diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1f82ca238..91777b7264 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,14 +51,11 @@ jobs: move bedrock_server_var.lib ..\LiteLoader\lib shell: cmd - - name: Get short SHA - id: sha_short - run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT - - name: Set LITELOADER_VERSION_COMMIT_SHA working-directory: ${{ env.GITHUB_WORKSPACE }} run: | - sed -r -i 's/#define\s+LITELOADER_VERSION_COMMIT_SHA\s+.*/#define LITELOADER_VERSION_COMMIT_SHA ${{ steps.sha_short.outputs.sha_short }}\r/' LiteLoader/include/liteloader/Version.h + export sha_short=$(git rev-parse --short HEAD) + sed -r -i "s/#define\s+LITELOADER_VERSION_COMMIT_SHA\s+.*/#define LITELOADER_VERSION_COMMIT_SHA $sha_short\r/" LiteLoader/include/liteloader/Version.h shell: bash - name: Configure CMake (MSVC) @@ -94,7 +91,7 @@ jobs: if: github.event_name == 'push' run: | cd build/output/plugins/LiteLoader/ResourcePacks - 7z a LiteLoaderBDS-CUI.tar LiteLoaderBDS-CUI + 7z a LiteLoaderBDS-CUI.zip LiteLoaderBDS-CUI rm -r LiteLoaderBDS-CUI shell: bash @@ -130,9 +127,7 @@ jobs: ${{ github.workspace }}\build\output\plugins\lib\ ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\ ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\ ${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll ${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar @@ -166,10 +161,8 @@ jobs: with: name: ScriptEngine path: | - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll - ${{ github.workspace }}\build\output\plugins\lib\node_modules.tar + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll + ${{ github.workspace }}\build\output\plugins\lib\*.zip ${{ github.workspace }}\build\output\plugins\lib\package.json - name: Upload LLParticle diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index 6ee9d77936..d0c6338a46 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -156,9 +156,7 @@ jobs: ${{ github.workspace }}\build\output\plugins\lib\ ${{ github.workspace }}\build\output\plugins\LiteLoader\LangPack\ ${{ github.workspace }}\build\output\plugins\LiteLoader\CrashLogger_Daemon.exe - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll ${{ github.workspace }}\build\output\plugins\LiteLoader\7z\ ${{ github.workspace }}\build\output\plugins\LiteLoader\ParticleAPI.dll ${{ github.workspace }}\build\output\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar @@ -192,10 +190,8 @@ jobs: with: name: ScriptEngine path: | - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Js.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.Lua.dll - ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.NodeJs.dll - ${{ github.workspace }}\build\output\plugins\lib\node_modules.tar + ${{ github.workspace }}\build\output\plugins\LiteLoader\LiteLoader.*.dll + ${{ github.workspace }}\build\output\plugins\lib\*.zip ${{ github.workspace }}\build\output\plugins\lib\package.json - name: Upload LLParticle @@ -261,6 +257,7 @@ jobs: tag: ${{ github.event.inputs.tag }} bodyFile: RELEASE_NOTES.md artifacts: | + build/LiteLoaderBDS.zip build/Modules.zip build/PDB.zip env: diff --git a/.gitmodules b/.gitmodules index f5618d2bc1..7e609f9b15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ -[submodule "assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"] - path = assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI - url = https://github.com/OEOTYAN/LiteLoaderBDS-CUI.git [submodule "PermissionAPI"] path = PermissionAPI url = https://github.com/LiteLDev/PermissionAPI.git [submodule "ParticleAPI"] path = ParticleAPI url = https://github.com/LiteLDev/ParticleAPI.git +[submodule "assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI"] + path = assets/plugins/LiteLoader/ResourcePacks/LiteLoaderBDS-CUI + url = https://github.com/OEOTYAN/LiteLoaderBDS-CUI.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d0c5af41d..1ec0878872 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,10 +12,12 @@ add_subdirectory(LiteLoader) add_subdirectory(ScriptEngine/CMake/ScriptEngine-Lua) add_subdirectory(ScriptEngine/CMake/ScriptEngine-QuickJs) add_subdirectory(ScriptEngine/CMake/ScriptEngine-NodeJs) +add_subdirectory(ScriptEngine/CMake/ScriptEngine-Python) add_subdirectory(Tools/Demangler) add_subdirectory(Tools/ScriptX/CMake/ScriptX-Lua) add_subdirectory(Tools/ScriptX/CMake/ScriptX-QuickJs) add_subdirectory(Tools/ScriptX/CMake/ScriptX-NodeJs) +add_subdirectory(Tools/ScriptX/CMake/ScriptX-Python) add_subdirectory(Tools/SymDBHelper) add_subdirectory(ParticleAPI) add_subdirectory(PermissionAPI/PermissionAPI) diff --git a/LiteLoader/CMakeLists.txt b/LiteLoader/CMakeLists.txt index b2447bc98f..0915c2f892 100644 --- a/LiteLoader/CMakeLists.txt +++ b/LiteLoader/CMakeLists.txt @@ -91,3 +91,14 @@ add_custom_command( COMMENT "Copying LiteLoader Lib to SDK directory" VERBATIM ) + +# copy target DLL and PDB to local bds dev directory +if(NOT "${BDS_LOCAL_DEV_ENVIRONMENT_DIR}" STREQUAL "") + add_custom_command( + TARGET LiteLoader POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/ + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/pdb/ + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to local bds dev directory" + VERBATIM + ) +endif() \ No newline at end of file diff --git a/LiteLoader/include/liteloader/Version.h b/LiteLoader/include/liteloader/Version.h index b30b63dbea..78107e2a52 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 11 -#define LITELOADER_VERSION_REVISION 1 +#define LITELOADER_VERSION_MINOR 12 +#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 568 +#define TARGET_BDS_PROTOCOL_VERSION 575 #define LITELOADER_VERSION ll::getLoaderVersion() diff --git a/LiteLoader/include/llapi/Global.h b/LiteLoader/include/llapi/Global.h index 64520fb2d5..4cd2aab9c9 100644 --- a/LiteLoader/include/llapi/Global.h +++ b/LiteLoader/include/llapi/Global.h @@ -66,6 +66,7 @@ #pragma unmanaged #include #pragma managed + #include #include #include diff --git a/LiteLoader/include/llapi/GlobalServiceAPI.h b/LiteLoader/include/llapi/GlobalServiceAPI.h index 91b6f8b040..58b46ca0f5 100644 --- a/LiteLoader/include/llapi/GlobalServiceAPI.h +++ b/LiteLoader/include/llapi/GlobalServiceAPI.h @@ -25,7 +25,7 @@ class AllowListFile; class PropertiesSettings; class ResourcePackRepository; class LevelStorage; - +class StructureManager; #ifdef LITELOADER_EXPORTS template LIAPI inline T* Global = nullptr; diff --git a/LiteLoader/include/llapi/SendPacketAPI.h b/LiteLoader/include/llapi/SendPacketAPI.h index b2eab77405..838944654f 100644 --- a/LiteLoader/include/llapi/SendPacketAPI.h +++ b/LiteLoader/include/llapi/SendPacketAPI.h @@ -1,6 +1,7 @@ #pragma once #include "llapi/mc/BinaryStream.hpp" #include "llapi/mc/Packet.hpp" +#include "llapi/mc/ExtendedStreamReadResult.hpp" template class NetworkPacket : public Packet { @@ -25,14 +26,17 @@ class NetworkPacket : public Packet { virtual void write(BinaryStream& bs) const { bs.getRaw().append(view); } - virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override { - throw("TODO in MyPkt::_read()"); - return (enum StreamReadResult)0; - } - virtual void dummyread() { - throw("TODO in MyPkt::dummyread()"); + virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &) { + throw("TODO"); } virtual bool disallowBatching() const { return !batching; } + virtual bool isValid() const { + throw("TODO"); + } + virtual enum StreamReadResult _read(class ReadOnlyBinaryStream&) override { + throw("TODO in MyPkt::_read()"); + return (enum StreamReadResult)0; + } }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AABBBucket.hpp b/LiteLoader/include/llapi/mc/AABBBucket.hpp index 05dfa6f393..75ec0b0a6e 100644 --- a/LiteLoader/include/llapi/mc/AABBBucket.hpp +++ b/LiteLoader/include/llapi/mc/AABBBucket.hpp @@ -29,31 +29,31 @@ struct AABBBucket { public: /** - * @symbol ??0AABBBucket\@\@QEAA\@XZ + * @symbol ??0AABBBucket\@\@QEAA\@XZ */ MCAPI AABBBucket(); /** - * @symbol ?clearDirty\@AABBBucket\@\@QEAAXXZ + * @symbol ?clearDirty\@AABBBucket\@\@QEAAXXZ */ MCAPI void clearDirty(); /** - * @symbol ?clearNeedsFinalize\@AABBBucket\@\@QEAAXXZ + * @symbol ?clearNeedsFinalize\@AABBBucket\@\@QEAAXXZ */ MCAPI void clearNeedsFinalize(); /** - * @symbol ?isDirty\@AABBBucket\@\@QEAA_NXZ + * @symbol ?isDirty\@AABBBucket\@\@QEAA_NXZ */ MCAPI bool isDirty(); /** - * @symbol ?markDirty\@AABBBucket\@\@QEAAXXZ + * @symbol ?markDirty\@AABBBucket\@\@QEAAXXZ */ MCAPI void markDirty(); /** - * @symbol ?mergeAABBs\@AABBBucket\@\@QEAAXXZ + * @symbol ?mergeAABBs\@AABBBucket\@\@QEAAXXZ */ MCAPI void mergeAABBs(); /** - * @symbol ?needsFinalize\@AABBBucket\@\@QEBA_NXZ + * @symbol ?needsFinalize\@AABBBucket\@\@QEBA_NXZ */ MCAPI bool needsFinalize() const; diff --git a/LiteLoader/include/llapi/mc/AABBPred.hpp b/LiteLoader/include/llapi/mc/AABBPred.hpp index 4455d67651..6f9d39be55 100644 --- a/LiteLoader/include/llapi/mc/AABBPred.hpp +++ b/LiteLoader/include/llapi/mc/AABBPred.hpp @@ -30,8 +30,8 @@ class AABBPred { public: /** - * @symbol ??RAABBPred\@\@QEBA_NAEBVAABB\@\@0\@Z + * @symbol ??RAABBPred\@\@QEBA_NAEBVAABB\@\@0\@Z */ MCAPI bool operator()(class AABB const &, class AABB const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp b/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp index 5bffbb068a..8f581d224c 100644 --- a/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp +++ b/LiteLoader/include/llapi/mc/AABBShapeComponent.hpp @@ -28,7 +28,7 @@ struct AABBShapeComponent { public: /** - * @symbol ?toString\@AABBShapeComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@AABBShapeComponent\@\@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/Abilities.hpp b/LiteLoader/include/llapi/mc/Abilities.hpp index 80cd768d2b..35ac773806 100644 --- a/LiteLoader/include/llapi/mc/Abilities.hpp +++ b/LiteLoader/include/llapi/mc/Abilities.hpp @@ -29,111 +29,111 @@ class Abilities { public: /** - * @symbol ??0Abilities\@\@QEAA\@_N\@Z + * @symbol ??0Abilities\@\@QEAA\@AEBV0\@\@Z */ - MCAPI Abilities(bool); + MCAPI Abilities(class Abilities const &); /** - * @symbol ??0Abilities\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0Abilities\@\@QEAA\@_N\@Z */ - MCAPI Abilities(class Abilities const &); + MCAPI Abilities(bool); /** - * @symbol ?addSaveData\@Abilities\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addSaveData\@Abilities\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addSaveData(class CompoundTag &) const; /** - * @symbol ?forEachAbility\@Abilities\@\@QEAAXAEBV?$function\@$$A6AXAEAVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z + * @symbol ?forEachAbility\@Abilities\@\@QEAAXAEBV?$function\@$$A6AXAEAVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z */ MCAPI void forEachAbility(class std::function const &, enum class Ability::Options); /** - * @symbol ?forEachAbility\@Abilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z + * @symbol ?forEachAbility\@Abilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z */ MCAPI void forEachAbility(class std::function const &, enum class Ability::Options) const; /** - * @symbol ?getAbility\@Abilities\@\@QEAAAEAVAbility\@\@W4AbilitiesIndex\@\@\@Z + * @symbol ?getAbility\@Abilities\@\@QEAAAEAVAbility\@\@W4AbilitiesIndex\@\@\@Z */ MCAPI class Ability & getAbility(enum class AbilitiesIndex); /** - * @symbol ?getAbility\@Abilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z + * @symbol ?getAbility\@Abilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z */ MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const; /** - * @symbol ?getBool\@Abilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z + * @symbol ?getBool\@Abilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z */ MCAPI bool getBool(enum class AbilitiesIndex) const; /** - * @symbol ?getFloat\@Abilities\@\@QEBAMW4AbilitiesIndex\@\@\@Z + * @symbol ?getFloat\@Abilities\@\@QEBAMW4AbilitiesIndex\@\@\@Z */ MCAPI float getFloat(enum class AbilitiesIndex) const; /** - * @symbol ?isAnyAbilitySet\@Abilities\@\@QEBA_NXZ + * @symbol ?isAnyAbilitySet\@Abilities\@\@QEBA_NXZ */ MCAPI bool isAnyAbilitySet() const; /** - * @symbol ?loadSaveData\@Abilities\@\@QEAA_NAEBVCompoundTag\@\@\@Z + * @symbol ?loadSaveData\@Abilities\@\@QEAA_NAEBVCompoundTag\@\@\@Z */ MCAPI bool loadSaveData(class CompoundTag const &); /** - * @symbol ??4Abilities\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4Abilities\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class Abilities & operator=(class Abilities const &); /** - * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@AEBVAbility\@\@\@Z + * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@AEBVAbility\@\@\@Z */ MCAPI void setAbility(enum class AbilitiesIndex, class Ability const &); /** - * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z + * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z */ MCAPI void setAbility(enum class AbilitiesIndex, float); /** - * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z + * @symbol ?setAbility\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z */ MCAPI void setAbility(enum class AbilitiesIndex, bool); /** - * @symbol ?setAbilityDiff\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@_NAEA_N\@Z + * @symbol ?setAbilityDiff\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@_NAEA_N\@Z */ MCAPI void setAbilityDiff(enum class AbilitiesIndex, bool, bool &); /** - * @symbol ?setDefault\@Abilities\@\@QEAAXXZ + * @symbol ?setDefault\@Abilities\@\@QEAAXXZ */ MCAPI void setDefault(); /** - * @symbol ?setFromPermissions\@Abilities\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z + * @symbol ?setFromPermissions\@Abilities\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z */ MCAPI void setFromPermissions(enum class PlayerPermissionLevel); /** - * @symbol ?unSet\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@\@Z + * @symbol ?unSet\@Abilities\@\@QEAAXXZ */ - MCAPI void unSet(enum class AbilitiesIndex); + MCAPI void unSet(); /** - * @symbol ?unSet\@Abilities\@\@QEAAXXZ + * @symbol ?unSet\@Abilities\@\@QEAAXW4AbilitiesIndex\@\@\@Z */ - MCAPI void unSet(); + MCAPI void unSet(enum class AbilitiesIndex); /** - * @symbol ?DIFF_ABILITIY_AT\@Abilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_ABILITIY_AT\@Abilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ABILITIY_AT; /** - * @symbol ?INVALID_ABILITY\@Abilities\@\@2VAbility\@\@A + * @symbol ?INVALID_ABILITY\@Abilities\@\@2VAbility\@\@A */ MCAPI static class Ability INVALID_ABILITY; /** - * @symbol ?SERIALIZATION_TAG\@Abilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SERIALIZATION_TAG\@Abilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SERIALIZATION_TAG; /** - * @symbol ?getAbilityName\@Abilities\@\@SAPEBDW4AbilitiesIndex\@\@\@Z + * @symbol ?getAbilityName\@Abilities\@\@SAPEBDW4AbilitiesIndex\@\@\@Z */ MCAPI static char const * getAbilityName(enum class AbilitiesIndex); /** - * @symbol ?getDefault\@Abilities\@\@SAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z + * @symbol ?getDefault\@Abilities\@\@SAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z */ MCAPI static class Ability const & getDefault(enum class AbilitiesIndex); /** - * @symbol ?getDiff\@Abilities\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z + * @symbol ?getDiff\@Abilities\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z */ MCAPI static class std::optional getDiff(class Abilities const &, class Abilities const &); /** - * @symbol ?nameToAbilityIndex\@Abilities\@\@SA?AW4AbilitiesIndex\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?nameToAbilityIndex\@Abilities\@\@SA?AW4AbilitiesIndex\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class AbilitiesIndex nameToAbilityIndex(std::string const &); @@ -141,8 +141,8 @@ class Abilities { private: /** - * @symbol ?ABILITY_NAMES\@Abilities\@\@0V?$array\@PEBD$0BC\@\@std\@\@A + * @symbol ?ABILITY_NAMES\@Abilities\@\@0V?$array\@PEBD$0BD\@\@std\@\@A */ - MCAPI static class std::array ABILITY_NAMES; + MCAPI static class std::array ABILITY_NAMES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Ability.hpp b/LiteLoader/include/llapi/mc/Ability.hpp index 82aeaf7b4d..c62f5ab293 100644 --- a/LiteLoader/include/llapi/mc/Ability.hpp +++ b/LiteLoader/include/llapi/mc/Ability.hpp @@ -32,48 +32,48 @@ class Ability { public: /** - * @symbol ??0Ability\@\@QEAA\@_NW4Options\@0\@\@Z + * @symbol ??0Ability\@\@QEAA\@XZ */ - MCAPI Ability(bool, enum class Ability::Options); + MCAPI Ability(); /** - * @symbol ??0Ability\@\@QEAA\@XZ + * @symbol ??0Ability\@\@QEAA\@_NW4Options\@0\@\@Z */ - MCAPI Ability(); + MCAPI Ability(bool, enum class Ability::Options); /** - * @symbol ?getBool\@Ability\@\@QEBA_NXZ + * @symbol ?getBool\@Ability\@\@QEBA_NXZ */ MCAPI bool getBool() const; /** - * @symbol ?getFloat\@Ability\@\@QEBAMXZ + * @symbol ?getFloat\@Ability\@\@QEBAMXZ */ MCAPI float getFloat() const; /** - * @symbol ?getType\@Ability\@\@QEBA?AW4Type\@1\@XZ + * @symbol ?getType\@Ability\@\@QEBA?AW4Type\@1\@XZ */ MCAPI enum class Ability::Type getType() const; /** - * @symbol ?hasOption\@Ability\@\@QEBA_NW4Options\@1\@\@Z + * @symbol ?hasOption\@Ability\@\@QEBA_NW4Options\@1\@\@Z */ MCAPI bool hasOption(enum class Ability::Options) const; /** - * @symbol ?isSet\@Ability\@\@QEBA_NXZ + * @symbol ?isSet\@Ability\@\@QEBA_NXZ */ MCAPI bool isSet() const; /** - * @symbol ??9Ability\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9Ability\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class Ability const &) const; /** - * @symbol ?setBool\@Ability\@\@QEAAX_N\@Z + * @symbol ?setBool\@Ability\@\@QEAAX_N\@Z */ MCAPI void setBool(bool); /** - * @symbol ?setFloat\@Ability\@\@QEAAXM\@Z + * @symbol ?setFloat\@Ability\@\@QEAAXM\@Z */ MCAPI void setFloat(float); /** - * @symbol ?unSet\@Ability\@\@QEAAXXZ + * @symbol ?unSet\@Ability\@\@QEAAXXZ */ MCAPI void unSet(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AbilityCommand.hpp b/LiteLoader/include/llapi/mc/AbilityCommand.hpp index 34471f9e0f..57b5469794 100644 --- a/LiteLoader/include/llapi/mc/AbilityCommand.hpp +++ b/LiteLoader/include/llapi/mc/AbilityCommand.hpp @@ -31,18 +31,18 @@ class AbilityCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AbilityCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@AbilityCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@AbilityCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@AbilityCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@AbilityCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp b/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp index 3e6a391864..e1e1b04867 100644 --- a/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/AbsorptionMobEffect.hpp @@ -31,23 +31,23 @@ class AbsorptionMobEffect : public MobEffect { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AbsorptionMobEffect(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applyEffects\@AbsorptionMobEffect\@\@UEBAXPEAVActor\@\@HH\@Z + * @vftbl 1 + * @symbol ?applyEffects\@AbsorptionMobEffect\@\@UEBAXPEAVActor\@\@HH\@Z */ virtual void applyEffects(class Actor *, int, int) const; /** - * @vftbl 2 - * @symbol ?removeEffects\@AbsorptionMobEffect\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?removeEffects\@AbsorptionMobEffect\@\@UEAAXPEAVActor\@\@\@Z */ virtual void removeEffects(class Actor *); /** - * @symbol ??0AbsorptionMobEffect\@\@QEAA\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z + * @symbol ??0AbsorptionMobEffect\@\@QEAA\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z */ MCAPI AbsorptionMobEffect(int, std::string const &, std::string const &, bool, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AbstractArrow.hpp b/LiteLoader/include/llapi/mc/AbstractArrow.hpp index 988f499391..4d71f7710f 100644 --- a/LiteLoader/include/llapi/mc/AbstractArrow.hpp +++ b/LiteLoader/include/llapi/mc/AbstractArrow.hpp @@ -32,203 +32,213 @@ class AbstractArrow : public PredictableProjectile { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@AbstractArrow\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@AbstractArrow\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@AbstractArrow\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@AbstractArrow\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~AbstractArrow(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 47 - * @symbol ?lerpMotion\@AbstractArrow\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 47 + * @symbol ?lerpMotion\@AbstractArrow\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@AbstractArrow\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@AbstractArrow\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@AbstractArrow\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@AbstractArrow\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 90 - * @symbol ?playerTouch\@AbstractArrow\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 89 + * @symbol ?playerTouch\@AbstractArrow\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@AbstractArrow\@\@MEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@AbstractArrow\@\@MEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@AbstractArrow\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@AbstractArrow\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@AbstractArrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@AbstractArrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@AbstractArrow\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@AbstractArrow\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?shoot\@AbstractArrow\@\@UEAAXAEBVVec3\@\@MM0\@Z + * @vftbl 276 + * @symbol ?shoot\@AbstractArrow\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 279 - * @symbol ?_playPickupSound\@AbstractArrow\@\@MEAAXXZ + * @vftbl 277 + * @symbol ?_playPickupSound\@AbstractArrow\@\@MEAAXXZ */ virtual void _playPickupSound(); /** - * @vftbl 280 - * @symbol ?_getPickupItem\@ThrownTrident\@\@MEBA?AVItemStack\@\@XZ + * @vftbl 278 + * @symbol ?_getPickupItem\@ThrownTrident\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ABSTRACTARROW /** - * @symbol ??0AbstractArrow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AbstractArrow(); +#endif + /** + * @symbol ??0AbstractArrow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI AbstractArrow(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?isPlayerOwned\@AbstractArrow\@\@QEBA_NXZ + * @symbol ?isPlayerOwned\@AbstractArrow\@\@QEBA_NXZ */ MCAPI bool isPlayerOwned() const; /** - * @symbol ?setFavoredSlot\@AbstractArrow\@\@QEAAXH\@Z + * @symbol ?setFavoredSlot\@AbstractArrow\@\@QEAAXH\@Z */ MCAPI void setFavoredSlot(int); /** - * @symbol ?setIsCreative\@AbstractArrow\@\@QEAAX_N\@Z + * @symbol ?setIsCreative\@AbstractArrow\@\@QEAAX_N\@Z */ MCAPI void setIsCreative(bool); + /** + * @symbol ?spawnPlayerProjectile\@AbstractArrow\@\@SAPEAVActor\@\@AEBUActorDefinitionIdentifier\@\@AEAVPlayer\@\@VVec3\@\@\@Z + */ + MCAPI static class Actor * spawnPlayerProjectile(struct ActorDefinitionIdentifier const &, class Player &, class Vec3); //protected: /** - * @symbol ?_canPickup\@AbstractArrow\@\@IEBA_NAEBVPlayer\@\@\@Z + * @symbol ?_canPickup\@AbstractArrow\@\@IEBA_NAEBVPlayer\@\@\@Z */ MCAPI bool _canPickup(class Player const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp index e626b0d886..7fa38d1786 100644 --- a/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCandleBlock.hpp @@ -31,310 +31,319 @@ class AbstractCandleBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AbstractCandleBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@AbstractCandleBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@AbstractCandleBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@AbstractCandleBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@AbstractCandleBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 - * @symbol ?getLightEmission\@AbstractCandleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@AbstractCandleBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@AbstractCandleBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?_getNumCandles\@AbstractCandleBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?_getNumCandles\@AbstractCandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 194 - * @symbol ?_iterateCandles\@AbstractCandleBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z + * @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 195 - * @symbol ?_tryLightOnFire\@AbstractCandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 196 + * @symbol ?_tryLightOnFire\@AbstractCandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 198 + * @symbol __unk_vfn_198 */ virtual void __unk_vfn_198(); /** - * @vftbl 199 - * @symbol __unk_vfn_199 + * @vftbl 199 + * @symbol __unk_vfn_199 */ virtual void __unk_vfn_199(); /** - * @vftbl 200 - * @symbol __unk_vfn_200 + * @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 + * @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_ABSTRACTCANDLEBLOCK /** - * @symbol ?canBeSilkTouched\@AbstractCandleBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@AbstractCandleBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasVariableLighting\@AbstractCandleBlock\@\@UEBA_NXZ + * @symbol ?hasVariableLighting\@AbstractCandleBlock\@\@UEBA_NXZ */ MCVAPI bool hasVariableLighting() const; /** - * @symbol ?isInteractiveBlock\@AbstractCandleBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@AbstractCandleBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AbstractCandleBlock(); #endif /** - * @symbol ??0AbstractCandleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0AbstractCandleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI AbstractCandleBlock(std::string const &, int, class Material const &); //protected: /** - * @symbol ?_checkForWaterlogging\@AbstractCandleBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_checkForWaterlogging\@AbstractCandleBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _checkForWaterlogging(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_extinguish\@AbstractCandleBlock\@\@IEBAXPEAVActor\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_extinguish\@AbstractCandleBlock\@\@IEBAXPEAVActor\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _extinguish(class Actor *, class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_canBeLit\@AbstractCandleBlock\@\@KA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canBeLit\@AbstractCandleBlock\@\@KA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _canBeLit(class Block const &, class BlockSource &, class BlockPos const &); /** - * @symbol ?_isLit\@AbstractCandleBlock\@\@KA_NAEBVBlock\@\@\@Z + * @symbol ?_isLit\@AbstractCandleBlock\@\@KA_NAEBVBlock\@\@\@Z */ MCAPI static bool _isLit(class Block const &); /** - * @symbol ?_setLit\@AbstractCandleBlock\@\@KAXAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_setLit\@AbstractCandleBlock\@\@KAXAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI static void _setLit(class Block const &, class BlockSource &, class BlockPos const &, bool); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp b/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp index 8623b41e6d..00816027ba 100644 --- a/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/AbstractCompassItem.hpp @@ -30,93 +30,93 @@ class AbstractCompassItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AbstractCompassItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@AbstractCompassItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@AbstractCompassItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 118 - * @symbol ?getIconInfo\@AbstractCompassItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@AbstractCompassItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 120 - * @symbol ?getAnimationFrameFor\@AbstractCompassItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@AbstractCompassItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @symbol ??0AbstractCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$function\@$$A6A?AVCompassSpriteCalculator\@\@PEAVMob\@\@\@Z\@2\@\@Z + * @symbol ??0AbstractCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$function\@$$A6A?AVCompassSpriteCalculator\@\@PEAVMob\@\@\@Z\@2\@\@Z */ MCAPI AbstractCompassItem(std::string const &, int, class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp b/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp index 8da4db5140..325009cffe 100644 --- a/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/AcaciaTreeCanopy.hpp @@ -31,14 +31,14 @@ class AcaciaTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AcaciaTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@AcaciaTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@AcaciaTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp b/LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp index e5608439f7..80fea18261 100644 --- a/LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/AcaciaTreeTrunk.hpp @@ -31,31 +31,31 @@ class AcaciaTreeTrunk { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AcaciaTreeTrunk(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeTrunk\@AcaciaTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + * @vftbl 1 + * @symbol ?placeTrunk\@AcaciaTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z */ virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; /** - * @vftbl 2 - * @symbol ?getTreeHeight\@AcaciaTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?getTreeHeight\@AcaciaTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z */ virtual int getTreeHeight(class Random &) const; //private: /** - * @symbol ?_placeLeaningBranches\@AcaciaTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1AEAVRandom\@\@AEAVRenderParams\@\@HHHAEBUTreeParams\@TreeHelper\@\@\@Z + * @symbol ?_placeLeaningBranches\@AcaciaTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1AEAVRandom\@\@AEAVRenderParams\@\@HHHAEBUTreeParams\@TreeHelper\@\@\@Z */ MCAPI void _placeLeaningBranches(class IBlockWorldGenAPI &, class BlockPos const &, class BlockPos const &, class Random &, class RenderParams &, int, int, int, struct TreeHelper::TreeParams const &) const; /** - * @symbol ?_placeVerticalBranches\@AcaciaTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@\@Z + * @symbol ?_placeVerticalBranches\@AcaciaTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@\@Z */ MCAPI void _placeVerticalBranches(class IBlockWorldGenAPI &, class BlockPos const &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp b/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp index a3ec3236fc..6910e5d3cf 100644 --- a/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/AccessRecordingConstBlockSource.hpp @@ -28,112 +28,118 @@ class AccessRecordingConstBlockSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AccessRecordingConstBlockSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z + * @vftbl 1 + * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z */ virtual class Block const & getBlock(int, int, int) const; /** - * @vftbl 2 - * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 2 + * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlock(class BlockPos const &) const; /** - * @vftbl 3 - * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z + * @vftbl 3 + * @symbol ?getBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z */ virtual class Block const & getBlock(class BlockPos const &, unsigned int) const; /** - * @vftbl 4 - * @symbol ?getBlockEntity\@AccessRecordingConstBlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?getBlockEntity\@AccessRecordingConstBlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z */ virtual class BlockActor const * getBlockEntity(class BlockPos const &) const; /** - * @vftbl 5 - * @symbol ?getExtraBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?getExtraBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getExtraBlock(class BlockPos const &) const; /** - * @vftbl 6 - * @symbol ?getLiquidBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 6 + * @symbol ?getLiquidBlock\@AccessRecordingConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getLiquidBlock(class BlockPos const &) const; /** - * @vftbl 7 - * @symbol ?hasBlock\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 7 + * @symbol ?hasBlock\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool hasBlock(class BlockPos const &) const; /** - * @vftbl 8 - * @symbol ?containsAnyLiquid\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@\@Z + * @vftbl 8 + * @symbol ?containsAnyLiquid\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@\@Z */ virtual bool containsAnyLiquid(class AABB const &) const; /** - * @vftbl 9 - * @symbol ?containsMaterial\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z + * @vftbl 9 + * @symbol ?containsMaterial\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z */ virtual bool containsMaterial(class AABB const &, enum class MaterialType) const; /** - * @vftbl 10 - * @symbol ?getMaterial\@AccessRecordingConstBlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z + * @vftbl 10 + * @symbol ?getMaterial\@AccessRecordingConstBlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z */ virtual class Material const & getMaterial(class BlockPos const &) const; /** - * @vftbl 11 - * @symbol ?getMaterial\@AccessRecordingConstBlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z + * @vftbl 11 + * @symbol ?getMaterial\@AccessRecordingConstBlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z */ virtual class Material const & getMaterial(int, int, int) const; /** - * @vftbl 12 - * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z + * @vftbl 12 + * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z */ virtual bool hasChunksAt(struct Bounds const &, bool) const; /** - * @vftbl 13 - * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z + * @vftbl 13 + * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z */ virtual bool hasChunksAt(class BlockPos const &, int, bool) const; /** - * @vftbl 14 - * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z + * @vftbl 14 + * @symbol ?hasChunksAt\@AccessRecordingConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z */ virtual bool hasChunksAt(class AABB const &, bool) const; /** - * @vftbl 15 - * @symbol ?getDimensionId\@AccessRecordingConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @vftbl 15 + * @symbol ?getDimensionId\@AccessRecordingConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ virtual class AutomaticID getDimensionId() const; /** - * @vftbl 16 - * @symbol ?fetchAABBs\@AccessRecordingConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z + * @vftbl 16 + * @symbol ?fetchAABBs\@AccessRecordingConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z */ virtual void fetchAABBs(std::vector &, class AABB const &, bool) const; /** - * @vftbl 17 - * @symbol ?fetchCollisionShapes\@AccessRecordingConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 17 + * @symbol ?fetchCollisionShapes\@AccessRecordingConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual void fetchCollisionShapes(std::vector &, class AABB const &, float *, bool, class optional_ref) const; /** - * @vftbl 18 - * @symbol ?getTallestCollisionShape\@AccessRecordingConstBlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 18 + * @symbol ?getTallestCollisionShape\@AccessRecordingConstBlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual class AABB getTallestCollisionShape(class AABB const &, float *, bool, class optional_ref) const; /** - * @vftbl 19 - * @symbol ?getBrightness\@AccessRecordingConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z + * @vftbl 19 + * @symbol ?getBrightness\@AccessRecordingConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z */ virtual float getBrightness(class BlockPos const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACCESSRECORDINGCONSTBLOCKSOURCE /** - * @symbol ??0AccessRecordingConstBlockSource\@\@QEAA\@V?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AccessRecordingConstBlockSource(); +#endif + /** + * @symbol ??0AccessRecordingConstBlockSource\@\@QEAA\@V?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z */ MCAPI AccessRecordingConstBlockSource(class gsl::not_null); /** - * @symbol ?takeAccessedBlocks\@AccessRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ + * @symbol ?takeAccessedBlocks\@AccessRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ */ MCAPI struct AccessedBlockSourceBlocks takeAccessedBlocks(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp b/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp index b1cb425749..c52ffb3f93 100644 --- a/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp +++ b/LiteLoader/include/llapi/mc/AccessedBlockSourceBlock.hpp @@ -28,11 +28,11 @@ struct AccessedBlockSourceBlock { public: /** - * @symbol ??0AccessedBlockSourceBlock\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0AccessedBlockSourceBlock\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI AccessedBlockSourceBlock(struct AccessedBlockSourceBlock &&); /** - * @symbol ??1AccessedBlockSourceBlock\@\@QEAA\@XZ + * @symbol ??1AccessedBlockSourceBlock\@\@QEAA\@XZ */ MCAPI ~AccessedBlockSourceBlock(); diff --git a/LiteLoader/include/llapi/mc/Achievements.hpp b/LiteLoader/include/llapi/mc/Achievements.hpp index 9a725edb99..1c19d9de62 100644 --- a/LiteLoader/include/llapi/mc/Achievements.hpp +++ b/LiteLoader/include/llapi/mc/Achievements.hpp @@ -20,7 +20,7 @@ namespace Achievements { #undef AFTER_EXTRA /** - * @symbol ?getIndexForFroglight\@Achievements\@\@YAHAEBVItemStack\@\@\@Z + * @symbol ?getIndexForFroglight\@Achievements\@\@YAHAEBVItemStack\@\@\@Z */ MCAPI int getIndexForFroglight(class ItemStack const &); diff --git a/LiteLoader/include/llapi/mc/ActionEvent.hpp b/LiteLoader/include/llapi/mc/ActionEvent.hpp index 70bccfdf62..ea4b1efa75 100644 --- a/LiteLoader/include/llapi/mc/ActionEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActionEvent.hpp @@ -28,8 +28,8 @@ class ActionEvent { public: /** - * @symbol ??0ActionEvent\@\@QEAA\@HW4ActionState\@0\@_NW4FocusImpact\@\@\@Z + * @symbol ??0ActionEvent\@\@QEAA\@HW4ActionState\@0\@_NW4FocusImpact\@\@\@Z */ MCAPI ActionEvent(int, enum class ActionEvent::ActionState, bool, enum class FocusImpact); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActionQueue.hpp b/LiteLoader/include/llapi/mc/ActionQueue.hpp index 77ebd31381..29c796fcb5 100644 --- a/LiteLoader/include/llapi/mc/ActionQueue.hpp +++ b/LiteLoader/include/llapi/mc/ActionQueue.hpp @@ -27,12 +27,12 @@ class ActionQueue { public: /** - * @symbol ??0ActionQueue\@\@QEAA\@XZ + * @symbol ??0ActionQueue\@\@QEAA\@XZ */ MCAPI ActionQueue(); /** - * @symbol ?pushBackActionEvent\@ActionQueue\@\@QEAAXVActionEvent\@\@\@Z + * @symbol ?pushBackActionEvent\@ActionQueue\@\@QEAAXVActionEvent\@\@\@Z */ MCAPI void pushBackActionEvent(class ActionEvent); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp b/LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp index cf35ca0282..2fa467b763 100644 --- a/LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActivateToolDefinition.hpp @@ -32,14 +32,14 @@ class ActivateToolDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActivateToolDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ActivateToolDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ActivateToolDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActivateToolNode.hpp b/LiteLoader/include/llapi/mc/ActivateToolNode.hpp index e0c8d3c0b8..9f23186a7a 100644 --- a/LiteLoader/include/llapi/mc/ActivateToolNode.hpp +++ b/LiteLoader/include/llapi/mc/ActivateToolNode.hpp @@ -29,23 +29,23 @@ class ActivateToolNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActivateToolNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@ActivateToolNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@ActivateToolNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@ActivateToolNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@ActivateToolNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0ActivateToolNode\@\@QEAA\@XZ + * @symbol ??0ActivateToolNode\@\@QEAA\@XZ */ MCAPI ActivateToolNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp index 494a9c85fd..a20e798b95 100644 --- a/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActivatorRailBlock.hpp @@ -31,203 +31,208 @@ class ActivatorRailBlock : public BaseRailBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActivatorRailBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@ActivatorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@ActivatorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ActivatorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0ActivatorRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0ActivatorRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ActivatorRailBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp b/LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp index 04f2984b5e..7900fd2e20 100644 --- a/LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp +++ b/LiteLoader/include/llapi/mc/ActiveDirectoryIdentity.hpp @@ -30,31 +30,31 @@ class ActiveDirectoryIdentity { public: /** - * @symbol ?IS_VALID_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IS_VALID_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const IS_VALID_FIELD; /** - * @symbol ?JWT_EXPIRATION_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?JWT_EXPIRATION_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const JWT_EXPIRATION_FIELD; /** - * @symbol ?JWT_REQUEST_ID_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?JWT_REQUEST_ID_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const JWT_REQUEST_ID_FIELD; /** - * @symbol ?PAYLOAD_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PAYLOAD_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PAYLOAD_FIELD; /** - * @symbol ?PUBLIC_KEY\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PUBLIC_KEY\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PUBLIC_KEY; /** - * @symbol ?REQUEST_ID_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?REQUEST_ID_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const REQUEST_ID_FIELD; /** - * @symbol ?RESPONSE_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RESPONSE_FIELD\@ActiveDirectoryIdentity\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RESPONSE_FIELD; @@ -62,8 +62,8 @@ class ActiveDirectoryIdentity { private: /** - * @symbol ?mCachedServiceEndpoint\@ActiveDirectoryIdentity\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@A + * @symbol ?mCachedServiceEndpoint\@ActiveDirectoryIdentity\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@A */ MCAPI static std::string mCachedServiceEndpoint; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp index 9092025385..569b642e9d 100644 --- a/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/ActiveDirectoryScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ActiveDirectoryScreenCapabilities. - * - */ -struct ActiveDirectoryScreenCapabilities { + +class ActiveDirectoryScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,27 @@ struct ActiveDirectoryScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTIVEDIRECTORYSCREENCAPABILITIES public: - struct ActiveDirectoryScreenCapabilities& operator=(struct ActiveDirectoryScreenCapabilities const &) = delete; - ActiveDirectoryScreenCapabilities(struct ActiveDirectoryScreenCapabilities const &) = delete; + class ActiveDirectoryScreenCapabilities& operator=(class ActiveDirectoryScreenCapabilities const &) = delete; + ActiveDirectoryScreenCapabilities(class ActiveDirectoryScreenCapabilities const &) = delete; ActiveDirectoryScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActiveDirectoryScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UActiveDirectoryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UActiveDirectoryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTIVEDIRECTORYSCREENCAPABILITIES + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActiveDirectoryScreenCapabilities(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Actor.hpp b/LiteLoader/include/llapi/mc/Actor.hpp index c4e37181db..67fa642413 100644 --- a/LiteLoader/include/llapi/mc/Actor.hpp +++ b/LiteLoader/include/llapi/mc/Actor.hpp @@ -12,8 +12,10 @@ #include "MobEffectInstance.hpp" #include "Tick.hpp" #include "ActorDamageSource.hpp" +#include "EntityRegistryRefTraits.hpp" #include "VehicleUtils.hpp" #include "Vec3.hpp" +#include "Ref.hpp" class Actor; class Player; class NetworkIdentifier; @@ -74,6 +76,7 @@ class Actor { LIAPI float quickEvalMolangScript(const string& expression); LIAPI Biome* getBiome(); LIAPI float getRealSpeed() const; + LIAPI class EntityContext* getEntityContext() const; //LIAPI Json::Value quickEvalMolangScriptAsJson(const string& expression); inline Vec3 getPos() @@ -93,6 +96,12 @@ class Actor { return getDimensionBlockSourceConst(); } + // template + // inline T* tryGetComponent() const { + // auto* entityContext = getEntityContext(); + // return entityContext->_enttRegistry().try_get(entityContext->_getEntityId()); + // } + #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTOR public: @@ -103,3266 +112,3260 @@ class Actor { public: /** - * @vftbl 0 - * @symbol ?getStatusFlag\@Actor\@\@UEBA_NW4ActorFlags\@\@\@Z + * @vftbl 0 + * @symbol ?getStatusFlag\@Actor\@\@UEBA_NW4ActorFlags\@\@\@Z */ virtual bool getStatusFlag(enum class ActorFlags) const; /** - * @vftbl 1 - * @symbol ?setStatusFlag\@Actor\@\@UEAAXW4ActorFlags\@\@_N\@Z + * @vftbl 1 + * @symbol ?setStatusFlag\@Actor\@\@UEAAXW4ActorFlags\@\@_N\@Z */ virtual void setStatusFlag(enum class ActorFlags, bool); /** - * @vftbl 2 - * @symbol ?hasComponent\@Actor\@\@UEBA_NAEBVHashedString\@\@\@Z + * @vftbl 2 + * @symbol ?hasComponent\@Actor\@\@UEBA_NAEBVHashedString\@\@\@Z */ virtual bool hasComponent(class HashedString const &) const; /** - * @vftbl 3 - * @symbol ?getLastHurtByMob\@Actor\@\@UEAAPEAVMob\@\@XZ + * @vftbl 3 + * @symbol ?getLastHurtByMob\@Actor\@\@UEAAPEAVMob\@\@XZ */ virtual class Mob * getLastHurtByMob(); /** - * @vftbl 4 - * @symbol ?setLastHurtByMob\@Actor\@\@UEAAXPEAVMob\@\@\@Z + * @vftbl 4 + * @symbol ?setLastHurtByMob\@Actor\@\@UEAAXPEAVMob\@\@\@Z */ virtual void setLastHurtByMob(class Mob *); /** - * @vftbl 5 - * @symbol ?getLastHurtByPlayer\@Actor\@\@UEAAPEAVPlayer\@\@XZ + * @vftbl 5 + * @symbol ?getLastHurtByPlayer\@Actor\@\@UEAAPEAVPlayer\@\@XZ */ virtual class Player * getLastHurtByPlayer(); /** - * @vftbl 6 - * @symbol ?setLastHurtByPlayer\@Actor\@\@UEAAXPEAVPlayer\@\@\@Z + * @vftbl 6 + * @symbol ?setLastHurtByPlayer\@Actor\@\@UEAAXPEAVPlayer\@\@\@Z */ virtual void setLastHurtByPlayer(class Player *); /** - * @vftbl 7 - * @symbol ?getLastHurtMob\@Actor\@\@UEAAPEAVMob\@\@XZ + * @vftbl 7 + * @symbol ?getLastHurtMob\@Actor\@\@UEAAPEAVMob\@\@XZ */ virtual class Mob * getLastHurtMob(); /** - * @vftbl 8 - * @symbol ?setLastHurtMob\@Actor\@\@UEAAXPEAV1\@\@Z + * @vftbl 8 + * @symbol ?setLastHurtMob\@Actor\@\@UEAAXPEAV1\@\@Z */ virtual void setLastHurtMob(class Actor *); /** - * @vftbl 9 - * @symbol ?outOfWorld\@Actor\@\@UEAAXXZ + * @vftbl 9 + * @symbol ?outOfWorld\@Actor\@\@UEAAXXZ */ virtual void outOfWorld(); /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 13 - * @symbol ?reloadComponents\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z + * @vftbl 13 + * @symbol ?reloadComponents\@Actor\@\@MEAAXW4InitializationMethod\@1\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 14 - * @symbol ?_serverInitItemStackIds\@Actor\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_serverInitItemStackIds\@Actor\@\@MEAAXXZ */ virtual void _serverInitItemStackIds(); /** - * @vftbl 15 - * @symbol ?_doInitialMove\@Actor\@\@MEAAXXZ + * @vftbl 15 + * @symbol ?_doInitialMove\@Actor\@\@MEAAXXZ */ virtual void _doInitialMove(); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Actor(); + virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol ?resetUserPos\@Actor\@\@UEAAX_N\@Z + * @vftbl 17 + * @symbol ?resetUserPos\@Actor\@\@UEAAX_N\@Z */ virtual void resetUserPos(bool); /** - * @vftbl 18 - * @symbol ?getOwnerEntityType\@Actor\@\@UEAA?AW4ActorType\@\@XZ + * @vftbl 18 + * @symbol ?getOwnerEntityType\@Actor\@\@UEAA?AW4ActorType\@\@XZ */ virtual enum class ActorType getOwnerEntityType(); /** - * @vftbl 19 - * @symbol ?remove\@Actor\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@Actor\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 20 - * @symbol ?setPos\@Actor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 20 + * @symbol ?setPos\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void setPos(class Vec3 const &); /** - * @vftbl 21 - * @symbol ?isRuntimePredictedMovementEnabled\@Actor\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isRuntimePredictedMovementEnabled\@Actor\@\@UEBA_NXZ */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 22 - * @symbol ?getPredictedMovementValues\@Actor\@\@UEBAAEBUPredictedMovementValues\@\@XZ + * @vftbl 22 + * @symbol ?getPredictedMovementValues\@Actor\@\@UEBAAEBUPredictedMovementValues\@\@XZ */ virtual struct PredictedMovementValues const & getPredictedMovementValues() const; /** - * @vftbl 23 - * @symbol ?getPosition\@Actor\@\@UEBAAEBVVec3\@\@XZ + * @vftbl 23 + * @symbol ?getPosition\@Actor\@\@UEBAAEBVVec3\@\@XZ */ virtual class Vec3 const & getPosition() const; /** - * @vftbl 24 - * @symbol ?getPosPrev\@Actor\@\@UEBAAEBVVec3\@\@XZ + * @vftbl 24 + * @symbol ?getPosPrev\@Actor\@\@UEBAAEBVVec3\@\@XZ */ virtual class Vec3 const & getPosPrev() const; /** - * @vftbl 25 - * @symbol ?getPosExtrapolated\@Actor\@\@UEBA?BVVec3\@\@M\@Z + * @vftbl 25 + * @symbol ?getPosExtrapolated\@Actor\@\@UEBA?BVVec3\@\@M\@Z */ virtual class Vec3 const getPosExtrapolated(float) const; /** - * @vftbl 26 - * @symbol ?getAttachPos\@Actor\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z + * @vftbl 26 + * @symbol ?getAttachPos\@Actor\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z */ virtual class Vec3 getAttachPos(enum class ActorLocation, float) const; /** - * @vftbl 27 - * @symbol ?getFiringPos\@Actor\@\@UEBA?AVVec3\@\@XZ + * @vftbl 27 + * @symbol ?getFiringPos\@Actor\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 28 - * @symbol ?move\@Actor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 28 + * @symbol ?move\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void move(class Vec3 const &); /** - * @vftbl 29 - * @symbol ?move\@Actor\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z + * @vftbl 29 + * @symbol ?move\@Actor\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z */ virtual void move(struct IActorMovementProxy &, class Vec3 const &) const; /** - * @vftbl 30 - * @symbol ?getInterpolatedRidingPosition\@Actor\@\@UEBA?AVVec3\@\@M\@Z + * @vftbl 30 + * @symbol ?getInterpolatedRidingPosition\@Actor\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getInterpolatedRidingPosition(float) const; /** - * @vftbl 31 - * @symbol ?getInterpolatedBodyRot\@Actor\@\@UEBAMM\@Z + * @vftbl 31 + * @symbol ?getInterpolatedBodyRot\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyRot(float) const; /** - * @vftbl 32 - * @symbol ?getInterpolatedHeadRot\@Actor\@\@UEBAMM\@Z + * @vftbl 32 + * @symbol ?getInterpolatedHeadRot\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedHeadRot(float) const; /** - * @vftbl 33 - * @symbol ?getInterpolatedBodyYaw\@Actor\@\@UEBAMM\@Z + * @vftbl 33 + * @symbol ?getInterpolatedBodyYaw\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 34 - * @symbol ?getYawSpeedInDegreesPerSecond\@Actor\@\@UEBAMXZ + * @vftbl 34 + * @symbol ?getYawSpeedInDegreesPerSecond\@Actor\@\@UEBAMXZ */ virtual float getYawSpeedInDegreesPerSecond() const; /** - * @vftbl 35 - * @symbol ?getInterpolatedWalkAnimSpeed\@Actor\@\@UEBAMM\@Z + * @vftbl 35 + * @symbol ?getInterpolatedWalkAnimSpeed\@Actor\@\@UEBAMM\@Z */ virtual float getInterpolatedWalkAnimSpeed(float) const; /** - * @vftbl 36 - * @symbol ?getInterpolatedRidingOffset\@Actor\@\@UEBA?AVVec3\@\@MH\@Z + * @vftbl 36 + * @symbol ?getInterpolatedRidingOffset\@Actor\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 37 - * @symbol ?resetInterpolated\@Actor\@\@UEAAXXZ + * @vftbl 37 + * @symbol ?resetInterpolated\@Actor\@\@UEAAXXZ */ virtual void resetInterpolated(); /** - * @vftbl 38 - * @symbol ?updateEntityInside\@Actor\@\@UEAAXAEBVAABB\@\@\@Z + * @vftbl 38 + * @symbol ?updateEntityInside\@Actor\@\@UEAAXAEBVAABB\@\@\@Z */ virtual void updateEntityInside(class AABB const &); /** - * @vftbl 39 - * @symbol ?updateEntityInside\@Actor\@\@UEAAXXZ + * @vftbl 39 + * @symbol ?updateEntityInside\@Actor\@\@UEAAXXZ */ virtual void updateEntityInside(); /** - * @vftbl 40 - * @symbol ?isFireImmune\@Actor\@\@UEBA_NXZ + * @vftbl 40 + * @symbol ?isFireImmune\@Actor\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol ?blockedByShield\@Actor\@\@UEAAXAEBVActorDamageSource\@\@AEAV1\@\@Z + * @vftbl 42 + * @symbol ?blockedByShield\@Actor\@\@UEAAXAEBVActorDamageSource\@\@AEAV1\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 43 - * @symbol ?canDisableShield\@Actor\@\@UEAA_NXZ + * @vftbl 43 + * @symbol ?canDisableShield\@Actor\@\@UEAA_NXZ */ virtual bool canDisableShield(); /** - * @vftbl 44 - * @symbol ?teleportTo\@Actor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@Actor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 45 - * @symbol ?tryTeleportTo\@Actor\@\@UEAA_NAEBVVec3\@\@_N1HH\@Z + * @vftbl 45 + * @symbol ?tryTeleportTo\@Actor\@\@UEAA_NAEBVVec3\@\@_N1HH\@Z */ virtual bool tryTeleportTo(class Vec3 const &, bool, bool, int, int); /** - * @vftbl 46 - * @symbol ?chorusFruitTeleport\@Actor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 46 + * @symbol ?chorusFruitTeleport\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void chorusFruitTeleport(class Vec3 const &); /** - * @vftbl 47 - * @symbol ?lerpMotion\@Actor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 47 + * @symbol ?lerpMotion\@Actor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 48 - * @symbol ?tryCreateAddActorPacket\@Actor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ + * @vftbl 48 + * @symbol ?tryCreateAddActorPacket\@Actor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 49 - * @symbol ?normalTick\@Actor\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Actor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 50 - * @symbol ?baseTick\@Actor\@\@UEAAXXZ + * @vftbl 50 + * @symbol ?baseTick\@Actor\@\@UEAAXXZ */ virtual void baseTick(); /** - * @vftbl 51 - * @symbol ?passengerTick\@Actor\@\@UEAAXXZ + * @vftbl 51 + * @symbol ?passengerTick\@Actor\@\@UEAAXXZ */ virtual void passengerTick(); /** - * @vftbl 52 - * @symbol ?positionPassenger\@Actor\@\@UEAAXAEAV1\@M\@Z + * @vftbl 52 + * @symbol ?positionPassenger\@Actor\@\@UEAAXAEAV1\@M\@Z */ virtual void positionPassenger(class Actor &, float); /** - * @vftbl 53 - * @symbol ?startRiding\@Actor\@\@UEAA_NAEAV1\@\@Z + * @vftbl 53 + * @symbol ?startRiding\@Actor\@\@UEAA_NAEAV1\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 54 - * @symbol ?addPassenger\@Actor\@\@UEAAXAEAV1\@\@Z + * @vftbl 54 + * @symbol ?addPassenger\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 55 - * @symbol ?flagPassengerToRemove\@Actor\@\@UEAAXAEAV1\@\@Z + * @vftbl 55 + * @symbol ?flagPassengerToRemove\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void flagPassengerToRemove(class Actor &); /** - * @vftbl 56 - * @symbol ?getExitTip\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@W4InputMode\@\@W4NewInteractionModel\@\@\@Z + * @vftbl 56 + * @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 - * @symbol ?getEntityLocNameString\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 57 + * @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 - * @symbol ?intersects\@Actor\@\@UEBA_NAEBVVec3\@\@0\@Z + * @vftbl 58 + * @symbol ?intersects\@Actor\@\@UEBA_NAEBVVec3\@\@0\@Z */ virtual bool intersects(class Vec3 const &, class Vec3 const &) const; /** - * @vftbl 59 - * @symbol ?isInWall\@Actor\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?isInWall\@Actor\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 60 - * @symbol ?isInvisible\@Actor\@\@UEBA_NXZ + * @vftbl 60 + * @symbol ?isInvisible\@Actor\@\@UEBA_NXZ */ virtual bool isInvisible() const; /** - * @vftbl 61 - * @symbol ?canShowNameTag\@Actor\@\@UEBA_NXZ + * @vftbl 61 + * @symbol ?canShowNameTag\@Actor\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 63 - * @symbol ?setNameTagVisible\@Actor\@\@UEAAX_N\@Z + * @vftbl 63 + * @symbol ?setNameTagVisible\@Actor\@\@UEAAX_N\@Z */ virtual void setNameTagVisible(bool); /** - * @vftbl 64 - * @symbol ?getNameTag\@Actor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 64 + * @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 - * @symbol ?getNameTagAsHash\@Actor\@\@UEBA_KXZ + * @vftbl 65 + * @symbol ?getNameTagAsHash\@Actor\@\@UEBA_KXZ */ virtual unsigned __int64 getNameTagAsHash() const; /** - * @vftbl 66 - * @symbol ?getFormattedNameTag\@Actor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 66 + * @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 - * @symbol ?filterFormattedNameTag\@Actor\@\@UEAAXAEBVUIProfanityContext\@\@\@Z + * @vftbl 67 + * @symbol ?filterFormattedNameTag\@Actor\@\@UEAAXAEBVUIProfanityContext\@\@\@Z */ virtual void filterFormattedNameTag(class UIProfanityContext const &); /** - * @vftbl 68 - * @symbol ?setNameTag\@Actor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 68 + * @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 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 70 - * @symbol ?setScoreTag\@Actor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 70 + * @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 - * @symbol ?getScoreTag\@Actor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 71 + * @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 - * @symbol ?isInWater\@Actor\@\@UEBA_NXZ + * @vftbl 72 + * @symbol ?isInWater\@Actor\@\@UEBA_NXZ */ virtual bool isInWater() const; /** - * @vftbl 73 - * @symbol ?hasEnteredWater\@Actor\@\@UEBA_NXZ - */ - virtual bool hasEnteredWater() const; - /** - * @vftbl 74 - * @symbol ?isInLava\@Actor\@\@UEBA_NAEBVIConstBlockSource\@\@\@Z + * @vftbl 73 + * @symbol ?isInLava\@Actor\@\@UEBA_NAEBVIConstBlockSource\@\@\@Z */ virtual bool isInLava(class IConstBlockSource const &) const; /** - * @vftbl 75 - * @symbol ?isUnderLiquid\@Actor\@\@UEBA_NW4MaterialType\@\@\@Z + * @vftbl 74 + * @symbol ?isUnderLiquid\@Actor\@\@UEBA_NW4MaterialType\@\@\@Z */ virtual bool isUnderLiquid(enum class MaterialType) const; /** - * @vftbl 76 - * @symbol ?isOverWater\@Actor\@\@UEBA_NXZ + * @vftbl 75 + * @symbol ?isOverWater\@Actor\@\@UEBA_NXZ */ virtual bool isOverWater() const; /** - * @vftbl 77 - * @symbol ?setBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z + * @vftbl 76 + * @symbol ?setBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 78 - * @symbol ?resetBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXXZ + * @vftbl 77 + * @symbol ?resetBlockMovementSlowdownMultiplier\@Actor\@\@UEAAXXZ */ virtual void resetBlockMovementSlowdownMultiplier(); /** - * @vftbl 79 - * @symbol ?getCameraOffset\@Actor\@\@UEBAMXZ + * @vftbl 78 + * @symbol ?getCameraOffset\@Actor\@\@UEBAMXZ */ virtual float getCameraOffset() const; /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@Actor\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@Actor\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Actor\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Actor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol ?getHeadLookVector\@Actor\@\@UEBA?AVVec3\@\@M\@Z + * @vftbl 81 + * @symbol ?getHeadLookVector\@Actor\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getHeadLookVector(float) const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 84 - * @symbol ?canSee\@Actor\@\@UEBA_NAEBV1\@\@Z + * @vftbl 83 + * @symbol ?canSee\@Actor\@\@UEBA_NAEBV1\@\@Z */ virtual bool canSee(class Actor const &) const; /** - * @vftbl 85 - * @symbol ?canSee\@Actor\@\@UEBA_NAEBVVec3\@\@\@Z + * @vftbl 84 + * @symbol ?canSee\@Actor\@\@UEBA_NAEBVVec3\@\@\@Z */ virtual bool canSee(class Vec3 const &) const; /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 87 - * @symbol ?isSkyLit\@Actor\@\@UEAA_NM\@Z + * @vftbl 86 + * @symbol ?isSkyLit\@Actor\@\@UEAA_NM\@Z */ virtual bool isSkyLit(float); /** - * @vftbl 88 - * @symbol ?getBrightness\@Actor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?getBrightness\@Actor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 90 - * @symbol ?playerTouch\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 89 + * @symbol ?playerTouch\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 91 - * @symbol ?onAboveBubbleColumn\@Actor\@\@UEAAX_N\@Z + * @vftbl 90 + * @symbol ?onAboveBubbleColumn\@Actor\@\@UEAAX_N\@Z */ virtual void onAboveBubbleColumn(bool); /** - * @vftbl 92 - * @symbol ?onInsideBubbleColumn\@Actor\@\@UEAAX_N\@Z + * @vftbl 91 + * @symbol ?onInsideBubbleColumn\@Actor\@\@UEAAX_N\@Z */ virtual void onInsideBubbleColumn(bool); /** - * @vftbl 93 - * @symbol ?isImmobile\@Actor\@\@UEBA_NXZ + * @vftbl 92 + * @symbol ?isImmobile\@Actor\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 94 - * @symbol ?isSilent\@Actor\@\@UEBA_NXZ + * @vftbl 93 + * @symbol ?isSilent\@Actor\@\@UEBA_NXZ */ virtual bool isSilent() const; /** - * @vftbl 95 - * @symbol ?isSilentObserver\@Actor\@\@UEBA_NXZ + * @vftbl 94 + * @symbol ?isSilentObserver\@Actor\@\@UEBA_NXZ */ virtual bool isSilentObserver() const; /** - * @vftbl 96 - * @symbol ?isPickable\@Actor\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Actor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 98 - * @symbol ?isSleeping\@Actor\@\@UEBA_NXZ + * @vftbl 97 + * @symbol ?isSleeping\@Actor\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 99 - * @symbol ?setSleeping\@Actor\@\@UEAAX_N\@Z + * @vftbl 98 + * @symbol ?setSleeping\@Actor\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 101 - * @symbol ?setSneaking\@Actor\@\@UEAAX_N\@Z + * @vftbl 100 + * @symbol ?setSneaking\@Actor\@\@UEAAX_N\@Z */ virtual void setSneaking(bool); /** - * @vftbl 102 - * @symbol ?isBlocking\@Actor\@\@UEBA_NXZ + * @vftbl 101 + * @symbol ?isBlocking\@Actor\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 103 - * @symbol ?isDamageBlocked\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 102 + * @symbol ?isDamageBlocked\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isDamageBlocked(class ActorDamageSource const &) const; /** - * @vftbl 104 - * @symbol ?isAlive\@Actor\@\@UEBA_NXZ + * @vftbl 103 + * @symbol ?isAlive\@Actor\@\@UEBA_NXZ */ virtual bool isAlive() const; /** - * @vftbl 105 - * @symbol ?isOnFire\@Actor\@\@UEBA_NXZ + * @vftbl 104 + * @symbol ?isOnFire\@Actor\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 106 - * @symbol ?isOnHotBlock\@Actor\@\@UEBA_NXZ + * @vftbl 105 + * @symbol ?isOnHotBlock\@Actor\@\@UEBA_NXZ */ virtual bool isOnHotBlock() const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol ?isSurfaceMob\@Actor\@\@UEBA_NXZ + * @vftbl 107 + * @symbol ?isSurfaceMob\@Actor\@\@UEBA_NXZ */ virtual bool isSurfaceMob() const; /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 111 - * @symbol ?isRemotePlayer\@Actor\@\@UEBA_NXZ + * @vftbl 110 + * @symbol ?isRemotePlayer\@Actor\@\@UEBA_NXZ */ virtual bool isRemotePlayer() const; /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 113 - * @symbol ?isAffectedByWaterBottle\@Actor\@\@UEBA_NXZ + * @vftbl 112 + * @symbol ?isAffectedByWaterBottle\@Actor\@\@UEBA_NXZ */ virtual bool isAffectedByWaterBottle() const; /** - * @vftbl 114 - * @symbol ?canAttack\@Actor\@\@UEBA_NPEAV1\@_N\@Z + * @vftbl 113 + * @symbol ?canAttack\@Actor\@\@UEBA_NPEAV1\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 115 - * @symbol ?setTarget\@Actor\@\@UEAAXPEAV1\@\@Z + * @vftbl 114 + * @symbol ?setTarget\@Actor\@\@UEAAXPEAV1\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 116 - * @symbol ?isValidTarget\@Actor\@\@UEBA_NPEAV1\@\@Z + * @vftbl 115 + * @symbol ?isValidTarget\@Actor\@\@UEBA_NPEAV1\@\@Z */ virtual bool isValidTarget(class Actor *) const; /** - * @vftbl 117 - * @symbol ?attack\@Actor\@\@UEAA_NAEAV1\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 116 + * @symbol ?attack\@Actor\@\@UEAA_NAEAV1\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 118 - * @symbol ?performRangedAttack\@Actor\@\@UEAAXAEAV1\@M\@Z + * @vftbl 117 + * @symbol ?performRangedAttack\@Actor\@\@UEAAXAEAV1\@M\@Z */ virtual void performRangedAttack(class Actor &, float); /** - * @vftbl 119 - * @symbol ?getEquipmentCount\@Actor\@\@UEBAHXZ + * @vftbl 118 + * @symbol ?getEquipmentCount\@Actor\@\@UEBAHXZ */ virtual int getEquipmentCount() const; /** - * @vftbl 120 - * @symbol ?setOwner\@Actor\@\@UEAAXUActorUniqueID\@\@\@Z + * @vftbl 119 + * @symbol ?setOwner\@Actor\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 121 - * @symbol ?setSitting\@Actor\@\@UEAAX_N\@Z + * @vftbl 120 + * @symbol ?setSitting\@Actor\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 122 - * @symbol ?onTame\@Actor\@\@UEAAXXZ + * @vftbl 121 + * @symbol ?onTame\@Actor\@\@UEAAXXZ */ virtual void onTame(); /** - * @vftbl 123 - * @symbol ?onFailedTame\@Actor\@\@UEAAXXZ + * @vftbl 122 + * @symbol ?onFailedTame\@Actor\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 124 - * @symbol ?getInventorySize\@Actor\@\@UEBAHXZ + * @vftbl 123 + * @symbol ?getInventorySize\@Actor\@\@UEBAHXZ */ virtual int getInventorySize() const; /** - * @vftbl 125 - * @symbol ?getEquipSlots\@Actor\@\@UEBAHXZ + * @vftbl 124 + * @symbol ?getEquipSlots\@Actor\@\@UEBAHXZ */ virtual int getEquipSlots() const; /** - * @vftbl 126 - * @symbol ?getChestSlots\@Actor\@\@UEBAHXZ + * @vftbl 125 + * @symbol ?getChestSlots\@Actor\@\@UEBAHXZ */ virtual int getChestSlots() const; /** - * @vftbl 127 - * @symbol ?setStanding\@Actor\@\@UEAAX_N\@Z + * @vftbl 126 + * @symbol ?setStanding\@Actor\@\@UEAAX_N\@Z */ virtual void setStanding(bool); /** - * @vftbl 128 - * @symbol ?canPowerJump\@Actor\@\@UEBA_NXZ + * @vftbl 127 + * @symbol ?canPowerJump\@Actor\@\@UEBA_NXZ */ virtual bool canPowerJump() const; /** - * @vftbl 129 - * @symbol ?setCanPowerJump\@Actor\@\@UEAAX_N\@Z + * @vftbl 128 + * @symbol ?setCanPowerJump\@Actor\@\@UEAAX_N\@Z */ virtual void setCanPowerJump(bool); /** - * @vftbl 130 - * @symbol ?isEnchanted\@Actor\@\@UEBA_NXZ + * @vftbl 129 + * @symbol ?isEnchanted\@Actor\@\@UEBA_NXZ */ virtual bool isEnchanted() const; /** - * @vftbl 131 - * @symbol ?vehicleLanded\@Actor\@\@UEAAXAEBVVec3\@\@0\@Z + * @vftbl 130 + * @symbol ?vehicleLanded\@Actor\@\@UEAAXAEBVVec3\@\@0\@Z */ virtual void vehicleLanded(class Vec3 const &, class Vec3 const &); /** - * @vftbl 132 - * @symbol ?shouldRender\@Actor\@\@UEBA_NXZ + * @vftbl 131 + * @symbol ?shouldRender\@Actor\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 133 - * @symbol ?playAmbientSound\@Actor\@\@UEAAXXZ + * @vftbl 132 + * @symbol ?playAmbientSound\@Actor\@\@UEAAXXZ */ virtual void playAmbientSound(); /** - * @vftbl 134 - * @symbol ?getAmbientSound\@Actor\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@Actor\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Actor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 136 - * @symbol ?getBlockDamageCause\@Actor\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getBlockDamageCause\@Actor\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z */ virtual enum class ActorDamageCause getBlockDamageCause(class Block const &) const; /** - * @vftbl 137 - * @symbol ?animateHurt\@Actor\@\@UEAAXXZ + * @vftbl 136 + * @symbol ?animateHurt\@Actor\@\@UEAAXXZ */ virtual void animateHurt(); /** - * @vftbl 138 - * @symbol ?doFireHurt\@Actor\@\@UEAA_NH\@Z + * @vftbl 137 + * @symbol ?doFireHurt\@Actor\@\@UEAA_NH\@Z */ virtual bool doFireHurt(int); /** - * @vftbl 139 - * @symbol ?onLightningHit\@Actor\@\@UEAAXXZ + * @vftbl 138 + * @symbol ?onLightningHit\@Actor\@\@UEAAXXZ */ virtual void onLightningHit(); /** - * @vftbl 140 - * @symbol ?onBounceStarted\@Actor\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 139 + * @symbol ?onBounceStarted\@Actor\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 141 - * @symbol ?feed\@Actor\@\@UEAAXH\@Z + * @vftbl 140 + * @symbol ?feed\@Actor\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Actor\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Actor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 143 - * @symbol ?getPickRadius\@Actor\@\@UEAAMXZ + * @vftbl 142 + * @symbol ?getPickRadius\@Actor\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 144 - * @symbol ?getActorRendererId\@Actor\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 143 + * @symbol ?getActorRendererId\@Actor\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getActorRendererId() const; /** - * @vftbl 145 - * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HH\@Z + * @vftbl 144 + * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HH\@Z */ virtual class ItemActor * spawnAtLocation(int, int); /** - * @vftbl 146 - * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HHM\@Z + * @vftbl 145 + * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@HHM\@Z */ virtual class ItemActor * spawnAtLocation(int, int, float); /** - * @vftbl 147 - * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@AEBVItemStack\@\@M\@Z + * @vftbl 146 + * @symbol ?spawnAtLocation\@Actor\@\@UEAAPEAVItemActor\@\@AEBVItemStack\@\@M\@Z */ virtual class ItemActor * spawnAtLocation(class ItemStack const &, float); /** - * @vftbl 148 - * @symbol ?despawn\@Actor\@\@UEAAXXZ + * @vftbl 147 + * @symbol ?despawn\@Actor\@\@UEAAXXZ */ virtual void despawn(); /** - * @vftbl 149 - * @symbol ?killed\@Actor\@\@UEAAXAEAV1\@\@Z + * @vftbl 148 + * @symbol ?killed\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void killed(class Actor &); /** - * @vftbl 150 - * @symbol ?awardKillScore\@Actor\@\@UEAAXAEAV1\@H\@Z + * @vftbl 149 + * @symbol ?awardKillScore\@Actor\@\@UEAAXAEAV1\@H\@Z */ virtual void awardKillScore(class Actor &, int); /** - * @vftbl 151 - * @symbol ?setArmor\@Actor\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 150 + * @symbol ?setArmor\@Actor\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 152 - * @symbol ?getArmor\@Actor\@\@UEBAAEBVItemStack\@\@W4ArmorSlot\@\@\@Z + * @vftbl 151 + * @symbol ?getArmor\@Actor\@\@UEBAAEBVItemStack\@\@W4ArmorSlot\@\@\@Z */ virtual class ItemStack const & getArmor(enum class ArmorSlot) const; /** - * @vftbl 153 - * @symbol ?getAllArmor\@Actor\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 152 + * @symbol ?getAllArmor\@Actor\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllArmor() const; /** - * @vftbl 154 - * @symbol ?getArmorMaterialTypeInSlot\@Actor\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z + * @vftbl 153 + * @symbol ?getArmorMaterialTypeInSlot\@Actor\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorMaterialType getArmorMaterialTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 155 - * @symbol ?getArmorMaterialTextureTypeInSlot\@Actor\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z + * @vftbl 154 + * @symbol ?getArmorMaterialTextureTypeInSlot\@Actor\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorTextureType getArmorMaterialTextureTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 156 - * @symbol ?getArmorColorInSlot\@Actor\@\@UEBAMW4ArmorSlot\@\@H\@Z + * @vftbl 155 + * @symbol ?getArmorColorInSlot\@Actor\@\@UEBAMW4ArmorSlot\@\@H\@Z */ virtual float getArmorColorInSlot(enum class ArmorSlot, int) const; /** - * @vftbl 157 - * @symbol ?getEquippedSlot\@Actor\@\@UEBAAEBVItemStack\@\@W4EquipmentSlot\@\@\@Z + * @vftbl 156 + * @symbol ?getEquippedSlot\@Actor\@\@UEBAAEBVItemStack\@\@W4EquipmentSlot\@\@\@Z */ virtual class ItemStack const & getEquippedSlot(enum class EquipmentSlot) const; /** - * @vftbl 158 - * @symbol ?setEquippedSlot\@Actor\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 157 + * @symbol ?setEquippedSlot\@Actor\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setEquippedSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 159 - * @symbol ?setCarriedItem\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 158 + * @symbol ?setCarriedItem\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 160 - * @symbol ?getCarriedItem\@Actor\@\@UEBAAEBVItemStack\@\@XZ + * @vftbl 159 + * @symbol ?getCarriedItem\@Actor\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getCarriedItem() const; /** - * @vftbl 161 - * @symbol ?setOffhandSlot\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 160 + * @symbol ?setOffhandSlot\@Actor\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 162 - * @symbol ?getEquippedTotem\@Actor\@\@UEBAAEBVItemStack\@\@XZ + * @vftbl 161 + * @symbol ?getEquippedTotem\@Actor\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getEquippedTotem() const; /** - * @vftbl 163 - * @symbol ?consumeTotem\@Actor\@\@UEAA_NXZ + * @vftbl 162 + * @symbol ?consumeTotem\@Actor\@\@UEAA_NXZ */ virtual bool consumeTotem(); /** - * @vftbl 164 - * @symbol ?save\@Actor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 163 + * @symbol ?save\@Actor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 165 - * @symbol ?saveWithoutId\@Actor\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 164 + * @symbol ?saveWithoutId\@Actor\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void saveWithoutId(class CompoundTag &) const; /** - * @vftbl 166 - * @symbol ?load\@Actor\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 165 + * @symbol ?load\@Actor\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 167 - * @symbol ?loadLinks\@Actor\@\@UEAAXAEBVCompoundTag\@\@AEAV?$vector\@UActorLink\@\@V?$allocator\@UActorLink\@\@\@std\@\@\@std\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 166 + * @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 168 - * @symbol ?getEntityTypeId\@Actor\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 167 + * @symbol ?getEntityTypeId\@Actor\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 169 - * @symbol ?queryEntityRenderer\@Actor\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 168 + * @symbol ?queryEntityRenderer\@Actor\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & queryEntityRenderer() const; /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 171 - * @symbol ?thawFreezeEffect\@Actor\@\@UEAAXXZ + * @vftbl 170 + * @symbol ?thawFreezeEffect\@Actor\@\@UEAAXXZ */ virtual void thawFreezeEffect(); /** - * @vftbl 172 - * @symbol ?canFreeze\@Actor\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@Actor\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 173 - * @symbol ?isWearingLeatherArmor\@Actor\@\@UEBA?B_NXZ + * @vftbl 172 + * @symbol ?isWearingLeatherArmor\@Actor\@\@UEBA?B_NXZ */ virtual bool const isWearingLeatherArmor() const; /** - * @vftbl 174 - * @symbol ?getLiquidAABB\@Actor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z + * @vftbl 173 + * @symbol ?getLiquidAABB\@Actor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z */ virtual class AABB getLiquidAABB(enum class MaterialType) const; /** - * @vftbl 175 - * @symbol ?handleInsidePortal\@Actor\@\@UEAAXAEBVBlockPos\@\@\@Z + * @vftbl 174 + * @symbol ?handleInsidePortal\@Actor\@\@UEAAXAEBVBlockPos\@\@\@Z */ virtual void handleInsidePortal(class BlockPos const &); /** - * @vftbl 176 - * @symbol ?getPortalCooldown\@Actor\@\@UEBAHXZ + * @vftbl 175 + * @symbol ?getPortalCooldown\@Actor\@\@UEBAHXZ */ virtual int getPortalCooldown() const; /** - * @vftbl 177 - * @symbol ?getPortalWaitTime\@Actor\@\@UEBAHXZ + * @vftbl 176 + * @symbol ?getPortalWaitTime\@Actor\@\@UEBAHXZ */ virtual int getPortalWaitTime() const; /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@Actor\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@Actor\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 180 - * @symbol ?changeDimension\@Actor\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @vftbl 179 + * @symbol ?changeDimension\@Actor\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimension(class AutomaticID); /** - * @vftbl 181 - * @symbol ?getControllingPlayer\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 180 + * @symbol ?getControllingPlayer\@Actor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 182 - * @symbol ?checkFallDamage\@Actor\@\@UEAAXM_N\@Z + * @vftbl 181 + * @symbol ?checkFallDamage\@Actor\@\@UEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 183 - * @symbol ?causeFallDamage\@Actor\@\@UEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@Actor\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 184 - * @symbol ?handleFallDistanceOnServer\@Actor\@\@UEAAXMM_N\@Z + * @vftbl 183 + * @symbol ?handleFallDistanceOnServer\@Actor\@\@UEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 185 - * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@_N\@Z + * @vftbl 184 + * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@_N\@Z */ virtual void playSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &, bool); /** - * @vftbl 186 - * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H_N\@Z + * @vftbl 185 + * @symbol ?playSynchronizedSound\@Actor\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H_N\@Z */ virtual void playSynchronizedSound(enum class LevelSoundEvent, class Vec3 const &, int, bool); /** - * @vftbl 187 - * @symbol ?onSynchedFlagUpdate\@Actor\@\@UEAAXH_J0\@Z + * @vftbl 186 + * @symbol ?onSynchedFlagUpdate\@Actor\@\@UEAAXH_J0\@Z */ virtual void onSynchedFlagUpdate(int, __int64, __int64); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Actor\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Actor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 189 - * @symbol ?canAddPassenger\@Actor\@\@UEBA_NAEAV1\@\@Z + * @vftbl 188 + * @symbol ?canAddPassenger\@Actor\@\@UEBA_NAEAV1\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 190 - * @symbol ?canPickupItem\@Actor\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 189 + * @symbol ?canPickupItem\@Actor\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canPickupItem(class ItemStack const &) const; /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Actor\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Actor\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 192 - * @symbol ?inCaravan\@Actor\@\@UEBA_NXZ + * @vftbl 191 + * @symbol ?inCaravan\@Actor\@\@UEBA_NXZ */ virtual bool inCaravan() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 194 - * @symbol ?tickLeash\@Actor\@\@UEAAXXZ + * @vftbl 193 + * @symbol ?tickLeash\@Actor\@\@UEAAXXZ */ virtual void tickLeash(); /** - * @vftbl 195 - * @symbol ?sendMotionPacketIfNeeded\@Actor\@\@UEAAXXZ + * @vftbl 194 + * @symbol ?sendMotionPacketIfNeeded\@Actor\@\@UEAAXXZ */ virtual void sendMotionPacketIfNeeded(); /** - * @vftbl 196 - * @symbol ?canSynchronizeNewEntity\@Actor\@\@UEBA_NXZ + * @vftbl 195 + * @symbol ?canSynchronizeNewEntity\@Actor\@\@UEBA_NXZ */ virtual bool canSynchronizeNewEntity() const; /** - * @vftbl 197 - * @symbol ?stopRiding\@Actor\@\@UEAAX_N00\@Z + * @vftbl 196 + * @symbol ?stopRiding\@Actor\@\@UEAAX_N00\@Z */ virtual void stopRiding(bool, bool, bool); /** - * @vftbl 198 - * @symbol ?startSwimming\@Actor\@\@UEAAXXZ + * @vftbl 197 + * @symbol ?startSwimming\@Actor\@\@UEAAXXZ */ virtual void startSwimming(); /** - * @vftbl 199 - * @symbol ?stopSwimming\@Actor\@\@UEAAXXZ + * @vftbl 198 + * @symbol ?stopSwimming\@Actor\@\@UEAAXXZ */ virtual void stopSwimming(); /** - * @vftbl 200 - * @symbol ?buildDebugInfo\@Actor\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 199 + * @symbol ?buildDebugInfo\@Actor\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 201 - * @symbol ?getCommandPermissionLevel\@Actor\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 200 + * @symbol ?getCommandPermissionLevel\@Actor\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @vftbl 202 - * @symbol ?isClientSide\@Actor\@\@UEBA_NXZ + * @vftbl 201 + * @symbol ?isClientSide\@Actor\@\@UEBA_NXZ */ virtual bool isClientSide() const; /** - * @vftbl 203 - * @symbol ?getMutableAttribute\@Actor\@\@UEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z + * @vftbl 202 + * @symbol ?getMutableAttribute\@Actor\@\@UEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ virtual class AttributeInstance * getMutableAttribute(class Attribute const &); /** - * @vftbl 204 - * @symbol ?getAttribute\@Actor\@\@UEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z + * @vftbl 203 + * @symbol ?getAttribute\@Actor\@\@UEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ virtual class AttributeInstance const & getAttribute(class Attribute const &) const; /** - * @vftbl 205 - * @symbol ?getDeathTime\@Actor\@\@UEBAHXZ + * @vftbl 204 + * @symbol ?getDeathTime\@Actor\@\@UEBAHXZ */ virtual int getDeathTime() const; /** - * @vftbl 206 - * @symbol ?heal\@Actor\@\@UEAAXH\@Z + * @vftbl 205 + * @symbol ?heal\@Actor\@\@UEAAXH\@Z */ virtual void heal(int); /** - * @vftbl 207 - * @symbol ?isInvertedHealAndHarm\@Actor\@\@UEBA_NXZ + * @vftbl 206 + * @symbol ?isInvertedHealAndHarm\@Actor\@\@UEBA_NXZ */ virtual bool isInvertedHealAndHarm() const; /** - * @vftbl 208 - * @symbol ?canBeAffected\@Actor\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@Actor\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 209 - * @symbol ?canBeAffectedByArrow\@Actor\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z + * @vftbl 208 + * @symbol ?canBeAffectedByArrow\@Actor\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 210 - * @symbol ?onEffectAdded\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z + * @vftbl 209 + * @symbol ?onEffectAdded\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectAdded(class MobEffectInstance &); /** - * @vftbl 211 - * @symbol ?onEffectUpdated\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z + * @vftbl 210 + * @symbol ?onEffectUpdated\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectUpdated(class MobEffectInstance &); /** - * @vftbl 212 - * @symbol ?onEffectRemoved\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z + * @vftbl 211 + * @symbol ?onEffectRemoved\@Actor\@\@UEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectRemoved(class MobEffectInstance &); /** - * @vftbl 213 - * @symbol ?canObstructSpawningAndBlockPlacement\@Actor\@\@UEBA_NXZ + * @vftbl 212 + * @symbol ?canObstructSpawningAndBlockPlacement\@Actor\@\@UEBA_NXZ */ virtual bool canObstructSpawningAndBlockPlacement() const; /** - * @vftbl 214 - * @symbol ?getAnimationComponent\@Actor\@\@UEAAAEAVAnimationComponent\@\@XZ + * @vftbl 213 + * @symbol ?getAnimationComponent\@Actor\@\@UEAAAEAVAnimationComponent\@\@XZ */ virtual class AnimationComponent & getAnimationComponent(); /** - * @vftbl 215 - * @symbol ?openContainerComponent\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 214 + * @symbol ?openContainerComponent\@Actor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void openContainerComponent(class Player &); /** - * @vftbl 216 - * @symbol ?swing\@Actor\@\@UEAAXXZ + * @vftbl 215 + * @symbol ?swing\@Actor\@\@UEAAXXZ */ virtual void swing(); /** - * @vftbl 217 - * @symbol ?useItem\@Actor\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z + * @vftbl 216 + * @symbol ?useItem\@Actor\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z */ virtual void useItem(class ItemStackBase &, enum class ItemUseMethod, bool); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 220 - * @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 + * @vftbl 219 + * @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 221 - * @symbol ?getMapDecorationRotation\@Actor\@\@UEBAMXZ + * @vftbl 220 + * @symbol ?getMapDecorationRotation\@Actor\@\@UEBAMXZ */ virtual float getMapDecorationRotation() const; /** - * @vftbl 222 - * @symbol ?getPassengerYRotation\@Actor\@\@UEBAMAEBV1\@\@Z + * @vftbl 221 + * @symbol ?getPassengerYRotation\@Actor\@\@UEBAMAEBV1\@\@Z */ virtual float getPassengerYRotation(class Actor const &) const; /** - * @vftbl 223 - * @symbol ?isWorldBuilder\@Actor\@\@UEBA_NXZ + * @vftbl 222 + * @symbol ?isWorldBuilder\@Actor\@\@UEBA_NXZ */ virtual bool isWorldBuilder() const; /** - * @vftbl 224 - * @symbol ?isCreative\@Actor\@\@UEBA_NXZ + * @vftbl 223 + * @symbol ?isCreative\@Actor\@\@UEBA_NXZ */ virtual bool isCreative() const; /** - * @vftbl 225 - * @symbol ?isAdventure\@Actor\@\@UEBA_NXZ + * @vftbl 224 + * @symbol ?isAdventure\@Actor\@\@UEBA_NXZ */ virtual bool isAdventure() const; /** - * @vftbl 226 - * @symbol ?isSurvival\@Actor\@\@UEBA_NXZ + * @vftbl 225 + * @symbol ?isSurvival\@Actor\@\@UEBA_NXZ */ virtual bool isSurvival() const; /** - * @vftbl 227 - * @symbol ?isSpectator\@Actor\@\@UEBA_NXZ + * @vftbl 226 + * @symbol ?isSpectator\@Actor\@\@UEBA_NXZ */ virtual bool isSpectator() const; /** - * @vftbl 228 - * @symbol ?isAttackableGamemode\@Actor\@\@UEBA_NXZ + * @vftbl 227 + * @symbol ?isAttackableGamemode\@Actor\@\@UEBA_NXZ */ virtual bool isAttackableGamemode() const; /** - * @vftbl 229 - * @symbol ?add\@Actor\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 228 + * @symbol ?add\@Actor\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 230 - * @symbol ?drop\@Actor\@\@UEAA_NAEBVItemStack\@\@_N\@Z + * @vftbl 229 + * @symbol ?drop\@Actor\@\@UEAA_NAEBVItemStack\@\@_N\@Z */ virtual bool drop(class ItemStack const &, bool); /** - * @vftbl 231 - * @symbol ?getInteraction\@Actor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z + * @vftbl 230 + * @symbol ?getInteraction\@Actor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 232 - * @symbol ?canDestroyBlock\@Actor\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 231 + * @symbol ?canDestroyBlock\@Actor\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroyBlock(class Block const &) const; /** - * @vftbl 233 - * @symbol ?setAuxValue\@Actor\@\@UEAAXH\@Z + * @vftbl 232 + * @symbol ?setAuxValue\@Actor\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 234 - * @symbol ?setSize\@Actor\@\@UEAAXMM\@Z + * @vftbl 233 + * @symbol ?setSize\@Actor\@\@UEAAXMM\@Z */ virtual void setSize(float, float); /** - * @vftbl 235 - * @symbol ?onOrphan\@Actor\@\@UEAAXXZ + * @vftbl 234 + * @symbol ?onOrphan\@Actor\@\@UEAAXXZ */ virtual void onOrphan(); /** - * @vftbl 236 - * @symbol ?wobble\@Actor\@\@UEAAXXZ + * @vftbl 235 + * @symbol ?wobble\@Actor\@\@UEAAXXZ */ virtual void wobble(); /** - * @vftbl 237 - * @symbol ?wasHurt\@Actor\@\@UEAA_NXZ + * @vftbl 236 + * @symbol ?wasHurt\@Actor\@\@UEAA_NXZ */ virtual bool wasHurt(); /** - * @vftbl 238 - * @symbol ?startSpinAttack\@Actor\@\@UEAAXXZ + * @vftbl 237 + * @symbol ?startSpinAttack\@Actor\@\@UEAAXXZ */ virtual void startSpinAttack(); /** - * @vftbl 239 - * @symbol ?stopSpinAttack\@Actor\@\@UEAAXXZ + * @vftbl 238 + * @symbol ?stopSpinAttack\@Actor\@\@UEAAXXZ */ virtual void stopSpinAttack(); /** - * @vftbl 240 - * @symbol ?setDamageNearbyMobs\@Actor\@\@UEAAX_N\@Z + * @vftbl 239 + * @symbol ?setDamageNearbyMobs\@Actor\@\@UEAAX_N\@Z */ virtual void setDamageNearbyMobs(bool); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 242 - * @symbol ?reloadLootTable\@Actor\@\@UEAAXXZ + * @vftbl 241 + * @symbol ?reloadLootTable\@Actor\@\@UEAAXXZ */ virtual void reloadLootTable(); /** - * @vftbl 243 - * @symbol ?reloadLootTable\@Actor\@\@UEAAXAEBUEquipmentTableDefinition\@\@\@Z + * @vftbl 242 + * @symbol ?reloadLootTable\@Actor\@\@UEAAXAEBUEquipmentTableDefinition\@\@\@Z */ virtual void reloadLootTable(struct EquipmentTableDefinition const &); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 245 - * @symbol ?kill\@Actor\@\@UEAAXXZ + * @vftbl 244 + * @symbol ?kill\@Actor\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 246 - * @symbol ?die\@Actor\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Actor\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 247 - * @symbol ?shouldDropDeathLoot\@Actor\@\@UEBA_NXZ + * @vftbl 246 + * @symbol ?shouldDropDeathLoot\@Actor\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 248 - * @symbol ?shouldTick\@Actor\@\@UEBA_NXZ + * @vftbl 247 + * @symbol ?shouldTick\@Actor\@\@UEBA_NXZ */ virtual bool shouldTick() const; /** - * @vftbl 249 - * @symbol ?applySnapshot\@Actor\@\@UEAAXAEBVEntityContext\@\@0\@Z + * @vftbl 248 + * @symbol ?applySnapshot\@Actor\@\@UEAAXAEBVEntityContext\@\@0\@Z */ virtual void applySnapshot(class EntityContext const &, class EntityContext const &); /** - * @vftbl 250 - * @symbol ?getNextStep\@Actor\@\@UEAAMM\@Z + * @vftbl 249 + * @symbol ?getNextStep\@Actor\@\@UEAAMM\@Z */ virtual float getNextStep(float); /** - * @vftbl 251 - * @symbol ?getLootTable\@Actor\@\@UEAAPEAVLootTable\@\@XZ + * @vftbl 250 + * @symbol ?getLootTable\@Actor\@\@UEAAPEAVLootTable\@\@XZ */ virtual class LootTable * getLootTable(); /** - * @vftbl 252 - * @symbol ?interpolatorTick\@Actor\@\@UEAAXXZ - */ - virtual void interpolatorTick(); - /** - * @vftbl 253 - * @symbol ?onPush\@Actor\@\@UEAAXAEAV1\@\@Z + * @vftbl 251 + * @symbol ?onPush\@Actor\@\@UEAAXAEAV1\@\@Z */ virtual void onPush(class Actor &); /** - * @vftbl 254 - * @symbol ?getLastDeathPos\@Actor\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @vftbl 252 + * @symbol ?getLastDeathPos\@Actor\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getLastDeathPos() const; /** - * @vftbl 255 - * @symbol ?getLastDeathDimension\@Actor\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ + * @vftbl 253 + * @symbol ?getLastDeathDimension\@Actor\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ */ virtual class std::optional> getLastDeathDimension() const; /** - * @vftbl 256 - * @symbol ?hasDiedBefore\@Actor\@\@UEBA_NXZ + * @vftbl 254 + * @symbol ?hasDiedBefore\@Actor\@\@UEBA_NXZ */ virtual bool hasDiedBefore() const; /** - * @vftbl 257 - * @symbol ?doWaterSplashEffect\@Actor\@\@UEAAXXZ + * @vftbl 255 + * @symbol ?doWaterSplashEffect\@Actor\@\@UEAAXXZ */ virtual void doWaterSplashEffect(); /** - * @vftbl 258 - * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Actor\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 256 + * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Actor\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnHandContainerItemSet(enum class HandSlot, class ItemStack const &) const; /** - * @vftbl 259 - * @symbol ?_shouldProvideFeedbackOnArmorSet\@Actor\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 257 + * @symbol ?_shouldProvideFeedbackOnArmorSet\@Actor\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnArmorSet(enum class ArmorSlot, class ItemStack const &) const; /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Actor\@\@MEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Actor\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 261 - * @symbol ?shouldTryMakeStepSound\@Actor\@\@MEAA_NXZ + * @vftbl 259 + * @symbol ?shouldTryMakeStepSound\@Actor\@\@MEAA_NXZ */ virtual bool shouldTryMakeStepSound(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Actor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Actor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 264 - * @symbol ?markHurt\@Actor\@\@MEAAXXZ + * @vftbl 262 + * @symbol ?markHurt\@Actor\@\@MEAAXXZ */ virtual void markHurt(); /** - * @vftbl 265 - * @symbol ?_getAnimationComponent\@Actor\@\@MEAAAEAVAnimationComponent\@\@AEAV?$shared_ptr\@VAnimationComponent\@\@\@std\@\@W4AnimationComponentGroupType\@\@\@Z + * @vftbl 263 + * @symbol ?_getAnimationComponent\@Actor\@\@MEAAAEAVAnimationComponent\@\@AEAV?$shared_ptr\@VAnimationComponent\@\@\@std\@\@W4AnimationComponentGroupType\@\@\@Z */ virtual class AnimationComponent & _getAnimationComponent(class std::shared_ptr &, enum class AnimationComponentGroupType); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Actor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Actor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Actor\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Actor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol ?_playStepSound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 269 - * @symbol ?_playFlySound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 267 + * @symbol ?_playFlySound\@Actor\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playFlySound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 271 - * @symbol ?checkInsideBlocks\@Actor\@\@MEAAXM\@Z + * @vftbl 269 + * @symbol ?checkInsideBlocks\@Actor\@\@MEAAXM\@Z */ virtual void checkInsideBlocks(float); /** - * @vftbl 272 - * @symbol ?pushOutOfBlocks\@Actor\@\@MEAAXAEBVVec3\@\@\@Z + * @vftbl 270 + * @symbol ?pushOutOfBlocks\@Actor\@\@MEAAXAEBVVec3\@\@\@Z */ virtual void pushOutOfBlocks(class Vec3 const &); /** - * @vftbl 273 - * @symbol ?spawnTrailBubbles\@Actor\@\@MEAAXXZ + * @vftbl 271 + * @symbol ?spawnTrailBubbles\@Actor\@\@MEAAXXZ */ virtual void spawnTrailBubbles(); /** - * @vftbl 274 - * @symbol ?updateInsideBlock\@Actor\@\@MEAAXXZ + * @vftbl 272 + * @symbol ?updateInsideBlock\@Actor\@\@MEAAXXZ */ virtual void updateInsideBlock(); /** - * @vftbl 275 - * @symbol ?_removePassenger\@Actor\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z + * @vftbl 273 + * @symbol ?_removePassenger\@Actor\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z */ virtual void _removePassenger(struct ActorUniqueID const &, bool, bool, bool); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Actor\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Actor\@\@EEAAXXZ */ virtual void _onSizeUpdated(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTOR /** - * @symbol ?_doAutoAttackOnTouch\@Actor\@\@EEAAXAEAV1\@\@Z + * @symbol ?_doAutoAttackOnTouch\@Actor\@\@EEAAXAEAV1\@\@Z */ MCVAPI void _doAutoAttackOnTouch(class Actor &); /** - * @symbol ?_makeFlySound\@Actor\@\@MEBA_NXZ + * @symbol ?_makeFlySound\@Actor\@\@MEBA_NXZ */ MCVAPI bool _makeFlySound() const; /** - * @symbol ?breaksFallingBlocks\@Actor\@\@UEBA_NXZ + * @symbol ?breaksFallingBlocks\@Actor\@\@UEBA_NXZ */ MCVAPI bool breaksFallingBlocks() const; /** - * @symbol ?canExistInPeaceful\@Actor\@\@UEBA_NXZ + * @symbol ?canExistInPeaceful\@Actor\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; /** - * @symbol ?canInteractWithOtherEntitiesInGame\@Actor\@\@UEBA_NXZ + * @symbol ?canInteractWithOtherEntitiesInGame\@Actor\@\@UEBA_NXZ */ MCVAPI bool canInteractWithOtherEntitiesInGame() const; /** - * @symbol ?canMakeStepSound\@Actor\@\@MEBA_NXZ + * @symbol ?canMakeStepSound\@Actor\@\@MEBA_NXZ */ MCVAPI bool canMakeStepSound() const; /** - * @symbol ?canSeeInvisible\@Actor\@\@UEBA_NXZ + * @symbol ?canSeeInvisible\@Actor\@\@UEBA_NXZ */ MCVAPI bool canSeeInvisible() const; /** - * @symbol ?changeDimension\@Actor\@\@UEAAXAEBVChangeDimensionPacket\@\@\@Z + * @symbol ?changeDimension\@Actor\@\@UEAAXAEBVChangeDimensionPacket\@\@\@Z */ MCVAPI void changeDimension(class ChangeDimensionPacket const &); /** - * @symbol ?getAlwaysShowNameTag\@Actor\@\@UEBA_NXZ + * @symbol ?getAlwaysShowNameTag\@Actor\@\@UEBA_NXZ */ MCVAPI bool getAlwaysShowNameTag() const; /** - * @symbol ?getDeletionDelayTimeSeconds\@Actor\@\@UEBAMXZ + * @symbol ?getDeletionDelayTimeSeconds\@Actor\@\@UEBAMXZ */ MCVAPI float getDeletionDelayTimeSeconds() const; /** - * @symbol ?getOutputSignal\@Actor\@\@UEBAHXZ + * @symbol ?getOutputSignal\@Actor\@\@UEBAHXZ */ MCVAPI int getOutputSignal() const; /** - * @symbol ?hasOutputSignal\@Actor\@\@UEBA_NE\@Z + * @symbol ?hasOutputSignal\@Actor\@\@UEBA_NE\@Z */ MCVAPI bool hasOutputSignal(unsigned char) const; /** - * @symbol ?interactPreventDefault\@Actor\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@Actor\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); /** - * @symbol ?isCreativeModeAllowed\@Actor\@\@UEAA_NXZ + * @symbol ?isCreativeModeAllowed\@Actor\@\@UEAA_NXZ */ MCVAPI bool isCreativeModeAllowed(); /** - * @symbol ?isFishable\@Actor\@\@UEBA_NXZ + * @symbol ?isFishable\@Actor\@\@UEBA_NXZ */ MCVAPI bool isFishable() const; /** - * @symbol ?isLeashableType\@Actor\@\@UEAA_NXZ + * @symbol ?isLeashableType\@Actor\@\@UEAA_NXZ */ MCVAPI bool isLeashableType(); /** - * @symbol ?isLocalPlayer\@Actor\@\@UEBA_NXZ + * @symbol ?isLocalPlayer\@Actor\@\@UEBA_NXZ */ MCVAPI bool isLocalPlayer() const; /** - * @symbol ?isPlayer\@Actor\@\@UEBA_NXZ + * @symbol ?isPlayer\@Actor\@\@UEBA_NXZ */ MCVAPI bool isPlayer() const; /** - * @symbol ?isShootable\@Actor\@\@UEAA_NXZ + * @symbol ?isShootable\@Actor\@\@UEAA_NXZ */ MCVAPI bool isShootable(); /** - * @symbol ?isTargetable\@Actor\@\@UEBA_NXZ + * @symbol ?isTargetable\@Actor\@\@UEBA_NXZ */ MCVAPI bool isTargetable() const; /** - * @symbol ?renderDebugServerState\@Actor\@\@UEAAXAEBVOptions\@\@\@Z + * @symbol ?renderDebugServerState\@Actor\@\@UEAAXAEBVOptions\@\@\@Z */ MCVAPI void renderDebugServerState(class Options const &); -#endif /** - * @symbol ??0Actor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI Actor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + MCVAPI ~Actor(); +#endif /** - * @symbol ??0Actor\@\@QEAA\@AEAVILevel\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Actor\@\@QEAA\@AEAVILevel\@\@AEAVEntityContext\@\@\@Z */ MCAPI Actor(class ILevel &, class EntityContext &); /** - * @symbol ?_sendDirtyActorData\@Actor\@\@QEAAXXZ + * @symbol ??0Actor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + */ + MCAPI Actor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + /** + * @symbol ?_sendDirtyActorData\@Actor\@\@QEAAXXZ */ MCAPI void _sendDirtyActorData(); /** - * @symbol ?_setActorTypeId\@Actor\@\@QEAAXW4ActorType\@\@\@Z + * @symbol ?_setActorTypeId\@Actor\@\@QEAAXW4ActorType\@\@\@Z */ MCAPI void _setActorTypeId(enum class ActorType); /** - * @symbol ?_setLevelPtr\@Actor\@\@QEAAXPEAVLevel\@\@\@Z + * @symbol ?_setLevelPtr\@Actor\@\@QEAAXPEAVLevel\@\@\@Z */ MCAPI void _setLevelPtr(class Level *); /** - * @symbol ?addCategory\@Actor\@\@QEAAXAEBW4ActorCategory\@\@\@Z + * @symbol ?addCategory\@Actor\@\@QEAAXAEBW4ActorCategory\@\@\@Z */ MCAPI void addCategory(enum class ActorCategory const &); /** - * @symbol ?addDefinitionGroup\@Actor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addDefinitionGroup\@Actor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addDefinitionGroup(std::string const &); /** - * @symbol ?addEffect\@Actor\@\@QEAAXAEBVMobEffectInstance\@\@\@Z + * @symbol ?addEffect\@Actor\@\@QEAAXAEBVMobEffectInstance\@\@\@Z */ MCAPI void addEffect(class MobEffectInstance const &); /** - * @symbol ?addTag\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addTag\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool addTag(std::string const &); /** - * @symbol ?buildDebugGroupInfo\@Actor\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?applyImpulse\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + */ + MCAPI void applyImpulse(class Vec3 const &); + /** + * @symbol ?buildDebugGroupInfo\@Actor\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void buildDebugGroupInfo(std::string &) const; /** - * @symbol ?buildForward\@Actor\@\@QEBA?AVVec3\@\@XZ + * @symbol ?buildForward\@Actor\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 buildForward() const; /** - * @symbol ?burn\@Actor\@\@QEAAXH_N\@Z + * @symbol ?burn\@Actor\@\@QEAAXH_N\@Z */ MCAPI void burn(int, bool); /** - * @symbol ?cacheComponentData\@Actor\@\@QEAAXXZ + * @symbol ?cacheComponentData\@Actor\@\@QEAAXXZ */ MCAPI void cacheComponentData(); /** - * @symbol ?calcCenterPos\@Actor\@\@QEBA?AVVec3\@\@XZ + * @symbol ?calcCenterPos\@Actor\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 calcCenterPos() const; /** - * @symbol ?calculateAttackDamage\@Actor\@\@QEAAMAEAV1\@\@Z + * @symbol ?calculateAttackDamage\@Actor\@\@QEAAMAEAV1\@\@Z */ MCAPI float calculateAttackDamage(class Actor &); /** - * @symbol ?canAscendCurrentBlockByJumping\@Actor\@\@QEBA_NXZ + * @symbol ?canAscendCurrentBlockByJumping\@Actor\@\@QEBA_NXZ */ MCAPI bool canAscendCurrentBlockByJumping() const; /** - * @symbol ?canBeginOrContinueClimbingLadder\@Actor\@\@QEBA_NXZ + * @symbol ?canBeginOrContinueClimbingLadder\@Actor\@\@QEBA_NXZ */ MCAPI bool canBeginOrContinueClimbingLadder() const; /** - * @symbol ?canCurrentlySwim\@Actor\@\@QEBA_NXZ + * @symbol ?canCurrentlySwim\@Actor\@\@QEBA_NXZ */ MCAPI bool canCurrentlySwim() const; /** - * @symbol ?canDescendBlockBelowByCrouching\@Actor\@\@QEBA_NXZ + * @symbol ?canDescendBlockBelowByCrouching\@Actor\@\@QEBA_NXZ */ MCAPI bool canDescendBlockBelowByCrouching() const; /** - * @symbol ?canFly\@Actor\@\@QEBA_NXZ + * @symbol ?canFly\@Actor\@\@QEBA_NXZ */ MCAPI bool canFly() const; /** - * @symbol ?canMate\@Actor\@\@QEBA_NAEBV1\@\@Z + * @symbol ?canMate\@Actor\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool canMate(class Actor const &) const; /** - * @symbol ?canReceiveMobEffectsFromGameplay\@Actor\@\@QEBA_NXZ + * @symbol ?canReceiveMobEffectsFromGameplay\@Actor\@\@QEBA_NXZ */ MCAPI bool canReceiveMobEffectsFromGameplay() const; /** - * @symbol ?canSeeDaylight\@Actor\@\@QEBA_NXZ + * @symbol ?canSeeDaylight\@Actor\@\@QEBA_NXZ */ MCAPI bool canSeeDaylight() const; /** - * @symbol ?celebrateHunt\@Actor\@\@QEAAXH_N\@Z + * @symbol ?celebrateHunt\@Actor\@\@QEAAXH_N\@Z */ MCAPI void celebrateHunt(int, bool); /** - * @symbol ?checkInsideCauldron\@Actor\@\@QEAAXXZ + * @symbol ?checkInsideCauldron\@Actor\@\@QEAAXXZ */ MCAPI void checkInsideCauldron(); /** - * @symbol ?clearFishingHookID\@Actor\@\@QEAAXXZ + * @symbol ?clearFishingHookID\@Actor\@\@QEAAXXZ */ MCAPI void clearFishingHookID(); /** - * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@MM\@Z + * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@M\@Z */ - MCAPI bool closerThan(class Actor const &, float, float) const; + MCAPI bool closerThan(class Actor const &, float) const; /** - * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@M\@Z + * @symbol ?closerThan\@Actor\@\@QEBA_NAEBV1\@MM\@Z */ - MCAPI bool closerThan(class Actor const &, float) const; + MCAPI bool closerThan(class Actor const &, float, float) const; /** - * @symbol ?consumeItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z + * @symbol ?consumeItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z */ MCAPI void consumeItem(class ItemActor &, int); /** - * @symbol ?createUpdateEquipPacket\@Actor\@\@QEAA?AVUpdateEquipPacket\@\@H\@Z + * @symbol ?createUpdateEquipPacket\@Actor\@\@QEAA?AVUpdateEquipPacket\@\@H\@Z */ MCAPI class UpdateEquipPacket createUpdateEquipPacket(int); /** - * @symbol ?createUpdateTradePacket\@Actor\@\@QEAA?AVUpdateTradePacket\@\@H\@Z + * @symbol ?createUpdateTradePacket\@Actor\@\@QEAA?AVUpdateTradePacket\@\@H\@Z */ MCAPI class UpdateTradePacket createUpdateTradePacket(int); /** - * @symbol ?damageSensorComponentHurt\@Actor\@\@QEAA_NAEAMAEBVActorDamageSource\@\@_N\@Z + * @symbol ?damageSensorComponentHurt\@Actor\@\@QEAA_NAEAMAEBVActorDamageSource\@\@_N\@Z */ MCAPI bool damageSensorComponentHurt(float &, class ActorDamageSource const &, bool); /** - * @symbol ?deregisterTagsFromLevelCache\@Actor\@\@QEAAXXZ + * @symbol ?deregisterTagsFromLevelCache\@Actor\@\@QEAAXXZ */ MCAPI void deregisterTagsFromLevelCache(); /** - * @symbol ?distanceSqrToBlockPosCenter\@Actor\@\@QEBAMAEBVBlockPos\@\@\@Z + * @symbol ?distanceSqrToBlockPosCenter\@Actor\@\@QEBAMAEBVBlockPos\@\@\@Z */ MCAPI float distanceSqrToBlockPosCenter(class BlockPos const &) const; /** - * @symbol ?distanceTo\@Actor\@\@QEBAMAEBV1\@\@Z + * @symbol ?distanceTo\@Actor\@\@QEBAMAEBVVec3\@\@\@Z */ - MCAPI float distanceTo(class Actor const &) const; + MCAPI float distanceTo(class Vec3 const &) const; /** - * @symbol ?distanceTo\@Actor\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?distanceTo\@Actor\@\@QEBAMAEBV1\@\@Z */ - MCAPI float distanceTo(class Vec3 const &) const; + MCAPI float distanceTo(class Actor const &) const; /** - * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float distanceToSqr(class Vec3 const &) const; /** - * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBV1\@\@Z + * @symbol ?distanceToSqr\@Actor\@\@QEBAMAEBV1\@\@Z */ MCAPI float distanceToSqr(class Actor const &) const; /** - * @symbol ?dropLeash\@Actor\@\@QEAAX_N0\@Z + * @symbol ?dropLeash\@Actor\@\@QEAAX_N0\@Z */ MCAPI void dropLeash(bool, bool); /** - * @symbol ?dropTowards\@Actor\@\@QEAAXAEBVItemStack\@\@VVec3\@\@\@Z + * @symbol ?dropTowards\@Actor\@\@QEAAXAEBVItemStack\@\@VVec3\@\@\@Z */ MCAPI void dropTowards(class ItemStack const &, class Vec3); /** - * @symbol ?evaluateSeatRotation\@Actor\@\@QEAAMAEBVRideableComponent\@\@\@Z + * @symbol ?evaluateSeatRotation\@Actor\@\@QEAAMAEBVRideableComponent\@\@\@Z */ MCAPI float evaluateSeatRotation(class RideableComponent const &); /** - * @symbol ?executeEvent\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?executeEvent\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVariantParameterList\@\@\@Z */ 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\@\@QEAAXAEBV1\@P6A?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@VehicleUtils\@\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z\@Z */ MCAPI void exitVehicle(class Actor const &, class std::optional ( *)(struct VehicleUtils::VehicleDirections const &, class std::function)); /** - * @symbol ?fetchFishingHook\@Actor\@\@QEAAPEAVFishingHook\@\@XZ + * @symbol ?fetchFishingHook\@Actor\@\@QEAAPEAVFishingHook\@\@XZ */ MCAPI class FishingHook * fetchFishingHook(); /** - * @symbol ?fetchNearbyActorsSorted\@Actor\@\@QEAA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@AEBVVec3\@\@W4ActorType\@\@\@Z + * @symbol ?fetchNearbyActorsSorted\@Actor\@\@QEAA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@AEBVVec3\@\@W4ActorType\@\@\@Z */ MCAPI std::vector fetchNearbyActorsSorted(class Vec3 const &, enum class ActorType); /** - * @symbol ?forEachLeashedActor\@Actor\@\@QEAAXV?$function\@$$A6AXV?$not_null\@PEAVActor\@\@\@gsl\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachLeashedActor\@Actor\@\@QEAAXV?$function\@$$A6AXV?$not_null\@PEAVActor\@\@\@gsl\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachLeashedActor(class std::function)>); /** - * @symbol ?getAABB\@Actor\@\@QEBAAEBVAABB\@\@XZ + * @symbol ?getAABB\@Actor\@\@QEBAAEBVAABB\@\@XZ */ MCAPI class AABB const & getAABB() const; /** - * @symbol ?getAABBDim\@Actor\@\@QEBAAEBVVec2\@\@XZ + * @symbol ?getAABBDim\@Actor\@\@QEBAAEBVVec2\@\@XZ */ MCAPI class Vec2 const & getAABBDim() const; /** - * @symbol ?getActiveEffectCount\@Actor\@\@QEBAHXZ + * @symbol ?getActiveEffectCount\@Actor\@\@QEBAHXZ */ MCAPI int getActiveEffectCount() const; /** - * @symbol ?getActorIdentifier\@Actor\@\@QEBAAEBUActorDefinitionIdentifier\@\@XZ + * @symbol ?getActorIdentifier\@Actor\@\@QEBAAEBUActorDefinitionIdentifier\@\@XZ */ MCAPI struct ActorDefinitionIdentifier const & getActorIdentifier() const; /** - * @symbol ?getAllEffects\@Actor\@\@QEBAAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAllEffects\@Actor\@\@QEBAAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAllEffects() const; /** - * @symbol ?getArmorContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ + * @symbol ?getArmorContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ */ MCAPI class SimpleContainer & getArmorContainer(); /** - * @symbol ?getArmorContainer\@Actor\@\@QEBAAEBVSimpleContainer\@\@XZ + * @symbol ?getArmorContainer\@Actor\@\@QEBAAEBVSimpleContainer\@\@XZ */ MCAPI class SimpleContainer const & getArmorContainer() const; /** - * @symbol ?getAttributes\@Actor\@\@QEAA?AV?$not_null\@PEAVBaseAttributeMap\@\@\@gsl\@\@XZ + * @symbol ?getAttributes\@Actor\@\@QEAA?AV?$not_null\@PEAVBaseAttributeMap\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getAttributes(); /** - * @symbol ?getAttributes\@Actor\@\@QEBA?AV?$not_null\@PEBVBaseAttributeMap\@\@\@gsl\@\@XZ + * @symbol ?getAttributes\@Actor\@\@QEBA?AV?$not_null\@PEBVBaseAttributeMap\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getAttributes() const; /** - * @symbol ?getBlockMovementSlowdownMultiplier\@Actor\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getBlockMovementSlowdownMultiplier\@Actor\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getBlockMovementSlowdownMultiplier() const; /** - * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@QEBA?AVBlockPos\@\@PEBV1\@\@Z + * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@QEBA?AVBlockPos\@\@PEBV1\@\@Z */ MCAPI class BlockPos getBlockPosCurrentlyStandingOn(class Actor const *) const; /** - * @symbol ?getBlockTarget\@Actor\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getBlockTarget\@Actor\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getBlockTarget() const; /** - * @symbol ?getBrightness\@Actor\@\@QEBAMM\@Z + * @symbol ?getBrightness\@Actor\@\@QEBAMM\@Z */ MCAPI float getBrightness(float) const; /** - * @symbol ?getCanPickupItems\@Actor\@\@QEBA_NXZ + * @symbol ?getCanPickupItems\@Actor\@\@QEBA_NXZ */ MCAPI bool getCanPickupItems() const; /** - * @symbol ?getCarriedItemInSlotPreferredBy\@Actor\@\@QEBAAEBVItemStack\@\@AEBV2\@\@Z + * @symbol ?getCarriedItemInSlotPreferredBy\@Actor\@\@QEBAAEBVItemStack\@\@AEBV2\@\@Z */ MCAPI class ItemStack const & getCarriedItemInSlotPreferredBy(class ItemStack const &) const; /** - * @symbol ?getCategories\@Actor\@\@QEBA?AW4ActorCategory\@\@XZ + * @symbol ?getCategories\@Actor\@\@QEBA?AW4ActorCategory\@\@XZ */ MCAPI enum class ActorCategory getCategories() const; /** - * @symbol ?getChainedDamageEffects\@Actor\@\@QEBA_NXZ + * @symbol ?getChainedDamageEffects\@Actor\@\@QEBA_NXZ */ MCAPI bool getChainedDamageEffects() const; /** - * @symbol ?getCollidableMob\@Actor\@\@QEBA_NXZ - */ - MCAPI bool getCollidableMob() const; - /** - * @symbol ?getColor\@Actor\@\@QEBA?AW4PaletteColor\@\@XZ + * @symbol ?getColor\@Actor\@\@QEBA?AW4PaletteColor\@\@XZ */ MCAPI enum class PaletteColor getColor() const; /** - * @symbol ?getColor2\@Actor\@\@QEBA?AW4PaletteColor\@\@XZ + * @symbol ?getColor2\@Actor\@\@QEBA?AW4PaletteColor\@\@XZ */ MCAPI enum class PaletteColor getColor2() const; /** - * @symbol ?getControllingSeat\@Actor\@\@QEBAHXZ + * @symbol ?getControllingSeat\@Actor\@\@QEBAHXZ */ MCAPI int getControllingSeat() const; /** - * @symbol ?getCurrentSwimAmount\@Actor\@\@QEBAMXZ + * @symbol ?getCurrentSwimAmount\@Actor\@\@QEBAMXZ */ MCAPI float getCurrentSwimAmount() const; /** - * @symbol ?getDamageNearbyMobs\@Actor\@\@QEBA_NXZ + * @symbol ?getDamageNearbyMobs\@Actor\@\@QEBA_NXZ */ MCAPI bool getDamageNearbyMobs() const; /** - * @symbol ?getDiffList\@Actor\@\@QEBAPEBVActorDefinitionDiffList\@\@XZ + * @symbol ?getDiffList\@Actor\@\@QEBAPEBVActorDefinitionDiffList\@\@XZ */ MCAPI class ActorDefinitionDiffList const * getDiffList() const; /** - * @symbol ?getDiffListNonConst\@Actor\@\@QEAAPEAVActorDefinitionDiffList\@\@XZ + * @symbol ?getDiffListNonConst\@Actor\@\@QEAAPEAVActorDefinitionDiffList\@\@XZ */ MCAPI class ActorDefinitionDiffList * getDiffListNonConst(); /** - * @symbol ?getDimension\@Actor\@\@QEBAAEAVDimension\@\@XZ + * @symbol ?getDimension\@Actor\@\@QEBAAEAVDimension\@\@XZ */ MCAPI class Dimension & getDimension() const; /** - * @symbol ?getDimensionBlockSource\@Actor\@\@QEBAAEAVBlockSource\@\@XZ + * @symbol ?getDimensionBlockSource\@Actor\@\@QEBAAEAVBlockSource\@\@XZ */ MCAPI class BlockSource & getDimensionBlockSource() const; /** - * @symbol ?getDimensionBlockSourceConst\@Actor\@\@QEBAAEBVBlockSource\@\@XZ + * @symbol ?getDimensionBlockSourceConst\@Actor\@\@QEBAAEBVBlockSource\@\@XZ */ MCAPI class BlockSource const & getDimensionBlockSourceConst() const; /** - * @symbol ?getDimensionConst\@Actor\@\@QEBAAEBVDimension\@\@XZ + * @symbol ?getDimensionConst\@Actor\@\@QEBAAEBVDimension\@\@XZ */ MCAPI class Dimension const & getDimensionConst() const; /** - * @symbol ?getDimensionId\@Actor\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getDimensionId\@Actor\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID getDimensionId() const; /** - * @symbol ?getEconomyTradeableComponent\@Actor\@\@QEBAPEAVEconomyTradeableComponent\@\@XZ + * @symbol ?getEconomyTradeableComponent\@Actor\@\@QEBAPEAVEconomyTradeableComponent\@\@XZ */ MCAPI class EconomyTradeableComponent * getEconomyTradeableComponent() const; /** - * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@AEBVMobEffect\@\@\@Z + * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z */ - MCAPI class MobEffectInstance const * getEffect(class MobEffect const &) const; + MCAPI class MobEffectInstance const * getEffect(unsigned int) const; /** - * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@I\@Z + * @symbol ?getEffect\@Actor\@\@QEBAPEBVMobEffectInstance\@\@AEBVMobEffect\@\@\@Z */ - MCAPI class MobEffectInstance const * getEffect(unsigned int) const; + MCAPI class MobEffectInstance const * getEffect(class MobEffect const &) const; /** - * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ + * @symbol ?getEntityData\@Actor\@\@QEBAAEBVSynchedActorDataEntityWrapper\@\@XZ */ MCAPI class SynchedActorDataEntityWrapper const & getEntityData() const; /** - * @symbol ?getEntityData\@Actor\@\@QEAAAEAVSynchedActorDataEntityWrapper\@\@XZ + * @symbol ?getEntityData\@Actor\@\@QEAAAEAVSynchedActorDataEntityWrapper\@\@XZ */ MCAPI class SynchedActorDataEntityWrapper & getEntityData(); /** - * @symbol ?getEntityRegistry\@Actor\@\@QEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@Actor\@\@QEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ MCAPI class StackRefResultT getEntityRegistry(); /** - * @symbol ?getEntityTerrainInterlockData\@Actor\@\@QEAAAEAVActorTerrainInterlockData\@\@XZ + * @symbol ?getEntityTerrainInterlockData\@Actor\@\@QEAAAEAVActorTerrainInterlockData\@\@XZ */ MCAPI class ActorTerrainInterlockData & getEntityTerrainInterlockData(); /** - * @symbol ?getEquipmentSlotForItem\@Actor\@\@QEBA?AW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z + * @symbol ?getEquipmentSlotForItem\@Actor\@\@QEBA?AW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ MCAPI enum class EquipmentSlot getEquipmentSlotForItem(class ItemStack const &) const; /** - * @symbol ?getFallDistance\@Actor\@\@QEBAMXZ + * @symbol ?getFallDistance\@Actor\@\@QEBAMXZ */ MCAPI float getFallDistance() const; /** - * @symbol ?getFirstAvailableSeatPos\@Actor\@\@QEBA_NAEAV1\@AEAVVec3\@\@\@Z + * @symbol ?getFirstAvailableSeatPos\@Actor\@\@QEBA_NAEAV1\@AEAVVec3\@\@\@Z */ MCAPI bool getFirstAvailableSeatPos(class Actor &, class Vec3 &) const; /** - * @symbol ?getFirstPassenger\@Actor\@\@QEBAPEAV1\@XZ + * @symbol ?getFirstPassenger\@Actor\@\@QEBAPEAV1\@XZ */ MCAPI class Actor * getFirstPassenger() const; /** - * @symbol ?getHandContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ + * @symbol ?getHandContainer\@Actor\@\@QEAAAEAVSimpleContainer\@\@XZ */ MCAPI class SimpleContainer & getHandContainer(); /** - * @symbol ?getHandContainer\@Actor\@\@QEBAAEBVSimpleContainer\@\@XZ + * @symbol ?getHandContainer\@Actor\@\@QEBAAEBVSimpleContainer\@\@XZ */ MCAPI class SimpleContainer const & getHandContainer() const; /** - * @symbol ?getHealth\@Actor\@\@QEBAHXZ + * @symbol ?getHealth\@Actor\@\@QEBAHXZ */ MCAPI int getHealth() const; /** - * @symbol ?getHurtDir\@Actor\@\@QEBAHXZ + * @symbol ?getHurtDir\@Actor\@\@QEBAHXZ */ MCAPI int getHurtDir() const; /** - * @symbol ?getHurtTime\@Actor\@\@QEBAHXZ + * @symbol ?getHurtTime\@Actor\@\@QEBAHXZ */ MCAPI int getHurtTime() const; /** - * @symbol ?getInitializationMethod\@Actor\@\@QEAA?AW4InitializationMethod\@1\@XZ + * @symbol ?getInitializationMethod\@Actor\@\@QEAA?AW4InitializationMethod\@1\@XZ */ MCAPI enum class Actor::InitializationMethod getInitializationMethod(); /** - * @symbol ?getInterpolatedPosition\@Actor\@\@QEBA?AVVec3\@\@M\@Z + * @symbol ?getInterpolatedPosition\@Actor\@\@QEBA?AVVec3\@\@M\@Z */ MCAPI class Vec3 getInterpolatedPosition(float) const; /** - * @symbol ?getInterpolatedRotation\@Actor\@\@QEBA?AVVec2\@\@M\@Z + * @symbol ?getInterpolatedRotation\@Actor\@\@QEBA?AVVec2\@\@M\@Z */ MCAPI class Vec2 getInterpolatedRotation(float) const; /** - * @symbol ?getIsExperienceDropEnabled\@Actor\@\@QEBA_NXZ + * @symbol ?getIsExperienceDropEnabled\@Actor\@\@QEBA_NXZ */ MCAPI bool getIsExperienceDropEnabled() const; /** - * @symbol ?getJumpDuration\@Actor\@\@QEBAHXZ + * @symbol ?getJumpDuration\@Actor\@\@QEBAHXZ */ MCAPI int getJumpDuration() const; /** - * @symbol ?getLastHurtByMobTime\@Actor\@\@QEAAHXZ + * @symbol ?getLastHurtByMobTime\@Actor\@\@QEAAHXZ */ MCAPI int getLastHurtByMobTime(); /** - * @symbol ?getLastHurtByMobTimestamp\@Actor\@\@QEAAHXZ + * @symbol ?getLastHurtByMobTimestamp\@Actor\@\@QEAAHXZ */ MCAPI int getLastHurtByMobTimestamp(); /** - * @symbol ?getLastHurtCause\@Actor\@\@QEBA?AW4ActorDamageCause\@\@XZ + * @symbol ?getLastHurtCause\@Actor\@\@QEBA?AW4ActorDamageCause\@\@XZ */ MCAPI enum class ActorDamageCause getLastHurtCause() const; /** - * @symbol ?getLastHurtDamage\@Actor\@\@QEBAMXZ + * @symbol ?getLastHurtDamage\@Actor\@\@QEBAMXZ */ MCAPI float getLastHurtDamage() const; /** - * @symbol ?getLastHurtMobTimestamp\@Actor\@\@QEAAHXZ + * @symbol ?getLastHurtMobTimestamp\@Actor\@\@QEAAHXZ */ MCAPI int getLastHurtMobTimestamp(); /** - * @symbol ?getLastHurtTimestamp\@Actor\@\@QEBA_KXZ + * @symbol ?getLastHurtTimestamp\@Actor\@\@QEBA_KXZ */ MCAPI unsigned __int64 getLastHurtTimestamp() const; /** - * @symbol ?getLeashHolder\@Actor\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getLeashHolder\@Actor\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getLeashHolder() const; /** - * @symbol ?getLevel\@Actor\@\@QEAAAEAVLevel\@\@XZ + * @symbol ?getLevel\@Actor\@\@QEBAAEBVLevel\@\@XZ */ - MCAPI class Level & getLevel(); + MCAPI class Level const & getLevel() const; /** - * @symbol ?getLevel\@Actor\@\@QEBAAEBVLevel\@\@XZ + * @symbol ?getLevel\@Actor\@\@QEAAAEAVLevel\@\@XZ */ - MCAPI class Level const & getLevel() const; + MCAPI class Level & getLevel(); /** - * @symbol ?getLevelTimeStamp\@Actor\@\@QEBA_KXZ + * @symbol ?getLevelTimeStamp\@Actor\@\@QEBA_KXZ */ MCAPI unsigned __int64 getLevelTimeStamp() const; /** - * @symbol ?getLimitedLifetimeTicks\@Actor\@\@QEBAHXZ + * @symbol ?getLimitedLifetimeTicks\@Actor\@\@QEBAHXZ */ MCAPI int getLimitedLifetimeTicks() const; /** - * @symbol ?getLinks\@Actor\@\@QEBA?AV?$vector\@UActorLink\@\@V?$allocator\@UActorLink\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getLinks\@Actor\@\@QEBA?AV?$vector\@UActorLink\@\@V?$allocator\@UActorLink\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getLinks() const; /** - * @symbol ?getMarkVariant\@Actor\@\@QEBAHXZ + * @symbol ?getMarkVariant\@Actor\@\@QEBAHXZ */ MCAPI int getMarkVariant() const; /** - * @symbol ?getMaxAutoStep\@Actor\@\@QEBAMXZ + * @symbol ?getMaxAutoStep\@Actor\@\@QEBAMXZ */ MCAPI float getMaxAutoStep() const; /** - * @symbol ?getMaxHealth\@Actor\@\@QEBAHXZ + * @symbol ?getMaxHealth\@Actor\@\@QEBAHXZ */ MCAPI int getMaxHealth() const; /** - * @symbol ?getMolangVariables\@Actor\@\@QEAAAEAVMolangVariableMap\@\@XZ + * @symbol ?getMolangVariables\@Actor\@\@QEAAAEAVMolangVariableMap\@\@XZ */ MCAPI class MolangVariableMap & getMolangVariables(); /** - * @symbol ?getMovementProxy\@Actor\@\@QEAA?AV?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@XZ + * @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 + * @symbol ?getMovementProxy\@Actor\@\@QEBA?AV?$not_null\@V?$shared_ptr\@$$CBUIActorMovementProxy\@\@\@std\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null> getMovementProxy() const; /** - * @symbol ?getOffhandSlot\@Actor\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getOffhandSlot\@Actor\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getOffhandSlot() const; /** - * @symbol ?getOnDeathExperience\@Actor\@\@QEAAHXZ + * @symbol ?getOnDeathExperience\@Actor\@\@QEAAHXZ */ MCAPI int getOnDeathExperience(); /** - * @symbol ?getOnewayPhysicsBlocks\@Actor\@\@QEBAAEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getOnewayPhysicsBlocks\@Actor\@\@QEBAAEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getOnewayPhysicsBlocks() const; /** - * @symbol ?getOrAddDynamicProperties\@Actor\@\@QEAAAEAVDynamicProperties\@\@XZ + * @symbol ?getOrAddDynamicProperties\@Actor\@\@QEAAAEAVDynamicProperties\@\@XZ */ MCAPI class DynamicProperties & getOrAddDynamicProperties(); /** - * @symbol ?getOwner\@Actor\@\@QEBAPEAVMob\@\@XZ + * @symbol ?getOwner\@Actor\@\@QEBAPEAVMob\@\@XZ */ MCAPI class Mob * getOwner() const; /** - * @symbol ?getOwnerId\@Actor\@\@QEBA?BUActorUniqueID\@\@XZ + * @symbol ?getOwnerId\@Actor\@\@QEBA?BUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID const getOwnerId() const; /** - * @symbol ?getPassengerIndex\@Actor\@\@QEBAHAEBV1\@\@Z + * @symbol ?getPassengerIndex\@Actor\@\@QEBAHAEBV1\@\@Z */ MCAPI int getPassengerIndex(class Actor const &) const; /** - * @symbol ?getPersistingTradeOffers\@Actor\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getPersistingTradeOffers\@Actor\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getPersistingTradeOffers(); /** - * @symbol ?getPersistingTradeRiches\@Actor\@\@QEAAHXZ + * @symbol ?getPersistingTradeRiches\@Actor\@\@QEAAHXZ */ MCAPI int getPersistingTradeRiches(); /** - * @symbol ?getPlayerOwner\@Actor\@\@QEBAPEAVPlayer\@\@XZ + * @symbol ?getPlayerOwner\@Actor\@\@QEBAPEAVPlayer\@\@XZ */ MCAPI class Player * getPlayerOwner() const; /** - * @symbol ?getPosDelta\@Actor\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getPosDelta\@Actor\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getPosDelta() const; /** - * @symbol ?getPosDeltaNonConst\@Actor\@\@QEAAAEAVVec3\@\@XZ + * @symbol ?getPosDeltaNonConst\@Actor\@\@QEAAAEAVVec3\@\@XZ */ MCAPI class Vec3 & getPosDeltaNonConst(); /** - * @symbol ?getRadius\@Actor\@\@QEBAMXZ + * @symbol ?getRadius\@Actor\@\@QEBAMXZ */ MCAPI float getRadius() const; /** - * @symbol ?getRandom\@Actor\@\@QEBAAEAVRandom\@\@XZ + * @symbol ?getRandom\@Actor\@\@QEBAAEAVRandom\@\@XZ */ MCAPI class Random & getRandom() const; /** - * @symbol ?getRenderParams\@Actor\@\@QEAAAEAVRenderParams\@\@XZ + * @symbol ?getRenderParams\@Actor\@\@QEAAAEAVRenderParams\@\@XZ */ MCAPI class RenderParams & getRenderParams(); /** - * @symbol ?getRidingHeight\@Actor\@\@QEBAMXZ + * @symbol ?getRidingHeight\@Actor\@\@QEBAMXZ */ MCAPI float getRidingHeight() const; /** - * @symbol ?getRotation\@Actor\@\@QEBAAEBVVec2\@\@XZ + * @symbol ?getRotation\@Actor\@\@QEBAAEBVVec2\@\@XZ */ MCAPI class Vec2 const & getRotation() const; /** - * @symbol ?getRotationPrev\@Actor\@\@QEBAAEBVVec2\@\@XZ + * @symbol ?getRotationPrev\@Actor\@\@QEBAAEBVVec2\@\@XZ */ MCAPI class Vec2 const & getRotationPrev() const; /** - * @symbol ?getRuntimeID\@Actor\@\@QEBA?AVActorRuntimeID\@\@XZ + * @symbol ?getRuntimeID\@Actor\@\@QEBA?AVActorRuntimeID\@\@XZ */ MCAPI class ActorRuntimeID getRuntimeID() const; /** - * @symbol ?getShakeTime\@Actor\@\@QEBAHXZ + * @symbol ?getShakeTime\@Actor\@\@QEBAHXZ */ MCAPI int getShakeTime() const; /** - * @symbol ?getSkinID\@Actor\@\@QEBAHXZ + * @symbol ?getSkinID\@Actor\@\@QEBAHXZ */ MCAPI int getSkinID() const; /** - * @symbol ?getSlideOffset\@Actor\@\@QEBA?AVVec2\@\@XZ + * @symbol ?getSlideOffset\@Actor\@\@QEBA?AVVec2\@\@XZ */ MCAPI class Vec2 getSlideOffset() const; /** - * @symbol ?getSpatialNetworkData\@Actor\@\@QEBAAEBVSpatialActorNetworkData\@\@XZ + * @symbol ?getSpatialNetworkData\@Actor\@\@QEBAAEBVSpatialActorNetworkData\@\@XZ */ MCAPI class SpatialActorNetworkData const & getSpatialNetworkData() const; /** - * @symbol ?getSpatialNetworkData\@Actor\@\@QEAAAEAVSpatialActorNetworkData\@\@XZ + * @symbol ?getSpatialNetworkData\@Actor\@\@QEAAAEAVSpatialActorNetworkData\@\@XZ */ MCAPI class SpatialActorNetworkData & getSpatialNetworkData(); /** - * @symbol ?getSpeedInMetersPerSecond\@Actor\@\@QEBAMXZ + * @symbol ?getSpeedInMetersPerSecond\@Actor\@\@QEBAMXZ */ MCAPI float getSpeedInMetersPerSecond() const; /** - * @symbol ?getStrength\@Actor\@\@QEBAHXZ + * @symbol ?getStrength\@Actor\@\@QEBAHXZ */ MCAPI int getStrength() const; /** - * @symbol ?getStrengthMax\@Actor\@\@QEBAHXZ + * @symbol ?getStrengthMax\@Actor\@\@QEBAHXZ */ MCAPI int getStrengthMax() const; /** - * @symbol ?getStructuralIntegrity\@Actor\@\@QEBAHXZ + * @symbol ?getStructuralIntegrity\@Actor\@\@QEBAHXZ */ MCAPI int getStructuralIntegrity() const; /** - * @symbol ?getSwimAmount\@Actor\@\@QEBAMM\@Z + * @symbol ?getSwimAmount\@Actor\@\@QEBAMM\@Z */ MCAPI float getSwimAmount(float) const; /** - * @symbol ?getTags\@Actor\@\@QEBA?BV?$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 + * @symbol ?getTags\@Actor\@\@QEBA?BV?$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 getTags() const; /** - * @symbol ?getTarget\@Actor\@\@QEBAPEAV1\@XZ + * @symbol ?getTarget\@Actor\@\@QEBAPEAV1\@XZ */ MCAPI class Actor * getTarget() const; /** - * @symbol ?getTargetId\@Actor\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getTargetId\@Actor\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getTargetId() const; /** - * @symbol ?getTradeInterest\@Actor\@\@QEBA_NXZ + * @symbol ?getTradeInterest\@Actor\@\@QEBA_NXZ */ MCAPI bool getTradeInterest() const; /** - * @symbol ?getTradeOffers\@Actor\@\@QEAAPEAVMerchantRecipeList\@\@XZ + * @symbol ?getTradeOffers\@Actor\@\@QEAAPEAVMerchantRecipeList\@\@XZ */ MCAPI class MerchantRecipeList * getTradeOffers(); /** - * @symbol ?getTradingPlayer\@Actor\@\@QEBAPEAVPlayer\@\@XZ + * @symbol ?getTradingPlayer\@Actor\@\@QEBAPEAVPlayer\@\@XZ */ MCAPI class Player * getTradingPlayer() const; /** - * @symbol ?getUniqueID\@Actor\@\@QEBAAEBUActorUniqueID\@\@XZ + * @symbol ?getUniqueID\@Actor\@\@QEBAAEBUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID const & getUniqueID() const; /** - * @symbol ?getVariant\@Actor\@\@QEBAHXZ + * @symbol ?getVariant\@Actor\@\@QEBAHXZ */ MCAPI int getVariant() const; /** - * @symbol ?getVehicle\@Actor\@\@QEBAPEAV1\@XZ + * @symbol ?getVehicle\@Actor\@\@QEBAPEAV1\@XZ */ MCAPI class Actor * getVehicle() const; /** - * @symbol ?getVehicleRoot\@Actor\@\@QEBAPEAV1\@XZ + * @symbol ?getVehicleRoot\@Actor\@\@QEBAPEAV1\@XZ */ MCAPI class Actor * getVehicleRoot() const; /** - * @symbol ?getVehicleRuntimeID\@Actor\@\@QEBA?AVActorRuntimeID\@\@XZ + * @symbol ?getVehicleRuntimeID\@Actor\@\@QEBA?AVActorRuntimeID\@\@XZ */ MCAPI class ActorRuntimeID getVehicleRuntimeID() const; /** - * @symbol ?getVerticalSpeedInMetersPerSecond\@Actor\@\@QEBAMXZ + * @symbol ?getVerticalSpeedInMetersPerSecond\@Actor\@\@QEBAMXZ */ MCAPI float getVerticalSpeedInMetersPerSecond() const; /** - * @symbol ?getViewVector\@Actor\@\@QEBA?AVVec3\@\@M\@Z + * @symbol ?getViewVector\@Actor\@\@QEBA?AVVec3\@\@M\@Z */ MCAPI class Vec3 getViewVector(float) const; /** - * @symbol ?getWeakEntity\@Actor\@\@QEBA?BV?$WeakRefT\@UEntityRefTraits\@\@\@\@XZ + * @symbol ?getWeakEntity\@Actor\@\@QEBA?BV?$WeakRefT\@UEntityRefTraits\@\@\@\@XZ */ MCAPI class WeakRefT const getWeakEntity() const; /** - * @symbol ?getYHeadRot\@Actor\@\@QEBAMXZ + * @symbol ?getYHeadRot\@Actor\@\@QEBAMXZ */ MCAPI float getYHeadRot() const; /** - * @symbol ?getYHeadRotationsNewOld\@Actor\@\@QEBA?AUInterpolationPair\@\@XZ + * @symbol ?getYHeadRotationsNewOld\@Actor\@\@QEBA?AUInterpolationPair\@\@XZ */ MCAPI struct InterpolationPair getYHeadRotationsNewOld() const; /** - * @symbol ?hasAnyEffects\@Actor\@\@QEBA_NXZ + * @symbol ?hasAnyEffects\@Actor\@\@QEBA_NXZ */ MCAPI bool hasAnyEffects() const; /** - * @symbol ?hasAnyVisibleEffects\@Actor\@\@QEBA_NXZ + * @symbol ?hasAnyVisibleEffects\@Actor\@\@QEBA_NXZ */ MCAPI bool hasAnyVisibleEffects() const; /** - * @symbol ?hasBeenHurtByMobInLastTicks\@Actor\@\@QEBA_NH\@Z + * @symbol ?hasBeenHurtByMobInLastTicks\@Actor\@\@QEBA_NH\@Z */ MCAPI bool hasBeenHurtByMobInLastTicks(int) const; /** - * @symbol ?hasCategory\@Actor\@\@QEBA_NW4ActorCategory\@\@\@Z + * @symbol ?hasCategory\@Actor\@\@QEBA_NW4ActorCategory\@\@\@Z */ MCAPI bool hasCategory(enum class ActorCategory) const; /** - * @symbol ?hasDefinitionGroup\@Actor\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?hasDefinitionGroup\@Actor\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool hasDefinitionGroup(std::string const &) const; /** - * @symbol ?hasDimension\@Actor\@\@QEBA_NXZ + * @symbol ?hasDimension\@Actor\@\@QEBA_NXZ */ MCAPI bool hasDimension() const; /** - * @symbol ?hasEffect\@Actor\@\@QEBA_NAEBVMobEffect\@\@\@Z + * @symbol ?hasEffect\@Actor\@\@QEBA_NAEBVMobEffect\@\@\@Z */ MCAPI bool hasEffect(class MobEffect const &) const; /** - * @symbol ?hasFamily\@Actor\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?hasFamily\@Actor\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool hasFamily(class HashedString const &) const; /** - * @symbol ?hasFishingHook\@Actor\@\@QEBA_NXZ + * @symbol ?hasFishingHook\@Actor\@\@QEBA_NXZ */ MCAPI bool hasFishingHook() const; /** - * @symbol ?hasLevel\@Actor\@\@QEBA_NXZ + * @symbol ?hasLevel\@Actor\@\@QEBA_NXZ */ MCAPI bool hasLevel() const; /** - * @symbol ?hasPassenger\@Actor\@\@QEBA_NXZ + * @symbol ?hasPassenger\@Actor\@\@QEBA_NXZ */ MCAPI bool hasPassenger() const; /** - * @symbol ?hasPersistingTrade\@Actor\@\@QEBA_NXZ + * @symbol ?hasPersistingTrade\@Actor\@\@QEBA_NXZ */ MCAPI bool hasPersistingTrade() const; /** - * @symbol ?hasPlayerPassenger\@Actor\@\@QEBA_NXZ + * @symbol ?hasPlayerPassenger\@Actor\@\@QEBA_NXZ */ MCAPI bool hasPlayerPassenger() const; /** - * @symbol ?hasPriorityAmmunition\@Actor\@\@QEBA_NXZ + * @symbol ?hasPriorityAmmunition\@Actor\@\@QEBA_NXZ */ MCAPI bool hasPriorityAmmunition() const; /** - * @symbol ?hasRuntimeID\@Actor\@\@QEBA_NXZ + * @symbol ?hasRuntimeID\@Actor\@\@QEBA_NXZ */ MCAPI bool hasRuntimeID() const; /** - * @symbol ?hasSaddle\@Actor\@\@QEBA_NXZ + * @symbol ?hasSaddle\@Actor\@\@QEBA_NXZ */ MCAPI bool hasSaddle() const; /** - * @symbol ?hasTag\@Actor\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?hasTag\@Actor\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool hasTag(std::string const &) const; /** - * @symbol ?hasTags\@Actor\@\@QEBA_NXZ + * @symbol ?hasTags\@Actor\@\@QEBA_NXZ */ MCAPI bool hasTags() const; /** - * @symbol ?hasTeleported\@Actor\@\@QEBA_NXZ + * @symbol ?hasTeleported\@Actor\@\@QEBA_NXZ */ MCAPI bool hasTeleported() const; /** - * @symbol ?hasTotemEquipped\@Actor\@\@QEBA_NXZ + * @symbol ?hasTotemEquipped\@Actor\@\@QEBA_NXZ */ MCAPI bool hasTotemEquipped() const; /** - * @symbol ?hasType\@Actor\@\@QEBA_NW4ActorType\@\@\@Z + * @symbol ?hasType\@Actor\@\@QEBA_NW4ActorType\@\@\@Z */ MCAPI bool hasType(enum class ActorType) const; /** - * @symbol ?hasUniqueID\@Actor\@\@QEBA_NXZ + * @symbol ?hasUniqueID\@Actor\@\@QEBA_NXZ */ MCAPI bool hasUniqueID() const; /** - * @symbol ?healEffects\@Actor\@\@QEAAXH\@Z + * @symbol ?healEffects\@Actor\@\@QEAAXH\@Z */ MCAPI void healEffects(int); /** - * @symbol ?hurt\@Actor\@\@QEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @symbol ?hurt\@Actor\@\@QEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ MCAPI bool hurt(class ActorDamageSource const &, float, bool, bool); /** - * @symbol ?inDownwardFlowingLiquid\@Actor\@\@QEBA_NXZ + * @symbol ?inDownwardFlowingLiquid\@Actor\@\@QEBA_NXZ */ MCAPI bool inDownwardFlowingLiquid() const; /** - * @symbol ?initActorProperties\@Actor\@\@QEAAXXZ + * @symbol ?initActorProperties\@Actor\@\@QEAAXXZ */ MCAPI void initActorProperties(); /** - * @symbol ?initParams\@Actor\@\@QEAAXAEAVVariantParameterList\@\@\@Z + * @symbol ?initParams\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z */ - MCAPI void initParams(class VariantParameterList &); + MCAPI void initParams(class RenderParams &); /** - * @symbol ?initParams\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z + * @symbol ?initParams\@Actor\@\@QEAAXAEAVVariantParameterList\@\@\@Z */ - MCAPI void initParams(class RenderParams &); + MCAPI void initParams(class VariantParameterList &); /** - * @symbol ?isActorLocationInMaterial\@Actor\@\@QEBA_NW4ActorLocation\@\@W4MaterialType\@\@\@Z + * @symbol ?isActorLocationInMaterial\@Actor\@\@QEBA_NW4ActorLocation\@\@W4MaterialType\@\@\@Z */ MCAPI bool isActorLocationInMaterial(enum class ActorLocation, enum class MaterialType) const; /** - * @symbol ?isAngry\@Actor\@\@QEBA_NXZ + * @symbol ?isAngry\@Actor\@\@QEBA_NXZ */ MCAPI bool isAngry() const; /** - * @symbol ?isAutonomous\@Actor\@\@QEBA_NXZ + * @symbol ?isAutonomous\@Actor\@\@QEBA_NXZ */ MCAPI bool isAutonomous() const; /** - * @symbol ?isBaby\@Actor\@\@QEBA_NXZ + * @symbol ?isBaby\@Actor\@\@QEBA_NXZ */ MCAPI bool isBaby() const; /** - * @symbol ?isBreakingObstruction\@Actor\@\@QEBA_NXZ + * @symbol ?isBreakingObstruction\@Actor\@\@QEBA_NXZ */ MCAPI bool isBreakingObstruction() const; /** - * @symbol ?isBribed\@Actor\@\@QEBA_NXZ + * @symbol ?isBribed\@Actor\@\@QEBA_NXZ */ MCAPI bool isBribed() const; /** - * @symbol ?isCharged\@Actor\@\@QEBA_NXZ + * @symbol ?isCharged\@Actor\@\@QEBA_NXZ */ MCAPI bool isCharged() const; /** - * @symbol ?isChested\@Actor\@\@QEBA_NXZ + * @symbol ?isChested\@Actor\@\@QEBA_NXZ */ MCAPI bool isChested() const; /** - * @symbol ?isClimbing\@Actor\@\@QEBA_NXZ + * @symbol ?isClimbing\@Actor\@\@QEBA_NXZ */ MCAPI bool isClimbing() const; /** - * @symbol ?isControlledByLocalInstance\@Actor\@\@QEBA_NXZ + * @symbol ?isControlledByLocalInstance\@Actor\@\@QEBA_NXZ */ MCAPI bool isControlledByLocalInstance() const; /** - * @symbol ?isDancing\@Actor\@\@QEBA_NXZ + * @symbol ?isDancing\@Actor\@\@QEBA_NXZ */ MCAPI bool isDancing() const; /** - * @symbol ?isDead\@Actor\@\@QEBA_NXZ + * @symbol ?isDead\@Actor\@\@QEBA_NXZ */ MCAPI bool isDead() const; /** - * @symbol ?isDoorBreaker\@Actor\@\@QEBA_NXZ + * @symbol ?isDoorBreaker\@Actor\@\@QEBA_NXZ */ MCAPI bool isDoorBreaker() const; /** - * @symbol ?isDoorOpener\@Actor\@\@QEBA_NXZ + * @symbol ?isDoorOpener\@Actor\@\@QEBA_NXZ */ MCAPI bool isDoorOpener() const; /** - * @symbol ?isGlobal\@Actor\@\@QEBA_NXZ + * @symbol ?isGlobal\@Actor\@\@QEBA_NXZ */ MCAPI bool isGlobal() const; /** - * @symbol ?isIgnited\@Actor\@\@QEBA_NXZ + * @symbol ?isIgnited\@Actor\@\@QEBA_NXZ */ MCAPI bool isIgnited() const; /** - * @symbol ?isImmersedInWater\@Actor\@\@QEBA_NXZ + * @symbol ?isImmersedInWater\@Actor\@\@QEBA_NXZ */ MCAPI bool isImmersedInWater() const; /** - * @symbol ?isInClouds\@Actor\@\@QEBA_NXZ + * @symbol ?isInClouds\@Actor\@\@QEBA_NXZ */ MCAPI bool isInClouds() const; /** - * @symbol ?isInContactWithWater\@Actor\@\@QEBA_NXZ + * @symbol ?isInContactWithWater\@Actor\@\@QEBA_NXZ */ MCAPI bool isInContactWithWater() const; /** - * @symbol ?isInLava\@Actor\@\@QEBA_NXZ + * @symbol ?isInLava\@Actor\@\@QEBA_NXZ */ MCAPI bool isInLava() const; /** - * @symbol ?isInLove\@Actor\@\@QEBA_NXZ + * @symbol ?isInLove\@Actor\@\@QEBA_NXZ */ MCAPI bool isInLove() const; /** - * @symbol ?isInPrecipitation\@Actor\@\@QEBA_NXZ + * @symbol ?isInPrecipitation\@Actor\@\@QEBA_NXZ */ MCAPI bool isInPrecipitation() const; /** - * @symbol ?isInRain\@Actor\@\@QEBA_NXZ + * @symbol ?isInRain\@Actor\@\@QEBA_NXZ */ MCAPI bool isInRain() const; /** - * @symbol ?isInScaffolding\@Actor\@\@QEBA_NXZ + * @symbol ?isInScaffolding\@Actor\@\@QEBA_NXZ */ MCAPI bool isInScaffolding() const; /** - * @symbol ?isInSnow\@Actor\@\@QEBA_NXZ + * @symbol ?isInSnow\@Actor\@\@QEBA_NXZ */ MCAPI bool isInSnow() const; /** - * @symbol ?isInThunderstorm\@Actor\@\@QEBA_NXZ + * @symbol ?isInThunderstorm\@Actor\@\@QEBA_NXZ */ MCAPI bool isInThunderstorm() const; /** - * @symbol ?isInWaterOrRain\@Actor\@\@QEBA_NXZ + * @symbol ?isInWaterOrRain\@Actor\@\@QEBA_NXZ */ MCAPI bool isInWaterOrRain() const; /** - * @symbol ?isInWorld\@Actor\@\@QEBA_NXZ + * @symbol ?isInWorld\@Actor\@\@QEBA_NXZ */ MCAPI bool isInWorld() const; /** - * @symbol ?isInsideBorderBlock\@Actor\@\@QEBA_NM\@Z + * @symbol ?isInsideBorderBlock\@Actor\@\@QEBA_NM\@Z */ MCAPI bool isInsideBorderBlock(float) const; /** - * @symbol ?isInsidePortal\@Actor\@\@QEBA_NXZ + * @symbol ?isInsidePortal\@Actor\@\@QEBA_NXZ */ MCAPI bool isInsidePortal() const; /** - * @symbol ?isJumping\@Actor\@\@QEBA_NXZ + * @symbol ?isJumping\@Actor\@\@QEBA_NXZ */ MCAPI bool isJumping() const; /** - * @symbol ?isLayingDown\@Actor\@\@QEBA_NXZ + * @symbol ?isLayingDown\@Actor\@\@QEBA_NXZ */ MCAPI bool isLayingDown() const; /** - * @symbol ?isLeashed\@Actor\@\@QEBA_NXZ + * @symbol ?isLeashed\@Actor\@\@QEBA_NXZ */ MCAPI bool isLeashed() const; /** - * @symbol ?isMovedToLimbo\@Actor\@\@QEBA_NXZ + * @symbol ?isMovedToLimbo\@Actor\@\@QEBA_NXZ */ MCAPI bool isMovedToLimbo() const; /** - * @symbol ?isMovedToUnloadedChunk\@Actor\@\@QEBA_NXZ + * @symbol ?isMovedToUnloadedChunk\@Actor\@\@QEBA_NXZ */ MCAPI bool isMovedToUnloadedChunk() const; /** - * @symbol ?isMoving\@Actor\@\@QEBA_NXZ + * @symbol ?isMoving\@Actor\@\@QEBA_NXZ */ MCAPI bool isMoving() const; /** - * @symbol ?isOrphan\@Actor\@\@QEBA_NXZ + * @symbol ?isOrphan\@Actor\@\@QEBA_NXZ */ MCAPI bool isOrphan() const; /** - * @symbol ?isOutOfControl\@Actor\@\@QEBA_NXZ + * @symbol ?isOutOfControl\@Actor\@\@QEBA_NXZ */ MCAPI bool isOutOfControl() const; /** - * @symbol ?isOverScaffolding\@Actor\@\@QEBA_NXZ + * @symbol ?isOverScaffolding\@Actor\@\@QEBA_NXZ */ MCAPI bool isOverScaffolding() const; /** - * @symbol ?isPacified\@Actor\@\@QEBA_NXZ + * @symbol ?isPacified\@Actor\@\@QEBA_NXZ */ MCAPI bool isPacified() const; /** - * @symbol ?isPassenger\@Actor\@\@QEBA_NAEBV1\@\@Z + * @symbol ?isPassenger\@Actor\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool isPassenger(class Actor const &) const; /** - * @symbol ?isPersistent\@Actor\@\@QEBA_NXZ + * @symbol ?isPersistent\@Actor\@\@QEBA_NXZ */ MCAPI bool isPersistent() const; /** - * @symbol ?isPlayingDead\@Actor\@\@QEBA_NXZ + * @symbol ?isPlayingDead\@Actor\@\@QEBA_NXZ */ MCAPI bool isPlayingDead() const; /** - * @symbol ?isPowered\@Actor\@\@QEBA_NXZ + * @symbol ?isPowered\@Actor\@\@QEBA_NXZ */ MCAPI bool isPowered() const; /** - * @symbol ?isRemoved\@Actor\@\@QEBA_NXZ + * @symbol ?isRemoved\@Actor\@\@QEBA_NXZ */ MCAPI bool isRemoved() const; /** - * @symbol ?isResting\@Actor\@\@QEBA_NXZ + * @symbol ?isResting\@Actor\@\@QEBA_NXZ */ MCAPI bool isResting() const; /** - * @symbol ?isRiding\@Actor\@\@QEBA_NXZ + * @symbol ?isRiding\@Actor\@\@QEBA_NPEAV1\@\@Z */ - MCAPI bool isRiding() const; + MCAPI bool isRiding(class Actor *) const; /** - * @symbol ?isRiding\@Actor\@\@QEBA_NPEAV1\@\@Z + * @symbol ?isRiding\@Actor\@\@QEBA_NXZ */ - MCAPI bool isRiding(class Actor *) const; + MCAPI bool isRiding() const; /** - * @symbol ?isSafeToSleepNear\@Actor\@\@QEBA_NXZ + * @symbol ?isSafeToSleepNear\@Actor\@\@QEBA_NXZ */ MCAPI bool isSafeToSleepNear() const; /** - * @symbol ?isSheared\@Actor\@\@QEBA_NXZ + * @symbol ?isSheared\@Actor\@\@QEBA_NXZ */ MCAPI bool isSheared() const; /** - * @symbol ?isSitting\@Actor\@\@QEBA_NXZ + * @symbol ?isSitting\@Actor\@\@QEBA_NXZ */ MCAPI bool isSitting() const; /** - * @symbol ?isSneaking\@Actor\@\@QEBA_NXZ + * @symbol ?isSneaking\@Actor\@\@QEBA_NXZ */ MCAPI bool isSneaking() const; /** - * @symbol ?isStackable\@Actor\@\@QEBA_NXZ + * @symbol ?isStackable\@Actor\@\@QEBA_NXZ */ MCAPI bool isStackable() const; /** - * @symbol ?isStanding\@Actor\@\@QEBA_NXZ + * @symbol ?isStanding\@Actor\@\@QEBA_NXZ */ MCAPI bool isStanding() const; /** - * @symbol ?isSwimmer\@Actor\@\@QEBA_NXZ + * @symbol ?isSwimmer\@Actor\@\@QEBA_NXZ */ MCAPI bool isSwimmer() const; /** - * @symbol ?isSwimming\@Actor\@\@QEBA_NXZ + * @symbol ?isSwimming\@Actor\@\@QEBA_NXZ */ MCAPI bool isSwimming() const; /** - * @symbol ?isTame\@Actor\@\@QEBA_NXZ + * @symbol ?isTame\@Actor\@\@QEBA_NXZ */ MCAPI bool isTame() const; /** - * @symbol ?isTickingEntity\@Actor\@\@QEBA_NXZ + * @symbol ?isTickingEntity\@Actor\@\@QEBA_NXZ */ MCAPI bool isTickingEntity() const; /** - * @symbol ?isTouchingDamageBlock\@Actor\@\@QEBA_NXZ + * @symbol ?isTouchingDamageBlock\@Actor\@\@QEBA_NXZ */ MCAPI bool isTouchingDamageBlock() const; /** - * @symbol ?isTrading\@Actor\@\@QEBA_NXZ + * @symbol ?isTrading\@Actor\@\@QEBA_NXZ */ MCAPI bool isTrading() const; /** - * @symbol ?isTrusting\@Actor\@\@QEBA_NXZ + * @symbol ?isTrusting\@Actor\@\@QEBA_NXZ */ MCAPI bool isTrusting() const; /** - * @symbol ?isType\@Actor\@\@QEBA_NW4ActorType\@\@\@Z + * @symbol ?isType\@Actor\@\@QEBA_NW4ActorType\@\@\@Z */ MCAPI bool isType(enum class ActorType) const; /** - * @symbol ?isUseNewTradeScreen\@Actor\@\@QEBA_NXZ + * @symbol ?isUseNewTradeScreen\@Actor\@\@QEBA_NXZ */ MCAPI bool isUseNewTradeScreen() const; /** - * @symbol ?isWASDControlled\@Actor\@\@QEBA_NXZ + * @symbol ?isWASDControlled\@Actor\@\@QEBA_NXZ */ MCAPI bool isWASDControlled() const; /** - * @symbol ?isWalker\@Actor\@\@QEBA_NXZ + * @symbol ?isWalker\@Actor\@\@QEBA_NXZ */ MCAPI bool isWalker() const; /** - * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@MH\@Z + * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@MH\@Z */ MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, float, int); /** - * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z + * @symbol ?lerpTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z */ MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, int); /** - * @symbol ?lerpToRotation\@Actor\@\@QEAAXAEBVVec2\@\@H\@Z + * @symbol ?lerpToRotation\@Actor\@\@QEAAXAEBVVec2\@\@H\@Z */ MCAPI void lerpToRotation(class Vec2 const &, int); /** - * @symbol ?loadEntityFlags\@Actor\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?loadEntityFlags\@Actor\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void loadEntityFlags(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?lovePartnerId\@Actor\@\@QEBAAEBUActorUniqueID\@\@XZ + * @symbol ?lovePartnerId\@Actor\@\@QEBAAEBUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID const & lovePartnerId() const; /** - * @symbol ?migrateUniqueID\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?migrateUniqueID\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void migrateUniqueID(struct ActorUniqueID); /** - * @symbol ?moveBBs\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?moveBBs\@Actor\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void moveBBs(class Vec3 const &); /** - * @symbol ?moveRelative\@Actor\@\@QEAAXMMMM\@Z + * @symbol ?moveRelative\@Actor\@\@QEAAXMMMM\@Z */ MCAPI void moveRelative(float, float, float, float); /** - * @symbol ?moveTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?moveTo\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI void moveTo(class Vec3 const &, class Vec2 const &); /** - * @symbol ?onAffectedByWaterBottle\@Actor\@\@QEAAXXZ + * @symbol ?onAffectedByWaterBottle\@Actor\@\@QEAAXXZ */ MCAPI void onAffectedByWaterBottle(); /** - * @symbol ?onClimbableBlock\@Actor\@\@QEBA_NXZ + * @symbol ?onClimbableBlock\@Actor\@\@QEBA_NXZ */ MCAPI bool onClimbableBlock() const; /** - * @symbol ?onHoverableBlock\@Actor\@\@QEBA_NXZ + * @symbol ?onHoverableBlock\@Actor\@\@QEBA_NXZ */ MCAPI bool onHoverableBlock() const; /** - * @symbol ?onOnewayCollision\@Actor\@\@QEAAXAEBVAABB\@\@\@Z + * @symbol ?onOnewayCollision\@Actor\@\@QEAAXAEBVAABB\@\@\@Z */ MCAPI void onOnewayCollision(class AABB const &); /** - * @symbol ??9Actor\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9Actor\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class Actor const &) const; /** - * @symbol ??8Actor\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8Actor\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class Actor const &) const; /** - * @symbol ?pickUpItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z + * @symbol ?pickUpItem\@Actor\@\@QEAAXAEAVItemActor\@\@H\@Z */ MCAPI void pickUpItem(class ItemActor &, int); /** - * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z + * @symbol ?playMovementSound\@Actor\@\@QEAAXXZ + */ + MCAPI void playMovementSound(); + /** + * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z */ MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, class Block const &); /** - * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z + * @symbol ?playSound\@Actor\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int); /** - * @symbol ?positionAllPassengers\@Actor\@\@QEAAXXZ + * @symbol ?playSound\@Actor\@\@QEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z + */ + MCAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int); + /** + * @symbol ?positionAllPassengers\@Actor\@\@QEAAXXZ */ MCAPI void positionAllPassengers(); /** - * @symbol ?postSplashGameEvent\@Actor\@\@QEAAXXZ + * @symbol ?postSplashGameEvent\@Actor\@\@QEAAXXZ */ MCAPI void postSplashGameEvent(); /** - * @symbol ?pullInEntity\@Actor\@\@QEAA_NAEAV1\@\@Z + * @symbol ?pullInEntity\@Actor\@\@QEAA_NAEAV1\@\@Z */ MCAPI bool pullInEntity(class Actor &); /** - * @symbol ?pushBackActionEventToActionQueue\@Actor\@\@QEAAXVActionEvent\@\@\@Z + * @symbol ?pushBackActionEventToActionQueue\@Actor\@\@QEAAXVActionEvent\@\@\@Z */ MCAPI void pushBackActionEventToActionQueue(class ActionEvent); /** - * @symbol ?queueBBUpdateFromDefinition\@Actor\@\@QEAAXXZ + * @symbol ?queueBBUpdateFromDefinition\@Actor\@\@QEAAXXZ */ MCAPI void queueBBUpdateFromDefinition(); /** - * @symbol ?queueBBUpdateFromValue\@Actor\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?queueBBUpdateFromValue\@Actor\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void queueBBUpdateFromValue(class Vec2 const &); /** - * @symbol ?refreshComponents\@Actor\@\@QEAAXXZ + * @symbol ?refreshComponents\@Actor\@\@QEAAXXZ */ MCAPI void refreshComponents(); /** - * @symbol ?reload\@Actor\@\@QEAAXXZ + * @symbol ?reload\@Actor\@\@QEAAXXZ */ MCAPI void reload(); /** - * @symbol ?removeAllEffects\@Actor\@\@QEAAXXZ + * @symbol ?removeAllEffects\@Actor\@\@QEAAXXZ */ MCAPI void removeAllEffects(); /** - * @symbol ?removeAllPassengers\@Actor\@\@QEAAX_N0\@Z + * @symbol ?removeAllPassengers\@Actor\@\@QEAAX_N0\@Z */ MCAPI void removeAllPassengers(bool, bool); /** - * @symbol ?removeDefinitionGroup\@Actor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeDefinitionGroup\@Actor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeDefinitionGroup(std::string const &); /** - * @symbol ?removeEffect\@Actor\@\@QEAAXH\@Z + * @symbol ?removeEffect\@Actor\@\@QEAAXH\@Z */ MCAPI void removeEffect(int); /** - * @symbol ?removePersistingTrade\@Actor\@\@QEAAXXZ + * @symbol ?removePersistingTrade\@Actor\@\@QEAAXXZ */ MCAPI void removePersistingTrade(); /** - * @symbol ?removeTag\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeTag\@Actor\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool removeTag(std::string const &); /** - * @symbol ?resetSlideYOffset\@Actor\@\@QEAAXXZ + * @symbol ?resetSlideYOffset\@Actor\@\@QEAAXXZ */ MCAPI void resetSlideYOffset(); /** - * @symbol ?saveEntityFlags\@Actor\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?saveEntityFlags\@Actor\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void saveEntityFlags(class CompoundTag &) const; /** - * @symbol ?saveLinks\@Actor\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?saveLinks\@Actor\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr saveLinks() const; /** - * @symbol ?savePersistingTrade\@Actor\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?savePersistingTrade\@Actor\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI void savePersistingTrade(std::unique_ptr, int); /** - * @symbol ?sendActorDefinitionEventTriggered\@Actor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?sendActorDefinitionEventTriggered\@Actor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void sendActorDefinitionEventTriggered(std::string const &); /** - * @symbol ?sendMotionToServer\@Actor\@\@QEAAXXZ + * @symbol ?sendMotionToServer\@Actor\@\@QEAAXXZ */ MCAPI void sendMotionToServer(); /** - * @symbol ?serializationSetHealth\@Actor\@\@QEAAXH\@Z + * @symbol ?serializationSetHealth\@Actor\@\@QEAAXH\@Z */ MCAPI void serializationSetHealth(int); /** - * @symbol ?setAABB\@Actor\@\@QEAAXAEBVAABB\@\@\@Z + * @symbol ?setAABB\@Actor\@\@QEAAXAEBVAABB\@\@\@Z */ MCAPI void setAABB(class AABB const &); /** - * @symbol ?setAABBDim\@Actor\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setAABBDim\@Actor\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setAABBDim(class Vec2 const &); /** - * @symbol ?setActorRendererId\@Actor\@\@QEAAXVHashedString\@\@\@Z + * @symbol ?setActorRendererId\@Actor\@\@QEAAXVHashedString\@\@\@Z */ MCAPI void setActorRendererId(class HashedString); /** - * @symbol ?setAutonomous\@Actor\@\@QEAAX_N\@Z + * @symbol ?setAutonomous\@Actor\@\@QEAAX_N\@Z */ MCAPI void setAutonomous(bool); /** - * @symbol ?setBaseDefinition\@Actor\@\@QEAAXAEBUActorDefinitionIdentifier\@\@_N1\@Z + * @symbol ?setBaseDefinition\@Actor\@\@QEAAXAEBUActorDefinitionIdentifier\@\@_N1\@Z */ MCAPI void setBaseDefinition(struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?setBlockTarget\@Actor\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setBlockTarget\@Actor\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setBlockTarget(class BlockPos const &); /** - * @symbol ?setBreakingObstruction\@Actor\@\@QEAAX_N\@Z + * @symbol ?setBreakingObstruction\@Actor\@\@QEAAX_N\@Z */ MCAPI void setBreakingObstruction(bool); /** - * @symbol ?setCanClimb\@Actor\@\@QEAAX_N\@Z + * @symbol ?setCanClimb\@Actor\@\@QEAAX_N\@Z */ MCAPI void setCanClimb(bool); /** - * @symbol ?setCanFly\@Actor\@\@QEAAX_N\@Z + * @symbol ?setCanFly\@Actor\@\@QEAAX_N\@Z */ MCAPI void setCanFly(bool); /** - * @symbol ?setChainedDamageEffects\@Actor\@\@QEAAX_N\@Z + * @symbol ?setChainedDamageEffects\@Actor\@\@QEAAX_N\@Z */ MCAPI void setChainedDamageEffects(bool); /** - * @symbol ?setCharged\@Actor\@\@QEAAX_N\@Z + * @symbol ?setCharged\@Actor\@\@QEAAX_N\@Z */ MCAPI void setCharged(bool); /** - * @symbol ?setClimbing\@Actor\@\@QEAAX_N\@Z + * @symbol ?setClimbing\@Actor\@\@QEAAX_N\@Z */ MCAPI void setClimbing(bool); /** - * @symbol ?setColor\@Actor\@\@QEAAXW4PaletteColor\@\@\@Z + * @symbol ?setColor\@Actor\@\@QEAAXW4PaletteColor\@\@\@Z */ MCAPI void setColor(enum class PaletteColor); /** - * @symbol ?setControllingSeat\@Actor\@\@QEAAXH\@Z + * @symbol ?setControllingSeat\@Actor\@\@QEAAXH\@Z */ MCAPI void setControllingSeat(int); /** - * @symbol ?setDancing\@Actor\@\@QEAAX_N\@Z + * @symbol ?setDancing\@Actor\@\@QEAAX_N\@Z */ MCAPI void setDancing(bool); /** - * @symbol ?setDead\@Actor\@\@QEAAX_N\@Z + * @symbol ?setDead\@Actor\@\@QEAAX_N\@Z */ MCAPI void setDead(bool); /** - * @symbol ?setDimension\@Actor\@\@QEAAXV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@\@Z + * @symbol ?setDimension\@Actor\@\@QEAAXV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@\@Z */ MCAPI void setDimension(class WeakRefT>); /** - * @symbol ?setDoorBreaker\@Actor\@\@QEAAX_N\@Z + * @symbol ?setDoorBreaker\@Actor\@\@QEAAX_N\@Z */ MCAPI void setDoorBreaker(bool); /** - * @symbol ?setDoorOpener\@Actor\@\@QEAAX_N\@Z + * @symbol ?setDoorOpener\@Actor\@\@QEAAX_N\@Z */ MCAPI void setDoorOpener(bool); /** - * @symbol ?setEnchanted\@Actor\@\@QEAAX_N\@Z + * @symbol ?setEnchanted\@Actor\@\@QEAAX_N\@Z */ MCAPI void setEnchanted(bool); /** - * @symbol ?setFallDistance\@Actor\@\@QEAAXM\@Z + * @symbol ?setFallDistance\@Actor\@\@QEAAXM\@Z */ MCAPI void setFallDistance(float); /** - * @symbol ?setFishingHookID\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setFishingHookID\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setFishingHookID(struct ActorUniqueID); /** - * @symbol ?setGlobal\@Actor\@\@QEAAX_N\@Z + * @symbol ?setGlobal\@Actor\@\@QEAAX_N\@Z */ MCAPI void setGlobal(bool); /** - * @symbol ?setHurtDir\@Actor\@\@QEAAXH\@Z + * @symbol ?setHurtDir\@Actor\@\@QEAAXH\@Z */ MCAPI void setHurtDir(int); /** - * @symbol ?setHurtTime\@Actor\@\@QEAAXH\@Z + * @symbol ?setHurtTime\@Actor\@\@QEAAXH\@Z */ MCAPI void setHurtTime(int); /** - * @symbol ?setInLove\@Actor\@\@QEAAXPEAV1\@\@Z + * @symbol ?setInLove\@Actor\@\@QEAAXPEAV1\@\@Z */ MCAPI void setInLove(class Actor *); /** - * @symbol ?setInterpolation\@Actor\@\@QEAAX_N\@Z + * @symbol ?setInterpolation\@Actor\@\@QEAAX_N\@Z */ MCAPI void setInterpolation(bool); /** - * @symbol ?setInvisible\@Actor\@\@QEAAX_N\@Z + * @symbol ?setInvisible\@Actor\@\@QEAAX_N\@Z */ MCAPI void setInvisible(bool); /** - * @symbol ?setIsExperienceDropEnabled\@Actor\@\@QEAAX_N\@Z + * @symbol ?setIsExperienceDropEnabled\@Actor\@\@QEAAX_N\@Z */ MCAPI void setIsExperienceDropEnabled(bool); /** - * @symbol ?setJumpDuration\@Actor\@\@QEAAXH\@Z + * @symbol ?setJumpDuration\@Actor\@\@QEAAXH\@Z */ MCAPI void setJumpDuration(int); /** - * @symbol ?setJumping\@Actor\@\@QEAAX_N\@Z + * @symbol ?setJumping\@Actor\@\@QEAAX_N\@Z */ MCAPI void setJumping(bool); /** - * @symbol ?setLastHitBB\@Actor\@\@QEAAXAEBVVec3\@\@0\@Z + * @symbol ?setLastHitBB\@Actor\@\@QEAAXAEBVVec3\@\@0\@Z */ MCAPI void setLastHitBB(class Vec3 const &, class Vec3 const &); /** - * @symbol ?setLayingDown\@Actor\@\@QEAAX_N\@Z + * @symbol ?setLayingDown\@Actor\@\@QEAAX_N\@Z */ MCAPI void setLayingDown(bool); /** - * @symbol ?setLeashHolder\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setLeashHolder\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setLeashHolder(struct ActorUniqueID); /** - * @symbol ?setLimitedLifetimeTicks\@Actor\@\@QEAAXH\@Z + * @symbol ?setLimitedLifetimeTicks\@Actor\@\@QEAAXH\@Z */ MCAPI void setLimitedLifetimeTicks(int); /** - * @symbol ?setMarkVariant\@Actor\@\@QEAAXH\@Z + * @symbol ?setMarkVariant\@Actor\@\@QEAAXH\@Z */ MCAPI void setMarkVariant(int); /** - * @symbol ?setMovedToLimbo\@Actor\@\@QEAAX_N\@Z + * @symbol ?setMovedToLimbo\@Actor\@\@QEAAX_N\@Z */ MCAPI void setMovedToLimbo(bool); /** - * @symbol ?setMovedToUnloadedChunk\@Actor\@\@QEAAX_N\@Z + * @symbol ?setMovedToUnloadedChunk\@Actor\@\@QEAAX_N\@Z */ MCAPI void setMovedToUnloadedChunk(bool); /** - * @symbol ?setMoving\@Actor\@\@QEAAX_N\@Z + * @symbol ?setMoving\@Actor\@\@QEAAX_N\@Z */ MCAPI void setMoving(bool); /** - * @symbol ?setPersistent\@Actor\@\@QEAAXXZ + * @symbol ?setPersistent\@Actor\@\@QEAAXXZ */ MCAPI void setPersistent(); /** - * @symbol ?setPosDirectLegacy\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setPosDirectLegacy\@Actor\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setPosDirectLegacy(class Vec3 const &); /** - * @symbol ?setPosPrev\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setPosPrev\@Actor\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setPosPrev(class Vec3 const &); /** - * @symbol ?setPrevPosRotSetThisTick\@Actor\@\@QEAAX_N\@Z + * @symbol ?setPrevPosRotSetThisTick\@Actor\@\@QEAAX_N\@Z */ MCAPI void setPrevPosRotSetThisTick(bool); /** - * @symbol ?setPreviousPosRot\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?setPreviousPosRot\@Actor\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI void setPreviousPosRot(class Vec3 const &, class Vec2 const &); /** - * @symbol ?setResting\@Actor\@\@QEAAX_N\@Z + * @symbol ?setResting\@Actor\@\@QEAAX_N\@Z */ MCAPI void setResting(bool); /** - * @symbol ?setRotationDirectly\@Actor\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setRotationDirectly\@Actor\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setRotationDirectly(class Vec2 const &); /** - * @symbol ?setRotationPrev\@Actor\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setRotationPrev\@Actor\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setRotationPrev(class Vec2 const &); /** - * @symbol ?setRotationPrevY\@Actor\@\@QEAAXM\@Z + * @symbol ?setRotationPrevY\@Actor\@\@QEAAXM\@Z */ MCAPI void setRotationPrevY(float); /** - * @symbol ?setRotationWrapped\@Actor\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setRotationWrapped\@Actor\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setRotationWrapped(class Vec2 const &); /** - * @symbol ?setRotationX\@Actor\@\@QEAAXM\@Z + * @symbol ?setRotationX\@Actor\@\@QEAAXM\@Z */ MCAPI void setRotationX(float); /** - * @symbol ?setRotationY\@Actor\@\@QEAAXM\@Z + * @symbol ?setRotationY\@Actor\@\@QEAAXM\@Z */ MCAPI void setRotationY(float); /** - * @symbol ?setRuntimeID\@Actor\@\@QEAAXVActorRuntimeID\@\@\@Z + * @symbol ?setRuntimeID\@Actor\@\@QEAAXVActorRuntimeID\@\@\@Z */ MCAPI void setRuntimeID(class ActorRuntimeID); /** - * @symbol ?setSaddle\@Actor\@\@QEAAX_N\@Z + * @symbol ?setSaddle\@Actor\@\@QEAAX_N\@Z */ MCAPI void setSaddle(bool); /** - * @symbol ?setScared\@Actor\@\@QEAAX_N\@Z + * @symbol ?setScared\@Actor\@\@QEAAX_N\@Z */ MCAPI void setScared(bool); /** - * @symbol ?setSeatDescription\@Actor\@\@QEAAXAEBVVec3\@\@AEBUSeatDescription\@\@\@Z + * @symbol ?setSeatDescription\@Actor\@\@QEAAXAEBVVec3\@\@AEBUSeatDescription\@\@\@Z */ MCAPI void setSeatDescription(class Vec3 const &, struct SeatDescription const &); /** - * @symbol ?setShakeTime\@Actor\@\@QEAAXH\@Z + * @symbol ?setShakeTime\@Actor\@\@QEAAXH\@Z */ MCAPI void setShakeTime(int); /** - * @symbol ?setSkinID\@Actor\@\@QEAAXH\@Z + * @symbol ?setSkinID\@Actor\@\@QEAAXH\@Z */ MCAPI void setSkinID(int); /** - * @symbol ?setSlideOffset\@Actor\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setSlideOffset\@Actor\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setSlideOffset(class Vec2 const &); /** - * @symbol ?setStrength\@Actor\@\@QEAAXH\@Z + * @symbol ?setStrength\@Actor\@\@QEAAXH\@Z */ MCAPI void setStrength(int); /** - * @symbol ?setStrengthMax\@Actor\@\@QEAAXH\@Z + * @symbol ?setStrengthMax\@Actor\@\@QEAAXH\@Z */ MCAPI void setStrengthMax(int); /** - * @symbol ?setStructuralIntegrity\@Actor\@\@QEAAXH\@Z + * @symbol ?setStructuralIntegrity\@Actor\@\@QEAAXH\@Z */ MCAPI void setStructuralIntegrity(int); /** - * @symbol ?setStunned\@Actor\@\@QEAAX_N\@Z + * @symbol ?setStunned\@Actor\@\@QEAAX_N\@Z */ MCAPI void setStunned(bool); /** - * @symbol ?setSwimmer\@Actor\@\@QEAAX_N\@Z + * @symbol ?setSwimmer\@Actor\@\@QEAAX_N\@Z */ MCAPI void setSwimmer(bool); /** - * @symbol ?setTempted\@Actor\@\@QEAAX_N\@Z + * @symbol ?setTempted\@Actor\@\@QEAAX_N\@Z */ MCAPI void setTempted(bool); /** - * @symbol ?setTradeInterest\@Actor\@\@QEAAX_N\@Z + * @symbol ?setTradeInterest\@Actor\@\@QEAAX_N\@Z */ MCAPI void setTradeInterest(bool); /** - * @symbol ?setTradingPlayer\@Actor\@\@QEAAXPEAVPlayer\@\@\@Z + * @symbol ?setTradingPlayer\@Actor\@\@QEAAXPEAVPlayer\@\@\@Z */ MCAPI void setTradingPlayer(class Player *); /** - * @symbol ?setUniqueID\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setUniqueID\@Actor\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setUniqueID(struct ActorUniqueID); /** - * @symbol ?setVariant\@Actor\@\@QEAAXH\@Z + * @symbol ?setVariant\@Actor\@\@QEAAXH\@Z */ MCAPI void setVariant(int); /** - * @symbol ?setVelocity\@Actor\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setVelocity\@Actor\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setVelocity(class Vec3 const &); /** - * @symbol ?setWASDControlled\@Actor\@\@QEAAX_N\@Z + * @symbol ?setWASDControlled\@Actor\@\@QEAAX_N\@Z */ MCAPI void setWASDControlled(bool); /** - * @symbol ?setWalker\@Actor\@\@QEAAX_N\@Z + * @symbol ?setWalker\@Actor\@\@QEAAX_N\@Z */ MCAPI void setWalker(bool); /** - * @symbol ?setYHeadRot\@Actor\@\@QEAAXM\@Z + * @symbol ?setYHeadRot\@Actor\@\@QEAAXM\@Z */ MCAPI void setYHeadRot(float); /** - * @symbol ?setYHeadRotO\@Actor\@\@QEAAXM\@Z + * @symbol ?setYHeadRotO\@Actor\@\@QEAAXM\@Z */ MCAPI void setYHeadRotO(float); /** - * @symbol ?setYHeadRotations\@Actor\@\@QEAAXMM\@Z + * @symbol ?setYHeadRotations\@Actor\@\@QEAAXMM\@Z */ MCAPI void setYHeadRotations(float, float); /** - * @symbol ?shouldOrphan\@Actor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?shouldOrphan\@Actor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool shouldOrphan(class BlockSource &); /** - * @symbol ?shouldUpdateEffects\@Actor\@\@QEBA_NXZ + * @symbol ?shouldUpdateEffects\@Actor\@\@QEBA_NXZ */ MCAPI bool shouldUpdateEffects() const; /** - * @symbol ?spawnEatParticles\@Actor\@\@QEAAXAEBVItemStack\@\@H\@Z + * @symbol ?spawnEatParticles\@Actor\@\@QEAAXAEBVItemStack\@\@H\@Z */ MCAPI void spawnEatParticles(class ItemStack const &, int); /** - * @symbol ?spinAttack\@Actor\@\@QEAAXXZ + * @symbol ?spinAttack\@Actor\@\@QEAAXXZ */ MCAPI void spinAttack(); /** - * @symbol ?teleportPassengersTo\@Actor\@\@QEAAXAEBVVec3\@\@HH\@Z + * @symbol ?teleportPassengersTo\@Actor\@\@QEAAXAEBVVec3\@\@HH\@Z */ MCAPI void teleportPassengersTo(class Vec3 const &, int, int); /** - * @symbol ?testForEntityStacking\@Actor\@\@QEAAXAEAVBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?testForEntityStacking\@Actor\@\@QEAAXAEAVBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void testForEntityStacking(class BlockSource &, class AABB const &, std::vector &); /** - * @symbol ?tick\@Actor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?tick\@Actor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool tick(class BlockSource &); /** - * @symbol ?transferTickingArea\@Actor\@\@QEAAXAEAVDimension\@\@\@Z + * @symbol ?transferTickingArea\@Actor\@\@QEAAXAEAVDimension\@\@\@Z */ MCAPI void transferTickingArea(class Dimension &); /** - * @symbol ?tryGetEquippableSlotAllowedItems\@Actor\@\@QEBAPEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?tryGetEquippableSlotAllowedItems\@Actor\@\@QEBAPEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI std::vector const * tryGetEquippableSlotAllowedItems(int) const; /** - * @symbol ?tryGetEquippableSlotForItem\@Actor\@\@QEBA?AV?$optional\@H\@std\@\@VItemDescriptor\@\@\@Z + * @symbol ?tryGetEquippableSlotForItem\@Actor\@\@QEBA?AV?$optional\@H\@std\@\@VItemDescriptor\@\@\@Z */ MCAPI class std::optional tryGetEquippableSlotForItem(class ItemDescriptor) const; /** - * @symbol ?updateAnimationComponentOnServer\@Actor\@\@QEAAXXZ + * @symbol ?updateAnimationComponentOnServer\@Actor\@\@QEAAXXZ */ MCAPI void updateAnimationComponentOnServer(); /** - * @symbol ?updateBBFromDefinition\@Actor\@\@QEAAXXZ - */ - MCAPI void updateBBFromDefinition(); - /** - * @symbol ?updateDescription\@Actor\@\@QEAAXXZ + * @symbol ?updateDescription\@Actor\@\@QEAAXXZ */ MCAPI void updateDescription(); /** - * @symbol ?updateInvisibilityStatus\@Actor\@\@QEAAXXZ + * @symbol ?updateInvisibilityStatus\@Actor\@\@QEAAXXZ */ MCAPI void updateInvisibilityStatus(); /** - * @symbol ?updateMolangVariables\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z + * @symbol ?updateMolangVariables\@Actor\@\@QEAAXAEAVRenderParams\@\@\@Z */ MCAPI void updateMolangVariables(class RenderParams &); /** - * @symbol ?updateTickingData\@Actor\@\@QEAAXXZ + * @symbol ?updateTickingData\@Actor\@\@QEAAXXZ */ MCAPI void updateTickingData(); /** - * @symbol ?useSaddle\@Actor\@\@QEAA_NAEAVItemStackBase\@\@PEAVPlayer\@\@\@Z + * @symbol ?useSaddle\@Actor\@\@QEAA_NAEAVItemStackBase\@\@PEAVPlayer\@\@\@Z */ MCAPI bool useSaddle(class ItemStackBase &, class Player *); /** - * @symbol ?wasLastHitByPlayer\@Actor\@\@QEAA_NXZ + * @symbol ?wasLastHitByPlayer\@Actor\@\@QEAA_NXZ */ MCAPI bool wasLastHitByPlayer(); /** - * @symbol ?wasLoadedFromNBTThisFrame\@Actor\@\@QEBA_NXZ + * @symbol ?wasLoadedFromNBTThisFrame\@Actor\@\@QEBA_NXZ */ MCAPI bool wasLoadedFromNBTThisFrame() const; /** - * @symbol ?_move\@Actor\@\@SAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z + * @symbol ?_move\@Actor\@\@SAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z */ MCAPI static void _move(struct IActorMovementProxy &, class Vec3 const &); /** - * @symbol ?buildForward\@Actor\@\@SA?AVVec3\@\@AEBUIActorMovementProxy\@\@\@Z + * @symbol ?_moveRelative\@Actor\@\@SAXAEAVVec3\@\@MMMMM\@Z */ - MCAPI static class Vec3 buildForward(struct IActorMovementProxy const &); + MCAPI static void _moveRelative(class Vec3 &, float, float, float, float, float); /** - * @symbol ?canBeginOrContinueClimbingLadder\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?buildForward\@Actor\@\@SA?AVVec3\@\@AEBUIActorMovementProxy\@\@\@Z */ - MCAPI static bool canBeginOrContinueClimbingLadder(struct IActorMovementProxy const &); + MCAPI static class Vec3 buildForward(struct IActorMovementProxy const &); /** - * @symbol ?canBeginOrContinueClimbingLadder\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?canBeginOrContinueClimbingLadder\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static bool canBeginOrContinueClimbingLadder(struct IActorMovementProxy const &, class IConstBlockSource const &); /** - * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBUIActorMovementProxy\@\@PEBU3\@\@Z + * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBVVec3\@\@VAABB\@\@AEBVIConstBlockSource\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ - MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(struct IActorMovementProxy const &, struct IActorMovementProxy const *); + MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(class Vec3 const &, class AABB, class IConstBlockSource const &, class optional_ref); /** - * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBVVec3\@\@VAABB\@\@AEBVIConstBlockSource\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?getBlockPosCurrentlyStandingOn\@Actor\@\@SA?AVBlockPos\@\@AEBUIActorMovementProxy\@\@PEBU3\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(class Vec3 const &, class AABB, class IConstBlockSource const &, class optional_ref); + MCAPI static class BlockPos getBlockPosCurrentlyStandingOn(struct IActorMovementProxy const &, struct IActorMovementProxy const *, class IConstBlockSource const &); /** - * @symbol ?getCenter\@Actor\@\@SA?AVVec3\@\@MAEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@M\@Z + * @symbol ?getCenter\@Actor\@\@SA?AVVec3\@\@MAEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@M\@Z */ MCAPI static class Vec3 getCenter(float, struct AABBShapeComponent const &, struct StateVectorComponent const &, float); /** - * @symbol ?getEffect\@Actor\@\@SAPEBVMobEffectInstance\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEBVMobEffect\@\@\@Z + * @symbol ?getEffect\@Actor\@\@SAPEBVMobEffectInstance\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEBVMobEffect\@\@\@Z */ MCAPI static class MobEffectInstance const * getEffect(std::vector const &, class MobEffect const &); /** - * @symbol ?getInterpolatedRotation\@Actor\@\@SA?AVVec2\@\@AEBV2\@0M\@Z + * @symbol ?getInterpolatedRotation\@Actor\@\@SA?AVVec2\@\@AEBV2\@0M\@Z */ MCAPI static class Vec2 getInterpolatedRotation(class Vec2 const &, class Vec2 const &, float); /** - * @symbol ?getLiquidAABB\@Actor\@\@SA?AVAABB\@\@AEBV2\@W4MaterialType\@\@\@Z + * @symbol ?getLiquidAABB\@Actor\@\@SA?AVAABB\@\@AEBV2\@W4MaterialType\@\@\@Z */ MCAPI static class AABB getLiquidAABB(class AABB const &, enum class MaterialType); /** - * @symbol ?getLiquidFlowStrength\@Actor\@\@SAMW4MaterialType\@\@\@Z + * @symbol ?getLiquidFlowStrength\@Actor\@\@SAMW4MaterialType\@\@\@Z */ MCAPI static float getLiquidFlowStrength(enum class MaterialType); /** - * @symbol ?getStatusFlag\@Actor\@\@SA_NAEBVSynchedActorData\@\@W4ActorFlags\@\@\@Z + * @symbol ?getStatusFlag\@Actor\@\@SA_NAEBVSynchedActorData\@\@W4ActorFlags\@\@\@Z */ MCAPI static bool getStatusFlag(class SynchedActorData const &, enum class ActorFlags); /** - * @symbol ?getViewVector\@Actor\@\@SA?AVVec3\@\@AEBUIActorMovementProxy\@\@M\@Z + * @symbol ?getViewVector\@Actor\@\@SA?AVVec3\@\@AEBUIActorMovementProxy\@\@M\@Z */ MCAPI static class Vec3 getViewVector(struct IActorMovementProxy const &, float); /** - * @symbol ?getViewVector\@Actor\@\@SA?AVVec3\@\@AEBVVec2\@\@0M\@Z + * @symbol ?getViewVector\@Actor\@\@SA?AVVec3\@\@AEBVVec2\@\@0M\@Z */ MCAPI static class Vec3 getViewVector(class Vec2 const &, class Vec2 const &, float); /** - * @symbol ?hasSubBBIn\@Actor\@\@SA_NAEBVIConstBlockSource\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@W4MaterialType\@\@\@Z + * @symbol ?hasSubBBIn\@Actor\@\@SA_NAEBVIConstBlockSource\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@W4MaterialType\@\@\@Z */ MCAPI static bool hasSubBBIn(class IConstBlockSource const &, std::vector const &, enum class MaterialType); /** - * @symbol ?isFree\@Actor\@\@SA_NAEAUIActorMovementProxy\@\@AEBVVec3\@\@M\@Z + * @symbol ?isFree\@Actor\@\@SA_NAEAUIActorMovementProxy\@\@AEBVVec3\@\@AEBVIConstBlockSource\@\@M\@Z */ - MCAPI static bool isFree(struct IActorMovementProxy &, class Vec3 const &, float); + MCAPI static bool isFree(struct IActorMovementProxy &, class Vec3 const &, class IConstBlockSource const &, float); /** - * @symbol ?isImmersedInWater\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isImmersedInWater\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isImmersedInWater(struct IActorMovementProxy const &); /** - * @symbol ?isImmobile\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isImmobile\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isImmobile(struct IActorMovementProxy const &); /** - * @symbol ?isInLava\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?isInLava\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static bool isInLava(struct IActorMovementProxy const &, class IConstBlockSource const &); /** - * @symbol ?isInLiquid\@Actor\@\@SA_NW4MaterialType\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI static bool isInLiquid(enum class MaterialType, class IConstBlockSource const &, class AABB const &, std::vector const &); - /** - * @symbol ?isInScaffolding\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isInScaffolding\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isInScaffolding(struct IActorMovementProxy const &); /** - * @symbol ?isSitting\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isSitting\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isSitting(struct IActorMovementProxy const &); /** - * @symbol ?isStanding\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isStanding\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isStanding(struct IActorMovementProxy const &); /** - * @symbol ?moveRelative\@Actor\@\@SAXAEAUIActorMovementProxy\@\@MMMM\@Z + * @symbol ?moveRelative\@Actor\@\@SAXAEAUIActorMovementProxy\@\@MMMM\@Z */ MCAPI static void moveRelative(struct IActorMovementProxy &, float, float, float, float); /** - * @symbol ?onClimbableBlock\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?onClimbableBlock\@Actor\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool onClimbableBlock(struct IActorMovementProxy const &); /** - * @symbol ?testForCollidableMobs\@Actor\@\@SAXAEBUIActorMovementProxy\@\@AEAVBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?testForCollidableMobs\@Actor\@\@SAXAEBUIActorMovementProxy\@\@AEAVBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void testForCollidableMobs(struct IActorMovementProxy const &, class BlockSource &, class AABB const &, std::vector &); /** - * @symbol ?tryGetFromComponent\@Actor\@\@SAPEAV1\@AEAVActorOwnerComponent\@\@_N\@Z + * @symbol ?tryGetFromComponent\@Actor\@\@SAPEAV1\@AEAVActorOwnerComponent\@\@_N\@Z */ MCAPI static class Actor * tryGetFromComponent(class ActorOwnerComponent &, bool); /** - * @symbol ?tryGetFromComponent\@Actor\@\@SAPEBV1\@AEBVActorOwnerComponent\@\@_N\@Z + * @symbol ?tryGetFromComponent\@Actor\@\@SAPEBV1\@AEBVActorOwnerComponent\@\@_N\@Z */ MCAPI static class Actor const * tryGetFromComponent(class ActorOwnerComponent const &, bool); /** - * @symbol ?tryGetFromEntity\@Actor\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Actor\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class Actor * tryGetFromEntity(class EntityContext &, bool); /** - * @symbol ?tryGetFromEntity\@Actor\@\@SAPEAV1\@AEBVStrictEntityContext\@\@AEAVEntityRegistry\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Actor\@\@SAPEBV1\@AEBVEntityContext\@\@_N\@Z */ - MCAPI static class Actor * tryGetFromEntity(class StrictEntityContext const &, class EntityRegistry &, bool); + MCAPI static class Actor const * tryGetFromEntity(class EntityContext const &, bool); /** - * @symbol ?tryGetFromEntity\@Actor\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Actor\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z */ MCAPI static class Actor * tryGetFromEntity(class StackRefResultT, bool); + /** + * @symbol ?tryGetFromEntity\@Actor\@\@SAPEAV1\@AEBVStrictEntityContext\@\@AEAVEntityRegistry\@\@_N\@Z + */ + MCAPI static class Actor * tryGetFromEntity(class StrictEntityContext const &, class EntityRegistry &, bool); //protected: /** - * @symbol ?_assignActorMovementProxy\@Actor\@\@IEAAXV?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@\@Z + * @symbol ?_assignActorMovementProxy\@Actor\@\@IEAAXV?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@\@Z */ MCAPI void _assignActorMovementProxy(class gsl::not_null>); /** - * @symbol ?_drop\@Actor\@\@IEAAPEBVItemActor\@\@AEBVItemStack\@\@_N\@Z + * @symbol ?_drop\@Actor\@\@IEAAPEBVItemActor\@\@AEBVItemStack\@\@_N\@Z */ MCAPI class ItemActor const * _drop(class ItemStack const &, bool); /** - * @symbol ?_getAllEffectsNonConst\@Actor\@\@IEAAAEAV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_getAllEffectsNonConst\@Actor\@\@IEAAAEAV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & _getAllEffectsNonConst(); /** - * @symbol ?_initializeMaxAutoStep\@Actor\@\@IEAAXM\@Z + * @symbol ?_initializeMaxAutoStep\@Actor\@\@IEAAXM\@Z */ MCAPI void _initializeMaxAutoStep(float); /** - * @symbol ?_isHeadInWater\@Actor\@\@IEBA_NXZ + * @symbol ?_isHeadInWater\@Actor\@\@IEBA_NXZ */ MCAPI bool _isHeadInWater() const; /** - * @symbol ?_playMovementSound\@Actor\@\@IEAAX_N\@Z - */ - MCAPI void _playMovementSound(bool); - /** - * @symbol ?_refreshAABB\@Actor\@\@IEAAXXZ + * @symbol ?_refreshAABB\@Actor\@\@IEAAXXZ */ MCAPI void _refreshAABB(); /** - * @symbol ?_setArmorContainer\@Actor\@\@IEAAXV?$unique_ptr\@VSimpleContainer\@\@U?$default_delete\@VSimpleContainer\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_setArmorContainer\@Actor\@\@IEAAXV?$unique_ptr\@VSimpleContainer\@\@U?$default_delete\@VSimpleContainer\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _setArmorContainer(std::unique_ptr); /** - * @symbol ?_setDimensionTransitionComponent\@Actor\@\@IEAAXV?$AutomaticID\@VDimension\@\@H\@\@0H\@Z + * @symbol ?_setDimensionTransitionComponent\@Actor\@\@IEAAXV?$AutomaticID\@VDimension\@\@H\@\@0H\@Z */ MCAPI void _setDimensionTransitionComponent(class AutomaticID, class AutomaticID, int); /** - * @symbol ?_setHandContainer\@Actor\@\@IEAAXV?$unique_ptr\@VSimpleContainer\@\@U?$default_delete\@VSimpleContainer\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_setHandContainer\@Actor\@\@IEAAXV?$unique_ptr\@VSimpleContainer\@\@U?$default_delete\@VSimpleContainer\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _setHandContainer(std::unique_ptr); /** - * @symbol ?_setHandContainerItem\@Actor\@\@IEAAXAEBVItemStack\@\@W4HandSlot\@\@\@Z + * @symbol ?_setHandContainerItem\@Actor\@\@IEAAXAEBVItemStack\@\@W4HandSlot\@\@\@Z */ MCAPI void _setHandContainerItem(class ItemStack const &, enum class HandSlot); /** - * @symbol ?_setHeightOffset\@Actor\@\@IEAAXM\@Z + * @symbol ?_setHeightOffset\@Actor\@\@IEAAXM\@Z */ MCAPI void _setHeightOffset(float); /** - * @symbol ?_setPos\@Actor\@\@IEAAXAEBVVec3\@\@\@Z + * @symbol ?_setPos\@Actor\@\@IEAAXAEBVVec3\@\@\@Z */ MCAPI void _setPos(class Vec3 const &); /** - * @symbol ?_setPosPrev\@Actor\@\@IEAAXAEBVVec3\@\@\@Z + * @symbol ?_setPosPrev\@Actor\@\@IEAAXAEBVVec3\@\@\@Z */ MCAPI void _setPosPrev(class Vec3 const &); /** - * @symbol ?enableAutoSendPosRot\@Actor\@\@IEAAX_N\@Z + * @symbol ?enableAutoSendPosRot\@Actor\@\@IEAAX_N\@Z */ MCAPI void enableAutoSendPosRot(bool); /** - * @symbol ?updateWaterState\@Actor\@\@IEAA_NXZ + * @symbol ?updateWaterState\@Actor\@\@IEAA_NXZ */ MCAPI bool updateWaterState(); /** - * @symbol ?getBlockWhenClimbing\@Actor\@\@KAAEBVBlock\@\@AEBUIActorMovementProxy\@\@\@Z + * @symbol ?getBlockWhenClimbing\@Actor\@\@KAAEBVBlock\@\@AEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static class Block const & getBlockWhenClimbing(struct IActorMovementProxy const &); + MCAPI static class Block const & getBlockWhenClimbing(struct IActorMovementProxy const &, class IConstBlockSource const &); /** - * @symbol ?getBlockWhenClimbing\@Actor\@\@KAAEBVBlock\@\@AEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?getBlockWhenClimbing\@Actor\@\@KAAEBVBlock\@\@AEBUIActorMovementProxy\@\@\@Z */ - MCAPI static class Block const & getBlockWhenClimbing(struct IActorMovementProxy const &, class IConstBlockSource const &); + MCAPI static class Block const & getBlockWhenClimbing(struct IActorMovementProxy const &); //private: /** - * @symbol ?_addActorBuiltInComponents\@Actor\@\@AEAA?AUBuiltInActorComponents\@\@XZ + * @symbol ?_addActorBuiltInComponents\@Actor\@\@AEAA?AUBuiltInActorComponents\@\@XZ */ MCAPI struct BuiltInActorComponents _addActorBuiltInComponents(); /** - * @symbol ?_addActorNonBuiltInComponents\@Actor\@\@AEAAXXZ + * @symbol ?_addActorNonBuiltInComponents\@Actor\@\@AEAAXXZ */ MCAPI void _addActorNonBuiltInComponents(); /** - * @symbol ?_damageNearbyMobs\@Actor\@\@AEAAXXZ + * @symbol ?_damageNearbyMobs\@Actor\@\@AEAAXXZ */ MCAPI void _damageNearbyMobs(); /** - * @symbol ?_defaultInitEquipmentDropChances\@Actor\@\@AEAAXXZ + * @symbol ?_defaultInitEquipmentDropChances\@Actor\@\@AEAAXXZ */ MCAPI void _defaultInitEquipmentDropChances(); /** - * @symbol ?_initializeLeashRopeSystem\@Actor\@\@AEAAXPEAV1\@\@Z + * @symbol ?_initializeLeashRopeSystem\@Actor\@\@AEAAXPEAV1\@\@Z */ MCAPI void _initializeLeashRopeSystem(class Actor *); /** - * @symbol ?_isItemStackNetManagerEnabled\@Actor\@\@AEBA_NXZ + * @symbol ?_isItemStackNetManagerEnabled\@Actor\@\@AEBA_NXZ */ MCAPI bool _isItemStackNetManagerEnabled() const; /** - * @symbol ?_onVibrationDetected\@Actor\@\@AEAAXXZ + * @symbol ?_onVibrationDetected\@Actor\@\@AEAAXXZ */ MCAPI void _onVibrationDetected(); /** - * @symbol ?_serializeComponents\@Actor\@\@AEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?_serializeComponents\@Actor\@\@AEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void _serializeComponents(class CompoundTag &) const; /** - * @symbol ?_setupServerAnimationComponent\@Actor\@\@AEAAXXZ + * @symbol ?_setupServerAnimationComponent\@Actor\@\@AEAAXXZ */ MCAPI void _setupServerAnimationComponent(); /** - * @symbol ?_tryPlantWitherRose\@Actor\@\@AEAAXXZ + * @symbol ?_tryPlantWitherRose\@Actor\@\@AEAAXXZ */ MCAPI void _tryPlantWitherRose(); /** - * @symbol ?_updateComposition\@Actor\@\@AEAAX_N\@Z + * @symbol ?_updateComposition\@Actor\@\@AEAAX_N\@Z */ MCAPI void _updateComposition(bool); /** - * @symbol ?_updateOwnerChunk\@Actor\@\@AEAAXXZ + * @symbol ?_updateOwnerChunk\@Actor\@\@AEAAXXZ */ MCAPI void _updateOwnerChunk(); /** - * @symbol ?_containsSneakCollisionShapes\@Actor\@\@CA_NAEAUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_containsSneakCollisionShapes\@Actor\@\@CA_NAEAUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static bool _containsSneakCollisionShapes(struct IActorMovementProxy &, class IConstBlockSource const &, class AABB const &, std::vector &); @@ -3370,16 +3373,16 @@ class Actor { private: /** - * @symbol ?DAMAGE_NEARBY_MOBS_DURATION\@Actor\@\@0HB + * @symbol ?DAMAGE_NEARBY_MOBS_DURATION\@Actor\@\@0HB */ MCAPI static int const DAMAGE_NEARBY_MOBS_DURATION; /** - * @symbol ?DEFAULT_MAX_DISTANCE_OPTIMIZATION\@Actor\@\@0MB + * @symbol ?DEFAULT_MAX_DISTANCE_OPTIMIZATION\@Actor\@\@0MB */ MCAPI static float const DEFAULT_MAX_DISTANCE_OPTIMIZATION; /** - * @symbol ?DEFAULT_MAX_TICK_DELAY_OPTIMIZATION\@Actor\@\@0_KB + * @symbol ?DEFAULT_MAX_TICK_DELAY_OPTIMIZATION\@Actor\@\@0_KB */ MCAPI static unsigned __int64 const DEFAULT_MAX_TICK_DELAY_OPTIMIZATION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAcquiredItemEvent.hpp b/LiteLoader/include/llapi/mc/ActorAcquiredItemEvent.hpp index dd6e4e9d07..dc3d528e32 100644 --- a/LiteLoader/include/llapi/mc/ActorAcquiredItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAcquiredItemEvent.hpp @@ -27,11 +27,11 @@ struct ActorAcquiredItemEvent { public: /** - * @symbol ??0ActorAcquiredItemEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorAcquiredItemEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorAcquiredItemEvent(struct ActorAcquiredItemEvent const &); /** - * @symbol ??1ActorAcquiredItemEvent\@\@QEAA\@XZ + * @symbol ??1ActorAcquiredItemEvent\@\@QEAA\@XZ */ MCAPI ~ActorAcquiredItemEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp index 1616ff8dc2..6367296d39 100644 --- a/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAddEffectEvent.hpp @@ -25,7 +25,7 @@ struct ActorAddEffectEvent { public: /** - * @symbol ??1ActorAddEffectEvent\@\@QEAA\@XZ + * @symbol ??1ActorAddEffectEvent\@\@QEAA\@XZ */ MCAPI ~ActorAddEffectEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp b/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp index c6b6862d90..b677bc1071 100644 --- a/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp +++ b/LiteLoader/include/llapi/mc/ActorAliasDescription.hpp @@ -12,11 +12,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ActorAliasDescription. - * - */ -struct ActorAliasDescription { + +class ActorAliasDescription { #define AFTER_EXTRA // Add Member There @@ -24,32 +21,35 @@ struct ActorAliasDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORALIASDESCRIPTION public: - ActorAliasDescription(struct ActorAliasDescription const &) = delete; + class ActorAliasDescription& operator=(class ActorAliasDescription const &) = delete; + ActorAliasDescription(class ActorAliasDescription const &) = delete; ActorAliasDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorAliasDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getJsonName\@ActorAliasDescription\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?getJsonName\@ActorAliasDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORALIASDESCRIPTION /** - * @symbol ?getAliasInfo\@ActorAliasDescription\@\@QEBAPEBUAliasInfoDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI struct AliasInfoDescription const * getAliasInfo(std::string const &) const; + MCVAPI ~ActorAliasDescription(); +#endif /** - * @symbol ??4ActorAliasDescription\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ?getAliasInfo\@ActorAliasDescription\@\@QEBAPEBUAliasInfoDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI struct ActorAliasDescription & operator=(struct ActorAliasDescription const &); + MCAPI struct AliasInfoDescription const * getAliasInfo(std::string const &) const; /** - * @symbol ?parse\@ActorAliasDescription\@\@QEAAXAEAVValue\@Json\@\@_N\@Z + * @symbol ?parse\@ActorAliasDescription\@\@QEAAXAEAVValue\@Json\@\@_N\@Z */ MCAPI void parse(class Json::Value &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationController.hpp b/LiteLoader/include/llapi/mc/ActorAnimationController.hpp index ac4a9979f1..317ab91e7d 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationController.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationController.hpp @@ -30,20 +30,20 @@ class ActorAnimationController { public: /** - * @symbol ??0ActorAnimationController\@\@QEAA\@AEBVHashedString\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ActorAnimationController\@\@QEAA\@AEBVHashedString\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ActorAnimationController(class HashedString const &, class SemVersion const &, std::string const &); /** - * @symbol ?addState\@ActorAnimationController\@\@QEAAAEAV?$shared_ptr\@VActorAnimationControllerState\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @symbol ?addState\@ActorAnimationController\@\@QEAAAEAV?$shared_ptr\@VActorAnimationControllerState\@\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI class std::shared_ptr & addState(class HashedString const &); /** - * @symbol ?findStateIndex\@ActorAnimationController\@\@QEBA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N_K\@Z + * @symbol ?findStateIndex\@ActorAnimationController\@\@QEBA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N_K\@Z */ MCAPI unsigned __int64 findStateIndex(std::string const &, bool, unsigned __int64) const; /** - * @symbol ?resolveTransitionStateIndices\@ActorAnimationController\@\@QEAAXXZ + * @symbol ?resolveTransitionStateIndices\@ActorAnimationController\@\@QEAAXXZ */ MCAPI void resolveTransitionStateIndices(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp index d9648ae2cf..cea94a629a 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerGroup.hpp @@ -32,48 +32,48 @@ class ActorAnimationControllerGroup { public: /** - * @symbol ??0ActorAnimationControllerGroup\@\@QEAA\@XZ + * @symbol ??0ActorAnimationControllerGroup\@\@QEAA\@XZ */ MCAPI ActorAnimationControllerGroup(); /** - * @symbol ?getActorAnimationController\@ActorAnimationControllerGroup\@\@QEAA?AVActorAnimationControllerPtr\@\@AEBVHashedString\@\@\@Z + * @symbol ?getActorAnimationController\@ActorAnimationControllerGroup\@\@QEAA?AVActorAnimationControllerPtr\@\@AEBVHashedString\@\@\@Z */ MCAPI class ActorAnimationControllerPtr getActorAnimationController(class HashedString const &); /** - * @symbol ?getActorAnimationControllerInfo\@ActorAnimationControllerGroup\@\@QEAA?AV?$shared_ptr\@VActorAnimationControllerInfo\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @symbol ?getActorAnimationControllerInfo\@ActorAnimationControllerGroup\@\@QEAA?AV?$shared_ptr\@VActorAnimationControllerInfo\@\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI class std::shared_ptr getActorAnimationControllerInfo(class HashedString const &); /** - * @symbol ?loadActorAnimationControllersSync\@ActorAnimationControllerGroup\@\@QEAAXAEAVResourcePackManager\@\@\@Z + * @symbol ?loadActorAnimationControllersSync\@ActorAnimationControllerGroup\@\@QEAAXAEAVResourcePackManager\@\@\@Z */ MCAPI void loadActorAnimationControllersSync(class ResourcePackManager &); /** - * @symbol ??1ActorAnimationControllerGroup\@\@QEAA\@XZ + * @symbol ??1ActorAnimationControllerGroup\@\@QEAA\@XZ */ MCAPI ~ActorAnimationControllerGroup(); /** - * @symbol ?loadFormatVersion\@ActorAnimationControllerGroup\@\@SA_NAEBVValue\@Json\@\@AEAVSemVersion\@\@\@Z + * @symbol ?loadFormatVersion\@ActorAnimationControllerGroup\@\@SA_NAEBVValue\@Json\@\@AEAVSemVersion\@\@\@Z */ MCAPI static bool loadFormatVersion(class Json::Value const &, class SemVersion &); //private: /** - * @symbol ?_loadActorAnimationController\@ActorAnimationControllerGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@W4CurrentCmdVersion\@\@\@Z + * @symbol ?_loadActorAnimationController\@ActorAnimationControllerGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI void _loadActorAnimationController(std::string const &, class Core::Path const &, enum class CurrentCmdVersion); /** - * @symbol ?_buildAnimationControllerFileSchema_v1_10_Or_Later\@ActorAnimationControllerGroup\@\@CA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorAnimationControllerGroupParseMetaData\@\@\@JsonUtil\@\@\@std\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_buildAnimationControllerFileSchema_v1_10_Or_Later\@ActorAnimationControllerGroup\@\@CA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorAnimationControllerGroupParseMetaData\@\@\@JsonUtil\@\@\@std\@\@AEBVSemVersion\@\@\@Z */ MCAPI static class std::shared_ptr> _buildAnimationControllerFileSchema_v1_10_Or_Later(class SemVersion const &); /** - * @symbol ?_buildAnimationControllerFileSchema_v1_8\@ActorAnimationControllerGroup\@\@CA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@_N\@JsonUtil\@\@\@std\@\@XZ + * @symbol ?_buildAnimationControllerFileSchema_v1_8\@ActorAnimationControllerGroup\@\@CA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@_N\@JsonUtil\@\@\@std\@\@XZ */ MCAPI static class std::shared_ptr> _buildAnimationControllerFileSchema_v1_8(); /** - * @symbol ?upgrade_v1_8_to_v1_10\@ActorAnimationControllerGroup\@\@CA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?upgrade_v1_8_to_v1_10\@ActorAnimationControllerGroup\@\@CA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI static bool upgrade_v1_8_to_v1_10(class Json::Value &, class SemVersion const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp index e629a540b2..428ad0f470 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerPlayer.hpp @@ -30,66 +30,66 @@ class ActorAnimationControllerPlayer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorAnimationControllerPlayer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applyToPose\@ActorAnimationControllerPlayer\@\@UEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z + * @vftbl 1 + * @symbol ?applyToPose\@ActorAnimationControllerPlayer\@\@UEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z */ virtual void applyToPose(class RenderParams &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, float); /** - * @vftbl 2 - * @symbol ?resetAnimation\@ActorAnimationControllerPlayer\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?resetAnimation\@ActorAnimationControllerPlayer\@\@UEAAXXZ */ virtual void resetAnimation(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?bindParticleEffects\@ActorAnimationControllerPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?bindParticleEffects\@ActorAnimationControllerPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual void bindParticleEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @vftbl 5 - * @symbol ?bindSoundEffects\@ActorAnimationControllerPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?bindSoundEffects\@ActorAnimationControllerPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual void bindSoundEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @vftbl 6 - * @symbol ?hasAnimationFinished\@ActorAnimationControllerPlayer\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?hasAnimationFinished\@ActorAnimationControllerPlayer\@\@UEBA_NXZ */ virtual bool hasAnimationFinished() const; /** - * @vftbl 7 - * @symbol ?findAnimation\@ActorAnimationControllerPlayer\@\@UEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @vftbl 7 + * @symbol ?findAnimation\@ActorAnimationControllerPlayer\@\@UEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@\@Z */ virtual class std::shared_ptr findAnimation(class HashedString const &); /** - * @vftbl 8 - * @symbol ?getAnimationType\@ActorAnimationControllerPlayer\@\@UEBA?AW4ActorAnimationType\@\@XZ + * @vftbl 8 + * @symbol ?getAnimationType\@ActorAnimationControllerPlayer\@\@UEBA?AW4ActorAnimationType\@\@XZ */ virtual enum class ActorAnimationType getAnimationType() const; /** - * @vftbl 9 - * @symbol ?getRawName\@ActorAnimationControllerPlayer\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 9 + * @symbol ?getRawName\@ActorAnimationControllerPlayer\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getRawName() const; /** - * @symbol ??0ActorAnimationControllerPlayer\@\@QEAA\@AEBVHashedString\@\@AEBVActorAnimationControllerPtr\@\@AEAVAnimationComponent\@\@AEBVExpressionNode\@\@AEAV?$set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@V?$allocator\@VHashedString\@\@\@3\@\@std\@\@\@Z + * @symbol ??0ActorAnimationControllerPlayer\@\@QEAA\@AEBVHashedString\@\@AEBVActorAnimationControllerPtr\@\@AEAVAnimationComponent\@\@AEBVExpressionNode\@\@AEAV?$set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@V?$allocator\@VHashedString\@\@\@3\@\@std\@\@\@Z */ MCAPI ActorAnimationControllerPlayer(class HashedString const &, class ActorAnimationControllerPtr const &, class AnimationComponent &, class ExpressionNode const &, class std::set, class std::allocator> &); /** - * @symbol ?applyStateAnimationToPose\@ActorAnimationControllerPlayer\@\@QEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z + * @symbol ?applyStateAnimationToPose\@ActorAnimationControllerPlayer\@\@QEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z */ MCAPI void applyStateAnimationToPose(class RenderParams &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, float); /** - * @symbol ?blendViaShortestPath\@ActorAnimationControllerPlayer\@\@QEAAXAEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@00MM\@Z + * @symbol ?blendViaShortestPath\@ActorAnimationControllerPlayer\@\@QEAAXAEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@00MM\@Z */ MCAPI void blendViaShortestPath(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp index faa3b531b8..b2e6057063 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerPtr.hpp @@ -30,32 +30,32 @@ class ActorAnimationControllerPtr { public: /** - * @symbol ??0ActorAnimationControllerPtr\@\@QEAA\@AEAVActorAnimationControllerGroup\@\@AEBVHashedString\@\@\@Z + * @symbol ??0ActorAnimationControllerPtr\@\@QEAA\@AEAVActorAnimationControllerGroup\@\@AEBVHashedString\@\@\@Z */ MCAPI ActorAnimationControllerPtr(class ActorAnimationControllerGroup &, class HashedString const &); /** - * @symbol ?getName\@ActorAnimationControllerPtr\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getName\@ActorAnimationControllerPtr\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getName() const; /** - * @symbol ?isNull\@ActorAnimationControllerPtr\@\@QEBA_NXZ + * @symbol ?isNull\@ActorAnimationControllerPtr\@\@QEBA_NXZ */ MCAPI bool isNull() const; /** - * @symbol ??CActorAnimationControllerPtr\@\@QEBAPEBVActorAnimationController\@\@XZ + * @symbol ??CActorAnimationControllerPtr\@\@QEBAPEBVActorAnimationController\@\@XZ */ MCAPI class ActorAnimationController const * operator->() const; /** - * @symbol ??CActorAnimationControllerPtr\@\@QEAAPEAVActorAnimationController\@\@XZ + * @symbol ??CActorAnimationControllerPtr\@\@QEAAPEAVActorAnimationController\@\@XZ */ MCAPI class ActorAnimationController * operator->(); /** - * @symbol ??1ActorAnimationControllerPtr\@\@QEAA\@XZ + * @symbol ??1ActorAnimationControllerPtr\@\@QEAA\@XZ */ MCAPI ~ActorAnimationControllerPtr(); /** - * @symbol ?NONE\@ActorAnimationControllerPtr\@\@2V1\@B + * @symbol ?NONE\@ActorAnimationControllerPtr\@\@2V1\@B */ MCAPI static class ActorAnimationControllerPtr const NONE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp index 224338ad1f..b6d3bff2fb 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerState.hpp @@ -30,48 +30,48 @@ class ActorAnimationControllerState { public: /** - * @symbol ?addAnimation\@ActorAnimationControllerState\@\@QEAAXAEBVHashedString\@\@\@Z + * @symbol ?addAnimation\@ActorAnimationControllerState\@\@QEAAXAEBVHashedString\@\@AEBVExpressionNode\@\@\@Z */ - MCAPI void addAnimation(class HashedString const &); + MCAPI void addAnimation(class HashedString const &, class ExpressionNode const &); /** - * @symbol ?addAnimation\@ActorAnimationControllerState\@\@QEAAXAEBVHashedString\@\@AEBVExpressionNode\@\@\@Z + * @symbol ?addAnimation\@ActorAnimationControllerState\@\@QEAAXAEBVHashedString\@\@\@Z */ - MCAPI void addAnimation(class HashedString const &, class ExpressionNode const &); + MCAPI void addAnimation(class HashedString const &); /** - * @symbol ?addBlendTransitionKeyFrame\@ActorAnimationControllerState\@\@QEAAXMM\@Z + * @symbol ?addBlendTransitionKeyFrame\@ActorAnimationControllerState\@\@QEAAXMM\@Z */ MCAPI void addBlendTransitionKeyFrame(float, float); /** - * @symbol ?addEntryActorEvent\@ActorAnimationControllerState\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z + * @symbol ?addEntryActorEvent\@ActorAnimationControllerState\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z */ MCAPI class ActorAnimationEvent & addEntryActorEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); /** - * @symbol ?addExitActorEvent\@ActorAnimationControllerState\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z + * @symbol ?addExitActorEvent\@ActorAnimationControllerState\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z */ MCAPI class ActorAnimationEvent & addExitActorEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); /** - * @symbol ?addParticleEffect\@ActorAnimationControllerState\@\@QEAAAEAVActorParticleEffect\@\@XZ + * @symbol ?addParticleEffect\@ActorAnimationControllerState\@\@QEAAAEAVActorParticleEffect\@\@XZ */ MCAPI class ActorParticleEffect & addParticleEffect(); /** - * @symbol ?addSoundEffect\@ActorAnimationControllerState\@\@QEAAAEAVActorSoundEffect\@\@XZ + * @symbol ?addSoundEffect\@ActorAnimationControllerState\@\@QEAAAEAVActorSoundEffect\@\@XZ */ MCAPI class ActorSoundEffect & addSoundEffect(); /** - * @symbol ?addTransition\@ActorAnimationControllerState\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4MolangVersion\@\@_N\@Z + * @symbol ?addTransition\@ActorAnimationControllerState\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4MolangVersion\@\@_N\@Z */ MCAPI void addTransition(std::string const &, std::string const &, enum class MolangVersion, bool); /** - * @symbol ?addVariable\@ActorAnimationControllerState\@\@QEAAAEAVStateAnimationVariable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addVariable\@ActorAnimationControllerState\@\@QEAAAEAVStateAnimationVariable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StateAnimationVariable & addVariable(std::string const &); /** - * @symbol ?setBlendTransitionTime\@ActorAnimationControllerState\@\@QEAAXM\@Z + * @symbol ?setBlendTransitionTime\@ActorAnimationControllerState\@\@QEAAXM\@Z */ MCAPI void setBlendTransitionTime(float); /** - * @symbol ?setVariables\@ActorAnimationControllerState\@\@QEBAXAEAVRenderParams\@\@\@Z + * @symbol ?setVariables\@ActorAnimationControllerState\@\@QEBAXAEAVRenderParams\@\@\@Z */ MCAPI void setVariables(class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp index 785eeb4142..44e5c13f70 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationControllerStatePlayer.hpp @@ -30,76 +30,76 @@ class ActorAnimationControllerStatePlayer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorAnimationControllerStatePlayer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applyToPose\@ActorAnimationControllerStatePlayer\@\@UEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z + * @vftbl 1 + * @symbol ?applyToPose\@ActorAnimationControllerStatePlayer\@\@UEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z */ virtual void applyToPose(class RenderParams &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, float); /** - * @vftbl 2 - * @symbol ?resetAnimation\@ActorAnimationControllerStatePlayer\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?resetAnimation\@ActorAnimationControllerStatePlayer\@\@UEAAXXZ */ virtual void resetAnimation(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?hasAnimationFinished\@ActorAnimationControllerStatePlayer\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?hasAnimationFinished\@ActorAnimationControllerStatePlayer\@\@UEBA_NXZ */ virtual bool hasAnimationFinished() const; /** - * @vftbl 7 - * @symbol ?findAnimation\@ActorAnimationControllerStatePlayer\@\@UEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @vftbl 7 + * @symbol ?findAnimation\@ActorAnimationControllerStatePlayer\@\@UEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@\@Z */ virtual class std::shared_ptr findAnimation(class HashedString const &); /** - * @vftbl 8 - * @symbol ?getAnimationType\@ActorAnimationControllerStatePlayer\@\@UEBA?AW4ActorAnimationType\@\@XZ + * @vftbl 8 + * @symbol ?getAnimationType\@ActorAnimationControllerStatePlayer\@\@UEBA?AW4ActorAnimationType\@\@XZ */ virtual enum class ActorAnimationType getAnimationType() const; /** - * @vftbl 9 - * @symbol ?getRawName\@ActorAnimationControllerStatePlayer\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 9 + * @symbol ?getRawName\@ActorAnimationControllerStatePlayer\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getRawName() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORANIMATIONCONTROLLERSTATEPLAYER /** - * @symbol ?bindParticleEffects\@ActorAnimationControllerStatePlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?bindParticleEffects\@ActorAnimationControllerStatePlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z */ MCVAPI void bindParticleEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?bindSoundEffects\@ActorAnimationControllerStatePlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?bindSoundEffects\@ActorAnimationControllerStatePlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCVAPI void bindSoundEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); #endif /** - * @symbol ??0ActorAnimationControllerStatePlayer\@\@QEAA\@AEBVHashedString\@\@AEAVActorAnimationControllerPlayer\@\@V?$shared_ptr\@VActorAnimationControllerState\@\@\@std\@\@AEAVAnimationComponent\@\@AEBVExpressionNode\@\@AEAV?$set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@V?$allocator\@VHashedString\@\@\@3\@\@4\@\@Z + * @symbol ??0ActorAnimationControllerStatePlayer\@\@QEAA\@AEBVHashedString\@\@AEAVActorAnimationControllerPlayer\@\@V?$shared_ptr\@VActorAnimationControllerState\@\@\@std\@\@AEAVAnimationComponent\@\@AEBVExpressionNode\@\@AEAV?$set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@V?$allocator\@VHashedString\@\@\@3\@\@4\@\@Z */ MCAPI ActorAnimationControllerStatePlayer(class HashedString const &, class ActorAnimationControllerPlayer &, class std::shared_ptr, class AnimationComponent &, class ExpressionNode const &, class std::set, class std::allocator> &); /** - * @symbol ?allAnimationsFinished\@ActorAnimationControllerStatePlayer\@\@QEBA_NXZ + * @symbol ?allAnimationsFinished\@ActorAnimationControllerStatePlayer\@\@QEBA_NXZ */ MCAPI bool allAnimationsFinished() const; /** - * @symbol ?anyAnimationsFinished\@ActorAnimationControllerStatePlayer\@\@QEBA_NXZ + * @symbol ?anyAnimationsFinished\@ActorAnimationControllerStatePlayer\@\@QEBA_NXZ */ MCAPI bool anyAnimationsFinished() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp index dd2ad410d7..2377178b35 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationEvent.hpp @@ -30,20 +30,20 @@ class ActorAnimationEvent { public: /** - * @symbol ??0ActorAnimationEvent\@\@QEAA\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z + * @symbol ??0ActorAnimationEvent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ActorAnimationEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); + MCAPI ActorAnimationEvent(class ActorAnimationEvent &&); /** - * @symbol ??0ActorAnimationEvent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ActorAnimationEvent\@\@QEAA\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z */ - MCAPI ActorAnimationEvent(class ActorAnimationEvent &&); + MCAPI ActorAnimationEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); /** - * @symbol ?fire\@ActorAnimationEvent\@\@QEBAXAEAVRenderParams\@\@PEAVActor\@\@\@Z + * @symbol ?fire\@ActorAnimationEvent\@\@QEBAXAEAVRenderParams\@\@PEAVActor\@\@\@Z */ MCAPI void fire(class RenderParams &, class Actor *) const; /** - * @symbol ??1ActorAnimationEvent\@\@QEAA\@XZ + * @symbol ??1ActorAnimationEvent\@\@QEAA\@XZ */ MCAPI ~ActorAnimationEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp b/LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp index c37ea322c4..fb1465f2ba 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationGroup.hpp @@ -30,24 +30,24 @@ class ActorAnimationGroup { public: /** - * @symbol ??0ActorAnimationGroup\@\@QEAA\@XZ + * @symbol ??0ActorAnimationGroup\@\@QEAA\@XZ */ MCAPI ActorAnimationGroup(); /** - * @symbol ?getActorAnimation\@ActorAnimationGroup\@\@QEAA?AVActorSkeletalAnimationPtr\@\@AEBVHashedString\@\@\@Z + * @symbol ?getActorAnimation\@ActorAnimationGroup\@\@QEAA?AVActorSkeletalAnimationPtr\@\@AEBVHashedString\@\@\@Z */ MCAPI class ActorSkeletalAnimationPtr getActorAnimation(class HashedString const &); /** - * @symbol ?getActorAnimationInfo\@ActorAnimationGroup\@\@QEAA?AV?$shared_ptr\@VActorAnimationInfo\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @symbol ?getActorAnimationInfo\@ActorAnimationGroup\@\@QEAA?AV?$shared_ptr\@VActorAnimationInfo\@\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI class std::shared_ptr getActorAnimationInfo(class HashedString const &); /** - * @symbol ?loadActorAnimation\@ActorAnimationGroup\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@AEAVPackStats\@\@AEBVSemVersion\@\@W4CurrentCmdVersion\@\@_N\@Z + * @symbol ?loadActorAnimation\@ActorAnimationGroup\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@AEAVPackStats\@\@AEBVSemVersion\@\@W4CurrentCmdVersion\@\@_N\@Z */ MCAPI void loadActorAnimation(std::string const &, class Core::Path const &, class PackStats &, class SemVersion const &, enum class CurrentCmdVersion, bool); /** - * @symbol ?loadActorAnimationsSync\@ActorAnimationGroup\@\@QEAAXAEAVResourcePackManager\@\@\@Z + * @symbol ?loadActorAnimationsSync\@ActorAnimationGroup\@\@QEAAXAEAVResourcePackManager\@\@\@Z */ MCAPI void loadActorAnimationsSync(class ResourcePackManager &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAnimationGroupParseMetaData.hpp b/LiteLoader/include/llapi/mc/ActorAnimationGroupParseMetaData.hpp index 79c46523c6..a7c11dfb78 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationGroupParseMetaData.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationGroupParseMetaData.hpp @@ -25,7 +25,7 @@ struct ActorAnimationGroupParseMetaData { public: /** - * @symbol ??1ActorAnimationGroupParseMetaData\@\@QEAA\@XZ + * @symbol ??1ActorAnimationGroupParseMetaData\@\@QEAA\@XZ */ MCAPI ~ActorAnimationGroupParseMetaData(); diff --git a/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp b/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp index 06c5771290..87248f34ff 100644 --- a/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorAnimationPlayer.hpp @@ -31,21 +31,25 @@ class ActorAnimationPlayer { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORANIMATIONPLAYER /** - * @symbol ?bindParticleEffects\@ActorAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?bindParticleEffects\@ActorAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z */ MCVAPI void bindParticleEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?bindSoundEffects\@ActorAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?bindSoundEffects\@ActorAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCVAPI void bindSoundEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?buildBoneToPartMapping\@ActorAnimationPlayer\@\@UEAAXAEAVAnimationComponent\@\@\@Z + * @symbol ?buildBoneToPartMapping\@ActorAnimationPlayer\@\@UEAAXAEAVAnimationComponent\@\@\@Z */ MCVAPI void buildBoneToPartMapping(class AnimationComponent &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorAnimationPlayer(); #endif /** - * @symbol ??0ActorAnimationPlayer\@\@QEAA\@AEBVHashedString\@\@AEBVExpressionNode\@\@\@Z + * @symbol ??0ActorAnimationPlayer\@\@QEAA\@AEBVHashedString\@\@AEBVExpressionNode\@\@\@Z */ MCAPI ActorAnimationPlayer(class HashedString const &, class ExpressionNode const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorAttackEvent.hpp b/LiteLoader/include/llapi/mc/ActorAttackEvent.hpp index 076032413f..3f451c9d54 100644 --- a/LiteLoader/include/llapi/mc/ActorAttackEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorAttackEvent.hpp @@ -25,7 +25,7 @@ struct ActorAttackEvent { public: /** - * @symbol ??1ActorAttackEvent\@\@QEAA\@XZ + * @symbol ??1ActorAttackEvent\@\@QEAA\@XZ */ MCAPI ~ActorAttackEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorBlock.hpp b/LiteLoader/include/llapi/mc/ActorBlock.hpp index a0ccb9f145..3d04e994b1 100644 --- a/LiteLoader/include/llapi/mc/ActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ActorBlock.hpp @@ -31,228 +31,237 @@ class ActorBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@ActorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@ActorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 116 - * @symbol ?triggerEvent\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @vftbl 116 + * @symbol ?triggerEvent\@ActorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@ActorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getEntityResourceItem\@ActorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORBLOCK /** - * @symbol ?canBeSilkTouched\@ActorBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@ActorBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorBlock(); #endif //protected: /** - * @symbol ??0ActorBlock\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0ActorBlock\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI ActorBlock(std::string const &, int, class Material const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorBoolPropertyTest.hpp b/LiteLoader/include/llapi/mc/ActorBoolPropertyTest.hpp index 932ecb56e1..4bf50f4d86 100644 --- a/LiteLoader/include/llapi/mc/ActorBoolPropertyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorBoolPropertyTest.hpp @@ -30,39 +30,45 @@ class ActorBoolPropertyTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorBoolPropertyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorBoolPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorBoolPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorBoolPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorBoolPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getName\@ActorBoolPropertyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorBoolPropertyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 5 - * @symbol ?_serializeDomain\@ActorBoolPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 5 + * @symbol ?_serializeDomain\@ActorBoolPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeDomain() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorBoolPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorBoolPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORBOOLPROPERTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorBoolPropertyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorCarriedItemChangedEvent.hpp b/LiteLoader/include/llapi/mc/ActorCarriedItemChangedEvent.hpp index b53290743f..318802e4ee 100644 --- a/LiteLoader/include/llapi/mc/ActorCarriedItemChangedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorCarriedItemChangedEvent.hpp @@ -27,11 +27,11 @@ struct ActorCarriedItemChangedEvent { public: /** - * @symbol ??0ActorCarriedItemChangedEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorCarriedItemChangedEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorCarriedItemChangedEvent(struct ActorCarriedItemChangedEvent const &); /** - * @symbol ??1ActorCarriedItemChangedEvent\@\@QEAA\@XZ + * @symbol ??1ActorCarriedItemChangedEvent\@\@QEAA\@XZ */ MCAPI ~ActorCarriedItemChangedEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorChunkPosition.hpp b/LiteLoader/include/llapi/mc/ActorChunkPosition.hpp index 53b5a5260b..d0fae62a7f 100644 --- a/LiteLoader/include/llapi/mc/ActorChunkPosition.hpp +++ b/LiteLoader/include/llapi/mc/ActorChunkPosition.hpp @@ -17,15 +17,15 @@ namespace ActorChunkPosition { #undef AFTER_EXTRA /** - * @symbol ?getChunkPosition\@ActorChunkPosition\@\@YAAEBVChunkPos\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getChunkPosition\@ActorChunkPosition\@\@YAAEBVChunkPos\@\@AEBVEntityContext\@\@\@Z */ MCAPI class ChunkPos const & getChunkPosition(class EntityContext const &); /** - * @symbol ?initializeActor\@ActorChunkPosition\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeActor\@ActorChunkPosition\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); /** - * @symbol ?setChunkPosition\@ActorChunkPosition\@\@YAXAEAVEntityContext\@\@AEBVChunkPos\@\@\@Z + * @symbol ?setChunkPosition\@ActorChunkPosition\@\@YAXAEAVEntityContext\@\@AEBVChunkPos\@\@\@Z */ MCAPI void setChunkPosition(class EntityContext &, class ChunkPos const &); diff --git a/LiteLoader/include/llapi/mc/ActorClassTree.hpp b/LiteLoader/include/llapi/mc/ActorClassTree.hpp index 604cadbcc1..7434ef2c41 100644 --- a/LiteLoader/include/llapi/mc/ActorClassTree.hpp +++ b/LiteLoader/include/llapi/mc/ActorClassTree.hpp @@ -30,36 +30,36 @@ class ActorClassTree { public: /** - * @symbol ?getEntityTypeIdLegacy\@ActorClassTree\@\@SA?AW4ActorType\@\@W42\@\@Z + * @symbol ?getEntityTypeIdLegacy\@ActorClassTree\@\@SA?AW4ActorType\@\@W42\@\@Z */ MCAPI static enum class ActorType getEntityTypeIdLegacy(enum class ActorType); /** - * @symbol ?hasCategory\@ActorClassTree\@\@SA_NAEBW4ActorCategory\@\@W42\@\@Z + * @symbol ?hasCategory\@ActorClassTree\@\@SA_NAEBW4ActorCategory\@\@W42\@\@Z */ MCAPI static bool hasCategory(enum class ActorCategory const &, enum class ActorCategory); /** - * @symbol ?isHangingEntity\@ActorClassTree\@\@SA_NAEBVActor\@\@\@Z + * @symbol ?isHangingEntity\@ActorClassTree\@\@SA_NAEBVActor\@\@\@Z */ MCAPI static bool isHangingEntity(class Actor const &); /** - * @symbol ?isInstanceOf\@ActorClassTree\@\@SA_NAEBVActor\@\@W4ActorType\@\@\@Z + * @symbol ?isInstanceOf\@ActorClassTree\@\@SA_NAEBVActor\@\@W4ActorType\@\@\@Z */ MCAPI static bool isInstanceOf(class Actor const &, enum class ActorType); /** - * @symbol ?isMob\@ActorClassTree\@\@SA_NW4ActorType\@\@\@Z + * @symbol ?isMob\@ActorClassTree\@\@SA_NW4ActorType\@\@\@Z */ MCAPI static bool isMob(enum class ActorType); /** - * @symbol ?isMobLegacy\@ActorClassTree\@\@SA_NW4ActorType\@\@\@Z + * @symbol ?isMobLegacy\@ActorClassTree\@\@SA_NW4ActorType\@\@\@Z */ MCAPI static bool isMobLegacy(enum class ActorType); /** - * @symbol ?isOfType\@ActorClassTree\@\@SA_NW4ActorType\@\@0\@Z + * @symbol ?isOfType\@ActorClassTree\@\@SA_NW4ActorType\@\@0\@Z */ MCAPI static bool isOfType(enum class ActorType, enum class ActorType); /** - * @symbol ?isTypeInstanceOf\@ActorClassTree\@\@SA_NW4ActorType\@\@0\@Z + * @symbol ?isTypeInstanceOf\@ActorClassTree\@\@SA_NW4ActorType\@\@0\@Z */ MCAPI static bool isTypeInstanceOf(enum class ActorType, enum class ActorType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorCollision.hpp b/LiteLoader/include/llapi/mc/ActorCollision.hpp index 8f5c9d1c87..b24f8de3af 100644 --- a/LiteLoader/include/llapi/mc/ActorCollision.hpp +++ b/LiteLoader/include/llapi/mc/ActorCollision.hpp @@ -17,111 +17,131 @@ namespace ActorCollision { #undef AFTER_EXTRA /** - * @symbol ?clearPushedBy\@ActorCollision\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?clearPushedBy\@ActorCollision\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void clearPushedBy(class EntityContext &); /** - * @symbol ?getCollidableMobNear\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?getCollidableMobNear\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool getCollidableMobNear(class EntityContext const &); /** - * @symbol ?getPushedByID\@ActorCollision\@\@YA?AUActorUniqueID\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getOnewayPhysicsBlocks\@ActorCollision\@\@YAAEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI std::vector const & getOnewayPhysicsBlocks(class EntityContext const &); + /** + * @symbol ?getPushedByID\@ActorCollision\@\@YA?AUActorUniqueID\@\@AEBVEntityContext\@\@\@Z */ MCAPI struct ActorUniqueID getPushedByID(class EntityContext const &); /** - * @symbol ?getSubAABBs\@ActorCollision\@\@YAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@\@Z + * @symbol ?getSubAABBs\@ActorCollision\@\@YAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@\@Z */ MCAPI std::vector & getSubAABBs(class EntityContext &); /** - * @symbol ?hasCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?hasCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool hasCollision(class EntityContext const &); /** - * @symbol ?hasHorizontalCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?hasHorizontalCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool hasHorizontalCollision(class EntityContext const &); /** - * @symbol ?hasVerticalCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?hasVerticalCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool hasVerticalCollision(class EntityContext const &); /** - * @symbol ?initializeActor\@ActorCollision\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeActor\@ActorCollision\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); /** - * @symbol ?isOnGround\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?isKnockedBackOnDeath\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool isKnockedBackOnDeath(class EntityContext const &); + /** + * @symbol ?isOnGround\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool isOnGround(class EntityContext const &); /** - * @symbol ?isStuckInCollider\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?isStuckInCollider\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool isStuckInCollider(class EntityContext const &); /** - * @symbol ?isStuckItem\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?isStuckItem\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool isStuckItem(class EntityContext const &); /** - * @symbol ?setCollidableMob\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?onOnewayCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@AEBVAABB\@\@\@Z + */ + MCAPI void onOnewayCollision(class EntityContext &, class AABB const &); + /** + * @symbol ?setCollidableMob\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setCollidableMob(class EntityContext &, bool); /** - * @symbol ?setCollidableMobNear\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setCollidableMobNear\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setCollidableMobNear(class EntityContext &, bool); /** - * @symbol ?setCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setCollision(class EntityContext &, bool); /** - * @symbol ?setHorizontalCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setHorizontalCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setHorizontalCollision(class EntityContext &, bool); /** - * @symbol ?setOnGround\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setIsKnockedBackOnDeath\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + */ + MCAPI void setIsKnockedBackOnDeath(class EntityContext &, bool); + /** + * @symbol ?setOnGround\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setOnGround(class EntityContext &, bool); /** - * @symbol ?setPushedBy\@ActorCollision\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?setPushedBy\@ActorCollision\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void setPushedBy(class EntityContext &, class StrictEntityContext, struct ActorUniqueID const &); /** - * @symbol ?setStuckInCollider\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setStuckInCollider\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setStuckInCollider(class EntityContext &, bool); /** - * @symbol ?setStuckItem\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setStuckItem\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setStuckItem(class EntityContext &, bool); /** - * @symbol ?setSubAABBs\@ActorCollision\@\@YAXAEAVEntityContext\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setSubAABBs\@ActorCollision\@\@YAXAEAVEntityContext\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setSubAABBs(class EntityContext &, std::vector const &); /** - * @symbol ?setUsesOneWayCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setUsesOneWayCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setUsesOneWayCollision(class EntityContext &, bool); /** - * @symbol ?setVerticalCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setVerticalCollision\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setVerticalCollision(class EntityContext &, bool); /** - * @symbol ?setWasOnGround\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setWasOnGround\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setWasOnGround(class EntityContext &, bool); /** - * @symbol ?setWasPenetratingLastFrame\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setWasPenetratingLastFrame\@ActorCollision\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setWasPenetratingLastFrame(class EntityContext &, bool); /** - * @symbol ?usesOneWayCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?updateOnewayCollisions\@ActorCollision\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void updateOnewayCollisions(class EntityContext &); + /** + * @symbol ?usesOneWayCollision\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool usesOneWayCollision(class EntityContext const &); /** - * @symbol ?wasOnGround\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?wasOnGround\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool wasOnGround(class EntityContext const &); /** - * @symbol ?wasPenetratingLastFrame\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?wasPenetratingLastFrame\@ActorCollision\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool wasPenetratingLastFrame(class EntityContext const &); diff --git a/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp index 9ead597990..074e57b303 100644 --- a/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ActorCommandOrigin.hpp @@ -32,87 +32,87 @@ class ActorCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@ActorCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@ActorCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@ActorCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ActorCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@ActorCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@ActorCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@ActorCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@ActorCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@ActorCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@ActorCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@ActorCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@ActorCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@ActorCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@ActorCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@ActorCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@ActorCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@ActorCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ActorCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@ActorCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ActorCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@ActorCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@ActorCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@ActorCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ActorCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@ActorCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@ActorCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@ActorCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@ActorCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0ActorCommandOrigin\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0ActorCommandOrigin\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI ActorCommandOrigin(class Actor &); /** - * @symbol ?load\@ActorCommandOrigin\@\@SA?AV?$unique_ptr\@VActorCommandOrigin\@\@U?$default_delete\@VActorCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@ActorCommandOrigin\@\@SA?AV?$unique_ptr\@VActorCommandOrigin\@\@U?$default_delete\@VActorCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorCommandResponse.hpp b/LiteLoader/include/llapi/mc/ActorCommandResponse.hpp index 8be0607ae6..d68c50ac95 100644 --- a/LiteLoader/include/llapi/mc/ActorCommandResponse.hpp +++ b/LiteLoader/include/llapi/mc/ActorCommandResponse.hpp @@ -29,24 +29,24 @@ class ActorCommandResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorCommandResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@ActorCommandResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@ActorCommandResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@ActorCommandResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@ActorCommandResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@ActorCommandResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@ActorCommandResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComponentDescription.hpp b/LiteLoader/include/llapi/mc/ActorComponentDescription.hpp similarity index 56% rename from LiteLoader/include/llapi/mc/ComponentDescription.hpp rename to LiteLoader/include/llapi/mc/ActorComponentDescription.hpp index 1d3c385649..5fead7ecce 100644 --- a/LiteLoader/include/llapi/mc/ComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/ActorComponentDescription.hpp @@ -1,5 +1,5 @@ /** - * @file ComponentDescription.hpp + * @file ActorComponentDescription.hpp * */ #pragma once @@ -10,11 +10,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC namespace ComponentDescription. - * - */ -namespace ComponentDescription { + +namespace ActorComponentDescription { #define AFTER_EXTRA diff --git a/LiteLoader/include/llapi/mc/ActorComponentFactory.hpp b/LiteLoader/include/llapi/mc/ActorComponentFactory.hpp index 897f1477c0..16389b0339 100644 --- a/LiteLoader/include/llapi/mc/ActorComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorComponentFactory.hpp @@ -32,10 +32,10 @@ class ActorComponentFactory { //private: /** - * @symbol ?_initialize\@ActorComponentFactory\@\@AEAAXAEBVExperiments\@\@\@Z + * @symbol ?_initialize\@ActorComponentFactory\@\@AEAAXAEBVExperiments\@\@\@Z */ MCAPI void _initialize(class Experiments const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp b/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp index ee3199f594..987e4cd8c5 100644 --- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp +++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelper.hpp @@ -22,16 +22,16 @@ namespace ActorContainerDiffHelper { #undef AFTER_EXTRA /** - * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEBV23\@1\@Z - */ - MCAPI void applyIfChanged(std::vector &, std::vector const &, std::vector const &); - /** - * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAVBaseAttributeMap\@\@AEBV2\@1\@Z + * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAVBaseAttributeMap\@\@AEBV2\@1\@Z */ MCAPI void applyIfChanged(class BaseAttributeMap &, class BaseAttributeMap const &, class BaseAttributeMap const &); /** - * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAVSynchedActorData\@\@AEBV2\@1PEAVActor\@\@\@Z + * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAVSynchedActorData\@\@AEBV2\@1PEAVActor\@\@\@Z */ MCAPI void applyIfChanged(class SynchedActorData &, class SynchedActorData const &, class SynchedActorData const &, class Actor *); + /** + * @symbol ?applyIfChanged\@ActorContainerDiffHelper\@\@YAXAEAV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEBV23\@1\@Z + */ + MCAPI void applyIfChanged(std::vector &, std::vector const &, std::vector const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp index 8704817d31..53c10f1702 100644 --- a/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp +++ b/LiteLoader/include/llapi/mc/ActorContainerDiffHelperImpl.hpp @@ -22,31 +22,31 @@ namespace ActorContainerDiffHelperImpl { #undef AFTER_EXTRA /** - * @symbol ?_applyDiff\@ActorContainerDiffHelperImpl\@\@YAXAEAVBaseAttributeMap\@\@AEBV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@\@Z + * @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\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@\@Z + * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@\@Z */ MCAPI std::vector> const _createListOfPointers(class BaseAttributeMap const &); /** - * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVDataItem\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVSynchedActorData\@\@\@Z + * @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 + * @symbol ?_createListOfPointers\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVMobEffectInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@3\@\@Z */ MCAPI std::vector> const _createListOfPointers(std::vector const &); /** - * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?AV?$vector\@V?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVSynchedActorData\@\@0\@Z + * @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 */ MCAPI std::vector> _getDiff(class SynchedActorData const &, class SynchedActorData const &); /** - * @symbol ?_getDiff\@ActorContainerDiffHelperImpl\@\@YA?BV?$vector\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEBVAttributeInstance\@\@\@gsl\@\@\@std\@\@\@std\@\@AEBVBaseAttributeMap\@\@0\@Z + * @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 + * @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 &); diff --git a/LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp index e12ce55e1d..5b9b2a5c5f 100644 --- a/LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByActorSource.hpp @@ -31,63 +31,69 @@ class ActorDamageByActorSource : public ActorDamageSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorDamageByActorSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isEntitySource\@ActorDamageByActorSource\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isEntitySource\@ActorDamageByActorSource\@\@UEBA_NXZ */ virtual bool isEntitySource() const; /** - * @vftbl 10 - * @symbol ?getDeathMessage\@ActorDamageByActorSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z + * @vftbl 10 + * @symbol ?getDeathMessage\@ActorDamageByActorSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z */ virtual struct std::pair> getDeathMessage(std::string, class Actor *) const; /** - * @vftbl 11 - * @symbol ?getIsCreative\@ActorDamageByActorSource\@\@UEBA_NXZ + * @vftbl 11 + * @symbol ?getIsCreative\@ActorDamageByActorSource\@\@UEBA_NXZ */ virtual bool getIsCreative() const; /** - * @vftbl 12 - * @symbol ?getIsWorldBuilder\@ActorDamageByActorSource\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?getIsWorldBuilder\@ActorDamageByActorSource\@\@UEBA_NXZ */ virtual bool getIsWorldBuilder() const; /** - * @vftbl 13 - * @symbol ?getEntityUniqueID\@ActorDamageByActorSource\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 13 + * @symbol ?getEntityUniqueID\@ActorDamageByActorSource\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getEntityUniqueID() const; /** - * @vftbl 14 - * @symbol ?getEntityType\@ActorDamageByActorSource\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 14 + * @symbol ?getEntityType\@ActorDamageByActorSource\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityType() const; /** - * @vftbl 15 - * @symbol ?getEntityCategories\@ActorDamageByActorSource\@\@UEBA?AW4ActorCategory\@\@XZ + * @vftbl 15 + * @symbol ?getEntityCategories\@ActorDamageByActorSource\@\@UEBA?AW4ActorCategory\@\@XZ */ virtual enum class ActorCategory getEntityCategories() const; /** - * @vftbl 18 - * @symbol ?getDamagingEntityUniqueID\@ActorDamageByActorSource\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 18 + * @symbol ?getDamagingEntityUniqueID\@ActorDamageByActorSource\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getDamagingEntityUniqueID() const; /** - * @vftbl 19 - * @symbol ?getDamagingEntityType\@ActorDamageByActorSource\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 19 + * @symbol ?getDamagingEntityType\@ActorDamageByActorSource\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getDamagingEntityType() const; /** - * @vftbl 21 - * @symbol ?clone\@ActorDamageByActorSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ + * @vftbl 21 + * @symbol ?clone\@ActorDamageByActorSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORDAMAGEBYACTORSOURCE /** - * @symbol ??0ActorDamageByActorSource\@\@QEAA\@AEBVActor\@\@W4ActorDamageCause\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorDamageByActorSource(); +#endif + /** + * @symbol ??0ActorDamageByActorSource\@\@QEAA\@AEBVActor\@\@W4ActorDamageCause\@\@\@Z */ MCAPI ActorDamageByActorSource(class Actor const &, enum class ActorDamageCause); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp index f8ef585dfa..1966b4c545 100644 --- a/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByBlockSource.hpp @@ -31,28 +31,28 @@ class ActorDamageByBlockSource : public ActorDamageSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorDamageByBlockSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?isBlockSource\@ActorDamageByBlockSource\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?isBlockSource\@ActorDamageByBlockSource\@\@UEBA_NXZ */ virtual bool isBlockSource() const; /** - * @vftbl 10 - * @symbol ?getDeathMessage\@ActorDamageByBlockSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z + * @vftbl 10 + * @symbol ?getDeathMessage\@ActorDamageByBlockSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z */ virtual struct std::pair> getDeathMessage(std::string, class Actor *) const; /** - * @vftbl 21 - * @symbol ?clone\@ActorDamageByBlockSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ + * @vftbl 21 + * @symbol ?clone\@ActorDamageByBlockSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @symbol ??0ActorDamageByBlockSource\@\@QEAA\@AEBVBlock\@\@W4ActorDamageCause\@\@\@Z + * @symbol ??0ActorDamageByBlockSource\@\@QEAA\@AEBVBlock\@\@W4ActorDamageCause\@\@\@Z */ MCAPI ActorDamageByBlockSource(class Block const &, enum class ActorDamageCause); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp index 52d31d77e5..42e5b6b1e5 100644 --- a/LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageByChildActorSource.hpp @@ -31,53 +31,59 @@ class ActorDamageByChildActorSource : public ActorDamageByActorSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorDamageByChildActorSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?isChildEntitySource\@ActorDamageByChildActorSource\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isChildEntitySource\@ActorDamageByChildActorSource\@\@UEBA_NXZ */ virtual bool isChildEntitySource() const; /** - * @vftbl 10 - * @symbol ?getDeathMessage\@ActorDamageByChildActorSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z + * @vftbl 10 + * @symbol ?getDeathMessage\@ActorDamageByChildActorSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z */ virtual struct std::pair> getDeathMessage(std::string, class Actor *) const; /** - * @vftbl 16 - * @symbol ?getDamagingEntityIsCreative\@ActorDamageByChildActorSource\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?getDamagingEntityIsCreative\@ActorDamageByChildActorSource\@\@UEBA_NXZ */ virtual bool getDamagingEntityIsCreative() const; /** - * @vftbl 17 - * @symbol ?getDamagingEntityIsWorldBuilder\@ActorDamageByChildActorSource\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?getDamagingEntityIsWorldBuilder\@ActorDamageByChildActorSource\@\@UEBA_NXZ */ virtual bool getDamagingEntityIsWorldBuilder() const; /** - * @vftbl 18 - * @symbol ?getDamagingEntityUniqueID\@ActorDamageByChildActorSource\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 18 + * @symbol ?getDamagingEntityUniqueID\@ActorDamageByChildActorSource\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getDamagingEntityUniqueID() const; /** - * @vftbl 19 - * @symbol ?getDamagingEntityType\@ActorDamageByChildActorSource\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 19 + * @symbol ?getDamagingEntityType\@ActorDamageByChildActorSource\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getDamagingEntityType() const; /** - * @vftbl 20 - * @symbol ?getDamagingEntityCategories\@ActorDamageByChildActorSource\@\@UEBA?AW4ActorCategory\@\@XZ + * @vftbl 20 + * @symbol ?getDamagingEntityCategories\@ActorDamageByChildActorSource\@\@UEBA?AW4ActorCategory\@\@XZ */ virtual enum class ActorCategory getDamagingEntityCategories() const; /** - * @vftbl 21 - * @symbol ?clone\@ActorDamageByChildActorSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ + * @vftbl 21 + * @symbol ?clone\@ActorDamageByChildActorSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORDAMAGEBYCHILDACTORSOURCE /** - * @symbol ??0ActorDamageByChildActorSource\@\@QEAA\@AEBVActor\@\@0W4ActorDamageCause\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorDamageByChildActorSource(); +#endif + /** + * @symbol ??0ActorDamageByChildActorSource\@\@QEAA\@AEBVActor\@\@0W4ActorDamageCause\@\@\@Z */ MCAPI ActorDamageByChildActorSource(class Actor const &, class Actor const &, enum class ActorDamageCause); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDamageSource.hpp b/LiteLoader/include/llapi/mc/ActorDamageSource.hpp index a1409d4095..47bdf23471 100644 --- a/LiteLoader/include/llapi/mc/ActorDamageSource.hpp +++ b/LiteLoader/include/llapi/mc/ActorDamageSource.hpp @@ -71,142 +71,142 @@ class ActorDamageSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorDamageSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isEntitySource\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isEntitySource\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isEntitySource() const; /** - * @vftbl 2 - * @symbol ?isChildEntitySource\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isChildEntitySource\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isChildEntitySource() const; /** - * @vftbl 3 - * @symbol ?isBlockSource\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?isBlockSource\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isBlockSource() const; /** - * @vftbl 4 - * @symbol ?isFire\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isFire\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isFire() const; /** - * @vftbl 5 - * @symbol ?isReducedByResistanceEffect\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isReducedByResistanceEffect\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isReducedByResistanceEffect() const; /** - * @vftbl 6 - * @symbol ?isReducedByEnchantReduction\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isReducedByEnchantReduction\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isReducedByEnchantReduction() const; /** - * @vftbl 7 - * @symbol ?isReducedByArmorReduction\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?isReducedByArmorReduction\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isReducedByArmorReduction() const; /** - * @vftbl 8 - * @symbol ?isFallingBlockDamage\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?isFallingBlockDamage\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isFallingBlockDamage() const; /** - * @vftbl 9 - * @symbol ?isFallDamage\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 9 + * @symbol ?isFallDamage\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool isFallDamage() const; /** - * @vftbl 10 - * @symbol ?getDeathMessage\@ActorDamageSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z + * @vftbl 10 + * @symbol ?getDeathMessage\@ActorDamageSource\@\@UEBA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@PEAVActor\@\@\@Z */ virtual struct std::pair> getDeathMessage(std::string, class Actor *) const; /** - * @vftbl 11 - * @symbol ?getIsCreative\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 11 + * @symbol ?getIsCreative\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool getIsCreative() const; /** - * @vftbl 12 - * @symbol ?getIsWorldBuilder\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?getIsWorldBuilder\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool getIsWorldBuilder() const; /** - * @vftbl 13 - * @symbol ?getEntityUniqueID\@ActorDamageSource\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 13 + * @symbol ?getEntityUniqueID\@ActorDamageSource\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getEntityUniqueID() const; /** - * @vftbl 14 - * @symbol ?getEntityType\@ActorDamageSource\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 14 + * @symbol ?getEntityType\@ActorDamageSource\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityType() const; /** - * @vftbl 15 - * @symbol ?getEntityCategories\@ActorDamageSource\@\@UEBA?AW4ActorCategory\@\@XZ + * @vftbl 15 + * @symbol ?getEntityCategories\@ActorDamageSource\@\@UEBA?AW4ActorCategory\@\@XZ */ virtual enum class ActorCategory getEntityCategories() const; /** - * @vftbl 16 - * @symbol ?getDamagingEntityIsCreative\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?getDamagingEntityIsCreative\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool getDamagingEntityIsCreative() const; /** - * @vftbl 17 - * @symbol ?getDamagingEntityIsWorldBuilder\@ActorDamageSource\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?getDamagingEntityIsWorldBuilder\@ActorDamageSource\@\@UEBA_NXZ */ virtual bool getDamagingEntityIsWorldBuilder() const; /** - * @vftbl 18 - * @symbol ?getDamagingEntityUniqueID\@ActorDamageSource\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 18 + * @symbol ?getDamagingEntityUniqueID\@ActorDamageSource\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getDamagingEntityUniqueID() const; /** - * @vftbl 19 - * @symbol ?getDamagingEntityType\@ActorDamageSource\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 19 + * @symbol ?getDamagingEntityType\@ActorDamageSource\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getDamagingEntityType() const; /** - * @vftbl 20 - * @symbol ?getDamagingEntityCategories\@ActorDamageSource\@\@UEBA?AW4ActorCategory\@\@XZ + * @vftbl 20 + * @symbol ?getDamagingEntityCategories\@ActorDamageSource\@\@UEBA?AW4ActorCategory\@\@XZ */ virtual enum class ActorCategory getDamagingEntityCategories() const; /** - * @vftbl 21 - * @symbol ?clone\@ActorDamageSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ + * @vftbl 21 + * @symbol ?clone\@ActorDamageSource\@\@UEBA?AV?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @symbol ??0ActorDamageSource\@\@QEAA\@W4ActorDamageCause\@\@\@Z + * @symbol ??0ActorDamageSource\@\@QEAA\@W4ActorDamageCause\@\@\@Z */ MCAPI ActorDamageSource(enum class ActorDamageCause); /** - * @symbol ?getCause\@ActorDamageSource\@\@QEBA?AW4ActorDamageCause\@\@XZ + * @symbol ?getCause\@ActorDamageSource\@\@QEBA?AW4ActorDamageCause\@\@XZ */ MCAPI enum class ActorDamageCause getCause() const; /** - * @symbol ?setCause\@ActorDamageSource\@\@QEAAXW4ActorDamageCause\@\@\@Z + * @symbol ?setCause\@ActorDamageSource\@\@QEAAXW4ActorDamageCause\@\@\@Z */ MCAPI void setCause(enum class ActorDamageCause); /** - * @symbol ?generateDamageCauseCommandEnum\@ActorDamageSource\@\@SA?AV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorDamageCause\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorDamageCause\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?generateDamageCauseCommandEnum\@ActorDamageSource\@\@SA?AV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorDamageCause\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorDamageCause\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI static std::vector> generateDamageCauseCommandEnum(); /** - * @symbol ?isDamageCausedByMob\@ActorDamageSource\@\@SA_NW4ActorDamageCause\@\@\@Z + * @symbol ?isDamageCausedByMob\@ActorDamageSource\@\@SA_NW4ActorDamageCause\@\@\@Z */ MCAPI static bool isDamageCausedByMob(enum class ActorDamageCause); /** - * @symbol ?lookupCause\@ActorDamageSource\@\@SA?AW4ActorDamageCause\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookupCause\@ActorDamageSource\@\@SA?AW4ActorDamageCause\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class ActorDamageCause lookupCause(std::string const &); /** - * @symbol ?lookupCauseName\@ActorDamageSource\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorDamageCause\@\@\@Z + * @symbol ?lookupCauseName\@ActorDamageSource\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorDamageCause\@\@\@Z */ MCAPI static std::string const & lookupCauseName(enum class ActorDamageCause); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDataSyncSystem.hpp b/LiteLoader/include/llapi/mc/ActorDataSyncSystem.hpp index 36bdf66097..591b4d1aef 100644 --- a/LiteLoader/include/llapi/mc/ActorDataSyncSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorDataSyncSystem.hpp @@ -30,8 +30,8 @@ class ActorDataSyncSystem { public: /** - * @symbol ?createActorDataSyncSystem\@ActorDataSyncSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createActorDataSyncSystem\@ActorDataSyncSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorDataSyncSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinition.hpp b/LiteLoader/include/llapi/mc/ActorDefinition.hpp index 1ac9b549e0..c40a1af57b 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinition.hpp @@ -31,36 +31,36 @@ class ActorDefinition { public: /** - * @symbol ??0ActorDefinition\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ActorDefinition\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ActorDefinition(std::string const &); /** - * @symbol ?parse\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@AEAVActorFactory\@\@W4LogArea\@\@\@Z + * @symbol ?parse\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@AEAVActorFactory\@\@W4LogArea\@\@\@Z */ MCAPI void parse(struct DeserializeDataParams, class ActorDefinitionDescriptor &, class ActorFactory &, enum class LogArea); /** - * @symbol ?parseAttributes\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@\@Z + * @symbol ?parseAttributes\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@AEAVActorDefinitionDescriptor\@\@\@Z */ MCAPI void parseAttributes(struct DeserializeDataParams, class ActorDefinitionDescriptor &); /** - * @symbol ?parseEntityDescription\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@\@Z + * @symbol ?parseEntityDescription\@ActorDefinition\@\@QEAAXUDeserializeDataParams\@\@\@Z */ MCAPI void parseEntityDescription(struct DeserializeDataParams); /** - * @symbol ?parseEvents\@ActorDefinition\@\@QEAAXAEBVValue\@Json\@\@AEBVSemVersion\@\@1PEAVActorEventResponseFactory\@\@\@Z + * @symbol ?parseEvents\@ActorDefinition\@\@QEAAXAEBVValue\@Json\@\@AEBVSemVersion\@\@1PEAVActorEventResponseFactory\@\@\@Z */ MCAPI void parseEvents(class Json::Value const &, class SemVersion const &, class SemVersion const &, class ActorEventResponseFactory *); /** - * @symbol ?parsePermutations\@ActorDefinition\@\@QEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@1AEAVActorFactory\@\@\@Z + * @symbol ?parsePermutations\@ActorDefinition\@\@QEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@1AEAVActorFactory\@\@\@Z */ MCAPI void parsePermutations(class Json::Value &, class SemVersion const &, class SemVersion const &, class ActorFactory &); /** - * @symbol ?validatePermutationJson\@ActorDefinition\@\@QEAA_NAEAVValue\@Json\@\@\@Z + * @symbol ?validatePermutationJson\@ActorDefinition\@\@QEAA_NAEAVValue\@Json\@\@\@Z */ MCAPI bool validatePermutationJson(class Json::Value &); /** - * @symbol ??1ActorDefinition\@\@QEAA\@XZ + * @symbol ??1ActorDefinition\@\@QEAA\@XZ */ MCAPI ~ActorDefinition(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp index dbc364c351..a121e48a28 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionAttribute.hpp @@ -25,7 +25,7 @@ struct ActorDefinitionAttribute { public: /** - * @symbol ??1ActorDefinitionAttribute\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionAttribute\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionAttribute(); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp index 368f4c2768..971396148f 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDescriptor.hpp @@ -23,88 +23,92 @@ class ActorDefinitionDescriptor { #undef AFTER_EXTRA public: /** - * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@XZ */ - MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &); + MCAPI ActorDefinitionDescriptor(); /** - * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor &&); + MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor const &); /** - * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@XZ + * @symbol ??0ActorDefinitionDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ActorDefinitionDescriptor(); + MCAPI ActorDefinitionDescriptor(class ActorDefinitionDescriptor &&); /** - * @symbol ?combine\@ActorDefinitionDescriptor\@\@QEAAAEAV1\@AEBV1\@\@Z + * @symbol ?combine\@ActorDefinitionDescriptor\@\@QEAAAEAV1\@AEBV1\@\@Z */ MCAPI class ActorDefinitionDescriptor & combine(class ActorDefinitionDescriptor const &); /** - * @symbol ?contains\@ActorDefinitionDescriptor\@\@QEBA_NAEBV1\@\@Z + * @symbol ?contains\@ActorDefinitionDescriptor\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool contains(class ActorDefinitionDescriptor const &) const; /** - * @symbol ?hasComponent\@ActorDefinitionDescriptor\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?findAttributeByName\@ActorDefinitionDescriptor\@\@QEBA?AV?$optional\@UActorDefinitionAttribute\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional findAttributeByName(std::string const &) const; + /** + * @symbol ?hasComponent\@ActorDefinitionDescriptor\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool hasComponent(class HashedString const &) const; /** - * @symbol ?hasJumpSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ + * @symbol ?hasJumpSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ */ MCAPI bool hasJumpSubComponent(); /** - * @symbol ?hasMovementSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ + * @symbol ?hasMovementSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ */ MCAPI bool hasMovementSubComponent(); /** - * @symbol ?hasNavigationSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ + * @symbol ?hasNavigationSubComponent\@ActorDefinitionDescriptor\@\@QEAA_NXZ */ MCAPI bool hasNavigationSubComponent(); /** - * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor &&); /** - * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ActorDefinitionDescriptor\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ActorDefinitionDescriptor & operator=(class ActorDefinitionDescriptor const &); /** - * @symbol ?overlaps\@ActorDefinitionDescriptor\@\@QEBA_NAEBV1\@\@Z + * @symbol ?overlaps\@ActorDefinitionDescriptor\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool overlaps(class ActorDefinitionDescriptor const &) const; /** - * @symbol ?subtract\@ActorDefinitionDescriptor\@\@QEAAAEAV1\@AEBV1\@\@Z + * @symbol ?subtract\@ActorDefinitionDescriptor\@\@QEAAAEAV1\@AEBV1\@\@Z */ MCAPI class ActorDefinitionDescriptor & subtract(class ActorDefinitionDescriptor const &); /** - * @symbol ??1ActorDefinitionDescriptor\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionDescriptor\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionDescriptor(); /** - * @symbol ?executeEvent\@ActorDefinitionDescriptor\@\@SA_NAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?executeEvent\@ActorDefinitionDescriptor\@\@SA_NAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI static bool executeEvent(class Actor &, std::string const &, class VariantParameterList const &); /** - * @symbol ?executeTrigger\@ActorDefinitionDescriptor\@\@SA_NAEAVActor\@\@AEBVActorDefinitionTrigger\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?executeTrigger\@ActorDefinitionDescriptor\@\@SA_NAEAVActor\@\@AEBVActorDefinitionTrigger\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI static bool executeTrigger(class Actor &, class ActorDefinitionTrigger const &, class VariantParameterList const &); /** - * @symbol ?forceExecuteTrigger\@ActorDefinitionDescriptor\@\@SAXAEAVActor\@\@AEBVActorDefinitionTrigger\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?forceExecuteTrigger\@ActorDefinitionDescriptor\@\@SAXAEAVActor\@\@AEBVActorDefinitionTrigger\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI static void forceExecuteTrigger(class Actor &, class ActorDefinitionTrigger const &, class VariantParameterList const &); /** - * @symbol ?forceExecuteTriggerChain\@ActorDefinitionDescriptor\@\@SAXAEAVActor\@\@AEBVActorDefinitionTrigger\@\@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\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?forceExecuteTriggerChain\@ActorDefinitionDescriptor\@\@SAXAEAVActor\@\@AEBVActorDefinitionTrigger\@\@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\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI static void forceExecuteTriggerChain(class Actor &, class ActorDefinitionTrigger const &, std::vector> &, class VariantParameterList const &); //private: /** - * @symbol ?_executeEvent\@ActorDefinitionDescriptor\@\@CA_NAEAVActor\@\@AEBV?$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\@\@4\@AEBVVariantParameterList\@\@\@Z + * @symbol ?_executeEvent\@ActorDefinitionDescriptor\@\@CA_NAEAVActor\@\@AEBV?$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\@\@4\@AEBVVariantParameterList\@\@\@Z */ MCAPI static bool _executeEvent(class Actor &, std::string const &, std::vector> &, class VariantParameterList const &); /** - * @symbol ?_forceExecuteTrigger\@ActorDefinitionDescriptor\@\@CAXAEAVActor\@\@AEBVActorDefinitionTrigger\@\@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\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?_forceExecuteTrigger\@ActorDefinitionDescriptor\@\@CAXAEAVActor\@\@AEBVActorDefinitionTrigger\@\@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\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI static void _forceExecuteTrigger(class Actor &, class ActorDefinitionTrigger const &, std::vector> &, class VariantParameterList const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp index 11647fb8b5..1370f3b37a 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionDiffList.hpp @@ -30,100 +30,100 @@ class ActorDefinitionDiffList { public: /** - * @symbol ??0ActorDefinitionDiffList\@\@QEAA\@AEAVActorDefinitionGroup\@\@\@Z + * @symbol ??0ActorDefinitionDiffList\@\@QEAA\@AEAVActorDefinitionGroup\@\@\@Z */ MCAPI ActorDefinitionDiffList(class ActorDefinitionGroup &); /** - * @symbol ?addDefinition\@ActorDefinitionDiffList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addDefinition\@ActorDefinitionDiffList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addDefinition(std::string const &); /** - * @symbol ?addPendingPropertyChange\@ActorDefinitionDiffList\@\@QEAAX_KV?$variant\@HM_N_K\@std\@\@\@Z + * @symbol ?addPendingPropertyChange\@ActorDefinitionDiffList\@\@QEAAX_KV?$variant\@HM_N_K\@std\@\@\@Z */ MCAPI void addPendingPropertyChange(unsigned __int64, class std::variant); /** - * @symbol ?buildAdditiveDescriptionFrom\@ActorDefinitionDiffList\@\@QEBA?AVActorDefinitionDescriptor\@\@_K0\@Z + * @symbol ?buildAdditiveDescriptionFrom\@ActorDefinitionDiffList\@\@QEBA?AVActorDefinitionDescriptor\@\@_K0\@Z */ MCAPI class ActorDefinitionDescriptor buildAdditiveDescriptionFrom(unsigned __int64, unsigned __int64) const; /** - * @symbol ?clearChangedDescription\@ActorDefinitionDiffList\@\@QEAAXXZ + * @symbol ?clearChangedDescription\@ActorDefinitionDiffList\@\@QEAAXXZ */ MCAPI void clearChangedDescription(); /** - * @symbol ?clearDefinitions\@ActorDefinitionDiffList\@\@QEAAXXZ + * @symbol ?clearDefinitions\@ActorDefinitionDiffList\@\@QEAAXXZ */ MCAPI void clearDefinitions(); /** - * @symbol ?definitionListToString\@ActorDefinitionDiffList\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?definitionListToString\@ActorDefinitionDiffList\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string definitionListToString(std::string const &) const; /** - * @symbol ?getAddedDefinitionGroup\@ActorDefinitionDiffList\@\@QEBAAEBVDefinitionInstanceGroup\@\@XZ + * @symbol ?getAddedDefinitionGroup\@ActorDefinitionDiffList\@\@QEBAAEBVDefinitionInstanceGroup\@\@XZ */ MCAPI class DefinitionInstanceGroup const & getAddedDefinitionGroup() const; /** - * @symbol ?getAddedDefinitionGroupMutable\@ActorDefinitionDiffList\@\@QEAAAEAVDefinitionInstanceGroup\@\@XZ + * @symbol ?getAddedDefinitionGroupMutable\@ActorDefinitionDiffList\@\@QEAAAEAVDefinitionInstanceGroup\@\@XZ */ MCAPI class DefinitionInstanceGroup & getAddedDefinitionGroupMutable(); /** - * @symbol ?getChangedDescription\@ActorDefinitionDiffList\@\@QEAAAEAVActorDefinitionDescriptor\@\@XZ + * @symbol ?getChangedDescription\@ActorDefinitionDiffList\@\@QEAAAEAVActorDefinitionDescriptor\@\@XZ */ MCAPI class ActorDefinitionDescriptor & getChangedDescription(); /** - * @symbol ?getDefinitionStack\@ActorDefinitionDiffList\@\@QEBAAEBV?$vector\@UDiffListPair\@\@V?$allocator\@UDiffListPair\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getDefinitionStack\@ActorDefinitionDiffList\@\@QEBAAEBV?$vector\@UDiffListPair\@\@V?$allocator\@UDiffListPair\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getDefinitionStack() const; /** - * @symbol ?getDescription\@ActorDefinitionDiffList\@\@QEAA?AV?$unique_ptr\@VActorDefinitionDescriptor\@\@U?$default_delete\@VActorDefinitionDescriptor\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?getDescription\@ActorDefinitionDiffList\@\@QEAA?AV?$unique_ptr\@VActorDefinitionDescriptor\@\@U?$default_delete\@VActorDefinitionDescriptor\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI std::unique_ptr getDescription(bool); /** - * @symbol ?getRemovedDefinitionGroup\@ActorDefinitionDiffList\@\@QEBAAEBVDefinitionInstanceGroup\@\@XZ + * @symbol ?getRemovedDefinitionGroup\@ActorDefinitionDiffList\@\@QEBAAEBVDefinitionInstanceGroup\@\@XZ */ MCAPI class DefinitionInstanceGroup const & getRemovedDefinitionGroup() const; /** - * @symbol ?getRemovedDefinitionGroupMutable\@ActorDefinitionDiffList\@\@QEAAAEAVDefinitionInstanceGroup\@\@XZ + * @symbol ?getRemovedDefinitionGroupMutable\@ActorDefinitionDiffList\@\@QEAAAEAVDefinitionInstanceGroup\@\@XZ */ MCAPI class DefinitionInstanceGroup & getRemovedDefinitionGroupMutable(); /** - * @symbol ?hasChanged\@ActorDefinitionDiffList\@\@QEBA_NXZ + * @symbol ?hasChanged\@ActorDefinitionDiffList\@\@QEBA_NXZ */ MCAPI bool hasChanged() const; /** - * @symbol ?hasDefinition\@ActorDefinitionDiffList\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?hasDefinition\@ActorDefinitionDiffList\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool hasDefinition(std::string const &) const; /** - * @symbol ?lockChanges\@ActorDefinitionDiffList\@\@QEAAXXZ + * @symbol ?lockChanges\@ActorDefinitionDiffList\@\@QEAAXXZ */ MCAPI void lockChanges(); /** - * @symbol ?removeDefinition\@ActorDefinitionDiffList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeDefinition\@ActorDefinitionDiffList\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeDefinition(std::string const &); /** - * @symbol ?setDefinitionStack\@ActorDefinitionDiffList\@\@QEAAXAEAV?$vector\@UDiffListPair\@\@V?$allocator\@UDiffListPair\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setDefinitionStack\@ActorDefinitionDiffList\@\@QEAAXAEAV?$vector\@UDiffListPair\@\@V?$allocator\@UDiffListPair\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setDefinitionStack(std::vector &); /** - * @symbol ?size\@ActorDefinitionDiffList\@\@QEBA_KXZ + * @symbol ?size\@ActorDefinitionDiffList\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; /** - * @symbol ?unlockChanges\@ActorDefinitionDiffList\@\@QEAAXXZ + * @symbol ?unlockChanges\@ActorDefinitionDiffList\@\@QEAAXXZ */ MCAPI void unlockChanges(); /** - * @symbol ??1ActorDefinitionDiffList\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionDiffList\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionDiffList(); //private: /** - * @symbol ?_updateStack\@ActorDefinitionDiffList\@\@AEAAXXZ + * @symbol ?_updateStack\@ActorDefinitionDiffList\@\@AEAAXXZ */ MCAPI void _updateStack(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionEndedEvent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionEndedEvent.hpp index a593082a79..b26f9a9ec0 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionEndedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionEndedEvent.hpp @@ -25,7 +25,7 @@ struct ActorDefinitionEndedEvent { public: /** - * @symbol ??1ActorDefinitionEndedEvent\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionEndedEvent\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionEndedEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionEvent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionEvent.hpp index 5f62b44ad5..ca4a8aa2fa 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionEvent.hpp @@ -26,32 +26,32 @@ class ActorDefinitionEvent { public: /** - * @symbol ??0ActorDefinitionEvent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ActorDefinitionEvent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ActorDefinitionEvent(class ActorDefinitionEvent &&); /** - * @symbol ??0ActorDefinitionEvent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ActorDefinitionEvent\@\@QEAA\@AEBV0\@\@Z */ MCAPI ActorDefinitionEvent(class ActorDefinitionEvent const &); /** - * @symbol ?evaluateGroups\@ActorDefinitionEvent\@\@QEBAXAEAVActor\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@std\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?evaluateGroups\@ActorDefinitionEvent\@\@QEBAXAEAVActor\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@std\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI void evaluateGroups(class Actor &, std::vector &, class VariantParameterList const &) const; /** - * @symbol ??4ActorDefinitionEvent\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ActorDefinitionEvent\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ActorDefinitionEvent & operator=(class ActorDefinitionEvent const &); /** - * @symbol ??1ActorDefinitionEvent\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionEvent\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionEvent(); //private: /** - * @symbol ?_evaluateGroups\@ActorDefinitionEvent\@\@AEBAXAEAVActor\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@std\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?_evaluateGroups\@ActorDefinitionEvent\@\@AEBAXAEAVActor\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@std\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI void _evaluateGroups(class Actor &, std::vector &, class VariantParameterList const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionEventLoader.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionEventLoader.hpp index e752449d51..8c03c99512 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionEventLoader.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionEventLoader.hpp @@ -29,20 +29,20 @@ class ActorDefinitionEventLoader { public: /** - * @symbol ?loadEvent\@ActorDefinitionEventLoader\@\@SA?AVActorDefinitionEvent\@\@VValue\@Json\@\@AEBVSemVersion\@\@1PEBVActorEventResponseFactory\@\@\@Z + * @symbol ?loadEvent\@ActorDefinitionEventLoader\@\@SA?AVActorDefinitionEvent\@\@VValue\@Json\@\@AEBVSemVersion\@\@1PEBVActorEventResponseFactory\@\@\@Z */ MCAPI static class ActorDefinitionEvent loadEvent(class Json::Value, class SemVersion const &, class SemVersion const &, class ActorEventResponseFactory const *); //private: /** - * @symbol ?_loadCollection\@ActorDefinitionEventLoader\@\@CAXAEAVActorDefinitionEvent\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@PEBVActorEventResponseFactory\@\@\@Z + * @symbol ?_loadCollection\@ActorDefinitionEventLoader\@\@CAXAEAVActorDefinitionEvent\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@PEBVActorEventResponseFactory\@\@\@Z */ MCAPI static void _loadCollection(class ActorDefinitionEvent &, class Json::Value const &, class SemVersion const &, class ActorEventResponseFactory const *); /** - * @symbol ?_loadEvent\@ActorDefinitionEventLoader\@\@CA?AVActorDefinitionEvent\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@PEBVActorEventResponseFactory\@\@\@Z + * @symbol ?_loadEvent\@ActorDefinitionEventLoader\@\@CA?AVActorDefinitionEvent\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@PEBVActorEventResponseFactory\@\@\@Z */ MCAPI static class ActorDefinitionEvent _loadEvent(class Json::Value &, class SemVersion const &, class ActorEventResponseFactory const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp index 939a2a6abc..2adcaa59b5 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionEventSubcomponent.hpp @@ -30,33 +30,33 @@ class ActorDefinitionEventSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorDefinitionEventSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@ActorDefinitionEventSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@ActorDefinitionEventSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@ActorDefinitionEventSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@ActorDefinitionEventSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@ActorDefinitionEventSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@ActorDefinitionEventSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@ActorDefinitionEventSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@ActorDefinitionEventSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0ActorDefinitionEventSubcomponent\@\@QEAA\@XZ + * @symbol ??0ActorDefinitionEventSubcomponent\@\@QEAA\@XZ */ MCAPI ActorDefinitionEventSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionFeedItem.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionFeedItem.hpp index fab6f70c86..c55808b32f 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionFeedItem.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionFeedItem.hpp @@ -28,7 +28,7 @@ struct ActorDefinitionFeedItem { public: /** - * @symbol ??1ActorDefinitionFeedItem\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionFeedItem\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionFeedItem(); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp index 668ac947f0..ce1fe94cbf 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionGroup.hpp @@ -38,75 +38,75 @@ struct LoadActorResult { public: /** - * @symbol ??0ActorDefinitionGroup\@\@QEAA\@AEAVLevel\@\@AEAVResourcePackManager\@\@AEAVIMinecraftEventing\@\@AEBVExperiments\@\@\@Z + * @symbol ??0ActorDefinitionGroup\@\@QEAA\@AEAVLevel\@\@AEAVResourcePackManager\@\@AEAVIMinecraftEventing\@\@AEBVExperiments\@\@\@Z */ MCAPI ActorDefinitionGroup(class Level &, class ResourcePackManager &, class IMinecraftEventing &, class Experiments const &); /** - * @symbol ?buildActorEventList\@ActorDefinitionGroup\@\@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 + * @symbol ?buildActorEventList\@ActorDefinitionGroup\@\@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 buildActorEventList() const; /** - * @symbol ?getComponentFactory\@ActorDefinitionGroup\@\@QEAAPEAVActorComponentFactory\@\@XZ + * @symbol ?getComponentFactory\@ActorDefinitionGroup\@\@QEAAPEAVActorComponentFactory\@\@XZ */ MCAPI class ActorComponentFactory * getComponentFactory(); /** - * @symbol ?setComponentFactory\@ActorDefinitionGroup\@\@QEAAXPEAVActorComponentFactory\@\@\@Z + * @symbol ?setComponentFactory\@ActorDefinitionGroup\@\@QEAAXPEAVActorComponentFactory\@\@\@Z */ MCAPI void setComponentFactory(class ActorComponentFactory *); /** - * @symbol ?tryGetDefinition\@ActorDefinitionGroup\@\@QEAA?AVActorDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryGetDefinition\@ActorDefinitionGroup\@\@QEAA?AVActorDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class ActorDefinitionPtr tryGetDefinition(std::string const &); /** - * @symbol ?tryGetDefinitionGroup\@ActorDefinitionGroup\@\@QEAA?AVActorDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?tryGetDefinitionGroup\@ActorDefinitionGroup\@\@QEAA?AVActorDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI class ActorDefinitionPtr tryGetDefinitionGroup(std::string const &, std::string const &); /** - * @symbol ?loadActorDefinitionIdentifier\@ActorDefinitionGroup\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?loadActorDefinitionIdentifier\@ActorDefinitionGroup\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool loadActorDefinitionIdentifier(class Json::Value const &, class SemVersion const &, std::string &); /** - * @symbol ?loadActorDefinitionRuntimeIdentifier\@ActorDefinitionGroup\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?loadActorDefinitionRuntimeIdentifier\@ActorDefinitionGroup\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool loadActorDefinitionRuntimeIdentifier(class Json::Value const &, class SemVersion const &, std::string &); /** - * @symbol ?tryReadEntityResourceFile\@ActorDefinitionGroup\@\@SA_NAEAVPackInstance\@\@AEBVPath\@Core\@\@AEAVValue\@Json\@\@\@Z + * @symbol ?tryReadEntityResourceFile\@ActorDefinitionGroup\@\@SA_NAEAVPackInstance\@\@AEBVPath\@Core\@\@AEAVValue\@Json\@\@\@Z */ MCAPI static bool tryReadEntityResourceFile(class PackInstance &, class Core::Path const &, class Json::Value &); //protected: /** - * @symbol ?_addRef\@ActorDefinitionGroup\@\@IEAAXAEAVActorDefinitionPtr\@\@\@Z + * @symbol ?_addRef\@ActorDefinitionGroup\@\@IEAAXAEAVActorDefinitionPtr\@\@\@Z */ MCAPI void _addRef(class ActorDefinitionPtr &); /** - * @symbol ?_removeRef\@ActorDefinitionGroup\@\@IEAAXAEAVActorDefinitionPtr\@\@\@Z + * @symbol ?_removeRef\@ActorDefinitionGroup\@\@IEAAXAEAVActorDefinitionPtr\@\@\@Z */ MCAPI void _removeRef(class ActorDefinitionPtr &); //private: /** - * @symbol ?_getResources\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@\@Z + * @symbol ?_getResources\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@\@Z */ 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\@W4LogArea\@\@\@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); /** - * @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\@\@W4LogArea\@\@\@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); /** - * @symbol ?_loadTemplates\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UDeserializeDataParams\@\@\@Z + * @symbol ?_loadTemplates\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@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); /** - * @symbol ?_setupCommonResourceDefinitionMap\@ActorDefinitionGroup\@\@AEAAXAEAVActorDefinition\@\@AEAVLevel\@\@\@Z + * @symbol ?_setupCommonResourceDefinitionMap\@ActorDefinitionGroup\@\@AEAAXAEAVActorDefinition\@\@AEAVLevel\@\@\@Z */ MCAPI void _setupCommonResourceDefinitionMap(class ActorDefinition &, class Level &); /** - * @symbol ?_setupPropertyGroups\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@\@Z + * @symbol ?_setupPropertyGroups\@ActorDefinitionGroup\@\@AEAAXAEAVLevel\@\@\@Z */ MCAPI void _setupPropertyGroups(class Level &); @@ -114,4 +114,4 @@ struct LoadActorResult { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp index 66a7a32b02..fdcc72320c 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifier.hpp @@ -29,121 +29,121 @@ struct ActorDefinitionIdentifier { #undef AFTER_EXTRA public: /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@W4ActorType\@\@\@Z */ - MCAPI ActorDefinitionIdentifier(); + MCAPI ActorDefinitionIdentifier(enum class ActorType); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@W4ActorType\@\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z */ - MCAPI ActorDefinitionIdentifier(enum class ActorType); + MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI ActorDefinitionIdentifier(std::string, std::string, std::string); + MCAPI ActorDefinitionIdentifier(std::string const &); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@XZ */ - MCAPI ActorDefinitionIdentifier(char const *); + MCAPI ActorDefinitionIdentifier(); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ - MCAPI ActorDefinitionIdentifier(std::string const &); + MCAPI ActorDefinitionIdentifier(std::string, std::string, std::string); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@PEBD\@Z */ - MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier const &); + MCAPI ActorDefinitionIdentifier(char const *); /** - * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ActorDefinitionIdentifier\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ActorDefinitionIdentifier(struct ActorDefinitionIdentifier &&); /** - * @symbol ?_getLegacyActorType\@ActorDefinitionIdentifier\@\@QEBA?AW4ActorType\@\@XZ + * @symbol ?_getLegacyActorType\@ActorDefinitionIdentifier\@\@QEBA?AW4ActorType\@\@XZ */ MCAPI enum class ActorType _getLegacyActorType() const; /** - * @symbol ?clear\@ActorDefinitionIdentifier\@\@QEAAXXZ + * @symbol ?clear\@ActorDefinitionIdentifier\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?getCanonicalHash\@ActorDefinitionIdentifier\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getCanonicalHash\@ActorDefinitionIdentifier\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getCanonicalHash() const; /** - * @symbol ?getCanonicalName\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCanonicalName\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getCanonicalName() const; /** - * @symbol ?getFullName\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFullName\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFullName() const; /** - * @symbol ?getIdentifier\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getIdentifier\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getIdentifier() const; /** - * @symbol ?getInitEvent\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getInitEvent\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getInitEvent() const; /** - * @symbol ?getNamespace\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getNamespace\@ActorDefinitionIdentifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getNamespace() const; /** - * @symbol ?initialize\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?initialize\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCAPI void initialize(std::string const &, std::string const &, std::string const &); /** - * @symbol ?initialize\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?initialize\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void initialize(std::string const &); /** - * @symbol ?isEmpty\@ActorDefinitionIdentifier\@\@QEBA_NXZ + * @symbol ?isEmpty\@ActorDefinitionIdentifier\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?isVanilla\@ActorDefinitionIdentifier\@\@QEBA_NXZ + * @symbol ?isVanilla\@ActorDefinitionIdentifier\@\@QEBA_NXZ */ MCAPI bool isVanilla() const; /** - * @symbol ??4ActorDefinitionIdentifier\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ActorDefinitionIdentifier\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ActorDefinitionIdentifier & operator=(struct ActorDefinitionIdentifier const &); /** - * @symbol ??8ActorDefinitionIdentifier\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8ActorDefinitionIdentifier\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct ActorDefinitionIdentifier const &) const; /** - * @symbol ?setIdentifier\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setIdentifier\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setIdentifier(std::string const &); /** - * @symbol ?setInitEvent\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setInitEvent\@ActorDefinitionIdentifier\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setInitEvent(std::string const &); /** - * @symbol ??1ActorDefinitionIdentifier\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionIdentifier\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionIdentifier(); /** - * @symbol ?EVENT_BEGIN\@ActorDefinitionIdentifier\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EVENT_BEGIN\@ActorDefinitionIdentifier\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EVENT_BEGIN; /** - * @symbol ?EVENT_END\@ActorDefinitionIdentifier\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EVENT_END\@ActorDefinitionIdentifier\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EVENT_END; /** - * @symbol ?NAMESPACE_SEPARATOR\@ActorDefinitionIdentifier\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NAMESPACE_SEPARATOR\@ActorDefinitionIdentifier\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NAMESPACE_SEPARATOR; //private: /** - * @symbol ?_initialize\@ActorDefinitionIdentifier\@\@AEAAXXZ + * @symbol ?_initialize\@ActorDefinitionIdentifier\@\@AEAAXXZ */ MCAPI void _initialize(); /** - * @symbol ?_extractIdentifier\@ActorDefinitionIdentifier\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAU1\@\@Z + * @symbol ?_extractIdentifier\@ActorDefinitionIdentifier\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAU1\@\@Z */ MCAPI static void _extractIdentifier(std::string const &, struct ActorDefinitionIdentifier &); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifierComponent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifierComponent.hpp index 3b40905796..3f4e274659 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionIdentifierComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionIdentifierComponent.hpp @@ -28,7 +28,7 @@ struct ActorDefinitionIdentifierComponent { public: /** - * @symbol ??1ActorDefinitionIdentifierComponent\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionIdentifierComponent\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionIdentifierComponent(); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp index b0ca288cac..09bfbe81ad 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionModifier.hpp @@ -26,19 +26,19 @@ struct ActorDefinitionModifier { public: /** - * @symbol ??0ActorDefinitionModifier\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorDefinitionModifier\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorDefinitionModifier(struct ActorDefinitionModifier const &); /** - * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier const &); + MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier &&); /** - * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ActorDefinitionModifier\@\@QEAAAEAU0\@AEBU0\@\@Z */ - MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier &&); + MCAPI struct ActorDefinitionModifier & operator=(struct ActorDefinitionModifier const &); /** - * @symbol ??1ActorDefinitionModifier\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionModifier\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionModifier(); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp index b948eacaea..112abfa0c9 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionPtr.hpp @@ -28,28 +28,28 @@ class ActorDefinitionPtr { public: /** - * @symbol ??0ActorDefinitionPtr\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ActorDefinitionPtr\@\@QEAA\@AEAVActorDefinitionGroup\@\@AEAVActorDefinition\@\@\@Z */ - MCAPI ActorDefinitionPtr(class ActorDefinitionPtr const &); + MCAPI ActorDefinitionPtr(class ActorDefinitionGroup &, class ActorDefinition &); /** - * @symbol ??0ActorDefinitionPtr\@\@QEAA\@AEAVActorDefinitionGroup\@\@AEAVActorDefinition\@\@\@Z + * @symbol ??0ActorDefinitionPtr\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ActorDefinitionPtr(class ActorDefinitionGroup &, class ActorDefinition &); + MCAPI ActorDefinitionPtr(class ActorDefinitionPtr const &); /** - * @symbol ??0ActorDefinitionPtr\@\@QEAA\@XZ + * @symbol ??0ActorDefinitionPtr\@\@QEAA\@XZ */ MCAPI ActorDefinitionPtr(); /** - * @symbol ??4ActorDefinitionPtr\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ActorDefinitionPtr\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ActorDefinitionPtr & operator=(class ActorDefinitionPtr &&); /** - * @symbol ??1ActorDefinitionPtr\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionPtr\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionPtr(); /** - * @symbol ?NONE\@ActorDefinitionPtr\@\@2V1\@B + * @symbol ?NONE\@ActorDefinitionPtr\@\@2V1\@B */ MCAPI static class ActorDefinitionPtr const NONE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionStartedEvent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionStartedEvent.hpp index f6fcbe4dba..43a1afd88c 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionStartedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionStartedEvent.hpp @@ -28,7 +28,7 @@ struct ActorDefinitionStartedEvent { public: /** - * @symbol ??1ActorDefinitionStartedEvent\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionStartedEvent\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionStartedEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionTrigger.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionTrigger.hpp index 4219589b2e..520ea4dc26 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionTrigger.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionTrigger.hpp @@ -21,33 +21,30 @@ class ActorDefinitionTrigger { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORDEFINITIONTRIGGER public: + ActorDefinitionTrigger(class ActorDefinitionTrigger const &) = delete; ActorDefinitionTrigger() = delete; #endif public: /** - * @symbol ??0ActorDefinitionTrigger\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ActorDefinitionTrigger\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ActorDefinitionTrigger(class ActorDefinitionTrigger &&); /** - * @symbol ??0ActorDefinitionTrigger\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI ActorDefinitionTrigger(class ActorDefinitionTrigger const &); - /** - * @symbol ?canTrigger\@ActorDefinitionTrigger\@\@QEBA_NAEBVActor\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?canTrigger\@ActorDefinitionTrigger\@\@QEBA_NAEBVActor\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI bool canTrigger(class Actor const &, class VariantParameterList const &) const; /** - * @symbol ??4ActorDefinitionTrigger\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ActorDefinitionTrigger\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ActorDefinitionTrigger & operator=(class ActorDefinitionTrigger const &); /** - * @symbol ??4ActorDefinitionTrigger\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ActorDefinitionTrigger\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ActorDefinitionTrigger & operator=(class ActorDefinitionTrigger &&); /** - * @symbol ??1ActorDefinitionTrigger\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionTrigger\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorDefinitionTriggeredEvent.hpp b/LiteLoader/include/llapi/mc/ActorDefinitionTriggeredEvent.hpp index c7afec4f34..5555fd61f8 100644 --- a/LiteLoader/include/llapi/mc/ActorDefinitionTriggeredEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDefinitionTriggeredEvent.hpp @@ -28,7 +28,7 @@ struct ActorDefinitionTriggeredEvent { public: /** - * @symbol ??1ActorDefinitionTriggeredEvent\@\@QEAA\@XZ + * @symbol ??1ActorDefinitionTriggeredEvent\@\@QEAA\@XZ */ MCAPI ~ActorDefinitionTriggeredEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorDiedEvent.hpp b/LiteLoader/include/llapi/mc/ActorDiedEvent.hpp new file mode 100644 index 0000000000..53b4464307 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorDiedEvent.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorDiedEvent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorDiedEvent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORDIEDEVENT +public: + struct ActorDiedEvent& operator=(struct ActorDiedEvent const &) = delete; + ActorDiedEvent(struct ActorDiedEvent const &) = delete; + ActorDiedEvent() = delete; +#endif + +public: + /** + * @symbol ??1ActorDiedEvent\@\@QEAA\@XZ + */ + MCAPI ~ActorDiedEvent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorDroppedItemEvent.hpp b/LiteLoader/include/llapi/mc/ActorDroppedItemEvent.hpp index 57171f06cf..6833279bd8 100644 --- a/LiteLoader/include/llapi/mc/ActorDroppedItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorDroppedItemEvent.hpp @@ -25,7 +25,7 @@ struct ActorDroppedItemEvent { public: /** - * @symbol ??1ActorDroppedItemEvent\@\@QEAA\@XZ + * @symbol ??1ActorDroppedItemEvent\@\@QEAA\@XZ */ MCAPI ~ActorDroppedItemEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorEnumPropertyTest.hpp b/LiteLoader/include/llapi/mc/ActorEnumPropertyTest.hpp index ae3f17eb21..48da9d776c 100644 --- a/LiteLoader/include/llapi/mc/ActorEnumPropertyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorEnumPropertyTest.hpp @@ -30,39 +30,45 @@ class ActorEnumPropertyTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorEnumPropertyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorEnumPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorEnumPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorEnumPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorEnumPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getName\@ActorEnumPropertyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorEnumPropertyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 5 - * @symbol ?_serializeDomain\@ActorEnumPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 5 + * @symbol ?_serializeDomain\@ActorEnumPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeDomain() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorEnumPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorEnumPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORENUMPROPERTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorEnumPropertyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorEnvironment.hpp b/LiteLoader/include/llapi/mc/ActorEnvironment.hpp index 2863e37fea..74fa87f9d7 100644 --- a/LiteLoader/include/llapi/mc/ActorEnvironment.hpp +++ b/LiteLoader/include/llapi/mc/ActorEnvironment.hpp @@ -17,27 +17,27 @@ namespace ActorEnvironment { #undef AFTER_EXTRA /** - * @symbol ?getHeadInWater\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?getHeadInWater\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool getHeadInWater(class EntityContext const &); /** - * @symbol ?getIsInLava\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?getIsInLava\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool getIsInLava(class EntityContext const &); /** - * @symbol ?getIsInWater\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?getIsInWater\@ActorEnvironment\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool getIsInWater(class EntityContext const &); /** - * @symbol ?setHeadInWater\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setHeadInWater\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setHeadInWater(class EntityContext &, bool); /** - * @symbol ?setIsInLava\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setIsInLava\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setIsInLava(class EntityContext &, bool); /** - * @symbol ?setIsInWater\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setIsInWater\@ActorEnvironment\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setIsInWater(class EntityContext &, bool); diff --git a/LiteLoader/include/llapi/mc/ActorEquippedArmorEvent.hpp b/LiteLoader/include/llapi/mc/ActorEquippedArmorEvent.hpp index da5f1ba0ec..abe384e3b4 100644 --- a/LiteLoader/include/llapi/mc/ActorEquippedArmorEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorEquippedArmorEvent.hpp @@ -28,7 +28,7 @@ struct ActorEquippedArmorEvent { public: /** - * @symbol ??1ActorEquippedArmorEvent\@\@QEAA\@XZ + * @symbol ??1ActorEquippedArmorEvent\@\@QEAA\@XZ */ MCAPI ~ActorEquippedArmorEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp index 6cc6ab2991..0b17b731db 100644 --- a/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventCoordinator.hpp @@ -30,68 +30,64 @@ class ActorEventCoordinator { public: /** - * @symbol ?getActorGameplayHandler\@ActorEventCoordinator\@\@QEAAAEAVActorGameplayHandler\@\@XZ + * @symbol ?getActorGameplayHandler\@ActorEventCoordinator\@\@QEAAAEAVActorGameplayHandler\@\@XZ */ MCAPI class ActorGameplayHandler & getActorGameplayHandler(); /** - * @symbol ?registerActorGameplayHandler\@ActorEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VActorGameplayHandler\@\@U?$default_delete\@VActorGameplayHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerActorGameplayHandler\@ActorEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VActorGameplayHandler\@\@U?$default_delete\@VActorGameplayHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerActorGameplayHandler(std::unique_ptr &&); /** - * @symbol ?sendActorCreated\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?sendActorCreated\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendActorCreated(class Actor &); /** - * @symbol ?sendActorDeath\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@W4ActorType\@\@\@Z - */ - MCAPI void sendActorDeath(class Actor &, class ActorDamageSource const &, enum class ActorType); - /** - * @symbol ?sendActorMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?sendActorMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z */ MCAPI void sendActorMove(class Actor &, class Vec3 const &); /** - * @symbol ?sendActorPredictedMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@W4MovePredictionType\@\@AEBVVec3\@\@\@Z + * @symbol ?sendActorPredictedMove\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@W4MovePredictionType\@\@AEBVVec3\@\@\@Z */ MCAPI void sendActorPredictedMove(class Actor &, enum class MovePredictionType, class Vec3 const &); /** - * @symbol ?sendActorSneakChanged\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?sendActorSneakChanged\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void sendActorSneakChanged(class Actor &, bool); /** - * @symbol ?sendActorStartRiding\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@0\@Z + * @symbol ?sendActorStartRiding\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@0\@Z */ MCAPI void sendActorStartRiding(class Actor &, class Actor &); /** - * @symbol ?sendActorStopRiding\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@_N11\@Z + * @symbol ?sendActorStopRiding\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@_N11\@Z */ MCAPI void sendActorStopRiding(class Actor &, bool, bool, bool); /** - * @symbol ?sendActorTargetAcquired\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@0\@Z + * @symbol ?sendActorTargetAcquired\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@0\@Z */ MCAPI void sendActorTargetAcquired(class Actor &, class Actor &); /** - * @symbol ?sendActorTeleported\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?sendActorTeleported\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendActorTeleported(class Actor &); /** - * @symbol ?sendActorTick\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?sendActorTick\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendActorTick(class Actor &); /** - * @symbol ?sendActorUseItemOn\@ActorEventCoordinator\@\@QEAAXAEAVActor\@\@AEBVItemStack\@\@AEBVBlockPos\@\@E\@Z + * @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 - */ - MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); - /** - * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @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\@\@QEAAXAEBV?$EventRef\@U?$ActorGameplayEvent\@X\@\@\@\@\@Z */ MCAPI void sendEvent(class EventRef> const &); + /** + * @symbol ?sendEvent\@ActorEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + */ + MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorEventListener.hpp b/LiteLoader/include/llapi/mc/ActorEventListener.hpp index 68ec737241..1a0f9b8b02 100644 --- a/LiteLoader/include/llapi/mc/ActorEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventListener.hpp @@ -31,65 +31,65 @@ class ActorEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTOREVENTLISTENER /** - * @symbol ?onActorAttackedActor\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@0\@Z + * @symbol ?onActorAttackedActor\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@0\@Z */ MCVAPI enum class EventResult onActorAttackedActor(class Actor &, class Actor &); /** - * @symbol ?onActorCreated\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z + * @symbol ?onActorCreated\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onActorCreated(class Actor &); /** - * @symbol ?onActorDeath\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVActorDamageSource\@\@W4ActorType\@\@\@Z - */ - MCVAPI enum class EventResult onActorDeath(class Actor &, class ActorDamageSource const &, enum class ActorType); - /** - * @symbol ?onActorDefinitionEvent\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@5\@\@Z + * @symbol ?onActorDefinitionEvent\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@UActorDefinitionModifier\@\@V?$allocator\@UActorDefinitionModifier\@\@\@std\@\@\@5\@\@Z */ MCVAPI enum class EventResult onActorDefinitionEvent(class Actor &, std::string const &, std::vector &); /** - * @symbol ?onActorMobInteraction\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@W4InteractionType\@MinecraftEventing\@\@W4ActorType\@\@\@Z + * @symbol ?onActorMobInteraction\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@W4InteractionType\@MinecraftEventing\@\@W4ActorType\@\@\@Z */ MCVAPI enum class EventResult onActorMobInteraction(class Actor &, enum class MinecraftEventing::InteractionType, enum class ActorType); /** - * @symbol ?onActorMove\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?onActorMove\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVVec3\@\@\@Z */ MCVAPI enum class EventResult onActorMove(class Actor &, class Vec3 const &); /** - * @symbol ?onActorPredictedMove\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@W4MovePredictionType\@\@AEBVVec3\@\@\@Z + * @symbol ?onActorPredictedMove\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@W4MovePredictionType\@\@AEBVVec3\@\@\@Z */ MCVAPI enum class EventResult onActorPredictedMove(class Actor &, enum class MovePredictionType, class Vec3 const &); /** - * @symbol ?onActorSneakChanged\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@_N\@Z + * @symbol ?onActorSneakChanged\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@_N\@Z */ MCVAPI enum class EventResult onActorSneakChanged(class Actor &, bool); /** - * @symbol ?onActorStartRiding\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@0\@Z + * @symbol ?onActorStartRiding\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@0\@Z */ MCVAPI enum class EventResult onActorStartRiding(class Actor &, class Actor &); /** - * @symbol ?onActorStopRiding\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@_N11\@Z + * @symbol ?onActorStopRiding\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@_N11\@Z */ MCVAPI enum class EventResult onActorStopRiding(class Actor &, bool, bool, bool); /** - * @symbol ?onActorTargetAcquired\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@0\@Z + * @symbol ?onActorTargetAcquired\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@0\@Z */ MCVAPI enum class EventResult onActorTargetAcquired(class Actor &, class Actor &); /** - * @symbol ?onActorTeleported\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z + * @symbol ?onActorTeleported\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onActorTeleported(class Actor &); /** - * @symbol ?onActorTick\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z + * @symbol ?onActorTick\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onActorTick(class Actor &); /** - * @symbol ?onActorUseItemOn\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVItemStack\@\@AEBVBlockPos\@\@E\@Z + * @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 + * @symbol ?onEvent\@ActorEventListener\@\@UEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct ActorNotificationEvent const &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorEventListener(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp index 0ce06a9f7d..59e9107f6e 100644 --- a/LiteLoader/include/llapi/mc/ActorEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventPacket.hpp @@ -33,37 +33,43 @@ class ActorEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ActorEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ActorEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ActorEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ActorEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ActorEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ActorEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ActorEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ActorEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTOREVENTPACKET /** - * @symbol ??0ActorEventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ActorEventPacket(); + MCVAPI ~ActorEventPacket(); +#endif /** - * @symbol ??0ActorEventPacket\@\@QEAA\@VActorRuntimeID\@\@W4ActorEvent\@\@H\@Z + * @symbol ??0ActorEventPacket\@\@QEAA\@VActorRuntimeID\@\@W4ActorEvent\@\@H\@Z */ MCAPI ActorEventPacket(class ActorRuntimeID, enum class ActorEvent, int); + /** + * @symbol ??0ActorEventPacket\@\@QEAA\@XZ + */ + MCAPI ActorEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorEventResponse.hpp b/LiteLoader/include/llapi/mc/ActorEventResponse.hpp index e8f228761d..a98d6ffefc 100644 --- a/LiteLoader/include/llapi/mc/ActorEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventResponse.hpp @@ -31,24 +31,24 @@ class ActorEventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorEventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@ActorEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@ActorEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2() = 0; /** - * @vftbl 3 - * @symbol ?buildSchema\@ActorEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@ActorEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorEventResponseCollection.hpp b/LiteLoader/include/llapi/mc/ActorEventResponseCollection.hpp index 5b4c46dec1..3aa67ffd9d 100644 --- a/LiteLoader/include/llapi/mc/ActorEventResponseCollection.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventResponseCollection.hpp @@ -29,7 +29,7 @@ struct ActorEventResponseCollection { public: /** - * @symbol ?buildSchema\@ActorEventResponseCollection\@\@SA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVSemVersion\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z + * @symbol ?buildSchema\@ActorEventResponseCollection\@\@SA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVSemVersion\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z */ MCAPI static class std::shared_ptr> buildSchema(std::string const &, class SemVersion const &, class Factory const &); diff --git a/LiteLoader/include/llapi/mc/ActorEventResponseFactory.hpp b/LiteLoader/include/llapi/mc/ActorEventResponseFactory.hpp index 3d392f2acc..6cd91fd040 100644 --- a/LiteLoader/include/llapi/mc/ActorEventResponseFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventResponseFactory.hpp @@ -25,17 +25,26 @@ class ActorEventResponseFactory { public: class ActorEventResponseFactory& operator=(class ActorEventResponseFactory const &) = delete; ActorEventResponseFactory(class ActorEventResponseFactory const &) = delete; - ActorEventResponseFactory() = delete; #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTOREVENTRESPONSEFACTORY /** - * @symbol ?initSchema\@ActorEventResponseFactory\@\@QEAAXXZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorEventResponseFactory(); +#endif + /** + * @symbol ??0ActorEventResponseFactory\@\@QEAA\@XZ + */ + MCAPI ActorEventResponseFactory(); + /** + * @symbol ?initSchema\@ActorEventResponseFactory\@\@QEAAXXZ */ MCAPI void initSchema(); /** - * @symbol ?initializeFactory\@ActorEventResponseFactory\@\@QEAAXAEBVExperiments\@\@\@Z + * @symbol ?initializeFactory\@ActorEventResponseFactory\@\@QEAAXAEBVExperiments\@\@\@Z */ MCAPI void initializeFactory(class Experiments const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorEventVersions.hpp b/LiteLoader/include/llapi/mc/ActorEventVersions.hpp index dde0f8cb98..78a58e0957 100644 --- a/LiteLoader/include/llapi/mc/ActorEventVersions.hpp +++ b/LiteLoader/include/llapi/mc/ActorEventVersions.hpp @@ -20,7 +20,7 @@ namespace ActorEventVersions { #undef AFTER_EXTRA /** - * @symbol ?ACTOR_EVENT_RESPONSE_VERSION_1_16_100\@ActorEventVersions\@\@3VSemVersion\@\@A + * @symbol ?ACTOR_EVENT_RESPONSE_VERSION_1_16_100\@ActorEventVersions\@\@3VSemVersion\@\@A */ MCAPI extern class SemVersion ACTOR_EVENT_RESPONSE_VERSION_1_16_100; diff --git a/LiteLoader/include/llapi/mc/ActorFactory.hpp b/LiteLoader/include/llapi/mc/ActorFactory.hpp index dc1c8a6e28..1811c233d7 100644 --- a/LiteLoader/include/llapi/mc/ActorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactory.hpp @@ -31,112 +31,112 @@ class ActorFactory { public: /** - * @symbol ??0ActorFactory\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0ActorFactory\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VLevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI ActorFactory(class gsl::not_null>); /** - * @symbol ?applyEntityInitializer\@ActorFactory\@\@QEBAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@\@Z + * @symbol ?applyEntityInitializer\@ActorFactory\@\@QEBAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@\@Z */ MCAPI void applyEntityInitializer(std::unique_ptr, class EntityContext &) const; /** - * @symbol ?buildSummonEntityTypeEnum\@ActorFactory\@\@QEBA?AV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUActorDefinitionIdentifier\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUActorDefinitionIdentifier\@\@\@std\@\@\@2\@\@std\@\@AEBVExperiments\@\@\@Z + * @symbol ?buildSummonEntityTypeEnum\@ActorFactory\@\@QEBA?AV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUActorDefinitionIdentifier\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUActorDefinitionIdentifier\@\@\@std\@\@\@2\@\@std\@\@AEBVExperiments\@\@\@Z */ MCAPI std::vector> buildSummonEntityTypeEnum(class Experiments const &) const; /** - * @symbol ?clearDefinitionGroup\@ActorFactory\@\@QEAAXXZ + * @symbol ?clearDefinitionGroup\@ActorFactory\@\@QEAAXXZ */ MCAPI void clearDefinitionGroup(); /** - * @symbol ?createActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?createActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI class OwnerPtrT createActor(std::string const &, struct ActorDefinitionIdentifier const &, class Actor *, class Vec3 const &, class Vec2 const &); /** - * @symbol ?createBornActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@\@Z + * @symbol ?createBornActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@\@Z */ - MCAPI class OwnerPtrT createBornActor(struct ActorDefinitionIdentifier const &, class BlockPos const &); + MCAPI class OwnerPtrT createBornActor(struct ActorDefinitionIdentifier const &, class Actor *); /** - * @symbol ?createBornActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@\@Z + * @symbol ?createBornActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@\@Z */ - MCAPI class OwnerPtrT createBornActor(struct ActorDefinitionIdentifier const &, class Actor *); + MCAPI class OwnerPtrT createBornActor(struct ActorDefinitionIdentifier const &, class BlockPos const &); /** - * @symbol ?createSpawnedActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?createSpawnedActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI class OwnerPtrT createSpawnedActor(struct ActorDefinitionIdentifier const &, class Actor *, class Vec3 const &, class Vec2 const &); /** - * @symbol ?createSummonedActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?createSummonedActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@\@Z */ MCAPI class OwnerPtrT createSummonedActor(struct ActorDefinitionIdentifier const &, class Actor *, class Vec3 const &); /** - * @symbol ?createTransformedActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@\@Z + * @symbol ?createTransformedActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@\@Z */ MCAPI class OwnerPtrT createTransformedActor(struct ActorDefinitionIdentifier const &, class Actor *); /** - * @symbol ?getGoalFactory\@ActorFactory\@\@QEAAAEAVActorGoalFactory\@\@XZ + * @symbol ?getGoalFactory\@ActorFactory\@\@QEAAAEAVActorGoalFactory\@\@XZ */ MCAPI class ActorGoalFactory & getGoalFactory(); /** - * @symbol ?init\@ActorFactory\@\@QEAAXAEBVExperiments\@\@\@Z + * @symbol ?init\@ActorFactory\@\@QEAAXAEBVExperiments\@\@\@Z */ MCAPI void init(class Experiments const &); /** - * @symbol ?loadActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@PEAVCompoundTag\@\@AEAVDataLoadHelper\@\@AEBVDimensionHeightRange\@\@PEBVLevelChunk\@\@\@Z + * @symbol ?loadActor\@ActorFactory\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@PEAVCompoundTag\@\@AEAVDataLoadHelper\@\@AEBVDimensionHeightRange\@\@PEBVLevelChunk\@\@\@Z */ MCAPI class OwnerPtrT loadActor(class CompoundTag *, class DataLoadHelper &, class DimensionHeightRange const &, class LevelChunk const *); /** - * @symbol ?lookupEntityType\@ActorFactory\@\@QEBA?AW4ActorType\@\@AEBUActorDefinitionIdentifier\@\@\@Z + * @symbol ?lookupEntityType\@ActorFactory\@\@QEBA?AW4ActorType\@\@AEBUActorDefinitionIdentifier\@\@\@Z */ MCAPI enum class ActorType lookupEntityType(struct ActorDefinitionIdentifier const &) const; /** - * @symbol ?setDefinitionGroup\@ActorFactory\@\@QEAAXPEAVActorDefinitionGroup\@\@\@Z + * @symbol ?setDefinitionGroup\@ActorFactory\@\@QEAAXPEAVActorDefinitionGroup\@\@\@Z */ MCAPI void setDefinitionGroup(class ActorDefinitionGroup *); /** - * @symbol ?setEntityInitializer\@ActorFactory\@\@QEAAXV?$shared_ptr\@VIEntityInitializer\@\@\@std\@\@\@Z + * @symbol ?setEntityInitializer\@ActorFactory\@\@QEAAXV?$shared_ptr\@VIEntityInitializer\@\@\@std\@\@\@Z */ MCAPI void setEntityInitializer(class std::shared_ptr); /** - * @symbol ??1ActorFactory\@\@QEAA\@XZ + * @symbol ??1ActorFactory\@\@QEAA\@XZ */ MCAPI ~ActorFactory(); /** - * @symbol ?clearEntityMappings\@ActorFactory\@\@SAXXZ + * @symbol ?clearEntityMappings\@ActorFactory\@\@SAXXZ */ MCAPI static void clearEntityMappings(); /** - * @symbol ?fixLegacyEntity\@ActorFactory\@\@SAPEAVActor\@\@AEAVBlockSource\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?fixLegacyEntity\@ActorFactory\@\@SAPEAVActor\@\@AEAVBlockSource\@\@PEBVCompoundTag\@\@\@Z */ MCAPI static class Actor * fixLegacyEntity(class BlockSource &, class CompoundTag const *); /** - * @symbol ?registerEntityMapping\@ActorFactory\@\@SAXAEBW4ActorType\@\@_NAEBQ6A?AV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@ZV?$optional\@H\@4\@\@Z + * @symbol ?registerEntityMapping\@ActorFactory\@\@SAXAEBW4ActorType\@\@_NAEBQ6A?AV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@ZV?$optional\@H\@4\@\@Z */ MCAPI static void registerEntityMapping(enum class ActorType const &, bool, std::unique_ptr ( *const &)(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &), class std::optional); //private: /** - * @symbol ?_buildSummonableActorList\@ActorFactory\@\@AEBAXAEBVExperiments\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUActorFactoryData\@\@\@Z\@std\@\@\@Z + * @symbol ?_buildSummonableActorList\@ActorFactory\@\@AEBAXAEBVExperiments\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUActorFactoryData\@\@\@Z\@std\@\@\@Z */ MCAPI void _buildSummonableActorList(class Experiments const &, class std::function) const; /** - * @symbol ?_constructActor\@ActorFactory\@\@AEBA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@AEBVVec2\@\@PEBV?$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 ?_constructActor\@ActorFactory\@\@AEBA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@AEBVVec2\@\@PEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI class OwnerPtrT _constructActor(struct ActorDefinitionIdentifier const &, class Vec3 const &, class Vec2 const &, std::vector const *) const; /** - * @symbol ?_loadDefinitionGroups\@ActorFactory\@\@AEAAXPEAVActorDefinitionGroup\@\@\@Z + * @symbol ?_loadDefinitionGroups\@ActorFactory\@\@AEAAXPEAVActorDefinitionGroup\@\@\@Z */ MCAPI void _loadDefinitionGroups(class ActorDefinitionGroup *); /** - * @symbol ?_loadDefinitionsHelper\@ActorFactory\@\@AEAAXXZ + * @symbol ?_loadDefinitionsHelper\@ActorFactory\@\@AEAAXXZ */ MCAPI void _loadDefinitionsHelper(); /** - * @symbol ?_validateActorData\@ActorFactory\@\@AEBA_NAEAVCompoundTag\@\@AEAUActorDefinitionIdentifier\@\@AEAVVec3\@\@PEBVLevelChunk\@\@\@Z + * @symbol ?_validateActorData\@ActorFactory\@\@AEBA_NAEAVCompoundTag\@\@AEAUActorDefinitionIdentifier\@\@AEAVVec3\@\@PEBVLevelChunk\@\@\@Z */ MCAPI bool _validateActorData(class CompoundTag &, struct ActorDefinitionIdentifier &, class Vec3 &, class LevelChunk const *) const; private: /** - * @symbol ?builtinEntityMappings\@ActorFactory\@\@0V?$vector\@UVanillaActorData\@\@V?$allocator\@UVanillaActorData\@\@\@std\@\@\@std\@\@A + * @symbol ?builtinEntityMappings\@ActorFactory\@\@0V?$vector\@UVanillaActorData\@\@V?$allocator\@UVanillaActorData\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector builtinEntityMappings; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorFactoryData.hpp b/LiteLoader/include/llapi/mc/ActorFactoryData.hpp index 1c1e90ea6e..be1b145239 100644 --- a/LiteLoader/include/llapi/mc/ActorFactoryData.hpp +++ b/LiteLoader/include/llapi/mc/ActorFactoryData.hpp @@ -27,11 +27,11 @@ struct ActorFactoryData { public: /** - * @symbol ??4ActorFactoryData\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ActorFactoryData\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ActorFactoryData & operator=(struct ActorFactoryData const &); /** - * @symbol ??1ActorFactoryData\@\@QEAA\@XZ + * @symbol ??1ActorFactoryData\@\@QEAA\@XZ */ MCAPI ~ActorFactoryData(); diff --git a/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp b/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp index 867c89071e..1f6655b87e 100644 --- a/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorFilterGroup.hpp @@ -31,56 +31,59 @@ struct LegacyMapping { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORFILTERGROUP public: + ActorFilterGroup(class ActorFilterGroup const &) = delete; ActorFilterGroup() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorFilterGroup(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_createSubgroup\@ActorFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z + * @vftbl 1 + * @symbol ?_createSubgroup\@ActorFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z */ virtual class std::shared_ptr _createSubgroup(enum class FilterGroup::CollectionType) const; /** - * @vftbl 3 - * @symbol ?_handleUnknownMember\@ActorFilterGroup\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @vftbl 3 + * @symbol ?_handleUnknownMember\@ActorFilterGroup\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ virtual bool _handleUnknownMember(std::string const &, class Json::Value const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORFILTERGROUP /** - * @symbol ??0ActorFilterGroup\@\@QEAA\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ActorFilterGroup(class ActorFilterGroup const &); + MCVAPI ~ActorFilterGroup(); +#endif /** - * @symbol ?evaluateActor\@ActorFilterGroup\@\@QEBA_NAEBVActor\@\@AEBVVariantParameterList\@\@\@Z + * @symbol ?evaluateActor\@ActorFilterGroup\@\@QEBA_NAEBVActor\@\@AEBVVariantParameterList\@\@\@Z */ MCAPI bool evaluateActor(class Actor const &, class VariantParameterList const &) const; /** - * @symbol ??4ActorFilterGroup\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ActorFilterGroup\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ActorFilterGroup & operator=(class ActorFilterGroup const &); /** - * @symbol ?initialize\@ActorFilterGroup\@\@SAXXZ + * @symbol ?initialize\@ActorFilterGroup\@\@SAXXZ */ MCAPI static void initialize(); //protected: /** - * @symbol ?_addLegacyFilter\@ActorFilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBULegacyMapping\@1\@AEBVFilterInput\@\@\@Z + * @symbol ?_addLegacyFilter\@ActorFilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBULegacyMapping\@1\@AEBVFilterInput\@\@\@Z */ MCAPI bool _addLegacyFilter(std::string const &, struct ActorFilterGroup::LegacyMapping const &, class FilterInput const &); /** - * @symbol ?_processLegacyArray\@ActorFilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@AEBULegacyMapping\@1\@\@Z + * @symbol ?_processLegacyArray\@ActorFilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@AEBULegacyMapping\@1\@\@Z */ MCAPI bool _processLegacyArray(std::string const &, class Json::Value const &, struct ActorFilterGroup::LegacyMapping const &); /** - * @symbol ?_processLegacyMember\@ActorFilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@AEBULegacyMapping\@1\@\@Z + * @symbol ?_processLegacyMember\@ActorFilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@AEBULegacyMapping\@1\@\@Z */ MCAPI bool _processLegacyMember(std::string const &, class Json::Value const &, struct ActorFilterGroup::LegacyMapping const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorFloatPropertyTest.hpp b/LiteLoader/include/llapi/mc/ActorFloatPropertyTest.hpp index a24447b19b..aa6b4b4890 100644 --- a/LiteLoader/include/llapi/mc/ActorFloatPropertyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorFloatPropertyTest.hpp @@ -30,39 +30,45 @@ class ActorFloatPropertyTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorFloatPropertyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorFloatPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorFloatPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorFloatPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorFloatPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getName\@ActorFloatPropertyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorFloatPropertyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 5 - * @symbol ?_serializeDomain\@ActorFloatPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 5 + * @symbol ?_serializeDomain\@ActorFloatPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeDomain() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorFloatPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorFloatPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORFLOATPROPERTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorFloatPropertyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp b/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp index 951327da0c..77fcdd22b8 100644 --- a/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp +++ b/LiteLoader/include/llapi/mc/ActorGarbageCollector.hpp @@ -23,29 +23,35 @@ class ActorGarbageCollector { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORGARBAGECOLLECTOR /** - * @symbol ??0ActorGarbageCollector\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorGarbageCollector(); +#endif + /** + * @symbol ??0ActorGarbageCollector\@\@QEAA\@XZ */ MCAPI ActorGarbageCollector(); /** - * @symbol ?clearChunkDiscardedEntities\@ActorGarbageCollector\@\@QEAAXXZ + * @symbol ?clearChunkDiscardedEntities\@ActorGarbageCollector\@\@QEAAXXZ */ MCAPI void clearChunkDiscardedEntities(); /** - * @symbol ?clearPendingEntities\@ActorGarbageCollector\@\@QEAAXXZ + * @symbol ?clearPendingEntities\@ActorGarbageCollector\@\@QEAAXXZ */ MCAPI void clearPendingEntities(); /** - * @symbol ?garbageCollectEntity\@ActorGarbageCollector\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?garbageCollectEntity\@ActorGarbageCollector\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void garbageCollectEntity(class OwnerPtrT); /** - * @symbol ?garbageCollectEntityWhenChunkDiscarded\@ActorGarbageCollector\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?garbageCollectEntityWhenChunkDiscarded\@ActorGarbageCollector\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void garbageCollectEntityWhenChunkDiscarded(class OwnerPtrT); /** - * @symbol ?update\@ActorGarbageCollector\@\@QEAAXXZ + * @symbol ?update\@ActorGarbageCollector\@\@QEAAXXZ */ MCAPI void update(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorGlobal.hpp b/LiteLoader/include/llapi/mc/ActorGlobal.hpp new file mode 100644 index 0000000000..df4d63accb --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorGlobal.hpp @@ -0,0 +1,28 @@ +/** + * @file ActorGlobal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorGlobal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?addActorGlobalComponents\@ActorGlobal\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void addActorGlobalComponents(class EntityContext &); + /** + * @symbol ?removeActorGlobalComponents\@ActorGlobal\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void removeActorGlobalComponents(class EntityContext &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorGoalFactory.hpp b/LiteLoader/include/llapi/mc/ActorGoalFactory.hpp index f705874803..fe21df8937 100644 --- a/LiteLoader/include/llapi/mc/ActorGoalFactory.hpp +++ b/LiteLoader/include/llapi/mc/ActorGoalFactory.hpp @@ -28,8 +28,8 @@ class ActorGoalFactory { public: /** - * @symbol ?_initializeBedrock\@ActorGoalFactory\@\@QEAAXXZ + * @symbol ?_initializeBedrock\@ActorGoalFactory\@\@QEAAXXZ */ MCAPI void _initializeBedrock(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorGriefingBlockEvent.hpp b/LiteLoader/include/llapi/mc/ActorGriefingBlockEvent.hpp index ab7b14a869..3fce91d6e8 100644 --- a/LiteLoader/include/llapi/mc/ActorGriefingBlockEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorGriefingBlockEvent.hpp @@ -27,11 +27,11 @@ struct ActorGriefingBlockEvent { public: /** - * @symbol ??0ActorGriefingBlockEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorGriefingBlockEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorGriefingBlockEvent(struct ActorGriefingBlockEvent const &); /** - * @symbol ??1ActorGriefingBlockEvent\@\@QEAA\@XZ + * @symbol ??1ActorGriefingBlockEvent\@\@QEAA\@XZ */ MCAPI ~ActorGriefingBlockEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp b/LiteLoader/include/llapi/mc/ActorHasAbilityTest.hpp index 83bbd5f38b..401808d00a 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 : public FilterTest { +class ActorHasAbilityTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorHasAbilityTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasAbilityTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasAbilityTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorHasAbilityTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorHasAbilityTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp b/LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp index 1be214efcc..6155fab369 100644 --- a/LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasComponentTest.hpp @@ -32,19 +32,25 @@ class ActorHasComponentTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasComponentTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasComponentTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorHasComponentTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasComponentTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorHasComponentTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASCOMPONENTTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasComponentTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp b/LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp index 9fc3036dfb..a0920e2930 100644 --- a/LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasContainerOpenTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorHasContainerOpenTest. * */ -class ActorHasContainerOpenTest : public FilterTest { +class ActorHasContainerOpenTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorHasContainerOpenTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasContainerOpenTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasContainerOpenTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasContainerOpenTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasContainerOpenTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasContainerOpenTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASCONTAINEROPENTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasContainerOpenTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp b/LiteLoader/include/llapi/mc/ActorHasDamageTest.hpp index 9668e67168..53ee067c22 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 : public FilterTest { +class ActorHasDamageTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorHasDamageTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasDamageTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasDamageTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorHasDamageTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorHasDamageTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp b/LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp index 759c23b926..733ead015f 100644 --- a/LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasEquipmentTest.hpp @@ -32,39 +32,45 @@ class ActorHasEquipmentTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasEquipmentTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorHasEquipmentTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorHasEquipmentTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasEquipmentTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorHasEquipmentTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getName\@ActorHasEquipmentTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorHasEquipmentTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 5 - * @symbol ?_serializeDomain\@ActorHasEquipmentTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 5 + * @symbol ?_serializeDomain\@ActorHasEquipmentTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeDomain() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorHasEquipmentTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorHasEquipmentTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASEQUIPMENTTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasEquipmentTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp b/LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp index 912ef684ad..f3e35fbe9f 100644 --- a/LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasMobEffect.hpp @@ -32,29 +32,35 @@ class ActorHasMobEffect : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasMobEffect(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorHasMobEffect\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorHasMobEffect\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasMobEffect\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorHasMobEffect\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasMobEffect\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorHasMobEffect\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorHasMobEffect\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorHasMobEffect\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASMOBEFFECT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasMobEffect(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasNameTagTest.hpp b/LiteLoader/include/llapi/mc/ActorHasNameTagTest.hpp index 9f57e10779..ad3228fb57 100644 --- a/LiteLoader/include/llapi/mc/ActorHasNameTagTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasNameTagTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorHasNameTagTest. * */ -class ActorHasNameTagTest : public FilterTest { +class ActorHasNameTagTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,39 @@ class ActorHasNameTagTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasNameTagTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasNameTagTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasNameTagTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasNameTagTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasNameTagTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasPropertyTest.hpp b/LiteLoader/include/llapi/mc/ActorHasPropertyTest.hpp index 311d3dac31..a776bc8c02 100644 --- a/LiteLoader/include/llapi/mc/ActorHasPropertyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasPropertyTest.hpp @@ -30,29 +30,35 @@ class ActorHasPropertyTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasPropertyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorHasPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorHasPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorHasPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasPropertyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorHasPropertyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorHasPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorHasPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASPROPERTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasPropertyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp b/LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp index 1693aedd77..37887af138 100644 --- a/LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasRangedWeaponTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorHasRangedWeaponTest. * */ -class ActorHasRangedWeaponTest : public FilterTest { +class ActorHasRangedWeaponTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorHasRangedWeaponTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasRangedWeaponTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasRangedWeaponTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasRangedWeaponTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasRangedWeaponTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasRangedWeaponTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASRANGEDWEAPONTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasRangedWeaponTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasTagTest.hpp b/LiteLoader/include/llapi/mc/ActorHasTagTest.hpp index b6be697bc8..a830555752 100644 --- a/LiteLoader/include/llapi/mc/ActorHasTagTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasTagTest.hpp @@ -32,19 +32,25 @@ class ActorHasTagTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasTagTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasTagTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorHasTagTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasTagTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorHasTagTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASTAGTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasTagTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp b/LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp index ada155a870..408b95dc2c 100644 --- a/LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHasTargetTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorHasTargetTest. * */ -class ActorHasTargetTest : public FilterTest { +class ActorHasTargetTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorHasTargetTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHasTargetTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHasTargetTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorHasTargetTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorHasTargetTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorHasTargetTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORHASTARGETTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorHasTargetTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHealthTest.hpp b/LiteLoader/include/llapi/mc/ActorHealthTest.hpp index d831641f3e..b889ab901f 100644 --- a/LiteLoader/include/llapi/mc/ActorHealthTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorHealthTest.hpp @@ -13,7 +13,7 @@ #undef BEFORE_EXTRA -class ActorHealthTest : public FilterTest { +class ActorHealthTest { #define AFTER_EXTRA @@ -27,19 +27,39 @@ class ActorHealthTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorHealthTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorHealthTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorHealthTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHistory.hpp b/LiteLoader/include/llapi/mc/ActorHistory.hpp index 8036c368e9..e85e767539 100644 --- a/LiteLoader/include/llapi/mc/ActorHistory.hpp +++ b/LiteLoader/include/llapi/mc/ActorHistory.hpp @@ -36,16 +36,16 @@ struct Snapshot { public: /** - * @symbol ?addFrame\@ActorHistory\@\@QEAA_NAEAUIActorMovementProxy\@\@_KAEAVEntityRegistry\@\@\@Z + * @symbol ?addFrame\@ActorHistory\@\@QEAA_NAEAUIActorMovementProxy\@\@_KAEAVEntityRegistry\@\@\@Z */ MCAPI bool addFrame(struct IActorMovementProxy &, unsigned __int64, class EntityRegistry &); /** - * @symbol ?createSnapshot\@ActorHistory\@\@QEBA?AUSnapshot\@1\@AEAUIActorMovementProxy\@\@AEAVEntityRegistry\@\@\@Z + * @symbol ?createSnapshot\@ActorHistory\@\@QEBA?AUSnapshot\@1\@AEAUIActorMovementProxy\@\@AEAVEntityRegistry\@\@\@Z */ MCAPI struct ActorHistory::Snapshot createSnapshot(struct IActorMovementProxy &, class EntityRegistry &) const; /** - * @symbol ??1ActorHistory\@\@QEAA\@XZ + * @symbol ??1ActorHistory\@\@QEAA\@XZ */ MCAPI ~ActorHistory(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorHurtEvent.hpp b/LiteLoader/include/llapi/mc/ActorHurtEvent.hpp index 1d206d899c..9607633c88 100644 --- a/LiteLoader/include/llapi/mc/ActorHurtEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorHurtEvent.hpp @@ -28,7 +28,7 @@ struct ActorHurtEvent { public: /** - * @symbol ??1ActorHurtEvent\@\@QEAA\@XZ + * @symbol ??1ActorHurtEvent\@\@QEAA\@XZ */ MCAPI ~ActorHurtEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorInBlockTest.hpp b/LiteLoader/include/llapi/mc/ActorInBlockTest.hpp index 5663e8bb61..4d0c29ee20 100644 --- a/LiteLoader/include/llapi/mc/ActorInBlockTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInBlockTest.hpp @@ -32,19 +32,25 @@ class ActorInBlockTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInBlockTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInBlockTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorInBlockTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInBlockTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorInBlockTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINBLOCKTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInBlockTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp b/LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp index cf0f891976..8b6b6ecbfa 100644 --- a/LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInCaravanTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInCaravanTest. * */ -class ActorInCaravanTest : public FilterTest { +class ActorInCaravanTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInCaravanTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInCaravanTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInCaravanTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInCaravanTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInCaravanTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInCaravanTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINCARAVANTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInCaravanTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp index 27e3512fce..f72dcd2281 100644 --- a/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInCloudsTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInCloudsTest. * */ -class ActorInCloudsTest : public FilterTest { +class ActorInCloudsTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInCloudsTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInCloudsTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInCloudsTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInCloudsTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInCloudsTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInCloudsTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINCLOUDSTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInCloudsTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInContactWithWater.hpp b/LiteLoader/include/llapi/mc/ActorInContactWithWater.hpp index 27c3ee5168..4bdecaabcc 100644 --- a/LiteLoader/include/llapi/mc/ActorInContactWithWater.hpp +++ b/LiteLoader/include/llapi/mc/ActorInContactWithWater.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInContactWithWater. * */ -class ActorInContactWithWater : public FilterTest { +class ActorInContactWithWater { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInContactWithWater : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInContactWithWater(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInContactWithWater\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInContactWithWater\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInContactWithWater\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInContactWithWater\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINCONTACTWITHWATER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInContactWithWater(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInLavaTest.hpp b/LiteLoader/include/llapi/mc/ActorInLavaTest.hpp index 2087715694..4feec133b2 100644 --- a/LiteLoader/include/llapi/mc/ActorInLavaTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInLavaTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInLavaTest. * */ -class ActorInLavaTest : public FilterTest { +class ActorInLavaTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInLavaTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInLavaTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInLavaTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInLavaTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInLavaTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInLavaTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINLAVATEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInLavaTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInNetherTest.hpp b/LiteLoader/include/llapi/mc/ActorInNetherTest.hpp index f8cf186e96..1e484fbec4 100644 --- a/LiteLoader/include/llapi/mc/ActorInNetherTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInNetherTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInNetherTest. * */ -class ActorInNetherTest : public FilterTest { +class ActorInNetherTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInNetherTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInNetherTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInNetherTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInNetherTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInNetherTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInNetherTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINNETHERTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInNetherTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInVillageTest.hpp b/LiteLoader/include/llapi/mc/ActorInVillageTest.hpp index c171131b5a..11e1b8e874 100644 --- a/LiteLoader/include/llapi/mc/ActorInVillageTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInVillageTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInVillageTest. * */ -class ActorInVillageTest : public FilterTest { +class ActorInVillageTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInVillageTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInVillageTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInVillageTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInVillageTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInVillageTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInVillageTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINVILLAGETEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInVillageTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp b/LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp index fd19c279d9..4bff70f17d 100644 --- a/LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInWaterOrRainTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInWaterOrRainTest. * */ -class ActorInWaterOrRainTest : public FilterTest { +class ActorInWaterOrRainTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInWaterOrRainTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInWaterOrRainTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInWaterOrRainTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInWaterOrRainTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInWaterOrRainTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInWaterOrRainTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINWATERORRAINTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInWaterOrRainTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInWaterTest.hpp b/LiteLoader/include/llapi/mc/ActorInWaterTest.hpp index 225e7fa4a1..d5d8e0f7a7 100644 --- a/LiteLoader/include/llapi/mc/ActorInWaterTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInWaterTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorInWaterTest. * */ -class ActorInWaterTest : public FilterTest { +class ActorInWaterTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorInWaterTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInWaterTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInWaterTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorInWaterTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInWaterTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorInWaterTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINWATERTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorInWaterTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp b/LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp index 6b98240ad2..035658876f 100644 --- a/LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorInWeatherTest.hpp @@ -32,29 +32,29 @@ class ActorInWeatherTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInWeatherTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorInWeatherTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorInWeatherTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInWeatherTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorInWeatherTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorInWeatherTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorInWeatherTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorInWeatherTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorInWeatherTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp b/LiteLoader/include/llapi/mc/ActorInactivityTimerTest.hpp index 38544e2440..2142c02583 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 : public FilterTest { +class ActorInactivityTimerTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,39 @@ class ActorInactivityTimerTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorInactivityTimerTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorInactivityTimerTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorInactivityTimerTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInfo.hpp b/LiteLoader/include/llapi/mc/ActorInfo.hpp index a4707e27d3..b2f4dfa05c 100644 --- a/LiteLoader/include/llapi/mc/ActorInfo.hpp +++ b/LiteLoader/include/llapi/mc/ActorInfo.hpp @@ -28,23 +28,23 @@ struct ActorInfo { public: /** - * @symbol ??0ActorInfo\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorInfo\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorInfo(struct ActorInfo const &); /** - * @symbol ?load\@ActorInfo\@\@QEAAXPEBVCompoundTag\@\@\@Z + * @symbol ?load\@ActorInfo\@\@QEAAXPEBVCompoundTag\@\@\@Z */ MCAPI void load(class CompoundTag const *); /** - * @symbol ??4ActorInfo\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ActorInfo\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ActorInfo & operator=(struct ActorInfo const &); /** - * @symbol ?save\@ActorInfo\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@ActorInfo\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ??1ActorInfo\@\@QEAA\@XZ + * @symbol ??1ActorInfo\@\@QEAA\@XZ */ MCAPI ~ActorInfo(); diff --git a/LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp b/LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp index cb9419293f..3de83dd851 100644 --- a/LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ActorInfoRegistry.hpp @@ -29,36 +29,36 @@ class ActorInfoRegistry { public: /** - * @symbol ??0ActorInfoRegistry\@\@QEAA\@XZ + * @symbol ??0ActorInfoRegistry\@\@QEAA\@XZ */ MCAPI ActorInfoRegistry(); /** - * @symbol ?getActorInfo\@ActorInfoRegistry\@\@QEBAAEBUActorInfo\@\@I\@Z + * @symbol ?getActorInfo\@ActorInfoRegistry\@\@QEBAAEBUActorInfo\@\@I\@Z */ MCAPI struct ActorInfo const & getActorInfo(unsigned int) const; /** - * @symbol ?getActorInfoId\@ActorInfoRegistry\@\@QEBAIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getActorInfoId\@ActorInfoRegistry\@\@QEBAIAEB_K\@Z */ - MCAPI unsigned int getActorInfoId(std::string const &) const; + MCAPI unsigned int getActorInfoId(unsigned __int64 const &) const; /** - * @symbol ?getActorInfoId\@ActorInfoRegistry\@\@QEBAIAEB_K\@Z + * @symbol ?getActorInfoId\@ActorInfoRegistry\@\@QEBAIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI unsigned int getActorInfoId(unsigned __int64 const &) const; + MCAPI unsigned int getActorInfoId(std::string const &) const; /** - * @symbol ?getActorInfoList\@ActorInfoRegistry\@\@QEBA?AV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getActorInfoList\@ActorInfoRegistry\@\@QEBA?AV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getActorInfoList() const; /** - * @symbol ?isSpawnEggAvailable\@ActorInfoRegistry\@\@QEAA_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isSpawnEggAvailable\@ActorInfoRegistry\@\@QEAA_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isSpawnEggAvailable(std::string); /** - * @symbol ?registerActorInfo\@ActorInfoRegistry\@\@QEAAXAEBUActorInfo\@\@\@Z + * @symbol ?registerActorInfo\@ActorInfoRegistry\@\@QEAAXAEBUActorInfo\@\@\@Z */ MCAPI void registerActorInfo(struct ActorInfo const &); /** - * @symbol ?setSpawnEggAvailable\@ActorInfoRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?setSpawnEggAvailable\@ActorInfoRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void setSpawnEggAvailable(std::string, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInsideBlockEvent.hpp b/LiteLoader/include/llapi/mc/ActorInsideBlockEvent.hpp index b2d8ba56ea..319612c112 100644 --- a/LiteLoader/include/llapi/mc/ActorInsideBlockEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorInsideBlockEvent.hpp @@ -27,11 +27,11 @@ struct ActorInsideBlockEvent { public: /** - * @symbol ??0ActorInsideBlockEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ActorInsideBlockEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ActorInsideBlockEvent(struct ActorInsideBlockEvent const &); /** - * @symbol ??1ActorInsideBlockEvent\@\@QEAA\@XZ + * @symbol ??1ActorInsideBlockEvent\@\@QEAA\@XZ */ MCAPI ~ActorInsideBlockEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorIntPropertyTest.hpp b/LiteLoader/include/llapi/mc/ActorIntPropertyTest.hpp index 99a9a5ed10..77213be375 100644 --- a/LiteLoader/include/llapi/mc/ActorIntPropertyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIntPropertyTest.hpp @@ -30,39 +30,45 @@ class ActorIntPropertyTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIntPropertyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@ActorIntPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@ActorIntPropertyTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIntPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorIntPropertyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getName\@ActorIntPropertyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorIntPropertyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 5 - * @symbol ?_serializeDomain\@ActorIntPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 5 + * @symbol ?_serializeDomain\@ActorIntPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeDomain() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@ActorIntPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@ActorIntPropertyTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORINTPROPERTYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIntPropertyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInteraction.hpp b/LiteLoader/include/llapi/mc/ActorInteraction.hpp index c41be10efe..267987620d 100644 --- a/LiteLoader/include/llapi/mc/ActorInteraction.hpp +++ b/LiteLoader/include/llapi/mc/ActorInteraction.hpp @@ -30,32 +30,32 @@ class ActorInteraction { public: /** - * @symbol ??0ActorInteraction\@\@QEAA\@_N\@Z + * @symbol ??0ActorInteraction\@\@QEAA\@_N\@Z */ MCAPI ActorInteraction(bool); /** - * @symbol ?capture\@ActorInteraction\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?capture\@ActorInteraction\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void capture(class std::function); /** - * @symbol ?getInteractText\@ActorInteraction\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getInteractText\@ActorInteraction\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getInteractText() const; /** - * @symbol ?interact\@ActorInteraction\@\@QEAAXXZ + * @symbol ?interact\@ActorInteraction\@\@QEAAXXZ */ MCAPI void interact(); /** - * @symbol ?setInteractText\@ActorInteraction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setInteractText\@ActorInteraction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setInteractText(std::string const &); /** - * @symbol ?shouldCapture\@ActorInteraction\@\@QEBA_NXZ + * @symbol ?shouldCapture\@ActorInteraction\@\@QEBA_NXZ */ MCAPI bool shouldCapture() const; /** - * @symbol ??1ActorInteraction\@\@QEAA\@XZ + * @symbol ??1ActorInteraction\@\@QEAA\@XZ */ MCAPI ~ActorInteraction(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp b/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp index 0c5bd3ec3b..e9a4732783 100644 --- a/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp +++ b/LiteLoader/include/llapi/mc/ActorInventoryUtils.hpp @@ -20,35 +20,35 @@ namespace ActorInventoryUtils { #undef AFTER_EXTRA /** - * @symbol ?forEachItemInContainer\@ActorInventoryUtils\@\@YAXAEBVContainer\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachItemInContainer\@ActorInventoryUtils\@\@YAXAEBVContainer\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachItemInContainer(class Container const &, class CommandIntegerRange const &, class std::function); /** - * @symbol ?forEachItemOnActor\@ActorInventoryUtils\@\@YAXAEBVActor\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachItemOnActor\@ActorInventoryUtils\@\@YAXAEBVActor\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachItemOnActor(class Actor const &, class std::function); /** - * @symbol ?forEachItemOnActor\@ActorInventoryUtils\@\@YAXAEBVActor\@\@W4EquipmentSlot\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachItemOnActor\@ActorInventoryUtils\@\@YAXAEBVActor\@\@W4EquipmentSlot\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachItemOnActor(class Actor const &, enum class EquipmentSlot, class CommandIntegerRange const &, class std::function); /** - * @symbol ?forEachItemOnActorHotbar\@ActorInventoryUtils\@\@YAXAEBVActor\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachItemOnActorHotbar\@ActorInventoryUtils\@\@YAXAEBVActor\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachItemOnActorHotbar(class Actor const &, class CommandIntegerRange const &, class std::function); /** - * @symbol ?forEachItemOnActorInventory\@ActorInventoryUtils\@\@YAXAEBVActor\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachItemOnActorInventory\@ActorInventoryUtils\@\@YAXAEBVActor\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachItemOnActorInventory(class Actor const &, class CommandIntegerRange const &, class std::function); /** - * @symbol ?getItem\@ActorInventoryUtils\@\@YAPEBVItemStack\@\@AEBVActor\@\@W4EquipmentSlot\@\@H\@Z + * @symbol ?getItem\@ActorInventoryUtils\@\@YAPEBVItemStack\@\@AEBVActor\@\@W4EquipmentSlot\@\@H\@Z */ 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\@\@3_N\@Z */ MCAPI bool queryActorEquipmentSlotForItem(class Actor const &, class ItemInstance const &, enum class EquipmentSlot, class CommandIntegerRange const &, class CommandIntegerRange const &, bool); /** - * @symbol ?queryActorForItem\@ActorInventoryUtils\@\@YA_NAEBVActor\@\@AEBVItemInstance\@\@AEBVCommandIntegerRange\@\@_N\@Z + * @symbol ?queryActorForItem\@ActorInventoryUtils\@\@YA_NAEBVActor\@\@AEBVItemInstance\@\@AEBVCommandIntegerRange\@\@_N\@Z */ MCAPI bool queryActorForItem(class Actor const &, class ItemInstance const &, class CommandIntegerRange const &, bool); diff --git a/LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp b/LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp index 4d3ce98483..6393c4e7dc 100644 --- a/LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsAvoidingMobsTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsAvoidingMobsTest. * */ -class ActorIsAvoidingMobsTest : public FilterTest { +class ActorIsAvoidingMobsTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsAvoidingMobsTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsAvoidingMobsTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsAvoidingMobsTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsAvoidingMobsTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsAvoidingMobsTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsAvoidingMobsTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISAVOIDINGMOBSTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsAvoidingMobsTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsBabyTest.hpp b/LiteLoader/include/llapi/mc/ActorIsBabyTest.hpp index 0f0d1f4a95..44a741a22d 100644 --- a/LiteLoader/include/llapi/mc/ActorIsBabyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsBabyTest.hpp @@ -16,7 +16,7 @@ * @brief MC class ActorIsBabyTest. * */ -class ActorIsBabyTest : public FilterTest { +class ActorIsBabyTest { #define AFTER_EXTRA @@ -30,19 +30,45 @@ class ActorIsBabyTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsBabyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsBabyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsBabyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsBabyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsBabyTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISBABYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsBabyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp index 5ed66f2076..20a007a7fb 100644 --- a/LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsClimbingTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsClimbingTest. * */ -class ActorIsClimbingTest : public FilterTest { +class ActorIsClimbingTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsClimbingTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsClimbingTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsClimbingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsClimbingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsClimbingTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsClimbingTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISCLIMBINGTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsClimbingTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp b/LiteLoader/include/llapi/mc/ActorIsColorTest.hpp index b59101d1b2..6ceca6c8d0 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 : public FilterTest { +class ActorIsColorTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsColorTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsColorTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsColorTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorIsColorTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorIsColorTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp b/LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp index a23b8ef767..1a66520763 100644 --- a/LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsFamilyTest.hpp @@ -32,19 +32,25 @@ class ActorIsFamilyTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsFamilyTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsFamilyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@ActorIsFamilyTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsFamilyTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@ActorIsFamilyTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISFAMILYTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsFamilyTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp b/LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp index 737775a1cf..1469a6d281 100644 --- a/LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsImmobileTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsImmobileTest. * */ -class ActorIsImmobileTest : public FilterTest { +class ActorIsImmobileTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsImmobileTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsImmobileTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsImmobileTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsImmobileTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsImmobileTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsImmobileTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISIMMOBILETEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsImmobileTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp b/LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp index 88a2a97135..1f849ae7bd 100644 --- a/LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsLeashedTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsLeashedTest. * */ -class ActorIsLeashedTest : public FilterTest { +class ActorIsLeashedTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsLeashedTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsLeashedTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsLeashedTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsLeashedTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsLeashedTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsLeashedTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISLEASHEDTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsLeashedTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp b/LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp index 195cafadc8..085e718345 100644 --- a/LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsLeashedToTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsLeashedToTest. * */ -class ActorIsLeashedToTest : public FilterTest { +class ActorIsLeashedToTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsLeashedToTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsLeashedToTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsLeashedToTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsLeashedToTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsLeashedToTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsLeashedToTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISLEASHEDTOTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsLeashedToTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp b/LiteLoader/include/llapi/mc/ActorIsMarkVariantTest.hpp index 798f4def2f..94f3276ff8 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 : public FilterTest { +class ActorIsMarkVariantTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsMarkVariantTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsMarkVariantTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsMarkVariantTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorIsMarkVariantTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorIsMarkVariantTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp index 27a9f9931b..7928b16cdc 100644 --- a/LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsMovingTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsMovingTest. * */ -class ActorIsMovingTest : public FilterTest { +class ActorIsMovingTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsMovingTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsMovingTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsMovingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsMovingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsMovingTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsMovingTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISMOVINGTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsMovingTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp b/LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp index 25ca83b1c7..faf56453e9 100644 --- a/LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsOwnerTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsOwnerTest. * */ -class ActorIsOwnerTest : public FilterTest { +class ActorIsOwnerTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsOwnerTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsOwnerTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsOwnerTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsOwnerTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsOwnerTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsOwnerTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISOWNERTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsOwnerTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp b/LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp index b5e42569dc..68b4d12cde 100644 --- a/LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsPersistentTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsPersistentTest. * */ -class ActorIsPersistentTest : public FilterTest { +class ActorIsPersistentTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,39 @@ class ActorIsPersistentTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsPersistentTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsPersistentTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsPersistentTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsPersistentTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsPersistentTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp index 0e4965fc08..b0bed8cacb 100644 --- a/LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsRidingTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsRidingTest. * */ -class ActorIsRidingTest : public FilterTest { +class ActorIsRidingTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsRidingTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsRidingTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsRidingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsRidingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsRidingTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsRidingTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISRIDINGTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsRidingTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSkinIDTest.hpp index 4a2cd7098c..ed07013802 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 : public FilterTest { +class ActorIsSkinIDTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsSkinIDTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsSkinIDTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsSkinIDTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorIsSkinIDTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorIsSkinIDTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp index b0c74bfdd2..d3f4b3b8c2 100644 --- a/LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsSleepingTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsSleepingTest. * */ -class ActorIsSleepingTest : public FilterTest { +class ActorIsSleepingTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsSleepingTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsSleepingTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsSleepingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsSleepingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsSleepingTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsSleepingTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISSLEEPINGTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsSleepingTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp b/LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp index 2286fdf93d..308ef787e8 100644 --- a/LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsSneakingTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsSneakingTest. * */ -class ActorIsSneakingTest : public FilterTest { +class ActorIsSneakingTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsSneakingTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsSneakingTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsSneakingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsSneakingTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsSneakingTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsSneakingTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISSNEAKINGTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsSneakingTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp b/LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp index c801b8ccdb..206f0ba410 100644 --- a/LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsTargetTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsTargetTest. * */ -class ActorIsTargetTest : public FilterTest { +class ActorIsTargetTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsTargetTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsTargetTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsTargetTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsTargetTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsTargetTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsTargetTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISTARGETTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsTargetTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp b/LiteLoader/include/llapi/mc/ActorIsVariantTest.hpp index 30e5cb0557..f533ef3fc6 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 : public FilterTest { +class ActorIsVariantTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsVariantTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsVariantTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsVariantTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorIsVariantTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorIsVariantTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp b/LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp index f09cc1861f..831a51996e 100644 --- a/LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorIsVisibleTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorIsVisibleTest. * */ -class ActorIsVisibleTest : public FilterTest { +class ActorIsVisibleTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorIsVisibleTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorIsVisibleTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorIsVisibleTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorIsVisibleTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorIsVisibleTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorIsVisibleTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORISVISIBLETEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorIsVisibleTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorKilledEvent.hpp b/LiteLoader/include/llapi/mc/ActorKilledEvent.hpp index 7d29e6492a..b9fb93b136 100644 --- a/LiteLoader/include/llapi/mc/ActorKilledEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorKilledEvent.hpp @@ -25,7 +25,7 @@ struct ActorKilledEvent { public: /** - * @symbol ??1ActorKilledEvent\@\@QEAA\@XZ + * @symbol ??1ActorKilledEvent\@\@QEAA\@XZ */ MCAPI ~ActorKilledEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp b/LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp index 47262b4ab8..accf356b11 100644 --- a/LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp +++ b/LiteLoader/include/llapi/mc/ActorLegacySaveConverter.hpp @@ -30,108 +30,108 @@ class ActorLegacySaveConverter { public: /** - * @symbol ?convertSave\@ActorLegacySaveConverter\@\@SAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSave\@ActorLegacySaveConverter\@\@SAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSave(class Actor &, class CompoundTag const &); //private: /** - * @symbol ?convertBoat\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertBoat\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertBoat(class Actor &, class CompoundTag const &); /** - * @symbol ?convertChicken\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertChicken\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertChicken(class Actor &, class CompoundTag const &); /** - * @symbol ?convertCow\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertCow\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertCow(class Actor &, class CompoundTag const &); /** - * @symbol ?convertCreeper\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertCreeper\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertCreeper(class Actor &, class CompoundTag const &); /** - * @symbol ?convertEnderman\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertEnderman\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertEnderman(class Actor &, class CompoundTag const &); /** - * @symbol ?convertHorse\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertHorse\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertHorse(class Actor &, class CompoundTag const &); /** - * @symbol ?convertIronGolem\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertIronGolem\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertIronGolem(class Actor &, class CompoundTag const &); /** - * @symbol ?convertMinecart\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertMinecart\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertMinecart(class Actor &, class CompoundTag const &); /** - * @symbol ?convertMinecartHopper\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertMinecartHopper\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertMinecartHopper(class Actor &, class CompoundTag const &); /** - * @symbol ?convertMinecartTNT\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertMinecartTNT\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertMinecartTNT(class Actor &, class CompoundTag const &); /** - * @symbol ?convertOcelot\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertOcelot\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertOcelot(class Actor &, class CompoundTag const &); /** - * @symbol ?convertPig\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertPig\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertPig(class Actor &, class CompoundTag const &); /** - * @symbol ?convertRabbit\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertRabbit\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertRabbit(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSheep\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSheep\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSheep(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSilverfish\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSilverfish\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSilverfish(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSkeleton\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSkeleton\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSkeleton(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSlime\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSlime\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSlime(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSnowgolem\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSnowgolem\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSnowgolem(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSpider\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSpider\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSpider(class Actor &, class CompoundTag const &); /** - * @symbol ?convertSquid\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertSquid\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertSquid(class Actor &, class CompoundTag const &); /** - * @symbol ?convertVillager\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertVillager\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertVillager(class Actor &, class CompoundTag const &); /** - * @symbol ?convertWolf\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertWolf\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertWolf(class Actor &, class CompoundTag const &); /** - * @symbol ?convertZombie\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertZombie\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertZombie(class Actor &, class CompoundTag const &); /** - * @symbol ?convertZombieVillager\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertZombieVillager\@ActorLegacySaveConverter\@\@CAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static void convertZombieVillager(class Actor &, class CompoundTag const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorLegacyTickSystem.hpp b/LiteLoader/include/llapi/mc/ActorLegacyTickSystem.hpp index 4aaaf5be42..bd19773c8a 100644 --- a/LiteLoader/include/llapi/mc/ActorLegacyTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorLegacyTickSystem.hpp @@ -30,23 +30,23 @@ class ActorLegacyTickSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorLegacyTickSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@ActorLegacyTickSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@ActorLegacyTickSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?tickActorLegacyTickSystem\@ActorLegacyTickSystem\@\@SAXAEAVEntityContext\@\@AEAVActor\@\@AEAVActorTickNeededComponent\@\@\@Z + * @symbol ?tickActorLegacyTickSystem\@ActorLegacyTickSystem\@\@SAXAEAVEntityContext\@\@AEAVActor\@\@AEAVActorTickNeededComponent\@\@\@Z */ MCAPI static void tickActorLegacyTickSystem(class EntityContext &, class Actor &, class ActorTickNeededComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorLifecycle.hpp b/LiteLoader/include/llapi/mc/ActorLifecycle.hpp new file mode 100644 index 0000000000..1bcd3aa84d --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorLifecycle.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorLifecycle.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorLifecycle { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?clearIsFirstTick\@ActorLifecycle\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void clearIsFirstTick(class EntityContext &); + /** + * @symbol ?initializeActor\@ActorLifecycle\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initializeActor(class EntityContext &); + /** + * @symbol ?isFirstTick\@ActorLifecycle\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool isFirstTick(class EntityContext const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorLimitedLifetimeComponent.hpp b/LiteLoader/include/llapi/mc/ActorLimitedLifetimeComponent.hpp index 608c667967..0da81d45a1 100644 --- a/LiteLoader/include/llapi/mc/ActorLimitedLifetimeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorLimitedLifetimeComponent.hpp @@ -29,24 +29,24 @@ class ActorLimitedLifetimeComponent { public: /** - * @symbol ??0ActorLimitedLifetimeComponent\@\@QEAA\@XZ + * @symbol ??0ActorLimitedLifetimeComponent\@\@QEAA\@XZ */ MCAPI ActorLimitedLifetimeComponent(); /** - * @symbol ?addAdditionalSaveData\@ActorLimitedLifetimeComponent\@\@QEBAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@ActorLimitedLifetimeComponent\@\@QEBAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class Actor const &, class CompoundTag &) const; /** - * @symbol ?readAdditionalSaveData\@ActorLimitedLifetimeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?readAdditionalSaveData\@ActorLimitedLifetimeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &); /** - * @symbol ?convertFromLegacyData\@ActorLimitedLifetimeComponent\@\@SAXAEBVCompoundTag\@\@AEAV2\@\@Z + * @symbol ?convertFromLegacyData\@ActorLimitedLifetimeComponent\@\@SAXAEBVCompoundTag\@\@AEAV2\@\@Z */ MCAPI static void convertFromLegacyData(class CompoundTag const &, class CompoundTag &); /** - * @symbol ?needsLegacyConversion\@ActorLimitedLifetimeComponent\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?needsLegacyConversion\@ActorLimitedLifetimeComponent\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool needsLegacyConversion(class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorLimitedLifetimeTickSystem.hpp b/LiteLoader/include/llapi/mc/ActorLimitedLifetimeTickSystem.hpp index af3a360771..0692d2ed1a 100644 --- a/LiteLoader/include/llapi/mc/ActorLimitedLifetimeTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorLimitedLifetimeTickSystem.hpp @@ -30,19 +30,19 @@ class ActorLimitedLifetimeTickSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorLimitedLifetimeTickSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@ActorLimitedLifetimeTickSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@ActorLimitedLifetimeTickSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorManager.hpp b/LiteLoader/include/llapi/mc/ActorManager.hpp index d37cf2e606..b41f4692ee 100644 --- a/LiteLoader/include/llapi/mc/ActorManager.hpp +++ b/LiteLoader/include/llapi/mc/ActorManager.hpp @@ -24,69 +24,91 @@ class ActorManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORMANAGER /** - * @symbol ??0ActorManager\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ActorManager(); + MCVAPI ~ActorManager(); +#endif /** - * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ??0ActorManager\@\@QEAA\@XZ */ - MCAPI class Actor * addActorEntity(class Dimension &, class OwnerPtrT); + MCAPI ActorManager(); /** - * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI class Actor * addActorEntity(class IAddActorEntityProxy &, class OwnerPtrT); /** - * @symbol ?cleanupActorEntityReferencesGarbageCollect\@ActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addActorEntity\@ActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + */ + MCAPI class Actor * addActorEntity(class Dimension &, class OwnerPtrT); + /** + * @symbol ?cleanupActorEntityReferencesGarbageCollect\@ActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void cleanupActorEntityReferencesGarbageCollect(class OwnerPtrT); /** - * @symbol ?cleanupRemovedActorEntityReferencesGarbageCollect\@ActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?cleanupRemovedActorEntityReferencesGarbageCollect\@ActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void cleanupRemovedActorEntityReferencesGarbageCollect(class OwnerPtrT); /** - * @symbol ?getEntities\@ActorManager\@\@QEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ + * @symbol ?deleteActorEntityFromWorldAndTakeEntity\@ActorManager\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + */ + MCAPI class OwnerPtrT deleteActorEntityFromWorldAndTakeEntity(class WeakEntityRef); + /** + * @symbol ?forceRemoveActor\@ActorManager\@\@QEAAXAEAVActor\@\@\@Z + */ + MCAPI void forceRemoveActor(class Actor &); + /** + * @symbol ?forceRemoveActorFromWorld\@ActorManager\@\@QEAAXAEAVActor\@\@\@Z + */ + MCAPI void forceRemoveActorFromWorld(class Actor &); + /** + * @symbol ?getEntities\@ActorManager\@\@QEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector> const & getEntities() const; /** - * @symbol ?initializeWithActorGarbageCollector\@ActorManager\@\@QEAAXV?$not_null\@V?$NonOwnerPointer\@VActorGarbageCollector\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?initializeWithActorGarbageCollector\@ActorManager\@\@QEAAXV?$not_null\@V?$NonOwnerPointer\@VActorGarbageCollector\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI void initializeWithActorGarbageCollector(class gsl::not_null>); /** - * @symbol ?initializeWithProxy\@ActorManager\@\@QEAAXV?$unique_ptr\@VIActorManagerProxy\@\@U?$default_delete\@VIActorManagerProxy\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?initializeWithProxy\@ActorManager\@\@QEAAXV?$unique_ptr\@VIActorManagerProxy\@\@U?$default_delete\@VIActorManagerProxy\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void initializeWithProxy(std::unique_ptr); /** - * @symbol ?onChunkDiscarded\@ActorManager\@\@QEAAXVWeakEntityRef\@\@\@Z + * @symbol ?onChunkDiscarded\@ActorManager\@\@QEAAXVWeakEntityRef\@\@\@Z */ MCAPI void onChunkDiscarded(class WeakEntityRef); /** - * @symbol ?registerActorEntityAddedCallback\@ActorManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVActor\@\@\@Z\@std\@\@\@Z + * @symbol ?registerActorEntityAddedCallback\@ActorManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVActor\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerActorEntityAddedCallback(class std::function); /** - * @symbol ?registerOnRemoveActorEntityReferences\@ActorManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVActor\@\@\@Z\@std\@\@\@Z + * @symbol ?registerOnRemoveActorEntityReferences\@ActorManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVActor\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerOnRemoveActorEntityReferences(class std::function); /** - * @symbol ?registerPostReloadActor\@ActorManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVActor\@\@\@Z\@std\@\@\@Z + * @symbol ?registerPostReloadActor\@ActorManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVActor\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerPostReloadActor(class std::function); /** - * @symbol ?removeActorEntityReferencesForDeletion\@ActorManager\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?removeActorEntityAndTakeEntity\@ActorManager\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + */ + MCAPI class OwnerPtrT removeActorEntityAndTakeEntity(class WeakEntityRef); + /** + * @symbol ?removeActorEntityReferencesForDeletion\@ActorManager\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void removeActorEntityReferencesForDeletion(class Actor &); /** - * @symbol ?removeEntity\@ActorManager\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + * @symbol ?removeEntity\@ActorManager\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z */ MCAPI class OwnerPtrT removeEntity(class WeakEntityRef); /** - * @symbol ?setLevelIsTearingDown\@ActorManager\@\@QEAAXXZ + * @symbol ?setLevelIsTearingDown\@ActorManager\@\@QEAAXXZ */ MCAPI void setLevelIsTearingDown(); /** - * @symbol ?takeEntity\@ActorManager\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?takeEntity\@ActorManager\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@AEAVLevelChunk\@\@\@Z */ MCAPI class OwnerPtrT takeEntity(class WeakEntityRef, class LevelChunk &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMapping.hpp b/LiteLoader/include/llapi/mc/ActorMapping.hpp index 8158264c8d..2713cf15e4 100644 --- a/LiteLoader/include/llapi/mc/ActorMapping.hpp +++ b/LiteLoader/include/llapi/mc/ActorMapping.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ActorMapping. - * - */ -struct ActorMapping { + +class ActorMapping { #define AFTER_EXTRA // Add Member There @@ -23,27 +20,27 @@ struct ActorMapping { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORMAPPING public: - struct ActorMapping& operator=(struct ActorMapping const &) = delete; - ActorMapping(struct ActorMapping const &) = delete; + class ActorMapping& operator=(class ActorMapping const &) = delete; + ActorMapping(class ActorMapping const &) = delete; ActorMapping() = delete; #endif public: /** - * @symbol ??0ActorMapping\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @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 &); + 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\@\@00\@Z + * @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 &, std::string const &); + 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 + * @symbol ?getMappingName\@ActorMapping\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ActorTypeNamespaceRules\@\@\@Z */ MCAPI std::string getMappingName(enum class ActorTypeNamespaceRules) const; /** - * @symbol ??1ActorMapping\@\@QEAA\@XZ + * @symbol ??1ActorMapping\@\@QEAA\@XZ */ MCAPI ~ActorMapping(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMissingHealthTest.hpp b/LiteLoader/include/llapi/mc/ActorMissingHealthTest.hpp index 15b11cdef7..14fbf85938 100644 --- a/LiteLoader/include/llapi/mc/ActorMissingHealthTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorMissingHealthTest.hpp @@ -16,7 +16,7 @@ * @brief MC class ActorMissingHealthTest. * */ -class ActorMissingHealthTest : public FilterTest { +class ActorMissingHealthTest { #define AFTER_EXTRA @@ -30,19 +30,39 @@ class ActorMissingHealthTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorMissingHealthTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorMissingHealthTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorMissingHealthTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorMissingHealthTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorMissingHealthTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp b/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp index 7aaff03760..2d36a8092c 100644 --- a/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp +++ b/LiteLoader/include/llapi/mc/ActorMobilityUtils.hpp @@ -20,103 +20,127 @@ 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 ?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 */ MCAPI void actorSetSize(class StrictEntityContext &, class Vec2 const &, struct SynchedActorDataComponent &, struct AABBShapeComponent &, struct StateVectorComponent const &, class EntityModifierT> &, class ViewT>, struct OffsetsComponent>); /** - * @symbol ?canBeginOrContinueClimbingLadder\@ActorMobilityUtils\@\@YA_NAEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@_N4\@Z + * @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 + */ + MCAPI void applyFinalFriction(struct CurrentLocalMoveVelocityComponent const *, class FlagComponent const *, class FlagComponent const *, struct AbilitiesComponent const *, struct SynchedActorDataComponent const &, struct StateVectorComponent &, float, bool); + /** + * @symbol ?canBeginOrContinueClimbingLadder\@ActorMobilityUtils\@\@YA_NAEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@_N4\@Z */ MCAPI bool canBeginOrContinueClimbingLadder(struct AABBShapeComponent const &, class IConstBlockSource const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, bool, bool); /** - * @symbol ?canDash\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?canDash\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z */ MCAPI bool canDash(struct SynchedActorDataComponent const &); /** - * @symbol ?canPowerJump\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@PEBUAttributesComponent\@\@_N\@Z + * @symbol ?canJump\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@AEBUAABBShapeComponent\@\@AEBVGetCollisionShapeInterface\@\@\@Z + */ + MCAPI bool canJump(struct SynchedActorDataComponent const &, class IConstBlockSource const &, struct StateVectorComponent const &, struct AABBShapeComponent const &, class GetCollisionShapeInterface const &); + /** + * @symbol ?canPowerJump\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@PEBUAttributesComponent\@\@_N\@Z */ MCAPI bool canPowerJump(struct SynchedActorDataComponent const &, struct AttributesComponent const *, bool); /** - * @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 + * @symbol ?endJump\@ActorMobilityUtils\@\@YAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUMobJumpComponent\@\@AEAUSynchedActorDataComponent\@\@PEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ MCAPI void endJump(class StrictEntityContext const &, struct StateVectorComponent const &, struct MobJumpComponent &, struct SynchedActorDataComponent &, struct VehicleComponent const *, class ViewT>, struct PassengerComponent const>, class EntityModifierT, class FlagComponent, class FlagComponent> &); /** - * @symbol ?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 + * @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>>); /** - * @symbol ?getJumpEffectAmplifierValue\@ActorMobilityUtils\@\@YAMAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getJumpEffectAmplifierValue\@ActorMobilityUtils\@\@YAMAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z */ MCAPI float getJumpEffectAmplifierValue(std::vector const &); /** - * @symbol ?getJumpPower\@ActorMobilityUtils\@\@YAMPEBVJumpControlComponent\@\@_N\@Z + * @symbol ?getJumpPower\@ActorMobilityUtils\@\@YAMPEBVJumpControlComponent\@\@_N\@Z */ MCAPI float getJumpPower(class JumpControlComponent const *, bool); /** - * @symbol ?getPosFromAABB\@ActorMobilityUtils\@\@YA?AVVec3\@\@AEBVAABB\@\@MAEBVVec2\@\@\@Z + * @symbol ?getPosFromAABB\@ActorMobilityUtils\@\@YA?AVVec3\@\@AEBVAABB\@\@MAEBVVec2\@\@\@Z */ MCAPI class Vec3 getPosFromAABB(class AABB const &, float, class Vec2 const &); /** - * @symbol ?isFlying\@ActorMobilityUtils\@\@YA_NAEBUAbilitiesComponent\@\@\@Z + * @symbol ?getSpeed\@ActorMobilityUtils\@\@YAMAEBVStrictEntityContext\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAttributesComponent\@\@$$CBUMovementSpeedComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z + */ + MCAPI float getSpeed(class StrictEntityContext const &, class ViewT const &, class ViewT>> const &); + /** + * @symbol ?isFlying\@ActorMobilityUtils\@\@YA_NAEBUAbilitiesComponent\@\@\@Z */ MCAPI bool isFlying(struct AbilitiesComponent const &); /** - * @symbol ?isFree\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVVec3\@\@M\@Z + * @symbol ?isFree\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVVec3\@\@M\@Z */ MCAPI bool isFree(class IConstBlockSource const &, class AABB const &, class Vec3 const &, float); /** - * @symbol ?isImmersedInWater\@ActorMobilityUtils\@\@YA_NAEBVVec3\@\@AEBVIConstBlockSource\@\@AEBVVec2\@\@\@Z + * @symbol ?isImmersedInWater\@ActorMobilityUtils\@\@YA_NAEBVVec3\@\@AEBVIConstBlockSource\@\@AEBVVec2\@\@\@Z */ MCAPI bool isImmersedInWater(class Vec3 const &, class IConstBlockSource const &, class Vec2 const &); /** - * @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 + * @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> *); /** - * @symbol ?isInLava\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBUAABBShapeComponent\@\@AEBUSubBBsComponent\@\@\@Z + * @symbol ?isInLava\@ActorMobilityUtils\@\@YA_NAEBVIConstBlockSource\@\@AEBUAABBShapeComponent\@\@AEBUSubBBsComponent\@\@\@Z */ MCAPI bool isInLava(class IConstBlockSource const &, struct AABBShapeComponent const &, struct SubBBsComponent const &); /** - * @symbol ?isOnFire\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@PEBUOnFireComponent\@\@PEBV?$FlagComponent\@ULavaSlimeFlag\@\@\@\@PEBV?$FlagComponent\@UShulkerBulletFlag\@\@\@\@PEBV?$FlagComponent\@UWitherSkullFlag\@\@\@\@PEBV?$FlagComponent\@UBlazeFlag\@\@\@\@\@Z + * @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 ?isSprinting\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?isSprinting\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z */ MCAPI bool isSprinting(struct SynchedActorDataComponent const &); /** - * @symbol ?isSwimming\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?isSwimming\@ActorMobilityUtils\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z */ MCAPI bool isSwimming(struct SynchedActorDataComponent const &); /** - * @symbol ?isUnderLiquid\@ActorMobilityUtils\@\@YA_NAEBVVec3\@\@0AEBVIConstBlockSource\@\@W4MaterialType\@\@\@Z + * @symbol ?isUnderLiquid\@ActorMobilityUtils\@\@YA_NAEBVVec3\@\@0AEBVIConstBlockSource\@\@W4MaterialType\@\@\@Z */ MCAPI bool isUnderLiquid(class Vec3 const &, class Vec3 const &, class IConstBlockSource const &, enum class MaterialType); /** - * @symbol ?moveBBs\@ActorMobilityUtils\@\@YAXAEBVVec3\@\@AEAUAABBShapeComponent\@\@AEAUSubBBsComponent\@\@\@Z + * @symbol ?moveBBs\@ActorMobilityUtils\@\@YAXAEBVVec3\@\@AEAUAABBShapeComponent\@\@AEAUSubBBsComponent\@\@\@Z */ MCAPI void moveBBs(class Vec3 const &, struct AABBShapeComponent &, struct SubBBsComponent &); /** - * @symbol ?onClimbableBlock\@ActorMobilityUtils\@\@YA_NAEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@_N3\@Z + * @symbol ?onClimbableBlock\@ActorMobilityUtils\@\@YA_NAEBUAABBShapeComponent\@\@AEBVIConstBlockSource\@\@AEBUStateVectorComponent\@\@_N3\@Z */ MCAPI bool onClimbableBlock(struct AABBShapeComponent const &, class IConstBlockSource const &, struct StateVectorComponent const &, bool, bool); /** - * @symbol ?setLocalPlayerSneaking\@ActorMobilityUtils\@\@YAXAEAUSynchedActorDataComponent\@\@PEAUPlayerActionComponent\@\@_N\@Z + * @symbol ?setLocalPlayerSneaking\@ActorMobilityUtils\@\@YAXAEAUSynchedActorDataComponent\@\@PEAUPlayerActionComponent\@\@_N\@Z */ MCAPI void setLocalPlayerSneaking(struct SynchedActorDataComponent &, struct PlayerActionComponent *, bool); /** - * @symbol ?setSprinting\@ActorMobilityUtils\@\@YAXAEAUAttributesComponent\@\@AEAUSynchedActorDataComponent\@\@V?$optional_ref\@UPlayerActionComponent\@\@\@\@_N\@Z + * @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 &); + /** + * @symbol ?setSprinting\@ActorMobilityUtils\@\@YAXAEAUAttributesComponent\@\@AEAUSynchedActorDataComponent\@\@V?$optional_ref\@UPlayerActionComponent\@\@\@\@_N\@Z */ MCAPI void setSprinting(struct AttributesComponent &, struct SynchedActorDataComponent &, class optional_ref, bool); /** - * @symbol ?setStanding\@ActorMobilityUtils\@\@YAXVSynchedActorDataWriter\@\@_NPEAUHorseStandCounterComponent\@\@1\@Z + * @symbol ?setStanding\@ActorMobilityUtils\@\@YAXVSynchedActorDataWriter\@\@_NPEAUHorseStandCounterComponent\@\@1\@Z */ MCAPI void setStanding(class SynchedActorDataWriter, bool, struct HorseStandCounterComponent *, bool); /** - * @symbol ?shouldApplyWaterGravity\@ActorMobilityUtils\@\@YA_NPEBVNavigationComponent\@\@PEBVPhysicsComponent\@\@VSynchedActorDataReader\@\@AEBVVec3\@\@AEBVIConstBlockSource\@\@AEBVVec2\@\@\@Z + * @symbol ?shouldApplyWaterGravity\@ActorMobilityUtils\@\@YA_NPEBVNavigationComponent\@\@PEBVPhysicsComponent\@\@VSynchedActorDataReader\@\@AEBVVec3\@\@AEBVIConstBlockSource\@\@AEBVVec2\@\@\@Z */ MCAPI bool shouldApplyWaterGravity(class NavigationComponent const *, class PhysicsComponent const *, class SynchedActorDataReader, class Vec3 const &, class IConstBlockSource const &, class Vec2 const &); /** - * @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 + * @symbol ?tryApplyingLevitation\@ActorMobilityUtils\@\@YA_NAEBUMobEffectsComponent\@\@AEAUStateVectorComponent\@\@\@Z + */ + MCAPI bool tryApplyingLevitation(struct MobEffectsComponent const &, struct StateVectorComponent &); + /** + * @symbol ?updateBBFromDefinition\@ActorMobilityUtils\@\@YAXAEAVStrictEntityContext\@\@V?$optional_ref\@$$CBUCollisionBoxDefinitionComponent\@\@\@\@AEAUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@UOffsetsComponent\@\@\@\@\@Z */ MCAPI void updateBBFromDefinition(class StrictEntityContext &, class optional_ref, struct SynchedActorDataComponent &, struct AABBShapeComponent &, struct StateVectorComponent const &, class EntityModifierT> &, class ViewT>, struct OffsetsComponent>); diff --git a/LiteLoader/include/llapi/mc/ActorMotionSyncSystem.hpp b/LiteLoader/include/llapi/mc/ActorMotionSyncSystem.hpp index ac398a34fe..1bff468a01 100644 --- a/LiteLoader/include/llapi/mc/ActorMotionSyncSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMotionSyncSystem.hpp @@ -30,19 +30,19 @@ class ActorMotionSyncSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorMotionSyncSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@ActorMotionSyncSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@ActorMotionSyncSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp index 8508ad886c..5085fbc3ea 100644 --- a/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMoveNotifierSystem.hpp @@ -28,8 +28,8 @@ class ActorMoveNotifierSystem { public: /** - * @symbol ?createActorMoveNotifierSystem\@ActorMoveNotifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createActorMoveNotifierSystem\@ActorMoveNotifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorMoveNotifierSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp index 38e8ce3c44..25e713286c 100644 --- a/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMoveSystem.hpp @@ -28,12 +28,12 @@ class ActorMoveSystem { public: /** - * @symbol ?createActorMoveSystem\@ActorMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createActorMoveSystem\@ActorMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorMoveSystem(); /** - * @symbol ?createUpdateHitboxSystem\@ActorMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createUpdateHitboxSystem\@ActorMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdateHitboxSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMoveToSystem.hpp b/LiteLoader/include/llapi/mc/ActorMoveToSystem.hpp index bdf22f3906..41b39f3afb 100644 --- a/LiteLoader/include/llapi/mc/ActorMoveToSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMoveToSystem.hpp @@ -28,8 +28,8 @@ class ActorMoveToSystem { public: /** - * @symbol ?createActorMoveToSystem\@ActorMoveToSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createActorMoveToSystem\@ActorMoveToSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorMoveToSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMovement.hpp b/LiteLoader/include/llapi/mc/ActorMovement.hpp index e6e038e116..d765f8d5ea 100644 --- a/LiteLoader/include/llapi/mc/ActorMovement.hpp +++ b/LiteLoader/include/llapi/mc/ActorMovement.hpp @@ -17,19 +17,27 @@ namespace ActorMovement { #undef AFTER_EXTRA /** - * @symbol ?getWalkDist\@ActorMovement\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getHasTeleported\@ActorMovement\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool getHasTeleported(class EntityContext const &); + /** + * @symbol ?getWalkDist\@ActorMovement\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getWalkDist(class EntityContext const &); /** - * @symbol ?getWalkDistPrev\@ActorMovement\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getWalkDistPrev\@ActorMovement\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getWalkDistPrev(class EntityContext const &); /** - * @symbol ?initializeActor\@ActorMovement\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeActor\@ActorMovement\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); /** - * @symbol ?setWalkDist\@ActorMovement\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setHasTeleported\@ActorMovement\@\@YAXAEAVEntityContext\@\@_N\@Z + */ + MCAPI void setHasTeleported(class EntityContext &, bool); + /** + * @symbol ?setWalkDist\@ActorMovement\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setWalkDist(class EntityContext &, float); diff --git a/LiteLoader/include/llapi/mc/ActorMovementProxyComponent.hpp b/LiteLoader/include/llapi/mc/ActorMovementProxyComponent.hpp index 972d9bcdcc..7c32bbc47d 100644 --- a/LiteLoader/include/llapi/mc/ActorMovementProxyComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorMovementProxyComponent.hpp @@ -28,16 +28,16 @@ class ActorMovementProxyComponent { public: /** - * @symbol ??0ActorMovementProxyComponent\@\@QEAA\@V?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@\@Z + * @symbol ??0ActorMovementProxyComponent\@\@QEAA\@V?$not_null\@V?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@\@gsl\@\@\@Z */ MCAPI ActorMovementProxyComponent(class gsl::not_null>); /** - * @symbol ?getMovementProxy\@ActorMovementProxyComponent\@\@QEAA?AV?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@XZ + * @symbol ?getMovementProxy\@ActorMovementProxyComponent\@\@QEBA?AV?$shared_ptr\@$$CBUIActorMovementProxy\@\@\@std\@\@XZ */ - MCAPI class std::shared_ptr getMovementProxy(); + MCAPI class std::shared_ptr getMovementProxy() const; /** - * @symbol ?getMovementProxy\@ActorMovementProxyComponent\@\@QEBA?AV?$shared_ptr\@$$CBUIActorMovementProxy\@\@\@std\@\@XZ + * @symbol ?getMovementProxy\@ActorMovementProxyComponent\@\@QEAA?AV?$shared_ptr\@UIActorMovementProxy\@\@\@std\@\@XZ */ - MCAPI class std::shared_ptr getMovementProxy() const; + MCAPI class std::shared_ptr getMovementProxy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp index d290e01136..cb3ac87303 100644 --- a/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorMovementTickFilterSystem.hpp @@ -30,12 +30,12 @@ class ActorMovementTickFilterSystem { public: /** - * @symbol ?createBase\@ActorMovementTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createBase\@ActorMovementTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createBase(); /** - * @symbol ?createInputPacketDependentFilter\@ActorMovementTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createInputPacketDependentFilter\@ActorMovementTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createInputPacketDependentFilter(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorNormalTick.hpp b/LiteLoader/include/llapi/mc/ActorNormalTick.hpp new file mode 100644 index 0000000000..6db80dbaff --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorNormalTick.hpp @@ -0,0 +1,24 @@ +/** + * @file ActorNormalTick.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorNormalTick { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?_tickEach\@ActorNormalTick\@\@YAX_NAEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBeeFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBatFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UExperienceOrbFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFireworksRocketFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFishFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFishingHookFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UItemActorFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMinecartFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPandaFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPrimedTntFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@USlimeFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UTropicalFishFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UWolfFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UShulkerFlag\@\@\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUMinecartPreNormalTickBlockPosComponent\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@\@\@Z + */ + MCAPI void _tickEach(bool, class ViewT>, struct Exclude>, class ActorOwnerComponent> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT>> const &, class ViewT const &, class ViewT>> const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorNotificationEvent.hpp b/LiteLoader/include/llapi/mc/ActorNotificationEvent.hpp index b42fd14e3c..d3ba4d9c1b 100644 --- a/LiteLoader/include/llapi/mc/ActorNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorNotificationEvent.hpp @@ -28,7 +28,7 @@ struct ActorNotificationEvent { public: /** - * @symbol ??1ActorNotificationEvent\@\@QEAA\@XZ + * @symbol ??1ActorNotificationEvent\@\@QEAA\@XZ */ MCAPI ~ActorNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorOffset.hpp b/LiteLoader/include/llapi/mc/ActorOffset.hpp index 04cc361648..cd98ddc517 100644 --- a/LiteLoader/include/llapi/mc/ActorOffset.hpp +++ b/LiteLoader/include/llapi/mc/ActorOffset.hpp @@ -17,55 +17,55 @@ namespace ActorOffset { #undef AFTER_EXTRA /** - * @symbol ?getBreathingOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getBreathingOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getBreathingOffset(class EntityContext const &); /** - * @symbol ?getDropOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getDropOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getDropOffset(class EntityContext const &); /** - * @symbol ?getExplosionOffset\@ActorOffset\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getExplosionOffset\@ActorOffset\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getExplosionOffset(class EntityContext const &); /** - * @symbol ?getEyeOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getEyeOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getEyeOffset(class EntityContext const &); /** - * @symbol ?getHeadOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getHeadOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getHeadOffset(class EntityContext const &); /** - * @symbol ?getHeightOffset\@ActorOffset\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getHeightOffset\@ActorOffset\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getHeightOffset(class EntityContext const &); /** - * @symbol ?getMouthOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getMouthOffset\@ActorOffset\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getMouthOffset(class EntityContext const &); /** - * @symbol ?initializeActor\@ActorOffset\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeActor\@ActorOffset\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); /** - * @symbol ?setBreathingOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z + * @symbol ?setBreathingOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z */ MCAPI void setBreathingOffset(class EntityContext &, class Vec3 const &); /** - * @symbol ?setExplosionOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setExplosionOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setExplosionOffset(class EntityContext &, float); /** - * @symbol ?setEyeOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z + * @symbol ?setEyeOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z */ MCAPI void setEyeOffset(class EntityContext &, class Vec3 const &); /** - * @symbol ?setHeightOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setHeightOffset\@ActorOffset\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setHeightOffset(class EntityContext &, float); /** - * @symbol ?setOffsets\@ActorOffset\@\@YAXAEAVEntityContext\@\@V?$optional\@VVec3\@\@\@std\@\@111\@Z + * @symbol ?setOffsets\@ActorOffset\@\@YAXAEAVEntityContext\@\@V?$optional\@VVec3\@\@\@std\@\@111\@Z */ MCAPI void setOffsets(class EntityContext &, class std::optional, class std::optional, class std::optional, class std::optional); diff --git a/LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp b/LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp index 499e742f7a..cb68edc92f 100644 --- a/LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorOnGroundTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorOnGroundTest. * */ -class ActorOnGroundTest : public FilterTest { +class ActorOnGroundTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorOnGroundTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorOnGroundTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorOnGroundTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorOnGroundTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorOnGroundTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorOnGroundTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORONGROUNDTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorOnGroundTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp b/LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp index 09cec326ea..9d18a80c3a 100644 --- a/LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorOnLadderTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorOnLadderTest. * */ -class ActorOnLadderTest : public FilterTest { +class ActorOnLadderTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorOnLadderTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorOnLadderTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorOnLadderTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorOnLadderTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorOnLadderTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorOnLadderTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORONLADDERTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorOnLadderTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp b/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp index 7ad161ad36..7a9d765a7e 100644 --- a/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorOwnerComponent.hpp @@ -30,28 +30,28 @@ class ActorOwnerComponent { public: /** - * @symbol ??0ActorOwnerComponent\@\@QEAA\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0ActorOwnerComponent\@\@QEAA\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI ActorOwnerComponent(std::unique_ptr); /** - * @symbol ??0ActorOwnerComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ActorOwnerComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ActorOwnerComponent(class ActorOwnerComponent &&); /** - * @symbol ?getActor\@ActorOwnerComponent\@\@QEBAAEAVActor\@\@XZ + * @symbol ?getActor\@ActorOwnerComponent\@\@QEBAAEAVActor\@\@XZ */ MCAPI class Actor & getActor() const; /** - * @symbol ?getActor\@ActorOwnerComponent\@\@QEAAAEAVActor\@\@XZ + * @symbol ?getActor\@ActorOwnerComponent\@\@QEAAAEAVActor\@\@XZ */ MCAPI class Actor & getActor(); /** - * @symbol ??4ActorOwnerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ActorOwnerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ActorOwnerComponent & operator=(class ActorOwnerComponent &&); /** - * @symbol ??1ActorOwnerComponent\@\@QEAA\@XZ + * @symbol ??1ActorOwnerComponent\@\@QEAA\@XZ */ MCAPI ~ActorOwnerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorOwnerUtils.hpp b/LiteLoader/include/llapi/mc/ActorOwnerUtils.hpp new file mode 100644 index 0000000000..1546d6662c --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorOwnerUtils.hpp @@ -0,0 +1,24 @@ +/** + * @file ActorOwnerUtils.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorOwnerUtils { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?constActorOwnerComponentOrAssert\@ActorOwnerUtils\@\@YAPEBVActorOwnerComponent\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI class ActorOwnerComponent const * constActorOwnerComponentOrAssert(class EntityContext const &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp index dbd705d13a..16c56a5f9d 100644 --- a/LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorParticleEffectEvent.hpp @@ -28,8 +28,8 @@ class ActorParticleEffectEvent { public: /** - * @symbol ??1ActorParticleEffectEvent\@\@QEAA\@XZ + * @symbol ??1ActorParticleEffectEvent\@\@QEAA\@XZ */ MCAPI ~ActorParticleEffectEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorParticles.hpp b/LiteLoader/include/llapi/mc/ActorParticles.hpp index bb425ce199..fa52754eb9 100644 --- a/LiteLoader/include/llapi/mc/ActorParticles.hpp +++ b/LiteLoader/include/llapi/mc/ActorParticles.hpp @@ -20,35 +20,35 @@ namespace ActorParticles { #undef AFTER_EXTRA /** - * @symbol ?calculateDustParticleNumberFromFall\@ActorParticles\@\@YAIM\@Z + * @symbol ?calculateDustParticleNumberFromFall\@ActorParticles\@\@YAIM\@Z */ MCAPI unsigned int calculateDustParticleNumberFromFall(float); /** - * @symbol ?getDustParticlePosition\@ActorParticles\@\@YA?AVVec3\@\@AEBV2\@AEBVAABB\@\@\@Z + * @symbol ?getDustParticlePosition\@ActorParticles\@\@YA?AVVec3\@\@AEBV2\@AEBVAABB\@\@\@Z */ MCAPI class Vec3 getDustParticlePosition(class Vec3 const &, class AABB const &); /** - * @symbol ?spawnBalloonPopParticles\@ActorParticles\@\@YAXIVAABB\@\@W4PaletteColor\@\@AEAVILevel\@\@AEAVRandom\@\@\@Z + * @symbol ?spawnBalloonPopParticles\@ActorParticles\@\@YAXIVAABB\@\@W4PaletteColor\@\@AEAVILevel\@\@AEAVRandom\@\@\@Z */ MCAPI void spawnBalloonPopParticles(unsigned int, class AABB, enum class PaletteColor, class ILevel &, class Random &); /** - * @symbol ?spawnDeathParticles\@ActorParticles\@\@YAXVVec3\@\@VVec2\@\@MAEAVILevel\@\@\@Z + * @symbol ?spawnDeathParticles\@ActorParticles\@\@YAXVVec3\@\@VVec2\@\@MAEAVILevel\@\@\@Z */ MCAPI void spawnDeathParticles(class Vec3, class Vec2, float, class ILevel &); /** - * @symbol ?spawnDustParticlesFromFalling\@ActorParticles\@\@YAXIVVec3\@\@AEAVILevel\@\@AEBVBlock\@\@VBlockPos\@\@\@Z + * @symbol ?spawnDustParticlesFromFalling\@ActorParticles\@\@YAXIVVec3\@\@AEAVILevel\@\@AEBVBlock\@\@VBlockPos\@\@\@Z */ MCAPI void spawnDustParticlesFromFalling(unsigned int, class Vec3, class ILevel &, class Block const &, class BlockPos); /** - * @symbol ?spawnParticlesInArea\@ActorParticles\@\@YAXAEAVILevel\@\@IW4ParticleType\@\@AEBVVec3\@\@AEBVVec2\@\@AEAVRandom\@\@\@Z + * @symbol ?spawnParticlesInArea\@ActorParticles\@\@YAXAEAVILevel\@\@IW4ParticleType\@\@AEBVVec3\@\@AEBVVec2\@\@AEAVRandom\@\@\@Z */ MCAPI void spawnParticlesInArea(class ILevel &, unsigned int, enum class ParticleType, class Vec3 const &, class Vec2 const &, class Random &); /** - * @symbol ?spawnPukeParticles\@ActorParticles\@\@YAXIIVVec3\@\@0AEAVILevel\@\@AEAVRandom\@\@\@Z + * @symbol ?spawnPukeParticles\@ActorParticles\@\@YAXIIVVec3\@\@0AEAVILevel\@\@AEAVRandom\@\@\@Z */ MCAPI void spawnPukeParticles(unsigned int, unsigned int, class Vec3, class Vec3, class ILevel &, class Random &); /** - * @symbol ?spawnTreasureHuntingParticles\@ActorParticles\@\@YAXIVVec3\@\@0VVec2\@\@AEAVILevel\@\@AEAVRandom\@\@\@Z + * @symbol ?spawnTreasureHuntingParticles\@ActorParticles\@\@YAXIVVec3\@\@0VVec2\@\@AEAVILevel\@\@AEAVRandom\@\@\@Z */ MCAPI void spawnTreasureHuntingParticles(unsigned int, class Vec3, class Vec3, class Vec2, class ILevel &, class Random &); diff --git a/LiteLoader/include/llapi/mc/ActorPassengerCountTest.hpp b/LiteLoader/include/llapi/mc/ActorPassengerCountTest.hpp index 500064e85b..0a680bd511 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 : public FilterTest { +class ActorPassengerCountTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorPassengerCountTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorPassengerCountTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorPassengerCountTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorPassengerCountTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~ActorPassengerCountTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorPathingData.hpp b/LiteLoader/include/llapi/mc/ActorPathingData.hpp new file mode 100644 index 0000000000..93473b4acd --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPathingData.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorPathingData.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorPathingData { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORPATHINGDATA +public: + struct ActorPathingData& operator=(struct ActorPathingData const &) = delete; + ActorPathingData(struct ActorPathingData const &) = delete; + ActorPathingData() = delete; +#endif + +public: + /** + * @symbol ??1ActorPathingData\@\@QEAA\@XZ + */ + MCAPI ~ActorPathingData(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp b/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp index f4e42c7e4b..aebe332ad7 100644 --- a/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp +++ b/LiteLoader/include/llapi/mc/ActorPermutationEventHandler.hpp @@ -30,32 +30,32 @@ class ActorPermutationEventHandler { public: /** - * @symbol ??0ActorPermutationEventHandler\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0ActorPermutationEventHandler\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI ActorPermutationEventHandler(class Actor &); /** - * @symbol ?checkActiveComponents\@ActorPermutationEventHandler\@\@QEAAXV?$shared_ptr\@VActorPermutation\@\@\@std\@\@\@Z + * @symbol ?checkActiveComponents\@ActorPermutationEventHandler\@\@QEAAXV?$shared_ptr\@VActorPermutation\@\@\@std\@\@\@Z */ MCAPI void checkActiveComponents(class std::shared_ptr); /** - * @symbol ?getPermutationDescriptor\@ActorPermutationEventHandler\@\@QEAAPEAVActorDefinitionDescriptor\@\@XZ + * @symbol ?getPermutationDescriptor\@ActorPermutationEventHandler\@\@QEAAPEAVActorDefinitionDescriptor\@\@XZ */ MCAPI class ActorDefinitionDescriptor * getPermutationDescriptor(); /** - * @symbol ?hasChanged\@ActorPermutationEventHandler\@\@QEAA_NXZ + * @symbol ?hasChanged\@ActorPermutationEventHandler\@\@QEAA_NXZ */ MCAPI bool hasChanged(); /** - * @symbol ?initPermutations\@ActorPermutationEventHandler\@\@QEAAXAEAV?$vector\@V?$shared_ptr\@VActorPermutation\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VActorPermutation\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?initPermutations\@ActorPermutationEventHandler\@\@QEAAXAEAV?$vector\@V?$shared_ptr\@VActorPermutation\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VActorPermutation\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void initPermutations(std::vector> &); /** - * @symbol ?reload\@ActorPermutationEventHandler\@\@QEAAXAEAVRenderParams\@\@\@Z + * @symbol ?reload\@ActorPermutationEventHandler\@\@QEAAXAEAVRenderParams\@\@\@Z */ MCAPI void reload(class RenderParams &); /** - * @symbol ??1ActorPermutationEventHandler\@\@QEAA\@XZ + * @symbol ??1ActorPermutationEventHandler\@\@QEAA\@XZ */ MCAPI ~ActorPermutationEventHandler(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp index f7512f7194..369e7f22ea 100644 --- a/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ActorPickRequestPacket.hpp @@ -30,33 +30,33 @@ class ActorPickRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorPickRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ActorPickRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ActorPickRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ActorPickRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ActorPickRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ActorPickRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ActorPickRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ActorPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ActorPickRequestPacket\@\@QEAA\@XZ + * @symbol ??0ActorPickRequestPacket\@\@QEAA\@XZ */ MCAPI ActorPickRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp index db7bac3852..f7234c84c6 100644 --- a/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp +++ b/LiteLoader/include/llapi/mc/ActorPlacerItem.hpp @@ -32,189 +32,189 @@ class ActorPlacerItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorPlacerItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tearDown\@ActorPlacerItem\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?tearDown\@ActorPlacerItem\@\@UEAAXXZ */ virtual void tearDown(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@ActorPlacerItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@ActorPlacerItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 58 - * @symbol ?shouldInteractionWithBlockBypassLiquid\@ActorPlacerItem\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?shouldInteractionWithBlockBypassLiquid\@ActorPlacerItem\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool shouldInteractionWithBlockBypassLiquid(class Block const &) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@ActorPlacerItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@ActorPlacerItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 81 - * @symbol ?getActorIdentifier\@ActorPlacerItem\@\@UEBA?AUActorDefinitionIdentifier\@\@AEBVItemStack\@\@\@Z + * @vftbl 81 + * @symbol ?getActorIdentifier\@ActorPlacerItem\@\@UEBA?AUActorDefinitionIdentifier\@\@AEBVItemStack\@\@\@Z */ virtual struct ActorDefinitionIdentifier getActorIdentifier(class ItemStack const &) const; /** - * @vftbl 85 - * @symbol ?dispense\@ActorPlacerItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ActorPlacerItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@ActorPlacerItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@ActorPlacerItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@ActorPlacerItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@ActorPlacerItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 132 - * @symbol ?_useOn\@ActorPlacerItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@ActorPlacerItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORPLACERITEM /** - * @symbol ?getBaseColor\@ActorPlacerItem\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z + * @symbol ?getBaseColor\@ActorPlacerItem\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z */ MCVAPI class mce::Color getBaseColor(class ItemStack const &) const; /** - * @symbol ?getSecondaryColor\@ActorPlacerItem\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z + * @symbol ?getSecondaryColor\@ActorPlacerItem\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z */ MCVAPI class mce::Color getSecondaryColor(class ItemStack const &) const; /** - * @symbol ?isActorPlacerItem\@ActorPlacerItem\@\@UEBA_NXZ + * @symbol ?isActorPlacerItem\@ActorPlacerItem\@\@UEBA_NXZ */ MCVAPI bool isActorPlacerItem() const; /** - * @symbol ?isMultiColorTinted\@ActorPlacerItem\@\@UEBA_NAEBVItemStack\@\@\@Z + * @symbol ?isMultiColorTinted\@ActorPlacerItem\@\@UEBA_NAEBVItemStack\@\@\@Z */ MCVAPI bool isMultiColorTinted(class ItemStack const &) const; #endif /** - * @symbol ??0ActorPlacerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBUActorDefinitionIdentifier\@\@\@Z + * @symbol ??0ActorPlacerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBUActorDefinitionIdentifier\@\@\@Z */ MCAPI ActorPlacerItem(std::string const &, int, struct ActorDefinitionIdentifier const &); /** - * @symbol ?forEachCustomEgg\@ActorPlacerItem\@\@SAXVItemRegistryRef\@\@AEBV?$function\@$$A6AXAEBVItem\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachCustomEgg\@ActorPlacerItem\@\@SAXVItemRegistryRef\@\@AEBV?$function\@$$A6AXAEBVItem\@\@\@Z\@std\@\@\@Z */ MCAPI static void forEachCustomEgg(class ItemRegistryRef, class std::function const &); /** - * @symbol ?getCustomSpawnEggName\@ActorPlacerItem\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getCustomSpawnEggName\@ActorPlacerItem\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI static std::string getCustomSpawnEggName(int); /** - * @symbol ?registerCustomEggs\@ActorPlacerItem\@\@SAXVItemRegistryRef\@\@AEBVActorInfoRegistry\@\@\@Z + * @symbol ?registerCustomEggs\@ActorPlacerItem\@\@SAXVItemRegistryRef\@\@AEBVActorInfoRegistry\@\@\@Z */ MCAPI static void registerCustomEggs(class ItemRegistryRef, class ActorInfoRegistry const &); /** - * @symbol ?spawnOrMoveAgent\@ActorPlacerItem\@\@SAPEAVActor\@\@AEBVVec3\@\@AEAV2\@\@Z + * @symbol ?spawnOrMoveAgent\@ActorPlacerItem\@\@SAPEAVActor\@\@AEBVVec3\@\@AEAV2\@\@Z */ MCAPI static class Actor * spawnOrMoveAgent(class Vec3 const &, class Actor &); //private: /** - * @symbol ?_getActorID\@ActorPlacerItem\@\@AEBA?AUActorDefinitionIdentifier\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getActorID\@ActorPlacerItem\@\@AEBA?AUActorDefinitionIdentifier\@\@AEAVBlockSource\@\@\@Z */ MCAPI struct ActorDefinitionIdentifier _getActorID(class BlockSource &) const; /** - * @symbol ?_spawnActorAt\@ActorPlacerItem\@\@AEBAPEAVActor\@\@AEAVBlockSource\@\@AEBVVec3\@\@1AEBVItemStack\@\@PEAV2\@\@Z + * @symbol ?_spawnActorAt\@ActorPlacerItem\@\@AEBAPEAVActor\@\@AEAVBlockSource\@\@AEBVVec3\@\@1AEBVItemStack\@\@PEAV2\@\@Z */ MCAPI class Actor * _spawnActorAt(class BlockSource &, class Vec3 const &, class Vec3 const &, class ItemStack const &, class Actor *) const; /** - * @symbol ?_setAgentOwner\@ActorPlacerItem\@\@CAXAEAVPlayer\@\@AEAVAgent\@\@\@Z + * @symbol ?_setAgentOwner\@ActorPlacerItem\@\@CAXAEAVPlayer\@\@AEAVAgent\@\@\@Z */ MCAPI static void _setAgentOwner(class Player &, class Agent &); private: /** - * @symbol ?EGG_MASK_ID\@ActorPlacerItem\@\@0HB + * @symbol ?EGG_MASK_ID\@ActorPlacerItem\@\@0HB */ MCAPI static int const EGG_MASK_ID; /** - * @symbol ?NUM_SPAWN_EGG_TEXTURES\@ActorPlacerItem\@\@0HB + * @symbol ?NUM_SPAWN_EGG_TEXTURES\@ActorPlacerItem\@\@0HB */ MCAPI static int const NUM_SPAWN_EGG_TEXTURES; /** - * @symbol ?mCustomSpawnEggs\@ActorPlacerItem\@\@0V?$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\@\@A + * @symbol ?mCustomSpawnEggs\@ActorPlacerItem\@\@0V?$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\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mCustomSpawnEggs; /** - * @symbol ?mEggTextureInfoMap\@ActorPlacerItem\@\@0V?$unordered_map\@VHashedString\@\@UResolvedItemIconInfo\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UResolvedItemIconInfo\@\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mEggTextureInfoMap\@ActorPlacerItem\@\@0V?$unordered_map\@VHashedString\@\@UResolvedItemIconInfo\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UResolvedItemIconInfo\@\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mEggTextureInfoMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystem.hpp b/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystem.hpp new file mode 100644 index 0000000000..ef9126b0d4 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystem.hpp @@ -0,0 +1,24 @@ +/** + * @file ActorPlayMovementSoundSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorPlayMovementSoundSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSystem\@ActorPlayMovementSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp b/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp new file mode 100644 index 0000000000..0ef54287fc --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPlayMovementSoundSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file ActorPlayMovementSoundSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace ActorPlayMovementSoundSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doPlayMovementSound\@ActorPlayMovementSoundSystemImpl\@\@YAXAEAVActorOwnerComponent\@\@\@Z + */ + MCAPI void doPlayMovementSound(class ActorOwnerComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/ActorPostNormalTickSystem.hpp new file mode 100644 index 0000000000..fa22f86c47 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorPostNormalTickSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file ActorPostNormalTickSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ActorPostNormalTickSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORPOSTNORMALTICKSYSTEM +public: + class ActorPostNormalTickSystem& operator=(class ActorPostNormalTickSystem const &) = delete; + ActorPostNormalTickSystem(class ActorPostNormalTickSystem const &) = delete; + ActorPostNormalTickSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystemClient\@ActorPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystemClient(); + /** + * @symbol ?createSystemServer\@ActorPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystemServer(); + +}; diff --git a/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp b/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp index eb6abb61ac..56eb6349eb 100644 --- a/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp +++ b/LiteLoader/include/llapi/mc/ActorPropertiesDescription.hpp @@ -30,21 +30,27 @@ struct ActorPropertiesDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorPropertiesDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getJsonName\@ActorPropertiesDescription\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?getJsonName\@ActorPropertiesDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORPROPERTIESDESCRIPTION /** - * @symbol ??4ActorPropertiesDescription\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorPropertiesDescription(); +#endif + /** + * @symbol ??4ActorPropertiesDescription\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ActorPropertiesDescription & operator=(struct ActorPropertiesDescription const &); /** - * @symbol ?parse\@ActorPropertiesDescription\@\@QEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?parse\@ActorPropertiesDescription\@\@QEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI void parse(class Json::Value &, class SemVersion const &); diff --git a/LiteLoader/include/llapi/mc/ActorPropertyUtils.hpp b/LiteLoader/include/llapi/mc/ActorPropertyUtils.hpp index ffb22e214e..289747acd6 100644 --- a/LiteLoader/include/llapi/mc/ActorPropertyUtils.hpp +++ b/LiteLoader/include/llapi/mc/ActorPropertyUtils.hpp @@ -20,23 +20,23 @@ namespace ActorPropertyUtils { #undef AFTER_EXTRA /** - * @symbol ?_checkAndQueueBoolValue\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_KPEAVActorDefinitionDiffList\@\@_N\@Z + * @symbol ?_checkAndQueueBoolValue\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_KPEAVActorDefinitionDiffList\@\@_N\@Z */ MCAPI bool _checkAndQueueBoolValue(class PropertyGroup const &, unsigned __int64, class ActorDefinitionDiffList *, bool); /** - * @symbol ?_checkAndQueueEnumIndexValueByHash\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_K1PEAVActorDefinitionDiffList\@\@1\@Z + * @symbol ?_checkAndQueueEnumIndexValueByHash\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_K1PEAVActorDefinitionDiffList\@\@1\@Z */ MCAPI bool _checkAndQueueEnumIndexValueByHash(class PropertyGroup const &, unsigned __int64, unsigned __int64, class ActorDefinitionDiffList *, unsigned __int64); /** - * @symbol ?_checkAndQueueFloatValue\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_K1PEAVActorDefinitionDiffList\@\@M\@Z + * @symbol ?_checkAndQueueFloatValue\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_K1PEAVActorDefinitionDiffList\@\@M\@Z */ MCAPI bool _checkAndQueueFloatValue(class PropertyGroup const &, unsigned __int64, unsigned __int64, class ActorDefinitionDiffList *, float); /** - * @symbol ?_checkAndQueueIntValue\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_K1PEAVActorDefinitionDiffList\@\@H\@Z + * @symbol ?_checkAndQueueIntValue\@ActorPropertyUtils\@\@YA_NAEBVPropertyGroup\@\@_K1PEAVActorDefinitionDiffList\@\@H\@Z */ MCAPI bool _checkAndQueueIntValue(class PropertyGroup const &, unsigned __int64, unsigned __int64, class ActorDefinitionDiffList *, int); /** - * @symbol ?addPendingEventResponseChange\@ActorPropertyUtils\@\@YAXAEBVPropertyComponent\@\@AEAVActor\@\@AEBVHashedString\@\@AEBUMolangScriptArg\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addPendingEventResponseChange\@ActorPropertyUtils\@\@YAXAEBVPropertyComponent\@\@AEAVActor\@\@AEBVHashedString\@\@AEBUMolangScriptArg\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addPendingEventResponseChange(class PropertyComponent const &, class Actor &, class HashedString const &, struct MolangScriptArg const &, std::string const &); diff --git a/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp b/LiteLoader/include/llapi/mc/ActorRandomChanceTest.hpp index 102178e9b4..8c0331dd06 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 : public FilterTest { +class ActorRandomChanceTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,39 @@ class ActorRandomChanceTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorRandomChanceTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorRandomChanceTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@ActorRandomChanceTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorRefreshComponentsSystem.hpp b/LiteLoader/include/llapi/mc/ActorRefreshComponentsSystem.hpp index 5bb46aabc3..7d46621b03 100644 --- a/LiteLoader/include/llapi/mc/ActorRefreshComponentsSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorRefreshComponentsSystem.hpp @@ -25,8 +25,8 @@ class ActorRefreshComponentsSystem { public: /** - * @symbol ?createSystem\@ActorRefreshComponentsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ActorRefreshComponentsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp index ce0ffdecac..8008820d44 100644 --- a/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorRemoveEffectEvent.hpp @@ -25,7 +25,7 @@ struct ActorRemoveEffectEvent { public: /** - * @symbol ??1ActorRemoveEffectEvent\@\@QEAA\@XZ + * @symbol ??1ActorRemoveEffectEvent\@\@QEAA\@XZ */ MCAPI ~ActorRemoveEffectEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorRiding.hpp b/LiteLoader/include/llapi/mc/ActorRiding.hpp index b8040900f3..162f1bd956 100644 --- a/LiteLoader/include/llapi/mc/ActorRiding.hpp +++ b/LiteLoader/include/llapi/mc/ActorRiding.hpp @@ -17,47 +17,47 @@ namespace ActorRiding { #undef AFTER_EXTRA /** - * @symbol ?clearVehicle\@ActorRiding\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?clearVehicle\@ActorRiding\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void clearVehicle(class EntityContext &); /** - * @symbol ?clearVehiclePrev\@ActorRiding\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?clearVehiclePrev\@ActorRiding\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void clearVehiclePrev(class EntityContext &); /** - * @symbol ?getPassengers\@ActorRiding\@\@YAAEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getPassengers\@ActorRiding\@\@YAAEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@AEBVEntityContext\@\@\@Z */ MCAPI std::vector const & getPassengers(class EntityContext const &); /** - * @symbol ?getPendingRemovePassengers\@ActorRiding\@\@YAAEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getPendingRemovePassengers\@ActorRiding\@\@YAAEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@AEBVEntityContext\@\@\@Z */ MCAPI std::vector const & getPendingRemovePassengers(class EntityContext const &); /** - * @symbol ?getVehicleID\@ActorRiding\@\@YA?AUActorUniqueID\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getVehicleID\@ActorRiding\@\@YA?AUActorUniqueID\@\@AEBVEntityContext\@\@\@Z */ MCAPI struct ActorUniqueID getVehicleID(class EntityContext const &); /** - * @symbol ?getVehiclePrevEntity\@ActorRiding\@\@YA?AVStrictEntityContext\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getVehiclePrevEntity\@ActorRiding\@\@YA?AVStrictEntityContext\@\@AEBVEntityContext\@\@\@Z */ MCAPI class StrictEntityContext getVehiclePrevEntity(class EntityContext const &); /** - * @symbol ?removePassengerFromList\@ActorRiding\@\@YAXAEAVEntityContext\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?removePassengerFromList\@ActorRiding\@\@YAXAEAVEntityContext\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void removePassengerFromList(class EntityContext &, struct ActorUniqueID const &); /** - * @symbol ?setPassengersChanged\@ActorRiding\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setPassengersChanged\@ActorRiding\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setPassengersChanged(class EntityContext &, bool); /** - * @symbol ?setVehicle\@ActorRiding\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?setVehicle\@ActorRiding\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void setVehicle(class EntityContext &, class StrictEntityContext, struct ActorUniqueID const &); /** - * @symbol ?setVehiclePrev\@ActorRiding\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?setVehiclePrev\@ActorRiding\@\@YAXAEAVEntityContext\@\@VStrictEntityContext\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void setVehiclePrev(class EntityContext &, class StrictEntityContext, struct ActorUniqueID const &); /** - * @symbol ?tryRemoveLastPendingPassenger\@ActorRiding\@\@YA?AUStrictActorIDEntityContextPair\@\@AEAVEntityContext\@\@\@Z + * @symbol ?tryRemoveLastPendingPassenger\@ActorRiding\@\@YA?AUStrictActorIDEntityContextPair\@\@AEAVEntityContext\@\@\@Z */ MCAPI struct StrictActorIDEntityContextPair tryRemoveLastPendingPassenger(class EntityContext &); diff --git a/LiteLoader/include/llapi/mc/ActorRotationComponent.hpp b/LiteLoader/include/llapi/mc/ActorRotationComponent.hpp new file mode 100644 index 0000000000..539397f932 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ActorRotationComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file ActorRotationComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ActorRotationComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORROTATIONCOMPONENT +public: + struct ActorRotationComponent& operator=(struct ActorRotationComponent const &) = delete; + ActorRotationComponent(struct ActorRotationComponent const &) = delete; + ActorRotationComponent() = delete; +#endif + +public: + /** + * @symbol ?toString\@ActorRotationComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string toString() const; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp b/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp index dbd6bc4391..de455b00e4 100644 --- a/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp +++ b/LiteLoader/include/llapi/mc/ActorRuntimeIDManager.hpp @@ -24,48 +24,48 @@ class ActorRuntimeIDManager { public: /** - * @symbol ??0ActorRuntimeIDManager\@\@QEAA\@XZ + * @symbol ??0ActorRuntimeIDManager\@\@QEAA\@XZ */ MCAPI ActorRuntimeIDManager(); /** - * @symbol ?addRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEAAXVActorRuntimeID\@\@VWeakEntityRef\@\@\@Z + * @symbol ?addRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEAAXVActorRuntimeID\@\@VWeakEntityRef\@\@\@Z */ MCAPI void addRuntimeActorEntity(class ActorRuntimeID, class WeakEntityRef); /** - * @symbol ?getNextRuntimeID\@ActorRuntimeIDManager\@\@QEAA?AVActorRuntimeID\@\@XZ + * @symbol ?getNextRuntimeID\@ActorRuntimeIDManager\@\@QEAA?AVActorRuntimeID\@\@XZ */ MCAPI class ActorRuntimeID getNextRuntimeID(); /** - * @symbol ?getRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEBAPEAVActor\@\@VActorRuntimeID\@\@_N\@Z + * @symbol ?getRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEBAPEAVActor\@\@VActorRuntimeID\@\@_N\@Z */ MCAPI class Actor * getRuntimeActorEntity(class ActorRuntimeID, bool) const; /** - * @symbol ?getRuntimeActorList\@ActorRuntimeIDManager\@\@QEBA?AV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getRuntimeActorList\@ActorRuntimeIDManager\@\@QEBA?AV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getRuntimeActorList() const; /** - * @symbol ?initialize\@ActorRuntimeIDManager\@\@QEAAXAEAVActorManager\@\@\@Z + * @symbol ?initialize\@ActorRuntimeIDManager\@\@QEAAXAEAVActorManager\@\@\@Z */ MCAPI void initialize(class ActorManager &); /** - * @symbol ?removeRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEAAXVActorRuntimeID\@\@\@Z + * @symbol ?removeRuntimeActorEntity\@ActorRuntimeIDManager\@\@QEAAXVActorRuntimeID\@\@\@Z */ MCAPI void removeRuntimeActorEntity(class ActorRuntimeID); /** - * @symbol ??1ActorRuntimeIDManager\@\@QEAA\@XZ + * @symbol ??1ActorRuntimeIDManager\@\@QEAA\@XZ */ MCAPI ~ActorRuntimeIDManager(); //private: /** - * @symbol ?_onActorAdded\@ActorRuntimeIDManager\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_onActorAdded\@ActorRuntimeIDManager\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onActorAdded(class Actor &); /** - * @symbol ?_onRemoveActorEntityReferences\@ActorRuntimeIDManager\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_onRemoveActorEntityReferences\@ActorRuntimeIDManager\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp b/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp index 09406e991f..a0288e95bb 100644 --- a/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp +++ b/LiteLoader/include/llapi/mc/ActorSelectorArgs.hpp @@ -27,23 +27,23 @@ struct ActorSelectorArgs { public: /** - * @symbol ??0ActorSelectorArgs\@\@QEAA\@XZ + * @symbol ??0ActorSelectorArgs\@\@QEAA\@XZ */ MCAPI ActorSelectorArgs(); /** - * @symbol ??1ActorSelectorArgs\@\@QEAA\@XZ + * @symbol ??1ActorSelectorArgs\@\@QEAA\@XZ */ MCAPI ~ActorSelectorArgs(); /** - * @symbol ?DEFAULT_LEVEL\@ActorSelectorArgs\@\@2U?$pair\@HH\@std\@\@B + * @symbol ?DEFAULT_LEVEL\@ActorSelectorArgs\@\@2U?$pair\@HH\@std\@\@B */ MCAPI static struct std::pair const DEFAULT_LEVEL; /** - * @symbol ?DEFAULT_X_ROTATION\@ActorSelectorArgs\@\@2U?$pair\@MM\@std\@\@B + * @symbol ?DEFAULT_X_ROTATION\@ActorSelectorArgs\@\@2U?$pair\@MM\@std\@\@B */ MCAPI static struct std::pair const DEFAULT_X_ROTATION; /** - * @symbol ?DEFAULT_Y_ROTATION\@ActorSelectorArgs\@\@2U?$pair\@MM\@std\@\@B + * @symbol ?DEFAULT_Y_ROTATION\@ActorSelectorArgs\@\@2U?$pair\@MM\@std\@\@B */ MCAPI static struct std::pair const DEFAULT_Y_ROTATION; diff --git a/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp index 59fe4a2eda..481edcdb34 100644 --- a/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ActorServerCommandOrigin.hpp @@ -32,46 +32,46 @@ class ActorServerCommandOrigin : public ActorCommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorServerCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@ActorServerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ActorServerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@ActorServerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ActorServerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@ActorServerCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@ActorServerCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@ActorServerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ActorServerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@ActorServerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@ActorServerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @symbol ?getTargetOther\@ActorServerCommandOrigin\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getTargetOther\@ActorServerCommandOrigin\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getTargetOther() const; /** - * @symbol ?setTargetOther\@ActorServerCommandOrigin\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setTargetOther\@ActorServerCommandOrigin\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setTargetOther(struct ActorUniqueID); /** - * @symbol ?load\@ActorServerCommandOrigin\@\@SA?AV?$unique_ptr\@VActorServerCommandOrigin\@\@U?$default_delete\@VActorServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@ActorServerCommandOrigin\@\@SA?AV?$unique_ptr\@VActorServerCommandOrigin\@\@U?$default_delete\@VActorServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp index b2c3908386..cc9c1b149d 100644 --- a/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimation.hpp @@ -30,84 +30,84 @@ class ActorSkeletalAnimation { public: /** - * @symbol ??0ActorSkeletalAnimation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ??0ActorSkeletalAnimation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI ActorSkeletalAnimation(std::string const &, std::string const &); /** - * @symbol ?addActorEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z + * @symbol ?addActorEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorAnimationEvent\@\@MAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CurrentCmdVersion\@\@W4MolangVersion\@\@\@Z */ MCAPI class ActorAnimationEvent & addActorEvent(float, std::string const &, enum class CurrentCmdVersion, enum class MolangVersion); /** - * @symbol ?addBoneAnimation\@ActorSkeletalAnimation\@\@QEAAAEAVBoneAnimation\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addBoneAnimation\@ActorSkeletalAnimation\@\@QEAAAEAVBoneAnimation\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BoneAnimation & addBoneAnimation(std::string const &); /** - * @symbol ?addParticleEffectEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorParticleEffectEvent\@\@M\@Z + * @symbol ?addParticleEffectEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorParticleEffectEvent\@\@M\@Z */ MCAPI class ActorParticleEffectEvent & addParticleEffectEvent(float); /** - * @symbol ?addSoundEffectEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorSoundEffectEvent\@\@M\@Z + * @symbol ?addSoundEffectEvent\@ActorSkeletalAnimation\@\@QEAAAEAVActorSoundEffectEvent\@\@M\@Z */ MCAPI class ActorSoundEffectEvent & addSoundEffectEvent(float); /** - * @symbol ?calculateAnimationLength\@ActorSkeletalAnimation\@\@QEAAXXZ + * @symbol ?calculateAnimationLength\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void calculateAnimationLength(); /** - * @symbol ?getBoneAnimations\@ActorSkeletalAnimation\@\@QEAAAEAV?$vector\@VBoneAnimation\@\@V?$allocator\@VBoneAnimation\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getBoneAnimations\@ActorSkeletalAnimation\@\@QEAAAEAV?$vector\@VBoneAnimation\@\@V?$allocator\@VBoneAnimation\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getBoneAnimations(); /** - * @symbol ?initPrecomputedInterpolation\@ActorSkeletalAnimation\@\@QEAAXXZ + * @symbol ?initPrecomputedInterpolation\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void initPrecomputedInterpolation(); /** - * @symbol ?removeIrrelevantKeyFramesAndConvertAllFloatKeyFramesToSimplifiedVersion\@ActorSkeletalAnimation\@\@QEAAXXZ + * @symbol ?removeIrrelevantKeyFramesAndConvertAllFloatKeyFramesToSimplifiedVersion\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void removeIrrelevantKeyFramesAndConvertAllFloatKeyFramesToSimplifiedVersion(); /** - * @symbol ?setAnimTimeUpdate\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?setAnimTimeUpdate\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void setAnimTimeUpdate(class ExpressionNode const &); /** - * @symbol ?setAnimationLength\@ActorSkeletalAnimation\@\@QEAAXM\@Z + * @symbol ?setAnimationLength\@ActorSkeletalAnimation\@\@QEAAXM\@Z */ MCAPI void setAnimationLength(float); /** - * @symbol ?setBlendWeight\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?setBlendWeight\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void setBlendWeight(class ExpressionNode const &); /** - * @symbol ?setLoopDelay\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?setLoopDelay\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void setLoopDelay(class ExpressionNode const &); /** - * @symbol ?setLoopMode\@ActorSkeletalAnimation\@\@QEAAXW4AnimationLoopMode\@\@\@Z + * @symbol ?setLoopMode\@ActorSkeletalAnimation\@\@QEAAXW4AnimationLoopMode\@\@\@Z */ MCAPI void setLoopMode(enum class AnimationLoopMode); /** - * @symbol ?setShouldOverridePreviousAnimation\@ActorSkeletalAnimation\@\@QEAAX_N\@Z + * @symbol ?setShouldOverridePreviousAnimation\@ActorSkeletalAnimation\@\@QEAAX_N\@Z */ MCAPI void setShouldOverridePreviousAnimation(bool); /** - * @symbol ?setStartDelay\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?setStartDelay\@ActorSkeletalAnimation\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void setStartDelay(class ExpressionNode const &); /** - * @symbol ?sortEvents\@ActorSkeletalAnimation\@\@QEAAXXZ + * @symbol ?sortEvents\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void sortEvents(); /** - * @symbol ?sortParticleEffectEvents\@ActorSkeletalAnimation\@\@QEAAXXZ + * @symbol ?sortParticleEffectEvents\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void sortParticleEffectEvents(); /** - * @symbol ?sortSoundEffectEvents\@ActorSkeletalAnimation\@\@QEAAXXZ + * @symbol ?sortSoundEffectEvents\@ActorSkeletalAnimation\@\@QEAAXXZ */ MCAPI void sortSoundEffectEvents(); /** - * @symbol ??1ActorSkeletalAnimation\@\@QEAA\@XZ + * @symbol ??1ActorSkeletalAnimation\@\@QEAA\@XZ */ MCAPI ~ActorSkeletalAnimation(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp index 9f1552c15e..7fd2bee4f1 100644 --- a/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPlayer.hpp @@ -30,58 +30,58 @@ class ActorSkeletalAnimationPlayer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorSkeletalAnimationPlayer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applyToPose\@ActorSkeletalAnimationPlayer\@\@UEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z + * @vftbl 1 + * @symbol ?applyToPose\@ActorSkeletalAnimationPlayer\@\@UEAAXAEAVRenderParams\@\@AEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@M\@Z */ virtual void applyToPose(class RenderParams &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, float); /** - * @vftbl 2 - * @symbol ?resetAnimation\@ActorSkeletalAnimationPlayer\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?resetAnimation\@ActorSkeletalAnimationPlayer\@\@UEAAXXZ */ virtual void resetAnimation(); /** - * @vftbl 3 - * @symbol ?buildBoneToPartMapping\@ActorSkeletalAnimationPlayer\@\@UEAAXAEAVAnimationComponent\@\@\@Z + * @vftbl 3 + * @symbol ?buildBoneToPartMapping\@ActorSkeletalAnimationPlayer\@\@UEAAXAEAVAnimationComponent\@\@\@Z */ virtual void buildBoneToPartMapping(class AnimationComponent &); /** - * @vftbl 4 - * @symbol ?bindParticleEffects\@ActorSkeletalAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?bindParticleEffects\@ActorSkeletalAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual void bindParticleEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @vftbl 5 - * @symbol ?bindSoundEffects\@ActorSkeletalAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?bindSoundEffects\@ActorSkeletalAnimationPlayer\@\@UEAAXAEBV?$unordered_map\@VHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual void bindSoundEffects(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @vftbl 6 - * @symbol ?hasAnimationFinished\@ActorSkeletalAnimationPlayer\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?hasAnimationFinished\@ActorSkeletalAnimationPlayer\@\@UEBA_NXZ */ virtual bool hasAnimationFinished() const; /** - * @vftbl 7 - * @symbol ?findAnimation\@ActorSkeletalAnimationPlayer\@\@UEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @vftbl 7 + * @symbol ?findAnimation\@ActorSkeletalAnimationPlayer\@\@UEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@\@Z */ virtual class std::shared_ptr findAnimation(class HashedString const &); /** - * @vftbl 8 - * @symbol ?getAnimationType\@ActorSkeletalAnimationPlayer\@\@UEBA?AW4ActorAnimationType\@\@XZ + * @vftbl 8 + * @symbol ?getAnimationType\@ActorSkeletalAnimationPlayer\@\@UEBA?AW4ActorAnimationType\@\@XZ */ virtual enum class ActorAnimationType getAnimationType() const; /** - * @vftbl 9 - * @symbol ?getRawName\@ActorSkeletalAnimationPlayer\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 9 + * @symbol ?getRawName\@ActorSkeletalAnimationPlayer\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getRawName() const; /** - * @symbol ??0ActorSkeletalAnimationPlayer\@\@QEAA\@AEBVHashedString\@\@VActorSkeletalAnimationPtr\@\@AEAVAnimationComponent\@\@AEBVExpressionNode\@\@\@Z + * @symbol ??0ActorSkeletalAnimationPlayer\@\@QEAA\@AEBVHashedString\@\@VActorSkeletalAnimationPtr\@\@AEAVAnimationComponent\@\@AEBVExpressionNode\@\@\@Z */ MCAPI ActorSkeletalAnimationPlayer(class HashedString const &, class ActorSkeletalAnimationPtr, class AnimationComponent &, class ExpressionNode const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp index 9575fe64f9..0e8b76c73a 100644 --- a/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp +++ b/LiteLoader/include/llapi/mc/ActorSkeletalAnimationPtr.hpp @@ -30,36 +30,36 @@ class ActorSkeletalAnimationPtr { public: /** - * @symbol ??0ActorSkeletalAnimationPtr\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VActorAnimationGroup\@\@\@Bedrock\@\@\@gsl\@\@AEBVHashedString\@\@\@Z + * @symbol ??0ActorSkeletalAnimationPtr\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VActorAnimationGroup\@\@\@Bedrock\@\@\@gsl\@\@AEBVHashedString\@\@\@Z */ MCAPI ActorSkeletalAnimationPtr(class gsl::not_null> const &, class HashedString const &); /** - * @symbol ?getName\@ActorSkeletalAnimationPtr\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getName\@ActorSkeletalAnimationPtr\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getName() const; /** - * @symbol ?isNull\@ActorSkeletalAnimationPtr\@\@QEBA_NXZ + * @symbol ?isNull\@ActorSkeletalAnimationPtr\@\@QEBA_NXZ */ MCAPI bool isNull() const; /** - * @symbol ??CActorSkeletalAnimationPtr\@\@QEBAPEBVActorSkeletalAnimation\@\@XZ + * @symbol ??CActorSkeletalAnimationPtr\@\@QEBAPEBVActorSkeletalAnimation\@\@XZ */ MCAPI class ActorSkeletalAnimation const * operator->() const; /** - * @symbol ??CActorSkeletalAnimationPtr\@\@QEAAPEAVActorSkeletalAnimation\@\@XZ + * @symbol ??CActorSkeletalAnimationPtr\@\@QEAAPEAVActorSkeletalAnimation\@\@XZ */ MCAPI class ActorSkeletalAnimation * operator->(); /** - * @symbol ??4ActorSkeletalAnimationPtr\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ActorSkeletalAnimationPtr\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ActorSkeletalAnimationPtr & operator=(class ActorSkeletalAnimationPtr const &); /** - * @symbol ??1ActorSkeletalAnimationPtr\@\@QEAA\@XZ + * @symbol ??1ActorSkeletalAnimationPtr\@\@QEAA\@XZ */ MCAPI ~ActorSkeletalAnimationPtr(); /** - * @symbol ?NONE\@ActorSkeletalAnimationPtr\@\@2V1\@B + * @symbol ?NONE\@ActorSkeletalAnimationPtr\@\@2V1\@B */ MCAPI static class ActorSkeletalAnimationPtr const NONE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSoundEffectEvent.hpp b/LiteLoader/include/llapi/mc/ActorSoundEffectEvent.hpp index 1861c5cbc7..8d7a0d2724 100644 --- a/LiteLoader/include/llapi/mc/ActorSoundEffectEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorSoundEffectEvent.hpp @@ -28,8 +28,8 @@ class ActorSoundEffectEvent { public: /** - * @symbol ??1ActorSoundEffectEvent\@\@QEAA\@XZ + * @symbol ??1ActorSoundEffectEvent\@\@QEAA\@XZ */ MCAPI ~ActorSoundEffectEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp b/LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp index a38eb04995..1e0a71307c 100644 --- a/LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp +++ b/LiteLoader/include/llapi/mc/ActorSpawnRuleBase.hpp @@ -31,21 +31,27 @@ class ActorSpawnRuleBase { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORSPAWNRULEBASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorSpawnRuleBase(); +#endif //protected: /** - * @symbol ?_applySpawnCondition\@ActorSpawnRuleBase\@\@IEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVBiomeFilterGroup\@\@AEAVMobSpawnRules\@\@AEBVSemVersion\@\@\@Z\@std\@\@AEAVValue\@Json\@\@AEBVMobSpawnRules\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVSemVersion\@\@\@Z + * @symbol ?_applySpawnCondition\@ActorSpawnRuleBase\@\@IEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVBiomeFilterGroup\@\@AEAVMobSpawnRules\@\@AEBVSemVersion\@\@\@Z\@std\@\@AEAVValue\@Json\@\@AEBVMobSpawnRules\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVSemVersion\@\@\@Z */ MCAPI void _applySpawnCondition(class std::function, class Json::Value &, class MobSpawnRules const &, std::string const &, class SemVersion const &); /** - * @symbol ?_getResources\@ActorSpawnRuleBase\@\@IEAAXAEAVResourcePackManager\@\@AEBVMobSpawnRules\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVBiomeFilterGroup\@\@AEAVMobSpawnRules\@\@AEBVSemVersion\@\@\@Z\@std\@\@\@Z + * @symbol ?_getResources\@ActorSpawnRuleBase\@\@IEAAXAEAVResourcePackManager\@\@AEBVMobSpawnRules\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVBiomeFilterGroup\@\@AEAVMobSpawnRules\@\@AEBVSemVersion\@\@\@Z\@std\@\@\@Z */ MCAPI void _getResources(class ResourcePackManager &, class MobSpawnRules const &, class std::function); /** - * @symbol ?_readJsonHeader\@ActorSpawnRuleBase\@\@IEAA_N$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@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\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?_readJsonHeader\@ActorSpawnRuleBase\@\@IEAA_N$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@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\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI bool _readJsonHeader(std::string &&, class std::unordered_map, struct std::equal_to, class std::allocator>> &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp b/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp index b95a49f800..0b4618865f 100644 --- a/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ActorSpawnRuleDefinition.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ActorSpawnRuleDefinition. - * - */ -struct ActorSpawnRuleDefinition { + +class ActorSpawnRuleDefinition { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORSPAWNRULEDEFINITION public: - struct ActorSpawnRuleDefinition& operator=(struct ActorSpawnRuleDefinition const &) = delete; - ActorSpawnRuleDefinition(struct ActorSpawnRuleDefinition const &) = delete; + class ActorSpawnRuleDefinition& operator=(class ActorSpawnRuleDefinition const &) = delete; + ActorSpawnRuleDefinition(class ActorSpawnRuleDefinition const &) = delete; ActorSpawnRuleDefinition() = delete; #endif public: /** - * @symbol ??1ActorSpawnRuleDefinition\@\@QEAA\@XZ + * @symbol ??1ActorSpawnRuleDefinition\@\@QEAA\@XZ */ MCAPI ~ActorSpawnRuleDefinition(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp b/LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp index 634b08af1e..d02d15fdb0 100644 --- a/LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp +++ b/LiteLoader/include/llapi/mc/ActorSpawnRuleGroup.hpp @@ -31,49 +31,49 @@ class ActorSpawnRuleGroup { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorSpawnRuleGroup(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRootKey\@ActorSpawnRuleGroup\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRootKey\@ActorSpawnRuleGroup\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRootKey(); /** - * @vftbl 2 - * @symbol ?getFileType\@ActorSpawnRuleGroup\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getFileType\@ActorSpawnRuleGroup\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getFileType(); /** - * @vftbl 3 - * @symbol ?processPopulationControl\@ActorSpawnRuleGroup\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@\@Z + * @vftbl 3 + * @symbol ?processPopulationControl\@ActorSpawnRuleGroup\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@\@Z */ virtual bool processPopulationControl(std::string const &, class Json::Value &); /** - * @vftbl 4 - * @symbol ?readResourceFiles\@ActorSpawnRuleGroup\@\@MEAAXAEAVResourcePackManager\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@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\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?readResourceFiles\@ActorSpawnRuleGroup\@\@MEAAXAEAVResourcePackManager\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@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\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void readResourceFiles(class ResourcePackManager &, class std::unordered_map, struct std::equal_to, class std::allocator>> &); /** - * @symbol ??0ActorSpawnRuleGroup\@\@QEAA\@AEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ??0ActorSpawnRuleGroup\@\@QEAA\@AEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI ActorSpawnRuleGroup(class ResourcePackManager &, class IWorldRegistriesProvider &); /** - * @symbol ?getActorSpawnPool\@ActorSpawnRuleGroup\@\@QEBAHAEBUActorDefinitionIdentifier\@\@\@Z + * @symbol ?getActorSpawnPool\@ActorSpawnRuleGroup\@\@QEBAHAEBUActorDefinitionIdentifier\@\@\@Z */ MCAPI int getActorSpawnPool(struct ActorDefinitionIdentifier const &) const; /** - * @symbol ?getDelayEnd\@ActorSpawnRuleGroup\@\@QEBAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getDelayEnd\@ActorSpawnRuleGroup\@\@QEBAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI int getDelayEnd(std::string const &) const; /** - * @symbol ?offSetDelayByCurrentTick\@ActorSpawnRuleGroup\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?offSetDelayByCurrentTick\@ActorSpawnRuleGroup\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void offSetDelayByCurrentTick(struct Tick const &); /** - * @symbol ?resetDelayEnd\@ActorSpawnRuleGroup\@\@QEAAXVMobSpawnRules\@\@_KAEAVRandom\@\@\@Z + * @symbol ?resetDelayEnd\@ActorSpawnRuleGroup\@\@QEAAXVMobSpawnRules\@\@_KAEAVRandom\@\@\@Z */ MCAPI void resetDelayEnd(class MobSpawnRules, unsigned __int64, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorStandOnBlockEvent.hpp b/LiteLoader/include/llapi/mc/ActorStandOnBlockEvent.hpp index 03db22fdd9..c70fb204dc 100644 --- a/LiteLoader/include/llapi/mc/ActorStandOnBlockEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorStandOnBlockEvent.hpp @@ -25,7 +25,7 @@ struct ActorStandOnBlockEvent { public: /** - * @symbol ??1ActorStandOnBlockEvent\@\@QEAA\@XZ + * @symbol ??1ActorStandOnBlockEvent\@\@QEAA\@XZ */ MCAPI ~ActorStandOnBlockEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorStatus.hpp b/LiteLoader/include/llapi/mc/ActorStatus.hpp index ef1a44fc09..5fdfda5413 100644 --- a/LiteLoader/include/llapi/mc/ActorStatus.hpp +++ b/LiteLoader/include/llapi/mc/ActorStatus.hpp @@ -20,19 +20,19 @@ namespace ActorStatus { #undef AFTER_EXTRA /** - * @symbol ?canDash\@ActorStatus\@\@YA_NAEBVActorStatusProvider\@\@\@Z + * @symbol ?canDash\@ActorStatus\@\@YA_NAEBVActorStatusProvider\@\@\@Z */ MCAPI bool canDash(class ActorStatusProvider const &); /** - * @symbol ?hasDashCooldown\@ActorStatus\@\@YA_NAEBVActorStatusProvider\@\@\@Z + * @symbol ?hasDashCooldown\@ActorStatus\@\@YA_NAEBVActorStatusProvider\@\@\@Z */ MCAPI bool hasDashCooldown(class ActorStatusProvider const &); /** - * @symbol ?setCanDash\@ActorStatus\@\@YAX_NAEAVActorStatusProvider\@\@\@Z + * @symbol ?setCanDash\@ActorStatus\@\@YAX_NAEAVActorStatusProvider\@\@\@Z */ MCAPI void setCanDash(bool, class ActorStatusProvider &); /** - * @symbol ?setHasDashCooldown\@ActorStatus\@\@YAX_NAEAVActorStatusProvider\@\@\@Z + * @symbol ?setHasDashCooldown\@ActorStatus\@\@YAX_NAEAVActorStatusProvider\@\@\@Z */ MCAPI void setHasDashCooldown(bool, class ActorStatusProvider &); diff --git a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp index 0276a570b4..9d3771d82f 100644 --- a/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorStopRidingEventSystem.hpp @@ -28,12 +28,12 @@ class ActorStopRidingEventSystem { public: /** - * @symbol ?createSystem\@ActorStopRidingEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ActorStopRidingEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickSendEvent\@ActorStopRidingEventSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@Z + * @symbol ?tickSendEvent\@ActorStopRidingEventSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@USwitchingVehiclesFlag\@\@\@\@\@\@\@Z */ MCAPI static void tickSendEvent(class StrictEntityContext &, class ActorOwnerComponent &, class Optional const>, class Optional const>, class Optional const>, class Optional const>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp b/LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp index f09a4e2672..5308b954dd 100644 --- a/LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorSurfaceMobTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorSurfaceMobTest. * */ -class ActorSurfaceMobTest : public FilterTest { +class ActorSurfaceMobTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,39 @@ class ActorSurfaceMobTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorSurfaceMobTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorSurfaceMobTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorSurfaceMobTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorSurfaceMobTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorSurfaceMobTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorSynchedData.hpp b/LiteLoader/include/llapi/mc/ActorSynchedData.hpp index d170a1db9d..2205883089 100644 --- a/LiteLoader/include/llapi/mc/ActorSynchedData.hpp +++ b/LiteLoader/include/llapi/mc/ActorSynchedData.hpp @@ -17,71 +17,71 @@ namespace ActorSynchedData { #undef AFTER_EXTRA /** - * @symbol ?updateAction\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateAction\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateAction(class Actor &); /** - * @symbol ?updateAmbientSound\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?updateAmbientSound\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void updateAmbientSound(class EntityContext &); /** - * @symbol ?updateBuoyancyData\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEBVSynchedActorDataEntityWrapper\@\@\@Z + * @symbol ?updateBuoyancyData\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEBVSynchedActorDataEntityWrapper\@\@\@Z */ MCAPI void updateBuoyancyData(class EntityContext &, class SynchedActorDataEntityWrapper const &); /** - * @symbol ?updateCommandBlock\@ActorSynchedData\@\@YAXAEAVActor\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?updateCommandBlock\@ActorSynchedData\@\@YAXAEAVActor\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void updateCommandBlock(class Actor &, int, std::string &); /** - * @symbol ?updateContainer\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateContainer\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateContainer(class Actor &); /** - * @symbol ?updateHasNPC\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateHasNPC\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateHasNPC(class Actor &); /** - * @symbol ?updateHeartbeat\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?updateHeartbeat\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void updateHeartbeat(class EntityContext &); /** - * @symbol ?updateHitbox\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEBVSynchedActorDataEntityWrapper\@\@\@Z + * @symbol ?updateHitbox\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEBVSynchedActorDataEntityWrapper\@\@\@Z */ MCAPI void updateHitbox(class EntityContext &, class SynchedActorDataEntityWrapper const &); /** - * @symbol ?updateInteractText\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateInteractText\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateInteractText(class Actor &); /** - * @symbol ?updateIsBuoyant\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEAVSynchedActorDataEntityWrapper\@\@\@Z + * @symbol ?updateIsBuoyant\@ActorSynchedData\@\@YAXAEAVEntityContext\@\@AEAVSynchedActorDataEntityWrapper\@\@\@Z */ MCAPI void updateIsBuoyant(class EntityContext &, class SynchedActorDataEntityWrapper &); /** - * @symbol ?updateNPCData\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateNPCData\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateNPCData(class Actor &); /** - * @symbol ?updateNameTag\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateNameTag\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateNameTag(class Actor &); /** - * @symbol ?updateRawNameText\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateRawNameText\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateRawNameText(class Actor &); /** - * @symbol ?updateRuntimeID\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateRuntimeID\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateRuntimeID(class Actor &); /** - * @symbol ?updateSize\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z + * @symbol ?updateSize\@ActorSynchedData\@\@YAXAEAVActor\@\@\@Z */ MCAPI void updateSize(class Actor &); /** - * @symbol ?updateTarget\@ActorSynchedData\@\@YAXAEAVActor\@\@AEAUActorUniqueID\@\@\@Z + * @symbol ?updateTarget\@ActorSynchedData\@\@YAXAEAVActor\@\@AEAUActorUniqueID\@\@\@Z */ MCAPI void updateTarget(class Actor &, struct ActorUniqueID &); /** - * @symbol ?updateTintColor\@ActorSynchedData\@\@YAXAEAVColor\@mce\@\@AEBW4PaletteColor\@\@\@Z + * @symbol ?updateTintColor\@ActorSynchedData\@\@YAXAEAVColor\@mce\@\@AEBW4PaletteColor\@\@\@Z */ MCAPI void updateTintColor(class mce::Color &, enum class PaletteColor const &); diff --git a/LiteLoader/include/llapi/mc/ActorTerrainSurface.hpp b/LiteLoader/include/llapi/mc/ActorTerrainSurface.hpp index 52d4708fb4..2b04dae1cc 100644 --- a/LiteLoader/include/llapi/mc/ActorTerrainSurface.hpp +++ b/LiteLoader/include/llapi/mc/ActorTerrainSurface.hpp @@ -17,15 +17,15 @@ namespace ActorTerrainSurface { #undef AFTER_EXTRA /** - * @symbol ?getTerrainSurfaceOffset\@ActorTerrainSurface\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getTerrainSurfaceOffset\@ActorTerrainSurface\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getTerrainSurfaceOffset(class EntityContext const &); /** - * @symbol ?initializeActor\@ActorTerrainSurface\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeActor\@ActorTerrainSurface\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); /** - * @symbol ?setTerrainSurfaceOffset\@ActorTerrainSurface\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setTerrainSurfaceOffset\@ActorTerrainSurface\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setTerrainSurfaceOffset(class EntityContext &, float); diff --git a/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp b/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp index 1c378984a5..fcb65bf8a8 100644 --- a/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp +++ b/LiteLoader/include/llapi/mc/ActorTickNeededComponent.hpp @@ -31,24 +31,24 @@ class ActorTickNeededComponent { public: /** - * @symbol ??0ActorTickNeededComponent\@\@QEAA\@AEAVBlockSource\@\@\@Z + * @symbol ??0ActorTickNeededComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ActorTickNeededComponent(class BlockSource &); + MCAPI ActorTickNeededComponent(class ActorTickNeededComponent &&); /** - * @symbol ??0ActorTickNeededComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ActorTickNeededComponent\@\@QEAA\@AEAVBlockSource\@\@\@Z */ - MCAPI ActorTickNeededComponent(class ActorTickNeededComponent &&); + MCAPI ActorTickNeededComponent(class BlockSource &); /** - * @symbol ?getBlockSource\@ActorTickNeededComponent\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ + * @symbol ?getBlockSource\@ActorTickNeededComponent\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ */ MCAPI class WeakRefT> getBlockSource(); /** - * @symbol ??4ActorTickNeededComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ActorTickNeededComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ActorTickNeededComponent & operator=(class ActorTickNeededComponent &&); /** - * @symbol ??1ActorTickNeededComponent\@\@QEAA\@XZ + * @symbol ??1ActorTickNeededComponent\@\@QEAA\@XZ */ MCAPI ~ActorTickNeededComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorTransform.hpp b/LiteLoader/include/llapi/mc/ActorTransform.hpp index cb58f8b709..d6ee2ff596 100644 --- a/LiteLoader/include/llapi/mc/ActorTransform.hpp +++ b/LiteLoader/include/llapi/mc/ActorTransform.hpp @@ -17,19 +17,19 @@ namespace ActorTransform { #undef AFTER_EXTRA /** - * @symbol ?getRenderPosition\@ActorTransform\@\@YAAEBVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getRenderPosition\@ActorTransform\@\@YAAEBVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 const & getRenderPosition(class EntityContext const &); /** - * @symbol ?getRenderRotation\@ActorTransform\@\@YAAEBVVec2\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getRenderRotation\@ActorTransform\@\@YAAEBVVec2\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec2 const & getRenderRotation(class EntityContext const &); /** - * @symbol ?initializeActor\@ActorTransform\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeActor\@ActorTransform\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeActor(class EntityContext &); /** - * @symbol ?setRenderPosition\@ActorTransform\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z + * @symbol ?setRenderPosition\@ActorTransform\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z */ MCAPI void setRenderPosition(class EntityContext &, class Vec3 const &); diff --git a/LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp b/LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp index ee73ba8d04..537dd45271 100644 --- a/LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorTrustsSubjectTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorTrustsSubjectTest. * */ -class ActorTrustsSubjectTest : public FilterTest { +class ActorTrustsSubjectTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorTrustsSubjectTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorTrustsSubjectTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorTrustsSubjectTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorTrustsSubjectTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorTrustsSubjectTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorTrustsSubjectTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORTRUSTSSUBJECTTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorTrustsSubjectTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorTypeTracker.hpp b/LiteLoader/include/llapi/mc/ActorTypeTracker.hpp deleted file mode 100644 index a2c9bddefb..0000000000 --- a/LiteLoader/include/llapi/mc/ActorTypeTracker.hpp +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file ActorTypeTracker.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 ActorTypeTracker. - * - */ -class ActorTypeTracker { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ACTORTYPETRACKER -public: - class ActorTypeTracker& operator=(class ActorTypeTracker const &) = delete; - ActorTypeTracker(class ActorTypeTracker const &) = delete; -#endif - -public: - /** - * @symbol ??0ActorTypeTracker\@\@QEAA\@XZ - */ - MCAPI ActorTypeTracker(); - /** - * @symbol ?markSeenType\@ActorTypeTracker\@\@QEAAXAEBVActor\@\@\@Z - */ - MCAPI void markSeenType(class Actor const &); - /** - * @symbol ?shouldSendPropertyUpdate\@ActorTypeTracker\@\@QEAA_NAEBVActor\@\@\@Z - */ - MCAPI bool shouldSendPropertyUpdate(class Actor const &); - /** - * @symbol ??1ActorTypeTracker\@\@QEAA\@XZ - */ - MCAPI ~ActorTypeTracker(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp b/LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp index 1f63c27a8f..9c26b57d63 100644 --- a/LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorUndergroundTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorUndergroundTest. * */ -class ActorUndergroundTest : public FilterTest { +class ActorUndergroundTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorUndergroundTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorUndergroundTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorUndergroundTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorUndergroundTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorUndergroundTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorUndergroundTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORUNDERGROUNDTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorUndergroundTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp b/LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp index a42cc0c2ff..9a75e3e473 100644 --- a/LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp +++ b/LiteLoader/include/llapi/mc/ActorUnderwaterTest.hpp @@ -17,7 +17,7 @@ * @brief MC class ActorUnderwaterTest. * */ -class ActorUnderwaterTest : public FilterTest { +class ActorUnderwaterTest { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class ActorUnderwaterTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ActorUnderwaterTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@ActorUnderwaterTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@ActorUnderwaterTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@ActorUnderwaterTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@ActorUnderwaterTest\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ACTORUNDERWATERTEST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ActorUnderwaterTest(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorUniqueID.hpp b/LiteLoader/include/llapi/mc/ActorUniqueID.hpp index 77e7d4f766..3c8d71c2c6 100644 --- a/LiteLoader/include/llapi/mc/ActorUniqueID.hpp +++ b/LiteLoader/include/llapi/mc/ActorUniqueID.hpp @@ -51,7 +51,7 @@ struct ActorUniqueID { public: /** - * @symbol ?INVALID_ID\@ActorUniqueID\@\@2U1\@B + * @symbol ?INVALID_ID\@ActorUniqueID\@\@2U1\@B */ MCAPI static struct ActorUniqueID const INVALID_ID; diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp index c04a86d5f7..d1169424e7 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdatePositionSystem.hpp @@ -28,8 +28,8 @@ class ActorUpdatePositionSystem { public: /** - * @symbol ?createActorUpdatePositionSystem\@ActorUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createActorUpdatePositionSystem\@ActorUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorUpdatePositionSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp index 1472ec347f..2f15b0ffef 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdatePostTickPositionDeltaSystem.hpp @@ -28,8 +28,8 @@ class ActorUpdatePostTickPositionDeltaSystem { public: /** - * @symbol ?createActorUpdatePostTickPositionDeltaSystem\@ActorUpdatePostTickPositionDeltaSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createActorUpdatePostTickPositionDeltaSystem\@ActorUpdatePostTickPositionDeltaSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createActorUpdatePostTickPositionDeltaSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp index 84e2ad016e..54a9fd9faf 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdatePreviousPositionSystem.hpp @@ -30,8 +30,8 @@ class ActorUpdatePreviousPositionSystem { public: /** - * @symbol ?create\@ActorUpdatePreviousPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ActorUpdatePreviousPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp index 92e9223a72..d21cfa3fe7 100644 --- a/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp +++ b/LiteLoader/include/llapi/mc/ActorUpdateRidingIDSystem.hpp @@ -28,24 +28,24 @@ class ActorUpdateRidingIDSystem { public: /** - * @symbol ?createClearPrevRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClearPrevRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClearPrevRidingIDSystem(); /** - * @symbol ?createClearRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClearRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClearRidingIDSystem(); /** - * @symbol ?createUpdatePrevRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createUpdatePrevRidingIDSystem\@ActorUpdateRidingIDSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdatePrevRidingIDSystem(); /** - * @symbol ?tickClearRidingID\@ActorUpdateRidingIDSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPassengerComponent\@\@\@\@\@Z + * @symbol ?tickClearRidingID\@ActorUpdateRidingIDSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPassengerComponent\@\@\@\@\@Z */ MCAPI static void tickClearRidingID(class StrictEntityContext &, struct PassengerComponent const &, class EntityModifierT &); /** - * @symbol ?tickUpdateRidingPrevID\@ActorUpdateRidingIDSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URidingPrevIDComponent\@\@\@\@\@Z + * @symbol ?tickUpdateRidingPrevID\@ActorUpdateRidingIDSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@URidingPrevIDComponent\@\@\@\@\@Z */ MCAPI static void tickUpdateRidingPrevID(class StrictEntityContext &, struct PassengerComponent const &, class ViewT, class EntityModifierT); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ActorUseItemEvent.hpp b/LiteLoader/include/llapi/mc/ActorUseItemEvent.hpp index e0e583aadf..6a297e822f 100644 --- a/LiteLoader/include/llapi/mc/ActorUseItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/ActorUseItemEvent.hpp @@ -25,7 +25,7 @@ struct ActorUseItemEvent { public: /** - * @symbol ??1ActorUseItemEvent\@\@QEAA\@XZ + * @symbol ??1ActorUseItemEvent\@\@QEAA\@XZ */ MCAPI ~ActorUseItemEvent(); diff --git a/LiteLoader/include/llapi/mc/ActorUtil.hpp b/LiteLoader/include/llapi/mc/ActorUtil.hpp index 76a04180d0..2b980f865e 100644 --- a/LiteLoader/include/llapi/mc/ActorUtil.hpp +++ b/LiteLoader/include/llapi/mc/ActorUtil.hpp @@ -22,7 +22,7 @@ namespace ActorUtil { #undef AFTER_EXTRA /** - * @symbol ?startFizzEffect\@ActorUtil\@\@YAXAEAVActor\@\@\@Z + * @symbol ?startFizzEffect\@ActorUtil\@\@YAXAEAVActor\@\@\@Z */ MCAPI void startFizzEffect(class Actor &); diff --git a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp index acbca29f04..683aab0a0b 100644 --- a/LiteLoader/include/llapi/mc/ActorValueValidation.hpp +++ b/LiteLoader/include/llapi/mc/ActorValueValidation.hpp @@ -20,28 +20,36 @@ namespace ActorValueValidation { #undef AFTER_EXTRA /** - * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z + * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z */ - MCAPI void _fireTelemetryEvent(std::string const &, char const *); + MCAPI void _fireTelemetryEvent(class BlockPos const &, char const *); /** - * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z + * @symbol ?_fireTelemetryEvent\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z */ MCAPI void _fireTelemetryEvent(class Vec3 const &, char const *); /** - * @symbol ?isLegalPlayerPosition\@ActorValueValidation\@\@YA_NAEBVVec3\@\@PEBD\@Z + * @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 */ MCAPI bool isLegalPlayerPosition(class Vec3 const &, char const *); /** - * @symbol ?validateBlockPos\@ActorValueValidation\@\@YAXAEBVBlockPos\@\@PEBD\@Z + * @symbol ?validateBlockPos\@ActorValueValidation\@\@YA_NAEBVBlockPos\@\@PEBD\@Z + */ + MCAPI bool validateBlockPos(class BlockPos const &, char const *); + /** + * @symbol ?validateFloatValue\@ActorValueValidation\@\@YA_NMPEBD\@Z */ - MCAPI void validateBlockPos(class BlockPos const &, char const *); + MCAPI bool validateFloatValue(float, char const *); /** - * @symbol ?validateVec3Position\@ActorValueValidation\@\@YAXAEBVVec3\@\@PEBD\@Z + * @symbol ?validateVec2Position\@ActorValueValidation\@\@YA_NAEBVVec2\@\@PEBD\@Z */ - MCAPI void validateVec3Position(class Vec3 const &, char const *); + MCAPI bool validateVec2Position(class Vec2 const &, char const *); /** - * @symbol ?validateYHeadRot\@ActorValueValidation\@\@YAXMPEBD\@Z + * @symbol ?validateVec3Position\@ActorValueValidation\@\@YA_NAEBVVec3\@\@PEBD\@Z */ - MCAPI void validateYHeadRot(float, char const *); + MCAPI bool validateVec3Position(class Vec3 const &, char const *); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp b/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp index a3be1fd667..5422c0cb75 100644 --- a/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorBasePacket.hpp @@ -10,28 +10,11 @@ #undef BEFORE_EXTRA -/** - * @brief MC class AddActorBasePacket. - * - */ -class AddActorBasePacket { + +namespace AddActorBasePacket { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ADDACTORBASEPACKET -public: - class AddActorBasePacket& operator=(class AddActorBasePacket const &) = delete; - AddActorBasePacket(class AddActorBasePacket const &) = delete; - AddActorBasePacket() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDACTORBASEPACKET - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~AddActorBasePacket(); -#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp b/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp index f12ee0092a..c3128192bb 100644 --- a/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp +++ b/LiteLoader/include/llapi/mc/AddActorEntityProxy.hpp @@ -25,23 +25,23 @@ class AddActorEntityProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddActorEntityProxy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeActor\@AddActorEntityProxy\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?initializeActor\@AddActorEntityProxy\@\@UEAAXAEAVActor\@\@\@Z */ virtual void initializeActor(class Actor &); /** - * @vftbl 2 - * @symbol ?reloadActor\@AddActorEntityProxy\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?reloadActor\@AddActorEntityProxy\@\@UEAAXAEAVActor\@\@\@Z */ virtual void reloadActor(class Actor &); /** - * @symbol ??0AddActorEntityProxy\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0AddActorEntityProxy\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI AddActorEntityProxy(class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddActorPacket.hpp b/LiteLoader/include/llapi/mc/AddActorPacket.hpp index 8a06226f0f..34e8dd586f 100644 --- a/LiteLoader/include/llapi/mc/AddActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddActorPacket.hpp @@ -30,37 +30,43 @@ class AddActorPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddActorPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AddActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AddActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AddActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AddActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDACTORPACKET /** - * @symbol ??0AddActorPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AddActorPacket(); + MCVAPI ~AddActorPacket(); +#endif /** - * @symbol ??0AddActorPacket\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0AddActorPacket\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI AddActorPacket(class Actor &); + /** + * @symbol ??0AddActorPacket\@\@QEAA\@XZ + */ + MCAPI AddActorPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp index 77908e9ab5..79bc39555f 100644 --- a/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp +++ b/LiteLoader/include/llapi/mc/AddBehaviorTreePacket.hpp @@ -30,33 +30,33 @@ class AddBehaviorTreePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddBehaviorTreePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddBehaviorTreePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddBehaviorTreePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddBehaviorTreePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddBehaviorTreePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AddBehaviorTreePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AddBehaviorTreePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AddBehaviorTreePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0AddBehaviorTreePacket\@\@QEAA\@XZ + * @symbol ??0AddBehaviorTreePacket\@\@QEAA\@XZ */ MCAPI AddBehaviorTreePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp index 7d51ec9118..72bee3586f 100644 --- a/LiteLoader/include/llapi/mc/AddEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddEntityPacket.hpp @@ -30,27 +30,33 @@ class AddEntityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddEntityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDENTITYPACKET /** - * @symbol ??0AddEntityPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AddEntityPacket(); + MCVAPI ~AddEntityPacket(); +#endif /** - * @symbol ??0AddEntityPacket\@\@QEAA\@AEBVEntityContext\@\@\@Z + * @symbol ??0AddEntityPacket\@\@QEAA\@AEBVEntityContext\@\@\@Z */ MCAPI AddEntityPacket(class EntityContext const &); + /** + * @symbol ??0AddEntityPacket\@\@QEAA\@XZ + */ + MCAPI AddEntityPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp index 03600d3b00..43fcd4cdab 100644 --- a/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddItemActorPacket.hpp @@ -30,37 +30,37 @@ class AddItemActorPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddItemActorPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddItemActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddItemActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddItemActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddItemActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AddItemActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AddItemActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AddItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0AddItemActorPacket\@\@QEAA\@XZ + * @symbol ??0AddItemActorPacket\@\@QEAA\@AEAVItemActor\@\@\@Z */ - MCAPI AddItemActorPacket(); + MCAPI AddItemActorPacket(class ItemActor &); /** - * @symbol ??0AddItemActorPacket\@\@QEAA\@AEAVItemActor\@\@\@Z + * @symbol ??0AddItemActorPacket\@\@QEAA\@XZ */ - MCAPI AddItemActorPacket(class ItemActor &); + MCAPI AddItemActorPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp b/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp index 0575fb07b0..3b72ed4fbb 100644 --- a/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp +++ b/LiteLoader/include/llapi/mc/AddLocalPlayerEntityMovedSystem.hpp @@ -28,8 +28,8 @@ class AddLocalPlayerEntityMovedSystem { public: /** - * @symbol ?createAddLocalPlayerEntityMovedSystem\@AddLocalPlayerEntityMovedSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createAddLocalPlayerEntityMovedSystem\@AddLocalPlayerEntityMovedSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAddLocalPlayerEntityMovedSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddOceanTemperatureOperationNode.hpp b/LiteLoader/include/llapi/mc/AddOceanTemperatureOperationNode.hpp index 07d364f5ae..95d764c78b 100644 --- a/LiteLoader/include/llapi/mc/AddOceanTemperatureOperationNode.hpp +++ b/LiteLoader/include/llapi/mc/AddOceanTemperatureOperationNode.hpp @@ -30,19 +30,19 @@ class AddOceanTemperatureOperationNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddOceanTemperatureOperationNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_fillArea\@AddOceanTemperatureOperationNode\@\@MEBAXAEAV?$WorkingData\@W4BiomeTemperatureCategory\@\@D\@OperationNodeDetails\@\@AEBVPos2d\@\@1\@Z + * @vftbl 3 + * @symbol ?_fillArea\@AddOceanTemperatureOperationNode\@\@MEBAXAEAV?$WorkingData\@W4BiomeTemperatureCategory\@\@D\@OperationNodeDetails\@\@AEBVPos2d\@\@1\@Z */ virtual void _fillArea(class OperationNodeDetails::WorkingData &, class Pos2d const &, class Pos2d const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp index 6e95320238..7db2fcc7df 100644 --- a/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPaintingPacket.hpp @@ -30,37 +30,37 @@ class AddPaintingPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddPaintingPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddPaintingPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddPaintingPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddPaintingPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddPaintingPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AddPaintingPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AddPaintingPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AddPaintingPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0AddPaintingPacket\@\@QEAA\@XZ + * @symbol ??0AddPaintingPacket\@\@QEAA\@XZ */ MCAPI AddPaintingPacket(); /** - * @symbol ??0AddPaintingPacket\@\@QEAA\@AEBVPainting\@\@\@Z + * @symbol ??0AddPaintingPacket\@\@QEAA\@AEBVPainting\@\@\@Z */ MCAPI AddPaintingPacket(class Painting const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp index c490d4dd4b..fa4c9228cb 100644 --- a/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddPlayerPacket.hpp @@ -30,37 +30,43 @@ class AddPlayerPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddPlayerPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddPlayerPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddPlayerPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddPlayerPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddPlayerPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AddPlayerPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AddPlayerPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AddPlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDPLAYERPACKET /** - * @symbol ??0AddPlayerPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AddPlayerPacket(); +#endif + /** + * @symbol ??0AddPlayerPacket\@\@QEAA\@XZ */ MCAPI AddPlayerPacket(); /** - * @symbol ??0AddPlayerPacket\@\@QEAA\@AEAVPlayer\@\@\@Z + * @symbol ??0AddPlayerPacket\@\@QEAA\@AEAVPlayer\@\@\@Z */ MCAPI AddPlayerPacket(class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddRiderComponent.hpp b/LiteLoader/include/llapi/mc/AddRiderComponent.hpp index bc5c698638..25fb77202b 100644 --- a/LiteLoader/include/llapi/mc/AddRiderComponent.hpp +++ b/LiteLoader/include/llapi/mc/AddRiderComponent.hpp @@ -28,12 +28,12 @@ class AddRiderComponent { public: /** - * @symbol ?reloadComponent\@AddRiderComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?reloadComponent\@AddRiderComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void reloadComponent(class Actor &); /** - * @symbol ??1AddRiderComponent\@\@QEAA\@XZ + * @symbol ??1AddRiderComponent\@\@QEAA\@XZ */ MCAPI ~AddRiderComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddRiderDefinition.hpp b/LiteLoader/include/llapi/mc/AddRiderDefinition.hpp index c3080b45f1..f9c70c3f7d 100644 --- a/LiteLoader/include/llapi/mc/AddRiderDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AddRiderDefinition.hpp @@ -29,12 +29,12 @@ class AddRiderDefinition { public: /** - * @symbol ?initialize\@AddRiderDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAddRiderComponent\@\@\@Z + * @symbol ?initialize\@AddRiderDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAddRiderComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AddRiderComponent &) const; /** - * @symbol ?buildSchema\@AddRiderDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAddRiderDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AddRiderDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAddRiderDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp index d13eb61993..a5f60d64de 100644 --- a/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AddVolumeEntityPacket.hpp @@ -31,33 +31,39 @@ class AddVolumeEntityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AddVolumeEntityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AddVolumeEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AddVolumeEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AddVolumeEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AddVolumeEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AddVolumeEntityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AddVolumeEntityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AddVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ADDVOLUMEENTITYPACKET /** - * @symbol ??0AddVolumeEntityPacket\@\@QEAA\@AEBVEntityContext\@\@VCompoundTag\@\@AEBVSemVersion\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AddVolumeEntityPacket(); +#endif + /** + * @symbol ??0AddVolumeEntityPacket\@\@QEAA\@AEBVEntityContext\@\@VCompoundTag\@\@AEBVSemVersion\@\@\@Z */ MCAPI AddVolumeEntityPacket(class EntityContext const &, class CompoundTag, class SemVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AdmireItemComponent.hpp b/LiteLoader/include/llapi/mc/AdmireItemComponent.hpp index a33ac088f0..bddaa1d834 100644 --- a/LiteLoader/include/llapi/mc/AdmireItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/AdmireItemComponent.hpp @@ -30,36 +30,36 @@ class AdmireItemComponent { public: /** - * @symbol ??0AdmireItemComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0AdmireItemComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI AdmireItemComponent(class AdmireItemComponent &&); /** - * @symbol ?getAdmireItem\@AdmireItemComponent\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getAdmireItem\@AdmireItemComponent\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getAdmireItem() const; /** - * @symbol ?getAdmireUntil\@AdmireItemComponent\@\@QEBAAEBUTick\@\@XZ + * @symbol ?getAdmireUntil\@AdmireItemComponent\@\@QEBAAEBUTick\@\@XZ */ MCAPI struct Tick const & getAdmireUntil() const; /** - * @symbol ?getItemOwnerRef\@AdmireItemComponent\@\@QEBA?AVWeakEntityRef\@\@XZ + * @symbol ?getItemOwnerRef\@AdmireItemComponent\@\@QEBA?AVWeakEntityRef\@\@XZ */ MCAPI class WeakEntityRef getItemOwnerRef() const; /** - * @symbol ?isAdmiring\@AdmireItemComponent\@\@QEBA_NXZ + * @symbol ?isAdmiring\@AdmireItemComponent\@\@QEBA_NXZ */ MCAPI bool isAdmiring() const; /** - * @symbol ?onAdmireItemPickedUp\@AdmireItemComponent\@\@QEAAXAEBVActor\@\@AEBVItemStack\@\@PEAV2\@\@Z + * @symbol ?onAdmireItemPickedUp\@AdmireItemComponent\@\@QEAAXAEBVActor\@\@AEBVItemStack\@\@PEAV2\@\@Z */ MCAPI void onAdmireItemPickedUp(class Actor const &, class ItemStack const &, class Actor *); /** - * @symbol ?stopAdmiring\@AdmireItemComponent\@\@QEAAXXZ + * @symbol ?stopAdmiring\@AdmireItemComponent\@\@QEAAXXZ */ MCAPI void stopAdmiring(); /** - * @symbol ??1AdmireItemComponent\@\@QEAA\@XZ + * @symbol ??1AdmireItemComponent\@\@QEAA\@XZ */ MCAPI ~AdmireItemComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp b/LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp index 39421c23f4..d70308af22 100644 --- a/LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AdmireItemDefinition.hpp @@ -31,8 +31,8 @@ class AdmireItemDefinition { public: /** - * @symbol ?buildSchema\@AdmireItemDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAdmireItemDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AdmireItemDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAdmireItemDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AdmireItemGoal.hpp b/LiteLoader/include/llapi/mc/AdmireItemGoal.hpp index 47e8481ee2..cb5a6e5f27 100644 --- a/LiteLoader/include/llapi/mc/AdmireItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/AdmireItemGoal.hpp @@ -30,56 +30,56 @@ class AdmireItemGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AdmireItemGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@AdmireItemGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@AdmireItemGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@AdmireItemGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@AdmireItemGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@AdmireItemGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@AdmireItemGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@AdmireItemGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@AdmireItemGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@AdmireItemGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@AdmireItemGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@AdmireItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@AdmireItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0AdmireItemGoal\@\@QEAA\@AEAVMob\@\@W4LevelSoundEvent\@\@UFloatRange\@\@AEBVActorDefinitionTrigger\@\@3\@Z + * @symbol ??0AdmireItemGoal\@\@QEAA\@AEAVMob\@\@W4LevelSoundEvent\@\@UFloatRange\@\@AEBVActorDefinitionTrigger\@\@3\@Z */ MCAPI AdmireItemGoal(class Mob &, enum class LevelSoundEvent, struct FloatRange, class ActorDefinitionTrigger const &, class ActorDefinitionTrigger const &); //private: /** - * @symbol ?_tryPlaceItemInInventory\@AdmireItemGoal\@\@AEAAXAEAVContainerComponent\@\@AEBVShareableComponent\@\@\@Z + * @symbol ?_tryPlaceItemInInventory\@AdmireItemGoal\@\@AEAAXAEAVContainerComponent\@\@AEBVShareableComponent\@\@\@Z */ MCAPI void _tryPlaceItemInInventory(class ContainerComponent &, class ShareableComponent const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AdventureSettings.hpp b/LiteLoader/include/llapi/mc/AdventureSettings.hpp index 67048671e5..6bcde7d514 100644 --- a/LiteLoader/include/llapi/mc/AdventureSettings.hpp +++ b/LiteLoader/include/llapi/mc/AdventureSettings.hpp @@ -32,7 +32,7 @@ struct AdventureSettings { public: /** - * @symbol ??0AdventureSettings\@\@QEAA\@XZ + * @symbol ??0AdventureSettings\@\@QEAA\@XZ */ MCAPI AdventureSettings(); diff --git a/LiteLoader/include/llapi/mc/AgeableComponent.hpp b/LiteLoader/include/llapi/mc/AgeableComponent.hpp index 019b2b32ab..fc46a9cae1 100644 --- a/LiteLoader/include/llapi/mc/AgeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/AgeableComponent.hpp @@ -30,24 +30,24 @@ class AgeableComponent { public: /** - * @symbol ?addAdditionalSaveData\@AgeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@AgeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getAge\@AgeableComponent\@\@QEBAHXZ + * @symbol ?getAge\@AgeableComponent\@\@QEBAHXZ */ MCAPI int getAge() const; /** - * @symbol ?getInteraction\@AgeableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@AgeableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?readAdditionalSaveData\@AgeableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@AgeableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setAge\@AgeableComponent\@\@QEAAXH\@Z + * @symbol ?setAge\@AgeableComponent\@\@QEAAXH\@Z */ MCAPI void setAge(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgeableDefinition.hpp b/LiteLoader/include/llapi/mc/AgeableDefinition.hpp index c8c06b3849..da7bf8b493 100644 --- a/LiteLoader/include/llapi/mc/AgeableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AgeableDefinition.hpp @@ -31,32 +31,32 @@ class AgeableDefinition { public: /** - * @symbol ?addDropItem\@AgeableDefinition\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?addDropItem\@AgeableDefinition\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void addDropItem(class ItemDescriptor const &); /** - * @symbol ?addFeedItem\@AgeableDefinition\@\@QEAAXAEBUActorDefinitionFeedItem\@\@\@Z + * @symbol ?addFeedItem\@AgeableDefinition\@\@QEAAXAEBUActorDefinitionFeedItem\@\@\@Z */ MCAPI void addFeedItem(struct ActorDefinitionFeedItem const &); /** - * @symbol ?addFeedItemByName\@AgeableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addFeedItemByName\@AgeableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addFeedItemByName(std::string const &); /** - * @symbol ?canGrowUp\@AgeableDefinition\@\@QEBA_NXZ + * @symbol ?canGrowUp\@AgeableDefinition\@\@QEBA_NXZ */ MCAPI bool canGrowUp() const; /** - * @symbol ?getTicksAsBaby\@AgeableDefinition\@\@QEBAHXZ + * @symbol ?getTicksAsBaby\@AgeableDefinition\@\@QEBAHXZ */ MCAPI int getTicksAsBaby() const; /** - * @symbol ?initialize\@AgeableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAgeableComponent\@\@\@Z + * @symbol ?initialize\@AgeableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAgeableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AgeableComponent &) const; /** - * @symbol ?buildSchema\@AgeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAgeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AgeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAgeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgeableSystem.hpp b/LiteLoader/include/llapi/mc/AgeableSystem.hpp index 9b0a9fa6cc..908479741c 100644 --- a/LiteLoader/include/llapi/mc/AgeableSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgeableSystem.hpp @@ -30,19 +30,19 @@ class AgeableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgeableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AgeableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AgeableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Agent.hpp b/LiteLoader/include/llapi/mc/Agent.hpp index 0285bcc09b..ce78a8cda6 100644 --- a/LiteLoader/include/llapi/mc/Agent.hpp +++ b/LiteLoader/include/llapi/mc/Agent.hpp @@ -32,338 +32,342 @@ class Agent : public Mob { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Agent\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Agent\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Agent(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 44 - * @symbol ?teleportTo\@Agent\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@Agent\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 - * @symbol ?normalTick\@Agent\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Agent\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 60 - * @symbol ?isInvisible\@Agent\@\@UEBA_NXZ + * @vftbl 60 + * @symbol ?isInvisible\@Agent\@\@UEBA_NXZ */ virtual bool isInvisible() const; /** - * @vftbl 61 - * @symbol ?canShowNameTag\@Agent\@\@UEBA_NXZ + * @vftbl 61 + * @symbol ?canShowNameTag\@Agent\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 66 - * @symbol ?getFormattedNameTag\@Agent\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 66 + * @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 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@Agent\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Agent\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 119 + * @symbol ?setOwner\@Agent\@\@UEAAXUActorUniqueID\@\@\@Z */ - virtual void __unk_vfn_112(); + virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Agent\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Agent\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 159 - * @symbol ?setCarriedItem\@Agent\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 158 + * @symbol ?setCarriedItem\@Agent\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Agent\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Agent\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 208 - * @symbol ?canBeAffected\@Agent\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@Agent\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 223 - * @symbol ?isWorldBuilder\@Agent\@\@UEBA_NXZ + * @vftbl 222 + * @symbol ?isWorldBuilder\@Agent\@\@UEBA_NXZ */ virtual bool isWorldBuilder() const; /** - * @vftbl 225 - * @symbol ?isAdventure\@Agent\@\@UEBA_NXZ + * @vftbl 224 + * @symbol ?isAdventure\@Agent\@\@UEBA_NXZ */ virtual bool isAdventure() const; /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 245 - * @symbol ?kill\@Agent\@\@UEAAXXZ + * @vftbl 244 + * @symbol ?kill\@Agent\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Agent\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Agent\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Agent\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Agent\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?knockback\@Agent\@\@UEAAXPEAVActor\@\@HMMMMM\@Z + * @vftbl 276 + * @symbol ?knockback\@Agent\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 286 + * @symbol ?travel\@Agent\@\@UEAAXMMM_N\@Z */ - virtual void __unk_vfn_285(); + virtual void travel(float, float, float, bool); /** - * @vftbl 289 - * @symbol ?travel\@Agent\@\@UEAAXMMM\@Z - */ - virtual void travel(float, float, float); - /** - * @vftbl 291 - * @symbol ?aiStep\@Agent\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Agent\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 334 - * @symbol ?createAIGoals\@Agent\@\@UEAA_NXZ + * @vftbl 331 + * @symbol ?createAIGoals\@Agent\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 341 - * @symbol ?canExistWhenDisallowMob\@Agent\@\@UEBA_NXZ + * @vftbl 338 + * @symbol ?canExistWhenDisallowMob\@Agent\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 346 - * @symbol ?initBodyControl\@Agent\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ + * @vftbl 343 + * @symbol ?initBodyControl\@Agent\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AGENT /** - * @symbol ?breaksFallingBlocks\@Agent\@\@UEBA_NXZ + * @symbol ?breaksFallingBlocks\@Agent\@\@UEBA_NXZ */ MCVAPI bool breaksFallingBlocks() const; /** - * @symbol ?getAlwaysShowNameTag\@Agent\@\@UEBA_NXZ + * @symbol ?getAlwaysShowNameTag\@Agent\@\@UEBA_NXZ */ MCVAPI bool getAlwaysShowNameTag() const; /** - * @symbol ?interactPreventDefault\@Agent\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@Agent\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); /** - * @symbol ?isTargetable\@Agent\@\@UEBA_NXZ + * @symbol ?isTargetable\@Agent\@\@UEBA_NXZ */ MCVAPI bool isTargetable() const; #endif /** - * @symbol ??0Agent\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Agent\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Agent(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?checkTravelType\@Agent\@\@QEAA?AW4AgentTravelType\@\@XZ + * @symbol ?checkTravelType\@Agent\@\@QEAA?AW4AgentTravelType\@\@XZ */ MCAPI enum class AgentTravelType checkTravelType(); /** - * @symbol ?doClientTravel\@Agent\@\@QEAAXAEBVAABB\@\@\@Z + * @symbol ?doClientTravel\@Agent\@\@QEAAXAEBVAABB\@\@\@Z */ MCAPI void doClientTravel(class AABB const &); /** - * @symbol ?doServerTravel\@Agent\@\@QEAA?AVVec3\@\@AEBVAABB\@\@W4AgentTravelType\@\@\@Z + * @symbol ?doServerTravel\@Agent\@\@QEAA?AVVec3\@\@AEBVAABB\@\@W4AgentTravelType\@\@\@Z */ MCAPI class Vec3 doServerTravel(class AABB const &, enum class AgentTravelType); /** - * @symbol ?getMoveSpeedScalar\@Agent\@\@QEBAMXZ + * @symbol ?getMoveSpeedScalar\@Agent\@\@QEBAMXZ */ MCAPI float getMoveSpeedScalar() const; /** - * @symbol ?getSelectedSlot\@Agent\@\@QEBAHXZ + * @symbol ?getSelectedSlot\@Agent\@\@QEBAHXZ */ MCAPI int getSelectedSlot() const; /** - * @symbol ?isValidSlotNum\@Agent\@\@QEAA_NH\@Z + * @symbol ?isValidSlotNum\@Agent\@\@QEAA_NH\@Z */ MCAPI bool isValidSlotNum(int); /** - * @symbol ?setMoveTarget\@Agent\@\@QEAAXM\@Z + * @symbol ?setGameType\@Agent\@\@QEAAXW4GameType\@\@\@Z + */ + MCAPI void setGameType(enum class GameType); + /** + * @symbol ?setMoveTarget\@Agent\@\@QEAAXM\@Z */ MCAPI void setMoveTarget(float); /** - * @symbol ?setMoveTarget\@Agent\@\@QEAAXVVec2\@\@\@Z + * @symbol ?setMoveTarget\@Agent\@\@QEAAXVVec2\@\@\@Z */ MCAPI void setMoveTarget(class Vec2); /** - * @symbol ?setNameTagFromOwner\@Agent\@\@QEAAXAEBVPlayer\@\@\@Z + * @symbol ?setNameTagFromOwner\@Agent\@\@QEAAXAEBVPlayer\@\@\@Z */ MCAPI void setNameTagFromOwner(class Player const &); /** - * @symbol ?startCommandMode\@Agent\@\@QEAAXXZ + * @symbol ?startCommandMode\@Agent\@\@QEAAXXZ */ MCAPI void startCommandMode(); /** - * @symbol ?stopCommandMode\@Agent\@\@QEAAXXZ + * @symbol ?stopCommandMode\@Agent\@\@QEAAXXZ */ MCAPI void stopCommandMode(); /** - * @symbol ?swingAnimationCompleted\@Agent\@\@QEAA_NXZ + * @symbol ?swingAnimationCompleted\@Agent\@\@QEAA_NXZ */ MCAPI bool swingAnimationCompleted(); /** - * @symbol ?swingArm\@Agent\@\@QEAAXXZ + * @symbol ?swingArm\@Agent\@\@QEAAXXZ */ MCAPI void swingArm(); /** - * @symbol ?tryFireCreateEvent\@Agent\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?tryFireCreateEvent\@Agent\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void tryFireCreateEvent(class Player &); /** - * @symbol ?roundTeleportPos\@Agent\@\@SA?AVVec3\@\@AEBV2\@\@Z + * @symbol ?roundTeleportPos\@Agent\@\@SA?AVVec3\@\@AEBV2\@\@Z */ MCAPI static class Vec3 roundTeleportPos(class Vec3 const &); /** - * @symbol ?tryGetFromEntity\@Agent\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Agent\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class Agent * tryGetFromEntity(class EntityContext &, bool); //private: /** - * @symbol ?_isOnGround\@Agent\@\@AEAA_NAEBVAABB\@\@\@Z + * @symbol ?_isOnGround\@Agent\@\@AEAA_NAEBVAABB\@\@\@Z */ MCAPI bool _isOnGround(class AABB const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentAbilitiesHelper.hpp b/LiteLoader/include/llapi/mc/AgentAbilitiesHelper.hpp new file mode 100644 index 0000000000..ba77d89e94 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentAbilitiesHelper.hpp @@ -0,0 +1,24 @@ +/** + * @file AgentAbilitiesHelper.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace AgentAbilitiesHelper { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?updateAbilities\@AgentAbilitiesHelper\@\@YAXAEBVLayeredAbilities\@\@AEBV?$optional\@_N\@std\@\@AEAV2\@\@Z + */ + MCAPI void updateAbilities(class LayeredAbilities const &, class std::optional const &, class LayeredAbilities &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/AgentAbilitiesSyncSystem.hpp b/LiteLoader/include/llapi/mc/AgentAbilitiesSyncSystem.hpp new file mode 100644 index 0000000000..548dfa6fc4 --- /dev/null +++ b/LiteLoader/include/llapi/mc/AgentAbilitiesSyncSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file AgentAbilitiesSyncSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AgentAbilitiesSyncSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AGENTABILITIESSYNCSYSTEM +public: + class AgentAbilitiesSyncSystem& operator=(class AgentAbilitiesSyncSystem const &) = delete; + AgentAbilitiesSyncSystem(class AgentAbilitiesSyncSystem const &) = delete; + AgentAbilitiesSyncSystem() = delete; +#endif + +public: + /** + * @symbol ?createAgentAbilitiesSyncSystem\@AgentAbilitiesSyncSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAgentAbilitiesSyncSystem(); + /** + * @symbol ?tick\@AgentAbilitiesSyncSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VActorOwnerComponent\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@U?$Include\@$$CBV?$FlagComponent\@UActorTickedFlag\@\@\@\@V?$FlagComponent\@UAbilitiesDirtyFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VLevelComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UAbilitiesDirtyFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void tick(class ViewT, struct Include const, class FlagComponent>>, class ViewT, class EntityModifierT>); + +}; diff --git a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp index 5a9d6376e5..0062b54772 100644 --- a/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/AgentActionEventPacket.hpp @@ -29,37 +29,43 @@ class AgentActionEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentActionEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AgentActionEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AgentActionEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AgentActionEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AgentActionEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AgentActionEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AgentActionEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AgentActionEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_AGENTACTIONEVENTPACKET /** - * @symbol ??0AgentActionEventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AgentActionEventPacket(); + MCVAPI ~AgentActionEventPacket(); +#endif /** - * @symbol ??0AgentActionEventPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4AgentActionType\@\@AEBVValue\@Json\@\@\@Z + * @symbol ??0AgentActionEventPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4AgentActionType\@\@AEBVValue\@Json\@\@\@Z */ MCAPI AgentActionEventPacket(std::string const &, enum class AgentActionType, class Json::Value const &); + /** + * @symbol ??0AgentActionEventPacket\@\@QEAA\@XZ + */ + MCAPI AgentActionEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentBodyControl.hpp b/LiteLoader/include/llapi/mc/AgentBodyControl.hpp index f5c42caef4..e6ac8601ac 100644 --- a/LiteLoader/include/llapi/mc/AgentBodyControl.hpp +++ b/LiteLoader/include/llapi/mc/AgentBodyControl.hpp @@ -29,18 +29,18 @@ class AgentBodyControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentBodyControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?clientTick\@AgentBodyControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?clientTick\@AgentBodyControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void clientTick(class Mob &); /** - * @symbol ??0AgentBodyControl\@\@QEAA\@XZ + * @symbol ??0AgentBodyControl\@\@QEAA\@XZ */ MCAPI AgentBodyControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentCommand.hpp b/LiteLoader/include/llapi/mc/AgentCommand.hpp index 0e79188012..4f6c80ce88 100644 --- a/LiteLoader/include/llapi/mc/AgentCommand.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommand.hpp @@ -31,66 +31,62 @@ class AgentCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@AgentCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@AgentCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@AgentCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@AgentCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?collect\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z - */ - MCAPI void collect(class CommandOrigin const &, class CommandOutput &) const; - /** - * @symbol ?createAgent\@AgentCommand\@\@AEBAXAEAVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?createAgent\@AgentCommand\@\@AEBAXAEAVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void createAgent(class Player &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?createAgentOutputSuccess\@AgentCommand\@\@AEBAXAEAVCommandOutput\@\@_N\@Z + * @symbol ?createAgentOutputSuccess\@AgentCommand\@\@AEBAXAEAVCommandOutput\@\@_N\@Z */ MCAPI void createAgentOutputSuccess(class CommandOutput &, bool) const; /** - * @symbol ?directionCommand\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?directionCommand\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void directionCommand(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?getPosition\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?getPosition\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void getPosition(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?itemCommand\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?itemCommand\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void itemCommand(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?place\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?place\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void place(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?reportSuccess\@AgentCommand\@\@AEBAX_NAEAVCommandOutput\@\@\@Z + * @symbol ?reportSuccess\@AgentCommand\@\@AEBAX_NAEAVCommandOutput\@\@\@Z */ MCAPI void reportSuccess(bool, class CommandOutput &) const; /** - * @symbol ?setAgentOwner\@AgentCommand\@\@AEBAXAEAVAgent\@\@AEAVPlayer\@\@\@Z + * @symbol ?setAgentOwner\@AgentCommand\@\@AEBAXAEAVAgent\@\@AEAVPlayer\@\@\@Z */ MCAPI void setAgentOwner(class Agent &, class Player &) const; /** - * @symbol ?setItem\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?setItem\@AgentCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void setItem(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?tpAgent\@AgentCommand\@\@AEBAXAEAVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?tpAgent\@AgentCommand\@\@AEBAXAEAVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void tpAgent(class Player &, class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentCommandComponent.hpp b/LiteLoader/include/llapi/mc/AgentCommandComponent.hpp index e744d4a401..f22e4cf68a 100644 --- a/LiteLoader/include/llapi/mc/AgentCommandComponent.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommandComponent.hpp @@ -29,24 +29,24 @@ class AgentCommandComponent { public: /** - * @symbol ??0AgentCommandComponent\@\@QEAA\@XZ + * @symbol ??0AgentCommandComponent\@\@QEAA\@XZ */ MCAPI AgentCommandComponent(); /** - * @symbol ?addCommand\@AgentCommandComponent\@\@QEAA_NV?$unique_ptr\@VCommand\@AgentCommands\@\@U?$default_delete\@VCommand\@AgentCommands\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addCommand\@AgentCommandComponent\@\@QEAA_NV?$unique_ptr\@VCommand\@AgentCommands\@\@U?$default_delete\@VCommand\@AgentCommands\@\@\@std\@\@\@std\@\@\@Z */ MCAPI bool addCommand(std::unique_ptr); /** - * @symbol ?getCurrentCommand\@AgentCommandComponent\@\@QEBAAEBV?$unique_ptr\@VCommand\@AgentCommands\@\@U?$default_delete\@VCommand\@AgentCommands\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getCurrentCommand\@AgentCommandComponent\@\@QEBAAEBV?$unique_ptr\@VCommand\@AgentCommands\@\@U?$default_delete\@VCommand\@AgentCommands\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr const & getCurrentCommand() const; /** - * @symbol ?initFromDefinition\@AgentCommandComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@AgentCommandComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?setCurrentCommand\@AgentCommandComponent\@\@QEAAXV?$unique_ptr\@VCommand\@AgentCommands\@\@U?$default_delete\@VCommand\@AgentCommands\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setCurrentCommand\@AgentCommandComponent\@\@QEAAXV?$unique_ptr\@VCommand\@AgentCommands\@\@U?$default_delete\@VCommand\@AgentCommands\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setCurrentCommand(std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp b/LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp index 214c4cbbb8..fe480aeba7 100644 --- a/LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommandExecutionGoal.hpp @@ -30,48 +30,48 @@ class AgentCommandExecutionGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentCommandExecutionGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@AgentCommandExecutionGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@AgentCommandExecutionGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@AgentCommandExecutionGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@AgentCommandExecutionGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@AgentCommandExecutionGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@AgentCommandExecutionGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@AgentCommandExecutionGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@AgentCommandExecutionGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@AgentCommandExecutionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@AgentCommandExecutionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0AgentCommandExecutionGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0AgentCommandExecutionGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI AgentCommandExecutionGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp b/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp index f7e798ed1e..13f78b1a27 100644 --- a/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommandHelper.hpp @@ -20,7 +20,7 @@ namespace AgentCommandHelper { #undef AFTER_EXTRA /** - * @symbol ?isInRange\@AgentCommandHelper\@\@YA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVAgent\@\@\@Z + * @symbol ?isInRange\@AgentCommandHelper\@\@YA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVAgent\@\@\@Z */ MCAPI bool isInRange(class CommandOrigin const &, class CommandOutput &, class Player &, class Agent &); diff --git a/LiteLoader/include/llapi/mc/AgentCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentCommandSystem.hpp index 320d02b615..0a6f371502 100644 --- a/LiteLoader/include/llapi/mc/AgentCommandSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentCommandSystem.hpp @@ -30,35 +30,35 @@ class AgentCommandSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentCommandSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AgentCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AgentCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?cleanUp\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@M\@Z + * @symbol ?cleanUp\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@M\@Z */ MCAPI static void cleanUp(class EntityContext &, float); /** - * @symbol ?initialize\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@\@Z */ MCAPI static void initialize(class EntityContext &); /** - * @symbol ?tickAgentCooldown\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVCommandCooldown\@AgentComponents\@\@\@Z + * @symbol ?tickAgentCooldown\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVCommandCooldown\@AgentComponents\@\@\@Z */ MCAPI static void tickAgentCooldown(class EntityContext &, class AgentComponents::CommandCooldown &); /** - * @symbol ?tickLegacy\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVAgentCommandComponent\@\@\@Z + * @symbol ?tickLegacy\@AgentCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVAgentCommandComponent\@\@\@Z */ MCAPI static void tickLegacy(class EntityContext &, class AgentCommandComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentDetectCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentDetectCommandSystem.hpp index 870efbf5a7..93aef83598 100644 --- a/LiteLoader/include/llapi/mc/AgentDetectCommandSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentDetectCommandSystem.hpp @@ -28,27 +28,27 @@ class AgentDetectCommandSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentDetectCommandSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AgentDetectCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AgentDetectCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?initializeObstacle\@AgentDetectCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVDetectObstacle\@AgentComponents\@\@\@Z + * @symbol ?initializeObstacle\@AgentDetectCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVDetectObstacle\@AgentComponents\@\@\@Z */ MCAPI static void initializeObstacle(class EntityContext &, class AgentComponents::DetectObstacle &); /** - * @symbol ?initializeRedstone\@AgentDetectCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVDetectRedstone\@AgentComponents\@\@\@Z + * @symbol ?initializeRedstone\@AgentDetectCommandSystem\@\@SAXAEAVEntityContext\@\@AEAVDetectRedstone\@AgentComponents\@\@\@Z */ MCAPI static void initializeRedstone(class EntityContext &, class AgentComponents::DetectRedstone &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentLookControl.hpp b/LiteLoader/include/llapi/mc/AgentLookControl.hpp index 2b49abd3a8..98a82e395f 100644 --- a/LiteLoader/include/llapi/mc/AgentLookControl.hpp +++ b/LiteLoader/include/llapi/mc/AgentLookControl.hpp @@ -29,27 +29,27 @@ class AgentLookControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentLookControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@AgentLookControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@AgentLookControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void initializeInternal(class Mob &); /** - * @vftbl 2 - * @symbol ?tick\@AgentLookControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AgentLookControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void tick(class Mob &); /** - * @symbol ??0AgentLookControl\@\@QEAA\@XZ + * @symbol ??0AgentLookControl\@\@QEAA\@XZ */ MCAPI AgentLookControl(); /** - * @symbol ?sBaseYMax\@AgentLookControl\@\@2MA + * @symbol ?sBaseYMax\@AgentLookControl\@\@2MA */ MCAPI static float sBaseYMax; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentMoveCommandSystem.hpp b/LiteLoader/include/llapi/mc/AgentMoveCommandSystem.hpp index 7ffc5df846..313f645013 100644 --- a/LiteLoader/include/llapi/mc/AgentMoveCommandSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentMoveCommandSystem.hpp @@ -28,31 +28,31 @@ class AgentMoveCommandSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AgentMoveCommandSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AgentMoveCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AgentMoveCommandSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?cleanUp\@AgentMoveCommandSystem\@\@SAXAEAVEntityContext\@\@M\@Z + * @symbol ?cleanUp\@AgentMoveCommandSystem\@\@SAXAEAVEntityContext\@\@M\@Z */ MCAPI static void cleanUp(class EntityContext &, float); /** - * @symbol ?initialize\@AgentMoveCommandSystem\@\@SAXAEAVEntityContext\@\@AEAUActionDetails\@AgentComponents\@\@AEAVMove\@4\@\@Z + * @symbol ?initialize\@AgentMoveCommandSystem\@\@SAXAEAVEntityContext\@\@AEAUActionDetails\@AgentComponents\@\@AEAVMove\@4\@\@Z */ MCAPI static void initialize(class EntityContext &, struct AgentComponents::ActionDetails &, class AgentComponents::Move &); /** - * @symbol ?tickMove\@AgentMoveCommandSystem\@\@SAXAEAVEntityContext\@\@AEAUActionDetails\@AgentComponents\@\@AEAVMove\@4\@\@Z + * @symbol ?tickMove\@AgentMoveCommandSystem\@\@SAXAEAVEntityContext\@\@AEAUActionDetails\@AgentComponents\@\@AEAVMove\@4\@\@Z */ MCAPI static void tickMove(class EntityContext &, struct AgentComponents::ActionDetails &, class AgentComponents::Move &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp b/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp index e65f1f5c80..62b1693299 100644 --- a/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/AgentTravelSystem.hpp @@ -25,24 +25,24 @@ class AgentTravelSystem { public: /** - * @symbol ?createClientSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientSystem(); /** - * @symbol ?createServerSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerSystem\@AgentTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createServerSystem(); //private: /** - * @symbol ?_doClientAgentTravelSystem\@AgentTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doClientAgentTravelSystem\@AgentTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doClientAgentTravelSystem(class StrictEntityContext const &, class ActorMovementProxyComponent &, class ActorOwnerComponent &); /** - * @symbol ?_doServerAgentTravelSystem\@AgentTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAVActorOwnerComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + * @symbol ?_doServerAgentTravelSystem\@AgentTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@AEAVActorOwnerComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z */ MCAPI static void _doServerAgentTravelSystem(class StrictEntityContext const &, class ActorMovementProxyComponent &, class ActorOwnerComponent &, struct StateVectorComponent &, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AirBlock.hpp b/LiteLoader/include/llapi/mc/AirBlock.hpp index 291cf849cb..98617be844 100644 --- a/LiteLoader/include/llapi/mc/AirBlock.hpp +++ b/LiteLoader/include/llapi/mc/AirBlock.hpp @@ -31,293 +31,298 @@ class AirBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AirBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@AirBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@AirBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 6 - * @symbol ?isObstructingChests\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 6 + * @symbol ?isObstructingChests\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 9 - * @symbol ?addAABBs\@AirBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@AirBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@AirBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@AirBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@AirBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 89 - * @symbol ?mayPick\@AirBlock\@\@UEBA_NXZ + * @vftbl 89 + * @symbol ?mayPick\@AirBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 90 - * @symbol ?mayPick\@AirBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z + * @vftbl 90 + * @symbol ?mayPick\@AirBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 - * @symbol ?tryToPlace\@AirBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z + * @vftbl 94 + * @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 - * @symbol ?destroy\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @vftbl 97 + * @symbol ?destroy\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@AirBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@AirBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 143 - * @symbol ?getVisualShape\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@AirBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 - * @symbol ?animateTick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@AirBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AIRBLOCK /** - * @symbol ?canBeSilkTouched\@AirBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@AirBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?canHaveExtraData\@AirBlock\@\@UEBA_NXZ + * @symbol ?canHaveExtraData\@AirBlock\@\@UEBA_NXZ */ MCVAPI bool canHaveExtraData() const; #endif /** - * @symbol ??0AirBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0AirBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI AirBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AirBlockItem.hpp b/LiteLoader/include/llapi/mc/AirBlockItem.hpp index 155cdbf115..b3ed0f5091 100644 --- a/LiteLoader/include/llapi/mc/AirBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AirBlockItem.hpp @@ -32,74 +32,74 @@ class AirBlockItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AirBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AirTravelSystem.hpp b/LiteLoader/include/llapi/mc/AirTravelSystem.hpp new file mode 100644 index 0000000000..c00cea6a6b --- /dev/null +++ b/LiteLoader/include/llapi/mc/AirTravelSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file AirTravelSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class AirTravelSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_AIRTRAVELSYSTEM +public: + class AirTravelSystem& operator=(class AirTravelSystem const &) = delete; + AirTravelSystem(class AirTravelSystem const &) = delete; + AirTravelSystem() = delete; +#endif + +public: + /** + * @symbol ?createAirTravelSystem\@AirTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAirTravelSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/AliasInfoDescription.hpp b/LiteLoader/include/llapi/mc/AliasInfoDescription.hpp index 8311521988..39e52298ed 100644 --- a/LiteLoader/include/llapi/mc/AliasInfoDescription.hpp +++ b/LiteLoader/include/llapi/mc/AliasInfoDescription.hpp @@ -21,17 +21,20 @@ struct AliasInfoDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ALIASINFODESCRIPTION public: - struct AliasInfoDescription& operator=(struct AliasInfoDescription const &) = delete; AliasInfoDescription() = delete; #endif public: /** - * @symbol ??0AliasInfoDescription\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0AliasInfoDescription\@\@QEAA\@AEBU0\@\@Z */ MCAPI AliasInfoDescription(struct AliasInfoDescription const &); /** - * @symbol ??1AliasInfoDescription\@\@QEAA\@XZ + * @symbol ??4AliasInfoDescription\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct AliasInfoDescription & operator=(struct AliasInfoDescription const &); + /** + * @symbol ??1AliasInfoDescription\@\@QEAA\@XZ */ MCAPI ~AliasInfoDescription(); diff --git a/LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp b/LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp index 8b6b957c81..eab4d4f53d 100644 --- a/LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp +++ b/LiteLoader/include/llapi/mc/AllWorkerConfigurations.hpp @@ -27,8 +27,8 @@ class AllWorkerConfigurations { public: /** - * @symbol ??0AllWorkerConfigurations\@\@QEAA\@XZ + * @symbol ??0AllWorkerConfigurations\@\@QEAA\@XZ */ MCAPI AllWorkerConfigurations(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Allay.hpp b/LiteLoader/include/llapi/mc/Allay.hpp index e5c7266a6f..bae37780ad 100644 --- a/LiteLoader/include/llapi/mc/Allay.hpp +++ b/LiteLoader/include/llapi/mc/Allay.hpp @@ -30,166 +30,161 @@ class Allay : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Allay\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Allay\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Allay(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Allay\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Allay\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Allay\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Allay\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@Allay\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Allay\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Allay\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Allay\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Allay(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?hasDuplicationCooldown\@Allay\@\@QEAA_NXZ + * @symbol ?hasDuplicationCooldown\@Allay\@\@QEAA_NXZ */ MCAPI bool hasDuplicationCooldown(); /** - * @symbol ?setNewDuplicationCooldown\@Allay\@\@QEAAXXZ + * @symbol ?setNewDuplicationCooldown\@Allay\@\@QEAAXXZ */ MCAPI void setNewDuplicationCooldown(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp index 67cd1c7d9b..8cfdc748f6 100644 --- a/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/AllayVibrationConfig.hpp @@ -28,58 +28,58 @@ class AllayVibrationConfig { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AllayVibrationConfig(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onSignalReceive\@AllayVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @vftbl 1 + * @symbol ?onSignalReceive\@AllayVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z */ virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); /** - * @vftbl 2 - * @symbol ?isValidVibration\@AllayVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z + * @vftbl 2 + * @symbol ?isValidVibration\@AllayVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z */ virtual bool isValidVibration(class GameEvent const &); /** - * @vftbl 3 - * @symbol ?shouldListen\@AllayVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + * @vftbl 3 + * @symbol ?shouldListen\@AllayVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @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 + * @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 + * @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 ??0AllayVibrationConfig\@\@QEAA\@AEAVActor\@\@G\@Z + * @symbol ??0AllayVibrationConfig\@\@QEAA\@AEAVActor\@\@G\@Z */ MCAPI AllayVibrationConfig(class Actor &, unsigned short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AllowList.hpp b/LiteLoader/include/llapi/mc/AllowList.hpp index 5258277b3b..1efd549bf0 100644 --- a/LiteLoader/include/llapi/mc/AllowList.hpp +++ b/LiteLoader/include/llapi/mc/AllowList.hpp @@ -31,47 +31,47 @@ class AllowList { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AllowList(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?serialize\@AllowList\@\@UEAAXAEAVValue\@Json\@\@\@Z + * @vftbl 1 + * @symbol ?serialize\@AllowList\@\@UEAAXAEAVValue\@Json\@\@\@Z */ virtual void serialize(class Json::Value &); /** - * @vftbl 2 - * @symbol ?deserialize\@AllowList\@\@UEAAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?deserialize\@AllowList\@\@UEAAXAEAVValue\@Json\@\@\@Z */ virtual void deserialize(class Json::Value &); /** - * @symbol ??0AllowList\@\@QEAA\@V?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ??0AllowList\@\@QEAA\@V?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI AllowList(class std::function); /** - * @symbol ?addEntry\@AllowList\@\@QEAA_NAEBVAllowListEntry\@\@\@Z + * @symbol ?addEntry\@AllowList\@\@QEAA_NAEBVAllowListEntry\@\@\@Z */ MCAPI bool addEntry(class AllowListEntry const &); /** - * @symbol ?getEntries\@AllowList\@\@QEBAAEBV?$vector\@VAllowListEntry\@\@V?$allocator\@VAllowListEntry\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getEntries\@AllowList\@\@QEBAAEBV?$vector\@VAllowListEntry\@\@V?$allocator\@VAllowListEntry\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getEntries() const; /** - * @symbol ?isAllowed\@AllowList\@\@QEBA_NAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isAllowed\@AllowList\@\@QEBA_NAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isAllowed(class mce::UUID const &, std::string const &) const; /** - * @symbol ?isIgnoringPlayerLimit\@AllowList\@\@QEBA_NAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isIgnoringPlayerLimit\@AllowList\@\@QEBA_NAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isIgnoringPlayerLimit(class mce::UUID const &, std::string const &) const; /** - * @symbol ?removeByName\@AllowList\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeByName\@AllowList\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool removeByName(std::string const &); /** - * @symbol ?tryUpdateEntries\@AllowList\@\@QEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ?tryUpdateEntries\@AllowList\@\@QEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI void tryUpdateEntries(class mce::UUID const &, std::string const &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AllowListCommand.hpp b/LiteLoader/include/llapi/mc/AllowListCommand.hpp index c247d05a97..c68e710449 100644 --- a/LiteLoader/include/llapi/mc/AllowListCommand.hpp +++ b/LiteLoader/include/llapi/mc/AllowListCommand.hpp @@ -29,17 +29,17 @@ class AllowListCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AllowListCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@AllowListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@AllowListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@AllowListCommand\@\@SAXAEAVCommandRegistry\@\@AEAVAllowListFile\@\@\@Z + * @symbol ?setup\@AllowListCommand\@\@SAXAEAVCommandRegistry\@\@AEAVAllowListFile\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class AllowListFile &); @@ -47,8 +47,8 @@ class AllowListCommand : public Command { private: /** - * @symbol ?mAllowListFile\@AllowListCommand\@\@0PEAVAllowListFile\@\@EA + * @symbol ?mAllowListFile\@AllowListCommand\@\@0PEAVAllowListFile\@\@EA */ MCAPI static class AllowListFile * mAllowListFile; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AllowListEntry.hpp b/LiteLoader/include/llapi/mc/AllowListEntry.hpp index 3183e899f8..2a049a66b4 100644 --- a/LiteLoader/include/llapi/mc/AllowListEntry.hpp +++ b/LiteLoader/include/llapi/mc/AllowListEntry.hpp @@ -31,27 +31,33 @@ class AllowListEntry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AllowListEntry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?serialize\@AllowListEntry\@\@UEAAXAEAVValue\@Json\@\@\@Z + * @vftbl 1 + * @symbol ?serialize\@AllowListEntry\@\@UEAAXAEAVValue\@Json\@\@\@Z */ virtual void serialize(class Json::Value &); /** - * @vftbl 2 - * @symbol ?deserialize\@AllowListEntry\@\@UEAAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?deserialize\@AllowListEntry\@\@UEAAXAEAVValue\@Json\@\@\@Z */ virtual void deserialize(class Json::Value &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ALLOWLISTENTRY /** - * @symbol ??0AllowListEntry\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI AllowListEntry(std::string); + MCVAPI ~AllowListEntry(); +#endif /** - * @symbol ??0AllowListEntry\@\@QEAA\@AEAVValue\@Json\@\@\@Z + * @symbol ??0AllowListEntry\@\@QEAA\@AEAVValue\@Json\@\@\@Z */ MCAPI AllowListEntry(class Json::Value &); + /** + * @symbol ??0AllowListEntry\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI AllowListEntry(std::string); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AllowListFile.hpp b/LiteLoader/include/llapi/mc/AllowListFile.hpp index 1629fed641..47a4740170 100644 --- a/LiteLoader/include/llapi/mc/AllowListFile.hpp +++ b/LiteLoader/include/llapi/mc/AllowListFile.hpp @@ -31,24 +31,28 @@ class AllowListFile { public: /** - * @symbol ?getAllowList\@AllowListFile\@\@QEBAAEAVAllowList\@\@XZ + * @symbol ??0AllowListFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z + */ + MCAPI AllowListFile(class Core::Path const &); + /** + * @symbol ?getAllowList\@AllowListFile\@\@QEBAAEAVAllowList\@\@XZ */ MCAPI class AllowList & getAllowList() const; /** - * @symbol ?reload\@AllowListFile\@\@QEAA?AW4FileReadResult\@\@XZ + * @symbol ?reload\@AllowListFile\@\@QEAA?AW4FileReadResult\@\@XZ */ MCAPI enum class FileReadResult reload(); /** - * @symbol ?syncToDisc\@AllowListFile\@\@QEAAXXZ + * @symbol ?syncToDisc\@AllowListFile\@\@QEAAXXZ */ MCAPI void syncToDisc(); /** - * @symbol ??1AllowListFile\@\@QEAA\@XZ + * @symbol ??1AllowListFile\@\@QEAA\@XZ */ MCAPI ~AllowListFile(); /** - * @symbol ?loadFromDefaultLocations\@AllowListFile\@\@SA?AV1\@AEAVIFileSystem\@Core\@\@\@Z + * @symbol ?loadFromDefaultLocations\@AllowListFile\@\@SA?AV1\@AEAVIFileSystem\@Core\@\@\@Z */ MCAPI static class AllowListFile loadFromDefaultLocations(class Core::IFileSystem &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp index 9b6a49cbf1..9beee5d54c 100644 --- a/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp +++ b/LiteLoader/include/llapi/mc/AllowedAnywhereConsume.hpp @@ -25,7 +25,7 @@ struct AllowedAnywhereConsume { public: /** - * @symbol ??0AllowedAnywhereConsume\@\@QEAA\@W4ContainerEnumName\@\@EE\@Z + * @symbol ??0AllowedAnywhereConsume\@\@QEAA\@W4ContainerEnumName\@\@EE\@Z */ MCAPI AllowedAnywhereConsume(enum class ContainerEnumName, unsigned char, unsigned char); diff --git a/LiteLoader/include/llapi/mc/AmbientSoundComponent.hpp b/LiteLoader/include/llapi/mc/AmbientSoundComponent.hpp index 3cfa7c905f..617e9d2081 100644 --- a/LiteLoader/include/llapi/mc/AmbientSoundComponent.hpp +++ b/LiteLoader/include/llapi/mc/AmbientSoundComponent.hpp @@ -30,8 +30,8 @@ class AmbientSoundComponent { public: /** - * @symbol ?setAmbientSoundRemainingTime\@AmbientSoundComponent\@\@SAXAEAVActor\@\@M\@Z + * @symbol ?setAmbientSoundRemainingTime\@AmbientSoundComponent\@\@SAXAEAVActor\@\@M\@Z */ MCAPI static void setAmbientSoundRemainingTime(class Actor &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AmbientSoundInternals.hpp b/LiteLoader/include/llapi/mc/AmbientSoundInternals.hpp index 514baa3020..6da987d2b5 100644 --- a/LiteLoader/include/llapi/mc/AmbientSoundInternals.hpp +++ b/LiteLoader/include/llapi/mc/AmbientSoundInternals.hpp @@ -20,23 +20,23 @@ namespace AmbientSoundInternals { #undef AFTER_EXTRA /** - * @symbol ?EVENT_NAMES_KEY\@AmbientSoundInternals\@\@3PEBDEB + * @symbol ?EVENT_NAMES_KEY\@AmbientSoundInternals\@\@3PEBDEB */ MCAPI extern char const * EVENT_NAMES_KEY; /** - * @symbol ?EVENT_NAME_DEFAULT\@AmbientSoundInternals\@\@3PEBDEB + * @symbol ?EVENT_NAME_DEFAULT\@AmbientSoundInternals\@\@3PEBDEB */ MCAPI extern char const * EVENT_NAME_DEFAULT; /** - * @symbol ?EVENT_NAME_KEY\@AmbientSoundInternals\@\@3PEBDEB + * @symbol ?EVENT_NAME_KEY\@AmbientSoundInternals\@\@3PEBDEB */ MCAPI extern char const * EVENT_NAME_KEY; /** - * @symbol ?RANGE_KEY\@AmbientSoundInternals\@\@3PEBDEB + * @symbol ?RANGE_KEY\@AmbientSoundInternals\@\@3PEBDEB */ MCAPI extern char const * RANGE_KEY; /** - * @symbol ?VALUE_KEY\@AmbientSoundInternals\@\@3PEBDEB + * @symbol ?VALUE_KEY\@AmbientSoundInternals\@\@3PEBDEB */ MCAPI extern char const * VALUE_KEY; diff --git a/LiteLoader/include/llapi/mc/AmbientSoundIntervalDefinition.hpp b/LiteLoader/include/llapi/mc/AmbientSoundIntervalDefinition.hpp index f172047c1e..18e6077931 100644 --- a/LiteLoader/include/llapi/mc/AmbientSoundIntervalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AmbientSoundIntervalDefinition.hpp @@ -31,15 +31,15 @@ struct AmbientSoundIntervalDefinition { public: /** - * @symbol ?addDynamic\@AmbientSoundIntervalDefinition\@\@QEAAXAEBUDynamicAmbientSound\@\@\@Z + * @symbol ?addDynamic\@AmbientSoundIntervalDefinition\@\@QEAAXAEBUDynamicAmbientSound\@\@\@Z */ MCAPI void addDynamic(struct DynamicAmbientSound const &); /** - * @symbol ?initialize\@AmbientSoundIntervalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAmbientSoundServerComponent\@\@\@Z + * @symbol ?initialize\@AmbientSoundIntervalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAmbientSoundServerComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AmbientSoundServerComponent &) const; /** - * @symbol ?buildSchema\@AmbientSoundIntervalDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UAmbientSoundIntervalDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AmbientSoundIntervalDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UAmbientSoundIntervalDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/AmbientSoundServerComponent.hpp b/LiteLoader/include/llapi/mc/AmbientSoundServerComponent.hpp index 7db46f2be4..df0cea2a74 100644 --- a/LiteLoader/include/llapi/mc/AmbientSoundServerComponent.hpp +++ b/LiteLoader/include/llapi/mc/AmbientSoundServerComponent.hpp @@ -28,12 +28,12 @@ class AmbientSoundServerComponent { public: /** - * @symbol ??4AmbientSoundServerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4AmbientSoundServerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class AmbientSoundServerComponent & operator=(class AmbientSoundServerComponent &&); /** - * @symbol ??1AmbientSoundServerComponent\@\@QEAA\@XZ + * @symbol ??1AmbientSoundServerComponent\@\@QEAA\@XZ */ MCAPI ~AmbientSoundServerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AmbientSoundServerSystem.hpp b/LiteLoader/include/llapi/mc/AmbientSoundServerSystem.hpp index 445f92e89c..7f002e411f 100644 --- a/LiteLoader/include/llapi/mc/AmbientSoundServerSystem.hpp +++ b/LiteLoader/include/llapi/mc/AmbientSoundServerSystem.hpp @@ -28,27 +28,27 @@ class AmbientSoundServerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AmbientSoundServerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AmbientSoundServerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AmbientSoundServerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickAmbientSoundComponent\@AmbientSoundServerSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVAmbientSoundServerComponent\@\@\@Z + * @symbol ?_tickAmbientSoundComponent\@AmbientSoundServerSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVAmbientSoundServerComponent\@\@\@Z */ MCAPI static void _tickAmbientSoundComponent(class ActorOwnerComponent &, class AmbientSoundServerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AmethystBlock.hpp b/LiteLoader/include/llapi/mc/AmethystBlock.hpp index 5338aa03a3..93d7710918 100644 --- a/LiteLoader/include/llapi/mc/AmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystBlock.hpp @@ -31,209 +31,213 @@ class AmethystBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AmethystBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 15 - * @symbol ?onProjectileHit\@AmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@AmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@AmethystBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_AMETHYSTBLOCK /** - * @symbol ?isSilentWhenJumpingOff\@AmethystBlock\@\@UEBA_NXZ + * @symbol ?isSilentWhenJumpingOff\@AmethystBlock\@\@UEBA_NXZ */ MCVAPI bool isSilentWhenJumpingOff() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AmethystBlock(); #endif /** - * @symbol ??0AmethystBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0AmethystBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI AmethystBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp index e0b2558639..c4dfbadbc2 100644 --- a/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp +++ b/LiteLoader/include/llapi/mc/AmethystClusterBlock.hpp @@ -31,271 +31,276 @@ class AmethystClusterBlock : public AmethystBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AmethystClusterBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@AmethystClusterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@AmethystClusterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@AmethystClusterBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@AmethystClusterBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@AmethystClusterBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@AmethystClusterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@AmethystClusterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 - * @symbol ?init\@AmethystClusterBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@AmethystClusterBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@AmethystClusterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@AmethystClusterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@AmethystClusterBlock\@\@EEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@AmethystClusterBlock\@\@EEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@AmethystClusterBlock\@\@EEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@AmethystClusterBlock\@\@EEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@AmethystClusterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@AmethystClusterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0AmethystClusterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHH\@Z + * @symbol ??0AmethystClusterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHH\@Z */ MCAPI AmethystClusterBlock(std::string const &, int, int, int); //private: /** - * @symbol ?_shapeFromDirection\@AmethystClusterBlock\@\@AEBA?AVAABB\@\@H\@Z + * @symbol ?_shapeFromDirection\@AmethystClusterBlock\@\@AEBA?AVAABB\@\@H\@Z */ MCAPI class AABB _shapeFromDirection(int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp b/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp index 27f6dbfcb0..3db45e6c2f 100644 --- a/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/AmphibiousMoveControl.hpp @@ -30,18 +30,18 @@ class AmphibiousMoveControl : public GenericMoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AmphibiousMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@AmphibiousMoveControl\@\@UEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AmphibiousMoveControl\@\@UEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0AmphibiousMoveControl\@\@QEAA\@XZ + * @symbol ??0AmphibiousMoveControl\@\@QEAA\@XZ */ MCAPI AmphibiousMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp index 77f0a8436a..30a114600a 100644 --- a/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/AmphibiousMoveControlDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class AmphibiousMoveControlDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@AmphibiousMoveControlDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@AmphibiousMoveControlDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~AmphibiousMoveControlDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_AMPHIBIOUSMOVECONTROLDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~AmphibiousMoveControlDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Amplifier.hpp b/LiteLoader/include/llapi/mc/Amplifier.hpp index e2e93744f6..e0b6e48eff 100644 --- a/LiteLoader/include/llapi/mc/Amplifier.hpp +++ b/LiteLoader/include/llapi/mc/Amplifier.hpp @@ -30,24 +30,24 @@ class Amplifier { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Amplifier(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getAmount\@Amplifier\@\@UEBAMHM\@Z + * @vftbl 1 + * @symbol ?getAmount\@Amplifier\@\@UEBAMHM\@Z */ virtual float getAmount(int, float) const; /** - * @vftbl 2 - * @symbol ?shouldBuff\@Amplifier\@\@UEBA_NHH\@Z + * @vftbl 2 + * @symbol ?shouldBuff\@Amplifier\@\@UEBA_NHH\@Z */ virtual bool shouldBuff(int, int) const; /** - * @vftbl 3 - * @symbol ?getTickInterval\@Amplifier\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getTickInterval\@Amplifier\@\@UEBAHH\@Z */ virtual int getTickInterval(int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AncientCityFeature.hpp b/LiteLoader/include/llapi/mc/AncientCityFeature.hpp index f4ccca3b18..5bea901d29 100644 --- a/LiteLoader/include/llapi/mc/AncientCityFeature.hpp +++ b/LiteLoader/include/llapi/mc/AncientCityFeature.hpp @@ -29,28 +29,28 @@ class AncientCityFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AncientCityFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@AncientCityFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@AncientCityFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@AncientCityFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@AncientCityFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@AncientCityFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@AncientCityFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0AncientCityFeature\@\@QEAA\@IAEBVBaseGameVersion\@\@\@Z + * @symbol ??0AncientCityFeature\@\@QEAA\@IAEBVBaseGameVersion\@\@\@Z */ MCAPI AncientCityFeature(unsigned int, class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AncientCityPiece.hpp b/LiteLoader/include/llapi/mc/AncientCityPiece.hpp index b0d6a5011c..f29c3b2fa0 100644 --- a/LiteLoader/include/llapi/mc/AncientCityPiece.hpp +++ b/LiteLoader/include/llapi/mc/AncientCityPiece.hpp @@ -29,33 +29,33 @@ class AncientCityPiece : public PoolElementStructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AncientCityPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 13 - * @symbol ?generateHeightAtPosition\@AncientCityPiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 13 + * @symbol ?generateHeightAtPosition\@AncientCityPiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual int generateHeightAtPosition(class BlockPos const &, class Dimension &, class BlockVolume &, class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> &) const; /** - * @vftbl 14 - * @symbol ?getSupportBlock\@AncientCityPiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 14 + * @symbol ?getSupportBlock\@AncientCityPiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const * getSupportBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 15 - * @symbol ?getBeardStabilizeBlock\@AncientCityPiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + * @vftbl 15 + * @symbol ?getBeardStabilizeBlock\@AncientCityPiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getBeardStabilizeBlock(class Block const &) const; /** - * @vftbl 16 - * @symbol ?getTerrainAdjustmentEffect\@AncientCityPiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ + * @vftbl 16 + * @symbol ?getTerrainAdjustmentEffect\@AncientCityPiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ */ virtual enum class AdjustmentEffect getTerrainAdjustmentEffect() const; /** - * @symbol ?addPieces\@AncientCityPiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z + * @symbol ?addPieces\@AncientCityPiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z */ MCAPI static void addPieces(class BlockPos, std::vector> &, class Random &, class JigsawStructureRegistry &, enum class VanillaBiomeTypes, class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AncientCityStart.hpp b/LiteLoader/include/llapi/mc/AncientCityStart.hpp index 358421d6b9..86155bd0ba 100644 --- a/LiteLoader/include/llapi/mc/AncientCityStart.hpp +++ b/LiteLoader/include/llapi/mc/AncientCityStart.hpp @@ -29,14 +29,14 @@ class AncientCityStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AncientCityStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?isValid\@AncientCityStart\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isValid\@AncientCityStart\@\@UEBA_NXZ */ virtual bool isValid() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AngerLevelComponent.hpp b/LiteLoader/include/llapi/mc/AngerLevelComponent.hpp index a296d11d8b..8f2f526734 100644 --- a/LiteLoader/include/llapi/mc/AngerLevelComponent.hpp +++ b/LiteLoader/include/llapi/mc/AngerLevelComponent.hpp @@ -27,88 +27,88 @@ class AngerLevelComponent { public: /** - * @symbol ??0AngerLevelComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0AngerLevelComponent\@\@QEAA\@AEBV0\@\@Z */ MCAPI AngerLevelComponent(class AngerLevelComponent const &); /** - * @symbol ??0AngerLevelComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0AngerLevelComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI AngerLevelComponent(class AngerLevelComponent &&); /** - * @symbol ?addAdditionalSaveData\@AngerLevelComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@AngerLevelComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?belowAngryThreshold\@AngerLevelComponent\@\@QEBA_NUActorUniqueID\@\@\@Z + * @symbol ?belowAngryThreshold\@AngerLevelComponent\@\@QEBA_NUActorUniqueID\@\@\@Z */ MCAPI bool belowAngryThreshold(struct ActorUniqueID) const; /** - * @symbol ?canBeNuisance\@AngerLevelComponent\@\@QEBA_NPEAVActor\@\@0\@Z + * @symbol ?canBeNuisance\@AngerLevelComponent\@\@QEBA_NPEAVActor\@\@0\@Z */ MCAPI bool canBeNuisance(class Actor *, class Actor *) const; /** - * @symbol ?getAngerForAnimations\@AngerLevelComponent\@\@QEBAHAEAVActor\@\@\@Z + * @symbol ?getAngerForAnimations\@AngerLevelComponent\@\@QEBAHAEAVActor\@\@\@Z */ MCAPI int getAngerForAnimations(class Actor &) const; /** - * @symbol ?getTopActiveNuisance\@AngerLevelComponent\@\@QEBA?AV?$optional\@U?$pair\@PEAVActor\@\@H\@std\@\@\@std\@\@PEAVActor\@\@AEBVILevel\@\@\@Z + * @symbol ?getTopActiveNuisance\@AngerLevelComponent\@\@QEBA?AV?$optional\@U?$pair\@PEAVActor\@\@H\@std\@\@\@std\@\@PEAVActor\@\@AEBVILevel\@\@\@Z */ MCAPI class std::optional> getTopActiveNuisance(class Actor *, class ILevel const &) const; /** - * @symbol ?isAngry\@AngerLevelComponent\@\@QEBA_NXZ + * @symbol ?isAngry\@AngerLevelComponent\@\@QEBA_NXZ */ MCAPI bool isAngry() const; /** - * @symbol ??4AngerLevelComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4AngerLevelComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class AngerLevelComponent & operator=(class AngerLevelComponent &&); /** - * @symbol ?readAdditionalSaveData\@AngerLevelComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@AngerLevelComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?tick\@AngerLevelComponent\@\@QEAAXPEAVActor\@\@AEBVILevel\@\@\@Z + * @symbol ?tick\@AngerLevelComponent\@\@QEAAXPEAVActor\@\@AEBVILevel\@\@\@Z */ MCAPI void tick(class Actor *, class ILevel const &); /** - * @symbol ?tryIncreaseAngerAt\@AngerLevelComponent\@\@QEAAXAEAVActor\@\@0H_N\@Z + * @symbol ?tryIncreaseAngerAt\@AngerLevelComponent\@\@QEAAXAEAVActor\@\@0H_N\@Z */ MCAPI void tryIncreaseAngerAt(class Actor &, class Actor &, int, bool); /** - * @symbol ??1AngerLevelComponent\@\@QEAA\@XZ + * @symbol ??1AngerLevelComponent\@\@QEAA\@XZ */ MCAPI ~AngerLevelComponent(); /** - * @symbol ?DEFAULT_ANGER_DECREMENT_INTERVAL_SECONDS\@AngerLevelComponent\@\@2MB + * @symbol ?DEFAULT_ANGER_DECREMENT_INTERVAL_SECONDS\@AngerLevelComponent\@\@2MB */ MCAPI static float const DEFAULT_ANGER_DECREMENT_INTERVAL_SECONDS; /** - * @symbol ?DEFAULT_ANGRY_BOOST\@AngerLevelComponent\@\@2HB + * @symbol ?DEFAULT_ANGRY_BOOST\@AngerLevelComponent\@\@2HB */ MCAPI static int const DEFAULT_ANGRY_BOOST; /** - * @symbol ?DEFAULT_ANGRY_THRESHOLD\@AngerLevelComponent\@\@2HB + * @symbol ?DEFAULT_ANGRY_THRESHOLD\@AngerLevelComponent\@\@2HB */ MCAPI static int const DEFAULT_ANGRY_THRESHOLD; /** - * @symbol ?DEFAULT_MAX_ANGER_LEVEL\@AngerLevelComponent\@\@2HB + * @symbol ?DEFAULT_MAX_ANGER_LEVEL\@AngerLevelComponent\@\@2HB */ MCAPI static int const DEFAULT_MAX_ANGER_LEVEL; /** - * @symbol ?DEFAULT_SHOULD_REMOVE_TARGET\@AngerLevelComponent\@\@2_NB + * @symbol ?DEFAULT_SHOULD_REMOVE_TARGET\@AngerLevelComponent\@\@2_NB */ MCAPI static bool const DEFAULT_SHOULD_REMOVE_TARGET; //private: /** - * @symbol ?_createOrModifyAngerLevel\@AngerLevelComponent\@\@AEAAXAEBVActor\@\@AEBV?$function\@$$A6AHH\@Z\@std\@\@\@Z + * @symbol ?_createOrModifyAngerLevel\@AngerLevelComponent\@\@AEAAXAEBVActor\@\@AEBV?$function\@$$A6AHH\@Z\@std\@\@\@Z */ MCAPI void _createOrModifyAngerLevel(class Actor const &, class std::function const &); /** - * @symbol ?_getListeningSoundEvent\@AngerLevelComponent\@\@AEBA?AV?$optional\@W4LevelSoundEvent\@\@\@std\@\@AEAVActor\@\@\@Z + * @symbol ?_getListeningSoundEvent\@AngerLevelComponent\@\@AEBA?AV?$optional\@W4LevelSoundEvent\@\@\@std\@\@AEAVActor\@\@\@Z */ MCAPI class std::optional _getListeningSoundEvent(class Actor &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AngerLevelDefinition.hpp b/LiteLoader/include/llapi/mc/AngerLevelDefinition.hpp index ed055937d8..951630a3cc 100644 --- a/LiteLoader/include/llapi/mc/AngerLevelDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AngerLevelDefinition.hpp @@ -29,16 +29,16 @@ class AngerLevelDefinition { public: /** - * @symbol ?addOnIncreaseSoundDefinition\@AngerLevelDefinition\@\@QEAAXAEBVSoundDefinition\@\@\@Z + * @symbol ?addOnIncreaseSoundDefinition\@AngerLevelDefinition\@\@QEAAXAEBVSoundDefinition\@\@\@Z */ MCAPI void addOnIncreaseSoundDefinition(class SoundDefinition const &); /** - * @symbol ?initialize\@AngerLevelDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAngerLevelComponent\@\@\@Z + * @symbol ?initialize\@AngerLevelDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAngerLevelComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AngerLevelComponent &) const; /** - * @symbol ?buildSchema\@AngerLevelDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAngerLevelDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AngerLevelDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAngerLevelDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AngerLevelSystem.hpp b/LiteLoader/include/llapi/mc/AngerLevelSystem.hpp index 25150de0d2..90b207b1f8 100644 --- a/LiteLoader/include/llapi/mc/AngerLevelSystem.hpp +++ b/LiteLoader/include/llapi/mc/AngerLevelSystem.hpp @@ -28,19 +28,19 @@ class AngerLevelSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AngerLevelSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AngerLevelSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AngerLevelSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AngryComponent.hpp b/LiteLoader/include/llapi/mc/AngryComponent.hpp index d0096b49f2..3be5bae05d 100644 --- a/LiteLoader/include/llapi/mc/AngryComponent.hpp +++ b/LiteLoader/include/llapi/mc/AngryComponent.hpp @@ -29,72 +29,72 @@ class AngryComponent { public: /** - * @symbol ??0AngryComponent\@\@QEAA\@XZ + * @symbol ??0AngryComponent\@\@QEAA\@XZ */ MCAPI AngryComponent(); /** - * @symbol ??0AngryComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0AngryComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI AngryComponent(class AngryComponent &&); /** - * @symbol ?canGetAngry\@AngryComponent\@\@QEBA_NAEAVMob\@\@PEAV2\@PEAVActor\@\@_N3\@Z + * @symbol ?canGetAngry\@AngryComponent\@\@QEBA_NAEAVMob\@\@PEAV2\@PEAVActor\@\@_N3\@Z */ MCAPI bool canGetAngry(class Mob &, class Mob *, class Actor *, bool, bool) const; /** - * @symbol ?getAngrySound\@AngryComponent\@\@QEBA?BW4LevelSoundEvent\@\@AEBVMob\@\@\@Z + * @symbol ?getAngrySound\@AngryComponent\@\@QEBA?BW4LevelSoundEvent\@\@AEBVMob\@\@\@Z */ MCAPI enum class LevelSoundEvent const getAngrySound(class Mob const &) const; /** - * @symbol ?getBroadcastAnger\@AngryComponent\@\@QEBA_NXZ + * @symbol ?getBroadcastAnger\@AngryComponent\@\@QEBA_NXZ */ MCAPI bool getBroadcastAnger() const; /** - * @symbol ?getBroadcastAngerOnAttack\@AngryComponent\@\@QEBA_NXZ + * @symbol ?getBroadcastAngerOnAttack\@AngryComponent\@\@QEBA_NXZ */ MCAPI bool getBroadcastAngerOnAttack() const; /** - * @symbol ?getBroadcastAngerOnBeingAttacked\@AngryComponent\@\@QEBA_NXZ + * @symbol ?getBroadcastAngerOnBeingAttacked\@AngryComponent\@\@QEBA_NXZ */ MCAPI bool getBroadcastAngerOnBeingAttacked() const; /** - * @symbol ?getBroadcastFilter\@AngryComponent\@\@QEBAAEBVActorFilterGroup\@\@XZ + * @symbol ?getBroadcastFilter\@AngryComponent\@\@QEBAAEBVActorFilterGroup\@\@XZ */ MCAPI class ActorFilterGroup const & getBroadcastFilter() const; /** - * @symbol ?getBroadcastRange\@AngryComponent\@\@QEBAHXZ + * @symbol ?getBroadcastRange\@AngryComponent\@\@QEBAHXZ */ MCAPI int getBroadcastRange() const; /** - * @symbol ?getHasTicked\@AngryComponent\@\@QEBA_NXZ + * @symbol ?getHasTicked\@AngryComponent\@\@QEBA_NXZ */ MCAPI bool getHasTicked() const; /** - * @symbol ?getNextSoundEventTick\@AngryComponent\@\@QEBA?BUTick\@\@XZ + * @symbol ?getNextSoundEventTick\@AngryComponent\@\@QEBA?BUTick\@\@XZ */ MCAPI struct Tick const getNextSoundEventTick() const; /** - * @symbol ??4AngryComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4AngryComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class AngryComponent & operator=(class AngryComponent &&); /** - * @symbol ?restartTimer\@AngryComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?restartTimer\@AngryComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void restartTimer(class Mob &); /** - * @symbol ?setAngry\@AngryComponent\@\@QEAAXAEAVMob\@\@_N\@Z + * @symbol ?setAngry\@AngryComponent\@\@QEAAXAEAVMob\@\@_N\@Z */ MCAPI void setAngry(class Mob &, bool); /** - * @symbol ?setHasTicked\@AngryComponent\@\@QEAAX_N\@Z + * @symbol ?setHasTicked\@AngryComponent\@\@QEAAX_N\@Z */ MCAPI void setHasTicked(bool); /** - * @symbol ?setNextSoundEventTick\@AngryComponent\@\@QEAAXAEBVMob\@\@\@Z + * @symbol ?setNextSoundEventTick\@AngryComponent\@\@QEAAXAEBVMob\@\@\@Z */ MCAPI void setNextSoundEventTick(class Mob const &); /** - * @symbol ??1AngryComponent\@\@QEAA\@XZ + * @symbol ??1AngryComponent\@\@QEAA\@XZ */ MCAPI ~AngryComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AngryDefinition.hpp b/LiteLoader/include/llapi/mc/AngryDefinition.hpp index cfb528a467..b562303e95 100644 --- a/LiteLoader/include/llapi/mc/AngryDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AngryDefinition.hpp @@ -30,24 +30,24 @@ class AngryDefinition { public: /** - * @symbol ??0AngryDefinition\@\@QEAA\@XZ + * @symbol ??0AngryDefinition\@\@QEAA\@XZ */ MCAPI AngryDefinition(); /** - * @symbol ?addBroadcastTargetByName\@AngryDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addBroadcastTargetByName\@AngryDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addBroadcastTargetByName(std::string const &); /** - * @symbol ?initialize\@AngryDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAngryComponent\@\@\@Z + * @symbol ?initialize\@AngryDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAngryComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AngryComponent &) const; /** - * @symbol ?uninitialize\@AngryDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAngryComponent\@\@\@Z + * @symbol ?uninitialize\@AngryDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAngryComponent\@\@\@Z */ MCAPI void uninitialize(class EntityContext &, class AngryComponent &) const; /** - * @symbol ?buildSchema\@AngryDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAngryDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AngryDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAngryDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AngrySystem.hpp b/LiteLoader/include/llapi/mc/AngrySystem.hpp index 5ec037c1fe..9d11bb2f4b 100644 --- a/LiteLoader/include/llapi/mc/AngrySystem.hpp +++ b/LiteLoader/include/llapi/mc/AngrySystem.hpp @@ -30,27 +30,27 @@ class AngrySystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AngrySystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AngrySystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AngrySystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@AngrySystem\@\@CAXAEAVEntityContext\@\@AEAVAngryComponent\@\@\@Z + * @symbol ?_tickComponent\@AngrySystem\@\@CAXAEAVEntityContext\@\@AEAVAngryComponent\@\@\@Z */ MCAPI static void _tickComponent(class EntityContext &, class AngryComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Animal.hpp b/LiteLoader/include/llapi/mc/Animal.hpp index f0bee70d0f..08d6f7d55a 100644 --- a/LiteLoader/include/llapi/mc/Animal.hpp +++ b/LiteLoader/include/llapi/mc/Animal.hpp @@ -32,163 +32,164 @@ class Animal : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Animal\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Animal\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Animal(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Animal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Animal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Animal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Animal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Animal\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Animal\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_301(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_305(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Animal\@\@MEAAMAEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_308(); + virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Animal\@\@MEAAMAEBVBlockPos\@\@\@Z + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual float _getWalkTargetValue(class BlockPos const &); + virtual void __unk_vfn_351(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMAL /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @symbol __unk_destructor_-1 */ - virtual void __unk_vfn_354(); + MCVAPI ~Animal(); +#endif /** - * @symbol ??0Animal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Animal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Animal(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp index e5d34bf972..4f0d4a6111 100644 --- a/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimateEntityPacket.hpp @@ -30,37 +30,43 @@ class AnimateEntityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnimateEntityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AnimateEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AnimateEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AnimateEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AnimateEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AnimateEntityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AnimateEntityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AnimateEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATEENTITYPACKET /** - * @symbol ??0AnimateEntityPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AnimateEntityPacket(); + MCVAPI ~AnimateEntityPacket(); +#endif /** - * @symbol ??0AnimateEntityPacket\@\@QEAA\@AEBV?$vector\@VActorRuntimeID\@\@V?$allocator\@VActorRuntimeID\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1M1W4MolangVersion\@\@1\@Z + * @symbol ??0AnimateEntityPacket\@\@QEAA\@AEBV?$vector\@VActorRuntimeID\@\@V?$allocator\@VActorRuntimeID\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1M1W4MolangVersion\@\@1\@Z */ MCAPI AnimateEntityPacket(std::vector const &, std::string const &, std::string const &, float, std::string const &, enum class MolangVersion, std::string const &); + /** + * @symbol ??0AnimateEntityPacket\@\@QEAA\@XZ + */ + MCAPI AnimateEntityPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimatePacket.hpp b/LiteLoader/include/llapi/mc/AnimatePacket.hpp index dca1c175c7..66bc33e26b 100644 --- a/LiteLoader/include/llapi/mc/AnimatePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnimatePacket.hpp @@ -44,45 +44,51 @@ class AnimatePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnimatePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AnimatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AnimatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AnimatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AnimatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AnimatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AnimatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AnimatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AnimatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATEPACKET /** - * @symbol ??0AnimatePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AnimatePacket(); +#endif + /** + * @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 + * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@M\@Z */ MCAPI AnimatePacket(enum class AnimatePacket::Action, class ActorRuntimeID, float); /** - * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@\@Z + * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@\@Z */ MCAPI AnimatePacket(enum class AnimatePacket::Action, class ActorRuntimeID); - /** - * @symbol ??0AnimatePacket\@\@QEAA\@W4Action\@0\@AEAVActor\@\@\@Z - */ - MCAPI AnimatePacket(enum class AnimatePacket::Action, class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimatedImageData.hpp b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp index a5ecd1713a..3bf46ffa94 100644 --- a/LiteLoader/include/llapi/mc/AnimatedImageData.hpp +++ b/LiteLoader/include/llapi/mc/AnimatedImageData.hpp @@ -22,18 +22,21 @@ class AnimatedImageData { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ANIMATEDIMAGEDATA public: - class AnimatedImageData& operator=(class AnimatedImageData const &) = delete; AnimatedImageData() = delete; #endif public: /** - * @symbol ??0AnimatedImageData\@\@QEAA\@W4AnimatedTextureType\@persona\@\@W4AnimationExpression\@2\@AEBUImage\@mce\@\@M\@Z + * @symbol ??0AnimatedImageData\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI AnimatedImageData(class AnimatedImageData const &); + /** + * @symbol ??0AnimatedImageData\@\@QEAA\@W4AnimatedTextureType\@persona\@\@W4AnimationExpression\@2\@AEBUImage\@mce\@\@M\@Z */ MCAPI AnimatedImageData(enum class persona::AnimatedTextureType, enum class persona::AnimationExpression, struct mce::Image const &, float); /** - * @symbol ??0AnimatedImageData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??4AnimatedImageData\@\@QEAAAEAV0\@AEBV0\@\@Z */ - MCAPI AnimatedImageData(class AnimatedImageData const &); + MCAPI class AnimatedImageData & operator=(class AnimatedImageData const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimationComponent.hpp b/LiteLoader/include/llapi/mc/AnimationComponent.hpp index a00f3de11c..cf37327eeb 100644 --- a/LiteLoader/include/llapi/mc/AnimationComponent.hpp +++ b/LiteLoader/include/llapi/mc/AnimationComponent.hpp @@ -30,91 +30,91 @@ class AnimationComponent { public: /** - * @symbol ??0AnimationComponent\@\@QEAA\@W4AnimationComponentGroupType\@\@AEBVAnimationComponentID\@\@\@Z + * @symbol ??0AnimationComponent\@\@QEAA\@W4AnimationComponentGroupType\@\@AEBVAnimationComponentID\@\@\@Z */ MCAPI AnimationComponent(enum class AnimationComponentGroupType, class AnimationComponentID const &); /** - * @symbol ?applyAnimations\@AnimationComponent\@\@QEAAX_N\@Z + * @symbol ?applyAnimations\@AnimationComponent\@\@QEAAX_N\@Z */ MCAPI void applyAnimations(bool); /** - * @symbol ?createAnimationPlayer\@AnimationComponent\@\@QEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@AEBVExpressionNode\@\@AEAV?$set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@V?$allocator\@VHashedString\@\@\@3\@\@3\@\@Z + * @symbol ?createAnimationPlayer\@AnimationComponent\@\@QEAA?AV?$shared_ptr\@VActorAnimationPlayer\@\@\@std\@\@AEBVHashedString\@\@AEBVExpressionNode\@\@AEAV?$set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@V?$allocator\@VHashedString\@\@\@3\@\@3\@\@Z */ MCAPI class std::shared_ptr createAnimationPlayer(class HashedString const &, class ExpressionNode const &, class std::set, class std::allocator> &); /** - * @symbol ?getAllBoneOrientations\@AnimationComponent\@\@QEAAAEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @symbol ?getAllBoneOrientations\@AnimationComponent\@\@QEAAAEAV?$unordered_map\@W4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@U?$hash\@W4SkeletalHierarchyIndex\@\@\@3\@U?$equal_to\@W4SkeletalHierarchyIndex\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4SkeletalHierarchyIndex\@\@V?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> & getAllBoneOrientations(); /** - * @symbol ?getAnimationComponentInitFunction\@AnimationComponent\@\@QEBAAEBV?$function\@$$A6AXAEAVActorAnimationPlayer\@\@\@Z\@std\@\@XZ + * @symbol ?getAnimationComponentInitFunction\@AnimationComponent\@\@QEBAAEBV?$function\@$$A6AXAEAVActorAnimationPlayer\@\@\@Z\@std\@\@XZ */ MCAPI class std::function const & getAnimationComponentInitFunction() const; /** - * @symbol ?getBoneOrientations\@AnimationComponent\@\@QEAAPEAV?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@W4SkeletalHierarchyIndex\@\@_N\@Z + * @symbol ?getBoneOrientations\@AnimationComponent\@\@QEAAPEAV?$vector\@VBoneOrientation\@\@V?$allocator\@VBoneOrientation\@\@\@std\@\@\@std\@\@W4SkeletalHierarchyIndex\@\@_N\@Z */ MCAPI std::vector * getBoneOrientations(enum class SkeletalHierarchyIndex, bool); /** - * @symbol ?getCurrentAnimationControllerStatePlayer\@AnimationComponent\@\@QEBA?BV?$shared_ptr\@VActorAnimationControllerStatePlayer\@\@\@std\@\@XZ + * @symbol ?getCurrentAnimationControllerStatePlayer\@AnimationComponent\@\@QEBA?BV?$shared_ptr\@VActorAnimationControllerStatePlayer\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr const getCurrentAnimationControllerStatePlayer() const; /** - * @symbol ?getLocator\@AnimationComponent\@\@QEAAPEAVModelPartLocator\@\@AEB_K\@Z + * @symbol ?getLocator\@AnimationComponent\@\@QEAAPEAVModelPartLocator\@\@AEB_K\@Z */ MCAPI class ModelPartLocator * getLocator(unsigned __int64 const &); /** - * @symbol ?getRenderParams\@AnimationComponent\@\@QEAAAEAVRenderParams\@\@XZ + * @symbol ?getRenderParams\@AnimationComponent\@\@QEAAAEAVRenderParams\@\@XZ */ MCAPI class RenderParams & getRenderParams(); /** - * @symbol ?initInstanceSpecificAnimationData\@AnimationComponent\@\@QEAAXPEAVMolangVariableMap\@\@\@Z + * @symbol ?initInstanceSpecificAnimationData\@AnimationComponent\@\@QEAAXPEAVMolangVariableMap\@\@\@Z */ MCAPI void initInstanceSpecificAnimationData(class MolangVariableMap *); /** - * @symbol ?initializeServerAnimationComponent\@AnimationComponent\@\@QEAAXAEAVActor\@\@V?$shared_ptr\@VCommonResourceDefinitionMap\@\@\@std\@\@V?$function\@$$A6AXAEAVActorAnimationPlayer\@\@\@Z\@4\@\@Z + * @symbol ?initializeServerAnimationComponent\@AnimationComponent\@\@QEAAXAEAVActor\@\@V?$shared_ptr\@VCommonResourceDefinitionMap\@\@\@std\@\@V?$function\@$$A6AXAEAVActorAnimationPlayer\@\@\@Z\@4\@\@Z */ MCAPI void initializeServerAnimationComponent(class Actor &, class std::shared_ptr, class std::function); /** - * @symbol ?isInitialized\@AnimationComponent\@\@QEAA_NXZ + * @symbol ?isInitialized\@AnimationComponent\@\@QEAA_NXZ */ MCAPI bool isInitialized(); /** - * @symbol ?serverUpdate\@AnimationComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?serverUpdate\@AnimationComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void serverUpdate(class Actor &); /** - * @symbol ?setCurrentAnimationControllerStatePlayer\@AnimationComponent\@\@QEAAXV?$shared_ptr\@VActorAnimationControllerStatePlayer\@\@\@std\@\@\@Z + * @symbol ?setCurrentAnimationControllerStatePlayer\@AnimationComponent\@\@QEAAXV?$shared_ptr\@VActorAnimationControllerStatePlayer\@\@\@std\@\@\@Z */ MCAPI void setCurrentAnimationControllerStatePlayer(class std::shared_ptr); /** - * @symbol ?setDirty\@AnimationComponent\@\@QEAAXXZ + * @symbol ?setDirty\@AnimationComponent\@\@QEAAXXZ */ MCAPI void setDirty(); /** - * @symbol ?setLastReloadInitTimeStampClient\@AnimationComponent\@\@QEAAX_K\@Z + * @symbol ?setLastReloadInitTimeStampClient\@AnimationComponent\@\@QEAAX_K\@Z */ MCAPI void setLastReloadInitTimeStampClient(unsigned __int64); /** - * @symbol ?setupDeltaTimeAndLifeTimeParams\@AnimationComponent\@\@QEAAX_N\@Z + * @symbol ?setupDeltaTimeAndLifeTimeParams\@AnimationComponent\@\@QEAAX_N\@Z */ MCAPI void setupDeltaTimeAndLifeTimeParams(bool); /** - * @symbol ?shouldReloadBasedOnLastReloadInitTimeStamp\@AnimationComponent\@\@QEBA_NXZ + * @symbol ?shouldReloadBasedOnLastReloadInitTimeStamp\@AnimationComponent\@\@QEBA_NXZ */ MCAPI bool shouldReloadBasedOnLastReloadInitTimeStamp() const; /** - * @symbol ?usesLastReloadInitTimeStampClient\@AnimationComponent\@\@QEBA_NXZ + * @symbol ?usesLastReloadInitTimeStampClient\@AnimationComponent\@\@QEBA_NXZ */ MCAPI bool usesLastReloadInitTimeStampClient() const; /** - * @symbol ??1AnimationComponent\@\@QEAA\@XZ + * @symbol ??1AnimationComponent\@\@QEAA\@XZ */ MCAPI ~AnimationComponent(); /** - * @symbol ?getReloadTimeStampClient\@AnimationComponent\@\@SA_KXZ + * @symbol ?getReloadTimeStampClient\@AnimationComponent\@\@SA_KXZ */ MCAPI static unsigned __int64 getReloadTimeStampClient(); /** - * @symbol ?incrementCurrentServerFrameIndex\@AnimationComponent\@\@SAXXZ + * @symbol ?incrementCurrentServerFrameIndex\@AnimationComponent\@\@SAXXZ */ MCAPI static void incrementCurrentServerFrameIndex(); @@ -122,16 +122,16 @@ class AnimationComponent { private: /** - * @symbol ?mClientFrameIndex\@AnimationComponent\@\@0U?$atomic\@_J\@std\@\@A + * @symbol ?mClientFrameIndex\@AnimationComponent\@\@0U?$atomic\@_J\@std\@\@A */ MCAPI static struct std::atomic<__int64> mClientFrameIndex; /** - * @symbol ?mReloadTimeStampClient\@AnimationComponent\@\@0U?$atomic\@_J\@std\@\@A + * @symbol ?mReloadTimeStampClient\@AnimationComponent\@\@0U?$atomic\@_J\@std\@\@A */ MCAPI static struct std::atomic<__int64> mReloadTimeStampClient; /** - * @symbol ?mServerFrameIndex\@AnimationComponent\@\@0U?$atomic\@_J\@std\@\@A + * @symbol ?mServerFrameIndex\@AnimationComponent\@\@0U?$atomic\@_J\@std\@\@A */ MCAPI static struct std::atomic<__int64> mServerFrameIndex; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimationComponentGroup.hpp b/LiteLoader/include/llapi/mc/AnimationComponentGroup.hpp index a9d8d0c9e1..8c91ad4682 100644 --- a/LiteLoader/include/llapi/mc/AnimationComponentGroup.hpp +++ b/LiteLoader/include/llapi/mc/AnimationComponentGroup.hpp @@ -28,24 +28,24 @@ class AnimationComponentGroup { public: /** - * @symbol ?_getAllAnimationComponents\@AnimationComponentGroup\@\@SAAEAV?$unordered_map\@VAnimationComponentID\@\@V?$weak_ptr\@VAnimationComponent\@\@\@std\@\@U?$hash\@VAnimationComponentID\@\@\@3\@U?$equal_to\@VAnimationComponentID\@\@\@3\@V?$allocator\@U?$pair\@$$CBVAnimationComponentID\@\@V?$weak_ptr\@VAnimationComponent\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@W4AnimationComponentGroupType\@\@\@Z + * @symbol ?_getAllAnimationComponents\@AnimationComponentGroup\@\@SAAEAV?$unordered_map\@VAnimationComponentID\@\@V?$weak_ptr\@VAnimationComponent\@\@\@std\@\@U?$hash\@VAnimationComponentID\@\@\@3\@U?$equal_to\@VAnimationComponentID\@\@\@3\@V?$allocator\@U?$pair\@$$CBVAnimationComponentID\@\@V?$weak_ptr\@VAnimationComponent\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@W4AnimationComponentGroupType\@\@\@Z */ MCAPI static class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> & _getAllAnimationComponents(enum class AnimationComponentGroupType); /** - * @symbol ?getAnimationComponent\@AnimationComponentGroup\@\@SA?AV?$shared_ptr\@VAnimationComponent\@\@\@std\@\@W4AnimationComponentGroupType\@\@VAnimationComponentID\@\@\@Z + * @symbol ?getAnimationComponent\@AnimationComponentGroup\@\@SA?AV?$shared_ptr\@VAnimationComponent\@\@\@std\@\@W4AnimationComponentGroupType\@\@VAnimationComponentID\@\@\@Z */ MCAPI static class std::shared_ptr getAnimationComponent(enum class AnimationComponentGroupType, class AnimationComponentID); /** - * @symbol ?releaseAnimationComponent\@AnimationComponentGroup\@\@SAXW4AnimationComponentGroupType\@\@VAnimationComponentID\@\@\@Z + * @symbol ?releaseAnimationComponent\@AnimationComponentGroup\@\@SAXW4AnimationComponentGroupType\@\@VAnimationComponentID\@\@\@Z */ MCAPI static void releaseAnimationComponent(enum class AnimationComponentGroupType, class AnimationComponentID); //private: /** - * @symbol ?_getAnimationComponentMapLock\@AnimationComponentGroup\@\@CAAEAVrecursive_mutex\@std\@\@XZ + * @symbol ?_getAnimationComponentMapLock\@AnimationComponentGroup\@\@CAAEAVrecursive_mutex\@std\@\@XZ */ MCAPI static class std::recursive_mutex & _getAnimationComponentMapLock(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimationComponentID.hpp b/LiteLoader/include/llapi/mc/AnimationComponentID.hpp index 42a0a1b7fa..c8fa286eb0 100644 --- a/LiteLoader/include/llapi/mc/AnimationComponentID.hpp +++ b/LiteLoader/include/llapi/mc/AnimationComponentID.hpp @@ -28,16 +28,16 @@ class AnimationComponentID { public: /** - * @symbol ??0AnimationComponentID\@\@QEAA\@AEBUActorUniqueID\@\@GW4AttachableSlotIndex\@\@\@Z + * @symbol ??0AnimationComponentID\@\@QEAA\@AEBUActorUniqueID\@\@GW4AttachableSlotIndex\@\@\@Z */ MCAPI AnimationComponentID(struct ActorUniqueID const &, unsigned short, enum class AttachableSlotIndex); /** - * @symbol ?getHash\@AnimationComponentID\@\@QEBA_KXZ + * @symbol ?getHash\@AnimationComponentID\@\@QEBA_KXZ */ MCAPI unsigned __int64 getHash() const; /** - * @symbol ??8AnimationComponentID\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8AnimationComponentID\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class AnimationComponentID const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp b/LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp index 30b135075a..e3be61e900 100644 --- a/LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp +++ b/LiteLoader/include/llapi/mc/AnimationScriptsDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class AnimationScriptsDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@AnimationScriptsDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@AnimationScriptsDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~AnimationScriptsDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@AnimationScriptsDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@AnimationScriptsDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATIONSCRIPTSDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@AnimationScriptsDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~AnimationScriptsDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnimationsDescription.hpp b/LiteLoader/include/llapi/mc/AnimationsDescription.hpp index 900310a87c..9e68c5e99d 100644 --- a/LiteLoader/include/llapi/mc/AnimationsDescription.hpp +++ b/LiteLoader/include/llapi/mc/AnimationsDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,28 +29,29 @@ class AnimationsDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@AnimationsDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@AnimationsDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~AnimationsDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@AnimationsDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@AnimationsDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANIMATIONSDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@AnimationsDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~AnimationsDescription(); +#endif /** - * @symbol ??0AnimationsDescription\@\@QEAA\@XZ + * @symbol ??0AnimationsDescription\@\@QEAA\@XZ */ MCAPI AnimationsDescription(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp b/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp index a72dc6dacd..01b8fd4d9e 100644 --- a/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp +++ b/LiteLoader/include/llapi/mc/AntiCheatTickShimSystem.hpp @@ -25,12 +25,12 @@ class AntiCheatTickShimSystem { public: /** - * @symbol ?_tickOne\@AntiCheatTickShimSystem\@\@SAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z + * @symbol ?_tickOne\@AntiCheatTickShimSystem\@\@SAXAEBVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z */ MCAPI static void _tickOne(class StrictEntityContext const &, class ActorMovementProxyComponent &); /** - * @symbol ?create\@AntiCheatTickShimSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@AntiCheatTickShimSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnvilBlock.hpp b/LiteLoader/include/llapi/mc/AnvilBlock.hpp index f28fb02284..14999ef007 100644 --- a/LiteLoader/include/llapi/mc/AnvilBlock.hpp +++ b/LiteLoader/include/llapi/mc/AnvilBlock.hpp @@ -31,296 +31,301 @@ class AnvilBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnvilBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@AnvilBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@AnvilBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@AnvilBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@AnvilBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@AnvilBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@AnvilBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@AnvilBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@AnvilBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@AnvilBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@AnvilBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@AnvilBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@AnvilBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@AnvilBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@AnvilBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@AnvilBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@AnvilBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@AnvilBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@AnvilBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@AnvilBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getDustColor\@AnvilBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@AnvilBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@AnvilBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @vftbl 196 - * @symbol ?onLand\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 197 + * @symbol ?onLand\@AnvilBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANVILBLOCK /** - * @symbol ?canBeSilkTouched\@AnvilBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@AnvilBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?falling\@AnvilBlock\@\@UEBA_NXZ + * @symbol ?falling\@AnvilBlock\@\@UEBA_NXZ */ MCVAPI bool falling() const; /** - * @symbol ?isCraftingBlock\@AnvilBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@AnvilBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@AnvilBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@AnvilBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0AnvilBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0AnvilBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI AnvilBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp index b99ad4b932..95a4293c3a 100644 --- a/LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/AnvilContainerManagerModel.hpp @@ -31,60 +31,60 @@ class AnvilContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnvilContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@AnvilContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@AnvilContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@AnvilContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@AnvilContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@AnvilContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@AnvilContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@AnvilContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@AnvilContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@AnvilContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@AnvilContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@AnvilContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@AnvilContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@AnvilContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@AnvilContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0AnvilContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0AnvilContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI AnvilContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?INPUT_SLOT\@AnvilContainerManagerModel\@\@2HB + * @symbol ?INPUT_SLOT\@AnvilContainerManagerModel\@\@2HB */ MCAPI static int const INPUT_SLOT; /** - * @symbol ?MATERIAL_SLOT\@AnvilContainerManagerModel\@\@2HB + * @symbol ?MATERIAL_SLOT\@AnvilContainerManagerModel\@\@2HB */ MCAPI static int const MATERIAL_SLOT; /** - * @symbol ?RESULT_SLOT\@AnvilContainerManagerModel\@\@2HB + * @symbol ?RESULT_SLOT\@AnvilContainerManagerModel\@\@2HB */ MCAPI static int const RESULT_SLOT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp index c8376c20f5..141511a721 100644 --- a/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/AnvilContainerScreenValidator.hpp @@ -29,28 +29,28 @@ class AnvilContainerScreenValidator { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnvilContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?isCraftingImplemented\@AnvilContainerScreenValidator\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?isCraftingImplemented\@AnvilContainerScreenValidator\@\@UEAA_NXZ */ virtual bool isCraftingImplemented(); /** - * @vftbl 3 - * @symbol ?getCraftResult\@AnvilContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?getCraftResult\@AnvilContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResult(class ContainerScreenContext const &, class ContainerScreenValidation &, std::unique_ptr); /** - * @symbol ??0AnvilContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0AnvilContainerScreenValidator\@\@QEAA\@XZ */ MCAPI AnvilContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp index 28adaf76c8..a56a7f8a46 100644 --- a/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/AnvilDamagePacket.hpp @@ -30,33 +30,33 @@ class AnvilDamagePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnvilDamagePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AnvilDamagePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AnvilDamagePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AnvilDamagePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AnvilDamagePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AnvilDamagePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AnvilDamagePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AnvilDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0AnvilDamagePacket\@\@QEAA\@XZ + * @symbol ??0AnvilDamagePacket\@\@QEAA\@XZ */ MCAPI AnvilDamagePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnvilInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/AnvilInputContainerValidation.hpp index c8712d7c2d..e8be7466ee 100644 --- a/LiteLoader/include/llapi/mc/AnvilInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/AnvilInputContainerValidation.hpp @@ -31,50 +31,50 @@ class AnvilInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnvilInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ANVILINPUTCONTAINERVALIDATION /** - * @symbol ?getContainerOffset\@AnvilInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @symbol ?getContainerOffset\@AnvilInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ MCVAPI int getContainerOffset(class ContainerScreenContext const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AnvilMaterialContainerValidation.hpp b/LiteLoader/include/llapi/mc/AnvilMaterialContainerValidation.hpp index 27119273b6..7d77abdf81 100644 --- a/LiteLoader/include/llapi/mc/AnvilMaterialContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/AnvilMaterialContainerValidation.hpp @@ -31,54 +31,54 @@ class AnvilMaterialContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AnvilMaterialContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@AnvilMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@AnvilMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ApiDiag.hpp b/LiteLoader/include/llapi/mc/ApiDiag.hpp index d5c4ff1e0e..1cf09adcad 100644 --- a/LiteLoader/include/llapi/mc/ApiDiag.hpp +++ b/LiteLoader/include/llapi/mc/ApiDiag.hpp @@ -20,7 +20,7 @@ namespace ApiDiag { #undef AFTER_EXTRA /** - * @symbol ?g_globalApiRefs\@ApiDiag\@\@3U?$atomic\@I\@std\@\@A + * @symbol ?g_globalApiRefs\@ApiDiag\@\@3U?$atomic\@I\@std\@\@A */ MCAPI extern struct std::atomic g_globalApiRefs; diff --git a/LiteLoader/include/llapi/mc/AppConfigs.hpp b/LiteLoader/include/llapi/mc/AppConfigs.hpp index 794b22c578..4529759cb9 100644 --- a/LiteLoader/include/llapi/mc/AppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/AppConfigs.hpp @@ -30,306 +30,310 @@ class AppConfigs { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AppConfigs(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol ?getEducationEditionOffering\@AppConfigs\@\@UEBA?AW4EducationEditionOffer\@\@XZ + * @vftbl 18 + * @symbol ?getEducationEditionOffering\@AppConfigs\@\@UEBA?AW4EducationEditionOffer\@\@XZ */ virtual enum class EducationEditionOffer getEducationEditionOffering() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol ?supports3DExport\@AppConfigs\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?supports3DExport\@AppConfigs\@\@UEBA_NXZ */ virtual bool supports3DExport() const; /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol ?getConnectionDefinition\@AppConfigs\@\@UEBA?AUConnectionDefinition\@\@XZ + * @vftbl 23 + * @symbol ?getConnectionDefinition\@AppConfigs\@\@UEBA?AUConnectionDefinition\@\@XZ */ virtual struct ConnectionDefinition getConnectionDefinition() const; /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol __unk_vfn_26 + * @vftbl 26 + * @symbol __unk_vfn_26 */ virtual void __unk_vfn_26(); /** - * @vftbl 27 - * @symbol __unk_vfn_27 + * @vftbl 27 + * @symbol __unk_vfn_27 */ virtual void __unk_vfn_27(); /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 28 + * @symbol __unk_vfn_28 */ virtual void __unk_vfn_28(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol ?getAdditionalClientPacks\@AppConfigs\@\@UEBA?AV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@_N\@Z + * @vftbl 32 + * @symbol ?getAdditionalClientPacks\@AppConfigs\@\@UEBA?AV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@_N\@Z */ virtual std::vector getAdditionalClientPacks(bool) const; /** - * @vftbl 33 - * @symbol ?getScreenCapabilities\@AppConfigs\@\@UEBA?AV?$unique_ptr\@VIScreenCapabilities\@\@U?$default_delete\@VIScreenCapabilities\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 33 + * @symbol ?getScreenCapabilities\@AppConfigs\@\@UEBA?AV?$unique_ptr\@VIScreenCapabilities\@\@U?$default_delete\@VIScreenCapabilities\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual std::unique_ptr getScreenCapabilities(std::string const &) const; /** - * @vftbl 34 - * @symbol ?createContentAccessibility\@AppConfigs\@\@UEBA?AV?$unique_ptr\@VIContentAccessibilityProvider\@\@U?$default_delete\@VIContentAccessibilityProvider\@\@\@std\@\@\@std\@\@V?$not_null\@V?$NonOwnerPointer\@VIEntitlementManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 34 + * @symbol ?createContentAccessibility\@AppConfigs\@\@UEBA?AV?$unique_ptr\@VIContentAccessibilityProvider\@\@U?$default_delete\@VIContentAccessibilityProvider\@\@\@std\@\@\@std\@\@V?$not_null\@V?$NonOwnerPointer\@VIEntitlementManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual std::unique_ptr createContentAccessibility(class gsl::not_null>) const; /** - * @vftbl 35 - * @symbol ?getFeedbackURL\@AppConfigs\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 35 + * @symbol ?getFeedbackURL\@AppConfigs\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getFeedbackURL() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_APPCONFIGS /** - * @symbol ?allowGameArguments\@AppConfigs\@\@UEBA_NXZ + * @symbol ?allowGameArguments\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool allowGameArguments() const; /** - * @symbol ?applyLevelDataOverride\@AppConfigs\@\@UEBAXAEAVLevelData\@\@\@Z + * @symbol ?applyLevelDataOverride\@AppConfigs\@\@UEBAXAEAVLevelData\@\@\@Z */ MCVAPI void applyLevelDataOverride(class LevelData &) const; /** - * @symbol ?areEmotesSupported\@AppConfigs\@\@UEBA_NXZ + * @symbol ?areEmotesSupported\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool areEmotesSupported() const; /** - * @symbol ?arePremiumSkinPacksAllowed\@AppConfigs\@\@UEBA_NXZ + * @symbol ?arePremiumSkinPacksAllowed\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool arePremiumSkinPacksAllowed() const; /** - * @symbol ?areQuizzesSupported\@AppConfigs\@\@UEBA_NXZ + * @symbol ?areQuizzesSupported\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool areQuizzesSupported() const; /** - * @symbol ?areResourcePacksAllowed\@AppConfigs\@\@UEBA_NXZ + * @symbol ?areResourcePacksAllowed\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool areResourcePacksAllowed() const; /** - * @symbol ?canUseAzureNotebooks\@AppConfigs\@\@UEBA_NXZ + * @symbol ?canUseAzureNotebooks\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool canUseAzureNotebooks() const; /** - * @symbol ?canUseMaelstrom\@AppConfigs\@\@UEBA?AW4MaelstromEduUsabilityStatus\@1\@XZ + * @symbol ?canUseMaelstrom\@AppConfigs\@\@UEBA?AW4MaelstromEduUsabilityStatus\@1\@XZ */ MCVAPI enum class AppConfigs::MaelstromEduUsabilityStatus canUseMaelstrom() const; /** - * @symbol ?gameArgumentsNeedAuthentication\@AppConfigs\@\@UEBA_NXZ + * @symbol ?gameArgumentsNeedAuthentication\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool gameArgumentsNeedAuthentication() const; /** - * @symbol ?isChatScreenAllowed\@AppConfigs\@\@UEBA_NXZ + * @symbol ?isChatScreenAllowed\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool isChatScreenAllowed() const; /** - * @symbol ?isCoursesCacheEnabled\@AppConfigs\@\@UEBA_NXZ + * @symbol ?isCoursesCacheEnabled\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool isCoursesCacheEnabled() const; /** - * @symbol ?isExternalPlayerCommunicationAllowed\@AppConfigs\@\@UEBA_NXZ + * @symbol ?isExternalPlayerCommunicationAllowed\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool isExternalPlayerCommunicationAllowed() const; /** - * @symbol ?isGameTabShownInSettings\@AppConfigs\@\@UEBA_NXZ + * @symbol ?isGameTabShownInSettings\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool isGameTabShownInSettings() const; /** - * @symbol ?isLessonProgressionSupported\@AppConfigs\@\@UEBA_NXZ + * @symbol ?isLessonProgressionSupported\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool isLessonProgressionSupported() const; /** - * @symbol ?isPlayScreenAllowed\@AppConfigs\@\@UEBA_NXZ + * @symbol ?isPlayScreenAllowed\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool isPlayScreenAllowed() const; /** - * @symbol ?loadFromData\@AppConfigs\@\@UEAAXAEBVIAppConfigData\@\@\@Z + * @symbol ?loadFromData\@AppConfigs\@\@UEAAXAEBVIAppConfigData\@\@\@Z */ MCVAPI void loadFromData(class IAppConfigData const &); /** - * @symbol ?muteByDefault\@AppConfigs\@\@UEBA_NXZ + * @symbol ?muteByDefault\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool muteByDefault() const; /** - * @symbol ?requireEduLevelSettings\@AppConfigs\@\@UEBA_NXZ + * @symbol ?requireEduLevelSettings\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool requireEduLevelSettings() const; /** - * @symbol ?requireTrustedContent\@AppConfigs\@\@UEBA_NXZ + * @symbol ?requireTrustedContent\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool requireTrustedContent() const; /** - * @symbol ?sendPermissionsTelemetry\@AppConfigs\@\@UEBA_NXZ + * @symbol ?sendPermissionsTelemetry\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool sendPermissionsTelemetry() const; /** - * @symbol ?setCanAccessWorldCallback\@AppConfigs\@\@UEAAXAEAVIMinecraftGame\@\@\@Z + * @symbol ?setCanAccessWorldCallback\@AppConfigs\@\@UEAAXAEAVIMinecraftGame\@\@\@Z */ MCVAPI void setCanAccessWorldCallback(class IMinecraftGame &); /** - * @symbol ?shouldPromptBeforeExit\@AppConfigs\@\@UEBA_NXZ + * @symbol ?shouldPromptBeforeExit\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool shouldPromptBeforeExit() const; /** - * @symbol ?supportsChangingMultiplayerDuringPlay\@AppConfigs\@\@UEBA_NXZ + * @symbol ?supportsChangingMultiplayerDuringPlay\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool supportsChangingMultiplayerDuringPlay() const; /** - * @symbol ?useEduDemoUpsellDialog\@AppConfigs\@\@UEBA_NXZ + * @symbol ?useEduDemoUpsellDialog\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool useEduDemoUpsellDialog() const; /** - * @symbol ?useFullScreenByDefault\@AppConfigs\@\@UEBA_NXZ + * @symbol ?useFullScreenByDefault\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool useFullScreenByDefault() const; /** - * @symbol ?useNormalizedFontSize\@AppConfigs\@\@UEBA_NXZ + * @symbol ?useNormalizedFontSize\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool useNormalizedFontSize() const; /** - * @symbol ?webSocketsDisabled\@AppConfigs\@\@UEBA_NXZ + * @symbol ?webSocketsDisabled\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool webSocketsDisabled() const; /** - * @symbol ?worldBuilderDisabled\@AppConfigs\@\@UEBA_NXZ + * @symbol ?worldBuilderDisabled\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool worldBuilderDisabled() const; /** - * @symbol ?worldsAreSingleUse\@AppConfigs\@\@UEBA_NXZ + * @symbol ?worldsAreSingleUse\@AppConfigs\@\@UEBA_NXZ */ MCVAPI bool worldsAreSingleUse() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AppConfigs(); #endif /** - * @symbol ??0AppConfigs\@\@QEAA\@XZ + * @symbol ??0AppConfigs\@\@QEAA\@XZ */ MCAPI AppConfigs(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppConfigsFactory.hpp b/LiteLoader/include/llapi/mc/AppConfigsFactory.hpp index 68def49784..6d0cbd3b23 100644 --- a/LiteLoader/include/llapi/mc/AppConfigsFactory.hpp +++ b/LiteLoader/include/llapi/mc/AppConfigsFactory.hpp @@ -30,8 +30,8 @@ class AppConfigsFactory { public: /** - * @symbol ?createAppConfigs\@AppConfigsFactory\@\@SA?AV?$unique_ptr\@VAppConfigs\@\@U?$default_delete\@VAppConfigs\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createAppConfigs\@AppConfigsFactory\@\@SA?AV?$unique_ptr\@VAppConfigs\@\@U?$default_delete\@VAppConfigs\@\@\@std\@\@\@std\@\@XZ */ MCAPI static std::unique_ptr createAppConfigs(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppLifecycleContext.hpp b/LiteLoader/include/llapi/mc/AppLifecycleContext.hpp index d37cef2356..e7ec09f09b 100644 --- a/LiteLoader/include/llapi/mc/AppLifecycleContext.hpp +++ b/LiteLoader/include/llapi/mc/AppLifecycleContext.hpp @@ -27,8 +27,8 @@ class AppLifecycleContext { public: /** - * @symbol ??0AppLifecycleContext\@\@QEAA\@XZ + * @symbol ??0AppLifecycleContext\@\@QEAA\@XZ */ MCAPI AppLifecycleContext(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppPlatform.hpp b/LiteLoader/include/llapi/mc/AppPlatform.hpp index df1c8341c2..e0974fcb24 100644 --- a/LiteLoader/include/llapi/mc/AppPlatform.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform.hpp @@ -39,904 +39,912 @@ 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 + * @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 + * @symbol ?_disableCPUBoost\@AppPlatform\@\@MEAAXXZ */ MCVAPI void _disableCPUBoost(); /** - * @symbol ?_initializeFileStorageAreas\@AppPlatform\@\@MEAAXXZ + * @symbol ?_initializeFileStorageAreas\@AppPlatform\@\@MEAAXXZ */ MCVAPI void _initializeFileStorageAreas(); /** - * @symbol ?_onInitialize\@AppPlatform\@\@EEAAXXZ + * @symbol ?_onInitialize\@AppPlatform\@\@EEAAXXZ */ MCVAPI void _onInitialize(); /** - * @symbol ?_onTeardown\@AppPlatform\@\@EEAAXXZ + * @symbol ?_onTeardown\@AppPlatform\@\@EEAAXXZ */ MCVAPI void _onTeardown(); /** - * @symbol ?_teardownFileStorageAreas\@AppPlatform\@\@MEAAXXZ + * @symbol ?_teardownFileStorageAreas\@AppPlatform\@\@MEAAXXZ */ MCVAPI void _teardownFileStorageAreas(); /** - * @symbol ?_tryEnableCPUBoost\@AppPlatform\@\@MEAA_NXZ + * @symbol ?_tryEnableCPUBoost\@AppPlatform\@\@MEAA_NXZ */ MCVAPI bool _tryEnableCPUBoost(); /** - * @symbol ?addListener\@AppPlatform\@\@UEAAXPEAVAppPlatformListener\@\@M\@Z + * @symbol ?addListener\@AppPlatform\@\@UEAAXPEAVAppPlatformListener\@\@M\@Z */ MCVAPI void addListener(class AppPlatformListener *, float); /** - * @symbol ?allowBetaXblSignIn\@AppPlatform\@\@UEBA_NXZ + * @symbol ?allowBetaXblSignIn\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool allowBetaXblSignIn() const; /** - * @symbol ?allowContentLogWriteToDisk\@AppPlatform\@\@UEAA_NXZ + * @symbol ?allowContentLogWriteToDisk\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool allowContentLogWriteToDisk(); /** - * @symbol ?allowsResourcePackDevelopment\@AppPlatform\@\@UEBA_NXZ + * @symbol ?allowsResourcePackDevelopment\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool allowsResourcePackDevelopment() const; /** - * @symbol ?alwaysUseZippedPacksForDlc\@AppPlatform\@\@UEBA_NXZ + * @symbol ?alwaysUseZippedPacksForDlc\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool alwaysUseZippedPacksForDlc() const; /** - * @symbol ?areThreadsFrozen\@AppPlatform\@\@UEBA_NXZ + * @symbol ?areThreadsFrozen\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool areThreadsFrozen() const; /** - * @symbol ?buyGame\@AppPlatform\@\@UEAAXXZ + * @symbol ?buyGame\@AppPlatform\@\@UEAAXXZ */ MCVAPI void buyGame(); /** - * @symbol ?calculateIfLowMemoryDevice\@AppPlatform\@\@UEAAXXZ + * @symbol ?calculateIfLowMemoryDevice\@AppPlatform\@\@UEAAXXZ */ MCVAPI void calculateIfLowMemoryDevice(); /** - * @symbol ?canLaunchUri\@AppPlatform\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?canLaunchUri\@AppPlatform\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool canLaunchUri(std::string const &); /** - * @symbol ?canManageLegacyData\@AppPlatform\@\@UEBA_NXZ + * @symbol ?canManageLegacyData\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool canManageLegacyData() const; /** - * @symbol ?canSwapVRMode\@AppPlatform\@\@UEBA_N_N\@Z + * @symbol ?canSwapVRMode\@AppPlatform\@\@UEBA_N_N\@Z */ MCVAPI bool canSwapVRMode(bool) const; /** - * @symbol ?checkLicense\@AppPlatform\@\@UEAAHXZ + * @symbol ?checkLicense\@AppPlatform\@\@UEAAHXZ */ MCVAPI int checkLicense(); /** - * @symbol ?collectGraphicsHardwareDetails\@AppPlatform\@\@UEAAXXZ + * @symbol ?collectGraphicsHardwareDetails\@AppPlatform\@\@UEAAXXZ */ MCVAPI void collectGraphicsHardwareDetails(); /** - * @symbol ?compareAppReceiptToLocalReceipt\@AppPlatform\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?compareAppReceiptToLocalReceipt\@AppPlatform\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool compareAppReceiptToLocalReceipt(std::string const &); /** - * @symbol ?copyAssetFile\@AppPlatform\@\@UEAA_NAEBVPath\@Core\@\@0\@Z + * @symbol ?copyAssetFile\@AppPlatform\@\@UEAA_NAEBVPath\@Core\@\@0\@Z */ MCVAPI bool copyAssetFile(class Core::Path const &, class Core::Path const &); /** - * @symbol ?copyImportFileToTempFolder\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?copyImportFileToTempFolder\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCVAPI class Core::PathBuffer copyImportFileToTempFolder(class Core::Path const &); /** - * @symbol ?createLoggingStorageArea\@AppPlatform\@\@UEAA?AV?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@W4FileAccessType\@Core\@\@AEBVPath\@5\@\@Z + * @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 + * @symbol ?createUserInput\@AppPlatform\@\@UEAAXXZ */ - MCVAPI void createUserInput(int); + MCVAPI void createUserInput(); /** - * @symbol ?createUserInput\@AppPlatform\@\@UEAAXXZ + * @symbol ?createUserInput\@AppPlatform\@\@UEAAXH\@Z */ - MCVAPI void createUserInput(); + MCVAPI void createUserInput(int); /** - * @symbol ?createWebview\@AppPlatform\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z + * @symbol ?createWebview\@AppPlatform\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z */ MCVAPI class std::shared_ptr createWebview(class Webview::PlatformArguments &&) const; /** - * @symbol ?doesLANRequireMultiplayerRestrictions\@AppPlatform\@\@UEBA_NXZ + * @symbol ?doesLANRequireMultiplayerRestrictions\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool doesLANRequireMultiplayerRestrictions() const; /** - * @symbol ?exitVRMode\@AppPlatform\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?exitVRMode\@AppPlatform\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCVAPI void exitVRMode(class std::function); /** - * @symbol ?finish\@AppPlatform\@\@UEAAXXZ + * @symbol ?finish\@AppPlatform\@\@UEAAXXZ */ MCVAPI void finish(); /** - * @symbol ?getARVRPlatform\@AppPlatform\@\@UEBA?AW4ARVRPlatform\@\@XZ + * @symbol ?getARVRPlatform\@AppPlatform\@\@UEBA?AW4ARVRPlatform\@\@XZ */ MCVAPI enum class ARVRPlatform getARVRPlatform() const; /** - * @symbol ?getAndroidScopedStorageInfo\@AppPlatform\@\@UEBAAEBUAndroidScopedStorageInfo\@1\@XZ + * @symbol ?getAndroidScopedStorageInfo\@AppPlatform\@\@UEBAAEBUAndroidScopedStorageInfo\@1\@XZ */ MCVAPI struct AppPlatform::AndroidScopedStorageInfo const & getAndroidScopedStorageInfo() const; /** - * @symbol ?getAppLifecycleContext\@AppPlatform\@\@UEAAAEAVAppLifecycleContext\@\@XZ + * @symbol ?getAppLifecycleContext\@AppPlatform\@\@UEAAAEAVAppLifecycleContext\@\@XZ */ MCVAPI class AppLifecycleContext & getAppLifecycleContext(); /** - * @symbol ?getAssetFileFullPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?getAssetFileFullPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCVAPI class Core::PathBuffer getAssetFileFullPath(class Core::Path const &); /** - * @symbol ?getBroadcastAddresses\@AppPlatform\@\@UEAA?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 + * @symbol ?getBroadcastAddresses\@AppPlatform\@\@UEAA?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 */ MCVAPI std::vector getBroadcastAddresses(); /** - * @symbol ?getBroadcastingMultiplayerServiceIds\@AppPlatform\@\@UEBA?AV?$vector\@W4MultiplayerServiceIdentifier\@Social\@\@V?$allocator\@W4MultiplayerServiceIdentifier\@Social\@\@\@std\@\@\@std\@\@_N0\@Z + * @symbol ?getBroadcastingMultiplayerServiceIds\@AppPlatform\@\@UEBA?AV?$vector\@W4MultiplayerServiceIdentifier\@Social\@\@V?$allocator\@W4MultiplayerServiceIdentifier\@Social\@\@\@std\@\@\@std\@\@_N0\@Z */ MCVAPI std::vector getBroadcastingMultiplayerServiceIds(bool, bool) const; /** - * @symbol ?getBuildPlatform\@AppPlatform\@\@UEBA?AW4BuildPlatform\@\@XZ + * @symbol ?getBuildPlatform\@AppPlatform\@\@UEBA?AW4BuildPlatform\@\@XZ */ MCVAPI enum class BuildPlatform getBuildPlatform() const; /** - * @symbol ?getCacheStoragePath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getCacheStoragePath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getCacheStoragePath(); /** - * @symbol ?getCatalogSearchScratchPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getCatalogSearchScratchPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getCatalogSearchScratchPath(); /** - * @symbol ?getClientUpdateUrl\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getClientUpdateUrl\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getClientUpdateUrl() const; /** - * @symbol ?getDefaultInputMode\@AppPlatform\@\@UEBA?AW4InputMode\@\@XZ + * @symbol ?getDefaultInputMode\@AppPlatform\@\@UEBA?AW4InputMode\@\@XZ */ MCVAPI enum class InputMode getDefaultInputMode() const; /** - * @symbol ?getDefaultNetworkMaxPlayers\@AppPlatform\@\@UEBAHXZ + * @symbol ?getDefaultNetworkMaxPlayers\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getDefaultNetworkMaxPlayers() const; /** - * @symbol ?getDefaultSafeZoneScaleX\@AppPlatform\@\@UEBAMXZ + * @symbol ?getDefaultSafeZoneScaleX\@AppPlatform\@\@UEBAMXZ */ MCVAPI float getDefaultSafeZoneScaleX() const; /** - * @symbol ?getDefaultSafeZoneScaleY\@AppPlatform\@\@UEBAMXZ + * @symbol ?getDefaultSafeZoneScaleY\@AppPlatform\@\@UEBAMXZ */ MCVAPI float getDefaultSafeZoneScaleY() const; /** - * @symbol ?getDefaultScreenPositionX\@AppPlatform\@\@UEBAMXZ + * @symbol ?getDefaultScreenPositionX\@AppPlatform\@\@UEBAMXZ */ MCVAPI float getDefaultScreenPositionX() const; /** - * @symbol ?getDefaultScreenPositionY\@AppPlatform\@\@UEBAMXZ + * @symbol ?getDefaultScreenPositionY\@AppPlatform\@\@UEBAMXZ */ MCVAPI float getDefaultScreenPositionY() const; /** - * @symbol ?getDeviceSunsetTier\@AppPlatform\@\@UEBA?AW4DeviceSunsetTier\@\@XZ + * @symbol ?getDeviceSunsetTier\@AppPlatform\@\@UEBA?AW4DeviceSunsetTier\@\@XZ */ MCVAPI enum class DeviceSunsetTier getDeviceSunsetTier() const; /** - * @symbol ?getDisplayHeight\@AppPlatform\@\@UEAAHXZ + * @symbol ?getDisplayHeight\@AppPlatform\@\@UEAAHXZ */ MCVAPI int getDisplayHeight(); /** - * @symbol ?getDisplayWidth\@AppPlatform\@\@UEAAHXZ + * @symbol ?getDisplayWidth\@AppPlatform\@\@UEAAHXZ */ MCVAPI int getDisplayWidth(); /** - * @symbol ?getDpi\@AppPlatform\@\@UEBAHXZ + * @symbol ?getDpi\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getDpi() const; /** - * @symbol ?getEdition\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEdition\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getEdition() const; /** - * @symbol ?getExtraLevelSaveDataIconParams\@AppPlatform\@\@UEBA?AV?$optional\@UScreenshotOptions\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getExtraLevelSaveDataIconParams\@AppPlatform\@\@UEBA?AV?$optional\@UScreenshotOptions\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCVAPI class std::optional getExtraLevelSaveDataIconParams(std::string const &) const; /** - * @symbol ?getFeedbackBugsLink\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFeedbackBugsLink\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getFeedbackBugsLink() const; /** - * @symbol ?getFeedbackHelpLink\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFeedbackHelpLink\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getFeedbackHelpLink() const; /** - * @symbol ?getFileAccess\@AppPlatform\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@W4ResourceFileSystem\@\@\@Z + * @symbol ?getFileAccess\@AppPlatform\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@W4ResourceFileSystem\@\@\@Z */ MCVAPI class gsl::not_null> getFileAccess(enum class ResourceFileSystem); /** - * @symbol ?getFocusState\@AppPlatform\@\@UEAA?AW4AppFocusState\@\@XZ + * @symbol ?getFocusState\@AppPlatform\@\@UEAA?AW4AppFocusState\@\@XZ */ MCVAPI enum class AppFocusState getFocusState(); /** - * @symbol ?getHighPerformanceThreadsCount\@AppPlatform\@\@UEBA_KXZ + * @symbol ?getHighPerformanceThreadsCount\@AppPlatform\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getHighPerformanceThreadsCount() const; /** - * @symbol ?getIPAddresses\@AppPlatform\@\@UEAA?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 + * @symbol ?getIPAddresses\@AppPlatform\@\@UEAA?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 */ MCVAPI std::vector getIPAddresses(); /** - * @symbol ?getInternalPackStoragePath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @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 ?getLevelInfoCachePath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getLevelInfoCachePath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getLevelInfoCachePath() const; /** - * @symbol ?getLevelSaveInterval\@AppPlatform\@\@UEBA?AV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@XZ + * @symbol ?getLevelSaveInterval\@AppPlatform\@\@UEBA?AV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@XZ */ MCVAPI class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> getLevelSaveInterval() const; /** - * @symbol ?getLoggingPath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getLoggingPath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getLoggingPath() const; /** - * @symbol ?getLowPhysicalMemoryThreshold\@AppPlatform\@\@UEBA_KXZ + * @symbol ?getLowPhysicalMemoryThreshold\@AppPlatform\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getLowPhysicalMemoryThreshold() const; /** - * @symbol ?getMaxLDBFilesOpen\@AppPlatform\@\@UEBAHXZ + * @symbol ?getMaxLDBFilesOpen\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getMaxLDBFilesOpen() const; /** - * @symbol ?getMaxSimRadiusInChunks\@AppPlatform\@\@UEBAHXZ + * @symbol ?getMaxSimRadiusInChunks\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getMaxSimRadiusInChunks() const; /** - * @symbol ?getMaxSimultaneousDownloads\@AppPlatform\@\@UEBAHXZ + * @symbol ?getMaxSimultaneousDownloads\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getMaxSimultaneousDownloads() const; /** - * @symbol ?getMaxSimultaneousServiceRequests\@AppPlatform\@\@UEBAIXZ + * @symbol ?getMaxSimultaneousServiceRequests\@AppPlatform\@\@UEBAIXZ */ MCVAPI unsigned int getMaxSimultaneousServiceRequests() const; /** - * @symbol ?getMaximumUsedMemory\@AppPlatform\@\@UEAA_KXZ + * @symbol ?getMaximumUsedMemory\@AppPlatform\@\@UEAA_KXZ */ MCVAPI unsigned __int64 getMaximumUsedMemory(); /** - * @symbol ?getModalErrorMessageProc\@AppPlatform\@\@UEAAP6A?AW4AssertDialogResponse\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@ZXZ + * @symbol ?getModalErrorMessageProc\@AppPlatform\@\@UEAAP6A?AW4AssertDialogResponse\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@ZXZ */ MCVAPI enum class AssertDialogResponse ( *)(std::string const &, std::string const &) getModalErrorMessageProc(); /** - * @symbol ?getModelName\@AppPlatform\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModelName\@AppPlatform\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getModelName(); /** - * @symbol ?getMultiplayerServiceListToRegister\@AppPlatform\@\@UEBA?AV?$vector\@V?$shared_ptr\@VMultiplayerService\@Social\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VMultiplayerService\@Social\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getMultiplayerServiceListToRegister\@AppPlatform\@\@UEBA?AV?$vector\@V?$shared_ptr\@VMultiplayerService\@Social\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VMultiplayerService\@Social\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCVAPI std::vector> getMultiplayerServiceListToRegister() const; /** - * @symbol ?getNetworkConnectionType\@AppPlatform\@\@UEAA?AW4NetworkConnectionType\@\@XZ + * @symbol ?getNetworkConnectionType\@AppPlatform\@\@UEAA?AW4NetworkConnectionType\@\@XZ */ MCVAPI enum class NetworkConnectionType getNetworkConnectionType(); /** - * @symbol ?getNumberOfParticleFramesToInterpolate\@AppPlatform\@\@UEBAHXZ + * @symbol ?getNumberOfParticleFramesToInterpolate\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getNumberOfParticleFramesToInterpolate() const; /** - * @symbol ?getOSVersion\@AppPlatform\@\@UEBA?AW4OsVersion\@\@XZ + * @symbol ?getOSVersion\@AppPlatform\@\@UEBA?AW4OsVersion\@\@XZ */ MCVAPI enum class OsVersion getOSVersion() const; /** - * @symbol ?getOnDiskPackScratchPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getOnDiskPackScratchPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getOnDiskPackScratchPath(); /** - * @symbol ?getOnDiskScratchPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getOnDiskScratchPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getOnDiskScratchPath(); /** - * @symbol ?getOperationMode\@AppPlatform\@\@UEBA?AV?$optional\@W4OperationMode\@\@\@std\@\@XZ + * @symbol ?getOperationMode\@AppPlatform\@\@UEBA?AV?$optional\@W4OperationMode\@\@\@std\@\@XZ */ MCVAPI class std::optional getOperationMode() const; /** - * @symbol ?getOptimalLDBSize\@AppPlatform\@\@UEAA_KXZ + * @symbol ?getOptimalLDBSize\@AppPlatform\@\@UEAA_KXZ */ MCVAPI unsigned __int64 getOptimalLDBSize(); /** - * @symbol ?getOptionsSaveInterval\@AppPlatform\@\@UEBA?AV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@XZ + * @symbol ?getOptionsSaveInterval\@AppPlatform\@\@UEBA?AV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@XZ */ MCVAPI class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> getOptionsSaveInterval() const; /** - * @symbol ?getPackageFamilyName\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPackageFamilyName\@AppPlatform\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getPackageFamilyName() const; /** - * @symbol ?getPackagedShaderCachePath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getPackagedShaderCachePath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getPackagedShaderCachePath(); /** - * @symbol ?getPixelsPerMillimeter\@AppPlatform\@\@UEAAMXZ + * @symbol ?getPixelsPerMillimeter\@AppPlatform\@\@UEAAMXZ */ MCVAPI float getPixelsPerMillimeter(); /** - * @symbol ?getPlatformDpi\@AppPlatform\@\@EEBAHXZ + * @symbol ?getPlatformDpi\@AppPlatform\@\@EEBAHXZ */ MCVAPI int getPlatformDpi() const; /** - * @symbol ?getPlatformStringVar\@AppPlatform\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getPlatformStringVar\@AppPlatform\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCVAPI std::string getPlatformStringVar(int); /** - * @symbol ?getPlatformTTSEnabled\@AppPlatform\@\@UEBA_NXZ + * @symbol ?getPlatformTTSEnabled\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool getPlatformTTSEnabled() const; /** - * @symbol ?getPlatformTTSExists\@AppPlatform\@\@UEBA_NXZ + * @symbol ?getPlatformTTSExists\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool getPlatformTTSExists() const; /** - * @symbol ?getPlatformType\@AppPlatform\@\@UEBA?AW4PlatformType\@\@XZ + * @symbol ?getPlatformType\@AppPlatform\@\@UEBA?AW4PlatformType\@\@XZ */ MCVAPI enum class PlatformType getPlatformType() const; /** - * @symbol ?getPlatformUIScalingRules\@AppPlatform\@\@EEBA?AW4UIScalingRules\@\@XZ + * @symbol ?getPlatformUIScalingRules\@AppPlatform\@\@EEBA?AW4UIScalingRules\@\@XZ */ MCVAPI enum class UIScalingRules getPlatformUIScalingRules() const; /** - * @symbol ?getRenderSurfaceParameters\@AppPlatform\@\@UEBA?AV?$variant\@PEAUHWND__\@\@Umonostate\@std\@\@\@std\@\@XZ + * @symbol ?getRenderSurfaceParameters\@AppPlatform\@\@UEBA?AV?$variant\@PEAUHWND__\@\@Umonostate\@std\@\@\@std\@\@XZ */ MCVAPI class std::variant getRenderSurfaceParameters() const; /** - * @symbol ?getScreenHeight\@AppPlatform\@\@UEBAHXZ + * @symbol ?getScreenHeight\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getScreenHeight() const; /** - * @symbol ?getScreenWidth\@AppPlatform\@\@UEBAHXZ + * @symbol ?getScreenWidth\@AppPlatform\@\@UEBAHXZ */ MCVAPI int getScreenWidth() const; /** - * @symbol ?getSecureStorage\@AppPlatform\@\@UEAA?AV?$unique_ptr\@VSecureStorage\@\@U?$default_delete\@VSecureStorage\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSecureStorage\@AppPlatform\@\@UEAA?AV?$unique_ptr\@VSecureStorage\@\@U?$default_delete\@VSecureStorage\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr getSecureStorage(); /** - * @symbol ?getSecureStorageKey\@AppPlatform\@\@UEAA?AVSecureStorageKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getSecureStorageKey\@AppPlatform\@\@UEAA?AVSecureStorageKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class SecureStorageKey getSecureStorageKey(std::string const &); /** - * @symbol ?getSettingsPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getSettingsPath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getSettingsPath(); /** - * @symbol ?getShaderCachePath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getShaderCachePath\@AppPlatform\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getShaderCachePath(); /** - * @symbol ?getStoreNetworkFailureTimeout\@AppPlatform\@\@UEBAMXZ + * @symbol ?getStoreNetworkFailureTimeout\@AppPlatform\@\@UEBAMXZ */ MCVAPI float getStoreNetworkFailureTimeout() const; /** - * @symbol ?getThirdPartyPackUUID\@AppPlatform\@\@UEBAAEBVUUID\@mce\@\@XZ + * @symbol ?getThirdPartyPackUUID\@AppPlatform\@\@UEBAAEBVUUID\@mce\@\@XZ */ MCVAPI class mce::UUID const & getThirdPartyPackUUID() const; /** - * @symbol ?getTotalHardwareThreadsCount\@AppPlatform\@\@UEBA_KXZ + * @symbol ?getTotalHardwareThreadsCount\@AppPlatform\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getTotalHardwareThreadsCount() const; /** - * @symbol ?getUIScalingRules\@AppPlatform\@\@UEBA?AW4UIScalingRules\@\@XZ + * @symbol ?getUIScalingRules\@AppPlatform\@\@UEBA?AW4UIScalingRules\@\@XZ */ MCVAPI enum class UIScalingRules getUIScalingRules() const; /** - * @symbol ?getUserInput\@AppPlatform\@\@UEAA?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 + * @symbol ?getUserInput\@AppPlatform\@\@UEAA?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 */ MCVAPI std::vector getUserInput(); /** - * @symbol ?getUserInputStatus\@AppPlatform\@\@UEAAHXZ + * @symbol ?getUserInputStatus\@AppPlatform\@\@UEAAHXZ */ MCVAPI int getUserInputStatus(); /** - * @symbol ?getUserStorageRootPath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getUserStorageRootPath\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getUserStorageRootPath() const; /** - * @symbol ?getUserdataPathForLevels\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getUserdataPathForLevels\@AppPlatform\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getUserdataPathForLevels() const; /** - * @symbol ?getVRControllerType\@AppPlatform\@\@UEBA?AW4VRControllerType\@\@XZ + * @symbol ?getVRControllerType\@AppPlatform\@\@UEBA?AW4VRControllerType\@\@XZ */ MCVAPI enum class VRControllerType getVRControllerType() const; /** - * @symbol ?goToExternalConsumablesStoreListing\@AppPlatform\@\@UEBAXXZ + * @symbol ?goToExternalConsumablesStoreListing\@AppPlatform\@\@UEBAXXZ */ MCVAPI void goToExternalConsumablesStoreListing() const; /** - * @symbol ?handlePlatformSpecificCommerceError\@AppPlatform\@\@UEAAXI\@Z + * @symbol ?handlePlatformSpecificCommerceError\@AppPlatform\@\@UEAAXI\@Z */ MCVAPI void handlePlatformSpecificCommerceError(unsigned int); /** - * @symbol ?hasAssetFile\@AppPlatform\@\@UEAA_NAEBVPath\@Core\@\@\@Z + * @symbol ?hasAssetFile\@AppPlatform\@\@UEAA_NAEBVPath\@Core\@\@\@Z */ MCVAPI bool hasAssetFile(class Core::Path const &); /** - * @symbol ?hasBuyButtonWhenInvalidLicense\@AppPlatform\@\@UEAA_NXZ + * @symbol ?hasBuyButtonWhenInvalidLicense\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool hasBuyButtonWhenInvalidLicense(); /** - * @symbol ?hasFastAlphaTest\@AppPlatform\@\@UEBA_NXZ + * @symbol ?hasFastAlphaTest\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool hasFastAlphaTest() const; /** - * @symbol ?hasIDEProfiler\@AppPlatform\@\@UEAA_NXZ + * @symbol ?hasIDEProfiler\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool hasIDEProfiler(); /** - * @symbol ?hasJournalingFilesystem\@AppPlatform\@\@UEBA_NXZ + * @symbol ?hasJournalingFilesystem\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool hasJournalingFilesystem() const; /** - * @symbol ?hasPlatformSpecificInvites\@AppPlatform\@\@UEBA_NXZ + * @symbol ?hasPlatformSpecificInvites\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool hasPlatformSpecificInvites() const; /** - * @symbol ?hasSeparatedStorageAreasForContentAcquisition\@AppPlatform\@\@UEBA_NXZ + * @symbol ?hasSeparatedStorageAreasForContentAcquisition\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool hasSeparatedStorageAreasForContentAcquisition() const; /** - * @symbol ?hideSplashScreen\@AppPlatform\@\@UEAAXXZ + * @symbol ?hideSplashScreen\@AppPlatform\@\@UEAAXXZ */ MCVAPI void hideSplashScreen(); /** - * @symbol ?importAsFlatFile\@AppPlatform\@\@UEBA_NXZ + * @symbol ?importAsFlatFile\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool importAsFlatFile() const; /** - * @symbol ?initAppPlatformNetworkSettings\@AppPlatform\@\@UEAAXXZ + * @symbol ?initAppPlatformNetworkSettings\@AppPlatform\@\@UEAAXXZ */ MCVAPI void initAppPlatformNetworkSettings(); /** - * @symbol ?initialize\@AppPlatform\@\@UEAAXXZ + * @symbol ?initialize\@AppPlatform\@\@UEAAXXZ */ MCVAPI void initialize(); /** - * @symbol ?initializeGameStreaming\@AppPlatform\@\@UEAAXXZ + * @symbol ?initializeGameStreaming\@AppPlatform\@\@UEAAXXZ */ MCVAPI void initializeGameStreaming(); /** - * @symbol ?initializeScreenDependentResources\@AppPlatform\@\@UEAAXXZ + * @symbol ?initializeScreenDependentResources\@AppPlatform\@\@UEAAXXZ */ MCVAPI void initializeScreenDependentResources(); /** - * @symbol ?isAutoCompactionEnabled\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isAutoCompactionEnabled\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isAutoCompactionEnabled() const; /** - * @symbol ?isCentennial\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isCentennial\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isCentennial() const; /** - * @symbol ?isContentAutoUpdateAllowed\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isContentAutoUpdateAllowed\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isContentAutoUpdateAllowed() const; /** - * @symbol ?isCrossPlatformToggleVisible\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isCrossPlatformToggleVisible\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isCrossPlatformToggleVisible() const; /** - * @symbol ?isDisplayInitialized\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isDisplayInitialized\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isDisplayInitialized() const; /** - * @symbol ?isDownloadAndImportBlocking\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isDownloadAndImportBlocking\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isDownloadAndImportBlocking() const; /** - * @symbol ?isDownloadBuffered\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isDownloadBuffered\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isDownloadBuffered() const; /** - * @symbol ?isEduMode\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isEduMode\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isEduMode() const; /** - * @symbol ?isFireTV\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isFireTV\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isFireTV() const; /** - * @symbol ?isJoinableViaExternalServers\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isInternetAvailable\@AppPlatform\@\@UEBA_NXZ + */ + MCVAPI bool isInternetAvailable() const; + /** + * @symbol ?isJoinableViaExternalServers\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isJoinableViaExternalServers() const; /** - * @symbol ?isLANAllowed\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isLANAllowed\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isLANAllowed() const; /** - * @symbol ?isLowMemoryDevice\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isLANAvailable\@AppPlatform\@\@UEBA_NXZ + */ + MCVAPI bool isLANAvailable() const; + /** + * @symbol ?isLowMemoryDevice\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isLowMemoryDevice() const; /** - * @symbol ?isLowPhysicalMemoryDevice\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isLowPhysicalMemoryDevice\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isLowPhysicalMemoryDevice() const; /** - * @symbol ?isNetworkAllowed\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isNetworkAllowed\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isNetworkAllowed() const; /** - * @symbol ?isNetworkAvailable\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isNetworkAvailable\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isNetworkAvailable() const; /** - * @symbol ?isNetworkEnabled\@AppPlatform\@\@UEBA_N_N\@Z + * @symbol ?isNetworkEnabled\@AppPlatform\@\@UEBA_N_N\@Z */ MCVAPI bool isNetworkEnabled(bool) const; /** - * @symbol ?isNetworkThrottled\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isNetworkThrottled\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isNetworkThrottled() const; /** - * @symbol ?isOnWifiConnectionTelemetryValue\@AppPlatform\@\@UEAA?AV?$optional\@_N\@std\@\@XZ + * @symbol ?isOnWifiConnectionTelemetryValue\@AppPlatform\@\@UEAA?AV?$optional\@_N\@std\@\@XZ */ MCVAPI class std::optional isOnWifiConnectionTelemetryValue(); /** - * @symbol ?isQuitCapable\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isQuitCapable\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isQuitCapable() const; /** - * @symbol ?isRealmsEnabled\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isRealmsEnabled\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isRealmsEnabled() const; /** - * @symbol ?isTelemetryAllowed\@AppPlatform\@\@UEAA_NXZ + * @symbol ?isTelemetryAllowed\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool isTelemetryAllowed(); /** - * @symbol ?isTrialWorldsTransferToFullGameAllowed\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isTrialWorldsTransferToFullGameAllowed\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isTrialWorldsTransferToFullGameAllowed() const; /** - * @symbol ?isWebviewSupported\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isWebviewSupported\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isWebviewSupported() const; /** - * @symbol ?isWin10Arm\@AppPlatform\@\@UEBA_NXZ + * @symbol ?isWin10Arm\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool isWin10Arm() const; /** - * @symbol ?launchLegacyVersion\@AppPlatform\@\@UEAAXXZ + * @symbol ?launchLegacyVersion\@AppPlatform\@\@UEAAXXZ */ MCVAPI void launchLegacyVersion(); /** - * @symbol ?launchSettings\@AppPlatform\@\@UEAAXXZ + * @symbol ?launchSettings\@AppPlatform\@\@UEAAXXZ */ MCVAPI void launchSettings(); /** - * @symbol ?launchUri\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?launchUri\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void launchUri(std::string const &); /** - * @symbol ?listAssetFilesIn\@AppPlatform\@\@UEBA?AV?$set\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@U?$less\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@\@std\@\@AEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?listAssetFilesIn\@AppPlatform\@\@UEBA?AV?$set\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@U?$less\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@\@std\@\@AEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCVAPI class std::set, struct std::less>, class std::allocator>> listAssetFilesIn(class Core::Path const &, std::string const &) const; /** - * @symbol ?maxFileDataRequestConcurrency\@AppPlatform\@\@UEBAIXZ + * @symbol ?maxFileDataRequestConcurrency\@AppPlatform\@\@UEBAIXZ */ MCVAPI unsigned int maxFileDataRequestConcurrency() const; /** - * @symbol ?minimizeBackgroundDownloads\@AppPlatform\@\@UEBA_NXZ + * @symbol ?minimizeBackgroundDownloads\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool minimizeBackgroundDownloads() const; /** - * @symbol ?multiplayerRequiresPremiumAccess\@AppPlatform\@\@UEBA_NXZ + * @symbol ?multiplayerRequiresPremiumAccess\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool multiplayerRequiresPremiumAccess() const; /** - * @symbol ?multiplayerRequiresUGCEnabled\@AppPlatform\@\@UEBA_NXZ + * @symbol ?multiplayerRequiresUGCEnabled\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool multiplayerRequiresUGCEnabled() const; /** - * @symbol ?notifyControllerConnectionStateChange\@AppPlatform\@\@UEBA_NXZ + * @symbol ?notifyControllerConnectionStateChange\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool notifyControllerConnectionStateChange() const; /** - * @symbol ?notifyNetworkConfigurationChanged\@AppPlatform\@\@UEAAXXZ + * @symbol ?notifyNetworkConfigurationChanged\@AppPlatform\@\@UEAAXXZ */ MCVAPI void notifyNetworkConfigurationChanged(); /** - * @symbol ?onPrimaryUserNetworkReady\@AppPlatform\@\@UEAAXXZ + * @symbol ?onPrimaryUserNetworkReady\@AppPlatform\@\@UEAAXXZ */ MCVAPI void onPrimaryUserNetworkReady(); /** - * @symbol ?platformRequiresControllerApplet\@AppPlatform\@\@UEBA_NXZ + * @symbol ?platformRequiresControllerApplet\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool platformRequiresControllerApplet() const; /** - * @symbol ?readAssetFile\@AppPlatform\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?readAssetFile\@AppPlatform\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCVAPI std::string readAssetFile(class Core::Path const &); /** - * @symbol ?registerExperimentsActiveCrashDump\@AppPlatform\@\@UEBAXAEBV?$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 ?registerExperimentsActiveCrashDump\@AppPlatform\@\@UEBAXAEBV?$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 */ MCVAPI void registerExperimentsActiveCrashDump(std::vector const &) const; /** - * @symbol ?registerFileForCollectionWithCrashDump\@AppPlatform\@\@UEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?registerFileForCollectionWithCrashDump\@AppPlatform\@\@UEAAXAEBVPath\@Core\@\@\@Z */ MCVAPI void registerFileForCollectionWithCrashDump(class Core::Path const &); /** - * @symbol ?reloadRenderResourcesOnResume\@AppPlatform\@\@UEBA_NXZ + * @symbol ?reloadRenderResourcesOnResume\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool reloadRenderResourcesOnResume() const; /** - * @symbol ?removeListener\@AppPlatform\@\@UEAAXPEAVAppPlatformListener\@\@\@Z + * @symbol ?removeListener\@AppPlatform\@\@UEAAXPEAVAppPlatformListener\@\@\@Z */ MCVAPI void removeListener(class AppPlatformListener *); /** - * @symbol ?requireControllerAtStartup\@AppPlatform\@\@UEBA_NXZ + * @symbol ?requireControllerAtStartup\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool requireControllerAtStartup() const; /** - * @symbol ?requiresAutoSaveIconExplanationPopup\@AppPlatform\@\@UEBA_NXZ + * @symbol ?requiresAutoSaveIconExplanationPopup\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool requiresAutoSaveIconExplanationPopup() const; /** - * @symbol ?requiresLiveGoldForMultiplayer\@AppPlatform\@\@UEBA_NXZ + * @symbol ?requiresLiveGoldForMultiplayer\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool requiresLiveGoldForMultiplayer() const; /** - * @symbol ?requiresPatchNoticePopup\@AppPlatform\@\@UEBA_NXZ + * @symbol ?requiresPatchNoticePopup\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool requiresPatchNoticePopup() const; /** - * @symbol ?requiresXboxLiveSigninToPlay\@AppPlatform\@\@UEBA_NXZ + * @symbol ?requiresXboxLiveSigninToPlay\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool requiresXboxLiveSigninToPlay() const; /** - * @symbol ?restartApp\@AppPlatform\@\@UEAAX_N\@Z + * @symbol ?restartApp\@AppPlatform\@\@UEAAX_N\@Z */ MCVAPI void restartApp(bool); /** - * @symbol ?restartRequested\@AppPlatform\@\@UEAA_NXZ + * @symbol ?restartRequested\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool restartRequested(); /** - * @symbol ?setARVRPlatform\@AppPlatform\@\@UEAAXW4ARVRPlatform\@\@\@Z + * @symbol ?setARVRPlatform\@AppPlatform\@\@UEAAXW4ARVRPlatform\@\@\@Z */ MCVAPI void setARVRPlatform(enum class ARVRPlatform); /** - * @symbol ?setDpi\@AppPlatform\@\@UEAAXH\@Z + * @symbol ?setDpi\@AppPlatform\@\@UEAAXH\@Z */ MCVAPI void setDpi(int); /** - * @symbol ?setFullscreenMode\@AppPlatform\@\@UEAAXW4FullscreenMode\@\@\@Z + * @symbol ?setFullscreenMode\@AppPlatform\@\@UEAAXW4FullscreenMode\@\@\@Z */ MCVAPI void setFullscreenMode(enum class FullscreenMode); /** - * @symbol ?setKeepScreenOnFlag\@AppPlatform\@\@UEAAX_N\@Z + * @symbol ?setKeepScreenOnFlag\@AppPlatform\@\@UEAAX_N\@Z */ MCVAPI void setKeepScreenOnFlag(bool); /** - * @symbol ?setNetworkAllowed\@AppPlatform\@\@UEAAX_N\@Z + * @symbol ?setNetworkAllowed\@AppPlatform\@\@UEAAX_N\@Z */ MCVAPI void setNetworkAllowed(bool); /** - * @symbol ?setNetworkConnectionType\@AppPlatform\@\@UEAAXW4NetworkConnectionType\@\@\@Z + * @symbol ?setNetworkConnectionType\@AppPlatform\@\@UEAAXW4NetworkConnectionType\@\@\@Z */ MCVAPI void setNetworkConnectionType(enum class NetworkConnectionType); /** - * @symbol ?setScreenSize\@AppPlatform\@\@UEAAXHH\@Z + * @symbol ?setScreenSize\@AppPlatform\@\@UEAAXHH\@Z */ MCVAPI void setScreenSize(int, int); /** - * @symbol ?setSecureStorageKey\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSecureStorageKey\@\@\@Z + * @symbol ?setSecureStorageKey\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSecureStorageKey\@\@\@Z */ MCVAPI void setSecureStorageKey(std::string const &, class SecureStorageKey const &); /** - * @symbol ?setSleepEnabled\@AppPlatform\@\@UEAAX_N\@Z + * @symbol ?setSleepEnabled\@AppPlatform\@\@UEAAX_N\@Z */ MCVAPI void setSleepEnabled(bool); /** - * @symbol ?setThreadsFrozen\@AppPlatform\@\@UEAAX_N\@Z + * @symbol ?setThreadsFrozen\@AppPlatform\@\@UEAAX_N\@Z */ MCVAPI void setThreadsFrozen(bool); /** - * @symbol ?setUIScalingRules\@AppPlatform\@\@UEAAXW4UIScalingRules\@\@\@Z + * @symbol ?setUIScalingRules\@AppPlatform\@\@UEAAXW4UIScalingRules\@\@\@Z */ MCVAPI void setUIScalingRules(enum class UIScalingRules); /** - * @symbol ?setVRControllerType\@AppPlatform\@\@UEAAXW4VRControllerType\@\@\@Z + * @symbol ?setVRControllerType\@AppPlatform\@\@UEAAXW4VRControllerType\@\@\@Z */ MCVAPI void setVRControllerType(enum class VRControllerType); /** - * @symbol ?setWindowSize\@AppPlatform\@\@UEAAXHH\@Z + * @symbol ?setWindowSize\@AppPlatform\@\@UEAAXHH\@Z */ MCVAPI void setWindowSize(int, int); /** - * @symbol ?setWindowText\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setWindowText\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void setWindowText(std::string const &); /** - * @symbol ?shouldPauseDownloadsWhenEnterGame\@AppPlatform\@\@UEBA_NXZ + * @symbol ?shouldPauseDownloadsWhenEnterGame\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool shouldPauseDownloadsWhenEnterGame() const; /** - * @symbol ?shouldRegisterForXboxLiveNotifications\@AppPlatform\@\@UEBA_NXZ + * @symbol ?shouldRegisterForXboxLiveNotifications\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool shouldRegisterForXboxLiveNotifications() const; /** - * @symbol ?shouldRemoveGraphicsDeviceOnAppTermination\@AppPlatform\@\@UEBA_NXZ + * @symbol ?shouldRemoveGraphicsDeviceOnAppTermination\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool shouldRemoveGraphicsDeviceOnAppTermination() const; /** - * @symbol ?showDialog\@AppPlatform\@\@UEAAXH\@Z + * @symbol ?showDialog\@AppPlatform\@\@UEAAXH\@Z */ MCVAPI void showDialog(int); /** - * @symbol ?showPlatformEmptyStoreDialog\@AppPlatform\@\@UEAAX$$QEAV?$function\@$$A6AX_N\@Z\@std\@\@\@Z + * @symbol ?showPlatformEmptyStoreDialog\@AppPlatform\@\@UEAAX$$QEAV?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ MCVAPI void showPlatformEmptyStoreDialog(class std::function &&); /** - * @symbol ?showPlatformStoreIcon\@AppPlatform\@\@UEAAX_N\@Z + * @symbol ?showPlatformStoreIcon\@AppPlatform\@\@UEAAX_N\@Z */ MCVAPI void showPlatformStoreIcon(bool); /** - * @symbol ?supportsAutoSaveOnDBCompaction\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsAutoSaveOnDBCompaction\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsAutoSaveOnDBCompaction() const; /** - * @symbol ?supportsClientUpdate\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsClientUpdate\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsClientUpdate() const; /** - * @symbol ?supportsDayOneExperience\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsDayOneExperience\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsDayOneExperience() const; /** - * @symbol ?supportsFliteTTS\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsFliteTTS\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsFliteTTS() const; /** - * @symbol ?supportsInPackageRecursion\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsInPackageRecursion\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsInPackageRecursion() const; /** - * @symbol ?supportsLaunchingLegacyVersion\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsLaunchingLegacyVersion\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsLaunchingLegacyVersion() const; /** - * @symbol ?supportsLegacySinglePremiumCacheDirectory\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsLegacySinglePremiumCacheDirectory\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsLegacySinglePremiumCacheDirectory() const; /** - * @symbol ?supportsVRModeSwap\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsVRModeSwap\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsVRModeSwap() const; /** - * @symbol ?supportsVibration\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsVibration\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsVibration() const; /** - * @symbol ?supportsWorldShare\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsWorldShare\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsWorldShare() const; /** - * @symbol ?supportsXboxLiveAchievements\@AppPlatform\@\@UEBA_NXZ + * @symbol ?supportsXboxLiveAchievements\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool supportsXboxLiveAchievements() const; /** - * @symbol ?teardown\@AppPlatform\@\@UEAAXXZ + * @symbol ?teardown\@AppPlatform\@\@UEAAXXZ */ MCVAPI void teardown(); /** - * @symbol ?trackPurchaseEvent\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000000\@Z + * @symbol ?trackPurchaseEvent\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000000\@Z */ MCVAPI void trackPurchaseEvent(std::string const &, std::string const &, std::string const &, std::string const &, std::string const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ?tryEnterVRMode\@AppPlatform\@\@UEAAX_NV?$function\@$$A6AX_N\@Z\@std\@\@\@Z + * @symbol ?tryEnterVRMode\@AppPlatform\@\@UEAAX_NV?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ MCVAPI void tryEnterVRMode(bool, class std::function); /** - * @symbol ?updateLocalization\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?updateLocalization\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void updateLocalization(std::string const &); /** - * @symbol ?updateTextBoxText\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?updateTextBoxText\@AppPlatform\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void updateTextBoxText(std::string const &); /** - * @symbol ?useAppPlatformForTelemetryIPAddress\@AppPlatform\@\@UEAA_NXZ + * @symbol ?useAppPlatformForTelemetryIPAddress\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool useAppPlatformForTelemetryIPAddress(); /** - * @symbol ?useNativeStoreForRealmsPurchase\@AppPlatform\@\@UEAA_NXZ + * @symbol ?useNativeStoreForRealmsPurchase\@AppPlatform\@\@UEAA_NXZ */ MCVAPI bool useNativeStoreForRealmsPurchase(); /** - * @symbol ?usePlatformProfilePicturesOnly\@AppPlatform\@\@UEBA_NXZ + * @symbol ?usePlatformProfilePicturesOnly\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool usePlatformProfilePicturesOnly() const; /** - * @symbol ?useXboxControlHelpers\@AppPlatform\@\@UEBA_NXZ + * @symbol ?useXboxControlHelpers\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool useXboxControlHelpers() const; /** - * @symbol ?usesAsyncOptionSaving\@AppPlatform\@\@UEBA_NXZ + * @symbol ?usesAsyncOptionSaving\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool usesAsyncOptionSaving() const; /** - * @symbol ?usesHDRBrightness\@AppPlatform\@\@UEBA_NXZ + * @symbol ?usesHDRBrightness\@AppPlatform\@\@UEBA_NXZ */ MCVAPI bool usesHDRBrightness() const; /** - * @symbol ?vibrate\@AppPlatform\@\@UEAAXH\@Z + * @symbol ?vibrate\@AppPlatform\@\@UEAAXH\@Z */ MCVAPI void vibrate(int); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~AppPlatform(); #endif /** - * @symbol ??0AppPlatform\@\@QEAA\@_N\@Z + * @symbol ??0AppPlatform\@\@QEAA\@_N\@Z */ MCAPI AppPlatform(bool); /** - * @symbol ?_fireAppTerminated\@AppPlatform\@\@QEAAXXZ + * @symbol ?_fireAppTerminated\@AppPlatform\@\@QEAAXXZ */ MCAPI void _fireAppTerminated(); /** - * @symbol ?accessPlatformRuntimeInformation_Shim\@AppPlatform\@\@QEAAAEAV?$unique_ptr\@UPlatformRuntimeInfo\@Bedrock\@\@U?$default_delete\@UPlatformRuntimeInfo\@Bedrock\@\@\@std\@\@\@std\@\@XZ + * @symbol ?accessPlatformRuntimeInformation_Shim\@AppPlatform\@\@QEAAAEAV?$unique_ptr\@UPlatformRuntimeInfo\@Bedrock\@\@U?$default_delete\@UPlatformRuntimeInfo\@Bedrock\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr & accessPlatformRuntimeInformation_Shim(); /** - * @symbol ?getCurrentStoragePath\@AppPlatform\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getCurrentStoragePath\@AppPlatform\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getCurrentStoragePath() const; /** - * @symbol ?getInternalStoragePath\@AppPlatform\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getInternalStoragePath\@AppPlatform\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getInternalStoragePath() const; /** - * @symbol ?getPlatformRuntimeInformation\@AppPlatform\@\@QEBAAEBV?$unique_ptr\@UPlatformRuntimeInfo\@Bedrock\@\@U?$default_delete\@UPlatformRuntimeInfo\@Bedrock\@\@\@std\@\@\@std\@\@XZ + * @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 + * @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 + * @symbol ?getScratchPath\@AppPlatform\@\@QEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getScratchPath(); /** - * @symbol ?getUserdataPath\@AppPlatform\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getUserdataPath\@AppPlatform\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getUserdataPath() const; /** - * @symbol ?isTerminating\@AppPlatform\@\@QEBA_NXZ + * @symbol ?isTerminating\@AppPlatform\@\@QEBA_NXZ */ MCAPI bool isTerminating() const; /** - * @symbol ?notifyUserStorageInitialized\@AppPlatform\@\@QEAAXXZ + * @symbol ?notifyUserStorageInitialized\@AppPlatform\@\@QEAAXXZ */ MCAPI void notifyUserStorageInitialized(); /** - * @symbol ?HOME_PATH\@AppPlatform\@\@2V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B + * @symbol ?HOME_PATH\@AppPlatform\@\@2V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer> const HOME_PATH; /** - * @symbol ?LOG_PATH\@AppPlatform\@\@2V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B + * @symbol ?LOG_PATH\@AppPlatform\@\@2V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer> const LOG_PATH; /** - * @symbol ?SETTINGS_PATH\@AppPlatform\@\@2V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B + * @symbol ?SETTINGS_PATH\@AppPlatform\@\@2V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer> const SETTINGS_PATH; @@ -944,20 +952,20 @@ struct AndroidScopedStorageInfo { //private: /** - * @symbol ?_initializeLoadProfiler\@AppPlatform\@\@AEAAXXZ + * @symbol ?_initializeLoadProfiler\@AppPlatform\@\@AEAAXXZ */ MCAPI void _initializeLoadProfiler(); protected: /** - * @symbol ?SHADERCACHE_PATH\@AppPlatform\@\@1V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B + * @symbol ?SHADERCACHE_PATH\@AppPlatform\@\@1V?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer> const SHADERCACHE_PATH; private: /** - * @symbol ?mIsInitialized\@AppPlatform\@\@0_NA + * @symbol ?mIsInitialized\@AppPlatform\@\@0_NA */ MCAPI static bool mIsInitialized; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppPlatformListener.hpp b/LiteLoader/include/llapi/mc/AppPlatformListener.hpp index 521a76488a..b09fe3a6f3 100644 --- a/LiteLoader/include/llapi/mc/AppPlatformListener.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformListener.hpp @@ -25,86 +25,99 @@ class AppPlatformListener { public: class AppPlatformListener& operator=(class AppPlatformListener const &) = delete; AppPlatformListener(class AppPlatformListener const &) = delete; + AppPlatformListener() = delete; #endif public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_APPPLATFORMLISTENER /** - * @symbol ?onAppFocusGained\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppFocusGained\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppFocusGained(); /** - * @symbol ?onAppFocusLost\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppFocusLost\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppFocusLost(); /** - * @symbol ?onAppPaused\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppPaused\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppPaused(); /** - * @symbol ?onAppPreSuspended\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppPreSuspended\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppPreSuspended(); /** - * @symbol ?onAppResumed\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppResumed\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppResumed(); /** - * @symbol ?onAppSuspended\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppSurfaceCreated\@AppPlatformListener\@\@UEAAXXZ + */ + MCVAPI void onAppSurfaceCreated(); + /** + * @symbol ?onAppSurfaceDestroyed\@AppPlatformListener\@\@UEAAXXZ + */ + MCVAPI void onAppSurfaceDestroyed(); + /** + * @symbol ?onAppSuspended\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppSuspended(); /** - * @symbol ?onAppTerminated\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppTerminated\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppTerminated(); /** - * @symbol ?onAppUnpaused\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onAppUnpaused\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onAppUnpaused(); /** - * @symbol ?onClipboardCopy\@AppPlatformListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onClipboardCopy\@AppPlatformListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onClipboardCopy(std::string const &); /** - * @symbol ?onClipboardPaste\@AppPlatformListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onClipboardPaste\@AppPlatformListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onClipboardPaste(std::string const &); /** - * @symbol ?onDeviceLost\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onDeviceLost\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onDeviceLost(); /** - * @symbol ?onLowMemory\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onLowMemory\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onLowMemory(); /** - * @symbol ?onOperationModeChanged\@AppPlatformListener\@\@UEAAXW4OperationMode\@\@\@Z + * @symbol ?onOperationModeChanged\@AppPlatformListener\@\@UEAAXW4OperationMode\@\@\@Z */ MCVAPI void onOperationModeChanged(enum class OperationMode); /** - * @symbol ?onPerformanceModeChanged\@AppPlatformListener\@\@UEAAX_N\@Z + * @symbol ?onPerformanceModeChanged\@AppPlatformListener\@\@UEAAX_N\@Z */ MCVAPI void onPerformanceModeChanged(bool); /** - * @symbol ?onPushNotificationReceived\@AppPlatformListener\@\@UEAAXAEBVPushNotificationMessage\@\@\@Z + * @symbol ?onPushNotificationReceived\@AppPlatformListener\@\@UEAAXAEBVPushNotificationMessage\@\@\@Z */ MCVAPI void onPushNotificationReceived(class PushNotificationMessage const &); /** - * @symbol ?onResizeBegin\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onResizeBegin\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onResizeBegin(); /** - * @symbol ?onResizeEnd\@AppPlatformListener\@\@UEAAXXZ + * @symbol ?onResizeEnd\@AppPlatformListener\@\@UEAAXXZ */ MCVAPI void onResizeEnd(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AppPlatformListener(); #endif /** - * @symbol ??0AppPlatformListener\@\@QEAA\@XZ + * @symbol ??0AppPlatformListener\@\@QEAA\@_N\@Z */ - MCAPI AppPlatformListener(); + MCAPI AppPlatformListener(bool); /** - * @symbol ?terminate\@AppPlatformListener\@\@QEAAXXZ + * @symbol ?terminate\@AppPlatformListener\@\@QEAAXXZ */ MCAPI void terminate(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp b/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp index 4a5590207c..15e7e50152 100644 --- a/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformNetworkSettings.hpp @@ -27,18 +27,18 @@ class AppPlatformNetworkSettings { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AppPlatformNetworkSettings(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?requiresNetworkOutageMessaging\@AppPlatformNetworkSettings\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?requiresNetworkOutageMessaging\@AppPlatformNetworkSettings\@\@UEBA_NXZ */ virtual bool requiresNetworkOutageMessaging() const; /** - * @symbol ??0AppPlatformNetworkSettings\@\@QEAA\@XZ + * @symbol ??0AppPlatformNetworkSettings\@\@QEAA\@XZ */ MCAPI AppPlatformNetworkSettings(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp b/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp index 11040459d8..c95090c20f 100644 --- a/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatformWindows.hpp @@ -30,93 +30,93 @@ class AppPlatformWindows { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_APPPLATFORMWINDOWS /** - * @symbol ?_getCurrentStoragePath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?_getCurrentStoragePath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer _getCurrentStoragePath() const; /** - * @symbol ?_getExternalStoragePath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?_getExternalStoragePath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer _getExternalStoragePath() const; /** - * @symbol ?_getInternalStoragePath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?_getInternalStoragePath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer _getInternalStoragePath() const; /** - * @symbol ?_getUserdataPath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?_getUserdataPath\@AppPlatformWindows\@\@EEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer _getUserdataPath() const; /** - * @symbol ?allowContentLogWriteToDisk\@AppPlatformWindows\@\@UEAA_NXZ + * @symbol ?allowContentLogWriteToDisk\@AppPlatformWindows\@\@UEAA_NXZ */ MCVAPI bool allowContentLogWriteToDisk(); /** - * @symbol ?calculateAvailableDiskFreeSpace\@AppPlatformWindows\@\@UEAA_KAEBVPath\@Core\@\@\@Z + * @symbol ?calculateAvailableDiskFreeSpace\@AppPlatformWindows\@\@UEAA_KAEBVPath\@Core\@\@\@Z */ MCVAPI unsigned __int64 calculateAvailableDiskFreeSpace(class Core::Path const &); /** - * @symbol ?canAppSelfTerminate\@AppPlatformWindows\@\@UEBA_NXZ + * @symbol ?canAppSelfTerminate\@AppPlatformWindows\@\@UEBA_NXZ */ MCVAPI bool canAppSelfTerminate() const; /** - * @symbol ?copyImportFileToTempFolder\@AppPlatformWindows\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?copyImportFileToTempFolder\@AppPlatformWindows\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCVAPI class Core::PathBuffer copyImportFileToTempFolder(class Core::Path const &); /** - * @symbol ?getHighPerformanceThreadsCount\@AppPlatformWindows\@\@UEBA_KXZ + * @symbol ?getHighPerformanceThreadsCount\@AppPlatformWindows\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getHighPerformanceThreadsCount() const; /** - * @symbol ?getMainThreadQueue\@AppPlatformWindows\@\@UEAAAEAV?$MPMCQueue\@V?$function\@$$A6AXXZ\@std\@\@\@\@XZ + * @symbol ?getMainThreadQueue\@AppPlatformWindows\@\@UEAAAEAV?$MPMCQueue\@V?$function\@$$A6AXXZ\@std\@\@\@\@XZ */ MCVAPI class MPMCQueue> & getMainThreadQueue(); /** - * @symbol ?getPackagedShaderCachePath\@AppPlatformWindows\@\@MEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getPackagedShaderCachePath\@AppPlatformWindows\@\@MEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getPackagedShaderCachePath(); /** - * @symbol ?getPlatformTTSEnabled\@AppPlatformWindows\@\@UEBA_NXZ + * @symbol ?getPlatformTTSEnabled\@AppPlatformWindows\@\@UEBA_NXZ */ MCVAPI bool getPlatformTTSEnabled() const; /** - * @symbol ?getPlatformTTSExists\@AppPlatformWindows\@\@UEBA_NXZ + * @symbol ?getPlatformTTSExists\@AppPlatformWindows\@\@UEBA_NXZ */ MCVAPI bool getPlatformTTSExists() const; /** - * @symbol ?getPlatformTempPath\@AppPlatformWindows\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getPlatformTempPath\@AppPlatformWindows\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getPlatformTempPath() const; /** - * @symbol ?getTotalHardwareThreadsCount\@AppPlatformWindows\@\@UEBA_KXZ + * @symbol ?getTotalHardwareThreadsCount\@AppPlatformWindows\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getTotalHardwareThreadsCount() const; /** - * @symbol ?queueForMainThread_DEPRECATED\@AppPlatformWindows\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?queueForMainThread_DEPRECATED\@AppPlatformWindows\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCVAPI void queueForMainThread_DEPRECATED(class std::function); /** - * @symbol ?registerExperimentsActiveCrashDump\@AppPlatformWindows\@\@UEBAXAEBV?$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 ?registerExperimentsActiveCrashDump\@AppPlatformWindows\@\@UEBAXAEBV?$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 */ MCVAPI void registerExperimentsActiveCrashDump(std::vector const &) const; /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~AppPlatformWindows(); #endif /** - * @symbol ??0AppPlatformWindows\@\@QEAA\@XZ + * @symbol ??0AppPlatformWindows\@\@QEAA\@XZ */ MCAPI AppPlatformWindows(); /** - * @symbol ?EXPERIMENTS_ACTIVE_KEY\@AppPlatformWindows\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXPERIMENTS_ACTIVE_KEY\@AppPlatformWindows\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXPERIMENTS_ACTIVE_KEY; //protected: /** - * @symbol ?_findHighPerformanceThreadsCount\@AppPlatformWindows\@\@IEBA_KXZ + * @symbol ?_findHighPerformanceThreadsCount\@AppPlatformWindows\@\@IEBA_KXZ */ MCAPI unsigned __int64 _findHighPerformanceThreadsCount() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp b/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp index 0a9e42b038..cca01b89d0 100644 --- a/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp +++ b/LiteLoader/include/llapi/mc/AppPlatform_win32.hpp @@ -31,205 +31,205 @@ class AppPlatform_win32 { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_APPPLATFORM_WIN32 /** - * @symbol ?canLaunchUri\@AppPlatform_win32\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?canLaunchUri\@AppPlatform_win32\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool canLaunchUri(std::string const &); /** - * @symbol ?copyImportFileToTempFolder\@AppPlatform_win32\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?copyImportFileToTempFolder\@AppPlatform_win32\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCVAPI class Core::PathBuffer copyImportFileToTempFolder(class Core::Path const &); /** - * @symbol ?createWebview\@AppPlatform_win32\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z + * @symbol ?createWebview\@AppPlatform_win32\@\@UEBA?AV?$shared_ptr\@VWebviewInterface\@\@\@std\@\@$$QEAVPlatformArguments\@Webview\@\@\@Z */ MCVAPI class std::shared_ptr createWebview(class Webview::PlatformArguments &&) const; /** - * @symbol ?getApplicationId\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getApplicationId\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getApplicationId() const; /** - * @symbol ?getAssetFileFullPath\@AppPlatform_win32\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?getAssetFileFullPath\@AppPlatform_win32\@\@UEAA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCVAPI class Core::PathBuffer getAssetFileFullPath(class Core::Path const &); /** - * @symbol ?getBuildPlatform\@AppPlatform_win32\@\@UEBA?AW4BuildPlatform\@\@XZ + * @symbol ?getBuildPlatform\@AppPlatform_win32\@\@UEBA?AW4BuildPlatform\@\@XZ */ MCVAPI enum class BuildPlatform getBuildPlatform() const; /** - * @symbol ?getDisplayHeight\@AppPlatform_win32\@\@UEAAHXZ + * @symbol ?getDisplayHeight\@AppPlatform_win32\@\@UEAAHXZ */ MCVAPI int getDisplayHeight(); /** - * @symbol ?getDisplayWidth\@AppPlatform_win32\@\@UEAAHXZ + * @symbol ?getDisplayWidth\@AppPlatform_win32\@\@UEAAHXZ */ MCVAPI int getDisplayWidth(); /** - * @symbol ?getEdition\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEdition\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getEdition() const; /** - * @symbol ?getFreeMemory\@AppPlatform_win32\@\@UEBA_KXZ + * @symbol ?getFreeMemory\@AppPlatform_win32\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getFreeMemory() const; /** - * @symbol ?getLoggingPath\@AppPlatform_win32\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getLoggingPath\@AppPlatform_win32\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getLoggingPath() const; /** - * @symbol ?getMemoryLimit\@AppPlatform_win32\@\@UEBA_KXZ + * @symbol ?getMemoryLimit\@AppPlatform_win32\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getMemoryLimit() const; /** - * @symbol ?getModelName\@AppPlatform_win32\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModelName\@AppPlatform_win32\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getModelName(); /** - * @symbol ?getOSVersion\@AppPlatform_win32\@\@UEBA?AW4OsVersion\@\@XZ + * @symbol ?getOSVersion\@AppPlatform_win32\@\@UEBA?AW4OsVersion\@\@XZ */ MCVAPI enum class OsVersion getOSVersion() const; /** - * @symbol ?getPackageFamilyName\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPackageFamilyName\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getPackageFamilyName() const; /** - * @symbol ?getPackagePath\@AppPlatform_win32\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getPackagePath\@AppPlatform_win32\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getPackagePath() const; /** - * @symbol ?getPixelsPerMillimeter\@AppPlatform_win32\@\@UEAAMXZ + * @symbol ?getPixelsPerMillimeter\@AppPlatform_win32\@\@UEAAMXZ */ MCVAPI float getPixelsPerMillimeter(); /** - * @symbol ?getPlatformString\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlatformString\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getPlatformString() const; /** - * @symbol ?getPlatformTTSEnabled\@AppPlatform_win32\@\@UEBA_NXZ + * @symbol ?getPlatformTTSEnabled\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool getPlatformTTSEnabled() const; /** - * @symbol ?getPlatformType\@AppPlatform_win32\@\@UEBA?AW4PlatformType\@\@XZ + * @symbol ?getPlatformType\@AppPlatform_win32\@\@UEBA?AW4PlatformType\@\@XZ */ MCVAPI enum class PlatformType getPlatformType() const; /** - * @symbol ?getPlatformUIScalingRules\@AppPlatform_win32\@\@EEBA?AW4UIScalingRules\@\@XZ + * @symbol ?getPlatformUIScalingRules\@AppPlatform_win32\@\@EEBA?AW4UIScalingRules\@\@XZ */ MCVAPI enum class UIScalingRules getPlatformUIScalingRules() const; /** - * @symbol ?getRenderSurfaceParameters\@AppPlatform_win32\@\@UEBA?AV?$variant\@PEAUHWND__\@\@Umonostate\@std\@\@\@std\@\@XZ + * @symbol ?getRenderSurfaceParameters\@AppPlatform_win32\@\@UEBA?AV?$variant\@PEAUHWND__\@\@Umonostate\@std\@\@\@std\@\@XZ */ MCVAPI class std::variant getRenderSurfaceParameters() const; /** - * @symbol ?getScreenHeight\@AppPlatform_win32\@\@UEBAHXZ + * @symbol ?getScreenHeight\@AppPlatform_win32\@\@UEBAHXZ */ MCVAPI int getScreenHeight() const; /** - * @symbol ?getScreenWidth\@AppPlatform_win32\@\@UEBAHXZ + * @symbol ?getScreenWidth\@AppPlatform_win32\@\@UEBAHXZ */ MCVAPI int getScreenWidth() const; /** - * @symbol ?getSecureStorage\@AppPlatform_win32\@\@UEAA?AV?$unique_ptr\@VSecureStorage\@\@U?$default_delete\@VSecureStorage\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSecureStorage\@AppPlatform_win32\@\@UEAA?AV?$unique_ptr\@VSecureStorage\@\@U?$default_delete\@VSecureStorage\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr getSecureStorage(); /** - * @symbol ?getSecureStorageKey\@AppPlatform_win32\@\@UEAA?AVSecureStorageKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getSecureStorageKey\@AppPlatform_win32\@\@UEAA?AVSecureStorageKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class SecureStorageKey getSecureStorageKey(std::string const &); /** - * @symbol ?getSubPlatformString\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSubPlatformString\@AppPlatform_win32\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getSubPlatformString() const; /** - * @symbol ?getTotalPhysicalMemory\@AppPlatform_win32\@\@UEBA_KXZ + * @symbol ?getTotalPhysicalMemory\@AppPlatform_win32\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getTotalPhysicalMemory() const; /** - * @symbol ?getUsedMemory\@AppPlatform_win32\@\@UEAA_KXZ + * @symbol ?getUsedMemory\@AppPlatform_win32\@\@UEAA_KXZ */ MCVAPI unsigned __int64 getUsedMemory(); /** - * @symbol ?hasBuyButtonWhenInvalidLicense\@AppPlatform_win32\@\@UEAA_NXZ + * @symbol ?hasBuyButtonWhenInvalidLicense\@AppPlatform_win32\@\@UEAA_NXZ */ MCVAPI bool hasBuyButtonWhenInvalidLicense(); /** - * @symbol ?hasFastAlphaTest\@AppPlatform_win32\@\@UEBA_NXZ + * @symbol ?hasFastAlphaTest\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool hasFastAlphaTest() const; /** - * @symbol ?isCentennial\@AppPlatform_win32\@\@UEBA_NXZ + * @symbol ?isCentennial\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool isCentennial() const; /** - * @symbol ?isOnWifiConnectionTelemetryValue\@AppPlatform_win32\@\@UEAA?AV?$optional\@_N\@std\@\@XZ + * @symbol ?isOnWifiConnectionTelemetryValue\@AppPlatform_win32\@\@UEAA?AV?$optional\@_N\@std\@\@XZ */ MCVAPI class std::optional isOnWifiConnectionTelemetryValue(); /** - * @symbol ?isWebviewSupported\@AppPlatform_win32\@\@UEBA_NXZ + * @symbol ?isWebviewSupported\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool isWebviewSupported() const; /** - * @symbol ?launchUri\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?launchUri\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void launchUri(std::string const &); /** - * @symbol ?listAssetFilesIn\@AppPlatform_win32\@\@UEBA?AV?$set\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@U?$less\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@\@std\@\@AEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?listAssetFilesIn\@AppPlatform_win32\@\@UEBA?AV?$set\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@U?$less\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@\@std\@\@AEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCVAPI class std::set, struct std::less>, class std::allocator>> listAssetFilesIn(class Core::Path const &, std::string const &) const; /** - * @symbol ?readAssetFile\@AppPlatform_win32\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?readAssetFile\@AppPlatform_win32\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCVAPI std::string readAssetFile(class Core::Path const &); /** - * @symbol ?setFullscreenMode\@AppPlatform_win32\@\@UEAAXW4FullscreenMode\@\@\@Z + * @symbol ?setFullscreenMode\@AppPlatform_win32\@\@UEAAXW4FullscreenMode\@\@\@Z */ MCVAPI void setFullscreenMode(enum class FullscreenMode); /** - * @symbol ?setScreenSize\@AppPlatform_win32\@\@UEAAXHH\@Z + * @symbol ?setScreenSize\@AppPlatform_win32\@\@UEAAXHH\@Z */ MCVAPI void setScreenSize(int, int); /** - * @symbol ?setSecureStorageKey\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSecureStorageKey\@\@\@Z + * @symbol ?setSecureStorageKey\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSecureStorageKey\@\@\@Z */ MCVAPI void setSecureStorageKey(std::string const &, class SecureStorageKey const &); /** - * @symbol ?setWindowSize\@AppPlatform_win32\@\@UEAAXHH\@Z + * @symbol ?setWindowSize\@AppPlatform_win32\@\@UEAAXHH\@Z */ MCVAPI void setWindowSize(int, int); /** - * @symbol ?setWindowText\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setWindowText\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void setWindowText(std::string const &); /** - * @symbol ?supportsFliteTTS\@AppPlatform_win32\@\@UEBA_NXZ + * @symbol ?supportsFliteTTS\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool supportsFliteTTS() const; /** - * @symbol ?supportsVibration\@AppPlatform_win32\@\@UEBA_NXZ + * @symbol ?supportsVibration\@AppPlatform_win32\@\@UEBA_NXZ */ MCVAPI bool supportsVibration() const; /** - * @symbol ?updateTextBoxText\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?updateTextBoxText\@AppPlatform_win32\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void updateTextBoxText(std::string const &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~AppPlatform_win32(); #endif /** - * @symbol ??0AppPlatform_win32\@\@QEAA\@PEAUHWND__\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1V?$basic_string_span\@$$CBD$0?0\@gsl\@\@V?$shared_ptr\@VHIDController\@\@\@3\@HH\@Z + * @symbol ??0AppPlatform_win32\@\@QEAA\@PEAUHWND__\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@V?$shared_ptr\@VHIDController\@\@\@3\@HH\@Z */ - MCAPI AppPlatform_win32(struct HWND__*, std::string const &, std::string const &, class gsl::basic_string_span, class std::shared_ptr, int, int); + MCAPI AppPlatform_win32(struct HWND__*, std::string const &, std::string const &, class std::basic_string_view>, class std::shared_ptr, int, int); /** - * @symbol ?setupWorkingDirectory\@AppPlatform_win32\@\@SAXXZ + * @symbol ?setupWorkingDirectory\@AppPlatform_win32\@\@SAXXZ */ MCAPI static void setupWorkingDirectory(); //private: /** - * @symbol ?_fetchOSInformation\@AppPlatform_win32\@\@AEBA?AUOSInformation\@\@XZ + * @symbol ?_fetchOSInformation\@AppPlatform_win32\@\@AEBA?AUOSInformation\@\@XZ */ MCAPI struct OSInformation _fetchOSInformation() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ApplyDashSystem.hpp b/LiteLoader/include/llapi/mc/ApplyDashSystem.hpp index a2f8e83b61..2446efe7cf 100644 --- a/LiteLoader/include/llapi/mc/ApplyDashSystem.hpp +++ b/LiteLoader/include/llapi/mc/ApplyDashSystem.hpp @@ -25,8 +25,16 @@ class ApplyDashSystem { public: /** - * @symbol ?doDash\@ApplyDashSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUJumpPreventionResult\@\@AEBVBaseAttributeMap\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@MMMIAEAVVec3\@\@AEAMAEAVSynchedActorData\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDashCooldownTimerComponent\@\@\@\@\@Z + * @symbol ?create\@ApplyDashSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?doDash\@ApplyDashSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUJumpPreventionResult\@\@AEBVBaseAttributeMap\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@MMMIAEAVVec3\@\@AEAMAEAVSynchedActorData\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDashCooldownTimerComponent\@\@\@\@\@Z */ MCAPI static void doDash(class StrictEntityContext const &, struct JumpPreventionResult const &, class BaseAttributeMap const &, std::vector const &, float, float, float, unsigned int, class Vec3 &, float &, class SynchedActorData &, class EntityModifierT &); + /** + * @symbol ?tickApplyDashModifierSystem\@ApplyDashSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUTriggerJumpRequestComponent\@\@AEBVDashComponent\@\@AEBUAttributesComponent\@\@AEBUActorRotationComponent\@\@AEBUMobEffectsComponent\@\@AEAUStateVectorComponent\@\@AEAUJumpPendingScaleComponent\@\@AEAUSynchedActorDataComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UDashCooldownTimerComponent\@\@\@\@\@Z + */ + MCAPI static void tickApplyDashModifierSystem(class StrictEntityContext const &, struct TriggerJumpRequestComponent const &, class DashComponent const &, struct AttributesComponent const &, struct ActorRotationComponent const &, struct MobEffectsComponent const &, struct StateVectorComponent &, struct JumpPendingScaleComponent &, struct SynchedActorDataComponent &, class EntityModifierT &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp b/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp index 2e72c6cffc..d26d193cc3 100644 --- a/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/ApplyJumpModifierSystem.hpp @@ -25,8 +25,16 @@ class ApplyJumpModifierSystem { public: /** - * @symbol ?doPowerJump\@ApplyJumpModifierSystem\@\@SAXAEBUJumpPreventionResult\@\@AEBVBaseAttributeMap\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@MMAEAVVec3\@\@AEAM\@Z + * @symbol ?createApplyJumpModifierSystem\@ApplyJumpModifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createApplyJumpModifierSystem(); + /** + * @symbol ?doPowerJump\@ApplyJumpModifierSystem\@\@SAXAEBUJumpPreventionResult\@\@AEBVBaseAttributeMap\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@MMAEAVVec3\@\@AEAM\@Z */ MCAPI static void doPowerJump(struct JumpPreventionResult const &, class BaseAttributeMap const &, std::vector const &, float, float, class Vec3 &, float &); + /** + * @symbol ?tickApplyJumpModifierSystem\@ApplyJumpModifierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUTriggerJumpRequestComponent\@\@AEBUActorRotationComponent\@\@AEBUAttributesComponent\@\@AEBUMobEffectsComponent\@\@AEBUMobTravelComponent\@\@AEAUJumpPendingScaleComponent\@\@AEAUStateVectorComponent\@\@\@Z + */ + MCAPI static void tickApplyJumpModifierSystem(class StrictEntityContext const &, struct TriggerJumpRequestComponent const &, struct ActorRotationComponent const &, struct AttributesComponent const &, struct MobEffectsComponent const &, struct MobTravelComponent const &, struct JumpPendingScaleComponent &, struct StateVectorComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Aquifer.hpp b/LiteLoader/include/llapi/mc/Aquifer.hpp index 805ab46157..b7c6a325e8 100644 --- a/LiteLoader/include/llapi/mc/Aquifer.hpp +++ b/LiteLoader/include/llapi/mc/Aquifer.hpp @@ -36,40 +36,40 @@ struct FluidSample { public: /** - * @symbol ??0Aquifer\@\@QEAA\@AEBVChunkPos\@\@AEBVAquiferNoises\@\@AEBUOverworldNoises3d\@\@AEBVSurfaceLevelCache\@\@HHH\@Z + * @symbol ??0Aquifer\@\@QEAA\@AEBVChunkPos\@\@AEBVAquiferNoises\@\@AEBUOverworldNoises3d\@\@AEBVSurfaceLevelCache\@\@HHH\@Z */ MCAPI Aquifer(class ChunkPos const &, class AquiferNoises const &, struct OverworldNoises3d const &, class SurfaceLevelCache const &, int, int, int); /** - * @symbol ?computeAt\@Aquifer\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?computeAt\@Aquifer\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void computeAt(class BlockPos const &); /** - * @symbol ?getLastBarrier\@Aquifer\@\@QEBAMXZ + * @symbol ?getLastBarrier\@Aquifer\@\@QEBAMXZ */ MCAPI float getLastBarrier() const; /** - * @symbol ?getLastFluidBlockType\@Aquifer\@\@QEBAPEBVBlock\@\@_N\@Z + * @symbol ?getLastFluidBlockType\@Aquifer\@\@QEBAPEBVBlock\@\@_N\@Z */ MCAPI class Block const * getLastFluidBlockType(bool) const; /** - * @symbol ?getLastFluidLevel\@Aquifer\@\@QEBAHXZ + * @symbol ?getLastFluidLevel\@Aquifer\@\@QEBAHXZ */ MCAPI int getLastFluidLevel() const; /** - * @symbol ?shouldScheduleFluidUpdate\@Aquifer\@\@QEBA_NXZ + * @symbol ?shouldScheduleFluidUpdate\@Aquifer\@\@QEBA_NXZ */ MCAPI bool shouldScheduleFluidUpdate() const; //private: /** - * @symbol ?_computeAquifer\@Aquifer\@\@AEBA?AUFluidSample\@1\@AEBVBlockPos\@\@\@Z + * @symbol ?_computeAquifer\@Aquifer\@\@AEBA?AUFluidSample\@1\@AEBVBlockPos\@\@\@Z */ MCAPI struct Aquifer::FluidSample _computeAquifer(class BlockPos const &) const; private: /** - * @symbol ?chunkOffset\@Aquifer\@\@0V?$array\@U?$pair\@HH\@std\@\@$0N\@\@std\@\@B + * @symbol ?chunkOffset\@Aquifer\@\@0V?$array\@U?$pair\@HH\@std\@\@$0N\@\@std\@\@B */ MCAPI static class std::array, 13> const chunkOffset; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AquiferNoises.hpp b/LiteLoader/include/llapi/mc/AquiferNoises.hpp index c88ba2a830..d529f817c2 100644 --- a/LiteLoader/include/llapi/mc/AquiferNoises.hpp +++ b/LiteLoader/include/llapi/mc/AquiferNoises.hpp @@ -29,24 +29,24 @@ class AquiferNoises { public: /** - * @symbol ??0AquiferNoises\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0AquiferNoises\@\@QEAA\@AEBV0\@\@Z */ MCAPI AquiferNoises(class AquiferNoises const &); /** - * @symbol ??1AquiferNoises\@\@QEAA\@XZ + * @symbol ??1AquiferNoises\@\@QEAA\@XZ */ MCAPI ~AquiferNoises(); /** - * @symbol ?make\@AquiferNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ?make\@AquiferNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI static class AquiferNoises make(class XoroshiroPositionalRandomFactory const &); //private: /** - * @symbol ??0AquiferNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000VXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ??0AquiferNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000VXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI AquiferNoises(class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class XoroshiroPositionalRandomFactory); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp b/LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp index 17539879d4..43b954e306 100644 --- a/LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ArbitraryBiomeComponent.hpp @@ -25,7 +25,7 @@ struct ArbitraryBiomeComponent { public: /** - * @symbol ??1ArbitraryBiomeComponent\@\@QEAA\@XZ + * @symbol ??1ArbitraryBiomeComponent\@\@QEAA\@XZ */ MCAPI ~ArbitraryBiomeComponent(); diff --git a/LiteLoader/include/llapi/mc/AreaAttackComponent.hpp b/LiteLoader/include/llapi/mc/AreaAttackComponent.hpp index 6a2cf4e43c..eea385dfdb 100644 --- a/LiteLoader/include/llapi/mc/AreaAttackComponent.hpp +++ b/LiteLoader/include/llapi/mc/AreaAttackComponent.hpp @@ -30,32 +30,32 @@ class AreaAttackComponent { public: /** - * @symbol ??0AreaAttackComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0AreaAttackComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI AreaAttackComponent(class AreaAttackComponent &&); /** - * @symbol ?addAdditionalSaveData\@AreaAttackComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@AreaAttackComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?findCooldownEntry\@AreaAttackComponent\@\@QEAAPEAU?$pair\@UActorUniqueID\@\@UTick\@\@\@std\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?findCooldownEntry\@AreaAttackComponent\@\@QEAAPEAU?$pair\@UActorUniqueID\@\@UTick\@\@\@std\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI struct std::pair * findCooldownEntry(struct ActorUniqueID const &); /** - * @symbol ?isEntryOnAttackCooldown\@AreaAttackComponent\@\@QEBA_NPEBU?$pair\@UActorUniqueID\@\@UTick\@\@\@std\@\@AEBUTick\@\@\@Z + * @symbol ?isEntryOnAttackCooldown\@AreaAttackComponent\@\@QEBA_NPEBU?$pair\@UActorUniqueID\@\@UTick\@\@\@std\@\@AEBUTick\@\@\@Z */ MCAPI bool isEntryOnAttackCooldown(struct std::pair const *, struct Tick const &) const; /** - * @symbol ??4AreaAttackComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4AreaAttackComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class AreaAttackComponent & operator=(class AreaAttackComponent &&); /** - * @symbol ?readAdditionalSaveData\@AreaAttackComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@AreaAttackComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ??1AreaAttackComponent\@\@QEAA\@XZ + * @symbol ??1AreaAttackComponent\@\@QEAA\@XZ */ MCAPI ~AreaAttackComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp b/LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp index c557541653..ffb444b8b6 100644 --- a/LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AreaAttackDefinition.hpp @@ -31,16 +31,16 @@ class AreaAttackDefinition { public: /** - * @symbol ?initialize\@AreaAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAreaAttackComponent\@\@\@Z + * @symbol ?initialize\@AreaAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAreaAttackComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AreaAttackComponent &) const; /** - * @symbol ?setDamageCause\@AreaAttackDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setDamageCause\@AreaAttackDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setDamageCause(std::string const &); /** - * @symbol ?buildSchema\@AreaAttackDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAreaAttackDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@AreaAttackDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAreaAttackDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AreaAttackSystem.hpp b/LiteLoader/include/llapi/mc/AreaAttackSystem.hpp index 21c059998b..2bad134c37 100644 --- a/LiteLoader/include/llapi/mc/AreaAttackSystem.hpp +++ b/LiteLoader/include/llapi/mc/AreaAttackSystem.hpp @@ -30,27 +30,27 @@ class AreaAttackSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AreaAttackSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AreaAttackSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AreaAttackSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@AreaAttackSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVAreaAttackComponent\@\@\@Z + * @symbol ?_tickComponent\@AreaAttackSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVAreaAttackComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class AreaAttackComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp index 8b9b1bcdba..63625d9e19 100644 --- a/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp +++ b/LiteLoader/include/llapi/mc/AreaEffectCloud.hpp @@ -31,219 +31,219 @@ class AreaEffectCloud : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@AreaEffectCloud\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@AreaEffectCloud\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~AreaEffectCloud(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@AreaEffectCloud\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@AreaEffectCloud\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@AreaEffectCloud\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@AreaEffectCloud\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 120 - * @symbol ?setOwner\@AreaEffectCloud\@\@UEAAXUActorUniqueID\@\@\@Z + * @vftbl 119 + * @symbol ?setOwner\@AreaEffectCloud\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void setOwner(struct ActorUniqueID); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@AreaEffectCloud\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@AreaEffectCloud\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@AreaEffectCloud\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@AreaEffectCloud\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0AreaEffectCloud\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0AreaEffectCloud\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI AreaEffectCloud(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?addAreaEffect\@AreaEffectCloud\@\@QEAAXVMobEffectInstance\@\@\@Z + * @symbol ?addAreaEffect\@AreaEffectCloud\@\@QEAAXVMobEffectInstance\@\@\@Z */ MCAPI void addAreaEffect(class MobEffectInstance); /** - * @symbol ?getDuration\@AreaEffectCloud\@\@QEBAHXZ + * @symbol ?getDuration\@AreaEffectCloud\@\@QEBAHXZ */ MCAPI int getDuration() const; /** - * @symbol ?getEffectiveRadius\@AreaEffectCloud\@\@QEBAMXZ + * @symbol ?getEffectiveRadius\@AreaEffectCloud\@\@QEBAMXZ */ MCAPI float getEffectiveRadius() const; /** - * @symbol ?getParticle\@AreaEffectCloud\@\@QEBA?AW4ParticleType\@\@XZ + * @symbol ?getParticle\@AreaEffectCloud\@\@QEBA?AW4ParticleType\@\@XZ */ MCAPI enum class ParticleType getParticle() const; /** - * @symbol ?notifyPickup\@AreaEffectCloud\@\@QEAAXXZ + * @symbol ?notifyPickup\@AreaEffectCloud\@\@QEAAXXZ */ MCAPI void notifyPickup(); /** - * @symbol ?setAffectOwner\@AreaEffectCloud\@\@QEAAX_N\@Z + * @symbol ?setAffectOwner\@AreaEffectCloud\@\@QEAAX_N\@Z */ MCAPI void setAffectOwner(bool); /** - * @symbol ?setDuration\@AreaEffectCloud\@\@QEAAXH\@Z + * @symbol ?setDuration\@AreaEffectCloud\@\@QEAAXH\@Z */ MCAPI void setDuration(int); /** - * @symbol ?setInitialRadius\@AreaEffectCloud\@\@QEAAXM\@Z + * @symbol ?setInitialRadius\@AreaEffectCloud\@\@QEAAXM\@Z */ MCAPI void setInitialRadius(float); /** - * @symbol ?setParticle\@AreaEffectCloud\@\@QEAAXW4ParticleType\@\@\@Z + * @symbol ?setParticle\@AreaEffectCloud\@\@QEAAXW4ParticleType\@\@\@Z */ MCAPI void setParticle(enum class ParticleType); /** - * @symbol ?setParticleColor\@AreaEffectCloud\@\@QEAAXAEAVColor\@mce\@\@\@Z + * @symbol ?setParticleColor\@AreaEffectCloud\@\@QEAAXAEAVColor\@mce\@\@\@Z */ MCAPI void setParticleColor(class mce::Color &); /** - * @symbol ?setPotion\@AreaEffectCloud\@\@QEAAXF\@Z + * @symbol ?setPotion\@AreaEffectCloud\@\@QEAAXF\@Z */ MCAPI void setPotion(short); /** - * @symbol ?setRadiusChangeOnPickup\@AreaEffectCloud\@\@QEAAXM\@Z + * @symbol ?setRadiusChangeOnPickup\@AreaEffectCloud\@\@QEAAXM\@Z */ MCAPI void setRadiusChangeOnPickup(float); /** - * @symbol ?setRadiusOnUse\@AreaEffectCloud\@\@QEAAXM\@Z + * @symbol ?setRadiusOnUse\@AreaEffectCloud\@\@QEAAXM\@Z */ MCAPI void setRadiusOnUse(float); /** - * @symbol ?setRadiusPerTick\@AreaEffectCloud\@\@QEAAXM\@Z + * @symbol ?setRadiusPerTick\@AreaEffectCloud\@\@QEAAXM\@Z */ MCAPI void setRadiusPerTick(float); /** - * @symbol ?setReapplicationDelay\@AreaEffectCloud\@\@QEAAXH\@Z + * @symbol ?setReapplicationDelay\@AreaEffectCloud\@\@QEAAXH\@Z */ MCAPI void setReapplicationDelay(int); //private: /** - * @symbol ?_getTicksAlive\@AreaEffectCloud\@\@AEBA_JXZ + * @symbol ?_getTicksAlive\@AreaEffectCloud\@\@AEBA_JXZ */ MCAPI __int64 _getTicksAlive() const; /** - * @symbol ?_setSpawnTick\@AreaEffectCloud\@\@AEAAX_J\@Z + * @symbol ?_setSpawnTick\@AreaEffectCloud\@\@AEAAX_J\@Z */ MCAPI void _setSpawnTick(__int64); /** - * @symbol ?_spawnParticles\@AreaEffectCloud\@\@AEAAXAEAVRandom\@\@IM\@Z + * @symbol ?_spawnParticles\@AreaEffectCloud\@\@AEAAXAEAVRandom\@\@IM\@Z */ MCAPI void _spawnParticles(class Random &, unsigned int, float); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArmorContainerValidation.hpp b/LiteLoader/include/llapi/mc/ArmorContainerValidation.hpp index 1a2baff950..11808ea8e2 100644 --- a/LiteLoader/include/llapi/mc/ArmorContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/ArmorContainerValidation.hpp @@ -31,54 +31,54 @@ class ArmorContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ArmorContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@ArmorContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@ArmorContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ArmorContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ArmorContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@ArmorContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@ArmorContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@ArmorContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@ArmorContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ArmorContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ArmorContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@ArmorContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ArmorContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArmorItem.hpp b/LiteLoader/include/llapi/mc/ArmorItem.hpp index ad754fd7d4..951a947cf4 100644 --- a/LiteLoader/include/llapi/mc/ArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItem.hpp @@ -39,244 +39,236 @@ class ArmorMaterial { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ArmorItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?isArmor\@ArmorItem\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?isArmor\@ArmorItem\@\@UEBA_NXZ */ virtual bool isArmor() const; /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 18 - * @symbol ?isDyeable\@ArmorItem\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isDyeable\@ArmorItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@ArmorItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@ArmorItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@ArmorItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@ArmorItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@ArmorItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@ArmorItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@ArmorItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@ArmorItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 64 - * @symbol ?getArmorValue\@ArmorItem\@\@UEBAHXZ + * @vftbl 64 + * @symbol ?getArmorValue\@ArmorItem\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 65 - * @symbol ?getToughnessValue\@ArmorItem\@\@UEBAHXZ + * @vftbl 65 + * @symbol ?getToughnessValue\@ArmorItem\@\@UEBAHXZ */ virtual int getToughnessValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 68 - * @symbol ?getDamageChance\@ArmorItem\@\@UEBAHH\@Z + * @vftbl 68 + * @symbol ?getDamageChance\@ArmorItem\@\@UEBAHH\@Z */ virtual int getDamageChance(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 73 - * @symbol ?getColor\@ArmorItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @vftbl 73 + * @symbol ?getColor\@ArmorItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ virtual class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @vftbl 74 - * @symbol ?hasCustomColor\@ArmorItem\@\@UEBA_NPEBVCompoundTag\@\@\@Z + * @vftbl 74 + * @symbol ?hasCustomColor\@ArmorItem\@\@UEBA_NPEBVCompoundTag\@\@\@Z */ virtual bool hasCustomColor(class CompoundTag const *) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?clearColor\@ArmorItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 76 + * @symbol ?clearColor\@ArmorItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void clearColor(class ItemStackBase &) const; /** - * @vftbl 78 - * @symbol ?setColor\@ArmorItem\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z + * @vftbl 78 + * @symbol ?setColor\@ArmorItem\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z */ virtual void setColor(class ItemStackBase &, class mce::Color const &) const; /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 82 - * @symbol ?buildIdAux\@ArmorItem\@\@UEBAHFPEBVCompoundTag\@\@\@Z + * @vftbl 82 + * @symbol ?buildIdAux\@ArmorItem\@\@UEBAHFPEBVCompoundTag\@\@\@Z */ virtual int buildIdAux(short, class CompoundTag const *) const; /** - * @vftbl 84 - * @symbol ?use\@ArmorItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@ArmorItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@ArmorItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ArmorItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@ArmorItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@ArmorItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@ArmorItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@ArmorItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 113 - * @symbol ?getEquipLocation\@ArmorItem\@\@UEBA?AW4ActorLocation\@\@XZ + * @vftbl 113 + * @symbol ?getEquipLocation\@ArmorItem\@\@UEBA?AW4ActorLocation\@\@XZ */ virtual enum class ActorLocation getEquipLocation() const; /** - * @vftbl 114 - * @symbol ?getEquipSound\@ArmorItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 114 + * @symbol ?getEquipSound\@ArmorItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getEquipSound() const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@ArmorItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@ArmorItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 - * @symbol ?getArmorKnockbackResistance\@ArmorItem\@\@UEBAMXZ + * @vftbl 133 + * @symbol ?getArmorKnockbackResistance\@ArmorItem\@\@UEBAMXZ */ virtual float getArmorKnockbackResistance() const; /** - * @symbol ??0ArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVArmorMaterial\@0\@HW4ArmorSlot\@\@\@Z + * @symbol ??0ArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVArmorMaterial\@0\@HW4ArmorSlot\@\@\@Z */ MCAPI ArmorItem(std::string const &, int, class ArmorItem::ArmorMaterial const &, int, enum class ArmorSlot); /** - * @symbol ?CHAIN\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?CHAIN\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const CHAIN; /** - * @symbol ?DIAMOND\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?DIAMOND\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const DIAMOND; /** - * @symbol ?ELYTRA\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?ELYTRA\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const ELYTRA; /** - * @symbol ?GOLD\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?GOLD\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const GOLD; /** - * @symbol ?IRON\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?IRON\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const IRON; /** - * @symbol ?LEATHER\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?LEATHER\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const LEATHER; /** - * @symbol ?NETHERITE\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?NETHERITE\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const NETHERITE; /** - * @symbol ?TURTLE\@ArmorItem\@\@2VArmorMaterial\@1\@B + * @symbol ?TURTLE\@ArmorItem\@\@2VArmorMaterial\@1\@B */ MCAPI static class ArmorItem::ArmorMaterial const TURTLE; /** - * @symbol ?dispenseArmor\@ArmorItem\@\@SA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@EW4ArmorSlot\@\@\@Z + * @symbol ?dispenseArmor\@ArmorItem\@\@SA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@EW4ArmorSlot\@\@\@Z */ MCAPI static bool dispenseArmor(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char, enum class ArmorSlot); /** - * @symbol ?getSlotForItem\@ArmorItem\@\@SA?AW4ArmorSlot\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?getSlotForItem\@ArmorItem\@\@SA?AW4ArmorSlot\@\@AEBVItemStackBase\@\@\@Z */ MCAPI static enum class ArmorSlot getSlotForItem(class ItemStackBase const &); /** - * @symbol ?isDamageable\@ArmorItem\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isDamageable\@ArmorItem\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isDamageable(class ItemDescriptor const &); /** - * @symbol ?mHealthPerSlot\@ArmorItem\@\@2QBHB + * @symbol ?mHealthPerSlot\@ArmorItem\@\@2QBHB */ MCAPI static int const mHealthPerSlot[]; -//private: - /** - * @symbol ?getTierItem\@ArmorItem\@\@AEBA?AVItemInstance\@\@XZ - */ - MCAPI class ItemInstance getTierItem() const; - -private: - -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp b/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp index 6b1a678de5..5773017351 100644 --- a/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ArmorItemComponent.hpp @@ -30,55 +30,55 @@ class ArmorItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ArmorItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VArmorItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VArmorItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VArmorItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VArmorItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getArmorTextureType\@ArmorItemComponent\@\@QEBA?AW4ArmorTextureType\@\@XZ + * @symbol ?getArmorTextureType\@ArmorItemComponent\@\@QEBA?AW4ArmorTextureType\@\@XZ */ MCAPI enum class ArmorTextureType getArmorTextureType() const; /** - * @symbol ?getArmorValue\@ArmorItemComponent\@\@QEBAHXZ + * @symbol ?getArmorValue\@ArmorItemComponent\@\@QEBAHXZ */ MCAPI int getArmorValue() const; /** - * @symbol ?bindType\@ArmorItemComponent\@\@SAXXZ + * @symbol ?bindType\@ArmorItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@ArmorItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@ArmorItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArmorStand.hpp b/LiteLoader/include/llapi/mc/ArmorStand.hpp index cdc086a839..c6d176eb16 100644 --- a/LiteLoader/include/llapi/mc/ArmorStand.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStand.hpp @@ -38,287 +38,282 @@ struct Pose { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ArmorStand(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@ArmorStand\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@ArmorStand\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@ArmorStand\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@ArmorStand\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@ArmorStand\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@ArmorStand\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@ArmorStand\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@ArmorStand\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 231 - * @symbol ?getInteraction\@ArmorStand\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z + * @vftbl 230 + * @symbol ?getInteraction\@ArmorStand\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@ArmorStand\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@ArmorStand\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@ArmorStand\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@ArmorStand\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@ArmorStand\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@ArmorStand\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ArmorStand\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ArmorStand\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ArmorStand\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ArmorStand\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 293 - * @symbol ?pushActors\@ArmorStand\@\@UEAAXXZ + * @vftbl 290 + * @symbol ?pushActors\@ArmorStand\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ARMORSTAND /** - * @symbol ?interactPreventDefault\@ArmorStand\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@ArmorStand\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); #endif /** - * @symbol ??0ArmorStand\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ArmorStand\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ArmorStand(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?setPoseIndex\@ArmorStand\@\@QEAAXH\@Z + * @symbol ?setPoseIndex\@ArmorStand\@\@QEAAXH\@Z */ MCAPI void setPoseIndex(int); //private: /** - * @symbol ?_causeDamage\@ArmorStand\@\@AEAAXM\@Z + * @symbol ?_causeDamage\@ArmorStand\@\@AEAAXM\@Z */ MCAPI void _causeDamage(float); /** - * @symbol ?_destroyWithEffects\@ArmorStand\@\@AEAAXAEBVVec3\@\@\@Z + * @symbol ?_destroyWithEffects\@ArmorStand\@\@AEAAXAEBVVec3\@\@\@Z */ MCAPI void _destroyWithEffects(class Vec3 const &); /** - * @symbol ?_dropHeldItems\@ArmorStand\@\@AEAAXXZ + * @symbol ?_dropHeldItems\@ArmorStand\@\@AEAAXXZ */ MCAPI void _dropHeldItems(); /** - * @symbol ?_dropHeldItemsAndResource\@ArmorStand\@\@AEAAXXZ + * @symbol ?_dropHeldItemsAndResource\@ArmorStand\@\@AEAAXXZ */ MCAPI void _dropHeldItemsAndResource(); /** - * @symbol ?_dropItem\@ArmorStand\@\@AEAAXAEBVItemStack\@\@\@Z + * @symbol ?_dropItem\@ArmorStand\@\@AEAAXAEBVItemStack\@\@\@Z */ MCAPI void _dropItem(class ItemStack const &); /** - * @symbol ?_trySwapItem\@ArmorStand\@\@AEAA_NAEAVPlayer\@\@W4EquipmentSlot\@\@\@Z + * @symbol ?_trySwapItem\@ArmorStand\@\@AEAA_NAEAVPlayer\@\@W4EquipmentSlot\@\@\@Z */ MCAPI bool _trySwapItem(class Player &, enum class EquipmentSlot); private: /** - * @symbol ?POSE_ATHENA\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_ATHENA\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_ATHENA; /** - * @symbol ?POSE_BRANDISH\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_BRANDISH\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_BRANDISH; /** - * @symbol ?POSE_CANCAN_A\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_CANCAN_A\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_CANCAN_A; /** - * @symbol ?POSE_CANCAN_B\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_CANCAN_B\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_CANCAN_B; /** - * @symbol ?POSE_DEFAULT\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_DEFAULT\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_DEFAULT; /** - * @symbol ?POSE_ENTERTAIN\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_ENTERTAIN\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_ENTERTAIN; /** - * @symbol ?POSE_HERO\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_HERO\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_HERO; /** - * @symbol ?POSE_HONOR\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_HONOR\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_HONOR; /** - * @symbol ?POSE_RIPOSTE\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_RIPOSTE\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_RIPOSTE; /** - * @symbol ?POSE_SALUTE\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_SALUTE\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_SALUTE; /** - * @symbol ?POSE_SOLEMN\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_SOLEMN\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_SOLEMN; /** - * @symbol ?POSE_ZERO_ROTATION\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_ZERO_ROTATION\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_ZERO_ROTATION; /** - * @symbol ?POSE_ZOMBIE\@ArmorStand\@\@0UPose\@1\@B + * @symbol ?POSE_ZOMBIE\@ArmorStand\@\@0UPose\@1\@B */ MCAPI static struct ArmorStand::Pose const POSE_ZOMBIE; /** - * @symbol ?STAND_POSES\@ArmorStand\@\@0PAPEBUPose\@1\@A + * @symbol ?STAND_POSES\@ArmorStand\@\@0PAPEBUPose\@1\@A */ MCAPI static struct ArmorStand::Pose const * STAND_POSES[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp index bd45af2e96..03c9e23a37 100644 --- a/LiteLoader/include/llapi/mc/ArmorStandItem.hpp +++ b/LiteLoader/include/llapi/mc/ArmorStandItem.hpp @@ -32,87 +32,87 @@ class ArmorStandItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ArmorStandItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@ArmorStandItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@ArmorStandItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0ArmorStandItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0ArmorStandItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI ArmorStandItem(std::string const &, short); /** - * @symbol ?_shouldRemove\@ArmorStandItem\@\@QEBA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_shouldRemove\@ArmorStandItem\@\@QEBA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI bool _shouldRemove(class BlockSource &, class BlockPos) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Arrow.hpp b/LiteLoader/include/llapi/mc/Arrow.hpp index e316c5586e..fd26122108 100644 --- a/LiteLoader/include/llapi/mc/Arrow.hpp +++ b/LiteLoader/include/llapi/mc/Arrow.hpp @@ -32,202 +32,202 @@ class Arrow : public AbstractArrow { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Arrow\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Arrow\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Arrow(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Arrow\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Arrow\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 90 - * @symbol ?playerTouch\@Arrow\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 89 + * @symbol ?playerTouch\@Arrow\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 233 - * @symbol ?setAuxValue\@Arrow\@\@UEAAXH\@Z + * @vftbl 232 + * @symbol ?setAuxValue\@Arrow\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Arrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Arrow\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Arrow\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Arrow\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?shoot\@Arrow\@\@UEAAXAEBVVec3\@\@MM0\@Z + * @vftbl 276 + * @symbol ?shoot\@Arrow\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 280 - * @symbol ?_getPickupItem\@Arrow\@\@MEBA?AVItemStack\@\@XZ + * @vftbl 278 + * @symbol ?_getPickupItem\@Arrow\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const; /** - * @vftbl 281 - * @symbol ?applyParticleColor\@Arrow\@\@MEAAXPEAVParticle\@\@\@Z + * @vftbl 279 + * @symbol ?applyParticleColor\@Arrow\@\@MEAAXPEAVParticle\@\@\@Z */ virtual void applyParticleColor(class Particle *); /** - * @vftbl 282 - * @symbol ?getEffectColor\@Arrow\@\@MEAA?AVColor\@mce\@\@XZ + * @vftbl 280 + * @symbol ?getEffectColor\@Arrow\@\@MEAA?AVColor\@mce\@\@XZ */ virtual class mce::Color getEffectColor(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ARROW /** - * @symbol ?canMakeStepSound\@Arrow\@\@MEBA_NXZ + * @symbol ?canMakeStepSound\@Arrow\@\@MEBA_NXZ */ MCVAPI bool canMakeStepSound() const; #endif /** - * @symbol ??0Arrow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Arrow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Arrow(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?addMobEffect\@Arrow\@\@QEAAXVMobEffectInstance\@\@\@Z + * @symbol ?addMobEffect\@Arrow\@\@QEAAXVMobEffectInstance\@\@\@Z */ MCAPI void addMobEffect(class MobEffectInstance); /** - * @symbol ?getAuxValue\@Arrow\@\@QEBAHXZ + * @symbol ?getAuxValue\@Arrow\@\@QEBAHXZ */ MCAPI int getAuxValue() const; /** - * @symbol ?setCritical\@Arrow\@\@QEAAX_N\@Z + * @symbol ?setCritical\@Arrow\@\@QEAAX_N\@Z */ MCAPI void setCritical(bool); /** - * @symbol ?setEnchantFlame\@Arrow\@\@QEAAXH\@Z + * @symbol ?setEnchantFlame\@Arrow\@\@QEAAXH\@Z */ MCAPI void setEnchantFlame(int); /** - * @symbol ?setEnchantInfinity\@Arrow\@\@QEAAXH\@Z + * @symbol ?setEnchantInfinity\@Arrow\@\@QEAAXH\@Z */ MCAPI void setEnchantInfinity(int); /** - * @symbol ?setEnchantPower\@Arrow\@\@QEAAXH\@Z + * @symbol ?setEnchantPower\@Arrow\@\@QEAAXH\@Z */ MCAPI void setEnchantPower(int); /** - * @symbol ?setEnchantPunch\@Arrow\@\@QEAAXH\@Z + * @symbol ?setEnchantPunch\@Arrow\@\@QEAAXH\@Z */ MCAPI void setEnchantPunch(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp index a00307b40d..9171bcc3dc 100644 --- a/LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ArrowEffectSubcomponent.hpp @@ -32,24 +32,24 @@ class ArrowEffectSubcomponent : public MobEffectSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ArrowEffectSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?writetoJSON\@ArrowEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@ArrowEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@ArrowEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@ArrowEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@ArrowEffectSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@ArrowEffectSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ArrowItem.hpp b/LiteLoader/include/llapi/mc/ArrowItem.hpp index b4418b6ff0..078686a0ff 100644 --- a/LiteLoader/include/llapi/mc/ArrowItem.hpp +++ b/LiteLoader/include/llapi/mc/ArrowItem.hpp @@ -32,128 +32,128 @@ class ArrowItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ArrowItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@ArrowItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@ArrowItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@ArrowItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@ArrowItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@ArrowItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ArrowItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@ArrowItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@ArrowItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 96 - * @symbol ?buildEffectDescriptionName\@ArrowItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 96 + * @symbol ?buildEffectDescriptionName\@ArrowItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@ArrowItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@ArrowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@ArrowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @symbol ??0ArrowItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ArrowItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ArrowItem(std::string const &, int); /** - * @symbol ?applyEffect\@ArrowItem\@\@QEBAXPEAVArrow\@\@AEBVItemInstance\@\@\@Z + * @symbol ?applyEffect\@ArrowItem\@\@QEBAXPEAVArrow\@\@AEBVItemInstance\@\@\@Z */ MCAPI void applyEffect(class Arrow *, class ItemInstance const &) const; //protected: /** - * @symbol ?getMobEffects\@ArrowItem\@\@IEBA?AV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?getMobEffects\@ArrowItem\@\@IEBA?AV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI std::vector getMobEffects(int) const; //private: /** - * @symbol ?_potionExistsOrContentError\@ArrowItem\@\@AEBA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@H\@Z + * @symbol ?_potionExistsOrContentError\@ArrowItem\@\@AEBA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@H\@Z */ MCAPI class std::shared_ptr _potionExistsOrContentError(int) const; @@ -161,4 +161,4 @@ class ArrowItem : public Item { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AsyncBlockInternalGuard.hpp b/LiteLoader/include/llapi/mc/AsyncBlockInternalGuard.hpp index 5145059dff..f61002cdc8 100644 --- a/LiteLoader/include/llapi/mc/AsyncBlockInternalGuard.hpp +++ b/LiteLoader/include/llapi/mc/AsyncBlockInternalGuard.hpp @@ -28,8 +28,8 @@ class AsyncBlockInternalGuard { public: /** - * @symbol ??0AsyncBlockInternalGuard\@\@QEAA\@PEAUXAsyncBlock\@\@\@Z + * @symbol ??0AsyncBlockInternalGuard\@\@QEAA\@PEAUXAsyncBlock\@\@\@Z */ MCAPI AsyncBlockInternalGuard(struct XAsyncBlock *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AsyncState.hpp b/LiteLoader/include/llapi/mc/AsyncState.hpp index 6e7e183f1a..a6a1e42616 100644 --- a/LiteLoader/include/llapi/mc/AsyncState.hpp +++ b/LiteLoader/include/llapi/mc/AsyncState.hpp @@ -28,8 +28,8 @@ class AsyncState { public: /** - * @symbol ?Release\@AsyncState\@\@QEAAXXZ + * @symbol ?Release\@AsyncState\@\@QEAAXXZ */ MCAPI void Release(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AsyncStateRef.hpp b/LiteLoader/include/llapi/mc/AsyncStateRef.hpp index 959ac2137c..60fc48245c 100644 --- a/LiteLoader/include/llapi/mc/AsyncStateRef.hpp +++ b/LiteLoader/include/llapi/mc/AsyncStateRef.hpp @@ -28,8 +28,8 @@ class AsyncStateRef { public: /** - * @symbol ??1AsyncStateRef\@\@QEAA\@XZ + * @symbol ??1AsyncStateRef\@\@QEAA\@XZ */ MCAPI ~AsyncStateRef(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AsyncTracker.hpp b/LiteLoader/include/llapi/mc/AsyncTracker.hpp index d0fa08662a..bddee49f50 100644 --- a/LiteLoader/include/llapi/mc/AsyncTracker.hpp +++ b/LiteLoader/include/llapi/mc/AsyncTracker.hpp @@ -30,8 +30,8 @@ class AsyncTracker { public: /** - * @symbol ?hasAsyncOperationTimedOut\@AsyncTracker\@\@QEAA_NXZ + * @symbol ?hasAsyncOperationTimedOut\@AsyncTracker\@\@QEAA_NXZ */ MCAPI bool hasAsyncOperationTimedOut(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp b/LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp index 58678ed551..5778e804ec 100644 --- a/LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp +++ b/LiteLoader/include/llapi/mc/AsynchronousIPResolver.hpp @@ -30,32 +30,32 @@ class AsynchronousIPResolver { public: /** - * @symbol ??0AsynchronousIPResolver\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0AsynchronousIPResolver\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI AsynchronousIPResolver(std::string); /** - * @symbol ?getIp\@AsynchronousIPResolver\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getIp\@AsynchronousIPResolver\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getIp() const; /** - * @symbol ?getOriginalUrl\@AsynchronousIPResolver\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getOriginalUrl\@AsynchronousIPResolver\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getOriginalUrl() const; /** - * @symbol ?isDone\@AsynchronousIPResolver\@\@QEBA_NXZ + * @symbol ?isDone\@AsynchronousIPResolver\@\@QEBA_NXZ */ MCAPI bool isDone() const; /** - * @symbol ??1AsynchronousIPResolver\@\@QEAA\@XZ + * @symbol ??1AsynchronousIPResolver\@\@QEAA\@XZ */ MCAPI ~AsynchronousIPResolver(); //private: /** - * @symbol ?_resolve\@AsynchronousIPResolver\@\@AEAAXXZ + * @symbol ?_resolve\@AsynchronousIPResolver\@\@AEAAXXZ */ MCAPI void _resolve(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp b/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp index b1f67ebaa7..ab62f6449c 100644 --- a/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp +++ b/LiteLoader/include/llapi/mc/AtomicTimeAccumulator.hpp @@ -29,16 +29,16 @@ class AtomicTimeAccumulator { public: /** - * @symbol ??0AtomicTimeAccumulator\@\@QEAA\@XZ + * @symbol ??0AtomicTimeAccumulator\@\@QEAA\@XZ */ MCAPI AtomicTimeAccumulator(); /** - * @symbol ?addTime\@AtomicTimeAccumulator\@\@QEAAXAEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?addTime\@AtomicTimeAccumulator\@\@QEAAXAEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void addTime(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &); /** - * @symbol ?reset\@AtomicTimeAccumulator\@\@QEAAXXZ + * @symbol ?reset\@AtomicTimeAccumulator\@\@QEAAXXZ */ MCAPI void reset(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp b/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp index 803f15ebcb..35808a7040 100644 --- a/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp +++ b/LiteLoader/include/llapi/mc/AttackCooldownComponent.hpp @@ -30,16 +30,16 @@ class AttackCooldownComponent { public: /** - * @symbol ??0AttackCooldownComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0AttackCooldownComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI AttackCooldownComponent(class AttackCooldownComponent &&); /** - * @symbol ??4AttackCooldownComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4AttackCooldownComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class AttackCooldownComponent & operator=(class AttackCooldownComponent &&); /** - * @symbol ??1AttackCooldownComponent\@\@QEAA\@XZ + * @symbol ??1AttackCooldownComponent\@\@QEAA\@XZ */ MCAPI ~AttackCooldownComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp b/LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp index 219668709c..77b70189f7 100644 --- a/LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp +++ b/LiteLoader/include/llapi/mc/AttackCooldownSystem.hpp @@ -30,19 +30,19 @@ class AttackCooldownSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttackCooldownSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@AttackCooldownSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@AttackCooldownSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp b/LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp index f02c2f448d..d5108ab463 100644 --- a/LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/AttackDamageMobEffect.hpp @@ -31,26 +31,26 @@ class AttackDamageMobEffect : public MobEffect { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttackDamageMobEffect(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getAttributeModifierValue\@AttackDamageMobEffect\@\@UEBAMHAEBVAttributeModifier\@\@\@Z + * @vftbl 6 + * @symbol ?getAttributeModifierValue\@AttackDamageMobEffect\@\@UEBAMHAEBVAttributeModifier\@\@\@Z */ virtual float getAttributeModifierValue(int, class AttributeModifier const &) const; /** - * @symbol ??0AttackDamageMobEffect\@\@QEAA\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z + * @symbol ??0AttackDamageMobEffect\@\@QEAA\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z */ MCAPI AttackDamageMobEffect(int, std::string const &, std::string const &, bool, int, int); /** - * @symbol ?getDamageAfterDamageBoost\@AttackDamageMobEffect\@\@SAMMH\@Z + * @symbol ?getDamageAfterDamageBoost\@AttackDamageMobEffect\@\@SAMMH\@Z */ MCAPI static float getDamageAfterDamageBoost(float, int); /** - * @symbol ?getDamageAfterWeakness\@AttackDamageMobEffect\@\@SAMMH\@Z + * @symbol ?getDamageAfterWeakness\@AttackDamageMobEffect\@\@SAMMH\@Z */ MCAPI static float getDamageAfterWeakness(float, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttackDefinition.hpp b/LiteLoader/include/llapi/mc/AttackDefinition.hpp index e441a797bc..80ab371a87 100644 --- a/LiteLoader/include/llapi/mc/AttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AttackDefinition.hpp @@ -32,14 +32,14 @@ class AttackDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttackDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@AttackDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@AttackDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttackDescription.hpp b/LiteLoader/include/llapi/mc/AttackDescription.hpp index 7fca504ca8..58ac17373a 100644 --- a/LiteLoader/include/llapi/mc/AttackDescription.hpp +++ b/LiteLoader/include/llapi/mc/AttackDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class AttackDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@AttackDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@AttackDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~AttackDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@AttackDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@AttackDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ATTACKDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@AttackDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~AttackDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttackNode.hpp b/LiteLoader/include/llapi/mc/AttackNode.hpp index 7da7b9456d..6453698448 100644 --- a/LiteLoader/include/llapi/mc/AttackNode.hpp +++ b/LiteLoader/include/llapi/mc/AttackNode.hpp @@ -29,23 +29,23 @@ class AttackNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttackNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@AttackNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@AttackNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@AttackNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@AttackNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0AttackNode\@\@QEAA\@XZ + * @symbol ??0AttackNode\@\@QEAA\@XZ */ MCAPI AttackNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Attribute.hpp b/LiteLoader/include/llapi/mc/Attribute.hpp index c4a9f8d4cb..3fa843b6f4 100644 --- a/LiteLoader/include/llapi/mc/Attribute.hpp +++ b/LiteLoader/include/llapi/mc/Attribute.hpp @@ -30,32 +30,32 @@ class Attribute { public: /** - * @symbol ??0Attribute\@\@QEAA\@AEBVHashedString\@\@W4RedefinitionMode\@\@_N\@Z + * @symbol ??0Attribute\@\@QEAA\@AEBVHashedString\@\@W4RedefinitionMode\@\@_N\@Z */ MCAPI Attribute(class HashedString const &, enum class RedefinitionMode, bool); /** - * @symbol ?getIDValue\@Attribute\@\@QEBA?BIXZ + * @symbol ?getIDValue\@Attribute\@\@QEBA?BIXZ */ MCAPI unsigned int const getIDValue() const; /** - * @symbol ?getName\@Attribute\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getName\@Attribute\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getName() const; /** - * @symbol ?getRedefinitionMode\@Attribute\@\@QEBA?AW4RedefinitionMode\@\@XZ + * @symbol ?getRedefinitionMode\@Attribute\@\@QEBA?AW4RedefinitionMode\@\@XZ */ MCAPI enum class RedefinitionMode getRedefinitionMode() const; /** - * @symbol ?isClientSyncable\@Attribute\@\@QEBA_NXZ + * @symbol ?isClientSyncable\@Attribute\@\@QEBA_NXZ */ MCAPI bool isClientSyncable() const; /** - * @symbol ??8Attribute\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8Attribute\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class Attribute const &) const; /** - * @symbol ?getByName\@Attribute\@\@SAAEAV1\@AEBVHashedString\@\@\@Z + * @symbol ?getByName\@Attribute\@\@SAAEAV1\@AEBVHashedString\@\@\@Z */ MCAPI static class Attribute & getByName(class HashedString const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributeBuff.hpp b/LiteLoader/include/llapi/mc/AttributeBuff.hpp index c26f0e109d..5070af8a4e 100644 --- a/LiteLoader/include/llapi/mc/AttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/AttributeBuff.hpp @@ -29,92 +29,98 @@ class AttributeBuff { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttributeBuff(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isInstantaneous\@InstantaneousAttributeBuff\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isInstantaneous\@InstantaneousAttributeBuff\@\@UEBA_NXZ */ virtual bool isInstantaneous() const = 0; /** - * @vftbl 2 - * @symbol ?isSerializable\@InstantaneousAttributeBuff\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isSerializable\@InstantaneousAttributeBuff\@\@UEBA_NXZ */ virtual bool isSerializable() const = 0; /** - * @vftbl 3 - * @symbol ?setDurationAmplifier\@AttributeBuff\@\@UEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?setDurationAmplifier\@AttributeBuff\@\@UEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z */ virtual void setDurationAmplifier(class std::shared_ptr); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ATTRIBUTEBUFF /** - * @symbol ??0AttributeBuff\@\@QEAA\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AttributeBuff(); +#endif + /** + * @symbol ??0AttributeBuff\@\@QEAA\@AEBV0\@\@Z */ MCAPI AttributeBuff(class AttributeBuff const &); /** - * @symbol ?getAmount\@AttributeBuff\@\@QEBAMXZ + * @symbol ?getAmount\@AttributeBuff\@\@QEBAMXZ */ MCAPI float getAmount() const; /** - * @symbol ?getCause\@AttributeBuff\@\@QEBA?AW4ActorDamageCause\@\@XZ + * @symbol ?getCause\@AttributeBuff\@\@QEBA?AW4ActorDamageCause\@\@XZ */ MCAPI enum class ActorDamageCause getCause() const; /** - * @symbol ?getId\@AttributeBuff\@\@QEBA_KXZ + * @symbol ?getId\@AttributeBuff\@\@QEBA_KXZ */ MCAPI unsigned __int64 getId() const; /** - * @symbol ?getOperand\@AttributeBuff\@\@QEBAHXZ + * @symbol ?getOperand\@AttributeBuff\@\@QEBAHXZ */ MCAPI int getOperand() const; /** - * @symbol ?getSource\@AttributeBuff\@\@QEBAAEBVActorDamageSource\@\@XZ + * @symbol ?getSource\@AttributeBuff\@\@QEBAAEBVActorDamageSource\@\@XZ */ MCAPI class ActorDamageSource const & getSource() const; /** - * @symbol ?getType\@AttributeBuff\@\@QEBA?AW4AttributeBuffType\@\@XZ + * @symbol ?getType\@AttributeBuff\@\@QEBA?AW4AttributeBuffType\@\@XZ */ MCAPI enum class AttributeBuffType getType() const; /** - * @symbol ??8AttributeBuff\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8AttributeBuff\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class AttributeBuff const &) const; /** - * @symbol ?setAmplificationAmount\@AttributeBuff\@\@QEAAXHM\@Z + * @symbol ?setAmplificationAmount\@AttributeBuff\@\@QEAAXHM\@Z */ MCAPI void setAmplificationAmount(int, float); /** - * @symbol ?setId\@AttributeBuff\@\@QEAAX_K\@Z + * @symbol ?setId\@AttributeBuff\@\@QEAAX_K\@Z */ MCAPI void setId(unsigned __int64); /** - * @symbol ?setOperand\@AttributeBuff\@\@QEAAXH\@Z + * @symbol ?setOperand\@AttributeBuff\@\@QEAAXH\@Z */ MCAPI void setOperand(int); /** - * @symbol ?setSource\@AttributeBuff\@\@QEAAXPEAVActor\@\@\@Z + * @symbol ?setSource\@AttributeBuff\@\@QEAAXPEAVActor\@\@\@Z */ MCAPI void setSource(class Actor *); /** - * @symbol ?setValueAmplifier\@AttributeBuff\@\@QEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z + * @symbol ?setValueAmplifier\@AttributeBuff\@\@QEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z */ MCAPI void setValueAmplifier(class std::shared_ptr); /** - * @symbol ?buffTypeToDamageCause\@AttributeBuff\@\@SA?AW4ActorDamageCause\@\@W4AttributeBuffType\@\@\@Z + * @symbol ?buffTypeToDamageCause\@AttributeBuff\@\@SA?AW4ActorDamageCause\@\@W4AttributeBuffType\@\@\@Z */ MCAPI static enum class ActorDamageCause buffTypeToDamageCause(enum class AttributeBuffType); //protected: /** - * @symbol ??0AttributeBuff\@\@IEAA\@MHW4AttributeBuffType\@\@\@Z + * @symbol ??0AttributeBuff\@\@IEAA\@MHAEBVActorDamageSource\@\@W4AttributeBuffType\@\@\@Z */ - MCAPI AttributeBuff(float, int, enum class AttributeBuffType); + MCAPI AttributeBuff(float, int, class ActorDamageSource const &, enum class AttributeBuffType); /** - * @symbol ??0AttributeBuff\@\@IEAA\@MHAEBVActorDamageSource\@\@W4AttributeBuffType\@\@\@Z + * @symbol ??0AttributeBuff\@\@IEAA\@MHW4AttributeBuffType\@\@\@Z */ - MCAPI AttributeBuff(float, int, class ActorDamageSource const &, enum class AttributeBuffType); + MCAPI AttributeBuff(float, int, enum class AttributeBuffType); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributeCollection.hpp b/LiteLoader/include/llapi/mc/AttributeCollection.hpp index 07da353afc..2ff99ecebb 100644 --- a/LiteLoader/include/llapi/mc/AttributeCollection.hpp +++ b/LiteLoader/include/llapi/mc/AttributeCollection.hpp @@ -30,16 +30,16 @@ class AttributeCollection { public: /** - * @symbol ?hasAttribute\@AttributeCollection\@\@SA_NAEBVHashedString\@\@\@Z + * @symbol ?hasAttribute\@AttributeCollection\@\@SA_NAEBVHashedString\@\@\@Z */ MCAPI static bool hasAttribute(class HashedString const &); //private: /** - * @symbol ?instance\@AttributeCollection\@\@CAAEAV1\@XZ + * @symbol ?instance\@AttributeCollection\@\@CAAEAV1\@XZ */ MCAPI static class AttributeCollection & instance(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributeInstance.hpp b/LiteLoader/include/llapi/mc/AttributeInstance.hpp index baf3ea5fe2..1109354b15 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstance.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstance.hpp @@ -28,210 +28,220 @@ class AttributeInstance { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttributeInstance(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@AttributeInstance\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@AttributeInstance\@\@UEAAXXZ */ virtual void tick(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ATTRIBUTEINSTANCE /** - * @symbol ??0AttributeInstance\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AttributeInstance(); + MCVAPI ~AttributeInstance(); +#endif /** - * @symbol ??0AttributeInstance\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0AttributeInstance\@\@QEAA\@AEBV0\@\@Z */ MCAPI AttributeInstance(class AttributeInstance const &); /** - * @symbol ?addBuff\@AttributeInstance\@\@QEAAXAEBVAttributeBuff\@\@\@Z + * @symbol ??0AttributeInstance\@\@QEAA\@XZ */ - MCAPI void addBuff(class AttributeBuff const &); + MCAPI AttributeInstance(); /** - * @symbol ?addModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z + * @symbol ?addBuff\@AttributeInstance\@\@QEAAXAEBVAttributeBuff\@\@\@Z */ - MCAPI void addModifier(class AttributeModifier const &); + MCAPI void addBuff(class AttributeBuff const &); /** - * @symbol ?addModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + * @symbol ?addModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z */ MCAPI void addModifier(class std::shared_ptr); /** - * @symbol ?getAttribute\@AttributeInstance\@\@QEBAPEBVAttribute\@\@XZ + * @symbol ?addModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z + */ + MCAPI void addModifier(class AttributeModifier const &); + /** + * @symbol ?getAttribute\@AttributeInstance\@\@QEBAPEBVAttribute\@\@XZ */ MCAPI class Attribute const * getAttribute() const; /** - * @symbol ?getBuffs\@AttributeInstance\@\@QEBAAEBV?$vector\@VTemporalAttributeBuff\@\@V?$allocator\@VTemporalAttributeBuff\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getBuffs\@AttributeInstance\@\@QEBAAEBV?$vector\@VTemporalAttributeBuff\@\@V?$allocator\@VTemporalAttributeBuff\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getBuffs() const; /** - * @symbol ?getCurrentValue\@AttributeInstance\@\@QEBAMXZ + * @symbol ?getCurrentValue\@AttributeInstance\@\@QEBAMXZ */ MCAPI float getCurrentValue() const; /** - * @symbol ?getDefaultValue\@AttributeInstance\@\@QEBAMH\@Z + * @symbol ?getDefaultValue\@AttributeInstance\@\@QEBAMH\@Z */ MCAPI float getDefaultValue(int) const; /** - * @symbol ?getHandle\@AttributeInstance\@\@QEBA?AVAttributeInstanceHandle\@\@XZ + * @symbol ?getHandle\@AttributeInstance\@\@QEBA?AVAttributeInstanceHandle\@\@XZ */ MCAPI class AttributeInstanceHandle getHandle() const; /** - * @symbol ?getListeners\@AttributeInstance\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getListeners\@AttributeInstance\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getListeners() const; /** - * @symbol ?getMaxValue\@AttributeInstance\@\@QEBAMXZ + * @symbol ?getMaxValue\@AttributeInstance\@\@QEBAMXZ */ MCAPI float getMaxValue() const; /** - * @symbol ?getMinValue\@AttributeInstance\@\@QEBAMXZ + * @symbol ?getMinValue\@AttributeInstance\@\@QEBAMXZ */ MCAPI float getMinValue() const; /** - * @symbol ?getModifier\@AttributeInstance\@\@QEBA?AVAttributeModifier\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?getModifier\@AttributeInstance\@\@QEBA?AVAttributeModifier\@\@AEBVUUID\@mce\@\@\@Z */ MCAPI class AttributeModifier getModifier(class mce::UUID const &) const; /** - * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@H\@Z + */ + MCAPI std::vector getModifiers(int) const; + /** + * @symbol ?getModifiers\@AttributeInstance\@\@QEBA?AV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getModifiers() const; /** - * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVUUID\@mce\@\@\@Z + * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NAEBVUUID\@mce\@\@\@Z */ MCAPI bool hasModifier(class mce::UUID const &) const; /** - * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + * @symbol ?hasModifier\@AttributeInstance\@\@QEBA_NV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z */ MCAPI bool hasModifier(class std::shared_ptr) const; /** - * @symbol ?hasModifiers\@AttributeInstance\@\@QEBA_NXZ + * @symbol ?hasModifiers\@AttributeInstance\@\@QEBA_NXZ */ MCAPI bool hasModifiers() const; /** - * @symbol ?hasTemporalBuffs\@AttributeInstance\@\@QEBA_NXZ + * @symbol ?hasTemporalBuffs\@AttributeInstance\@\@QEBA_NXZ */ MCAPI bool hasTemporalBuffs() const; /** - * @symbol ?inheritFrom\@AttributeInstance\@\@QEAAXAEBV1\@PEAVBaseAttributeMap\@\@\@Z + * @symbol ?inheritFrom\@AttributeInstance\@\@QEAAXAEBV1\@PEAVBaseAttributeMap\@\@\@Z */ MCAPI void inheritFrom(class AttributeInstance const &, class BaseAttributeMap *); /** - * @symbol ?isValid\@AttributeInstance\@\@QEBA_NXZ + * @symbol ?isValid\@AttributeInstance\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?notify\@AttributeInstance\@\@QEAAX_J\@Z + * @symbol ?notify\@AttributeInstance\@\@QEAAX_J\@Z */ MCAPI void notify(__int64); /** - * @symbol ??8AttributeInstance\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8AttributeInstance\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class AttributeInstance const &) const; /** - * @symbol ?recalculateModifiers\@AttributeInstance\@\@QEAAXXZ + * @symbol ?recalculateModifiers\@AttributeInstance\@\@QEAAXXZ */ MCAPI void recalculateModifiers(); /** - * @symbol ?registerListener\@AttributeInstance\@\@QEAAXAEBV1\@\@Z + * @symbol ?registerListener\@AttributeInstance\@\@QEAAXAEBV1\@\@Z */ MCAPI void registerListener(class AttributeInstance const &); /** - * @symbol ?removeBuff\@AttributeInstance\@\@QEAAXAEBVAttributeBuff\@\@\@Z + * @symbol ?removeBuff\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeBuff\@\@\@std\@\@\@Z */ - MCAPI void removeBuff(class AttributeBuff const &); + MCAPI void removeBuff(class std::shared_ptr); /** - * @symbol ?removeBuff\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeBuff\@\@\@std\@\@\@Z + * @symbol ?removeBuff\@AttributeInstance\@\@QEAAXAEBVAttributeBuff\@\@\@Z */ - MCAPI void removeBuff(class std::shared_ptr); + MCAPI void removeBuff(class AttributeBuff const &); /** - * @symbol ?removeBuffs\@AttributeInstance\@\@QEAAXXZ + * @symbol ?removeBuffs\@AttributeInstance\@\@QEAAXXZ */ MCAPI void removeBuffs(); /** - * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z + * @symbol ?removeModifier\@AttributeInstance\@\@QEAA_NAEBVUUID\@mce\@\@\@Z */ - MCAPI void removeModifier(class AttributeModifier const &); + MCAPI bool removeModifier(class mce::UUID const &); /** - * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z */ MCAPI void removeModifier(class std::shared_ptr); /** - * @symbol ?removeModifier\@AttributeInstance\@\@QEAA_NAEBVUUID\@mce\@\@\@Z + * @symbol ?removeModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z */ - MCAPI bool removeModifier(class mce::UUID const &); + MCAPI void removeModifier(class AttributeModifier const &); /** - * @symbol ?removeModifiers\@AttributeInstance\@\@QEAAXXZ + * @symbol ?removeModifiers\@AttributeInstance\@\@QEAAXXZ */ MCAPI void removeModifiers(); /** - * @symbol ?resetToDefaultValue\@AttributeInstance\@\@QEAAXXZ + * @symbol ?resetToDefaultValue\@AttributeInstance\@\@QEAAXXZ */ MCAPI void resetToDefaultValue(); /** - * @symbol ?resetToMaxValue\@AttributeInstance\@\@QEAAXXZ + * @symbol ?resetToMaxValue\@AttributeInstance\@\@QEAAXXZ */ MCAPI void resetToMaxValue(); /** - * @symbol ?resetToMinValue\@AttributeInstance\@\@QEAAXXZ + * @symbol ?resetToMinValue\@AttributeInstance\@\@QEAAXXZ */ MCAPI void resetToMinValue(); /** - * @symbol ?serializationSetRange\@AttributeInstance\@\@QEAAXMMM\@Z + * @symbol ?serializationSetRange\@AttributeInstance\@\@QEAAXMMM\@Z */ MCAPI void serializationSetRange(float, float, float); /** - * @symbol ?serializationSetValue\@AttributeInstance\@\@QEAAXMHM\@Z + * @symbol ?serializationSetValue\@AttributeInstance\@\@QEAAXMHM\@Z */ MCAPI void serializationSetValue(float, int, float); /** - * @symbol ?setCurrentValue\@AttributeInstance\@\@QEAAXM\@Z + * @symbol ?setCurrentValue\@AttributeInstance\@\@QEAAXM\@Z */ MCAPI void setCurrentValue(float); /** - * @symbol ?setDefaultValue\@AttributeInstance\@\@QEAAXMH\@Z + * @symbol ?setDefaultValue\@AttributeInstance\@\@QEAAXMH\@Z */ MCAPI void setDefaultValue(float, int); /** - * @symbol ?setDefaultValueOnly\@AttributeInstance\@\@QEAAXM\@Z + * @symbol ?setDefaultValueOnly\@AttributeInstance\@\@QEAAXM\@Z */ MCAPI void setDefaultValueOnly(float); /** - * @symbol ?setDelegate\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeInstanceDelegate\@\@\@std\@\@\@Z + * @symbol ?setDelegate\@AttributeInstance\@\@QEAAXV?$shared_ptr\@VAttributeInstanceDelegate\@\@\@std\@\@\@Z */ MCAPI void setDelegate(class std::shared_ptr); /** - * @symbol ?setMaxValue\@AttributeInstance\@\@QEAAXM\@Z + * @symbol ?setMaxValue\@AttributeInstance\@\@QEAAXM\@Z */ MCAPI void setMaxValue(float); /** - * @symbol ?setRange\@AttributeInstance\@\@QEAAXMMM\@Z + * @symbol ?setRange\@AttributeInstance\@\@QEAAXMMM\@Z */ MCAPI void setRange(float, float, float); /** - * @symbol ?updateModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z + * @symbol ?updateModifier\@AttributeInstance\@\@QEAAXAEBVAttributeModifier\@\@\@Z */ MCAPI void updateModifier(class AttributeModifier const &); //private: /** - * @symbol ??0AttributeInstance\@\@AEAA\@PEAVBaseAttributeMap\@\@PEBVAttribute\@\@\@Z + * @symbol ??0AttributeInstance\@\@AEAA\@PEAVBaseAttributeMap\@\@PEBVAttribute\@\@\@Z */ MCAPI AttributeInstance(class BaseAttributeMap *, class Attribute const *); /** - * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMAEBVAttributeBuff\@\@\@Z + * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMXZ */ - MCAPI float _calculateValue(class AttributeBuff const &); + MCAPI float _calculateValue(); /** - * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMXZ + * @symbol ?_calculateValue\@AttributeInstance\@\@AEAAMAEBVAttributeBuff\@\@\@Z */ - MCAPI float _calculateValue(); + MCAPI float _calculateValue(class AttributeBuff const &); /** - * @symbol ?_sanitizeValue\@AttributeInstance\@\@AEAAMM\@Z + * @symbol ?_sanitizeValue\@AttributeInstance\@\@AEAAMM\@Z */ MCAPI float _sanitizeValue(float); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp b/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp index 973a838598..3ca83eb525 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstanceDelegate.hpp @@ -30,50 +30,56 @@ class AttributeInstanceDelegate { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttributeInstanceDelegate(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@AttributeInstanceDelegate\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@AttributeInstanceDelegate\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol ?notify\@AttributeInstanceDelegate\@\@UEAAX_J\@Z + * @vftbl 2 + * @symbol ?notify\@AttributeInstanceDelegate\@\@UEAAX_J\@Z */ virtual void notify(__int64); /** - * @vftbl 3 - * @symbol ?willChange\@AttributeInstanceDelegate\@\@UEAA_NMMAEBVAttributeBuff\@\@\@Z + * @vftbl 3 + * @symbol ?willChange\@AttributeInstanceDelegate\@\@UEAA_NMMAEBVAttributeBuff\@\@\@Z */ virtual bool willChange(float, float, class AttributeBuff const &); /** - * @vftbl 4 - * @symbol ?change\@AttributeInstanceDelegate\@\@UEAAMMMAEBVAttributeBuff\@\@\@Z + * @vftbl 4 + * @symbol ?change\@AttributeInstanceDelegate\@\@UEAAMMMAEBVAttributeBuff\@\@\@Z */ virtual float change(float, float, class AttributeBuff const &); /** - * @vftbl 5 - * @symbol ?getBuffValueWithModifiers\@AttributeInstanceDelegate\@\@UEBAMAEBVAttributeBuff\@\@\@Z + * @vftbl 5 + * @symbol ?getBuffValueWithModifiers\@AttributeInstanceDelegate\@\@UEBAMAEBVAttributeBuff\@\@\@Z */ virtual float getBuffValueWithModifiers(class AttributeBuff const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ATTRIBUTEINSTANCEDELEGATE /** - * @symbol ??0AttributeInstanceDelegate\@\@QEAA\@AEBVAttributeInstance\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AttributeInstanceDelegate(); +#endif + /** + * @symbol ??0AttributeInstanceDelegate\@\@QEAA\@AEBVAttributeInstance\@\@\@Z */ MCAPI AttributeInstanceDelegate(class AttributeInstance const &); //protected: /** - * @symbol ?_getInstance\@AttributeInstanceDelegate\@\@IEBAAEBVAttributeInstance\@\@XZ + * @symbol ?_getInstance\@AttributeInstanceDelegate\@\@IEBAAEBVAttributeInstance\@\@XZ */ MCAPI class AttributeInstance const & _getInstance() const; /** - * @symbol ?_getMutableInstance\@AttributeInstanceDelegate\@\@IEBAPEAVAttributeInstance\@\@XZ + * @symbol ?_getMutableInstance\@AttributeInstanceDelegate\@\@IEBAPEAVAttributeInstance\@\@XZ */ MCAPI class AttributeInstance * _getMutableInstance() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp b/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp index a8b4baca3e..1a8d13666d 100644 --- a/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp +++ b/LiteLoader/include/llapi/mc/AttributeInstanceHandle.hpp @@ -30,24 +30,24 @@ class AttributeInstanceHandle { public: /** - * @symbol ?getAttributeID\@AttributeInstanceHandle\@\@QEBA?BIXZ + * @symbol ?getAttributeID\@AttributeInstanceHandle\@\@QEBA?BIXZ */ MCAPI unsigned int const getAttributeID() const; /** - * @symbol ?getInstance\@AttributeInstanceHandle\@\@QEBAAEBVAttributeInstance\@\@XZ + * @symbol ?getInstance\@AttributeInstanceHandle\@\@QEBAAEBVAttributeInstance\@\@XZ */ MCAPI class AttributeInstance const & getInstance() const; /** - * @symbol ?getMutableInstance\@AttributeInstanceHandle\@\@QEBAPEAVAttributeInstance\@\@XZ + * @symbol ?getMutableInstance\@AttributeInstanceHandle\@\@QEBAPEAVAttributeInstance\@\@XZ */ MCAPI class AttributeInstance * getMutableInstance() const; /** - * @symbol ?inheritFrom\@AttributeInstanceHandle\@\@QEAAXAEBV1\@PEAVBaseAttributeMap\@\@\@Z + * @symbol ?inheritFrom\@AttributeInstanceHandle\@\@QEAAXAEBV1\@PEAVBaseAttributeMap\@\@\@Z */ MCAPI void inheritFrom(class AttributeInstanceHandle const &, class BaseAttributeMap *); /** - * @symbol ??8AttributeInstanceHandle\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8AttributeInstanceHandle\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class AttributeInstanceHandle const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributeModifier.hpp b/LiteLoader/include/llapi/mc/AttributeModifier.hpp index bbe2f4bb5c..b3cec94e81 100644 --- a/LiteLoader/include/llapi/mc/AttributeModifier.hpp +++ b/LiteLoader/include/llapi/mc/AttributeModifier.hpp @@ -43,63 +43,70 @@ class AttributeModifier { bool mSerialize; #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ATTRIBUTEMODIFIER +public: + AttributeModifier(class AttributeModifier const &) = delete; +#endif + public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AttributeModifier(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isInstantaneous\@AttributeModifier\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isInstantaneous\@AttributeModifier\@\@UEBA_NXZ */ virtual bool isInstantaneous() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ATTRIBUTEMODIFIER /** - * @symbol ??0AttributeModifier\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI 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 + * @symbol ??0AttributeModifier\@\@QEAA\@XZ */ - MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool); + MCAPI AttributeModifier(); /** - * @symbol ??0AttributeModifier\@\@QEAA\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MHH_N\@Z + * @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\@AEBV0\@\@Z + * @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 AttributeModifier const &); + MCAPI AttributeModifier(class mce::UUID, std::string const &, float, enum class AttributeModifierOperation, enum class AttributeOperands, bool); /** - * @symbol ?getAmount\@AttributeModifier\@\@QEBAMXZ + * @symbol ?getAmount\@AttributeModifier\@\@QEBAMXZ */ MCAPI float getAmount() const; /** - * @symbol ?getId\@AttributeModifier\@\@QEBAAEBVUUID\@mce\@\@XZ + * @symbol ?getId\@AttributeModifier\@\@QEBAAEBVUUID\@mce\@\@XZ */ MCAPI class mce::UUID const & getId() const; /** - * @symbol ?getName\@AttributeModifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@AttributeModifier\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getOperand\@AttributeModifier\@\@QEBAHXZ + * @symbol ?getOperand\@AttributeModifier\@\@QEBAHXZ */ MCAPI int getOperand() const; /** - * @symbol ?getOperation\@AttributeModifier\@\@QEBAHXZ + * @symbol ?getOperation\@AttributeModifier\@\@QEBAHXZ */ MCAPI int getOperation() const; /** - * @symbol ?isSerializable\@AttributeModifier\@\@QEBA_NXZ + * @symbol ?isSerializable\@AttributeModifier\@\@QEBA_NXZ */ MCAPI bool isSerializable() const; /** - * @symbol ??4AttributeModifier\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4AttributeModifier\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class AttributeModifier & operator=(class AttributeModifier const &); /** - * @symbol ??8AttributeModifier\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8AttributeModifier\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class AttributeModifier const &) const; @@ -107,8 +114,8 @@ class AttributeModifier { private: /** - * @symbol ?mInvalidUUID\@AttributeModifier\@\@0VUUID\@mce\@\@B + * @symbol ?mInvalidUUID\@AttributeModifier\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const mInvalidUUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AttributesComponent.hpp b/LiteLoader/include/llapi/mc/AttributesComponent.hpp index 3ba571298e..759e69b49b 100644 --- a/LiteLoader/include/llapi/mc/AttributesComponent.hpp +++ b/LiteLoader/include/llapi/mc/AttributesComponent.hpp @@ -27,19 +27,19 @@ struct AttributesComponent { public: /** - * @symbol ??0AttributesComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0AttributesComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI AttributesComponent(struct AttributesComponent &&); /** - * @symbol ??0AttributesComponent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0AttributesComponent\@\@QEAA\@AEBU0\@\@Z */ MCAPI AttributesComponent(struct AttributesComponent const &); /** - * @symbol ??4AttributesComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4AttributesComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct AttributesComponent & operator=(struct AttributesComponent &&); /** - * @symbol ??1AttributesComponent\@\@QEAA\@XZ + * @symbol ??1AttributesComponent\@\@QEAA\@XZ */ MCAPI ~AttributesComponent(); diff --git a/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp b/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp index 7bb8ae9828..26ffb1d440 100644 --- a/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/AutoStepFilterSystem.hpp @@ -28,8 +28,8 @@ class AutoStepFilterSystem { public: /** - * @symbol ?createAutoStepFilterSystem\@AutoStepFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createAutoStepFilterSystem\@AutoStepFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAutoStepFilterSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp b/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp index 7dfe0da989..37f9268386 100644 --- a/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp +++ b/LiteLoader/include/llapi/mc/AutomaticFeatureRules.hpp @@ -27,11 +27,11 @@ struct AutomaticFeatureRule { #undef AFTER_EXTRA /** - * @symbol ?attachAutomaticFeatures\@AutomaticFeatureRules\@\@YAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@\@Z + * @symbol ?attachAutomaticFeatures\@AutomaticFeatureRules\@\@YAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@\@Z */ MCAPI void attachAutomaticFeatures(class ResourcePackManager &, class IWorldRegistriesProvider &, class Experiments const &); /** - * @symbol ?parseAutomaticFeatures\@AutomaticFeatureRules\@\@YAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?parseAutomaticFeatures\@AutomaticFeatureRules\@\@YAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@AEBVExperiments\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unordered_map\@VHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UAutomaticFeatureRule\@AutomaticFeatureRules\@\@\@std\@\@\@5\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void parseAutomaticFeatures(class ResourcePackManager &, class IWorldRegistriesProvider &, class Experiments const &, class std::unordered_map, struct std::equal_to, class std::allocator>>, struct std::hash, struct std::equal_to, class std::allocator, struct std::equal_to, class std::allocator>>>>> &); diff --git a/LiteLoader/include/llapi/mc/Automation.hpp b/LiteLoader/include/llapi/mc/Automation.hpp index 4b1bab9d3d..01ae5f68da 100644 --- a/LiteLoader/include/llapi/mc/Automation.hpp +++ b/LiteLoader/include/llapi/mc/Automation.hpp @@ -23,11 +23,11 @@ namespace Automation { enum class MessagePurpose; #undef AFTER_EXTRA /** - * @symbol ?BodyData\@Automation\@\@3PEBDEB + * @symbol ?BodyData\@Automation\@\@3PEBDEB */ MCAPI extern char const * BodyData; /** - * @symbol ?HeaderData\@Automation\@\@3PEBDEB + * @symbol ?HeaderData\@Automation\@\@3PEBDEB */ MCAPI extern char const * HeaderData; diff --git a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp index c80a0e8354..fb9d0ef0c6 100644 --- a/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/AutomationClientConnectPacket.hpp @@ -30,37 +30,43 @@ class AutomationClientConnectPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AutomationClientConnectPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AutomationClientConnectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AutomationClientConnectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AutomationClientConnectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AutomationClientConnectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AutomationClientConnectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AutomationClientConnectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AutomationClientConnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_AUTOMATIONCLIENTCONNECTPACKET /** - * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~AutomationClientConnectPacket(); +#endif + /** + * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@XZ */ MCAPI AutomationClientConnectPacket(); /** - * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@UWebSocketPacketData\@\@\@Z + * @symbol ??0AutomationClientConnectPacket\@\@QEAA\@UWebSocketPacketData\@\@\@Z */ MCAPI AutomationClientConnectPacket(struct WebSocketPacketData); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp index 0849e5b5d6..6426c80b4a 100644 --- a/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/AutomationPlayerCommandOrigin.hpp @@ -32,72 +32,72 @@ class AutomationPlayerCommandOrigin : public PlayerCommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AutomationPlayerCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@AutomationPlayerCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@AutomationPlayerCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@AutomationPlayerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AutomationPlayerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@AutomationPlayerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@AutomationPlayerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@AutomationPlayerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@AutomationPlayerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 13 - * @symbol ?hasChatPerms\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?hasChatPerms\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ */ virtual bool hasChatPerms() const; /** - * @vftbl 14 - * @symbol ?hasTellPerms\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ + * @vftbl 14 + * @symbol ?hasTellPerms\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ */ virtual bool hasTellPerms() const; /** - * @vftbl 19 - * @symbol ?getSourceId\@AutomationPlayerCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ + * @vftbl 19 + * @symbol ?getSourceId\@AutomationPlayerCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ */ virtual class NetworkIdentifier const & getSourceId() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@AutomationPlayerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@AutomationPlayerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 24 - * @symbol ?toCommandOriginData\@AutomationPlayerCommandOrigin\@\@UEBA?AUCommandOriginData\@\@XZ + * @vftbl 24 + * @symbol ?toCommandOriginData\@AutomationPlayerCommandOrigin\@\@UEBA?AUCommandOriginData\@\@XZ */ virtual struct CommandOriginData toCommandOriginData() const; /** - * @vftbl 29 - * @symbol ?serialize\@AutomationPlayerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@AutomationPlayerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@AutomationPlayerCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CommandPermissionLevel\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPlayer\@\@\@Z */ - MCAPI AutomationPlayerCommandOrigin(struct ActorUniqueID, class Level &, std::string const &, enum class CommandPermissionLevel, class NetworkIdentifier const &); + MCAPI AutomationPlayerCommandOrigin(std::string const &, class Player &); /** - * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPlayer\@\@\@Z + * @symbol ??0AutomationPlayerCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CommandPermissionLevel\@\@AEBVNetworkIdentifier\@\@\@Z */ - MCAPI AutomationPlayerCommandOrigin(std::string const &, class Player &); + MCAPI AutomationPlayerCommandOrigin(struct ActorUniqueID, class Level &, std::string const &, enum class CommandPermissionLevel, class NetworkIdentifier const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp b/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp index 5316d6b6a1..29779766cc 100644 --- a/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp +++ b/LiteLoader/include/llapi/mc/AutonomousActorManager.hpp @@ -25,52 +25,52 @@ class AutonomousActorManager { public: /** - * @symbol ??0AutonomousActorManager\@\@QEAA\@XZ + * @symbol ??0AutonomousActorManager\@\@QEAA\@XZ */ MCAPI AutonomousActorManager(); /** - * @symbol ?addAutonomousActorEntity\@AutonomousActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addAutonomousActorEntity\@AutonomousActorManager\@\@QEAAPEAVActor\@\@AEAVDimension\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI class Actor * addAutonomousActorEntity(class Dimension &, class OwnerPtrT); /** - * @symbol ?addAutonomousActorEntity\@AutonomousActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addAutonomousActorEntity\@AutonomousActorManager\@\@QEAAPEAVActor\@\@AEAVIAddActorEntityProxy\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI class Actor * addAutonomousActorEntity(class IAddActorEntityProxy &, class OwnerPtrT); /** - * @symbol ?addOwnedInactiveAutonomousActorEntity\@AutonomousActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addOwnedInactiveAutonomousActorEntity\@AutonomousActorManager\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void addOwnedInactiveAutonomousActorEntity(class OwnerPtrT); /** - * @symbol ?hasOwnedInactiveAutonomousActorWithUniqueID\@AutonomousActorManager\@\@QEBA_NUActorUniqueID\@\@\@Z + * @symbol ?hasOwnedInactiveAutonomousActorWithUniqueID\@AutonomousActorManager\@\@QEBA_NUActorUniqueID\@\@\@Z */ MCAPI bool hasOwnedInactiveAutonomousActorWithUniqueID(struct ActorUniqueID) const; /** - * @symbol ?initializeWithActorManager\@AutonomousActorManager\@\@QEAAXV?$not_null\@V?$NonOwnerPointer\@VActorManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?initializeWithActorManager\@AutonomousActorManager\@\@QEAAXV?$not_null\@V?$NonOwnerPointer\@VActorManager\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI void initializeWithActorManager(class gsl::not_null>); /** - * @symbol ?onChunkDiscarded\@AutonomousActorManager\@\@QEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkDiscarded\@AutonomousActorManager\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void onChunkDiscarded(class LevelChunk &); /** - * @symbol ?onChunkLoaded\@AutonomousActorManager\@\@QEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@AutonomousActorManager\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void onChunkLoaded(class LevelChunk &); /** - * @symbol ??1AutonomousActorManager\@\@QEAA\@XZ + * @symbol ??1AutonomousActorManager\@\@QEAA\@XZ */ MCAPI ~AutonomousActorManager(); //private: /** - * @symbol ?_moveActiveAutonomousActorEntityToInactive\@AutonomousActorManager\@\@AEAAXAEAVActor\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?_moveActiveAutonomousActorEntityToInactive\@AutonomousActorManager\@\@AEAAXAEAVActor\@\@AEAVLevelChunk\@\@\@Z */ MCAPI void _moveActiveAutonomousActorEntityToInactive(class Actor &, class LevelChunk &); /** - * @symbol ?_onRemoveActorEntityReferences\@AutonomousActorManager\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_onRemoveActorEntityReferences\@AutonomousActorManager\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp index e54229f92d..f03d3686c7 100644 --- a/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/AuxDataBlockItem.hpp @@ -32,88 +32,88 @@ class AuxDataBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AuxDataBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@AuxDataBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@AuxDataBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@AuxDataBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @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; /** - * @symbol ??0AuxDataBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z + * @symbol ??0AuxDataBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z */ MCAPI AuxDataBlockItem(std::string const &, int, class Block const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp index 6711f926dd..57a373fc94 100644 --- a/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableActorIdentifiersPacket.hpp @@ -30,42 +30,48 @@ class AvailableActorIdentifiersPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AvailableActorIdentifiersPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AvailableActorIdentifiersPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AvailableActorIdentifiersPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AvailableActorIdentifiersPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AvailableActorIdentifiersPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AvailableActorIdentifiersPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AvailableActorIdentifiersPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol ?readExtended\@AvailableActorIdentifiersPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@AvailableActorIdentifiersPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AvailableActorIdentifiersPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_AVAILABLEACTORIDENTIFIERSPACKET /** - * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AvailableActorIdentifiersPacket(); + MCVAPI ~AvailableActorIdentifiersPacket(); +#endif /** - * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@AEBV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@AEBV?$vector\@UActorInfo\@\@V?$allocator\@UActorInfo\@\@\@std\@\@\@std\@\@\@Z */ MCAPI AvailableActorIdentifiersPacket(std::vector const &); + /** + * @symbol ??0AvailableActorIdentifiersPacket\@\@QEAA\@XZ + */ + MCAPI AvailableActorIdentifiersPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp index ea9b06f88f..7832ea4a07 100644 --- a/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp +++ b/LiteLoader/include/llapi/mc/AvailableCommandsPacket.hpp @@ -128,37 +128,43 @@ inline std::vector getSoftEnumValues(std::string const& name) public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AvailableCommandsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@AvailableCommandsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@AvailableCommandsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@AvailableCommandsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@AvailableCommandsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@AvailableCommandsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@AvailableCommandsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@AvailableCommandsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_AVAILABLECOMMANDSPACKET /** - * @symbol ??0AvailableCommandsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI AvailableCommandsPacket(); + MCVAPI ~AvailableCommandsPacket(); +#endif /** - * @symbol ??0AvailableCommandsPacket\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@0$$QEAV?$vector\@UEnumData\@AvailableCommandsPacket\@\@V?$allocator\@UEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UConstrainedValueData\@AvailableCommandsPacket\@\@V?$allocator\@UConstrainedValueData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UCommandData\@AvailableCommandsPacket\@\@V?$allocator\@UCommandData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@USoftEnumData\@AvailableCommandsPacket\@\@V?$allocator\@USoftEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@\@Z + * @symbol ??0AvailableCommandsPacket\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@0$$QEAV?$vector\@UEnumData\@AvailableCommandsPacket\@\@V?$allocator\@UEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UConstrainedValueData\@AvailableCommandsPacket\@\@V?$allocator\@UConstrainedValueData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@UCommandData\@AvailableCommandsPacket\@\@V?$allocator\@UCommandData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@$$QEAV?$vector\@USoftEnumData\@AvailableCommandsPacket\@\@V?$allocator\@USoftEnumData\@AvailableCommandsPacket\@\@\@std\@\@\@2\@\@Z */ MCAPI AvailableCommandsPacket(std::vector const &, std::vector const &, std::vector &&, std::vector &&, std::vector &&, std::vector &&); + /** + * @symbol ??0AvailableCommandsPacket\@\@QEAA\@XZ + */ + MCAPI AvailableCommandsPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AverageTracker.hpp b/LiteLoader/include/llapi/mc/AverageTracker.hpp index 5fc7dbb364..559eb5c990 100644 --- a/LiteLoader/include/llapi/mc/AverageTracker.hpp +++ b/LiteLoader/include/llapi/mc/AverageTracker.hpp @@ -11,22 +11,22 @@ #undef BEFORE_EXTRA -struct AverageTracker { +class AverageTracker { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_AVERAGETRACKER public: - struct AverageTracker& operator=(struct AverageTracker const &) = delete; - AverageTracker(struct AverageTracker const &) = delete; + class AverageTracker& operator=(class AverageTracker const &) = delete; + AverageTracker(class AverageTracker const &) = delete; AverageTracker() = delete; #endif public: /** - * @symbol ?addSample\@AverageTracker\@\@QEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?addSample\@AverageTracker\@\@QEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void addSample(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp b/LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp index 69be07358b..a3df86cef0 100644 --- a/LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/AvoidBlockGoal.hpp @@ -30,56 +30,56 @@ class AvoidBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AvoidBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@AvoidBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@AvoidBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@AvoidBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@AvoidBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@AvoidBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@AvoidBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@AvoidBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@AvoidBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@AvoidBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@AvoidBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@AvoidBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@AvoidBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0AvoidBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0AvoidBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI AvoidBlockGoal(class Mob &); //private: /** - * @symbol ?_isValidTarget\@AvoidBlockGoal\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_isValidTarget\@AvoidBlockGoal\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isValidTarget(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp b/LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp index c0cddab451..b37f05f647 100644 --- a/LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/AvoidMobTypeDefinition.hpp @@ -30,16 +30,16 @@ class AvoidMobTypeDefinition { public: /** - * @symbol ??0AvoidMobTypeDefinition\@\@QEAA\@XZ + * @symbol ??0AvoidMobTypeDefinition\@\@QEAA\@XZ */ MCAPI AvoidMobTypeDefinition(); /** - * @symbol ?initialize\@AvoidMobTypeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAvoidMobTypeGoal\@\@\@Z + * @symbol ?initialize\@AvoidMobTypeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVAvoidMobTypeGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class AvoidMobTypeGoal &) const; /** - * @symbol ?buildSchema\@AvoidMobTypeDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAvoidMobTypeDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@AvoidMobTypeDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VAvoidMobTypeDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp b/LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp index 77d6203367..639a6bc301 100644 --- a/LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp +++ b/LiteLoader/include/llapi/mc/AvoidMobTypeGoal.hpp @@ -30,56 +30,56 @@ class AvoidMobTypeGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AvoidMobTypeGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@AvoidMobTypeGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@AvoidMobTypeGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@AvoidMobTypeGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@AvoidMobTypeGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@AvoidMobTypeGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@AvoidMobTypeGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@AvoidMobTypeGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@AvoidMobTypeGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@AvoidMobTypeGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@AvoidMobTypeGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@AvoidMobTypeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@AvoidMobTypeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0AvoidMobTypeGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0AvoidMobTypeGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI AvoidMobTypeGoal(class Mob &); /** - * @symbol ?canFindAvoidPath\@AvoidMobTypeGoal\@\@QEAA_NPEAVActor\@\@\@Z + * @symbol ?canFindAvoidPath\@AvoidMobTypeGoal\@\@QEAA_NPEAVActor\@\@\@Z */ MCAPI bool canFindAvoidPath(class Actor *); /** - * @symbol ?findNearestEntityToAvoid\@AvoidMobTypeGoal\@\@QEAAPEAVActor\@\@M\@Z + * @symbol ?findNearestEntityToAvoid\@AvoidMobTypeGoal\@\@QEAAPEAVActor\@\@M\@Z */ MCAPI class Actor * findNearestEntityToAvoid(float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Axolotl.hpp b/LiteLoader/include/llapi/mc/Axolotl.hpp index 22371c6f6d..db3f17cbab 100644 --- a/LiteLoader/include/llapi/mc/Axolotl.hpp +++ b/LiteLoader/include/llapi/mc/Axolotl.hpp @@ -32,153 +32,148 @@ class Axolotl : public Animal { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Axolotl\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Axolotl\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Axolotl(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Axolotl\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Axolotl\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 355 - * @symbol ?_getAdjustedAABBForSpawnCheck\@Axolotl\@\@UEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z + * @vftbl 352 + * @symbol ?_getAdjustedAABBForSpawnCheck\@Axolotl\@\@UEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z */ virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const &, class Vec3 const &) const; /** - * @symbol ??0Axolotl\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Axolotl\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Axolotl(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp index 0bc79592ed..5bfbe68541 100644 --- a/LiteLoader/include/llapi/mc/AzaleaBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaBlock.hpp @@ -31,231 +31,236 @@ class AzaleaBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AzaleaBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@AzaleaBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@AzaleaBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 24 - * @symbol ?canProvideMultifaceSupport\@AzaleaBlock\@\@UEBA_NAEBVBlock\@\@E\@Z + * @vftbl 24 + * @symbol ?canProvideMultifaceSupport\@AzaleaBlock\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideMultifaceSupport(class Block const &, unsigned char) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@AzaleaBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@AzaleaBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@AzaleaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@AzaleaBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@AzaleaBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0AzaleaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0AzaleaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI AzaleaBlock(std::string const &, int); //private: /** - * @symbol ?_growTree\@AzaleaBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_growTree\@AzaleaBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp b/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp index c2559bf8c3..c4dcd15d0e 100644 --- a/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaLeafBlock.hpp @@ -31,228 +31,233 @@ class AzaleaLeafBlock : public LeafBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AzaleaLeafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 136 - * @symbol ?getColor\@AzaleaLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@AzaleaLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@AzaleaLeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@AzaleaLeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 146 - * @symbol ?getVariant\@AzaleaLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@AzaleaLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 180 - * @symbol ?getRenderLayer\@AzaleaLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 181 + * @symbol ?getRenderLayer\@AzaleaLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@AzaleaLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@AzaleaLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @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 + * @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); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/AzaleaTreeAndRootsFeature.hpp b/LiteLoader/include/llapi/mc/AzaleaTreeAndRootsFeature.hpp index 6cdb069685..786111a3ed 100644 --- a/LiteLoader/include/llapi/mc/AzaleaTreeAndRootsFeature.hpp +++ b/LiteLoader/include/llapi/mc/AzaleaTreeAndRootsFeature.hpp @@ -31,26 +31,26 @@ class AzaleaTreeAndRootsFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~AzaleaTreeAndRootsFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@AzaleaTreeAndRootsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@AzaleaTreeAndRootsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_isLushGroundReplaceable\@AzaleaTreeAndRootsFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isLushGroundReplaceable\@AzaleaTreeAndRootsFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isLushGroundReplaceable(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_tryPlaceAzaleaTree\@AzaleaTreeAndRootsFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@I\@Z + * @symbol ?_tryPlaceAzaleaTree\@AzaleaTreeAndRootsFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@I\@Z */ MCAPI bool _tryPlaceAzaleaTree(class BlockSource &, class BlockPos const &, class Random &, unsigned int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp b/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp index 5e14138cfb..8cb9f44e67 100644 --- a/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundTaskBase.hpp @@ -29,86 +29,92 @@ class BackgroundTaskBase { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BACKGROUNDTASKBASE /** - * @symbol ??0BackgroundTaskBase\@\@QEAA\@V?$not_null\@PEAVIBackgroundTaskOwner\@\@\@gsl\@\@AEBUTaskStartInfoBase\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BackgroundTaskBase(); +#endif + /** + * @symbol ??0BackgroundTaskBase\@\@QEAA\@V?$not_null\@PEAVIBackgroundTaskOwner\@\@\@gsl\@\@AEBUTaskStartInfoBase\@\@_N\@Z */ MCAPI BackgroundTaskBase(class gsl::not_null, struct TaskStartInfoBase const &, bool); /** - * @symbol ?_makeOrphan\@BackgroundTaskBase\@\@QEAAXXZ + * @symbol ?_makeOrphan\@BackgroundTaskBase\@\@QEAAXXZ */ MCAPI void _makeOrphan(); /** - * @symbol ?canBeRunBy\@BackgroundTaskBase\@\@QEBA_NVid\@thread\@std\@\@\@Z + * @symbol ?canBeRunBy\@BackgroundTaskBase\@\@QEBA_NVid\@thread\@std\@\@\@Z */ MCAPI bool canBeRunBy(class std::thread::id) const; /** - * @symbol ?getGroup\@BackgroundTaskBase\@\@QEAAPEAVIBackgroundTaskOwner\@\@XZ + * @symbol ?getGroup\@BackgroundTaskBase\@\@QEAAPEAVIBackgroundTaskOwner\@\@XZ */ MCAPI class IBackgroundTaskOwner * getGroup(); /** - * @symbol ?getGroupState\@BackgroundTaskBase\@\@QEBA?AW4TaskGroupState\@\@XZ + * @symbol ?getGroupState\@BackgroundTaskBase\@\@QEBA?AW4TaskGroupState\@\@XZ */ MCAPI enum class TaskGroupState getGroupState() const; /** - * @symbol ?getNext\@BackgroundTaskBase\@\@QEAA?AV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@XZ + * @symbol ?getNext\@BackgroundTaskBase\@\@QEAA?AV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getNext(); /** - * @symbol ?getPrev\@BackgroundTaskBase\@\@QEAAPEAV1\@XZ + * @symbol ?getPrev\@BackgroundTaskBase\@\@QEAAPEAV1\@XZ */ MCAPI class BackgroundTaskBase * getPrev(); /** - * @symbol ?getPriority\@BackgroundTaskBase\@\@QEBAHXZ + * @symbol ?getPriority\@BackgroundTaskBase\@\@QEBAHXZ */ MCAPI int getPriority() const; /** - * @symbol ?getStartAfterTime\@BackgroundTaskBase\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ + * @symbol ?getStartAfterTime\@BackgroundTaskBase\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ */ MCAPI class std::chrono::time_point>> getStartAfterTime() const; /** - * @symbol ?hasAffinity\@BackgroundTaskBase\@\@QEBA_NXZ + * @symbol ?hasAffinity\@BackgroundTaskBase\@\@QEBA_NXZ */ MCAPI bool hasAffinity() const; /** - * @symbol ?isAsync\@BackgroundTaskBase\@\@QEBA_NXZ + * @symbol ?isAsync\@BackgroundTaskBase\@\@QEBA_NXZ */ MCAPI bool isAsync() const; /** - * @symbol ?isOrphaned\@BackgroundTaskBase\@\@QEBA_NXZ + * @symbol ?isOrphaned\@BackgroundTaskBase\@\@QEBA_NXZ */ MCAPI bool isOrphaned() const; /** - * @symbol ?isReadyToStart\@BackgroundTaskBase\@\@QEBA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?isReadyToStart\@BackgroundTaskBase\@\@QEBA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI bool isReadyToStart(class std::chrono::time_point>>) const; /** - * @symbol ?setNext\@BackgroundTaskBase\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z + * @symbol ?setNext\@BackgroundTaskBase\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ MCAPI void setNext(class std::shared_ptr); /** - * @symbol ?setPrev\@BackgroundTaskBase\@\@QEAAXPEAV1\@\@Z + * @symbol ?setPrev\@BackgroundTaskBase\@\@QEAAXPEAV1\@\@Z */ MCAPI void setPrev(class BackgroundTaskBase *); /** - * @symbol ?setStartAfterTime\@BackgroundTaskBase\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?setStartAfterTime\@BackgroundTaskBase\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI void setStartAfterTime(class std::chrono::time_point>>); /** - * @symbol ?setSyncPriority\@BackgroundTaskBase\@\@QEAAXXZ + * @symbol ?setSyncPriority\@BackgroundTaskBase\@\@QEAAXXZ */ MCAPI void setSyncPriority(); /** - * @symbol ?getCurrent\@BackgroundTaskBase\@\@SAPEAV1\@XZ + * @symbol ?getCurrent\@BackgroundTaskBase\@\@SAPEAV1\@XZ */ MCAPI static class BackgroundTaskBase * getCurrent(); //protected: /** - * @symbol ?backDownPriority\@BackgroundTaskBase\@\@IEAAXXZ + * @symbol ?backDownPriority\@BackgroundTaskBase\@\@IEAAXXZ */ MCAPI void backDownPriority(); /** - * @symbol ?taskComplete\@BackgroundTaskBase\@\@IEAAXXZ + * @symbol ?taskComplete\@BackgroundTaskBase\@\@IEAAXXZ */ MCAPI void taskComplete(); @@ -118,8 +124,8 @@ class BackgroundTaskBase { private: /** - * @symbol ?gCurrentTask\@BackgroundTaskBase\@\@0PEAV1\@EA + * @symbol ?gCurrentTask\@BackgroundTaskBase\@\@0PEAV1\@EA */ MCAPI static class BackgroundTaskBase * gCurrentTask; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp index 367f9b7674..ca0a198028 100644 --- a/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundTaskQueue.hpp @@ -29,44 +29,44 @@ class BackgroundTaskQueue { public: /** - * @symbol ??0BackgroundTaskQueue\@\@QEAA\@XZ + * @symbol ??0BackgroundTaskQueue\@\@QEAA\@XZ */ MCAPI BackgroundTaskQueue(); /** - * @symbol ?flush\@BackgroundTaskQueue\@\@QEAAXXZ + * @symbol ?flush\@BackgroundTaskQueue\@\@QEAAXXZ */ MCAPI void flush(); /** - * @symbol ?getApproximateTaskCount\@BackgroundTaskQueue\@\@QEBA_KXZ + * @symbol ?getApproximateTaskCount\@BackgroundTaskQueue\@\@QEBA_KXZ */ MCAPI unsigned __int64 getApproximateTaskCount() const; /** - * @symbol ?getNextItemPriority\@BackgroundTaskQueue\@\@QEAAHXZ + * @symbol ?getNextItemPriority\@BackgroundTaskQueue\@\@QEAAHXZ */ MCAPI int getNextItemPriority(); /** - * @symbol ?queue\@BackgroundTaskQueue\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z + * @symbol ?queue\@BackgroundTaskQueue\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z */ MCAPI void queue(class std::shared_ptr, bool); /** - * @symbol ?resortPriorityQueue\@BackgroundTaskQueue\@\@QEAAXXZ + * @symbol ?resortPriorityQueue\@BackgroundTaskQueue\@\@QEAAXXZ */ MCAPI void resortPriorityQueue(); /** - * @symbol ?tryPop\@BackgroundTaskQueue\@\@QEAA?AV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@H\@Z + * @symbol ?tryPop\@BackgroundTaskQueue\@\@QEAA?AV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@H\@Z */ MCAPI class std::shared_ptr tryPop(int); /** - * @symbol ??1BackgroundTaskQueue\@\@QEAA\@XZ + * @symbol ??1BackgroundTaskQueue\@\@QEAA\@XZ */ MCAPI ~BackgroundTaskQueue(); //private: /** - * @symbol ?_fetchAllAvailableTasks\@BackgroundTaskQueue\@\@AEAA_NXZ + * @symbol ?_fetchAllAvailableTasks\@BackgroundTaskQueue\@\@AEAA_NXZ */ MCAPI bool _fetchAllAvailableTasks(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BackgroundWorker.hpp b/LiteLoader/include/llapi/mc/BackgroundWorker.hpp index 28292fe2ef..0069dc4508 100644 --- a/LiteLoader/include/llapi/mc/BackgroundWorker.hpp +++ b/LiteLoader/include/llapi/mc/BackgroundWorker.hpp @@ -33,83 +33,89 @@ enum class RunOneResult; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BackgroundWorker(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isAsync\@BackgroundWorker\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isAsync\@BackgroundWorker\@\@UEBA_NXZ */ virtual bool isAsync() const; /** - * @vftbl 2 - * @symbol ?canTaskRunAgain\@BackgroundWorker\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?canTaskRunAgain\@BackgroundWorker\@\@UEBA_NXZ */ virtual bool canTaskRunAgain() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BACKGROUNDWORKER /** - * @symbol ??0BackgroundWorker\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NAEBVOSThreadPriority\@Threading\@Bedrock\@\@V?$optional\@_K\@2\@V?$optional\@H\@2\@AEAVWorkerPool\@\@1\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BackgroundWorker(); +#endif + /** + * @symbol ??0BackgroundWorker\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NAEBVOSThreadPriority\@Threading\@Bedrock\@\@V?$optional\@_K\@2\@V?$optional\@H\@2\@AEAVWorkerPool\@\@1\@Z */ MCAPI BackgroundWorker(std::string, bool, class Bedrock::Threading::OSThreadPriority const &, class std::optional, class std::optional, class WorkerPool &, bool); /** - * @symbol ?getApproximateTaskCount\@BackgroundWorker\@\@QEBA_KXZ + * @symbol ?getApproximateTaskCount\@BackgroundWorker\@\@QEBA_KXZ */ MCAPI unsigned __int64 getApproximateTaskCount() const; /** - * @symbol ?getThreadId\@BackgroundWorker\@\@QEBA?AVid\@thread\@std\@\@XZ + * @symbol ?getThreadId\@BackgroundWorker\@\@QEBA?AVid\@thread\@std\@\@XZ */ MCAPI class std::thread::id getThreadId() const; /** - * @symbol ?isIdle\@BackgroundWorker\@\@QEBA_NXZ + * @symbol ?isIdle\@BackgroundWorker\@\@QEBA_NXZ */ MCAPI bool isIdle() const; /** - * @symbol ?processTaskSync\@BackgroundWorker\@\@QEAA_NXZ + * @symbol ?processTaskSync\@BackgroundWorker\@\@QEAA_NXZ */ MCAPI bool processTaskSync(); /** - * @symbol ?queue\@BackgroundWorker\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z + * @symbol ?queue\@BackgroundWorker\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ MCAPI void queue(class std::shared_ptr); /** - * @symbol ?requestStop\@BackgroundWorker\@\@QEAAX_N\@Z + * @symbol ?requestStop\@BackgroundWorker\@\@QEAAX_N\@Z */ MCAPI void requestStop(bool); /** - * @symbol ?resetWorkerThreadID\@BackgroundWorker\@\@QEAAXXZ + * @symbol ?resetWorkerThreadID\@BackgroundWorker\@\@QEAAXXZ */ MCAPI void resetWorkerThreadID(); /** - * @symbol ?resortPriorityQueue\@BackgroundWorker\@\@QEAAXXZ + * @symbol ?resortPriorityQueue\@BackgroundWorker\@\@QEAAXXZ */ MCAPI void resortPriorityQueue(); /** - * @symbol ?start\@BackgroundWorker\@\@QEAAXXZ + * @symbol ?start\@BackgroundWorker\@\@QEAAXXZ */ MCAPI void start(); /** - * @symbol ?wake\@BackgroundWorker\@\@QEAAXXZ + * @symbol ?wake\@BackgroundWorker\@\@QEAAXXZ */ MCAPI void wake(); /** - * @symbol ?getLocal\@BackgroundWorker\@\@SAPEAV1\@XZ + * @symbol ?getLocal\@BackgroundWorker\@\@SAPEAV1\@XZ */ MCAPI static class BackgroundWorker * getLocal(); //private: /** - * @symbol ?_processNextTask\@BackgroundWorker\@\@AEAA_NXZ + * @symbol ?_processNextTask\@BackgroundWorker\@\@AEAA_NXZ */ MCAPI bool _processNextTask(); /** - * @symbol ?_runOneTask\@BackgroundWorker\@\@AEAA?AW4RunOneResult\@1\@XZ + * @symbol ?_runOneTask\@BackgroundWorker\@\@AEAA?AW4RunOneResult\@1\@XZ */ MCAPI enum class BackgroundWorker::RunOneResult _runOneTask(); private: /** - * @symbol ?gLocalWorkerMappingSingleton\@BackgroundWorker\@\@0PEAV1\@EA + * @symbol ?gLocalWorkerMappingSingleton\@BackgroundWorker\@\@0PEAV1\@EA */ MCAPI static class BackgroundWorker * gLocalWorkerMappingSingleton; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp b/LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp index 033e78391f..67bc13222c 100644 --- a/LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp +++ b/LiteLoader/include/llapi/mc/BackwardsCompatTextureGroup.hpp @@ -34,8 +34,8 @@ class BackwardsCompatTextureGroup { private: /** - * @symbol ?invalidInfo\@BackwardsCompatTextureGroup\@\@0VBackwardsCompatTextureInfo\@\@B + * @symbol ?invalidInfo\@BackwardsCompatTextureGroup\@\@0VBackwardsCompatTextureInfo\@\@B */ MCAPI static class BackwardsCompatTextureInfo const invalidInfo; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp b/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp index 89d886c34d..59c99149ae 100644 --- a/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp +++ b/LiteLoader/include/llapi/mc/BackwardsCompatTextureInfo.hpp @@ -27,8 +27,8 @@ class BackwardsCompatTextureInfo { public: /** - * @symbol ??0BackwardsCompatTextureInfo\@\@QEAA\@XZ + * @symbol ??0BackwardsCompatTextureInfo\@\@QEAA\@XZ */ MCAPI BackwardsCompatTextureInfo(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Balloon.hpp b/LiteLoader/include/llapi/mc/Balloon.hpp index 722b823420..30fa19b2a7 100644 --- a/LiteLoader/include/llapi/mc/Balloon.hpp +++ b/LiteLoader/include/llapi/mc/Balloon.hpp @@ -32,137 +32,137 @@ class Balloon : public PredictableProjectile { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Balloon\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Balloon\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Balloon(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@Balloon\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@Balloon\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@Balloon\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Balloon\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Balloon\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Balloon\@\@UEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0Balloon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Balloon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Balloon(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?remove\@Balloon\@\@QEAAX_N\@Z + * @symbol ?remove\@Balloon\@\@QEAAX_N\@Z */ MCAPI void remove(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BalloonComponent.hpp b/LiteLoader/include/llapi/mc/BalloonComponent.hpp index 62b826bcbb..7291cdfd22 100644 --- a/LiteLoader/include/llapi/mc/BalloonComponent.hpp +++ b/LiteLoader/include/llapi/mc/BalloonComponent.hpp @@ -29,72 +29,72 @@ class BalloonComponent { public: /** - * @symbol ??0BalloonComponent\@\@QEAA\@XZ + * @symbol ??0BalloonComponent\@\@QEAA\@XZ */ MCAPI BalloonComponent(); /** - * @symbol ?addAdditionalSaveData\@BalloonComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@BalloonComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?computeMaxHeight\@BalloonComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?computeMaxHeight\@BalloonComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void computeMaxHeight(class Actor &); /** - * @symbol ?detach\@BalloonComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?detach\@BalloonComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void detach(class Actor &); /** - * @symbol ?getAttachedActor\@BalloonComponent\@\@QEAAPEAVActor\@\@AEAV2\@\@Z + * @symbol ?getAttachedActor\@BalloonComponent\@\@QEAAPEAVActor\@\@AEAV2\@\@Z */ MCAPI class Actor * getAttachedActor(class Actor &); /** - * @symbol ?getMaxHeight\@BalloonComponent\@\@QEBAMXZ + * @symbol ?getMaxHeight\@BalloonComponent\@\@QEBAMXZ */ MCAPI float getMaxHeight() const; /** - * @symbol ?integrate\@BalloonComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?integrate\@BalloonComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void integrate(class Actor &); /** - * @symbol ?onRemoved\@BalloonComponent\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?onRemoved\@BalloonComponent\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void onRemoved(class Actor &, bool); /** - * @symbol ?readAdditionalSaveData\@BalloonComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@BalloonComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setAttachedActor\@BalloonComponent\@\@QEAAXAEAVActor\@\@0\@Z + * @symbol ?setAttachedActor\@BalloonComponent\@\@QEAAXAEAVActor\@\@0\@Z */ MCAPI void setAttachedActor(class Actor &, class Actor &); /** - * @symbol ?shouldPop\@BalloonComponent\@\@QEAA_NAEAVActor\@\@AEA_N\@Z + * @symbol ?shouldPop\@BalloonComponent\@\@QEAA_NAEAVActor\@\@AEA_N\@Z */ MCAPI bool shouldPop(class Actor &, bool &); /** - * @symbol ?ATTACHED_TAG\@BalloonComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ATTACHED_TAG\@BalloonComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ATTACHED_TAG; /** - * @symbol ?FENCE_BALLOON_RANGE\@BalloonComponent\@\@2MB + * @symbol ?FENCE_BALLOON_RANGE\@BalloonComponent\@\@2MB */ MCAPI static float const FENCE_BALLOON_RANGE; /** - * @symbol ?MAX_BALLOON_RANGE\@BalloonComponent\@\@2MB + * @symbol ?MAX_BALLOON_RANGE\@BalloonComponent\@\@2MB */ MCAPI static float const MAX_BALLOON_RANGE; /** - * @symbol ?MAX_HEIGHT_TAG\@BalloonComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MAX_HEIGHT_TAG\@BalloonComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MAX_HEIGHT_TAG; /** - * @symbol ?SHOULD_DROP_TAG\@BalloonComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SHOULD_DROP_TAG\@BalloonComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SHOULD_DROP_TAG; /** - * @symbol ?getBalloonForActor\@BalloonComponent\@\@SAPEAVActor\@\@AEBV2\@\@Z + * @symbol ?getBalloonForActor\@BalloonComponent\@\@SAPEAVActor\@\@AEBV2\@\@Z */ MCAPI static class Actor * getBalloonForActor(class Actor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BalloonDefinition.hpp b/LiteLoader/include/llapi/mc/BalloonDefinition.hpp index bdb4b86ef4..f1dbf8f69f 100644 --- a/LiteLoader/include/llapi/mc/BalloonDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BalloonDefinition.hpp @@ -31,8 +31,8 @@ class BalloonDefinition { public: /** - * @symbol ?buildSchema\@BalloonDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBalloonDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BalloonDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBalloonDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BalloonItem.hpp b/LiteLoader/include/llapi/mc/BalloonItem.hpp index 43dc12a690..a9996e963d 100644 --- a/LiteLoader/include/llapi/mc/BalloonItem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonItem.hpp @@ -32,98 +32,98 @@ class BalloonItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BalloonItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 18 - * @symbol ?isDyeable\@BalloonItem\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isDyeable\@BalloonItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 73 - * @symbol ?getColor\@BalloonItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @vftbl 73 + * @symbol ?getColor\@BalloonItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ virtual class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BalloonItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BalloonItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BalloonItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BalloonItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0BalloonItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BalloonItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BalloonItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BalloonSystem.hpp b/LiteLoader/include/llapi/mc/BalloonSystem.hpp index 96a40dce1e..78edd85cb9 100644 --- a/LiteLoader/include/llapi/mc/BalloonSystem.hpp +++ b/LiteLoader/include/llapi/mc/BalloonSystem.hpp @@ -30,19 +30,19 @@ class BalloonSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BalloonSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BalloonSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BalloonSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BalloonableComponent.hpp b/LiteLoader/include/llapi/mc/BalloonableComponent.hpp index 0b9851f824..d4cb8e9847 100644 --- a/LiteLoader/include/llapi/mc/BalloonableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BalloonableComponent.hpp @@ -30,16 +30,16 @@ class BalloonableComponent { public: /** - * @symbol ?getInteraction\@BalloonableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@BalloonableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); //private: /** - * @symbol ?attach\@BalloonableComponent\@\@AEAA_NAEAVActor\@\@0AEAVItemStack\@\@\@Z + * @symbol ?attach\@BalloonableComponent\@\@AEAA_NAEAVActor\@\@0AEAVItemStack\@\@\@Z */ MCAPI bool attach(class Actor &, class Actor &, class ItemStack &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BalloonableDefinition.hpp b/LiteLoader/include/llapi/mc/BalloonableDefinition.hpp index 8295e1c19d..916d10220a 100644 --- a/LiteLoader/include/llapi/mc/BalloonableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BalloonableDefinition.hpp @@ -31,8 +31,8 @@ class BalloonableDefinition { public: /** - * @symbol ?buildSchema\@BalloonableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBalloonableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BalloonableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBalloonableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BambooBlock.hpp b/LiteLoader/include/llapi/mc/BambooBlock.hpp deleted file mode 100644 index 4da06cdbec..0000000000 --- a/LiteLoader/include/llapi/mc/BambooBlock.hpp +++ /dev/null @@ -1,263 +0,0 @@ -/** - * @file BambooBlock.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "BlockLegacy.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BambooBlock. - * - */ -class BambooBlock : public BlockLegacy { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BAMBOOBLOCK -public: - class BambooBlock& operator=(class BambooBlock const &) = delete; - BambooBlock(class BambooBlock const &) = delete; - BambooBlock() = delete; -#endif - -public: - /** - * @vftbl 0 - * @hash 97839815 - */ - virtual ~BambooBlock(); - /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition@BambooBlock@@UEBA?AVVec3@@AEBVBlockPos@@@Z - * @hash 1979700142 - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 10 - * @symbol ?getAABB@BambooBlock@@UEBAAEBVAABB@@AEBVIConstBlockSource@@AEBVBlockPos@@AEBVBlock@@AEAV2@_N@Z - * @hash -1448745159 - */ - virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; - /** - * @vftbl 32 - * @hash -176245469 - */ - virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @hash -175321948 - */ - virtual void __unk_vfn_33(); - /** - * @vftbl 34 - * @hash -174398427 - */ - virtual void __unk_vfn_34(); - /** - * @vftbl 35 - * @symbol ?isWaterBlocking@BambooBlock@@UEBA_NXZ - * @hash 275707569 - */ - virtual bool isWaterBlocking() const; - /** - * @vftbl 55 - * @symbol ?isValidAuxValue@BambooBlock@@UEBA_NH@Z - * @hash -84921089 - */ - virtual bool isValidAuxValue(int) const; - /** - * @vftbl 62 - * @symbol ?canContainLiquid@BambooBlock@@UEBA_NXZ - * @hash 1301696863 - */ - virtual bool canContainLiquid() const; - /** - * @vftbl 82 - * @hash -33099714 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 - * @symbol ?onFertilized@BambooBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@W4FertilizerType@@@Z - * @hash 82381917 - */ - virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum FertilizerType) const; - /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer@BambooBlock@@UEBA_NAEAVBlockSource@@@Z - * @hash -1442568966 - */ - virtual bool mayConsumeFertilizer(class BlockSource &) const; - /** - * @vftbl 88 - * @symbol ?canBeFertilized@BambooBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z - * @hash 1146808830 - */ - virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 92 - * @symbol ?mayPlace@BambooBlock@@MEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z - * @hash 899626448 - */ - virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 100 - * @symbol ?neighborChanged@BambooBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z - * @hash 685693787 - */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; - /** - * @vftbl 102 - * @symbol ?asItemInstance@BambooBlock@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z - * @hash 1358254705 - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; - /** - * @vftbl 105 - * @hash 1432640646 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 106 - * @symbol ?getPlacementBlock@BambooBlock@@UEBAAEBVBlock@@AEAVActor@@AEBVBlockPos@@EAEBVVec3@@H@Z - * @hash 784087816 - */ - virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; - /** - * @vftbl 123 - * @hash 1488051906 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @hash 1489898948 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @hash 1490822469 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 143 - * @symbol ?getVisualShape@BambooBlock@@UEBAAEBVAABB@@AEBVBlock@@AEAV2@_N@Z - * @hash 555483235 - */ - virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; - /** - * @vftbl 156 - * @hash 1576709922 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 169 - * @symbol ?onPlace@BambooBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@@Z - * @hash -1276847557 - */ - virtual void onPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 171 - * @symbol ?playerDestroy@BambooBlock@@UEBAXAEAVPlayer@@AEBVBlockPos@@AEBVBlock@@@Z - * @hash -1893368307 - */ - virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 173 - * @symbol ?tick@BambooBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z - * @hash -1843059809 - */ - virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 174 - * @symbol ?randomTick@BambooBlock@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z - * @hash 1128425244 - */ - virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 179 - * @symbol ?canSurvive@BambooBlock@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z - * @hash 2122998231 - */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 186 - * @hash 1662597375 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 188 - * @symbol ?getResourceItem@BambooBlock@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - * @hash -365594729 - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 192 - * @hash -391814758 - */ - virtual void __unk_vfn_192(); - /** - * @vftbl 193 - * @hash 1668382699 - */ - virtual void __unk_vfn_193(); - /** - * @vftbl 194 - * @hash 1669198588 - */ - virtual void __unk_vfn_194(); - /** - * @vftbl 195 - * @hash 1670091357 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @hash 1671014878 - */ - virtual void __unk_vfn_196(); - /** - * @symbol ?getDescriptionId@BlockLegacy@@QEBAAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - * @hash -1816919269 - */ - MCAPI std::string const & getDescriptionId() const; - /** - * @symbol ??0BambooBlock@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z - * @hash -18497801 - */ - MCAPI BambooBlock(std::string const &, int); - /** - * @symbol ?getMaxHeight@BambooBlock@@SAHAEBVBlockPos@@@Z - * @hash -219513615 - */ - MCAPI static int getMaxHeight(class BlockPos const &); - -//private: - /** - * @symbol ?_determineNewBlockState@BambooBlock@@AEBAAEBVBlock@@AEAVBlockSource@@AEBVBlockPos@@@Z - * @hash -218288126 - */ - MCAPI class Block const & _determineNewBlockState(class BlockSource &, class BlockPos const &) const; - /** - * @symbol ?_getLeafSize@BambooBlock@@AEBA?AW4LeafSize@@AEBVBlock@@@Z - * @hash -1935665105 - */ - MCAPI enum LeafSize _getLeafSize(class Block const &) const; - /** - * @symbol ?_getStalkThickness@BambooBlock@@AEBA?AW4StalkThickness@@AEBVBlock@@@Z - * @hash 2119377167 - */ - MCAPI enum StalkThickness _getStalkThickness(class Block const &) const; - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BambooBlockItem.hpp b/LiteLoader/include/llapi/mc/BambooBlockItem.hpp deleted file mode 100644 index 31cb119e4d..0000000000 --- a/LiteLoader/include/llapi/mc/BambooBlockItem.hpp +++ /dev/null @@ -1,123 +0,0 @@ -/** - * @file BambooBlockItem.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "Json.hpp" -#include "BlockItem.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BambooBlockItem. - * - */ -class BambooBlockItem : public BlockItem { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BAMBOOBLOCKITEM -public: - class BambooBlockItem& operator=(class BambooBlockItem const &) = delete; - BambooBlockItem(class BambooBlockItem const &) = delete; - BambooBlockItem() = delete; -#endif - -public: - /** - * @vftbl 0 - * @hash -1150221574 - */ - virtual ~BambooBlockItem(); - /** - * @vftbl 7 - * @hash -1253298233 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 11 - * @hash -234427292 - */ - virtual void __unk_vfn_11(); - /** - * @vftbl 14 - * @hash -231656729 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 16 - * @hash -229809687 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue@BambooBlockItem@@UEBAHH@Z - * @hash -2027030816 - */ - virtual int getLevelDataForAuxValue(int) const; - /** - * @vftbl 51 - * @hash -119910688 - */ - virtual void __unk_vfn_51(); - /** - * @vftbl 53 - * @hash -118063646 - */ - virtual void __unk_vfn_53(); - /** - * @vftbl 66 - * @hash -86663932 - */ - virtual void __unk_vfn_66(); - /** - * @vftbl 70 - * @hash -63575907 - */ - virtual void __unk_vfn_70(); - /** - * @vftbl 71 - * @hash -62652386 - */ - virtual void __unk_vfn_71(); - /** - * @vftbl 72 - * @hash -61728865 - */ - virtual void __unk_vfn_72(); - /** - * @vftbl 75 - * @hash -58958302 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 79 - * @hash -275809770 - */ - virtual void __unk_vfn_79(); - /** - * @vftbl 80 - * @hash -255492308 - */ - virtual void __unk_vfn_80(); - /** - * @vftbl 132 - * @symbol ?_useOn@BambooBlockItem@@UEBA_NAEAVItemStack@@AEAVActor@@VBlockPos@@EAEBVVec3@@@Z - * @hash 446438684 - */ - virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; - /** - * @symbol ??0BambooBlockItem@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z - * @hash -1330714838 - */ - MCAPI BambooBlockItem(std::string const &, int); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BambooFeature.hpp b/LiteLoader/include/llapi/mc/BambooFeature.hpp index ae251cf6cb..7e352e4837 100644 --- a/LiteLoader/include/llapi/mc/BambooFeature.hpp +++ b/LiteLoader/include/llapi/mc/BambooFeature.hpp @@ -31,14 +31,14 @@ class BambooFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BambooFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BambooFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BambooFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BambooItem.hpp b/LiteLoader/include/llapi/mc/BambooItem.hpp index cdf5272140..87e9dd41dd 100644 --- a/LiteLoader/include/llapi/mc/BambooItem.hpp +++ b/LiteLoader/include/llapi/mc/BambooItem.hpp @@ -27,88 +27,88 @@ class BambooItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BambooItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@BambooItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@BambooItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@BambooItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BambooItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0BambooItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BambooItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BambooItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BambooSapling.hpp b/LiteLoader/include/llapi/mc/BambooSapling.hpp deleted file mode 100644 index 646d83b7a9..0000000000 --- a/LiteLoader/include/llapi/mc/BambooSapling.hpp +++ /dev/null @@ -1,324 +0,0 @@ -/** - * @file BambooSapling.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "Sapling.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class BambooSapling. - * - */ -class BambooSapling : public Sapling { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BAMBOOSAPLING -public: - class BambooSapling& operator=(class BambooSapling const &) = delete; - BambooSapling(class BambooSapling const &) = delete; - BambooSapling() = delete; -#endif - -public: - /** - * @vftbl 0 - * @hash 320284690 - */ - virtual ~BambooSapling(); - /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition@BambooSapling@@UEBA?AVVec3@@AEBVBlockPos@@@Z - * @hash 1166727017 - */ - virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; - /** - * @vftbl 19 - * @hash -227039124 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 29 - * @hash -198409973 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @hash -178092511 - */ - virtual void __unk_vfn_30(); - /** - * @vftbl 32 - * @hash -176245469 - */ - virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @hash -175321948 - */ - virtual void __unk_vfn_33(); - /** - * @vftbl 34 - * @hash -174398427 - */ - virtual void __unk_vfn_34(); - /** - * @vftbl 36 - * @hash -172551385 - */ - virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @hash -171627864 - */ - virtual void __unk_vfn_37(); - /** - * @vftbl 38 - * @hash -170704343 - */ - virtual void __unk_vfn_38(); - /** - * @vftbl 39 - * @hash -169780822 - */ - virtual void __unk_vfn_39(); - /** - * @vftbl 40 - * @hash -149463360 - */ - virtual void __unk_vfn_40(); - /** - * @vftbl 41 - * @hash -148539839 - */ - virtual void __unk_vfn_41(); - /** - * @vftbl 42 - * @hash -147616318 - */ - virtual void __unk_vfn_42(); - /** - * @vftbl 44 - * @hash -145769276 - */ - virtual void __unk_vfn_44(); - /** - * @vftbl 45 - * @hash -144845755 - */ - virtual void __unk_vfn_45(); - /** - * @vftbl 46 - * @hash -143922234 - */ - virtual void __unk_vfn_46(); - /** - * @vftbl 47 - * @hash -142998713 - */ - virtual void __unk_vfn_47(); - /** - * @vftbl 48 - * @hash -142075192 - */ - virtual void __unk_vfn_48(); - /** - * @vftbl 49 - * @hash -141151671 - */ - virtual void __unk_vfn_49(); - /** - * @vftbl 54 - * @hash -117140125 - */ - virtual void __unk_vfn_54(); - /** - * @vftbl 55 - * @symbol ?isValidAuxValue@BambooSapling@@UEBA_NH@Z - * @hash 296447242 - */ - virtual bool isValidAuxValue(int) const; - /** - * @vftbl 60 - * @hash -99662418 - */ - virtual void __unk_vfn_60(); - /** - * @vftbl 61 - * @hash -91281537 - */ - virtual void __unk_vfn_61(); - /** - * @vftbl 62 - * @symbol ?canContainLiquid@BambooSapling@@UEBA_NXZ - * @hash 731291220 - */ - virtual bool canContainLiquid() const; - /** - * @vftbl 75 - * @hash -58958302 - */ - virtual void __unk_vfn_75(); - /** - * @vftbl 82 - * @hash -33099714 - */ - virtual void __unk_vfn_82(); - /** - * @vftbl 86 - * @symbol ?onFertilized@BambooSapling@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@PEAVActor@@W4FertilizerType@@@Z - * @hash 1568497826 - */ - virtual bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum FertilizerType) const; - /** - * @vftbl 88 - * @symbol ?canBeFertilized@BambooSapling@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@AEBVBlock@@@Z - * @hash -1109759063 - */ - virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 92 - * @symbol ?mayPlace@BambooSapling@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z - * @hash 1013618012 - */ - virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 100 - * @symbol ?neighborChanged@BambooSapling@@UEBAXAEAVBlockSource@@AEBVBlockPos@@1@Z - * @hash -942776762 - */ - virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; - /** - * @vftbl 102 - * @symbol ?asItemInstance@BambooSapling@@UEBA?AVItemInstance@@AEBVBlock@@PEBVBlockActor@@@Z - * @hash 905119798 - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; - /** - * @vftbl 105 - * @hash 1432640646 - */ - virtual void __unk_vfn_105(); - /** - * @vftbl 123 - * @hash 1488051906 - */ - virtual void __unk_vfn_123(); - /** - * @vftbl 125 - * @hash 1489898948 - */ - virtual void __unk_vfn_125(); - /** - * @vftbl 126 - * @hash 1490822469 - */ - virtual void __unk_vfn_126(); - /** - * @vftbl 131 - * @hash 1514834015 - */ - virtual void __unk_vfn_131(); - /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking@BambooSapling@@UEBA_NXZ - * @hash 683554528 - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 146 - * @symbol ?getVariant@BambooSapling@@UEBAHAEBVBlock@@@Z - * @hash 1359093940 - */ - virtual int getVariant(class Block const &) const; - /** - * @vftbl 156 - * @hash 1569252562 - */ - virtual void __unk_vfn_156(); - /** - * @vftbl 157 - * @symbol ?getSilkTouchItemInstance@BambooSapling@@UEBA?AVItemInstance@@AEBVBlock@@@Z - * @hash -953611877 - */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; - /** - * @vftbl 166 - * @hash 1547586817 - */ - virtual void __unk_vfn_166(); - /** - * @vftbl 167 - * @hash 1548510338 - */ - virtual void __unk_vfn_167(); - /** - * @vftbl 168 - * @hash 1549433859 - */ - virtual void __unk_vfn_168(); - /** - * @vftbl 171 - * @symbol ?playerDestroy@BambooSapling@@UEBAXAEAVPlayer@@AEBVBlockPos@@AEBVBlock@@@Z - * @hash 66189240 - */ - virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 172 - * @hash 1630274140 - */ - virtual void __unk_vfn_172(); - /** - * @vftbl 174 - * @symbol ?randomTick@BambooSapling@@UEBAXAEAVBlockSource@@AEBVBlockPos@@AEAVRandom@@@Z - * @hash -248256601 - */ - virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; - /** - * @vftbl 176 - * @hash 1633968224 - */ - virtual void __unk_vfn_176(); - /** - * @vftbl 179 - * @symbol ?canSurvive@BambooSapling@@UEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z - * @hash -1714778420 - */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 186 - * @hash 1662597375 - */ - virtual void __unk_vfn_186(); - /** - * @vftbl 188 - * @symbol ?getResourceItem@BambooSapling@@UEBA?AVItemInstance@@AEAVRandomize@@AEBVBlock@@H@Z - * @hash -508210190 - */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @symbol ??0BambooSapling@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@H@Z - * @hash 876803410 - */ - MCAPI BambooSapling(std::string const &, int); - -//private: - /** - * @symbol ?_grow@BambooSapling@@AEBA_NAEAVBlockSource@@AEBVBlockPos@@@Z - * @hash 823227329 - */ - MCAPI bool _grow(class BlockSource &, class BlockPos const &) const; - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp index f2ce3e2885..3350e51f46 100644 --- a/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooSaplingBlock.hpp @@ -26,276 +26,281 @@ class BambooSaplingBlock : public Sapling { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BambooSaplingBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@BambooSaplingBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@BambooSaplingBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@BambooSaplingBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@BambooSaplingBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BambooSaplingBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@BambooSaplingBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@BambooSaplingBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@BambooSaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BambooSaplingBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@BambooSaplingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BambooSaplingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@BambooSaplingBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@BambooSaplingBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@BambooSaplingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0BambooSaplingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BambooSaplingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BambooSaplingBlock(std::string const &, int); //private: /** - * @symbol ?_grow\@BambooSaplingBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_grow\@BambooSaplingBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _grow(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp index 6407e88e6f..c87be5915e 100644 --- a/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp +++ b/LiteLoader/include/llapi/mc/BambooStalkBlock.hpp @@ -26,309 +26,309 @@ class BambooStalkBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BambooStalkBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@BambooStalkBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@BambooStalkBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@BambooStalkBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@BambooStalkBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@BambooStalkBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@BambooStalkBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BambooStalkBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BambooStalkBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 92 + * @symbol ?mayPlace\@BambooStalkBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@BambooStalkBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@BambooStalkBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BambooStalkBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@BambooStalkBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_178(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 179 + * @symbol ?canSurvive\@BambooStalkBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_185(); + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 186 - * @symbol ?playerDestroy\@BambooStalkBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@BambooStalkBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@BambooStalkBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BAMBOOSTALKBLOCK /** - * @symbol ?canBeSilkTouched\@BambooStalkBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@BambooStalkBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0BambooStalkBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BambooStalkBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BambooStalkBlock(std::string const &, int); /** - * @symbol ?getMaxHeight\@BambooStalkBlock\@\@SAHAEBVBlockPos\@\@\@Z + * @symbol ?getMaxHeight\@BambooStalkBlock\@\@SAHAEBVBlockPos\@\@\@Z */ MCAPI static int getMaxHeight(class BlockPos const &); //private: /** - * @symbol ?_determineNewBlockState\@BambooStalkBlock\@\@AEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_determineNewBlockState\@BambooStalkBlock\@\@AEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Block const & _determineNewBlockState(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_getLeafSize\@BambooStalkBlock\@\@AEBA?AW4LeafSize\@\@AEBVBlock\@\@\@Z + * @symbol ?_getLeafSize\@BambooStalkBlock\@\@AEBA?AW4LeafSize\@\@AEBVBlock\@\@\@Z */ MCAPI enum class LeafSize _getLeafSize(class Block const &) const; /** - * @symbol ?_getStalkThickness\@BambooStalkBlock\@\@AEBA?AW4StalkThickness\@\@AEBVBlock\@\@\@Z + * @symbol ?_getStalkThickness\@BambooStalkBlock\@\@AEBA?AW4StalkThickness\@\@AEBVBlock\@\@\@Z */ MCAPI enum class StalkThickness _getStalkThickness(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp index 85fd37b221..ba0612cbce 100644 --- a/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerAddPatternRecipe.hpp @@ -32,55 +32,55 @@ class BannerAddPatternRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BannerAddPatternRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@BannerAddPatternRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@BannerAddPatternRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@BannerAddPatternRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@BannerAddPatternRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@BannerAddPatternRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI BannerAddPatternRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI BannerAddPatternRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ??0BannerAddPatternRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI BannerAddPatternRecipe(class gsl::basic_string_span); + 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\@\@AEAVCraftingContainer\@\@\@Z */ MCAPI class Bedrock::NonOwnerPointer const matchPatterns(class CraftingContainer &) const; /** - * @symbol ?ID\@BannerAddPatternRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@BannerAddPatternRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerBlock.hpp b/LiteLoader/include/llapi/mc/BannerBlock.hpp index 695c6739c7..9e15f26dca 100644 --- a/LiteLoader/include/llapi/mc/BannerBlock.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlock.hpp @@ -31,276 +31,281 @@ class BannerBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BannerBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BannerBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@BannerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@BannerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BannerBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@BannerBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BannerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BannerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BannerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BannerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 194 + * @symbol ?getEntityResourceItem\@BannerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @symbol ??0BannerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0BannerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI BannerBlock(std::string const &, int, bool); /** - * @symbol ?EAST_AABB\@BannerBlock\@\@2VAABB\@\@A + * @symbol ?EAST_AABB\@BannerBlock\@\@2VAABB\@\@A */ MCAPI static class AABB EAST_AABB; /** - * @symbol ?NORTH_AABB\@BannerBlock\@\@2VAABB\@\@A + * @symbol ?NORTH_AABB\@BannerBlock\@\@2VAABB\@\@A */ MCAPI static class AABB NORTH_AABB; /** - * @symbol ?SOUTH_AABB\@BannerBlock\@\@2VAABB\@\@A + * @symbol ?SOUTH_AABB\@BannerBlock\@\@2VAABB\@\@A */ MCAPI static class AABB SOUTH_AABB; /** - * @symbol ?STANDING_AABB\@BannerBlock\@\@2VAABB\@\@A + * @symbol ?STANDING_AABB\@BannerBlock\@\@2VAABB\@\@A */ MCAPI static class AABB STANDING_AABB; /** - * @symbol ?WEST_AABB\@BannerBlock\@\@2VAABB\@\@A + * @symbol ?WEST_AABB\@BannerBlock\@\@2VAABB\@\@A */ MCAPI static class AABB WEST_AABB; //private: /** - * @symbol ?_itemInstanceFromBlockEntity\@BannerBlock\@\@AEBA?AVItemInstance\@\@V?$not_null\@PEBVBannerBlockActor\@\@\@gsl\@\@\@Z + * @symbol ?_itemInstanceFromBlockEntity\@BannerBlock\@\@AEBA?AVItemInstance\@\@V?$not_null\@PEBVBannerBlockActor\@\@\@gsl\@\@\@Z */ MCAPI class ItemInstance _itemInstanceFromBlockEntity(class gsl::not_null) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp index 30a668e608..19ee37a150 100644 --- a/LiteLoader/include/llapi/mc/BannerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BannerBlockActor.hpp @@ -31,135 +31,135 @@ class BannerBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BannerBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BannerBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BannerBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@BannerBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@BannerBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@BannerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@BannerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 11 - * @symbol ?onPlace\@BannerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 11 + * @symbol ?onPlace\@BannerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onPlace(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@BannerBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@BannerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@BannerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0BannerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BannerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BannerBlockActor(class BlockPos const &); /** - * @symbol ?getBaseColorInt\@BannerBlockActor\@\@QEBAEXZ + * @symbol ?getBaseColorInt\@BannerBlockActor\@\@QEBAEXZ */ MCAPI unsigned char getBaseColorInt() const; /** - * @symbol ?setItemValues\@BannerBlockActor\@\@QEAAXAEBVItemStackBase\@\@\@Z + * @symbol ?setItemValues\@BannerBlockActor\@\@QEAAXAEBVItemStackBase\@\@\@Z */ MCAPI void setItemValues(class ItemStackBase const &); /** - * @symbol ?MAX_PATTERNS\@BannerBlockActor\@\@2HB + * @symbol ?MAX_PATTERNS\@BannerBlockActor\@\@2HB */ MCAPI static int const MAX_PATTERNS; /** - * @symbol ?TAG_BASE_COLOR\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_BASE_COLOR\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_BASE_COLOR; /** - * @symbol ?TAG_COLOR\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_COLOR\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_COLOR; /** - * @symbol ?TAG_PATTERN\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_PATTERN\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_PATTERN; /** - * @symbol ?TAG_PATTERNS\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_PATTERNS\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_PATTERNS; /** - * @symbol ?TAG_TYPE\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_TYPE\@BannerBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_TYPE; /** - * @symbol ?getBannerType\@BannerBlockActor\@\@SA?AW4BannerBlockType\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?getBannerType\@BannerBlockActor\@\@SA?AW4BannerBlockType\@\@PEBVCompoundTag\@\@\@Z */ MCAPI static enum class BannerBlockType getBannerType(class CompoundTag const *); /** - * @symbol ?getBaseColor\@BannerBlockActor\@\@SAHAEBVItemStack\@\@\@Z + * @symbol ?getBaseColor\@BannerBlockActor\@\@SAHAEBVItemStack\@\@\@Z */ MCAPI static int getBaseColor(class ItemStack const &); /** - * @symbol ?getPatternCount\@BannerBlockActor\@\@SAHPEBVCompoundTag\@\@\@Z + * @symbol ?getPatternCount\@BannerBlockActor\@\@SAHPEBVCompoundTag\@\@\@Z */ MCAPI static int getPatternCount(class CompoundTag const *); /** - * @symbol ?isDefaultBanner\@BannerBlockActor\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isDefaultBanner\@BannerBlockActor\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool isDefaultBanner(class ItemStackBase const &); /** - * @symbol ?removeLastPattern\@BannerBlockActor\@\@SA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?removeLastPattern\@BannerBlockActor\@\@SA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI static bool removeLastPattern(class ItemStack &, class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp index 4092b68600..a7d5c0d52c 100644 --- a/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BannerDuplicateRecipe.hpp @@ -31,51 +31,51 @@ class BannerDuplicateRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BannerDuplicateRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@BannerDuplicateRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@BannerDuplicateRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@BannerDuplicateRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@BannerDuplicateRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@BannerDuplicateRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@BannerDuplicateRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@BannerDuplicateRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@BannerDuplicateRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@BannerDuplicateRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0BannerDuplicateRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0BannerDuplicateRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI BannerDuplicateRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI BannerDuplicateRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ??0BannerDuplicateRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ??0BannerDuplicateRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI BannerDuplicateRecipe(class gsl::basic_string_span); + MCAPI BannerDuplicateRecipe(class std::basic_string_view>); /** - * @symbol ?ID\@BannerDuplicateRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@BannerDuplicateRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerItem.hpp b/LiteLoader/include/llapi/mc/BannerItem.hpp index a37067dcf1..aaa9a4c74f 100644 --- a/LiteLoader/include/llapi/mc/BannerItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerItem.hpp @@ -32,107 +32,103 @@ class BannerItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BannerItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol ?isWearableThroughLootTable\@BannerItem\@\@UEBA_NPEBVCompoundTag\@\@\@Z + * @vftbl 54 + * @symbol ?isWearableThroughLootTable\@BannerItem\@\@UEBA_NPEBVCompoundTag\@\@\@Z */ virtual bool isWearableThroughLootTable(class CompoundTag const *) const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@BannerItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@BannerItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@BannerItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@BannerItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BannerItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BannerItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BannerItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BannerItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0BannerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BannerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BannerItem(std::string const &, int); - /** - * @symbol ?getPatternAndColorPairsFromItemStack\@BannerItem\@\@SA?AV?$vector\@U?$pair\@V?$not_null\@PEBVBannerPattern\@\@\@gsl\@\@W4ItemColor\@\@\@std\@\@V?$allocator\@U?$pair\@V?$not_null\@PEBVBannerPattern\@\@\@gsl\@\@W4ItemColor\@\@\@std\@\@\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z - */ - MCAPI static std::vector, enum class ItemColor>> getPatternAndColorPairsFromItemStack(class ItemStackBase const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerPattern.hpp b/LiteLoader/include/llapi/mc/BannerPattern.hpp index b69ae14587..f0039f3d9f 100644 --- a/LiteLoader/include/llapi/mc/BannerPattern.hpp +++ b/LiteLoader/include/llapi/mc/BannerPattern.hpp @@ -30,224 +30,224 @@ class BannerPattern { public: /** - * @symbol ?getIgnoreAux\@BannerPattern\@\@QEBA_NXZ + * @symbol ?getIgnoreAux\@BannerPattern\@\@QEBA_NXZ */ MCAPI bool getIgnoreAux() const; /** - * @symbol ?getIngredientItem\@BannerPattern\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getIngredientItem\@BannerPattern\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getIngredientItem() const; /** - * @symbol ?getName\@BannerPattern\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BannerPattern\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getNameID\@BannerPattern\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getNameID\@BannerPattern\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getNameID() const; /** - * @symbol ?getPattern\@BannerPattern\@\@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 + * @symbol ?getPattern\@BannerPattern\@\@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 & getPattern() const; /** - * @symbol ?hasPattern\@BannerPattern\@\@QEBA_NXZ + * @symbol ?hasPattern\@BannerPattern\@\@QEBA_NXZ */ MCAPI bool hasPattern() const; /** - * @symbol ?matchesPatternItem\@BannerPattern\@\@QEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?matchesPatternItem\@BannerPattern\@\@QEBA_NAEBVItemStackBase\@\@\@Z */ MCAPI bool matchesPatternItem(class ItemStackBase const &) const; /** - * @symbol ?requiresIngredientItem\@BannerPattern\@\@QEBA_NXZ + * @symbol ?requiresIngredientItem\@BannerPattern\@\@QEBA_NXZ */ MCAPI bool requiresIngredientItem() const; /** - * @symbol ?requiresPatternItem\@BannerPattern\@\@QEBA_NXZ + * @symbol ?requiresPatternItem\@BannerPattern\@\@QEBA_NXZ */ MCAPI bool requiresPatternItem() const; /** - * @symbol ?findPatternIndexByNameID\@BannerPattern\@\@SA?AV?$optional\@E\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?findPatternIndexByNameID\@BannerPattern\@\@SA?AV?$optional\@E\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static class std::optional findPatternIndexByNameID(std::string const &); /** - * @symbol ?getPatternIndexFromName\@BannerPattern\@\@SA?AV?$optional\@E\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getPatternIndexFromName\@BannerPattern\@\@SA?AV?$optional\@E\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static class std::optional getPatternIndexFromName(std::string const &); /** - * @symbol ?getPatternIndexFromNameID\@BannerPattern\@\@SAEAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPatternIndexFromNameID\@BannerPattern\@\@SAEAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static unsigned char getPatternIndexFromNameID(std::string const &); /** - * @symbol ?initPatterns\@BannerPattern\@\@SAXXZ + * @symbol ?initPatterns\@BannerPattern\@\@SAXXZ */ MCAPI static void initPatterns(); /** - * @symbol ?mBase\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mBase\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mBase; /** - * @symbol ?mBorder\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mBorder\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mBorder; /** - * @symbol ?mBricks\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mBricks\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mBricks; /** - * @symbol ?mCircle\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mCircle\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mCircle; /** - * @symbol ?mCreeper\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mCreeper\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mCreeper; /** - * @symbol ?mCross\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mCross\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mCross; /** - * @symbol ?mCurlyBorder\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mCurlyBorder\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mCurlyBorder; /** - * @symbol ?mDiagonalLeft\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mDiagonalLeft\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mDiagonalLeft; /** - * @symbol ?mDiagonalRight\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mDiagonalRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mDiagonalRight; /** - * @symbol ?mDiagonalUpLeft\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mDiagonalUpLeft\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mDiagonalUpLeft; /** - * @symbol ?mDiagonalUpRight\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mDiagonalUpRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mDiagonalUpRight; /** - * @symbol ?mFlower\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mFlower\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mFlower; /** - * @symbol ?mGlobe\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mGlobe\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mGlobe; /** - * @symbol ?mGradient\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mGradient\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mGradient; /** - * @symbol ?mGradientUp\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mGradientUp\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mGradientUp; /** - * @symbol ?mHalfHorizontal\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mHalfHorizontal\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mHalfHorizontal; /** - * @symbol ?mHalfHorizontalBottom\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mHalfHorizontalBottom\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mHalfHorizontalBottom; /** - * @symbol ?mHalfVertical\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mHalfVertical\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mHalfVertical; /** - * @symbol ?mHalfVerticalRight\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mHalfVerticalRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mHalfVerticalRight; /** - * @symbol ?mMojang\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mMojang\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mMojang; /** - * @symbol ?mPatterns\@BannerPattern\@\@2V?$vector\@V?$unique_ptr\@VBannerPattern\@\@U?$default_delete\@VBannerPattern\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VBannerPattern\@\@U?$default_delete\@VBannerPattern\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mPatterns\@BannerPattern\@\@2V?$vector\@V?$unique_ptr\@VBannerPattern\@\@U?$default_delete\@VBannerPattern\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VBannerPattern\@\@U?$default_delete\@VBannerPattern\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mPatterns; /** - * @symbol ?mPiglin\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mPiglin\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mPiglin; /** - * @symbol ?mRhombus\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mRhombus\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mRhombus; /** - * @symbol ?mSkull\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mSkull\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mSkull; /** - * @symbol ?mSmallStripes\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mSmallStripes\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mSmallStripes; /** - * @symbol ?mSquareBottomLeft\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mSquareBottomLeft\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mSquareBottomLeft; /** - * @symbol ?mSquareBottomRight\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mSquareBottomRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mSquareBottomRight; /** - * @symbol ?mSquareTopLeft\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mSquareTopLeft\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mSquareTopLeft; /** - * @symbol ?mSquareTopRight\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mSquareTopRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mSquareTopRight; /** - * @symbol ?mStraightCross\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStraightCross\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStraightCross; /** - * @symbol ?mStripeBottom\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeBottom\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeBottom; /** - * @symbol ?mStripeCenter\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeCenter\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeCenter; /** - * @symbol ?mStripeDownleft\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeDownleft\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeDownleft; /** - * @symbol ?mStripeDownright\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeDownright\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeDownright; /** - * @symbol ?mStripeLeft\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeLeft\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeLeft; /** - * @symbol ?mStripeMiddle\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeMiddle\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeMiddle; /** - * @symbol ?mStripeRight\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeRight\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeRight; /** - * @symbol ?mStripeTop\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mStripeTop\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mStripeTop; /** - * @symbol ?mTriangleBottom\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mTriangleBottom\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mTriangleBottom; /** - * @symbol ?mTriangleTop\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mTriangleTop\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mTriangleTop; /** - * @symbol ?mTrianglesBottom\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mTrianglesBottom\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mTrianglesBottom; /** - * @symbol ?mTrianglesTop\@BannerPattern\@\@2PEAV1\@EA + * @symbol ?mTrianglesTop\@BannerPattern\@\@2PEAV1\@EA */ MCAPI static class BannerPattern * mTrianglesTop; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerPatternItem.hpp b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp index 2139041612..580a6d21dd 100644 --- a/LiteLoader/include/llapi/mc/BannerPatternItem.hpp +++ b/LiteLoader/include/llapi/mc/BannerPatternItem.hpp @@ -32,99 +32,99 @@ class BannerPatternItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BannerPatternItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 52 - * @symbol ?getPatternIndex\@BannerPatternItem\@\@UEBAHXZ + * @vftbl 52 + * @symbol ?getPatternIndex\@BannerPatternItem\@\@UEBAHXZ */ virtual int getPatternIndex() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@BannerPatternItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@BannerPatternItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BannerPatternItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @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; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BANNERPATTERNITEM /** - * @symbol ?isPattern\@BannerPatternItem\@\@UEBA_NXZ + * @symbol ?isPattern\@BannerPatternItem\@\@UEBA_NXZ */ MCVAPI bool isPattern() const; #endif /** - * @symbol ??0BannerPatternItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@\@Z + * @symbol ??0BannerPatternItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@\@Z */ MCAPI BannerPatternItem(std::string const &, int, enum class BannerPatternItem::Type); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BannerRecipes.hpp b/LiteLoader/include/llapi/mc/BannerRecipes.hpp index e27eb80e62..9c6609f419 100644 --- a/LiteLoader/include/llapi/mc/BannerRecipes.hpp +++ b/LiteLoader/include/llapi/mc/BannerRecipes.hpp @@ -28,8 +28,8 @@ class BannerRecipes { public: /** - * @symbol ?addRecipes\@BannerRecipes\@\@SAXAEAVRecipes\@\@\@Z + * @symbol ?addRecipes\@BannerRecipes\@\@SAXAEAVRecipes\@\@\@Z */ MCAPI static void addRecipes(class Recipes &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarrelBlock.hpp b/LiteLoader/include/llapi/mc/BarrelBlock.hpp index f081397e5a..79ac7783cd 100644 --- a/LiteLoader/include/llapi/mc/BarrelBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlock.hpp @@ -31,241 +31,246 @@ class BarrelBlock : public FaceDirectionalBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BarrelBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@BarrelBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@BarrelBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@BarrelBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@BarrelBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@BarrelBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BarrelBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 150 - * @symbol ?getFaceFlip\@BarrelBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + * @vftbl 150 + * @symbol ?getFaceFlip\@BarrelBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@BarrelBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@BarrelBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BarrelBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BarrelBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BARRELBLOCK /** - * @symbol ?hasComparatorSignal\@BarrelBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@BarrelBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isContainerBlock\@BarrelBlock\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@BarrelBlock\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isInteractiveBlock\@BarrelBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@BarrelBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0BarrelBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0BarrelBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI BarrelBlock(std::string const &, int, class Material const &); /** - * @symbol ?setOpen\@BarrelBlock\@\@SAX_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?setOpen\@BarrelBlock\@\@SAX_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void setOpen(bool, class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp b/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp index be023a9f02..f87b98fc99 100644 --- a/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BarrelBlockActor.hpp @@ -31,33 +31,33 @@ class BarrelBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BARRELBLOCKACTOR /** - * @symbol ?getName\@BarrelBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BarrelBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?onPlace\@BarrelBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onPlace\@BarrelBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onPlace(class BlockSource &); /** - * @symbol ?playCloseSound\@BarrelBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playCloseSound\@BarrelBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playCloseSound(class BlockSource &); /** - * @symbol ?playOpenSound\@BarrelBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playOpenSound\@BarrelBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playOpenSound(class BlockSource &); /** - * @symbol ?startOpen\@BarrelBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@BarrelBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@BarrelBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@BarrelBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); #endif /** - * @symbol ??0BarrelBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BarrelBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BarrelBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp index 5aec33e07d..dc41ae74ee 100644 --- a/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BarrelContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class BarrelContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BarrelContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0BarrelContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0BarrelContainerScreenValidator\@\@QEAA\@XZ */ MCAPI BarrelContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarrelContainerValidation.hpp b/LiteLoader/include/llapi/mc/BarrelContainerValidation.hpp index 2a6034f20f..351eaf12b9 100644 --- a/LiteLoader/include/llapi/mc/BarrelContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/BarrelContainerValidation.hpp @@ -31,54 +31,54 @@ class BarrelContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BarrelContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@BarrelContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@BarrelContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarrierBlock.hpp b/LiteLoader/include/llapi/mc/BarrierBlock.hpp index 47bd6ea530..788a744189 100644 --- a/LiteLoader/include/llapi/mc/BarrierBlock.hpp +++ b/LiteLoader/include/llapi/mc/BarrierBlock.hpp @@ -31,208 +31,213 @@ class BarrierBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BarrierBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@BarrierBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@BarrierBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BarrierBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BarrierBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 141 - * @symbol ?getShadeBrightness\@BarrierBlock\@\@UEBAMAEBVBlock\@\@\@Z + * @vftbl 141 + * @symbol ?getShadeBrightness\@BarrierBlock\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0BarrierBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0BarrierBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BarrierBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarterComponent.hpp b/LiteLoader/include/llapi/mc/BarterComponent.hpp index 33c11dde95..bbffbd0794 100644 --- a/LiteLoader/include/llapi/mc/BarterComponent.hpp +++ b/LiteLoader/include/llapi/mc/BarterComponent.hpp @@ -30,12 +30,12 @@ class BarterComponent { public: /** - * @symbol ?onBarterItemPickedUp\@BarterComponent\@\@QEAAXAEBVActor\@\@UActorUniqueID\@\@F\@Z + * @symbol ?onBarterItemPickedUp\@BarterComponent\@\@QEAAXAEBVActor\@\@UActorUniqueID\@\@F\@Z */ MCAPI void onBarterItemPickedUp(class Actor const &, struct ActorUniqueID, short); /** - * @symbol ?stopBarter\@BarterComponent\@\@QEAAXXZ + * @symbol ?stopBarter\@BarterComponent\@\@QEAAXXZ */ MCAPI void stopBarter(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarterDefinition.hpp b/LiteLoader/include/llapi/mc/BarterDefinition.hpp index ee2e7e5ca0..1a72879b7a 100644 --- a/LiteLoader/include/llapi/mc/BarterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BarterDefinition.hpp @@ -31,8 +31,8 @@ class BarterDefinition { public: /** - * @symbol ?buildSchema\@BarterDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBarterDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BarterDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBarterDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BarterGoal.hpp b/LiteLoader/include/llapi/mc/BarterGoal.hpp index e6172de81a..3e3cf3e7e1 100644 --- a/LiteLoader/include/llapi/mc/BarterGoal.hpp +++ b/LiteLoader/include/llapi/mc/BarterGoal.hpp @@ -30,56 +30,60 @@ class BarterGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BarterGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BarterGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BarterGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BarterGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BarterGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@BarterGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@BarterGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@BarterGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@BarterGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0BarterGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0BarterGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI BarterGoal(class Mob &); //private: /** - * @symbol ?_getThrowVector\@BarterGoal\@\@AEAA?AVVec3\@\@XZ + * @symbol ?_getThrowVector\@BarterGoal\@\@AEAA?AVVec3\@\@XZ */ MCAPI class Vec3 _getThrowVector(); + /** + * @symbol ?_sendBarterEventPacket\@BarterGoal\@\@AEAAXPEAVBarterComponent\@\@\@Z + */ + MCAPI void _sendBarterEventPacket(class BarterComponent *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp b/LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp index bbc793a16d..01bd902be5 100644 --- a/LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp +++ b/LiteLoader/include/llapi/mc/BasaltColumnsFeature.hpp @@ -31,26 +31,26 @@ class BasaltColumnsFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BasaltColumnsFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BasaltColumnsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BasaltColumnsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_findSurface\@BasaltColumnsFeature\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@VBlockPos\@\@HH\@Z + * @symbol ?_findSurface\@BasaltColumnsFeature\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@VBlockPos\@\@HH\@Z */ MCAPI class std::optional _findSurface(class BlockSource &, class BlockPos, int, int) const; /** - * @symbol ?_placeColumnCluster\@BasaltColumnsFeature\@\@AEBA_NAEAVBlockSource\@\@VBlockPos\@\@HH\@Z + * @symbol ?_placeColumnCluster\@BasaltColumnsFeature\@\@AEBA_NAEAVBlockSource\@\@VBlockPos\@\@HH\@Z */ MCAPI bool _placeColumnCluster(class BlockSource &, class BlockPos, int, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp b/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp index 0244065ac5..38e552ba7d 100644 --- a/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp +++ b/LiteLoader/include/llapi/mc/BasaltPillarFeature.hpp @@ -31,22 +31,22 @@ class BasaltPillarFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BasaltPillarFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BasaltPillarFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BasaltPillarFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_growColumn\@BasaltPillarFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@M\@Z + * @symbol ?_growColumn\@BasaltPillarFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@M\@Z */ MCAPI bool _growColumn(class BlockSource &, class BlockPos const &, class Random &, float) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp index 9f6105ae5e..0f09bbc363 100644 --- a/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp +++ b/LiteLoader/include/llapi/mc/BaseAttributeMap.hpp @@ -29,103 +29,103 @@ class BaseAttributeMap { public: /** - * @symbol ??0BaseAttributeMap\@\@QEAA\@XZ + * @symbol ??0BaseAttributeMap\@\@QEAA\@XZ */ MCAPI BaseAttributeMap(); /** - * @symbol ?begin\@BaseAttributeMap\@\@QEBA?AV?$_List_const_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ + * @symbol ?begin\@BaseAttributeMap\@\@QEBA?AV?$_List_const_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ MCAPI class std::_List_const_iterator>>> begin() const; /** - * @symbol ?begin\@BaseAttributeMap\@\@QEAA?AV?$_List_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ + * @symbol ?begin\@BaseAttributeMap\@\@QEAA?AV?$_List_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ MCAPI class std::_List_iterator>>> begin(); /** - * @symbol ?clearDirtyAttributes\@BaseAttributeMap\@\@QEAAXXZ + * @symbol ?clearDirtyAttributes\@BaseAttributeMap\@\@QEAAXXZ */ MCAPI void clearDirtyAttributes(); /** - * @symbol ?end\@BaseAttributeMap\@\@QEBA?AV?$_List_const_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ + * @symbol ?end\@BaseAttributeMap\@\@QEBA?AV?$_List_const_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ MCAPI class std::_List_const_iterator>>> end() const; /** - * @symbol ?end\@BaseAttributeMap\@\@QEAA?AV?$_List_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ + * @symbol ?end\@BaseAttributeMap\@\@QEAA?AV?$_List_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBIVAttributeInstance\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ MCAPI class std::_List_iterator>>> end(); /** - * @symbol ?getDirtyAttributes\@BaseAttributeMap\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getDirtyAttributes\@BaseAttributeMap\@\@QEBAAEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getDirtyAttributes() const; /** - * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z - */ - MCAPI class AttributeInstance const & getInstance(class Attribute const &) const; - /** - * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@I\@Z + * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@I\@Z */ MCAPI class AttributeInstance const & getInstance(unsigned int) const; /** - * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z + * @symbol ?getInstance\@BaseAttributeMap\@\@QEBAAEBVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ - MCAPI class AttributeInstance * getMutableInstance(class Attribute const &); + MCAPI class AttributeInstance const & getInstance(class Attribute const &) const; /** - * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z + * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVHashedString\@\@\@Z */ MCAPI class AttributeInstance * getMutableInstance(class HashedString const &); /** - * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@I\@Z + * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z + */ + MCAPI class AttributeInstance * getMutableInstance(class Attribute const &); + /** + * @symbol ?getMutableInstance\@BaseAttributeMap\@\@QEAAPEAVAttributeInstance\@\@I\@Z */ MCAPI class AttributeInstance * getMutableInstance(unsigned int); /** - * @symbol ?getSyncableAttributes\@BaseAttributeMap\@\@QEBA?AV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSyncableAttributes\@BaseAttributeMap\@\@QEBA?AV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getSyncableAttributes() const; /** - * @symbol ?inheritFrom\@BaseAttributeMap\@\@QEAAXAEBV1\@\@Z + * @symbol ?inheritFrom\@BaseAttributeMap\@\@QEAAXAEBV1\@\@Z */ MCAPI void inheritFrom(class BaseAttributeMap const &); /** - * @symbol ?onAttributeModified\@BaseAttributeMap\@\@QEAAXAEBVAttributeInstance\@\@\@Z + * @symbol ?onAttributeModified\@BaseAttributeMap\@\@QEAAXAEBVAttributeInstance\@\@\@Z */ MCAPI void onAttributeModified(class AttributeInstance const &); /** - * @symbol ?registerAttribute\@BaseAttributeMap\@\@QEAAAEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z + * @symbol ?registerAttribute\@BaseAttributeMap\@\@QEAAAEAVAttributeInstance\@\@AEBVAttribute\@\@\@Z */ MCAPI class AttributeInstance & registerAttribute(class Attribute const &); /** - * @symbol ?size\@BaseAttributeMap\@\@QEBA_KXZ + * @symbol ?size\@BaseAttributeMap\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; /** - * @symbol ?updateAttribute\@BaseAttributeMap\@\@QEAAXAEBVHashedString\@\@MMMMAEBV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?updateAttribute\@BaseAttributeMap\@\@QEAAXAEBVHashedString\@\@MMMMAEBV?$vector\@VAttributeModifier\@\@V?$allocator\@VAttributeModifier\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void updateAttribute(class HashedString const &, float, float, float, float, std::vector const &); /** - * @symbol ??1BaseAttributeMap\@\@QEAA\@XZ + * @symbol ??1BaseAttributeMap\@\@QEAA\@XZ */ MCAPI ~BaseAttributeMap(); /** - * @symbol ?DIFF_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ATTRIBUTES; /** - * @symbol ?DIFF_ATTRIBUTES_SIZE\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_ATTRIBUTES_SIZE\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ATTRIBUTES_SIZE; /** - * @symbol ?DIFF_DIRTY_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_DIRTY_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_DIRTY_ATTRIBUTES; /** - * @symbol ?DIFF_DIRTY_ATTRIBUTES_SIZE\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_DIRTY_ATTRIBUTES_SIZE\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_DIRTY_ATTRIBUTES_SIZE; /** - * @symbol ?DIFF_NO_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_NO_ATTRIBUTES\@BaseAttributeMap\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_NO_ATTRIBUTES; /** - * @symbol ?getDiff\@BaseAttributeMap\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z + * @symbol ?getDiff\@BaseAttributeMap\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z */ MCAPI static class std::optional getDiff(class BaseAttributeMap const &, class BaseAttributeMap const &); @@ -133,8 +133,8 @@ class BaseAttributeMap { private: /** - * @symbol ?mInvalidInstance\@BaseAttributeMap\@\@0VAttributeInstance\@\@A + * @symbol ?mInvalidInstance\@BaseAttributeMap\@\@0VAttributeInstance\@\@A */ MCAPI static class AttributeInstance mInvalidInstance; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp b/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp index 6120e1ed18..a11cb70f1e 100644 --- a/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp +++ b/LiteLoader/include/llapi/mc/BaseCircuitComponent.hpp @@ -48,171 +48,175 @@ class BaseCircuitComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BaseCircuitComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getStrength\@BaseCircuitComponent\@\@UEBAHXZ + * @vftbl 1 + * @symbol ?getStrength\@BaseCircuitComponent\@\@UEBAHXZ */ virtual int getStrength() const; /** - * @vftbl 2 - * @symbol ?getDirection\@BaseCircuitComponent\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getDirection\@BaseCircuitComponent\@\@UEBAHXZ */ virtual int getDirection() const; /** - * @vftbl 3 - * @symbol ?setStrength\@BaseCircuitComponent\@\@UEAAXH\@Z + * @vftbl 3 + * @symbol ?setStrength\@BaseCircuitComponent\@\@UEAAXH\@Z */ virtual void setStrength(int); /** - * @vftbl 4 - * @symbol ?setDirection\@BaseCircuitComponent\@\@UEAAXE\@Z + * @vftbl 4 + * @symbol ?setDirection\@BaseCircuitComponent\@\@UEAAXE\@Z */ virtual void setDirection(unsigned char); /** - * @vftbl 5 - * @symbol ?setConsumePowerAnyDirection\@BaseCircuitComponent\@\@UEAAX_N\@Z + * @vftbl 5 + * @symbol ?setConsumePowerAnyDirection\@BaseCircuitComponent\@\@UEAAX_N\@Z */ virtual void setConsumePowerAnyDirection(bool); /** - * @vftbl 6 - * @symbol ?canConsumePowerAnyDirection\@BaseCircuitComponent\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?canConsumePowerAnyDirection\@BaseCircuitComponent\@\@UEBA_NXZ */ virtual bool canConsumePowerAnyDirection() const; /** - * @vftbl 7 - * @symbol ?canConsumerPower\@BaseCircuitComponent\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?canConsumerPower\@BaseCircuitComponent\@\@UEBA_NXZ */ virtual bool canConsumerPower() const; /** - * @vftbl 8 - * @symbol ?canStopPower\@BaseCircuitComponent\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?canStopPower\@BaseCircuitComponent\@\@UEBA_NXZ */ virtual bool canStopPower() const; /** - * @vftbl 9 - * @symbol ?setStopPower\@BaseCircuitComponent\@\@UEAAX_N\@Z + * @vftbl 9 + * @symbol ?setStopPower\@BaseCircuitComponent\@\@UEAAX_N\@Z */ virtual void setStopPower(bool); /** - * @vftbl 10 - * @symbol ?removeSource\@BaseCircuitComponent\@\@UEAA_NAEBVBlockPos\@\@PEBV1\@\@Z + * @vftbl 10 + * @symbol ?removeSource\@BaseCircuitComponent\@\@UEAAXAEBVBlockPos\@\@PEBV1\@\@Z */ - virtual bool removeSource(class BlockPos const &, class BaseCircuitComponent const *); + virtual void removeSource(class BlockPos const &, class BaseCircuitComponent const *); /** - * @vftbl 11 - * @symbol ?addSource\@BaseCircuitComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@BaseCircuitComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@BaseCircuitComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@BaseCircuitComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 13 - * @symbol ?checkLock\@BaseCircuitComponent\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 13 + * @symbol ?checkLock\@BaseCircuitComponent\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void checkLock(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 14 - * @symbol ?evaluate\@BaseCircuitComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@BaseCircuitComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 15 - * @symbol ?cacheValues\@BaseCircuitComponent\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 15 + * @symbol ?cacheValues\@BaseCircuitComponent\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void cacheValues(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 16 - * @symbol ?updateDependencies\@BaseCircuitComponent\@\@UEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?updateDependencies\@BaseCircuitComponent\@\@UEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z */ virtual void updateDependencies(class CircuitSceneGraph &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol ?isHalfPulse\@BaseCircuitComponent\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isHalfPulse\@BaseCircuitComponent\@\@UEBA_NXZ */ virtual bool isHalfPulse() const; /** - * @vftbl 19 - * @symbol ?hasSource\@BaseCircuitComponent\@\@UEAA_NAEAV1\@\@Z + * @vftbl 19 + * @symbol ?hasSource\@BaseCircuitComponent\@\@UEBA_NAEBV1\@\@Z */ - virtual bool hasSource(class BaseCircuitComponent &); + virtual bool hasSource(class BaseCircuitComponent const &) const; /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol ?isSecondaryPowered\@BaseCircuitComponent\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isSecondaryPowered\@BaseCircuitComponent\@\@UEBA_NXZ */ virtual bool isSecondaryPowered() const; /** - * @vftbl 22 - * @symbol ?removeFromAnySourceList\@BaseCircuitComponent\@\@MEAA_NPEBV1\@\@Z + * @vftbl 22 + * @symbol ?removeFromAnySourceList\@BaseCircuitComponent\@\@MEAAXPEBV1\@\@Z */ - virtual bool removeFromAnySourceList(class BaseCircuitComponent const *); + virtual void removeFromAnySourceList(class BaseCircuitComponent const *); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@BaseCircuitComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@BaseCircuitComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @vftbl 24 - * @symbol ?getCircuitComponentGroupType\@BaseCircuitComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 24 + * @symbol ?getCircuitComponentGroupType\@BaseCircuitComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentGroupType() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASECIRCUITCOMPONENT /** - * @symbol ?allowIndirect\@BaseCircuitComponent\@\@UEBA_NXZ + * @symbol ?allowIndirect\@BaseCircuitComponent\@\@UEBA_NXZ */ MCVAPI bool allowIndirect() const; /** - * @symbol ?hasChildrenSource\@BaseCircuitComponent\@\@UEBA_NXZ + * @symbol ?hasChildrenSource\@BaseCircuitComponent\@\@UEBA_NXZ */ MCVAPI bool hasChildrenSource() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseCircuitComponent(); #endif /** - * @symbol ??0BaseCircuitComponent\@\@QEAA\@XZ + * @symbol ??0BaseCircuitComponent\@\@QEAA\@XZ */ MCAPI BaseCircuitComponent(); /** - * @symbol ?addSourceItem\@BaseCircuitComponent\@\@QEAAXAEBVItem\@CircuitComponentList\@\@\@Z + * @symbol ?addSourceItem\@BaseCircuitComponent\@\@QEAAXAEBVItem\@CircuitComponentList\@\@\@Z */ MCAPI void addSourceItem(class CircuitComponentList::Item const &); /** - * @symbol ?hasDirectPower\@BaseCircuitComponent\@\@QEAA_NXZ + * @symbol ?hasDirectPower\@BaseCircuitComponent\@\@QEAA_NXZ */ MCAPI bool hasDirectPower(); /** - * @symbol ?isRemoved\@BaseCircuitComponent\@\@QEBA_NXZ + * @symbol ?isRemoved\@BaseCircuitComponent\@\@QEBA_NXZ */ MCAPI bool isRemoved() const; /** - * @symbol ?removeFromSourceAndDestinationList\@BaseCircuitComponent\@\@QEAA?AV?$_Vector_iterator\@V?$_Vector_val\@U?$_Simple_types\@VItem\@CircuitComponentList\@\@\@std\@\@\@std\@\@\@std\@\@V23\@\@Z + * @symbol ?removeFromSourceAndDestinationList\@BaseCircuitComponent\@\@QEAA?AV?$_Vector_iterator\@V?$_Vector_val\@U?$_Simple_types\@VItem\@CircuitComponentList\@\@\@std\@\@\@std\@\@\@std\@\@V23\@\@Z */ MCAPI class std::_Vector_iterator>> removeFromSourceAndDestinationList(class std::_Vector_iterator>>); /** - * @symbol ?setRemoved\@BaseCircuitComponent\@\@QEAAXXZ + * @symbol ?setRemoved\@BaseCircuitComponent\@\@QEAAXXZ */ MCAPI void setRemoved(); //protected: /** - * @symbol ?trackPowerSource\@BaseCircuitComponent\@\@IEAA_NAEBVCircuitTrackingInfo\@\@H_NH1\@Z + * @symbol ?trackPowerSource\@BaseCircuitComponent\@\@IEAA_NAEBVCircuitTrackingInfo\@\@H_NH1\@Z */ MCAPI bool trackPowerSource(class CircuitTrackingInfo const &, int, bool, int, bool); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp b/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp index e0b22a1abd..704bfce5dd 100644 --- a/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseCommandBlock.hpp @@ -29,116 +29,116 @@ class BaseCommandBlock { public: /** - * @symbol ??0BaseCommandBlock\@\@QEAA\@XZ + * @symbol ??0BaseCommandBlock\@\@QEAA\@XZ */ MCAPI BaseCommandBlock(); /** - * @symbol ?getCommand\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCommand\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getCommand() const; /** - * @symbol ?getLastOutput\@BaseCommandBlock\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLastOutput\@BaseCommandBlock\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getLastOutput() const; /** - * @symbol ?getName\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getRawName\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRawName\@BaseCommandBlock\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getRawName() const; /** - * @symbol ?getSuccessCount\@BaseCommandBlock\@\@QEBAHXZ + * @symbol ?getSuccessCount\@BaseCommandBlock\@\@QEBAHXZ */ MCAPI int getSuccessCount() const; /** - * @symbol ?getTickDelay\@BaseCommandBlock\@\@QEBAHXZ + * @symbol ?getTickDelay\@BaseCommandBlock\@\@QEBAHXZ */ MCAPI int getTickDelay() const; /** - * @symbol ?getTrackOutput\@BaseCommandBlock\@\@QEBA_NXZ + * @symbol ?getTrackOutput\@BaseCommandBlock\@\@QEBA_NXZ */ MCAPI bool getTrackOutput() const; /** - * @symbol ?getVersion\@BaseCommandBlock\@\@QEBAHXZ + * @symbol ?getVersion\@BaseCommandBlock\@\@QEBAHXZ */ MCAPI int getVersion() const; /** - * @symbol ?load\@BaseCommandBlock\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@BaseCommandBlock\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?performCommand\@BaseCommandBlock\@\@QEAA_NAEAVBlockSource\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?performCommand\@BaseCommandBlock\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEA_N\@Z */ - MCAPI bool performCommand(class BlockSource &, struct ActorUniqueID const &); + MCAPI bool performCommand(class BlockSource &, class BlockPos const &, bool &); /** - * @symbol ?performCommand\@BaseCommandBlock\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEA_N\@Z + * @symbol ?performCommand\@BaseCommandBlock\@\@QEAA_NAEAVBlockSource\@\@AEBUActorUniqueID\@\@\@Z */ - MCAPI bool performCommand(class BlockSource &, class BlockPos const &, bool &); + MCAPI bool performCommand(class BlockSource &, struct ActorUniqueID const &); /** - * @symbol ?save\@BaseCommandBlock\@\@QEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@BaseCommandBlock\@\@QEBA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool save(class CompoundTag &) const; /** - * @symbol ?setCommand\@BaseCommandBlock\@\@QEAAXAEAVBlockSource\@\@AEBUActorUniqueID\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCommand\@BaseCommandBlock\@\@QEAAXAEAVBlockSource\@\@AEBUActorUniqueID\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCommand(class BlockSource &, struct ActorUniqueID const &, std::string const &); /** - * @symbol ?setCommand\@BaseCommandBlock\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCommand\@BaseCommandBlock\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCommand(class BlockSource &, class BlockPos const &, std::string const &); /** - * @symbol ?setLastOutput\@BaseCommandBlock\@\@QEAAXAEBV?$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 + * @symbol ?setLastOutput\@BaseCommandBlock\@\@QEAAXAEBV?$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 */ MCAPI void setLastOutput(std::string const &, std::vector const &); /** - * @symbol ?setName\@BaseCommandBlock\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setName\@BaseCommandBlock\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setName(std::string const &); /** - * @symbol ?setShouldExecuteOnFirstTick\@BaseCommandBlock\@\@QEAAX_N\@Z + * @symbol ?setShouldExecuteOnFirstTick\@BaseCommandBlock\@\@QEAAX_N\@Z */ MCAPI void setShouldExecuteOnFirstTick(bool); /** - * @symbol ?setSuccessCount\@BaseCommandBlock\@\@QEAAXH\@Z + * @symbol ?setSuccessCount\@BaseCommandBlock\@\@QEAAXH\@Z */ MCAPI void setSuccessCount(int); /** - * @symbol ?setTickDelay\@BaseCommandBlock\@\@QEAAXH\@Z + * @symbol ?setTickDelay\@BaseCommandBlock\@\@QEAAXH\@Z */ MCAPI void setTickDelay(int); /** - * @symbol ?setTrackOutput\@BaseCommandBlock\@\@QEAAX_N\@Z + * @symbol ?setTrackOutput\@BaseCommandBlock\@\@QEAAX_N\@Z */ MCAPI void setTrackOutput(bool); /** - * @symbol ?shouldExecuteOnFirstTick\@BaseCommandBlock\@\@QEBA_NXZ + * @symbol ?shouldExecuteOnFirstTick\@BaseCommandBlock\@\@QEBA_NXZ */ MCAPI bool shouldExecuteOnFirstTick() const; /** - * @symbol ??1BaseCommandBlock\@\@QEAA\@XZ + * @symbol ??1BaseCommandBlock\@\@QEAA\@XZ */ MCAPI ~BaseCommandBlock(); //private: /** - * @symbol ?_performCommand\@BaseCommandBlock\@\@AEAA_NAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEA_N\@Z + * @symbol ?_performCommand\@BaseCommandBlock\@\@AEAA_NAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEA_N\@Z */ MCAPI bool _performCommand(class BlockSource &, class CommandOrigin const &, bool &); /** - * @symbol ?_setCommand\@BaseCommandBlock\@\@AEAAXAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_setCommand\@BaseCommandBlock\@\@AEAAXAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _setCommand(class BlockSource &, class CommandOrigin const &, std::string const &); /** - * @symbol ?compile\@BaseCommandBlock\@\@AEAAXAEBVCommandOrigin\@\@AEAVLevel\@\@\@Z + * @symbol ?compile\@BaseCommandBlock\@\@AEAAXAEBVCommandOrigin\@\@AEAVLevel\@\@\@Z */ MCAPI void compile(class CommandOrigin const &, class Level &); private: /** - * @symbol ?DefaultCommandBlockName\@BaseCommandBlock\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DefaultCommandBlockName\@BaseCommandBlock\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DefaultCommandBlockName; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp b/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp index fe43c1c9de..8bb3c09431 100644 --- a/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp +++ b/LiteLoader/include/llapi/mc/BaseContainerMenu.hpp @@ -31,57 +31,57 @@ class BaseContainerMenu { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASECONTAINERMENU /** - * @symbol ?broadcastChanges\@BaseContainerMenu\@\@UEAAXXZ + * @symbol ?broadcastChanges\@BaseContainerMenu\@\@UEAAXXZ */ MCVAPI void broadcastChanges(); /** - * @symbol ?containerContentChanged\@BaseContainerMenu\@\@UEAAXH\@Z + * @symbol ?containerContentChanged\@BaseContainerMenu\@\@UEAAXH\@Z */ MCVAPI void containerContentChanged(int); /** - * @symbol ?getContainerId\@BaseContainerMenu\@\@UEBA?AW4ContainerID\@\@XZ + * @symbol ?getContainerId\@BaseContainerMenu\@\@UEBA?AW4ContainerID\@\@XZ */ MCVAPI enum class ContainerID getContainerId() const; /** - * @symbol ?getContainerType\@BaseContainerMenu\@\@UEBA?AW4ContainerType\@\@XZ + * @symbol ?getContainerType\@BaseContainerMenu\@\@UEBA?AW4ContainerType\@\@XZ */ MCVAPI enum class ContainerType getContainerType() const; /** - * @symbol ?isResultSlot\@BaseContainerMenu\@\@UEAA_NH\@Z + * @symbol ?isResultSlot\@BaseContainerMenu\@\@UEAA_NH\@Z */ MCVAPI bool isResultSlot(int); /** - * @symbol ?isSlotDirty\@BaseContainerMenu\@\@UEAA_NH\@Z + * @symbol ?isSlotDirty\@BaseContainerMenu\@\@UEAA_NH\@Z */ MCVAPI bool isSlotDirty(int); /** - * @symbol ?setContainerId\@BaseContainerMenu\@\@UEAAXW4ContainerID\@\@\@Z + * @symbol ?setContainerId\@BaseContainerMenu\@\@UEAAXW4ContainerID\@\@\@Z */ MCVAPI void setContainerId(enum class ContainerID); /** - * @symbol ?setContainerType\@BaseContainerMenu\@\@UEAAXW4ContainerType\@\@\@Z + * @symbol ?setContainerType\@BaseContainerMenu\@\@UEAAXW4ContainerType\@\@\@Z */ MCVAPI void setContainerType(enum class ContainerType); /** - * @symbol ?setData\@BaseContainerMenu\@\@UEAAXHH\@Z + * @symbol ?setData\@BaseContainerMenu\@\@UEAAXHH\@Z */ MCVAPI void setData(int, int); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~BaseContainerMenu(); #endif /** - * @symbol ??0BaseContainerMenu\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@\@Z + * @symbol ??0BaseContainerMenu\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@\@Z */ MCAPI BaseContainerMenu(class Player &, enum class ContainerType); //protected: /** - * @symbol ?_saveLastSlots\@BaseContainerMenu\@\@IEAAXPEAVContainer\@\@\@Z + * @symbol ?_saveLastSlots\@BaseContainerMenu\@\@IEAAXPEAVContainer\@\@\@Z */ MCAPI void _saveLastSlots(class Container *); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp b/LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp index 458a00034b..9ce8555781 100644 --- a/LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp +++ b/LiteLoader/include/llapi/mc/BaseGamePackSlices.hpp @@ -29,20 +29,20 @@ class BaseGamePackSlices { public: /** - * @symbol ??0BaseGamePackSlices\@\@QEAA\@XZ + * @symbol ??0BaseGamePackSlices\@\@QEAA\@XZ */ MCAPI BaseGamePackSlices(); /** - * @symbol ?addFromVersions\@BaseGamePackSlices\@\@QEAAXAEBV?$vector\@VBaseGameVersion\@\@V?$allocator\@VBaseGameVersion\@\@\@std\@\@\@std\@\@AEBVIResourcePackRepository\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?addFromVersions\@BaseGamePackSlices\@\@QEAAXAEBV?$vector\@VBaseGameVersion\@\@V?$allocator\@VBaseGameVersion\@\@\@std\@\@\@std\@\@AEBVIResourcePackRepository\@\@AEBVUUID\@mce\@\@\@Z */ MCAPI void addFromVersions(std::vector const &, class IResourcePackRepository const &, class mce::UUID const &); /** - * @symbol ?applyPackSlices\@BaseGamePackSlices\@\@QEBAXAEBVBaseGameVersion\@\@AEBVIResourcePackRepository\@\@AEAVResourcePackStack\@\@\@Z + * @symbol ?applyPackSlices\@BaseGamePackSlices\@\@QEBAXAEBVBaseGameVersion\@\@AEBVIResourcePackRepository\@\@AEAVResourcePackStack\@\@\@Z */ MCAPI void applyPackSlices(class BaseGameVersion const &, class IResourcePackRepository const &, class ResourcePackStack &) const; /** - * @symbol ??1BaseGamePackSlices\@\@QEAA\@XZ + * @symbol ??1BaseGamePackSlices\@\@QEAA\@XZ */ MCAPI ~BaseGamePackSlices(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp index 121d40b93b..452416e00e 100644 --- a/LiteLoader/include/llapi/mc/BaseGameVersion.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersion.hpp @@ -24,100 +24,104 @@ class BaseGameVersion { #undef AFTER_EXTRA public: /** - * @symbol ??0BaseGameVersion\@\@QEAA\@XZ + * @symbol ??0BaseGameVersion\@\@QEAA\@AEBV0\@\@Z */ - MCAPI BaseGameVersion(); + MCAPI BaseGameVersion(class BaseGameVersion const &); /** - * @symbol ??0BaseGameVersion\@\@QEAA\@GII\@Z + * @symbol ??0BaseGameVersion\@\@QEAA\@AEBVSemVersion\@\@\@Z */ - MCAPI BaseGameVersion(unsigned short, unsigned int, unsigned int); + MCAPI BaseGameVersion(class SemVersion const &); /** - * @symbol ??0BaseGameVersion\@\@QEAA\@AEBVSemVersion\@\@\@Z + * @symbol ??0BaseGameVersion\@\@QEAA\@GII\@Z */ - MCAPI BaseGameVersion(class SemVersion const &); + MCAPI BaseGameVersion(unsigned short, unsigned int, unsigned int); /** - * @symbol ??0BaseGameVersion\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0BaseGameVersion\@\@QEAA\@XZ */ - MCAPI BaseGameVersion(class BaseGameVersion const &); + MCAPI BaseGameVersion(); /** - * @symbol ?asSemVersion\@BaseGameVersion\@\@QEBAAEBVSemVersion\@\@XZ + * @symbol ?asSemVersion\@BaseGameVersion\@\@QEBAAEBVSemVersion\@\@XZ */ MCAPI class SemVersion const & asSemVersion() const; /** - * @symbol ?asString\@BaseGameVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?asString\@BaseGameVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & asString() const; /** - * @symbol ?getMajor\@BaseGameVersion\@\@QEBAGXZ + * @symbol ?getMajor\@BaseGameVersion\@\@QEBAGXZ */ MCAPI unsigned short getMajor() const; /** - * @symbol ?getMinor\@BaseGameVersion\@\@QEBAGXZ + * @symbol ?getMinor\@BaseGameVersion\@\@QEBAGXZ */ MCAPI unsigned short getMinor() const; /** - * @symbol ?getPatch\@BaseGameVersion\@\@QEBAGXZ + * @symbol ?getPatch\@BaseGameVersion\@\@QEBAGXZ */ MCAPI unsigned short getPatch() const; /** - * @symbol ?isAnyVersion\@BaseGameVersion\@\@QEBA_NXZ + * @symbol ?isAnyVersion\@BaseGameVersion\@\@QEBA_NXZ */ MCAPI bool isAnyVersion() const; /** - * @symbol ?isCompatibleWith\@BaseGameVersion\@\@QEBA_NAEBV1\@\@Z + * @symbol ?isCompatibleWith\@BaseGameVersion\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool isCompatibleWith(class BaseGameVersion const &) const; /** - * @symbol ?isValid\@BaseGameVersion\@\@QEBA_NXZ + * @symbol ?isNeverCompatible\@BaseGameVersion\@\@QEBA_NXZ + */ + MCAPI bool isNeverCompatible() const; + /** + * @symbol ?isValid\@BaseGameVersion\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??9BaseGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9BaseGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class BaseGameVersion const &) const; /** - * @symbol ??MBaseGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??MBaseGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator<(class BaseGameVersion const &) const; /** - * @symbol ??NBaseGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??NBaseGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator<=(class BaseGameVersion const &) const; /** - * @symbol ??4BaseGameVersion\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4BaseGameVersion\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class BaseGameVersion & operator=(class BaseGameVersion const &); /** - * @symbol ??8BaseGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8BaseGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class BaseGameVersion const &) const; /** - * @symbol ??OBaseGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??OBaseGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>(class BaseGameVersion const &) const; /** - * @symbol ??PBaseGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??PBaseGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>=(class BaseGameVersion const &) const; /** - * @symbol ??1BaseGameVersion\@\@QEAA\@XZ + * @symbol ??1BaseGameVersion\@\@QEAA\@XZ */ MCAPI ~BaseGameVersion(); /** - * @symbol ?ANY\@BaseGameVersion\@\@2V1\@B + * @symbol ?ANY\@BaseGameVersion\@\@2V1\@B */ MCAPI static class BaseGameVersion const ANY; /** - * @symbol ?EMPTY\@BaseGameVersion\@\@2V1\@B + * @symbol ?EMPTY\@BaseGameVersion\@\@2V1\@B */ MCAPI static class BaseGameVersion const EMPTY; /** - * @symbol ?INCOMPATIBLE\@BaseGameVersion\@\@2V1\@B + * @symbol ?INCOMPATIBLE\@BaseGameVersion\@\@2V1\@B */ MCAPI static class BaseGameVersion const INCOMPATIBLE; /** - * @symbol ?fromString\@BaseGameVersion\@\@SA?AW4MatchType\@SemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV1\@\@Z + * @symbol ?fromString\@BaseGameVersion\@\@SA?AW4MatchType\@SemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV1\@\@Z */ MCAPI static enum class SemVersion::MatchType fromString(std::string const &, class BaseGameVersion &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseGameVersioning.hpp b/LiteLoader/include/llapi/mc/BaseGameVersioning.hpp index c2546d450e..f2f65eca35 100644 --- a/LiteLoader/include/llapi/mc/BaseGameVersioning.hpp +++ b/LiteLoader/include/llapi/mc/BaseGameVersioning.hpp @@ -23,23 +23,23 @@ namespace BaseGameVersioning { #undef AFTER_EXTRA /** - * @symbol ?PATCH_UPGRADE_VERSION\@BaseGameVersioning\@\@3VBaseGameVersion\@\@B + * @symbol ?PATCH_UPGRADE_VERSION\@BaseGameVersioning\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const PATCH_UPGRADE_VERSION; /** - * @symbol ?REQUIRED_BASE_GAME_VERSION_FOR_OLD_CONTENT\@BaseGameVersioning\@\@3VBaseGameVersion\@\@B + * @symbol ?REQUIRED_BASE_GAME_VERSION_FOR_OLD_CONTENT\@BaseGameVersioning\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const REQUIRED_BASE_GAME_VERSION_FOR_OLD_CONTENT; /** - * @symbol ?getAvailableBehaviorPackBaseGameVersions\@BaseGameVersioning\@\@YAAEBV?$vector\@VBaseGameVersion\@\@V?$allocator\@VBaseGameVersion\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAvailableBehaviorPackBaseGameVersions\@BaseGameVersioning\@\@YAAEBV?$vector\@VBaseGameVersion\@\@V?$allocator\@VBaseGameVersion\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAvailableBehaviorPackBaseGameVersions(); /** - * @symbol ?getAvailableResourcePackBaseGameVersions\@BaseGameVersioning\@\@YAAEBV?$vector\@VBaseGameVersion\@\@V?$allocator\@VBaseGameVersion\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAvailableResourcePackBaseGameVersions\@BaseGameVersioning\@\@YAAEBV?$vector\@VBaseGameVersion\@\@V?$allocator\@VBaseGameVersion\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAvailableResourcePackBaseGameVersions(); /** - * @symbol ?upgradeBaseGameVersionFromWorldTemplate\@BaseGameVersioning\@\@YA_NAEBV?$not_null\@V?$NonOwnerPointer\@$$CBVWorldTemplateManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVLevelData\@\@\@Z + * @symbol ?upgradeBaseGameVersionFromWorldTemplate\@BaseGameVersioning\@\@YA_NAEBV?$not_null\@V?$NonOwnerPointer\@$$CBVWorldTemplateManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVLevelData\@\@\@Z */ MCAPI bool upgradeBaseGameVersionFromWorldTemplate(class gsl::not_null> const &, class LevelData &); diff --git a/LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp b/LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp index 92dcb8e5dc..68e69a4961 100644 --- a/LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BaseGoalDefinition.hpp @@ -31,16 +31,20 @@ class BaseGoalDefinition { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASEGOALDEFINITION /** - * @symbol ?validate\@BaseGoalDefinition\@\@UEBA_NAEAVMob\@\@\@Z + * @symbol ?validate\@BaseGoalDefinition\@\@UEBA_NAEAVMob\@\@\@Z */ MCVAPI bool validate(class Mob &) const; /** - * @symbol ?validateMobType\@BaseGoalDefinition\@\@UEBA_NAEAVMob\@\@\@Z + * @symbol ?validateMobType\@BaseGoalDefinition\@\@UEBA_NAEAVMob\@\@\@Z */ MCVAPI bool validateMobType(class Mob &) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseGoalDefinition(); #endif /** - * @symbol ?initialize\@BaseGoalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGoal\@\@\@Z + * @symbol ?initialize\@BaseGoalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class Goal &) const; @@ -48,8 +52,8 @@ class BaseGoalDefinition { private: /** - * @symbol ?mControlFlagMap\@BaseGoalDefinition\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@std\@\@A + * @symbol ?mControlFlagMap\@BaseGoalDefinition\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mControlFlagMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseMobSpawner.hpp b/LiteLoader/include/llapi/mc/BaseMobSpawner.hpp index 83d2d9ce52..df6ef5fc38 100644 --- a/LiteLoader/include/llapi/mc/BaseMobSpawner.hpp +++ b/LiteLoader/include/llapi/mc/BaseMobSpawner.hpp @@ -30,53 +30,59 @@ class BaseMobSpawner { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BaseMobSpawner(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@BaseMobSpawner\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@BaseMobSpawner\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 2 - * @symbol ?load\@BaseMobSpawner\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?load\@BaseMobSpawner\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void load(class CompoundTag const &); /** - * @vftbl 3 - * @symbol ?save\@BaseMobSpawner\@\@UEAAXAEAVCompoundTag\@\@\@Z + * @vftbl 3 + * @symbol ?save\@BaseMobSpawner\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void save(class CompoundTag &); /** - * @vftbl 4 - * @symbol ?getPos\@DefaultMobSpawner\@\@UEAAAEBVBlockPos\@\@XZ + * @vftbl 4 + * @symbol ?getPos\@DefaultMobSpawner\@\@UEAAAEBVBlockPos\@\@XZ */ virtual class BlockPos const & getPos() = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASEMOBSPAWNER /** - * @symbol ??0BaseMobSpawner\@\@QEAA\@UActorDefinitionIdentifier\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseMobSpawner(); +#endif + /** + * @symbol ??0BaseMobSpawner\@\@QEAA\@UActorDefinitionIdentifier\@\@\@Z */ MCAPI BaseMobSpawner(struct ActorDefinitionIdentifier); /** - * @symbol ?removeDisplayEntity\@BaseMobSpawner\@\@QEAAXXZ + * @symbol ?removeDisplayEntity\@BaseMobSpawner\@\@QEAAXXZ */ MCAPI void removeDisplayEntity(); /** - * @symbol ?setEntityId\@BaseMobSpawner\@\@QEAAXUActorDefinitionIdentifier\@\@\@Z + * @symbol ?setEntityId\@BaseMobSpawner\@\@QEAAXUActorDefinitionIdentifier\@\@\@Z */ MCAPI void setEntityId(struct ActorDefinitionIdentifier); /** - * @symbol ?setNextSpawnData\@BaseMobSpawner\@\@QEAAXV?$unique_ptr\@VSpawnData\@\@U?$default_delete\@VSpawnData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setNextSpawnData\@BaseMobSpawner\@\@QEAAXV?$unique_ptr\@VSpawnData\@\@U?$default_delete\@VSpawnData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setNextSpawnData(std::unique_ptr); //protected: /** - * @symbol ?_delay\@BaseMobSpawner\@\@IEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_delay\@BaseMobSpawner\@\@IEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _delay(class BlockSource &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp index 2072c0a25f..091bfbd286 100644 --- a/LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToBlockGoal.hpp @@ -31,48 +31,54 @@ class BaseMoveToBlockGoal : public BaseMoveToGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BaseMoveToBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BaseMoveToBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BaseMoveToBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BaseMoveToBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BaseMoveToBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@BaseMoveToBlockGoal\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@BaseMoveToBlockGoal\@\@MEAAXXZ */ virtual void _moveToBlock(); /** - * @vftbl 17 - * @symbol ?findTargetBlock\@BaseMoveToBlockGoal\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?findTargetBlock\@BaseMoveToBlockGoal\@\@UEAA_NXZ */ virtual bool findTargetBlock(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASEMOVETOBLOCKGOAL /** - * @symbol ??0BaseMoveToBlockGoal\@\@QEAA\@AEAVMob\@\@MHHHMM\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseMoveToBlockGoal(); +#endif + /** + * @symbol ??0BaseMoveToBlockGoal\@\@QEAA\@AEAVMob\@\@MHHHMM\@Z */ MCAPI BaseMoveToBlockGoal(class Mob &, float, int, int, int, float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp index 8d78195a17..584bc26fd8 100644 --- a/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp +++ b/LiteLoader/include/llapi/mc/BaseMoveToGoal.hpp @@ -30,117 +30,123 @@ class BaseMoveToGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BaseMoveToGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BaseMoveToGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BaseMoveToGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BaseMoveToGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BaseMoveToGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@BaseMoveToGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@BaseMoveToGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@BaseMoveToGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@BaseMoveToGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@BaseMoveToGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@BaseMoveToGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@WorkGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@LayEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const = 0; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?hasReachedTarget\@BaseMoveToGoal\@\@UEBA_NXZ + * @vftbl 10 + * @symbol ?hasReachedTarget\@BaseMoveToGoal\@\@UEBA_NXZ */ virtual bool hasReachedTarget() const; /** - * @vftbl 11 - * @symbol ?isValidTarget\@StompBlockGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@LayEggGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &) = 0; /** - * @vftbl 12 - * @symbol ?_nextStartTick\@BaseMoveToGoal\@\@MEAAHXZ + * @vftbl 12 + * @symbol ?_nextStartTick\@BaseMoveToGoal\@\@MEAAHXZ */ virtual int _nextStartTick(); /** - * @vftbl 13 - * @symbol ?_canReach\@BaseMoveToGoal\@\@MEAA_NAEBVBlockPos\@\@\@Z + * @vftbl 13 + * @symbol ?_canReach\@BaseMoveToGoal\@\@MEAA_NAEBVBlockPos\@\@\@Z */ virtual bool _canReach(class BlockPos const &); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@StompBlockGoal\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@BaseMoveToBlockGoal\@\@MEAAXXZ */ virtual void _moveToBlock() = 0; /** - * @vftbl 15 - * @symbol ?_getTargetPosition\@BaseMoveToGoal\@\@MEBA?AVVec3\@\@XZ + * @vftbl 15 + * @symbol ?_getTargetPosition\@BaseMoveToGoal\@\@MEBA?AVVec3\@\@XZ */ virtual class Vec3 _getTargetPosition() const; /** - * @vftbl 16 - * @symbol ?_getRepathTime\@BaseMoveToGoal\@\@MEBA_KXZ + * @vftbl 16 + * @symbol ?_getRepathTime\@BaseMoveToGoal\@\@MEBA_KXZ */ virtual unsigned __int64 _getRepathTime() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASEMOVETOGOAL /** - * @symbol ??0BaseMoveToGoal\@\@QEAA\@AEAVMob\@\@MMMHH\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseMoveToGoal(); +#endif + /** + * @symbol ??0BaseMoveToGoal\@\@QEAA\@AEAVMob\@\@MMMHH\@Z */ MCAPI BaseMoveToGoal(class Mob &, float, float, float, int, int); /** - * @symbol ?setTargetPositionOffset\@BaseMoveToGoal\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setTargetPositionOffset\@BaseMoveToGoal\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setTargetPositionOffset(class Vec3 const &); //protected: /** - * @symbol ?_blockAboveTarget\@BaseMoveToGoal\@\@IEBA?AVBlockPos\@\@XZ + * @symbol ?_blockAboveTarget\@BaseMoveToGoal\@\@IEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos _blockAboveTarget() const; /** - * @symbol ?_checkIfStuck\@BaseMoveToGoal\@\@IEAAXXZ + * @symbol ?_checkIfStuck\@BaseMoveToGoal\@\@IEAAXXZ */ MCAPI void _checkIfStuck(); /** - * @symbol ?_isCooldownActive\@BaseMoveToGoal\@\@IEBA_NXZ + * @symbol ?_isCooldownActive\@BaseMoveToGoal\@\@IEBA_NXZ */ MCAPI bool _isCooldownActive() const; /** - * @symbol ?setInterval\@BaseMoveToGoal\@\@IEAAXH\@Z + * @symbol ?setInterval\@BaseMoveToGoal\@\@IEAAXH\@Z */ MCAPI void setInterval(int); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp index 515df4c5d9..95b9172412 100644 --- a/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/BasePressurePlateBlock.hpp @@ -31,314 +31,325 @@ class BasePressurePlateBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BasePressurePlateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@BasePressurePlateBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@BasePressurePlateBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BasePressurePlateBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 108 - * @symbol ?isAttachedTo\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 108 + * @symbol ?isAttachedTo\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 112 - * @symbol ?shouldTriggerEntityInside\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?shouldTriggerEntityInside\@BasePressurePlateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 113 - * @symbol ?entityInside\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BasePressurePlateBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@BasePressurePlateBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BasePressurePlateBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@BasePressurePlateBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@BasePressurePlateBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BasePressurePlateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BasePressurePlateBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BasePressurePlateBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@BasePressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@BasePressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getTickDelay\@BasePressurePlateBlock\@\@UEBAHXZ + * @vftbl 194 + * @symbol ?getTickDelay\@BasePressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 194 - * @symbol ?getSignalStrength\@WeightedPressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 195 + * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const = 0; /** - * @vftbl 195 - * @symbol ?getSignalForData\@WeightedPressurePlateBlock\@\@MEBAHH\@Z + * @vftbl 196 + * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const = 0; /** - * @vftbl 196 - * @symbol ?getRedstoneSignal\@WeightedPressurePlateBlock\@\@MEBAHH\@Z + * @vftbl 197 + * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const = 0; /** - * @vftbl 197 - * @symbol ?getSensitiveAABB\@BasePressurePlateBlock\@\@MEBA?BVAABB\@\@AEBVBlockPos\@\@\@Z + * @vftbl 198 + * @symbol ?getSensitiveAABB\@BasePressurePlateBlock\@\@MEBA?BVAABB\@\@AEBVBlockPos\@\@\@Z */ virtual class AABB const getSensitiveAABB(class BlockPos const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASEPRESSUREPLATEBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BasePressurePlateBlock(); +#endif //protected: /** - * @symbol ??0BasePressurePlateBlock\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0BasePressurePlateBlock\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI BasePressurePlateBlock(std::string const &, int, class Material const &); /** - * @symbol ?checkPressed\@BasePressurePlateBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@HH\@Z + * @symbol ?checkPressed\@BasePressurePlateBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@HH\@Z */ MCAPI void checkPressed(class BlockSource &, class BlockPos const &, class Actor *, int, int) const; //private: /** - * @symbol ?isEntityInsideTriggerable\@BasePressurePlateBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @symbol ?isEntityInsideTriggerable\@BasePressurePlateBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ MCAPI bool isEntityInsideTriggerable(class BlockSource const &, class BlockPos const &, class Actor &) const; @@ -346,4 +357,4 @@ class BasePressurePlateBlock : public BlockLegacy { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp index 1a523bdb04..75f020bda6 100644 --- a/LiteLoader/include/llapi/mc/BaseRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailBlock.hpp @@ -31,309 +31,314 @@ class BaseRailBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BaseRailBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@BaseRailBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@BaseRailBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BaseRailBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BaseRailBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@BaseRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@BaseRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@BaseRailBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@BaseRailBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BaseRailBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@BaseRailBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@BaseRailBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BaseRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BaseRailBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BaseRailBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@BaseRailBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@BaseRailBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASERAILBLOCK /** - * @symbol ?isRailBlock\@BaseRailBlock\@\@UEBA_NXZ + * @symbol ?isRailBlock\@BaseRailBlock\@\@UEBA_NXZ */ MCVAPI bool isRailBlock() const; /** - * @symbol ?waterSpreadCausesSpawn\@BaseRailBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@BaseRailBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0BaseRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0BaseRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI BaseRailBlock(std::string const &, int, bool); /** - * @symbol ?isCorner\@BaseRailBlock\@\@SA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isCorner\@BaseRailBlock\@\@SA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isCorner(class BlockSource const &, class BlockPos const &); /** - * @symbol ?isFacingWestEast\@BaseRailBlock\@\@SA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isFacingWestEast\@BaseRailBlock\@\@SA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isFacingWestEast(class BlockSource const &, class BlockPos const &); /** - * @symbol ?isRail\@BaseRailBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isRail\@BaseRailBlock\@\@SA_NAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI static bool isRail(class Block const &); + MCAPI static bool isRail(class IConstBlockSource const &, class BlockPos const &); /** - * @symbol ?isRail\@BaseRailBlock\@\@SA_NAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isRail\@BaseRailBlock\@\@SA_NAEBVBlock\@\@\@Z */ - MCAPI static bool isRail(class IConstBlockSource const &, class BlockPos const &); + MCAPI static bool isRail(class Block const &); /** - * @symbol ?isSlope\@BaseRailBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isSlope\@BaseRailBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isSlope(class Block const &); /** - * @symbol ?isSlope\@BaseRailBlock\@\@SA_NH\@Z + * @symbol ?isSlope\@BaseRailBlock\@\@SA_NH\@Z */ MCAPI static bool isSlope(int); //private: /** - * @symbol ?_updatePlacement\@BaseRailBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_updatePlacement\@BaseRailBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _updatePlacement(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_createCircuitComponent\@BaseRailBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_createCircuitComponent\@BaseRailBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void _createCircuitComponent(class BlockSource &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseRailTransporter.hpp b/LiteLoader/include/llapi/mc/BaseRailTransporter.hpp index 90fb8e2174..1e6c1fb330 100644 --- a/LiteLoader/include/llapi/mc/BaseRailTransporter.hpp +++ b/LiteLoader/include/llapi/mc/BaseRailTransporter.hpp @@ -31,39 +31,39 @@ class BaseRailTransporter : public BaseCircuitComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BaseRailTransporter(); + virtual void __unk_vfn_0(); /** - * @vftbl 11 - * @symbol ?addSource\@BaseRailTransporter\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@BaseRailTransporter\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@BaseRailTransporter\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@BaseRailTransporter\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@BaseRailTransporter\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@BaseRailTransporter\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@BaseRailTransporter\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@BaseRailTransporter\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BaseTimedActorFlagDefinition.hpp b/LiteLoader/include/llapi/mc/BaseTimedActorFlagDefinition.hpp new file mode 100644 index 0000000000..82188c561a --- /dev/null +++ b/LiteLoader/include/llapi/mc/BaseTimedActorFlagDefinition.hpp @@ -0,0 +1,41 @@ +/** + * @file BaseTimedActorFlagDefinition.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BaseTimedActorFlagDefinition { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BASETIMEDACTORFLAGDEFINITION +public: + class BaseTimedActorFlagDefinition& operator=(class BaseTimedActorFlagDefinition const &) = delete; + BaseTimedActorFlagDefinition(class BaseTimedActorFlagDefinition const &) = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASETIMEDACTORFLAGDEFINITION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseTimedActorFlagDefinition(); +#endif + /** + * @symbol ??0BaseTimedActorFlagDefinition\@\@QEAA\@XZ + */ + MCAPI BaseTimedActorFlagDefinition(); + /** + * @symbol ?initialize\@BaseTimedActorFlagDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBaseTimedActorFlagGoal\@\@\@Z + */ + MCAPI void initialize(class EntityContext &, class BaseTimedActorFlagGoal &) const; + +}; diff --git a/LiteLoader/include/llapi/mc/BaseTimedActorFlagGoal.hpp b/LiteLoader/include/llapi/mc/BaseTimedActorFlagGoal.hpp new file mode 100644 index 0000000000..4c944f4126 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BaseTimedActorFlagGoal.hpp @@ -0,0 +1,78 @@ +/** + * @file BaseTimedActorFlagGoal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BaseTimedActorFlagGoal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BASETIMEDACTORFLAGGOAL +public: + class BaseTimedActorFlagGoal& operator=(class BaseTimedActorFlagGoal const &) = delete; + BaseTimedActorFlagGoal(class BaseTimedActorFlagGoal const &) = delete; + BaseTimedActorFlagGoal() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?canUse\@BaseTimedActorFlagGoal\@\@UEAA_NXZ + */ + virtual bool canUse(); + /** + * @vftbl 2 + * @symbol ?canContinueToUse\@BaseTimedActorFlagGoal\@\@UEAA_NXZ + */ + virtual bool canContinueToUse(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?start\@BaseTimedActorFlagGoal\@\@UEAAXXZ + */ + virtual void start(); + /** + * @vftbl 5 + * @symbol ?stop\@BaseTimedActorFlagGoal\@\@UEAAXXZ + */ + virtual void stop(); + /** + * @vftbl 6 + * @symbol ?tick\@BaseTimedActorFlagGoal\@\@UEAAXXZ + */ + virtual void tick(); + /** + * @vftbl 7 + * @symbol ?appendDebugInfo\@BaseTimedActorFlagGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + virtual void appendDebugInfo(std::string &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASETIMEDACTORFLAGGOAL + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BaseTimedActorFlagGoal(); +#endif + /** + * @symbol ??0BaseTimedActorFlagGoal\@\@QEAA\@AEAVMob\@\@W4ActorFlags\@\@\@Z + */ + MCAPI BaseTimedActorFlagGoal(class Mob &, enum class ActorFlags); + +}; diff --git a/LiteLoader/include/llapi/mc/BasicLoader.hpp b/LiteLoader/include/llapi/mc/BasicLoader.hpp index ceab0b0d4e..af5e4fd0b9 100644 --- a/LiteLoader/include/llapi/mc/BasicLoader.hpp +++ b/LiteLoader/include/llapi/mc/BasicLoader.hpp @@ -30,8 +30,8 @@ class BasicLoader { public: /** - * @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 + * @symbol ?getErrors\@BasicLoader\@\@QEBA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector getErrors() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BasicSaver.hpp b/LiteLoader/include/llapi/mc/BasicSaver.hpp index 67d845d487..58eb162545 100644 --- a/LiteLoader/include/llapi/mc/BasicSaver.hpp +++ b/LiteLoader/include/llapi/mc/BasicSaver.hpp @@ -29,13 +29,19 @@ class BasicSaver { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BASICSAVER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BasicSaver(); +#endif //private: /** - * @symbol ?saveImpl\@BasicSaver\@\@AEAA_NAEAUSchemaWriter\@reflection\@\@Umeta_handle\@entt\@\@AEBVBasicSchema\@internal\@3\@\@Z + * @symbol ?saveImpl\@BasicSaver\@\@AEAA_NAEAUSchemaWriter\@reflection\@\@Umeta_handle\@entt\@\@AEBVBasicSchema\@internal\@3\@\@Z */ MCAPI bool saveImpl(struct reflection::SchemaWriter &, struct entt::meta_handle, class reflection::internal::BasicSchema const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BasicTimer.hpp b/LiteLoader/include/llapi/mc/BasicTimer.hpp index eb328823f5..91bbb98334 100644 --- a/LiteLoader/include/llapi/mc/BasicTimer.hpp +++ b/LiteLoader/include/llapi/mc/BasicTimer.hpp @@ -30,20 +30,20 @@ class BasicTimer { public: /** - * @symbol ??0BasicTimer\@\@QEAA\@NV?$function\@$$A6ANXZ\@std\@\@\@Z + * @symbol ??0BasicTimer\@\@QEAA\@NV?$function\@$$A6ANXZ\@std\@\@\@Z */ MCAPI BasicTimer(double, class std::function); /** - * @symbol ?isFinished\@BasicTimer\@\@QEBA_NXZ + * @symbol ?isFinished\@BasicTimer\@\@QEBA_NXZ */ MCAPI bool isFinished() const; /** - * @symbol ?resetTime\@BasicTimer\@\@QEAAXXZ + * @symbol ?resetTime\@BasicTimer\@\@QEAAXXZ */ MCAPI void resetTime(); /** - * @symbol ??1BasicTimer\@\@QEAA\@XZ + * @symbol ??1BasicTimer\@\@QEAA\@XZ */ MCAPI ~BasicTimer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BastionFeature.hpp b/LiteLoader/include/llapi/mc/BastionFeature.hpp index ce26ee55bf..cf1fb75bc6 100644 --- a/LiteLoader/include/llapi/mc/BastionFeature.hpp +++ b/LiteLoader/include/llapi/mc/BastionFeature.hpp @@ -31,33 +31,33 @@ class BastionFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BastionFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@BastionFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@BastionFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@BastionFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@BastionFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@BastionFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@BastionFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@BastionFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@BastionFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0BastionFeature\@\@QEAA\@IAEBVBaseGameVersion\@\@\@Z + * @symbol ??0BastionFeature\@\@QEAA\@IAEBVBaseGameVersion\@\@\@Z */ MCAPI BastionFeature(unsigned int, class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BastionPiece.hpp b/LiteLoader/include/llapi/mc/BastionPiece.hpp index 8682a59fba..119d08df0f 100644 --- a/LiteLoader/include/llapi/mc/BastionPiece.hpp +++ b/LiteLoader/include/llapi/mc/BastionPiece.hpp @@ -31,33 +31,33 @@ class BastionPiece : public PoolElementStructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BastionPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 13 - * @symbol ?generateHeightAtPosition\@BastionPiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 13 + * @symbol ?generateHeightAtPosition\@BastionPiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual int generateHeightAtPosition(class BlockPos const &, class Dimension &, class BlockVolume &, class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> &) const; /** - * @vftbl 14 - * @symbol ?getSupportBlock\@BastionPiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 14 + * @symbol ?getSupportBlock\@BastionPiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const * getSupportBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 15 - * @symbol ?getBeardStabilizeBlock\@BastionPiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + * @vftbl 15 + * @symbol ?getBeardStabilizeBlock\@BastionPiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getBeardStabilizeBlock(class Block const &) const; /** - * @vftbl 16 - * @symbol ?getTerrainAdjustmentEffect\@BastionPiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ + * @vftbl 16 + * @symbol ?getTerrainAdjustmentEffect\@BastionPiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ */ virtual enum class AdjustmentEffect getTerrainAdjustmentEffect() const; /** - * @symbol ?addPieces\@BastionPiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z + * @symbol ?addPieces\@BastionPiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z */ MCAPI static void addPieces(class BlockPos, std::vector> &, class Random &, class JigsawStructureRegistry &, enum class VanillaBiomeTypes, class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BastionStart.hpp b/LiteLoader/include/llapi/mc/BastionStart.hpp index 2ae1e876ae..f82aa8f151 100644 --- a/LiteLoader/include/llapi/mc/BastionStart.hpp +++ b/LiteLoader/include/llapi/mc/BastionStart.hpp @@ -31,14 +31,14 @@ class BastionStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BastionStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?isValid\@BastionStart\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isValid\@BastionStart\@\@UEBA_NXZ */ virtual bool isValid() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Bat.hpp b/LiteLoader/include/llapi/mc/Bat.hpp index b630618bdc..8df1467760 100644 --- a/LiteLoader/include/llapi/mc/Bat.hpp +++ b/LiteLoader/include/llapi/mc/Bat.hpp @@ -32,181 +32,171 @@ class Bat : public Mob { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Bat(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Bat\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 182 - * @symbol ?checkFallDamage\@Bat\@\@MEAAXM_N\@Z + * @vftbl 181 + * @symbol ?checkFallDamage\@Bat\@\@MEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Bat\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Bat\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Bat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Bat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Bat\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Bat\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 293 - * @symbol ?pushActors\@Bat\@\@UEAAXXZ + * @vftbl 290 + * @symbol ?pushActors\@Bat\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 349 - * @symbol ?newServerAiStep\@Bat\@\@MEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@Bat\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Bat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Bat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Bat(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@Bat\@\@QEAAXXZ + * @symbol ?postNormalTick\@Bat\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?hasRestingBlockAbove\@Bat\@\@SA_NAEBVVec3\@\@AEBVBlockSource\@\@\@Z + * @symbol ?hasRestingBlockAbove\@Bat\@\@SA_NAEBVVec3\@\@AEBVBlockSource\@\@\@Z */ MCAPI static bool hasRestingBlockAbove(class Vec3 const &, class BlockSource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BatPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/BatPostNormalTickSystem.hpp deleted file mode 100644 index 9a154004e3..0000000000 --- a/LiteLoader/include/llapi/mc/BatPostNormalTickSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file BatPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BatPostNormalTickSystem. - * - */ -class BatPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BATPOSTNORMALTICKSYSTEM -public: - class BatPostNormalTickSystem& operator=(class BatPostNormalTickSystem const &) = delete; - BatPostNormalTickSystem(class BatPostNormalTickSystem const &) = delete; - BatPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@BatPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp b/LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp index a52a56ba9c..bddd955f50 100644 --- a/LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/BatchedNetworkPeer.hpp @@ -31,50 +31,50 @@ class BatchedNetworkPeer : public NetworkPeer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BatchedNetworkPeer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?sendPacket\@BatchedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z + * @vftbl 1 + * @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); /** - * @vftbl 2 - * @symbol ?receivePacket\@BatchedNetworkPeer\@\@UEAA?AW4DataStatus\@NetworkPeer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$shared_ptr\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@5\@\@Z + * @vftbl 2 + * @symbol ?receivePacket\@BatchedNetworkPeer\@\@UEAA?AW4DataStatus\@NetworkPeer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$shared_ptr\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@5\@\@Z */ virtual enum class NetworkPeer::DataStatus receivePacket(std::string &, class std::shared_ptr>>> const &); /** - * @vftbl 3 - * @symbol ?getNetworkStatus\@BatchedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + * @vftbl 3 + * @symbol ?getNetworkStatus\@BatchedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ */ virtual struct NetworkPeer::NetworkStatus getNetworkStatus() const; /** - * @vftbl 4 - * @symbol ?update\@BatchedNetworkPeer\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?update\@BatchedNetworkPeer\@\@UEAAXXZ */ virtual void update(); /** - * @vftbl 5 - * @symbol ?flush\@BatchedNetworkPeer\@\@UEAAX$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z + * @vftbl 5 + * @symbol ?flush\@BatchedNetworkPeer\@\@UEAAX$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z */ virtual void flush(class std::function &&); /** - * @symbol ??0BatchedNetworkPeer\@\@QEAA\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@AEAVScheduler\@\@\@Z + * @symbol ??0BatchedNetworkPeer\@\@QEAA\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@AEAVScheduler\@\@\@Z */ MCAPI BatchedNetworkPeer(class std::shared_ptr, class Scheduler &); /** - * @symbol ?setAsyncEnabled\@BatchedNetworkPeer\@\@QEAAX_N\@Z + * @symbol ?setAsyncEnabled\@BatchedNetworkPeer\@\@QEAAX_N\@Z */ MCAPI void setAsyncEnabled(bool); //private: /** - * @symbol ?_startSendTask\@BatchedNetworkPeer\@\@AEAAXXZ + * @symbol ?_startSendTask\@BatchedNetworkPeer\@\@AEAAXXZ */ MCAPI void _startSendTask(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BatteryMonitorInterface.hpp b/LiteLoader/include/llapi/mc/BatteryMonitorInterface.hpp index 778cd29253..cd82fdb15d 100644 --- a/LiteLoader/include/llapi/mc/BatteryMonitorInterface.hpp +++ b/LiteLoader/include/llapi/mc/BatteryMonitorInterface.hpp @@ -30,4 +30,4 @@ class BatteryMonitorInterface { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeaconBlock.hpp b/LiteLoader/include/llapi/mc/BeaconBlock.hpp index 27bbe5b262..76991f8adf 100644 --- a/LiteLoader/include/llapi/mc/BeaconBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlock.hpp @@ -31,209 +31,214 @@ class BeaconBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeaconBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BeaconBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BeaconBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BeaconBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BeaconBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEACONBLOCK /** - * @symbol ?isInteractiveBlock\@BeaconBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@BeaconBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0BeaconBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BeaconBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BeaconBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeaconBlockActor.hpp b/LiteLoader/include/llapi/mc/BeaconBlockActor.hpp index 05cb8afcd9..c1235484d4 100644 --- a/LiteLoader/include/llapi/mc/BeaconBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BeaconBlockActor.hpp @@ -31,133 +31,129 @@ class BeaconBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEACONBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@BeaconBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@BeaconBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@BeaconBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@BeaconBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?getContainer\@BeaconBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@BeaconBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@BeaconBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@BeaconBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@BeaconBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@BeaconBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@BeaconBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@BeaconBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@BeaconBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@BeaconBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@BeaconBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BeaconBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?hasAlphaLayer\@BeaconBlockActor\@\@UEBA_NXZ + * @symbol ?hasAlphaLayer\@BeaconBlockActor\@\@UEBA_NXZ */ MCVAPI bool hasAlphaLayer() const; /** - * @symbol ?load\@BeaconBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@BeaconBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?removeItem\@BeaconBlockActor\@\@UEAAXHH\@Z + * @symbol ?removeItem\@BeaconBlockActor\@\@UEAAXHH\@Z */ MCVAPI void removeItem(int, int); /** - * @symbol ?save\@BeaconBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@BeaconBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@BeaconBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@BeaconBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@BeaconBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@BeaconBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@BeaconBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@BeaconBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@BeaconBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@BeaconBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@BeaconBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@BeaconBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0BeaconBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BeaconBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BeaconBlockActor(class BlockPos const &); /** - * @symbol ?checkShapeAndAchievement\@BeaconBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?checkShapeAndAchievement\@BeaconBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void checkShapeAndAchievement(class BlockSource &); /** - * @symbol ?getBeaconData\@BeaconBlockActor\@\@QEAA?AVCompoundTag\@\@XZ + * @symbol ?getBeaconData\@BeaconBlockActor\@\@QEAA?AVCompoundTag\@\@XZ */ MCAPI class CompoundTag getBeaconData(); /** - * @symbol ?isEffectAvailable\@BeaconBlockActor\@\@QEBA_NH\@Z + * @symbol ?isEffectAvailable\@BeaconBlockActor\@\@QEBA_NH\@Z */ MCAPI bool isEffectAvailable(int) const; /** - * @symbol ?isSecondaryAvailable\@BeaconBlockActor\@\@QEBA_NXZ + * @symbol ?isSecondaryAvailable\@BeaconBlockActor\@\@QEBA_NXZ */ MCAPI bool isSecondaryAvailable() const; /** - * @symbol ?setPrimaryEffect\@BeaconBlockActor\@\@QEAA_NH\@Z + * @symbol ?setPrimaryEffect\@BeaconBlockActor\@\@QEAA_NH\@Z */ MCAPI bool setPrimaryEffect(int); /** - * @symbol ?setSecondaryEffect\@BeaconBlockActor\@\@QEAA_NH\@Z + * @symbol ?setSecondaryEffect\@BeaconBlockActor\@\@QEAA_NH\@Z */ MCAPI bool setSecondaryEffect(int); /** - * @symbol ?isPaymentItem\@BeaconBlockActor\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isPaymentItem\@BeaconBlockActor\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isPaymentItem(class ItemDescriptor const &); //private: /** - * @symbol ?_applyEffects\@BeaconBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_applyEffects\@BeaconBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _applyEffects(class BlockSource &); /** - * @symbol ?_getEffectTier\@BeaconBlockActor\@\@AEBAHH\@Z + * @symbol ?_getEffectTier\@BeaconBlockActor\@\@AEBAHH\@Z */ MCAPI int _getEffectTier(int) const; /** - * @symbol ?_isEffectValid\@BeaconBlockActor\@\@AEBA_NH\@Z + * @symbol ?_isEffectValid\@BeaconBlockActor\@\@AEBA_NH\@Z */ MCAPI bool _isEffectValid(int) const; /** - * @symbol ?_isSecondaryEffectValid\@BeaconBlockActor\@\@AEBA_NH\@Z + * @symbol ?_isSecondaryEffectValid\@BeaconBlockActor\@\@AEBA_NH\@Z */ MCAPI bool _isSecondaryEffectValid(int) const; /** - * @symbol ?_loadClientSideState\@BeaconBlockActor\@\@AEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z - */ - MCAPI void _loadClientSideState(class Level &, class CompoundTag const &, class DataLoadHelper &); - /** - * @symbol ?_saveClientSideState\@BeaconBlockActor\@\@AEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?_saveClientSideState\@BeaconBlockActor\@\@AEBA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool _saveClientSideState(class CompoundTag &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp index 22d1588673..2f19de67c3 100644 --- a/LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/BeaconContainerManagerModel.hpp @@ -31,45 +31,45 @@ class BeaconContainerManagerModel : public LevelContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeaconContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@BeaconContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@BeaconContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@BeaconContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@BeaconContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@BeaconContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@BeaconContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 17 - * @symbol ?_postInit\@BeaconContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@BeaconContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0BeaconContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0BeaconContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI BeaconContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?PAYMENT_SLOT\@BeaconContainerManagerModel\@\@2HB + * @symbol ?PAYMENT_SLOT\@BeaconContainerManagerModel\@\@2HB */ MCAPI static int const PAYMENT_SLOT; //private: /** - * @symbol ?_resetSelectionState\@BeaconContainerManagerModel\@\@AEAAXXZ + * @symbol ?_resetSelectionState\@BeaconContainerManagerModel\@\@AEAAXXZ */ MCAPI void _resetSelectionState(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp index e75222a881..06926b3fb3 100644 --- a/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BeaconContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class BeaconContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeaconContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0BeaconContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0BeaconContainerScreenValidator\@\@QEAA\@XZ */ MCAPI BeaconContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeaconPaymentContainerValidation.hpp b/LiteLoader/include/llapi/mc/BeaconPaymentContainerValidation.hpp index cea7033bbf..9f224c64ff 100644 --- a/LiteLoader/include/llapi/mc/BeaconPaymentContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/BeaconPaymentContainerValidation.hpp @@ -31,59 +31,59 @@ class BeaconPaymentContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeaconPaymentContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@BeaconPaymentContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@BeaconPaymentContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@BeaconPaymentContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@BeaconPaymentContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?getContainerOffset\@BeaconPaymentContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@BeaconPaymentContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEACONPAYMENTCONTAINERVALIDATION /** - * @symbol ?canDestroy\@BeaconPaymentContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @symbol ?canDestroy\@BeaconPaymentContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ MCVAPI bool canDestroy(class ContainerScreenContext const &) const; /** - * @symbol ?getAvailableSetCount\@BeaconPaymentContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @symbol ?getAvailableSetCount\@BeaconPaymentContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ MCVAPI int getAvailableSetCount(int, class ItemStackBase const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp b/LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp index 3dcd199dca..e838266871 100644 --- a/LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp +++ b/LiteLoader/include/llapi/mc/BeardAndShaverDescription.hpp @@ -30,16 +30,16 @@ class BeardAndShaverDescription { public: /** - * @symbol ??0BeardAndShaverDescription\@\@QEAA\@VBeardingDescriptionCache\@\@AEBUBeardKernel\@\@MM\@Z + * @symbol ??0BeardAndShaverDescription\@\@QEAA\@VBeardingDescriptionCache\@\@AEBUBeardKernel\@\@MM\@Z */ MCAPI BeardAndShaverDescription(class BeardingDescriptionCache, struct BeardKernel const &, float, float); /** - * @symbol ?calculateContribution\@BeardAndShaverDescription\@\@QEBAMAEBVBlockPos\@\@\@Z + * @symbol ?calculateContribution\@BeardAndShaverDescription\@\@QEBAMAEBVBlockPos\@\@\@Z */ MCAPI float calculateContribution(class BlockPos const &) const; /** - * @symbol ?getCache\@BeardAndShaverDescription\@\@QEBAAEBVBeardingDescriptionCache\@\@XZ + * @symbol ?getCache\@BeardAndShaverDescription\@\@QEBAAEBVBeardingDescriptionCache\@\@XZ */ MCAPI class BeardingDescriptionCache const & getCache() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeardAndShaverFeature.hpp b/LiteLoader/include/llapi/mc/BeardAndShaverFeature.hpp index dfd28a8d4a..6315d746ad 100644 --- a/LiteLoader/include/llapi/mc/BeardAndShaverFeature.hpp +++ b/LiteLoader/include/llapi/mc/BeardAndShaverFeature.hpp @@ -29,18 +29,18 @@ class BeardAndShaverFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeardAndShaverFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@BeardAndShaverFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@BeardAndShaverFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0BeardAndShaverFeature\@\@QEAA\@XZ + * @symbol ??0BeardAndShaverFeature\@\@QEAA\@XZ */ MCAPI BeardAndShaverFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeardDescription.hpp b/LiteLoader/include/llapi/mc/BeardDescription.hpp index bd431bd811..7f82b0b8c1 100644 --- a/LiteLoader/include/llapi/mc/BeardDescription.hpp +++ b/LiteLoader/include/llapi/mc/BeardDescription.hpp @@ -30,12 +30,12 @@ class BeardDescription { public: /** - * @symbol ??0BeardDescription\@\@QEAA\@VBeardingDescriptionCache\@\@AEBUBeardKernel\@\@\@Z + * @symbol ??0BeardDescription\@\@QEAA\@VBeardingDescriptionCache\@\@AEBUBeardKernel\@\@\@Z */ MCAPI BeardDescription(class BeardingDescriptionCache, struct BeardKernel const &); /** - * @symbol ?calculateContribution\@BeardDescription\@\@QEBAMAEBVBlockPos\@\@\@Z + * @symbol ?calculateContribution\@BeardDescription\@\@QEBAMAEBVBlockPos\@\@\@Z */ MCAPI float calculateContribution(class BlockPos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeardKernel.hpp b/LiteLoader/include/llapi/mc/BeardKernel.hpp index 1e3c6e9c52..d2a6975b69 100644 --- a/LiteLoader/include/llapi/mc/BeardKernel.hpp +++ b/LiteLoader/include/llapi/mc/BeardKernel.hpp @@ -29,17 +29,17 @@ struct BeardKernel { public: /** - * @symbol ??0BeardKernel\@\@QEAA\@XZ + * @symbol ??0BeardKernel\@\@QEAA\@XZ */ MCAPI BeardKernel(); /** - * @symbol ?getContribution\@BeardKernel\@\@QEBAMHHH\@Z + * @symbol ?getContribution\@BeardKernel\@\@QEBAMHHH\@Z */ MCAPI float getContribution(int, int, int) const; //private: /** - * @symbol ?createBeardKernel\@BeardKernel\@\@AEAA?BV?$array\@M$0DGAA\@\@std\@\@XZ + * @symbol ?createBeardKernel\@BeardKernel\@\@AEAA?BV?$array\@M$0DGAA\@\@std\@\@XZ */ MCAPI class std::array const createBeardKernel(); diff --git a/LiteLoader/include/llapi/mc/BeardingDescriptionCache.hpp b/LiteLoader/include/llapi/mc/BeardingDescriptionCache.hpp index fdbaaf8a9e..e1de2e4942 100644 --- a/LiteLoader/include/llapi/mc/BeardingDescriptionCache.hpp +++ b/LiteLoader/include/llapi/mc/BeardingDescriptionCache.hpp @@ -28,8 +28,8 @@ class BeardingDescriptionCache { public: /** - * @symbol ??0BeardingDescriptionCache\@\@QEAA\@AEBVBoundingBox\@\@H\@Z + * @symbol ??0BeardingDescriptionCache\@\@QEAA\@AEBVBoundingBox\@\@H\@Z */ MCAPI BeardingDescriptionCache(class BoundingBox const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedBlock.hpp b/LiteLoader/include/llapi/mc/BedBlock.hpp index 079fcde034..b0b8426a3a 100644 --- a/LiteLoader/include/llapi/mc/BedBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedBlock.hpp @@ -31,326 +31,331 @@ class BedBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BedBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNextBlockPermutation\@BedBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 3 + * @symbol ?getNextBlockPermutation\@BedBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 56 - * @symbol ?canFillAtPos\@BedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 56 + * @symbol ?canFillAtPos\@BedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 - * @symbol ?sanitizeFillBlock\@BedBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 57 + * @symbol ?sanitizeFillBlock\@BedBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 - * @symbol ?onFillBlock\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?onFillBlock\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BedBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 81 - * @symbol ?updateEntityAfterFallOn\@BedBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @vftbl 81 + * @symbol ?updateEntityAfterFallOn\@BedBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @symbol ?getSecondPart\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@BedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 129 - * @symbol ?canSpawnAt\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 129 + * @symbol ?canSpawnAt\@BedBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 145 - * @symbol ?telemetryVariant\@BedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 145 + * @symbol ?telemetryVariant\@BedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@BedBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@BedBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@BedBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol ?onFallOn\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@BedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BedBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@BedBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEDBLOCK /** - * @symbol ?canBeSilkTouched\@BedBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@BedBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isBounceBlock\@BedBlock\@\@UEBA_NXZ + * @symbol ?isBounceBlock\@BedBlock\@\@UEBA_NXZ */ MCVAPI bool isBounceBlock() const; /** - * @symbol ?isInteractiveBlock\@BedBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@BedBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0BedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BedBlock(std::string const &, int); /** - * @symbol ?HEAD_PIECE_DATA\@BedBlock\@\@2GB + * @symbol ?HEAD_PIECE_DATA\@BedBlock\@\@2GB */ MCAPI static unsigned short const HEAD_PIECE_DATA; /** - * @symbol ?OCCUPIED_DATA\@BedBlock\@\@2GB + * @symbol ?OCCUPIED_DATA\@BedBlock\@\@2GB */ MCAPI static unsigned short const OCCUPIED_DATA; /** - * @symbol ?findWakeupPosition\@BedBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_NAEBV?$optional\@VVec3\@\@\@3\@\@Z + * @symbol ?findWakeupPosition\@BedBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_NAEBV?$optional\@VVec3\@\@\@3\@\@Z */ MCAPI static class std::optional findWakeupPosition(class BlockSource &, class BlockPos const &, bool, class std::optional const &); /** - * @symbol ?isDangerousSpawnPosition\@BedBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isDangerousSpawnPosition\@BedBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isDangerousSpawnPosition(class BlockSource &, class BlockPos const &); /** - * @symbol ?isValidStandUpPosition\@BedBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isValidStandUpPosition\@BedBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isValidStandUpPosition(class BlockSource &, class BlockPos const &); /** - * @symbol ?setOccupied\@BedBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?setOccupied\@BedBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI static void setOccupied(class BlockSource &, class BlockPos const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedBlockActor.hpp b/LiteLoader/include/llapi/mc/BedBlockActor.hpp index 1838040a30..b22ae3fb9e 100644 --- a/LiteLoader/include/llapi/mc/BedBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BedBlockActor.hpp @@ -31,115 +31,115 @@ class BedBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BedBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BedBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BedBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@BedBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@BedBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 3 - * @symbol ?saveItemInstanceData\@BedBlockActor\@\@UEAA_NAEAVCompoundTag\@\@\@Z + * @vftbl 3 + * @symbol ?saveItemInstanceData\@BedBlockActor\@\@UEAA_NAEAVCompoundTag\@\@\@Z */ virtual bool saveItemInstanceData(class CompoundTag &); /** - * @vftbl 7 - * @symbol ?tick\@BedBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@BedBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@BedBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@BedBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 11 - * @symbol ?onPlace\@BedBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 11 + * @symbol ?onPlace\@BedBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onPlace(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 21 - * @symbol ?getCrackEntity\@BedBlockActor\@\@UEAAPEAVBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?getCrackEntity\@BedBlockActor\@\@UEAAPEAVBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual class BlockActor * getCrackEntity(class BlockSource &, class BlockPos const &); /** - * @vftbl 26 - * @symbol ?getName\@BedBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 26 + * @symbol ?getName\@BedBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@BedBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@BedBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@BedBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0BedBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BedBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BedBlockActor(class BlockPos const &); /** - * @symbol ?claimPetSleepOnBed\@BedBlockActor\@\@QEAA_NUActorUniqueID\@\@\@Z + * @symbol ?claimPetSleepOnBed\@BedBlockActor\@\@QEAA_NUActorUniqueID\@\@\@Z */ MCAPI bool claimPetSleepOnBed(struct ActorUniqueID); /** - * @symbol ?startSleepingOn\@BedBlockActor\@\@QEAAXXZ + * @symbol ?startSleepingOn\@BedBlockActor\@\@QEAAXXZ */ MCAPI void startSleepingOn(); /** - * @symbol ?stopSleepingOn\@BedBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z + * @symbol ?stopSleepingOn\@BedBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z */ MCAPI void stopSleepingOn(class BlockSource &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedHelper.hpp b/LiteLoader/include/llapi/mc/BedHelper.hpp index f81861433c..2c4b48c4c6 100644 --- a/LiteLoader/include/llapi/mc/BedHelper.hpp +++ b/LiteLoader/include/llapi/mc/BedHelper.hpp @@ -30,20 +30,20 @@ class BedHelper { public: /** - * @symbol ??0BedHelper\@\@QEAA\@HHHHMMMMMM\@Z + * @symbol ??0BedHelper\@\@QEAA\@HHHHMMMM\@Z */ - MCAPI BedHelper(int, int, int, int, float, float, float, float, float, float); + MCAPI BedHelper(int, int, int, int, float, float, float, float); /** - * @symbol ??0BedHelper\@\@QEAA\@HHHHMMMM\@Z + * @symbol ??0BedHelper\@\@QEAA\@HHHHMMMMMM\@Z */ - MCAPI BedHelper(int, int, int, int, float, float, float, float); + MCAPI BedHelper(int, int, int, int, float, float, float, float, float, float); /** - * @symbol ?getBedRotation\@BedHelper\@\@QEBAMH\@Z + * @symbol ?getBedRotation\@BedHelper\@\@QEBAMH\@Z */ MCAPI float getBedRotation(int) const; /** - * @symbol ?setBedPositionOffsets\@BedHelper\@\@QEAAXHAEAM0AEAVVec3\@\@\@Z + * @symbol ?setBedPositionOffsets\@BedHelper\@\@QEAAXHAEAM0AEAVVec3\@\@\@Z */ MCAPI void setBedPositionOffsets(int, float &, float &, class Vec3 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedItem.hpp b/LiteLoader/include/llapi/mc/BedItem.hpp index a134916ae3..c604f1d50a 100644 --- a/LiteLoader/include/llapi/mc/BedItem.hpp +++ b/LiteLoader/include/llapi/mc/BedItem.hpp @@ -32,107 +32,107 @@ class BedItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BedItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@BedItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@BedItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BedItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BedItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@BedItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@BedItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 130 - * @symbol ?_checkUseOnPermissions\@BedItem\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z + * @vftbl 130 + * @symbol ?_checkUseOnPermissions\@BedItem\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BedItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BedItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; //private: /** - * @symbol ?_tryUseOn\@BedItem\@\@AEBA_NAEAVItemStackBase\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?_tryUseOn\@BedItem\@\@AEBA_NAEAVItemStackBase\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ MCAPI bool _tryUseOn(class ItemStackBase &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Bedrock.hpp b/LiteLoader/include/llapi/mc/Bedrock.hpp index dacbb13fb0..c27ada3240 100644 --- a/LiteLoader/include/llapi/mc/Bedrock.hpp +++ b/LiteLoader/include/llapi/mc/Bedrock.hpp @@ -112,19 +112,19 @@ class SessionInfo #undef AFTER_EXTRA /** - * @symbol ?getExceptionMessage\@Bedrock\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@Vexception_ptr\@3\@\@Z + * @symbol ?getExceptionMessage\@Bedrock\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@Vexception_ptr\@3\@\@Z */ MCAPI std::string getExceptionMessage(class std::exception_ptr); /** - * @symbol ?strtoint32\@Bedrock\@\@YAHPEBDPEAPEADH\@Z + * @symbol ?strtoint32\@Bedrock\@\@YAHPEBDPEAPEADH\@Z */ MCAPI int strtoint32(char const *, char **, int); /** - * @symbol ?strtouint32\@Bedrock\@\@YAIPEBDPEAPEADH\@Z + * @symbol ?strtouint32\@Bedrock\@\@YAIPEBDPEAPEADH\@Z */ MCAPI unsigned int strtouint32(char const *, char **, int); /** - * @symbol ?throw_system_error\@Bedrock\@\@YAXW4errc\@std\@\@\@Z + * @symbol ?throw_system_error\@Bedrock\@\@YAXW4errc\@std\@\@\@Z */ MCAPI void throw_system_error(enum class std::errc); diff --git a/LiteLoader/include/llapi/mc/BedrockBlock.hpp b/LiteLoader/include/llapi/mc/BedrockBlock.hpp index 83ec765dd4..62d80dab0d 100644 --- a/LiteLoader/include/llapi/mc/BedrockBlock.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlock.hpp @@ -31,208 +31,213 @@ class BedrockBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BedrockBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@BedrockBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@BedrockBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@BedrockBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@BedrockBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@BedrockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@BedrockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0BedrockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BedrockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BedrockBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedrockBlockNames.hpp b/LiteLoader/include/llapi/mc/BedrockBlockNames.hpp index 780b568093..9296f8812b 100644 --- a/LiteLoader/include/llapi/mc/BedrockBlockNames.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlockNames.hpp @@ -20,23 +20,23 @@ namespace BedrockBlockNames { #undef AFTER_EXTRA /** - * @symbol ?Air\@BedrockBlockNames\@\@3VHashedString\@\@B + * @symbol ?Air\@BedrockBlockNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Air; /** - * @symbol ?ClientRequestPlaceholderBlock\@BedrockBlockNames\@\@3VHashedString\@\@B + * @symbol ?ClientRequestPlaceholderBlock\@BedrockBlockNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ClientRequestPlaceholderBlock; /** - * @symbol ?Unknown\@BedrockBlockNames\@\@3VHashedString\@\@B + * @symbol ?Unknown\@BedrockBlockNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Unknown; /** - * @symbol ?cleanupBedrockBlockNames\@BedrockBlockNames\@\@YAXXZ + * @symbol ?cleanupBedrockBlockNames\@BedrockBlockNames\@\@YAXXZ */ MCAPI void cleanupBedrockBlockNames(); /** - * @symbol ?initBedrockBlockNames\@BedrockBlockNames\@\@YAXXZ + * @symbol ?initBedrockBlockNames\@BedrockBlockNames\@\@YAXXZ */ MCAPI void initBedrockBlockNames(); diff --git a/LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp b/LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp index fbe7663b1b..51f9f3f474 100644 --- a/LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlockTypes.hpp @@ -22,23 +22,23 @@ namespace BedrockBlockTypes { #undef AFTER_EXTRA /** - * @symbol ?mAir\@BedrockBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mAir\@BedrockBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mAir; /** - * @symbol ?mClientRequestPlaceholderBlock\@BedrockBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mClientRequestPlaceholderBlock\@BedrockBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mClientRequestPlaceholderBlock; /** - * @symbol ?mUnknown\@BedrockBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mUnknown\@BedrockBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mUnknown; /** - * @symbol ?registerBlocks\@BedrockBlockTypes\@\@YAXXZ + * @symbol ?registerBlocks\@BedrockBlockTypes\@\@YAXXZ */ MCAPI void registerBlocks(); /** - * @symbol ?unregisterBlocks\@BedrockBlockTypes\@\@YAXXZ + * @symbol ?unregisterBlocks\@BedrockBlockTypes\@\@YAXXZ */ MCAPI void unregisterBlocks(); diff --git a/LiteLoader/include/llapi/mc/BedrockBlocks.hpp b/LiteLoader/include/llapi/mc/BedrockBlocks.hpp index 81f1e0f3ee..4fb8623220 100644 --- a/LiteLoader/include/llapi/mc/BedrockBlocks.hpp +++ b/LiteLoader/include/llapi/mc/BedrockBlocks.hpp @@ -22,23 +22,23 @@ namespace BedrockBlocks { #undef AFTER_EXTRA /** - * @symbol ?assignBlocks\@BedrockBlocks\@\@YAXXZ + * @symbol ?assignBlocks\@BedrockBlocks\@\@YAXXZ */ MCAPI void assignBlocks(); /** - * @symbol ?mAir\@BedrockBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mAir\@BedrockBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mAir; /** - * @symbol ?mClientRequestPlaceholderBlock\@BedrockBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mClientRequestPlaceholderBlock\@BedrockBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mClientRequestPlaceholderBlock; /** - * @symbol ?mUnknown\@BedrockBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mUnknown\@BedrockBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mUnknown; /** - * @symbol ?unassignBlocks\@BedrockBlocks\@\@YAXXZ + * @symbol ?unassignBlocks\@BedrockBlocks\@\@YAXXZ */ MCAPI void unassignBlocks(); diff --git a/LiteLoader/include/llapi/mc/BedrockItems.hpp b/LiteLoader/include/llapi/mc/BedrockItems.hpp index 3e633d612e..f7f979cb9e 100644 --- a/LiteLoader/include/llapi/mc/BedrockItems.hpp +++ b/LiteLoader/include/llapi/mc/BedrockItems.hpp @@ -30,16 +30,16 @@ class BedrockItems { public: /** - * @symbol ?mAir\@BedrockItems\@\@2V?$WeakPtr\@VItem\@\@\@\@A + * @symbol ?mAir\@BedrockItems\@\@2V?$WeakPtr\@VItem\@\@\@\@A */ MCAPI static class WeakPtr mAir; /** - * @symbol ?registerItems\@BedrockItems\@\@SAXVItemRegistryRef\@\@\@Z + * @symbol ?registerItems\@BedrockItems\@\@SAXVItemRegistryRef\@\@\@Z */ MCAPI static void registerItems(class ItemRegistryRef); /** - * @symbol ?unregisterItems\@BedrockItems\@\@SAXVItemRegistryRef\@\@\@Z + * @symbol ?unregisterItems\@BedrockItems\@\@SAXVItemRegistryRef\@\@\@Z */ MCAPI static void unregisterItems(class ItemRegistryRef); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedrockLoadContext.hpp b/LiteLoader/include/llapi/mc/BedrockLoadContext.hpp index da3e3115df..c8bfda1e72 100644 --- a/LiteLoader/include/llapi/mc/BedrockLoadContext.hpp +++ b/LiteLoader/include/llapi/mc/BedrockLoadContext.hpp @@ -28,12 +28,12 @@ class BedrockLoadContext { public: /** - * @symbol ??0BedrockLoadContext\@\@QEAA\@AEBVSemVersion\@\@\@Z + * @symbol ??0BedrockLoadContext\@\@QEAA\@AEBVSemVersion\@\@\@Z */ MCAPI BedrockLoadContext(class SemVersion const &); /** - * @symbol ??1BedrockLoadContext\@\@QEAA\@XZ + * @symbol ??1BedrockLoadContext\@\@QEAA\@XZ */ MCAPI ~BedrockLoadContext(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BedrockLog.hpp b/LiteLoader/include/llapi/mc/BedrockLog.hpp index e0d7646fa7..141f91bfde 100644 --- a/LiteLoader/include/llapi/mc/BedrockLog.hpp +++ b/LiteLoader/include/llapi/mc/BedrockLog.hpp @@ -39,87 +39,87 @@ struct LogDetails { #undef AFTER_EXTRA /** - * @symbol ?_areaFilterString\@BedrockLog\@\@YAPEBDW4LogAreaID\@\@\@Z + * @symbol ?_areaFilterString\@BedrockLog\@\@YAPEBDW4LogAreaID\@\@\@Z */ MCAPI char const * _areaFilterString(enum class LogAreaID); /** - * @symbol ?_constructAreaFilterFromString\@BedrockLog\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLogAreaFilter\@1\@\@Z + * @symbol ?_constructAreaFilterFromString\@BedrockLog\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLogAreaFilter\@1\@\@Z */ MCAPI bool _constructAreaFilterFromString(std::string const &, class BedrockLog::LogAreaFilter &); /** - * @symbol ?_constructAreaFilterStringFromFilter\@BedrockLog\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLogAreaFilter\@1\@\@Z + * @symbol ?_constructAreaFilterStringFromFilter\@BedrockLog\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLogAreaFilter\@1\@\@Z */ MCAPI std::string _constructAreaFilterStringFromFilter(class BedrockLog::LogAreaFilter const &); /** - * @symbol ?_getLog\@BedrockLog\@\@YAAEAULogDetails\@1\@W4LogCategory\@1\@W4LogChannel\@1\@\@Z + * @symbol ?_getLog\@BedrockLog\@\@YAAEAULogDetails\@1\@W4LogCategory\@1\@W4LogChannel\@1\@\@Z */ MCAPI struct BedrockLog::LogDetails & _getLog(enum class BedrockLog::LogCategory, enum class BedrockLog::LogChannel); /** - * @symbol ?_initAreaFilterMap\@BedrockLog\@\@YAXXZ + * @symbol ?_initAreaFilterMap\@BedrockLog\@\@YAXXZ */ MCAPI void _initAreaFilterMap(); /** - * @symbol ?_initPriorityFilterMap\@BedrockLog\@\@YAXXZ + * @symbol ?_initPriorityFilterMap\@BedrockLog\@\@YAXXZ */ MCAPI void _initPriorityFilterMap(); /** - * @symbol ?_messageIdString\@BedrockLog\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?_messageIdString\@BedrockLog\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI std::string _messageIdString(int); /** - * @symbol ?_openChannel\@BedrockLog\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4LogCategory\@1\@W4LogChannel\@1\@_NPEAVLogSettingsUpdater\@\@N\@Z + * @symbol ?_openChannel\@BedrockLog\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4LogCategory\@1\@W4LogChannel\@1\@_NPEAVLogSettingsUpdater\@\@N\@Z */ MCAPI void _openChannel(class Core::Path const &, std::string const &, std::string const &, enum class BedrockLog::LogCategory, enum class BedrockLog::LogChannel, bool, class LogSettingsUpdater *, double); /** - * @symbol ?_priorityFilterString\@BedrockLog\@\@YAPEBDI\@Z + * @symbol ?_priorityFilterString\@BedrockLog\@\@YAPEBDI\@Z */ MCAPI char const * _priorityFilterString(unsigned int); /** - * @symbol ?_processIdString\@BedrockLog\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_processIdString\@BedrockLog\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string _processIdString(); /** - * @symbol ?closeAndResetAllLogs\@BedrockLog\@\@YAXXZ + * @symbol ?closeAndResetAllLogs\@BedrockLog\@\@YAXXZ */ MCAPI void closeAndResetAllLogs(); /** - * @symbol ?createLog\@BedrockLog\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4LogCategory\@1\@V?$bitset\@$02\@5\@_NPEAVLogSettingsUpdater\@\@N\@Z + * @symbol ?createLog\@BedrockLog\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4LogCategory\@1\@V?$bitset\@$02\@5\@_NPEAVLogSettingsUpdater\@\@N\@Z */ MCAPI void createLog(class Core::Path const &, std::string const &, std::string const &, enum class BedrockLog::LogCategory, class std::bitset<3>, bool, class LogSettingsUpdater *, double); /** - * @symbol ?flushAllLogs\@BedrockLog\@\@YAXXZ + * @symbol ?flushAllLogs\@BedrockLog\@\@YAXXZ */ MCAPI void flushAllLogs(); /** - * @symbol ?initialize\@BedrockLog\@\@YA?AVScopeExit\@Bedrock\@\@XZ + * @symbol ?initialize\@BedrockLog\@\@YA?AVScopeExit\@Bedrock\@\@XZ */ MCAPI class Bedrock::ScopeExit initialize(); /** - * @symbol ?initializeLogExtensions\@BedrockLog\@\@YAXXZ + * @symbol ?initializeLogExtensions\@BedrockLog\@\@YAXXZ */ MCAPI void initializeLogExtensions(); /** - * @symbol ?log\@BedrockLog\@\@YAXW4LogCategory\@1\@V?$bitset\@$02\@std\@\@W4LogRule\@1\@W4LogAreaID\@\@IPEBDH4ZZ + * @symbol ?log\@BedrockLog\@\@YAXW4LogCategory\@1\@V?$bitset\@$02\@std\@\@W4LogRule\@1\@W4LogAreaID\@\@IPEBDH4ZZ */ MCAPI void log(enum class BedrockLog::LogCategory, class std::bitset<3>, enum class BedrockLog::LogRule, enum class LogAreaID, unsigned int, char const *, int, char const *, ...); /** - * @symbol ?log_va\@BedrockLog\@\@YAXW4LogCategory\@1\@V?$bitset\@$02\@std\@\@W4LogRule\@1\@W4LogAreaID\@\@IPEBDH4PEAD\@Z + * @symbol ?log_va\@BedrockLog\@\@YAXW4LogCategory\@1\@V?$bitset\@$02\@std\@\@W4LogRule\@1\@W4LogAreaID\@\@IPEBDH4PEAD\@Z */ MCAPI void log_va(enum class BedrockLog::LogCategory, class std::bitset<3>, enum class BedrockLog::LogRule, enum class LogAreaID, unsigned int, char const *, int, char const *, char *); /** - * @symbol ?rakDebugLog\@BedrockLog\@\@YAHPEBDZZ + * @symbol ?rakDebugLog\@BedrockLog\@\@YAHPEBDZZ */ MCAPI int rakDebugLog(char const *, ...); /** - * @symbol ?update\@BedrockLog\@\@YAXXZ + * @symbol ?update\@BedrockLog\@\@YAXXZ */ MCAPI void update(); /** - * @symbol ?updateLogFilter\@BedrockLog\@\@YAXV?$unique_ptr\@VLogSettingsUpdater\@\@U?$default_delete\@VLogSettingsUpdater\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@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\@AEAV43\@_N\@Z + * @symbol ?updateLogFilter\@BedrockLog\@\@YAXV?$unique_ptr\@VLogSettingsUpdater\@\@U?$default_delete\@VLogSettingsUpdater\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@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\@AEAV43\@_N\@Z */ MCAPI void updateLogFilter(std::unique_ptr, std::string const &, std::vector const &, std::string &, bool); /** - * @symbol ?updateLogSetting\@BedrockLog\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?updateLogSetting\@BedrockLog\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void updateLogSetting(std::string const &, bool); diff --git a/LiteLoader/include/llapi/mc/Bee.hpp b/LiteLoader/include/llapi/mc/Bee.hpp index 08b91aa8f2..49666ad65a 100644 --- a/LiteLoader/include/llapi/mc/Bee.hpp +++ b/LiteLoader/include/llapi/mc/Bee.hpp @@ -32,165 +32,161 @@ class Bee : public Animal { public: /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Bee\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Bee\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Bee(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Bee\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Bee\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Bee\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_301(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_305(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_351(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEE /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @symbol __unk_destructor_-1 */ - virtual void __unk_vfn_354(); + MCVAPI ~Bee(); +#endif /** - * @symbol ??0Bee\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Bee\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Bee(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@Bee\@\@QEAAXXZ + * @symbol ?postNormalTick\@Bee\@\@QEAAXXZ */ MCAPI void postNormalTick(); //protected: /** - * @symbol ?_registerLoopingSounds\@Bee\@\@IEAAXXZ + * @symbol ?_registerLoopingSounds\@Bee\@\@IEAAXXZ */ MCAPI void _registerLoopingSounds(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeePostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/BeePostNormalTickSystem.hpp deleted file mode 100644 index 959497b4f7..0000000000 --- a/LiteLoader/include/llapi/mc/BeePostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file BeePostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BeePostNormalTickSystem. - * - */ -class BeePostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BEEPOSTNORMALTICKSYSTEM -public: - class BeePostNormalTickSystem& operator=(class BeePostNormalTickSystem const &) = delete; - BeePostNormalTickSystem(class BeePostNormalTickSystem const &) = delete; - BeePostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@BeePostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doBeePostNormalTickSystem\@BeePostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doBeePostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BeehiveBlock.hpp b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp index 3b12338f8f..f3b2930f4a 100644 --- a/LiteLoader/include/llapi/mc/BeehiveBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlock.hpp @@ -31,284 +31,289 @@ class BeehiveBlock : public FaceDirectionalActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeehiveBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNextBlockPermutation\@BeehiveBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 3 + * @symbol ?getNextBlockPermutation\@BeehiveBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 118 - * @symbol ?executeEvent\@BeehiveBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @vftbl 118 + * @symbol ?executeEvent\@BeehiveBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ virtual void executeEvent(class BlockSource &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@BeehiveBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@BeehiveBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@BeehiveBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BeehiveBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@BeehiveBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@BeehiveBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@BeehiveBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BeehiveBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BeehiveBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@BeehiveBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@BeehiveBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEEHIVEBLOCK /** - * @symbol ?canBeSilkTouched\@BeehiveBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@BeehiveBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasComparatorSignal\@BeehiveBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@BeehiveBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; #endif /** - * @symbol ??0BeehiveBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BeehiveBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BeehiveBlock(std::string const &, int); /** - * @symbol ?emitHoneyComb\@BeehiveBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?emitHoneyComb\@BeehiveBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void emitHoneyComb(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?evictAll\@BeehiveBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?evictAll\@BeehiveBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void evictAll(class BlockSource &, class BlockPos const &, bool) const; /** - * @symbol ?onPlayerPlace\@BeehiveBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onPlayerPlace\@BeehiveBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onPlayerPlace(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?deliverNectar\@BeehiveBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?deliverNectar\@BeehiveBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void deliverNectar(class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?hasHoneyToHarvest\@BeehiveBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?hasHoneyToHarvest\@BeehiveBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool hasHoneyToHarvest(class Block const &); /** - * @symbol ?resetHoneyLevel\@BeehiveBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?resetHoneyLevel\@BeehiveBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void resetHoneyLevel(class BlockSource &, class Block const &, class BlockPos const &); //private: /** - * @symbol ?_fillHoneyBottle\@BeehiveBlock\@\@AEBAXAEAVPlayer\@\@AEAVItemStack\@\@1AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_fillHoneyBottle\@BeehiveBlock\@\@AEBAXAEAVPlayer\@\@AEAVItemStack\@\@1AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _fillHoneyBottle(class Player &, class ItemStack &, class ItemStack &, class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_playBottleSound\@BeehiveBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_playBottleSound\@BeehiveBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _playBottleSound(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp index fc563f6848..ba4be6104a 100644 --- a/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BeehiveBlockActor.hpp @@ -37,104 +37,104 @@ struct Occupant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeehiveBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BeehiveBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BeehiveBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@BeehiveBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@BeehiveBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@BeehiveBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@BeehiveBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0BeehiveBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BeehiveBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BeehiveBlockActor(class BlockPos const &); /** - * @symbol ?disableBeeSpawn\@BeehiveBlockActor\@\@QEAAXXZ + * @symbol ?disableBeeSpawn\@BeehiveBlockActor\@\@QEAAXXZ */ MCAPI void disableBeeSpawn(); /** - * @symbol ?evictAll\@BeehiveBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z + * @symbol ?evictAll\@BeehiveBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z */ MCAPI void evictAll(class BlockSource &, bool); /** - * @symbol ?saveUserData\@BeehiveBlockActor\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?saveUserData\@BeehiveBlockActor\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void saveUserData(class CompoundTag &) const; /** - * @symbol ?tryAdmit\@BeehiveBlockActor\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?tryAdmit\@BeehiveBlockActor\@\@QEAA_NAEAVActor\@\@\@Z */ MCAPI bool tryAdmit(class Actor &); /** - * @symbol ?MAX_OCCUPANCY\@BeehiveBlockActor\@\@2IB + * @symbol ?MAX_OCCUPANCY\@BeehiveBlockActor\@\@2IB */ MCAPI static unsigned int const MAX_OCCUPANCY; //private: /** - * @symbol ?_revive\@BeehiveBlockActor\@\@AEAAPEAVActor\@\@AEAVBlockSource\@\@AEBUOccupant\@1\@E\@Z + * @symbol ?_revive\@BeehiveBlockActor\@\@AEAAPEAVActor\@\@AEAVBlockSource\@\@AEBUOccupant\@1\@E\@Z */ MCAPI class Actor * _revive(class BlockSource &, struct BeehiveBlockActor::Occupant const &, unsigned char); /** - * @symbol ?_tickOccupant\@BeehiveBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEAUOccupant\@1\@\@Z + * @symbol ?_tickOccupant\@BeehiveBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEAUOccupant\@1\@\@Z */ MCAPI bool _tickOccupant(class BlockSource &, struct BeehiveBlockActor::Occupant &); /** - * @symbol ?_trySpawnBees\@BeehiveBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_trySpawnBees\@BeehiveBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _trySpawnBees(class BlockSource &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeetrootBlock.hpp b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp index cfd2cd20eb..56f63108d0 100644 --- a/LiteLoader/include/llapi/mc/BeetrootBlock.hpp +++ b/LiteLoader/include/llapi/mc/BeetrootBlock.hpp @@ -31,223 +31,228 @@ class BeetrootBlock : public CropBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BeetrootBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BeetrootBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BeetrootBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@BeetrootBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BeetrootBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol ?getBaseSeed\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ + * @vftbl 194 + * @symbol __unk_vfn_194 + */ + virtual void __unk_vfn_194(); + /** + * @vftbl 195 + * @symbol ?getBaseSeed\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 195 - * @symbol ?getBaseCrop\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ + * @vftbl 196 + * @symbol ?getBaseCrop\@BeetrootBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 197 - * @symbol ?getCropNum\@BeetrootBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z + * @vftbl 198 + * @symbol ?getCropNum\@BeetrootBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; /** - * @symbol ??0BeetrootBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BeetrootBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BeetrootBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BeforeWatchdogTerminateEvent.hpp b/LiteLoader/include/llapi/mc/BeforeWatchdogTerminateEvent.hpp index 7c7b66b843..6f4be6718e 100644 --- a/LiteLoader/include/llapi/mc/BeforeWatchdogTerminateEvent.hpp +++ b/LiteLoader/include/llapi/mc/BeforeWatchdogTerminateEvent.hpp @@ -28,7 +28,7 @@ struct BeforeWatchdogTerminateEvent { public: /** - * @symbol ??1BeforeWatchdogTerminateEvent\@\@QEAA\@XZ + * @symbol ??1BeforeWatchdogTerminateEvent\@\@QEAA\@XZ */ MCAPI ~BeforeWatchdogTerminateEvent(); diff --git a/LiteLoader/include/llapi/mc/BegGoal.hpp b/LiteLoader/include/llapi/mc/BegGoal.hpp index d7affdb2a3..8f257f6a90 100644 --- a/LiteLoader/include/llapi/mc/BegGoal.hpp +++ b/LiteLoader/include/llapi/mc/BegGoal.hpp @@ -30,56 +30,56 @@ class BegGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BegGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BegGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BegGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BegGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BegGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@BegGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@BegGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@BegGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@BegGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@BegGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@BegGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@BegGoal\@\@EEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@BegGoal\@\@EEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0BegGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@MHH\@Z + * @symbol ??0BegGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@MHH\@Z */ MCAPI BegGoal(class Mob &, std::vector const &, float, int, int); //private: /** - * @symbol ?_playerHoldingInteresting\@BegGoal\@\@AEAA_NPEAVPlayer\@\@\@Z + * @symbol ?_playerHoldingInteresting\@BegGoal\@\@AEAA_NPEAVPlayer\@\@\@Z */ MCAPI bool _playerHoldingInteresting(class Player *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorComponent.hpp b/LiteLoader/include/llapi/mc/BehaviorComponent.hpp index 138b982ea2..b9780292ca 100644 --- a/LiteLoader/include/llapi/mc/BehaviorComponent.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorComponent.hpp @@ -29,20 +29,20 @@ class BehaviorComponent { public: /** - * @symbol ??0BehaviorComponent\@\@QEAA\@XZ + * @symbol ??0BehaviorComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI BehaviorComponent(); + MCAPI BehaviorComponent(class BehaviorComponent &&); /** - * @symbol ??0BehaviorComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0BehaviorComponent\@\@QEAA\@XZ */ - MCAPI BehaviorComponent(class BehaviorComponent &&); + MCAPI BehaviorComponent(); /** - * @symbol ??4BehaviorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BehaviorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BehaviorComponent & operator=(class BehaviorComponent &&); /** - * @symbol ??1BehaviorComponent\@\@QEAA\@XZ + * @symbol ??1BehaviorComponent\@\@QEAA\@XZ */ MCAPI ~BehaviorComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorData.hpp b/LiteLoader/include/llapi/mc/BehaviorData.hpp index 8265b312d5..124691d1bf 100644 --- a/LiteLoader/include/llapi/mc/BehaviorData.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorData.hpp @@ -32,12 +32,12 @@ enum class DataType; public: /** - * @symbol ?copyData\@BehaviorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAV1\@\@Z + * @symbol ?copyData\@BehaviorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAV1\@\@Z */ MCAPI void copyData(std::string const &, std::string const &, class BehaviorData &); /** - * @symbol ?hasDataOfType\@BehaviorData\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DataType\@1\@\@Z + * @symbol ?hasDataOfType\@BehaviorData\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DataType\@1\@\@Z */ MCAPI bool hasDataOfType(std::string const &, enum class BehaviorData::DataType) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp b/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp index 325f312b5c..877b85a775 100644 --- a/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorDefinition.hpp @@ -31,23 +31,29 @@ class BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BehaviorDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BehaviorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BehaviorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); /** - * @vftbl 2 - * @symbol ?createNode\@BehaviorDefinition\@\@UEBA?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@AEAVActor\@\@AEBVBehaviorFactory\@\@PEAVBehaviorNode\@\@PEAVBehaviorData\@\@\@Z + * @vftbl 2 + * @symbol ?createNode\@BehaviorDefinition\@\@UEBA?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@AEAVActor\@\@AEBVBehaviorFactory\@\@PEAVBehaviorNode\@\@PEAVBehaviorData\@\@\@Z */ virtual std::unique_ptr createNode(class Actor &, class BehaviorFactory const &, class BehaviorNode *, class BehaviorData *) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEHAVIORDEFINITION /** - * @symbol ?getTreeDefinition\@BehaviorDefinition\@\@QEBA?AVBehaviorTreeDefinitionPtr\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BehaviorDefinition(); +#endif + /** + * @symbol ?getTreeDefinition\@BehaviorDefinition\@\@QEBA?AVBehaviorTreeDefinitionPtr\@\@XZ */ MCAPI class BehaviorTreeDefinitionPtr getTreeDefinition() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorFactory.hpp b/LiteLoader/include/llapi/mc/BehaviorFactory.hpp index 7b7c76c1fc..028b1915e7 100644 --- a/LiteLoader/include/llapi/mc/BehaviorFactory.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorFactory.hpp @@ -30,28 +30,28 @@ class BehaviorFactory { public: /** - * @symbol ??0BehaviorFactory\@\@QEAA\@XZ + * @symbol ??0BehaviorFactory\@\@QEAA\@XZ */ MCAPI BehaviorFactory(); /** - * @symbol ?loadNodeDefinition\@BehaviorFactory\@\@QEBA?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@VValue\@Json\@\@AEAVBehaviorTreeDefinitionPtr\@\@\@Z + * @symbol ?loadNodeDefinition\@BehaviorFactory\@\@QEBA?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@VValue\@Json\@\@AEAVBehaviorTreeDefinitionPtr\@\@\@Z */ MCAPI std::unique_ptr loadNodeDefinition(std::string const &, class Json::Value, class BehaviorTreeDefinitionPtr &) const; /** - * @symbol ?registerNodePair\@BehaviorFactory\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@XZ\@3\@V?$function\@$$A6A?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@XZ\@3\@\@Z + * @symbol ?registerNodePair\@BehaviorFactory\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@XZ\@3\@V?$function\@$$A6A?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@XZ\@3\@\@Z */ MCAPI void registerNodePair(std::string const &, class std::function (void)>, class std::function (void)>); /** - * @symbol ?tryGetNode\@BehaviorFactory\@\@QEBA?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?tryGetNode\@BehaviorFactory\@\@QEBA?AV?$unique_ptr\@VBehaviorNode\@\@U?$default_delete\@VBehaviorNode\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::unique_ptr tryGetNode(std::string const &) const; //private: /** - * @symbol ?_initNodes\@BehaviorFactory\@\@AEAAXXZ + * @symbol ?_initNodes\@BehaviorFactory\@\@AEAAXXZ */ MCAPI void _initNodes(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorNode.hpp b/LiteLoader/include/llapi/mc/BehaviorNode.hpp index 272eb3e537..8c4d7ed4df 100644 --- a/LiteLoader/include/llapi/mc/BehaviorNode.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorNode.hpp @@ -29,27 +29,33 @@ class BehaviorNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BehaviorNode(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual void __unk_vfn_1() = 0; + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@BehaviorNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@BehaviorNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEHAVIORNODE /** - * @symbol ??0BehaviorNode\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BehaviorNode(); +#endif + /** + * @symbol ??0BehaviorNode\@\@QEAA\@XZ */ MCAPI BehaviorNode(); /** - * @symbol ?getBehaviorData\@BehaviorNode\@\@QEAAAEAVBehaviorData\@\@XZ + * @symbol ?getBehaviorData\@BehaviorNode\@\@QEAAAEAVBehaviorData\@\@XZ */ MCAPI class BehaviorData & getBehaviorData(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp b/LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp index b7407d2bc8..41befecac9 100644 --- a/LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorNodeUtils.hpp @@ -22,7 +22,7 @@ namespace BehaviorNodeUtils { #undef AFTER_EXTRA /** - * @symbol ?lookAt\@BehaviorNodeUtils\@\@YAXAEAVActor\@\@AEBVVec3\@\@MM\@Z + * @symbol ?lookAt\@BehaviorNodeUtils\@\@YAXAEAVActor\@\@AEBVVec3\@\@MM\@Z */ MCAPI void lookAt(class Actor &, class Vec3 const &, float, float); diff --git a/LiteLoader/include/llapi/mc/BehaviorSystem.hpp b/LiteLoader/include/llapi/mc/BehaviorSystem.hpp index cc9378f2c4..66881e7a53 100644 --- a/LiteLoader/include/llapi/mc/BehaviorSystem.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorSystem.hpp @@ -30,19 +30,19 @@ class BehaviorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BehaviorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BehaviorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BehaviorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeDefinition.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDefinition.hpp index 5747023ba6..a32d571d1a 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDefinition.hpp @@ -30,8 +30,8 @@ class BehaviorTreeDefinition { public: /** - * @symbol ?getRoot\@BehaviorTreeDefinition\@\@QEBAPEBVBehaviorDefinition\@\@XZ + * @symbol ?getRoot\@BehaviorTreeDefinition\@\@QEBAPEBVBehaviorDefinition\@\@XZ */ MCAPI class BehaviorDefinition const * getRoot() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp index 756d3d8ffd..b78ecf35d1 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDefinitionPtr.hpp @@ -23,36 +23,36 @@ class BehaviorTreeDefinitionPtr { #undef AFTER_EXTRA public: /** - * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr const &); + MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr &&); /** - * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEAVBehaviorTreeGroup\@\@AEAVBehaviorTreeDefinition\@\@\@Z + * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEAVBehaviorTreeGroup\@\@AEAVBehaviorTreeDefinition\@\@\@Z */ MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeGroup &, class BehaviorTreeDefinition &); /** - * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@AEBV0\@\@Z */ - MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr &&); + MCAPI BehaviorTreeDefinitionPtr(class BehaviorTreeDefinitionPtr const &); /** - * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@XZ + * @symbol ??0BehaviorTreeDefinitionPtr\@\@QEAA\@XZ */ MCAPI BehaviorTreeDefinitionPtr(); /** - * @symbol ??4BehaviorTreeDefinitionPtr\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4BehaviorTreeDefinitionPtr\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ - MCAPI class BehaviorTreeDefinitionPtr & operator=(class BehaviorTreeDefinitionPtr const &); + MCAPI class BehaviorTreeDefinitionPtr & operator=(class BehaviorTreeDefinitionPtr &&); /** - * @symbol ??4BehaviorTreeDefinitionPtr\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BehaviorTreeDefinitionPtr\@\@QEAAAEAV0\@AEBV0\@\@Z */ - MCAPI class BehaviorTreeDefinitionPtr & operator=(class BehaviorTreeDefinitionPtr &&); + MCAPI class BehaviorTreeDefinitionPtr & operator=(class BehaviorTreeDefinitionPtr const &); /** - * @symbol ??1BehaviorTreeDefinitionPtr\@\@QEAA\@XZ + * @symbol ??1BehaviorTreeDefinitionPtr\@\@QEAA\@XZ */ MCAPI ~BehaviorTreeDefinitionPtr(); /** - * @symbol ?NONE\@BehaviorTreeDefinitionPtr\@\@2V1\@B + * @symbol ?NONE\@BehaviorTreeDefinitionPtr\@\@2V1\@B */ MCAPI static class BehaviorTreeDefinitionPtr const NONE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp index f72f76f580..6c15166995 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class BehaviorTreeDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@BehaviorTreeDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@BehaviorTreeDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~BehaviorTreeDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BEHAVIORTREEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@BehaviorTreeDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~BehaviorTreeDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp index 6b59adfd18..4975113634 100644 --- a/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp +++ b/LiteLoader/include/llapi/mc/BehaviorTreeGroup.hpp @@ -30,28 +30,28 @@ class BehaviorTreeGroup { public: /** - * @symbol ??0BehaviorTreeGroup\@\@QEAA\@AEAVResourcePackManager\@\@AEAVBehaviorFactory\@\@\@Z + * @symbol ??0BehaviorTreeGroup\@\@QEAA\@AEAVResourcePackManager\@\@AEAVBehaviorFactory\@\@\@Z */ MCAPI BehaviorTreeGroup(class ResourcePackManager &, class BehaviorFactory &); /** - * @symbol ?tryGetDefinition\@BehaviorTreeGroup\@\@QEAA?AVBehaviorTreeDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryGetDefinition\@BehaviorTreeGroup\@\@QEAA?AVBehaviorTreeDefinitionPtr\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BehaviorTreeDefinitionPtr tryGetDefinition(std::string const &); /** - * @symbol ??1BehaviorTreeGroup\@\@QEAA\@XZ + * @symbol ??1BehaviorTreeGroup\@\@QEAA\@XZ */ MCAPI ~BehaviorTreeGroup(); //private: /** - * @symbol ?_addRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z + * @symbol ?_addRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z */ MCAPI void _addRef(class BehaviorTreeDefinitionPtr &); /** - * @symbol ?_removeRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z + * @symbol ?_removeRef\@BehaviorTreeGroup\@\@AEAAXAEAVBehaviorTreeDefinitionPtr\@\@\@Z */ MCAPI void _removeRef(class BehaviorTreeDefinitionPtr &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BellBlock.hpp b/LiteLoader/include/llapi/mc/BellBlock.hpp index 5cfe467930..c2854a07c1 100644 --- a/LiteLoader/include/llapi/mc/BellBlock.hpp +++ b/LiteLoader/include/llapi/mc/BellBlock.hpp @@ -31,303 +31,312 @@ class BellBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BellBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 15 - * @symbol ?onProjectileHit\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@BellBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@BellBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BellBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BellBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?movedByPiston\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 76 + * @symbol ?movedByPiston\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@BellBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@BellBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 113 - * @symbol ?entityInside\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BellBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BellBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BellBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BellBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BellBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@BellBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@BellBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BELLBLOCK /** - * @symbol ?isInteractiveBlock\@BellBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@BellBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0BellBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BellBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BellBlock(std::string const &, int); /** - * @symbol ?hasValidAttachment\@BellBlock\@\@QEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?hasValidAttachment\@BellBlock\@\@QEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool hasValidAttachment(class Block const &, class BlockSource &, class BlockPos const &) const; //private: /** - * @symbol ?_determineAttachment\@BellBlock\@\@AEBAAEBVBlock\@\@AEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_determineAttachment\@BellBlock\@\@AEBAAEBVBlock\@\@AEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI class Block const & _determineAttachment(class Actor &, class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @symbol ?_getItemId\@BellBlock\@\@AEBAFAEBVBlockSource\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?_getItemId\@BellBlock\@\@AEBAFAEBVBlockSource\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI short _getItemId(class BlockSource const &, class gsl::basic_string_span) const; + MCAPI short _getItemId(class BlockSource const &, class std::basic_string_view>) const; /** - * @symbol ?_getShape\@BellBlock\@\@AEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + * @symbol ?_getShape\@BellBlock\@\@AEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ MCAPI class AABB const & _getShape(class Block const &, class AABB &) const; /** - * @symbol ?_sendBellUsedEventToClient\@BellBlock\@\@AEBAXAEBVBlockSource\@\@AEBVActor\@\@\@Z + * @symbol ?_sendBellUsedEventToClient\@BellBlock\@\@AEBAXAEBVBlockSource\@\@AEBVActor\@\@\@Z */ MCAPI void _sendBellUsedEventToClient(class BlockSource const &, class Actor const &) const; + /** + * @symbol ?_tryAttachToNeighbors\@BellBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1H\@Z + */ + MCAPI void _tryAttachToNeighbors(class BlockSource &, class BlockPos const &, class BlockPos const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BellBlockActor.hpp b/LiteLoader/include/llapi/mc/BellBlockActor.hpp index be19c6d7d4..f858bd412c 100644 --- a/LiteLoader/include/llapi/mc/BellBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockActor.hpp @@ -32,90 +32,90 @@ class BellBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BellBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BellBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BellBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@BellBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@BellBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@BellBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@BellBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@BellBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @symbol ?_getUpdatePacket\@BellBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @vftbl 38 - * @symbol ?_onUpdatePacket\@BellBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@BellBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0BellBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BellBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BellBlockActor(class BlockPos const &); /** - * @symbol ?ejectItem\@BellBlockActor\@\@QEBAXAEBVBlockPos\@\@AEAVActor\@\@\@Z + * @symbol ?ejectItem\@BellBlockActor\@\@QEBAXAEBVBlockPos\@\@AEAVActor\@\@\@Z */ MCAPI void ejectItem(class BlockPos const &, class Actor &) const; /** - * @symbol ?isRinging\@BellBlockActor\@\@QEBA_NXZ + * @symbol ?isRinging\@BellBlockActor\@\@QEBA_NXZ */ MCAPI bool isRinging() const; /** - * @symbol ?ring\@BellBlockActor\@\@QEAA_NW4Type\@Direction\@\@AEAVBlockSource\@\@PEAVActor\@\@_N\@Z + * @symbol ?ring\@BellBlockActor\@\@QEAA_NW4Type\@Direction\@\@AEAVBlockSource\@\@PEAVActor\@\@_N\@Z */ MCAPI bool ring(enum class Direction::Type, class BlockSource &, class Actor *, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BellBlockItem.hpp b/LiteLoader/include/llapi/mc/BellBlockItem.hpp index 82a7353602..0b47d80ecb 100644 --- a/LiteLoader/include/llapi/mc/BellBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BellBlockItem.hpp @@ -32,83 +32,83 @@ class BellBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BellBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@BellBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BellBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0BellBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BellBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BellBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp index 3161cc0fa0..a3d6249593 100644 --- a/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/BigDripleafBlock.hpp @@ -31,323 +31,327 @@ class BigDripleafBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BigDripleafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@BigDripleafBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@BigDripleafBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 15 - * @symbol ?onProjectileHit\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@BigDripleafBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@BigDripleafBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BigDripleafBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BigDripleafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BigDripleafBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@BigDripleafBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@BigDripleafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@BigDripleafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 113 - * @symbol ?entityInside\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BigDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 152 - * @symbol ?init\@BigDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@BigDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BigDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_178(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 179 + * @symbol ?canSurvive\@BigDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_185(); + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@BigDripleafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIGDRIPLEAFBLOCK /** - * @symbol ?canBeSilkTouched\@BigDripleafBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@BigDripleafBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@BigDripleafBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@BigDripleafBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0BigDripleafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BigDripleafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BigDripleafBlock(std::string const &, int); /** - * @symbol ?MAX_DRIPLEAF_GROWTH_HEIGHT\@BigDripleafBlock\@\@2HB + * @symbol ?MAX_DRIPLEAF_GROWTH_HEIGHT\@BigDripleafBlock\@\@2HB */ MCAPI static int const MAX_DRIPLEAF_GROWTH_HEIGHT; /** - * @symbol ?placeWithRandomHeight\@BigDripleafBlock\@\@SAXAEAVBlockSource\@\@AEAVRandom\@\@VBlockPos\@\@H\@Z + * @symbol ?placeWithRandomHeight\@BigDripleafBlock\@\@SAXAEAVBlockSource\@\@AEAVRandom\@\@VBlockPos\@\@H\@Z */ MCAPI static void placeWithRandomHeight(class BlockSource &, class Random &, class BlockPos, int); //private: /** - * @symbol ?_resetTilt\@BigDripleafBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_findHeadPos\@BigDripleafBlock\@\@AEBA?AVBlockPos\@\@AEAVBlockSource\@\@V2\@\@Z + */ + MCAPI class BlockPos _findHeadPos(class BlockSource &, class BlockPos) const; + /** + * @symbol ?_resetTilt\@BigDripleafBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _resetTilt(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_setTiltAndScheduleTick\@BigDripleafBlock\@\@AEBAXW4BigDripleafTilt\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_setTiltAndScheduleTick\@BigDripleafBlock\@\@AEBAXW4BigDripleafTilt\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _setTiltAndScheduleTick(enum class BigDripleafTilt, class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp b/LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp index c2ef5406a6..cd86319470 100644 --- a/LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp +++ b/LiteLoader/include/llapi/mc/BigEndianStringByteInput.hpp @@ -31,44 +31,50 @@ class BigEndianStringByteInput : public StringByteInput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BigEndianStringByteInput(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?readFloat\@BigEndianStringByteInput\@\@UEAAMXZ + * @vftbl 3 + * @symbol ?readFloat\@BigEndianStringByteInput\@\@UEAAMXZ */ virtual float readFloat(); /** - * @vftbl 4 - * @symbol ?readDouble\@BigEndianStringByteInput\@\@UEAANXZ + * @vftbl 4 + * @symbol ?readDouble\@BigEndianStringByteInput\@\@UEAANXZ */ virtual double readDouble(); /** - * @vftbl 6 - * @symbol ?readShort\@BigEndianStringByteInput\@\@UEAAFXZ + * @vftbl 6 + * @symbol ?readShort\@BigEndianStringByteInput\@\@UEAAFXZ */ virtual short readShort(); /** - * @vftbl 7 - * @symbol ?readInt\@BigEndianStringByteInput\@\@UEAAHXZ + * @vftbl 7 + * @symbol ?readInt\@BigEndianStringByteInput\@\@UEAAHXZ */ virtual int readInt(); /** - * @vftbl 8 - * @symbol ?readLongLong\@BigEndianStringByteInput\@\@UEAA_JXZ + * @vftbl 8 + * @symbol ?readLongLong\@BigEndianStringByteInput\@\@UEAA_JXZ */ virtual __int64 readLongLong(); /** - * @vftbl 9 - * @symbol ?readBytes\@BigEndianStringByteInput\@\@UEAA_NPEAX_K\@Z + * @vftbl 9 + * @symbol ?readBytes\@BigEndianStringByteInput\@\@UEAA_NPEAX_K\@Z */ virtual bool readBytes(void *, unsigned __int64); /** - * @vftbl 11 - * @symbol ?readBigEndianBytes\@BigEndianStringByteInput\@\@UEAA_NPEAX_K\@Z + * @vftbl 11 + * @symbol ?readBigEndianBytes\@BigEndianStringByteInput\@\@UEAA_NPEAX_K\@Z */ virtual bool readBigEndianBytes(void *, unsigned __int64); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIGENDIANSTRINGBYTEINPUT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BigEndianStringByteInput(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BigEndianStringByteOutput.hpp b/LiteLoader/include/llapi/mc/BigEndianStringByteOutput.hpp index a968288b92..18aa0f2be1 100644 --- a/LiteLoader/include/llapi/mc/BigEndianStringByteOutput.hpp +++ b/LiteLoader/include/llapi/mc/BigEndianStringByteOutput.hpp @@ -29,34 +29,40 @@ class BigEndianStringByteOutput : public StringByteOutput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BigEndianStringByteOutput(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?writeFloat\@BigEndianStringByteOutput\@\@UEAAXM\@Z + * @vftbl 3 + * @symbol ?writeFloat\@BigEndianStringByteOutput\@\@UEAAXM\@Z */ virtual void writeFloat(float); /** - * @vftbl 4 - * @symbol ?writeDouble\@BigEndianStringByteOutput\@\@UEAAXN\@Z + * @vftbl 4 + * @symbol ?writeDouble\@BigEndianStringByteOutput\@\@UEAAXN\@Z */ virtual void writeDouble(double); /** - * @vftbl 6 - * @symbol ?writeShort\@BigEndianStringByteOutput\@\@UEAAXF\@Z + * @vftbl 6 + * @symbol ?writeShort\@BigEndianStringByteOutput\@\@UEAAXF\@Z */ virtual void writeShort(short); /** - * @vftbl 7 - * @symbol ?writeInt\@BigEndianStringByteOutput\@\@UEAAXH\@Z + * @vftbl 7 + * @symbol ?writeInt\@BigEndianStringByteOutput\@\@UEAAXH\@Z */ virtual void writeInt(int); /** - * @vftbl 8 - * @symbol ?writeLongLong\@BigEndianStringByteOutput\@\@UEAAX_J\@Z + * @vftbl 8 + * @symbol ?writeLongLong\@BigEndianStringByteOutput\@\@UEAAX_J\@Z */ virtual void writeLongLong(__int64); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIGENDIANSTRINGBYTEOUTPUT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BigEndianStringByteOutput(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BinaryHeap.hpp b/LiteLoader/include/llapi/mc/BinaryHeap.hpp index 26aae1d30f..c67c4b0881 100644 --- a/LiteLoader/include/llapi/mc/BinaryHeap.hpp +++ b/LiteLoader/include/llapi/mc/BinaryHeap.hpp @@ -29,40 +29,40 @@ class BinaryHeap { public: /** - * @symbol ??0BinaryHeap\@\@QEAA\@XZ + * @symbol ??0BinaryHeap\@\@QEAA\@XZ */ MCAPI BinaryHeap(); /** - * @symbol ?changeCost\@BinaryHeap\@\@QEAAXPEAVPathfinderNode\@\@M\@Z + * @symbol ?changeCost\@BinaryHeap\@\@QEAAXPEAVPathfinderNode\@\@M\@Z */ MCAPI void changeCost(class PathfinderNode *, float); /** - * @symbol ?clear\@BinaryHeap\@\@QEAAXXZ + * @symbol ?clear\@BinaryHeap\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?insert\@BinaryHeap\@\@QEAAPEAVPathfinderNode\@\@PEAV2\@\@Z + * @symbol ?insert\@BinaryHeap\@\@QEAAPEAVPathfinderNode\@\@PEAV2\@\@Z */ MCAPI class PathfinderNode * insert(class PathfinderNode *); /** - * @symbol ?isEmpty\@BinaryHeap\@\@QEAA_NXZ + * @symbol ?isEmpty\@BinaryHeap\@\@QEAA_NXZ */ MCAPI bool isEmpty(); /** - * @symbol ?pop\@BinaryHeap\@\@QEAAPEAVPathfinderNode\@\@XZ + * @symbol ?pop\@BinaryHeap\@\@QEAAPEAVPathfinderNode\@\@XZ */ MCAPI class PathfinderNode * pop(); /** - * @symbol ??1BinaryHeap\@\@QEAA\@XZ + * @symbol ??1BinaryHeap\@\@QEAA\@XZ */ MCAPI ~BinaryHeap(); //private: /** - * @symbol ?downHeap\@BinaryHeap\@\@AEAAXH\@Z + * @symbol ?downHeap\@BinaryHeap\@\@AEAAXH\@Z */ MCAPI void downHeap(int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BinaryStream.hpp b/LiteLoader/include/llapi/mc/BinaryStream.hpp index f5d72ad22c..5e69e8d095 100644 --- a/LiteLoader/include/llapi/mc/BinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/BinaryStream.hpp @@ -68,101 +68,107 @@ class BinaryStream : public ReadOnlyBinaryStream { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BinaryStream(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BINARYSTREAM /** - * @symbol ??0BinaryStream\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI BinaryStream(); + MCVAPI ~BinaryStream(); +#endif /** - * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ??0BinaryStream\@\@QEAA\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI BinaryStream(std::string &, bool); /** - * @symbol ?getAndReleaseData\@BinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ??0BinaryStream\@\@QEAA\@XZ + */ + MCAPI BinaryStream(); + /** + * @symbol ?getAndReleaseData\@BinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getAndReleaseData(); /** - * @symbol ?reset\@BinaryStream\@\@QEAAXXZ + * @symbol ?reset\@BinaryStream\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?writeBool\@BinaryStream\@\@QEAAX_N\@Z + * @symbol ?writeBool\@BinaryStream\@\@QEAAX_N\@Z */ MCAPI void writeBool(bool); /** - * @symbol ?writeByte\@BinaryStream\@\@QEAAXE\@Z + * @symbol ?writeByte\@BinaryStream\@\@QEAAXE\@Z */ MCAPI void writeByte(unsigned char); /** - * @symbol ?writeDouble\@BinaryStream\@\@QEAAXN\@Z + * @symbol ?writeDouble\@BinaryStream\@\@QEAAXN\@Z */ MCAPI void writeDouble(double); /** - * @symbol ?writeFloat\@BinaryStream\@\@QEAAXM\@Z + * @symbol ?writeFloat\@BinaryStream\@\@QEAAXM\@Z */ MCAPI void writeFloat(float); /** - * @symbol ?writeSignedBigEndianInt\@BinaryStream\@\@QEAAXH\@Z + * @symbol ?writeSignedBigEndianInt\@BinaryStream\@\@QEAAXH\@Z */ MCAPI void writeSignedBigEndianInt(int); /** - * @symbol ?writeSignedInt\@BinaryStream\@\@QEAAXH\@Z + * @symbol ?writeSignedInt\@BinaryStream\@\@QEAAXH\@Z */ MCAPI void writeSignedInt(int); /** - * @symbol ?writeSignedInt64\@BinaryStream\@\@QEAAX_J\@Z + * @symbol ?writeSignedInt64\@BinaryStream\@\@QEAAX_J\@Z */ MCAPI void writeSignedInt64(__int64); /** - * @symbol ?writeSignedShort\@BinaryStream\@\@QEAAXF\@Z + * @symbol ?writeSignedShort\@BinaryStream\@\@QEAAXF\@Z */ MCAPI void writeSignedShort(short); /** - * @symbol ?writeString\@BinaryStream\@\@QEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?writeString\@BinaryStream\@\@QEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI void writeString(class gsl::basic_string_span); + MCAPI void writeString(class std::basic_string_view>); /** - * @symbol ?writeUnsignedChar\@BinaryStream\@\@QEAAXE\@Z + * @symbol ?writeUnsignedChar\@BinaryStream\@\@QEAAXE\@Z */ MCAPI void writeUnsignedChar(unsigned char); /** - * @symbol ?writeUnsignedInt\@BinaryStream\@\@QEAAXI\@Z + * @symbol ?writeUnsignedInt\@BinaryStream\@\@QEAAXI\@Z */ MCAPI void writeUnsignedInt(unsigned int); /** - * @symbol ?writeUnsignedInt64\@BinaryStream\@\@QEAAX_K\@Z + * @symbol ?writeUnsignedInt64\@BinaryStream\@\@QEAAX_K\@Z */ MCAPI void writeUnsignedInt64(unsigned __int64); /** - * @symbol ?writeUnsignedShort\@BinaryStream\@\@QEAAXG\@Z + * @symbol ?writeUnsignedShort\@BinaryStream\@\@QEAAXG\@Z */ MCAPI void writeUnsignedShort(unsigned short); /** - * @symbol ?writeUnsignedVarInt\@BinaryStream\@\@QEAAXI\@Z + * @symbol ?writeUnsignedVarInt\@BinaryStream\@\@QEAAXI\@Z */ MCAPI void writeUnsignedVarInt(unsigned int); /** - * @symbol ?writeUnsignedVarInt64\@BinaryStream\@\@QEAAX_K\@Z + * @symbol ?writeUnsignedVarInt64\@BinaryStream\@\@QEAAX_K\@Z */ MCAPI void writeUnsignedVarInt64(unsigned __int64); /** - * @symbol ?writeVarInt\@BinaryStream\@\@QEAAXH\@Z + * @symbol ?writeVarInt\@BinaryStream\@\@QEAAXH\@Z */ MCAPI void writeVarInt(int); /** - * @symbol ?writeVarInt64\@BinaryStream\@\@QEAAX_J\@Z + * @symbol ?writeVarInt64\@BinaryStream\@\@QEAAX_J\@Z */ MCAPI void writeVarInt64(__int64); //private: /** - * @symbol ?write\@BinaryStream\@\@AEAAXPEBX_K\@Z + * @symbol ?write\@BinaryStream\@\@AEAAXPEBX_K\@Z */ MCAPI void write(void const *, unsigned __int64); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Biome.hpp b/LiteLoader/include/llapi/mc/Biome.hpp index 0d9c5f6cb2..d41820ef7b 100644 --- a/LiteLoader/include/llapi/mc/Biome.hpp +++ b/LiteLoader/include/llapi/mc/Biome.hpp @@ -38,176 +38,176 @@ class Biome { public: /** - * @symbol ??0Biome\@\@QEAA\@H\@Z + * @symbol ??0Biome\@\@QEAA\@H\@Z */ MCAPI Biome(int); /** - * @symbol ?addTag\@Biome\@\@QEAAAEAV1\@VHashedString\@\@AEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?addTag\@Biome\@\@QEAAAEAV1\@VHashedString\@\@AEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ MCAPI class Biome & addTag(class HashedString, class TagRegistry, struct IDType> &); /** - * @symbol ?cacheClientComponentData\@Biome\@\@QEAAXXZ + * @symbol ?cacheClientComponentData\@Biome\@\@QEAAXXZ */ MCAPI void cacheClientComponentData(); /** - * @symbol ?canHaveSnowfall\@Biome\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canHaveSnowfall\@Biome\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canHaveSnowfall(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?getBiomeType\@Biome\@\@QEBA?AW4VanillaBiomeTypes\@\@XZ + * @symbol ?getBiomeType\@Biome\@\@QEBA?AW4VanillaBiomeTypes\@\@XZ */ MCAPI enum class VanillaBiomeTypes getBiomeType() const; /** - * @symbol ?getBirchFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getBirchFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getBirchFoliageColor(class BlockPos const &) const; /** - * @symbol ?getDefaultBiomeTemperature\@Biome\@\@QEBAMXZ + * @symbol ?getDefaultBiomeTemperature\@Biome\@\@QEBAMXZ */ MCAPI float getDefaultBiomeTemperature() const; /** - * @symbol ?getDownfall\@Biome\@\@QEBAMXZ + * @symbol ?getDownfall\@Biome\@\@QEBAMXZ */ MCAPI float getDownfall() const; /** - * @symbol ?getEvergreenFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getEvergreenFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getEvergreenFoliageColor(class BlockPos const &) const; /** - * @symbol ?getFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getFoliageColor(class BlockPos const &) const; /** - * @symbol ?getMapBirchFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getMapBirchFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getMapBirchFoliageColor(class BlockPos const &) const; /** - * @symbol ?getMapEvergreenFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getMapEvergreenFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getMapEvergreenFoliageColor(class BlockPos const &) const; /** - * @symbol ?getMapFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getMapFoliageColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getMapFoliageColor(class BlockPos const &) const; /** - * @symbol ?getMapGrassColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getMapGrassColor\@Biome\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getMapGrassColor(class BlockPos const &) const; /** - * @symbol ?getMobs\@Biome\@\@QEBAAEBV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMobs\@Biome\@\@QEBAAEBV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getMobs() const; /** - * @symbol ?getMobsMutable\@Biome\@\@QEAAAEAV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMobsMutable\@Biome\@\@QEAAAEAV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getMobsMutable(); /** - * @symbol ?getSnowAccumulationLayers\@Biome\@\@QEBAHXZ + * @symbol ?getSnowAccumulationLayers\@Biome\@\@QEBAHXZ */ MCAPI int getSnowAccumulationLayers() const; /** - * @symbol ?getTemperature\@Biome\@\@QEBAMAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getTemperature\@Biome\@\@QEBAMAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI float getTemperature(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?getTemperatureCategory\@Biome\@\@QEBA?AW4BiomeTempCategory\@1\@XZ + * @symbol ?getTemperatureCategory\@Biome\@\@QEBA?AW4BiomeTempCategory\@1\@XZ */ MCAPI enum class Biome::BiomeTempCategory getTemperatureCategory() const; /** - * @symbol ?getTemperatureWorldGen\@Biome\@\@QEBAMAEBVBlockPos\@\@F\@Z + * @symbol ?getTemperatureWorldGen\@Biome\@\@QEBAMAEBVBlockPos\@\@F\@Z */ MCAPI float getTemperatureWorldGen(class BlockPos const &, short) const; /** - * @symbol ?hasTag\@Biome\@\@QEBA_NAEBU?$IDType\@UBiomeTagIDType\@\@\@\@AEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?hasTag\@Biome\@\@QEBA_NAEBU?$IDType\@UBiomeTagIDType\@\@\@\@AEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ MCAPI bool hasTag(struct IDType const &, class TagRegistry, struct IDType> const &) const; /** - * @symbol ?hasTag\@Biome\@\@QEBA_NAEBVWellKnownTagID\@\@\@Z + * @symbol ?hasTag\@Biome\@\@QEBA_N_KAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ - MCAPI bool hasTag(class WellKnownTagID const &) const; + MCAPI bool hasTag(unsigned __int64, class TagRegistry, struct IDType> const &) const; /** - * @symbol ?hasTag\@Biome\@\@QEBA_N_KAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?hasTag\@Biome\@\@QEBA_NAEBVWellKnownTagID\@\@\@Z */ - MCAPI bool hasTag(unsigned __int64, class TagRegistry, struct IDType> const &) const; + MCAPI bool hasTag(class WellKnownTagID const &) const; /** - * @symbol ?initEntity\@Biome\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?initEntity\@Biome\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void initEntity(class EntityRegistry &); /** - * @symbol ?isHumid\@Biome\@\@QEBA_NXZ + * @symbol ?isHumid\@Biome\@\@QEBA_NXZ */ MCAPI bool isHumid() const; /** - * @symbol ?isSnowCovered\@Biome\@\@QEBA_NXZ + * @symbol ?isSnowCovered\@Biome\@\@QEBA_NXZ */ MCAPI bool isSnowCovered() const; /** - * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H\@Z + * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H\@Z */ MCAPI class Biome & setColor(int); /** - * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H_N\@Z + * @symbol ?setColor\@Biome\@\@QEAAAEAV1\@H_N\@Z */ MCAPI class Biome & setColor(int, bool); /** - * @symbol ?setDepthAndScale\@Biome\@\@QEAAAEAV1\@AEBUBiomeHeight\@\@\@Z + * @symbol ?setDepthAndScale\@Biome\@\@QEAAAEAV1\@AEBUBiomeHeight\@\@\@Z */ MCAPI class Biome & setDepthAndScale(struct BiomeHeight const &); /** - * @symbol ?setMapWaterColor\@Biome\@\@QEAAAEAV1\@H\@Z + * @symbol ?setMapWaterColor\@Biome\@\@QEAAAEAV1\@H\@Z */ MCAPI class Biome & setMapWaterColor(int); /** - * @symbol ?setName\@Biome\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setName\@Biome\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class Biome & setName(std::string const &); /** - * @symbol ?setNoRain\@Biome\@\@QEAAAEAV1\@XZ + * @symbol ?setNoRain\@Biome\@\@QEAAAEAV1\@XZ */ MCAPI class Biome & setNoRain(); /** - * @symbol ?setOceanRuinConfig\@Biome\@\@QEAAAEAV1\@AEBUOceanRuinConfiguration\@\@\@Z + * @symbol ?setOceanRuinConfig\@Biome\@\@QEAAAEAV1\@AEBUOceanRuinConfiguration\@\@\@Z */ MCAPI class Biome & setOceanRuinConfig(struct OceanRuinConfiguration const &); /** - * @symbol ?setOddColor\@Biome\@\@QEAAAEAV1\@H\@Z + * @symbol ?setOddColor\@Biome\@\@QEAAAEAV1\@H\@Z */ MCAPI class Biome & setOddColor(int); /** - * @symbol ?setSnowAccumulation\@Biome\@\@QEAAAEAV1\@MM\@Z + * @symbol ?setSnowAccumulation\@Biome\@\@QEAAAEAV1\@MM\@Z */ MCAPI class Biome & setSnowAccumulation(float, float); /** - * @symbol ?writePacketData\@Biome\@\@QEAAXAEAVCompoundTag\@\@AEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?writePacketData\@Biome\@\@QEAAXAEAVCompoundTag\@\@AEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@\@Z */ MCAPI void writePacketData(class CompoundTag &, class TagRegistry, struct IDType> &); /** - * @symbol ?BACKCOMPAT_FOG_NAME\@Biome\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?BACKCOMPAT_FOG_NAME\@Biome\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const BACKCOMPAT_FOG_NAME; + MCAPI static class std::basic_string_view> const BACKCOMPAT_FOG_NAME; /** - * @symbol ?DEFAULT_FOG_COLOR\@Biome\@\@2VColor\@mce\@\@B + * @symbol ?DEFAULT_FOG_COLOR\@Biome\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const DEFAULT_FOG_COLOR; /** - * @symbol ?DEFAULT_FOG_ID\@Biome\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?DEFAULT_FOG_ID\@Biome\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const DEFAULT_FOG_ID; + MCAPI static class std::basic_string_view> const DEFAULT_FOG_ID; /** - * @symbol ?DEFAULT_UNDERWATER_COLOR\@Biome\@\@2VColor\@mce\@\@B + * @symbol ?DEFAULT_UNDERWATER_COLOR\@Biome\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const DEFAULT_UNDERWATER_COLOR; /** - * @symbol ?DEFAULT_WATER_COLOR\@Biome\@\@2VColor\@mce\@\@B + * @symbol ?DEFAULT_WATER_COLOR\@Biome\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const DEFAULT_WATER_COLOR; /** - * @symbol ?RAIN_TEMP_THRESHOLD\@Biome\@\@2MB + * @symbol ?RAIN_TEMP_THRESHOLD\@Biome\@\@2MB */ MCAPI static float const RAIN_TEMP_THRESHOLD; /** - * @symbol ?buildCachedTemperatureNoise\@Biome\@\@SAXAEAVLevelChunk\@\@\@Z + * @symbol ?buildCachedTemperatureNoise\@Biome\@\@SAXAEAVLevelChunk\@\@\@Z */ MCAPI static void buildCachedTemperatureNoise(class LevelChunk &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeArea.hpp b/LiteLoader/include/llapi/mc/BiomeArea.hpp index e995dce35c..cd8844a7da 100644 --- a/LiteLoader/include/llapi/mc/BiomeArea.hpp +++ b/LiteLoader/include/llapi/mc/BiomeArea.hpp @@ -28,12 +28,12 @@ class BiomeArea { public: /** - * @symbol ??0BiomeArea\@\@QEAA\@AEBVBoundingBox\@\@I\@Z + * @symbol ??0BiomeArea\@\@QEAA\@AEBVBoundingBox\@\@I\@Z */ MCAPI BiomeArea(class BoundingBox const &, unsigned int); /** - * @symbol ??1BiomeArea\@\@QEAA\@XZ + * @symbol ??1BiomeArea\@\@QEAA\@XZ */ MCAPI ~BiomeArea(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp b/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp index 0b8e9671b0..9a94221f4f 100644 --- a/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/BiomeComponentFactory.hpp @@ -31,20 +31,20 @@ class BiomeComponentFactory { public: /** - * @symbol ??0BiomeComponentFactory\@\@QEAA\@W4FactoryScope\@0\@\@Z + * @symbol ??0BiomeComponentFactory\@\@QEAA\@W4FactoryScope\@0\@\@Z */ MCAPI BiomeComponentFactory(enum class BiomeComponentFactory::FactoryScope); /** - * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ - MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class CompoundTag &) const; + MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class Json::Value &, class SemVersion const &) const; /** - * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?processDataComponents\@BiomeComponentFactory\@\@QEBAXAEAVBiome\@\@AEAVIWorldRegistriesProvider\@\@AEAVCompoundTag\@\@\@Z */ - MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class Json::Value &, class SemVersion const &) const; + MCAPI void processDataComponents(class Biome &, class IWorldRegistriesProvider &, class CompoundTag &) const; /** - * @symbol ?registrationFinished\@BiomeComponentFactory\@\@QEAAXXZ + * @symbol ?registrationFinished\@BiomeComponentFactory\@\@QEAAXXZ */ MCAPI void registrationFinished(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp b/LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp index f3a702a3bf..bf7c2e0d15 100644 --- a/LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp +++ b/LiteLoader/include/llapi/mc/BiomeComponentLoading.hpp @@ -22,11 +22,11 @@ namespace BiomeComponentLoading { #undef AFTER_EXTRA /** - * @symbol ?_read\@BiomeComponentLoading\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAV?$vector\@U?$pair\@PEAVBiome\@\@I\@std\@\@V?$allocator\@U?$pair\@PEAVBiome\@\@I\@std\@\@\@2\@\@3\@AEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ?_read\@BiomeComponentLoading\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAV?$vector\@U?$pair\@PEAVBiome\@\@I\@std\@\@V?$allocator\@U?$pair\@PEAVBiome\@\@I\@std\@\@\@2\@\@3\@AEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI void _read(std::string const &, class CompoundTag const &, std::vector> &, class IWorldRegistriesProvider &); /** - * @symbol ?_write\@BiomeComponentLoading\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCompoundTag\@\@AEBV?$vector\@U?$pair\@PEAVBiome\@\@I\@std\@\@V?$allocator\@U?$pair\@PEAVBiome\@\@I\@std\@\@\@2\@\@3\@\@Z + * @symbol ?_write\@BiomeComponentLoading\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCompoundTag\@\@AEBV?$vector\@U?$pair\@PEAVBiome\@\@I\@std\@\@V?$allocator\@U?$pair\@PEAVBiome\@\@I\@std\@\@\@2\@\@3\@\@Z */ MCAPI void _write(std::string const &, class CompoundTag &, std::vector> const &); diff --git a/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp b/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp index b034015a76..ab2d73c058 100644 --- a/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDecorationFeature.hpp @@ -27,15 +27,15 @@ struct BiomeDecorationFeature { public: /** - * @symbol ??0BiomeDecorationFeature\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0BiomeDecorationFeature\@\@QEAA\@AEBU0\@\@Z */ - MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature &&); + MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature const &); /** - * @symbol ??0BiomeDecorationFeature\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BiomeDecorationFeature\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature const &); + MCAPI BiomeDecorationFeature(struct BiomeDecorationFeature &&); /** - * @symbol ??1BiomeDecorationFeature\@\@QEAA\@XZ + * @symbol ??1BiomeDecorationFeature\@\@QEAA\@XZ */ MCAPI ~BiomeDecorationFeature(); diff --git a/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp b/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp index 789eda1ae2..2e8cc188e9 100644 --- a/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDecorationSystem.hpp @@ -22,24 +22,24 @@ namespace BiomeDecorationSystem { #undef AFTER_EXTRA /** - * @symbol ?consolidateDecorationFeatures\@BiomeDecorationSystem\@\@YAXAEAVBiomeRegistry\@\@\@Z + * @symbol ?consolidateDecorationFeatures\@BiomeDecorationSystem\@\@YAXAEAVBiomeRegistry\@\@\@Z */ MCAPI void consolidateDecorationFeatures(class BiomeRegistry &); /** - * @symbol ?decorate\@BiomeDecorationSystem\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEAV?$vector\@PEBVBiome\@\@V?$allocator\@PEBVBiome\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ?decorate\@BiomeDecorationSystem\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEAV?$vector\@PEBVBiome\@\@V?$allocator\@PEBVBiome\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@6\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI void decorate(class LevelChunk &, class BlockSource &, class Random &, std::vector &, std::string const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ?decorateBiome\@BiomeDecorationSystem\@\@YA_NAEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@V?$span\@UBiomeDecorationFeature\@\@$0?0\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVBiome\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ?decorateBiome\@BiomeDecorationSystem\@\@YA_NAEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@V?$span\@UBiomeDecorationFeature\@\@$0?0\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVBiome\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI bool decorateBiome(class LevelChunk &, class BlockSource &, class Random &, class gsl::span, std::string const &, class Biome const *, class IPreliminarySurfaceProvider const &); /** - * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YA_NAEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@V?$span\@UBiomeDecorationFeature\@\@$0?0\@gsl\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI void decorateLargeFeature(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &, std::string const &); + MCAPI bool decorateLargeFeature(class LevelChunk &, class BlockVolumeTarget &, class Random &, class gsl::span, class ChunkPos const &, std::string const &); /** - * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YA_NAEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@V?$span\@UBiomeDecorationFeature\@\@$0?0\@gsl\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?decorateLargeFeature\@BiomeDecorationSystem\@\@YAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI bool decorateLargeFeature(class LevelChunk &, class BlockVolumeTarget &, class Random &, class gsl::span, class ChunkPos const &, std::string const &); + MCAPI void decorateLargeFeature(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &, std::string const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp index d8b465dbfc..ead933cc6a 100644 --- a/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp +++ b/LiteLoader/include/llapi/mc/BiomeDefinitionListPacket.hpp @@ -30,38 +30,44 @@ class BiomeDefinitionListPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BiomeDefinitionListPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@BiomeDefinitionListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@BiomeDefinitionListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@BiomeDefinitionListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BiomeDefinitionListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@BiomeDefinitionListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@BiomeDefinitionListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol ?readExtended\@BiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@BiomeDefinitionListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@BiomeDefinitionListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIOMEDEFINITIONLISTPACKET /** - * @symbol ??0BiomeDefinitionListPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BiomeDefinitionListPacket(); +#endif + /** + * @symbol ??0BiomeDefinitionListPacket\@\@QEAA\@XZ */ MCAPI BiomeDefinitionListPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp b/LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp index 850d7b8931..2c8346a79e 100644 --- a/LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/BiomeFilterGroup.hpp @@ -26,27 +26,30 @@ class BiomeFilterGroup : public FilterGroup { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BIOMEFILTERGROUP public: class BiomeFilterGroup& operator=(class BiomeFilterGroup const &) = delete; + BiomeFilterGroup(class BiomeFilterGroup const &) = delete; BiomeFilterGroup() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BiomeFilterGroup(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_createSubgroup\@BiomeFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z + * @vftbl 1 + * @symbol ?_createSubgroup\@BiomeFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z */ virtual class std::shared_ptr _createSubgroup(enum class FilterGroup::CollectionType) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIOMEFILTERGROUP /** - * @symbol ??0BiomeFilterGroup\@\@QEAA\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI BiomeFilterGroup(class BiomeFilterGroup const &); + MCVAPI ~BiomeFilterGroup(); +#endif /** - * @symbol ?finalizeParsedValue\@BiomeFilterGroup\@\@QEAAXAEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ?finalizeParsedValue\@BiomeFilterGroup\@\@QEAAXAEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI void finalizeParsedValue(class IWorldRegistriesProvider &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeHeight.hpp b/LiteLoader/include/llapi/mc/BiomeHeight.hpp index 0c518a1e40..1cfe13d12a 100644 --- a/LiteLoader/include/llapi/mc/BiomeHeight.hpp +++ b/LiteLoader/include/llapi/mc/BiomeHeight.hpp @@ -30,7 +30,7 @@ struct BiomeHeight { public: /** - * @symbol ?MIN_DEPTH\@BiomeHeight\@\@2MB + * @symbol ?MIN_DEPTH\@BiomeHeight\@\@2MB */ MCAPI static float const MIN_DEPTH; diff --git a/LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp b/LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp index 8d9a7c6222..92ed08cded 100644 --- a/LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp +++ b/LiteLoader/include/llapi/mc/BiomeIdCompatibility.hpp @@ -22,15 +22,15 @@ namespace BiomeIdCompatibility { #undef AFTER_EXTRA /** - * @symbol ?MAX_CUSTOM_BIOMES\@BiomeIdCompatibility\@\@3IB + * @symbol ?MAX_CUSTOM_BIOMES\@BiomeIdCompatibility\@\@3IB */ MCAPI extern unsigned int const MAX_CUSTOM_BIOMES; /** - * @symbol ?adjustForReservedRanges\@BiomeIdCompatibility\@\@YAIIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?adjustForReservedRanges\@BiomeIdCompatibility\@\@YAIIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI unsigned int adjustForReservedRanges(unsigned int, std::string const &); /** - * @symbol ?isReserved\@BiomeIdCompatibility\@\@YA_NI\@Z + * @symbol ?isReserved\@BiomeIdCompatibility\@\@YA_NI\@Z */ MCAPI bool isReserved(unsigned int); diff --git a/LiteLoader/include/llapi/mc/BiomeMetadata.hpp b/LiteLoader/include/llapi/mc/BiomeMetadata.hpp index 8d489cbf2c..df2f742588 100644 --- a/LiteLoader/include/llapi/mc/BiomeMetadata.hpp +++ b/LiteLoader/include/llapi/mc/BiomeMetadata.hpp @@ -25,7 +25,7 @@ struct BiomeMetadata { public: /** - * @symbol ??1BiomeMetadata\@\@QEAA\@XZ + * @symbol ??1BiomeMetadata\@\@QEAA\@XZ */ MCAPI ~BiomeMetadata(); diff --git a/LiteLoader/include/llapi/mc/BiomeRegistry.hpp b/LiteLoader/include/llapi/mc/BiomeRegistry.hpp index 3050682183..81d871de9a 100644 --- a/LiteLoader/include/llapi/mc/BiomeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BiomeRegistry.hpp @@ -37,81 +37,85 @@ struct BiomeParent { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIOMEREGISTRY /** - * @symbol ?getEntityRegistry\@BiomeRegistry\@\@UEBA?AV?$StackRefResultT\@UEntityRegistryConstRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@BiomeRegistry\@\@UEBA?AV?$StackRefResultT\@UEntityRegistryConstRefTraits\@\@\@\@XZ */ MCVAPI class StackRefResultT getEntityRegistry() const; /** - * @symbol ?getEntityRegistry\@BiomeRegistry\@\@UEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@BiomeRegistry\@\@UEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ MCVAPI class StackRefResultT getEntityRegistry(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BiomeRegistry(); #endif /** - * @symbol ??0BiomeRegistry\@\@QEAA\@XZ + * @symbol ??0BiomeRegistry\@\@QEAA\@XZ */ MCAPI BiomeRegistry(); /** - * @symbol ?forEachBiome\@BiomeRegistry\@\@QEBAXV?$function\@$$A6AXAEAVBiome\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachBiome\@BiomeRegistry\@\@QEBAXV?$function\@$$A6AXAEAVBiome\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachBiome(class std::function) const; /** - * @symbol ?getTagRegistry\@BiomeRegistry\@\@QEAAAEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@XZ + * @symbol ?getTagRegistry\@BiomeRegistry\@\@QEAAAEAV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@XZ */ MCAPI class TagRegistry, struct IDType> & getTagRegistry(); /** - * @symbol ?getTagRegistry\@BiomeRegistry\@\@QEBAAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@XZ + * @symbol ?getTagRegistry\@BiomeRegistry\@\@QEBAAEBV?$TagRegistry\@U?$IDType\@UBiomeTagIDType\@\@\@\@U?$IDType\@UBiomeTagSetIDType\@\@\@\@\@\@XZ */ MCAPI class TagRegistry, struct IDType> const & getTagRegistry() const; /** - * @symbol ?initServerFromPacks\@BiomeRegistry\@\@QEAAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ?initServerFromPacks\@BiomeRegistry\@\@QEAAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI void initServerFromPacks(class ResourcePackManager &, class IWorldRegistriesProvider &); /** - * @symbol ?isRegistrationFinished\@BiomeRegistry\@\@QEBA_NXZ + * @symbol ?isRegistrationFinished\@BiomeRegistry\@\@QEBA_NXZ */ MCAPI bool isRegistrationFinished() const; /** - * @symbol ?lookupByHash\@BiomeRegistry\@\@QEBAPEAVBiome\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByHash\@BiomeRegistry\@\@QEBAPEAVBiome\@\@AEBVHashedString\@\@\@Z */ MCAPI class Biome * lookupByHash(class HashedString const &) const; /** - * @symbol ?lookupById\@BiomeRegistry\@\@QEBAPEAVBiome\@\@H\@Z + * @symbol ?lookupById\@BiomeRegistry\@\@QEBAPEAVBiome\@\@H\@Z */ MCAPI class Biome * lookupById(int) const; /** - * @symbol ?lookupByName\@BiomeRegistry\@\@QEBAPEAVBiome\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookupByName\@BiomeRegistry\@\@QEBAPEAVBiome\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class Biome * lookupByName(std::string const &) const; /** - * @symbol ?registerBiome\@BiomeRegistry\@\@QEAAAEAVBiome\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?registerBiome\@BiomeRegistry\@\@QEAAAEAVBiome\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class Biome & registerBiome(std::string const &); /** - * @symbol ?registrationFinished\@BiomeRegistry\@\@QEAAXXZ + * @symbol ?registrationFinished\@BiomeRegistry\@\@QEAAXXZ */ MCAPI void registrationFinished(); //private: /** - * @symbol ?_addToInheritanceTree\@BiomeRegistry\@\@AEAA_NAEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_addToInheritanceTree\@BiomeRegistry\@\@AEAA_NAEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool _addToInheritanceTree(class InheritanceTree &, std::string const &, class Json::Value &&, class SemVersion const &); /** - * @symbol ?_buildInheritanceTree\@BiomeRegistry\@\@AEAA?AV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEAVResourcePackManager\@\@\@Z + * @symbol ?_buildInheritanceTree\@BiomeRegistry\@\@AEAA?AV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEAVResourcePackManager\@\@\@Z */ MCAPI class InheritanceTree _buildInheritanceTree(class ResourcePackManager &); /** - * @symbol ?_initTagRegistry\@BiomeRegistry\@\@AEAAXXZ + * @symbol ?_initTagRegistry\@BiomeRegistry\@\@AEAAXXZ */ MCAPI void _initTagRegistry(); /** - * @symbol ?_loadSingleBiome\@BiomeRegistry\@\@AEAA_NAEAVResourcePackManager\@\@AEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_loadSingleBiome\@BiomeRegistry\@\@AEAA_NAEAVResourcePackManager\@\@AEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _loadSingleBiome(class ResourcePackManager &, class InheritanceTree &, std::string const &); /** - * @symbol ?_mergeDataInheritance\@BiomeRegistry\@\@AEAAXAEAVValue\@Json\@\@AEAVSemVersion\@\@AEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBUBiomeParent\@1\@\@Z + * @symbol ?_mergeDataInheritance\@BiomeRegistry\@\@AEAAXAEAVValue\@Json\@\@AEAVSemVersion\@\@AEAV?$InheritanceTree\@UBiomeParent\@BiomeRegistry\@\@\@\@AEBUBiomeParent\@1\@\@Z */ MCAPI void _mergeDataInheritance(class Json::Value &, class SemVersion &, class InheritanceTree &, struct BiomeRegistry::BiomeParent const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp b/LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp index 1cf1e29533..0e91786591 100644 --- a/LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp +++ b/LiteLoader/include/llapi/mc/BiomeRegistryMergeStrategy.hpp @@ -30,14 +30,20 @@ class BiomeRegistryMergeStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BiomeRegistryMergeStrategy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?mergeFiles\@BiomeRegistryMergeStrategy\@\@UEAAXAEBV?$vector\@VLoadedResourceData\@\@V?$allocator\@VLoadedResourceData\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?mergeFiles\@BiomeRegistryMergeStrategy\@\@UEAAXAEBV?$vector\@VLoadedResourceData\@\@V?$allocator\@VLoadedResourceData\@\@\@std\@\@\@std\@\@\@Z */ virtual void mergeFiles(std::vector const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BIOMEREGISTRYMERGESTRATEGY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BiomeRegistryMergeStrategy(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeSource.hpp b/LiteLoader/include/llapi/mc/BiomeSource.hpp index 8d29769c7b..c124d2aee5 100644 --- a/LiteLoader/include/llapi/mc/BiomeSource.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSource.hpp @@ -28,8 +28,8 @@ class BiomeSource { public: /** - * @symbol ?getAreaIterator\@BiomeSource\@\@SA?AVBlockPosIterator\@\@AEBVBoundingBox\@\@I\@Z + * @symbol ?getAreaIterator\@BiomeSource\@\@SA?AVBlockPosIterator\@\@AEBVBoundingBox\@\@I\@Z */ MCAPI static class BlockPosIterator getAreaIterator(class BoundingBox const &, unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeSource3d.hpp b/LiteLoader/include/llapi/mc/BiomeSource3d.hpp index cea3f96083..e6da71ed8b 100644 --- a/LiteLoader/include/llapi/mc/BiomeSource3d.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSource3d.hpp @@ -28,44 +28,44 @@ class BiomeSource3d { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BiomeSource3d(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fillBiomes\@BiomeSource3d\@\@UEBAXAEAVLevelChunk\@\@AEBVChunkLocalNoiseCache\@\@\@Z + * @vftbl 1 + * @symbol ?fillBiomes\@BiomeSource3d\@\@UEBAXAEAVLevelChunk\@\@AEBVChunkLocalNoiseCache\@\@\@Z */ virtual void fillBiomes(class LevelChunk &, class ChunkLocalNoiseCache const &) const; /** - * @vftbl 2 - * @symbol ?getBiomeArea\@BiomeSource3d\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + * @vftbl 2 + * @symbol ?getBiomeArea\@BiomeSource3d\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z */ virtual class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; /** - * @vftbl 3 - * @symbol ?getBiomeArea\@BiomeSource3d\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@IAEBUGetBiomeOptions\@\@\@Z + * @vftbl 3 + * @symbol ?getBiomeArea\@BiomeSource3d\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@IAEBUGetBiomeOptions\@\@\@Z */ virtual class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int, struct GetBiomeOptions const &) const; /** - * @vftbl 4 - * @symbol ?containsOnly\@BiomeSource3d\@\@UEBA_NHHHHV?$span\@$$CB_K$0?0\@gsl\@\@\@Z + * @vftbl 4 + * @symbol ?containsOnly\@BiomeSource3d\@\@UEBA_NHHHHV?$span\@$$CB_K$0?0\@gsl\@\@\@Z */ virtual bool containsOnly(int, int, int, int, class gsl::span) const; /** - * @vftbl 5 - * @symbol ?getBiome\@BiomeSource3d\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?getBiome\@BiomeSource3d\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z */ virtual class Biome const * getBiome(class BlockPos const &) const; /** - * @vftbl 6 - * @symbol ?getBiome\@BiomeSource3d\@\@UEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@\@Z + * @vftbl 6 + * @symbol ?getBiome\@BiomeSource3d\@\@UEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@\@Z */ virtual class Biome const * getBiome(struct GetBiomeOptions const &) const; /** - * @vftbl 7 - * @symbol ?getBiome\@BiomeSource3d\@\@UEBAPEBVBiome\@\@HHH\@Z + * @vftbl 7 + * @symbol ?getBiome\@BiomeSource3d\@\@UEBAPEBVBiome\@\@HHH\@Z */ virtual class Biome const * getBiome(int, int, int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp b/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp index 291951c3cd..e108ba1a6d 100644 --- a/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSourceUtil.hpp @@ -22,20 +22,20 @@ namespace BiomeSourceUtil { #undef AFTER_EXTRA /** - * @symbol ?determineDestinationHeight\@BiomeSourceUtil\@\@YAFAEBVDimension\@\@VBlockPos\@\@\@Z + * @symbol ?determineDestinationHeight\@BiomeSourceUtil\@\@YAFAEBVDimension\@\@VBlockPos\@\@\@Z */ MCAPI short determineDestinationHeight(class Dimension const &, class BlockPos); /** - * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBlockPos\@\@2I\@Z + * @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 BlockPos const &, class BlockPos const &, unsigned int); + 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 + * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBlockPos\@\@VBoundingBox\@\@I\@Z */ MCAPI class std::optional locateBiome(class std::function const &, class BiomeSource const &, class BlockPos const &, class BoundingBox, unsigned int); /** - * @symbol ?locateBiome\@BiomeSourceUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBV?$function\@$$A6A_NAEBVBiome\@\@\@Z\@3\@AEBVBiomeSource\@\@AEBVBoundingBox\@\@I\@Z + * @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 BoundingBox const &, unsigned int); + MCAPI class std::optional locateBiome(class std::function const &, class BiomeSource const &, class BlockPos const &, class BlockPos const &, unsigned int); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp b/LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp index 027c1ede21..9cf4373279 100644 --- a/LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp +++ b/LiteLoader/include/llapi/mc/BiomeSurfaceSystem.hpp @@ -22,11 +22,11 @@ namespace BiomeSurfaceSystem { #undef AFTER_EXTRA /** - * @symbol ?buildSurfaceAt\@BiomeSurfaceSystem\@\@YAXAEBUBuildParameters\@ISurfaceBuilder\@\@\@Z + * @symbol ?buildSurfaceAt\@BiomeSurfaceSystem\@\@YAXAEBUBuildParameters\@ISurfaceBuilder\@\@\@Z */ MCAPI void buildSurfaceAt(struct ISurfaceBuilder::BuildParameters const &); /** - * @symbol ?resolveBuilderImplementation\@BiomeSurfaceSystem\@\@YAXAEAVEntityRegistry\@\@AEBVSurfaceBuilderRegistry\@\@I\@Z + * @symbol ?resolveBuilderImplementation\@BiomeSurfaceSystem\@\@YAXAEAVEntityRegistry\@\@AEBVSurfaceBuilderRegistry\@\@I\@Z */ MCAPI void resolveBuilderImplementation(class EntityRegistry &, class SurfaceBuilderRegistry const &, unsigned int); diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp index a7918a8c40..10c10bc416 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlock.hpp @@ -31,213 +31,218 @@ class BlastFurnaceBlock : public FurnaceBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlastFurnaceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BlastFurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BlastFurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@BlastFurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0BlastFurnaceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0BlastFurnaceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI BlastFurnaceBlock(std::string const &, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp index c8f14fa57a..0b64ad9619 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceBlockActor.hpp @@ -31,13 +31,13 @@ class BlastFurnaceBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLASTFURNACEBLOCKACTOR /** - * @symbol ?getName\@BlastFurnaceBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BlastFurnaceBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; #endif /** - * @symbol ??0BlastFurnaceBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BlastFurnaceBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BlastFurnaceBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp index 0810ffda61..ec11a18684 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceContainerManagerModel.hpp @@ -31,13 +31,13 @@ class BlastFurnaceContainerManagerModel : public FurnaceContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlastFurnaceContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @symbol ??0BlastFurnaceContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0BlastFurnaceContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI BlastFurnaceContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlastFurnaceContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BlastFurnaceContainerScreenValidator.hpp index 9a240e3d3f..932f4034b2 100644 --- a/LiteLoader/include/llapi/mc/BlastFurnaceContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BlastFurnaceContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class BlastFurnaceContainerScreenValidator : public FurnaceContainerScreenValida public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlastFurnaceContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0BlastFurnaceContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0BlastFurnaceContainerScreenValidator\@\@QEAA\@XZ */ MCAPI BlastFurnaceContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Blaze.hpp b/LiteLoader/include/llapi/mc/Blaze.hpp index 953a672e9e..69edaefc88 100644 --- a/LiteLoader/include/llapi/mc/Blaze.hpp +++ b/LiteLoader/include/llapi/mc/Blaze.hpp @@ -32,177 +32,172 @@ class Blaze : public Monster { public: /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Blaze\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Blaze\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Blaze(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Blaze\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Blaze\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 88 - * @symbol ?getBrightness\@Blaze\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?getBrightness\@Blaze\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 105 - * @symbol ?isOnFire\@Blaze\@\@UEBA_NXZ + * @vftbl 104 + * @symbol ?isOnFire\@Blaze\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 289 - * @symbol ?travel\@Blaze\@\@UEAAXMMM\@Z + * @vftbl 286 + * @symbol ?travel\@Blaze\@\@UEAAXMMM_N\@Z */ - virtual void travel(float, float, float); + virtual void travel(float, float, float, bool); /** - * @vftbl 291 - * @symbol ?aiStep\@Blaze\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Blaze\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Blaze\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Blaze\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @symbol ??0Blaze\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Blaze\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Blaze(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?preTravel\@Blaze\@\@QEAAXXZ + * @symbol ?preTravel\@Blaze\@\@QEAAXXZ */ MCAPI void preTravel(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp b/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp index 4e9eb67283..e149142205 100644 --- a/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlazePreTravelSystem.hpp @@ -25,16 +25,16 @@ class BlazePreTravelSystem { public: /** - * @symbol ?createSystem\@BlazePreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@BlazePreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doBlazePreTravelSystem\@BlazePreTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doBlazePreTravelSystem\@BlazePreTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doBlazePreTravelSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp b/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp index 727b1d4e19..c7687e9c76 100644 --- a/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp +++ b/LiteLoader/include/llapi/mc/BlendedMultiNoiseBiomeProvider.hpp @@ -30,20 +30,20 @@ class BlendedMultiNoiseBiomeProvider { public: /** - * @symbol ??0BlendedMultiNoiseBiomeProvider\@\@QEAA\@AEBUOverworldNoises3d\@\@VParameterList\@\@AEAVChunkBlenderFactory\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ??0BlendedMultiNoiseBiomeProvider\@\@QEAA\@AEBUOverworldNoises3d\@\@VParameterList\@\@AEAVChunkBlenderFactory\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI BlendedMultiNoiseBiomeProvider(struct OverworldNoises3d const &, class ParameterList, class ChunkBlenderFactory &, class BiomeRegistry const &); /** - * @symbol ?tryGetBiome\@BlendedMultiNoiseBiomeProvider\@\@QEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@\@Z + * @symbol ?tryGetBiome\@BlendedMultiNoiseBiomeProvider\@\@QEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@AEBUCacheEntry\@ChunkLocalNoiseCache\@\@PEAUHint\@RTree\@\@\@Z */ - MCAPI class Biome const * tryGetBiome(struct GetBiomeOptions const &) const; + MCAPI class Biome const * tryGetBiome(struct GetBiomeOptions const &, struct ChunkLocalNoiseCache::CacheEntry const &, struct RTree::Hint *) const; /** - * @symbol ?tryGetBiome\@BlendedMultiNoiseBiomeProvider\@\@QEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@AEBUCacheEntry\@ChunkLocalNoiseCache\@\@PEAUHint\@RTree\@\@\@Z + * @symbol ?tryGetBiome\@BlendedMultiNoiseBiomeProvider\@\@QEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@\@Z */ - MCAPI class Biome const * tryGetBiome(struct GetBiomeOptions const &, struct ChunkLocalNoiseCache::CacheEntry const &, struct RTree::Hint *) const; + MCAPI class Biome const * tryGetBiome(struct GetBiomeOptions const &) const; /** - * @symbol ??1BlendedMultiNoiseBiomeProvider\@\@QEAA\@XZ + * @symbol ??1BlendedMultiNoiseBiomeProvider\@\@QEAA\@XZ */ MCAPI ~BlendedMultiNoiseBiomeProvider(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlendingData.hpp b/LiteLoader/include/llapi/mc/BlendingData.hpp index f2177489a9..91eaa2fe77 100644 --- a/LiteLoader/include/llapi/mc/BlendingData.hpp +++ b/LiteLoader/include/llapi/mc/BlendingData.hpp @@ -28,28 +28,28 @@ class BlendingData { public: /** - * @symbol ?createDataForStorage\@BlendingData\@\@QEBA?AUPersistentBlendData\@\@W4BlendVersion\@\@\@Z + * @symbol ?createDataForStorage\@BlendingData\@\@QEBA?AUPersistentBlendData\@\@W4BlendVersion\@\@\@Z */ MCAPI struct PersistentBlendData createDataForStorage(enum class BlendVersion) const; /** - * @symbol ?getBiome\@BlendingData\@\@QEBA?AV?$ScalarOptional\@E\@\@HHH\@Z + * @symbol ?getBiome\@BlendingData\@\@QEBA?AV?$ScalarOptional\@E\@\@HHH\@Z */ MCAPI class ScalarOptional getBiome(int, int, int) const; /** - * @symbol ?getBlockType\@BlendingData\@\@QEBA?AW4BlendingBlockType\@\@HHH\@Z + * @symbol ?getBlockType\@BlendingData\@\@QEBA?AW4BlendingBlockType\@\@HHH\@Z */ MCAPI enum class BlendingBlockType getBlockType(int, int, int) const; /** - * @symbol ?getDensity\@BlendingData\@\@QEBA?AV?$ScalarOptional\@M\@\@HHH\@Z + * @symbol ?getDensity\@BlendingData\@\@QEBA?AV?$ScalarOptional\@M\@\@HHH\@Z */ MCAPI class ScalarOptional getDensity(int, int, int) const; /** - * @symbol ?getHeight\@BlendingData\@\@QEBA?AV?$ScalarOptional\@F\@\@HH\@Z + * @symbol ?getHeight\@BlendingData\@\@QEBA?AV?$ScalarOptional\@F\@\@HH\@Z */ MCAPI class ScalarOptional getHeight(int, int) const; /** - * @symbol ?hasBlendDataAt\@BlendingData\@\@QEBA_NHH\@Z + * @symbol ?hasBlendDataAt\@BlendingData\@\@QEBA_NHH\@Z */ MCAPI bool hasBlendDataAt(int, int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlendingDataFactoryUtil.hpp b/LiteLoader/include/llapi/mc/BlendingDataFactoryUtil.hpp index 43d4935d2a..1bdb2b27ce 100644 --- a/LiteLoader/include/llapi/mc/BlendingDataFactoryUtil.hpp +++ b/LiteLoader/include/llapi/mc/BlendingDataFactoryUtil.hpp @@ -21,31 +21,35 @@ namespace BlendingDataFactoryUtil { #undef AFTER_EXTRA /** - * @symbol ?_deduceBlockTypeFromBlock\@BlendingDataFactoryUtil\@\@YA?AW4BlendingBlockType\@\@AEBVBlock\@\@0\@Z + * @symbol ?_deduceBlockTypeFromBlock\@BlendingDataFactoryUtil\@\@YA?AW4BlendingBlockType\@\@AEBVBlock\@\@0\@Z */ MCAPI enum class BlendingBlockType _deduceBlockTypeFromBlock(class Block const &, class Block const &); /** - * @symbol ?_processBlockTypeFromCellEntry\@BlendingDataFactoryUtil\@\@YA?AW4BlendingBlockType\@\@AEAV?$vector\@W4BlendingBlockType\@\@V?$allocator\@W4BlendingBlockType\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_processBlockTypeFromCellEntry\@BlendingDataFactoryUtil\@\@YA?AW4BlendingBlockType\@\@AEAV?$vector\@W4BlendingBlockType\@\@V?$allocator\@W4BlendingBlockType\@\@\@std\@\@\@std\@\@\@Z */ MCAPI enum class BlendingBlockType _processBlockTypeFromCellEntry(std::vector &); /** - * @symbol ?calculateSurfaceDensity\@BlendingDataFactoryUtil\@\@YAXAEAVBlendingData\@\@_K\@Z + * @symbol ?calculateHeight\@BlendingDataFactoryUtil\@\@YA?AVChunkLocalHeight\@\@AEAVBlendingData\@\@AEAV?$vector\@UBorderCellEntry\@BlendingDataFactoryUtil\@\@V?$allocator\@UBorderCellEntry\@BlendingDataFactoryUtil\@\@\@std\@\@\@std\@\@V2\@V?$function\@$$A6AAEAUSubChunk\@\@H\@Z\@5\@\@Z + */ + MCAPI class ChunkLocalHeight calculateHeight(class BlendingData &, std::vector &, class ChunkLocalHeight, class std::function); + /** + * @symbol ?calculateSurfaceDensity\@BlendingDataFactoryUtil\@\@YAXAEAVBlendingData\@\@_K\@Z */ MCAPI void calculateSurfaceDensity(class BlendingData &, unsigned __int64); /** - * @symbol ?iterateDownCellColumnUntil\@BlendingDataFactoryUtil\@\@YAXVChunkLocalHeight\@\@AEAV?$vector\@UBorderCellEntry\@BlendingDataFactoryUtil\@\@V?$allocator\@UBorderCellEntry\@BlendingDataFactoryUtil\@\@\@std\@\@\@std\@\@HV?$function\@$$A6AAEAUSubChunk\@\@H\@Z\@4\@V?$function\@$$A6A_NAEBUSubChunk\@\@AEAUBorderCellEntry\@BlendingDataFactoryUtil\@\@VChunkLocalHeight\@\@GH\@Z\@4\@\@Z + * @symbol ?iterateDownCellColumnUntil\@BlendingDataFactoryUtil\@\@YAXVChunkLocalHeight\@\@AEAV?$vector\@UBorderCellEntry\@BlendingDataFactoryUtil\@\@V?$allocator\@UBorderCellEntry\@BlendingDataFactoryUtil\@\@\@std\@\@\@std\@\@HV?$function\@$$A6AAEAUSubChunk\@\@H\@Z\@4\@V?$function\@$$A6A_NAEBUSubChunk\@\@AEAUBorderCellEntry\@BlendingDataFactoryUtil\@\@VChunkLocalHeight\@\@GH\@Z\@4\@\@Z */ MCAPI void iterateDownCellColumnUntil(class ChunkLocalHeight, std::vector &, int, class std::function, class std::function); /** - * @symbol ?processBorderCells\@BlendingDataFactoryUtil\@\@YAXVNeighbors\@LevelChunk\@\@V?$function\@$$A6AX_KHH0\@Z\@std\@\@\@Z + * @symbol ?processBorderCells\@BlendingDataFactoryUtil\@\@YAXVNeighbors\@LevelChunk\@\@V?$function\@$$A6AX_KHH0\@Z\@std\@\@\@Z */ MCAPI void processBorderCells(class LevelChunk::Neighbors, class std::function); /** - * @symbol ?setBiome\@BlendingDataFactoryUtil\@\@YAXAEAVBlendingData\@\@_KHE\@Z + * @symbol ?setBiome\@BlendingDataFactoryUtil\@\@YAXAEAVBlendingData\@\@_KHE\@Z */ MCAPI void setBiome(class BlendingData &, unsigned __int64, int, unsigned char); /** - * @symbol ?setDensity\@BlendingDataFactoryUtil\@\@YAXAEAVBlendingData\@\@_KHM\@Z + * @symbol ?setDensity\@BlendingDataFactoryUtil\@\@YAXAEAVBlendingData\@\@_KHM\@Z */ MCAPI void setDensity(class BlendingData &, unsigned __int64, int, float); diff --git a/LiteLoader/include/llapi/mc/Block.hpp b/LiteLoader/include/llapi/mc/Block.hpp index be41ffbe98..0b78eb6bd1 100644 --- a/LiteLoader/include/llapi/mc/Block.hpp +++ b/LiteLoader/include/llapi/mc/Block.hpp @@ -65,725 +65,725 @@ class Block { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Block(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRenderLayer\@Block\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 1 + * @symbol ?getRenderLayer\@Block\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@\@Z + * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@\@Z */ MCAPI Block(unsigned short, class gsl::not_null); /** - * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@VCompoundTag\@\@AEBI\@Z + * @symbol ??0Block\@\@QEAA\@GV?$not_null\@PEAVBlockLegacy\@\@\@gsl\@\@VCompoundTag\@\@AEBI\@Z */ MCAPI Block(unsigned short, class gsl::not_null, class CompoundTag, unsigned int const &); /** - * @symbol ?addAABBs\@Block\@\@QEBAXAEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addAABBs\@Block\@\@QEBAXAEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void addAABBs(class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @symbol ?addCollisionShapes\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?addCollisionShapes\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ MCAPI bool addCollisionShapes(class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @symbol ?addTag\@Block\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z + * @symbol ?addTag\@Block\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z */ MCAPI class Block & addTag(class HashedString const &); /** - * @symbol ?animateTick\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?allowStateMismatchOnPlacement\@Block\@\@QEBA_NAEBV1\@\@Z + */ + MCAPI bool allowStateMismatchOnPlacement(class Block const &) const; + /** + * @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 + * @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 + * @symbol ?attack\@Block\@\@QEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool attack(class Player *, class BlockPos const &) const; /** - * @symbol ?breaksFallingBlocks\@Block\@\@QEBA_NVBaseGameVersion\@\@\@Z + * @symbol ?breaksFallingBlocks\@Block\@\@QEBA_NVBaseGameVersion\@\@\@Z */ MCAPI bool breaksFallingBlocks(class BaseGameVersion) const; /** - * @symbol ?buildDescriptionId\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?buildDescriptionId\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string buildDescriptionId() const; /** - * @symbol ?buildDescriptionName\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?buildDescriptionName\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string buildDescriptionName() const; /** - * @symbol ?cacheComponentData\@Block\@\@QEAAXXZ + * @symbol ?cacheComponentData\@Block\@\@QEAAXXZ */ MCAPI void cacheComponentData(); /** - * @symbol ?calcGroundFriction\@Block\@\@QEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @symbol ?calcGroundFriction\@Block\@\@QEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z */ MCAPI float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; /** - * @symbol ?canBeBrokenFromFalling\@Block\@\@QEBA_NXZ + * @symbol ?canBeBrokenFromFalling\@Block\@\@QEBA_NXZ */ MCAPI bool canBeBrokenFromFalling() const; /** - * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?canBeBuiltOver\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z + * @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 + * @symbol ?canBeFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z */ MCAPI bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?canBeOriginalSurface\@Block\@\@QEBA_NXZ + * @symbol ?canBeOriginalSurface\@Block\@\@QEBA_NXZ */ MCAPI bool canBeOriginalSurface() const; /** - * @symbol ?canConnect\@Block\@\@QEBA_NAEBV1\@E0\@Z + * @symbol ?canConnect\@Block\@\@QEBA_NAEBV1\@E0\@Z */ MCAPI bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @symbol ?canDamperVibrations\@Block\@\@QEBA_NXZ + * @symbol ?canDamperVibrations\@Block\@\@QEBA_NXZ */ MCAPI bool canDamperVibrations() const; /** - * @symbol ?canHaveExtraData\@Block\@\@QEBA_NXZ + * @symbol ?canHaveExtraData\@Block\@\@QEBA_NXZ */ MCAPI bool canHaveExtraData() const; /** - * @symbol ?canHurtAndBreakItem\@Block\@\@QEBA_NXZ + * @symbol ?canHurtAndBreakItem\@Block\@\@QEBA_NXZ */ MCAPI bool canHurtAndBreakItem() const; /** - * @symbol ?canInstatick\@Block\@\@QEBA_NXZ + * @symbol ?canInstatick\@Block\@\@QEBA_NXZ */ MCAPI bool canInstatick() const; /** - * @symbol ?canOccludeVibrations\@Block\@\@QEBA_NXZ + * @symbol ?canOccludeVibrations\@Block\@\@QEBA_NXZ */ MCAPI bool canOccludeVibrations() const; /** - * @symbol ?canProvideFullSupport\@Block\@\@QEBA_NE\@Z + * @symbol ?canProvideFullSupport\@Block\@\@QEBA_NE\@Z */ MCAPI bool canProvideFullSupport(unsigned char) const; /** - * @symbol ?canProvideMultifaceSupport\@Block\@\@QEBA_NE\@Z + * @symbol ?canProvideMultifaceSupport\@Block\@\@QEBA_NE\@Z */ MCAPI bool canProvideMultifaceSupport(unsigned char) const; /** - * @symbol ?canProvideSupport\@Block\@\@QEBA_NEW4BlockSupportType\@\@\@Z + * @symbol ?canProvideSupport\@Block\@\@QEBA_NEW4BlockSupportType\@\@\@Z */ MCAPI bool canProvideSupport(unsigned char, enum class BlockSupportType) const; /** - * @symbol ?canSlide\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canSlide\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?canSurvive\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canSurvive\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?causesFreezeEffect\@Block\@\@QEBA_NXZ + * @symbol ?causesFreezeEffect\@Block\@\@QEBA_NXZ */ MCAPI bool causesFreezeEffect() const; /** - * @symbol ?checkIsPathable\@Block\@\@QEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @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 + * @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 + * @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 ?copyState\@Block\@\@QEBAAEBV1\@AEBV1\@AEBVItemState\@\@\@Z + * @symbol ?copyState\@Block\@\@QEBAAEBV1\@AEBV1\@AEBVItemState\@\@\@Z */ MCAPI class Block const & copyState(class Block const &, class ItemState const &) const; /** - * @symbol ?dealsContactDamage\@Block\@\@QEBA_NAEBVActor\@\@_N\@Z + * @symbol ?dealsContactDamage\@Block\@\@QEBA_NAEBVActor\@\@_N\@Z */ MCAPI bool dealsContactDamage(class Actor const &, bool) const; /** - * @symbol ?destroy\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?destroy\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI void destroy(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @symbol ?entityInside\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @symbol ?entityInside\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ MCAPI void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @symbol ?executeEvent\@Block\@\@QEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z + * @symbol ?executeEvent\@Block\@\@QEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ MCAPI void executeEvent(std::string const &, class RenderParams &) const; /** - * @symbol ?executeItemEvent\@Block\@\@QEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?executeItemEvent\@Block\@\@QEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI void executeItemEvent(class ItemStackBase &, std::string const &, class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @symbol ?executeTrigger\@Block\@\@QEBA_NAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z + * @symbol ?executeTrigger\@Block\@\@QEBA_NAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ MCAPI bool executeTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @symbol ?getAABB\@Block\@\@QEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @symbol ?getAABB\@Block\@\@QEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ MCAPI class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @symbol ?getAllowsRunes\@Block\@\@QEBA_NXZ + * @symbol ?getAllowsRunes\@Block\@\@QEBA_NXZ */ MCAPI bool getAllowsRunes() const; /** - * @symbol ?getBlockEntityType\@Block\@\@QEBA?AW4BlockActorType\@\@XZ + * @symbol ?getBlockEntityType\@Block\@\@QEBA?AW4BlockActorType\@\@XZ */ MCAPI enum class BlockActorType getBlockEntityType() const; /** - * @symbol ?getBurnOdds\@Block\@\@QEBAHXZ + * @symbol ?getBurnOdds\@Block\@\@QEBAHXZ */ MCAPI int getBurnOdds() const; /** - * @symbol ?getCollisionShape\@Block\@\@QEBA_NAEAVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @symbol ?getCollisionShape\@Block\@\@QEBA_NAEAVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ MCAPI bool getCollisionShape(class AABB &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @symbol ?getColor\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getColor\@Block\@\@QEBAHXZ */ - MCAPI int getColor(class BlockSource &, class BlockPos const &) const; + MCAPI int getColor() const; /** - * @symbol ?getColor\@Block\@\@QEBAHXZ + * @symbol ?getColor\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI int getColor() const; + MCAPI int getColor(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?getComparatorSignal\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @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\@\@QEBAXAEBVBlockPos\@\@AEAVBlockSource\@\@AEA_N222\@Z */ MCAPI void getConnectedDirections(class BlockPos const &, class BlockSource &, bool &, bool &, bool &, bool &) const; /** - * @symbol ?getCreativeCategory\@Block\@\@QEBA?AW4CreativeItemCategory\@\@XZ + * @symbol ?getCreativeCategory\@Block\@\@QEBA?AW4CreativeItemCategory\@\@XZ */ MCAPI enum class CreativeItemCategory getCreativeCategory() const; /** - * @symbol ?getDebugText\@Block\@\@QEBAXAEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getDebugText\@Block\@\@QEBAXAEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI void getDebugText(std::vector &, class BlockPos const &) const; /** - * @symbol ?getDefaultState\@Block\@\@QEBAAEBV1\@XZ + * @symbol ?getDefaultState\@Block\@\@QEBAAEBV1\@XZ */ MCAPI class Block const & getDefaultState() const; /** - * @symbol ?getDescriptionId\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescriptionId() const; /** - * @symbol ?getDestroySpeed\@Block\@\@QEBAMXZ + * @symbol ?getDestroySpeed\@Block\@\@QEBAMXZ */ MCAPI float getDestroySpeed() const; /** - * @symbol ?getDirectSignal\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?getDirectSignal\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?getEntityForModification\@Block\@\@QEBAAEAVEntityContext\@\@XZ + * @symbol ?getEntityForModification\@Block\@\@QEBAAEAVEntityContext\@\@XZ */ MCAPI class EntityContext & getEntityForModification() const; /** - * @symbol ?getExplosionResistance\@Block\@\@QEBAMXZ + * @symbol ?getExplosionResistance\@Block\@\@QEBAMXZ */ MCAPI float getExplosionResistance() const; /** - * @symbol ?getFlameOdds\@Block\@\@QEBAHXZ + * @symbol ?getFlameOdds\@Block\@\@QEBAHXZ */ MCAPI int getFlameOdds() const; /** - * @symbol ?getFriction\@Block\@\@QEBAMXZ + * @symbol ?getFriction\@Block\@\@QEBAMXZ */ MCAPI float getFriction() const; /** - * @symbol ?getIgnoresDestroyPermissions\@Block\@\@QEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getIgnoresDestroyPermissions\@Block\@\@QEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @symbol ?getLegacyBlock\@Block\@\@QEBAAEBVBlockLegacy\@\@XZ + * @symbol ?getLegacyBlock\@Block\@\@QEBAAEBVBlockLegacy\@\@XZ */ MCAPI class BlockLegacy const & getLegacyBlock() const; /** - * @symbol ?getLight\@Block\@\@QEBA?AUBrightness\@\@XZ + * @symbol ?getLight\@Block\@\@QEBA?AUBrightness\@\@XZ */ MCAPI struct Brightness getLight() const; /** - * @symbol ?getLightEmission\@Block\@\@QEBA?AUBrightness\@\@XZ + * @symbol ?getLightEmission\@Block\@\@QEBA?AUBrightness\@\@XZ */ MCAPI struct Brightness getLightEmission() const; /** - * @symbol ?getMapColor\@Block\@\@QEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getMapColor\@Block\@\@QEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI class mce::Color getMapColor(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?getMaterial\@Block\@\@QEBAAEBVMaterial\@\@XZ + * @symbol ?getMaterial\@Block\@\@QEBAAEBVMaterial\@\@XZ */ MCAPI class Material const & getMaterial() const; /** - * @symbol ?getMobToSpawn\@Block\@\@QEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getMobToSpawn\@Block\@\@QEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ MCAPI class MobSpawnerData const * getMobToSpawn(class SpawnConditions const &, class BlockSource &) const; /** - * @symbol ?getName\@Block\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getName\@Block\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getName() const; /** - * @symbol ?getPlacementBlock\@Block\@\@QEBAAEBV1\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @symbol ?getPlacementBlock\@Block\@\@QEBAAEBV1\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ MCAPI class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @symbol ?getRuntimeId\@Block\@\@QEBAAEBIXZ + * @symbol ?getRuntimeId\@Block\@\@QEBAAEBIXZ */ MCAPI unsigned int const & getRuntimeId() const; /** - * @symbol ?getSecondPart\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @symbol ?getSecondPart\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ MCAPI bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @symbol ?getSerializationId\@Block\@\@QEBAAEBVCompoundTag\@\@XZ + * @symbol ?getSerializationId\@Block\@\@QEBAAEBVCompoundTag\@\@XZ */ MCAPI class CompoundTag const & getSerializationId() const; /** - * @symbol ?getThickness\@Block\@\@QEBAMXZ + * @symbol ?getThickness\@Block\@\@QEBAMXZ */ MCAPI float getThickness() const; /** - * @symbol ?getTranslucency\@Block\@\@QEBAMXZ + * @symbol ?getTranslucency\@Block\@\@QEBAMXZ */ MCAPI float getTranslucency() const; /** - * @symbol ?getVariant\@Block\@\@QEBAHXZ + * @symbol ?getVariant\@Block\@\@QEBAHXZ */ MCAPI int getVariant() const; /** - * @symbol ?getVisualShape\@Block\@\@QEBAAEBVAABB\@\@AEAV2\@_N\@Z + * @symbol ?getVisualShape\@Block\@\@QEBAAEBVAABB\@\@AEAV2\@_N\@Z */ MCAPI class AABB const & getVisualShape(class AABB &, bool) const; /** - * @symbol ?getVisualShapeInWorld\@Block\@\@QEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @symbol ?getVisualShapeInWorld\@Block\@\@QEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z */ MCAPI class AABB const & getVisualShapeInWorld(class BlockSource &, class BlockPos const &, class AABB &, bool) const; /** - * @symbol ?hasBlockEntity\@Block\@\@QEBA_NXZ + * @symbol ?hasBlockEntity\@Block\@\@QEBA_NXZ */ MCAPI bool hasBlockEntity() const; /** - * @symbol ?hasComparatorSignal\@Block\@\@QEBA_NXZ + * @symbol ?hasComparatorSignal\@Block\@\@QEBA_NXZ */ MCAPI bool hasComparatorSignal() const; /** - * @symbol ?hasProperty\@Block\@\@QEBA_NW4BlockProperty\@\@\@Z + * @symbol ?hasProperty\@Block\@\@QEBA_NW4BlockProperty\@\@\@Z */ MCAPI bool hasProperty(enum class BlockProperty) const; /** - * @symbol ?hasState\@Block\@\@QEBA_NAEBVItemState\@\@\@Z + * @symbol ?hasState\@Block\@\@QEBA_NAEBVItemState\@\@\@Z */ MCAPI bool hasState(class ItemState const &) const; /** - * @symbol ?hasTag\@Block\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?hasTag\@Block\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool hasTag(class HashedString const &) const; /** - * @symbol ?hasTag\@Block\@\@QEBA_NAEB_K\@Z + * @symbol ?hasTag\@Block\@\@QEBA_NAEB_K\@Z */ MCAPI bool hasTag(unsigned __int64 const &) const; /** - * @symbol ?ignoreEntitiesOnPistonMove\@Block\@\@QEBA_NXZ + * @symbol ?ignoreEntitiesOnPistonMove\@Block\@\@QEBA_NXZ */ MCAPI bool ignoreEntitiesOnPistonMove() const; /** - * @symbol ?initEntity\@Block\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?initEntity\@Block\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void initEntity(class EntityRegistry &); /** - * @symbol ?initParams\@Block\@\@QEBAXAEAVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?initParams\@Block\@\@QEBAXAEAVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI void initParams(class RenderParams &, class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @symbol ?isAir\@Block\@\@QEBA_NXZ + * @symbol ?isAir\@Block\@\@QEBA_NXZ */ MCAPI bool isAir() const; /** - * @symbol ?isAttachedTo\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @symbol ?isAttachedTo\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ MCAPI bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @symbol ?isAuxValueRelevantForPicking\@Block\@\@QEBA_NXZ - */ - MCAPI bool isAuxValueRelevantForPicking() const; - /** - * @symbol ?isBounceBlock\@Block\@\@QEBA_NXZ + * @symbol ?isBounceBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isBounceBlock() const; /** - * @symbol ?isButtonBlock\@Block\@\@QEBA_NXZ + * @symbol ?isButtonBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isButtonBlock() const; /** - * @symbol ?isClimbable\@Block\@\@QEBA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isClimbable\@Block\@\@QEBA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI bool isClimbable(struct IActorMovementProxy const &) const; /** - * @symbol ?isContainerBlock\@Block\@\@QEBA_NXZ + * @symbol ?isContainerBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isContainerBlock() const; /** - * @symbol ?isCropBlock\@Block\@\@QEBA_NXZ + * @symbol ?isCropBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isCropBlock() const; /** - * @symbol ?isDoorBlock\@Block\@\@QEBA_NXZ + * @symbol ?isDoorBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isDoorBlock() const; /** - * @symbol ?isEmpty\@Block\@\@QEBA_NXZ + * @symbol ?isEmpty\@Block\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?isFenceBlock\@Block\@\@QEBA_NXZ + * @symbol ?isFenceBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isFenceBlock() const; /** - * @symbol ?isFenceGateBlock\@Block\@\@QEBA_NXZ + * @symbol ?isFenceGateBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isFenceGateBlock() const; /** - * @symbol ?isFilteredOut\@Block\@\@QEBA_NW4BlockRenderLayer\@\@\@Z + * @symbol ?isFilteredOut\@Block\@\@QEBA_NW4BlockRenderLayer\@\@\@Z */ MCAPI bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @symbol ?isHeavy\@Block\@\@QEBA_NXZ + * @symbol ?isHeavy\@Block\@\@QEBA_NXZ */ MCAPI bool isHeavy() const; /** - * @symbol ?isInteractiveBlock\@Block\@\@QEBA_NXZ + * @symbol ?isInteractiveBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isInteractiveBlock() const; /** - * @symbol ?isLavaFlammable\@Block\@\@QEBA_NXZ + * @symbol ?isLavaFlammable\@Block\@\@QEBA_NXZ */ MCAPI bool isLavaFlammable() const; /** - * @symbol ?isLeverBlock\@Block\@\@QEBA_NXZ + * @symbol ?isLeverBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isLeverBlock() const; /** - * @symbol ?isMotionBlockingBlock\@Block\@\@QEBA_NXZ + * @symbol ?isMotionBlockingBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isMotionBlockingBlock() const; /** - * @symbol ?isMultifaceBlock\@Block\@\@QEBA_NXZ + * @symbol ?isMultifaceBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isMultifaceBlock() const; /** - * @symbol ?isObstructingChests\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isObstructingChests\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isObstructingChests(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?isPartialBlock\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isPartialBlock\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isPartialBlock(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?isPreservingMediumWhenPlaced\@Block\@\@QEBA_NAEBV1\@\@Z + * @symbol ?isPreservingMediumWhenPlaced\@Block\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool isPreservingMediumWhenPlaced(class Block const &) const; /** - * @symbol ?isRailBlock\@Block\@\@QEBA_NXZ + * @symbol ?isRailBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isRailBlock() const; /** - * @symbol ?isSignalSource\@Block\@\@QEBA_NXZ + * @symbol ?isSignalSource\@Block\@\@QEBA_NXZ */ MCAPI bool isSignalSource() const; /** - * @symbol ?isSlabBlock\@Block\@\@QEBA_NXZ + * @symbol ?isSlabBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isSlabBlock() const; /** - * @symbol ?isSolid\@Block\@\@QEBA_NXZ + * @symbol ?isSolid\@Block\@\@QEBA_NXZ */ MCAPI bool isSolid() const; /** - * @symbol ?isSolidBlockingBlock\@Block\@\@QEBA_NXZ + * @symbol ?isSolidBlockingBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isSolidBlockingBlock() const; /** - * @symbol ?isSolidBlockingBlockAndNotSignalSource\@Block\@\@QEBA_NXZ + * @symbol ?isSolidBlockingBlockAndNotSignalSource\@Block\@\@QEBA_NXZ */ MCAPI bool isSolidBlockingBlockAndNotSignalSource() const; /** - * @symbol ?isStairBlock\@Block\@\@QEBA_NXZ + * @symbol ?isStairBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isStairBlock() const; /** - * @symbol ?isStemBlock\@Block\@\@QEBA_NXZ + * @symbol ?isStemBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isStemBlock() const; /** - * @symbol ?isThinFenceBlock\@Block\@\@QEBA_NXZ + * @symbol ?isThinFenceBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isThinFenceBlock() const; /** - * @symbol ?isTopPartialBlock\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isTopPartialBlock\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isTopPartialBlock(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?isUnbreakable\@Block\@\@QEBA_NXZ + * @symbol ?isUnbreakable\@Block\@\@QEBA_NXZ */ MCAPI bool isUnbreakable() const; /** - * @symbol ?isWallBlock\@Block\@\@QEBA_NXZ + * @symbol ?isWallBlock\@Block\@\@QEBA_NXZ */ MCAPI bool isWallBlock() const; /** - * @symbol ?isWaterBlocking\@Block\@\@QEBA_NXZ + * @symbol ?isWaterBlocking\@Block\@\@QEBA_NXZ */ MCAPI bool isWaterBlocking() const; /** - * @symbol ?keepState\@Block\@\@QEBAAEBV1\@AEBVItemState\@\@\@Z + * @symbol ?keepState\@Block\@\@QEBAAEBV1\@AEBVItemState\@\@\@Z */ MCAPI class Block const & keepState(class ItemState const &) const; /** - * @symbol ?mayConsumeFertilizer\@Block\@\@QEBA_NAEAVBlockSource\@\@\@Z + * @symbol ?mayConsumeFertilizer\@Block\@\@QEBA_NAEAVBlockSource\@\@\@Z */ MCAPI bool mayConsumeFertilizer(class BlockSource &) const; /** - * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z + * @symbol ?mayPick\@Block\@\@QEBA_NAEBVBlockSource\@\@_N\@Z */ MCAPI bool mayPick(class BlockSource const &, bool) const; /** - * @symbol ?mayPick\@Block\@\@QEBA_NXZ + * @symbol ?mayPick\@Block\@\@QEBA_NXZ */ MCAPI bool mayPick() const; /** - * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?mayPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @symbol ?mayPlaceOn\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?mayPlaceOn\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?movedByPiston\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?movedByPiston\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?neighborChanged\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?neighborChanged\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCAPI void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @symbol ?onExploded\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?onExploded\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @symbol ?onFallOn\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @symbol ?onFallOn\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ MCAPI void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @symbol ?onFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @symbol ?onFertilized\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z */ MCAPI bool onFertilized(class BlockSource &, class BlockPos const &, class Actor *, enum class FertilizerType) const; /** - * @symbol ?onLightningHit\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onLightningHit\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?onPlace\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z + * @symbol ?onPlace\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@\@Z */ MCAPI void onPlace(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?onPlayerPlacing\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@E\@Z + * @symbol ?onPlayerPlacing\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@E\@Z */ MCAPI void onPlayerPlacing(class BlockSource &, class BlockPos const &, class Actor &, unsigned char) const; /** - * @symbol ?onProjectileHit\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @symbol ?onProjectileHit\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ MCAPI void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @symbol ?onRemove\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onRemove\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?onStandOn\@Block\@\@QEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStandOn\@Block\@\@QEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @symbol ?onStepOff\@Block\@\@QEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStepOff\@Block\@\@QEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onStepOff(class Actor &, class BlockPos const &) const; /** - * @symbol ?onStepOn\@Block\@\@QEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStepOn\@Block\@\@QEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onStepOn(class Actor &, class BlockPos const &) const; /** - * @symbol ?onStructureBlockPlace\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStructureBlockPlace\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?onStructureNeighborBlockPlace\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStructureNeighborBlockPlace\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?playerDestroy\@Block\@\@QEBAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?playerDestroy\@Block\@\@QEBAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI void playerDestroy(class Player &, class BlockPos const &) const; /** - * @symbol ?playerWillDestroy\@Block\@\@QEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?playerWillDestroy\@Block\@\@QEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool playerWillDestroy(class Player &, class BlockPos const &) const; /** - * @symbol ?popResource\@Block\@\@QEBAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemInstance\@\@\@Z + * @symbol ?popResource\@Block\@\@QEBAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemInstance\@\@\@Z */ MCAPI class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemInstance const &) const; /** - * @symbol ?pushesOutItems\@Block\@\@QEBA_NXZ + * @symbol ?pushesOutItems\@Block\@\@QEBA_NXZ */ MCAPI bool pushesOutItems() const; /** - * @symbol ?pushesUpFallingBlocks\@Block\@\@QEBA_NXZ + * @symbol ?pushesUpFallingBlocks\@Block\@\@QEBA_NXZ */ MCAPI bool pushesUpFallingBlocks() const; /** - * @symbol ?queuedTick\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?queuedTick\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void queuedTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?randomTick\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?randomTick\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?randomlyModifyPosition\@Block\@\@QEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?randomlyModifyPosition\@Block\@\@QEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @symbol ?shouldRandomTick\@Block\@\@QEBA_NXZ + * @symbol ?shouldRandomTick\@Block\@\@QEBA_NXZ */ MCAPI bool shouldRandomTick() const; /** - * @symbol ?shouldRandomTickExtraLayer\@Block\@\@QEBA_NXZ + * @symbol ?shouldRandomTickExtraLayer\@Block\@\@QEBA_NXZ */ MCAPI bool shouldRandomTickExtraLayer() const; /** - * @symbol ?shouldStopFalling\@Block\@\@QEBA_NAEAVActor\@\@\@Z + * @symbol ?shouldStopFalling\@Block\@\@QEBA_NAEAVActor\@\@\@Z */ MCAPI bool shouldStopFalling(class Actor &) const; /** - * @symbol ?shouldTickOnSetBlock\@Block\@\@QEBA_NXZ + * @symbol ?shouldTickOnSetBlock\@Block\@\@QEBA_NXZ */ MCAPI bool shouldTickOnSetBlock() const; /** - * @symbol ?spawnResources\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@MAEBVItemStack\@\@\@Z + * @symbol ?spawnResources\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@MAEBVItemStack\@\@\@Z */ MCAPI void spawnResources(class BlockSource &, class BlockPos const &, class Randomize &, float, class ItemStack const &) const; /** - * @symbol ?telemetryVariant\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?telemetryVariant\@Block\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?toDebugString\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toDebugString\@Block\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toDebugString() const; /** - * @symbol ?transformOnFall\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z + * @symbol ?transformOnFall\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ MCAPI void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @symbol ?triggerEvent\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?triggerEvent\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @symbol ?tryGetCopperBehavior\@Block\@\@QEBAPEBVCopperBehavior\@\@XZ + * @symbol ?tryGetCopperBehavior\@Block\@\@QEBAPEBVCopperBehavior\@\@XZ */ MCAPI class CopperBehavior const * tryGetCopperBehavior() const; /** - * @symbol ?tryGetInfested\@Block\@\@QEBAPEBV1\@XZ + * @symbol ?tryGetInfested\@Block\@\@QEBAPEBV1\@XZ */ MCAPI class Block const * tryGetInfested() const; /** - * @symbol ?tryGetUninfested\@Block\@\@QEBAPEBV1\@XZ + * @symbol ?tryGetUninfested\@Block\@\@QEBAPEBV1\@XZ */ MCAPI class Block const * tryGetUninfested() const; /** - * @symbol ?trySpawnResourcesOnExplosion\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@M\@Z + * @symbol ?trySpawnResourcesOnExplosion\@Block\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBV1\@M\@Z */ MCAPI void trySpawnResourcesOnExplosion(class BlockSource &, class BlockPos const &, class Block const &, float) const; /** - * @symbol ?tryToPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEBUActorBlockSyncMessage\@\@\@Z + * @symbol ?tryToPlace\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEBUActorBlockSyncMessage\@\@\@Z */ MCAPI bool tryToPlace(class BlockSource &, class BlockPos const &, struct ActorBlockSyncMessage const *) const; /** - * @symbol ?tryToTill\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @symbol ?tryToTill\@Block\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ MCAPI bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @symbol ?updateEntityAfterFallOn\@Block\@\@QEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @symbol ?updateEntityAfterFallOn\@Block\@\@QEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ MCAPI void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @symbol ?updateTallestCollisionShape\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV4\@AEBVVec3\@\@AEAM\@Z + * @symbol ?updateTallestCollisionShape\@Block\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV4\@AEBVVec3\@\@AEAM\@Z */ MCAPI bool updateTallestCollisionShape(class BlockSource const &, class BlockPos const &, class AABB const &, class optional_ref, class AABB &, class Vec3 const &, float &) const; /** - * @symbol ?use\@Block\@\@QEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z + * @symbol ?use\@Block\@\@QEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z */ MCAPI bool use(class Player &, class BlockPos const &, unsigned char, class std::optional) const; /** - * @symbol ?waterSpreadCausesSpawn\@Block\@\@QEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@Block\@\@QEBA_NXZ */ MCAPI bool waterSpreadCausesSpawn() const; /** - * @symbol ?BLOCK_DESCRIPTION_PREFIX\@Block\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_DESCRIPTION_PREFIX\@Block\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BLOCK_DESCRIPTION_PREFIX; /** - * @symbol ?SIZE_OFFSET\@Block\@\@2MB + * @symbol ?SIZE_OFFSET\@Block\@\@2MB */ MCAPI static float const SIZE_OFFSET; //protected: /** - * @symbol ?buildSerializationId\@Block\@\@IEAAXI\@Z + * @symbol ?buildSerializationId\@Block\@\@IEAAXI\@Z */ MCAPI void buildSerializationId(unsigned int); /** - * @symbol ?setRuntimeId\@Block\@\@IEBAXAEBI\@Z + * @symbol ?setRuntimeId\@Block\@\@IEBAXAEBI\@Z */ MCAPI void setRuntimeId(unsigned int const &) const; //private: /** - * @symbol ?_getBlockOcclusionType\@Block\@\@AEBA?AW4BlockOcclusionType\@\@XZ + * @symbol ?_getBlockOcclusionType\@Block\@\@AEBA?AW4BlockOcclusionType\@\@XZ */ MCAPI enum class BlockOcclusionType _getBlockOcclusionType() const; /** - * @symbol ?_lockRegistryForRead\@Block\@\@AEBA?AVBlockTypeRegistryReadLock\@\@XZ + * @symbol ?_lockRegistryForRead\@Block\@\@AEBA?AVBlockTypeRegistryReadLock\@\@XZ */ MCAPI class BlockTypeRegistryReadLock _lockRegistryForRead() const; /** - * @symbol ?_tryInitEntityIfNotInitialized\@Block\@\@AEAAXXZ + * @symbol ?_tryInitEntityIfNotInitialized\@Block\@\@AEAAXXZ */ MCAPI void _tryInitEntityIfNotInitialized(); /** - * @symbol ?getEntity\@Block\@\@AEBAAEBVEntityContext\@\@XZ + * @symbol ?getEntity\@Block\@\@AEBAAEBVEntityContext\@\@XZ */ MCAPI class EntityContext const & getEntity() const; @@ -791,4 +791,4 @@ class Block { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockActor.hpp b/LiteLoader/include/llapi/mc/BlockActor.hpp index c1a27d9b37..81fe3ede30 100644 --- a/LiteLoader/include/llapi/mc/BlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BlockActor.hpp @@ -43,321 +43,325 @@ class BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@BlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@BlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 3 - * @symbol ?saveItemInstanceData\@BlockActor\@\@UEAA_NAEAVCompoundTag\@\@\@Z + * @vftbl 3 + * @symbol ?saveItemInstanceData\@BlockActor\@\@UEAA_NAEAVCompoundTag\@\@\@Z */ virtual bool saveItemInstanceData(class CompoundTag &); /** - * @vftbl 4 - * @symbol ?saveBlockData\@BlockActor\@\@UEBAXAEAVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 4 + * @symbol ?saveBlockData\@BlockActor\@\@UEBAXAEAVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void saveBlockData(class CompoundTag &, class BlockSource &) const; /** - * @vftbl 5 - * @symbol ?loadBlockData\@BlockActor\@\@UEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 5 + * @symbol ?loadBlockData\@BlockActor\@\@UEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void loadBlockData(class CompoundTag const &, class BlockSource &, class DataLoadHelper &); /** - * @vftbl 6 - * @symbol ?onCustomTagLoadDone\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 6 + * @symbol ?onCustomTagLoadDone\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onCustomTagLoadDone(class BlockSource &); /** - * @vftbl 7 - * @symbol ?tick\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 9 - * @symbol ?isMovable\@BlockActor\@\@UEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 9 + * @symbol ?isMovable\@BlockActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool isMovable(class BlockSource &); /** - * @vftbl 10 - * @symbol ?isCustomNameSaved\@BlockActor\@\@UEAA_NXZ + * @vftbl 10 + * @symbol ?isCustomNameSaved\@BlockActor\@\@UEAA_NXZ */ virtual bool isCustomNameSaved(); /** - * @vftbl 11 - * @symbol ?onPlace\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 11 + * @symbol ?onPlace\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onPlace(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@BlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 14 - * @symbol ?isPreserved\@BlockActor\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 14 + * @symbol ?isPreserved\@BlockActor\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool isPreserved(class BlockSource &) const; /** - * @vftbl 15 - * @symbol ?shouldPreserve\@BlockActor\@\@UEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 15 + * @symbol ?shouldPreserve\@BlockActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool shouldPreserve(class BlockSource &); /** - * @vftbl 16 - * @symbol ?triggerEvent\@BlockActor\@\@UEAAXHH\@Z + * @vftbl 16 + * @symbol ?triggerEvent\@BlockActor\@\@UEAAXHH\@Z */ virtual void triggerEvent(int, int); /** - * @vftbl 17 - * @symbol ?clearCache\@BlockActor\@\@UEAAXXZ + * @vftbl 17 + * @symbol ?clearCache\@BlockActor\@\@UEAAXXZ */ virtual void clearCache(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getShadowRadius\@BlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z + * @vftbl 19 + * @symbol ?getShadowRadius\@BlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; /** - * @vftbl 20 - * @symbol ?hasAlphaLayer\@BlockActor\@\@UEBA_NXZ + * @vftbl 20 + * @symbol ?hasAlphaLayer\@BlockActor\@\@UEBA_NXZ */ virtual bool hasAlphaLayer() const; /** - * @vftbl 21 - * @symbol ?getCrackEntity\@BlockActor\@\@UEAAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?getCrackEntity\@BlockActor\@\@UEAAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual class BlockActor * getCrackEntity(class BlockSource &, class BlockPos const &); /** - * @vftbl 22 - * @symbol ?getCollisionShape\@BlockActor\@\@UEBA?AVAABB\@\@AEBVIConstBlockSource\@\@\@Z + * @vftbl 22 + * @symbol ?getCollisionShape\@BlockActor\@\@UEBA?AVAABB\@\@AEBVIConstBlockSource\@\@\@Z */ virtual class AABB getCollisionShape(class IConstBlockSource const &) const; /** - * @vftbl 23 - * @symbol ?getDebugText\@BlockActor\@\@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\@\@AEBVBlockPos\@\@\@Z + * @vftbl 23 + * @symbol ?getDebugText\@BlockActor\@\@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\@\@AEBVBlockPos\@\@\@Z */ virtual void getDebugText(std::vector &, class BlockPos const &); /** - * @vftbl 24 - * @symbol ?getCustomName\@BlockActor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 24 + * @symbol ?getCustomName\@BlockActor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getCustomName() const; /** - * @vftbl 25 - * @symbol ?getFilteredCustomName\@BlockActor\@\@UEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUIProfanityContext\@\@\@Z + * @vftbl 25 + * @symbol ?getFilteredCustomName\@BlockActor\@\@UEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUIProfanityContext\@\@\@Z */ virtual std::string const & getFilteredCustomName(class UIProfanityContext const &); /** - * @vftbl 26 - * @symbol ?getName\@BlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 26 + * @symbol ?getName\@BlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 27 - * @symbol ?setCustomName\@BlockActor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 27 + * @symbol ?setCustomName\@BlockActor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setCustomName(std::string const &); /** - * @vftbl 28 - * @symbol ?getImmersiveReaderText\@BlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 28 + * @symbol ?getImmersiveReaderText\@BlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::string getImmersiveReaderText(class BlockSource &); /** - * @vftbl 29 - * @symbol ?getRepairCost\@BlockActor\@\@UEBAHXZ + * @vftbl 29 + * @symbol ?getRepairCost\@BlockActor\@\@UEBAHXZ */ virtual int getRepairCost() const; /** - * @vftbl 30 - * @symbol ?getOwningPiston\@BlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + * @vftbl 30 + * @symbol ?getOwningPiston\@BlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z */ virtual class PistonBlockActor * getOwningPiston(class BlockSource &); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@BlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@BlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@BlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 39 - * @symbol ?_playerCanUpdate\@BlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z + * @vftbl 39 + * @symbol ?_playerCanUpdate\@BlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKACTOR /** - * @symbol ?eraseLootTable\@BlockActor\@\@UEAAXXZ + * @symbol ?eraseLootTable\@BlockActor\@\@UEAAXXZ */ MCVAPI void eraseLootTable(); /** - * @symbol ?fixupOnLoad\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?fixupOnLoad\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void fixupOnLoad(class LevelChunk &); /** - * @symbol ?getContainer\@BlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@BlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@BlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@BlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?onChunkLoaded\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkLoaded(class LevelChunk &); /** - * @symbol ?onChunkUnloaded\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkUnloaded\@BlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkUnloaded(class LevelChunk &); /** - * @symbol ?onMove\@BlockActor\@\@UEAAXXZ + * @symbol ?onMove\@BlockActor\@\@UEAAXXZ */ MCVAPI void onMove(); /** - * @symbol ?onNeighborChanged\@BlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onNeighborChanged\@BlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void onNeighborChanged(class BlockSource &, class BlockPos const &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockActor(); #endif /** - * @symbol ??0BlockActor\@\@QEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0BlockActor\@\@QEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI BlockActor(enum class BlockActorType, class BlockPos const &, std::string const &); /** - * @symbol ?assignBlockIfNotAssigned\@BlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?assignBlockIfNotAssigned\@BlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void assignBlockIfNotAssigned(class BlockSource &); /** - * @symbol ?getAABB\@BlockActor\@\@QEBAAEBVAABB\@\@XZ + * @symbol ?getAABB\@BlockActor\@\@QEBAAEBVAABB\@\@XZ */ MCAPI class AABB const & getAABB() const; /** - * @symbol ?getBlock\@BlockActor\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getBlock\@BlockActor\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getBlock() const; /** - * @symbol ?getPosition\@BlockActor\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getPosition\@BlockActor\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getPosition() const; /** - * @symbol ?getServerUpdatePacket\@BlockActor\@\@QEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getServerUpdatePacket\@BlockActor\@\@QEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCAPI std::unique_ptr getServerUpdatePacket(class BlockSource &); /** - * @symbol ?getType\@BlockActor\@\@QEBAAEBW4BlockActorType\@\@XZ + * @symbol ?getType\@BlockActor\@\@QEBAAEBW4BlockActorType\@\@XZ */ MCAPI enum class BlockActorType const & getType() const; /** - * @symbol ?ignoreLighting\@BlockActor\@\@QEBA?B_NXZ + * @symbol ?ignoreLighting\@BlockActor\@\@QEBA?B_NXZ */ MCAPI bool const ignoreLighting() const; /** - * @symbol ?isType\@BlockActor\@\@QEBA_NW4BlockActorType\@\@\@Z + * @symbol ?isType\@BlockActor\@\@QEBA_NW4BlockActorType\@\@\@Z */ MCAPI bool isType(enum class BlockActorType) const; /** - * @symbol ?moveTo\@BlockActor\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?moveTo\@BlockActor\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void moveTo(class BlockPos const &); /** - * @symbol ?onUpdatePacket\@BlockActor\@\@QEAA_NAEBVCompoundTag\@\@AEAVBlockSource\@\@PEBVPlayer\@\@\@Z + * @symbol ?onUpdatePacket\@BlockActor\@\@QEAA_NAEBVCompoundTag\@\@AEAVBlockSource\@\@PEBVPlayer\@\@\@Z */ MCAPI bool onUpdatePacket(class CompoundTag const &, class BlockSource &, class Player const *); /** - * @symbol ?setBB\@BlockActor\@\@QEAAXVAABB\@\@\@Z + * @symbol ?setBB\@BlockActor\@\@QEAAXVAABB\@\@\@Z */ MCAPI void setBB(class AABB); /** - * @symbol ?setChanged\@BlockActor\@\@QEAAXXZ + * @symbol ?setChanged\@BlockActor\@\@QEAAXXZ */ MCAPI void setChanged(); /** - * @symbol ?setCustomNameSaved\@BlockActor\@\@QEAAX_N\@Z + * @symbol ?setCustomNameSaved\@BlockActor\@\@QEAAX_N\@Z */ MCAPI void setCustomNameSaved(bool); /** - * @symbol ?setIgnoreLighting\@BlockActor\@\@QEAAX_N\@Z + * @symbol ?setIgnoreLighting\@BlockActor\@\@QEAAX_N\@Z */ MCAPI void setIgnoreLighting(bool); /** - * @symbol ?setMovable\@BlockActor\@\@QEAAX_N\@Z + * @symbol ?setMovable\@BlockActor\@\@QEAAX_N\@Z */ MCAPI void setMovable(bool); /** - * @symbol ?isType\@BlockActor\@\@SA_NAEAV1\@W4BlockActorType\@\@\@Z + * @symbol ?isType\@BlockActor\@\@SA_NAEAV1\@W4BlockActorType\@\@\@Z */ MCAPI static bool isType(class BlockActor &, enum class BlockActorType); /** - * @symbol ?loadStatic\@BlockActor\@\@SA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?loadStatic\@BlockActor\@\@SA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI static class std::shared_ptr loadStatic(class Level &, class CompoundTag const &, class DataLoadHelper &); //protected: /** - * @symbol ?_resetAABB\@BlockActor\@\@IEAAXXZ + * @symbol ?_resetAABB\@BlockActor\@\@IEAAXXZ */ MCAPI void _resetAABB(); //private: /** - * @symbol ?_createIdClassMap\@BlockActor\@\@CA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorType\@\@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\@\@W4BlockActorType\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?_createIdClassMap\@BlockActor\@\@CA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorType\@\@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\@\@W4BlockActorType\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI static class std::map, class std::allocator>> _createIdClassMap(); @@ -365,12 +369,12 @@ class BlockActor { private: /** - * @symbol ?mClassIdMap\@BlockActor\@\@0V?$map\@W4BlockActorType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@W4BlockActorType\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4BlockActorType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@B + * @symbol ?mClassIdMap\@BlockActor\@\@0V?$map\@W4BlockActorType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@W4BlockActorType\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4BlockActorType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@B */ MCAPI static class std::map, class std::allocator>> const mClassIdMap; /** - * @symbol ?mIdClassMap\@BlockActor\@\@0V?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorType\@\@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\@\@W4BlockActorType\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?mIdClassMap\@BlockActor\@\@0V?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorType\@\@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\@\@W4BlockActorType\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::map, class std::allocator>> const mIdClassMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp index 7a93fbe6ba..72c181e166 100644 --- a/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorDataPacket.hpp @@ -31,37 +31,37 @@ class BlockActorDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockActorDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@BlockActorDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@BlockActorDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@BlockActorDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BlockActorDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@BlockActorDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@BlockActorDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@BlockActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0BlockActorDataPacket\@\@QEAA\@XZ + * @symbol ??0BlockActorDataPacket\@\@QEAA\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z */ - MCAPI BlockActorDataPacket(); + MCAPI BlockActorDataPacket(class BlockPos const &, class CompoundTag); /** - * @symbol ??0BlockActorDataPacket\@\@QEAA\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z + * @symbol ??0BlockActorDataPacket\@\@QEAA\@XZ */ - MCAPI BlockActorDataPacket(class BlockPos const &, class CompoundTag); + MCAPI BlockActorDataPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockActorFactory.hpp b/LiteLoader/include/llapi/mc/BlockActorFactory.hpp index 83881053f9..d68083d854 100644 --- a/LiteLoader/include/llapi/mc/BlockActorFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorFactory.hpp @@ -30,11 +30,11 @@ class BlockActorFactory { public: /** - * @symbol ?createBlockEntity\@BlockActorFactory\@\@SA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z + * @symbol ?createBlockEntity\@BlockActorFactory\@\@SA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z */ MCAPI static class std::shared_ptr createBlockEntity(enum class BlockActorType, class BlockPos const &, class BlockLegacy const &); /** - * @symbol ?flushCustomBlockEntityCreationCallbacks\@BlockActorFactory\@\@SAXXZ + * @symbol ?flushCustomBlockEntityCreationCallbacks\@BlockActorFactory\@\@SAXXZ */ MCAPI static void flushCustomBlockEntityCreationCallbacks(); @@ -42,8 +42,8 @@ class BlockActorFactory { private: /** - * @symbol ?mCustomBlockEntityCreation\@BlockActorFactory\@\@0V?$vector\@U?$pair\@W4BlockActorType\@\@V?$function\@$$A6A?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4BlockActorType\@\@V?$function\@$$A6A?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mCustomBlockEntityCreation\@BlockActorFactory\@\@0V?$vector\@U?$pair\@W4BlockActorType\@\@V?$function\@$$A6A?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4BlockActorType\@\@V?$function\@$$A6A?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector (class BlockPos const &)>>> mCustomBlockEntityCreation; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp b/LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp index 5ff97c5fbc..cc96906e7f 100644 --- a/LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockActorLevelListener.hpp @@ -30,118 +30,119 @@ class BlockActorLevelListener : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockActorLevelListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol ?onChunkLoaded\@BlockActorLevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ - virtual void __unk_vfn_19(); + virtual void onChunkLoaded(class ChunkSource &, class LevelChunk &); /** - * @vftbl 20 - * @symbol ?onChunkLoaded\@BlockActorLevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @vftbl 20 + * @symbol __unk_vfn_20 */ - virtual void onChunkLoaded(class ChunkSource &, class LevelChunk &); + virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol ?onChunkUnloaded\@BlockActorLevelListener\@\@UEAAXAEAVLevelChunk\@\@\@Z */ - virtual void __unk_vfn_22(); + virtual void onChunkUnloaded(class LevelChunk &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKACTORLEVELLISTENER /** - * @vftbl 23 - * @symbol ?onChunkUnloaded\@BlockActorLevelListener\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void onChunkUnloaded(class LevelChunk &); + MCVAPI ~BlockActorLevelListener(); +#endif /** - * @symbol ??0BlockActorLevelListener\@\@QEAA\@XZ + * @symbol ??0BlockActorLevelListener\@\@QEAA\@XZ */ MCAPI BlockActorLevelListener(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp b/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp index f4154a7e2b..8d8c561321 100644 --- a/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockBakedMaterialDataComponent.hpp @@ -30,11 +30,11 @@ struct BlockBakedMaterialDataComponent { public: /** - * @symbol ?isSolidOpaque\@BlockBakedMaterialDataComponent\@\@QEBA_NXZ + * @symbol ?isSolidOpaque\@BlockBakedMaterialDataComponent\@\@QEBA_NXZ */ MCAPI bool isSolidOpaque() const; /** - * @symbol ??4BlockBakedMaterialDataComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockBakedMaterialDataComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockBakedMaterialDataComponent & operator=(struct BlockBakedMaterialDataComponent &&); diff --git a/LiteLoader/include/llapi/mc/BlockBlobFeature.hpp b/LiteLoader/include/llapi/mc/BlockBlobFeature.hpp index dc67c2adf5..52cf16d9a5 100644 --- a/LiteLoader/include/llapi/mc/BlockBlobFeature.hpp +++ b/LiteLoader/include/llapi/mc/BlockBlobFeature.hpp @@ -31,18 +31,18 @@ class BlockBlobFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockBlobFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BlockBlobFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BlockBlobFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0BlockBlobFeature\@\@QEAA\@AEBVBlock\@\@H\@Z + * @symbol ??0BlockBlobFeature\@\@QEAA\@AEBVBlock\@\@H\@Z */ MCAPI BlockBlobFeature(class Block const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp index 81b2d9631b..a48e665bfb 100644 --- a/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorComponent.hpp @@ -29,28 +29,28 @@ class BlockBreakSensorComponent { public: /** - * @symbol ??0BlockBreakSensorComponent\@\@QEAA\@XZ + * @symbol ??0BlockBreakSensorComponent\@\@QEAA\@XZ */ MCAPI BlockBreakSensorComponent(); /** - * @symbol ??0BlockBreakSensorComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0BlockBreakSensorComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI BlockBreakSensorComponent(class BlockBreakSensorComponent &&); /** - * @symbol ?initialize\@BlockBreakSensorComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initialize\@BlockBreakSensorComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initialize(class Actor &); /** - * @symbol ??4BlockBreakSensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BlockBreakSensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BlockBreakSensorComponent & operator=(class BlockBreakSensorComponent &&); /** - * @symbol ?updateSensorPos\@BlockBreakSensorComponent\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?updateSensorPos\@BlockBreakSensorComponent\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void updateSensorPos(class Vec3 const &); /** - * @symbol ??1BlockBreakSensorComponent\@\@QEAA\@XZ + * @symbol ??1BlockBreakSensorComponent\@\@QEAA\@XZ */ MCAPI ~BlockBreakSensorComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp index fa4d1972b6..1176e15877 100644 --- a/LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorDefinition.hpp @@ -30,16 +30,16 @@ class BlockBreakSensorDefinition { public: /** - * @symbol ??0BlockBreakSensorDefinition\@\@QEAA\@XZ + * @symbol ??0BlockBreakSensorDefinition\@\@QEAA\@XZ */ MCAPI BlockBreakSensorDefinition(); /** - * @symbol ?initialize\@BlockBreakSensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBlockBreakSensorComponent\@\@\@Z + * @symbol ?initialize\@BlockBreakSensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBlockBreakSensorComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BlockBreakSensorComponent &) const; /** - * @symbol ?buildSchema\@BlockBreakSensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBlockBreakSensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BlockBreakSensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBlockBreakSensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp b/LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp index 159bf76eb3..5e7b22f7b5 100644 --- a/LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreakSensorSystem.hpp @@ -30,19 +30,19 @@ class BlockBreakSensorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockBreakSensorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BlockBreakSensorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BlockBreakSensorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp index 19fff8d137..5790b6a5d2 100644 --- a/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockBreathabilityDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockBreathabilityDescription. - * - */ -struct BlockBreathabilityDescription { + +class BlockBreathabilityDescription { #define AFTER_EXTRA // Add Member There @@ -23,58 +20,58 @@ struct BlockBreathabilityDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKBREATHABILITYDESCRIPTION public: - struct BlockBreathabilityDescription& operator=(struct BlockBreathabilityDescription const &) = delete; - BlockBreathabilityDescription(struct BlockBreathabilityDescription const &) = delete; + class BlockBreathabilityDescription& operator=(class BlockBreathabilityDescription const &) = delete; + BlockBreathabilityDescription(class BlockBreathabilityDescription const &) = delete; BlockBreathabilityDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockBreathabilityDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockBreathabilityDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockBreathabilityDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockBreathabilityDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockBreathabilityDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockBreathabilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockBreathabilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockBreathabilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockBreathabilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockBreathabilityDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockBreathabilityDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockBreathabilityDescription\@\@SAXXZ + * @symbol ?bindType\@BlockBreathabilityDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockBreathabilityDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockBreathabilityDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockClimberDefinition.hpp b/LiteLoader/include/llapi/mc/BlockClimberDefinition.hpp index 2b23759dc6..9b10b6899f 100644 --- a/LiteLoader/include/llapi/mc/BlockClimberDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockClimberDefinition.hpp @@ -31,8 +31,8 @@ class BlockClimberDefinition { public: /** - * @symbol ?buildSchema\@BlockClimberDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBlockClimberDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BlockClimberDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBlockClimberDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockClimberSystem.hpp b/LiteLoader/include/llapi/mc/BlockClimberSystem.hpp index 146176e37a..da7c953cba 100644 --- a/LiteLoader/include/llapi/mc/BlockClimberSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockClimberSystem.hpp @@ -30,19 +30,19 @@ class BlockClimberSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockClimberSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BlockClimberSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BlockClimberSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp index f0061ab9ba..c6543b8896 100644 --- a/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxDescription.hpp @@ -10,69 +10,66 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockCollisionBoxDescription. - * - */ -struct BlockCollisionBoxDescription { + +class BlockCollisionBoxDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCOLLISIONBOXDESCRIPTION public: - struct BlockCollisionBoxDescription& operator=(struct BlockCollisionBoxDescription const &) = delete; - BlockCollisionBoxDescription(struct BlockCollisionBoxDescription const &) = delete; + class BlockCollisionBoxDescription& operator=(class BlockCollisionBoxDescription const &) = delete; + BlockCollisionBoxDescription(class BlockCollisionBoxDescription const &) = delete; BlockCollisionBoxDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockCollisionBoxDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockCollisionBoxDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockCollisionBoxDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockCollisionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockCollisionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockCollisionBoxDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockCollisionBoxDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockCollisionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockCollisionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockCollisionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockCollisionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockCollisionBoxDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockCollisionBoxDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockCollisionBoxDescription\@\@SAXXZ + * @symbol ?bindType\@BlockCollisionBoxDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockCollisionBoxDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockCollisionBoxDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp b/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp index 70c6a162c9..97051af0b6 100644 --- a/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp +++ b/LiteLoader/include/llapi/mc/BlockCollisionBoxProcessor.hpp @@ -29,12 +29,12 @@ class BlockCollisionBoxProcessor { public: /** - * @symbol ?_tryBake\@BlockCollisionBoxProcessor\@\@SAXPEBUBlockRotationComponent\@\@PEAUBlockCollisionBoxComponent\@\@\@Z + * @symbol ?_tryBake\@BlockCollisionBoxProcessor\@\@SAXPEBUBlockRotationComponent\@\@PEAUBlockCollisionBoxComponent\@\@\@Z */ MCAPI static void _tryBake(struct BlockRotationComponent const *, struct BlockCollisionBoxComponent *); /** - * @symbol ?getProcessor\@BlockCollisionBoxProcessor\@\@SA?AV?$unique_ptr\@VEntityComponentProcessor\@Util\@\@U?$default_delete\@VEntityComponentProcessor\@Util\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getProcessor\@BlockCollisionBoxProcessor\@\@SA?AV?$unique_ptr\@VEntityComponentProcessor\@Util\@\@U?$default_delete\@VEntityComponentProcessor\@Util\@\@\@std\@\@\@std\@\@XZ */ MCAPI static std::unique_ptr getProcessor(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockColorUtil.hpp b/LiteLoader/include/llapi/mc/BlockColorUtil.hpp index 56703cb786..38c41a1fdf 100644 --- a/LiteLoader/include/llapi/mc/BlockColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/BlockColorUtil.hpp @@ -22,35 +22,35 @@ namespace BlockColorUtil { #undef AFTER_EXTRA /** - * @symbol ?RAINBOW\@BlockColorUtil\@\@3V?$array\@W4BlockColor\@\@$0BA\@\@std\@\@A + * @symbol ?RAINBOW\@BlockColorUtil\@\@3V?$array\@W4BlockColor\@\@$0BA\@\@std\@\@A */ MCAPI extern class std::array RAINBOW; /** - * @symbol ?fromInt\@BlockColorUtil\@\@YA?AW4BlockColor\@\@H\@Z + * @symbol ?fromInt\@BlockColorUtil\@\@YA?AW4BlockColor\@\@H\@Z */ MCAPI enum class BlockColor fromInt(int); /** - * @symbol ?fromItemColor\@BlockColorUtil\@\@YA?AW4BlockColor\@\@W4ItemColor\@\@\@Z + * @symbol ?fromItemColor\@BlockColorUtil\@\@YA?AW4BlockColor\@\@W4ItemColor\@\@\@Z */ MCAPI enum class BlockColor fromItemColor(enum class ItemColor); /** - * @symbol ?getColor\@BlockColorUtil\@\@YA?AVColor\@mce\@\@W4BlockColor\@\@\@Z + * @symbol ?getColor\@BlockColorUtil\@\@YA?AVColor\@mce\@\@W4BlockColor\@\@\@Z */ MCAPI class mce::Color getColor(enum class BlockColor); /** - * @symbol ?getName\@BlockColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockColor\@\@\@Z + * @symbol ?getName\@BlockColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockColor\@\@\@Z */ MCAPI std::string const & getName(enum class BlockColor); /** - * @symbol ?getNameMixedCase\@BlockColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockColor\@\@\@Z + * @symbol ?getNameMixedCase\@BlockColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockColor\@\@\@Z */ MCAPI std::string const & getNameMixedCase(enum class BlockColor); /** - * @symbol ?getNameSnakeCase\@BlockColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockColor\@\@\@Z + * @symbol ?getNameSnakeCase\@BlockColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockColor\@\@\@Z */ MCAPI std::string const & getNameSnakeCase(enum class BlockColor); /** - * @symbol ?getRGBColor\@BlockColorUtil\@\@YAHW4BlockColor\@\@\@Z + * @symbol ?getRGBColor\@BlockColorUtil\@\@YAHW4BlockColor\@\@\@Z */ MCAPI int getRGBColor(enum class BlockColor); diff --git a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp index 6b8e9b7d76..784db4286a 100644 --- a/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/BlockCommandOrigin.hpp @@ -32,114 +32,120 @@ class BlockCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@BlockCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@BlockCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@BlockCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BlockCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@BlockCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@BlockCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@BlockCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@BlockCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@BlockCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@BlockCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@BlockCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@BlockCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@BlockCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@BlockCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@BlockCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@BlockCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@BlockCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@BlockCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@BlockCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@BlockCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@BlockCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@BlockCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@BlockCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@BlockCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@BlockCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@BlockCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@BlockCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@BlockCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@BlockCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@BlockCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @vftbl 32 - * @symbol ?_getBaseCommandBlock\@BlockCommandOrigin\@\@MEBAPEAVBaseCommandBlock\@\@AEAVBlockSource\@\@\@Z + * @vftbl 32 + * @symbol ?_getBaseCommandBlock\@BlockCommandOrigin\@\@MEBAPEAVBaseCommandBlock\@\@AEAVBlockSource\@\@\@Z */ virtual class BaseCommandBlock * _getBaseCommandBlock(class BlockSource &) const; /** - * @vftbl 33 - * @symbol ?_getBlockEntity\@BlockCommandOrigin\@\@MEBAPEAVCommandBlockActor\@\@AEAVBlockSource\@\@\@Z + * @vftbl 33 + * @symbol ?_getBlockEntity\@BlockCommandOrigin\@\@MEBAPEAVCommandBlockActor\@\@AEAVBlockSource\@\@\@Z */ virtual class CommandBlockActor * _getBlockEntity(class BlockSource &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKCOMMANDORIGIN /** - * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI BlockCommandOrigin(class Level &, class AutomaticID, std::string const &, class BlockPos const &); + MCVAPI ~BlockCommandOrigin(); +#endif /** - * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI BlockCommandOrigin(class BlockSource &, class BlockPos const &); /** - * @symbol ?load\@BlockCommandOrigin\@\@SA?AV?$unique_ptr\@VBlockCommandOrigin\@\@U?$default_delete\@VBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ??0BlockCommandOrigin\@\@QEAA\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI BlockCommandOrigin(class Level &, class AutomaticID, std::string const &, class BlockPos const &); + /** + * @symbol ?load\@BlockCommandOrigin\@\@SA?AV?$unique_ptr\@VBlockCommandOrigin\@\@U?$default_delete\@VBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); //protected: /** - * @symbol ?_getName\@BlockCommandOrigin\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getName\@BlockCommandOrigin\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCAPI std::string _getName(class BlockSource &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp index 7c41b4d448..72bb734ff2 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentDescription.hpp @@ -30,59 +30,63 @@ struct BlockComponentDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockComponentDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockComponentDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockComponentDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockComponentDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockComponentDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockComponentDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockComponentDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKCOMPONENTDESCRIPTION /** - * @symbol ?buildSchema\@BlockComponentDescription\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z + * @symbol ?buildSchema\@BlockComponentDescription\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z */ MCVAPI void buildSchema(class std::shared_ptr> &, class BlockComponentFactory const &) const; /** - * @symbol ?handleVersionBasedInitialization\@BlockComponentDescription\@\@UEAAXAEBVSemVersion\@\@\@Z + * @symbol ?handleVersionBasedInitialization\@BlockComponentDescription\@\@UEAAXAEBVSemVersion\@\@\@Z */ MCVAPI void handleVersionBasedInitialization(class SemVersion const &); /** - * @symbol ?initializeComponent\@BlockComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeComponent\@BlockComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ MCVAPI void initializeComponent(class EntityContext &) const; /** - * @symbol ?initializeFromNetwork\@BlockComponentDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?initializeFromNetwork\@BlockComponentDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ MCVAPI void initializeFromNetwork(class CompoundTag const &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockComponentDescription(); #endif /** - * @symbol ?bindType\@BlockComponentDescription\@\@SAXXZ + * @symbol ?bindType\@BlockComponentDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockComponentDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockComponentDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); diff --git a/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp b/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp index ad3020245e..db2caf1eea 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentFactory.hpp @@ -36,36 +36,36 @@ struct Constructor { public: /** - * @symbol ??0BlockComponentFactory\@\@QEAA\@AEBVExperiments\@\@\@Z + * @symbol ??0BlockComponentFactory\@\@QEAA\@AEBVExperiments\@\@\@Z */ MCAPI BlockComponentFactory(class Experiments const &); /** - * @symbol ?createDescription\@BlockComponentFactory\@\@QEBA?AV?$unique_ptr\@UBlockComponentDescription\@\@U?$default_delete\@UBlockComponentDescription\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?createDescription\@BlockComponentFactory\@\@QEBA?AV?$unique_ptr\@UBlockComponentDescription\@\@U?$default_delete\@UBlockComponentDescription\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::unique_ptr createDescription(std::string const &) const; /** - * @symbol ?initializeFactory\@BlockComponentFactory\@\@QEAAXAEBVExperiments\@\@\@Z + * @symbol ?initializeFactory\@BlockComponentFactory\@\@QEAAXAEBVExperiments\@\@\@Z */ MCAPI void initializeFactory(class Experiments const &); /** - * @symbol ?addAllComponentUpgrades\@BlockComponentFactory\@\@SAXAEAVCerealDocumentUpgrader\@\@\@Z + * @symbol ?addAllComponentUpgrades\@BlockComponentFactory\@\@SAXAEAVCerealDocumentUpgrader\@\@\@Z */ MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader &); /** - * @symbol ?bindAllComponentSchemas\@BlockComponentFactory\@\@SAXAEAVSchemaFactory\@reflection\@\@AEBVSemVersion\@\@\@Z + * @symbol ?bindAllComponentSchemas\@BlockComponentFactory\@\@SAXAEAVSchemaFactory\@reflection\@\@AEBVSemVersion\@\@\@Z */ MCAPI static void bindAllComponentSchemas(class reflection::SchemaFactory &, class SemVersion const &); /** - * @symbol ?mRegisteredCerealComponents\@BlockComponentFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@BlockComponentFactory\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@BlockComponentFactory\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mRegisteredCerealComponents\@BlockComponentFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@BlockComponentFactory\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UConstructor\@BlockComponentFactory\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mRegisteredCerealComponents; /** - * @symbol ?registerAllCerealDescriptions\@BlockComponentFactory\@\@SAXXZ + * @symbol ?registerAllCerealDescriptions\@BlockComponentFactory\@\@SAXXZ */ MCAPI static void registerAllCerealDescriptions(); /** - * @symbol ?registerComponentUpgrade\@BlockComponentFactory\@\@SAXAEAVCerealDocumentUpgrader\@\@V?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z + * @symbol ?registerComponentUpgrade\@BlockComponentFactory\@\@SAXAEAVCerealDocumentUpgrader\@\@V?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z */ MCAPI static void registerComponentUpgrade(class CerealDocumentUpgrader &, class std::shared_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp b/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp index 6031c5d99d..0e55a1c5c9 100644 --- a/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockComponentGroupDescription.hpp @@ -28,31 +28,31 @@ struct BlockComponentGroupDescription { public: /** - * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@XZ + * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@AEBU0\@\@Z */ - MCAPI BlockComponentGroupDescription(); + MCAPI BlockComponentGroupDescription(struct BlockComponentGroupDescription const &); /** - * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@XZ */ - MCAPI BlockComponentGroupDescription(struct BlockComponentGroupDescription const &); + MCAPI BlockComponentGroupDescription(); /** - * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0BlockComponentGroupDescription\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BlockComponentGroupDescription(struct BlockComponentGroupDescription &&); /** - * @symbol ?foreachDescription\@BlockComponentGroupDescription\@\@QEBAXV?$function\@$$A6AXAEBUBlockComponentDescription\@\@\@Z\@std\@\@\@Z + * @symbol ?foreachDescription\@BlockComponentGroupDescription\@\@QEBAXV?$function\@$$A6AXAEBUBlockComponentDescription\@\@\@Z\@std\@\@\@Z */ MCAPI void foreachDescription(class std::function) const; /** - * @symbol ?getComponentDescription\@BlockComponentGroupDescription\@\@QEBAPEAUBlockComponentDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getComponentDescription\@BlockComponentGroupDescription\@\@QEBAPEAUBlockComponentDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct BlockComponentDescription * getComponentDescription(std::string const &) const; /** - * @symbol ??4BlockComponentGroupDescription\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockComponentGroupDescription\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockComponentGroupDescription & operator=(struct BlockComponentGroupDescription &&); /** - * @symbol ??1BlockComponentGroupDescription\@\@QEAA\@XZ + * @symbol ??1BlockComponentGroupDescription\@\@QEAA\@XZ */ MCAPI ~BlockComponentGroupDescription(); diff --git a/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp b/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp index f6011ea9a4..19848ef2c8 100644 --- a/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockCraftingTableComponent.hpp @@ -28,11 +28,11 @@ struct BlockCraftingTableComponent { public: /** - * @symbol ??4BlockCraftingTableComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockCraftingTableComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockCraftingTableComponent & operator=(struct BlockCraftingTableComponent &&); /** - * @symbol ??1BlockCraftingTableComponent\@\@QEAA\@XZ + * @symbol ??1BlockCraftingTableComponent\@\@QEAA\@XZ */ MCAPI ~BlockCraftingTableComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp index e6ee4473b0..e1dda41c5e 100644 --- a/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCraftingTableDescription.hpp @@ -10,69 +10,66 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockCraftingTableDescription. - * - */ -struct BlockCraftingTableDescription { + +class BlockCraftingTableDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCRAFTINGTABLEDESCRIPTION public: - struct BlockCraftingTableDescription& operator=(struct BlockCraftingTableDescription const &) = delete; - BlockCraftingTableDescription(struct BlockCraftingTableDescription const &) = delete; + class BlockCraftingTableDescription& operator=(class BlockCraftingTableDescription const &) = delete; + BlockCraftingTableDescription(class BlockCraftingTableDescription const &) = delete; BlockCraftingTableDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockCraftingTableDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockCraftingTableDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockCraftingTableDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockCraftingTableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockCraftingTableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockCraftingTableDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockCraftingTableDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockCraftingTableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockCraftingTableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockCraftingTableDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockCraftingTableDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockCraftingTableDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockCraftingTableDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockCraftingTableDescription\@\@SAXXZ + * @symbol ?bindType\@BlockCraftingTableDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockCraftingTableDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockCraftingTableDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp b/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp index 69a314e95f..018616bc93 100644 --- a/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockCreativeGroupDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockCreativeGroupDescription. - * - */ -struct BlockCreativeGroupDescription { + +class BlockCreativeGroupDescription { #define AFTER_EXTRA // Add Member There @@ -23,29 +20,29 @@ struct BlockCreativeGroupDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKCREATIVEGROUPDESCRIPTION public: - struct BlockCreativeGroupDescription& operator=(struct BlockCreativeGroupDescription const &) = delete; - BlockCreativeGroupDescription(struct BlockCreativeGroupDescription const &) = delete; + class BlockCreativeGroupDescription& operator=(class BlockCreativeGroupDescription const &) = delete; + BlockCreativeGroupDescription(class BlockCreativeGroupDescription const &) = delete; BlockCreativeGroupDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockCreativeGroupDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockCreativeGroupDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockCreativeGroupDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @symbol ?NameID\@BlockCreativeGroupDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockCreativeGroupDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?registerVersionUpgrades\@BlockCreativeGroupDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockCreativeGroupDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockDefinition.hpp b/LiteLoader/include/llapi/mc/BlockDefinition.hpp index 6fd6fad230..5a6ead0f7f 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinition.hpp @@ -27,31 +27,31 @@ struct BlockDefinition { public: /** - * @symbol ??0BlockDefinition\@\@QEAA\@XZ + * @symbol ??0BlockDefinition\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI BlockDefinition(); + MCAPI BlockDefinition(struct BlockDefinition &&); /** - * @symbol ??0BlockDefinition\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BlockDefinition\@\@QEAA\@XZ */ - MCAPI BlockDefinition(struct BlockDefinition const &); + MCAPI BlockDefinition(); /** - * @symbol ??0BlockDefinition\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0BlockDefinition\@\@QEAA\@AEBU0\@\@Z */ - MCAPI BlockDefinition(struct BlockDefinition &&); + MCAPI BlockDefinition(struct BlockDefinition const &); /** - * @symbol ??1BlockDefinition\@\@QEAA\@XZ + * @symbol ??1BlockDefinition\@\@QEAA\@XZ */ MCAPI ~BlockDefinition(); /** - * @symbol ?createBlockAbstractCerealSchema\@BlockDefinition\@\@SA?AUSchema\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createBlockAbstractCerealSchema\@BlockDefinition\@\@SA?AUSchema\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static struct reflection::Schema createBlockAbstractCerealSchema(std::string const &); /** - * @symbol ?registerBlockDefinitionTypes\@BlockDefinition\@\@SAXXZ + * @symbol ?registerBlockDefinitionTypes\@BlockDefinition\@\@SAXXZ */ MCAPI static void registerBlockDefinitionTypes(); /** - * @symbol ?upgradeJson\@BlockDefinition\@\@SA?AU?$pair\@_NVSemVersion\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@\@Z + * @symbol ?upgradeJson\@BlockDefinition\@\@SA?AU?$pair\@_NVSemVersion\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@\@Z */ MCAPI static struct std::pair upgradeJson(std::string &, class Core::Path const &, class std::optional); diff --git a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp index fecf23e099..47c1cbe8cc 100644 --- a/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockDefinitionGroup.hpp @@ -37,96 +37,96 @@ struct BlockResource { public: /** - * @symbol ??0BlockDefinitionGroup\@\@QEAA\@XZ + * @symbol ??0BlockDefinitionGroup\@\@QEAA\@XZ */ MCAPI BlockDefinitionGroup(); /** - * @symbol ?buildBlockSchema\@BlockDefinitionGroup\@\@QEAAXAEBVBlockComponentFactory\@\@\@Z + * @symbol ?buildBlockSchema\@BlockDefinitionGroup\@\@QEAAXAEBVBlockComponentFactory\@\@\@Z */ MCAPI void buildBlockSchema(class BlockComponentFactory const &); /** - * @symbol ?digestServerBlockProperties\@BlockDefinitionGroup\@\@QEAAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z + * @symbol ?digestServerBlockProperties\@BlockDefinitionGroup\@\@QEAAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z */ MCAPI void digestServerBlockProperties(std::vector> const &, class BlockComponentFactory const &); /** - * @symbol ?generateBlockDefinition\@BlockDefinitionGroup\@\@QEAA?AV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@AEBUBlockResource\@1\@AEBVExperiments\@\@\@Z + * @symbol ?generateBlockDefinition\@BlockDefinitionGroup\@\@QEAA?AV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@AEBUBlockResource\@1\@AEBVExperiments\@\@\@Z */ MCAPI std::unique_ptr generateBlockDefinition(struct BlockDefinitionGroup::BlockResource const &, class Experiments const &); /** - * @symbol ?generateServerBlockProperties\@BlockDefinitionGroup\@\@QEBA?AV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?generateServerBlockProperties\@BlockDefinitionGroup\@\@QEBA?AV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> generateServerBlockProperties() const; /** - * @symbol ?getBlockDefinitions\@BlockDefinitionGroup\@\@QEBA?AV?$vector\@PEBUBlockDefinition\@\@V?$allocator\@PEBUBlockDefinition\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getBlockDefinitions\@BlockDefinitionGroup\@\@QEBA?AV?$vector\@PEBUBlockDefinition\@\@V?$allocator\@PEBUBlockDefinition\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getBlockDefinitions() const; /** - * @symbol ?initBlockLegacyFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEAVBlockLegacy\@\@AEBUBlockDefinition\@\@\@Z + * @symbol ?initBlockLegacyFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEAVBlockLegacy\@\@AEBUBlockDefinition\@\@\@Z */ MCAPI void initBlockLegacyFromDefinition(class BlockLegacy &, struct BlockDefinition const &); /** - * @symbol ?initializeBlockFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEBUBlockDefinition\@\@AEAVEntityRegistry\@\@AEAVLevel\@\@\@Z + * @symbol ?initializeBlockFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEBUBlockDefinition\@\@AEAVEntityRegistry\@\@AEAVLevel\@\@\@Z */ MCAPI void initializeBlockFromDefinition(struct BlockDefinition const &, class EntityRegistry &, class Level &); /** - * @symbol ?initializeBlocks\@BlockDefinitionGroup\@\@QEAAXAEAVEntityRegistry\@\@AEAVLevel\@\@\@Z + * @symbol ?initializeBlocks\@BlockDefinitionGroup\@\@QEAAXAEAVEntityRegistry\@\@AEAVLevel\@\@\@Z */ MCAPI void initializeBlocks(class EntityRegistry &, class Level &); /** - * @symbol ?loadResources\@BlockDefinitionGroup\@\@QEAAXAEAVResourcePackManager\@\@AEBVBlockComponentFactory\@\@AEBVExperiments\@\@\@Z + * @symbol ?loadResources\@BlockDefinitionGroup\@\@QEAAXAEAVResourcePackManager\@\@AEBVBlockComponentFactory\@\@AEBVExperiments\@\@\@Z */ MCAPI void loadResources(class ResourcePackManager &, class BlockComponentFactory const &, class Experiments const &); /** - * @symbol ?registerBlockDefinition\@BlockDefinitionGroup\@\@QEAAXV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerBlockDefinition\@BlockDefinitionGroup\@\@QEAAXV?$unique_ptr\@UBlockDefinition\@\@U?$default_delete\@UBlockDefinition\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerBlockDefinition(std::unique_ptr); /** - * @symbol ?registerBlockFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEBUBlockDefinition\@\@_N\@Z + * @symbol ?registerBlockFromDefinition\@BlockDefinitionGroup\@\@QEAAXAEBUBlockDefinition\@\@_N\@Z */ MCAPI void registerBlockFromDefinition(struct BlockDefinition const &, bool); /** - * @symbol ?registerBlocks\@BlockDefinitionGroup\@\@QEAAXXZ + * @symbol ?registerBlocks\@BlockDefinitionGroup\@\@QEAAXXZ */ MCAPI void registerBlocks(); /** - * @symbol ??1BlockDefinitionGroup\@\@QEAA\@XZ + * @symbol ??1BlockDefinitionGroup\@\@QEAA\@XZ */ MCAPI ~BlockDefinitionGroup(); //private: /** - * @symbol ?_buildBlockComponentsSchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z + * @symbol ?_buildBlockComponentsSchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z */ MCAPI void _buildBlockComponentsSchema(class std::shared_ptr> &, class BlockComponentFactory const &); /** - * @symbol ?_buildBlockDescriptionSchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockDescription\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?_buildBlockDescriptionSchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockDescription\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI void _buildBlockDescriptionSchema(class std::shared_ptr> &); /** - * @symbol ?_buildBlockMenuCategorySchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockDescription\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?_buildBlockMenuCategorySchema\@BlockDefinitionGroup\@\@AEAAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockDescription\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI void _buildBlockMenuCategorySchema(class std::shared_ptr> &); /** - * @symbol ?_loadBlockDescription\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDescription\@\@\@Z + * @symbol ?_loadBlockDescription\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDescription\@\@\@Z */ MCAPI bool _loadBlockDescription(class Json::Value const &, struct BlockDescription &); /** - * @symbol ?_loadComponents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDefinition\@\@AEBVExperiments\@\@\@Z + * @symbol ?_loadComponents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDefinition\@\@AEBVExperiments\@\@\@Z */ MCAPI bool _loadComponents(class Json::Value const &, struct BlockDefinition &, class Experiments const &); /** - * @symbol ?_loadEvents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDefinition\@\@\@Z + * @symbol ?_loadEvents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockDefinition\@\@\@Z */ MCAPI bool _loadEvents(class Json::Value const &, struct BlockDefinition &); /** - * @symbol ?_parseComponents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockComponentGroupDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@3AEBVExperiments\@\@\@Z + * @symbol ?_parseComponents\@BlockDefinitionGroup\@\@AEAA_NAEBVValue\@Json\@\@AEAUBlockComponentGroupDescription\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@3AEBVExperiments\@\@\@Z */ MCAPI bool _parseComponents(class Json::Value const &, struct BlockComponentGroupDescription &, std::string const &, class SemVersion const &, class SemVersion const &, class Experiments const &); /** - * @symbol ?_stringToCreativeItemCategory\@BlockDefinitionGroup\@\@AEAA?AW4CreativeItemCategory\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_stringToCreativeItemCategory\@BlockDefinitionGroup\@\@AEAA?AW4CreativeItemCategory\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class CreativeItemCategory _stringToCreativeItemCategory(std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockDescription.hpp b/LiteLoader/include/llapi/mc/BlockDescription.hpp index c9506c07e2..22b8e5172a 100644 --- a/LiteLoader/include/llapi/mc/BlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescription.hpp @@ -27,11 +27,11 @@ struct BlockDescription { public: /** - * @symbol ??4BlockDescription\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4BlockDescription\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct BlockDescription & operator=(struct BlockDescription const &); /** - * @symbol ??1BlockDescription\@\@QEAA\@XZ + * @symbol ??1BlockDescription\@\@QEAA\@XZ */ MCAPI ~BlockDescription(); diff --git a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp index 5895f7a8f9..62f8ad77c8 100644 --- a/LiteLoader/include/llapi/mc/BlockDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescriptor.hpp @@ -28,128 +28,132 @@ class BlockDescriptor { public: /** - * @symbol ??0BlockDescriptor\@\@QEAA\@XZ + * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEBV?$vector\@VBlockState\@BlockDescriptor\@\@V?$allocator\@VBlockState\@BlockDescriptor\@\@\@std\@\@\@2\@\@Z */ - MCAPI BlockDescriptor(); + MCAPI BlockDescriptor(std::string const &, std::vector const &&); /** - * @symbol ??0BlockDescriptor\@\@QEAA\@AEBVHashedString\@\@\@Z + * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV0\@\@Z */ - MCAPI BlockDescriptor(class HashedString const &); + MCAPI BlockDescriptor(class BlockDescriptor const &); /** - * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEBV?$vector\@VBlockState\@BlockDescriptor\@\@V?$allocator\@VBlockState\@BlockDescriptor\@\@\@std\@\@\@2\@\@Z + * @symbol ??0BlockDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI BlockDescriptor(std::string const &, std::vector const &&); + MCAPI BlockDescriptor(class BlockDescriptor &&); /** - * @symbol ??0BlockDescriptor\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0BlockDescriptor\@\@QEAA\@XZ */ - MCAPI BlockDescriptor(class BlockDescriptor const &); + MCAPI BlockDescriptor(); /** - * @symbol ??0BlockDescriptor\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0BlockDescriptor\@\@QEAA\@AEBVHashedString\@\@\@Z */ - MCAPI BlockDescriptor(class BlockDescriptor &&); + MCAPI BlockDescriptor(class HashedString const &); /** - * @symbol ?getBlockOrUnknownBlock\@BlockDescriptor\@\@QEBAAEBVBlock\@\@XZ + * @symbol ?getBlockOrUnknownBlock\@BlockDescriptor\@\@QEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getBlockOrUnknownBlock() const; /** - * @symbol ?getCompareType\@BlockDescriptor\@\@QEBAAEBW4CompareType\@1\@XZ + * @symbol ?getCompareType\@BlockDescriptor\@\@QEBAAEBW4CompareType\@1\@XZ */ MCAPI enum class BlockDescriptor::CompareType const & getCompareType() const; /** - * @symbol ?getFullName\@BlockDescriptor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFullName\@BlockDescriptor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFullName() const; /** - * @symbol ?getStates\@BlockDescriptor\@\@QEBAAEBV?$vector\@VBlockState\@BlockDescriptor\@\@V?$allocator\@VBlockState\@BlockDescriptor\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getStates\@BlockDescriptor\@\@QEBAAEBV?$vector\@VBlockState\@BlockDescriptor\@\@V?$allocator\@VBlockState\@BlockDescriptor\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getStates() const; /** - * @symbol ?getTagExpression\@BlockDescriptor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getTagExpression\@BlockDescriptor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getTagExpression() const; /** - * @symbol ?isValid\@BlockDescriptor\@\@QEBA_NXZ + * @symbol ?isValid\@BlockDescriptor\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBV1\@\@Z + * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool matches(class BlockDescriptor const &) const; /** - * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?matches\@BlockDescriptor\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool matches(class Block const &) const; /** - * @symbol ??4BlockDescriptor\@\@QEAAXAEBV0\@\@Z + * @symbol ??4BlockDescriptor\@\@QEAAXAEBV0\@\@Z */ MCAPI void operator=(class BlockDescriptor const &); /** - * @symbol ??4BlockDescriptor\@\@QEAAX$$QEAV0\@\@Z + * @symbol ??4BlockDescriptor\@\@QEAAX$$QEAV0\@\@Z */ MCAPI void operator=(class BlockDescriptor &&); /** - * @symbol ??8BlockDescriptor\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8BlockDescriptor\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class BlockDescriptor const &) const; /** - * @symbol ?toCompoundTag\@BlockDescriptor\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?toCompoundTag\@BlockDescriptor\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr toCompoundTag() const; /** - * @symbol ?tryGetBlock\@BlockDescriptor\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?tryGetBlock\@BlockDescriptor\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * tryGetBlock() const; /** - * @symbol ??1BlockDescriptor\@\@QEAA\@XZ + * @symbol ?tryGetBlockNoLogging\@BlockDescriptor\@\@QEBAPEBVBlock\@\@XZ + */ + MCAPI class Block const * tryGetBlockNoLogging() const; + /** + * @symbol ??1BlockDescriptor\@\@QEAA\@XZ */ MCAPI ~BlockDescriptor(); /** - * @symbol ?JSON_NAME_FIELD\@BlockDescriptor\@\@2QBDB + * @symbol ?JSON_NAME_FIELD\@BlockDescriptor\@\@2QBDB */ MCAPI static char const JSON_NAME_FIELD[]; /** - * @symbol ?JSON_STATES_FIELD\@BlockDescriptor\@\@2QBDB + * @symbol ?JSON_STATES_FIELD\@BlockDescriptor\@\@2QBDB */ MCAPI static char const JSON_STATES_FIELD[]; /** - * @symbol ?JSON_TAGS_FIELD\@BlockDescriptor\@\@2QBDB + * @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 + * @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 + * @symbol ?anyMatch\@BlockDescriptor\@\@SA_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEBVBlock\@\@\@Z */ MCAPI static bool anyMatch(std::vector const &, class Block const &); /** - * @symbol ?bindType\@BlockDescriptor\@\@SAXXZ + * @symbol ?bindType\@BlockDescriptor\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?fromCompoundTag\@BlockDescriptor\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z + * @symbol ?fromCompoundTag\@BlockDescriptor\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z */ MCAPI static class BlockDescriptor fromCompoundTag(class CompoundTag const &); /** - * @symbol ?fromTagExpression\@BlockDescriptor\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@\@Z + * @symbol ?fromTagExpression\@BlockDescriptor\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@\@Z */ MCAPI static class BlockDescriptor fromTagExpression(std::string const &, enum class MolangVersion); //private: /** - * @symbol ?_anyTagsMatch\@BlockDescriptor\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_anyTagsMatch\@BlockDescriptor\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _anyTagsMatch(class Block const &) const; /** - * @symbol ?_resolveImpl\@BlockDescriptor\@\@AEAAXXZ + * @symbol ?_resolveImpl\@BlockDescriptor\@\@AEAAX_N\@Z */ - MCAPI void _resolveImpl(); + MCAPI void _resolveImpl(bool); /** - * @symbol ?_statesMatch\@BlockDescriptor\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_statesMatch\@BlockDescriptor\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _statesMatch(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockDescriptorSerializer.hpp b/LiteLoader/include/llapi/mc/BlockDescriptorSerializer.hpp index 737a197711..b89d6a35e0 100644 --- a/LiteLoader/include/llapi/mc/BlockDescriptorSerializer.hpp +++ b/LiteLoader/include/llapi/mc/BlockDescriptorSerializer.hpp @@ -20,19 +20,19 @@ namespace BlockDescriptorSerializer { #undef AFTER_EXTRA /** - * @symbol ?_validateAndCreateFromString\@BlockDescriptorSerializer\@\@YA?AVBlockDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_validateAndCreateFromString\@BlockDescriptorSerializer\@\@YA?AVBlockDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BlockDescriptor _validateAndCreateFromString(std::string const &); /** - * @symbol ?fromProxy\@BlockDescriptorSerializer\@\@YAXAEAVBlockDescriptor\@\@AEAUBlockDescriptorProxy\@1\@\@Z + * @symbol ?fromProxy\@BlockDescriptorSerializer\@\@YAXAEAVBlockDescriptor\@\@AEAUBlockDescriptorProxy\@1\@\@Z */ MCAPI void fromProxy(class BlockDescriptor &, struct BlockDescriptorSerializer::BlockDescriptorProxy &); /** - * @symbol ?fromString\@BlockDescriptorSerializer\@\@YAXAEAVBlockDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@BlockDescriptorSerializer\@\@YAXAEAVBlockDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void fromString(class BlockDescriptor &, std::string const &); /** - * @symbol ?toProxy\@BlockDescriptorSerializer\@\@YA?AUBlockDescriptorProxy\@1\@AEBVBlockDescriptor\@\@\@Z + * @symbol ?toProxy\@BlockDescriptorSerializer\@\@YA?AUBlockDescriptorProxy\@1\@AEBVBlockDescriptor\@\@\@Z */ MCAPI struct BlockDescriptorSerializer::BlockDescriptorProxy toProxy(class BlockDescriptor const &); diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp index 596079c758..b3ac4172e5 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByExplosionDescription.hpp @@ -10,49 +10,46 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockDestructibleByExplosionDescription. - * - */ -struct BlockDestructibleByExplosionDescription { + +class BlockDestructibleByExplosionDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESTRUCTIBLEBYEXPLOSIONDESCRIPTION public: - struct BlockDestructibleByExplosionDescription& operator=(struct BlockDestructibleByExplosionDescription const &) = delete; - BlockDestructibleByExplosionDescription(struct BlockDestructibleByExplosionDescription const &) = delete; + class BlockDestructibleByExplosionDescription& operator=(class BlockDestructibleByExplosionDescription const &) = delete; + BlockDestructibleByExplosionDescription(class BlockDestructibleByExplosionDescription const &) = delete; BlockDestructibleByExplosionDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockDestructibleByExplosionDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockDestructibleByExplosionDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockDestructibleByExplosionDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockDestructibleByExplosionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockDestructibleByExplosionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @symbol ?NameID\@BlockDestructibleByExplosionDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockDestructibleByExplosionDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockDestructibleByExplosionDescription\@\@SAXXZ + * @symbol ?bindType\@BlockDestructibleByExplosionDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockDestructibleByExplosionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockDestructibleByExplosionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp index bab3410890..be94ff0118 100644 --- a/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDestructibleByMiningDescription.hpp @@ -10,69 +10,66 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockDestructibleByMiningDescription. - * - */ -struct BlockDestructibleByMiningDescription { + +class BlockDestructibleByMiningDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDESTRUCTIBLEBYMININGDESCRIPTION public: - struct BlockDestructibleByMiningDescription& operator=(struct BlockDestructibleByMiningDescription const &) = delete; - BlockDestructibleByMiningDescription(struct BlockDestructibleByMiningDescription const &) = delete; + class BlockDestructibleByMiningDescription& operator=(class BlockDestructibleByMiningDescription const &) = delete; + BlockDestructibleByMiningDescription(class BlockDestructibleByMiningDescription const &) = delete; BlockDestructibleByMiningDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockDestructibleByMiningDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockDestructibleByMiningDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockDestructibleByMiningDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockDestructibleByMiningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockDestructibleByMiningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockDestructibleByMiningDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockDestructibleByMiningDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockDestructibleByMiningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockDestructibleByMiningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockDestructibleByMiningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockDestructibleByMiningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockDestructibleByMiningDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockDestructibleByMiningDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockDestructibleByMiningDescription\@\@SAXXZ + * @symbol ?bindType\@BlockDestructibleByMiningDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockDestructibleByMiningDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockDestructibleByMiningDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp index 722ed6f359..c5c0367872 100644 --- a/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockDisplayNameComponent.hpp @@ -28,7 +28,7 @@ struct BlockDisplayNameComponent { public: /** - * @symbol ??1BlockDisplayNameComponent\@\@QEAA\@XZ + * @symbol ??1BlockDisplayNameComponent\@\@QEAA\@XZ */ MCAPI ~BlockDisplayNameComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp index 7cd912bcb6..b113cd50fd 100644 --- a/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockDisplayNameDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockDisplayNameDescription. - * - */ -struct BlockDisplayNameDescription { + +class BlockDisplayNameDescription { #define AFTER_EXTRA // Add Member There @@ -23,58 +20,58 @@ struct BlockDisplayNameDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKDISPLAYNAMEDESCRIPTION public: - struct BlockDisplayNameDescription& operator=(struct BlockDisplayNameDescription const &) = delete; - BlockDisplayNameDescription(struct BlockDisplayNameDescription const &) = delete; + class BlockDisplayNameDescription& operator=(class BlockDisplayNameDescription const &) = delete; + BlockDisplayNameDescription(class BlockDisplayNameDescription const &) = delete; BlockDisplayNameDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockDisplayNameDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockDisplayNameDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockDisplayNameDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockDisplayNameDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockDisplayNameDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockDisplayNameDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockDisplayNameDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockDisplayNameDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockDisplayNameDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockDisplayNameDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockDisplayNameDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockDisplayNameDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockDisplayNameDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockDisplayNameDescription\@\@SAXXZ + * @symbol ?bindType\@BlockDisplayNameDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockDisplayNameDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockDisplayNameDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp index 05aa733afa..85795cce84 100644 --- a/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventCoordinator.hpp @@ -30,60 +30,60 @@ class BlockEventCoordinator { public: /** - * @symbol ?getBlockGameplayHandler\@BlockEventCoordinator\@\@QEAAAEAVBlockGameplayHandler\@\@XZ + * @symbol ?getBlockGameplayHandler\@BlockEventCoordinator\@\@QEAAAEAVBlockGameplayHandler\@\@XZ */ MCAPI class BlockGameplayHandler & getBlockGameplayHandler(); /** - * @symbol ?registerBlockGameplayHandler\@BlockEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VBlockGameplayHandler\@\@U?$default_delete\@VBlockGameplayHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerBlockGameplayHandler\@BlockEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VBlockGameplayHandler\@\@U?$default_delete\@VBlockGameplayHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerBlockGameplayHandler(std::unique_ptr &&); /** - * @symbol ?sendBlockDestroyedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?sendBlockDestroyedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI void sendBlockDestroyedByPlayer(class Player &, class Block const &, class BlockPos const &); /** - * @symbol ?sendBlockDestructionStarted\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?sendBlockDestructionStarted\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI void sendBlockDestructionStarted(class Player &, class BlockPos const &); /** - * @symbol ?sendBlockDestructionStopped\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?sendBlockDestructionStopped\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void sendBlockDestructionStopped(class Player &, class BlockPos const &, int); /** - * @symbol ?sendBlockExploded\@BlockEventCoordinator\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @symbol ?sendBlockExploded\@BlockEventCoordinator\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ MCAPI void sendBlockExploded(class BlockPos const &, class Block const &, class Actor *); /** - * @symbol ?sendBlockInPosWillBeDestroyedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?sendBlockInPosWillBeDestroyedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI void sendBlockInPosWillBeDestroyedByPlayer(class Player &, class BlockPos const &); /** - * @symbol ?sendBlockInteractedWith\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?sendBlockInteractedWith\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI void sendBlockInteractedWith(class Player &, class BlockPos const &); /** - * @symbol ?sendBlockMovedByPiston\@BlockEventCoordinator\@\@QEAAXAEBVBlockPos\@\@0W4PistonState\@\@\@Z + * @symbol ?sendBlockMovedByPiston\@BlockEventCoordinator\@\@QEAAXAEBVBlockPos\@\@0W4PistonState\@\@\@Z */ MCAPI void sendBlockMovedByPiston(class BlockPos const &, class BlockPos const &, enum class PistonState); /** - * @symbol ?sendBlockPlacedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?sendBlockPlacedByPlayer\@BlockEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void sendBlockPlacedByPlayer(class Player &, class Block const &, class BlockPos const &, bool); /** - * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z - */ - MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); - /** - * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef>); /** - * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$BlockGameplayEvent\@X\@\@\@\@\@Z + * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$BlockGameplayEvent\@X\@\@\@\@\@Z */ MCAPI void sendEvent(class EventRef> const &); /** - * @symbol ?sendUnknownBlockReceived\@BlockEventCoordinator\@\@QEAAXAEAVLevel\@\@AEBUNewBlockID\@\@G\@Z + * @symbol ?sendEvent\@BlockEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + */ + MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); + /** + * @symbol ?sendUnknownBlockReceived\@BlockEventCoordinator\@\@QEAAXAEAVLevel\@\@AEBUNewBlockID\@\@G\@Z */ MCAPI void sendUnknownBlockReceived(class Level &, struct NewBlockID const &, unsigned short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp index 98c1fde9cf..41420402e3 100644 --- a/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcher.hpp @@ -30,20 +30,20 @@ class BlockEventDispatcher { public: /** - * @symbol ?dispatchEvent\@BlockEventDispatcher\@\@QEAAXAEBVBlockPos\@\@IAEBVBlock\@\@1PEAVActor\@\@\@Z + * @symbol ?dispatchEvent\@BlockEventDispatcher\@\@QEAAXAEBVBlockPos\@\@IAEBVBlock\@\@1PEAVActor\@\@\@Z */ MCAPI void dispatchEvent(class BlockPos const &, unsigned int, class Block const &, class Block const &, class Actor *); /** - * @symbol ?registerListener\@BlockEventDispatcher\@\@QEAA?AVBlockEventDispatcherToken\@\@AEBVVec3\@\@MV?$function\@$$A6AXAEBVBlockPos\@\@IAEBVBlock\@\@PEAVActor\@\@\@Z\@std\@\@\@Z + * @symbol ?registerListener\@BlockEventDispatcher\@\@QEAA?AVBlockEventDispatcherToken\@\@AEBVVec3\@\@MV?$function\@$$A6AXAEBVBlockPos\@\@IAEBVBlock\@\@PEAVActor\@\@\@Z\@std\@\@\@Z */ MCAPI class BlockEventDispatcherToken registerListener(class Vec3 const &, float, class std::function); /** - * @symbol ?removeListener\@BlockEventDispatcher\@\@QEAAXH\@Z + * @symbol ?removeListener\@BlockEventDispatcher\@\@QEAAXH\@Z */ MCAPI void removeListener(int); /** - * @symbol ?updatePosition\@BlockEventDispatcher\@\@QEAAXHAEBVVec3\@\@\@Z + * @symbol ?updatePosition\@BlockEventDispatcher\@\@QEAAXHAEBVVec3\@\@\@Z */ MCAPI void updatePosition(int, class Vec3 const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp index bea81c3edd..f153a94e34 100644 --- a/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventDispatcherToken.hpp @@ -30,12 +30,12 @@ class BlockEventDispatcherToken { public: /** - * @symbol ??4BlockEventDispatcherToken\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BlockEventDispatcherToken\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BlockEventDispatcherToken & operator=(class BlockEventDispatcherToken &&); /** - * @symbol ??1BlockEventDispatcherToken\@\@QEAA\@XZ + * @symbol ??1BlockEventDispatcherToken\@\@QEAA\@XZ */ MCAPI ~BlockEventDispatcherToken(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockEventListener.hpp b/LiteLoader/include/llapi/mc/BlockEventListener.hpp index 461907946c..4ff69170cb 100644 --- a/LiteLoader/include/llapi/mc/BlockEventListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventListener.hpp @@ -31,49 +31,49 @@ class BlockEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKEVENTLISTENER /** - * @symbol ?onBlockDestroyedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onBlockDestroyedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class EventResult onBlockDestroyedByPlayer(class Player &, class Block const &, class BlockPos const &); /** - * @symbol ?onBlockDestructionStarted\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onBlockDestructionStarted\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class EventResult onBlockDestructionStarted(class Player &, class BlockPos const &); /** - * @symbol ?onBlockDestructionStopped\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?onBlockDestructionStopped\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@H\@Z */ 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\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ MCVAPI enum class EventResult onBlockExploded(class BlockPos const &, class Block const &, class Actor *); /** - * @symbol ?onBlockInPosWillBeDestroyedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onBlockInPosWillBeDestroyedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class EventResult onBlockInPosWillBeDestroyedByPlayer(class Player &, class BlockPos const &); /** - * @symbol ?onBlockInteractedWith\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onBlockInteractedWith\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class EventResult onBlockInteractedWith(class Player &, class BlockPos const &); /** - * @symbol ?onBlockModified\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBVBlockPos\@\@AEBVBlock\@\@1\@Z + * @symbol ?onBlockModified\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBVBlockPos\@\@AEBVBlock\@\@1\@Z */ MCVAPI enum class EventResult onBlockModified(class BlockPos const &, class Block const &, class Block const &); /** - * @symbol ?onBlockMovedByPiston\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBVBlockPos\@\@0W4PistonState\@\@\@Z + * @symbol ?onBlockMovedByPiston\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBVBlockPos\@\@0W4PistonState\@\@\@Z */ MCVAPI enum class EventResult onBlockMovedByPiston(class BlockPos const &, class BlockPos const &, enum class PistonState); /** - * @symbol ?onBlockPlacedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?onBlockPlacedByPlayer\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z */ MCVAPI enum class EventResult onBlockPlacedByPlayer(class Player &, class Block const &, class BlockPos const &, bool); /** - * @symbol ?onEvent\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBUBlockNotificationEvent\@\@\@Z + * @symbol ?onEvent\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEBUBlockNotificationEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct BlockNotificationEvent const &); /** - * @symbol ?onUnknownBlockReceived\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEBUNewBlockID\@\@G\@Z + * @symbol ?onUnknownBlockReceived\@BlockEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEBUNewBlockID\@\@G\@Z */ MCVAPI enum class EventResult onUnknownBlockReceived(class Level &, struct NewBlockID const &, unsigned short); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp index f331bb6835..90074cdad6 100644 --- a/LiteLoader/include/llapi/mc/BlockEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventPacket.hpp @@ -30,37 +30,43 @@ class BlockEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@BlockEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@BlockEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@BlockEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BlockEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@BlockEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@BlockEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@BlockEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@BlockEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKEVENTPACKET /** - * @symbol ??0BlockEventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI BlockEventPacket(); + MCVAPI ~BlockEventPacket(); +#endif /** - * @symbol ??0BlockEventPacket\@\@QEAA\@VBlockPos\@\@HH\@Z + * @symbol ??0BlockEventPacket\@\@QEAA\@VBlockPos\@\@HH\@Z */ MCAPI BlockEventPacket(class BlockPos, int, int); + /** + * @symbol ??0BlockEventPacket\@\@QEAA\@XZ + */ + MCAPI BlockEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockEventResponse.hpp b/LiteLoader/include/llapi/mc/BlockEventResponse.hpp index c63aa8363b..798f9e02b3 100644 --- a/LiteLoader/include/llapi/mc/BlockEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventResponse.hpp @@ -22,7 +22,7 @@ namespace BlockEventResponse { #undef AFTER_EXTRA /** - * @symbol ?EVENT_RESPONSE_VERSION_1_16_100\@BlockEventResponse\@\@3VSemVersion\@\@B + * @symbol ?EVENT_RESPONSE_VERSION_1_16_100\@BlockEventResponse\@\@3VSemVersion\@\@B */ MCAPI extern class SemVersion const EVENT_RESPONSE_VERSION_1_16_100; diff --git a/LiteLoader/include/llapi/mc/BlockEventResponseFactory.hpp b/LiteLoader/include/llapi/mc/BlockEventResponseFactory.hpp index 1438df6423..cd66e36f46 100644 --- a/LiteLoader/include/llapi/mc/BlockEventResponseFactory.hpp +++ b/LiteLoader/include/llapi/mc/BlockEventResponseFactory.hpp @@ -30,19 +30,25 @@ class BlockEventResponseFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockEventResponseFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeFactory\@BlockEventResponseFactory\@\@UEAAXAEBVExperiments\@\@\@Z + * @vftbl 1 + * @symbol ?initializeFactory\@BlockEventResponseFactory\@\@UEAAXAEBVExperiments\@\@\@Z */ virtual void initializeFactory(class Experiments const &); /** - * @vftbl 2 - * @symbol ?initSchema\@BlockEventResponseFactory\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?initSchema\@BlockEventResponseFactory\@\@UEAAXXZ */ virtual void initSchema(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKEVENTRESPONSEFACTORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockEventResponseFactory(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp index 67d911ebe8..1ad4e404ca 100644 --- a/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFlammableDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockFlammableDescription. - * - */ -struct BlockFlammableDescription { + +class BlockFlammableDescription { #define AFTER_EXTRA // Add Member There @@ -23,46 +20,46 @@ struct BlockFlammableDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKFLAMMABLEDESCRIPTION public: - struct BlockFlammableDescription& operator=(struct BlockFlammableDescription const &) = delete; - BlockFlammableDescription(struct BlockFlammableDescription const &) = delete; + class BlockFlammableDescription& operator=(class BlockFlammableDescription const &) = delete; + BlockFlammableDescription(class BlockFlammableDescription const &) = delete; BlockFlammableDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockFlammableDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockFlammableDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockFlammableDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockFlammableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockFlammableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @symbol ?CATCH_CHANCE_DEFAULT\@BlockFlammableDescription\@\@2HB + * @symbol ?CATCH_CHANCE_DEFAULT\@BlockFlammableDescription\@\@2HB */ MCAPI static int const CATCH_CHANCE_DEFAULT; /** - * @symbol ?DESTROY_CHANCE_DEFAULT\@BlockFlammableDescription\@\@2HB + * @symbol ?DESTROY_CHANCE_DEFAULT\@BlockFlammableDescription\@\@2HB */ MCAPI static int const DESTROY_CHANCE_DEFAULT; /** - * @symbol ?NameID\@BlockFlammableDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockFlammableDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockFlammableDescription\@\@SAXXZ + * @symbol ?bindType\@BlockFlammableDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockFlammableDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockFlammableDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp index 7733bea01b..ea607917c8 100644 --- a/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockFrictionDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockFrictionDescription. - * - */ -struct BlockFrictionDescription { + +class BlockFrictionDescription { #define AFTER_EXTRA // Add Member There @@ -23,58 +20,58 @@ struct BlockFrictionDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKFRICTIONDESCRIPTION public: - struct BlockFrictionDescription& operator=(struct BlockFrictionDescription const &) = delete; - BlockFrictionDescription(struct BlockFrictionDescription const &) = delete; + class BlockFrictionDescription& operator=(class BlockFrictionDescription const &) = delete; + BlockFrictionDescription(class BlockFrictionDescription const &) = delete; BlockFrictionDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockFrictionDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockFrictionDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockFrictionDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockFrictionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockFrictionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockFrictionDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockFrictionDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockFrictionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockFrictionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockFrictionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockFrictionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockFrictionDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockFrictionDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockFrictionDescription\@\@SAXXZ + * @symbol ?bindType\@BlockFrictionDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockFrictionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockFrictionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp b/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp index cb99b4b862..a25ee465d9 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryComponent.hpp @@ -30,11 +30,11 @@ struct BlockGeometryComponent { public: /** - * @symbol ??4BlockGeometryComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockGeometryComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockGeometryComponent & operator=(struct BlockGeometryComponent &&); /** - * @symbol ??1BlockGeometryComponent\@\@QEAA\@XZ + * @symbol ??1BlockGeometryComponent\@\@QEAA\@XZ */ MCAPI ~BlockGeometryComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp index c069f61a5d..e565294399 100644 --- a/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockGeometryDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockGeometryDescription. - * - */ -struct BlockGeometryDescription { + +class BlockGeometryDescription { #define AFTER_EXTRA // Add Member There @@ -23,63 +20,63 @@ struct BlockGeometryDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKGEOMETRYDESCRIPTION public: - struct BlockGeometryDescription& operator=(struct BlockGeometryDescription const &) = delete; - BlockGeometryDescription(struct BlockGeometryDescription const &) = delete; + class BlockGeometryDescription& operator=(class BlockGeometryDescription const &) = delete; + BlockGeometryDescription(class BlockGeometryDescription const &) = delete; BlockGeometryDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockGeometryDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockGeometryDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockGeometryDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockGeometryDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockGeometryDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockGeometryDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockGeometryDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockGeometryDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockGeometryDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockGeometryDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockGeometryDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @vftbl 7 - * @symbol ?handleVersionBasedInitialization\@BlockGeometryDescription\@\@UEAAXAEBVSemVersion\@\@\@Z + * @vftbl 7 + * @symbol ?handleVersionBasedInitialization\@BlockGeometryDescription\@\@UEAAXAEBVSemVersion\@\@\@Z */ virtual void handleVersionBasedInitialization(class SemVersion const &); /** - * @symbol ?NameID\@BlockGeometryDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockGeometryDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockGeometryDescription\@\@SAXXZ + * @symbol ?bindType\@BlockGeometryDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockGeometryDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockGeometryDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp b/LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp index d34363a91f..d4109f4cb3 100644 --- a/LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp +++ b/LiteLoader/include/llapi/mc/BlockIntersectionConstraint.hpp @@ -30,18 +30,18 @@ class BlockIntersectionConstraint { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockIntersectionConstraint(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isSatisfied\@BlockIntersectionConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z + * @vftbl 1 + * @symbol ?isSatisfied\@BlockIntersectionConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z */ virtual bool isSatisfied(class IBlockWorldGenAPI const &, class BlockPos const &, enum class Rotation const &) const; /** - * @symbol ??0BlockIntersectionConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z + * @symbol ??0BlockIntersectionConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z */ MCAPI BlockIntersectionConstraint(class StructureTemplate &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockIsNameTest.hpp b/LiteLoader/include/llapi/mc/BlockIsNameTest.hpp index ad52071940..ddae6eb5c6 100644 --- a/LiteLoader/include/llapi/mc/BlockIsNameTest.hpp +++ b/LiteLoader/include/llapi/mc/BlockIsNameTest.hpp @@ -32,19 +32,19 @@ class BlockIsNameTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockIsNameTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@BlockIsNameTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@BlockIsNameTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@BlockIsNameTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@BlockIsNameTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockItem.hpp b/LiteLoader/include/llapi/mc/BlockItem.hpp index e72d67427a..ed90c2e8eb 100644 --- a/LiteLoader/include/llapi/mc/BlockItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockItem.hpp @@ -32,118 +32,132 @@ class BlockItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@BlockItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@BlockItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@BlockItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@BlockItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@BlockItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@BlockItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 122 - * @symbol ?getLightEmission\@BlockItem\@\@UEBA?AUBrightness\@\@H\@Z + * @vftbl 122 + * @symbol ?getLightEmission\@BlockItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @vftbl 123 - * @symbol ?getIconYOffset\@BlockItem\@\@UEBAHXZ + * @vftbl 123 + * @symbol ?getIconYOffset\@BlockItem\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@BlockItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@BlockItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BlockItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BlockItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKITEM /** - * @symbol ??0BlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockItem(); +#endif + /** + * @symbol ??0BlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BlockItem(std::string const &, int); -}; \ No newline at end of file +//protected: + /** + * @symbol ?_displayHeightLimitErrorMessages\@BlockItem\@\@IEBAXAEAVActor\@\@H_N\@Z + */ + MCAPI void _displayHeightLimitErrorMessages(class Actor &, int, bool) const; + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/BlockLegacy.hpp b/LiteLoader/include/llapi/mc/BlockLegacy.hpp index 29bf6982c1..70af6f3fbf 100644 --- a/LiteLoader/include/llapi/mc/BlockLegacy.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacy.hpp @@ -39,1530 +39,1543 @@ class BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockLegacy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getStateFromLegacyData\@BlockLegacy\@\@UEBAAEBVBlock\@\@G\@Z + * @vftbl 1 + * @symbol ?getStateFromLegacyData\@BlockLegacy\@\@UEBAAEBVBlock\@\@G\@Z */ virtual class Block const & getStateFromLegacyData(unsigned short) const; /** - * @vftbl 2 - * @symbol ?newBlockEntity\@BlockLegacy\@\@UEBA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 2 + * @symbol ?newBlockEntity\@BlockLegacy\@\@UEBA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class std::shared_ptr newBlockEntity(class BlockPos const &, class Block const &) const; /** - * @vftbl 3 - * @symbol ?getNextBlockPermutation\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 3 + * @symbol ?getNextBlockPermutation\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 4 - * @symbol ?hasTag\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?hasTag\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 5 - * @symbol ?getCollisionShape\@BlockLegacy\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@BlockLegacy\@\@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\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 6 + * @symbol ?isObstructingChests\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 7 - * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z + * @vftbl 7 + * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@BlockLegacy\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 9 - * @symbol ?addAABBs\@BlockLegacy\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@BlockLegacy\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BlockLegacy\@\@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\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 12 - * @symbol ?updateTallestCollisionShape\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV5\@AEBVVec3\@\@AEAM\@Z + * @vftbl 12 + * @symbol ?updateTallestCollisionShape\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV5\@AEBVVec3\@\@AEAM\@Z */ virtual bool updateTallestCollisionShape(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const &, class optional_ref, class AABB &, class Vec3 const &, float &) const; /** - * @vftbl 13 - * @symbol ?getOutline\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z + * @vftbl 13 + * @symbol ?getOutline\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ virtual class AABB const & getOutline(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 15 - * @symbol ?onProjectileHit\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 16 - * @symbol ?onLightningHit\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?onLightningHit\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 17 - * @symbol ?liquidCanFlowIntoFromDirection\@BlockLegacy\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 17 + * @symbol ?liquidCanFlowIntoFromDirection\@BlockLegacy\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 18 - * @symbol ?isSolid\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSolid\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isSolid() const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?isStrippable\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 20 + * @symbol ?isStrippable\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isStrippable(class Block const &) const; /** - * @vftbl 21 - * @symbol ?getStrippedBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + * @vftbl 21 + * @symbol ?getStrippedBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getStrippedBlock(class Block const &) const; /** - * @vftbl 22 - * @symbol ?canProvideSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 23 - * @symbol ?canProvideFullSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E\@Z + * @vftbl 23 + * @symbol ?canProvideFullSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideFullSupport(class Block const &, unsigned char) const; /** - * @vftbl 24 - * @symbol ?canProvideMultifaceSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E\@Z + * @vftbl 24 + * @symbol ?canProvideMultifaceSupport\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideMultifaceSupport(class Block const &, unsigned char) const; /** - * @vftbl 25 - * @symbol ?canConnect\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 26 - * @symbol ?getConnectedDirections\@BlockLegacy\@\@UEBAXAEBVBlock\@\@AEBVBlockPos\@\@AEBVIConstBlockSource\@\@AEA_N333\@Z + * @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 + * @vftbl 27 + * @symbol ?isAir\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAir() const; /** - * @vftbl 28 - * @symbol ?tryGetCopperBehavior\@BlockLegacy\@\@UEBAPEBVCopperBehavior\@\@XZ + * @vftbl 28 + * @symbol ?tryGetCopperBehavior\@BlockLegacy\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 31 - * @symbol ?isClimbable\@BlockLegacy\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z + * @vftbl 31 + * @symbol ?isClimbable\@BlockLegacy\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z */ virtual bool isClimbable(struct IActorMovementProxy const &) const; /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 43 - * @symbol ?isDoubleSlabBlock\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 43 + * @symbol ?isDoubleSlabBlock\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isDoubleSlabBlock() const; /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 50 - * @symbol ?canHurtAndBreakItem\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 50 + * @symbol ?canHurtAndBreakItem\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canHurtAndBreakItem() const; /** - * @vftbl 51 - * @symbol ?isSignalSource\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 53 - * @symbol ?canBeAscendedByJumping\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 53 + * @symbol ?canBeAscendedByJumping\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@BlockLegacy\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@BlockLegacy\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 56 - * @symbol ?canFillAtPos\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 56 + * @symbol ?canFillAtPos\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 57 - * @symbol ?sanitizeFillBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 57 + * @symbol ?sanitizeFillBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 - * @symbol ?onFillBlock\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?onFillBlock\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 59 - * @symbol ?getDirectSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 59 + * @symbol ?getDirectSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BlockLegacy\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 - * @symbol ?getRequiredMedium\@BlockLegacy\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ + * @vftbl 63 + * @symbol ?getRequiredMedium\@BlockLegacy\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ */ virtual class std::optional getRequiredMedium() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 65 - * @symbol ?handlePrecipitation\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z + * @vftbl 65 + * @symbol ?handlePrecipitation\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ virtual void handlePrecipitation(class BlockSource &, class BlockPos const &, float, float) const; /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@BlockLegacy\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@BlockLegacy\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 67 - * @symbol ?getThickness\@BlockLegacy\@\@UEBAMXZ + * @vftbl 67 + * @symbol ?getThickness\@BlockLegacy\@\@UEBAMXZ */ virtual float getThickness() const; /** - * @vftbl 68 - * @symbol ?getFlexibility\@BlockLegacy\@\@UEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 68 + * @symbol ?getFlexibility\@BlockLegacy\@\@UEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual float getFlexibility(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 70 - * @symbol ?shouldDispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z + * @vftbl 70 + * @symbol ?shouldDispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z */ virtual bool shouldDispense(class BlockSource &, class Container &) const; /** - * @vftbl 71 - * @symbol ?dispense\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @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 - * @symbol ?transformOnFall\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z + * @vftbl 72 + * @symbol ?transformOnFall\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z */ virtual void transformOnFall(class BlockSource &, class BlockPos const &, class Actor *, float) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @symbol ?onRedstoneUpdate\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ virtual void onRedstoneUpdate(class BlockSource &, class BlockPos const &, int, bool) const; /** - * @vftbl 74 - * @symbol ?onMove\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 74 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?movedByPiston\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 76 + * @symbol ?movedByPiston\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 77 - * @symbol ?onStructureBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 77 + * @symbol ?onStructureBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 - * @symbol ?onStructureNeighborBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 78 + * @symbol ?onStructureNeighborBlockPlace\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 80 - * @symbol ?getRedstoneProperty\@BlockLegacy\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 80 + * @symbol ?getRedstoneProperty\@BlockLegacy\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockProperty getRedstoneProperty(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 81 - * @symbol ?updateEntityAfterFallOn\@BlockLegacy\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @vftbl 81 + * @symbol ?updateEntityAfterFallOn\@BlockLegacy\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 83 - * @symbol ?isFilteredOut\@BlockLegacy\@\@UEBA_NW4BlockRenderLayer\@\@\@Z + * @vftbl 83 + * @symbol ?isFilteredOut\@BlockLegacy\@\@UEBA_NW4BlockRenderLayer\@\@\@Z */ virtual bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @vftbl 84 - * @symbol ?isPreservingMediumWhenPlaced\@BlockLegacy\@\@UEBA_NPEBV1\@\@Z + * @vftbl 84 + * @symbol ?isPreservingMediumWhenPlaced\@BlockLegacy\@\@UEBA_NPEBV1\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 85 - * @symbol ?ignoreEntitiesOnPistonMove\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 85 + * @symbol ?ignoreEntitiesOnPistonMove\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool ignoreEntitiesOnPistonMove(class Block const &) const; /** - * @vftbl 86 - * @symbol ?onFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 89 - * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 89 + * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 90 - * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z + * @vftbl 90 + * @symbol ?mayPick\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 - * @symbol ?tryToPlace\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z + * @vftbl 94 + * @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 - * @symbol ?tryToTill\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @vftbl 95 + * @symbol ?tryToTill\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 97 - * @symbol ?destroy\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @vftbl 97 + * @symbol ?destroy\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 98 - * @symbol ?getIgnoresDestroyPermissions\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 98 + * @symbol ?getIgnoresDestroyPermissions\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @symbol ?getSecondPart\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@BlockLegacy\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@BlockLegacy\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@BlockLegacy\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@BlockLegacy\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 104 - * @symbol ?trySpawnResourcesOnExplosion\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@M\@Z + * @vftbl 104 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 107 - * @symbol ?calcVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z + * @vftbl 107 + * @symbol ?calcVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z */ virtual int calcVariant(class BlockSource &, class BlockPos const &, class mce::Color const &) const; /** - * @vftbl 108 - * @symbol ?isAttachedTo\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 108 + * @symbol ?isAttachedTo\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 109 - * @symbol ?attack\@BlockLegacy\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@BlockLegacy\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 110 - * @symbol ?handleEntityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z + * @vftbl 110 + * @symbol ?handleEntityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z */ virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; /** - * @vftbl 111 - * @symbol ?shouldTriggerOnStandOn\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 111 + * @symbol ?shouldTriggerOnStandOn\@BlockLegacy\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTriggerOnStandOn(class Actor &, class BlockPos const &) const; /** - * @vftbl 112 - * @symbol ?shouldTriggerEntityInside\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?shouldTriggerEntityInside\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 113 - * @symbol ?entityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 114 - * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z + * @vftbl 114 + * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 115 - * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 115 + * @symbol ?canBeBuiltOver\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 116 - * @symbol ?triggerEvent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @vftbl 116 + * @symbol ?triggerEvent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @vftbl 117 - * @symbol ?executeEvent\@BlockLegacy\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z + * @vftbl 117 + * @symbol ?executeEvent\@BlockLegacy\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(std::string const &, class RenderParams &) const; /** - * @vftbl 118 - * @symbol ?executeEvent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @vftbl 118 + * @symbol ?executeEvent\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ virtual void executeEvent(class BlockSource &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; /** - * @vftbl 119 - * @symbol ?executeTrigger\@BlockLegacy\@\@UEBA_NAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z + * @vftbl 119 + * @symbol ?executeTrigger\@BlockLegacy\@\@UEBA_NAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ virtual bool executeTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @vftbl 120 - * @symbol ?forceExecuteTrigger\@BlockLegacy\@\@UEBAXAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z + * @vftbl 120 + * @symbol ?forceExecuteTrigger\@BlockLegacy\@\@UEBAXAEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z */ virtual void forceExecuteTrigger(class DefinitionTrigger const &, class RenderParams &) const; /** - * @vftbl 121 - * @symbol ?getMobToSpawn\@BlockLegacy\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z + * @vftbl 121 + * @symbol ?getMobToSpawn\@BlockLegacy\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ virtual class MobSpawnerData const * getMobToSpawn(class SpawnConditions const &, class BlockSource &) const; /** - * @vftbl 122 - * @symbol ?shouldStopFalling\@BlockLegacy\@\@UEBA_NAEAVActor\@\@\@Z + * @vftbl 122 + * @symbol ?shouldStopFalling\@BlockLegacy\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool shouldStopFalling(class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 124 - * @symbol ?calcGroundFriction\@BlockLegacy\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @vftbl 124 + * @symbol ?calcGroundFriction\@BlockLegacy\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z */ virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @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 - * @symbol ?canSlide\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 128 + * @symbol ?canSlide\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 129 - * @symbol ?canSpawnAt\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 129 + * @symbol ?canSpawnAt\@BlockLegacy\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 130 - * @symbol ?notifySpawnedAt\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 130 + * @symbol ?notifySpawnedAt\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 132 - * @symbol ?getIconYOffset\@BlockLegacy\@\@UEBAHXZ + * @vftbl 132 + * @symbol ?getIconYOffset\@BlockLegacy\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@BlockLegacy\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@BlockLegacy\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@BlockLegacy\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@BlockLegacy\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 - * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColorAtPos\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 137 + * @symbol ?getColorAtPos\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 138 - * @symbol ?getColorForParticle\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 138 + * @symbol ?getColorForParticle\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 139 - * @symbol ?isSeasonTinted\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 139 + * @symbol ?isSeasonTinted\@BlockLegacy\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@BlockLegacy\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@BlockLegacy\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 141 - * @symbol ?getShadeBrightness\@BlockLegacy\@\@UEBAMAEBVBlock\@\@\@Z + * @vftbl 141 + * @symbol ?getShadeBrightness\@BlockLegacy\@\@UEBAMAEBVBlock\@\@\@Z */ virtual float getShadeBrightness(class Block const &) const; /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 143 - * @symbol ?getVisualShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 144 - * @symbol ?getUIShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + * @vftbl 144 + * @symbol ?getUIShape\@BlockLegacy\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 145 - * @symbol ?telemetryVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 145 + * @symbol ?telemetryVariant\@BlockLegacy\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int telemetryVariant(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BlockLegacy\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@BlockLegacy\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@BlockLegacy\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 148 - * @symbol ?getRenderBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 148 + * @symbol ?getRenderBlock\@BlockLegacy\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@BlockLegacy\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@BlockLegacy\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 - * @symbol ?getFaceFlip\@BlockLegacy\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + * @vftbl 150 + * @symbol ?getFaceFlip\@BlockLegacy\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BlockLegacy\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 - * @symbol ?init\@BlockLegacy\@\@UEAAAEAV1\@XZ + * @vftbl 152 + * @symbol ?init\@BlockLegacy\@\@UEAAAEAV1\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 153 - * @symbol ?getLightEmission\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 154 - * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVItemState\@\@\@Z + * @vftbl 154 + * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVItemState\@\@\@Z */ virtual class BlockLegacy & addState(class ItemState const &); /** - * @vftbl 155 - * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVItemState\@\@_K\@Z + * @vftbl 155 + * @symbol ?addState\@BlockLegacy\@\@UEAAAEAV1\@AEBVItemState\@\@_K\@Z */ virtual class BlockLegacy & addState(class ItemState const &, unsigned __int64); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 157 - * @symbol ?tryLegacyUpgrade\@BlockLegacy\@\@UEBAPEBVBlock\@\@G\@Z + * @vftbl 157 + * @symbol ?tryLegacyUpgrade\@BlockLegacy\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 158 - * @symbol ?dealsContactDamage\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z + * @vftbl 158 + * @symbol ?dealsContactDamage\@BlockLegacy\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 159 - * @symbol ?tryGetInfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 159 + * @symbol ?tryGetInfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 160 - * @symbol ?tryGetUninfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 160 + * @symbol ?tryGetUninfested\@BlockLegacy\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@BlockLegacy\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@BlockLegacy\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 162 - * @symbol ?onRemove\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 163 - * @symbol ?onExploded\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 163 + * @symbol ?onExploded\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 164 - * @symbol ?onStandOn\@BlockLegacy\@\@MEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@BlockLegacy\@\@MEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 169 - * @symbol ?onFallOn\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 173 - * @symbol ?shouldRandomTick\@BlockLegacy\@\@MEBA_NXZ + * @vftbl 173 + * @symbol ?shouldRandomTick\@BlockLegacy\@\@MEBA_NXZ */ virtual bool shouldRandomTick() const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@BlockLegacy\@\@MEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 176 - * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z + * @vftbl 176 + * @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 177 - * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BlockLegacy\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@BlockLegacy\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BlockLegacy\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 - * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 180 + * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@BlockLegacy\@\@MEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 181 - * @symbol ?getExtraRenderLayers\@BlockLegacy\@\@MEBAHXZ + * @vftbl 182 + * @symbol ?getExtraRenderLayers\@BlockLegacy\@\@MEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 182 - * @symbol ?getExplosionResistance\@BlockLegacy\@\@MEBAMXZ + * @vftbl 183 + * @symbol ?getExplosionResistance\@BlockLegacy\@\@MEBAMXZ */ virtual float getExplosionResistance() const; /** - * @vftbl 183 - * @symbol ?getEmissiveBrightness\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 184 + * @symbol ?getEmissiveBrightness\@BlockLegacy\@\@MEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@BlockLegacy\@\@MEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@BlockLegacy\@\@MEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@BlockLegacy\@\@MEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@BlockLegacy\@\@MEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@BlockLegacy\@\@MEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@BlockLegacy\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 190 - * @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 + * @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 191 - * @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 + * @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 192 - * @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 + * @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; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKLEGACY /** - * @symbol ?canBeDestroyedByWaterSpread\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?allowStateMismatchOnPlacement\@BlockLegacy\@\@MEBA_NAEBVBlock\@\@0\@Z + */ + MCVAPI bool allowStateMismatchOnPlacement(class Block const &, class Block const &) const; + /** + * @symbol ?canBeDestroyedByWaterSpread\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool canBeDestroyedByWaterSpread() const; /** - * @symbol ?canBeSilkTouched\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?canDamperVibrations\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?canDamperVibrations\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool canDamperVibrations() const; /** - * @symbol ?canHaveExtraData\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?canHaveExtraData\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool canHaveExtraData() const; /** - * @symbol ?canOccludeVibrations\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?canOccludeVibrations\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool canOccludeVibrations() const; /** - * @symbol ?causesFreezeEffect\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?causesFreezeEffect\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool causesFreezeEffect() const; /** - * @symbol ?detachesOnPistonMove\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?detachesOnPistonMove\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI bool detachesOnPistonMove(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?hasComparatorSignal\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?hasVariableLighting\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?hasVariableLighting\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool hasVariableLighting() const; /** - * @symbol ?isBounceBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isBounceBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isBounceBlock() const; /** - * @symbol ?isButtonBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isButtonBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isButtonBlock() const; /** - * @symbol ?isCandleCakeBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isCandleCakeBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isCandleCakeBlock() const; /** - * @symbol ?isContainerBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isCraftingBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isCropBlock\@BlockLegacy\@\@MEBA_NXZ + * @symbol ?isCropBlock\@BlockLegacy\@\@MEBA_NXZ */ MCVAPI bool isCropBlock() const; /** - * @symbol ?isDoorBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isDoorBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isDoorBlock() const; /** - * @symbol ?isFenceBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isFenceBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isFenceBlock() const; /** - * @symbol ?isFenceGateBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isFenceGateBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isFenceGateBlock() const; /** - * @symbol ?isHurtableBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isHurtableBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isHurtableBlock() const; /** - * @symbol ?isInteractiveBlock\@BlockLegacy\@\@MEBA_NXZ + * @symbol ?isInteractiveBlock\@BlockLegacy\@\@MEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; /** - * @symbol ?isLeverBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isLeverBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isLeverBlock() const; /** - * @symbol ?isMultifaceBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isMultifaceBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isMultifaceBlock() const; /** - * @symbol ?isRailBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isRailBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isRailBlock() const; /** - * @symbol ?isSilentWhenJumpingOff\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isSilentWhenJumpingOff\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isSilentWhenJumpingOff() const; /** - * @symbol ?isSlabBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isSlabBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isSlabBlock() const; /** - * @symbol ?isStairBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isStairBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isStairBlock() const; /** - * @symbol ?isStemBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isStemBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isStemBlock() const; /** - * @symbol ?isThinFenceBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isThinFenceBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isThinFenceBlock() const; /** - * @symbol ?isWallBlock\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?isWallBlock\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool isWallBlock() const; /** - * @symbol ?onPlayerPlacing\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@E\@Z + * @symbol ?onPlayerPlacing\@BlockLegacy\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@E\@Z */ MCVAPI void onPlayerPlacing(class BlockSource &, class BlockPos const &, class Actor &, unsigned char) const; /** - * @symbol ?onStepOff\@BlockLegacy\@\@MEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStepOff\@BlockLegacy\@\@MEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void onStepOff(class Actor &, class BlockPos const &) const; /** - * @symbol ?onStepOn\@BlockLegacy\@\@MEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onStepOn\@BlockLegacy\@\@MEBAXAEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void onStepOn(class Actor &, class BlockPos const &) const; /** - * @symbol ?pushesUpFallingBlocks\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?pushesUpFallingBlocks\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool pushesUpFallingBlocks() const; /** - * @symbol ?shouldTickOnSetBlock\@BlockLegacy\@\@MEBA_NXZ + * @symbol ?shouldTickOnSetBlock\@BlockLegacy\@\@MEBA_NXZ */ MCVAPI bool shouldTickOnSetBlock() const; /** - * @symbol ?spawnBurnResources\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@MMM\@Z + * @symbol ?spawnBurnResources\@BlockLegacy\@\@UEBA_NAEAVBlockSource\@\@MMM\@Z */ MCVAPI bool spawnBurnResources(class BlockSource &, float, float, float) const; /** - * @symbol ?waterSpreadCausesSpawn\@BlockLegacy\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@BlockLegacy\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockLegacy(); #endif /** - * @symbol ??0BlockLegacy\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0BlockLegacy\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI BlockLegacy(std::string const &, int, class Material const &); /** - * @symbol ?_isDataDrivingVanillaBlocksAndItems\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?_isDataDrivingVanillaBlocksAndItems\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool _isDataDrivingVanillaBlocksAndItems() const; /** - * @symbol ?addAABB\@BlockLegacy\@\@QEBA_NAEBVAABB\@\@PEBV2\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addAABB\@BlockLegacy\@\@QEBA_NAEBVAABB\@\@PEBV2\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI bool addAABB(class AABB const &, class AABB const *, std::vector &) const; /** - * @symbol ?addBlockProperties\@BlockLegacy\@\@QEAAAEAV1\@W4BlockProperty\@\@\@Z + * @symbol ?addBlockProperties\@BlockLegacy\@\@QEAAAEAV1\@W4BlockProperty\@\@\@Z */ MCAPI class BlockLegacy & addBlockProperties(enum class BlockProperty); /** - * @symbol ?addTag\@BlockLegacy\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z + * @symbol ?addTag\@BlockLegacy\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z */ MCAPI class BlockLegacy & addTag(class HashedString const &); /** - * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z + * @symbol ?anyOf\@BlockLegacy\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z */ MCAPI bool anyOf(class std::initializer_list) const; /** - * @symbol ?buildDescriptionName\@BlockLegacy\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @symbol ?buildDescriptionName\@BlockLegacy\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ MCAPI std::string buildDescriptionName(class Block const &) const; /** - * @symbol ?canInstatick\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?canInstatick\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool canInstatick() const; /** - * @symbol ?createBlockPermutations\@BlockLegacy\@\@QEAAXI\@Z + * @symbol ?createBlockPermutations\@BlockLegacy\@\@QEAAXI\@Z */ MCAPI void createBlockPermutations(unsigned int); /** - * @symbol ?createWeakPtr\@BlockLegacy\@\@QEBA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ + * @symbol ?createWeakPtr\@BlockLegacy\@\@QEBA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ */ MCAPI class WeakPtr createWeakPtr() const; /** - * @symbol ?forEachBlockPermutation\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachBlockPermutation\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachBlockPermutation(class std::function) const; /** - * @symbol ?forEachItemStateInstance\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVItemStateInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachItemStateInstance\@BlockLegacy\@\@QEBAXV?$function\@$$A6A_NAEBVItemStateInstance\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachItemStateInstance(class std::function) const; /** - * @symbol ?getAllowsRunes\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?getAllowsRunes\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool getAllowsRunes() const; /** - * @symbol ?getBlockEntityType\@BlockLegacy\@\@QEBA?AW4BlockActorType\@\@XZ + * @symbol ?getBlockEntityType\@BlockLegacy\@\@QEBA?AW4BlockActorType\@\@XZ */ MCAPI enum class BlockActorType getBlockEntityType() const; /** - * @symbol ?getBlockItemId\@BlockLegacy\@\@QEBAFXZ + * @symbol ?getBlockItemId\@BlockLegacy\@\@QEBAFXZ */ MCAPI short getBlockItemId() const; /** - * @symbol ?getBlockState\@BlockLegacy\@\@QEBAPEBVItemState\@\@AEBVHashedString\@\@\@Z + * @symbol ?getBlockState\@BlockLegacy\@\@QEBAPEBVItemState\@\@AEBVHashedString\@\@\@Z */ MCAPI class ItemState const * getBlockState(class HashedString const &) const; /** - * @symbol ?getBlockStateGroup\@BlockLegacy\@\@QEAAPEAVBlockStateGroup\@\@XZ + * @symbol ?getBlockStateGroup\@BlockLegacy\@\@QEAAPEAVBlockStateGroup\@\@XZ */ MCAPI class BlockStateGroup * getBlockStateGroup(); /** - * @symbol ?getCommandNames\@BlockLegacy\@\@QEBA?AV?$vector\@UCommandName\@\@V?$allocator\@UCommandName\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getCommandNames\@BlockLegacy\@\@QEBA?AV?$vector\@UCommandName\@\@V?$allocator\@UCommandName\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getCommandNames() const; /** - * @symbol ?getCreativeCategory\@BlockLegacy\@\@QEBA?AW4CreativeItemCategory\@\@XZ + * @symbol ?getCreativeCategory\@BlockLegacy\@\@QEBA?AW4CreativeItemCategory\@\@XZ */ MCAPI enum class CreativeItemCategory getCreativeCategory() const; /** - * @symbol ?getDebugText\@BlockLegacy\@\@QEBAXAEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getDebugText\@BlockLegacy\@\@QEBAXAEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI void getDebugText(std::vector &, class BlockPos const &) const; /** - * @symbol ?getDefaultState\@BlockLegacy\@\@QEBAAEBVBlock\@\@XZ + * @symbol ?getDefaultState\@BlockLegacy\@\@QEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getDefaultState() const; /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDescriptionId() const; /** - * @symbol ?getEntity\@BlockLegacy\@\@QEBAAEBVEntityContext\@\@XZ + * @symbol ?getEntity\@BlockLegacy\@\@QEBAAEBVEntityContext\@\@XZ */ MCAPI class EntityContext const & getEntity() const; /** - * @symbol ?getEntityForModification\@BlockLegacy\@\@QEBAAEAVEntityContext\@\@XZ + * @symbol ?getEntityForModification\@BlockLegacy\@\@QEBAAEAVEntityContext\@\@XZ */ MCAPI class EntityContext & getEntityForModification() const; /** - * @symbol ?getEntityNoCheck\@BlockLegacy\@\@QEBAAEBVEntityContext\@\@XZ + * @symbol ?getEntityNoCheck\@BlockLegacy\@\@QEBAAEBVEntityContext\@\@XZ */ MCAPI class EntityContext const & getEntityNoCheck() const; /** - * @symbol ?getExperienceDrop\@BlockLegacy\@\@QEBAHAEAVRandom\@\@\@Z + * @symbol ?getExperienceDrop\@BlockLegacy\@\@QEBAHAEAVRandom\@\@\@Z */ MCAPI int getExperienceDrop(class Random &) const; /** - * @symbol ?getMaterial\@BlockLegacy\@\@QEBAAEBVMaterial\@\@XZ + * @symbol ?getMaterial\@BlockLegacy\@\@QEBAAEBVMaterial\@\@XZ */ MCAPI class Material const & getMaterial() const; /** - * @symbol ?getNamespace\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getNamespace\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getNamespace() const; /** - * @symbol ?getRawNameHash\@BlockLegacy\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getRawNameHash\@BlockLegacy\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getRawNameHash() const; /** - * @symbol ?getRawNameId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRawNameId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getRawNameId() const; /** - * @symbol ?getRequiredBaseGameVersion\@BlockLegacy\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getRequiredBaseGameVersion\@BlockLegacy\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getRequiredBaseGameVersion() const; /** - * @symbol ?getResourceDrops\@BlockLegacy\@\@QEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @symbol ?getResourceDrops\@BlockLegacy\@\@QEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ MCAPI std::vector getResourceDrops(class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @symbol ?hasBlockEntity\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?getUniquePermutations\@BlockLegacy\@\@QEBA_KXZ + */ + MCAPI unsigned __int64 getUniquePermutations() const; + /** + * @symbol ?hasBlockEntity\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool hasBlockEntity() const; /** - * @symbol ?hasProperty\@BlockLegacy\@\@QEBA_NW4BlockProperty\@\@\@Z + * @symbol ?hasProperty\@BlockLegacy\@\@QEBA_NW4BlockProperty\@\@\@Z */ MCAPI bool hasProperty(enum class BlockProperty) const; /** - * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool hasState(class HashedString const &) const; /** - * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVItemState\@\@\@Z + * @symbol ?hasState\@BlockLegacy\@\@QEBA_NAEBVItemState\@\@\@Z */ MCAPI bool hasState(class ItemState const &) const; /** - * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool hasTag(class HashedString const &) const; /** - * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEB_K\@Z + * @symbol ?hasTag\@BlockLegacy\@\@QEBA_NAEB_K\@Z */ MCAPI bool hasTag(unsigned __int64 const &) const; /** - * @symbol ?initEntity\@BlockLegacy\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?initEntity\@BlockLegacy\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void initEntity(class EntityRegistry &); /** - * @symbol ?initializeBlockStateGroup\@BlockLegacy\@\@QEAAXXZ + * @symbol ?initializeBlockStateGroup\@BlockLegacy\@\@QEAAXXZ */ MCAPI void initializeBlockStateGroup(); /** - * @symbol ?isEmpty\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?isEmpty\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?isFullAndOpaque\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?isFullAndOpaque\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isFullAndOpaque() const; /** - * @symbol ?isHeavy\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?isHeavy\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isHeavy() const; /** - * @symbol ?isMotionBlockingBlock\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?isMotionBlockingBlock\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isMotionBlockingBlock() const; /** - * @symbol ?isSolidBlockingBlock\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?isSolidBlockingBlock\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isSolidBlockingBlock() const; /** - * @symbol ?isVanilla\@BlockLegacy\@\@QEBA_NXZ + * @symbol ?isVanilla\@BlockLegacy\@\@QEBA_NXZ */ MCAPI bool isVanilla() const; /** - * @symbol ?matchesStates\@BlockLegacy\@\@QEBA_NAEBV1\@\@Z + * @symbol ?matchesStates\@BlockLegacy\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool matchesStates(class BlockLegacy const &) const; /** - * @symbol ??9BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ??9BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool operator!=(class HashedString const &) const; /** - * @symbol ??8BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ??8BlockLegacy\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool operator==(class HashedString const &) const; /** - * @symbol ?overrideBlockProperties\@BlockLegacy\@\@QEAAAEAV1\@W4BlockProperty\@\@\@Z + * @symbol ?overrideBlockProperties\@BlockLegacy\@\@QEAAAEAV1\@W4BlockProperty\@\@\@Z */ MCAPI class BlockLegacy & overrideBlockProperties(enum class BlockProperty); /** - * @symbol ?setAllowsRunes\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setAllowsRunes\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z */ MCAPI class BlockLegacy & setAllowsRunes(bool); /** - * @symbol ?setBlockTintType\@BlockLegacy\@\@QEAAAEAV1\@W4BlockTintType\@\@\@Z + * @symbol ?setBlockTintType\@BlockLegacy\@\@QEAAAEAV1\@W4BlockTintType\@\@\@Z */ MCAPI class BlockLegacy & setBlockTintType(enum class BlockTintType); /** - * @symbol ?setCanBeExtraBlock\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setCanBeExtraBlock\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z */ MCAPI class BlockLegacy & setCanBeExtraBlock(bool); /** - * @symbol ?setCanBeOriginalSurface\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setCanBeOriginalSurface\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z */ MCAPI class BlockLegacy & setCanBeOriginalSurface(bool); /** - * @symbol ?setCategory\@BlockLegacy\@\@QEAAAEAV1\@W4CreativeItemCategory\@\@\@Z + * @symbol ?setCategory\@BlockLegacy\@\@QEAAAEAV1\@W4CreativeItemCategory\@\@\@Z */ MCAPI class BlockLegacy & setCategory(enum class CreativeItemCategory); /** - * @symbol ?setCreativeEnumState\@BlockLegacy\@\@QEAAAEAV1\@AEBVItemState\@\@\@Z + * @symbol ?setCreativeEnumState\@BlockLegacy\@\@QEAAAEAV1\@AEBVItemState\@\@\@Z */ MCAPI class BlockLegacy & setCreativeEnumState(class ItemState const &); /** - * @symbol ?setCreativeGroup\@BlockLegacy\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCreativeGroup\@BlockLegacy\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BlockLegacy & setCreativeGroup(std::string const &); /** - * @symbol ?setDefaultState\@BlockLegacy\@\@QEAAXAEBVBlock\@\@\@Z + * @symbol ?setDefaultState\@BlockLegacy\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void setDefaultState(class Block const &); /** - * @symbol ?setDestroyTime\@BlockLegacy\@\@QEAAAEAV1\@M\@Z + * @symbol ?setDestroyTime\@BlockLegacy\@\@QEAAAEAV1\@M\@Z */ MCAPI class BlockLegacy & setDestroyTime(float); /** - * @symbol ?setExperienceDrop\@BlockLegacy\@\@QEAAAEAV1\@UIntRange\@\@\@Z + * @symbol ?setExperienceDrop\@BlockLegacy\@\@QEAAAEAV1\@UIntRange\@\@\@Z */ MCAPI class BlockLegacy & setExperienceDrop(struct IntRange); /** - * @symbol ?setExplodeable\@BlockLegacy\@\@QEAAAEAV1\@M\@Z + * @symbol ?setExplodeable\@BlockLegacy\@\@QEAAAEAV1\@M\@Z */ MCAPI class BlockLegacy & setExplodeable(float); /** - * @symbol ?setFlammable\@BlockLegacy\@\@QEAAAEAV1\@W4FlameOdds\@\@W4BurnOdds\@\@W4LavaFlammable\@\@\@Z + * @symbol ?setFlammable\@BlockLegacy\@\@QEAAAEAV1\@W4FlameOdds\@\@W4BurnOdds\@\@W4LavaFlammable\@\@\@Z */ MCAPI class BlockLegacy & setFlammable(enum class FlameOdds, enum class BurnOdds, enum class LavaFlammable); /** - * @symbol ?setIgnoreBlockForInsideCubeRenderer\@BlockLegacy\@\@QEAAX_N\@Z + * @symbol ?setIgnoreBlockForInsideCubeRenderer\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setIgnoreBlockForInsideCubeRenderer(bool); /** - * @symbol ?setIsHiddenInCommands\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setIsHiddenInCommands\@BlockLegacy\@\@QEAAAEAV1\@_N\@Z */ MCAPI class BlockLegacy & setIsHiddenInCommands(bool); /** - * @symbol ?setIsInteraction\@BlockLegacy\@\@QEAAX_N\@Z + * @symbol ?setIsInteraction\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setIsInteraction(bool); /** - * @symbol ?setIsVanillaBlock\@BlockLegacy\@\@QEAAX_N\@Z + * @symbol ?setIsVanillaBlock\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setIsVanillaBlock(bool); /** - * @symbol ?setLightBlock\@BlockLegacy\@\@QEAAAEAV1\@UBrightness\@\@\@Z + * @symbol ?setLightBlock\@BlockLegacy\@\@QEAAAEAV1\@UBrightness\@\@\@Z */ MCAPI class BlockLegacy & setLightBlock(struct Brightness); /** - * @symbol ?setLightEmission\@BlockLegacy\@\@QEAAAEAV1\@UBrightness\@\@\@Z + * @symbol ?setLightEmission\@BlockLegacy\@\@QEAAAEAV1\@UBrightness\@\@\@Z */ MCAPI class BlockLegacy & setLightEmission(struct Brightness); /** - * @symbol ?setMapColor\@BlockLegacy\@\@QEAAAEAV1\@AEBVColor\@mce\@\@\@Z + * @symbol ?setMapColor\@BlockLegacy\@\@QEAAAEAV1\@AEBVColor\@mce\@\@\@Z */ MCAPI class BlockLegacy & setMapColor(class mce::Color const &); /** - * @symbol ?setMinRequiredBaseGameVersion\@BlockLegacy\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?setMinRequiredBaseGameVersion\@BlockLegacy\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z */ MCAPI class BlockLegacy & setMinRequiredBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?setNameId\@BlockLegacy\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setNameId\@BlockLegacy\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BlockLegacy & setNameId(std::string const &); /** - * @symbol ?setOnlyPermutationandDefaultState\@BlockLegacy\@\@QEAAXV?$unique_ptr\@VBlock\@\@U?$default_delete\@VBlock\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setOnlyPermutationandDefaultState\@BlockLegacy\@\@QEAAXV?$unique_ptr\@VBlock\@\@U?$default_delete\@VBlock\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setOnlyPermutationandDefaultState(std::unique_ptr); /** - * @symbol ?setPushesOutItems\@BlockLegacy\@\@QEAAX_N\@Z + * @symbol ?setPushesOutItems\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setPushesOutItems(bool); /** - * @symbol ?setRandomTicking\@BlockLegacy\@\@QEBAX_N\@Z + * @symbol ?setRandomTicking\@BlockLegacy\@\@QEBAX_N\@Z */ MCAPI void setRandomTicking(bool) const; /** - * @symbol ?setRandomTickingExtraLayer\@BlockLegacy\@\@QEBAX_N\@Z + * @symbol ?setRandomTickingExtraLayer\@BlockLegacy\@\@QEBAX_N\@Z */ MCAPI void setRandomTickingExtraLayer(bool) const; /** - * @symbol ?setResourceDropsStrategy\@BlockLegacy\@\@QEAAXV?$unique_ptr\@VIResourceDropsStrategy\@\@U?$default_delete\@VIResourceDropsStrategy\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setResourceDropsStrategy\@BlockLegacy\@\@QEAAXV?$unique_ptr\@VIResourceDropsStrategy\@\@U?$default_delete\@VIResourceDropsStrategy\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setResourceDropsStrategy(std::unique_ptr); /** - * @symbol ?setReturnDefaultBlockOnUnidentifiedBlockState\@BlockLegacy\@\@QEAAAEAV1\@XZ - */ - MCAPI class BlockLegacy & setReturnDefaultBlockOnUnidentifiedBlockState(); - /** - * @symbol ?setSolid\@BlockLegacy\@\@QEAAX_N\@Z + * @symbol ?setSolid\@BlockLegacy\@\@QEAAX_N\@Z */ MCAPI void setSolid(bool); /** - * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVAABB\@\@\@Z + * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVVec3\@\@0\@Z */ - MCAPI void setVisualShape(class AABB const &); + MCAPI void setVisualShape(class Vec3 const &, class Vec3 const &); /** - * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVVec3\@\@0\@Z + * @symbol ?setVisualShape\@BlockLegacy\@\@QEAAXAEBVAABB\@\@\@Z */ - MCAPI void setVisualShape(class Vec3 const &, class Vec3 const &); + MCAPI void setVisualShape(class AABB const &); /** - * @symbol ?tryGetStateFromLegacyData\@BlockLegacy\@\@QEBAPEBVBlock\@\@G\@Z + * @symbol ?tryGetStateFromLegacyData\@BlockLegacy\@\@QEBAPEBVBlock\@\@G\@Z */ MCAPI class Block const * tryGetStateFromLegacyData(unsigned short) const; /** - * @symbol ?BLOCK_DESCRIPTION_PREFIX\@BlockLegacy\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_DESCRIPTION_PREFIX\@BlockLegacy\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BLOCK_DESCRIPTION_PREFIX; /** - * @symbol ?SIZE_OFFSET\@BlockLegacy\@\@2MB + * @symbol ?SIZE_OFFSET\@BlockLegacy\@\@2MB */ MCAPI static float const SIZE_OFFSET; /** - * @symbol ?buildDescriptionIdFromNameInfo\@BlockLegacy\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUNameInfo\@1\@\@Z + * @symbol ?buildDescriptionIdFromNameInfo\@BlockLegacy\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUNameInfo\@1\@\@Z */ MCAPI static std::string buildDescriptionIdFromNameInfo(struct BlockLegacy::NameInfo const &); /** - * @symbol ?extractBlockNameInfo\@BlockLegacy\@\@SA?AUNameInfo\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 ?getPlacementFacingAll\@BlockLegacy\@\@SAEAEAVActor\@\@AEBVBlockPos\@\@M\@Z + * @symbol ?getPlacementFacingAll\@BlockLegacy\@\@SAEAEAVActor\@\@AEBVBlockPos\@\@M\@Z */ MCAPI static unsigned char getPlacementFacingAll(class Actor &, class BlockPos const &, float); /** - * @symbol ?getPlacementFacingAllExceptAxisY\@BlockLegacy\@\@SAEAEAVActor\@\@AEBVBlockPos\@\@M\@Z + * @symbol ?getPlacementFacingAllExceptAxisY\@BlockLegacy\@\@SAEAEAVActor\@\@AEBVBlockPos\@\@M\@Z */ MCAPI static unsigned char getPlacementFacingAllExceptAxisY(class Actor &, class BlockPos const &, float); /** - * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemInstance\@\@\@Z + * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemStack\@\@\@Z */ - MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemInstance const &); + MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemStack const &); /** - * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemStack\@\@\@Z + * @symbol ?popResource\@BlockLegacy\@\@SAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVItemInstance\@\@\@Z */ - MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemStack const &); + MCAPI static class ItemActor * popResource(class BlockSource &, class BlockPos const &, class ItemInstance const &); /** - * @symbol ?spawnResources\@BlockLegacy\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@M\@Z + * @symbol ?spawnResources\@BlockLegacy\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@M\@Z */ MCAPI static void spawnResources(class BlockSource &, class BlockPos const &, class Randomize &, float); //protected: /** - * @symbol ?_getBlockShape\@BlockLegacy\@\@IEBA?AW4BlockShape\@\@XZ + * @symbol ?_getBlockShape\@BlockLegacy\@\@IEBA?AW4BlockShape\@\@XZ */ MCAPI enum class BlockShape _getBlockShape() const; /** - * @symbol ?clip\@BlockLegacy\@\@IEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_NAEBVAABB\@\@\@Z + * @symbol ?clip\@BlockLegacy\@\@IEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_NAEBVAABB\@\@\@Z */ MCAPI class HitResult clip(class BlockSource const &, class BlockPos const &, class Vec3 const &, class Vec3 const &, bool, class AABB const &) const; /** - * @symbol ?forEachBlockPermutationMutable\@BlockLegacy\@\@IEAA_NV?$function\@$$A6A_NAEAVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachBlockPermutationMutable\@BlockLegacy\@\@IEAA_NV?$function\@$$A6A_NAEAVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI bool forEachBlockPermutationMutable(class std::function); /** - * @symbol ?getBurnOdds\@BlockLegacy\@\@IEBAHXZ + * @symbol ?getBurnOdds\@BlockLegacy\@\@IEBAHXZ */ MCAPI int getBurnOdds() const; /** - * @symbol ?getDestroySpeed\@BlockLegacy\@\@IEBAMXZ + * @symbol ?getDestroySpeed\@BlockLegacy\@\@IEBAMXZ */ MCAPI float getDestroySpeed() const; /** - * @symbol ?getFlameOdds\@BlockLegacy\@\@IEBAHXZ + * @symbol ?getFlameOdds\@BlockLegacy\@\@IEBAHXZ */ MCAPI int getFlameOdds() const; /** - * @symbol ?getFriction\@BlockLegacy\@\@IEBAMXZ + * @symbol ?getFriction\@BlockLegacy\@\@IEBAMXZ */ MCAPI float getFriction() const; /** - * @symbol ?getLight\@BlockLegacy\@\@IEBA?AUBrightness\@\@XZ + * @symbol ?getLight\@BlockLegacy\@\@IEBA?AUBrightness\@\@XZ */ MCAPI struct Brightness getLight() const; /** - * @symbol ?isLavaFlammable\@BlockLegacy\@\@IEBA_NXZ + * @symbol ?isLavaFlammable\@BlockLegacy\@\@IEBA_NXZ */ MCAPI bool isLavaFlammable() const; /** - * @symbol ?createAABBWithPixelCoordinates\@BlockLegacy\@\@KA?AVAABB\@\@MMMMMM\@Z + * @symbol ?createAABBWithPixelCoordinates\@BlockLegacy\@\@KA?AVAABB\@\@MMMMMM\@Z */ MCAPI static class AABB createAABBWithPixelCoordinates(float, float, float, float, float, float); //private: /** - * @symbol ?_tryLookupSplitStateCollection\@BlockLegacy\@\@AEBA?AV?$optional\@H\@std\@\@_K\@Z + * @symbol ?_tryLookupSplitStateCollection\@BlockLegacy\@\@AEBA?AV?$optional\@H\@std\@\@_K\@Z */ MCAPI class std::optional _tryLookupSplitStateCollection(unsigned __int64) const; /** - * @symbol ?_trySetStateFromSplitStateCollection\@BlockLegacy\@\@AEBAPEBVBlock\@\@_KHG\@Z + * @symbol ?_trySetStateFromSplitStateCollection\@BlockLegacy\@\@AEBAPEBVBlock\@\@_KHG\@Z */ MCAPI class Block const * _trySetStateFromSplitStateCollection(unsigned __int64, int, unsigned short) const; /** - * @symbol ?initParams\@BlockLegacy\@\@AEBAXAEAVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?initParams\@BlockLegacy\@\@AEBAXAEAVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI void initParams(class RenderParams &, class BlockSource &, class BlockPos const &, class Actor *) const; @@ -1570,4 +1583,4 @@ class BlockLegacy { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockLegacyPtr.hpp b/LiteLoader/include/llapi/mc/BlockLegacyPtr.hpp index 3adf4ffeea..9ee56d3960 100644 --- a/LiteLoader/include/llapi/mc/BlockLegacyPtr.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacyPtr.hpp @@ -30,8 +30,8 @@ class BlockLegacyPtr { public: /** - * @symbol ?toString\@BlockLegacyPtr\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@BlockLegacyPtr\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockLegacyPtrProxy.hpp b/LiteLoader/include/llapi/mc/BlockLegacyPtrProxy.hpp index 569ed93384..08dcd82b90 100644 --- a/LiteLoader/include/llapi/mc/BlockLegacyPtrProxy.hpp +++ b/LiteLoader/include/llapi/mc/BlockLegacyPtrProxy.hpp @@ -28,15 +28,15 @@ struct BlockLegacyPtrProxy { public: /** - * @symbol ?setter\@BlockLegacyPtrProxy\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setter\@BlockLegacyPtrProxy\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setter(std::string const &); /** - * @symbol ?toBlockLegacyPtr\@BlockLegacyPtrProxy\@\@SAXAEAVBlockLegacyPtr\@\@AEBU1\@\@Z + * @symbol ?toBlockLegacyPtr\@BlockLegacyPtrProxy\@\@SAXAEAVBlockLegacyPtr\@\@AEBU1\@\@Z */ MCAPI static void toBlockLegacyPtr(class BlockLegacyPtr &, struct BlockLegacyPtrProxy const &); /** - * @symbol ?toString\@BlockLegacyPtrProxy\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBU1\@\@Z + * @symbol ?toString\@BlockLegacyPtrProxy\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBU1\@\@Z */ MCAPI static std::string toString(struct BlockLegacyPtrProxy const &); diff --git a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp index b2885d6a59..cd08f44751 100644 --- a/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightDampeningDescription.hpp @@ -10,69 +10,66 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockLightDampeningDescription. - * - */ -struct BlockLightDampeningDescription { + +class BlockLightDampeningDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLIGHTDAMPENINGDESCRIPTION public: - struct BlockLightDampeningDescription& operator=(struct BlockLightDampeningDescription const &) = delete; - BlockLightDampeningDescription(struct BlockLightDampeningDescription const &) = delete; + class BlockLightDampeningDescription& operator=(class BlockLightDampeningDescription const &) = delete; + BlockLightDampeningDescription(class BlockLightDampeningDescription const &) = delete; BlockLightDampeningDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockLightDampeningDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockLightDampeningDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockLightDampeningDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockLightDampeningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockLightDampeningDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockLightDampeningDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockLightDampeningDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockLightDampeningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockLightDampeningDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockLightDampeningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockLightDampeningDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockLightDampeningDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockLightDampeningDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockLightDampeningDescription\@\@SAXXZ + * @symbol ?bindType\@BlockLightDampeningDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockLightDampeningDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockLightDampeningDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp index 354525018e..93b9318aa8 100644 --- a/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLightEmissionDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockLightEmissionDescription. - * - */ -struct BlockLightEmissionDescription { + +class BlockLightEmissionDescription { #define AFTER_EXTRA // Add Member There @@ -23,58 +20,58 @@ struct BlockLightEmissionDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLIGHTEMISSIONDESCRIPTION public: - struct BlockLightEmissionDescription& operator=(struct BlockLightEmissionDescription const &) = delete; - BlockLightEmissionDescription(struct BlockLightEmissionDescription const &) = delete; + class BlockLightEmissionDescription& operator=(class BlockLightEmissionDescription const &) = delete; + BlockLightEmissionDescription(class BlockLightEmissionDescription const &) = delete; BlockLightEmissionDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockLightEmissionDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockLightEmissionDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockLightEmissionDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockLightEmissionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockLightEmissionDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockLightEmissionDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockLightEmissionDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockLightEmissionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockLightEmissionDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockLightEmissionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockLightEmissionDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockLightEmissionDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockLightEmissionDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockLightEmissionDescription\@\@SAXXZ + * @symbol ?bindType\@BlockLightEmissionDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockLightEmissionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockLightEmissionDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockListEventMap.hpp b/LiteLoader/include/llapi/mc/BlockListEventMap.hpp index 054e9cf3d6..d0863496e5 100644 --- a/LiteLoader/include/llapi/mc/BlockListEventMap.hpp +++ b/LiteLoader/include/llapi/mc/BlockListEventMap.hpp @@ -21,18 +21,21 @@ class BlockListEventMap { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLISTEVENTMAP public: - class BlockListEventMap& operator=(class BlockListEventMap const &) = delete; BlockListEventMap() = delete; #endif public: /** - * @symbol ??0BlockListEventMap\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0BlockListEventMap\@\@QEAA\@AEBV0\@\@Z */ MCAPI BlockListEventMap(class BlockListEventMap const &); /** - * @symbol ??1BlockListEventMap\@\@QEAA\@XZ + * @symbol ??4BlockListEventMap\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class BlockListEventMap & operator=(class BlockListEventMap const &); + /** + * @symbol ??1BlockListEventMap\@\@QEAA\@XZ */ MCAPI ~BlockListEventMap(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockListSerializer.hpp b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp index f1aab12bbc..c7cac99be4 100644 --- a/LiteLoader/include/llapi/mc/BlockListSerializer.hpp +++ b/LiteLoader/include/llapi/mc/BlockListSerializer.hpp @@ -31,16 +31,16 @@ class BlockListSerializer { public: /** - * @symbol ?loadJSON\@BlockListSerializer\@\@SAXVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @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 + * @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 + * @symbol ?saveJSON\@BlockListSerializer\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@\@Z */ MCAPI static void saveJSON(std::vector const &, class Json::Value &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockLootComponent.hpp b/LiteLoader/include/llapi/mc/BlockLootComponent.hpp index e70dbedf09..c0e0843749 100644 --- a/LiteLoader/include/llapi/mc/BlockLootComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockLootComponent.hpp @@ -24,11 +24,11 @@ struct BlockLootComponent { public: /** - * @symbol ??0BlockLootComponent\@\@QEAA\@XZ + * @symbol ??0BlockLootComponent\@\@QEAA\@XZ */ MCAPI BlockLootComponent(); /** - * @symbol ?getLootTable\@BlockLootComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLootTable\@BlockLootComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLootTable() const; diff --git a/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp b/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp index 4b50abf828..1be6d8e262 100644 --- a/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockLootComponentDescription.hpp @@ -10,49 +10,46 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockLootComponentDescription. - * - */ -struct BlockLootComponentDescription { + +class BlockLootComponentDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKLOOTCOMPONENTDESCRIPTION public: - struct BlockLootComponentDescription& operator=(struct BlockLootComponentDescription const &) = delete; - BlockLootComponentDescription(struct BlockLootComponentDescription const &) = delete; + class BlockLootComponentDescription& operator=(class BlockLootComponentDescription const &) = delete; + BlockLootComponentDescription(class BlockLootComponentDescription const &) = delete; BlockLootComponentDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockLootComponentDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockLootComponentDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockLootComponentDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockLootComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockLootComponentDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @symbol ?NameID\@BlockLootComponentDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockLootComponentDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockLootComponentDescription\@\@SAXXZ + * @symbol ?bindType\@BlockLootComponentDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockLootComponentDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockLootComponentDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp index 473f57d77b..8438fd3648 100644 --- a/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMapColorDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockMapColorDescription. - * - */ -struct BlockMapColorDescription { + +class BlockMapColorDescription { #define AFTER_EXTRA // Add Member There @@ -23,38 +20,38 @@ struct BlockMapColorDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMAPCOLORDESCRIPTION public: - struct BlockMapColorDescription& operator=(struct BlockMapColorDescription const &) = delete; - BlockMapColorDescription(struct BlockMapColorDescription const &) = delete; + class BlockMapColorDescription& operator=(class BlockMapColorDescription const &) = delete; + BlockMapColorDescription(class BlockMapColorDescription const &) = delete; BlockMapColorDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockMapColorDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockMapColorDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockMapColorDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockMapColorDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockMapColorDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @symbol ?NameID\@BlockMapColorDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockMapColorDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockMapColorDescription\@\@SAXXZ + * @symbol ?bindType\@BlockMapColorDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockMapColorDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockMapColorDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp index f414b4c83a..4d587fd890 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstance.hpp @@ -27,23 +27,23 @@ struct BlockMaterialInstance { public: /** - * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct BlockMaterialInstance & operator=(struct BlockMaterialInstance const &); /** - * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockMaterialInstance\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockMaterialInstance & operator=(struct BlockMaterialInstance &&); /** - * @symbol ??1BlockMaterialInstance\@\@QEAA\@XZ + * @symbol ??1BlockMaterialInstance\@\@QEAA\@XZ */ MCAPI ~BlockMaterialInstance(); /** - * @symbol ?blockRenderLayerEnumValues\@BlockMaterialInstance\@\@2V?$initializer_list\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockRenderLayer\@\@\@std\@\@\@std\@\@B + * @symbol ?blockRenderLayerEnumValues\@BlockMaterialInstance\@\@2V?$initializer_list\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockRenderLayer\@\@\@std\@\@\@std\@\@B */ MCAPI static class std::initializer_list> const blockRenderLayerEnumValues; /** - * @symbol ?renderLayerNameBiMap\@BlockMaterialInstance\@\@2V?$BidirectionalUnorderedMap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockRenderLayer\@\@\@\@B + * @symbol ?renderLayerNameBiMap\@BlockMaterialInstance\@\@2V?$BidirectionalUnorderedMap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockRenderLayer\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const renderLayerNameBiMap; diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstanceProxy.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstanceProxy.hpp index 4dee80f71c..55449b55b9 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstanceProxy.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstanceProxy.hpp @@ -27,15 +27,15 @@ struct BlockMaterialInstanceProxy { public: /** - * @symbol ??0BlockMaterialInstanceProxy\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BlockMaterialInstanceProxy\@\@QEAA\@AEBU0\@\@Z */ MCAPI BlockMaterialInstanceProxy(struct BlockMaterialInstanceProxy const &); /** - * @symbol ??1BlockMaterialInstanceProxy\@\@QEAA\@XZ + * @symbol ??1BlockMaterialInstanceProxy\@\@QEAA\@XZ */ MCAPI ~BlockMaterialInstanceProxy(); /** - * @symbol ?bindType\@BlockMaterialInstanceProxy\@\@SAXXZ + * @symbol ?bindType\@BlockMaterialInstanceProxy\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp index 35c07e791d..479dfcfb33 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstancesComponent.hpp @@ -30,19 +30,19 @@ struct BlockMaterialInstancesComponent { public: /** - * @symbol ??0BlockMaterialInstancesComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0BlockMaterialInstancesComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BlockMaterialInstancesComponent(struct BlockMaterialInstancesComponent &&); /** - * @symbol ?getRenderLayer\@BlockMaterialInstancesComponent\@\@QEBA?AW4BlockRenderLayer\@\@XZ + * @symbol ?getRenderLayer\@BlockMaterialInstancesComponent\@\@QEBA?AW4BlockRenderLayer\@\@XZ */ MCAPI enum class BlockRenderLayer getRenderLayer() const; /** - * @symbol ??4BlockMaterialInstancesComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockMaterialInstancesComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockMaterialInstancesComponent & operator=(struct BlockMaterialInstancesComponent &&); /** - * @symbol ??1BlockMaterialInstancesComponent\@\@QEAA\@XZ + * @symbol ??1BlockMaterialInstancesComponent\@\@QEAA\@XZ */ MCAPI ~BlockMaterialInstancesComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp index eb2400a884..7c72c92568 100644 --- a/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockMaterialInstancesDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockMaterialInstancesDescription. - * - */ -struct BlockMaterialInstancesDescription { + +class BlockMaterialInstancesDescription { #define AFTER_EXTRA // Add Member There @@ -23,57 +20,57 @@ struct BlockMaterialInstancesDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKMATERIALINSTANCESDESCRIPTION public: - struct BlockMaterialInstancesDescription& operator=(struct BlockMaterialInstancesDescription const &) = delete; - BlockMaterialInstancesDescription(struct BlockMaterialInstancesDescription const &) = delete; + class BlockMaterialInstancesDescription& operator=(class BlockMaterialInstancesDescription const &) = delete; + BlockMaterialInstancesDescription(class BlockMaterialInstancesDescription const &) = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockMaterialInstancesDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockMaterialInstancesDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockMaterialInstancesDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockMaterialInstancesDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockMaterialInstancesDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockMaterialInstancesDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockMaterialInstancesDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockMaterialInstancesDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockMaterialInstancesDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockMaterialInstancesDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockMaterialInstancesDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ??0BlockMaterialInstancesDescription\@\@QEAA\@XZ + * @symbol ??0BlockMaterialInstancesDescription\@\@QEAA\@XZ */ MCAPI BlockMaterialInstancesDescription(); /** - * @symbol ?NameID\@BlockMaterialInstancesDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockMaterialInstancesDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockMaterialInstancesDescription\@\@SAXXZ + * @symbol ?bindType\@BlockMaterialInstancesDescription\@\@SAXXZ */ MCAPI static void bindType(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp index dc67c327b3..d6ac22618d 100644 --- a/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockMovementSlowdownMultiplierSystem.hpp @@ -28,44 +28,44 @@ class BlockMovementSlowdownMultiplierSystem { public: /** - * @symbol ?_adjustFallDistance\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUBlockMovementSlowdownAppliedComponent\@\@AEAUFallDistanceComponent\@\@\@Z + * @symbol ?_adjustFallDistance\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUBlockMovementSlowdownAppliedComponent\@\@AEAUFallDistanceComponent\@\@\@Z */ MCAPI static void _adjustFallDistance(class StrictEntityContext const &, struct BlockMovementSlowdownAppliedComponent const &, struct FallDistanceComponent &); /** - * @symbol ?_applySlowdownOnMove\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_applySlowdownOnMove\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _applySlowdownOnMove(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct MoveRequestComponent &, struct StateVectorComponent &); /** - * @symbol ?_immunePlayer\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEBUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?_immunePlayer\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@AEBUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ MCAPI static void _immunePlayer(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, struct AbilitiesComponent const &, class EntityModifierT); /** - * @symbol ?_immuneSlowdown\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?_immuneSlowdown\@BlockMovementSlowdownMultiplierSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ MCAPI static void _immuneSlowdown(class StrictEntityContext const &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT); /** - * @symbol ?createAdjustFallDistanceSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createAdjustFallDistanceSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAdjustFallDistanceSystem(); /** - * @symbol ?createApplySlowdownOnMoveSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createApplySlowdownOnMoveSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createApplySlowdownOnMoveSystem(); /** - * @symbol ?createCleanupSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createCleanupSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCleanupSystem(); /** - * @symbol ?createImmunePlayerSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createImmunePlayerSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createImmunePlayerSystem(); /** - * @symbol ?createImmuneSpiderSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createImmuneSpiderSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createImmuneSpiderSystem(); /** - * @symbol ?createImmuneWitherBossSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createImmuneWitherBossSystem\@BlockMovementSlowdownMultiplierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createImmuneWitherBossSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockNotificationEvent.hpp b/LiteLoader/include/llapi/mc/BlockNotificationEvent.hpp index cf4aff10c3..c07fdfd139 100644 --- a/LiteLoader/include/llapi/mc/BlockNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/BlockNotificationEvent.hpp @@ -28,7 +28,7 @@ struct BlockNotificationEvent { public: /** - * @symbol ??1BlockNotificationEvent\@\@QEAA\@XZ + * @symbol ??1BlockNotificationEvent\@\@QEAA\@XZ */ MCAPI ~BlockNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/BlockPalette.hpp b/LiteLoader/include/llapi/mc/BlockPalette.hpp index 2f19619423..4c5b7205d1 100644 --- a/LiteLoader/include/llapi/mc/BlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/BlockPalette.hpp @@ -30,60 +30,60 @@ class BlockPalette { public: /** - * @symbol ??0BlockPalette\@\@QEAA\@UConstructorToken\@0\@\@Z + * @symbol ??0BlockPalette\@\@QEAA\@UConstructorToken\@0\@\@Z */ MCAPI BlockPalette(struct BlockPalette::ConstructorToken); /** - * @symbol ??0BlockPalette\@\@QEAA\@AEAVLevel\@\@\@Z + * @symbol ??0BlockPalette\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI BlockPalette(class Level &); /** - * @symbol ?cacheBlockComponentData\@BlockPalette\@\@QEAAXXZ + * @symbol ?cacheBlockComponentData\@BlockPalette\@\@QEAAXXZ */ MCAPI void cacheBlockComponentData(); /** - * @symbol ?convertLegacyBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@UBlockID\@\@G\@Z + * @symbol ?convertLegacyBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@UBlockID\@\@G\@Z */ MCAPI class Block const & convertLegacyBlock(struct BlockID, unsigned short) const; /** - * @symbol ?convertLegacyBlocks\@BlockPalette\@\@QEBA_NV?$buffer_span_mut\@PEBVBlock\@\@\@\@V?$buffer_span\@UBlockID\@\@\@\@V?$buffer_span\@UNibblePair\@\@\@\@_K\@Z + * @symbol ?convertLegacyBlocks\@BlockPalette\@\@QEBA_NV?$buffer_span_mut\@PEBVBlock\@\@\@\@V?$buffer_span\@UBlockID\@\@\@\@V?$buffer_span\@UNibblePair\@\@\@\@_K\@Z */ MCAPI bool convertLegacyBlocks(class buffer_span_mut, class buffer_span, class buffer_span, unsigned __int64) const; /** - * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBI\@Z + * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z */ - MCAPI class Block const & getBlock(unsigned int const &) const; + MCAPI class Block const & getBlock(class CompoundTag const &) const; /** - * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?getBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBI\@Z */ - MCAPI class Block const & getBlock(class CompoundTag const &) const; + MCAPI class Block const & getBlock(unsigned int const &) const; /** - * @symbol ?getBlockFromLegacyData\@BlockPalette\@\@QEBAAEBVBlock\@\@UNewBlockID\@\@I\@Z + * @symbol ?getBlockFromLegacyData\@BlockPalette\@\@QEBAAEBVBlock\@\@UNewBlockID\@\@I\@Z */ MCAPI class Block const & getBlockFromLegacyData(struct NewBlockID, unsigned int) const; /** - * @symbol ?getBlockLegacy\@BlockPalette\@\@QEBAPEBVBlockLegacy\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getBlockLegacy\@BlockPalette\@\@QEBAPEBVBlockLegacy\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BlockLegacy const * getBlockLegacy(std::string const &) const; /** - * @symbol ?initFromBlockDefinitions\@BlockPalette\@\@QEAAXXZ + * @symbol ?initFromBlockDefinitions\@BlockPalette\@\@QEAAXXZ */ MCAPI void initFromBlockDefinitions(); /** - * @symbol ?switchBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBV2\@AEBVBlockLegacy\@\@\@Z + * @symbol ?switchBlock\@BlockPalette\@\@QEBAAEBVBlock\@\@AEBV2\@AEBVBlockLegacy\@\@\@Z */ MCAPI class Block const & switchBlock(class Block const &, class BlockLegacy const &) const; /** - * @symbol ??1BlockPalette\@\@QEAA\@XZ + * @symbol ??1BlockPalette\@\@QEAA\@XZ */ MCAPI ~BlockPalette(); //private: /** - * @symbol ?shouldWarnFor\@BlockPalette\@\@AEBA_NUNewBlockID\@\@G\@Z + * @symbol ?shouldWarnFor\@BlockPalette\@\@AEBA_NUNewBlockID\@\@G\@Z */ MCAPI bool shouldWarnFor(struct NewBlockID, unsigned short) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp b/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp index 084fd265b1..1e5c5b5456 100644 --- a/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPartVisibilityComponent.hpp @@ -28,11 +28,11 @@ struct BlockPartVisibilityComponent { public: /** - * @symbol ??4BlockPartVisibilityComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockPartVisibilityComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockPartVisibilityComponent & operator=(struct BlockPartVisibilityComponent &&); /** - * @symbol ??1BlockPartVisibilityComponent\@\@QEAA\@XZ + * @symbol ??1BlockPartVisibilityComponent\@\@QEAA\@XZ */ MCAPI ~BlockPartVisibilityComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp b/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp index 48ac6c69cd..ac609bdd3f 100644 --- a/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPartVisibilityDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockPartVisibilityDescription. - * - */ -struct BlockPartVisibilityDescription { + +class BlockPartVisibilityDescription { #define AFTER_EXTRA // Add Member There @@ -23,61 +20,61 @@ struct BlockPartVisibilityDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKPARTVISIBILITYDESCRIPTION public: - struct BlockPartVisibilityDescription& operator=(struct BlockPartVisibilityDescription const &) = delete; - BlockPartVisibilityDescription(struct BlockPartVisibilityDescription const &) = delete; + class BlockPartVisibilityDescription& operator=(class BlockPartVisibilityDescription const &) = delete; + BlockPartVisibilityDescription(class BlockPartVisibilityDescription const &) = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockPartVisibilityDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockPartVisibilityDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockPartVisibilityDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockPartVisibilityDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockPartVisibilityDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockPartVisibilityDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockPartVisibilityDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockPartVisibilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockPartVisibilityDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockPartVisibilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockPartVisibilityDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ??0BlockPartVisibilityDescription\@\@QEAA\@XZ + * @symbol ??0BlockPartVisibilityDescription\@\@QEAA\@XZ */ MCAPI BlockPartVisibilityDescription(); /** - * @symbol ?NameID\@BlockPartVisibilityDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockPartVisibilityDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockPartVisibilityDescription\@\@SAXXZ + * @symbol ?bindType\@BlockPartVisibilityDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockPartVisibilityDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockPartVisibilityDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp index d23f900629..a17a5cec06 100644 --- a/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternBuilder.hpp @@ -30,52 +30,52 @@ class BlockPatternBuilder { public: /** - * @symbol ?aisle\@BlockPatternBuilder\@\@QEAAAEAV1\@HZZ + * @symbol ?aisle\@BlockPatternBuilder\@\@QEAAAEAV1\@HZZ */ MCAPI class BlockPatternBuilder & aisle(int, ...); /** - * @symbol ?build\@BlockPatternBuilder\@\@QEAAAEAV1\@XZ + * @symbol ?build\@BlockPatternBuilder\@\@QEAAAEAV1\@XZ */ MCAPI class BlockPatternBuilder & build(); /** - * @symbol ?define\@BlockPatternBuilder\@\@QEAAAEAV1\@DAEBVBlock\@\@\@Z + * @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 + * @symbol ?define\@BlockPatternBuilder\@\@QEAAAEAV1\@DV?$function\@$$A6A_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI class BlockPatternBuilder & define(char, class std::function); /** - * @symbol ?isReadyForMatch\@BlockPatternBuilder\@\@QEAA_NXZ + * @symbol ?isReadyForMatch\@BlockPatternBuilder\@\@QEAA_NXZ */ MCAPI bool isReadyForMatch(); /** - * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@\@Z + * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z */ - MCAPI struct BuildMatch match(class BlockPos const &); + MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char); /** - * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@\@Z */ - MCAPI struct BuildMatch match(class BlockPos const &, int, int); + MCAPI struct BuildMatch match(class BlockPos const &); /** - * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HHEE\@Z + * @symbol ?match\@BlockPatternBuilder\@\@QEAA?AUBuildMatch\@\@AEBVBlockPos\@\@HH\@Z */ - MCAPI struct BuildMatch match(class BlockPos const &, int, int, unsigned char, unsigned char); + MCAPI struct BuildMatch match(class BlockPos const &, int, int); /** - * @symbol ?replaceBlocks\@BlockPatternBuilder\@\@QEAAXDUBuildMatch\@\@AEBVBlock\@\@\@Z + * @symbol ?replaceBlocks\@BlockPatternBuilder\@\@QEAAXDUBuildMatch\@\@AEBVBlock\@\@\@Z */ MCAPI void replaceBlocks(char, struct BuildMatch, class Block const &); /** - * @symbol ?start\@BlockPatternBuilder\@\@SA?AV?$unique_ptr\@VBlockPatternBuilder\@\@U?$default_delete\@VBlockPatternBuilder\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?start\@BlockPatternBuilder\@\@SA?AV?$unique_ptr\@VBlockPatternBuilder\@\@U?$default_delete\@VBlockPatternBuilder\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCAPI static std::unique_ptr start(class BlockSource &); //private: /** - * @symbol ?_fitsBlockPatternEntry\@BlockPatternBuilder\@\@AEAA_NHHAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?_fitsBlockPatternEntry\@BlockPatternBuilder\@\@AEAA_NHHAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool _fitsBlockPatternEntry(int, int, class BlockPos const &, class Block const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPatternEvent.hpp b/LiteLoader/include/llapi/mc/BlockPatternEvent.hpp index e11ce0a1ac..199e7028ea 100644 --- a/LiteLoader/include/llapi/mc/BlockPatternEvent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternEvent.hpp @@ -27,11 +27,11 @@ struct BlockPatternEvent { public: /** - * @symbol ??0BlockPatternEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BlockPatternEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI BlockPatternEvent(struct BlockPatternEvent const &); /** - * @symbol ??1BlockPatternEvent\@\@QEAA\@XZ + * @symbol ??1BlockPatternEvent\@\@QEAA\@XZ */ MCAPI ~BlockPatternEvent(); diff --git a/LiteLoader/include/llapi/mc/BlockPatternPostEvent.hpp b/LiteLoader/include/llapi/mc/BlockPatternPostEvent.hpp index d511e40181..4c2740c466 100644 --- a/LiteLoader/include/llapi/mc/BlockPatternPostEvent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternPostEvent.hpp @@ -25,7 +25,7 @@ struct BlockPatternPostEvent { public: /** - * @symbol ??1BlockPatternPostEvent\@\@QEAA\@XZ + * @symbol ??1BlockPatternPostEvent\@\@QEAA\@XZ */ MCAPI ~BlockPatternPostEvent(); diff --git a/LiteLoader/include/llapi/mc/BlockPatternPreEvent.hpp b/LiteLoader/include/llapi/mc/BlockPatternPreEvent.hpp index 56ab3547b7..1f36d563cc 100644 --- a/LiteLoader/include/llapi/mc/BlockPatternPreEvent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPatternPreEvent.hpp @@ -25,7 +25,7 @@ struct BlockPatternPreEvent { public: /** - * @symbol ??1BlockPatternPreEvent\@\@QEAA\@XZ + * @symbol ??1BlockPatternPreEvent\@\@QEAA\@XZ */ MCAPI ~BlockPatternPreEvent(); diff --git a/LiteLoader/include/llapi/mc/BlockPermutationDescription.hpp b/LiteLoader/include/llapi/mc/BlockPermutationDescription.hpp index 263c7a89bf..02490e83eb 100644 --- a/LiteLoader/include/llapi/mc/BlockPermutationDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPermutationDescription.hpp @@ -25,7 +25,7 @@ struct BlockPermutationDescription { public: /** - * @symbol ??1BlockPermutationDescription\@\@QEAA\@XZ + * @symbol ??1BlockPermutationDescription\@\@QEAA\@XZ */ MCAPI ~BlockPermutationDescription(); diff --git a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp index 82ecd3dbcc..2c1ad3413e 100644 --- a/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/BlockPickRequestPacket.hpp @@ -30,33 +30,33 @@ class BlockPickRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockPickRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@BlockPickRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@BlockPickRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@BlockPickRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BlockPickRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@BlockPickRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@BlockPickRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@BlockPickRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0BlockPickRequestPacket\@\@QEAA\@XZ + * @symbol ??0BlockPickRequestPacket\@\@QEAA\@XZ */ MCAPI BlockPickRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPileFeature.hpp b/LiteLoader/include/llapi/mc/BlockPileFeature.hpp index 63dac15e22..046198474c 100644 --- a/LiteLoader/include/llapi/mc/BlockPileFeature.hpp +++ b/LiteLoader/include/llapi/mc/BlockPileFeature.hpp @@ -31,23 +31,23 @@ class BlockPileFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockPileFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BlockPileFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BlockPileFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 4 - * @symbol ?getBlockToPlace\@BlockPileFeature\@\@MEBAAEBVBlock\@\@AEAVRandom\@\@\@Z + * @vftbl 4 + * @symbol ?getBlockToPlace\@BlockPileFeature\@\@MEBAAEBVBlock\@\@AEAVRandom\@\@\@Z */ virtual class Block const & getBlockToPlace(class Random &) const; /** - * @symbol ??0BlockPileFeature\@\@QEAA\@AEBVBlock\@\@\@Z + * @symbol ??0BlockPileFeature\@\@QEAA\@AEBVBlock\@\@\@Z */ MCAPI BlockPileFeature(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPlacementCondition.hpp b/LiteLoader/include/llapi/mc/BlockPlacementCondition.hpp index 4cb95fb28d..9d479f9e37 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementCondition.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementCondition.hpp @@ -28,19 +28,19 @@ struct BlockPlacementCondition { public: /** - * @symbol ??0BlockPlacementCondition\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BlockPlacementCondition\@\@QEAA\@AEBU0\@\@Z */ MCAPI BlockPlacementCondition(struct BlockPlacementCondition const &); /** - * @symbol ??4BlockPlacementCondition\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4BlockPlacementCondition\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI struct BlockPlacementCondition & operator=(struct BlockPlacementCondition const &); + MCAPI struct BlockPlacementCondition & operator=(struct BlockPlacementCondition &&); /** - * @symbol ??4BlockPlacementCondition\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockPlacementCondition\@\@QEAAAEAU0\@AEBU0\@\@Z */ - MCAPI struct BlockPlacementCondition & operator=(struct BlockPlacementCondition &&); + MCAPI struct BlockPlacementCondition & operator=(struct BlockPlacementCondition const &); /** - * @symbol ??1BlockPlacementCondition\@\@QEAA\@XZ + * @symbol ??1BlockPlacementCondition\@\@QEAA\@XZ */ MCAPI ~BlockPlacementCondition(); diff --git a/LiteLoader/include/llapi/mc/BlockPlacementDirectionalFilter.hpp b/LiteLoader/include/llapi/mc/BlockPlacementDirectionalFilter.hpp index cb599e6de9..692a4f9ab3 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementDirectionalFilter.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementDirectionalFilter.hpp @@ -28,7 +28,7 @@ struct BlockPlacementDirectionalFilter { public: /** - * @symbol ?fromStringVector\@BlockPlacementDirectionalFilter\@\@SAXAEAU1\@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 + * @symbol ?fromStringVector\@BlockPlacementDirectionalFilter\@\@SAXAEAU1\@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 fromStringVector(struct BlockPlacementDirectionalFilter &, std::vector); diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp index bde7716014..22ba4b19eb 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterComponent.hpp @@ -30,19 +30,19 @@ struct BlockPlacementFilterComponent { public: /** - * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ - MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; + MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?mayPlace\@BlockPlacementFilterComponent\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; + MCAPI bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??4BlockPlacementFilterComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockPlacementFilterComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct BlockPlacementFilterComponent & operator=(struct BlockPlacementFilterComponent &&); /** - * @symbol ??1BlockPlacementFilterComponent\@\@QEAA\@XZ + * @symbol ??1BlockPlacementFilterComponent\@\@QEAA\@XZ */ MCAPI ~BlockPlacementFilterComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp index c95b1f3852..66dd2def50 100644 --- a/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlacementFilterDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockPlacementFilterDescription. - * - */ -struct BlockPlacementFilterDescription { + +class BlockPlacementFilterDescription { #define AFTER_EXTRA // Add Member There @@ -23,54 +20,54 @@ struct BlockPlacementFilterDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKPLACEMENTFILTERDESCRIPTION public: - struct BlockPlacementFilterDescription& operator=(struct BlockPlacementFilterDescription const &) = delete; - BlockPlacementFilterDescription(struct BlockPlacementFilterDescription const &) = delete; + class BlockPlacementFilterDescription& operator=(class BlockPlacementFilterDescription const &) = delete; + BlockPlacementFilterDescription(class BlockPlacementFilterDescription const &) = delete; BlockPlacementFilterDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockPlacementFilterDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockPlacementFilterDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockPlacementFilterDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockPlacementFilterDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockPlacementFilterDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockPlacementFilterDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockPlacementFilterDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockPlacementFilterDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockPlacementFilterDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockPlacementFilterDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockPlacementFilterDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockPlacementFilterDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockPlacementFilterDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockPlacementFilterDescription\@\@SAXXZ + * @symbol ?bindType\@BlockPlacementFilterDescription\@\@SAXXZ */ MCAPI static void bindType(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp index 716764c287..82f1b5ce4a 100644 --- a/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp +++ b/LiteLoader/include/llapi/mc/BlockPlanterItem.hpp @@ -32,93 +32,93 @@ class BlockPlanterItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockPlanterItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 13 - * @symbol ?isBlockPlanterItem\@BlockPlanterItem\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?isBlockPlanterItem\@BlockPlanterItem\@\@UEBA_NXZ */ virtual bool isBlockPlanterItem() const; /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@BlockPlanterItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@BlockPlanterItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BlockPlanterItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BlockPlanterItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0BlockPlanterItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlock\@\@_N\@Z + * @symbol ??0BlockPlanterItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlock\@\@_N\@Z */ MCAPI BlockPlanterItem(std::string const &, int, class Block const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPos.hpp b/LiteLoader/include/llapi/mc/BlockPos.hpp index 9d031f662c..9066866724 100644 --- a/LiteLoader/include/llapi/mc/BlockPos.hpp +++ b/LiteLoader/include/llapi/mc/BlockPos.hpp @@ -33,7 +33,7 @@ class BlockPos { MCAPI static void bindType(); - constexpr int& operator[](size_t index) { + [[nodiscard]] constexpr int& operator[](size_t index) { switch (index) { case 1: return y; @@ -44,7 +44,7 @@ class BlockPos { } } - constexpr int operator[](size_t index) const { + [[nodiscard]] constexpr int operator[](size_t index) const { switch (index) { case 1: return y; @@ -55,16 +55,16 @@ class BlockPos { } } - inline bool containedWithin(BlockPos const& a, BlockPos const& b) const { + [[nodiscard]] inline bool containedWithin(BlockPos const& a, BlockPos const& b) const { return x >= a.x && y >= a.y && z >= a.z && x <= b.x && y <= b.y && z <= b.z; } - LIAPI Vec3 toVec3() const; - LIAPI class BoundingBox toBoundingBox() const; - LIAPI class AABB toAABB() const; - LIAPI Vec3 bottomCenter() const; - LIAPI Vec3 center() const; - LIAPI bool containedWithin(class BoundingBox const&) const; + [[nodiscard]] LIAPI Vec3 toVec3() const; + [[nodiscard]] LIAPI class BoundingBox toBoundingBox() const; + [[nodiscard]] LIAPI class AABB toAABB() const; + [[nodiscard]] LIAPI Vec3 bottomCenter() const; + [[nodiscard]] LIAPI Vec3 center() const; + [[nodiscard]] LIAPI bool containedWithin(class BoundingBox const&) const; FAKE_CRTP(BlockPos, int, 3); }; diff --git a/LiteLoader/include/llapi/mc/BlockPosIterator.hpp b/LiteLoader/include/llapi/mc/BlockPosIterator.hpp index 9f0110e448..100dca78ae 100644 --- a/LiteLoader/include/llapi/mc/BlockPosIterator.hpp +++ b/LiteLoader/include/llapi/mc/BlockPosIterator.hpp @@ -30,28 +30,28 @@ class BlockPosIterator { public: /** - * @symbol ??0BlockPosIterator\@\@QEAA\@AEBVBlockPos\@\@0\@Z + * @symbol ??0BlockPosIterator\@\@QEAA\@AEBVBlockPos\@\@0\@Z */ MCAPI BlockPosIterator(class BlockPos const &, class BlockPos const &); /** - * @symbol ?begin\@BlockPosIterator\@\@QEBA?AV1\@XZ + * @symbol ?begin\@BlockPosIterator\@\@QEBA?AV1\@XZ */ MCAPI class BlockPosIterator begin() const; /** - * @symbol ?end\@BlockPosIterator\@\@QEBA?AV1\@XZ + * @symbol ?end\@BlockPosIterator\@\@QEBA?AV1\@XZ */ MCAPI class BlockPosIterator end() const; /** - * @symbol ??9BlockPosIterator\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9BlockPosIterator\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class BlockPosIterator const &) const; /** - * @symbol ??DBlockPosIterator\@\@QEAAAEBVBlockPos\@\@XZ + * @symbol ??DBlockPosIterator\@\@QEAAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & operator*(); /** - * @symbol ??EBlockPosIterator\@\@QEAAAEAV0\@XZ + * @symbol ??EBlockPosIterator\@\@QEAAAEAV0\@XZ */ MCAPI class BlockPosIterator & operator++(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPosTrackerComponent.hpp b/LiteLoader/include/llapi/mc/BlockPosTrackerComponent.hpp index 958d1a9d2a..49837b2a6f 100644 --- a/LiteLoader/include/llapi/mc/BlockPosTrackerComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPosTrackerComponent.hpp @@ -30,12 +30,12 @@ class BlockPosTrackerComponent { public: /** - * @symbol ??0BlockPosTrackerComponent\@\@QEAA\@_NAEBVBlockPos\@\@\@Z + * @symbol ??0BlockPosTrackerComponent\@\@QEAA\@_NAEBVBlockPos\@\@\@Z */ MCAPI BlockPosTrackerComponent(bool, class BlockPos const &); /** - * @symbol ?onRemove\@BlockPosTrackerComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?onRemove\@BlockPosTrackerComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void onRemove(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPosTrackerSystem.hpp b/LiteLoader/include/llapi/mc/BlockPosTrackerSystem.hpp index 4f0d06c9ce..de7ed83e4f 100644 --- a/LiteLoader/include/llapi/mc/BlockPosTrackerSystem.hpp +++ b/LiteLoader/include/llapi/mc/BlockPosTrackerSystem.hpp @@ -30,23 +30,23 @@ class BlockPosTrackerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockPosTrackerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BlockPosTrackerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BlockPosTrackerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?_tickBlockPosTrackerComponent\@BlockPosTrackerSystem\@\@SAXAEAVActor\@\@AEAVBlockPosTrackerComponent\@\@\@Z + * @symbol ?_tickBlockPosTrackerComponent\@BlockPosTrackerSystem\@\@SAXAEAVActor\@\@AEAVBlockPosTrackerComponent\@\@\@Z */ MCAPI static void _tickBlockPosTrackerComponent(class Actor &, class BlockPosTrackerComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockPropertyComponent.hpp b/LiteLoader/include/llapi/mc/BlockPropertyComponent.hpp index ac3d08a4d2..6ba929d42c 100644 --- a/LiteLoader/include/llapi/mc/BlockPropertyComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockPropertyComponent.hpp @@ -28,11 +28,11 @@ struct BlockPropertyComponent { public: /** - * @symbol ?getProperty\@BlockPropertyComponent\@\@QEBA_NW4BlockProperty\@\@\@Z + * @symbol ?getProperty\@BlockPropertyComponent\@\@QEBA_NW4BlockProperty\@\@\@Z */ MCAPI bool getProperty(enum class BlockProperty) const; /** - * @symbol ?hasProperty\@BlockPropertyComponent\@\@QEBA_NW4BlockProperty\@\@\@Z + * @symbol ?hasProperty\@BlockPropertyComponent\@\@QEBA_NW4BlockProperty\@\@\@Z */ MCAPI bool hasProperty(enum class BlockProperty) const; diff --git a/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp b/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp index 97802c90ee..82578e7e7d 100644 --- a/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockQueuedTickingComponent.hpp @@ -30,11 +30,11 @@ struct BlockQueuedTickingComponent { public: /** - * @symbol ??0BlockQueuedTickingComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0BlockQueuedTickingComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI BlockQueuedTickingComponent(struct BlockQueuedTickingComponent &&); /** - * @symbol ??1BlockQueuedTickingComponent\@\@QEAA\@XZ + * @symbol ??1BlockQueuedTickingComponent\@\@QEAA\@XZ */ MCAPI ~BlockQueuedTickingComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp index 1e24fc9103..dc40f65071 100644 --- a/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockQueuedTickingDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockQueuedTickingDescription. - * - */ -struct BlockQueuedTickingDescription { + +class BlockQueuedTickingDescription { #define AFTER_EXTRA // Add Member There @@ -23,38 +20,38 @@ struct BlockQueuedTickingDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKQUEUEDTICKINGDESCRIPTION public: - struct BlockQueuedTickingDescription& operator=(struct BlockQueuedTickingDescription const &) = delete; - BlockQueuedTickingDescription(struct BlockQueuedTickingDescription const &) = delete; + class BlockQueuedTickingDescription& operator=(class BlockQueuedTickingDescription const &) = delete; + BlockQueuedTickingDescription(class BlockQueuedTickingDescription const &) = delete; BlockQueuedTickingDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockQueuedTickingDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockQueuedTickingDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockQueuedTickingDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockQueuedTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockQueuedTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @symbol ?NameID\@BlockQueuedTickingDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockQueuedTickingDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockQueuedTickingDescription\@\@SAXXZ + * @symbol ?bindType\@BlockQueuedTickingDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockQueuedTickingDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockQueuedTickingDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp b/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp index 9947079769..10d5ccc47c 100644 --- a/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockRandomTickingComponent.hpp @@ -28,7 +28,7 @@ struct BlockRandomTickingComponent { public: /** - * @symbol ??1BlockRandomTickingComponent\@\@QEAA\@XZ + * @symbol ??1BlockRandomTickingComponent\@\@QEAA\@XZ */ MCAPI ~BlockRandomTickingComponent(); diff --git a/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp b/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp index 09970f7982..39910490ff 100644 --- a/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockRandomTickingDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockRandomTickingDescription. - * - */ -struct BlockRandomTickingDescription { + +class BlockRandomTickingDescription { #define AFTER_EXTRA // Add Member There @@ -23,34 +20,34 @@ struct BlockRandomTickingDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKRANDOMTICKINGDESCRIPTION public: - struct BlockRandomTickingDescription& operator=(struct BlockRandomTickingDescription const &) = delete; - BlockRandomTickingDescription(struct BlockRandomTickingDescription const &) = delete; + class BlockRandomTickingDescription& operator=(class BlockRandomTickingDescription const &) = delete; + BlockRandomTickingDescription(class BlockRandomTickingDescription const &) = delete; BlockRandomTickingDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockRandomTickingDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockRandomTickingDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockRandomTickingDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockRandomTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockRandomTickingDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @symbol ?NameID\@BlockRandomTickingDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockRandomTickingDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockRandomTickingDescription\@\@SAXXZ + * @symbol ?bindType\@BlockRandomTickingDescription\@\@SAXXZ */ MCAPI static void bindType(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockReducer.hpp b/LiteLoader/include/llapi/mc/BlockReducer.hpp index 39e2fb2749..f7d3c28d1f 100644 --- a/LiteLoader/include/llapi/mc/BlockReducer.hpp +++ b/LiteLoader/include/llapi/mc/BlockReducer.hpp @@ -29,30 +29,30 @@ class BlockReducer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockReducer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?registerBlock\@BlockReducer\@\@UEAAXAEBVItemStack\@\@$$QEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?registerBlock\@BlockReducer\@\@UEAAXAEBVItemStack\@\@$$QEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ virtual void registerBlock(class ItemStack const &, std::vector &&); /** - * @symbol ??0BlockReducer\@\@QEAA\@XZ + * @symbol ??0BlockReducer\@\@QEAA\@XZ */ MCAPI BlockReducer(); /** - * @symbol ?getReduction\@BlockReducer\@\@QEBAPEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?getReduction\@BlockReducer\@\@QEBAPEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemStackBase\@\@\@Z */ MCAPI std::vector const * getReduction(class ItemStackBase const &) const; /** - * @symbol ?getReductionMap\@BlockReducer\@\@QEBAAEBV?$unordered_map\@HV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getReductionMap\@BlockReducer\@\@QEBAAEBV?$unordered_map\@HV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getReductionMap() const; /** - * @symbol ?tryGetItemDescriptorFromKey\@BlockReducer\@\@QEBA?AVItemDescriptor\@\@H\@Z + * @symbol ?tryGetItemDescriptorFromKey\@BlockReducer\@\@QEBA?AVItemDescriptor\@\@H\@Z */ MCAPI class ItemDescriptor tryGetItemDescriptorFromKey(int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp b/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp index 2df9be1501..f65fe0eda2 100644 --- a/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockRotationComponent.hpp @@ -30,11 +30,11 @@ struct BlockRotationComponent { public: /** - * @symbol ??0BlockRotationComponent\@\@QEAA\@AEBVVec3\@\@\@Z + * @symbol ??0BlockRotationComponent\@\@QEAA\@AEBVVec3\@\@\@Z */ MCAPI BlockRotationComponent(class Vec3 const &); /** - * @symbol ?setRotationDegrees\@BlockRotationComponent\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setRotationDegrees\@BlockRotationComponent\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setRotationDegrees(class Vec3 const &); diff --git a/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp b/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp index 177ff6133b..78ce7c6bdb 100644 --- a/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockRotationDescription.hpp @@ -30,46 +30,46 @@ struct BlockRotationDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockRotationDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockRotationDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @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 + * @vftbl 2 + * @symbol ?initializeComponent\@BlockRotationDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockRotationDescription\@\@UEBA_NXZ + * @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 + * @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 + * @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 + * @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 + * @symbol ?bindType\@BlockRotationDescription\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp b/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp index 9fd8bb873c..ddbd293303 100644 --- a/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp +++ b/LiteLoader/include/llapi/mc/BlockRotationHelpers.hpp @@ -20,7 +20,7 @@ namespace BlockRotationHelpers { #undef AFTER_EXTRA /** - * @symbol ?fromVec3\@BlockRotationHelpers\@\@YAXAEAUBlockRotationDescription\@\@AEBVVec3\@\@\@Z + * @symbol ?fromVec3\@BlockRotationHelpers\@\@YAXAEAUBlockRotationDescription\@\@AEBVVec3\@\@\@Z */ MCAPI void fromVec3(struct BlockRotationDescription &, class Vec3 const &); diff --git a/LiteLoader/include/llapi/mc/BlockRotationMatrixHelpers.hpp b/LiteLoader/include/llapi/mc/BlockRotationMatrixHelpers.hpp index 815acc72bf..c9dec35b43 100644 --- a/LiteLoader/include/llapi/mc/BlockRotationMatrixHelpers.hpp +++ b/LiteLoader/include/llapi/mc/BlockRotationMatrixHelpers.hpp @@ -17,7 +17,7 @@ namespace BlockRotationMatrixHelpers { #undef AFTER_EXTRA /** - * @symbol ?bakeRotationMatrix\@BlockRotationMatrixHelpers\@\@YA?BVMatrix\@\@HHH\@Z + * @symbol ?bakeRotationMatrix\@BlockRotationMatrixHelpers\@\@YA?BVMatrix\@\@HHH\@Z */ MCAPI class Matrix const bakeRotationMatrix(int, int, int); diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp index 2c2471b88b..9807e0c3fb 100644 --- a/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxDescription.hpp @@ -10,69 +10,66 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockSelectionBoxDescription. - * - */ -struct BlockSelectionBoxDescription { + +class BlockSelectionBoxDescription { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSELECTIONBOXDESCRIPTION public: - struct BlockSelectionBoxDescription& operator=(struct BlockSelectionBoxDescription const &) = delete; - BlockSelectionBoxDescription(struct BlockSelectionBoxDescription const &) = delete; + class BlockSelectionBoxDescription& operator=(class BlockSelectionBoxDescription const &) = delete; + BlockSelectionBoxDescription(class BlockSelectionBoxDescription const &) = delete; BlockSelectionBoxDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockSelectionBoxDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockSelectionBoxDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockSelectionBoxDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockSelectionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockSelectionBoxDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockSelectionBoxDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockSelectionBoxDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockSelectionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockSelectionBoxDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockSelectionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockSelectionBoxDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockSelectionBoxDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockSelectionBoxDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockSelectionBoxDescription\@\@SAXXZ + * @symbol ?bindType\@BlockSelectionBoxDescription\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?registerVersionUpgrades\@BlockSelectionBoxDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@BlockSelectionBoxDescription\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp b/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp index 7df481aef6..c8333e3080 100644 --- a/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelectionBoxProcessor.hpp @@ -29,12 +29,12 @@ class BlockSelectionBoxProcessor { public: /** - * @symbol ?_tryBake\@BlockSelectionBoxProcessor\@\@SAXPEBUBlockRotationComponent\@\@PEAUBlockSelectionBoxComponent\@\@\@Z + * @symbol ?_tryBake\@BlockSelectionBoxProcessor\@\@SAXPEBUBlockRotationComponent\@\@PEAUBlockSelectionBoxComponent\@\@\@Z */ MCAPI static void _tryBake(struct BlockRotationComponent const *, struct BlockSelectionBoxComponent *); /** - * @symbol ?getProcessor\@BlockSelectionBoxProcessor\@\@SA?AV?$unique_ptr\@VEntityComponentProcessor\@Util\@\@U?$default_delete\@VEntityComponentProcessor\@Util\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getProcessor\@BlockSelectionBoxProcessor\@\@SA?AV?$unique_ptr\@VEntityComponentProcessor\@Util\@\@U?$default_delete\@VEntityComponentProcessor\@Util\@\@\@std\@\@\@std\@\@XZ */ MCAPI static std::unique_ptr getProcessor(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSelector.hpp b/LiteLoader/include/llapi/mc/BlockSelector.hpp index b9c9d312de..4b1a4adf24 100644 --- a/LiteLoader/include/llapi/mc/BlockSelector.hpp +++ b/LiteLoader/include/llapi/mc/BlockSelector.hpp @@ -29,5 +29,11 @@ class BlockSelector { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKSELECTOR + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockSelector(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp b/LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp index 0c15d980f7..a78815f93e 100644 --- a/LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp +++ b/LiteLoader/include/llapi/mc/BlockSerializationUtils.hpp @@ -29,23 +29,23 @@ enum class NBTState; #undef AFTER_EXTRA /** - * @symbol ?BLOCK_REPLACE_DATA_MAP\@BlockSerializationUtils\@\@3V?$unordered_map\@VHashedString\@\@V?$function\@$$A6AXHAEAVCompoundTag\@\@\@Z\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$function\@$$A6AXHAEAVCompoundTag\@\@\@Z\@std\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?BLOCK_REPLACE_DATA_MAP\@BlockSerializationUtils\@\@3V?$unordered_map\@VHashedString\@\@V?$function\@$$A6AXHAEAVCompoundTag\@\@\@Z\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$function\@$$A6AXHAEAVCompoundTag\@\@\@Z\@std\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI extern class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> BLOCK_REPLACE_DATA_MAP; /** - * @symbol ?clearBlockReplaceDataMap\@BlockSerializationUtils\@\@YAXXZ + * @symbol ?clearBlockReplaceDataMap\@BlockSerializationUtils\@\@YAXXZ */ MCAPI void clearBlockReplaceDataMap(); /** - * @symbol ?clearNBTToBlockCache\@BlockSerializationUtils\@\@YAXXZ + * @symbol ?clearNBTToBlockCache\@BlockSerializationUtils\@\@YAXXZ */ MCAPI void clearNBTToBlockCache(); /** - * @symbol ?initBlockReplaceDataMap\@BlockSerializationUtils\@\@YAXXZ + * @symbol ?initBlockReplaceDataMap\@BlockSerializationUtils\@\@YAXXZ */ MCAPI void initBlockReplaceDataMap(); /** - * @symbol ?tryGetBlockFromNBT\@BlockSerializationUtils\@\@YA?AU?$pair\@W4NBTState\@BlockSerializationUtils\@\@PEBVBlock\@\@\@std\@\@AEBVCompoundTag\@\@PEAUNbtToBlockCache\@1\@\@Z + * @symbol ?tryGetBlockFromNBT\@BlockSerializationUtils\@\@YA?AU?$pair\@W4NBTState\@BlockSerializationUtils\@\@PEBVBlock\@\@\@std\@\@AEBVCompoundTag\@\@PEAUNbtToBlockCache\@1\@\@Z */ MCAPI struct std::pair tryGetBlockFromNBT(class CompoundTag const &, struct BlockSerializationUtils::NbtToBlockCache *); diff --git a/LiteLoader/include/llapi/mc/BlockSet.hpp b/LiteLoader/include/llapi/mc/BlockSet.hpp index f343937dee..1bda40c083 100644 --- a/LiteLoader/include/llapi/mc/BlockSet.hpp +++ b/LiteLoader/include/llapi/mc/BlockSet.hpp @@ -25,7 +25,7 @@ struct BlockSet { public: /** - * @symbol ??1BlockSet\@\@QEAA\@XZ + * @symbol ??1BlockSet\@\@QEAA\@XZ */ MCAPI ~BlockSet(); diff --git a/LiteLoader/include/llapi/mc/BlockSource.hpp b/LiteLoader/include/llapi/mc/BlockSource.hpp index ee466d77ad..ca8117cfa4 100644 --- a/LiteLoader/include/llapi/mc/BlockSource.hpp +++ b/LiteLoader/include/llapi/mc/BlockSource.hpp @@ -44,9 +44,14 @@ struct ClipParameters * // If ignoreTargetType = true, query results will contain actorTypes other than targets. * bs->queryEntities(ActorType::Creeper, aabb, true); * + * // extendDistance means to the distance to expand outward when querying chunks, depends on the + * size of the collision box of entity you want to query + * * @endcode */ - LIAPI vector queryEntities(ActorType actorType, const AABB& range, bool ignoreTargetType = false); + LIAPI vector queryEntities(ActorType actorType, const AABB& range, bool ignoreTargetType = false, + float extendDistance = 2.0f); + LIAPI vector getEntities(const AABB& range, float extendDistance = 2.0f); #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKSOURCE @@ -58,776 +63,784 @@ struct ClipParameters public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getBlock\@BlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z + * @vftbl 1 + * @symbol ?getBlock\@BlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z */ virtual class Block const & getBlock(int, int, int) const; /** - * @vftbl 2 - * @symbol ?getBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 2 + * @symbol ?getBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlock(class BlockPos const &) const; /** - * @vftbl 3 - * @symbol ?getBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z + * @vftbl 3 + * @symbol ?getBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z */ virtual class Block const & getBlock(class BlockPos const &, unsigned int) const; /** - * @vftbl 4 - * @symbol ?getBlockEntity\@BlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?getBlockEntity\@BlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z */ virtual class BlockActor const * getBlockEntity(class BlockPos const &) const; /** - * @vftbl 5 - * @symbol ?getExtraBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?getExtraBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getExtraBlock(class BlockPos const &) const; /** - * @vftbl 6 - * @symbol ?getLiquidBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 6 + * @symbol ?getLiquidBlock\@BlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getLiquidBlock(class BlockPos const &) const; /** - * @vftbl 7 - * @symbol ?hasBlock\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 7 + * @symbol ?hasBlock\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool hasBlock(class BlockPos const &) const; /** - * @vftbl 8 - * @symbol ?containsAnyLiquid\@BlockSource\@\@UEBA_NAEBVAABB\@\@\@Z + * @vftbl 8 + * @symbol ?containsAnyLiquid\@BlockSource\@\@UEBA_NAEBVAABB\@\@\@Z */ virtual bool containsAnyLiquid(class AABB const &) const; /** - * @vftbl 9 - * @symbol ?containsMaterial\@BlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z + * @vftbl 9 + * @symbol ?containsMaterial\@BlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z */ virtual bool containsMaterial(class AABB const &, enum class MaterialType) const; /** - * @vftbl 10 - * @symbol ?getMaterial\@BlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z + * @vftbl 10 + * @symbol ?getMaterial\@BlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z */ virtual class Material const & getMaterial(class BlockPos const &) const; /** - * @vftbl 11 - * @symbol ?getMaterial\@BlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z + * @vftbl 11 + * @symbol ?getMaterial\@BlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z */ virtual class Material const & getMaterial(int, int, int) const; /** - * @vftbl 12 - * @symbol ?hasChunksAt\@BlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z + * @vftbl 12 + * @symbol ?hasChunksAt\@BlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z */ virtual bool hasChunksAt(struct Bounds const &, bool) const; /** - * @vftbl 13 - * @symbol ?hasChunksAt\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z + * @vftbl 13 + * @symbol ?hasChunksAt\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z */ virtual bool hasChunksAt(class BlockPos const &, int, bool) const; /** - * @vftbl 14 - * @symbol ?hasChunksAt\@BlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z + * @vftbl 14 + * @symbol ?hasChunksAt\@BlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z */ virtual bool hasChunksAt(class AABB const &, bool) const; /** - * @vftbl 15 - * @symbol ?getDimensionId\@BlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @vftbl 15 + * @symbol ?getDimensionId\@BlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ virtual class AutomaticID getDimensionId() const; /** - * @vftbl 16 - * @symbol ?fetchAABBs\@BlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z + * @vftbl 16 + * @symbol ?fetchAABBs\@BlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z */ virtual void fetchAABBs(std::vector &, class AABB const &, bool) const; /** - * @vftbl 17 - * @symbol ?fetchCollisionShapes\@BlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 17 + * @symbol ?fetchCollisionShapes\@BlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual void fetchCollisionShapes(std::vector &, class AABB const &, float *, bool, class optional_ref) const; /** - * @vftbl 18 - * @symbol ?getTallestCollisionShape\@BlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 18 + * @symbol ?getTallestCollisionShape\@BlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual class AABB getTallestCollisionShape(class AABB const &, float *, bool, class optional_ref) const; /** - * @vftbl 19 - * @symbol ?getBrightness\@BlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z + * @vftbl 19 + * @symbol ?getBrightness\@BlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z */ virtual float getBrightness(class BlockPos const &) const; /** - * @vftbl 20 - * @symbol ?fetchAABBs\@BlockSource\@\@UEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z + * @vftbl 20 + * @symbol ?fetchAABBs\@BlockSource\@\@UEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z */ virtual std::vector & fetchAABBs(class AABB const &, bool); /** - * @vftbl 21 - * @symbol ?fetchCollisionShapes\@BlockSource\@\@UEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NPEAUIActorMovementProxy\@\@\@Z + * @vftbl 21 + * @symbol ?fetchCollisionShapes\@BlockSource\@\@UEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NPEAUIActorMovementProxy\@\@\@Z */ virtual std::vector & fetchCollisionShapes(class AABB const &, float *, bool, struct IActorMovementProxy *); /** - * @vftbl 22 - * @symbol ?getWeakRef\@BlockSource\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ + * @vftbl 22 + * @symbol ?getWeakRef\@BlockSource\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ */ virtual class WeakRefT> getWeakRef(); /** - * @vftbl 23 - * @symbol ?addListener\@BlockSource\@\@UEAAXAEAVBlockSourceListener\@\@\@Z + * @vftbl 23 + * @symbol ?addListener\@BlockSource\@\@UEAAXAEAVBlockSourceListener\@\@\@Z */ virtual void addListener(class BlockSourceListener &); /** - * @vftbl 24 - * @symbol ?removeListener\@BlockSource\@\@UEAAXAEAVBlockSourceListener\@\@\@Z + * @vftbl 24 + * @symbol ?removeListener\@BlockSource\@\@UEAAXAEAVBlockSourceListener\@\@\@Z */ virtual void removeListener(class BlockSourceListener &); /** - * @vftbl 25 - * @symbol ?fetchEntities\@BlockSource\@\@UEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@PEBVActor\@\@AEBVAABB\@\@_N2\@Z + * @vftbl 25 + * @symbol ?fetchEntities\@BlockSource\@\@UEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@PEBVActor\@\@AEBVAABB\@\@_N2\@Z */ 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 + * @vftbl 26 + * @symbol ?fetchEntities\@BlockSource\@\@UEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@W4ActorType\@\@AEBVAABB\@\@PEBVActor\@\@\@Z */ virtual class gsl::span, -1> fetchEntities(enum class ActorType, class AABB const &, class Actor const *); /** - * @vftbl 27 - * @symbol ?setBlock\@BlockSource\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HPEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z + * @vftbl 27 + * @symbol ?setBlock\@BlockSource\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HPEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z */ virtual bool setBlock(class BlockPos const &, class Block const &, int, struct ActorBlockSyncMessage const *, class Actor *); /** - * @vftbl 28 - * @symbol ?getMaxHeight\@BlockSource\@\@UEBAFXZ + * @vftbl 28 + * @symbol ?getMaxHeight\@BlockSource\@\@UEBAFXZ */ virtual short getMaxHeight() const; /** - * @vftbl 29 - * @symbol ?getMinHeight\@BlockSource\@\@UEBAFXZ + * @vftbl 29 + * @symbol ?getMinHeight\@BlockSource\@\@UEBAFXZ */ virtual short getMinHeight() const; /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol ?getChunkAt\@BlockSource\@\@UEBAPEAVLevelChunk\@\@AEBVBlockPos\@\@\@Z + * @vftbl 33 + * @symbol ?getChunkAt\@BlockSource\@\@UEBAPEAVLevelChunk\@\@AEBVBlockPos\@\@\@Z */ virtual class LevelChunk * getChunkAt(class BlockPos const &) const; /** - * @vftbl 34 - * @symbol ?getILevel\@BlockSource\@\@UEBAAEAVILevel\@\@XZ + * @vftbl 34 + * @symbol ?getILevel\@BlockSource\@\@UEBAAEAVILevel\@\@XZ */ virtual class ILevel & getILevel() const; /** - * @vftbl 35 - * @symbol ?getChunkSource\@BlockSource\@\@UEAAAEAVChunkSource\@\@XZ + * @vftbl 35 + * @symbol ?getChunkSource\@BlockSource\@\@UEAAAEAVChunkSource\@\@XZ */ virtual class ChunkSource & getChunkSource(); /** - * @vftbl 36 - * @symbol ?isSolidBlockingBlock\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 36 + * @symbol ?isSolidBlockingBlock\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool isSolidBlockingBlock(class BlockPos const &) const; /** - * @vftbl 37 - * @symbol ?isSolidBlockingBlock\@BlockSource\@\@UEBA_NHHH\@Z + * @vftbl 37 + * @symbol ?isSolidBlockingBlock\@BlockSource\@\@UEBA_NHHH\@Z */ virtual bool isSolidBlockingBlock(int, int, int) const; /** - * @vftbl 38 - * @symbol ?areChunksFullyLoaded\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@H\@Z + * @vftbl 38 + * @symbol ?areChunksFullyLoaded\@BlockSource\@\@UEBA_NAEBVBlockPos\@\@H\@Z */ virtual bool areChunksFullyLoaded(class BlockPos const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKSOURCE /** - * @symbol ?getDimension\@BlockSource\@\@UEAAAEAVDimension\@\@XZ + * @symbol ?getDimension\@BlockSource\@\@UEAAAEAVDimension\@\@XZ */ MCVAPI class Dimension & getDimension(); /** - * @symbol ?getDimension\@BlockSource\@\@UEBAAEAVDimension\@\@XZ + * @symbol ?getDimension\@BlockSource\@\@UEBAAEAVDimension\@\@XZ */ MCVAPI class Dimension & getDimension() const; /** - * @symbol ?getDimensionConst\@BlockSource\@\@UEBAAEBVDimension\@\@XZ + * @symbol ?getDimensionConst\@BlockSource\@\@UEBAAEBVDimension\@\@XZ */ MCVAPI class Dimension const & getDimensionConst() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockSource(); #endif /** - * @symbol ??0BlockSource\@\@QEAA\@AEAVLevel\@\@AEAVDimension\@\@AEAVChunkSource\@\@_N33\@Z + * @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 + * @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 + * @symbol ?_fetchEntities\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@PEBUIActorMovementProxy\@\@AEBVAABB\@\@_N\@Z */ MCAPI class gsl::span, -1> _fetchEntities(struct IActorMovementProxy const *, class AABB const &, bool); /** - * @symbol ?addToRandomTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH_N\@Z + * @symbol ?addToRandomTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH_N\@Z */ MCAPI void addToRandomTickingQueue(class BlockPos const &, class Block const &, int, int, bool); /** - * @symbol ?addToRandomTickingQueuePercentChance\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@MH_N\@Z + * @symbol ?addToRandomTickingQueuePercentChance\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@MH_N\@Z */ MCAPI void addToRandomTickingQueuePercentChance(class BlockPos const &, class Block const &, float, int, bool); /** - * @symbol ?addToTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH_N\@Z + * @symbol ?addToTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH_N\@Z */ MCAPI void addToTickingQueue(class BlockPos const &, class Block const &, int, int, bool); /** - * @symbol ?allowsRunes\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?allowsRunes\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool allowsRunes(class BlockPos const &); /** - * @symbol ?areAllChunksLoaded\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z + * @symbol ?areAllChunksLoaded\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z */ MCAPI bool areAllChunksLoaded(class BlockPos const &, class BlockVolume &) const; /** - * @symbol ?areChunksFullyLoaded\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0\@Z + * @symbol ?areChunksFullyLoaded\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0\@Z */ MCAPI bool areChunksFullyLoaded(class BlockPos const &, class BlockPos const &) const; /** - * @symbol ?blockEvent\@BlockSource\@\@QEAAXAEBVBlockPos\@\@HH\@Z + * @symbol ?blockEvent\@BlockSource\@\@QEAAXAEBVBlockPos\@\@HH\@Z */ MCAPI void blockEvent(class BlockPos const &, int, int); /** - * @symbol ?canProvideSupport\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@EW4BlockSupportType\@\@\@Z + * @symbol ?canProvideSupport\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@EW4BlockSupportType\@\@\@Z */ MCAPI bool canProvideSupport(class BlockPos const &, unsigned char, enum class BlockSupportType) const; /** - * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool canSeeSky(class BlockPos const &) const; /** - * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NHHH\@Z + * @symbol ?canSeeSky\@BlockSource\@\@QEBA_NHHH\@Z */ MCAPI bool canSeeSky(int, int, int) const; /** - * @symbol ?canSeeSkyFromBelowWater\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?canSeeSkyFromBelowWater\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool canSeeSkyFromBelowWater(class BlockPos const &); /** - * @symbol ?checkBlockDestroyPermissions\@BlockSource\@\@QEAA_NAEAVActor\@\@AEBVBlockPos\@\@AEBVItemStackBase\@\@_N\@Z + * @symbol ?checkBlockDestroyPermissions\@BlockSource\@\@QEAA_NAEAVActor\@\@AEBVBlockPos\@\@AEBVItemStackBase\@\@_N\@Z */ MCAPI bool checkBlockDestroyPermissions(class Actor &, class BlockPos const &, class ItemStackBase const &, bool); /** - * @symbol ?checkBlockPermissions\@BlockSource\@\@QEAA_NAEAVActor\@\@AEBVBlockPos\@\@EAEBVItemStackBase\@\@_N\@Z + * @symbol ?checkBlockPermissions\@BlockSource\@\@QEAA_NAEAVActor\@\@AEBVBlockPos\@\@EAEBVItemStackBase\@\@_N\@Z */ MCAPI bool checkBlockPermissions(class Actor &, class BlockPos const &, unsigned char, class ItemStackBase const &, bool); /** - * @symbol ?checkValidity\@BlockSource\@\@QEBAXXZ + * @symbol ?checkValidity\@BlockSource\@\@QEBAXXZ */ MCAPI void checkValidity() const; /** - * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBUClipParameters\@\@\@Z + * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBVVec3\@\@0_N1H11PEAVPlayer\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z */ - MCAPI class HitResult clip(struct ClipParameters const &) const; + 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\@\@AEBVVec3\@\@0_N1H11PEAVPlayer\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z + * @symbol ?clip\@BlockSource\@\@QEBA?AVHitResult\@\@AEBUClipParameters\@\@\@Z */ - MCAPI class HitResult clip(class Vec3 const &, class Vec3 const &, bool, bool, int, bool, bool, class Player *, class std::function const &) const; + MCAPI class HitResult clip(struct ClipParameters const &) const; /** - * @symbol ?containsAnyBlockInBox\@BlockSource\@\@QEAA_NAEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?containsAnyBlockInBox\@BlockSource\@\@QEAA_NAEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI bool containsAnyBlockInBox(class BoundingBox const &, class std::function); /** - * @symbol ?containsAnyBlockOfType\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0AEBVBlock\@\@\@Z + * @symbol ?containsAnyBlockOfType\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0AEBVBlock\@\@\@Z */ MCAPI bool containsAnyBlockOfType(class BlockPos const &, class BlockPos const &, class Block const &) const; /** - * @symbol ?containsAnySolidBlocking\@BlockSource\@\@QEBA_NAEBVAABB\@\@\@Z + * @symbol ?containsAnySolidBlocking\@BlockSource\@\@QEBA_NAEBVAABB\@\@\@Z */ MCAPI bool containsAnySolidBlocking(class AABB const &) const; /** - * @symbol ?countBlocksOfType\@BlockSource\@\@QEBA_KAEBVBlockDescriptor\@\@AEBVBlockPos\@\@1_K\@Z + * @symbol ?countBlocksOfType\@BlockSource\@\@QEBA_KAEBVBlockDescriptor\@\@AEBVBlockPos\@\@1_K\@Z */ MCAPI unsigned __int64 countBlocksOfType(class BlockDescriptor const &, class BlockPos const &, class BlockPos const &, unsigned __int64) const; /** - * @symbol ?fetchActorIds\@BlockSource\@\@QEBAXAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?fetchActorIds\@BlockSource\@\@QEBAX_KAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI void fetchActorIds(class AABB const &, std::vector &) const; + MCAPI void fetchActorIds(unsigned __int64, class AABB const &, std::vector &) const; /** - * @symbol ?fetchActorIds\@BlockSource\@\@QEBAX_KAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?fetchActorIds\@BlockSource\@\@QEBAXAEBVAABB\@\@AEAV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI void fetchActorIds(unsigned __int64, class AABB const &, std::vector &) const; + MCAPI void fetchActorIds(class AABB const &, std::vector &) const; /** - * @symbol ?fetchActors\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@\@Z + * @symbol ?fetchActors\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@\@Z */ MCAPI class gsl::span, -1> fetchActors(struct ActorDefinitionIdentifier const &, class AABB const &); /** - * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAAEBV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z + * @symbol ?fetchBlockEntities\@BlockSource\@\@QEBA?AV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@W4BlockActorType\@\@AEBVAABB\@\@\@Z */ - MCAPI std::vector const & fetchBlockEntities(class AABB const &); + MCAPI std::vector fetchBlockEntities(enum class BlockActorType, class AABB const &) const; /** - * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAXAEBVAABB\@\@AEAV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAAEBV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z */ - MCAPI void fetchBlockEntities(class AABB const &, std::vector &, bool); + MCAPI std::vector const & fetchBlockEntities(class AABB const &); /** - * @symbol ?fetchBlockEntities\@BlockSource\@\@QEBA?AV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@W4BlockActorType\@\@AEBVAABB\@\@\@Z + * @symbol ?fetchBlockEntities\@BlockSource\@\@QEAAXAEBVAABB\@\@AEAV?$vector\@PEAVBlockActor\@\@V?$allocator\@PEAVBlockActor\@\@\@std\@\@\@std\@\@_N\@Z */ - MCAPI std::vector fetchBlockEntities(enum class BlockActorType, class AABB const &) const; + MCAPI void fetchBlockEntities(class AABB const &, std::vector &, bool); /** - * @symbol ?fetchBlocks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z + * @symbol ?fetchBlocks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z */ MCAPI bool fetchBlocks(class BlockPos const &, class BlockVolume &) const; /** - * @symbol ?fetchBlocksInBox\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?fetchBlocksInBox\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI class gsl::span const, -1> fetchBlocksInBox(class BoundingBox const &, class std::function); /** - * @symbol ?fetchBlocksInBoxSorted\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?fetchBlocksInBoxSorted\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI class gsl::span const, -1> fetchBlocksInBoxSorted(class BoundingBox const &, class std::function); /** - * @symbol ?fetchBlocksInCylinder\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBlockPos\@\@IIV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?fetchBlocksInCylinder\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBlockPos\@\@IIV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI class gsl::span const, -1> fetchBlocksInCylinder(class BlockPos const &, unsigned int, unsigned int, class std::function); /** - * @symbol ?fetchBlocksInCylinderSorted\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBlockPos\@\@IIV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @symbol ?fetchBlocksInCylinderSorted\@BlockSource\@\@QEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBlockPos\@\@IIV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ MCAPI class gsl::span const, -1> fetchBlocksInCylinderSorted(class BlockPos const &, unsigned int, unsigned int, class std::function); /** - * @symbol ?fetchEntities\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@3\@AEBVAABB\@\@_N2\@Z + * @symbol ?fetchEntities\@BlockSource\@\@QEAA?AV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@3\@AEBVAABB\@\@_N2\@Z */ MCAPI class gsl::span, -1> fetchEntities(class gsl::span, -1>, class AABB const &, bool, bool); /** - * @symbol ?fetchEntities2\@BlockSource\@\@QEAAAEBV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@W4ActorType\@\@AEBVAABB\@\@_N\@Z + * @symbol ?fetchEntities2\@BlockSource\@\@QEAAAEBV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@W4ActorType\@\@AEBVAABB\@\@_N\@Z */ MCAPI std::vector const & fetchEntities2(enum class ActorType, class AABB const &, bool); /** - * @symbol ?fetchNearestEntityOfType\@BlockSource\@\@QEAAPEAVActor\@\@PEBV2\@AEBVAABB\@\@W4ActorType\@\@\@Z + * @symbol ?fetchNearestEntityOfType\@BlockSource\@\@QEAAPEAVActor\@\@PEBV2\@AEBVAABB\@\@W4ActorType\@\@\@Z */ MCAPI class Actor * fetchNearestEntityOfType(class Actor const *, class AABB const &, enum class ActorType); /** - * @symbol ?findNextTopSolidBlockAbove\@BlockSource\@\@QEAA_NAEAVBlockPos\@\@\@Z + * @symbol ?findNextTopSolidBlockAbove\@BlockSource\@\@QEAA_NAEAVBlockPos\@\@\@Z */ MCAPI bool findNextTopSolidBlockAbove(class BlockPos &); /** - * @symbol ?findNextTopSolidBlockUnder\@BlockSource\@\@QEAA_NAEAVBlockPos\@\@\@Z + * @symbol ?findNextTopSolidBlockUnder\@BlockSource\@\@QEAA_NAEAVBlockPos\@\@\@Z */ MCAPI bool findNextTopSolidBlockUnder(class BlockPos &); /** - * @symbol ?fireAreaChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0\@Z + * @symbol ?fireAreaChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0\@Z */ MCAPI void fireAreaChanged(class BlockPos const &, class BlockPos const &); /** - * @symbol ?fireBlockChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@IAEBVBlock\@\@1HW4BlockChangedEventTarget\@\@PEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z + * @symbol ?fireBlockChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@IAEBVBlock\@\@1HW4BlockChangedEventTarget\@\@PEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z */ MCAPI void fireBlockChanged(class BlockPos const &, unsigned int, class Block const &, class Block const &, int, enum class BlockChangedEventTarget, struct ActorBlockSyncMessage const *, class Actor *); /** - * @symbol ?fireBlockEntityAboutToBeRemoved\@BlockSource\@\@QEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z + * @symbol ?fireBlockEntityAboutToBeRemoved\@BlockSource\@\@QEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z */ MCAPI void fireBlockEntityAboutToBeRemoved(class std::shared_ptr); /** - * @symbol ?fireBlockEntityChanged\@BlockSource\@\@QEAAXAEAVBlockActor\@\@\@Z + * @symbol ?fireBlockEntityChanged\@BlockSource\@\@QEAAXAEAVBlockActor\@\@\@Z */ MCAPI void fireBlockEntityChanged(class BlockActor &); /** - * @symbol ?fireBrightnessChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?fireBrightnessChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void fireBrightnessChanged(class BlockPos const &); /** - * @symbol ?fireEntityChanged\@BlockSource\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?fireEntityChanged\@BlockSource\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void fireEntityChanged(class Actor &); /** - * @symbol ?getAABBFetchResultCache\@BlockSource\@\@QEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAABBFetchResultCache\@BlockSource\@\@QEAAAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getAABBFetchResultCache(); /** - * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z + * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z */ - MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool); + MCAPI short getAboveTopSolidBlock(int, int, bool, bool); /** - * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFHH_N0\@Z + * @symbol ?getAboveTopSolidBlock\@BlockSource\@\@QEAAFAEBVBlockPos\@\@_N1\@Z */ - MCAPI short getAboveTopSolidBlock(int, int, bool, bool); + MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool); /** - * @symbol ?getAllocatedHeightAt\@BlockSource\@\@QEAAFAEBVBlockPos\@\@\@Z + * @symbol ?getAllocatedHeightAt\@BlockSource\@\@QEAAFAEBVBlockPos\@\@\@Z */ MCAPI short getAllocatedHeightAt(class BlockPos const &); /** - * @symbol ?getBiome\@BlockSource\@\@QEAAAEAVBiome\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBiome\@BlockSource\@\@QEAAAEAVBiome\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Biome & getBiome(class BlockPos const &); /** - * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI class BlockActor * getBlockEntity(class BlockPos const &); /** - * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@HHH\@Z + * @symbol ?getBlockEntity\@BlockSource\@\@QEAAPEAVBlockActor\@\@HHH\@Z */ MCAPI class BlockActor * getBlockEntity(int, int, int); /** - * @symbol ?getBrightnessPair\@BlockSource\@\@QEBA?AUBrightnessPair\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBrightnessPair\@BlockSource\@\@QEBA?AUBrightnessPair\@\@AEBVBlockPos\@\@\@Z */ MCAPI struct BrightnessPair getBrightnessPair(class BlockPos const &) const; /** - * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z + * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@HH\@Z */ - MCAPI class LevelChunk * getChunk(class ChunkPos const &) const; + MCAPI class LevelChunk * getChunk(int, int) const; /** - * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@HH\@Z + * @symbol ?getChunk\@BlockSource\@\@QEBAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z */ - MCAPI class LevelChunk * getChunk(int, int) const; + MCAPI class LevelChunk * getChunk(class ChunkPos const &) const; /** - * @symbol ?getConstBiome\@BlockSource\@\@QEBAAEBVBiome\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getConstBiome\@BlockSource\@\@QEBAAEBVBiome\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Biome const & getConstBiome(class BlockPos const &) const; /** - * @symbol ?getDefaultBrightness\@BlockSource\@\@QEBA?AUBrightnessPair\@\@XZ + * @symbol ?getDefaultBrightness\@BlockSource\@\@QEBA?AUBrightnessPair\@\@XZ */ MCAPI struct BrightnessPair getDefaultBrightness() const; /** - * @symbol ?getGrassColor\@BlockSource\@\@QEBAHAEBVBlockPos\@\@\@Z + * @symbol ?getGrassColor\@BlockSource\@\@QEBAHAEBVBlockPos\@\@\@Z */ MCAPI int getGrassColor(class BlockPos const &) const; /** - * @symbol ?getHeightmap\@BlockSource\@\@QEAAFHH\@Z + * @symbol ?getHeightmap\@BlockSource\@\@QEAAFHH\@Z */ MCAPI short getHeightmap(int, int); /** - * @symbol ?getHeightmap\@BlockSource\@\@QEBAFAEBVBlockPos\@\@\@Z + * @symbol ?getHeightmap\@BlockSource\@\@QEBAFAEBVBlockPos\@\@\@Z */ MCAPI short getHeightmap(class BlockPos const &) const; /** - * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?getHeightmapPos\@BlockSource\@\@QEBA?AVBlockPos\@\@AEBV2\@\@Z */ MCAPI class BlockPos getHeightmapPos(class BlockPos const &) const; /** - * @symbol ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ + * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ */ - MCAPI class Level & getLevel() const; + MCAPI class Level & getLevel(); /** - * @symbol ?getLevel\@BlockSource\@\@QEAAAEAVLevel\@\@XZ + * @symbol ?getLevel\@BlockSource\@\@QEBAAEAVLevel\@\@XZ */ - MCAPI class Level & getLevel(); + MCAPI class Level & getLevel() const; /** - * @symbol ?getLevelConst\@BlockSource\@\@QEBAAEBVLevel\@\@XZ + * @symbol ?getLevelConst\@BlockSource\@\@QEBAAEBVLevel\@\@XZ */ MCAPI class Level const & getLevelConst() const; /** - * @symbol ?getNextTickUpdateForPos\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@AEAUTick\@\@\@Z + * @symbol ?getNextTickUpdateForPos\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@AEAUTick\@\@\@Z */ MCAPI bool getNextTickUpdateForPos(class BlockPos const &, enum class TickingQueueType, struct Tick &) const; /** - * @symbol ?getPublicSource\@BlockSource\@\@QEBA_NXZ + * @symbol ?getPublicSource\@BlockSource\@\@QEBA_NXZ */ MCAPI bool getPublicSource() const; /** - * @symbol ?getRawBrightness\@BlockSource\@\@QEBA?AUBrightness\@\@AEBVBlockPos\@\@_N1\@Z + * @symbol ?getRawBrightness\@BlockSource\@\@QEBA?AUBrightness\@\@AEBVBlockPos\@\@_N1\@Z */ MCAPI struct Brightness getRawBrightness(class BlockPos const &, bool, bool) const; /** - * @symbol ?getRawBrightnessWithManualDarken\@BlockSource\@\@QEBA?AUBrightness\@\@AEBVBlockPos\@\@U2\@_N2\@Z + * @symbol ?getRawBrightnessWithManualDarken\@BlockSource\@\@QEBA?AUBrightness\@\@AEBVBlockPos\@\@U2\@_N2\@Z */ MCAPI struct Brightness getRawBrightnessWithManualDarken(class BlockPos const &, struct Brightness, bool, bool) const; /** - * @symbol ?getSeenPercent\@BlockSource\@\@QEAAMAEBVVec3\@\@AEBVAABB\@\@\@Z + * @symbol ?getSeenPercent\@BlockSource\@\@QEAAMAEBVVec3\@\@AEBVAABB\@\@\@Z */ MCAPI float getSeenPercent(class Vec3 const &, class AABB const &); /** - * @symbol ?getTickingQueue\@BlockSource\@\@QEBAPEAVBlockTickingQueue\@\@AEBVBlockPos\@\@W4TickingQueueType\@\@_N\@Z + * @symbol ?getTickingQueue\@BlockSource\@\@QEBAPEAVBlockTickingQueue\@\@AEBVBlockPos\@\@W4TickingQueueType\@\@_N\@Z */ MCAPI class BlockTickingQueue * getTickingQueue(class BlockPos const &, enum class TickingQueueType, bool) const; /** - * @symbol ?getVoidHeight\@BlockSource\@\@QEBAFXZ + * @symbol ?getVoidHeight\@BlockSource\@\@QEBAFXZ */ MCAPI short getVoidHeight() const; /** - * @symbol ?getWritableChunk\@BlockSource\@\@QEAAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z + * @symbol ?getWritableChunk\@BlockSource\@\@QEAAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z */ MCAPI class LevelChunk * getWritableChunk(class ChunkPos const &); /** - * @symbol ?hasBorderBlock\@BlockSource\@\@QEBA_NVBlockPos\@\@\@Z + * @symbol ?hasBorderBlock\@BlockSource\@\@QEBA_NVBlockPos\@\@\@Z */ MCAPI bool hasBorderBlock(class BlockPos) const; /** - * @symbol ?hasChunksAt\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0_N\@Z + * @symbol ?hasChunksAt\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@0_N\@Z */ MCAPI bool hasChunksAt(class BlockPos const &, class BlockPos const &, bool) const; /** - * @symbol ?hasSubChunksAt\@BlockSource\@\@QEBA?AU?$pair\@_NV?$optional\@VSubChunkPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0\@Z + * @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\@\@\@Z + * @symbol ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool hasTickInCurrentTick(class BlockPos const &) const; /** - * @symbol ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInCurrentTick\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z */ MCAPI bool hasTickInCurrentTick(class BlockPos const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class Block const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &, class BlockLegacy const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4TickingQueueType\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ - MCAPI bool hasTickInPendingTicks(class BlockPos const &, enum class TickingQueueType) const; + MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; /** - * @symbol ?hasUntickedNeighborChunk\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@H\@Z + * @symbol ?hasUntickedNeighborChunk\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@H\@Z */ MCAPI bool hasUntickedNeighborChunk(class ChunkPos const &, int) const; /** - * @symbol ?isChunkFullyLoaded\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@AEBVChunkSource\@\@\@Z + * @symbol ?isChunkFullyLoaded\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@AEBVChunkSource\@\@\@Z */ MCAPI bool isChunkFullyLoaded(class ChunkPos const &, class ChunkSource const &) const; /** - * @symbol ?isConsideredSolidBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?isConsideredSolidBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isConsideredSolidBlock(class BlockPos const &); /** - * @symbol ?isEmptyBlock\@BlockSource\@\@QEAA_NHHH\@Z + * @symbol ?isEmptyBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ - MCAPI bool isEmptyBlock(int, int, int); + MCAPI bool isEmptyBlock(class BlockPos const &) const; /** - * @symbol ?isEmptyBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?isEmptyBlock\@BlockSource\@\@QEAA_NHHH\@Z */ - MCAPI bool isEmptyBlock(class BlockPos const &) const; + MCAPI bool isEmptyBlock(int, int, int); /** - * @symbol ?isEmptyWaterBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?isEmptyWaterBlock\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isEmptyWaterBlock(class BlockPos const &) const; /** - * @symbol ?isInWall\@BlockSource\@\@QEAA_NAEBVVec3\@\@\@Z + * @symbol ?isInWall\@BlockSource\@\@QEAA_NAEBVVec3\@\@\@Z */ MCAPI bool isInWall(class Vec3 const &); /** - * @symbol ?isInstaticking\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?isInstaticking\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isInstaticking(class BlockPos const &) const; /** - * @symbol ?isNearUnloadedChunks\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@\@Z + * @symbol ?isNearUnloadedChunks\@BlockSource\@\@QEBA_NAEBVChunkPos\@\@\@Z */ MCAPI bool isNearUnloadedChunks(class ChunkPos const &) const; /** - * @symbol ?isTouchingMaterial\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4MaterialType\@\@\@Z + * @symbol ?isTouchingMaterial\@BlockSource\@\@QEBA_NAEBVBlockPos\@\@W4MaterialType\@\@\@Z */ MCAPI bool isTouchingMaterial(class BlockPos const &, enum class MaterialType) const; /** - * @symbol ?isUnderWater\@BlockSource\@\@QEBA_NAEBVVec3\@\@AEBVBlock\@\@\@Z + * @symbol ?isUnderWater\@BlockSource\@\@QEBA_NAEBVVec3\@\@AEBVBlock\@\@\@Z */ MCAPI bool isUnderWater(class Vec3 const &, class Block const &) const; /** - * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@PEBVActor\@\@\@Z + * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@PEBVActor\@\@\@Z */ MCAPI bool isUnobstructedByEntities(class AABB const &, class Actor const *); /** - * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z + * @symbol ?isUnobstructedByEntities\@BlockSource\@\@QEAA_NAEBVAABB\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z */ MCAPI bool isUnobstructedByEntities(class AABB const &, class gsl::span, -1>); /** - * @symbol ?isWithinHeightLimits\@BlockSource\@\@QEBA_NH\@Z + * @symbol ?isWithinHeightLimits\@BlockSource\@\@QEBA_NH\@Z */ MCAPI bool isWithinHeightLimits(int) const; /** - * @symbol ?mayPlace\@BlockSource\@\@QEAA_NAEBVBlock\@\@AEBVBlockPos\@\@EPEAVActor\@\@_N\@Z + * @symbol ?mayPlace\@BlockSource\@\@QEAA_NAEBVBlock\@\@AEBVBlockPos\@\@EPEAVActor\@\@_NVVec3\@\@\@Z */ - MCAPI bool mayPlace(class Block const &, class BlockPos const &, unsigned char, class Actor *, bool); + MCAPI bool mayPlace(class Block const &, class BlockPos const &, unsigned char, class Actor *, bool, class Vec3); /** - * @symbol ?neighborChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0\@Z + * @symbol ?neighborChanged\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0\@Z */ MCAPI void neighborChanged(class BlockPos const &, class BlockPos const &); /** - * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z - */ - MCAPI void postGameEvent(class Actor *, class GameEvent const &, class BlockPos const &, class Block const *); - /** - * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z + * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z */ MCAPI void postGameEvent(class Actor *, class GameEvent const &, class Vec3 const &, class Block const *); /** - * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?postGameEvent\@BlockSource\@\@QEAAXPEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z */ - MCAPI bool removeBlock(class BlockPos const &); + MCAPI void postGameEvent(class Actor *, class GameEvent const &, class BlockPos const &, class Block const *); /** - * @symbol ?removeBlock\@BlockSource\@\@QEAA_NHHH\@Z + * @symbol ?removeBlock\@BlockSource\@\@QEAA_NHHH\@Z */ MCAPI bool removeBlock(int, int, int); /** - * @symbol ?removeBlockEntity\@BlockSource\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?removeBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@\@Z + */ + MCAPI bool removeBlock(class BlockPos const &); + /** + * @symbol ?removeBlockEntity\@BlockSource\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::shared_ptr removeBlockEntity(class BlockPos const &); /** - * @symbol ?removeFromRandomTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?removeFromRandomTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void removeFromRandomTickingQueue(class BlockPos const &, class Block const &); /** - * @symbol ?removeFromTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?removeFromTickingQueue\@BlockSource\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void removeFromTickingQueue(class BlockPos const &, class Block const &); /** - * @symbol ?setBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@HV?$shared_ptr\@VBlockActor\@\@\@std\@\@PEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z + * @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 + * @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 + * @symbol ?setBlockNoUpdate\@BlockSource\@\@QEAA_NHHHAEBVBlock\@\@\@Z */ MCAPI bool setBlockNoUpdate(int, int, int, class Block const &); /** - * @symbol ?setBlockSimple\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?setBlockSimple\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool setBlockSimple(class BlockPos const &, class Block const &); /** - * @symbol ?setBorderBlock\@BlockSource\@\@QEAAXAEBVBlockPos\@\@_N\@Z + * @symbol ?setBorderBlock\@BlockSource\@\@QEAAXAEBVBlockPos\@\@_N\@Z */ MCAPI void setBorderBlock(class BlockPos const &, bool); /** - * @symbol ?setCurrentTickForValidityChecks\@BlockSource\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?setCurrentTickForValidityChecks\@BlockSource\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void setCurrentTickForValidityChecks(struct Tick const &); /** - * @symbol ?setExtraBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @symbol ?setExtraBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ MCAPI bool setExtraBlock(class BlockPos const &, class Block const &, int); /** - * @symbol ?setExtraBlockSimple\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?setExtraBlockSimple\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool setExtraBlockSimple(class BlockPos const &, class Block const &); /** - * @symbol ?setIsPersistentBlockSource\@BlockSource\@\@QEAAXXZ + * @symbol ?setIsPersistentBlockSource\@BlockSource\@\@QEAAXXZ */ MCAPI void setIsPersistentBlockSource(); /** - * @symbol ?setLiquidBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@_NH\@Z + * @symbol ?setLiquidBlock\@BlockSource\@\@QEAA_NAEBVBlockPos\@\@AEBVBlock\@\@_NH\@Z */ MCAPI bool setLiquidBlock(class BlockPos const &, class Block const &, bool, int); /** - * @symbol ?setRandomTickingQueue\@BlockSource\@\@QEAAXAEAVBlockTickingQueue\@\@\@Z + * @symbol ?setRandomTickingQueue\@BlockSource\@\@QEAAXAEAVBlockTickingQueue\@\@\@Z */ MCAPI void setRandomTickingQueue(class BlockTickingQueue &); /** - * @symbol ?setTickingQueue\@BlockSource\@\@QEAAXAEAVBlockTickingQueue\@\@\@Z + * @symbol ?setTickingQueue\@BlockSource\@\@QEAAXAEAVBlockTickingQueue\@\@\@Z */ MCAPI void setTickingQueue(class BlockTickingQueue &); /** - * @symbol ?shouldFireEvents\@BlockSource\@\@QEBA_NAEAVLevelChunk\@\@\@Z + * @symbol ?shouldFireEvents\@BlockSource\@\@QEBA_NAEAVLevelChunk\@\@\@Z */ MCAPI bool shouldFireEvents(class LevelChunk &) const; /** - * @symbol ?ticksFromNow\@BlockSource\@\@QEBAHAEBVBlockPos\@\@W4TickingQueueType\@\@H\@Z + * @symbol ?ticksFromNow\@BlockSource\@\@QEBAHAEBVBlockPos\@\@W4TickingQueueType\@\@H\@Z */ MCAPI int ticksFromNow(class BlockPos const &, enum class TickingQueueType, int) const; /** - * @symbol ?tryGetBiome\@BlockSource\@\@QEBAPEAVBiome\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryGetBiome\@BlockSource\@\@QEBAPEAVBiome\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Biome * tryGetBiome(class BlockPos const &) const; /** - * @symbol ?updateCheckForValidityState\@BlockSource\@\@QEAAX_N\@Z + * @symbol ?updateCheckForValidityState\@BlockSource\@\@QEAAX_N\@Z */ MCAPI void updateCheckForValidityState(bool); /** - * @symbol ?updateNeighborsAt\@BlockSource\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?updateNeighborsAt\@BlockSource\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void updateNeighborsAt(class BlockPos const &); /** - * @symbol ?updateNeighborsAtExceptFromFacing\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0H\@Z + * @symbol ?updateNeighborsAtExceptFromFacing\@BlockSource\@\@QEAAXAEBVBlockPos\@\@0H\@Z */ MCAPI void updateNeighborsAtExceptFromFacing(class BlockPos const &, class BlockPos const &, int); /** - * @symbol ?containsAnyLiquid\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@\@Z + * @symbol ?containsAnyLiquid\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@\@Z */ MCAPI static bool containsAnyLiquid(class IConstBlockSource const &, class AABB const &); /** - * @symbol ?containsMaterial\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@W4MaterialType\@\@\@Z + * @symbol ?containsMaterial\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@W4MaterialType\@\@\@Z */ MCAPI static bool containsMaterial(class IConstBlockSource const &, class AABB const &, enum class MaterialType); /** - * @symbol ?generateUnloadedChunkAABB\@BlockSource\@\@SA?AVAABB\@\@AEBVChunkPos\@\@\@Z + * @symbol ?doesIntersect\@BlockSource\@\@SA_NAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBVGetCollisionShapeInterface\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI static bool doesIntersect(class IConstBlockSource const &, class AABB const &, class GetCollisionShapeInterface const &, std::vector &); + /** + * @symbol ?generateUnloadedChunkAABB\@BlockSource\@\@SA?AVAABB\@\@AEBVChunkPos\@\@\@Z */ MCAPI static class AABB generateUnloadedChunkAABB(class ChunkPos const &); /** - * @symbol ?getLiquidBlock\@BlockSource\@\@SAAEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getLiquidBlock\@BlockSource\@\@SAAEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class Block const & getLiquidBlock(class IConstBlockSource const &, class BlockPos const &); //protected: /** - * @symbol ?_blockChanged\@BlockSource\@\@IEAAXAEBVBlockPos\@\@IAEBVBlock\@\@1HPEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z + * @symbol ?_blockChanged\@BlockSource\@\@IEAAXAEBVBlockPos\@\@IAEBVBlock\@\@1HPEBUActorBlockSyncMessage\@\@PEAVActor\@\@\@Z */ MCAPI void _blockChanged(class BlockPos const &, unsigned int, class Block const &, class Block const &, int, struct ActorBlockSyncMessage const *, class Actor *); /** - * @symbol ?_fetchBorderBlockCollisions\@BlockSource\@\@IEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@_N\@Z + * @symbol ?_fetchBorderBlockCollisions\@BlockSource\@\@IEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@_N\@Z */ MCAPI void _fetchBorderBlockCollisions(std::vector &, class AABB const &, class optional_ref, bool) const; /** - * @symbol ?_fetchEntityHelper\@BlockSource\@\@IEAAXVWeakEntityRef\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBVAABB\@\@_N\@Z + * @symbol ?_fetchEntityHelper\@BlockSource\@\@IEAAXVWeakEntityRef\@\@V?$span\@V?$not_null\@PEBVActor\@\@\@gsl\@\@$0?0\@gsl\@\@AEBVAABB\@\@_N\@Z */ MCAPI void _fetchEntityHelper(class WeakEntityRef, class gsl::span, -1>, class AABB const &, bool); /** - * @symbol ?_hasChunksAt\@BlockSource\@\@IEBA_NAEBUBounds\@\@_N\@Z + * @symbol ?_hasChunksAt\@BlockSource\@\@IEBA_NAEBUBounds\@\@_N\@Z */ MCAPI bool _hasChunksAt(struct Bounds const &, bool) const; /** - * @symbol ?_updateTallestCollisionShapeWithBorderBlockCollisions\@BlockSource\@\@IEBAXAEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV2\@AEBVVec3\@\@AEAM\@Z + * @symbol ?_updateTallestCollisionShapeWithBorderBlockCollisions\@BlockSource\@\@IEBAXAEBVAABB\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@AEAV2\@AEBVVec3\@\@AEAM\@Z */ MCAPI void _updateTallestCollisionShapeWithBorderBlockCollisions(class AABB const &, class optional_ref, class AABB &, class Vec3 const &, float &) const; /** - * @symbol ?addUnloadedChunksAABBs\@BlockSource\@\@IEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z + * @symbol ?addUnloadedChunksAABBs\@BlockSource\@\@IEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z */ MCAPI void addUnloadedChunksAABBs(std::vector &, class AABB const &) const; /** - * @symbol ?addVoidFloor\@BlockSource\@\@IEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z + * @symbol ?addVoidFloor\@BlockSource\@\@IEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@\@Z */ MCAPI void addVoidFloor(std::vector &, class AABB const &) const; /** - * @symbol ?getTallestCollisionShapeFromUnloadedChunksAABBs\@BlockSource\@\@IEBAXAEBVAABB\@\@AEAV2\@AEBVVec3\@\@AEAM\@Z + * @symbol ?getTallestCollisionShapeFromUnloadedChunksAABBs\@BlockSource\@\@IEBAXAEBVAABB\@\@AEAV2\@AEBVVec3\@\@AEAM\@Z */ MCAPI void getTallestCollisionShapeFromUnloadedChunksAABBs(class AABB const &, class AABB &, class Vec3 const &, float &) const; //private: /** - * @symbol ?_addToTickingQueue\@BlockSource\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@HHW4TickingQueueType\@\@_N\@Z + * @symbol ?_addToTickingQueue\@BlockSource\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@HHW4TickingQueueType\@\@_N\@Z */ MCAPI void _addToTickingQueue(class BlockPos const &, class Block const &, int, int, enum class TickingQueueType, bool); /** - * @symbol ?_getBlockPermissions\@BlockSource\@\@AEAA_NAEBVBlockPos\@\@_N\@Z + * @symbol ?_getBlockPermissions\@BlockSource\@\@AEAA_NAEBVBlockPos\@\@_N\@Z */ MCAPI bool _getBlockPermissions(class BlockPos const &, bool); /** - * @symbol ?_getRawBrightness\@BlockSource\@\@AEBA?AUBrightness\@\@AEBVBlockPos\@\@U2\@_N2\@Z + * @symbol ?_getRawBrightness\@BlockSource\@\@AEBA?AUBrightness\@\@AEBVBlockPos\@\@U2\@_N2\@Z */ MCAPI struct Brightness _getRawBrightness(class BlockPos const &, struct Brightness, bool, bool) const; /** - * @symbol ?_removeFromTickingQueue\@BlockSource\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z + * @symbol ?_removeFromTickingQueue\@BlockSource\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@W4TickingQueueType\@\@\@Z */ MCAPI void _removeFromTickingQueue(class BlockPos const &, class Block const &, enum class TickingQueueType); @@ -835,4 +848,4 @@ struct ClipParameters private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSourceComponent.hpp b/LiteLoader/include/llapi/mc/BlockSourceComponent.hpp index 21bd58be82..af47046de5 100644 --- a/LiteLoader/include/llapi/mc/BlockSourceComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockSourceComponent.hpp @@ -30,12 +30,12 @@ class BlockSourceComponent { public: /** - * @symbol ??0BlockSourceComponent\@\@QEAA\@V?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@\@Z + * @symbol ??0BlockSourceComponent\@\@QEAA\@V?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@\@Z */ MCAPI BlockSourceComponent(class WeakRefT>); /** - * @symbol ?tryGetBlockSource\@BlockSourceComponent\@\@QEBA?AV?$StackRefResultT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ + * @symbol ?tryGetBlockSource\@BlockSourceComponent\@\@QEBA?AV?$StackRefResultT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ */ MCAPI class StackRefResultT> tryGetBlockSource() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSourceFactoryImpl.hpp b/LiteLoader/include/llapi/mc/BlockSourceFactoryImpl.hpp index 5e12d0871b..a7483586b3 100644 --- a/LiteLoader/include/llapi/mc/BlockSourceFactoryImpl.hpp +++ b/LiteLoader/include/llapi/mc/BlockSourceFactoryImpl.hpp @@ -27,10 +27,10 @@ class BlockSourceFactoryImpl { //protected: /** - * @symbol ?_createOrUpdate\@BlockSourceFactoryImpl\@\@IEBAXAEAVMockableOwnedBlockSource\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?_createOrUpdate\@BlockSourceFactoryImpl\@\@IEBAXAEAVMockableOwnedBlockSource\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void _createOrUpdate(class MockableOwnedBlockSource &, class AutomaticID) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSourceHandle.hpp b/LiteLoader/include/llapi/mc/BlockSourceHandle.hpp index 4dc7319f3b..4492089402 100644 --- a/LiteLoader/include/llapi/mc/BlockSourceHandle.hpp +++ b/LiteLoader/include/llapi/mc/BlockSourceHandle.hpp @@ -31,29 +31,29 @@ class BlockSourceHandle : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockSourceHandle(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?onSourceDestroyed\@BlockSourceHandle\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 2 + * @symbol ?onSourceDestroyed\@BlockSourceHandle\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onSourceDestroyed(class BlockSource &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockSourceListener.hpp b/LiteLoader/include/llapi/mc/BlockSourceListener.hpp index 3f2b51a44f..daec976a17 100644 --- a/LiteLoader/include/llapi/mc/BlockSourceListener.hpp +++ b/LiteLoader/include/llapi/mc/BlockSourceListener.hpp @@ -30,60 +30,64 @@ class BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockSourceListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?onSourceDestroyed\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 2 + * @symbol ?onSourceDestroyed\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onSourceDestroyed(class BlockSource &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?onBrightnessChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?onBrightnessChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onBrightnessChanged(class BlockSource &, class BlockPos const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKSOURCELISTENER /** - * @symbol ?onAreaChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?onAreaChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCVAPI void onAreaChanged(class BlockSource &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?onBlockChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@IAEBVBlock\@\@2HPEBUActorBlockSyncMessage\@\@W4BlockChangedEventTarget\@\@PEAVActor\@\@\@Z + * @symbol ?onBlockChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@IAEBVBlock\@\@2HPEBUActorBlockSyncMessage\@\@W4BlockChangedEventTarget\@\@PEAVActor\@\@\@Z */ MCVAPI void onBlockChanged(class BlockSource &, class BlockPos const &, unsigned int, class Block const &, class Block const &, int, struct ActorBlockSyncMessage const *, enum class BlockChangedEventTarget, class Actor *); /** - * @symbol ?onBlockEntityChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEAVBlockActor\@\@\@Z + * @symbol ?onBlockEntityChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEAVBlockActor\@\@\@Z */ MCVAPI void onBlockEntityChanged(class BlockSource &, class BlockActor &); /** - * @symbol ?onBlockEvent\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@HHHHH\@Z + * @symbol ?onBlockEvent\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@HHHHH\@Z */ MCVAPI void onBlockEvent(class BlockSource &, int, int, int, int, int); /** - * @symbol ?onEntityChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEAVActor\@\@\@Z + * @symbol ?onEntityChanged\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@AEAVActor\@\@\@Z */ MCVAPI void onEntityChanged(class BlockSource &, class Actor &); /** - * @symbol ?onSourceCreated\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onSourceCreated\@BlockSourceListener\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onSourceCreated(class BlockSource &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockSourceListener(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp b/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp index 87077cfd8d..12939af8ec 100644 --- a/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateCommandParam.hpp @@ -30,28 +30,28 @@ class BlockStateCommandParam { public: /** - * @symbol ??0BlockStateCommandParam\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4Type\@0\@\@Z + * @symbol ??0BlockStateCommandParam\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4Type\@0\@\@Z */ MCAPI BlockStateCommandParam(std::string, std::string, enum class BlockStateCommandParam::Type); /** - * @symbol ?getNameAndValue\@BlockStateCommandParam\@\@QEBA?AV?$optional\@U?$pair\@VHashedString\@\@H\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?getNameAndValue\@BlockStateCommandParam\@\@QEBA?AV?$optional\@U?$pair\@VHashedString\@\@H\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI class std::optional> getNameAndValue(class CommandOutput &) const; /** - * @symbol ?setBlockState\@BlockStateCommandParam\@\@QEBA_NPEAPEBVBlock\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?setBlockState\@BlockStateCommandParam\@\@QEBA_NPEAPEBVBlock\@\@AEAVCommandOutput\@\@\@Z */ MCAPI bool setBlockState(class Block const **, class CommandOutput &) const; /** - * @symbol ??1BlockStateCommandParam\@\@QEAA\@XZ + * @symbol ??1BlockStateCommandParam\@\@QEAA\@XZ */ MCAPI ~BlockStateCommandParam(); //private: /** - * @symbol ?_createCompoundTag\@BlockStateCommandParam\@\@AEBA_NAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_createCompoundTag\@BlockStateCommandParam\@\@AEBA_NAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z */ MCAPI bool _createCompoundTag(class CompoundTag &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp b/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp index 87d9ff940d..9e728e8cf1 100644 --- a/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateDefinition.hpp @@ -28,25 +28,25 @@ struct BlockStateDefinition { public: /** - * @symbol ??0BlockStateDefinition\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BlockStateDefinition\@\@QEAA\@AEBU0\@\@Z */ MCAPI BlockStateDefinition(struct BlockStateDefinition const &); /** - * @symbol ??4BlockStateDefinition\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4BlockStateDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI struct BlockStateDefinition & operator=(struct BlockStateDefinition const &); + MCAPI struct BlockStateDefinition & operator=(struct BlockStateDefinition &&); /** - * @symbol ??4BlockStateDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4BlockStateDefinition\@\@QEAAAEAU0\@AEBU0\@\@Z */ - MCAPI struct BlockStateDefinition & operator=(struct BlockStateDefinition &&); + MCAPI struct BlockStateDefinition & operator=(struct BlockStateDefinition const &); /** - * @symbol ??1BlockStateDefinition\@\@QEAA\@XZ + * @symbol ??1BlockStateDefinition\@\@QEAA\@XZ */ MCAPI ~BlockStateDefinition(); //private: /** - * @symbol ?_copy\@BlockStateDefinition\@\@AEAAXAEBU1\@\@Z + * @symbol ?_copy\@BlockStateDefinition\@\@AEAAXAEBU1\@\@Z */ MCAPI void _copy(struct BlockStateDefinition const &); diff --git a/LiteLoader/include/llapi/mc/BlockStateGroup.hpp b/LiteLoader/include/llapi/mc/BlockStateGroup.hpp index 0cf16a6dae..20c932307b 100644 --- a/LiteLoader/include/llapi/mc/BlockStateGroup.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateGroup.hpp @@ -30,32 +30,32 @@ class BlockStateGroup { public: /** - * @symbol ??0BlockStateGroup\@\@QEAA\@XZ + * @symbol ??0BlockStateGroup\@\@QEAA\@XZ */ MCAPI BlockStateGroup(); /** - * @symbol ?getBlockStateFromHash\@BlockStateGroup\@\@QEBAPEBVBlockStateMeta\@\@AEB_K\@Z + * @symbol ?getBlockStateFromHash\@BlockStateGroup\@\@QEBAPEBVBlockStateMeta\@\@AEB_K\@Z */ MCAPI class BlockStateMeta const * getBlockStateFromHash(unsigned __int64 const &) const; /** - * @symbol ?getBlockStateFromName\@BlockStateGroup\@\@QEBAPEBVBlockStateMeta\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getBlockStateFromName\@BlockStateGroup\@\@QEBAPEBVBlockStateMeta\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class BlockStateMeta const * getBlockStateFromName(std::string const &) const; /** - * @symbol ?registerBlockStateDefinition\@BlockStateGroup\@\@QEAAXAEBUBlockStateDefinition\@\@\@Z + * @symbol ?registerBlockStateDefinition\@BlockStateGroup\@\@QEAAXAEBUBlockStateDefinition\@\@\@Z */ MCAPI void registerBlockStateDefinition(struct BlockStateDefinition const &); /** - * @symbol ?registerToBlock\@BlockStateGroup\@\@QEAAXAEAVBlockLegacy\@\@\@Z + * @symbol ?registerToBlock\@BlockStateGroup\@\@QEAAXAEAVBlockLegacy\@\@\@Z */ MCAPI void registerToBlock(class BlockLegacy &); /** - * @symbol ?MAX_ENUM_SIZE\@BlockStateGroup\@\@2HB + * @symbol ?MAX_ENUM_SIZE\@BlockStateGroup\@\@2HB */ MCAPI static int const MAX_ENUM_SIZE; /** - * @symbol ?loadBlockStateFromJson\@BlockStateGroup\@\@SA_NAEAUBlockStateDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?loadBlockStateFromJson\@BlockStateGroup\@\@SA_NAEAUBlockStateDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static bool loadBlockStateFromJson(struct BlockStateDefinition &, std::string const &, class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateMeta.hpp b/LiteLoader/include/llapi/mc/BlockStateMeta.hpp index 25bdb07e7d..6d69a6aa33 100644 --- a/LiteLoader/include/llapi/mc/BlockStateMeta.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateMeta.hpp @@ -31,40 +31,40 @@ class BlockStateMeta { public: /** - * @symbol ??0BlockStateMeta\@\@QEAA\@AEBVItemState\@\@AEBUBlockStateDefinition\@\@\@Z + * @symbol ??0BlockStateMeta\@\@QEAA\@AEBVItemState\@\@AEBUBlockStateDefinition\@\@\@Z */ MCAPI BlockStateMeta(class ItemState const &, struct BlockStateDefinition const &); /** - * @symbol ?getBool\@BlockStateMeta\@\@QEBA?B_NH\@Z + * @symbol ?getBool\@BlockStateMeta\@\@QEBA?B_NH\@Z */ MCAPI bool const getBool(int) const; /** - * @symbol ?getID\@BlockStateMeta\@\@QEBA_KXZ + * @symbol ?getID\@BlockStateMeta\@\@QEBA_KXZ */ MCAPI unsigned __int64 getID() const; /** - * @symbol ?getInt\@BlockStateMeta\@\@QEBA?BHH\@Z + * @symbol ?getInt\@BlockStateMeta\@\@QEBA?BHH\@Z */ MCAPI int const getInt(int) const; /** - * @symbol ?getName\@BlockStateMeta\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BlockStateMeta\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getState\@BlockStateMeta\@\@QEBAAEBVItemState\@\@XZ + * @symbol ?getState\@BlockStateMeta\@\@QEBAAEBVItemState\@\@XZ */ MCAPI class ItemState const & getState() const; /** - * @symbol ?getString\@BlockStateMeta\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getString\@BlockStateMeta\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI std::string const & getString(int) const; /** - * @symbol ?getType\@BlockStateMeta\@\@QEBA?BW4Type\@Tag\@\@XZ + * @symbol ?getType\@BlockStateMeta\@\@QEBA?BW4Type\@Tag\@\@XZ */ MCAPI enum class Tag::Type const getType() const; /** - * @symbol ?indexOf\@BlockStateMeta\@\@QEBAHAEB_K\@Z + * @symbol ?indexOf\@BlockStateMeta\@\@QEBAHAEB_K\@Z */ MCAPI int indexOf(unsigned __int64 const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockStateVariant.hpp b/LiteLoader/include/llapi/mc/BlockStateVariant.hpp index 48f96171a8..dade5e10fb 100644 --- a/LiteLoader/include/llapi/mc/BlockStateVariant.hpp +++ b/LiteLoader/include/llapi/mc/BlockStateVariant.hpp @@ -30,19 +30,19 @@ class BlockStateVariant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockStateVariant(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?toNBT\@BlockStateVariant\@\@UEBAXAEAVCompoundTag\@\@H\@Z + * @vftbl 1 + * @symbol ?toNBT\@BlockStateVariant\@\@UEBAXAEAVCompoundTag\@\@H\@Z */ virtual void toNBT(class CompoundTag &, int) const; /** - * @vftbl 2 - * @symbol ?fromNBT\@BlockStateVariant\@\@UEBA_NAEBVCompoundTag\@\@AEAH\@Z + * @vftbl 2 + * @symbol ?fromNBT\@BlockStateVariant\@\@UEBA_NAEBVCompoundTag\@\@AEAH\@Z */ virtual bool fromNBT(class CompoundTag const &, int &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp index adf363962c..7a1572728b 100644 --- a/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp +++ b/LiteLoader/include/llapi/mc/BlockTickingQueue.hpp @@ -37,115 +37,119 @@ class TickDataSet { public: /** - * @symbol ?acquireAllRandomTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?acquireAllRandomTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void acquireAllRandomTicks(class LevelChunk &); /** - * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAV1\@\@Z + * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAV1\@\@Z */ MCAPI void acquireAllTicks(class BlockTickingQueue &); /** - * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?acquireAllTicks\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void acquireAllTicks(class LevelChunk &); /** - * @symbol ?add\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z + * @symbol ?add\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z */ MCAPI void add(class BlockSource &, class BlockPos const &, class Block const &, int, int); /** - * @symbol ?addTickToLevelChunk\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z + * @symbol ?addTickToLevelChunk\@BlockTickingQueue\@\@QEAAXAEAVLevelChunk\@\@AEBVBlockPos\@\@AEBVBlock\@\@HH\@Z */ MCAPI void addTickToLevelChunk(class LevelChunk &, class BlockPos const &, class Block const &, int, int); /** - * @symbol ?eliminateAllTicksZeroAndAbove\@BlockTickingQueue\@\@QEAAXXZ + * @symbol ?eliminateAllTicksZeroAndAbove\@BlockTickingQueue\@\@QEAAXXZ */ MCAPI void eliminateAllTicksZeroAndAbove(); /** - * @symbol ?eliminateDuplicatesOf\@BlockTickingQueue\@\@QEAAXAEBVBlockLegacy\@\@\@Z + * @symbol ?eliminateDuplicatesOf\@BlockTickingQueue\@\@QEAAXAEBVBlockLegacy\@\@\@Z */ MCAPI void eliminateDuplicatesOf(class BlockLegacy const &); /** - * @symbol ?getNextUpdateForPos\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEAUTick\@\@\@Z + * @symbol ?getNextUpdateForPos\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEAUTick\@\@\@Z */ MCAPI bool getNextUpdateForPos(class BlockPos const &, struct Tick &) const; /** - * @symbol ?getTickDelaysInArea\@BlockTickingQueue\@\@QEBA?AV?$unordered_multimap\@VBlockPos\@\@UTickDelayBlock\@\@U?$hash\@VBlockPos\@\@\@std\@\@U?$equal_to\@VBlockPos\@\@\@4\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@UTickDelayBlock\@\@\@std\@\@\@4\@\@std\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?getTickDelayForNextTickUpdateAtPos\@BlockTickingQueue\@\@QEBA?AV?$optional\@UTick\@\@\@std\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI class std::optional getTickDelayForNextTickUpdateAtPos(class BlockPos const &) const; + /** + * @symbol ?getTickDelaysInArea\@BlockTickingQueue\@\@QEBA?AV?$unordered_multimap\@VBlockPos\@\@UTickDelayBlock\@\@U?$hash\@VBlockPos\@\@\@std\@\@U?$equal_to\@VBlockPos\@\@\@4\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@UTickDelayBlock\@\@\@std\@\@\@4\@\@std\@\@AEBVBoundingBox\@\@\@Z */ MCAPI class std::unordered_multimap, struct std::equal_to, class std::allocator>> getTickDelaysInArea(class BoundingBox const &) const; /** - * @symbol ?hasTickInCurrentTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?hasTickInCurrentTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool hasTickInCurrentTick(class BlockPos const &) const; /** - * @symbol ?hasTickInPendingTicks\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?hasTickInPendingTicks\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool hasTickInPendingTicks(class BlockPos const &) const; /** - * @symbol ?isBlockInPendingTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?isBlockInPendingTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool isBlockInPendingTick(class BlockPos const &, class Block const &) const; /** - * @symbol ?isBlockInPendingTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z + * @symbol ?isBlockInPendingTick\@BlockTickingQueue\@\@QEBA_NAEBVBlockPos\@\@AEBVBlockLegacy\@\@\@Z */ MCAPI bool isBlockInPendingTick(class BlockPos const &, class BlockLegacy const &) const; /** - * @symbol ?isEmpty\@BlockTickingQueue\@\@QEBA_NXZ + * @symbol ?isEmpty\@BlockTickingQueue\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?isInstaticking\@BlockTickingQueue\@\@QEBA_NXZ + * @symbol ?isInstaticking\@BlockTickingQueue\@\@QEBA_NXZ */ MCAPI bool isInstaticking() const; /** - * @symbol ?load\@BlockTickingQueue\@\@QEAAXAEBVCompoundTag\@\@AEBVBlockPalette\@\@\@Z + * @symbol ?load\@BlockTickingQueue\@\@QEAAXAEBVCompoundTag\@\@AEBVBlockPalette\@\@\@Z */ MCAPI void load(class CompoundTag const &, class BlockPalette const &); /** - * @symbol ?remove\@BlockTickingQueue\@\@QEAAX$$QEAV?$function\@$$A6A_NAEBVTickNextTickData\@\@\@Z\@std\@\@\@Z + * @symbol ?remove\@BlockTickingQueue\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ - MCAPI void remove(class std::function &&); + MCAPI void remove(class BlockPos const &, class Block const &); /** - * @symbol ?remove\@BlockTickingQueue\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?remove\@BlockTickingQueue\@\@QEAAX$$QEAV?$function\@$$A6A_NAEBVTickNextTickData\@\@\@Z\@std\@\@\@Z */ - MCAPI void remove(class BlockPos const &, class Block const &); + MCAPI void remove(class std::function &&); /** - * @symbol ?save\@BlockTickingQueue\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@BlockTickingQueue\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; /** - * @symbol ?setOwningChunk\@BlockTickingQueue\@\@QEAAXPEAVLevelChunk\@\@\@Z + * @symbol ?setOwningChunk\@BlockTickingQueue\@\@QEAAXPEAVLevelChunk\@\@\@Z */ MCAPI void setOwningChunk(class LevelChunk *); /** - * @symbol ?tickAllPendingTicks\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@_K\@Z + * @symbol ?tickAllPendingTicks\@BlockTickingQueue\@\@QEAAXAEAVBlockSource\@\@_K\@Z */ MCAPI void tickAllPendingTicks(class BlockSource &, unsigned __int64); /** - * @symbol ?tickPendingTicks\@BlockTickingQueue\@\@QEAA_NAEAVBlockSource\@\@AEBUTick\@\@H_N\@Z + * @symbol ?tickPendingTicks\@BlockTickingQueue\@\@QEAA_NAEAVBlockSource\@\@AEBUTick\@\@H_N\@Z */ MCAPI bool tickPendingTicks(class BlockSource &, struct Tick const &, int, bool); /** - * @symbol ?ticksFromNow\@BlockTickingQueue\@\@QEBAHH\@Z + * @symbol ?ticksFromNow\@BlockTickingQueue\@\@QEBAHH\@Z */ MCAPI int ticksFromNow(int) const; /** - * @symbol ??1BlockTickingQueue\@\@QEAA\@XZ + * @symbol ??1BlockTickingQueue\@\@QEAA\@XZ */ MCAPI ~BlockTickingQueue(); //protected: /** - * @symbol ?_saveQueue\@BlockTickingQueue\@\@IEBAXAEAVListTag\@\@AEBVTickDataSet\@1\@\@Z + * @symbol ?_saveQueue\@BlockTickingQueue\@\@IEBAXAEAVListTag\@\@AEBVTickDataSet\@1\@\@Z */ MCAPI void _saveQueue(class ListTag &, class BlockTickingQueue::TickDataSet const &) const; //private: /** - * @symbol ?_acquireAllTicks\@BlockTickingQueue\@\@AEAAXAEAV1\@\@Z + * @symbol ?_acquireAllTicks\@BlockTickingQueue\@\@AEAAXAEAV1\@\@Z */ MCAPI void _acquireAllTicks(class BlockTickingQueue &); /** - * @symbol ?_addToNextTickQueue\@BlockTickingQueue\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH\@Z + * @symbol ?_addToNextTickQueue\@BlockTickingQueue\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@HH\@Z */ MCAPI void _addToNextTickQueue(class BlockPos const &, class Block const &, int, int); @@ -153,4 +157,4 @@ class TickDataSet { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp index 28968da722..b26965b9df 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistry.hpp @@ -20,11 +20,12 @@ class BlockTypeRegistry { #define AFTER_EXTRA // Add Member There +public: struct LookupByNameImplReturnType; class InhibitModificationsLock; struct BlockComplexAliasBlockState; class BlockComplexAliasContent; - + inline static std::map, struct std::less, class std::allocator>>>& getBlockLookupMap(){return mBlockLookupMap;} #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKTYPEREGISTRY public: @@ -35,120 +36,124 @@ class BlockTypeRegistry { public: /** - * @symbol ?computeBlockTypeRegistryChecksum\@BlockTypeRegistry\@\@SA_KAEBVBaseGameVersion\@\@\@Z + * @symbol ?computeBlockTypeRegistryChecksum\@BlockTypeRegistry\@\@SA_KAEBVBaseGameVersion\@\@\@Z */ MCAPI static unsigned __int64 computeBlockTypeRegistryChecksum(class BaseGameVersion const &); /** - * @symbol ?forEachBlock\@BlockTypeRegistry\@\@SAXV?$function\@$$A6A_NAEBVBlockLegacy\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachBlock\@BlockTypeRegistry\@\@SAXV?$function\@$$A6A_NAEBVBlockLegacy\@\@\@Z\@std\@\@\@Z */ MCAPI static void forEachBlock(class std::function); /** - * @symbol ?getBlockNameFromNameHash\@BlockTypeRegistry\@\@SAAEBVHashedString\@\@_K\@Z + * @symbol ?getBlockNameFromNameHash\@BlockTypeRegistry\@\@SAAEBVHashedString\@\@_K\@Z */ MCAPI static class HashedString const & getBlockNameFromNameHash(unsigned __int64); /** - * @symbol ?getComplexAliasPostSplitBlockNames\@BlockTypeRegistry\@\@SAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z + * @symbol ?getComplexAliasPostSplitBlockNames\@BlockTypeRegistry\@\@SAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI static std::vector const & getComplexAliasPostSplitBlockNames(class HashedString const &); /** - * @symbol ?getDefaultBlockState\@BlockTypeRegistry\@\@SAAEBVBlock\@\@AEBVHashedString\@\@_N\@Z + * @symbol ?getDefaultBlockState\@BlockTypeRegistry\@\@SAAEBVBlock\@\@AEBVHashedString\@\@_N\@Z */ MCAPI static class Block const & getDefaultBlockState(class HashedString const &, bool); /** - * @symbol ?getEntityRegistry\@BlockTypeRegistry\@\@SA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@BlockTypeRegistry\@\@SA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ MCAPI static class StackRefResultT getEntityRegistry(); /** - * @symbol ?initBlockEntities\@BlockTypeRegistry\@\@SAXPEAVBlockDefinitionGroup\@\@AEBVExperiments\@\@\@Z + * @symbol ?initBlockEntities\@BlockTypeRegistry\@\@SAXPEAVBlockDefinitionGroup\@\@AEBVExperiments\@\@\@Z */ MCAPI static void initBlockEntities(class BlockDefinitionGroup *, class Experiments const &); /** - * @symbol ?initEntityRegistry\@BlockTypeRegistry\@\@SAXXZ + * @symbol ?initEntityRegistry\@BlockTypeRegistry\@\@SAXXZ */ MCAPI static void initEntityRegistry(); /** - * @symbol ?isComplexAliasBlock\@BlockTypeRegistry\@\@SA_NAEBVHashedString\@\@\@Z + * @symbol ?isComplexAliasBlock\@BlockTypeRegistry\@\@SA_NAEBVHashedString\@\@\@Z */ MCAPI static bool isComplexAliasBlock(class HashedString const &); /** - * @symbol ?lockAgainstRegistryModifications\@BlockTypeRegistry\@\@SA?AVBlockTypeRegistryReadLock\@\@XZ + * @symbol ?lockAgainstRegistryModifications\@BlockTypeRegistry\@\@SA?AVBlockTypeRegistryReadLock\@\@XZ */ MCAPI static class BlockTypeRegistryReadLock lockAgainstRegistryModifications(); /** - * @symbol ?lockForRegistryModifications\@BlockTypeRegistry\@\@SA?AVBlockTypeRegistryModificationsLock\@\@XZ + * @symbol ?lockForRegistryModifications\@BlockTypeRegistry\@\@SA?AVBlockTypeRegistryModificationsLock\@\@XZ */ MCAPI static class BlockTypeRegistryModificationsLock lockForRegistryModifications(); /** - * @symbol ?lookupByName\@BlockTypeRegistry\@\@SA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@AEBVHashedString\@\@_N\@Z + * @symbol ?lookupByName\@BlockTypeRegistry\@\@SA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@AEBVHashedString\@\@_N\@Z */ MCAPI static class WeakPtr lookupByName(class HashedString const &, bool); /** - * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI static class Block const * lookupByName(class HashedString const &, std::vector const &, bool); /** - * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@H_N\@Z + * @symbol ?lookupByName\@BlockTypeRegistry\@\@SAPEBVBlock\@\@AEBVHashedString\@\@H_N\@Z */ MCAPI static class Block const * lookupByName(class HashedString const &, int, bool); /** - * @symbol ?prepareBlocks\@BlockTypeRegistry\@\@SAXI\@Z + * @symbol ?prepareBlocks\@BlockTypeRegistry\@\@SAXI\@Z */ MCAPI static void prepareBlocks(unsigned int); /** - * @symbol ?registerAlias\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@0\@Z + * @symbol ?registerAlias\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@0\@Z */ MCAPI static void registerAlias(class HashedString const &, class HashedString const &); /** - * @symbol ?unregisterBlock\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@\@Z + * @symbol ?registerComplexAlias\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@V?$function\@$$A6APEBVBlock\@\@H\@Z\@std\@\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@4\@AEBVBaseGameVersion\@\@\@Z + */ + MCAPI static void registerComplexAlias(class HashedString const &, class std::function, std::vector const &, class BaseGameVersion const &); + /** + * @symbol ?unregisterBlock\@BlockTypeRegistry\@\@SAXAEBVHashedString\@\@\@Z */ MCAPI static void unregisterBlock(class HashedString const &); /** - * @symbol ?unregisterBlocks\@BlockTypeRegistry\@\@SAXXZ + * @symbol ?unregisterBlocks\@BlockTypeRegistry\@\@SAXXZ */ MCAPI static void unregisterBlocks(); //private: /** - * @symbol ?_lookupByNameImpl\@BlockTypeRegistry\@\@CA?AULookupByNameImplReturnType\@1\@AEBVHashedString\@\@HW4LookupByNameImplResolve\@1\@_N\@Z + * @symbol ?_lookupByNameImpl\@BlockTypeRegistry\@\@CA?AULookupByNameImplReturnType\@1\@AEBVHashedString\@\@HW4LookupByNameImplResolve\@1\@_N\@Z */ MCAPI static struct BlockTypeRegistry::LookupByNameImplReturnType _lookupByNameImpl(class HashedString const &, int, enum class BlockTypeRegistry::LookupByNameImplResolve, bool); /** - * @symbol ?_lookupByNameImplSetNewBlockStates\@BlockTypeRegistry\@\@CAPEBVBlock\@\@AEBV2\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_lookupByNameImplSetNewBlockStates\@BlockTypeRegistry\@\@CAPEBVBlock\@\@AEBV2\@AEBV?$vector\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@V?$allocator\@UBlockComplexAliasBlockState\@BlockTypeRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static class Block const * _lookupByNameImplSetNewBlockStates(class Block const &, std::vector const &); private: /** - * @symbol ?mBlockAliasLookupMap\@BlockTypeRegistry\@\@0V?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mBlockAliasLookupMap\@BlockTypeRegistry\@\@0V?$unordered_map\@VHashedString\@\@V1\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V1\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mBlockAliasLookupMap; /** - * @symbol ?mBlockComplexAliasLookupMap\@BlockTypeRegistry\@\@0V?$unordered_map\@VHashedString\@\@VBlockComplexAliasContent\@BlockTypeRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@VBlockComplexAliasContent\@BlockTypeRegistry\@\@\@std\@\@\@5\@\@std\@\@A + * @symbol ?mBlockComplexAliasLookupMap\@BlockTypeRegistry\@\@0V?$unordered_map\@VHashedString\@\@VBlockComplexAliasContent\@BlockTypeRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@VBlockComplexAliasContent\@BlockTypeRegistry\@\@\@std\@\@\@5\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mBlockComplexAliasLookupMap; /** - * @symbol ?mBlockComplexAliasPostSplitBlockNamesLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mBlockComplexAliasPostSplitBlockNamesLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::map, struct std::less, class std::allocator>>> mBlockComplexAliasPostSplitBlockNamesLookupMap; /** - * @symbol ?mBlockLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$SharedPtr\@VBlockLegacy\@\@\@\@U?$less\@VHashedString\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$SharedPtr\@VBlockLegacy\@\@\@\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mBlockLookupMap\@BlockTypeRegistry\@\@0V?$map\@VHashedString\@\@V?$SharedPtr\@VBlockLegacy\@\@\@\@U?$less\@VHashedString\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$SharedPtr\@VBlockLegacy\@\@\@\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::map, struct std::less, class std::allocator>>> mBlockLookupMap; /** - * @symbol ?mBlockNameHashToStringMap\@BlockTypeRegistry\@\@0V?$unordered_map\@_KVHashedString\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@3\@V?$allocator\@U?$pair\@$$CB_KVHashedString\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mBlockNameHashToStringMap\@BlockTypeRegistry\@\@0V?$unordered_map\@_KVHashedString\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@3\@V?$allocator\@U?$pair\@$$CB_KVHashedString\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mBlockNameHashToStringMap; /** - * @symbol ?mEntities\@BlockTypeRegistry\@\@0V?$OwnerPtrT\@UEntityRegistryRefTraits\@\@\@\@A + * @symbol ?mEntities\@BlockTypeRegistry\@\@0V?$OwnerPtrT\@UEntityRegistryRefTraits\@\@\@\@A */ MCAPI static class OwnerPtrT mEntities; /** - * @symbol ?mKnownNamespaces\@BlockTypeRegistry\@\@0V?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mKnownNamespaces\@BlockTypeRegistry\@\@0V?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::set, class std::allocator> mKnownNamespaces; /** - * @symbol ?mRWLock\@BlockTypeRegistry\@\@0V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@A + * @symbol ?mRWLock\@BlockTypeRegistry\@\@0V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@A */ MCAPI static class std::shared_ptr mRWLock; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp index 6baeb3dca8..28a240f0f6 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistryModificationsLock.hpp @@ -28,16 +28,16 @@ class BlockTypeRegistryModificationsLock { public: /** - * @symbol ??1BlockTypeRegistryModificationsLock\@\@QEAA\@XZ + * @symbol ??1BlockTypeRegistryModificationsLock\@\@QEAA\@XZ */ MCAPI ~BlockTypeRegistryModificationsLock(); //private: /** - * @symbol ??0BlockTypeRegistryModificationsLock\@\@AEAA\@V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@\@Z + * @symbol ??0BlockTypeRegistryModificationsLock\@\@AEAA\@V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@\@Z */ MCAPI BlockTypeRegistryModificationsLock(class std::shared_ptr); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp b/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp index d6a9992b8f..f9fcd56a48 100644 --- a/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp +++ b/LiteLoader/include/llapi/mc/BlockTypeRegistryReadLock.hpp @@ -28,16 +28,16 @@ class BlockTypeRegistryReadLock { public: /** - * @symbol ??1BlockTypeRegistryReadLock\@\@QEAA\@XZ + * @symbol ??1BlockTypeRegistryReadLock\@\@QEAA\@XZ */ MCAPI ~BlockTypeRegistryReadLock(); //private: /** - * @symbol ??0BlockTypeRegistryReadLock\@\@AEAA\@V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@\@Z + * @symbol ??0BlockTypeRegistryReadLock\@\@AEAA\@V?$shared_ptr\@VBlockTypeRegistryRWLock\@\@\@std\@\@\@Z */ MCAPI BlockTypeRegistryReadLock(class std::shared_ptr); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp b/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp index b390ad8bc2..92bff12236 100644 --- a/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnitCubeComponent.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockUnitCubeComponent. - * - */ -struct BlockUnitCubeComponent { + +class BlockUnitCubeComponent { #define AFTER_EXTRA // Add Member There @@ -23,15 +20,15 @@ struct BlockUnitCubeComponent { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKUNITCUBECOMPONENT public: - struct BlockUnitCubeComponent& operator=(struct BlockUnitCubeComponent const &) = delete; - BlockUnitCubeComponent(struct BlockUnitCubeComponent const &) = delete; + class BlockUnitCubeComponent& operator=(class BlockUnitCubeComponent const &) = delete; + BlockUnitCubeComponent(class BlockUnitCubeComponent const &) = delete; BlockUnitCubeComponent() = delete; #endif public: /** - * @symbol ?mBlockSchematic\@BlockUnitCubeComponent\@\@2V?$shared_ptr\@UBlockSchematic\@ClientBlockPipeline\@\@\@std\@\@A + * @symbol ?mBlockSchematic\@BlockUnitCubeComponent\@\@2V?$shared_ptr\@UBlockSchematic\@ClientBlockPipeline\@\@\@std\@\@A */ MCAPI static class std::shared_ptr mBlockSchematic; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp index c151cf0ffa..2c403619aa 100644 --- a/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnitCubeDescription.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure BlockUnitCubeDescription. - * - */ -struct BlockUnitCubeDescription { + +class BlockUnitCubeDescription { #define AFTER_EXTRA // Add Member There @@ -23,49 +20,49 @@ struct BlockUnitCubeDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BLOCKUNITCUBEDESCRIPTION public: - struct BlockUnitCubeDescription& operator=(struct BlockUnitCubeDescription const &) = delete; - BlockUnitCubeDescription(struct BlockUnitCubeDescription const &) = delete; + class BlockUnitCubeDescription& operator=(class BlockUnitCubeDescription const &) = delete; + BlockUnitCubeDescription(class BlockUnitCubeDescription const &) = delete; BlockUnitCubeDescription() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockUnitCubeDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockUnitCubeDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockUnitCubeDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockUnitCubeDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockUnitCubeDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol ?initializeFromNetwork\@BlockUnitCubeDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 3 + * @symbol ?initializeFromNetwork\@BlockUnitCubeDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@BlockUnitCubeDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockUnitCubeDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockUnitCubeDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockUnitCubeDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @symbol ?NameID\@BlockUnitCubeDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockUnitCubeDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; /** - * @symbol ?bindType\@BlockUnitCubeDescription\@\@SAXXZ + * @symbol ?bindType\@BlockUnitCubeDescription\@\@SAXXZ */ MCAPI static void bindType(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp b/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp index bf9d9cc5cc..da33aff420 100644 --- a/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BlockUnwalkableDescription.hpp @@ -31,43 +31,43 @@ class BlockUnwalkableDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockUnwalkableDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@BlockUnwalkableDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@BlockUnwalkableDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@BlockUnwalkableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@BlockUnwalkableDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@BlockUnwalkableDescription\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z + * @vftbl 3 + * @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 - * @symbol ?isNetworkComponent\@BlockUnwalkableDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@BlockUnwalkableDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@BlockUnwalkableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@BlockUnwalkableDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@BlockUnwalkableDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@BlockUnwalkableDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@BlockUnwalkableDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@BlockUnwalkableDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockUtils.hpp b/LiteLoader/include/llapi/mc/BlockUtils.hpp index 62cc62ce5d..6fe908432b 100644 --- a/LiteLoader/include/llapi/mc/BlockUtils.hpp +++ b/LiteLoader/include/llapi/mc/BlockUtils.hpp @@ -30,40 +30,40 @@ class BlockUtils { public: /** - * @symbol ?allowsNetherVegetation\@BlockUtils\@\@SA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?allowsNetherVegetation\@BlockUtils\@\@SA_NAEBVBlockLegacy\@\@\@Z */ MCAPI static bool allowsNetherVegetation(class BlockLegacy const &); /** - * @symbol ?canGrowTreeWithBeehive\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?canGrowTreeWithBeehive\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool canGrowTreeWithBeehive(class Block const &); /** - * @symbol ?getLiquidBlockHeight\@BlockUtils\@\@SAMAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getLiquidBlockHeight\@BlockUtils\@\@SAMAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static float getLiquidBlockHeight(class Block const &, class BlockPos const &); /** - * @symbol ?isBeehiveBlock\@BlockUtils\@\@SA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?isBeehiveBlock\@BlockUtils\@\@SA_NAEBVBlockLegacy\@\@\@Z */ MCAPI static bool isBeehiveBlock(class BlockLegacy const &); /** - * @symbol ?isDownwardFlowingLiquid\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isDownwardFlowingLiquid\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isDownwardFlowingLiquid(class Block const &); /** - * @symbol ?isFullFlowingLiquid\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isFullFlowingLiquid\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isFullFlowingLiquid(class Block const &); /** - * @symbol ?isLiquidSource\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isLiquidSource\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isLiquidSource(class Block const &); /** - * @symbol ?isThinFenceOrWallBlock\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isThinFenceOrWallBlock\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isThinFenceOrWallBlock(class Block const &); /** - * @symbol ?isWaterSource\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isWaterSource\@BlockUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isWaterSource(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockVolume.hpp b/LiteLoader/include/llapi/mc/BlockVolume.hpp index 4473df73be..d95684a40b 100644 --- a/LiteLoader/include/llapi/mc/BlockVolume.hpp +++ b/LiteLoader/include/llapi/mc/BlockVolume.hpp @@ -36,60 +36,60 @@ struct BlockVolumeIter { public: /** - * @symbol ??0BlockVolume\@\@QEAA\@V?$buffer_span_mut\@PEBVBlock\@\@\@\@HHHAEBVBlock\@\@H\@Z + * @symbol ??0BlockVolume\@\@QEAA\@V?$buffer_span_mut\@PEBVBlock\@\@\@\@HHHAEBVBlock\@\@H\@Z */ MCAPI BlockVolume(class buffer_span_mut, int, int, int, class Block const &, int); /** - * @symbol ?begin\@BlockVolume\@\@QEBA?AUBlockVolumeIter\@1\@XZ + * @symbol ?begin\@BlockVolume\@\@QEBA?AUBlockVolumeIter\@1\@XZ */ MCAPI struct BlockVolume::BlockVolumeIter begin() const; /** - * @symbol ?computeHeightMap\@BlockVolume\@\@QEBA?AV?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?computeHeightMap\@BlockVolume\@\@QEBA?AV?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::unique_ptr> computeHeightMap() const; /** - * @symbol ?end\@BlockVolume\@\@QEBA?AUBlockVolumeIter\@1\@XZ + * @symbol ?end\@BlockVolume\@\@QEBA?AUBlockVolumeIter\@1\@XZ */ MCAPI struct BlockVolume::BlockVolumeIter end() const; /** - * @symbol ?findHighestNonAirBlock\@BlockVolume\@\@QEBAFXZ + * @symbol ?findHighestNonAirBlock\@BlockVolume\@\@QEBAFXZ */ MCAPI short findHighestNonAirBlock() const; /** - * @symbol ?getAboveTopSolidBlock\@BlockVolume\@\@QEBAFAEBVBlockPos\@\@_N11\@Z + * @symbol ?getAboveTopSolidBlock\@BlockVolume\@\@QEBAFAEBVBlockPos\@\@_N11\@Z */ MCAPI short getAboveTopSolidBlock(class BlockPos const &, bool, bool, bool) const; /** - * @symbol ?getDimensions\@BlockVolume\@\@QEBA?AVPos\@\@XZ + * @symbol ?getDimensions\@BlockVolume\@\@QEBA?AVPos\@\@XZ */ MCAPI class Pos getDimensions() const; /** - * @symbol ?getIndexBounds\@BlockVolume\@\@QEBAIXZ + * @symbol ?getIndexBounds\@BlockVolume\@\@QEBAIXZ */ MCAPI unsigned int getIndexBounds() const; /** - * @symbol ?index\@BlockVolume\@\@QEBAIAEBVBlockPos\@\@\@Z + * @symbol ?index\@BlockVolume\@\@QEBAIAEBVBlockPos\@\@\@Z */ MCAPI unsigned int index(class BlockPos const &) const; /** - * @symbol ?index\@BlockVolume\@\@QEBAIAEBVPos\@\@\@Z + * @symbol ?index\@BlockVolume\@\@QEBAIAEBVPos\@\@\@Z */ MCAPI unsigned int index(class Pos const &) const; /** - * @symbol ?indexNoBoundsCheck\@BlockVolume\@\@QEBAIAEBVPos\@\@\@Z + * @symbol ?indexNoBoundsCheck\@BlockVolume\@\@QEBAIAEBVPos\@\@\@Z */ MCAPI unsigned int indexNoBoundsCheck(class Pos const &) const; /** - * @symbol ?indexNoBoundsCheck\@BlockVolume\@\@QEBAIAEBVBlockPos\@\@\@Z + * @symbol ?indexNoBoundsCheck\@BlockVolume\@\@QEBAIAEBVBlockPos\@\@\@Z */ MCAPI unsigned int indexNoBoundsCheck(class BlockPos const &) const; /** - * @symbol ?isInBounds\@BlockVolume\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?isInBounds\@BlockVolume\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isInBounds(class BlockPos const &) const; /** - * @symbol ?isInBounds\@BlockVolume\@\@QEBA_NAEBVPos\@\@\@Z + * @symbol ?isInBounds\@BlockVolume\@\@QEBA_NAEBVPos\@\@\@Z */ MCAPI bool isInBounds(class Pos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlockVolumeTarget.hpp b/LiteLoader/include/llapi/mc/BlockVolumeTarget.hpp index 5b939108a8..4933e1d3b4 100644 --- a/LiteLoader/include/llapi/mc/BlockVolumeTarget.hpp +++ b/LiteLoader/include/llapi/mc/BlockVolumeTarget.hpp @@ -30,177 +30,181 @@ class BlockVolumeTarget { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlockVolumeTarget(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?getMinHeight\@BlockVolumeTarget\@\@UEBAFXZ + * @vftbl 2 + * @symbol ?getMinHeight\@BlockVolumeTarget\@\@UEBAFXZ */ virtual short getMinHeight() const; /** - * @vftbl 3 - * @symbol ?tryGetLiquidBlock\@BlockVolumeTarget\@\@UEBAPEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 3 + * @symbol ?tryGetLiquidBlock\@BlockVolumeTarget\@\@UEBAPEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const * tryGetLiquidBlock(class BlockPos const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?getExtraBlock\@BlockVolumeTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 6 + * @symbol ?getExtraBlock\@BlockVolumeTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getExtraBlock(class BlockPos const &) const; /** - * @vftbl 7 - * @symbol ?fetchBlocksInBox\@BlockVolumeTarget\@\@UEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @vftbl 7 + * @symbol ?fetchBlocksInBox\@BlockVolumeTarget\@\@UEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ virtual class gsl::span const, -1> fetchBlocksInBox(class BoundingBox const &, class std::function); /** - * @vftbl 8 - * @symbol ?hasBiomeTag\@BlockVolumeTarget\@\@UEBA_N_KAEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?hasBiomeTag\@BlockVolumeTarget\@\@UEBA_N_KAEBVBlockPos\@\@\@Z */ virtual bool hasBiomeTag(unsigned __int64, class BlockPos const &) const; /** - * @vftbl 9 - * @symbol ?setBlock\@BlockVolumeTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @vftbl 9 + * @symbol ?setBlock\@BlockVolumeTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ virtual bool setBlock(class BlockPos const &, class Block const &, int); /** - * @vftbl 10 - * @symbol ?setBlockSimple\@BlockVolumeTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 10 + * @symbol ?setBlockSimple\@BlockVolumeTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool setBlockSimple(class BlockPos const &, class Block const &); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol ?getMaxHeight\@BlockVolumeTarget\@\@UEBAFXZ + * @vftbl 16 + * @symbol ?getMaxHeight\@BlockVolumeTarget\@\@UEBAFXZ */ virtual short getMaxHeight() const; /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getHeightmap\@BlockVolumeTarget\@\@UEAAFHH\@Z + * @vftbl 19 + * @symbol ?getHeightmap\@BlockVolumeTarget\@\@UEAAFHH\@Z */ virtual short getHeightmap(int, int); /** - * @vftbl 20 - * @symbol ?isLegacyLevel\@BlockVolumeTarget\@\@UEAA_NXZ + * @vftbl 20 + * @symbol ?isLegacyLevel\@BlockVolumeTarget\@\@UEAA_NXZ */ virtual bool isLegacyLevel(); /** - * @vftbl 21 - * @symbol ?getBiome\@BlockVolumeTarget\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?getBiome\@BlockVolumeTarget\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z */ virtual class Biome const * getBiome(class BlockPos const &) const; /** - * @vftbl 22 - * @symbol ?isInBounds\@BlockVolumeTarget\@\@UEBA_NAEBVPos\@\@\@Z + * @vftbl 22 + * @symbol ?isInBounds\@BlockVolumeTarget\@\@UEBA_NAEBVPos\@\@\@Z */ virtual bool isInBounds(class Pos const &) const; /** - * @vftbl 23 - * @symbol ?getLocalWaterLevel\@BlockVolumeTarget\@\@UEBAFAEBVBlockPos\@\@\@Z + * @vftbl 23 + * @symbol ?getLocalWaterLevel\@BlockVolumeTarget\@\@UEBAFAEBVBlockPos\@\@\@Z */ virtual short getLocalWaterLevel(class BlockPos const &) const; /** - * @vftbl 24 - * @symbol ?getLevelData\@BlockVolumeTarget\@\@UEBAAEBVLevelData\@\@XZ + * @vftbl 24 + * @symbol ?getLevelData\@BlockVolumeTarget\@\@UEBAAEBVLevelData\@\@XZ */ virtual class LevelData const & getLevelData() const; /** - * @vftbl 25 - * @symbol ?getContext\@BlockVolumeTarget\@\@UEAAAEBUWorldGenContext\@\@XZ + * @vftbl 25 + * @symbol ?getContext\@BlockVolumeTarget\@\@UEAAAEBUWorldGenContext\@\@XZ */ virtual struct WorldGenContext const & getContext(); /** - * @vftbl 26 - * @symbol ?disableBlockSimple\@BlockVolumeTarget\@\@UEAAXXZ + * @vftbl 26 + * @symbol ?disableBlockSimple\@BlockVolumeTarget\@\@UEAAXXZ */ virtual void disableBlockSimple(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLOCKVOLUMETARGET /** - * @symbol ?apply\@BlockVolumeTarget\@\@UEBA_NXZ + * @symbol ?apply\@BlockVolumeTarget\@\@UEBA_NXZ */ MCVAPI bool apply() const; /** - * @symbol ?canBeBuiltOver\@BlockVolumeTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?canBeBuiltOver\@BlockVolumeTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCVAPI bool canBeBuiltOver(class BlockPos const &, class Block const &) const; /** - * @symbol ?canSurvive\@BlockVolumeTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?canSurvive\@BlockVolumeTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCVAPI bool canSurvive(class BlockPos const &, class Block const &) const; /** - * @symbol ?getBlock\@BlockVolumeTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlock\@BlockVolumeTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCVAPI class Block const & getBlock(class BlockPos const &) const; /** - * @symbol ?getBlockNoBoundsCheck\@BlockVolumeTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlockNoBoundsCheck\@BlockVolumeTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCVAPI class Block const & getBlockNoBoundsCheck(class BlockPos const &) const; /** - * @symbol ?mayPlace\@BlockVolumeTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?mayPlace\@BlockVolumeTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCVAPI bool mayPlace(class BlockPos const &, class Block const &) const; /** - * @symbol ?placeStructure\@BlockVolumeTarget\@\@UEAA_NAEBVBlockPos\@\@AEAVStructureTemplate\@\@AEAVStructureSettings\@\@\@Z + * @symbol ?placeStructure\@BlockVolumeTarget\@\@UEAA_NAEBVBlockPos\@\@AEAVStructureTemplate\@\@AEAVStructureSettings\@\@\@Z */ MCVAPI bool placeStructure(class BlockPos const &, class StructureTemplate &, class StructureSettings &); /** - * @symbol ?shimPlaceForOldFeatures\@BlockVolumeTarget\@\@UEBA_NAEBVFeature\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?shimPlaceForOldFeatures\@BlockVolumeTarget\@\@UEBA_NAEBVFeature\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCVAPI bool shimPlaceForOldFeatures(class Feature const &, class BlockPos const &, class Random &) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BlockVolumeTarget(); #endif /** - * @symbol ??0BlockVolumeTarget\@\@QEAA\@AEAVBlockVolume\@\@AEAVLevel\@\@AEBVBiomeSource\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBUWorldGenContext\@\@\@Z + * @symbol ??0BlockVolumeTarget\@\@QEAA\@AEAVBlockVolume\@\@AEAVLevel\@\@AEBVBiomeSource\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBUWorldGenContext\@\@\@Z */ MCAPI BlockVolumeTarget(class BlockVolume &, class Level &, class BiomeSource const &, class AutomaticID, struct WorldGenContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlueFireBlock.hpp b/LiteLoader/include/llapi/mc/BlueFireBlock.hpp index 86f4aa74e9..abde8d6988 100644 --- a/LiteLoader/include/llapi/mc/BlueFireBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueFireBlock.hpp @@ -31,257 +31,262 @@ class BlueFireBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlueFireBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BlueFireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BlueFireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BlueFireBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BlueFireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 89 - * @symbol ?mayPick\@BlueFireBlock\@\@UEBA_NXZ + * @vftbl 89 + * @symbol ?mayPick\@BlueFireBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 92 - * @symbol ?mayPlace\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BlueFireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BlueFireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BLUEFIREBLOCK /** - * @symbol ?canBeSilkTouched\@BlueFireBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@BlueFireBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@BlueFireBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@BlueFireBlock\@\@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 ??0BlueFireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BlueFireBlock(std::string const &, int); /** - * @symbol ?isValidBlueFireFuel\@BlueFireBlock\@\@SA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?isValidBlueFireFuel\@BlueFireBlock\@\@SA_NAEBVBlockLegacy\@\@\@Z */ MCAPI static bool isValidBlueFireFuel(class BlockLegacy const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp index 43a0bc9171..45da70b0a6 100644 --- a/LiteLoader/include/llapi/mc/BlueIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceBlock.hpp @@ -31,198 +31,203 @@ class BlueIceBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlueIceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@BlueIceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@BlueIceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0BlueIceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BlueIceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BlueIceBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BlueIceFeature.hpp b/LiteLoader/include/llapi/mc/BlueIceFeature.hpp index 1b307f667f..fa57cc87fb 100644 --- a/LiteLoader/include/llapi/mc/BlueIceFeature.hpp +++ b/LiteLoader/include/llapi/mc/BlueIceFeature.hpp @@ -31,14 +31,14 @@ class BlueIceFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BlueIceFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BlueIceFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BlueIceFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Boat.hpp b/LiteLoader/include/llapi/mc/Boat.hpp index 6eeddf7c56..41a99db511 100644 --- a/LiteLoader/include/llapi/mc/Boat.hpp +++ b/LiteLoader/include/llapi/mc/Boat.hpp @@ -31,229 +31,229 @@ class Boat : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Boat\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Boat\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Boat\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Boat\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Boat(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@Boat\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@Boat\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Boat\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Boat\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 56 - * @symbol ?getExitTip\@Boat\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@W4InputMode\@\@W4NewInteractionModel\@\@\@Z + * @vftbl 56 + * @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 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@Boat\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@Boat\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Boat\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Boat\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 91 - * @symbol ?onAboveBubbleColumn\@Boat\@\@UEAAX_N\@Z + * @vftbl 90 + * @symbol ?onAboveBubbleColumn\@Boat\@\@UEAAX_N\@Z */ virtual void onAboveBubbleColumn(bool); /** - * @vftbl 96 - * @symbol ?isPickable\@Boat\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Boat\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Boat\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Boat\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 181 - * @symbol ?getControllingPlayer\@Boat\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 180 + * @symbol ?getControllingPlayer\@Boat\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 189 - * @symbol ?canAddPassenger\@Boat\@\@UEBA_NAEAVActor\@\@\@Z + * @vftbl 188 + * @symbol ?canAddPassenger\@Boat\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 222 - * @symbol ?getPassengerYRotation\@Boat\@\@UEBAMAEBVActor\@\@\@Z + * @vftbl 221 + * @symbol ?getPassengerYRotation\@Boat\@\@UEBAMAEBVActor\@\@\@Z */ virtual float getPassengerYRotation(class Actor const &) const; /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Boat\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Boat\@\@EEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?destroy\@Boat\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 276 + * @symbol ?destroy\@Boat\@\@UEAAXPEAVActor\@\@\@Z */ virtual void destroy(class Actor *); /** - * @symbol ??0Boat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Boat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Boat(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getRowingTime\@Boat\@\@QEBAMW4Side\@\@\@Z + * @symbol ?getRowingTime\@Boat\@\@QEBAMW4Side\@\@\@Z */ MCAPI float getRowingTime(enum class Side) const; /** - * @symbol ?getWoodID\@Boat\@\@QEBAEXZ + * @symbol ?getWoodID\@Boat\@\@QEBAEXZ */ MCAPI unsigned char getWoodID() const; /** - * @symbol ?postNormalTick\@Boat\@\@QEAAXXZ + * @symbol ?postNormalTick\@Boat\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?setPaddleState\@Boat\@\@QEAA_NW4Side\@\@_N\@Z + * @symbol ?setPaddleState\@Boat\@\@QEAA_NW4Side\@\@_N\@Z */ MCAPI bool setPaddleState(enum class Side, bool); /** - * @symbol ?setRowingTime\@Boat\@\@QEAAXW4Side\@\@M\@Z + * @symbol ?setRowingTime\@Boat\@\@QEAAXW4Side\@\@M\@Z */ MCAPI void setRowingTime(enum class Side, float); //private: /** - * @symbol ?_control\@Boat\@\@AEAAXXZ + * @symbol ?_control\@Boat\@\@AEAAXXZ */ MCAPI void _control(); /** - * @symbol ?_move\@Boat\@\@AEAAXXZ + * @symbol ?_move\@Boat\@\@AEAAXXZ */ MCAPI void _move(); /** - * @symbol ?_paddleControl\@Boat\@\@AEAAXW4Side\@\@AEAVVec3\@\@1\@Z + * @symbol ?_paddleControl\@Boat\@\@AEAAXW4Side\@\@AEAVVec3\@\@1\@Z */ MCAPI void _paddleControl(enum class Side, class Vec3 &, class Vec3 &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp b/LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp index 8818681cc5..0df54986cf 100644 --- a/LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp +++ b/LiteLoader/include/llapi/mc/BoatFrictionHelper.hpp @@ -22,7 +22,7 @@ namespace BoatFrictionHelper { #undef AFTER_EXTRA /** - * @symbol ?getFrictionBasedOnCollision\@BoatFrictionHelper\@\@YAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getFrictionBasedOnCollision\@BoatFrictionHelper\@\@YAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI float getFrictionBasedOnCollision(class BlockSource &, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/BoatItem.hpp b/LiteLoader/include/llapi/mc/BoatItem.hpp index 80cb19eb50..c0a322fe34 100644 --- a/LiteLoader/include/llapi/mc/BoatItem.hpp +++ b/LiteLoader/include/llapi/mc/BoatItem.hpp @@ -32,118 +32,118 @@ class BoatItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BoatItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 46 - * @symbol ?isStackedByData\@BoatItem\@\@UEBA_NXZ + * @vftbl 46 + * @symbol ?isStackedByData\@BoatItem\@\@UEBA_NXZ */ virtual bool isStackedByData() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@BoatItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@BoatItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@BoatItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@BoatItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@BoatItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@BoatItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BoatItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BoatItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@BoatItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@BoatItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BoatItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BoatItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @vftbl 133 - * @symbol ?_getActorType\@BoatItem\@\@EEBA?AW4ActorType\@\@XZ + * @vftbl 133 + * @symbol ?_getActorType\@BoatItem\@\@EEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType _getActorType() const; /** - * @symbol ??0BoatItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z + * @symbol ??0BoatItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z */ MCAPI BoatItem(std::string const &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp b/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp index 31695e3651..1664052636 100644 --- a/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/BoatPaddleInputSystem.hpp @@ -10,26 +10,19 @@ #undef BEFORE_EXTRA -/** - * @brief MC class BoatPaddleInputSystem. - * - */ -class BoatPaddleInputSystem { + +namespace BoatPaddleInputSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BOATPADDLEINPUTSYSTEM -public: - class BoatPaddleInputSystem& operator=(class BoatPaddleInputSystem const &) = delete; - BoatPaddleInputSystem(class BoatPaddleInputSystem const &) = delete; - BoatPaddleInputSystem() = delete; -#endif - -public: /** - * @symbol ?createBoatPaddleInputSystemClient\@BoatPaddleInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySideSystem\@BoatPaddleInputSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSideBySideSystem(); + /** + * @symbol ?createSystem\@BoatPaddleInputSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createBoatPaddleInputSystemClient(); + MCAPI struct TickingSystemWithInfo createSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BoatPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/BoatPostNormalTickSystem.hpp deleted file mode 100644 index abbf1a4a3c..0000000000 --- a/LiteLoader/include/llapi/mc/BoatPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file BoatPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BoatPostNormalTickSystem. - * - */ -class BoatPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BOATPOSTNORMALTICKSYSTEM -public: - class BoatPostNormalTickSystem& operator=(class BoatPostNormalTickSystem const &) = delete; - BoatPostNormalTickSystem(class BoatPostNormalTickSystem const &) = delete; - BoatPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@BoatPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doBoatPostNormalTickSystem\@BoatPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doBoatPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BodyControl.hpp b/LiteLoader/include/llapi/mc/BodyControl.hpp index 12d2b6b756..62da296a96 100644 --- a/LiteLoader/include/llapi/mc/BodyControl.hpp +++ b/LiteLoader/include/llapi/mc/BodyControl.hpp @@ -29,30 +29,36 @@ class BodyControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BodyControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?clientTick\@BodyControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?clientTick\@BodyControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void clientTick(class Mob &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BODYCONTROL /** - * @symbol ??0BodyControl\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BodyControl(); +#endif + /** + * @symbol ??0BodyControl\@\@QEAA\@XZ */ MCAPI BodyControl(); //private: /** - * @symbol ?_allowUpdateBodyRotation\@BodyControl\@\@AEBA_NAEBVMob\@\@\@Z + * @symbol ?_allowUpdateBodyRotation\@BodyControl\@\@AEBA_NAEBVMob\@\@\@Z */ MCAPI bool _allowUpdateBodyRotation(class Mob const &) const; private: /** - * @symbol ?MAX_CLAMP_ANGLE\@BodyControl\@\@0MB + * @symbol ?MAX_CLAMP_ANGLE\@BodyControl\@\@0MB */ MCAPI static float const MAX_CLAMP_ANGLE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BodyControlComponent.hpp b/LiteLoader/include/llapi/mc/BodyControlComponent.hpp index 4288d685a4..59c81e037a 100644 --- a/LiteLoader/include/llapi/mc/BodyControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/BodyControlComponent.hpp @@ -28,8 +28,8 @@ class BodyControlComponent { public: /** - * @symbol ??1BodyControlComponent\@\@QEAA\@XZ + * @symbol ??1BodyControlComponent\@\@QEAA\@XZ */ MCAPI ~BodyControlComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BodyControlSystem.hpp b/LiteLoader/include/llapi/mc/BodyControlSystem.hpp index 8e5df75526..f8e209101f 100644 --- a/LiteLoader/include/llapi/mc/BodyControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/BodyControlSystem.hpp @@ -30,19 +30,19 @@ class BodyControlSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BodyControlSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BodyControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BodyControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoneAnimation.hpp b/LiteLoader/include/llapi/mc/BoneAnimation.hpp index e544c36352..de30b3c1e2 100644 --- a/LiteLoader/include/llapi/mc/BoneAnimation.hpp +++ b/LiteLoader/include/llapi/mc/BoneAnimation.hpp @@ -30,12 +30,12 @@ class BoneAnimation { public: /** - * @symbol ?addAnimationChannel\@BoneAnimation\@\@QEAAAEAVBoneAnimationChannel\@\@W4BoneTransformType\@\@\@Z + * @symbol ?addAnimationChannel\@BoneAnimation\@\@QEAAAEAVBoneAnimationChannel\@\@W4BoneTransformType\@\@\@Z */ MCAPI class BoneAnimationChannel & addAnimationChannel(enum class BoneTransformType); /** - * @symbol ?setRotationRelativeMode\@BoneAnimation\@\@QEAAXW4BoneAnimationRelativeMode\@\@\@Z + * @symbol ?setRotationRelativeMode\@BoneAnimation\@\@QEAAXW4BoneAnimationRelativeMode\@\@\@Z */ MCAPI void setRotationRelativeMode(enum class BoneAnimationRelativeMode); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp b/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp index 4a78aa7cf0..2dcdc2e3cc 100644 --- a/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp +++ b/LiteLoader/include/llapi/mc/BoneAnimationChannel.hpp @@ -30,12 +30,12 @@ class BoneAnimationChannel { public: /** - * @symbol ?addKeyFrame\@BoneAnimationChannel\@\@QEAAAEAVKeyFrameTransform\@\@M\@Z + * @symbol ?addKeyFrame\@BoneAnimationChannel\@\@QEAAAEAVKeyFrameTransform\@\@M\@Z */ MCAPI class KeyFrameTransform & addKeyFrame(float); /** - * @symbol ?sortKeyFrames\@BoneAnimationChannel\@\@QEAAXXZ + * @symbol ?sortKeyFrames\@BoneAnimationChannel\@\@QEAAXXZ */ MCAPI void sortKeyFrames(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoneOrientation.hpp b/LiteLoader/include/llapi/mc/BoneOrientation.hpp index e6fca2579c..08212b9da1 100644 --- a/LiteLoader/include/llapi/mc/BoneOrientation.hpp +++ b/LiteLoader/include/llapi/mc/BoneOrientation.hpp @@ -30,24 +30,24 @@ class BoneOrientation { public: /** - * @symbol ?applyShortestPathBlend\@BoneOrientation\@\@QEAAXAEBV1\@0MM\@Z + * @symbol ?applyShortestPathBlend\@BoneOrientation\@\@QEAAXAEBV1\@0MM\@Z */ MCAPI void applyShortestPathBlend(class BoneOrientation const &, class BoneOrientation const &, float, float); /** - * @symbol ?getName\@BoneOrientation\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getName\@BoneOrientation\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getName() const; /** - * @symbol ?getPivot\@BoneOrientation\@\@QEAAAEAVVec3\@\@XZ + * @symbol ?getPivot\@BoneOrientation\@\@QEAAAEAVVec3\@\@XZ */ MCAPI class Vec3 & getPivot(); /** - * @symbol ?getPivot\@BoneOrientation\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getPivot\@BoneOrientation\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getPivot() const; /** - * @symbol ?setDefaultPose\@BoneOrientation\@\@QEAAXXZ + * @symbol ?setDefaultPose\@BoneOrientation\@\@QEAAXXZ */ MCAPI void setDefaultPose(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp b/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp index 79df9226de..be4724accf 100644 --- a/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp +++ b/LiteLoader/include/llapi/mc/BoneOrientationTransform.hpp @@ -27,8 +27,8 @@ class BoneOrientationTransform { public: /** - * @symbol ??0BoneOrientationTransform\@\@QEAA\@XZ + * @symbol ??0BoneOrientationTransform\@\@QEAA\@XZ */ MCAPI BoneOrientationTransform(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BonusChestFeature.hpp b/LiteLoader/include/llapi/mc/BonusChestFeature.hpp index 01873bc7ed..a9de8c3861 100644 --- a/LiteLoader/include/llapi/mc/BonusChestFeature.hpp +++ b/LiteLoader/include/llapi/mc/BonusChestFeature.hpp @@ -31,22 +31,28 @@ class BonusChestFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BonusChestFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@BonusChestFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@BonusChestFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BONUSCHESTFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BonusChestFeature(); +#endif //private: /** - * @symbol ?_place\@BonusChestFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_place\@BonusChestFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI bool _place(class BlockSource &, class BlockPos const &, class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp index de02d65fbd..84f6c46baf 100644 --- a/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/BookCloningRecipe.hpp @@ -31,51 +31,51 @@ class BookCloningRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BookCloningRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@BookCloningRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@BookCloningRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@BookCloningRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@BookCloningRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@BookCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@BookCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@BookCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@BookCloningRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@BookCloningRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI BookCloningRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI BookCloningRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ??0BookCloningRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI BookCloningRecipe(class gsl::basic_string_span); + MCAPI BookCloningRecipe(class std::basic_string_view>); /** - * @symbol ?ID\@BookCloningRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@BookCloningRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BookEditPacket.hpp b/LiteLoader/include/llapi/mc/BookEditPacket.hpp index 113dade1b4..801cc1e86d 100644 --- a/LiteLoader/include/llapi/mc/BookEditPacket.hpp +++ b/LiteLoader/include/llapi/mc/BookEditPacket.hpp @@ -29,53 +29,59 @@ class BookEditPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BookEditPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@BookEditPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@BookEditPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@BookEditPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BookEditPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@BookEditPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@BookEditPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@BookEditPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@BookEditPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOOKEDITPACKET /** - * @symbol ??0BookEditPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI BookEditPacket(); + MCVAPI ~BookEditPacket(); +#endif /** - * @symbol ??0BookEditPacket\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0BookEditPacket\@\@QEAA\@AEBV0\@\@Z */ MCAPI BookEditPacket(class BookEditPacket const &); /** - * @symbol ?getPage\@BookEditPacket\@\@QEBA?AUPageContent\@\@XZ + * @symbol ??0BookEditPacket\@\@QEAA\@XZ + */ + MCAPI BookEditPacket(); + /** + * @symbol ?getPage\@BookEditPacket\@\@QEBA?AUPageContent\@\@XZ */ MCAPI struct PageContent getPage() const; //private: /** - * @symbol ?_readPage\@BookEditPacket\@\@AEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_readPage\@BookEditPacket\@\@AEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI void _readPage(class ReadOnlyBinaryStream &); /** - * @symbol ?_writePage\@BookEditPacket\@\@AEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?_writePage\@BookEditPacket\@\@AEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void _writePage(class BinaryStream &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp index 67d0974575..1bb524eded 100644 --- a/LiteLoader/include/llapi/mc/BookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/BookshelfBlock.hpp @@ -31,208 +31,213 @@ class BookshelfBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BookshelfBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@BookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@BookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@BookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@BookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@BookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0BookshelfBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BookshelfBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BookshelfBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoolOption.hpp b/LiteLoader/include/llapi/mc/BoolOption.hpp index 7a61470b59..bb8b89f450 100644 --- a/LiteLoader/include/llapi/mc/BoolOption.hpp +++ b/LiteLoader/include/llapi/mc/BoolOption.hpp @@ -32,39 +32,39 @@ class BoolOption : public Option { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BoolOption(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?save\@BoolOption\@\@UEAAXAEAV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?save\@BoolOption\@\@UEAAXAEAV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void save(std::vector> &); /** - * @vftbl 2 - * @symbol ?load\@BoolOption\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?load\@BoolOption\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void load(std::string const &); /** - * @symbol ??0BoolOption\@\@QEAA\@W4OptionID\@\@W4OptionOwnerType\@\@W4OptionResetFlags\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3_N\@Z + * @symbol ??0BoolOption\@\@QEAA\@W4OptionID\@\@W4OptionOwnerType\@\@W4OptionResetFlags\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3_N\@Z */ MCAPI BoolOption(enum class OptionID, enum class OptionOwnerType, enum class OptionResetFlags, std::string const &, std::string const &, bool); /** - * @symbol ?getValue\@BoolOption\@\@QEBA_NXZ + * @symbol ?getValue\@BoolOption\@\@QEBA_NXZ */ MCAPI bool getValue() const; /** - * @symbol ?set\@BoolOption\@\@QEAAX_N0\@Z + * @symbol ?set\@BoolOption\@\@QEAAX_N0\@Z */ MCAPI void set(bool, bool); //private: /** - * @symbol ?_set\@BoolOption\@\@AEAAX_N0\@Z + * @symbol ?_set\@BoolOption\@\@AEAAX_N0\@Z */ MCAPI void _set(bool, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoostItem.hpp b/LiteLoader/include/llapi/mc/BoostItem.hpp index 15ab0040db..a682846c71 100644 --- a/LiteLoader/include/llapi/mc/BoostItem.hpp +++ b/LiteLoader/include/llapi/mc/BoostItem.hpp @@ -27,11 +27,11 @@ struct BoostItem { public: /** - * @symbol ?setReplacementItemDescriptor\@BoostItem\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?setReplacementItemDescriptor\@BoostItem\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void setReplacementItemDescriptor(class ItemDescriptor const &); /** - * @symbol ??1BoostItem\@\@QEAA\@XZ + * @symbol ??1BoostItem\@\@QEAA\@XZ */ MCAPI ~BoostItem(); diff --git a/LiteLoader/include/llapi/mc/BoostableComponent.hpp b/LiteLoader/include/llapi/mc/BoostableComponent.hpp index 2827da0f7b..93e37e44b8 100644 --- a/LiteLoader/include/llapi/mc/BoostableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BoostableComponent.hpp @@ -29,39 +29,39 @@ class BoostableComponent { public: /** - * @symbol ??0BoostableComponent\@\@QEAA\@XZ + * @symbol ??0BoostableComponent\@\@QEAA\@XZ */ MCAPI BoostableComponent(); /** - * @symbol ?getBoostTime\@BoostableComponent\@\@QEBAHXZ + * @symbol ?getBoostTime\@BoostableComponent\@\@QEBAHXZ */ MCAPI int getBoostTime() const; /** - * @symbol ?getBoostTimeTotal\@BoostableComponent\@\@QEBAHXZ + * @symbol ?getBoostTimeTotal\@BoostableComponent\@\@QEBAHXZ */ MCAPI int getBoostTimeTotal() const; /** - * @symbol ?getIsBoosting\@BoostableComponent\@\@QEBA_NXZ + * @symbol ?getIsBoosting\@BoostableComponent\@\@QEBA_NXZ */ MCAPI bool getIsBoosting() const; /** - * @symbol ?itemUseText\@BoostableComponent\@\@QEAA_NAEBVPlayer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?itemUseText\@BoostableComponent\@\@QEAA_NAEBVPlayer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool itemUseText(class Player const &, std::string &); /** - * @symbol ?onItemInteract\@BoostableComponent\@\@QEAA_NAEAVActor\@\@AEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?onItemInteract\@BoostableComponent\@\@QEAA_NAEAVActor\@\@AEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool onItemInteract(class Actor &, class ItemStack &, class Player &); /** - * @symbol ?setBoostTime\@BoostableComponent\@\@QEAAXH\@Z + * @symbol ?setBoostTime\@BoostableComponent\@\@QEAAXH\@Z */ MCAPI void setBoostTime(int); /** - * @symbol ?setIsBoosting\@BoostableComponent\@\@QEAAX_N\@Z + * @symbol ?setIsBoosting\@BoostableComponent\@\@QEAAX_N\@Z */ MCAPI void setIsBoosting(bool); /** - * @symbol ?getSpeedModifierBoosting\@BoostableComponent\@\@SA?AV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@XZ + * @symbol ?getSpeedModifierBoosting\@BoostableComponent\@\@SA?AV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@XZ */ MCAPI static class std::shared_ptr getSpeedModifierBoosting(); @@ -69,12 +69,12 @@ class BoostableComponent { private: /** - * @symbol ?SPEED_MODIFIER_BOOSTING\@BoostableComponent\@\@0V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @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 + * @symbol ?SPEED_MODIFIER_BOOSTING_UUID\@BoostableComponent\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SPEED_MODIFIER_BOOSTING_UUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoostableDefinition.hpp b/LiteLoader/include/llapi/mc/BoostableDefinition.hpp index 4e92fa6e5e..8d7b3b8b51 100644 --- a/LiteLoader/include/llapi/mc/BoostableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BoostableDefinition.hpp @@ -31,12 +31,12 @@ class BoostableDefinition { public: /** - * @symbol ?initialize\@BoostableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBoostableComponent\@\@\@Z + * @symbol ?initialize\@BoostableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBoostableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BoostableComponent &) const; /** - * @symbol ?buildSchema\@BoostableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBoostableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BoostableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBoostableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BoostableRemovePassengerSystem.hpp b/LiteLoader/include/llapi/mc/BoostableRemovePassengerSystem.hpp deleted file mode 100644 index 9d7a2ec30f..0000000000 --- a/LiteLoader/include/llapi/mc/BoostableRemovePassengerSystem.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @file BoostableRemovePassengerSystem.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class BoostableRemovePassengerSystem. - * - */ -class BoostableRemovePassengerSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BOOSTABLEREMOVEPASSENGERSYSTEM -public: - class BoostableRemovePassengerSystem& operator=(class BoostableRemovePassengerSystem const &) = delete; - BoostableRemovePassengerSystem(class BoostableRemovePassengerSystem const &) = delete; - BoostableRemovePassengerSystem() = delete; -#endif - -public: - /** - * @symbol ?boostableRemovePassenger@BoostableRemovePassengerSystem@@SAXAEAVStrictEntityContext@@AEBURemovePassengersComponent@@AEAV?$ViewT@VStrictEntityContext@@VEntityRegistryBase@@U?$Include@UPassengerComponent@@V?$FlagComponent@UPlayerComponentFlag@@@@@@UFOVModifierComponent@@@@@Z - * @hash 1797414603 - */ - MCAPI static void boostableRemovePassenger(class StrictEntityContext &, struct RemovePassengersComponent const &, class ViewT>, struct FOVModifierComponent> &); - /** - * @symbol ?createSystem@BoostableRemovePassengerSystem@@SA?AUTickingSystemWithInfo@@XZ - * @hash -1980784878 - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/BoostableSystem.hpp b/LiteLoader/include/llapi/mc/BoostableSystem.hpp index 2fbb0bc792..64e91729c9 100644 --- a/LiteLoader/include/llapi/mc/BoostableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BoostableSystem.hpp @@ -30,19 +30,19 @@ class BoostableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BoostableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BoostableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BoostableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BorderBlock.hpp b/LiteLoader/include/llapi/mc/BorderBlock.hpp index ce74c69112..4a7c44c962 100644 --- a/LiteLoader/include/llapi/mc/BorderBlock.hpp +++ b/LiteLoader/include/llapi/mc/BorderBlock.hpp @@ -31,243 +31,248 @@ class BorderBlock : public WallBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BorderBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@BorderBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@BorderBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@BorderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @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 142 - * @symbol ?getVisualShapeInWorld\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 143 - * @symbol ?getVisualShape\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@BorderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@BorderBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@BorderBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BorderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@BorderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@BorderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0BorderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BorderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BorderBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BossComponent.hpp b/LiteLoader/include/llapi/mc/BossComponent.hpp index 78ddbea9dd..d061dd6533 100644 --- a/LiteLoader/include/llapi/mc/BossComponent.hpp +++ b/LiteLoader/include/llapi/mc/BossComponent.hpp @@ -29,120 +29,120 @@ class BossComponent { public: /** - * @symbol ??0BossComponent\@\@QEAA\@XZ + * @symbol ??0BossComponent\@\@QEAA\@XZ */ MCAPI BossComponent(); /** - * @symbol ??0BossComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0BossComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI BossComponent(class BossComponent &&); /** - * @symbol ?addPlayerToParty\@BossComponent\@\@QEAAXVUUID\@mce\@\@H\@Z + * @symbol ?addPlayerToParty\@BossComponent\@\@QEAAXVUUID\@mce\@\@H\@Z */ MCAPI void addPlayerToParty(class mce::UUID, int); /** - * @symbol ?broadcastBossEvent\@BossComponent\@\@QEAAXAEAVActor\@\@W4BossEventUpdateType\@\@\@Z + * @symbol ?broadcastBossEvent\@BossComponent\@\@QEAAXAEAVActor\@\@W4BossEventUpdateType\@\@\@Z */ MCAPI void broadcastBossEvent(class Actor &, enum class BossEventUpdateType); /** - * @symbol ?getColor\@BossComponent\@\@QEBA?AW4BossBarColor\@\@XZ + * @symbol ?getColor\@BossComponent\@\@QEBA?AW4BossBarColor\@\@XZ */ MCAPI enum class BossBarColor getColor() const; /** - * @symbol ?getCreateWorldFog\@BossComponent\@\@QEBA_NXZ + * @symbol ?getCreateWorldFog\@BossComponent\@\@QEBA_NXZ */ MCAPI bool getCreateWorldFog() const; /** - * @symbol ?getHealthPercent\@BossComponent\@\@QEBAMXZ + * @symbol ?getHealthPercent\@BossComponent\@\@QEBAMXZ */ MCAPI float getHealthPercent() const; /** - * @symbol ?getLastHealth\@BossComponent\@\@QEBAHXZ + * @symbol ?getLastHealth\@BossComponent\@\@QEBAHXZ */ MCAPI int getLastHealth() const; /** - * @symbol ?getLastPlayerUpdate\@BossComponent\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ + * @symbol ?getLastPlayerUpdate\@BossComponent\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ */ MCAPI class std::chrono::time_point>> getLastPlayerUpdate() const; /** - * @symbol ?getName\@BossComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BossComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName() const; /** - * @symbol ?getOverlay\@BossComponent\@\@QEBA?AW4BossBarOverlay\@\@XZ + * @symbol ?getOverlay\@BossComponent\@\@QEBA?AW4BossBarOverlay\@\@XZ */ MCAPI enum class BossBarOverlay getOverlay() const; /** - * @symbol ?getPlayerParty\@BossComponent\@\@QEBAAEBV?$unordered_map\@VUUID\@mce\@\@HU?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@4\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@H\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getPlayerParty\@BossComponent\@\@QEBAAEBV?$unordered_map\@VUUID\@mce\@\@HU?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@4\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@H\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getPlayerParty() const; /** - * @symbol ?getShouldDarkenSky\@BossComponent\@\@QEBA_NXZ + * @symbol ?getShouldDarkenSky\@BossComponent\@\@QEBA_NXZ */ MCAPI bool getShouldDarkenSky() const; /** - * @symbol ?handleRegisterPlayers\@BossComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?handleRegisterPlayers\@BossComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void handleRegisterPlayers(class Actor &); /** - * @symbol ??4BossComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BossComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BossComponent & operator=(class BossComponent &&); /** - * @symbol ?readAdditionalSaveData\@BossComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@BossComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?registerPlayer\@BossComponent\@\@QEAAXAEAVActor\@\@PEAVPlayer\@\@\@Z + * @symbol ?registerPlayer\@BossComponent\@\@QEAAXAEAVActor\@\@PEAVPlayer\@\@\@Z */ MCAPI void registerPlayer(class Actor &, class Player *); /** - * @symbol ?resendBossEventData\@BossComponent\@\@QEAAXAEAVActor\@\@PEAVPlayer\@\@\@Z + * @symbol ?resendBossEventData\@BossComponent\@\@QEAAXAEAVActor\@\@PEAVPlayer\@\@\@Z */ MCAPI void resendBossEventData(class Actor &, class Player *); /** - * @symbol ?sendDeathTelemetry\@BossComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?sendDeathTelemetry\@BossComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendDeathTelemetry(class Actor &); /** - * @symbol ?setHealthBarVisible\@BossComponent\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?setHealthBarVisible\@BossComponent\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void setHealthBarVisible(class Actor &, bool); /** - * @symbol ?setHealthPercent\@BossComponent\@\@QEAAXAEAVActor\@\@M\@Z + * @symbol ?setHealthPercent\@BossComponent\@\@QEAAXAEAVActor\@\@M\@Z */ MCAPI void setHealthPercent(class Actor &, float); /** - * @symbol ?setLastHealth\@BossComponent\@\@QEAAXH\@Z + * @symbol ?setLastHealth\@BossComponent\@\@QEAAXH\@Z */ MCAPI void setLastHealth(int); /** - * @symbol ?setLastPlayerUpdate\@BossComponent\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?setLastPlayerUpdate\@BossComponent\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI void setLastPlayerUpdate(class std::chrono::time_point>>); /** - * @symbol ?setName\@BossComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setName\@BossComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setName(class Actor &, std::string const &); /** - * @symbol ?tryRemoveBoss\@BossComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?tryRemoveBoss\@BossComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI bool tryRemoveBoss(class Actor &, class Player &); /** - * @symbol ?unRegisterPlayer\@BossComponent\@\@QEAAXAEAVActor\@\@PEAVPlayer\@\@\@Z + * @symbol ?unRegisterPlayer\@BossComponent\@\@QEAAXAEAVActor\@\@PEAVPlayer\@\@\@Z */ MCAPI void unRegisterPlayer(class Actor &, class Player *); /** - * @symbol ??1BossComponent\@\@QEAA\@XZ + * @symbol ??1BossComponent\@\@QEAA\@XZ */ MCAPI ~BossComponent(); //private: /** - * @symbol ?_sendBossEvent\@BossComponent\@\@AEAAXAEAVActor\@\@W4BossEventUpdateType\@\@PEAVPlayer\@\@\@Z + * @symbol ?_sendBossEvent\@BossComponent\@\@AEAAXAEAVActor\@\@W4BossEventUpdateType\@\@PEAVPlayer\@\@\@Z */ MCAPI void _sendBossEvent(class Actor &, enum class BossEventUpdateType, class Player *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BossDefinition.hpp b/LiteLoader/include/llapi/mc/BossDefinition.hpp index b80513d561..8414b3c75f 100644 --- a/LiteLoader/include/llapi/mc/BossDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BossDefinition.hpp @@ -30,16 +30,16 @@ class BossDefinition { public: /** - * @symbol ??0BossDefinition\@\@QEAA\@XZ + * @symbol ??0BossDefinition\@\@QEAA\@XZ */ MCAPI BossDefinition(); /** - * @symbol ?initialize\@BossDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBossComponent\@\@\@Z + * @symbol ?initialize\@BossDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBossComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BossComponent &) const; /** - * @symbol ?buildSchema\@BossDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBossDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BossDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBossDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BossEventPacket.hpp b/LiteLoader/include/llapi/mc/BossEventPacket.hpp index 95aad49bce..0815a6cf2c 100644 --- a/LiteLoader/include/llapi/mc/BossEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/BossEventPacket.hpp @@ -30,41 +30,47 @@ class BossEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BossEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@BossEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@BossEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@BossEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@BossEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@BossEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@BossEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@BossEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@BossEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BOSSEVENTPACKET /** - * @symbol ??0BossEventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI BossEventPacket(); + MCVAPI ~BossEventPacket(); +#endif /** - * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@UActorUniqueID\@\@AEAVBossComponent\@\@\@Z + * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@UActorUniqueID\@\@AEAVBossComponent\@\@\@Z */ MCAPI BossEventPacket(enum class BossEventUpdateType, struct ActorUniqueID, class BossComponent &); /** - * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@AEAVRaidBossComponent\@\@\@Z + * @symbol ??0BossEventPacket\@\@QEAA\@W4BossEventUpdateType\@\@AEAVRaidBossComponent\@\@\@Z */ MCAPI BossEventPacket(enum class BossEventUpdateType, class RaidBossComponent &); + /** + * @symbol ??0BossEventPacket\@\@QEAA\@XZ + */ + MCAPI BossEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BossSystem.hpp b/LiteLoader/include/llapi/mc/BossSystem.hpp index 02ecdd0755..25546ae9c2 100644 --- a/LiteLoader/include/llapi/mc/BossSystem.hpp +++ b/LiteLoader/include/llapi/mc/BossSystem.hpp @@ -30,19 +30,19 @@ class BossSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BossSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BossSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BossSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BossbarManager.hpp b/LiteLoader/include/llapi/mc/BossbarManager.hpp index d8de5bffa0..f68603683b 100644 --- a/LiteLoader/include/llapi/mc/BossbarManager.hpp +++ b/LiteLoader/include/llapi/mc/BossbarManager.hpp @@ -28,8 +28,8 @@ class BossbarManager { public: /** - * @symbol ??1BossbarManager\@\@QEAA\@XZ + * @symbol ??1BossbarManager\@\@QEAA\@XZ */ MCAPI ~BossbarManager(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BottleItem.hpp b/LiteLoader/include/llapi/mc/BottleItem.hpp index cea1b20b08..469ee02598 100644 --- a/LiteLoader/include/llapi/mc/BottleItem.hpp +++ b/LiteLoader/include/llapi/mc/BottleItem.hpp @@ -32,105 +32,105 @@ class BottleItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BottleItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@BottleItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@BottleItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@BottleItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@BottleItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 - * @symbol ?_useOn\@BottleItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BottleItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0BottleItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BottleItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BottleItem(std::string const &, int); //private: /** - * @symbol ?_createBottledItem\@BottleItem\@\@AEBAXAEAVActor\@\@AEAVItemStack\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?_createBottledItem\@BottleItem\@\@AEBAXAEAVActor\@\@AEAVItemStack\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI void _createBottledItem(class Actor &, class ItemStack &, class gsl::basic_string_span) const; + MCAPI void _createBottledItem(class Actor &, class ItemStack &, class std::basic_string_view>) const; /** - * @symbol ?_fillBottleViaDispenser\@BottleItem\@\@AEBAXAEAVBlockSource\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @symbol ?_fillBottleViaDispenser\@BottleItem\@\@AEBAXAEAVBlockSource\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ - MCAPI void _fillBottleViaDispenser(class BlockSource &, class gsl::basic_string_span, class Container &, int, class Vec3 const &, unsigned char) const; + MCAPI void _fillBottleViaDispenser(class BlockSource &, class std::basic_string_view>, class Container &, int, class Vec3 const &, unsigned char) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp b/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp index ad6dc0f7f6..eca791208f 100644 --- a/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp +++ b/LiteLoader/include/llapi/mc/BounceEventingSystem.hpp @@ -28,16 +28,16 @@ class BounceEventingSystem { public: /** - * @symbol ?createSystem\@BounceEventingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@BounceEventingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doBounceEventingSystem\@BounceEventingSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEBUActorUniqueIDComponent\@\@AEBUEventingDispatcherComponent\@\@AEAUBounceComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@\@Z + * @symbol ?_doBounceEventingSystem\@BounceEventingSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEBUActorUniqueIDComponent\@\@AEBUEventingDispatcherComponent\@\@AEAUBounceComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@\@Z */ MCAPI static void _doBounceEventingSystem(class StrictEntityContext const &, struct StateVectorComponent const &, struct ActorUniqueIDComponent const &, struct EventingDispatcherComponent const &, struct BounceComponent &, class ViewT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Bounds.hpp b/LiteLoader/include/llapi/mc/Bounds.hpp index e25a2cd0b7..a6f1400189 100644 --- a/LiteLoader/include/llapi/mc/Bounds.hpp +++ b/LiteLoader/include/llapi/mc/Bounds.hpp @@ -30,15 +30,15 @@ struct Bounds { public: /** - * @symbol ??0Bounds\@\@QEAA\@AEBVChunkPos\@\@0\@Z + * @symbol ??0Bounds\@\@QEAA\@AEBVChunkPos\@\@0\@Z */ MCAPI Bounds(class ChunkPos const &, class ChunkPos const &); /** - * @symbol ??0Bounds\@\@QEAA\@AEBVBlockPos\@\@0HW4Option\@0\@\@Z + * @symbol ??0Bounds\@\@QEAA\@AEBVBlockPos\@\@0HW4Option\@0\@\@Z */ MCAPI Bounds(class BlockPos const &, class BlockPos const &, int, enum class Bounds::Option); /** - * @symbol ??0Bounds\@\@QEAA\@AEBVBlockPos\@\@HHFF\@Z + * @symbol ??0Bounds\@\@QEAA\@AEBVBlockPos\@\@HHFF\@Z */ MCAPI Bounds(class BlockPos const &, int, int, short, short); diff --git a/LiteLoader/include/llapi/mc/BowEnchant.hpp b/LiteLoader/include/llapi/mc/BowEnchant.hpp index 929242302e..44dbbf7c0a 100644 --- a/LiteLoader/include/llapi/mc/BowEnchant.hpp +++ b/LiteLoader/include/llapi/mc/BowEnchant.hpp @@ -31,61 +31,61 @@ class BowEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BowEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@BowEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@BowEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@BowEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@BowEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@BowEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@BowEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@BowEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@BowEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; /** - * @symbol ??0BowEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0BowEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI BowEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI BowEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: private: /** - * @symbol ?VALID_ENCHANTMENTS\@BowEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B + * @symbol ?VALID_ENCHANTMENTS\@BowEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const VALID_ENCHANTMENTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BowItem.hpp b/LiteLoader/include/llapi/mc/BowItem.hpp index 94a2dc93f4..64a378e2b8 100644 --- a/LiteLoader/include/llapi/mc/BowItem.hpp +++ b/LiteLoader/include/llapi/mc/BowItem.hpp @@ -32,98 +32,98 @@ class BowItem : public RangedWeaponItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BowItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@BowItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@BowItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 112 - * @symbol ?enchantProjectile\@BowItem\@\@UEBAXAEBVItemStackBase\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?enchantProjectile\@BowItem\@\@UEBAXAEBVItemStackBase\@\@AEAVActor\@\@\@Z */ virtual void enchantProjectile(class ItemStackBase const &, class Actor &) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@BowItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@BowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@BowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @symbol ??0BowItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BowItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BowItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp b/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp index b0d67fce71..be79a2090b 100644 --- a/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp +++ b/LiteLoader/include/llapi/mc/BrazeSDKManager.hpp @@ -29,25 +29,25 @@ class BrazeSDKManager { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BRAZESDKMANAGER /** - * @symbol ?_disableBrazeSDK\@BrazeSDKManager\@\@MEAAXXZ + * @symbol ?_disableBrazeSDK\@BrazeSDKManager\@\@MEAAXXZ */ MCVAPI void _disableBrazeSDK(); /** - * @symbol ?_enableBrazeSDK\@BrazeSDKManager\@\@MEAAXXZ + * @symbol ?_enableBrazeSDK\@BrazeSDKManager\@\@MEAAXXZ */ MCVAPI void _enableBrazeSDK(); /** - * @symbol ?disableBrazeSDK\@BrazeSDKManager\@\@UEAAXXZ + * @symbol ?disableBrazeSDK\@BrazeSDKManager\@\@UEAAXXZ */ MCVAPI void disableBrazeSDK(); /** - * @symbol ?enableBrazeSDK\@BrazeSDKManager\@\@UEAAXXZ + * @symbol ?enableBrazeSDK\@BrazeSDKManager\@\@UEAAXXZ */ MCVAPI void enableBrazeSDK(); /** - * @symbol ?setBrazeId\@BrazeSDKManager\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setBrazeId\@BrazeSDKManager\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void setBrazeId(std::string const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp b/LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp index 8b89e3df5c..430a926d82 100644 --- a/LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlockDefinition.hpp @@ -32,14 +32,14 @@ class BreakBlockDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreakBlockDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@BreakBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@BreakBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakBlockNode.hpp b/LiteLoader/include/llapi/mc/BreakBlockNode.hpp index f658eddb74..70506ba010 100644 --- a/LiteLoader/include/llapi/mc/BreakBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlockNode.hpp @@ -29,23 +29,23 @@ class BreakBlockNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreakBlockNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@BreakBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@BreakBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@BreakBlockNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@BreakBlockNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0BreakBlockNode\@\@QEAA\@XZ + * @symbol ??0BreakBlockNode\@\@QEAA\@XZ */ MCAPI BreakBlockNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp b/LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp index cfdbc2a719..6daed68f13 100644 --- a/LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlocksComponent.hpp @@ -30,16 +30,16 @@ class BreakBlocksComponent { public: /** - * @symbol ?breakNearbyBlocks\@BreakBlocksComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?breakNearbyBlocks\@BreakBlocksComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void breakNearbyBlocks(class Actor &); /** - * @symbol ?initFromDefinition\@BreakBlocksComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@BreakBlocksComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?isBreakable\@BreakBlocksComponent\@\@QEBA_NAEAVActor\@\@AEBVBlockLegacy\@\@\@Z + * @symbol ?isBreakable\@BreakBlocksComponent\@\@SA_NPEBUBreakBlocksDescription\@\@AEBVBlockLegacy\@\@\@Z */ - MCAPI bool isBreakable(class Actor &, class BlockLegacy const &) const; + MCAPI static bool isBreakable(struct BreakBlocksDescription const *, class BlockLegacy const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp b/LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp index 8a267370f2..4682c67731 100644 --- a/LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlocksDescription.hpp @@ -5,18 +5,14 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class BreakBlocksDescription. - * - */ -class BreakBlocksDescription { + +struct BreakBlocksDescription { #define AFTER_EXTRA // Add Member There @@ -24,33 +20,34 @@ class BreakBlocksDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_BREAKBLOCKSDESCRIPTION public: - class BreakBlocksDescription& operator=(class BreakBlocksDescription const &) = delete; - BreakBlocksDescription(class BreakBlocksDescription const &) = delete; + struct BreakBlocksDescription& operator=(struct BreakBlocksDescription const &) = delete; + BreakBlocksDescription(struct BreakBlocksDescription const &) = delete; #endif public: /** - * @vftbl 0 - * @symbol ?getJsonName\@BreakBlocksDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@BreakBlocksDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~BreakBlocksDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@BreakBlocksDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@BreakBlocksDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BREAKBLOCKSDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@BreakBlocksDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~BreakBlocksDescription(); +#endif /** - * @symbol ??0BreakBlocksDescription\@\@QEAA\@XZ + * @symbol ??0BreakBlocksDescription\@\@QEAA\@XZ */ MCAPI BreakBlocksDescription(); diff --git a/LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp b/LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp index 689c6a1a5f..86ada02667 100644 --- a/LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreakBlocksSystem.hpp @@ -30,27 +30,27 @@ class BreakBlocksSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreakBlocksSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BreakBlocksSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BreakBlocksSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@BreakBlocksSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVBreakBlocksComponent\@\@\@Z + * @symbol ?_tickComponent\@BreakBlocksSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVBreakBlocksComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class BreakBlocksComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp b/LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp index 0dae3a704d..9e2abacfe8 100644 --- a/LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorAnnotationComponent.hpp @@ -29,40 +29,40 @@ class BreakDoorAnnotationComponent { public: /** - * @symbol ??0BreakDoorAnnotationComponent\@\@QEAA\@XZ + * @symbol ??0BreakDoorAnnotationComponent\@\@QEAA\@XZ */ MCAPI BreakDoorAnnotationComponent(); /** - * @symbol ?canMobBreakDoor\@BreakDoorAnnotationComponent\@\@QEBA_NAEAVMob\@\@AEBVPath\@\@\@Z + * @symbol ?canMobBreakDoor\@BreakDoorAnnotationComponent\@\@QEBA_NAEAVMob\@\@AEBVPath\@\@\@Z */ MCAPI bool canMobBreakDoor(class Mob &, class Path const &) const; /** - * @symbol ?clearProgress\@BreakDoorAnnotationComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?clearProgress\@BreakDoorAnnotationComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void clearProgress(class Mob &); /** - * @symbol ?initFromDefinition\@BreakDoorAnnotationComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@BreakDoorAnnotationComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?obstructionCheck\@BreakDoorAnnotationComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?obstructionCheck\@BreakDoorAnnotationComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void obstructionCheck(class Mob &); /** - * @symbol ?onComponentRemoved\@BreakDoorAnnotationComponent\@\@QEAAXAEAVEntityContext\@\@\@Z + * @symbol ?onComponentRemoved\@BreakDoorAnnotationComponent\@\@QEAAXAEAVEntityContext\@\@\@Z */ MCAPI void onComponentRemoved(class EntityContext &); //private: /** - * @symbol ?_cleanUp\@BreakDoorAnnotationComponent\@\@AEAAXAEAVMob\@\@\@Z + * @symbol ?_cleanUp\@BreakDoorAnnotationComponent\@\@AEAAXAEAVMob\@\@\@Z */ MCAPI void _cleanUp(class Mob &); /** - * @symbol ?_shouldBreakDoor\@BreakDoorAnnotationComponent\@\@AEAA_NAEAVMob\@\@\@Z + * @symbol ?_shouldBreakDoor\@BreakDoorAnnotationComponent\@\@AEAA_NAEAVMob\@\@\@Z */ MCAPI bool _shouldBreakDoor(class Mob &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp b/LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp index 3e89568b80..875133e1ee 100644 --- a/LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorAnnotationDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class BreakDoorAnnotationDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@BreakDoorAnnotationDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@BreakDoorAnnotationDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~BreakDoorAnnotationDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@BreakDoorAnnotationDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@BreakDoorAnnotationDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BREAKDOORANNOTATIONDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@BreakDoorAnnotationDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~BreakDoorAnnotationDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp b/LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp index 6eac578acd..8b82920db9 100644 --- a/LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorAnnotationSystem.hpp @@ -30,19 +30,19 @@ class BreakDoorAnnotationSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreakDoorAnnotationSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BreakDoorAnnotationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BreakDoorAnnotationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreakDoorGoal.hpp b/LiteLoader/include/llapi/mc/BreakDoorGoal.hpp index 42479a8fea..9cfafbd2ab 100644 --- a/LiteLoader/include/llapi/mc/BreakDoorGoal.hpp +++ b/LiteLoader/include/llapi/mc/BreakDoorGoal.hpp @@ -30,48 +30,48 @@ class BreakDoorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreakDoorGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BreakDoorGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BreakDoorGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BreakDoorGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BreakDoorGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@BreakDoorGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@BreakDoorGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@BreakDoorGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@BreakDoorGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@BreakDoorGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@BreakDoorGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@BreakDoorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@BreakDoorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0BreakDoorGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0BreakDoorGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI BreakDoorGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreathableComponent.hpp b/LiteLoader/include/llapi/mc/BreathableComponent.hpp index 298e70f13d..5e5e5ab187 100644 --- a/LiteLoader/include/llapi/mc/BreathableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreathableComponent.hpp @@ -31,64 +31,64 @@ enum class BreathableState; public: /** - * @symbol ??0BreathableComponent\@\@QEAA\@XZ + * @symbol ??0BreathableComponent\@\@QEAA\@XZ */ MCAPI BreathableComponent(); /** - * @symbol ?addAdditionalSaveData\@BreathableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@BreathableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?canBreathe\@BreathableComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?canBreathe\@BreathableComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool canBreathe(class Actor const &) const; /** - * @symbol ?generatesBubbles\@BreathableComponent\@\@QEBA_NXZ + * @symbol ?generatesBubbles\@BreathableComponent\@\@QEBA_NXZ */ MCAPI bool generatesBubbles() const; /** - * @symbol ?getAirRegenPerTick\@BreathableComponent\@\@QEBAHXZ + * @symbol ?getAirRegenPerTick\@BreathableComponent\@\@QEBAHXZ */ MCAPI int getAirRegenPerTick() const; /** - * @symbol ?getAirSupply\@BreathableComponent\@\@QEBAFXZ + * @symbol ?getAirSupply\@BreathableComponent\@\@QEBAFXZ */ MCAPI short getAirSupply() const; /** - * @symbol ?getBreathableState\@BreathableComponent\@\@QEAAAEAW4BreathableState\@1\@XZ + * @symbol ?getBreathableState\@BreathableComponent\@\@QEAAAEAW4BreathableState\@1\@XZ */ MCAPI enum class BreathableComponent::BreathableState & getBreathableState(); /** - * @symbol ?getInhaleTime\@BreathableComponent\@\@QEBAMXZ + * @symbol ?getInhaleTime\@BreathableComponent\@\@QEBAMXZ */ MCAPI float getInhaleTime() const; /** - * @symbol ?getMaxAirSupply\@BreathableComponent\@\@QEBAFXZ + * @symbol ?getMaxAirSupply\@BreathableComponent\@\@QEBAFXZ */ MCAPI short getMaxAirSupply() const; /** - * @symbol ?getSuffocateTime\@BreathableComponent\@\@QEBAHXZ + * @symbol ?getSuffocateTime\@BreathableComponent\@\@QEBAHXZ */ MCAPI int getSuffocateTime() const; /** - * @symbol ??4BreathableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BreathableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BreathableComponent & operator=(class BreathableComponent &&); /** - * @symbol ?readAdditionalSaveData\@BreathableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@BreathableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setAirSupply\@BreathableComponent\@\@QEAAXF\@Z + * @symbol ?setAirSupply\@BreathableComponent\@\@QEAAXF\@Z */ MCAPI void setAirSupply(short); /** - * @symbol ?updateBreathableState\@BreathableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?updateBreathableState\@BreathableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void updateBreathableState(class Actor &); /** - * @symbol ??1BreathableComponent\@\@QEAA\@XZ + * @symbol ??1BreathableComponent\@\@QEAA\@XZ */ MCAPI ~BreathableComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreathableDefinition.hpp b/LiteLoader/include/llapi/mc/BreathableDefinition.hpp index 31ec794c19..6d5b122935 100644 --- a/LiteLoader/include/llapi/mc/BreathableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BreathableDefinition.hpp @@ -30,24 +30,24 @@ class BreathableDefinition { public: /** - * @symbol ??0BreathableDefinition\@\@QEAA\@XZ + * @symbol ??0BreathableDefinition\@\@QEAA\@XZ */ MCAPI BreathableDefinition(); /** - * @symbol ?addBreathableBlockDescriptor\@BreathableDefinition\@\@QEAAXAEBVBlockDescriptor\@\@\@Z + * @symbol ?addBreathableBlockDescriptor\@BreathableDefinition\@\@QEAAXAEBVBlockDescriptor\@\@\@Z */ MCAPI void addBreathableBlockDescriptor(class BlockDescriptor const &); /** - * @symbol ?addNonBreathableBlockDescriptor\@BreathableDefinition\@\@QEAAXAEBVBlockDescriptor\@\@\@Z + * @symbol ?addNonBreathableBlockDescriptor\@BreathableDefinition\@\@QEAAXAEBVBlockDescriptor\@\@\@Z */ MCAPI void addNonBreathableBlockDescriptor(class BlockDescriptor const &); /** - * @symbol ?initialize\@BreathableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBreathableComponent\@\@\@Z + * @symbol ?initialize\@BreathableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBreathableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BreathableComponent &) const; /** - * @symbol ?buildSchema\@BreathableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBreathableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BreathableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBreathableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreathableSystem.hpp b/LiteLoader/include/llapi/mc/BreathableSystem.hpp index 07f6a6a559..7c4ff0aea7 100644 --- a/LiteLoader/include/llapi/mc/BreathableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreathableSystem.hpp @@ -30,19 +30,19 @@ class BreathableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreathableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BreathableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BreathableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreatheAirGoal.hpp b/LiteLoader/include/llapi/mc/BreatheAirGoal.hpp index 84be89cafc..e2e1cf7f34 100644 --- a/LiteLoader/include/llapi/mc/BreatheAirGoal.hpp +++ b/LiteLoader/include/llapi/mc/BreatheAirGoal.hpp @@ -30,60 +30,60 @@ class BreatheAirGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreatheAirGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BreatheAirGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BreatheAirGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BreatheAirGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BreatheAirGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@BreatheAirGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@BreatheAirGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@BreatheAirGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@BreatheAirGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@BreatheAirGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@BreatheAirGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@BreatheAirGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@BreatheAirGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0BreatheAirGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0BreatheAirGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI BreatheAirGoal(class Mob &); //private: /** - * @symbol ?_determineApproximateDepth\@BreatheAirGoal\@\@AEAAHXZ + * @symbol ?_determineApproximateDepth\@BreatheAirGoal\@\@AEAAHXZ */ MCAPI int _determineApproximateDepth(); /** - * @symbol ?_findAirPosition\@BreatheAirGoal\@\@AEAAXXZ + * @symbol ?_findAirPosition\@BreatheAirGoal\@\@AEAAXXZ */ MCAPI void _findAirPosition(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreedGoal.hpp b/LiteLoader/include/llapi/mc/BreedGoal.hpp index cc5b7c9f67..2de5d9221b 100644 --- a/LiteLoader/include/llapi/mc/BreedGoal.hpp +++ b/LiteLoader/include/llapi/mc/BreedGoal.hpp @@ -30,60 +30,60 @@ class BreedGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreedGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@BreedGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@BreedGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@BreedGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@BreedGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?stop\@BreedGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@BreedGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@BreedGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@BreedGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@BreedGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@BreedGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0BreedGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0BreedGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI BreedGoal(class Mob &, float); //private: /** - * @symbol ?_isCloseEnoughToBreed\@BreedGoal\@\@AEBA_NVVec3\@\@VVec2\@\@01\@Z + * @symbol ?_isCloseEnoughToBreed\@BreedGoal\@\@AEBA_NVVec3\@\@VVec2\@\@01\@Z */ MCAPI bool _isCloseEnoughToBreed(class Vec3, class Vec2, class Vec3, class Vec2) const; /** - * @symbol ?_moveToFreePartner\@BreedGoal\@\@AEBAPEAVMob\@\@XZ + * @symbol ?_moveToFreePartner\@BreedGoal\@\@AEBAPEAVMob\@\@XZ */ MCAPI class Mob * _moveToFreePartner() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreedableComponent.hpp b/LiteLoader/include/llapi/mc/BreedableComponent.hpp index da75b9175c..57d84e0b6d 100644 --- a/LiteLoader/include/llapi/mc/BreedableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BreedableComponent.hpp @@ -29,88 +29,92 @@ class BreedableComponent { public: /** - * @symbol ??0BreedableComponent\@\@QEAA\@XZ + * @symbol ??0BreedableComponent\@\@QEAA\@XZ */ MCAPI BreedableComponent(); /** - * @symbol ?addAdditionalSaveData\@BreedableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@BreedableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?canMate\@BreedableComponent\@\@QEBA_NAEBVActor\@\@0\@Z + * @symbol ?canMate\@BreedableComponent\@\@QEBA_NAEBVActor\@\@0\@Z */ MCAPI bool canMate(class Actor const &, class Actor const &) const; /** - * @symbol ?decrementBreedCooldown\@BreedableComponent\@\@QEAAXXZ + * @symbol ?decrementBreedCooldown\@BreedableComponent\@\@QEAAXXZ */ MCAPI void decrementBreedCooldown(); /** - * @symbol ?decrementLoveTimer\@BreedableComponent\@\@QEAAXXZ + * @symbol ?decrementLoveTimer\@BreedableComponent\@\@QEAAXXZ */ MCAPI void decrementLoveTimer(); /** - * @symbol ?getBreedCooldown\@BreedableComponent\@\@QEBAHXZ + * @symbol ?getBreedCooldown\@BreedableComponent\@\@QEBAHXZ */ MCAPI int getBreedCooldown() const; /** - * @symbol ?getInteraction\@BreedableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@BreedableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?getLoveCause\@BreedableComponent\@\@QEBAPEAVPlayer\@\@AEBVActor\@\@\@Z + * @symbol ?getLoveCause\@BreedableComponent\@\@QEBAPEAVPlayer\@\@AEBVActor\@\@\@Z */ MCAPI class Player * getLoveCause(class Actor const &) const; /** - * @symbol ?getLoveTimer\@BreedableComponent\@\@QEBAHXZ + * @symbol ?getLoveTimer\@BreedableComponent\@\@QEBAHXZ */ MCAPI int getLoveTimer() const; /** - * @symbol ?mate\@BreedableComponent\@\@QEAAXAEAVActor\@\@0\@Z + * @symbol ?mate\@BreedableComponent\@\@QEAA?AUMatingResult\@1\@AEAVActor\@\@0\@Z */ - MCAPI void mate(class Actor &, class Actor &); + MCAPI struct BreedableComponent::MatingResult mate(class Actor &, class Actor &); /** - * @symbol ?meetsSittingRequirements\@BreedableComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?meetsSittingRequirements\@BreedableComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool meetsSittingRequirements(class Actor const &) const; /** - * @symbol ?readAdditionalSaveData\@BreedableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@BreedableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?resetLove\@BreedableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?resetLove\@BreedableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void resetLove(class Actor &); /** - * @symbol ?setInLove\@BreedableComponent\@\@QEAAXAEAVActor\@\@PEBVPlayer\@\@\@Z + * @symbol ?setInLove\@BreedableComponent\@\@QEAAXAEAVActor\@\@PEBVPlayer\@\@\@Z */ MCAPI void setInLove(class Actor &, class Player const *); /** - * @symbol ?setLoveTimer\@BreedableComponent\@\@QEAAXH\@Z + * @symbol ?setLoveTimer\@BreedableComponent\@\@QEAAXH\@Z */ MCAPI void setLoveTimer(int); + /** + * @symbol ?setOffspringAttributesWithParentCentricBlending\@BreedableComponent\@\@SAXAEAVAttributeInstance\@\@AEBV2\@1AEAVIRandom\@\@MM\@Z + */ + MCAPI static void setOffspringAttributesWithParentCentricBlending(class AttributeInstance &, class AttributeInstance const &, class AttributeInstance const &, class IRandom &, float, float); //private: /** - * @symbol ?_canBreed\@BreedableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@AEBVItemStack\@\@\@Z + * @symbol ?_canBreed\@BreedableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@AEBVItemStack\@\@\@Z */ MCAPI bool _canBreed(class Actor &, class Player &, class ItemStack const &); /** - * @symbol ?_handleMate\@BreedableComponent\@\@AEAAXAEAVActor\@\@0\@Z + * @symbol ?_handleMate\@BreedableComponent\@\@AEAAPEAVActor\@\@AEAV2\@0\@Z */ - MCAPI void _handleMate(class Actor &, class Actor &); + MCAPI class Actor * _handleMate(class Actor &, class Actor &); /** - * @symbol ?_handlePregnancy\@BreedableComponent\@\@AEAAXAEAVActor\@\@0\@Z + * @symbol ?_handlePregnancy\@BreedableComponent\@\@AEAAXAEAVActor\@\@0\@Z */ MCAPI void _handlePregnancy(class Actor &, class Actor &); /** - * @symbol ?_meetsEnvironmentRequirements\@BreedableComponent\@\@AEBA_NAEAVActor\@\@\@Z + * @symbol ?_meetsEnvironmentRequirements\@BreedableComponent\@\@AEBA_NAEAVActor\@\@\@Z */ MCAPI bool _meetsEnvironmentRequirements(class Actor &) const; /** - * @symbol ?_useBreedItem\@BreedableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@AEBVItemStack\@\@\@Z + * @symbol ?_useBreedItem\@BreedableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@AEBVItemStack\@\@\@Z */ MCAPI void _useBreedItem(class Actor &, class Player &, class ItemStack const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreedableDefinition.hpp b/LiteLoader/include/llapi/mc/BreedableDefinition.hpp index 8f689d1e9b..b29de74ec8 100644 --- a/LiteLoader/include/llapi/mc/BreedableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BreedableDefinition.hpp @@ -30,32 +30,40 @@ class BreedableDefinition { public: /** - * @symbol ??0BreedableDefinition\@\@QEAA\@XZ + * @symbol ??0BreedableDefinition\@\@QEAA\@XZ */ MCAPI BreedableDefinition(); /** - * @symbol ?addBreedItem\@BreedableDefinition\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?addBreedItem\@BreedableDefinition\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void addBreedItem(class ItemDescriptor const &); /** - * @symbol ?addBreedableType\@BreedableDefinition\@\@QEAAXAEBUBreedableType\@\@\@Z + * @symbol ?addBreedableType\@BreedableDefinition\@\@QEAAXAEBUBreedableType\@\@\@Z */ MCAPI void addBreedableType(struct BreedableType const &); /** - * @symbol ?addEnvironmentRequirement\@BreedableDefinition\@\@QEAAXAEBUEnvironmentRequirement\@\@\@Z + * @symbol ?addEnvironmentRequirement\@BreedableDefinition\@\@QEAAXAEBUEnvironmentRequirement\@\@\@Z */ MCAPI void addEnvironmentRequirement(struct EnvironmentRequirement const &); /** - * @symbol ?initialize\@BreedableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBreedableComponent\@\@\@Z + * @symbol ?addParentCentricAttributeBlending\@BreedableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void addParentCentricAttributeBlending(std::string const &); + /** + * @symbol ?initialize\@BreedableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBreedableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BreedableComponent &) const; /** - * @symbol ??1BreedableDefinition\@\@QEAA\@XZ + * @symbol ?setMutationStrategy\@BreedableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void setMutationStrategy(std::string const &); + /** + * @symbol ??1BreedableDefinition\@\@QEAA\@XZ */ MCAPI ~BreedableDefinition(); /** - * @symbol ?buildSchema\@BreedableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBreedableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BreedableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBreedableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreedableSystem.hpp b/LiteLoader/include/llapi/mc/BreedableSystem.hpp index ec282d0ce9..11b3e7a9ea 100644 --- a/LiteLoader/include/llapi/mc/BreedableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BreedableSystem.hpp @@ -30,19 +30,19 @@ class BreedableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BreedableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BreedableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BreedableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BreedableType.hpp b/LiteLoader/include/llapi/mc/BreedableType.hpp index 3ecb2bf5fe..d52f1bccf2 100644 --- a/LiteLoader/include/llapi/mc/BreedableType.hpp +++ b/LiteLoader/include/llapi/mc/BreedableType.hpp @@ -27,11 +27,11 @@ struct BreedableType { public: /** - * @symbol ??0BreedableType\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0BreedableType\@\@QEAA\@AEBU0\@\@Z */ MCAPI BreedableType(struct BreedableType const &); /** - * @symbol ??1BreedableType\@\@QEAA\@XZ + * @symbol ??1BreedableType\@\@QEAA\@XZ */ MCAPI ~BreedableType(); diff --git a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp index 6dec7a2a03..1f26638257 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlock.hpp @@ -31,271 +31,276 @@ class BrewingStandBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BrewingStandBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@BrewingStandBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@BrewingStandBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@BrewingStandBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BrewingStandBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@BrewingStandBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BrewingStandBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@BrewingStandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@BrewingStandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@BrewingStandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@BrewingStandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@BrewingStandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@BrewingStandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@BrewingStandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@BrewingStandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BREWINGSTANDBLOCK /** - * @symbol ?hasComparatorSignal\@BrewingStandBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@BrewingStandBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isContainerBlock\@BrewingStandBlock\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@BrewingStandBlock\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isCraftingBlock\@BrewingStandBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@BrewingStandBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@BrewingStandBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@BrewingStandBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0BrewingStandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BrewingStandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BrewingStandBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp b/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp index 13af827fcd..7120bdb390 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandBlockActor.hpp @@ -31,121 +31,121 @@ class BrewingStandBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BREWINGSTANDBLOCKACTOR /** - * @symbol ?canPullOutItem\@BrewingStandBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@BrewingStandBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@BrewingStandBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@BrewingStandBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?getContainer\@BrewingStandBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@BrewingStandBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@BrewingStandBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@BrewingStandBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@BrewingStandBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@BrewingStandBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@BrewingStandBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@BrewingStandBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@BrewingStandBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@BrewingStandBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@BrewingStandBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@BrewingStandBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?load\@BrewingStandBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@BrewingStandBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onChanged\@BrewingStandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onChanged\@BrewingStandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onChanged(class BlockSource &); /** - * @symbol ?onMove\@BrewingStandBlockActor\@\@UEAAXXZ + * @symbol ?onMove\@BrewingStandBlockActor\@\@UEAAXXZ */ MCVAPI void onMove(); /** - * @symbol ?save\@BrewingStandBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@BrewingStandBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@BrewingStandBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@BrewingStandBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setContainerChanged\@BrewingStandBlockActor\@\@UEAAXH\@Z + * @symbol ?setContainerChanged\@BrewingStandBlockActor\@\@UEAAXH\@Z */ MCVAPI void setContainerChanged(int); /** - * @symbol ?setItem\@BrewingStandBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@BrewingStandBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@BrewingStandBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@BrewingStandBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@BrewingStandBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@BrewingStandBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@BrewingStandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@BrewingStandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0BrewingStandBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0BrewingStandBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI BrewingStandBlockActor(class BlockPos const &); /** - * @symbol ?brew\@BrewingStandBlockActor\@\@QEAAXXZ + * @symbol ?brew\@BrewingStandBlockActor\@\@QEAAXXZ */ MCAPI void brew(); /** - * @symbol ?getBrewTime\@BrewingStandBlockActor\@\@QEBAHXZ + * @symbol ?getBrewTime\@BrewingStandBlockActor\@\@QEBAHXZ */ MCAPI int getBrewTime() const; /** - * @symbol ?getFuelAmount\@BrewingStandBlockActor\@\@QEBAHXZ + * @symbol ?getFuelAmount\@BrewingStandBlockActor\@\@QEBAHXZ */ MCAPI int getFuelAmount() const; /** - * @symbol ?getFuelTotal\@BrewingStandBlockActor\@\@QEBAHXZ + * @symbol ?getFuelTotal\@BrewingStandBlockActor\@\@QEBAHXZ */ MCAPI int getFuelTotal() const; /** - * @symbol ?setBrewTime\@BrewingStandBlockActor\@\@QEAAXH\@Z + * @symbol ?setBrewTime\@BrewingStandBlockActor\@\@QEAAXH\@Z */ MCAPI void setBrewTime(int); /** - * @symbol ?setFuelAmount\@BrewingStandBlockActor\@\@QEAAXH\@Z + * @symbol ?setFuelAmount\@BrewingStandBlockActor\@\@QEAAXH\@Z */ MCAPI void setFuelAmount(int); /** - * @symbol ?setFuelTotal\@BrewingStandBlockActor\@\@QEAAXH\@Z + * @symbol ?setFuelTotal\@BrewingStandBlockActor\@\@QEAAXH\@Z */ MCAPI void setFuelTotal(int); /** - * @symbol ?isFuel\@BrewingStandBlockActor\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isFuel\@BrewingStandBlockActor\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isFuel(class ItemDescriptor const &); //private: /** - * @symbol ?canBrew\@BrewingStandBlockActor\@\@AEAA_NXZ + * @symbol ?canBrew\@BrewingStandBlockActor\@\@AEAA_NXZ */ MCAPI bool canBrew(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp index 2f77044316..3bf4eb5b86 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandContainerManagerModel.hpp @@ -31,48 +31,48 @@ class BrewingStandContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BrewingStandContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@BrewingStandContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@BrewingStandContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@BrewingStandContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@BrewingStandContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@BrewingStandContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@BrewingStandContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@BrewingStandContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@BrewingStandContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@BrewingStandContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@BrewingStandContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@BrewingStandContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@BrewingStandContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@BrewingStandContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@BrewingStandContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0BrewingStandContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0BrewingStandContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI BrewingStandContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp index c246298f93..15d0e9c220 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class BrewingStandContainerScreenValidator : public ContainerScreenValidatorBase public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BrewingStandContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0BrewingStandContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0BrewingStandContainerScreenValidator\@\@QEAA\@XZ */ MCAPI BrewingStandContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrewingStandFuelContainerValidation.hpp b/LiteLoader/include/llapi/mc/BrewingStandFuelContainerValidation.hpp index 8f8f857b5a..96e777a7f9 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandFuelContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandFuelContainerValidation.hpp @@ -31,54 +31,54 @@ class BrewingStandFuelContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BrewingStandFuelContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@BrewingStandFuelContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@BrewingStandFuelContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@BrewingStandFuelContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@BrewingStandFuelContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrewingStandInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/BrewingStandInputContainerValidation.hpp index ab3e742328..e509f86383 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandInputContainerValidation.hpp @@ -31,54 +31,54 @@ class BrewingStandInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BrewingStandInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@BrewingStandInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@BrewingStandInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@BrewingStandInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@BrewingStandInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BrewingStandResultContainerValidation.hpp b/LiteLoader/include/llapi/mc/BrewingStandResultContainerValidation.hpp index 4121f85eba..8971859996 100644 --- a/LiteLoader/include/llapi/mc/BrewingStandResultContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/BrewingStandResultContainerValidation.hpp @@ -31,54 +31,54 @@ class BrewingStandResultContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BrewingStandResultContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@BrewingStandResultContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@BrewingStandResultContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@BrewingStandResultContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@BrewingStandResultContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@BrewingStandResultContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@BrewingStandResultContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@BrewingStandResultContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@BrewingStandResultContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@BrewingStandResultContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@BrewingStandResultContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BribeableComponent.hpp b/LiteLoader/include/llapi/mc/BribeableComponent.hpp index 886c0dd03a..ce2119bab0 100644 --- a/LiteLoader/include/llapi/mc/BribeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BribeableComponent.hpp @@ -29,48 +29,48 @@ class BribeableComponent { public: /** - * @symbol ??0BribeableComponent\@\@QEAA\@XZ + * @symbol ??0BribeableComponent\@\@QEAA\@XZ */ MCAPI BribeableComponent(); /** - * @symbol ?addAdditionalSaveData\@BribeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@BribeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?clientBribeCheck\@BribeableComponent\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?clientBribeCheck\@BribeableComponent\@\@QEAA_NAEAVActor\@\@\@Z */ MCAPI bool clientBribeCheck(class Actor &); /** - * @symbol ?getBribeCooldown\@BribeableComponent\@\@QEAAAEAHXZ + * @symbol ?getBribeCooldown\@BribeableComponent\@\@QEAAAEAHXZ */ MCAPI int & getBribeCooldown(); /** - * @symbol ?getBribeTimer\@BribeableComponent\@\@QEAAAEAHXZ + * @symbol ?getBribeTimer\@BribeableComponent\@\@QEAAAEAHXZ */ MCAPI int & getBribeTimer(); /** - * @symbol ?getInteraction\@BribeableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@BribeableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?readAdditionalSaveData\@BribeableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@BribeableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?resetBribe\@BribeableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?resetBribe\@BribeableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void resetBribe(class Actor &); //private: /** - * @symbol ?_bribe\@BribeableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?_bribe\@BribeableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI void _bribe(class Actor &, class Player &); /** - * @symbol ?_canBribe\@BribeableComponent\@\@AEAA_NAEBVItemStack\@\@\@Z + * @symbol ?_canBribe\@BribeableComponent\@\@AEAA_NAEBVItemStack\@\@\@Z */ MCAPI bool _canBribe(class ItemStack const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BribeableDefinition.hpp b/LiteLoader/include/llapi/mc/BribeableDefinition.hpp index 179d381796..7014c0ceec 100644 --- a/LiteLoader/include/llapi/mc/BribeableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BribeableDefinition.hpp @@ -31,16 +31,16 @@ class BribeableDefinition { public: /** - * @symbol ?addBribeItem\@BribeableDefinition\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?addBribeItem\@BribeableDefinition\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void addBribeItem(class ItemDescriptor const &); /** - * @symbol ?initialize\@BribeableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBribeableComponent\@\@\@Z + * @symbol ?initialize\@BribeableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBribeableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BribeableComponent &) const; /** - * @symbol ?buildSchema\@BribeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBribeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BribeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBribeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BribeableSystem.hpp b/LiteLoader/include/llapi/mc/BribeableSystem.hpp index 14d4229d1c..21642769a8 100644 --- a/LiteLoader/include/llapi/mc/BribeableSystem.hpp +++ b/LiteLoader/include/llapi/mc/BribeableSystem.hpp @@ -30,19 +30,19 @@ class BribeableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BribeableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BribeableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BribeableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Brightness.hpp b/LiteLoader/include/llapi/mc/Brightness.hpp index e153ee61ab..bcda460157 100644 --- a/LiteLoader/include/llapi/mc/Brightness.hpp +++ b/LiteLoader/include/llapi/mc/Brightness.hpp @@ -29,31 +29,31 @@ struct Brightness { public: /** - * @symbol ??0Brightness\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0Brightness\@\@QEAA\@AEBU0\@\@Z */ MCAPI Brightness(struct Brightness const &); /** - * @symbol ??0Brightness\@\@QEAA\@AEBE\@Z + * @symbol ??0Brightness\@\@QEAA\@AEBE\@Z */ MCAPI Brightness(unsigned char const &); /** - * @symbol ??4Brightness\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4Brightness\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct Brightness & operator=(struct Brightness const &); /** - * @symbol ??4Brightness\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4Brightness\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct Brightness & operator=(struct Brightness &&); /** - * @symbol ?INVALID\@Brightness\@\@2U1\@B + * @symbol ?INVALID\@Brightness\@\@2U1\@B */ MCAPI static struct Brightness const INVALID; /** - * @symbol ?MAX\@Brightness\@\@2U1\@B + * @symbol ?MAX\@Brightness\@\@2U1\@B */ MCAPI static struct Brightness const MAX; /** - * @symbol ?MIN\@Brightness\@\@2U1\@B + * @symbol ?MIN\@Brightness\@\@2U1\@B */ MCAPI static struct Brightness const MIN; diff --git a/LiteLoader/include/llapi/mc/BrushItem.hpp b/LiteLoader/include/llapi/mc/BrushItem.hpp new file mode 100644 index 0000000000..0de641bf19 --- /dev/null +++ b/LiteLoader/include/llapi/mc/BrushItem.hpp @@ -0,0 +1,105 @@ +/** + * @file BrushItem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Json.hpp" +#include "Item.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class BrushItem : public Item { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_BRUSHITEM +public: + class BrushItem& operator=(class BrushItem const &) = delete; + BrushItem(class BrushItem const &) = delete; + BrushItem() = delete; +#endif + +public: + /** + * @vftbl 0 + * @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 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 16 + * @symbol __unk_vfn_16 + */ + virtual void __unk_vfn_16(); + /** + * @vftbl 51 + * @symbol __unk_vfn_51 + */ + virtual void __unk_vfn_51(); + /** + * @vftbl 53 + * @symbol __unk_vfn_53 + */ + virtual void __unk_vfn_53(); + /** + * @vftbl 66 + * @symbol __unk_vfn_66 + */ + virtual void __unk_vfn_66(); + /** + * @vftbl 70 + * @symbol __unk_vfn_70 + */ + virtual void __unk_vfn_70(); + /** + * @vftbl 71 + * @symbol __unk_vfn_71 + */ + virtual void __unk_vfn_71(); + /** + * @vftbl 72 + * @symbol __unk_vfn_72 + */ + virtual void __unk_vfn_72(); + /** + * @vftbl 75 + * @symbol __unk_vfn_75 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 79 + * @symbol __unk_vfn_79 + */ + virtual void __unk_vfn_79(); + /** + * @vftbl 80 + * @symbol __unk_vfn_80 + */ + virtual void __unk_vfn_80(); + /** + * @vftbl 132 + * @symbol ?_useOn\@BrushItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + */ + virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; + +}; diff --git a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp index 2d808bf2be..8cac8cf6fe 100644 --- a/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp +++ b/LiteLoader/include/llapi/mc/BubbleColumnBlock.hpp @@ -31,308 +31,313 @@ class BubbleColumnBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BubbleColumnBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@BubbleColumnBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@BubbleColumnBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 9 - * @symbol ?addAABBs\@BubbleColumnBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@BubbleColumnBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@BubbleColumnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BubbleColumnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@BubbleColumnBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@BubbleColumnBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@BubbleColumnBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@BubbleColumnBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 63 - * @symbol ?getRequiredMedium\@BubbleColumnBlock\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ + * @vftbl 63 + * @symbol ?getRequiredMedium\@BubbleColumnBlock\@\@UEBA?AV?$optional\@VHashedString\@\@\@std\@\@XZ */ virtual class std::optional getRequiredMedium() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@BubbleColumnBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 84 - * @symbol ?isPreservingMediumWhenPlaced\@BubbleColumnBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z + * @vftbl 84 + * @symbol ?isPreservingMediumWhenPlaced\@BubbleColumnBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 90 - * @symbol ?mayPick\@BubbleColumnBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z + * @vftbl 90 + * @symbol ?mayPick\@BubbleColumnBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@BubbleColumnBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@BubbleColumnBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 151 - * @symbol ?animateTick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BubbleColumnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BubbleColumnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BubbleColumnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@BubbleColumnBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@BubbleColumnBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUBBLECOLUMNBLOCK /** - * @symbol ?shouldTickOnSetBlock\@BubbleColumnBlock\@\@UEBA_NXZ + * @symbol ?shouldTickOnSetBlock\@BubbleColumnBlock\@\@UEBA_NXZ */ MCVAPI bool shouldTickOnSetBlock() const; #endif /** - * @symbol ??0BubbleColumnBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0BubbleColumnBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI BubbleColumnBlock(std::string const &, int); /** - * @symbol ?addBubbleColumnSegment\@BubbleColumnBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?addBubbleColumnSegment\@BubbleColumnBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool addBubbleColumnSegment(class BlockSource &, class BlockPos const &); /** - * @symbol ?shouldDragDown\@BubbleColumnBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?shouldDragDown\@BubbleColumnBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool shouldDragDown(class Block const &); /** - * @symbol ?spawnBubbles\@BubbleColumnBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?spawnBubbles\@BubbleColumnBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void spawnBubbles(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?createParticles\@BubbleColumnBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z + * @symbol ?createParticles\@BubbleColumnBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI static void createParticles(class BlockSource &, class BlockPos const &, class Random &, bool); /** - * @symbol ?getFlowDownward\@BubbleColumnBlock\@\@CA_NAEBVBlock\@\@\@Z + * @symbol ?getFlowDownward\@BubbleColumnBlock\@\@CA_NAEBVBlock\@\@\@Z */ MCAPI static bool getFlowDownward(class Block const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BucketItem.hpp b/LiteLoader/include/llapi/mc/BucketItem.hpp index b1308e51d6..fba4ec6da5 100644 --- a/LiteLoader/include/llapi/mc/BucketItem.hpp +++ b/LiteLoader/include/llapi/mc/BucketItem.hpp @@ -32,202 +32,202 @@ class BucketItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BucketItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@BucketItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@BucketItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@BucketItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@BucketItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@BucketItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@BucketItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 83 - * @symbol ?canUseOnSimTick\@BucketItem\@\@UEBA_NXZ + * @vftbl 83 + * @symbol ?canUseOnSimTick\@BucketItem\@\@UEBA_NXZ */ virtual bool canUseOnSimTick() const; /** - * @vftbl 84 - * @symbol ?use\@BucketItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@BucketItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@BucketItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@BucketItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@BucketItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@BucketItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@BucketItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@BucketItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@BucketItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@BucketItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 100 - * @symbol ?getMaxStackSize\@BucketItem\@\@UEBAEAEBVItemDescriptor\@\@\@Z + * @vftbl 100 + * @symbol ?getMaxStackSize\@BucketItem\@\@UEBAEAEBVItemDescriptor\@\@\@Z */ virtual unsigned char getMaxStackSize(class ItemDescriptor const &) const; /** - * @vftbl 111 - * @symbol ?validFishInteraction\@BucketItem\@\@UEBA_NH\@Z + * @vftbl 111 + * @symbol ?validFishInteraction\@BucketItem\@\@UEBA_NH\@Z */ virtual bool validFishInteraction(int) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@BucketItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getLightEmission\@BucketItem\@\@UEBA?AUBrightness\@\@H\@Z + * @vftbl 122 + * @symbol ?getLightEmission\@BucketItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @vftbl 129 - * @symbol ?getAuxValuesDescription\@BucketItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 129 + * @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 - * @symbol ?_useOn\@BucketItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@BucketItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUCKETITEM /** - * @symbol ?isBucket\@BucketItem\@\@UEBA_NXZ + * @symbol ?isBucket\@BucketItem\@\@UEBA_NXZ */ MCVAPI bool isBucket() const; /** - * @symbol ?uniqueAuxValues\@BucketItem\@\@UEBA_NXZ + * @symbol ?uniqueAuxValues\@BucketItem\@\@UEBA_NXZ */ MCVAPI bool uniqueAuxValues() const; #endif /** - * @symbol ??0BucketItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BucketFillType\@\@\@Z + * @symbol ??0BucketItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4BucketFillType\@\@\@Z */ MCAPI BucketItem(std::string const &, int, enum class BucketFillType); /** - * @symbol ?DRINK_DURATION\@BucketItem\@\@2HB + * @symbol ?DRINK_DURATION\@BucketItem\@\@2HB */ MCAPI static int const DRINK_DURATION; //protected: /** - * @symbol ?addBucketEntitySaveData\@BucketItem\@\@IEBAXAEAVActor\@\@AEAVItemStack\@\@\@Z + * @symbol ?addBucketEntitySaveData\@BucketItem\@\@IEBAXAEAVActor\@\@AEAVItemStack\@\@\@Z */ MCAPI void addBucketEntitySaveData(class Actor &, class ItemStack &) const; /** - * @symbol ?readBucketEntitySaveData\@BucketItem\@\@IEBA_NAEAVBlockSource\@\@PEAVActor\@\@EVBlockPos\@\@AEBVItemInstance\@\@\@Z + * @symbol ?readBucketEntitySaveData\@BucketItem\@\@IEBA_NAEAVBlockSource\@\@PEAVActor\@\@EVBlockPos\@\@AEBVItemInstance\@\@\@Z */ MCAPI bool readBucketEntitySaveData(class BlockSource &, class Actor *, unsigned char, class BlockPos, class ItemInstance const &) const; //private: /** - * @symbol ?_canEmptyBucketIntoBlock\@BucketItem\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@2\@Z + * @symbol ?_canEmptyBucketIntoBlock\@BucketItem\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@2\@Z */ MCAPI bool _canEmptyBucketIntoBlock(class BlockSource &, class BlockPos const &, class Block const &, class Block const &) const; /** - * @symbol ?_emptyBucket\@BucketItem\@\@AEBA_NAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@PEAVActor\@\@AEBVItemStack\@\@E\@Z + * @symbol ?_emptyBucket\@BucketItem\@\@AEBA_NAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@PEAVActor\@\@AEBVItemStack\@\@E\@Z */ MCAPI bool _emptyBucket(class BlockSource &, class Block const &, class BlockPos const &, class Actor *, class ItemStack const &, unsigned char) const; /** - * @symbol ?_removeBubbleColumn\@BucketItem\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_removeBubbleColumn\@BucketItem\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _removeBubbleColumn(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_takeLiquid\@BucketItem\@\@AEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_takeLiquid\@BucketItem\@\@AEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _takeLiquid(class ItemStack &, class Actor &, class BlockPos const &) const; /** - * @symbol ?_takePowderSnow\@BucketItem\@\@AEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_takePowderSnow\@BucketItem\@\@AEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _takePowderSnow(class ItemStack &, class Actor &, class BlockPos const &) const; /** - * @symbol ?_tryGetBlock\@BucketItem\@\@AEBAPEBVBlockLegacy\@\@W4BucketFillType\@\@\@Z + * @symbol ?_tryGetBlock\@BucketItem\@\@AEBAPEBVBlockLegacy\@\@W4BucketFillType\@\@\@Z */ MCAPI class BlockLegacy const * _tryGetBlock(enum class BucketFillType) const; @@ -235,8 +235,8 @@ class BucketItem : public Item { private: /** - * @symbol ?mFillTypeToEntityType\@BucketItem\@\@0V?$vector\@U?$pair\@W4BucketFillType\@\@W4ActorType\@\@\@std\@\@V?$allocator\@U?$pair\@W4BucketFillType\@\@W4ActorType\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?mFillTypeToEntityType\@BucketItem\@\@0V?$vector\@U?$pair\@W4BucketFillType\@\@W4ActorType\@\@\@std\@\@V?$allocator\@U?$pair\@W4BucketFillType\@\@W4ActorType\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static std::vector> const mFillTypeToEntityType; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BucketableComponent.hpp b/LiteLoader/include/llapi/mc/BucketableComponent.hpp index 6afe0878d8..04b9cc488c 100644 --- a/LiteLoader/include/llapi/mc/BucketableComponent.hpp +++ b/LiteLoader/include/llapi/mc/BucketableComponent.hpp @@ -29,19 +29,19 @@ class BucketableComponent { public: /** - * @symbol ??0BucketableComponent\@\@QEAA\@XZ + * @symbol ??0BucketableComponent\@\@QEAA\@XZ */ MCAPI BucketableComponent(); /** - * @symbol ?getInteraction\@BucketableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@BucketableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?initFromDefinition\@BucketableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@BucketableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?implInteraction\@BucketableComponent\@\@SAXAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?implInteraction\@BucketableComponent\@\@SAXAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI static void implInteraction(class Actor &, class Player &); @@ -49,8 +49,8 @@ class BucketableComponent { private: /** - * @symbol ?WATER_BUCKET_USEABLE_VERSION\@BucketableComponent\@\@0VBaseGameVersion\@\@B + * @symbol ?WATER_BUCKET_USEABLE_VERSION\@BucketableComponent\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const WATER_BUCKET_USEABLE_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BucketableDescription.hpp b/LiteLoader/include/llapi/mc/BucketableDescription.hpp index 633acf6b21..f757d850f6 100644 --- a/LiteLoader/include/llapi/mc/BucketableDescription.hpp +++ b/LiteLoader/include/llapi/mc/BucketableDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class BucketableDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@BucketableDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@BucketableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~BucketableDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUCKETABLEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@BucketableDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~BucketableDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp index 63fd5cbde8..e7315fbbb2 100644 --- a/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp +++ b/LiteLoader/include/llapi/mc/BuddingAmethystBlock.hpp @@ -31,225 +31,230 @@ class BuddingAmethystBlock : public AmethystBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BuddingAmethystBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@BuddingAmethystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@BuddingAmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@BuddingAmethystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUDDINGAMETHYSTBLOCK /** - * @symbol ?canBeSilkTouched\@BuddingAmethystBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@BuddingAmethystBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isSilentWhenJumpingOff\@BuddingAmethystBlock\@\@UEBA_NXZ + * @symbol ?isSilentWhenJumpingOff\@BuddingAmethystBlock\@\@UEBA_NXZ */ MCVAPI bool isSilentWhenJumpingOff() const; #endif /** - * @symbol ??0BuddingAmethystBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0BuddingAmethystBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI BuddingAmethystBlock(std::string const &, int, class Material const &); /** - * @symbol ?canBudGrowAtPos\@BuddingAmethystBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canBudGrowAtPos\@BuddingAmethystBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool canBudGrowAtPos(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_canGrowInDirection\@BuddingAmethystBlock\@\@AEBA_NAEBVBlock\@\@E\@Z + * @symbol ?_canGrowInDirection\@BuddingAmethystBlock\@\@AEBA_NAEBVBlock\@\@E\@Z */ MCAPI bool _canGrowInDirection(class Block const &, unsigned char) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp index a33dc73eed..5ee6ba425e 100644 --- a/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancyComponent.hpp @@ -28,56 +28,56 @@ class BuoyancyComponent { public: /** - * @symbol ??0BuoyancyComponent\@\@QEAA\@XZ + * @symbol ??0BuoyancyComponent\@\@QEAA\@AEBV0\@\@Z */ - MCAPI BuoyancyComponent(); + MCAPI BuoyancyComponent(class BuoyancyComponent const &); /** - * @symbol ??0BuoyancyComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0BuoyancyComponent\@\@QEAA\@XZ */ - MCAPI BuoyancyComponent(class BuoyancyComponent const &); + MCAPI BuoyancyComponent(); /** - * @symbol ?canFloat\@BuoyancyComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?canFloat\@BuoyancyComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool canFloat(class Actor const &) const; /** - * @symbol ?getBaseBuoyancy\@BuoyancyComponent\@\@QEBAMXZ + * @symbol ?getBaseBuoyancy\@BuoyancyComponent\@\@QEBAMXZ */ MCAPI float getBaseBuoyancy() const; /** - * @symbol ?getBigWaveProbability\@BuoyancyComponent\@\@QEBAMXZ + * @symbol ?getBigWaveProbability\@BuoyancyComponent\@\@QEBAMXZ */ MCAPI float getBigWaveProbability() const; /** - * @symbol ?getBigWaveSpeedMultiplier\@BuoyancyComponent\@\@QEBAMXZ + * @symbol ?getBigWaveSpeedMultiplier\@BuoyancyComponent\@\@QEBAMXZ */ MCAPI float getBigWaveSpeedMultiplier() const; /** - * @symbol ?getTimer\@BuoyancyComponent\@\@QEBANXZ + * @symbol ?getTimer\@BuoyancyComponent\@\@QEBANXZ */ MCAPI double getTimer() const; /** - * @symbol ?increaseTimer\@BuoyancyComponent\@\@QEAAXM\@Z + * @symbol ?increaseTimer\@BuoyancyComponent\@\@QEAAXM\@Z */ MCAPI void increaseTimer(float); /** - * @symbol ?loadData\@BuoyancyComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@\@Z + * @symbol ?loadData\@BuoyancyComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@\@Z */ MCAPI void loadData(std::string const &, class SemVersion const &); /** - * @symbol ?needToResurface\@BuoyancyComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?needToResurface\@BuoyancyComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool needToResurface(class Actor const &) const; /** - * @symbol ??4BuoyancyComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4BuoyancyComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class BuoyancyComponent & operator=(class BuoyancyComponent &&); /** - * @symbol ?shouldApplyGravity\@BuoyancyComponent\@\@QEBA_NXZ + * @symbol ?shouldApplyGravity\@BuoyancyComponent\@\@QEBA_NXZ */ MCAPI bool shouldApplyGravity() const; /** - * @symbol ?shouldSimulateWaves\@BuoyancyComponent\@\@QEBA_NXZ + * @symbol ?shouldSimulateWaves\@BuoyancyComponent\@\@QEBA_NXZ */ MCAPI bool shouldSimulateWaves() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp b/LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp index e73b424ba3..241032e6b2 100644 --- a/LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancyDefinition.hpp @@ -31,32 +31,32 @@ class BuoyancyDefinition { public: /** - * @symbol ??0BuoyancyDefinition\@\@QEAA\@XZ + * @symbol ??0BuoyancyDefinition\@\@QEAA\@XZ */ MCAPI BuoyancyDefinition(); /** - * @symbol ?initialize\@BuoyancyDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBuoyancyComponent\@\@\@Z + * @symbol ?initialize\@BuoyancyDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBuoyancyComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class BuoyancyComponent &) const; /** - * @symbol ?uninitialize\@BuoyancyDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBuoyancyComponent\@\@\@Z + * @symbol ?uninitialize\@BuoyancyDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVBuoyancyComponent\@\@\@Z */ MCAPI void uninitialize(class EntityContext &, class BuoyancyComponent &) const; /** - * @symbol ?buildSchema\@BuoyancyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBuoyancyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BuoyancyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBuoyancyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); //private: /** - * @symbol ?_addLiquidBlockDescriptor\@BuoyancyDefinition\@\@AEAAXAEBVBlockDescriptor\@\@\@Z + * @symbol ?_addLiquidBlockDescriptor\@BuoyancyDefinition\@\@AEAAXAEBVBlockDescriptor\@\@\@Z */ MCAPI void _addLiquidBlockDescriptor(class BlockDescriptor const &); /** - * @symbol ?_serialize\@BuoyancyDefinition\@\@AEBA?AVValue\@Json\@\@XZ + * @symbol ?_serialize\@BuoyancyDefinition\@\@AEBA?AVValue\@Json\@\@XZ */ MCAPI class Json::Value _serialize() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuoyancySystem.hpp b/LiteLoader/include/llapi/mc/BuoyancySystem.hpp index 0a8ce02185..37f4377c21 100644 --- a/LiteLoader/include/llapi/mc/BuoyancySystem.hpp +++ b/LiteLoader/include/llapi/mc/BuoyancySystem.hpp @@ -30,19 +30,19 @@ class BuoyancySystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BuoyancySystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BuoyancySystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BuoyancySystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp b/LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp index 3e5f5c87b0..1ae25d8cc2 100644 --- a/LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp +++ b/LiteLoader/include/llapi/mc/BuriedTreasureFeature.hpp @@ -31,28 +31,28 @@ class BuriedTreasureFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BuriedTreasureFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@BuriedTreasureFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@BuriedTreasureFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@BuriedTreasureFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@BuriedTreasureFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@BuriedTreasureFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@BuriedTreasureFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0BuriedTreasureFeature\@\@QEAA\@I\@Z + * @symbol ??0BuriedTreasureFeature\@\@QEAA\@I\@Z */ MCAPI BuriedTreasureFeature(unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp b/LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp index 605910d8c8..d4562f00e1 100644 --- a/LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp +++ b/LiteLoader/include/llapi/mc/BuriedTreasurePiece.hpp @@ -31,27 +31,27 @@ class BuriedTreasurePiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BuriedTreasurePiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@BuriedTreasurePiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@BuriedTreasurePiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@BuriedTreasurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@BuriedTreasurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); //private: /** - * @symbol ?_isCovered\@BuriedTreasurePiece\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isCovered\@BuriedTreasurePiece\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isCovered(class BlockSource const &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp b/LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp index 4eac935a6a..da769d0060 100644 --- a/LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp +++ b/LiteLoader/include/llapi/mc/BuriedTreasureStart.hpp @@ -31,13 +31,13 @@ class BuriedTreasureStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BuriedTreasureStart(); + virtual void __unk_vfn_0(); /** - * @symbol ??0BuriedTreasureStart\@\@QEAA\@AEAVDimension\@\@AEAVRandom\@\@HH\@Z + * @symbol ??0BuriedTreasureStart\@\@QEAA\@AEAVDimension\@\@AEAVRandom\@\@HH\@Z */ MCAPI BuriedTreasureStart(class Dimension &, class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BurnsInDaylightDefinition.hpp b/LiteLoader/include/llapi/mc/BurnsInDaylightDefinition.hpp index d8a1effbd6..3dd2d3bb62 100644 --- a/LiteLoader/include/llapi/mc/BurnsInDaylightDefinition.hpp +++ b/LiteLoader/include/llapi/mc/BurnsInDaylightDefinition.hpp @@ -31,8 +31,8 @@ class BurnsInDaylightDefinition { public: /** - * @symbol ?buildSchema\@BurnsInDaylightDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBurnsInDaylightDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@BurnsInDaylightDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VBurnsInDaylightDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp b/LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp index 970741eb09..79df871eba 100644 --- a/LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp +++ b/LiteLoader/include/llapi/mc/BurnsInDaylightSystem.hpp @@ -30,19 +30,19 @@ class BurnsInDaylightSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BurnsInDaylightSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@BurnsInDaylightSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@BurnsInDaylightSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BurstReactionComponent.hpp b/LiteLoader/include/llapi/mc/BurstReactionComponent.hpp index e797d047f5..77888e7f04 100644 --- a/LiteLoader/include/llapi/mc/BurstReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/BurstReactionComponent.hpp @@ -30,24 +30,24 @@ class BurstReactionComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BurstReactionComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_onEnd\@BurstReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @vftbl 3 + * @symbol ?_onEnd\@BurstReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ virtual void _onEnd(class LabTableReaction &, class BlockSource &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BuryDescription.hpp b/LiteLoader/include/llapi/mc/BuryDescription.hpp index cb6acee749..1e1d55b94a 100644 --- a/LiteLoader/include/llapi/mc/BuryDescription.hpp +++ b/LiteLoader/include/llapi/mc/BuryDescription.hpp @@ -28,12 +28,12 @@ class BuryDescription { public: /** - * @symbol ??0BuryDescription\@\@QEAA\@AEBVBoundingBox\@\@\@Z + * @symbol ??0BuryDescription\@\@QEAA\@AEBVBoundingBox\@\@\@Z */ MCAPI BuryDescription(class BoundingBox const &); /** - * @symbol ?calculateContribution\@BuryDescription\@\@QEBAMAEBVBlockPos\@\@\@Z + * @symbol ?calculateContribution\@BuryDescription\@\@QEBAMAEBVBlockPos\@\@\@Z */ MCAPI float calculateContribution(class BlockPos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/BushBlock.hpp b/LiteLoader/include/llapi/mc/BushBlock.hpp index 671c7ee44c..bc750539be 100644 --- a/LiteLoader/include/llapi/mc/BushBlock.hpp +++ b/LiteLoader/include/llapi/mc/BushBlock.hpp @@ -31,233 +31,242 @@ class BushBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~BushBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@BushBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@BushBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@BushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@BushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@BushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@BushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@BushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?checkAlive\@BushBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?checkAlive\@BushBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUSHBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@BushBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@BushBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~BushBlock(); #endif /** - * @symbol ??0BushBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0BushBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI BushBlock(std::string const &, int, class Material const &); /** - * @symbol ?growCrops\@BushBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4FertilizerType\@\@\@Z + * @symbol ?growCrops\@BushBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4FertilizerType\@\@\@Z */ MCAPI bool growCrops(class BlockSource &, class BlockPos const &, enum class FertilizerType) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ButtonBlock.hpp b/LiteLoader/include/llapi/mc/ButtonBlock.hpp index 402a5d77d8..b3879aed6e 100644 --- a/LiteLoader/include/llapi/mc/ButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/ButtonBlock.hpp @@ -31,331 +31,331 @@ class ButtonBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ButtonBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@ButtonBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@ButtonBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@ButtonBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@ButtonBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@ButtonBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@ButtonBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ButtonBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ButtonBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 108 - * @symbol ?isAttachedTo\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 108 + * @symbol ?isAttachedTo\@ButtonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 113 - * @symbol ?entityInside\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 144 - * @symbol ?getUIShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + * @vftbl 144 + * @symbol ?getUIShape\@ButtonBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ virtual class AABB const & getUIShape(class Block const &, class AABB &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@ButtonBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ButtonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@ButtonBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@ButtonBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ButtonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@ButtonBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@ButtonBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@ButtonBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_178(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 179 + * @symbol ?canSurvive\@ButtonBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_185(); + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@ButtonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_BUTTONBLOCK /** - * @symbol ?isButtonBlock\@ButtonBlock\@\@UEBA_NXZ + * @symbol ?isButtonBlock\@ButtonBlock\@\@UEBA_NXZ */ MCVAPI bool isButtonBlock() const; /** - * @symbol ?isInteractiveBlock\@ButtonBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@ButtonBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ?buttonPressed\@ButtonBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVVec3\@\@PEAVActor\@\@\@Z + * @symbol ?buttonPressed\@ButtonBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVVec3\@\@PEAVActor\@\@\@Z */ MCAPI void buttonPressed(class BlockSource &, class Block const &, class Vec3 const &, class Actor *) const; /** - * @symbol ?canAttachTo\@ButtonBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?canAttachTo\@ButtonBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI static bool canAttachTo(class BlockSource &, class BlockPos const &, unsigned char); //protected: /** - * @symbol ??0ButtonBlock\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N\@Z + * @symbol ??0ButtonBlock\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N\@Z */ MCAPI ButtonBlock(std::string const &, int, class Material const &, bool); //private: /** - * @symbol ?_buttonUnpressed\@ButtonBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVVec3\@\@PEAVActor\@\@\@Z + * @symbol ?_buttonUnpressed\@ButtonBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVVec3\@\@PEAVActor\@\@\@Z */ MCAPI void _buttonUnpressed(class BlockSource &, class Block const &, class Vec3 const &, class Actor *) const; /** - * @symbol ?_checkPressed\@ButtonBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_checkPressed\@ButtonBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _checkPressed(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_getShape\@ButtonBlock\@\@AEBAXAEAVAABB\@\@_NE1\@Z + * @symbol ?_getShape\@ButtonBlock\@\@AEBAXAEAVAABB\@\@_NE1\@Z */ MCAPI void _getShape(class AABB &, bool, unsigned char, bool) const; @@ -363,4 +363,4 @@ class ButtonBlock : public BlockLegacy { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ButtonPushEvent.hpp b/LiteLoader/include/llapi/mc/ButtonPushEvent.hpp index 4c5406aca0..0d2c7b130d 100644 --- a/LiteLoader/include/llapi/mc/ButtonPushEvent.hpp +++ b/LiteLoader/include/llapi/mc/ButtonPushEvent.hpp @@ -25,7 +25,7 @@ struct ButtonPushEvent { public: /** - * @symbol ??1ButtonPushEvent\@\@QEAA\@XZ + * @symbol ??1ButtonPushEvent\@\@QEAA\@XZ */ MCAPI ~ButtonPushEvent(); diff --git a/LiteLoader/include/llapi/mc/ByteArrayTag.hpp b/LiteLoader/include/llapi/mc/ByteArrayTag.hpp index 993d121c49..ed6249bc83 100644 --- a/LiteLoader/include/llapi/mc/ByteArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/ByteArrayTag.hpp @@ -41,52 +41,52 @@ TagMemoryChunk val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ByteArrayTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@ByteArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ByteArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@ByteArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@ByteArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@ByteArrayTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@ByteArrayTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@ByteArrayTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@ByteArrayTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@ByteArrayTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@ByteArrayTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@ByteArrayTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@ByteArrayTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@ByteArrayTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@ByteArrayTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; /** - * @symbol ??0ByteArrayTag\@\@QEAA\@XZ + * @symbol ??0ByteArrayTag\@\@QEAA\@UTagMemoryChunk\@\@\@Z */ - MCAPI ByteArrayTag(); + MCAPI ByteArrayTag(struct TagMemoryChunk); /** - * @symbol ??0ByteArrayTag\@\@QEAA\@UTagMemoryChunk\@\@\@Z + * @symbol ??0ByteArrayTag\@\@QEAA\@XZ */ - MCAPI ByteArrayTag(struct TagMemoryChunk); + MCAPI ByteArrayTag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ByteTag.hpp b/LiteLoader/include/llapi/mc/ByteTag.hpp index fdfe154b2e..41e05bcb6c 100644 --- a/LiteLoader/include/llapi/mc/ByteTag.hpp +++ b/LiteLoader/include/llapi/mc/ByteTag.hpp @@ -39,52 +39,58 @@ unsigned char val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ByteTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@ByteTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ByteTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@ByteTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@ByteTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@ByteTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@ByteTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@ByteTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@ByteTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@ByteTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@ByteTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@ByteTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@ByteTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@ByteTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@ByteTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_BYTETAG /** - * @symbol ??0ByteTag\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ByteTag(); +#endif + /** + * @symbol ??0ByteTag\@\@QEAA\@XZ */ MCAPI ByteTag(); /** - * @symbol ??0ByteTag\@\@QEAA\@E\@Z + * @symbol ??0ByteTag\@\@QEAA\@E\@Z */ MCAPI ByteTag(unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CDScopedEvent.hpp b/LiteLoader/include/llapi/mc/CDScopedEvent.hpp index 06d0f6278e..543391f5d2 100644 --- a/LiteLoader/include/llapi/mc/CDScopedEvent.hpp +++ b/LiteLoader/include/llapi/mc/CDScopedEvent.hpp @@ -28,12 +28,12 @@ class CDScopedEvent { public: /** - * @symbol ??0CDScopedEvent\@\@QEAA\@W4CrashDumpLogStringID\@\@00\@Z + * @symbol ??0CDScopedEvent\@\@QEAA\@W4CrashDumpLogStringID\@\@00\@Z */ MCAPI CDScopedEvent(enum class CrashDumpLogStringID, enum class CrashDumpLogStringID, enum class CrashDumpLogStringID); /** - * @symbol ??1CDScopedEvent\@\@QEAA\@XZ + * @symbol ??1CDScopedEvent\@\@QEAA\@XZ */ MCAPI ~CDScopedEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CSHA1.hpp b/LiteLoader/include/llapi/mc/CSHA1.hpp index ca9dcecd90..6436e6f657 100644 --- a/LiteLoader/include/llapi/mc/CSHA1.hpp +++ b/LiteLoader/include/llapi/mc/CSHA1.hpp @@ -29,36 +29,36 @@ class CSHA1 { public: /** - * @symbol ??0CSHA1\@\@QEAA\@XZ + * @symbol ??0CSHA1\@\@QEAA\@XZ */ MCAPI CSHA1(); /** - * @symbol ?Final\@CSHA1\@\@QEAAXXZ + * @symbol ?Final\@CSHA1\@\@QEAAXXZ */ MCAPI void Final(); /** - * @symbol ?GetHash\@CSHA1\@\@QEBAPEAEXZ + * @symbol ?GetHash\@CSHA1\@\@QEBAPEAEXZ */ MCAPI unsigned char * GetHash() const; /** - * @symbol ?Reset\@CSHA1\@\@QEAAXXZ + * @symbol ?Reset\@CSHA1\@\@QEAAXXZ */ MCAPI void Reset(); /** - * @symbol ?Update\@CSHA1\@\@QEAAXPEBEI\@Z + * @symbol ?Update\@CSHA1\@\@QEAAXPEBEI\@Z */ MCAPI void Update(unsigned char const *, unsigned int); /** - * @symbol ??1CSHA1\@\@QEAA\@XZ + * @symbol ??1CSHA1\@\@QEAA\@XZ */ MCAPI ~CSHA1(); //private: /** - * @symbol ?Transform\@CSHA1\@\@AEAAXPEAIPEBE\@Z + * @symbol ?Transform\@CSHA1\@\@AEAAXPEAIPEBE\@Z */ MCAPI void Transform(unsigned int *, unsigned char const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CacheMovingStateSystem.hpp b/LiteLoader/include/llapi/mc/CacheMovingStateSystem.hpp index b33bf12614..3fb8404095 100644 --- a/LiteLoader/include/llapi/mc/CacheMovingStateSystem.hpp +++ b/LiteLoader/include/llapi/mc/CacheMovingStateSystem.hpp @@ -20,11 +20,11 @@ namespace CacheMovingStateSystem { #undef AFTER_EXTRA /** - * @symbol ?tickEntity\@CacheMovingStateSystem\@\@YAXAEAVStrictEntityContext\@\@AEAUSynchedActorDataComponent\@\@AEAUActorRotationComponent\@\@V?$Optional\@V?$FlagComponent\@UMovingFlag\@\@\@\@\@\@\@Z + * @symbol ?tickEntity\@CacheMovingStateSystem\@\@YAXAEAVStrictEntityContext\@\@AEAUSynchedActorDataComponent\@\@AEAUActorRotationComponent\@\@V?$Optional\@V?$FlagComponent\@UMovingFlag\@\@\@\@\@\@\@Z */ MCAPI void tickEntity(class StrictEntityContext &, struct SynchedActorDataComponent &, struct ActorRotationComponent &, class Optional>); /** - * @symbol ?tickPassengerEntity\@CacheMovingStateSystem\@\@YAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUSynchedActorDataComponent\@\@AEAUActorRotationComponent\@\@V?$Optional\@V?$FlagComponent\@UMovingFlag\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UControlledByLocalInstanceFlag\@\@\@\@\@\@\@Z + * @symbol ?tickPassengerEntity\@CacheMovingStateSystem\@\@YAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUSynchedActorDataComponent\@\@AEAUActorRotationComponent\@\@V?$Optional\@V?$FlagComponent\@UMovingFlag\@\@\@\@\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$FlagComponent\@UControlledByLocalInstanceFlag\@\@\@\@\@\@\@Z */ MCAPI void tickPassengerEntity(class StrictEntityContext &, struct PassengerComponent const &, struct SynchedActorDataComponent &, struct ActorRotationComponent &, class Optional>, class ViewT> const &); diff --git a/LiteLoader/include/llapi/mc/CachedComponentData.hpp b/LiteLoader/include/llapi/mc/CachedComponentData.hpp index abaf160cec..4990d7d96e 100644 --- a/LiteLoader/include/llapi/mc/CachedComponentData.hpp +++ b/LiteLoader/include/llapi/mc/CachedComponentData.hpp @@ -30,8 +30,8 @@ class CachedComponentData { public: /** - * @symbol ?cacheComponentData\@CachedComponentData\@\@QEAAXAEBVBlock\@\@\@Z + * @symbol ?cacheComponentData\@CachedComponentData\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void cacheComponentData(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CactusBlock.hpp b/LiteLoader/include/llapi/mc/CactusBlock.hpp index c4514f0f88..ac489f0ecd 100644 --- a/LiteLoader/include/llapi/mc/CactusBlock.hpp +++ b/LiteLoader/include/llapi/mc/CactusBlock.hpp @@ -31,249 +31,254 @@ class CactusBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CactusBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@CactusBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CactusBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@CactusBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@CactusBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@CactusBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@CactusBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 158 - * @symbol ?dealsContactDamage\@CactusBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z + * @vftbl 158 + * @symbol ?dealsContactDamage\@CactusBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CactusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CactusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CACTUSBLOCK /** - * @symbol ?canBeSilkTouched\@CactusBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@CactusBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0CactusBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CactusBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CactusBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CactusFeature.hpp b/LiteLoader/include/llapi/mc/CactusFeature.hpp index 43482515bb..1b94a5c554 100644 --- a/LiteLoader/include/llapi/mc/CactusFeature.hpp +++ b/LiteLoader/include/llapi/mc/CactusFeature.hpp @@ -31,14 +31,14 @@ class CactusFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CactusFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@CactusFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@CactusFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CakeBlock.hpp b/LiteLoader/include/llapi/mc/CakeBlock.hpp index 05ef515989..e781709e4d 100644 --- a/LiteLoader/include/llapi/mc/CakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CakeBlock.hpp @@ -31,261 +31,266 @@ class CakeBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CakeBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@CakeBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CakeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@CakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@CakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@CakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@CakeBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CakeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAKEBLOCK /** - * @symbol ?canBeSilkTouched\@CakeBlock\@\@EEBA_NXZ + * @symbol ?canBeSilkTouched\@CakeBlock\@\@EEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasComparatorSignal\@CakeBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@CakeBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; #endif /** - * @symbol ??0CakeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CakeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CakeBlock(std::string const &, int); /** - * @symbol ?getComparatorSignalFromBites\@CakeBlock\@\@SAHH\@Z + * @symbol ?getComparatorSignalFromBites\@CakeBlock\@\@SAHH\@Z */ MCAPI static int getComparatorSignalFromBites(int); /** - * @symbol ?removeCakeSlice\@CakeBlock\@\@SAXAEAVPlayer\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z + * @symbol ?removeCakeSlice\@CakeBlock\@\@SAXAEAVPlayer\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z */ MCAPI static void removeCakeSlice(class Player &, class BlockSource &, class BlockPos const &, class Block const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CallbackToken.hpp b/LiteLoader/include/llapi/mc/CallbackToken.hpp index 7e79657d18..a08bfe64e3 100644 --- a/LiteLoader/include/llapi/mc/CallbackToken.hpp +++ b/LiteLoader/include/llapi/mc/CallbackToken.hpp @@ -29,32 +29,32 @@ class CallbackToken { public: /** - * @symbol ??0CallbackToken\@\@QEAA\@V?$weak_ptr\@VCallbackTokenCancelState\@\@\@std\@\@\@Z + * @symbol ??0CallbackToken\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI CallbackToken(class std::weak_ptr); + MCAPI CallbackToken(class CallbackToken &&); /** - * @symbol ??0CallbackToken\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0CallbackToken\@\@QEAA\@V?$weak_ptr\@VCallbackTokenCancelState\@\@\@std\@\@\@Z */ - MCAPI CallbackToken(class CallbackToken &&); + MCAPI CallbackToken(class std::weak_ptr); /** - * @symbol ??0CallbackToken\@\@QEAA\@XZ + * @symbol ??0CallbackToken\@\@QEAA\@XZ */ MCAPI CallbackToken(); /** - * @symbol ?cancelCallback\@CallbackToken\@\@QEAAXXZ + * @symbol ?cancelCallback\@CallbackToken\@\@QEAAXXZ */ MCAPI void cancelCallback(); /** - * @symbol ??4CallbackToken\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4CallbackToken\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CallbackToken & operator=(class CallbackToken &&); /** - * @symbol ?release\@CallbackToken\@\@QEAAXXZ + * @symbol ?release\@CallbackToken\@\@QEAAXXZ */ MCAPI void release(); /** - * @symbol ??1CallbackToken\@\@QEAA\@XZ + * @symbol ??1CallbackToken\@\@QEAA\@XZ */ MCAPI ~CallbackToken(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CallbackTokenCancelState.hpp b/LiteLoader/include/llapi/mc/CallbackTokenCancelState.hpp index 526213025c..b4817b4f9b 100644 --- a/LiteLoader/include/llapi/mc/CallbackTokenCancelState.hpp +++ b/LiteLoader/include/llapi/mc/CallbackTokenCancelState.hpp @@ -29,12 +29,12 @@ class CallbackTokenCancelState { public: /** - * @symbol ??0CallbackTokenCancelState\@\@QEAA\@XZ + * @symbol ??0CallbackTokenCancelState\@\@QEAA\@XZ */ MCAPI CallbackTokenCancelState(); /** - * @symbol ?wasCanceled\@CallbackTokenCancelState\@\@QEBA_NXZ + * @symbol ?wasCanceled\@CallbackTokenCancelState\@\@QEBA_NXZ */ MCAPI bool wasCanceled() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Camel.hpp b/LiteLoader/include/llapi/mc/Camel.hpp index 8f5488e191..348452bbef 100644 --- a/LiteLoader/include/llapi/mc/Camel.hpp +++ b/LiteLoader/include/llapi/mc/Camel.hpp @@ -30,173 +30,167 @@ class Camel : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Camel(); + virtual void __unk_vfn_16(); /** - * @vftbl 36 - * @symbol ?getInterpolatedRidingOffset\@Camel\@\@UEBA?AVVec3\@\@MH\@Z + * @vftbl 36 + * @symbol ?getInterpolatedRidingOffset\@Camel\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Camel\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Camel\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 182 + * @symbol ?causeFallDamage\@Camel\@\@MEAAXMMVActorDamageSource\@\@\@Z */ - virtual void __unk_vfn_179(); + virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Camel\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Camel\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Camel\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Camel\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 291 - * @symbol ?aiStep\@Camel\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Camel\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 - */ - virtual void __unk_vfn_304(); - /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_301(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_354(); -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMEL + virtual void __unk_vfn_305(); /** - * @symbol ?getSprintSpeedIncrease\@Camel\@\@UEBAMXZ + * @vftbl 351 + * @symbol __unk_vfn_351 */ - MCVAPI float getSprintSpeedIncrease() const; -#endif + virtual void __unk_vfn_351(); /** - * @symbol ??0Camel\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Camel\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Camel(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getDashCooldown\@Camel\@\@QEBA?AV?$optional\@VExpiringTick\@\@\@std\@\@XZ + * @symbol ?getDashCooldown\@Camel\@\@QEBA?AV?$optional\@VExpiringTick\@\@\@std\@\@XZ */ MCAPI class std::optional getDashCooldown() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraBlock.hpp b/LiteLoader/include/llapi/mc/CameraBlock.hpp index faab1c5ca6..12b70e8c6c 100644 --- a/LiteLoader/include/llapi/mc/CameraBlock.hpp +++ b/LiteLoader/include/llapi/mc/CameraBlock.hpp @@ -31,198 +31,203 @@ class CameraBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CameraBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@CameraBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@CameraBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0CameraBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0CameraBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CameraBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraInstruction.hpp b/LiteLoader/include/llapi/mc/CameraInstruction.hpp new file mode 100644 index 0000000000..73748f318d --- /dev/null +++ b/LiteLoader/include/llapi/mc/CameraInstruction.hpp @@ -0,0 +1,36 @@ +/** + * @file CameraInstruction.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct CameraInstruction { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CAMERAINSTRUCTION +public: + struct CameraInstruction& operator=(struct CameraInstruction const &) = delete; + CameraInstruction(struct CameraInstruction const &) = delete; + CameraInstruction() = delete; +#endif + +public: + /** + * @symbol ??8CameraInstruction\@\@QEBA_NAEBU0\@\@Z + */ + MCAPI bool operator==(struct CameraInstruction const &) const; + /** + * @symbol ?bindType\@CameraInstruction\@\@SAXXZ + */ + MCAPI static void bindType(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp new file mode 100644 index 0000000000..82d639e283 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CameraInstructionPacket.hpp @@ -0,0 +1,62 @@ +/** + * @file CameraInstructionPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CameraInstructionPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CAMERAINSTRUCTIONPACKET +public: + class CameraInstructionPacket& operator=(class CameraInstructionPacket const &) = delete; + CameraInstructionPacket(class CameraInstructionPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@CameraInstructionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@CameraInstructionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@CameraInstructionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 4 + * @symbol ?readExtended\@CameraInstructionPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + /** + * @vftbl 7 + * @symbol ?_read\@CameraInstructionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + /** + * @symbol ??0CameraInstructionPacket\@\@QEAA\@XZ + */ + MCAPI CameraInstructionPacket(); + +}; diff --git a/LiteLoader/include/llapi/mc/CameraItem.hpp b/LiteLoader/include/llapi/mc/CameraItem.hpp index 99d0069b90..5ff90399fa 100644 --- a/LiteLoader/include/llapi/mc/CameraItem.hpp +++ b/LiteLoader/include/llapi/mc/CameraItem.hpp @@ -32,74 +32,74 @@ class CameraItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CameraItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraItemComponentLegacy.hpp b/LiteLoader/include/llapi/mc/CameraItemComponentLegacy.hpp index b19eec7b4b..44de33ef9b 100644 --- a/LiteLoader/include/llapi/mc/CameraItemComponentLegacy.hpp +++ b/LiteLoader/include/llapi/mc/CameraItemComponentLegacy.hpp @@ -33,85 +33,85 @@ enum class UseAction; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CameraItemComponentLegacy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?blackBarsDuration\@CameraItemComponentLegacy\@\@UEBAMXZ + * @vftbl 1 + * @symbol ?blackBarsDuration\@CameraItemComponentLegacy\@\@UEBAMXZ */ virtual float blackBarsDuration() const; /** - * @vftbl 2 - * @symbol ?blackBarsScreenRatio\@CameraItemComponentLegacy\@\@UEBAMXZ + * @vftbl 2 + * @symbol ?blackBarsScreenRatio\@CameraItemComponentLegacy\@\@UEBAMXZ */ virtual float blackBarsScreenRatio() const; /** - * @vftbl 3 - * @symbol ?shutterScreenRatio\@CameraItemComponentLegacy\@\@UEBAMXZ + * @vftbl 3 + * @symbol ?shutterScreenRatio\@CameraItemComponentLegacy\@\@UEBAMXZ */ virtual float shutterScreenRatio() const; /** - * @vftbl 4 - * @symbol ?shutterDuration\@CameraItemComponentLegacy\@\@UEBAMXZ + * @vftbl 4 + * @symbol ?shutterDuration\@CameraItemComponentLegacy\@\@UEBAMXZ */ virtual float shutterDuration() const; /** - * @vftbl 5 - * @symbol ?pictureDuration\@CameraItemComponentLegacy\@\@UEBAMXZ + * @vftbl 5 + * @symbol ?pictureDuration\@CameraItemComponentLegacy\@\@UEBAMXZ */ virtual float pictureDuration() const; /** - * @vftbl 6 - * @symbol ?slideAwayDuration\@CameraItemComponentLegacy\@\@UEBAMXZ + * @vftbl 6 + * @symbol ?slideAwayDuration\@CameraItemComponentLegacy\@\@UEBAMXZ */ virtual float slideAwayDuration() const; /** - * @vftbl 7 - * @symbol ?canPlace\@CameraItemComponentLegacy\@\@UEBA_NAEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 7 + * @symbol ?canPlace\@CameraItemComponentLegacy\@\@UEBA_NAEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@E\@Z */ virtual bool canPlace(class ItemStack const &, class Actor &, class BlockPos const &, unsigned char) const; /** - * @vftbl 8 - * @symbol ?takePictureNow\@CameraItemComponentLegacy\@\@UEAAXAEAVPlayer\@\@PEAVActor\@\@1\@Z + * @vftbl 8 + * @symbol ?takePictureNow\@CameraItemComponentLegacy\@\@UEAAXAEAVPlayer\@\@PEAVActor\@\@1\@Z */ virtual void takePictureNow(class Player &, class Actor *, class Actor *); /** - * @vftbl 9 - * @symbol ?registerCallbacks\@CameraItemComponentLegacy\@\@UEAAXPEAVCameraCallbacks\@\@\@Z + * @vftbl 9 + * @symbol ?registerCallbacks\@CameraItemComponentLegacy\@\@UEAAXPEAVCameraCallbacks\@\@\@Z */ virtual void registerCallbacks(class CameraCallbacks *); /** - * @vftbl 10 - * @symbol ?use\@CameraItemComponentLegacy\@\@UEAAXAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @vftbl 10 + * @symbol ?use\@CameraItemComponentLegacy\@\@UEAAXAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ virtual void use(class ItemStack &, class Player &); /** - * @vftbl 11 - * @symbol ?releaseUsing\@CameraItemComponentLegacy\@\@UEAAXAEAVItemStack\@\@AEAVPlayer\@\@H\@Z + * @vftbl 11 + * @symbol ?releaseUsing\@CameraItemComponentLegacy\@\@UEAAXAEAVItemStack\@\@AEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player &, int); /** - * @vftbl 12 - * @symbol ?useOn\@CameraItemComponentLegacy\@\@UEAA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 12 + * @symbol ?useOn\@CameraItemComponentLegacy\@\@UEAA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &); /** - * @symbol ??0CameraItemComponentLegacy\@\@QEAA\@AEAVItem\@\@\@Z + * @symbol ??0CameraItemComponentLegacy\@\@QEAA\@AEAVItem\@\@\@Z */ MCAPI CameraItemComponentLegacy(class Item &); /** - * @symbol ?init\@CameraItemComponentLegacy\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?init\@CameraItemComponentLegacy\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool init(class Json::Value &, class SemVersion const &); //private: /** - * @symbol ?_tryPlace\@CameraItemComponentLegacy\@\@AEBA?AW4UseAction\@1\@AEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEAVVec3\@\@\@Z + * @symbol ?_tryPlace\@CameraItemComponentLegacy\@\@AEBA?AW4UseAction\@1\@AEBVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEAVVec3\@\@\@Z */ MCAPI enum class CameraItemComponentLegacy::UseAction _tryPlace(class ItemStack const &, class Actor &, class BlockPos const &, unsigned char, class Vec3 &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraPacket.hpp b/LiteLoader/include/llapi/mc/CameraPacket.hpp index f4c66cdbd8..1587cda225 100644 --- a/LiteLoader/include/llapi/mc/CameraPacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraPacket.hpp @@ -30,37 +30,43 @@ class CameraPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CameraPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CameraPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CameraPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CameraPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CameraPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CameraPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CameraPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CameraPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CameraPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERAPACKET /** - * @symbol ??0CameraPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CameraPacket(); + MCVAPI ~CameraPacket(); +#endif /** - * @symbol ??0CameraPacket\@\@QEAA\@UActorUniqueID\@\@0\@Z + * @symbol ??0CameraPacket\@\@QEAA\@UActorUniqueID\@\@0\@Z */ MCAPI CameraPacket(struct ActorUniqueID, struct ActorUniqueID); + /** + * @symbol ??0CameraPacket\@\@QEAA\@XZ + */ + MCAPI CameraPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraPresets.hpp b/LiteLoader/include/llapi/mc/CameraPresets.hpp index def782686a..3962d823b1 100644 --- a/LiteLoader/include/llapi/mc/CameraPresets.hpp +++ b/LiteLoader/include/llapi/mc/CameraPresets.hpp @@ -27,16 +27,28 @@ class CameraPresets { public: /** - * @symbol ??0CameraPresets\@\@QEAA\@XZ + * @symbol ??0CameraPresets\@\@QEAA\@XZ */ MCAPI 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 ??4CameraPresets\@\@QEAAAEAV0\@$$QEAV0\@\@Z + */ + MCAPI class CameraPresets & operator=(class CameraPresets &&); + /** + * @symbol ?bindType\@CameraPresets\@\@SAXXZ + */ + MCAPI static void bindType(); //private: /** - * @symbol ?_setupBindings\@CameraPresets\@\@CAXXZ + * @symbol ?_setupBindings\@CameraPresets\@\@CAXXZ */ MCAPI static void _setupBindings(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp new file mode 100644 index 0000000000..e776f60368 --- /dev/null +++ b/LiteLoader/include/llapi/mc/CameraPresetsPacket.hpp @@ -0,0 +1,62 @@ +/** + * @file CameraPresetsPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class CameraPresetsPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CAMERAPRESETSPACKET +public: + class CameraPresetsPacket& operator=(class CameraPresetsPacket const &) = delete; + CameraPresetsPacket(class CameraPresetsPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@CameraPresetsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@CameraPresetsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@CameraPresetsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 4 + * @symbol ?readExtended\@CameraPresetsPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); + /** + * @vftbl 7 + * @symbol ?_read\@CameraPresetsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + /** + * @symbol ??0CameraPresetsPacket\@\@QEAA\@XZ + */ + MCAPI CameraPresetsPacket(); + +}; diff --git a/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp b/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp index 59ab4f9652..4425d340e8 100644 --- a/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakeCommand.hpp @@ -31,30 +31,30 @@ class CameraShakeCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CameraShakeCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@CameraShakeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@CameraShakeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@CameraShakeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@CameraShakeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_executeAdd\@CameraShakeCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeAdd\@CameraShakeCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeAdd(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_executeStop\@CameraShakeCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeStop\@CameraShakeCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeStop(class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraShakeComponent.hpp b/LiteLoader/include/llapi/mc/CameraShakeComponent.hpp index 16b59224ca..7133037c4f 100644 --- a/LiteLoader/include/llapi/mc/CameraShakeComponent.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakeComponent.hpp @@ -30,8 +30,8 @@ class CameraShakeComponent { public: /** - * @symbol ?getMaxIntensity\@CameraShakeComponent\@\@SAMXZ + * @symbol ?getMaxIntensity\@CameraShakeComponent\@\@SAMXZ */ MCAPI static float getMaxIntensity(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp index 16791abf8b..9090fdb0ff 100644 --- a/LiteLoader/include/llapi/mc/CameraShakePacket.hpp +++ b/LiteLoader/include/llapi/mc/CameraShakePacket.hpp @@ -30,41 +30,47 @@ class CameraShakePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CameraShakePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CameraShakePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CameraShakePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CameraShakePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CameraShakePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CameraShakePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CameraShakePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CameraShakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CameraShakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMERASHAKEPACKET /** - * @symbol ??0CameraShakePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CameraShakePacket(); + MCVAPI ~CameraShakePacket(); +#endif /** - * @symbol ??0CameraShakePacket\@\@QEAA\@W4CameraShakeAction\@\@\@Z + * @symbol ??0CameraShakePacket\@\@QEAA\@MMW4CameraShakeType\@\@\@Z */ - MCAPI CameraShakePacket(enum class CameraShakeAction); + MCAPI CameraShakePacket(float, float, enum class CameraShakeType); /** - * @symbol ??0CameraShakePacket\@\@QEAA\@MMW4CameraShakeType\@\@\@Z + * @symbol ??0CameraShakePacket\@\@QEAA\@XZ */ - MCAPI CameraShakePacket(float, float, enum class CameraShakeType); + MCAPI CameraShakePacket(); + /** + * @symbol ??0CameraShakePacket\@\@QEAA\@W4CameraShakeAction\@\@\@Z + */ + MCAPI CameraShakePacket(enum class CameraShakeAction); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CampfireBlock.hpp b/LiteLoader/include/llapi/mc/CampfireBlock.hpp index eade23505a..304d19d854 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlock.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlock.hpp @@ -31,319 +31,324 @@ class CampfireBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CampfireBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@CampfireBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@CampfireBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@CampfireBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@CampfireBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@CampfireBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@CampfireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@CampfireBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@CampfireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@CampfireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@CampfireBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@CampfireBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 113 - * @symbol ?entityInside\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@CampfireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@CampfireBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@CampfireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 - * @symbol ?animateTick\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 - * @symbol ?getLightEmission\@CampfireBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@CampfireBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CampfireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CampfireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CampfireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@CampfireBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@CampfireBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@CampfireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAMPFIREBLOCK /** - * @symbol ?canBeSilkTouched\@CampfireBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@CampfireBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasVariableLighting\@CampfireBlock\@\@UEBA_NXZ + * @symbol ?hasVariableLighting\@CampfireBlock\@\@UEBA_NXZ */ MCVAPI bool hasVariableLighting() const; /** - * @symbol ?waterSpreadCausesSpawn\@CampfireBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@CampfireBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0CampfireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4Behavior\@0\@\@Z + * @symbol ??0CampfireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N_N\@Z */ - MCAPI CampfireBlock(std::string const &, int, bool, enum class CampfireBlock::Behavior); + MCAPI CampfireBlock(std::string const &, int, bool, bool); /** - * @symbol ?isLit\@CampfireBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isLit\@CampfireBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isLit(class Block const &); /** - * @symbol ?tryDouseFire\@CampfireBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@_N\@Z + * @symbol ?tryDouseFire\@CampfireBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@_N\@Z */ MCAPI static bool tryDouseFire(class BlockSource &, class BlockPos const &, class Actor *, bool); /** - * @symbol ?tryLightFire\@CampfireBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?tryLightFire\@CampfireBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI static bool tryLightFire(class BlockSource &, class BlockPos const &, class Actor *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp index f282f9f9cb..57cc209b12 100644 --- a/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CampfireBlockActor.hpp @@ -31,124 +31,124 @@ class CampfireBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CampfireBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@CampfireBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@CampfireBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@CampfireBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@CampfireBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@CampfireBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@CampfireBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@CampfireBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@CampfireBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getShadowRadius\@CampfireBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z + * @vftbl 19 + * @symbol ?getShadowRadius\@CampfireBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@CampfireBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@CampfireBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@CampfireBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0CampfireBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0CampfireBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI CampfireBlockActor(class BlockPos const &); /** - * @symbol ?dropAllItems\@CampfireBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?dropAllItems\@CampfireBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void dropAllItems(class BlockSource &); /** - * @symbol ?getCampfireTag\@CampfireBlockActor\@\@QEBAAEBVHashedString\@\@AEBVBlockSource\@\@\@Z + * @symbol ?getCampfireTag\@CampfireBlockActor\@\@QEBAAEBVHashedString\@\@AEBVBlockSource\@\@\@Z */ MCAPI class HashedString const & getCampfireTag(class BlockSource const &) const; /** - * @symbol ?getCookingItem\@CampfireBlockActor\@\@QEAAAEBVItemInstance\@\@H\@Z + * @symbol ?getCookingItem\@CampfireBlockActor\@\@QEAAAEBVItemInstance\@\@H\@Z */ MCAPI class ItemInstance const & getCookingItem(int); /** - * @symbol ?setItem\@CampfireBlockActor\@\@QEAA_NAEAVBlockSource\@\@AEBVItemInstance\@\@\@Z + * @symbol ?setItem\@CampfireBlockActor\@\@QEAA_NAEAVBlockSource\@\@AEBVItemInstance\@\@\@Z */ MCAPI bool setItem(class BlockSource &, class ItemInstance const &); /** - * @symbol ?MAX_SMOKE_THRESHOLD_COUNTER\@CampfireBlockActor\@\@2HB + * @symbol ?MAX_SMOKE_THRESHOLD_COUNTER\@CampfireBlockActor\@\@2HB */ MCAPI static int const MAX_SMOKE_THRESHOLD_COUNTER; /** - * @symbol ?MIN_SMOKE_THRESHOLD_COUNTER\@CampfireBlockActor\@\@2HB + * @symbol ?MIN_SMOKE_THRESHOLD_COUNTER\@CampfireBlockActor\@\@2HB */ MCAPI static int const MIN_SMOKE_THRESHOLD_COUNTER; //private: /** - * @symbol ?_finishCooking\@CampfireBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z + * @symbol ?_finishCooking\@CampfireBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z */ MCAPI void _finishCooking(class BlockSource &, int); /** - * @symbol ?_removeItem\@CampfireBlockActor\@\@AEAAXH\@Z + * @symbol ?_removeItem\@CampfireBlockActor\@\@AEAAXH\@Z */ MCAPI void _removeItem(int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CanClimbDefinition.hpp b/LiteLoader/include/llapi/mc/CanClimbDefinition.hpp index 6f34ee6d6e..aeccfe71be 100644 --- a/LiteLoader/include/llapi/mc/CanClimbDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CanClimbDefinition.hpp @@ -31,15 +31,15 @@ struct CanClimbDefinition { public: /** - * @symbol ?initialize\@CanClimbDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@CanClimbDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@CanClimbDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@CanClimbDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@CanClimbDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCanClimbDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@CanClimbDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCanClimbDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/CanFlyDefinition.hpp b/LiteLoader/include/llapi/mc/CanFlyDefinition.hpp index 0a866563f4..ab11bfc977 100644 --- a/LiteLoader/include/llapi/mc/CanFlyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CanFlyDefinition.hpp @@ -31,15 +31,15 @@ struct CanFlyDefinition { public: /** - * @symbol ?initialize\@CanFlyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@CanFlyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@CanFlyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@CanFlyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@CanFlyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCanFlyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@CanFlyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCanFlyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/CanPowerJumpDefinition.hpp b/LiteLoader/include/llapi/mc/CanPowerJumpDefinition.hpp index 13d4f2c8b4..9a5f758b67 100644 --- a/LiteLoader/include/llapi/mc/CanPowerJumpDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CanPowerJumpDefinition.hpp @@ -31,15 +31,15 @@ struct CanPowerJumpDefinition { public: /** - * @symbol ?initialize\@CanPowerJumpDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@CanPowerJumpDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@CanPowerJumpDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@CanPowerJumpDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@CanPowerJumpDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCanPowerJumpDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@CanPowerJumpDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCanPowerJumpDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/CandleBlock.hpp b/LiteLoader/include/llapi/mc/CandleBlock.hpp index 78796f26fb..aad10c18d0 100644 --- a/LiteLoader/include/llapi/mc/CandleBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlock.hpp @@ -31,285 +31,290 @@ class CandleBlock : public AbstractCandleBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CandleBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@CandleBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@CandleBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@CandleBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CandleBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CandleBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@CandleBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@CandleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@CandleBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?_getNumCandles\@CandleBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?_getNumCandles\@CandleBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 194 - * @symbol ?_iterateCandles\@CandleBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z + * @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 195 - * @symbol ?_tryLightOnFire\@CandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 196 + * @symbol ?_tryLightOnFire\@CandleBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 198 + * @symbol __unk_vfn_198 */ virtual void __unk_vfn_198(); /** - * @vftbl 199 - * @symbol __unk_vfn_199 + * @vftbl 199 + * @symbol __unk_vfn_199 */ virtual void __unk_vfn_199(); /** - * @vftbl 200 - * @symbol __unk_vfn_200 + * @vftbl 200 + * @symbol __unk_vfn_200 */ virtual void __unk_vfn_200(); + /** + * @vftbl 201 + * @symbol __unk_vfn_201 + */ + virtual void __unk_vfn_201(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANDLEBLOCK /** - * @symbol ?isInteractiveBlock\@CandleBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@CandleBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; /** - * @symbol ?waterSpreadCausesSpawn\@CandleBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@CandleBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0CandleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CandleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CandleBlock(std::string const &, int); /** - * @symbol ?tryLightFire\@CandleBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?tryLightFire\@CandleBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI static bool tryLightFire(class BlockSource &, class BlockPos const &, class Actor *); //private: /** - * @symbol ?_forEachCandle\@CandleBlock\@\@CAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z + * @symbol ?_forEachCandle\@CandleBlock\@\@CAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ MCAPI static void _forEachCandle(class Block const &, class BlockPos const &, class std::function); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp index ad29401029..a6329f75e3 100644 --- a/LiteLoader/include/llapi/mc/CandleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CandleBlockItem.hpp @@ -32,94 +32,94 @@ class CandleBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CandleBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@CandleBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@CandleBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@CandleBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@CandleBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANDLEBLOCKITEM /** - * @symbol ?isCandle\@CandleBlockItem\@\@UEBA_NXZ + * @symbol ?isCandle\@CandleBlockItem\@\@UEBA_NXZ */ MCVAPI bool isCandle() const; #endif /** - * @symbol ??0CandleBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CandleBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CandleBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp index 54e53f9f5e..eb3b5e815a 100644 --- a/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp +++ b/LiteLoader/include/llapi/mc/CandleCakeBlock.hpp @@ -31,321 +31,326 @@ class CandleCakeBlock : public AbstractCandleBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CandleCakeBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@CandleCakeBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CandleCakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CandleCakeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@CandleCakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@CandleCakeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@CandleCakeBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CandleCakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CandleCakeBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CandleCakeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@CandleCakeBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@CandleCakeBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CandleCakeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?_getNumCandles\@CandleCakeBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?_getNumCandles\@CandleCakeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int _getNumCandles(class Block const &) const; /** - * @vftbl 194 - * @symbol ?_iterateCandles\@CandleCakeBlock\@\@MEBAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z + * @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 195 - * @symbol ?_tryLightOnFire\@CandleCakeBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 196 + * @symbol ?_tryLightOnFire\@CandleCakeBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void _tryLightOnFire(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 196 - * @symbol __unk_vfn_196 - */ - virtual void __unk_vfn_196(); - /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 198 + * @symbol __unk_vfn_198 */ virtual void __unk_vfn_198(); /** - * @vftbl 199 - * @symbol __unk_vfn_199 + * @vftbl 199 + * @symbol __unk_vfn_199 */ virtual void __unk_vfn_199(); /** - * @vftbl 200 - * @symbol __unk_vfn_200 + * @vftbl 200 + * @symbol __unk_vfn_200 */ virtual void __unk_vfn_200(); + /** + * @vftbl 201 + * @symbol __unk_vfn_201 + */ + virtual void __unk_vfn_201(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANDLECAKEBLOCK /** - * @symbol ?canBeSilkTouched\@CandleCakeBlock\@\@EEBA_NXZ + * @symbol ?canBeSilkTouched\@CandleCakeBlock\@\@EEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasComparatorSignal\@CandleCakeBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@CandleCakeBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isCandleCakeBlock\@CandleCakeBlock\@\@UEBA_NXZ + * @symbol ?isCandleCakeBlock\@CandleCakeBlock\@\@UEBA_NXZ */ MCVAPI bool isCandleCakeBlock() const; #endif /** - * @symbol ??0CandleCakeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CandleCakeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CandleCakeBlock(std::string const &, int); /** - * @symbol ?getCandleCakeFromCandle\@CandleCakeBlock\@\@SAAEBVBlock\@\@AEBV2\@\@Z + * @symbol ?getCandleCakeFromCandle\@CandleCakeBlock\@\@SAAEBVBlock\@\@AEBV2\@\@Z */ MCAPI static class Block const & getCandleCakeFromCandle(class Block const &); /** - * @symbol ?getCandleFromCandleCake\@CandleCakeBlock\@\@SAAEBVBlock\@\@AEBV2\@\@Z + * @symbol ?getCandleFromCandleCake\@CandleCakeBlock\@\@SAAEBVBlock\@\@AEBV2\@\@Z */ MCAPI static class Block const & getCandleFromCandleCake(class Block const &); /** - * @symbol ?tryLightFire\@CandleCakeBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @symbol ?tryLightFire\@CandleCakeBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ MCAPI static bool tryLightFire(class BlockSource &, class BlockPos const &, class Actor *); //private: /** - * @symbol ?_popCandle\@CandleCakeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_popCandle\@CandleCakeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _popCandle(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_forEachCandle\@CandleCakeBlock\@\@CAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z + * @symbol ?_forEachCandle\@CandleCakeBlock\@\@CAXAEBVBlock\@\@AEBVBlockPos\@\@V?$function\@$$A6AXAEBVVec3\@\@H\@Z\@std\@\@\@Z */ MCAPI static void _forEachCandle(class Block const &, class BlockPos const &, class std::function); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CanyonFeature.hpp b/LiteLoader/include/llapi/mc/CanyonFeature.hpp index c3dcc57078..80ba70e91d 100644 --- a/LiteLoader/include/llapi/mc/CanyonFeature.hpp +++ b/LiteLoader/include/llapi/mc/CanyonFeature.hpp @@ -33,39 +33,45 @@ struct CanyonConfiguration; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CanyonFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?carve\@CanyonFeature\@\@MEBA_NAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@4HHHHHHMMV?$span\@$$CBM$0?0\@gsl\@\@AEBUWorldGenContext\@\@\@Z + * @vftbl 1 + * @symbol ?carve\@CanyonFeature\@\@MEBA_NAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@4HHHHHHMMV?$span\@$$CBM$0?0\@gsl\@\@AEBUWorldGenContext\@\@\@Z */ virtual bool carve(class BlockVolume &, class BiomeSource const &, class Random &, class ChunkPos const &, class Vec3 const &, class Vec3 const &, int, int, int, int, int, int, float, float, class gsl::span, struct WorldGenContext const &) const; /** - * @vftbl 2 - * @symbol ?addFeature\@CanyonFeature\@\@MEAAXAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEBUCanyonConfiguration\@CanyonFeatureUtils\@\@AEBVChunkPos\@\@AEAVRandom\@\@HHAEBUWorldGenContext\@\@\@Z + * @vftbl 2 + * @symbol ?addFeature\@CanyonFeature\@\@MEAAXAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEBUCanyonConfiguration\@CanyonFeatureUtils\@\@AEBVChunkPos\@\@AEAVRandom\@\@HHAEBUWorldGenContext\@\@\@Z */ virtual void addFeature(class BlockVolume &, class BiomeSource const &, struct CanyonFeatureUtils::CanyonConfiguration const &, class ChunkPos const &, class Random &, int, int, struct WorldGenContext const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CANYONFEATURE /** - * @symbol ??0CanyonFeature\@\@QEAA\@F\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CanyonFeature(); +#endif + /** + * @symbol ??0CanyonFeature\@\@QEAA\@F\@Z */ MCAPI CanyonFeature(short); /** - * @symbol ?apply\@CanyonFeature\@\@QEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBUCanyonConfiguration\@CanyonFeatureUtils\@\@AEAVRandom\@\@IAEBUWorldGenContext\@\@\@Z + * @symbol ?apply\@CanyonFeature\@\@QEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBUCanyonConfiguration\@CanyonFeatureUtils\@\@AEAVRandom\@\@IAEBUWorldGenContext\@\@\@Z */ MCAPI void apply(class BlockVolume &, class ChunkPos const &, class BiomeSource const &, struct CanyonFeatureUtils::CanyonConfiguration const &, class Random &, unsigned int, struct WorldGenContext const &); /** - * @symbol ?isDiggable\@CanyonFeature\@\@SA_NAEBVBlock\@\@0\@Z + * @symbol ?isDiggable\@CanyonFeature\@\@SA_NAEBVBlock\@\@0\@Z */ MCAPI static bool isDiggable(class Block const &, class Block const &); //protected: /** - * @symbol ?addTunnel\@CanyonFeature\@\@IEBAXAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@4MMMHHMAEBUWorldGenContext\@\@\@Z + * @symbol ?addTunnel\@CanyonFeature\@\@IEBAXAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@4MMMHHMAEBUWorldGenContext\@\@\@Z */ MCAPI void addTunnel(class BlockVolume &, class BiomeSource const &, class Random &, class ChunkPos const &, class Vec3 const &, class Vec3 const &, float, float, float, int, int, float, struct WorldGenContext const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CanyonFeatureUtils.hpp b/LiteLoader/include/llapi/mc/CanyonFeatureUtils.hpp index b9db6374d2..65cd118b0b 100644 --- a/LiteLoader/include/llapi/mc/CanyonFeatureUtils.hpp +++ b/LiteLoader/include/llapi/mc/CanyonFeatureUtils.hpp @@ -20,7 +20,7 @@ namespace CanyonFeatureUtils { #undef AFTER_EXTRA /** - * @symbol ?getCurrentConfiguration\@CanyonFeatureUtils\@\@YAAEBUCanyonConfiguration\@1\@W4TerrainGenVersion\@1\@\@Z + * @symbol ?getCurrentConfiguration\@CanyonFeatureUtils\@\@YAAEBUCanyonConfiguration\@1\@W4TerrainGenVersion\@1\@\@Z */ MCAPI struct CanyonFeatureUtils::CanyonConfiguration const & getCurrentConfiguration(enum class CanyonFeatureUtils::TerrainGenVersion); diff --git a/LiteLoader/include/llapi/mc/CapacitorComponent.hpp b/LiteLoader/include/llapi/mc/CapacitorComponent.hpp index 73496e2c03..9d602d7266 100644 --- a/LiteLoader/include/llapi/mc/CapacitorComponent.hpp +++ b/LiteLoader/include/llapi/mc/CapacitorComponent.hpp @@ -28,33 +28,33 @@ class CapacitorComponent : public ProducerComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CapacitorComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@CapacitorComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@CapacitorComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @vftbl 25 - * @symbol ?getPoweroutDirection\@CapacitorComponent\@\@UEBAEXZ + * @vftbl 25 + * @symbol ?getPoweroutDirection\@CapacitorComponent\@\@UEBAEXZ */ virtual unsigned char getPoweroutDirection() const; /** - * @symbol ??0CapacitorComponent\@\@QEAA\@XZ + * @symbol ??0CapacitorComponent\@\@QEAA\@XZ */ MCAPI CapacitorComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp b/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp index 9bb3e7d4b1..587278a7de 100644 --- a/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp +++ b/LiteLoader/include/llapi/mc/CappedSurfaceAttributes.hpp @@ -35,27 +35,27 @@ struct MaterialLayer { public: /** - * @symbol ?getCeilingMaterial\@CappedSurfaceAttributes\@\@QEBAPEBVBlock\@\@AEBVVec3\@\@\@Z + * @symbol ?getCeilingMaterial\@CappedSurfaceAttributes\@\@QEBAPEBVBlock\@\@AEBVVec3\@\@\@Z */ MCAPI class Block const * getCeilingMaterial(class Vec3 const &) const; /** - * @symbol ?getFloorMaterial\@CappedSurfaceAttributes\@\@QEBAPEBVBlock\@\@AEBVVec3\@\@\@Z + * @symbol ?getFloorMaterial\@CappedSurfaceAttributes\@\@QEBAPEBVBlock\@\@AEBVVec3\@\@\@Z */ MCAPI class Block const * getFloorMaterial(class Vec3 const &) const; /** - * @symbol ?initializeNoise\@CappedSurfaceAttributes\@\@QEAAXI\@Z + * @symbol ?initializeNoise\@CappedSurfaceAttributes\@\@QEAAXI\@Z */ MCAPI void initializeNoise(unsigned int); /** - * @symbol ??4CappedSurfaceAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4CappedSurfaceAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct CappedSurfaceAttributes & operator=(struct CappedSurfaceAttributes &&); /** - * @symbol ??1CappedSurfaceAttributes\@\@QEAA\@XZ + * @symbol ??1CappedSurfaceAttributes\@\@QEAA\@XZ */ MCAPI ~CappedSurfaceAttributes(); /** - * @symbol ?getRandomBlock\@CappedSurfaceAttributes\@\@SAPEBVBlock\@\@AEBV?$vector\@UMaterialLayer\@CappedSurfaceAttributes\@\@V?$allocator\@UMaterialLayer\@CappedSurfaceAttributes\@\@\@std\@\@\@std\@\@AEBVVec3\@\@\@Z + * @symbol ?getRandomBlock\@CappedSurfaceAttributes\@\@SAPEBVBlock\@\@AEBV?$vector\@UMaterialLayer\@CappedSurfaceAttributes\@\@V?$allocator\@UMaterialLayer\@CappedSurfaceAttributes\@\@\@std\@\@\@std\@\@AEBVVec3\@\@\@Z */ MCAPI static class Block const * getRandomBlock(std::vector const &, class Vec3 const &); diff --git a/LiteLoader/include/llapi/mc/CarpetBlock.hpp b/LiteLoader/include/llapi/mc/CarpetBlock.hpp index ba905b18a5..3ed426df25 100644 --- a/LiteLoader/include/llapi/mc/CarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarpetBlock.hpp @@ -31,244 +31,249 @@ class CarpetBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CarpetBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@CarpetBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@CarpetBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@CarpetBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@CarpetBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CarpetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARPETBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@CarpetBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@CarpetBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0CarpetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0CarpetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI CarpetBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CarrotBlock.hpp b/LiteLoader/include/llapi/mc/CarrotBlock.hpp index b3aa5344de..6bf6b4d310 100644 --- a/LiteLoader/include/llapi/mc/CarrotBlock.hpp +++ b/LiteLoader/include/llapi/mc/CarrotBlock.hpp @@ -31,238 +31,243 @@ class CarrotBlock : public CropBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CarrotBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@CarrotBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CarrotBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@CarrotBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CarrotBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 179 - * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 180 + * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@CarrotBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_194(); /** - * @vftbl 194 - * @symbol ?getBaseSeed\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ + * @vftbl 195 + * @symbol ?getBaseSeed\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 195 - * @symbol ?getBaseCrop\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ + * @vftbl 196 + * @symbol ?getBaseCrop\@CarrotBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 197 - * @symbol ?getCropNum\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z + * @vftbl 198 + * @symbol ?getCropNum\@CarrotBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; /** - * @symbol ??0CarrotBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CarrotBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CarrotBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp index e2e6b04a2b..6f7414fb18 100644 --- a/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/CarrotOnAStickItem.hpp @@ -32,108 +32,108 @@ class CarrotOnAStickItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CarrotOnAStickItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 49 - * @symbol ?isHandEquipped\@CarrotOnAStickItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@CarrotOnAStickItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 59 - * @symbol ?requiresInteract\@CarrotOnAStickItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@CarrotOnAStickItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@CarrotOnAStickItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@CarrotOnAStickItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@CarrotOnAStickItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@CarrotOnAStickItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 89 - * @symbol ?hurtActor\@CarrotOnAStickItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@CarrotOnAStickItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@CarrotOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@CarrotOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @symbol ??0CarrotOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CarrotOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CarrotOnAStickItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CartographyAdditionalContainerValidation.hpp b/LiteLoader/include/llapi/mc/CartographyAdditionalContainerValidation.hpp index d4b4832f3e..868fd4cd7d 100644 --- a/LiteLoader/include/llapi/mc/CartographyAdditionalContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/CartographyAdditionalContainerValidation.hpp @@ -31,54 +31,54 @@ class CartographyAdditionalContainerValidation : public ContainerValidationBase public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CartographyAdditionalContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@CartographyAdditionalContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@CartographyAdditionalContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@CartographyAdditionalContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@CartographyAdditionalContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp index b463e6ed6c..3d4ee1c8dd 100644 --- a/LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/CartographyContainerManagerModel.hpp @@ -31,48 +31,48 @@ class CartographyContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CartographyContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@CartographyContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@CartographyContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@CartographyContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@CartographyContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@CartographyContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@CartographyContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@CartographyContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@CartographyContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@CartographyContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@CartographyContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@CartographyContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@CartographyContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@CartographyContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@CartographyContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0CartographyContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0CartographyContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI CartographyContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CartographyContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/CartographyContainerScreenValidator.hpp index 02d9f5c091..dce108da48 100644 --- a/LiteLoader/include/llapi/mc/CartographyContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/CartographyContainerScreenValidator.hpp @@ -29,28 +29,28 @@ class CartographyContainerScreenValidator { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CartographyContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?isCraftingImplemented\@CartographyContainerScreenValidator\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?isCraftingImplemented\@CartographyContainerScreenValidator\@\@UEAA_NXZ */ virtual bool isCraftingImplemented(); /** - * @vftbl 3 - * @symbol ?getCraftResult\@CartographyContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?getCraftResult\@CartographyContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResult(class ContainerScreenContext const &, class ContainerScreenValidation &, std::unique_ptr); /** - * @symbol ??0CartographyContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0CartographyContainerScreenValidator\@\@QEAA\@XZ */ MCAPI CartographyContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CartographyInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/CartographyInputContainerValidation.hpp index d1a00c3320..9c4f80a1ba 100644 --- a/LiteLoader/include/llapi/mc/CartographyInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/CartographyInputContainerValidation.hpp @@ -31,54 +31,54 @@ class CartographyInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CartographyInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@CartographyInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@CartographyInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@CartographyInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@CartographyInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp index e1289f0cda..96a6e9415f 100644 --- a/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/CartographyTableBlock.hpp @@ -31,208 +31,213 @@ class CartographyTableBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CartographyTableBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CartographyTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CartographyTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CARTOGRAPHYTABLEBLOCK /** - * @symbol ?isCraftingBlock\@CartographyTableBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@CartographyTableBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@CartographyTableBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@CartographyTableBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0CartographyTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CartographyTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CartographyTableBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Cat.hpp b/LiteLoader/include/llapi/mc/Cat.hpp index ab9182c0ee..c82be27f2c 100644 --- a/LiteLoader/include/llapi/mc/Cat.hpp +++ b/LiteLoader/include/llapi/mc/Cat.hpp @@ -32,179 +32,174 @@ class Cat : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Cat(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 122 - * @symbol ?onTame\@Cat\@\@UEAAXXZ + * @vftbl 121 + * @symbol ?onTame\@Cat\@\@UEAAXXZ */ virtual void onTame(); /** - * @vftbl 134 - * @symbol ?getAmbientSound\@Cat\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@Cat\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Cat\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Cat\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@Cat\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Cat\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 350 - * @symbol ?_serverAiMobStep\@Cat\@\@UEAAXXZ + * @vftbl 347 + * @symbol ?_serverAiMobStep\@Cat\@\@UEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Cat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Cat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Cat(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?SNEAK_SPEED_MOD\@Cat\@\@2MB + * @symbol ?SNEAK_SPEED_MOD\@Cat\@\@2MB */ MCAPI static float const SNEAK_SPEED_MOD; /** - * @symbol ?SPRINT_SPEED_MOD\@Cat\@\@2MB + * @symbol ?SPRINT_SPEED_MOD\@Cat\@\@2MB */ MCAPI static float const SPRINT_SPEED_MOD; //private: /** - * @symbol ?getLieOnPlayer\@Cat\@\@AEAAMXZ + * @symbol ?getLieOnPlayer\@Cat\@\@AEAAMXZ */ MCAPI float getLieOnPlayer(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp b/LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp index 96730e623a..88b8f55423 100644 --- a/LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/CatchFireSubcomponent.hpp @@ -30,33 +30,33 @@ class CatchFireSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CatchFireSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@CatchFireSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@CatchFireSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@CatchFireSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@CatchFireSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@CatchFireSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@CatchFireSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@CatchFireSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@CatchFireSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0CatchFireSubcomponent\@\@QEAA\@XZ + * @symbol ??0CatchFireSubcomponent\@\@QEAA\@XZ */ MCAPI CatchFireSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CauldronBlock.hpp b/LiteLoader/include/llapi/mc/CauldronBlock.hpp index a2677e6e83..e8ecf14646 100644 --- a/LiteLoader/include/llapi/mc/CauldronBlock.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlock.hpp @@ -32,352 +32,357 @@ class CauldronBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CauldronBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@CauldronBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@CauldronBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@CauldronBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@CauldronBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 65 - * @symbol ?handlePrecipitation\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z + * @vftbl 65 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@CauldronBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 110 - * @symbol ?handleEntityInside\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z + * @vftbl 110 + * @symbol ?handleEntityInside\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z */ virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@CauldronBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@CauldronBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CauldronBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CauldronBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CauldronBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 181 - * @symbol ?getExtraRenderLayers\@CauldronBlock\@\@UEBAHXZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 182 + * @symbol ?getExtraRenderLayers\@CauldronBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@CauldronBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAULDRONBLOCK /** - * @symbol ?hasComparatorSignal\@CauldronBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@CauldronBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@CauldronBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@CauldronBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0CauldronBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CauldronBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CauldronBlock(std::string const &, int); /** - * @symbol ?getLiquidLevel\@CauldronBlock\@\@QEBAHH\@Z + * @symbol ?getLiquidLevel\@CauldronBlock\@\@QEBAHH\@Z */ MCAPI int getLiquidLevel(int) const; /** - * @symbol ?setLiquidLevel\@CauldronBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HW4CauldronLiquidType\@\@\@Z + * @symbol ?setLiquidLevel\@CauldronBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HW4CauldronLiquidType\@\@\@Z */ MCAPI void setLiquidLevel(class BlockSource &, class BlockPos const &, int, enum class CauldronLiquidType) const; /** - * @symbol ?FILL_LEVEL_PER_DRIP\@CauldronBlock\@\@2HB + * @symbol ?FILL_LEVEL_PER_DRIP\@CauldronBlock\@\@2HB */ MCAPI static int const FILL_LEVEL_PER_DRIP; /** - * @symbol ?canReceiveStalactiteDrip\@CauldronBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4MaterialType\@\@\@Z + * @symbol ?canReceiveStalactiteDrip\@CauldronBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4MaterialType\@\@\@Z */ MCAPI static bool canReceiveStalactiteDrip(class BlockSource &, class BlockPos const &, enum class MaterialType); /** - * @symbol ?spawnPotionParticles\@CauldronBlock\@\@SAXAEAVLevel\@\@AEBVVec3\@\@AEAVRandom\@\@HH\@Z + * @symbol ?spawnPotionParticles\@CauldronBlock\@\@SAXAEAVLevel\@\@AEBVVec3\@\@AEAVRandom\@\@HH\@Z */ MCAPI static void spawnPotionParticles(class Level &, class Vec3 const &, class Random &, int, int); //private: /** - * @symbol ?_checkForStalactiteDrip\@CauldronBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_checkForStalactiteDrip\@CauldronBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _checkForStalactiteDrip(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_explodeCauldronContents\@CauldronBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@G\@Z + * @symbol ?_explodeCauldronContents\@CauldronBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@G\@Z */ MCAPI void _explodeCauldronContents(class BlockSource &, class BlockPos const &, unsigned short) const; /** - * @symbol ?_mayUpdateLiquidLevel\@CauldronBlock\@\@AEBA?B_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_mayUpdateLiquidLevel\@CauldronBlock\@\@AEBA?B_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool const _mayUpdateLiquidLevel(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_sendCauldronUsedEventToClient\@CauldronBlock\@\@AEBAXAEBVPlayer\@\@FW4POIBlockInteractionType\@MinecraftEventing\@\@\@Z + * @symbol ?_sendCauldronUsedEventToClient\@CauldronBlock\@\@AEBAXAEBVPlayer\@\@FW4POIBlockInteractionType\@MinecraftEventing\@\@\@Z */ MCAPI void _sendCauldronUsedEventToClient(class Player const &, short, enum class MinecraftEventing::POIBlockInteractionType) const; /** - * @symbol ?_spawnCauldronEvent\@CauldronBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@W4LevelEvent\@\@\@Z + * @symbol ?_spawnCauldronEvent\@CauldronBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@W4LevelEvent\@\@\@Z */ MCAPI void _spawnCauldronEvent(class BlockSource &, class BlockPos const &, enum class LevelEvent) const; /** - * @symbol ?_useDyeableComponent\@CauldronBlock\@\@AEBA_NAEAVItemStack\@\@AEAVPlayer\@\@AEBVBlockPos\@\@AEAVCauldronBlockActor\@\@AEAVBlockSource\@\@H_N55\@Z + * @symbol ?_useDyeableComponent\@CauldronBlock\@\@AEBA_NAEAVItemStack\@\@AEAVPlayer\@\@AEBVBlockPos\@\@AEAVCauldronBlockActor\@\@AEAVBlockSource\@\@H_N55\@Z */ MCAPI bool _useDyeableComponent(class ItemStack &, class Player &, class BlockPos const &, class CauldronBlockActor &, class BlockSource &, int, bool, bool, bool) const; /** - * @symbol ?_useInventory\@CauldronBlock\@\@AEBAXAEAVPlayer\@\@AEAVItemStack\@\@1H\@Z + * @symbol ?_useInventory\@CauldronBlock\@\@AEBAXAEAVPlayer\@\@AEAVItemStack\@\@1H\@Z */ MCAPI void _useInventory(class Player &, class ItemStack &, class ItemStack &, int) const; private: /** - * @symbol ?BASE_WATER_PIXEL\@CauldronBlock\@\@0HB + * @symbol ?BASE_WATER_PIXEL\@CauldronBlock\@\@0HB */ MCAPI static int const BASE_WATER_PIXEL; /** - * @symbol ?CAULDRON_DOESNT_BREAK_FALLING_BLOCK_VERSION\@CauldronBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?CAULDRON_DOESNT_BREAK_FALLING_BLOCK_VERSION\@CauldronBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const CAULDRON_DOESNT_BREAK_FALLING_BLOCK_VERSION; /** - * @symbol ?PIXEL_PER_LEVEL\@CauldronBlock\@\@0HB + * @symbol ?PIXEL_PER_LEVEL\@CauldronBlock\@\@0HB */ MCAPI static int const PIXEL_PER_LEVEL; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp b/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp index 86cfa6cbec..b0ae89d3f4 100644 --- a/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CauldronBlockActor.hpp @@ -32,109 +32,109 @@ class CauldronBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAULDRONBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@CauldronBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@CauldronBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@CauldronBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@CauldronBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?getContainer\@CauldronBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@CauldronBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@CauldronBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@CauldronBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@CauldronBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@CauldronBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@CauldronBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@CauldronBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@CauldronBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@CauldronBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@CauldronBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@CauldronBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?load\@CauldronBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@CauldronBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onChanged\@CauldronBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onChanged\@CauldronBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onChanged(class BlockSource &); /** - * @symbol ?save\@CauldronBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@CauldronBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@CauldronBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@CauldronBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@CauldronBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@CauldronBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@CauldronBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@CauldronBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@CauldronBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@CauldronBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@CauldronBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@CauldronBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0CauldronBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0CauldronBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI CauldronBlockActor(class BlockPos const &); /** - * @symbol ?getColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ + * @symbol ?getColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getColor() const; /** - * @symbol ?getCustomColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ + * @symbol ?getCustomColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getCustomColor() const; /** - * @symbol ?getMixDyeColor\@CauldronBlockActor\@\@QEAA?AVColor\@mce\@\@XZ + * @symbol ?getMixDyeColor\@CauldronBlockActor\@\@QEAA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getMixDyeColor(); /** - * @symbol ?getPotionColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ + * @symbol ?getPotionColor\@CauldronBlockActor\@\@QEBA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getPotionColor() const; /** - * @symbol ?getPotionType\@CauldronBlockActor\@\@QEBA?AW4PotionType\@Potion\@\@XZ + * @symbol ?getPotionType\@CauldronBlockActor\@\@QEBA?AW4PotionType\@Potion\@\@XZ */ MCAPI enum class Potion::PotionType getPotionType() const; /** - * @symbol ?mixDyes\@CauldronBlockActor\@\@QEAAXXZ + * @symbol ?mixDyes\@CauldronBlockActor\@\@QEAAXXZ */ MCAPI void mixDyes(); /** - * @symbol ?setCustomColor\@CauldronBlockActor\@\@QEAAXAEBVColor\@mce\@\@\@Z + * @symbol ?setCustomColor\@CauldronBlockActor\@\@QEAAXAEBVColor\@mce\@\@\@Z */ MCAPI void setCustomColor(class mce::Color const &); /** - * @symbol ?setPotionType\@CauldronBlockActor\@\@QEAAXW4PotionType\@Potion\@\@\@Z + * @symbol ?setPotionType\@CauldronBlockActor\@\@QEAAXW4PotionType\@Potion\@\@\@Z */ MCAPI void setPotionType(enum class Potion::PotionType); /** - * @symbol ?WATER_COLOR\@CauldronBlockActor\@\@2VColor\@mce\@\@A + * @symbol ?WATER_COLOR\@CauldronBlockActor\@\@2VColor\@mce\@\@A */ MCAPI static class mce::Color WATER_COLOR; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CaveFeature.hpp b/LiteLoader/include/llapi/mc/CaveFeature.hpp index c3c44f1802..5401001233 100644 --- a/LiteLoader/include/llapi/mc/CaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/CaveFeature.hpp @@ -43,67 +43,73 @@ CachedMetaData(CachedMetaData const&&) = delete; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CaveFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@CaveFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@CaveFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @vftbl 2 - * @symbol ?isValidPlacement\@CaveFeature\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?isValidPlacement\@CaveFeature\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool isValidPlacement(std::string const &); /** - * @vftbl 3 - * @symbol ?addRoom\@CaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?addRoom\@CaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addRoom(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, class RenderParams &, struct CaveFeatureUtils::CarvingParameters const &, std::vector &) const; /** - * @vftbl 4 - * @symbol ?addTunnel\@CaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMMHHMAEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?addTunnel\@CaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMMHHMAEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addTunnel(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, float, float, float, int, int, float, class RenderParams &, struct CaveFeatureUtils::CarvingParameters const &, std::vector &) const; /** - * @vftbl 5 - * @symbol ?carveEllipsoidVolume\@CaveFeature\@\@MEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEBVBoundingBox\@\@MMAEBUCarvingParameters\@4\@\@Z + * @vftbl 5 + * @symbol ?carveEllipsoidVolume\@CaveFeature\@\@MEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEBVBoundingBox\@\@MMAEBUCarvingParameters\@4\@\@Z */ virtual bool carveEllipsoidVolume(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, class BoundingBox const &, float, float, struct CaveFeatureUtils::CarvingParameters const &) const; /** - * @vftbl 6 - * @symbol ?addFeature\@CaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBVChunkPos\@\@AEAVRandom\@\@1AEAVRenderParams\@\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 6 + * @symbol ?addFeature\@CaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBVChunkPos\@\@AEAVRandom\@\@1AEAVRenderParams\@\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addFeature(class IBlockWorldGenAPI &, class ChunkPos const &, class Random &, class ChunkPos const &, class RenderParams &, std::vector &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CAVEFEATURE /** - * @symbol ??0CaveFeature\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CaveFeature(); +#endif + /** + * @symbol ??0CaveFeature\@\@QEAA\@XZ */ MCAPI CaveFeature(); /** - * @symbol ?getWidthModifier\@CaveFeature\@\@QEBAMAEAVRenderParams\@\@\@Z + * @symbol ?getWidthModifier\@CaveFeature\@\@QEBAMAEAVRenderParams\@\@\@Z */ MCAPI float getWidthModifier(class RenderParams &) const; //protected: /** - * @symbol ?carveBlock\@CaveFeature\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@VBlockPos\@\@PEA_N_NAEBVVec3\@\@HV5\@\@Z + * @symbol ?carveBlock\@CaveFeature\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@VBlockPos\@\@PEA_N_NAEBVVec3\@\@HV5\@\@Z */ MCAPI bool carveBlock(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class BlockPos, bool *, bool, class Vec3 const &, int, class BlockPos) const; /** - * @symbol ?carveEllipsoid\@CaveFeature\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMAEBUCarvingParameters\@4\@\@Z + * @symbol ?carveEllipsoid\@CaveFeature\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMAEBUCarvingParameters\@4\@\@Z */ MCAPI bool carveEllipsoid(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, float, float, struct CaveFeatureUtils::CarvingParameters const &) const; /** - * @symbol ?detectWater\@CaveFeature\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?detectWater\@CaveFeature\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBoundingBox\@\@\@Z */ MCAPI bool detectWater(class IBlockWorldGenAPI &, class BoundingBox const &) const; /** - * @symbol ?shouldSkipCarving\@CaveFeature\@\@KA_NMMMMM\@Z + * @symbol ?shouldSkipCarving\@CaveFeature\@\@KA_NMMMMM\@Z */ MCAPI static bool shouldSkipCarving(float, float, float, float, float); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CaveFeatureUtils.hpp b/LiteLoader/include/llapi/mc/CaveFeatureUtils.hpp index 75dccd30ae..9b0fe35f42 100644 --- a/LiteLoader/include/llapi/mc/CaveFeatureUtils.hpp +++ b/LiteLoader/include/llapi/mc/CaveFeatureUtils.hpp @@ -32,35 +32,35 @@ struct CarvingParameters { #undef AFTER_EXTRA /** - * @symbol ?getCurrentConfiguration\@CaveFeatureUtils\@\@YAAEBUCarverConfiguration\@1\@_N\@Z + * @symbol ?getCurrentConfiguration\@CaveFeatureUtils\@\@YAAEBUCarverConfiguration\@1\@_N\@Z */ MCAPI struct CaveFeatureUtils::CarverConfiguration const & getCurrentConfiguration(bool); /** - * @symbol ?getDistance_1_16\@CaveFeatureUtils\@\@YAHAEAVRandom\@\@\@Z + * @symbol ?getDistance_1_16\@CaveFeatureUtils\@\@YAHAEAVRandom\@\@\@Z */ MCAPI int getDistance_1_16(class Random &); /** - * @symbol ?getDistance_1_18\@CaveFeatureUtils\@\@YAHAEAVRandom\@\@\@Z + * @symbol ?getDistance_1_18\@CaveFeatureUtils\@\@YAHAEAVRandom\@\@\@Z */ MCAPI int getDistance_1_18(class Random &); /** - * @symbol ?getTunnelThickness_1_16\@CaveFeatureUtils\@\@YAMAEAVRandom\@\@\@Z + * @symbol ?getTunnelThickness_1_16\@CaveFeatureUtils\@\@YAMAEAVRandom\@\@\@Z */ MCAPI float getTunnelThickness_1_16(class Random &); /** - * @symbol ?getTunnelThickness_1_18\@CaveFeatureUtils\@\@YAMAEAVRandom\@\@\@Z + * @symbol ?getTunnelThickness_1_18\@CaveFeatureUtils\@\@YAMAEAVRandom\@\@\@Z */ MCAPI float getTunnelThickness_1_18(class Random &); /** - * @symbol ?isDiggable_1_16\@CaveFeatureUtils\@\@YA_NAEBVBlock\@\@0\@Z + * @symbol ?isDiggable_1_16\@CaveFeatureUtils\@\@YA_NAEBVBlock\@\@0\@Z */ MCAPI bool isDiggable_1_16(class Block const &, class Block const &); /** - * @symbol ?isDiggable_1_18\@CaveFeatureUtils\@\@YA_NAEBVBlock\@\@0\@Z + * @symbol ?isDiggable_1_18\@CaveFeatureUtils\@\@YA_NAEBVBlock\@\@0\@Z */ MCAPI bool isDiggable_1_18(class Block const &, class Block const &); /** - * @symbol ?sampleFloatRange\@CaveFeatureUtils\@\@YAMAEBUFloatRange\@\@AEAVRandom\@\@\@Z + * @symbol ?sampleFloatRange\@CaveFeatureUtils\@\@YAMAEBUFloatRange\@\@AEAVRandom\@\@\@Z */ MCAPI float sampleFloatRange(struct FloatRange const &, class Random &); diff --git a/LiteLoader/include/llapi/mc/CaveSpider.hpp b/LiteLoader/include/llapi/mc/CaveSpider.hpp index a0581cfb32..066180da22 100644 --- a/LiteLoader/include/llapi/mc/CaveSpider.hpp +++ b/LiteLoader/include/llapi/mc/CaveSpider.hpp @@ -32,153 +32,148 @@ class CaveSpider : public Spider { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~CaveSpider(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 220 - * @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 + * @vftbl 219 + * @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 241 - * @symbol __unk_vfn_241 - */ - virtual void __unk_vfn_241(); - /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 357 - * @symbol ?getModelScale\@CaveSpider\@\@UEBAMXZ + * @vftbl 354 + * @symbol ?getModelScale\@CaveSpider\@\@UEBAMXZ */ virtual float getModelScale() const; /** - * @vftbl 358 - * @symbol ?getSpiderType\@CaveSpider\@\@UEBA?AW4Type\@Spider\@\@XZ + * @vftbl 355 + * @symbol ?getSpiderType\@CaveSpider\@\@UEBA?AW4Type\@Spider\@\@XZ */ virtual enum class Spider::Type getSpiderType() const; /** - * @symbol ??0CaveSpider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0CaveSpider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI CaveSpider(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp index 3cd2bc2a28..7426320c11 100644 --- a/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/CaveVinesBlock.hpp @@ -31,307 +31,308 @@ class CaveVinesBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CaveVinesBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?hasTag\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?hasTag\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@CaveVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CaveVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@CaveVinesBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@CaveVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 118 - * @symbol ?executeEvent\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @vftbl 118 + * @symbol ?executeEvent\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ virtual void executeEvent(class BlockSource &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@CaveVinesBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CaveVinesBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CaveVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CaveVinesBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CaveVinesBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CaveVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@CaveVinesBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0CaveVinesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CaveVinesVariant\@\@\@Z + * @symbol ??0CaveVinesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CaveVinesVariant\@\@\@Z */ MCAPI CaveVinesBlock(std::string const &, int, enum class CaveVinesVariant); /** - * @symbol ?tryGrow\@CaveVinesBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z + * @symbol ?tryGrow\@CaveVinesBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ MCAPI static void tryGrow(class BlockSource &, class BlockPos const &, float, float); //private: /** - * @symbol ?_isCaveVinesBlock\@CaveVinesBlock\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_isCaveVinesBlock\@CaveVinesBlock\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isCaveVinesBlock(class Block const &) const; /** - * @symbol ?_isCaveVinesHead\@CaveVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI bool _isCaveVinesHead(class BlockSource &, class BlockPos const &) const; - /** - * @symbol ?_pickBerries\@CaveVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_pickBerries\@CaveVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _pickBerries(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_updateBlockBasedOnNeighborBelow\@CaveVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_updateBlockBasedOnNeighborBelow\@CaveVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _updateBlockBasedOnNeighborBelow(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Cavifier.hpp b/LiteLoader/include/llapi/mc/Cavifier.hpp index 9f828002e6..c9dc2a6444 100644 --- a/LiteLoader/include/llapi/mc/Cavifier.hpp +++ b/LiteLoader/include/llapi/mc/Cavifier.hpp @@ -30,20 +30,20 @@ class Cavifier { public: /** - * @symbol ??0Cavifier\@\@QEAA\@AEBVCavifierNoises\@\@MM\@Z + * @symbol ??0Cavifier\@\@QEAA\@AEBVCavifierNoises\@\@MM\@Z */ MCAPI Cavifier(class CavifierNoises const &, float, float); /** - * @symbol ?cavify\@Cavifier\@\@QEBAMVVec3\@\@HM\@Z + * @symbol ?cavify\@Cavifier\@\@QEBAMVVec3\@\@HM\@Z */ MCAPI float cavify(class Vec3, int, float) const; //private: /** - * @symbol ?_getSpaghetti2d\@Cavifier\@\@AEBAMVVec3\@\@\@Z + * @symbol ?_getSpaghetti2d\@Cavifier\@\@AEBAMVVec3\@\@\@Z */ MCAPI float _getSpaghetti2d(class Vec3) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CavifierNoises.hpp b/LiteLoader/include/llapi/mc/CavifierNoises.hpp index da49b09505..4119ced539 100644 --- a/LiteLoader/include/llapi/mc/CavifierNoises.hpp +++ b/LiteLoader/include/llapi/mc/CavifierNoises.hpp @@ -29,24 +29,24 @@ class CavifierNoises { public: /** - * @symbol ??0CavifierNoises\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CavifierNoises\@\@QEAA\@AEBV0\@\@Z */ MCAPI CavifierNoises(class CavifierNoises const &); /** - * @symbol ??1CavifierNoises\@\@QEAA\@XZ + * @symbol ??1CavifierNoises\@\@QEAA\@XZ */ MCAPI ~CavifierNoises(); /** - * @symbol ?make\@CavifierNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ?make\@CavifierNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI static class CavifierNoises make(class XoroshiroPositionalRandomFactory const &); //private: /** - * @symbol ??0CavifierNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000000000000000\@Z + * @symbol ??0CavifierNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000000000000000\@Z */ MCAPI CavifierNoises(class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CelebrateHuntComponent.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntComponent.hpp index 41810a2679..2c63a2409c 100644 --- a/LiteLoader/include/llapi/mc/CelebrateHuntComponent.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntComponent.hpp @@ -30,32 +30,32 @@ class CelebrateHuntComponent { public: /** - * @symbol ?getCelebrateSound\@CelebrateHuntComponent\@\@QEBA?BW4LevelSoundEvent\@\@AEBVMob\@\@\@Z + * @symbol ?getCelebrateSound\@CelebrateHuntComponent\@\@QEBA?BW4LevelSoundEvent\@\@AEBVMob\@\@\@Z */ MCAPI enum class LevelSoundEvent const getCelebrateSound(class Mob const &) const; /** - * @symbol ?getCelebrateUntil\@CelebrateHuntComponent\@\@QEBA?BUTick\@\@XZ + * @symbol ?getCelebrateUntil\@CelebrateHuntComponent\@\@QEBA?BUTick\@\@XZ */ MCAPI struct Tick const getCelebrateUntil() const; /** - * @symbol ?getNextSoundEventTick\@CelebrateHuntComponent\@\@QEBA?BUTick\@\@XZ + * @symbol ?getNextSoundEventTick\@CelebrateHuntComponent\@\@QEBA?BUTick\@\@XZ */ MCAPI struct Tick const getNextSoundEventTick() const; /** - * @symbol ?isCelebrating\@CelebrateHuntComponent\@\@QEBA_NXZ + * @symbol ?isCelebrating\@CelebrateHuntComponent\@\@QEBA_NXZ */ MCAPI bool isCelebrating() const; /** - * @symbol ?setNextSoundEventTick\@CelebrateHuntComponent\@\@QEAAXAEBVMob\@\@\@Z + * @symbol ?setNextSoundEventTick\@CelebrateHuntComponent\@\@QEAAXAEBVMob\@\@\@Z */ MCAPI void setNextSoundEventTick(class Mob const &); /** - * @symbol ?startCelebrating\@CelebrateHuntComponent\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?startCelebrating\@CelebrateHuntComponent\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void startCelebrating(struct Tick const &); /** - * @symbol ?stopCelebrating\@CelebrateHuntComponent\@\@QEAAXXZ + * @symbol ?stopCelebrating\@CelebrateHuntComponent\@\@QEAAXXZ */ MCAPI void stopCelebrating(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp index ba636f2a15..d8589f659b 100644 --- a/LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntDefinition.hpp @@ -31,8 +31,8 @@ class CelebrateHuntDefinition { public: /** - * @symbol ?buildSchema\@CelebrateHuntDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCelebrateHuntDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@CelebrateHuntDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCelebrateHuntDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp index 59221b4bdb..c258754ef8 100644 --- a/LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntSystem.hpp @@ -30,19 +30,19 @@ class CelebrateHuntSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CelebrateHuntSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@CelebrateHuntSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@CelebrateHuntSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp b/LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp index ec3d665c69..74943aac03 100644 --- a/LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp +++ b/LiteLoader/include/llapi/mc/CelebrateHuntSystemInternal.hpp @@ -22,11 +22,11 @@ namespace CelebrateHuntSystemInternal { #undef AFTER_EXTRA /** - * @symbol ?_stopCelebrating\@CelebrateHuntSystemInternal\@\@YAXAEAVActor\@\@AEAVCelebrateHuntComponent\@\@\@Z + * @symbol ?_stopCelebrating\@CelebrateHuntSystemInternal\@\@YAXAEAVActor\@\@AEAVCelebrateHuntComponent\@\@\@Z */ MCAPI void _stopCelebrating(class Actor &, class CelebrateHuntComponent &); /** - * @symbol ?_tickCelebrateHuntComponent\@CelebrateHuntSystemInternal\@\@YAXAEAVActorOwnerComponent\@\@AEAVCelebrateHuntComponent\@\@\@Z + * @symbol ?_tickCelebrateHuntComponent\@CelebrateHuntSystemInternal\@\@YAXAEAVActorOwnerComponent\@\@AEAVCelebrateHuntComponent\@\@\@Z */ MCAPI void _tickCelebrateHuntComponent(class ActorOwnerComponent &, class CelebrateHuntComponent &); diff --git a/LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp b/LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp index 0fbe6663a6..f429595972 100644 --- a/LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp +++ b/LiteLoader/include/llapi/mc/CentralSpikedFeature.hpp @@ -31,18 +31,18 @@ class CentralSpikedFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CentralSpikedFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@CentralSpikedFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@CentralSpikedFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0CentralSpikedFeature\@\@QEAA\@AEBVBlock\@\@\@Z + * @symbol ??0CentralSpikedFeature\@\@QEAA\@AEBVBlock\@\@\@Z */ MCAPI CentralSpikedFeature(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp b/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp index baee8c0773..9e55f91500 100644 --- a/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp +++ b/LiteLoader/include/llapi/mc/CerealDocumentUpgradeStep.hpp @@ -25,37 +25,43 @@ class CerealDocumentUpgradeStep { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CEREALDOCUMENTUPGRADESTEP /** - * @symbol ??0CerealDocumentUpgradeStep\@\@QEAA\@AEBVSemVersion\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CerealDocumentUpgradeStep(); +#endif + /** + * @symbol ??0CerealDocumentUpgradeStep\@\@QEAA\@AEBVSemVersion\@\@\@Z */ MCAPI CerealDocumentUpgradeStep(class SemVersion const &); /** - * @symbol ??0CerealDocumentUpgradeStep\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CerealDocumentUpgradeStep\@\@QEAA\@AEBV0\@\@Z */ MCAPI CerealDocumentUpgradeStep(class CerealDocumentUpgradeStep const &); /** - * @symbol ?addUpgrade\@CerealDocumentUpgradeStep\@\@QEAAXV?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z + * @symbol ?addUpgrade\@CerealDocumentUpgradeStep\@\@QEAAXV?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z */ MCAPI void addUpgrade(class std::shared_ptr); /** - * @symbol ?apply\@CerealDocumentUpgradeStep\@\@QEAA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBVSemVersion\@\@\@Z + * @symbol ?apply\@CerealDocumentUpgradeStep\@\@QEAA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool apply(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &, class SemVersion const &); /** - * @symbol ?canUpgrade\@CerealDocumentUpgradeStep\@\@QEBA_NAEBVSemVersion\@\@\@Z + * @symbol ?canUpgrade\@CerealDocumentUpgradeStep\@\@QEBA_NAEBVSemVersion\@\@\@Z */ MCAPI bool canUpgrade(class SemVersion const &) const; /** - * @symbol ?getTargetVersion\@CerealDocumentUpgradeStep\@\@QEBAAEBVSemVersion\@\@XZ + * @symbol ?getTargetVersion\@CerealDocumentUpgradeStep\@\@QEBAAEBVSemVersion\@\@XZ */ MCAPI class SemVersion const & getTargetVersion() const; /** - * @symbol ??4CerealDocumentUpgradeStep\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4CerealDocumentUpgradeStep\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class CerealDocumentUpgradeStep & operator=(class CerealDocumentUpgradeStep const &); /** - * @symbol ?setSchema\@CerealDocumentUpgradeStep\@\@QEAAXAEBUSchema\@reflection\@\@\@Z + * @symbol ?setSchema\@CerealDocumentUpgradeStep\@\@QEAAXAEBUSchema\@reflection\@\@\@Z */ MCAPI void setSchema(struct reflection::Schema const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp b/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp index 85fe1fc771..b9f5fff9eb 100644 --- a/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp +++ b/LiteLoader/include/llapi/mc/CerealDocumentUpgrader.hpp @@ -29,32 +29,32 @@ class CerealDocumentUpgrader { public: /** - * @symbol ??0CerealDocumentUpgrader\@\@QEAA\@AEBUSchema\@reflection\@\@\@Z + * @symbol ??0CerealDocumentUpgrader\@\@QEAA\@AEBUSchema\@reflection\@\@\@Z */ MCAPI CerealDocumentUpgrader(struct reflection::Schema const &); /** - * @symbol ?buildPatchSchemas\@CerealDocumentUpgrader\@\@QEAAXAEBV?$function\@$$A6A?BUSchema\@reflection\@\@AEBVSemVersion\@\@\@Z\@std\@\@\@Z + * @symbol ?buildPatchSchemas\@CerealDocumentUpgrader\@\@QEAAXAEBV?$function\@$$A6A?BUSchema\@reflection\@\@AEBVSemVersion\@\@\@Z\@std\@\@\@Z */ MCAPI void buildPatchSchemas(class std::function const &); /** - * @symbol ?clear\@CerealDocumentUpgrader\@\@QEAAXXZ + * @symbol ?clear\@CerealDocumentUpgrader\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?registerUpgrade\@CerealDocumentUpgrader\@\@QEAAXV?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z + * @symbol ?registerUpgrade\@CerealDocumentUpgrader\@\@QEAAXV?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z */ MCAPI void registerUpgrade(class std::shared_ptr); /** - * @symbol ?upgradeJson\@CerealDocumentUpgrader\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@V?$function\@$$A6A_NAEBVSemVersion\@\@\@Z\@3\@\@Z + * @symbol ?upgradeJson\@CerealDocumentUpgrader\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@V?$function\@$$A6A_NAEBVSemVersion\@\@\@Z\@3\@\@Z */ MCAPI bool upgradeJson(std::string &, class Core::Path const &, class std::optional, class std::function); //private: /** - * @symbol ?_getVersion\@CerealDocumentUpgrader\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@\@Z + * @symbol ?_getVersion\@CerealDocumentUpgrader\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@\@Z */ MCAPI std::string _getVersion(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CerealHelpers.hpp b/LiteLoader/include/llapi/mc/CerealHelpers.hpp index 738ff81a0a..85e11bba1e 100644 --- a/LiteLoader/include/llapi/mc/CerealHelpers.hpp +++ b/LiteLoader/include/llapi/mc/CerealHelpers.hpp @@ -22,107 +22,99 @@ namespace CerealHelpers { #undef AFTER_EXTRA /** - * @symbol ?bindBrightness\@CerealHelpers\@\@YAXXZ + * @symbol ?bindBrightness\@CerealHelpers\@\@YAXXZ */ MCAPI void bindBrightness(); /** - * @symbol ?bindColor\@CerealHelpers\@\@YAXXZ + * @symbol ?bindColor\@CerealHelpers\@\@YAXXZ */ MCAPI void bindColor(); /** - * @symbol ?bindHelpers\@CerealHelpers\@\@YAXXZ + * @symbol ?bindHelpers\@CerealHelpers\@\@YAXXZ */ MCAPI void bindHelpers(); /** - * @symbol ?bindIdentifierString\@CerealHelpers\@\@YAXXZ + * @symbol ?bindIdentifierString\@CerealHelpers\@\@YAXXZ */ MCAPI void bindIdentifierString(); /** - * @symbol ?bindIntRange\@CerealHelpers\@\@YAXXZ + * @symbol ?bindIntRange\@CerealHelpers\@\@YAXXZ */ MCAPI void bindIntRange(); /** - * @symbol ?bindLocIdString\@CerealHelpers\@\@YAXXZ - */ - MCAPI void bindLocIdString(); - /** - * @symbol ?bindMceUUID\@CerealHelpers\@\@YAXXZ + * @symbol ?bindMceUUID\@CerealHelpers\@\@YAXXZ */ MCAPI void bindMceUUID(); /** - * @symbol ?bindResourcePath\@CerealHelpers\@\@YAXXZ - */ - MCAPI void bindResourcePath(); - /** - * @symbol ?bindVec2\@CerealHelpers\@\@YAXXZ + * @symbol ?bindVec2\@CerealHelpers\@\@YAXXZ */ MCAPI void bindVec2(); /** - * @symbol ?bindVec3\@CerealHelpers\@\@YAXXZ + * @symbol ?bindVec3\@CerealHelpers\@\@YAXXZ */ MCAPI void bindVec3(); /** - * @symbol ?blockPosAsArray\@CerealHelpers\@\@YA?AV?$array\@H$02\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?blockPosAsArray\@CerealHelpers\@\@YA?AV?$array\@H$02\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::array blockPosAsArray(class BlockPos const &); /** - * @symbol ?blockPosFromArray\@CerealHelpers\@\@YAXAEAVBlockPos\@\@AEBV?$array\@H$02\@std\@\@\@Z + * @symbol ?blockPosFromArray\@CerealHelpers\@\@YAXAEAVBlockPos\@\@AEBV?$array\@H$02\@std\@\@\@Z */ MCAPI void blockPosFromArray(class BlockPos &, class std::array const &); /** - * @symbol ?colorFromFloatArray3\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@M$02\@std\@\@\@Z + * @symbol ?colorFromFloatArray3\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@M$02\@std\@\@\@Z */ MCAPI void colorFromFloatArray3(class mce::Color &, class std::array const &); /** - * @symbol ?colorFromFloatArray4\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@M$03\@std\@\@\@Z + * @symbol ?colorFromFloatArray4\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@M$03\@std\@\@\@Z */ MCAPI void colorFromFloatArray4(class mce::Color &, class std::array const &); /** - * @symbol ?colorFromHexString\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?colorFromHexString\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void colorFromHexString(class mce::Color &, std::string const &); /** - * @symbol ?colorFromIntArray3\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@H$02\@std\@\@\@Z + * @symbol ?colorFromIntArray3\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@H$02\@std\@\@\@Z */ MCAPI void colorFromIntArray3(class mce::Color &, class std::array const &); /** - * @symbol ?colorFromIntArray4\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@H$03\@std\@\@\@Z + * @symbol ?colorFromIntArray4\@CerealHelpers\@\@YAXAEAVColor\@mce\@\@AEBV?$array\@H$03\@std\@\@\@Z */ MCAPI void colorFromIntArray4(class mce::Color &, class std::array const &); /** - * @symbol ?colorToFloatArray3\@CerealHelpers\@\@YA?AV?$array\@M$02\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?colorToFloatArray3\@CerealHelpers\@\@YA?AV?$array\@M$02\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI class std::array colorToFloatArray3(class mce::Color const &); /** - * @symbol ?colorToFloatArray4\@CerealHelpers\@\@YA?AV?$array\@M$03\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?colorToFloatArray4\@CerealHelpers\@\@YA?AV?$array\@M$03\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI class std::array colorToFloatArray4(class mce::Color const &); /** - * @symbol ?colorToIntArray3\@CerealHelpers\@\@YA?AV?$array\@H$02\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?colorToIntArray3\@CerealHelpers\@\@YA?AV?$array\@H$02\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI class std::array colorToIntArray3(class mce::Color const &); /** - * @symbol ?colorToIntArray4\@CerealHelpers\@\@YA?AV?$array\@H$03\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?colorToIntArray4\@CerealHelpers\@\@YA?AV?$array\@H$03\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI class std::array colorToIntArray4(class mce::Color const &); /** - * @symbol ?hashedStringFromString\@CerealHelpers\@\@YAXAEAVHashedString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?hashedStringFromString\@CerealHelpers\@\@YAXAEAVHashedString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void hashedStringFromString(class HashedString &, std::string const &); /** - * @symbol ?identifierStringFromString\@CerealHelpers\@\@YAXAEAUIdentifierString\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 ?vec2FromArray\@CerealHelpers\@\@YAXAEAU?$vec\@$01M$0A\@\@glm\@\@V?$array\@M$01\@std\@\@\@Z + * @symbol ?vec2FromArray\@CerealHelpers\@\@YAXAEAU?$vec\@$01M$0A\@\@glm\@\@V?$array\@M$01\@std\@\@\@Z */ MCAPI void vec2FromArray(struct glm::vec<2, float, 0> &, class std::array); /** - * @symbol ?vec3AsArray\@CerealHelpers\@\@YA?AV?$array\@M$02\@std\@\@AEBVVec3\@\@\@Z + * @symbol ?vec3AsArray\@CerealHelpers\@\@YA?AV?$array\@M$02\@std\@\@AEBVVec3\@\@\@Z */ MCAPI class std::array vec3AsArray(class Vec3 const &); /** - * @symbol ?vec3FromArray\@CerealHelpers\@\@YAXAEAVVec3\@\@V?$array\@M$02\@std\@\@\@Z + * @symbol ?vec3FromArray\@CerealHelpers\@\@YAXAEAVVec3\@\@V?$array\@M$02\@std\@\@\@Z */ MCAPI void vec3FromArray(class Vec3 &, class std::array); diff --git a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp index 1802087290..61f22099a7 100644 --- a/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/CerealItemComponentFactory.hpp @@ -36,31 +36,31 @@ struct Constructor { public: /** - * @symbol ?addAllComponentUpgrades\@CerealItemComponentFactory\@\@SAXAEAVCerealDocumentUpgrader\@\@\@Z + * @symbol ?addAllComponentUpgrades\@CerealItemComponentFactory\@\@SAXAEAVCerealDocumentUpgrader\@\@\@Z */ MCAPI static void addAllComponentUpgrades(class CerealDocumentUpgrader &); /** - * @symbol ?bindAllComponentSchemas\@CerealItemComponentFactory\@\@SAXAEAVSchemaFactory\@reflection\@\@AEBVSemVersion\@\@\@Z + * @symbol ?bindAllComponentSchemas\@CerealItemComponentFactory\@\@SAXAEAVSchemaFactory\@reflection\@\@AEBVSemVersion\@\@\@Z */ MCAPI static void bindAllComponentSchemas(class reflection::SchemaFactory &, class SemVersion const &); /** - * @symbol ?constructItemComponent\@CerealItemComponentFactory\@\@SA?AV?$shared_ptr\@VItemComponent\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?constructItemComponent\@CerealItemComponentFactory\@\@SA?AV?$shared_ptr\@VItemComponent\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static class std::shared_ptr constructItemComponent(std::string const &); /** - * @symbol ?getItemContext\@CerealItemComponentFactory\@\@SAPEAVComponentItem\@\@XZ + * @symbol ?getItemContext\@CerealItemComponentFactory\@\@SAPEAVComponentItem\@\@XZ */ MCAPI static class ComponentItem * getItemContext(); /** - * @symbol ?isRegisteredComponent\@CerealItemComponentFactory\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isRegisteredComponent\@CerealItemComponentFactory\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isRegisteredComponent(std::string const &); /** - * @symbol ?resetItemContext\@CerealItemComponentFactory\@\@SAXXZ + * @symbol ?resetItemContext\@CerealItemComponentFactory\@\@SAXXZ */ MCAPI static void resetItemContext(); /** - * @symbol ?setItemContext\@CerealItemComponentFactory\@\@SAXPEAVComponentItem\@\@\@Z + * @symbol ?setItemContext\@CerealItemComponentFactory\@\@SAXPEAVComponentItem\@\@\@Z */ MCAPI static void setItemContext(class ComponentItem *); @@ -68,12 +68,12 @@ struct Constructor { private: /** - * @symbol ?mItemContext\@CerealItemComponentFactory\@\@0PEAVComponentItem\@\@EA + * @symbol ?mItemContext\@CerealItemComponentFactory\@\@0PEAVComponentItem\@\@EA */ MCAPI static class ComponentItem * mItemContext; /** - * @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 + * @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; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp b/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp index 45276b0fa8..57d542ae1a 100644 --- a/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp +++ b/LiteLoader/include/llapi/mc/CerealSchemaUpgrade.hpp @@ -28,35 +28,41 @@ class CerealSchemaUpgrade { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CerealSchemaUpgrade(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual void __unk_vfn_1() = 0; + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?upgradeToNext\@CerealSchemaUpgrade\@\@UEBA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@\@Z + * @vftbl 2 + * @symbol ?upgradeToNext\@CerealSchemaUpgrade\@\@UEBA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@\@Z */ virtual bool upgradeToNext(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CEREALSCHEMAUPGRADE /** - * @symbol ??0CerealSchemaUpgrade\@\@QEAA\@VSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CerealSchemaUpgrade(); +#endif + /** + * @symbol ??0CerealSchemaUpgrade\@\@QEAA\@VSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI CerealSchemaUpgrade(class SemVersion, std::string const &, std::string const &); /** - * @symbol ?bindLegacySchema\@CerealSchemaUpgrade\@\@QEAAXAEAVSchemaFactory\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?bindLegacySchema\@CerealSchemaUpgrade\@\@QEAAXAEAVSchemaFactory\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void bindLegacySchema(class reflection::SchemaFactory &, std::string const &); /** - * @symbol ?getTargetVersion\@CerealSchemaUpgrade\@\@QEBAAEBVSemVersion\@\@XZ + * @symbol ?getTargetVersion\@CerealSchemaUpgrade\@\@QEBAAEBVSemVersion\@\@XZ */ MCAPI class SemVersion const & getTargetVersion() const; /** - * @symbol ?registerLegacySchema\@CerealSchemaUpgrade\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?registerLegacySchema\@CerealSchemaUpgrade\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void registerLegacySchema(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CerealSchemaUpgradeSet.hpp b/LiteLoader/include/llapi/mc/CerealSchemaUpgradeSet.hpp index 6b2f23846f..6f5deb334a 100644 --- a/LiteLoader/include/llapi/mc/CerealSchemaUpgradeSet.hpp +++ b/LiteLoader/include/llapi/mc/CerealSchemaUpgradeSet.hpp @@ -28,16 +28,16 @@ class CerealSchemaUpgradeSet { public: /** - * @symbol ?findNext\@CerealSchemaUpgradeSet\@\@QEBA?AU?$pair\@V?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@VSemVersion\@\@\@std\@\@AEBVSemVersion\@\@\@Z + * @symbol ?findNext\@CerealSchemaUpgradeSet\@\@QEBA?AU?$pair\@V?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@VSemVersion\@\@\@std\@\@AEBVSemVersion\@\@\@Z */ MCAPI struct std::pair, class SemVersion> findNext(class SemVersion const &) const; /** - * @symbol ?forEach\@CerealSchemaUpgradeSet\@\@QEAA_NV?$function\@$$A6A_NV?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?forEach\@CerealSchemaUpgradeSet\@\@QEAA_NV?$function\@$$A6A_NV?$shared_ptr\@VCerealSchemaUpgrade\@\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI bool forEach(class std::function)>); /** - * @symbol ??1CerealSchemaUpgradeSet\@\@QEAA\@XZ + * @symbol ??1CerealSchemaUpgradeSet\@\@QEAA\@XZ */ MCAPI ~CerealSchemaUpgradeSet(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Certificate.hpp b/LiteLoader/include/llapi/mc/Certificate.hpp index b48e5f8f6b..63847948aa 100644 --- a/LiteLoader/include/llapi/mc/Certificate.hpp +++ b/LiteLoader/include/llapi/mc/Certificate.hpp @@ -34,56 +34,56 @@ class Certificate { public: /** - * @symbol ??0Certificate\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0Certificate\@\@QEAA\@AEBV0\@\@Z */ MCAPI Certificate(class Certificate const &); /** - * @symbol ?getExpirationDate\@Certificate\@\@QEBA_JXZ + * @symbol ?getExpirationDate\@Certificate\@\@QEBA_JXZ */ MCAPI __int64 getExpirationDate() const; /** - * @symbol ?getExtraData\@Certificate\@\@QEBA?AVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getExtraData\@Certificate\@\@QEBA?AVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI class Json::Value getExtraData(std::string const &, class Json::Value const &) const; /** - * @symbol ?getIdentityPublicKey\@Certificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getIdentityPublicKey\@Certificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getIdentityPublicKey() const; /** - * @symbol ?getNotBeforeDate\@Certificate\@\@QEBA_JXZ + * @symbol ?getNotBeforeDate\@Certificate\@\@QEBA_JXZ */ MCAPI __int64 getNotBeforeDate() const; /** - * @symbol ?isValid\@Certificate\@\@QEBA_NXZ + * @symbol ?isValid\@Certificate\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?toString\@Certificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@Certificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; /** - * @symbol ?validate\@Certificate\@\@QEAA_N_J\@Z + * @symbol ?validate\@Certificate\@\@QEAA_N_J\@Z */ MCAPI bool validate(__int64); /** - * @symbol ??1Certificate\@\@QEAA\@XZ + * @symbol ??1Certificate\@\@QEAA\@XZ */ MCAPI ~Certificate(); /** - * @symbol ?createWrappedCertificate\@Certificate\@\@SA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@AEAVPrivateKeyManager\@\@_J1AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@_NPEBVValue\@Json\@\@V23\@\@Z + * @symbol ?createWrappedCertificate\@Certificate\@\@SA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@AEAVPrivateKeyManager\@\@_J1AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@_NPEBVValue\@Json\@\@V23\@\@Z */ MCAPI static std::unique_ptr createWrappedCertificate(class PrivateKeyManager &, __int64, __int64, std::string const &, bool, class Json::Value const *, std::unique_ptr); //private: /** - * @symbol ??0Certificate\@\@AEAA\@AEBVUnverifiedCertificate\@\@V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0Certificate\@\@AEAA\@AEBVUnverifiedCertificate\@\@V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@\@Z */ MCAPI Certificate(class UnverifiedCertificate const &, std::unique_ptr); /** - * @symbol ?createWebToken\@Certificate\@\@CA?AV?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEAVPrivateKeyManager\@\@_J1AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@_NPEBVValue\@Json\@\@\@Z + * @symbol ?createWebToken\@Certificate\@\@CA?AV?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEAVPrivateKeyManager\@\@_J1AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@_NPEBVValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr createWebToken(class PrivateKeyManager &, __int64, __int64, std::string const &, bool, class Json::Value const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChainBlock.hpp b/LiteLoader/include/llapi/mc/ChainBlock.hpp index 72c4548423..dce979c5f8 100644 --- a/LiteLoader/include/llapi/mc/ChainBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChainBlock.hpp @@ -31,228 +31,233 @@ class ChainBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChainBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@ChainBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@ChainBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@ChainBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@ChainBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ChainBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ChainBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@ChainBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@ChainBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0ChainBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0ChainBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI ChainBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp index 031a56fb21..4326e78a1e 100644 --- a/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChalkboardBlockActor.hpp @@ -31,140 +31,140 @@ class ChalkboardBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChalkboardBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ChalkboardBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ChalkboardBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@ChalkboardBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@ChalkboardBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@ChalkboardBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@ChalkboardBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@ChalkboardBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@ChalkboardBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 28 - * @symbol ?getImmersiveReaderText\@ChalkboardBlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 28 + * @symbol ?getImmersiveReaderText\@ChalkboardBlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::string getImmersiveReaderText(class BlockSource &); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@ChalkboardBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@ChalkboardBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@ChalkboardBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0ChalkboardBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0ChalkboardBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI ChalkboardBlockActor(class BlockPos const &); /** - * @symbol ?getChalkboardSize\@ChalkboardBlockActor\@\@QEBA?BW4ChalkboardSize\@\@XZ + * @symbol ?getChalkboardSize\@ChalkboardBlockActor\@\@QEBA?BW4ChalkboardSize\@\@XZ */ MCAPI enum class ChalkboardSize const getChalkboardSize() const; /** - * @symbol ?getLocked\@ChalkboardBlockActor\@\@QEBA_NXZ + * @symbol ?getLocked\@ChalkboardBlockActor\@\@QEBA_NXZ */ MCAPI bool getLocked() const; /** - * @symbol ?getRotation\@ChalkboardBlockActor\@\@QEBAHAEAVBlockSource\@\@\@Z + * @symbol ?getRotation\@ChalkboardBlockActor\@\@QEBAHAEAVBlockSource\@\@\@Z */ MCAPI int getRotation(class BlockSource &) const; /** - * @symbol ?getText\@ChalkboardBlockActor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getText\@ChalkboardBlockActor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getText() const; /** - * @symbol ?getTextCharCount\@ChalkboardBlockActor\@\@QEBAHXZ + * @symbol ?getTextCharCount\@ChalkboardBlockActor\@\@QEBAHXZ */ MCAPI int getTextCharCount() const; /** - * @symbol ?setText\@ChalkboardBlockActor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setText\@ChalkboardBlockActor\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setText(std::string const &); /** - * @symbol ?validate\@ChalkboardBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?validate\@ChalkboardBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void validate(class BlockSource &); /** - * @symbol ?calculateAllBlocks\@ChalkboardBlockActor\@\@SA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@W4ChalkboardSize\@\@H\@Z + * @symbol ?calculateAllBlocks\@ChalkboardBlockActor\@\@SA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@W4ChalkboardSize\@\@H\@Z */ MCAPI static std::vector calculateAllBlocks(class BlockPos const &, enum class ChalkboardSize, int); /** - * @symbol ?canCreateChalkboard\@ChalkboardBlockActor\@\@SA_NPEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@W4ChalkboardSize\@\@EHAEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@_N\@Z + * @symbol ?canCreateChalkboard\@ChalkboardBlockActor\@\@SA_NPEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@W4ChalkboardSize\@\@EHAEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@_N\@Z */ MCAPI static bool canCreateChalkboard(class Actor *, class BlockSource &, class BlockPos const &, enum class ChalkboardSize, unsigned char, int, std::vector &, class ItemStack const &, bool); /** - * @symbol ?convertFromEntity\@ChalkboardBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?convertFromEntity\@ChalkboardBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static class ChalkboardBlockActor * convertFromEntity(class BlockSource &, class CompoundTag const &); /** - * @symbol ?createChalkboard\@ChalkboardBlockActor\@\@SAPEAV1\@PEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@W4ChalkboardSize\@\@EH_NAEBVItemStack\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createChalkboard\@ChalkboardBlockActor\@\@SAPEAV1\@PEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@W4ChalkboardSize\@\@EH_NAEBVItemStack\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class ChalkboardBlockActor * createChalkboard(class Actor *, class BlockSource &, class BlockPos const &, enum class ChalkboardSize, unsigned char, int, bool, class ItemStack const &, std::string); //private: /** - * @symbol ?_findChalkboard\@ChalkboardBlockActor\@\@CA?AUChalkboardFinder\@1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_findChalkboard\@ChalkboardBlockActor\@\@CA?AUChalkboardFinder\@1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static struct ChalkboardBlockActor::ChalkboardFinder _findChalkboard(class BlockSource &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChanceInformation.hpp b/LiteLoader/include/llapi/mc/ChanceInformation.hpp index 6adcbc96fa..044c8db902 100644 --- a/LiteLoader/include/llapi/mc/ChanceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ChanceInformation.hpp @@ -30,20 +30,20 @@ class ChanceInformation { public: /** - * @symbol ?isValid\@ChanceInformation\@\@QEBA_NXZ + * @symbol ?isValid\@ChanceInformation\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?roll\@ChanceInformation\@\@QEBA_NAEAVRandom\@\@\@Z + * @symbol ?roll\@ChanceInformation\@\@QEBA_NAEAVRandom\@\@\@Z */ MCAPI bool roll(class Random &) const; /** - * @symbol ?set\@ChanceInformation\@\@QEAAXII\@Z + * @symbol ?set\@ChanceInformation\@\@QEAAXM\@Z */ - MCAPI void set(unsigned int, unsigned int); + MCAPI void set(float); /** - * @symbol ?set\@ChanceInformation\@\@QEAAXM\@Z + * @symbol ?set\@ChanceInformation\@\@QEAAXII\@Z */ - MCAPI void set(float); + MCAPI void set(unsigned int, unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp index cd68358c15..4f90013c00 100644 --- a/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeDimensionPacket.hpp @@ -9,6 +9,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "Vec3.hpp" #undef BEFORE_EXTRA @@ -38,37 +39,43 @@ class ChangeDimensionPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChangeDimensionPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ChangeDimensionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ChangeDimensionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ChangeDimensionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ChangeDimensionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ChangeDimensionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ChangeDimensionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ChangeDimensionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHANGEDIMENSIONPACKET /** - * @symbol ??0ChangeDimensionPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ChangeDimensionPacket(); +#endif + /** + * @symbol ??0ChangeDimensionPacket\@\@QEAA\@XZ */ MCAPI ChangeDimensionPacket(); /** - * @symbol ??0ChangeDimensionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@VVec3\@\@_N\@Z + * @symbol ??0ChangeDimensionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@VVec3\@\@_N\@Z */ MCAPI ChangeDimensionPacket(class AutomaticID, class Vec3, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp index 6b0d540492..aba7092467 100644 --- a/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChangeMobPropertyPacket.hpp @@ -35,33 +35,33 @@ class ChangeMobPropertyPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChangeMobPropertyPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ChangeMobPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ChangeMobPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ChangeMobPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ChangeMobPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ChangeMobPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ChangeMobPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ChangeMobPropertyPacket\@\@QEAA\@XZ + * @symbol ??0ChangeMobPropertyPacket\@\@QEAA\@XZ */ MCAPI ChangeMobPropertyPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp index 5a6d6ab6be..e9e4e4d685 100644 --- a/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp +++ b/LiteLoader/include/llapi/mc/ChangeSettingCommand.hpp @@ -31,18 +31,18 @@ class ChangeSettingCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChangeSettingCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ChangeSettingCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ChangeSettingCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ChangeSettingCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ChangeSettingCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChannelTransform.hpp b/LiteLoader/include/llapi/mc/ChannelTransform.hpp index 1047e3c851..79d9ba842c 100644 --- a/LiteLoader/include/llapi/mc/ChannelTransform.hpp +++ b/LiteLoader/include/llapi/mc/ChannelTransform.hpp @@ -30,8 +30,8 @@ class ChannelTransform { public: /** - * @symbol ?getDataValues\@ChannelTransform\@\@QEBA_NAEAVVec3\@\@0\@Z + * @symbol ?getDataValues\@ChannelTransform\@\@QEBA_NAEAVVec3\@\@0\@Z */ MCAPI bool getDataValues(class Vec3 &, class Vec3 &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp b/LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp index f239f7bf56..06b4ae7fa4 100644 --- a/LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ChargeAttackDefinition.hpp @@ -30,16 +30,16 @@ class ChargeAttackDefinition { public: /** - * @symbol ??0ChargeAttackDefinition\@\@QEAA\@XZ + * @symbol ??0ChargeAttackDefinition\@\@QEAA\@XZ */ MCAPI ChargeAttackDefinition(); /** - * @symbol ?initialize\@ChargeAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVChargeAttackGoal\@\@\@Z + * @symbol ?initialize\@ChargeAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVChargeAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ChargeAttackGoal &) const; /** - * @symbol ?buildSchema\@ChargeAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VChargeAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@ChargeAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VChargeAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp b/LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp index 487f7f41f8..604cce48f7 100644 --- a/LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/ChargeAttackGoal.hpp @@ -30,48 +30,48 @@ class ChargeAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChargeAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ChargeAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ChargeAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@ChargeAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@ChargeAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ChargeAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ChargeAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ChargeAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ChargeAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ChargeAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ChargeAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ChargeAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ChargeAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ChargeAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0ChargeAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI ChargeAttackGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp b/LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp index 4ea711128e..b2d2d79f49 100644 --- a/LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ChargeHeldItemDefinition.hpp @@ -31,12 +31,12 @@ class ChargeHeldItemDefinition { public: /** - * @symbol ?initialize\@ChargeHeldItemDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVChargeHeldItemGoal\@\@\@Z + * @symbol ?initialize\@ChargeHeldItemDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVChargeHeldItemGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ChargeHeldItemGoal &) const; /** - * @symbol ?buildSchema\@ChargeHeldItemDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VChargeHeldItemDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@ChargeHeldItemDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VChargeHeldItemDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp b/LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp index ee5e0f34f1..d5db2378c2 100644 --- a/LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/ChargeHeldItemGoal.hpp @@ -30,48 +30,48 @@ class ChargeHeldItemGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChargeHeldItemGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ChargeHeldItemGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ChargeHeldItemGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@ChargeHeldItemGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@ChargeHeldItemGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ChargeHeldItemGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ChargeHeldItemGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ChargeHeldItemGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ChargeHeldItemGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ChargeHeldItemGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ChargeHeldItemGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ChargeHeldItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ChargeHeldItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ChargeHeldItemGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0ChargeHeldItemGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI ChargeHeldItemGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp b/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp index 864640d80a..d601007eaa 100644 --- a/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ChargeableItemComponent.hpp @@ -28,59 +28,59 @@ class ChargeableItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChargeableItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@ChargeableItemComponent\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@ChargeableItemComponent\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@ChargeableItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@ChargeableItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getMovementModifier\@ChargeableItemComponent\@\@QEBAMXZ + * @symbol ?getMovementModifier\@ChargeableItemComponent\@\@QEBAMXZ */ MCAPI float getMovementModifier() const; /** - * @symbol ?use\@ChargeableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?use\@ChargeableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool use(class ItemStack &, class Player &) const; /** - * @symbol ?useTimeDepleted\@ChargeableItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z + * @symbol ?useTimeDepleted\@ChargeableItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z */ MCAPI void useTimeDepleted(class ItemStack &, class Player &, class Level &) const; /** - * @symbol ?bindType\@ChargeableItemComponent\@\@SAXXZ + * @symbol ?bindType\@ChargeableItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@ChargeableItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@ChargeableItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChatEvent.hpp b/LiteLoader/include/llapi/mc/ChatEvent.hpp index ff58c77831..2439c2f49b 100644 --- a/LiteLoader/include/llapi/mc/ChatEvent.hpp +++ b/LiteLoader/include/llapi/mc/ChatEvent.hpp @@ -27,11 +27,11 @@ struct ChatEvent { public: /** - * @symbol ??0ChatEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ChatEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ChatEvent(struct ChatEvent const &); /** - * @symbol ??1ChatEvent\@\@QEAA\@XZ + * @symbol ??1ChatEvent\@\@QEAA\@XZ */ MCAPI ~ChatEvent(); diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp index ee405ea514..c8720cf15e 100644 --- a/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/CheckFallDamageInMoveSystem.hpp @@ -28,8 +28,8 @@ class CheckFallDamageInMoveSystem { public: /** - * @symbol ?createSystem\@CheckFallDamageInMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@CheckFallDamageInMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp b/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp index 7f82f94204..d50bebb5aa 100644 --- a/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp +++ b/LiteLoader/include/llapi/mc/CheckFallDamageSystem.hpp @@ -28,12 +28,12 @@ class CheckFallDamageSystem { public: /** - * @symbol ?_checkFallDamage\@CheckFallDamageSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUCheckFallDamageRequestComponent\@\@\@Z + * @symbol ?_checkFallDamage\@CheckFallDamageSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUCheckFallDamageRequestComponent\@\@\@Z */ MCAPI static void _checkFallDamage(class StrictEntityContext &, class ActorOwnerComponent &, struct CheckFallDamageRequestComponent &); /** - * @symbol ?createSystem\@CheckFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@CheckFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp index 0c4e5b5026..09a8893d15 100644 --- a/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemicalHeatBlock.hpp @@ -31,221 +31,226 @@ class ChemicalHeatBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChemicalHeatBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@ChemicalHeatBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@ChemicalHeatBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ChemicalHeatBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 181 - * @symbol ?getExtraRenderLayers\@ChemicalHeatBlock\@\@UEBAHXZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 182 + * @symbol ?getExtraRenderLayers\@ChemicalHeatBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0ChemicalHeatBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ChemicalHeatBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ChemicalHeatBlock(std::string const &, int); //private: /** - * @symbol ?_queueTick\@ChemicalHeatBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_queueTick\@ChemicalHeatBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void _queueTick(class BlockSource &, class BlockPos const &, class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp index fcba44ba1a..73107f77c9 100644 --- a/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryAuxDataBlockItem.hpp @@ -32,79 +32,79 @@ class ChemistryAuxDataBlockItem : public AuxDataBlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChemistryAuxDataBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 105 - * @symbol ?fixupCommon\@ChemistryAuxDataBlockItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 105 + * @symbol ?fixupCommon\@ChemistryAuxDataBlockItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp b/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp index 3b526cc5f4..86314b6e51 100644 --- a/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryIngredient.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ChemistryIngredient. - * - */ -struct ChemistryIngredient { + +class ChemistryIngredient { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CHEMISTRYINGREDIENT public: - struct ChemistryIngredient& operator=(struct ChemistryIngredient const &) = delete; - ChemistryIngredient(struct ChemistryIngredient const &) = delete; + class ChemistryIngredient& operator=(class ChemistryIngredient const &) = delete; + ChemistryIngredient(class ChemistryIngredient const &) = delete; ChemistryIngredient() = delete; #endif public: /** - * @symbol ??1ChemistryIngredient\@\@QEAA\@XZ + * @symbol ??1ChemistryIngredient\@\@QEAA\@XZ */ MCAPI ~ChemistryIngredient(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryItem.hpp b/LiteLoader/include/llapi/mc/ChemistryItem.hpp index 03bca4514d..fca64ba0df 100644 --- a/LiteLoader/include/llapi/mc/ChemistryItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryItem.hpp @@ -32,83 +32,89 @@ class ChemistryItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChemistryItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 105 - * @symbol ?fixupCommon\@ChemistryItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 105 + * @symbol ?fixupCommon\@ChemistryItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHEMISTRYITEM /** - * @symbol ?validate\@ChemistryItem\@\@SAXAEAVItemStackBase\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ChemistryItem(); +#endif + /** + * @symbol ?validate\@ChemistryItem\@\@SAXAEAVItemStackBase\@\@\@Z */ MCAPI static void validate(class ItemStackBase &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryRecipes.hpp b/LiteLoader/include/llapi/mc/ChemistryRecipes.hpp index d588c15cbb..9797333b92 100644 --- a/LiteLoader/include/llapi/mc/ChemistryRecipes.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryRecipes.hpp @@ -30,8 +30,8 @@ class ChemistryRecipes { public: /** - * @symbol ?addRecipes\@ChemistryRecipes\@\@SAXAEAVRecipes\@\@\@Z + * @symbol ?addRecipes\@ChemistryRecipes\@\@SAXAEAVRecipes\@\@\@Z */ MCAPI static void addRecipes(class Recipes &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp index 7fe9904a1a..bceba002d0 100644 --- a/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryStickItem.hpp @@ -32,155 +32,155 @@ class ChemistryStickItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChemistryStickItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 30 - * @symbol ?setMaxDamage\@ChemistryStickItem\@\@UEAAAEAVItem\@\@H\@Z + * @vftbl 30 + * @symbol ?setMaxDamage\@ChemistryStickItem\@\@UEAAAEAVItem\@\@H\@Z */ virtual class Item & setMaxDamage(int); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@ChemistryStickItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@ChemistryStickItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@ChemistryStickItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@ChemistryStickItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@ChemistryStickItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@ChemistryStickItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@ChemistryStickItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@ChemistryStickItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@ChemistryStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@ChemistryStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 101 - * @symbol ?inventoryTick\@ChemistryStickItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z + * @vftbl 101 + * @symbol ?inventoryTick\@ChemistryStickItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z */ virtual bool inventoryTick(class ItemStack &, class Level &, class Actor &, int, bool) const; /** - * @vftbl 105 - * @symbol ?fixupCommon\@ChemistryStickItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 105 + * @symbol ?fixupCommon\@ChemistryStickItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHEMISTRYSTICKITEM /** - * @symbol ?showsDurabilityInCreative\@ChemistryStickItem\@\@UEBA_NXZ + * @symbol ?showsDurabilityInCreative\@ChemistryStickItem\@\@UEBA_NXZ */ MCVAPI bool showsDurabilityInCreative() const; /** - * @symbol ?uniqueAuxValues\@ChemistryStickItem\@\@UEBA_NXZ + * @symbol ?uniqueAuxValues\@ChemistryStickItem\@\@UEBA_NXZ */ MCVAPI bool uniqueAuxValues() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ChemistryStickItem(); #endif /** - * @symbol ??0ChemistryStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ChemistryStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ChemistryStickItem(std::string const &, int); /** - * @symbol ?getColorType\@ChemistryStickItem\@\@SA?AW4ItemColor\@\@H\@Z + * @symbol ?getColorType\@ChemistryStickItem\@\@SA?AW4ItemColor\@\@H\@Z */ MCAPI static enum class ItemColor getColorType(int); /** - * @symbol ?isActive\@ChemistryStickItem\@\@SA_NH\@Z + * @symbol ?isActive\@ChemistryStickItem\@\@SA_NH\@Z */ MCAPI static bool isActive(int); /** - * @symbol ?isChemistryStick\@ChemistryStickItem\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isChemistryStick\@ChemistryStickItem\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool isChemistryStick(class ItemStackBase const &); //protected: /** - * @symbol ?_getColorName\@ChemistryStickItem\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?_getColorName\@ChemistryStickItem\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI std::string _getColorName(int) const; - /** - * @symbol ?_tick\@ChemistryStickItem\@\@IEBA_NAEAVItemStack\@\@_K\@Z - */ - MCAPI bool _tick(class ItemStack &, unsigned __int64) const; //private: /** - * @symbol ?_storeActivationTimestamp\@ChemistryStickItem\@\@AEBAXAEAVItemStack\@\@_KH\@Z + * @symbol ?_storeActivationTimestamp\@ChemistryStickItem\@\@AEBAXAEAVItemStack\@\@_KH\@Z */ MCAPI void _storeActivationTimestamp(class ItemStack &, unsigned __int64, int) const; @@ -188,32 +188,32 @@ class ChemistryStickItem : public Item { private: /** - * @symbol ?ACTIVATION_TIMESTAMP_TAG\@ChemistryStickItem\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ACTIVATION_TIMESTAMP_TAG\@ChemistryStickItem\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ACTIVATION_TIMESTAMP_TAG; /** - * @symbol ?ACTIVE_BIT\@ChemistryStickItem\@\@0HB + * @symbol ?ACTIVE_BIT\@ChemistryStickItem\@\@0HB */ MCAPI static int const ACTIVE_BIT; /** - * @symbol ?COLOR_BITS\@ChemistryStickItem\@\@0HB + * @symbol ?COLOR_BITS\@ChemistryStickItem\@\@0HB */ MCAPI static int const COLOR_BITS; /** - * @symbol ?COLOR_MASK\@ChemistryStickItem\@\@0HB + * @symbol ?COLOR_MASK\@ChemistryStickItem\@\@0HB */ MCAPI static int const COLOR_MASK; /** - * @symbol ?DAMAGE_BITS\@ChemistryStickItem\@\@0HB + * @symbol ?DAMAGE_BITS\@ChemistryStickItem\@\@0HB */ MCAPI static int const DAMAGE_BITS; /** - * @symbol ?DAMAGE_MASK\@ChemistryStickItem\@\@0HB + * @symbol ?DAMAGE_MASK\@ChemistryStickItem\@\@0HB */ MCAPI static int const DAMAGE_MASK; /** - * @symbol ?DAMAGE_START_BIT\@ChemistryStickItem\@\@0HB + * @symbol ?DAMAGE_START_BIT\@ChemistryStickItem\@\@0HB */ MCAPI static int const DAMAGE_START_BIT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp index a247ec9383..643828a3e3 100644 --- a/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlock.hpp @@ -31,276 +31,281 @@ class ChemistryTableBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChemistryTableBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@ChemistryTableBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@ChemistryTableBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@ChemistryTableBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@ChemistryTableBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 58 - * @symbol ?onFillBlock\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?onFillBlock\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@ChemistryTableBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@ChemistryTableBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ChemistryTableBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ChemistryTableBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ChemistryTableBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@ChemistryTableBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@ChemistryTableBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ChemistryTableBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@ChemistryTableBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ChemistryTableBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@ChemistryTableBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@ChemistryTableBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@ChemistryTableBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@ChemistryTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@ChemistryTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getEntityResourceItem\@ChemistryTableBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHEMISTRYTABLEBLOCK /** - * @symbol ?isCraftingBlock\@ChemistryTableBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@ChemistryTableBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@ChemistryTableBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@ChemistryTableBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0ChemistryTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ChemistryTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ChemistryTableBlock(std::string const &, int); /** - * @symbol ?getItemForType\@ChemistryTableBlock\@\@SA?AVItemInstance\@\@W4ChemistryTableType\@\@H\@Z + * @symbol ?getItemForType\@ChemistryTableBlock\@\@SA?AVItemInstance\@\@W4ChemistryTableType\@\@H\@Z */ MCAPI static class ItemInstance getItemForType(enum class ChemistryTableType, int); /** - * @symbol ?isUIValidForPlayer\@ChemistryTableBlock\@\@SA_NAEBVBlockPos\@\@AEAVPlayer\@\@MW4ChemistryTableType\@\@\@Z + * @symbol ?isUIValidForPlayer\@ChemistryTableBlock\@\@SA_NAEBVBlockPos\@\@AEAVPlayer\@\@MW4ChemistryTableType\@\@\@Z */ MCAPI static bool isUIValidForPlayer(class BlockPos const &, class Player &, float, enum class ChemistryTableType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp b/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp index 61d5677991..0c372ce387 100644 --- a/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChemistryTableBlockActor.hpp @@ -31,97 +31,97 @@ class ChemistryTableBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHEMISTRYTABLEBLOCKACTOR /** - * @symbol ?getContainer\@ChemistryTableBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@ChemistryTableBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@ChemistryTableBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@ChemistryTableBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@ChemistryTableBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@ChemistryTableBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@ChemistryTableBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@ChemistryTableBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@ChemistryTableBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@ChemistryTableBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?load\@ChemistryTableBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@ChemistryTableBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onRemoved\@ChemistryTableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onRemoved\@ChemistryTableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onRemoved(class BlockSource &); /** - * @symbol ?save\@ChemistryTableBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@ChemistryTableBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@ChemistryTableBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@ChemistryTableBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@ChemistryTableBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ChemistryTableBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@ChemistryTableBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@ChemistryTableBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@ChemistryTableBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@ChemistryTableBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@ChemistryTableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@ChemistryTableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0ChemistryTableBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0ChemistryTableBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI ChemistryTableBlockActor(class BlockPos const &); /** - * @symbol ?isSameType\@ChemistryTableBlockActor\@\@QEBA_NW4ChemistryTableType\@\@\@Z + * @symbol ?isSameType\@ChemistryTableBlockActor\@\@QEBA_NW4ChemistryTableType\@\@\@Z */ MCAPI bool isSameType(enum class ChemistryTableType) const; /** - * @symbol ?playerOpenLabTable\@ChemistryTableBlockActor\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?playerOpenLabTable\@ChemistryTableBlockActor\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void playerOpenLabTable(class Player &); /** - * @symbol ?reset\@ChemistryTableBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?reset\@ChemistryTableBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void reset(class BlockSource &); /** - * @symbol ?serverCombine\@ChemistryTableBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?serverCombine\@ChemistryTableBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void serverCombine(class BlockSource &, std::vector const &); /** - * @symbol ?serverLabTablePacket_DEPRECATED\@ChemistryTableBlockActor\@\@QEAAXAEBVLabTablePacket\@\@AEAVBlockSource\@\@\@Z + * @symbol ?serverLabTablePacket_DEPRECATED\@ChemistryTableBlockActor\@\@QEAAXAEBVLabTablePacket\@\@AEAVBlockSource\@\@\@Z */ MCAPI void serverLabTablePacket_DEPRECATED(class LabTablePacket const &, class BlockSource &); //private: /** - * @symbol ?_createReaction\@ChemistryTableBlockActor\@\@AEAA?AV?$unique_ptr\@VLabTableReaction\@\@U?$default_delete\@VLabTableReaction\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@3\@\@Z + * @symbol ?_createReaction\@ChemistryTableBlockActor\@\@AEAA?AV?$unique_ptr\@VLabTableReaction\@\@U?$default_delete\@VLabTableReaction\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@3\@\@Z */ MCAPI std::unique_ptr _createReaction(class Random &, std::vector const &); /** - * @symbol ?_popPendingReactionOutput\@ChemistryTableBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_popPendingReactionOutput\@ChemistryTableBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _popPendingReactionOutput(class BlockSource &); /** - * @symbol ?_updateType\@ChemistryTableBlockActor\@\@AEAA?AW4ChemistryTableType\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_updateType\@ChemistryTableBlockActor\@\@AEAA?AW4ChemistryTableType\@\@AEAVBlockSource\@\@\@Z */ MCAPI enum class ChemistryTableType _updateType(class BlockSource &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChestBlock.hpp b/LiteLoader/include/llapi/mc/ChestBlock.hpp index 26f9d8405b..b1c09e0365 100644 --- a/LiteLoader/include/llapi/mc/ChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlock.hpp @@ -31,290 +31,299 @@ class ChestBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChestBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@ChestBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@ChestBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@ChestBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@ChestBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 71 - * @symbol ?dispense\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @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 - * @symbol ?onMove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 74 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@ChestBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@ChestBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@ChestBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ChestBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ChestBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@ChestBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@ChestBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 149 - * @symbol ?getMappedFace\@ChestBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@ChestBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 152 - * @symbol ?init\@ChestBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@ChestBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@ChestBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@ChestBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHESTBLOCK /** - * @symbol ?detachesOnPistonMove\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?detachesOnPistonMove\@ChestBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI bool detachesOnPistonMove(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?hasComparatorSignal\@ChestBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@ChestBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isContainerBlock\@ChestBlock\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@ChestBlock\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isInteractiveBlock\@ChestBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@ChestBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ChestBlock(); #endif /** - * @symbol ??0ChestBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ChestType\@0\@W4MaterialType\@\@\@Z + * @symbol ??0ChestBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ChestType\@0\@W4MaterialType\@\@\@Z */ MCAPI ChestBlock(std::string const &, int, enum class ChestBlock::ChestType, enum class MaterialType); /** - * @symbol ?updateSignalStrength\@ChestBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?updateSignalStrength\@ChestBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void updateSignalStrength(class BlockSource &, class BlockPos const &, int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChestBlockActor.hpp b/LiteLoader/include/llapi/mc/ChestBlockActor.hpp index 51771333b4..120b9dc141 100644 --- a/LiteLoader/include/llapi/mc/ChestBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlockActor.hpp @@ -31,252 +31,252 @@ class ChestBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHESTBLOCKACTOR /** - * @symbol ?_canOpenThis\@ChestBlockActor\@\@MEBA_NAEAVBlockSource\@\@\@Z + * @symbol ?_canOpenThis\@ChestBlockActor\@\@MEBA_NAEAVBlockSource\@\@\@Z */ MCVAPI bool _canOpenThis(class BlockSource &) const; /** - * @symbol ?_detectEntityObstruction\@ChestBlockActor\@\@MEBA_NAEAVBlockSource\@\@\@Z + * @symbol ?_detectEntityObstruction\@ChestBlockActor\@\@MEBA_NAEAVBlockSource\@\@\@Z */ MCVAPI bool _detectEntityObstruction(class BlockSource &) const; /** - * @symbol ?_getUpdatePacket\@ChestBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@ChestBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@ChestBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@ChestBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?addContentChangeListener\@ChestBlockActor\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z + * @symbol ?addContentChangeListener\@ChestBlockActor\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z */ MCVAPI void addContentChangeListener(class ContainerContentChangeListener *); /** - * @symbol ?canPullOutItem\@ChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@ChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@ChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@ChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?clearCache\@ChestBlockActor\@\@UEAAXXZ + * @symbol ?clearCache\@ChestBlockActor\@\@UEAAXXZ */ MCVAPI void clearCache(); /** - * @symbol ?clearInventory\@ChestBlockActor\@\@UEAAHH\@Z + * @symbol ?clearInventory\@ChestBlockActor\@\@UEAAHH\@Z */ MCVAPI int clearInventory(int); /** - * @symbol ?eraseLootTable\@ChestBlockActor\@\@UEAAXXZ + * @symbol ?eraseLootTable\@ChestBlockActor\@\@UEAAXXZ */ MCVAPI void eraseLootTable(); /** - * @symbol ?getContainer\@ChestBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@ChestBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@ChestBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@ChestBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@ChestBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@ChestBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getCrackEntity\@ChestBlockActor\@\@UEAAPEAVBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getCrackEntity\@ChestBlockActor\@\@UEAAPEAVBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI class BlockActor * getCrackEntity(class BlockSource &, class BlockPos const &); /** - * @symbol ?getDebugText\@ChestBlockActor\@\@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\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getDebugText\@ChestBlockActor\@\@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\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void getDebugText(std::vector &, class BlockPos const &); /** - * @symbol ?getItem\@ChestBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@ChestBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@ChestBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@ChestBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@ChestBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ChestBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?getObstructionAABB\@ChestBlockActor\@\@MEBA?AVAABB\@\@XZ + * @symbol ?getObstructionAABB\@ChestBlockActor\@\@MEBA?AVAABB\@\@XZ */ MCVAPI class AABB getObstructionAABB() const; /** - * @symbol ?initializeContainerContents\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?initializeContainerContents\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void initializeContainerContents(class BlockSource &); /** - * @symbol ?load\@ChestBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@ChestBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?loadItems\@ChestBlockActor\@\@UEAAXAEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?loadItems\@ChestBlockActor\@\@UEAAXAEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCVAPI void loadItems(class CompoundTag const &, class Level &); /** - * @symbol ?onChanged\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onChanged\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onChanged(class BlockSource &); /** - * @symbol ?onMove\@ChestBlockActor\@\@UEAAXXZ + * @symbol ?onMove\@ChestBlockActor\@\@UEAAXXZ */ MCVAPI void onMove(); /** - * @symbol ?onNeighborChanged\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onNeighborChanged\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void onNeighborChanged(class BlockSource &, class BlockPos const &); /** - * @symbol ?onPlace\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onPlace\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onPlace(class BlockSource &); /** - * @symbol ?onRemoved\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onRemoved\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onRemoved(class BlockSource &); /** - * @symbol ?playCloseSound\@ChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playCloseSound\@ChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playCloseSound(class BlockSource &); /** - * @symbol ?playOpenSound\@ChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playOpenSound\@ChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playOpenSound(class BlockSource &); /** - * @symbol ?removeContentChangeListener\@ChestBlockActor\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z + * @symbol ?removeContentChangeListener\@ChestBlockActor\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z */ MCVAPI void removeContentChangeListener(class ContainerContentChangeListener *); /** - * @symbol ?save\@ChestBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@ChestBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?saveItemInstanceData\@ChestBlockActor\@\@UEAA_NAEAVCompoundTag\@\@\@Z + * @symbol ?saveItemInstanceData\@ChestBlockActor\@\@UEAA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool saveItemInstanceData(class CompoundTag &); /** - * @symbol ?saveItems\@ChestBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?saveItems\@ChestBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool saveItems(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@ChestBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@ChestBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setContainerChanged\@ChestBlockActor\@\@UEAAXH\@Z + * @symbol ?setContainerChanged\@ChestBlockActor\@\@UEAAXH\@Z */ MCVAPI void setContainerChanged(int); /** - * @symbol ?setItem\@ChestBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ChestBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?setItemWithForceBalance\@ChestBlockActor\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @symbol ?setItemWithForceBalance\@ChestBlockActor\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ MCVAPI void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @symbol ?startOpen\@ChestBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@ChestBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@ChestBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@ChestBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@ChestBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); /** - * @symbol ?triggerEvent\@ChestBlockActor\@\@UEAAXHH\@Z + * @symbol ?triggerEvent\@ChestBlockActor\@\@UEAAXHH\@Z */ MCVAPI void triggerEvent(int, int); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ChestBlockActor(); #endif /** - * @symbol ??0ChestBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorRendererId\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ??0ChestBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorRendererId\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI ChestBlockActor(enum class BlockActorType, std::string const &, enum class BlockActorRendererId, class BlockPos const &, bool); /** - * @symbol ?canOpen\@ChestBlockActor\@\@QEBA_NAEAVBlockSource\@\@\@Z + * @symbol ?canOpen\@ChestBlockActor\@\@QEBA_NAEAVBlockSource\@\@\@Z */ MCAPI bool canOpen(class BlockSource &) const; /** - * @symbol ?canPairWith\@ChestBlockActor\@\@QEAA_NPEAVBlockActor\@\@AEAVBlockSource\@\@\@Z + * @symbol ?canPairWith\@ChestBlockActor\@\@QEAA_NPEAVBlockActor\@\@AEAVBlockSource\@\@\@Z */ MCAPI bool canPairWith(class BlockActor *, class BlockSource &); /** - * @symbol ?forceCloseChest\@ChestBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?forceCloseChest\@ChestBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void forceCloseChest(class BlockSource &); /** - * @symbol ?getOpenCount\@ChestBlockActor\@\@QEBAHXZ + * @symbol ?getOpenCount\@ChestBlockActor\@\@QEBAHXZ */ MCAPI int getOpenCount() const; /** - * @symbol ?getOpenness\@ChestBlockActor\@\@QEBAMXZ + * @symbol ?getOpenness\@ChestBlockActor\@\@QEBAMXZ */ MCAPI float getOpenness() const; /** - * @symbol ?getPairedChestPosition\@ChestBlockActor\@\@QEAAAEBVBlockPos\@\@XZ + * @symbol ?getPairedChestPosition\@ChestBlockActor\@\@QEAAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getPairedChestPosition(); /** - * @symbol ?isFindable\@ChestBlockActor\@\@QEBA_NXZ + * @symbol ?isFindable\@ChestBlockActor\@\@QEBA_NXZ */ MCAPI bool isFindable() const; /** - * @symbol ?isLargeChest\@ChestBlockActor\@\@QEBA_NXZ + * @symbol ?isLargeChest\@ChestBlockActor\@\@QEBA_NXZ */ MCAPI bool isLargeChest() const; /** - * @symbol ?onMove\@ChestBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?onMove\@ChestBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCAPI void onMove(class BlockSource &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?openBy\@ChestBlockActor\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?openBy\@ChestBlockActor\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void openBy(class Player &); /** - * @symbol ?pairWith\@ChestBlockActor\@\@QEAAXPEAV1\@_N\@Z + * @symbol ?pairWith\@ChestBlockActor\@\@QEAAXPEAV1\@_N\@Z */ MCAPI void pairWith(class ChestBlockActor *, bool); /** - * @symbol ?setFindable\@ChestBlockActor\@\@QEAAX_N\@Z + * @symbol ?setFindable\@ChestBlockActor\@\@QEAAX_N\@Z */ MCAPI void setFindable(bool); /** - * @symbol ?unpair\@ChestBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?unpair\@ChestBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void unpair(class BlockSource &); //protected: /** - * @symbol ?_getCenter\@ChestBlockActor\@\@IEAAXAEAM00\@Z + * @symbol ?_getCenter\@ChestBlockActor\@\@IEAAXAEAM00\@Z */ MCAPI void _getCenter(float &, float &, float &); //private: /** - * @symbol ?_closeChest\@ChestBlockActor\@\@AEAAXAEAVBlockSource\@\@PEAVPlayer\@\@\@Z + * @symbol ?_closeChest\@ChestBlockActor\@\@AEAAXAEAVBlockSource\@\@PEAVPlayer\@\@\@Z */ MCAPI void _closeChest(class BlockSource &, class Player *); /** - * @symbol ?_saveClientSideState\@ChestBlockActor\@\@AEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?_saveClientSideState\@ChestBlockActor\@\@AEBA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool _saveClientSideState(class CompoundTag &) const; /** - * @symbol ?_tryToPairWith\@ChestBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_tryToPairWith\@ChestBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _tryToPairWith(class BlockSource &, class BlockPos const &); /** - * @symbol ?_unpair\@ChestBlockActor\@\@AEAAXXZ + * @symbol ?_unpair\@ChestBlockActor\@\@AEAAXXZ */ MCAPI void _unpair(); @@ -284,4 +284,4 @@ class ChestBlockActor { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChestBlockTryPairEvent.hpp b/LiteLoader/include/llapi/mc/ChestBlockTryPairEvent.hpp index acc008d862..42f1e7a360 100644 --- a/LiteLoader/include/llapi/mc/ChestBlockTryPairEvent.hpp +++ b/LiteLoader/include/llapi/mc/ChestBlockTryPairEvent.hpp @@ -25,7 +25,7 @@ struct ChestBlockTryPairEvent { public: /** - * @symbol ??1ChestBlockTryPairEvent\@\@QEAA\@XZ + * @symbol ??1ChestBlockTryPairEvent\@\@QEAA\@XZ */ MCAPI ~ChestBlockTryPairEvent(); diff --git a/LiteLoader/include/llapi/mc/ChestBoat.hpp b/LiteLoader/include/llapi/mc/ChestBoat.hpp index 154cc32866..d1e4a71ffc 100644 --- a/LiteLoader/include/llapi/mc/ChestBoat.hpp +++ b/LiteLoader/include/llapi/mc/ChestBoat.hpp @@ -30,141 +30,141 @@ class ChestBoat : public Boat { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ChestBoat(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 57 - * @symbol ?getEntityLocNameString\@ChestBoat\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 57 + * @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 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 245 - * @symbol ?kill\@ChestBoat\@\@UEAAXXZ + * @vftbl 244 + * @symbol ?kill\@ChestBoat\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?destroy\@ChestBoat\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 276 + * @symbol ?destroy\@ChestBoat\@\@UEAAXPEAVActor\@\@\@Z */ virtual void destroy(class Actor *); /** - * @symbol ??0ChestBoat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ChestBoat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ChestBoat(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); //private: /** - * @symbol ?_dropChestContents\@ChestBoat\@\@AEAAXAEBVVec3\@\@\@Z + * @symbol ?_dropChestContents\@ChestBoat\@\@AEAAXAEBVVec3\@\@\@Z */ MCAPI void _dropChestContents(class Vec3 const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChestBoatItem.hpp b/LiteLoader/include/llapi/mc/ChestBoatItem.hpp index aa5cdf9025..2b6c6dfc60 100644 --- a/LiteLoader/include/llapi/mc/ChestBoatItem.hpp +++ b/LiteLoader/include/llapi/mc/ChestBoatItem.hpp @@ -30,88 +30,88 @@ class ChestBoatItem : public BoatItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChestBoatItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@ChestBoatItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@ChestBoatItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 133 - * @symbol ?_getActorType\@ChestBoatItem\@\@EEBA?AW4ActorType\@\@XZ + * @vftbl 133 + * @symbol ?_getActorType\@ChestBoatItem\@\@EEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType _getActorType() const; /** - * @symbol ??0ChestBoatItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z + * @symbol ??0ChestBoatItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z */ MCAPI ChestBoatItem(std::string const &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp index 07c41797b5..6fbefd3a38 100644 --- a/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ChestContainerManagerModel.hpp @@ -31,27 +31,27 @@ class ChestContainerManagerModel : public LevelContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChestContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 16 - * @symbol ?isValid\@ChestContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@ChestContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@ChestContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@ChestContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z + * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z */ MCAPI ChestContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); /** - * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z + * @symbol ??0ChestContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z */ MCAPI ChestContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &, enum class BlockActorType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChestContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/ChestContainerScreenValidator.hpp index c9ace3fc51..f603bde848 100644 --- a/LiteLoader/include/llapi/mc/ChestContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/ChestContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class ChestContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChestContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0ChestContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0ChestContainerScreenValidator\@\@QEAA\@XZ */ MCAPI ChestContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Chicken.hpp b/LiteLoader/include/llapi/mc/Chicken.hpp index 3bcb08dda1..e06fd01d12 100644 --- a/LiteLoader/include/llapi/mc/Chicken.hpp +++ b/LiteLoader/include/llapi/mc/Chicken.hpp @@ -32,157 +32,152 @@ class Chicken : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Chicken(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Chicken\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Chicken\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Chicken\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Chicken\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@Chicken\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Chicken\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Chicken\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Chicken\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Chicken(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postAIStep\@Chicken\@\@QEAAXXZ + * @symbol ?postAIStep\@Chicken\@\@QEAAXXZ */ MCAPI void postAIStep(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp index caddcf568d..060ec70310 100644 --- a/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ChickenPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class ChickenPostAIStepSystem { public: /** - * @symbol ?createSystem\@ChickenPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ChickenPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doChickenPostAIStepSystem\@ChickenPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doChickenPostAIStepSystem\@ChickenPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doChickenPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp index 504ad099a2..44fe0bc246 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlock.hpp @@ -29,250 +29,255 @@ class ChiseledBookshelfBlock : public FaceDirectionalActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChiseledBookshelfBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@ChiseledBookshelfBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@ChiseledBookshelfBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@ChiseledBookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@ChiseledBookshelfBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 176 - * @symbol ?use\@ChiseledBookshelfBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@EV?$optional\@VVec3\@\@\@std\@\@\@Z + * @vftbl 176 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@ChiseledBookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@ChiseledBookshelfBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@ChiseledBookshelfBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHISELEDBOOKSHELFBLOCK /** - * @symbol ?canBeSilkTouched\@ChiseledBookshelfBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@ChiseledBookshelfBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasComparatorSignal\@ChiseledBookshelfBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@ChiseledBookshelfBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@ChiseledBookshelfBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@ChiseledBookshelfBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0ChiseledBookshelfBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ChiseledBookshelfBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ChiseledBookshelfBlock(std::string const &, int); //private: /** - * @symbol ?_updateBlockEvents\@ChiseledBookshelfBlock\@\@AEBAXAEAVBlockSource\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4LevelSoundEvent\@\@\@Z + * @symbol ?_updateBlockEvents\@ChiseledBookshelfBlock\@\@AEBAXAEAVBlockSource\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4LevelSoundEvent\@\@\@Z */ MCAPI void _updateBlockEvents(class BlockSource &, class Player &, class BlockPos const &, enum class LevelSoundEvent) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActor.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActor.hpp index 1330dc1def..8e5aaaaf17 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActor.hpp @@ -29,113 +29,109 @@ class ChiseledBookshelfBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHISELEDBOOKSHELFBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@ChiseledBookshelfBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@ChiseledBookshelfBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@ChiseledBookshelfBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@ChiseledBookshelfBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?addItemToFirstEmptySlot\@ChiseledBookshelfBlockActor\@\@UEAA_NAEBVItemStack\@\@\@Z + * @symbol ?addItemToFirstEmptySlot\@ChiseledBookshelfBlockActor\@\@UEAA_NAEBVItemStack\@\@\@Z */ MCVAPI bool addItemToFirstEmptySlot(class ItemStack const &); /** - * @symbol ?canPullOutItem\@ChiseledBookshelfBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@ChiseledBookshelfBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@ChiseledBookshelfBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@ChiseledBookshelfBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?getContainer\@ChiseledBookshelfBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@ChiseledBookshelfBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@ChiseledBookshelfBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@ChiseledBookshelfBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@ChiseledBookshelfBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@ChiseledBookshelfBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@ChiseledBookshelfBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@ChiseledBookshelfBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@ChiseledBookshelfBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@ChiseledBookshelfBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@ChiseledBookshelfBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ChiseledBookshelfBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?isEmpty\@ChiseledBookshelfBlockActor\@\@UEBA_NXZ + * @symbol ?isEmpty\@ChiseledBookshelfBlockActor\@\@UEBA_NXZ */ MCVAPI bool isEmpty() const; /** - * @symbol ?load\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onChanged\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onChanged\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onChanged(class BlockSource &); /** - * @symbol ?save\@ChiseledBookshelfBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@ChiseledBookshelfBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@ChiseledBookshelfBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@ChiseledBookshelfBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@ChiseledBookshelfBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ChiseledBookshelfBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@ChiseledBookshelfBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); #endif /** - * @symbol ??0ChiseledBookshelfBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0ChiseledBookshelfBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI ChiseledBookshelfBlockActor(class BlockPos const &); /** - * @symbol ?getLastInteractedSlot\@ChiseledBookshelfBlockActor\@\@QEBAIXZ + * @symbol ?getLastInteractedSlot\@ChiseledBookshelfBlockActor\@\@QEBAIXZ */ MCAPI unsigned int getLastInteractedSlot() const; /** - * @symbol ?retrieveBook\@ChiseledBookshelfBlockActor\@\@QEAA?AVItemStack\@\@H\@Z + * @symbol ?retrieveBook\@ChiseledBookshelfBlockActor\@\@QEAA?AVItemStack\@\@H\@Z */ MCAPI class ItemStack retrieveBook(int); /** - * @symbol ?allowedItem\@ChiseledBookshelfBlockActor\@\@SA_NAEBVItemStack\@\@\@Z + * @symbol ?allowedItem\@ChiseledBookshelfBlockActor\@\@SA_NAEBVItemStack\@\@\@Z */ MCAPI static bool allowedItem(class ItemStack const &); /** - * @symbol ?tryGet\@ChiseledBookshelfBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryGet\@ChiseledBookshelfBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class ChiseledBookshelfBlockActor * tryGet(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_loadItems\@ChiseledBookshelfBlockActor\@\@AEAAXAEBVCompoundTag\@\@AEAVLevel\@\@\@Z - */ - MCAPI void _loadItems(class CompoundTag const &, class Level &); - /** - * @symbol ?_numberOfBooksStored\@ChiseledBookshelfBlockActor\@\@AEBAIXZ + * @symbol ?_numberOfBooksStored\@ChiseledBookshelfBlockActor\@\@AEBAIXZ */ MCAPI unsigned int _numberOfBooksStored() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActorKeys.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActorKeys.hpp index bce9a40f55..97fff00158 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActorKeys.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfBlockActorKeys.hpp @@ -20,7 +20,7 @@ namespace ChiseledBookshelfBlockActorKeys { #undef AFTER_EXTRA /** - * @symbol ?Items\@ChiseledBookshelfBlockActorKeys\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?Items\@ChiseledBookshelfBlockActorKeys\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const Items; diff --git a/LiteLoader/include/llapi/mc/ChiseledBookshelfSlotUtils.hpp b/LiteLoader/include/llapi/mc/ChiseledBookshelfSlotUtils.hpp index 22b92ee839..ccb12e16e1 100644 --- a/LiteLoader/include/llapi/mc/ChiseledBookshelfSlotUtils.hpp +++ b/LiteLoader/include/llapi/mc/ChiseledBookshelfSlotUtils.hpp @@ -17,7 +17,7 @@ namespace ChiseledBookshelfSlotUtils { #undef AFTER_EXTRA /** - * @symbol ?calculateHitSlot\@ChiseledBookshelfSlotUtils\@\@YA?AV?$optional\@H\@std\@\@AEBVVec3\@\@AEBVBlock\@\@E\@Z + * @symbol ?calculateHitSlot\@ChiseledBookshelfSlotUtils\@\@YA?AV?$optional\@H\@std\@\@AEBVVec3\@\@AEBVBlock\@\@E\@Z */ MCAPI class std::optional calculateHitSlot(class Vec3 const &, class Block const &, unsigned char); diff --git a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp index 9178add136..b5b8b4e6d2 100644 --- a/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusFlowerBlock.hpp @@ -31,286 +31,291 @@ class ChorusFlowerBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChorusFlowerBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@ChorusFlowerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@ChorusFlowerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@ChorusFlowerBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@ChorusFlowerBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ChorusFlowerBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ChorusFlowerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@ChorusFlowerBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ChorusFlowerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@ChorusFlowerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@ChorusFlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@ChorusFlowerBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@ChorusFlowerBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@ChorusFlowerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@ChorusFlowerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHORUSFLOWERBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@ChorusFlowerBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@ChorusFlowerBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0ChorusFlowerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ChorusFlowerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ChorusFlowerBlock(std::string const &, int); /** - * @symbol ?BRANCH_DIRECTIONS\@ChorusFlowerBlock\@\@2HB + * @symbol ?BRANCH_DIRECTIONS\@ChorusFlowerBlock\@\@2HB */ MCAPI static int const BRANCH_DIRECTIONS; /** - * @symbol ?DEAD_AGE\@ChorusFlowerBlock\@\@2GB + * @symbol ?DEAD_AGE\@ChorusFlowerBlock\@\@2GB */ MCAPI static unsigned short const DEAD_AGE; /** - * @symbol ?GROW_RATE\@ChorusFlowerBlock\@\@2HB + * @symbol ?GROW_RATE\@ChorusFlowerBlock\@\@2HB */ MCAPI static int const GROW_RATE; /** - * @symbol ?generatePlant\@ChorusFlowerBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@H\@Z + * @symbol ?generatePlant\@ChorusFlowerBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@H\@Z */ MCAPI static void generatePlant(class BlockSource &, class BlockPos const &, class Random &, int); //private: /** - * @symbol ?_placeDeadFlower\@ChorusFlowerBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_placeDeadFlower\@ChorusFlowerBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _placeDeadFlower(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_placeGrownFlower\@ChorusFlowerBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_placeGrownFlower\@ChorusFlowerBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void _placeGrownFlower(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?_growTreeRecursive\@ChorusFlowerBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@1AEAVRandom\@\@HH\@Z + * @symbol ?_growTreeRecursive\@ChorusFlowerBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@1AEAVRandom\@\@HH\@Z */ MCAPI static void _growTreeRecursive(class BlockSource &, class BlockPos const &, class BlockPos const &, class Random &, int, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp index 90a5123cb7..51d574aeff 100644 --- a/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/ChorusPlantBlock.hpp @@ -31,274 +31,279 @@ class ChorusPlantBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChorusPlantBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@ChorusPlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@ChorusPlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@ChorusPlantBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@ChorusPlantBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@ChorusPlantBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@ChorusPlantBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ChorusPlantBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ChorusPlantBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@ChorusPlantBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ChorusPlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@ChorusPlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ChorusPlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ChorusPlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@ChorusPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@ChorusPlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHORUSPLANTBLOCK /** - * @symbol ?canBeSilkTouched\@ChorusPlantBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@ChorusPlantBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@ChorusPlantBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@ChorusPlantBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0ChorusPlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ChorusPlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ChorusPlantBlock(std::string const &, int); /** - * @symbol ?PLANT_HEIGHT\@ChorusPlantBlock\@\@2MB + * @symbol ?PLANT_HEIGHT\@ChorusPlantBlock\@\@2MB */ MCAPI static float const PLANT_HEIGHT; /** - * @symbol ?PLANT_ITEM_DIMENSION\@ChorusPlantBlock\@\@2MB + * @symbol ?PLANT_ITEM_DIMENSION\@ChorusPlantBlock\@\@2MB */ MCAPI static float const PLANT_ITEM_DIMENSION; /** - * @symbol ?PLANT_WIDTH\@ChorusPlantBlock\@\@2MB + * @symbol ?PLANT_WIDTH\@ChorusPlantBlock\@\@2MB */ MCAPI static float const PLANT_WIDTH; /** - * @symbol ?canGrowChorus\@ChorusPlantBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?canGrowChorus\@ChorusPlantBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool canGrowChorus(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkBlender.hpp b/LiteLoader/include/llapi/mc/ChunkBlender.hpp index 7016374106..546869aba4 100644 --- a/LiteLoader/include/llapi/mc/ChunkBlender.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBlender.hpp @@ -26,28 +26,28 @@ class ChunkBlender { public: /** - * @symbol ??0ChunkBlender\@\@QEAA\@VChunkPos\@\@$$QEAV?$vector\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@V?$allocator\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@\@2\@\@std\@\@F\@Z + * @symbol ??0ChunkBlender\@\@QEAA\@VChunkPos\@\@$$QEAV?$vector\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@V?$allocator\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@\@2\@\@std\@\@F\@Z */ MCAPI ChunkBlender(class ChunkPos, std::vector> &&, short); /** - * @symbol ?attenuateDensity\@ChunkBlender\@\@QEBAMAEBV?$DividedPos2d\@$03\@\@HM\@Z + * @symbol ?attenuateDensity\@ChunkBlender\@\@QEBAMAEBV?$DividedPos2d\@$03\@\@HM\@Z */ MCAPI float attenuateDensity(class DividedPos2d<4> const &, int, float) const; /** - * @symbol ?attenuateTerrainInfo\@ChunkBlender\@\@QEBA?AUTerrainInfo\@\@AEBV?$DividedPos2d\@$03\@\@AEBU2\@\@Z + * @symbol ?attenuateTerrainInfo\@ChunkBlender\@\@QEBA?AUTerrainInfo\@\@AEBV?$DividedPos2d\@$03\@\@AEBU2\@\@Z */ MCAPI struct TerrainInfo attenuateTerrainInfo(class DividedPos2d<4> const &, struct TerrainInfo const &) const; /** - * @symbol ?tryGetAttenuatedBiome\@ChunkBlender\@\@QEBAPEBVBiome\@\@AEBV?$DividedPos\@$03\@\@AEBVBiomeRegistry\@\@AEBV?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@\@Z + * @symbol ?tryGetAttenuatedBiome\@ChunkBlender\@\@QEBAPEBVBiome\@\@AEBV?$DividedPos\@$03\@\@AEBVBiomeRegistry\@\@AEBV?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@\@Z */ MCAPI class Biome const * tryGetAttenuatedBiome(class DividedPos<4> const &, class BiomeRegistry const &, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>> const &) const; /** - * @symbol ?tryMoveWaterEdges\@ChunkBlender\@\@QEBA?BUBlockGenerationResult\@OverworldGeneratorMultinoise\@\@AEBVBlockPos\@\@U23\@\@Z + * @symbol ?tryMoveWaterEdges\@ChunkBlender\@\@QEBA?BUBlockGenerationResult\@OverworldGeneratorMultinoise\@\@AEBVBlockPos\@\@U23\@\@Z */ MCAPI struct OverworldGeneratorMultinoise::BlockGenerationResult const tryMoveWaterEdges(class BlockPos const &, struct OverworldGeneratorMultinoise::BlockGenerationResult) const; /** - * @symbol ??1ChunkBlender\@\@QEAA\@XZ + * @symbol ??1ChunkBlender\@\@QEAA\@XZ */ MCAPI ~ChunkBlender(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkBlenderFactory.hpp b/LiteLoader/include/llapi/mc/ChunkBlenderFactory.hpp index 40e778957e..23e29cf802 100644 --- a/LiteLoader/include/llapi/mc/ChunkBlenderFactory.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBlenderFactory.hpp @@ -25,36 +25,36 @@ class ChunkBlenderFactory { public: /** - * @symbol ??0ChunkBlenderFactory\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0ChunkBlenderFactory\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI ChunkBlenderFactory(class Dimension &); /** - * @symbol ?getOrCreateChunkBlender\@ChunkBlenderFactory\@\@QEAA?AV?$shared_ptr\@VChunkBlender\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @symbol ?getOrCreateChunkBlender\@ChunkBlenderFactory\@\@QEAA?AV?$shared_ptr\@VChunkBlender\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ MCAPI class std::shared_ptr getOrCreateChunkBlender(class ChunkPos const &); /** - * @symbol ?isClientSide\@ChunkBlenderFactory\@\@QEBA?B_NXZ + * @symbol ?isClientSide\@ChunkBlenderFactory\@\@QEBA?B_NXZ */ MCAPI bool const isClientSide() const; //private: /** - * @symbol ?_createChunkBlendingAttenuator\@ChunkBlenderFactory\@\@AEBA?AV?$shared_ptr\@VChunkBlender\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @symbol ?_createChunkBlendingAttenuator\@ChunkBlenderFactory\@\@AEBA?AV?$shared_ptr\@VChunkBlender\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ MCAPI class std::shared_ptr _createChunkBlendingAttenuator(class ChunkPos const &) const; /** - * @symbol ?_finalizeChunkAttenuationData\@ChunkBlenderFactory\@\@AEBA?AV?$vector\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@V?$allocator\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@\@2\@\@std\@\@AEBV?$vector\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@V?$allocator\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@\@2\@\@3\@\@Z + * @symbol ?_finalizeChunkAttenuationData\@ChunkBlenderFactory\@\@AEBA?AV?$vector\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@V?$allocator\@V?$array\@UAttenuationData\@ChunkBlenderUtil\@\@$03\@std\@\@\@2\@\@std\@\@AEBV?$vector\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@V?$allocator\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@\@2\@\@3\@\@Z */ MCAPI std::vector> _finalizeChunkAttenuationData(std::vector> const &) const; /** - * @symbol ?_processDensityColumn\@ChunkBlenderFactory\@\@AEBAXAEAV?$vector\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@V?$allocator\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@\@2\@\@std\@\@AEBVBlendingData\@\@MU?$pair\@HH\@3\@2_N\@Z + * @symbol ?_processDensityColumn\@ChunkBlenderFactory\@\@AEBAXAEAV?$vector\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@V?$allocator\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@\@2\@\@std\@\@AEBVBlendingData\@\@MU?$pair\@HH\@3\@2_N\@Z */ MCAPI void _processDensityColumn(std::vector> &, class BlendingData const &, float, struct std::pair, struct std::pair, bool) const; /** - * @symbol ?_updateIntermediateAttenuationData\@ChunkBlenderFactory\@\@AEBAXAEAV?$vector\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@V?$allocator\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@\@2\@\@std\@\@AEBVChunkPos\@\@1AEBVBlendingData\@\@_N\@Z + * @symbol ?_updateIntermediateAttenuationData\@ChunkBlenderFactory\@\@AEBAXAEAV?$vector\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@V?$allocator\@V?$array\@UIntermediateAttenuationData\@ChunkBlenderFactory\@\@$03\@std\@\@\@2\@\@std\@\@AEBVChunkPos\@\@1AEBVBlendingData\@\@_N\@Z */ MCAPI void _updateIntermediateAttenuationData(std::vector> &, class ChunkPos const &, class ChunkPos const &, class BlendingData const &, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkBlockPos.hpp b/LiteLoader/include/llapi/mc/ChunkBlockPos.hpp index fdc762729e..f1edd77345 100644 --- a/LiteLoader/include/llapi/mc/ChunkBlockPos.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBlockPos.hpp @@ -50,24 +50,24 @@ class ChunkBlockPos { public: /** - * @symbol ??0ChunkBlockPos\@\@QEAA\@EVChunkLocalHeight\@\@E\@Z + * @symbol ??0ChunkBlockPos\@\@QEAA\@EVChunkLocalHeight\@\@E\@Z */ MCAPI ChunkBlockPos(unsigned char, class ChunkLocalHeight, unsigned char); /** - * @symbol ??0ChunkBlockPos\@\@QEAA\@AEBVBlockPos\@\@F\@Z + * @symbol ??0ChunkBlockPos\@\@QEAA\@AEBVBlockPos\@\@F\@Z */ MCAPI ChunkBlockPos(class BlockPos const &, short); /** - * @symbol ?toPos\@ChunkBlockPos\@\@QEBA?AVPos\@\@XZ + * @symbol ?toPos\@ChunkBlockPos\@\@QEBA?AVPos\@\@XZ */ MCAPI class Pos toPos() const; /** - * @symbol ?from2D\@ChunkBlockPos\@\@SA?AV1\@EE\@Z + * @symbol ?from2D\@ChunkBlockPos\@\@SA?AV1\@EE\@Z */ MCAPI static class ChunkBlockPos from2D(unsigned char, unsigned char); /** - * @symbol ?fromLegacyIndex\@ChunkBlockPos\@\@SA?AV1\@G\@Z + * @symbol ?fromLegacyIndex\@ChunkBlockPos\@\@SA?AV1\@G\@Z */ MCAPI static class ChunkBlockPos fromLegacyIndex(unsigned short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp index e617c135f7..a7435e8586 100644 --- a/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicy.hpp @@ -29,43 +29,43 @@ class ChunkBuildOrderPolicy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChunkBuildOrderPolicy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getChunkRebuildPriority\@ChunkBuildOrderPolicy\@\@UEBAHAEBVChunkPos\@\@\@Z + * @vftbl 1 + * @symbol ?getChunkRebuildPriority\@ChunkBuildOrderPolicy\@\@UEBAHAEBVChunkPos\@\@\@Z */ virtual int getChunkRebuildPriority(class ChunkPos const &) const; /** - * @vftbl 2 - * @symbol ?registerForUpdates\@ChunkBuildOrderPolicy\@\@UEAAIXZ + * @vftbl 2 + * @symbol ?registerForUpdates\@ChunkBuildOrderPolicy\@\@UEAAIXZ */ virtual unsigned int registerForUpdates(); /** - * @vftbl 3 - * @symbol ?unregisterForUpdates\@ChunkBuildOrderPolicy\@\@UEAAXI\@Z + * @vftbl 3 + * @symbol ?unregisterForUpdates\@ChunkBuildOrderPolicy\@\@UEAAXI\@Z */ virtual void unregisterForUpdates(unsigned int); /** - * @vftbl 4 - * @symbol ?setPlayerInfluence\@ChunkBuildOrderPolicy\@\@UEAAXIAEBVChunkPos\@\@AEBVVec3\@\@\@Z + * @vftbl 4 + * @symbol ?setPlayerInfluence\@ChunkBuildOrderPolicy\@\@UEAAXIAEBVChunkPos\@\@AEBVVec3\@\@\@Z */ virtual void setPlayerInfluence(unsigned int, class ChunkPos const &, class Vec3 const &); /** - * @vftbl 5 - * @symbol ?setTickingAreaInfluence\@ChunkBuildOrderPolicy\@\@UEAAXIAEBVChunkPos\@\@HH_N1\@Z + * @vftbl 5 + * @symbol ?setTickingAreaInfluence\@ChunkBuildOrderPolicy\@\@UEAAXIAEBVChunkPos\@\@HH_N1\@Z */ virtual void setTickingAreaInfluence(unsigned int, class ChunkPos const &, int, int, bool, bool); /** - * @vftbl 6 - * @symbol ?updateInfluences\@ChunkBuildOrderPolicy\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?updateInfluences\@ChunkBuildOrderPolicy\@\@UEAAXXZ */ virtual void updateInfluences(); /** - * @symbol ??0ChunkBuildOrderPolicy\@\@QEAA\@XZ + * @symbol ??0ChunkBuildOrderPolicy\@\@QEAA\@XZ */ MCAPI ChunkBuildOrderPolicy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp index 216c21f5f3..bed2c17c0d 100644 --- a/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp +++ b/LiteLoader/include/llapi/mc/ChunkBuildOrderPolicyBase.hpp @@ -30,19 +30,25 @@ class ChunkBuildOrderPolicyBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChunkBuildOrderPolicyBase(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual void __unk_vfn_1() = 0; + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?registerForUpdates\@ChunkBuildOrderPolicyBase\@\@UEAAIXZ + * @vftbl 2 + * @symbol ?registerForUpdates\@ChunkBuildOrderPolicyBase\@\@UEAAIXZ */ virtual unsigned int registerForUpdates(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKBUILDORDERPOLICYBASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ChunkBuildOrderPolicyBase(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkKey.hpp b/LiteLoader/include/llapi/mc/ChunkKey.hpp index a1d15517b2..e424530c40 100644 --- a/LiteLoader/include/llapi/mc/ChunkKey.hpp +++ b/LiteLoader/include/llapi/mc/ChunkKey.hpp @@ -28,20 +28,20 @@ class ChunkKey { public: /** - * @symbol ??0ChunkKey\@\@QEAA\@AEBVLevelChunk\@\@\@Z + * @symbol ??0ChunkKey\@\@QEAA\@AEBVLevelChunk\@\@\@Z */ MCAPI ChunkKey(class LevelChunk const &); /** - * @symbol ??0ChunkKey\@\@QEAA\@AEBVChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ??0ChunkKey\@\@QEAA\@AEBVChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI ChunkKey(class ChunkPos const &, class AutomaticID); /** - * @symbol ?asSpan\@ChunkKey\@\@QEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @symbol ?asSpan\@ChunkKey\@\@QEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - MCAPI class gsl::basic_string_span asSpan() const; + MCAPI class std::basic_string_view> asSpan() const; /** - * @symbol ?hashCode\@ChunkKey\@\@QEBA_KXZ + * @symbol ?hashCode\@ChunkKey\@\@QEBA_KXZ */ MCAPI unsigned __int64 hashCode() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp b/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp index ebb34d8f59..232f5580df 100644 --- a/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLoadActionList.hpp @@ -29,56 +29,56 @@ class ChunkLoadActionList { public: /** - * @symbol ??0ChunkLoadActionList\@\@QEAA\@XZ + * @symbol ??0ChunkLoadActionList\@\@QEAA\@XZ */ MCAPI ChunkLoadActionList(); /** - * @symbol ?addChunkLoadedRequest\@ChunkLoadActionList\@\@QEAAXVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunksLoadedStatus\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?addChunkLoadedRequest\@ChunkLoadActionList\@\@QEAAXVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunksLoadedStatus\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void addChunkLoadedRequest(class ChunkLoadedRequest, std::string const &, enum class ChunksLoadedStatus, class LevelStorage &); /** - * @symbol ?loadRequests\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVICommandOriginLoader\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?loadRequests\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVICommandOriginLoader\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void loadRequests(class LevelStorage &, class ICommandOriginLoader &, std::string const &); /** - * @symbol ?onChunkLoaded\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVChunkSource\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelChunk\@\@UTick\@\@\@Z + * @symbol ?onChunkLoaded\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVChunkSource\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelChunk\@\@UTick\@\@\@Z */ MCAPI void onChunkLoaded(class LevelStorage &, class ChunkSource &, std::string const &, class LevelChunk &, struct Tick); /** - * @symbol ?onStaticTickingAreaAdded\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVDimension\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UTick\@\@\@Z + * @symbol ?onStaticTickingAreaAdded\@ChunkLoadActionList\@\@QEAAXAEAVLevelStorage\@\@AEAVDimension\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UTick\@\@\@Z */ MCAPI void onStaticTickingAreaAdded(class LevelStorage &, class Dimension &, std::string const &, struct Tick); /** - * @symbol ?queueRequestOrExecuteAction\@ChunkLoadActionList\@\@QEAA?AW4QueueRequestResult\@\@VChunkLoadedRequest\@\@AEAVServerLevel\@\@AEAVLevelStorage\@\@AEAVDimension\@\@\@Z + * @symbol ?queueRequestOrExecuteAction\@ChunkLoadActionList\@\@QEAA?AW4QueueRequestResult\@\@VChunkLoadedRequest\@\@AEAVServerLevel\@\@AEAVLevelStorage\@\@AEAVDimension\@\@\@Z */ MCAPI enum class QueueRequestResult queueRequestOrExecuteAction(class ChunkLoadedRequest, class ServerLevel &, class LevelStorage &, class Dimension &); /** - * @symbol ?tickRequests\@ChunkLoadActionList\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?tickRequests\@ChunkLoadActionList\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void tickRequests(class ServerLevel &, class Dimension &); /** - * @symbol ??1ChunkLoadActionList\@\@QEAA\@XZ + * @symbol ??1ChunkLoadActionList\@\@QEAA\@XZ */ MCAPI ~ChunkLoadActionList(); //private: /** - * @symbol ?_addChunkLoadedRequest\@ChunkLoadActionList\@\@AEAAXVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunksLoadedStatus\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?_addChunkLoadedRequest\@ChunkLoadActionList\@\@AEAAXVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunksLoadedStatus\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void _addChunkLoadedRequest(class ChunkLoadedRequest, std::string const &, enum class ChunksLoadedStatus, class LevelStorage &); /** - * @symbol ?_saveRequest\@ChunkLoadActionList\@\@AEAAXAEAVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunkRequestListType\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?_saveRequest\@ChunkLoadActionList\@\@AEAAXAEAVChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ChunkRequestListType\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void _saveRequest(class ChunkLoadedRequest &, std::string const &, enum class ChunkRequestListType, class LevelStorage &); /** - * @symbol ?_updateAsyncList\@ChunkLoadActionList\@\@AEAAXAEAVLevelStorage\@\@AEAVDimension\@\@V?$function\@$$A6A?AW4ChunksLoadedStatus\@\@AEAVChunkLoadedRequest\@\@\@Z\@std\@\@\@Z + * @symbol ?_updateAsyncList\@ChunkLoadActionList\@\@AEAAXAEAVLevelStorage\@\@AEAVDimension\@\@V?$function\@$$A6A?AW4ChunksLoadedStatus\@\@AEAVChunkLoadedRequest\@\@\@Z\@std\@\@\@Z */ MCAPI void _updateAsyncList(class LevelStorage &, class Dimension &, class std::function); /** - * @symbol ?_updateTickingList\@ChunkLoadActionList\@\@AEAAXAEAVServerLevel\@\@AEAVDimension\@\@V?$function\@$$A6A?AW4ChunksLoadedStatus\@\@AEAVChunkLoadedRequest\@\@\@Z\@std\@\@\@Z + * @symbol ?_updateTickingList\@ChunkLoadActionList\@\@AEAAXAEAVServerLevel\@\@AEAVDimension\@\@V?$function\@$$A6A?AW4ChunksLoadedStatus\@\@AEAVChunkLoadedRequest\@\@\@Z\@std\@\@\@Z */ MCAPI void _updateTickingList(class ServerLevel &, class Dimension &, class std::function); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkLoadPriority.hpp b/LiteLoader/include/llapi/mc/ChunkLoadPriority.hpp index ef0b43c1fc..837028653e 100644 --- a/LiteLoader/include/llapi/mc/ChunkLoadPriority.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLoadPriority.hpp @@ -28,12 +28,12 @@ class ChunkLoadPriority { public: /** - * @symbol ?getPlayerChunkPriority\@ChunkLoadPriority\@\@SAHAEBVChunkPos\@\@0AEBVVec3\@\@\@Z + * @symbol ?getPlayerChunkPriority\@ChunkLoadPriority\@\@SAHAEBVChunkPos\@\@0AEBVVec3\@\@\@Z */ MCAPI static int getPlayerChunkPriority(class ChunkPos const &, class ChunkPos const &, class Vec3 const &); /** - * @symbol ?getTickingAreaChunkPriority\@ChunkLoadPriority\@\@SAHAEBVChunkPos\@\@0AEBVVec3\@\@_N\@Z + * @symbol ?getTickingAreaChunkPriority\@ChunkLoadPriority\@\@SAHAEBVChunkPos\@\@0AEBVVec3\@\@_N\@Z */ MCAPI static int getTickingAreaChunkPriority(class ChunkPos const &, class ChunkPos const &, class Vec3 const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkLoadTelemetryData.hpp b/LiteLoader/include/llapi/mc/ChunkLoadTelemetryData.hpp index 8b2c278ad9..79ef07a7a0 100644 --- a/LiteLoader/include/llapi/mc/ChunkLoadTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLoadTelemetryData.hpp @@ -31,11 +31,11 @@ struct ChunkLoadTelemetryData { public: /** - * @symbol ?recordLoadedChunk\@ChunkLoadTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z + * @symbol ?recordLoadedChunk\@ChunkLoadTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z */ MCAPI void recordLoadedChunk(class LevelChunk const &); /** - * @symbol ?toJson\@ChunkLoadTelemetryData\@\@QEBA?AVValue\@Json\@\@XZ + * @symbol ?toJson\@ChunkLoadTelemetryData\@\@QEBA?AVValue\@Json\@\@XZ */ MCAPI class Json::Value toJson() const; diff --git a/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp b/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp index 925c72b172..1988e92919 100644 --- a/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLoadedRequest.hpp @@ -31,68 +31,68 @@ class ChunkLoadedRequest { public: /** - * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@2\@_N\@Z + * @symbol ??0ChunkLoadedRequest\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ChunkLoadedRequest(std::string const &, std::unique_ptr, bool); + MCAPI ChunkLoadedRequest(class ChunkLoadedRequest &&); /** - * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBUBounds\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@_N2\@Z + * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBUBounds\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@_N2\@Z */ MCAPI ChunkLoadedRequest(struct Bounds const &, std::unique_ptr, bool, bool); /** - * @symbol ??0ChunkLoadedRequest\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ChunkLoadedRequest\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@2\@_N\@Z */ - MCAPI ChunkLoadedRequest(class ChunkLoadedRequest &&); + MCAPI ChunkLoadedRequest(std::string const &, std::unique_ptr, bool); /** - * @symbol ?areAllChunksLoaded\@ChunkLoadedRequest\@\@QEBA?AW4ChunksLoadedStatus\@\@AEAVDimension\@\@UTick\@\@\@Z + * @symbol ?areAllChunksLoaded\@ChunkLoadedRequest\@\@QEBA?AW4ChunksLoadedStatus\@\@AEAVDimension\@\@UTick\@\@\@Z */ MCAPI enum class ChunksLoadedStatus areAllChunksLoaded(class Dimension &, struct Tick) const; /** - * @symbol ?areaContainsChunk\@ChunkLoadedRequest\@\@QEBA_NAEBVLevelChunk\@\@\@Z + * @symbol ?areaContainsChunk\@ChunkLoadedRequest\@\@QEBA_NAEBVLevelChunk\@\@\@Z */ MCAPI bool areaContainsChunk(class LevelChunk const &) const; /** - * @symbol ?executeAction\@ChunkLoadedRequest\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?executeAction\@ChunkLoadedRequest\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void executeAction(class ServerLevel &, class Dimension &); /** - * @symbol ?getSerializationId\@ChunkLoadedRequest\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSerializationId\@ChunkLoadedRequest\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getSerializationId() const; /** - * @symbol ?isValid\@ChunkLoadedRequest\@\@QEBA_NXZ + * @symbol ?isValid\@ChunkLoadedRequest\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?serialize\@ChunkLoadedRequest\@\@QEAA?AVCompoundTag\@\@W4ChunkRequestListType\@\@\@Z + * @symbol ?serialize\@ChunkLoadedRequest\@\@QEAA?AVCompoundTag\@\@W4ChunkRequestListType\@\@\@Z */ MCAPI class CompoundTag serialize(enum class ChunkRequestListType); /** - * @symbol ?setSerializationId\@ChunkLoadedRequest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setSerializationId\@ChunkLoadedRequest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setSerializationId(std::string const &); /** - * @symbol ?tickingAreaMatches\@ChunkLoadedRequest\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tickingAreaMatches\@ChunkLoadedRequest\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool tickingAreaMatches(std::string const &) const; /** - * @symbol ??1ChunkLoadedRequest\@\@QEAA\@XZ + * @symbol ??1ChunkLoadedRequest\@\@QEAA\@XZ */ MCAPI ~ChunkLoadedRequest(); /** - * @symbol ?isValidTag\@ChunkLoadedRequest\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?isValidTag\@ChunkLoadedRequest\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool isValidTag(class CompoundTag const &); /** - * @symbol ?load\@ChunkLoadedRequest\@\@SA?AUDeserializedChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@0\@Z + * @symbol ?load\@ChunkLoadedRequest\@\@SA?AUDeserializedChunkLoadedRequest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@0\@Z */ MCAPI static struct DeserializedChunkLoadedRequest load(std::string const &, class CompoundTag const &, class ICommandOriginLoader &, std::string const &); //private: /** - * @symbol ?_getTickingArea\@ChunkLoadedRequest\@\@AEBAPEBVITickingAreaView\@\@AEBVDimension\@\@\@Z + * @symbol ?_getTickingArea\@ChunkLoadedRequest\@\@AEBAPEBVITickingAreaView\@\@AEBVDimension\@\@\@Z */ MCAPI class ITickingAreaView const * _getTickingArea(class Dimension const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkLocalNoiseCache.hpp b/LiteLoader/include/llapi/mc/ChunkLocalNoiseCache.hpp index 677fa6fde4..4ddbea1518 100644 --- a/LiteLoader/include/llapi/mc/ChunkLocalNoiseCache.hpp +++ b/LiteLoader/include/llapi/mc/ChunkLocalNoiseCache.hpp @@ -35,24 +35,24 @@ struct CacheEntry { public: /** - * @symbol ??0ChunkLocalNoiseCache\@\@QEAA\@XZ + * @symbol ??0ChunkLocalNoiseCache\@\@QEAA\@V?$DividedPos2d\@$03\@\@H\@Z */ - MCAPI ChunkLocalNoiseCache(); + MCAPI ChunkLocalNoiseCache(class DividedPos2d<4>, int); /** - * @symbol ??0ChunkLocalNoiseCache\@\@QEAA\@V?$DividedPos2d\@$03\@\@H\@Z + * @symbol ??0ChunkLocalNoiseCache\@\@QEAA\@XZ */ - MCAPI ChunkLocalNoiseCache(class DividedPos2d<4>, int); + MCAPI ChunkLocalNoiseCache(); /** - * @symbol ?getCacheEntry\@ChunkLocalNoiseCache\@\@QEBAAEBUCacheEntry\@1\@AEBV?$DividedPos2d\@$03\@\@\@Z + * @symbol ?getCacheEntry\@ChunkLocalNoiseCache\@\@QEBAAEBUCacheEntry\@1\@AEBV?$DividedPos2d\@$03\@\@\@Z */ MCAPI struct ChunkLocalNoiseCache::CacheEntry const & getCacheEntry(class DividedPos2d<4> const &) const; /** - * @symbol ?setCacheEntry\@ChunkLocalNoiseCache\@\@QEAAXAEBV?$DividedPos2d\@$03\@\@AEBUCacheEntry\@1\@\@Z + * @symbol ?setCacheEntry\@ChunkLocalNoiseCache\@\@QEAAXAEBV?$DividedPos2d\@$03\@\@AEBUCacheEntry\@1\@\@Z */ MCAPI void setCacheEntry(class DividedPos2d<4> const &, struct ChunkLocalNoiseCache::CacheEntry const &); /** - * @symbol ??1ChunkLocalNoiseCache\@\@QEAA\@XZ + * @symbol ??1ChunkLocalNoiseCache\@\@QEAA\@XZ */ MCAPI ~ChunkLocalNoiseCache(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp b/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp index cbf82e140d..ad3ecb762d 100644 --- a/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp +++ b/LiteLoader/include/llapi/mc/ChunkMoveNeededSystem.hpp @@ -28,8 +28,8 @@ class ChunkMoveNeededSystem { public: /** - * @symbol ?createChunkMoveNeededSystem\@ChunkMoveNeededSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createChunkMoveNeededSystem\@ChunkMoveNeededSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createChunkMoveNeededSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkPerformanceData.hpp b/LiteLoader/include/llapi/mc/ChunkPerformanceData.hpp index baf9ffb059..0f5bf903f8 100644 --- a/LiteLoader/include/llapi/mc/ChunkPerformanceData.hpp +++ b/LiteLoader/include/llapi/mc/ChunkPerformanceData.hpp @@ -29,15 +29,15 @@ struct ChunkPerformanceData { public: /** - * @symbol ??0ChunkPerformanceData\@\@QEAA\@XZ + * @symbol ??0ChunkPerformanceData\@\@QEAA\@XZ */ MCAPI ChunkPerformanceData(); /** - * @symbol ?recordLoadedChunk\@ChunkPerformanceData\@\@QEAAXAEBVLevelChunk\@\@\@Z + * @symbol ?recordLoadedChunk\@ChunkPerformanceData\@\@QEAAXAEBVLevelChunk\@\@\@Z */ MCAPI void recordLoadedChunk(class LevelChunk const &); /** - * @symbol ?resetAll\@ChunkPerformanceData\@\@QEAAXXZ + * @symbol ?resetAll\@ChunkPerformanceData\@\@QEAAXXZ */ MCAPI void resetAll(); diff --git a/LiteLoader/include/llapi/mc/ChunkPos.hpp b/LiteLoader/include/llapi/mc/ChunkPos.hpp index 5d71aabbda..3728ad1c1e 100644 --- a/LiteLoader/include/llapi/mc/ChunkPos.hpp +++ b/LiteLoader/include/llapi/mc/ChunkPos.hpp @@ -25,7 +25,7 @@ class ChunkPos { ChunkPos() = default; ChunkPos(int ix, int iz) : x(ix), z(iz){}; - constexpr int& operator[](size_t index) { + [[nodiscard]] constexpr int& operator[](size_t index) { switch (index) { case 1: return z; @@ -34,7 +34,7 @@ class ChunkPos { } } - constexpr int operator[](size_t index) const { + [[nodiscard]] constexpr int operator[](size_t index) const { switch (index) { case 1: return z; @@ -56,36 +56,36 @@ class ChunkPos { public: /** - * @symbol ??0ChunkPos\@\@QEAA\@AEBVVec3\@\@\@Z + * @symbol ??0ChunkPos\@\@QEAA\@AEBVVec3\@\@\@Z */ MCAPI ChunkPos(class Vec3 const &); /** - * @symbol ??0ChunkPos\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0ChunkPos\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI ChunkPos(class BlockPos const &); /** - * @symbol ?isWithinBounds\@ChunkPos\@\@QEBA_NAEBV1\@0\@Z + * @symbol ?isWithinBounds\@ChunkPos\@\@QEBA_NAEBV1\@0\@Z */ MCAPI bool isWithinBounds(class ChunkPos const &, class ChunkPos const &) const; /** - * @symbol ?toBlockSpaceVec3\@ChunkPos\@\@QEBA?AVVec3\@\@M\@Z + * @symbol ?toBlockSpaceVec3\@ChunkPos\@\@QEBA?AVVec3\@\@M\@Z */ MCAPI class Vec3 toBlockSpaceVec3(float) const; /** - * @symbol ?INVALID\@ChunkPos\@\@2V1\@B + * @symbol ?INVALID\@ChunkPos\@\@2V1\@B */ MCAPI static class ChunkPos const INVALID; /** - * @symbol ?MAX\@ChunkPos\@\@2V1\@B + * @symbol ?MAX\@ChunkPos\@\@2V1\@B */ MCAPI static class ChunkPos const MAX; /** - * @symbol ?MIN\@ChunkPos\@\@2V1\@B + * @symbol ?MIN\@ChunkPos\@\@2V1\@B */ MCAPI static class ChunkPos const MIN; /** - * @symbol ?ONE\@ChunkPos\@\@2V1\@B + * @symbol ?ONE\@ChunkPos\@\@2V1\@B */ MCAPI static class ChunkPos const ONE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp index b085c095c5..4fbd3078df 100644 --- a/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRadiusUpdatedPacket.hpp @@ -30,37 +30,43 @@ class ChunkRadiusUpdatedPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChunkRadiusUpdatedPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ChunkRadiusUpdatedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ChunkRadiusUpdatedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ChunkRadiusUpdatedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ChunkRadiusUpdatedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ChunkRadiusUpdatedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ChunkRadiusUpdatedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ChunkRadiusUpdatedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKRADIUSUPDATEDPACKET /** - * @symbol ??0ChunkRadiusUpdatedPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ChunkRadiusUpdatedPacket(); + MCVAPI ~ChunkRadiusUpdatedPacket(); +#endif /** - * @symbol ??0ChunkRadiusUpdatedPacket\@\@QEAA\@H\@Z + * @symbol ??0ChunkRadiusUpdatedPacket\@\@QEAA\@H\@Z */ MCAPI ChunkRadiusUpdatedPacket(int); + /** + * @symbol ??0ChunkRadiusUpdatedPacket\@\@QEAA\@XZ + */ + MCAPI ChunkRadiusUpdatedPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp index d4ce7d0fc2..20f9751ff0 100644 --- a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryData.hpp @@ -25,44 +25,44 @@ class ChunkRecyclerTelemetryData { public: /** - * @symbol ?endLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?endLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void endLevel(class Level &); /** - * @symbol ?recordCacheCheck\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z + * @symbol ?recordCacheCheck\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z */ MCAPI void recordCacheCheck(class LevelChunk const &); /** - * @symbol ?recordChunkDeleted\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z + * @symbol ?recordChunkDeleted\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@\@Z */ MCAPI void recordChunkDeleted(class LevelChunk const &); /** - * @symbol ?recordTaskCompleted\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@AEBVTaskInfo\@1\@\@Z + * @symbol ?recordTaskCompleted\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevelChunk\@\@AEBVTaskInfo\@1\@\@Z */ MCAPI void recordTaskCompleted(class LevelChunk const &, class ChunkRecyclerTelemetryData::TaskInfo const &); /** - * @symbol ?startLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevel\@\@\@Z + * @symbol ?startLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevel\@\@\@Z */ MCAPI void startLevel(class Level const &); /** - * @symbol ?tickLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevel\@\@\@Z + * @symbol ?tickLevel\@ChunkRecyclerTelemetryData\@\@QEAAXAEBVLevel\@\@\@Z */ MCAPI void tickLevel(class Level const &); /** - * @symbol ?taskStarted\@ChunkRecyclerTelemetryData\@\@SA?AVTaskInfo\@1\@XZ + * @symbol ?taskStarted\@ChunkRecyclerTelemetryData\@\@SA?AVTaskInfo\@1\@XZ */ MCAPI static class ChunkRecyclerTelemetryData::TaskInfo taskStarted(); //private: /** - * @symbol ?_reset\@ChunkRecyclerTelemetryData\@\@AEAAXXZ + * @symbol ?_reset\@ChunkRecyclerTelemetryData\@\@AEAAXXZ */ MCAPI void _reset(); /** - * @symbol ?_setIsLocked\@ChunkRecyclerTelemetryData\@\@AEAAXXZ + * @symbol ?_setIsLocked\@ChunkRecyclerTelemetryData\@\@AEAAXXZ */ MCAPI void _setIsLocked(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryOutput.hpp b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryOutput.hpp index ed45abed89..bf9e3498dc 100644 --- a/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryOutput.hpp +++ b/LiteLoader/include/llapi/mc/ChunkRecyclerTelemetryOutput.hpp @@ -25,7 +25,7 @@ struct ChunkRecyclerTelemetryOutput { public: /** - * @symbol ??1ChunkRecyclerTelemetryOutput\@\@QEAA\@XZ + * @symbol ??1ChunkRecyclerTelemetryOutput\@\@QEAA\@XZ */ MCAPI ~ChunkRecyclerTelemetryOutput(); diff --git a/LiteLoader/include/llapi/mc/ChunkSource.hpp b/LiteLoader/include/llapi/mc/ChunkSource.hpp index d348c51d30..cec1ec1214 100644 --- a/LiteLoader/include/llapi/mc/ChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkSource.hpp @@ -38,274 +38,280 @@ enum class ChunkSourceViewGenerateMode; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChunkSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shutdown\@ChunkSource\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?shutdown\@ChunkSource\@\@UEAAXXZ */ virtual void shutdown(); /** - * @vftbl 2 - * @symbol ?isShutdownDone\@ChunkSource\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?isShutdownDone\@ChunkSource\@\@UEAA_NXZ */ virtual bool isShutdownDone(); /** - * @vftbl 3 - * @symbol ?getExistingChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @vftbl 3 + * @symbol ?getExistingChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ virtual class std::shared_ptr getExistingChunk(class ChunkPos const &); /** - * @vftbl 4 - * @symbol ?getRandomChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 4 + * @symbol ?getRandomChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVRandom\@\@\@Z */ virtual class std::shared_ptr getRandomChunk(class Random &); /** - * @vftbl 5 - * @symbol ?isChunkKnown\@ChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z + * @vftbl 5 + * @symbol ?isChunkKnown\@ChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z */ virtual bool isChunkKnown(class ChunkPos const &); /** - * @vftbl 6 - * @symbol ?isChunkSaved\@ChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z + * @vftbl 6 + * @symbol ?isChunkSaved\@ChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z */ virtual bool isChunkSaved(class ChunkPos const &); /** - * @vftbl 7 - * @symbol ?createNewChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@1\@_N\@Z + * @vftbl 7 + * @symbol ?createNewChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@1\@_N\@Z */ virtual class std::shared_ptr createNewChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 8 - * @symbol ?getOrLoadChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@1\@_N\@Z + * @vftbl 8 + * @symbol ?getOrLoadChunk\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@1\@_N\@Z */ virtual class std::shared_ptr getOrLoadChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 9 - * @symbol ?postProcess\@ChunkSource\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + * @vftbl 9 + * @symbol ?postProcess\@ChunkSource\@\@UEAA_NAEAVChunkViewSource\@\@\@Z */ virtual bool postProcess(class ChunkViewSource &); /** - * @vftbl 10 - * @symbol ?checkAndReplaceChunk\@ChunkSource\@\@UEAAXAEAVChunkViewSource\@\@AEAVLevelChunk\@\@\@Z + * @vftbl 10 + * @symbol ?checkAndReplaceChunk\@ChunkSource\@\@UEAAXAEAVChunkViewSource\@\@AEAVLevelChunk\@\@\@Z */ virtual void checkAndReplaceChunk(class ChunkViewSource &, class LevelChunk &); /** - * @vftbl 11 - * @symbol ?loadChunk\@ChunkSource\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @vftbl 11 + * @symbol ?loadChunk\@ChunkSource\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ virtual void loadChunk(class LevelChunk &, bool); /** - * @vftbl 12 - * @symbol ?postProcessMobsAt\@ChunkSource\@\@UEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z + * @vftbl 12 + * @symbol ?postProcessMobsAt\@ChunkSource\@\@UEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, int, int, class Random &); /** - * @vftbl 13 - * @symbol ?saveLiveChunk\@ChunkSource\@\@UEAA_NAEAVLevelChunk\@\@\@Z + * @vftbl 13 + * @symbol ?saveLiveChunk\@ChunkSource\@\@UEAA_NAEAVLevelChunk\@\@\@Z */ virtual bool saveLiveChunk(class LevelChunk &); /** - * @vftbl 14 - * @symbol ?writeEntityChunkTransfer\@ChunkSource\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @vftbl 14 + * @symbol ?writeEntityChunkTransfer\@ChunkSource\@\@UEAAXAEAVLevelChunk\@\@\@Z */ virtual void writeEntityChunkTransfer(class LevelChunk &); /** - * @vftbl 15 - * @symbol ?writeEntityChunkTransfersToUnloadedChunk\@ChunkSource\@\@UEAAXAEBVChunkKey\@\@AEBV?$vector\@UActorUnloadedChunkTransferEntry\@\@V?$allocator\@UActorUnloadedChunkTransferEntry\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 15 + * @symbol ?writeEntityChunkTransfersToUnloadedChunk\@ChunkSource\@\@UEAAXAEBVChunkKey\@\@AEBV?$vector\@UActorUnloadedChunkTransferEntry\@\@V?$allocator\@UActorUnloadedChunkTransferEntry\@\@\@std\@\@\@std\@\@\@Z */ virtual void writeEntityChunkTransfersToUnloadedChunk(class ChunkKey const &, std::vector const &); /** - * @vftbl 16 - * @symbol ?hintDiscardBatchBegin\@ChunkSource\@\@UEAAXXZ + * @vftbl 16 + * @symbol ?hintDiscardBatchBegin\@ChunkSource\@\@UEAAXXZ */ virtual void hintDiscardBatchBegin(); /** - * @vftbl 17 - * @symbol ?hintDiscardBatchEnd\@ChunkSource\@\@UEAAXXZ + * @vftbl 17 + * @symbol ?hintDiscardBatchEnd\@ChunkSource\@\@UEAAXXZ */ virtual void hintDiscardBatchEnd(); /** - * @vftbl 18 - * @symbol ?acquireDiscarded\@ChunkSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z + * @vftbl 18 + * @symbol ?acquireDiscarded\@ChunkSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z */ virtual void acquireDiscarded(class std::unique_ptr); /** - * @vftbl 19 - * @symbol ?compact\@ChunkSource\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?compact\@ChunkSource\@\@UEAAXXZ */ virtual void compact(); /** - * @vftbl 20 - * @symbol ?flushPendingDiscardedChunkWrites\@ChunkSource\@\@UEAAXXZ + * @vftbl 20 + * @symbol ?flushPendingDiscardedChunkWrites\@ChunkSource\@\@UEAAXXZ */ virtual void flushPendingDiscardedChunkWrites(); /** - * @vftbl 21 - * @symbol ?flushThreadBatch\@ChunkSource\@\@UEAAXXZ + * @vftbl 21 + * @symbol ?flushThreadBatch\@ChunkSource\@\@UEAAXXZ */ virtual void flushThreadBatch(); /** - * @vftbl 22 - * @symbol ?isWithinWorldLimit\@ChunkSource\@\@UEBA_NAEBVChunkPos\@\@\@Z + * @vftbl 22 + * @symbol ?isWithinWorldLimit\@ChunkSource\@\@UEBA_NAEBVChunkPos\@\@\@Z */ virtual bool isWithinWorldLimit(class ChunkPos const &) const; /** - * @vftbl 23 - * @symbol ?getChunkMap\@ChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @vftbl 23 + * @symbol ?getChunkMap\@ChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const * getChunkMap(); /** - * @vftbl 24 - * @symbol ?getStorage\@ChunkSource\@\@UEBAAEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @vftbl 24 + * @symbol ?getStorage\@ChunkSource\@\@UEBAAEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getStorage() const; /** - * @vftbl 25 - * @symbol ?clearDeletedEntities\@ChunkSource\@\@UEAAXXZ + * @vftbl 25 + * @symbol ?clearDeletedEntities\@ChunkSource\@\@UEAAXXZ */ virtual void clearDeletedEntities(); /** - * @vftbl 26 - * @symbol ?canCreateViews\@ChunkSource\@\@UEBA_NXZ + * @vftbl 26 + * @symbol ?canCreateViews\@ChunkSource\@\@UEBA_NXZ */ virtual bool canCreateViews() const; /** - * @vftbl 27 - * @symbol ?tryGetBlendingDataProvider\@ChunkSource\@\@UEAA?AV?$unique_ptr\@VBlendingDataProvider\@\@U?$default_delete\@VBlendingDataProvider\@\@\@std\@\@\@std\@\@XZ + * @vftbl 27 + * @symbol ?tryGetBlendingDataProvider\@ChunkSource\@\@UEAA?AV?$unique_ptr\@VBlendingDataProvider\@\@U?$default_delete\@VBlendingDataProvider\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryGetBlendingDataProvider(); /** - * @vftbl 28 - * @symbol ?loadLevelChunkMetaDataDictionary\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + * @vftbl 28 + * @symbol ?loadLevelChunkMetaDataDictionary\@ChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ */ virtual class std::shared_ptr loadLevelChunkMetaDataDictionary(); /** - * @vftbl 29 - * @symbol ?setLevelChunk\@ChunkSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z + * @vftbl 29 + * @symbol ?setLevelChunk\@ChunkSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z */ virtual void setLevelChunk(class std::shared_ptr); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKSOURCE /** - * @symbol ??0ChunkSource\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ChunkSource(std::unique_ptr); + MCVAPI ~ChunkSource(); +#endif /** - * @symbol ??0ChunkSource\@\@QEAA\@PEAVDimension\@\@H\@Z + * @symbol ??0ChunkSource\@\@QEAA\@PEAVDimension\@\@H\@Z */ MCAPI ChunkSource(class Dimension *, int); /** - * @symbol ?checkAndLaunchChunkGenerationTasks\@ChunkSource\@\@QEAAX_N\@Z + * @symbol ??0ChunkSource\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI ChunkSource(std::unique_ptr); + /** + * @symbol ?checkAndLaunchChunkGenerationTasks\@ChunkSource\@\@QEAAX_N\@Z */ MCAPI void checkAndLaunchChunkGenerationTasks(bool); /** - * @symbol ?createEmptyView\@ChunkSource\@\@QEAA?AV?$GridArea\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@W4LoadMode\@1\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@W4ChunkSourceViewGenerateMode\@\@\@Z + * @symbol ?createEmptyView\@ChunkSource\@\@QEAA?AV?$GridArea\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@W4LoadMode\@1\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@W4ChunkSourceViewGenerateMode\@\@\@Z */ MCAPI class GridArea> createEmptyView(enum class ChunkSource::LoadMode, bool, class std::function>, class buffer_span)>, enum class ChunkSourceViewGenerateMode); /** - * @symbol ?getAvailableChunk\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @symbol ?getAvailableChunk\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ MCAPI class std::shared_ptr getAvailableChunk(class ChunkPos const &); /** - * @symbol ?getAvailableChunkAt\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getAvailableChunkAt\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::shared_ptr getAvailableChunkAt(class BlockPos const &); /** - * @symbol ?getChunkSide\@ChunkSource\@\@QEBAHXZ + * @symbol ?getChunkSide\@ChunkSource\@\@QEBAHXZ */ MCAPI int getChunkSide() const; /** - * @symbol ?getDimension\@ChunkSource\@\@QEBAAEAVDimension\@\@XZ + * @symbol ?getDimension\@ChunkSource\@\@QEBAAEAVDimension\@\@XZ */ MCAPI class Dimension & getDimension() const; /** - * @symbol ?getGeneratedChunk\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @symbol ?getGeneratedChunk\@ChunkSource\@\@QEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ MCAPI class std::shared_ptr getGeneratedChunk(class ChunkPos const &); /** - * @symbol ?getLevel\@ChunkSource\@\@QEBAAEAVLevel\@\@XZ + * @symbol ?getLevel\@ChunkSource\@\@QEBAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel() const; /** - * @symbol ?setShuttingDown\@ChunkSource\@\@QEAAX_N\@Z + * @symbol ?setShuttingDown\@ChunkSource\@\@QEAAX_N\@Z */ MCAPI void setShuttingDown(bool); /** - * @symbol ?shouldServerGeneratePos\@ChunkSource\@\@QEAA_NAEBVChunkPos\@\@\@Z + * @symbol ?shouldServerGeneratePos\@ChunkSource\@\@QEAA_NAEBVChunkPos\@\@\@Z */ MCAPI bool shouldServerGeneratePos(class ChunkPos const &); /** - * @symbol ?gPerfIsClientSide\@ChunkSource\@\@2_NA + * @symbol ?gPerfIsClientSide\@ChunkSource\@\@2_NA */ MCAPI static bool gPerfIsClientSide; //protected: /** - * @symbol ?_checkAndDispatchTaskForLevelChunk\@ChunkSource\@\@IEAA_NAEBU?$pair\@VChunkPos\@\@W4ChunkState\@\@\@std\@\@_N\@Z + * @symbol ?_checkAndDispatchTaskForLevelChunk\@ChunkSource\@\@IEAA_NAEBU?$pair\@VChunkPos\@\@W4ChunkState\@\@\@std\@\@_N\@Z */ MCAPI bool _checkAndDispatchTaskForLevelChunk(struct std::pair const &, bool); /** - * @symbol ?_checkForReplacementDataTask\@ChunkSource\@\@IEAAXAEAVLevelChunk\@\@AEAVChunkViewSource\@\@\@Z + * @symbol ?_checkForReplacementDataTask\@ChunkSource\@\@IEAAXAEAVLevelChunk\@\@AEAVChunkViewSource\@\@\@Z */ MCAPI void _checkForReplacementDataTask(class LevelChunk &, class ChunkViewSource &); /** - * @symbol ?_checkForUnblockingChunks\@ChunkSource\@\@IEAAXAEBVLevelChunk\@\@\@Z + * @symbol ?_checkForUnblockingChunks\@ChunkSource\@\@IEAAXAEBVLevelChunk\@\@\@Z */ MCAPI void _checkForUnblockingChunks(class LevelChunk const &); /** - * @symbol ?_checkLevelChunkForNextStage\@ChunkSource\@\@IEAAXAEBVLevelChunk\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@W4ChunkState\@\@\@Z + * @symbol ?_checkLevelChunkForNextStage\@ChunkSource\@\@IEAAXAEBVLevelChunk\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@W4ChunkState\@\@\@Z */ MCAPI void _checkLevelChunkForNextStage(class LevelChunk const &, class LevelChunkGridAreaElement> &, enum class ChunkState); /** - * @symbol ?_checkLevelChunkForPostProcessing\@ChunkSource\@\@IEAAXAEBVLevelChunk\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@\@Z + * @symbol ?_checkLevelChunkForPostProcessing\@ChunkSource\@\@IEAAXAEBVLevelChunk\@\@AEAV?$LevelChunkGridAreaElement\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@\@\@Z */ MCAPI void _checkLevelChunkForPostProcessing(class LevelChunk const &, class LevelChunkGridAreaElement> &); /** - * @symbol ?_chunkAtStage\@ChunkSource\@\@IEAA_NV?$weak_ptr\@VLevelChunk\@\@\@std\@\@W4ChunkState\@\@\@Z + * @symbol ?_chunkAtStage\@ChunkSource\@\@IEAA_NV?$weak_ptr\@VLevelChunk\@\@\@std\@\@W4ChunkState\@\@\@Z */ MCAPI bool _chunkAtStage(class std::weak_ptr, enum class ChunkState); /** - * @symbol ?_createOrReplaceGridAreaMap\@ChunkSource\@\@IEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@_N\@Z + * @symbol ?_createOrReplaceGridAreaMap\@ChunkSource\@\@IEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@_N\@Z */ MCAPI void _createOrReplaceGridAreaMap(class std::shared_ptr, bool); /** - * @symbol ?_freeChunkGenerationGridMap\@ChunkSource\@\@IEAAXAEBVChunkPos\@\@_N\@Z + * @symbol ?_freeChunkGenerationGridMap\@ChunkSource\@\@IEAAXAEBVChunkPos\@\@_N\@Z */ MCAPI void _freeChunkGenerationGridMap(class ChunkPos const &, bool); /** - * @symbol ?_launchGenerationTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@_N\@Z + * @symbol ?_launchGenerationTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@_N\@Z */ MCAPI void _launchGenerationTask(class std::shared_ptr const &, bool); /** - * @symbol ?_launchLightingTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBV?$shared_ptr\@VChunkViewSource\@\@\@3\@_N\@Z + * @symbol ?_launchLightingTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBV?$shared_ptr\@VChunkViewSource\@\@\@3\@_N\@Z */ MCAPI void _launchLightingTask(class std::shared_ptr const &, class std::shared_ptr const &, bool); /** - * @symbol ?_launchPostProcessingTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBV?$shared_ptr\@VChunkViewSource\@\@\@3\@_N\@Z + * @symbol ?_launchPostProcessingTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBV?$shared_ptr\@VChunkViewSource\@\@\@3\@_N\@Z */ MCAPI void _launchPostProcessingTask(class std::shared_ptr const &, class std::shared_ptr const &, bool); /** - * @symbol ?_launchReplacementDataTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBV?$shared_ptr\@VChunkViewSource\@\@\@3\@_N\@Z + * @symbol ?_launchReplacementDataTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBV?$shared_ptr\@VChunkViewSource\@\@\@3\@_N\@Z */ MCAPI void _launchReplacementDataTask(class std::shared_ptr const &, class std::shared_ptr const &, bool); /** - * @symbol ?_lightingTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVChunkViewSource\@\@\@Z + * @symbol ?_lightingTask\@ChunkSource\@\@IEAAXAEBV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVChunkViewSource\@\@\@Z */ MCAPI void _lightingTask(class std::shared_ptr const &, class ChunkViewSource &); /** - * @symbol ?_loadChunkTask\@ChunkSource\@\@IEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?_loadChunkTask\@ChunkSource\@\@IEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void _loadChunkTask(class LevelChunk &); /** - * @symbol ?_postProcessingTask\@ChunkSource\@\@IEAAXAEAVLevelChunk\@\@AEAVChunkViewSource\@\@\@Z + * @symbol ?_postProcessingTask\@ChunkSource\@\@IEAAXAEAVLevelChunk\@\@AEAVChunkViewSource\@\@\@Z */ MCAPI void _postProcessingTask(class LevelChunk &, class ChunkViewSource &); /** - * @symbol ?_spawnChunkGenerationTasks\@ChunkSource\@\@IEAAXH_N\@Z + * @symbol ?_spawnChunkGenerationTasks\@ChunkSource\@\@IEAAXH_N\@Z */ MCAPI void _spawnChunkGenerationTasks(int, bool); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkViewOwner.hpp b/LiteLoader/include/llapi/mc/ChunkViewOwner.hpp index 9536aea7ef..af651e8950 100644 --- a/LiteLoader/include/llapi/mc/ChunkViewOwner.hpp +++ b/LiteLoader/include/llapi/mc/ChunkViewOwner.hpp @@ -24,16 +24,16 @@ class ChunkViewOwner { public: /** - * @symbol ??0ChunkViewOwner\@\@QEAA\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol ??0ChunkViewOwner\@\@QEAA\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI ChunkViewOwner(class NetworkIdentifier const &, enum class SubClientId); /** - * @symbol ??0ChunkViewOwner\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ChunkViewOwner\@\@QEAA\@AEBV0\@\@Z */ MCAPI ChunkViewOwner(class ChunkViewOwner const &); /** - * @symbol ?getHash\@ChunkViewOwner\@\@QEBA_KXZ + * @symbol ?getHash\@ChunkViewOwner\@\@QEBA_KXZ */ MCAPI unsigned __int64 getHash() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunkViewSource.hpp b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp index 948390800b..2274726fc8 100644 --- a/LiteLoader/include/llapi/mc/ChunkViewSource.hpp +++ b/LiteLoader/include/llapi/mc/ChunkViewSource.hpp @@ -32,87 +32,93 @@ char filler[0x188]; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ChunkViewSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getExistingChunk\@ChunkViewSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @vftbl 3 + * @symbol ?getExistingChunk\@ChunkViewSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ virtual class std::shared_ptr getExistingChunk(class ChunkPos const &); /** - * @vftbl 4 - * @symbol ?getRandomChunk\@ChunkViewSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 4 + * @symbol ?getRandomChunk\@ChunkViewSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVRandom\@\@\@Z */ virtual class std::shared_ptr getRandomChunk(class Random &); /** - * @vftbl 7 - * @symbol ?createNewChunk\@ChunkViewSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z + * @vftbl 7 + * @symbol ?createNewChunk\@ChunkViewSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z */ virtual class std::shared_ptr createNewChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 18 - * @symbol ?acquireDiscarded\@ChunkViewSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z + * @vftbl 18 + * @symbol ?acquireDiscarded\@ChunkViewSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z */ virtual void acquireDiscarded(class std::unique_ptr); /** - * @vftbl 22 - * @symbol ?isWithinWorldLimit\@ChunkViewSource\@\@UEBA_NAEBVChunkPos\@\@\@Z + * @vftbl 22 + * @symbol ?isWithinWorldLimit\@ChunkViewSource\@\@UEBA_NAEBVChunkPos\@\@\@Z */ virtual bool isWithinWorldLimit(class ChunkPos const &) const; /** - * @vftbl 29 - * @symbol ?setLevelChunk\@ChunkViewSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z + * @vftbl 29 + * @symbol ?setLevelChunk\@ChunkViewSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z */ virtual void setLevelChunk(class std::shared_ptr); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CHUNKVIEWSOURCE /** - * @symbol ??0ChunkViewSource\@\@QEAA\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ChunkViewSource(); +#endif + /** + * @symbol ??0ChunkViewSource\@\@QEAA\@AEBV0\@\@Z */ MCAPI ChunkViewSource(class ChunkViewSource const &); /** - * @symbol ??0ChunkViewSource\@\@QEAA\@AEAVChunkSource\@\@W4LoadMode\@1\@\@Z + * @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 + * @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 + * @symbol ?clear\@ChunkViewSource\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?clearEntryAtChunkPos\@ChunkViewSource\@\@QEAAXAEBVChunkPos\@\@\@Z + * @symbol ?clearEntryAtChunkPos\@ChunkViewSource\@\@QEAAXAEBVChunkPos\@\@\@Z */ MCAPI void clearEntryAtChunkPos(class ChunkPos const &); /** - * @symbol ?enableBlockEntityAccess\@ChunkViewSource\@\@QEAA?AV?$vector\@VLevelChunkBlockActorAccessToken\@\@V?$allocator\@VLevelChunkBlockActorAccessToken\@\@\@std\@\@\@std\@\@XZ + * @symbol ?enableBlockEntityAccess\@ChunkViewSource\@\@QEAA?AV?$vector\@VLevelChunkBlockActorAccessToken\@\@V?$allocator\@VLevelChunkBlockActorAccessToken\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector enableBlockEntityAccess(); /** - * @symbol ?getArea\@ChunkViewSource\@\@QEAAAEAV?$GridArea\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@XZ + * @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\@\@\@Z + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z */ MCAPI void move(struct Bounds const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); /** - * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@0_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@H_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z */ - MCAPI void move(class BlockPos const &, class BlockPos const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); + MCAPI void move(class BlockPos const &, int, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); /** - * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@H_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z + * @symbol ?move\@ChunkViewSource\@\@QEAAXAEBVBlockPos\@\@0_NW4ChunkSourceViewGenerateMode\@\@V?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z */ - MCAPI void move(class BlockPos const &, int, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); + MCAPI void move(class BlockPos const &, class BlockPos const &, bool, enum class ChunkSourceViewGenerateMode, class std::function>, class buffer_span)>); /** - * @symbol ?rebuildSpecificArea\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z + * @symbol ?rebuildSpecificArea\@ChunkViewSource\@\@QEAAXAEBUBounds\@\@_NV?$function\@$$A6AXV?$buffer_span_mut\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@\@V?$buffer_span\@I\@\@\@Z\@std\@\@\@Z */ MCAPI void rebuildSpecificArea(struct Bounds const &, bool, class std::function>, class buffer_span)>); /** - * @symbol ?getGenerateMode\@ChunkViewSource\@\@SA?AW4ChunkSourceViewGenerateMode\@\@_N0\@Z + * @symbol ?getGenerateMode\@ChunkViewSource\@\@SA?AW4ChunkSourceViewGenerateMode\@\@_N0\@Z */ MCAPI static enum class ChunkSourceViewGenerateMode getGenerateMode(bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ChunksLoadedInfo.hpp b/LiteLoader/include/llapi/mc/ChunksLoadedInfo.hpp index 2deec93952..95a31df3b2 100644 --- a/LiteLoader/include/llapi/mc/ChunksLoadedInfo.hpp +++ b/LiteLoader/include/llapi/mc/ChunksLoadedInfo.hpp @@ -30,19 +30,19 @@ struct ChunksLoadedInfo { public: /** - * @symbol ?getChunkViewSource\@ChunksLoadedInfo\@\@QEBA?AV?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getChunkViewSource\@ChunksLoadedInfo\@\@QEBA?AV?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getChunkViewSource() const; /** - * @symbol ?getChunksLoadedStatus\@ChunksLoadedInfo\@\@QEBA?AW4ChunksLoadedStatus\@\@XZ + * @symbol ?getChunksLoadedStatus\@ChunksLoadedInfo\@\@QEBA?AW4ChunksLoadedStatus\@\@XZ */ MCAPI enum class ChunksLoadedStatus getChunksLoadedStatus() const; /** - * @symbol ?areAllChunksLoadedAndTicking\@ChunksLoadedInfo\@\@SA?AW4ChunksLoadedStatus\@\@AEBVDimension\@\@AEAVChunkSource\@\@AEBUBounds\@\@_NUTick\@\@_N\@Z + * @symbol ?areAllChunksLoadedAndTicking\@ChunksLoadedInfo\@\@SA?AW4ChunksLoadedStatus\@\@AEBVDimension\@\@AEAVChunkSource\@\@AEBUBounds\@\@_NUTick\@\@_N\@Z */ MCAPI static enum class ChunksLoadedStatus areAllChunksLoadedAndTicking(class Dimension const &, class ChunkSource &, struct Bounds const &, bool, struct Tick, bool); /** - * @symbol ?calculateChunksLoadedInfo\@ChunksLoadedInfo\@\@SA?AU1\@AEBVDimension\@\@AEAVChunkSource\@\@AEBUBounds\@\@_NUTick\@\@_N55\@Z + * @symbol ?calculateChunksLoadedInfo\@ChunksLoadedInfo\@\@SA?AU1\@AEBVDimension\@\@AEAVChunkSource\@\@AEBUBounds\@\@_NUTick\@\@_N55\@Z */ MCAPI static struct ChunksLoadedInfo calculateChunksLoadedInfo(class Dimension const &, class ChunkSource &, struct Bounds const &, bool, struct Tick, bool, bool, bool); diff --git a/LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp b/LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp index 28922c5957..44947067b7 100644 --- a/LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CircleAroundAnchorDefinition.hpp @@ -30,16 +30,16 @@ class CircleAroundAnchorDefinition { public: /** - * @symbol ??0CircleAroundAnchorDefinition\@\@QEAA\@XZ + * @symbol ??0CircleAroundAnchorDefinition\@\@QEAA\@XZ */ MCAPI CircleAroundAnchorDefinition(); /** - * @symbol ?initialize\@CircleAroundAnchorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVCircleAroundAnchorGoal\@\@\@Z + * @symbol ?initialize\@CircleAroundAnchorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVCircleAroundAnchorGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class CircleAroundAnchorGoal &) const; /** - * @symbol ?buildSchema\@CircleAroundAnchorDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCircleAroundAnchorDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@CircleAroundAnchorDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCircleAroundAnchorDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp b/LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp index 0bebb5e185..109c3a070e 100644 --- a/LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp +++ b/LiteLoader/include/llapi/mc/CircleAroundAnchorGoal.hpp @@ -30,64 +30,64 @@ class CircleAroundAnchorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CircleAroundAnchorGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@CircleAroundAnchorGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@CircleAroundAnchorGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@CircleAroundAnchorGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@CircleAroundAnchorGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@CircleAroundAnchorGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@CircleAroundAnchorGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@CircleAroundAnchorGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@CircleAroundAnchorGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@CircleAroundAnchorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@CircleAroundAnchorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0CircleAroundAnchorGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0CircleAroundAnchorGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI CircleAroundAnchorGoal(class Mob &); //private: /** - * @symbol ?_calculateHeightOffset\@CircleAroundAnchorGoal\@\@AEBAMXZ + * @symbol ?_calculateHeightOffset\@CircleAroundAnchorGoal\@\@AEBAMXZ */ MCAPI float _calculateHeightOffset() const; /** - * @symbol ?_selectNext\@CircleAroundAnchorGoal\@\@AEAAXXZ + * @symbol ?_selectNext\@CircleAroundAnchorGoal\@\@AEAAXXZ */ MCAPI void _selectNext(); /** - * @symbol ?_setAnchorAboveTarget\@CircleAroundAnchorGoal\@\@AEAAXXZ + * @symbol ?_setAnchorAboveTarget\@CircleAroundAnchorGoal\@\@AEAAXXZ */ MCAPI void _setAnchorAboveTarget(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CircuitComponentList.hpp b/LiteLoader/include/llapi/mc/CircuitComponentList.hpp index 08e1d42d54..d8fa8f2ece 100644 --- a/LiteLoader/include/llapi/mc/CircuitComponentList.hpp +++ b/LiteLoader/include/llapi/mc/CircuitComponentList.hpp @@ -30,12 +30,12 @@ public: class Item {}; public: /** - * @symbol ?removeSource\@CircuitComponentList\@\@QEAA_NAEBVBlockPos\@\@PEBVBaseCircuitComponent\@\@\@Z + * @symbol ?removeSource\@CircuitComponentList\@\@QEAA_NAEBVBlockPos\@\@PEBVBaseCircuitComponent\@\@\@Z */ MCAPI bool removeSource(class BlockPos const &, class BaseCircuitComponent const *); /** - * @symbol ??1CircuitComponentList\@\@QEAA\@XZ + * @symbol ??1CircuitComponentList\@\@QEAA\@XZ */ MCAPI ~CircuitComponentList(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp b/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp index 6cf21724fc..026dc2fa5e 100644 --- a/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSceneGraph.hpp @@ -29,76 +29,72 @@ class CircuitSceneGraph { public: /** - * @symbol ??0CircuitSceneGraph\@\@QEAA\@XZ + * @symbol ??0CircuitSceneGraph\@\@QEAA\@XZ */ MCAPI CircuitSceneGraph(); /** - * @symbol ?add\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@V?$unique_ptr\@VBaseCircuitComponent\@\@U?$default_delete\@VBaseCircuitComponent\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?add\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@V?$unique_ptr\@VBaseCircuitComponent\@\@U?$default_delete\@VBaseCircuitComponent\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void add(class BlockPos const &, std::unique_ptr); /** - * @symbol ?getBaseComponent\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBaseComponent\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@\@Z */ MCAPI class BaseCircuitComponent * getBaseComponent(class BlockPos const &); /** - * @symbol ?getComponent\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@W4CircuitComponentType\@\@\@Z + * @symbol ?getComponent\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@W4CircuitComponentType\@\@\@Z */ MCAPI class BaseCircuitComponent * getComponent(class BlockPos const &, enum class CircuitComponentType); /** - * @symbol ?getFromPendingAdd\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@\@Z - */ - MCAPI class BaseCircuitComponent * getFromPendingAdd(class BlockPos const &); - /** - * @symbol ?getFromPendingAdd\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@W4CircuitComponentType\@\@\@Z + * @symbol ?getFromPendingAdd\@CircuitSceneGraph\@\@QEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@W4CircuitComponentType\@\@\@Z */ MCAPI class BaseCircuitComponent * getFromPendingAdd(class BlockPos const &, enum class CircuitComponentType); /** - * @symbol ?invalidatePos\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?invalidatePos\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void invalidatePos(class BlockPos const &); /** - * @symbol ?preSetupPoweredBlocks\@CircuitSceneGraph\@\@QEAAXAEBVChunkPos\@\@\@Z + * @symbol ?preSetupPoweredBlocks\@CircuitSceneGraph\@\@QEAAXAEBVChunkPos\@\@\@Z */ MCAPI void preSetupPoweredBlocks(class ChunkPos const &); /** - * @symbol ?remove\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@\@Z + * @symbol ?remove\@CircuitSceneGraph\@\@QEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@\@Z */ MCAPI void remove(class BlockPos const &, class BaseCircuitComponent *); /** - * @symbol ?update\@CircuitSceneGraph\@\@QEAAXPEAVBlockSource\@\@\@Z + * @symbol ?update\@CircuitSceneGraph\@\@QEAAXPEAVBlockSource\@\@\@Z */ MCAPI void update(class BlockSource *); /** - * @symbol ??1CircuitSceneGraph\@\@QEAA\@XZ + * @symbol ??1CircuitSceneGraph\@\@QEAA\@XZ */ MCAPI ~CircuitSceneGraph(); //private: /** - * @symbol ?findRelationships\@CircuitSceneGraph\@\@AEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@PEAVBlockSource\@\@\@Z + * @symbol ?findRelationships\@CircuitSceneGraph\@\@AEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@PEAVBlockSource\@\@\@Z */ MCAPI void findRelationships(class BlockPos const &, class BaseCircuitComponent *, class BlockSource *); /** - * @symbol ?processPendingAdds\@CircuitSceneGraph\@\@AEAAXXZ + * @symbol ?processPendingAdds\@CircuitSceneGraph\@\@AEAAXXZ */ MCAPI void processPendingAdds(); /** - * @symbol ?processPendingUpdates\@CircuitSceneGraph\@\@AEAAXPEAVBlockSource\@\@\@Z + * @symbol ?processPendingUpdates\@CircuitSceneGraph\@\@AEAAXPEAVBlockSource\@\@\@Z */ MCAPI void processPendingUpdates(class BlockSource *); /** - * @symbol ?removeComponent\@CircuitSceneGraph\@\@AEAAXAEBVBlockPos\@\@\@Z + * @symbol ?removeComponent\@CircuitSceneGraph\@\@AEAAXAEBVBlockPos\@\@\@Z */ MCAPI void removeComponent(class BlockPos const &); /** - * @symbol ?removeStaleRelationships\@CircuitSceneGraph\@\@AEAAXXZ + * @symbol ?removeStaleRelationships\@CircuitSceneGraph\@\@AEAAXXZ */ MCAPI void removeStaleRelationships(); /** - * @symbol ?scheduleRelationshipUpdate\@CircuitSceneGraph\@\@AEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@\@Z + * @symbol ?scheduleRelationshipUpdate\@CircuitSceneGraph\@\@AEAAXAEBVBlockPos\@\@PEAVBaseCircuitComponent\@\@\@Z */ MCAPI void scheduleRelationshipUpdate(class BlockPos const &, class BaseCircuitComponent *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CircuitSystem.hpp b/LiteLoader/include/llapi/mc/CircuitSystem.hpp index 8fa1d0cd4f..b8a193325c 100644 --- a/LiteLoader/include/llapi/mc/CircuitSystem.hpp +++ b/LiteLoader/include/llapi/mc/CircuitSystem.hpp @@ -29,60 +29,60 @@ class CircuitSystem { public: /** - * @symbol ??0CircuitSystem\@\@QEAA\@XZ + * @symbol ??0CircuitSystem\@\@QEAA\@XZ */ MCAPI CircuitSystem(); /** - * @symbol ?evaluate\@CircuitSystem\@\@QEAAXPEAVBlockSource\@\@\@Z + * @symbol ?evaluate\@CircuitSystem\@\@QEAAXPEAVBlockSource\@\@\@Z */ MCAPI void evaluate(class BlockSource *); /** - * @symbol ?getStrength\@CircuitSystem\@\@QEAAHAEBVBlockPos\@\@\@Z + * @symbol ?getStrength\@CircuitSystem\@\@QEAAHAEBVBlockPos\@\@\@Z */ MCAPI int getStrength(class BlockPos const &); /** - * @symbol ?invalidatePos\@CircuitSystem\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?invalidatePos\@CircuitSystem\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void invalidatePos(class BlockPos const &); /** - * @symbol ?isAvailableAt\@CircuitSystem\@\@QEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?isAvailableAt\@CircuitSystem\@\@QEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isAvailableAt(class BlockPos const &); /** - * @symbol ?preSetupPoweredBlocks\@CircuitSystem\@\@QEAAXAEBVChunkPos\@\@\@Z + * @symbol ?preSetupPoweredBlocks\@CircuitSystem\@\@QEAAXAEBVChunkPos\@\@\@Z */ MCAPI void preSetupPoweredBlocks(class ChunkPos const &); /** - * @symbol ?removeComponents\@CircuitSystem\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?removeComponents\@CircuitSystem\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void removeComponents(class BlockPos const &); /** - * @symbol ?setStrength\@CircuitSystem\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?setStrength\@CircuitSystem\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void setStrength(class BlockPos const &, int); /** - * @symbol ?updateBlocks\@CircuitSystem\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?updateBlocks\@CircuitSystem\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void updateBlocks(class BlockSource &, class BlockPos const &); /** - * @symbol ?updateDependencies\@CircuitSystem\@\@QEAAXPEAVBlockSource\@\@\@Z + * @symbol ?updateDependencies\@CircuitSystem\@\@QEAAXPEAVBlockSource\@\@\@Z */ MCAPI void updateDependencies(class BlockSource *); //private: /** - * @symbol ?createComponent\@CircuitSystem\@\@AEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@EV?$unique_ptr\@VBaseCircuitComponent\@\@U?$default_delete\@VBaseCircuitComponent\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?createComponent\@CircuitSystem\@\@AEAAPEAVBaseCircuitComponent\@\@AEBVBlockPos\@\@EV?$unique_ptr\@VBaseCircuitComponent\@\@U?$default_delete\@VBaseCircuitComponent\@\@\@std\@\@\@std\@\@\@Z */ MCAPI class BaseCircuitComponent * createComponent(class BlockPos const &, unsigned char, std::unique_ptr); /** - * @symbol ?evaluateComponents\@CircuitSystem\@\@AEAAX_N\@Z + * @symbol ?evaluateComponents\@CircuitSystem\@\@AEAAX_N\@Z */ MCAPI void evaluateComponents(bool); /** - * @symbol ?updateIndividualBlock\@CircuitSystem\@\@AEAAXV?$not_null\@PEAVBaseCircuitComponent\@\@\@gsl\@\@AEBVBlockPos\@\@1AEAVBlockSource\@\@\@Z + * @symbol ?updateIndividualBlock\@CircuitSystem\@\@AEAAXV?$not_null\@PEAVBaseCircuitComponent\@\@\@gsl\@\@AEBVBlockPos\@\@1AEAVBlockSource\@\@\@Z */ MCAPI void updateIndividualBlock(class gsl::not_null, class BlockPos const &, class BlockPos const &, class BlockSource &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClassID.hpp b/LiteLoader/include/llapi/mc/ClassID.hpp index f4373e5425..0527767f7e 100644 --- a/LiteLoader/include/llapi/mc/ClassID.hpp +++ b/LiteLoader/include/llapi/mc/ClassID.hpp @@ -32,10 +32,10 @@ class ClassID { //private: /** - * @symbol ?getNextID\@ClassID\@\@CA_KXZ + * @symbol ?getNextID\@ClassID\@\@CA_KXZ */ MCAPI static unsigned __int64 getNextID(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClassroomModeListener.hpp b/LiteLoader/include/llapi/mc/ClassroomModeListener.hpp index ba5edabde0..d5325935c9 100644 --- a/LiteLoader/include/llapi/mc/ClassroomModeListener.hpp +++ b/LiteLoader/include/llapi/mc/ClassroomModeListener.hpp @@ -31,54 +31,54 @@ class ClassroomModeListener : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClassroomModeListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLASSROOMMODELISTENER /** - * @symbol ?onAreaChanged\@ClassroomModeListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?onAreaChanged\@ClassroomModeListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCVAPI void onAreaChanged(class BlockSource &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?onBlockChanged\@ClassroomModeListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@IAEBVBlock\@\@2HPEBUActorBlockSyncMessage\@\@W4BlockChangedEventTarget\@\@PEAVActor\@\@\@Z + * @symbol ?onBlockChanged\@ClassroomModeListener\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@IAEBVBlock\@\@2HPEBUActorBlockSyncMessage\@\@W4BlockChangedEventTarget\@\@PEAVActor\@\@\@Z */ MCVAPI void onBlockChanged(class BlockSource &, class BlockPos const &, unsigned int, class Block const &, class Block const &, int, struct ActorBlockSyncMessage const *, enum class BlockChangedEventTarget, class Actor *); /** - * @symbol ?onChunkLoaded\@ClassroomModeListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@ClassroomModeListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkLoaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?onChunkUnloaded\@ClassroomModeListener\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkUnloaded\@ClassroomModeListener\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkUnloaded(class LevelChunk &); /** - * @symbol ?onEntityAdded\@ClassroomModeListener\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?onEntityAdded\@ClassroomModeListener\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void onEntityAdded(class Actor &); /** - * @symbol ?onEntityRemoved\@ClassroomModeListener\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?onEntityRemoved\@ClassroomModeListener\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void onEntityRemoved(class Actor &); #endif /** - * @symbol ??0ClassroomModeListener\@\@QEAA\@AEAVIMinecraftEventing\@\@\@Z + * @symbol ??0ClassroomModeListener\@\@QEAA\@AEAVIMinecraftEventing\@\@\@Z */ MCAPI ClassroomModeListener(class IMinecraftEventing &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp index 41c3f49804..840d90112d 100644 --- a/LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ClassroomModeNetworkHandler.hpp @@ -31,25 +31,25 @@ class ClassroomModeNetworkHandler { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLASSROOMMODENETWORKHANDLER /** - * @symbol ?allowIncomingPacketId\@ClassroomModeNetworkHandler\@\@UEAA_NAEBVNetworkIdentifier\@\@W4MinecraftPacketIds\@\@\@Z + * @symbol ?allowIncomingPacketId\@ClassroomModeNetworkHandler\@\@UEAA_NAEBVNetworkIdentifier\@\@W4MinecraftPacketIds\@\@\@Z */ MCVAPI bool allowIncomingPacketId(class NetworkIdentifier const &, enum class MinecraftPacketIds); /** - * @symbol ?onWebsocketRequest\@ClassroomModeNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?onWebsocketRequest\@ClassroomModeNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z */ MCVAPI void onWebsocketRequest(std::string const &, std::string const &, class std::function); #endif /** - * @symbol ??0ClassroomModeNetworkHandler\@\@QEAA\@_N\@Z + * @symbol ??0ClassroomModeNetworkHandler\@\@QEAA\@_N\@Z */ MCAPI ClassroomModeNetworkHandler(bool); //private: /** - * @symbol ?_connect\@ClassroomModeNetworkHandler\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_connect\@ClassroomModeNetworkHandler\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _connect(std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClayBlock.hpp b/LiteLoader/include/llapi/mc/ClayBlock.hpp index 9bbc093a78..ba4bd71b9d 100644 --- a/LiteLoader/include/llapi/mc/ClayBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClayBlock.hpp @@ -31,223 +31,228 @@ class ClayBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClayBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@ClayBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@ClayBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@ClayBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ClayBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@ClayBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@ClayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@ClayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0ClayBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ClayBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ClayBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClayFeature.hpp b/LiteLoader/include/llapi/mc/ClayFeature.hpp index 27f4220dde..e2334622a0 100644 --- a/LiteLoader/include/llapi/mc/ClayFeature.hpp +++ b/LiteLoader/include/llapi/mc/ClayFeature.hpp @@ -31,18 +31,18 @@ class ClayFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClayFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@ClayFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@ClayFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0ClayFeature\@\@QEAA\@H\@Z + * @symbol ??0ClayFeature\@\@QEAA\@H\@Z */ MCAPI ClayFeature(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClearCommand.hpp b/LiteLoader/include/llapi/mc/ClearCommand.hpp index 0470cf4f6d..e27f950bd8 100644 --- a/LiteLoader/include/llapi/mc/ClearCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearCommand.hpp @@ -31,18 +31,18 @@ class ClearCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClearCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ClearCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ClearCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ClearCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ClearCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp index 26f588eea2..aaa8cbda74 100644 --- a/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/ClearSpawnPointCommand.hpp @@ -31,18 +31,18 @@ class ClearSpawnPointCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClearSpawnPointCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ClearSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ClearSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ClearSpawnPointCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ClearSpawnPointCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp index 7e6e7fb3fb..8aef5f3ab7 100644 --- a/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientAutoStepSystem.hpp @@ -28,32 +28,32 @@ class ClientAutoStepSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientAutoStepSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@ClientAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 + * @vftbl 3 + * @symbol ?tick\@ClientAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ virtual void tick(class StrictExecutionContext, class FlagComponent, 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 + * @symbol ?createClientAutoStepSystem\@ClientAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientAutoStepSystem(); /** - * @symbol ?createClientAutoStepSystemSideBySide\@ClientAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientAutoStepSystemSideBySide\@ClientAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientAutoStepSystemSideBySide(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp index 2f917b9047..bd3d1ea58d 100644 --- a/LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ClientAutomationCommandOrigin.hpp @@ -32,93 +32,93 @@ class ClientAutomationCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientAutomationCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@ClientAutomationCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@ClientAutomationCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientAutomationCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientAutomationCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@ClientAutomationCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@ClientAutomationCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@ClientAutomationCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@ClientAutomationCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@ClientAutomationCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@ClientAutomationCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@ClientAutomationCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@ClientAutomationCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@ClientAutomationCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@ClientAutomationCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@ClientAutomationCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@ClientAutomationCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@ClientAutomationCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ClientAutomationCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@ClientAutomationCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ClientAutomationCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@ClientAutomationCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@ClientAutomationCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@ClientAutomationCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@ClientAutomationCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@ClientAutomationCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ClientAutomationCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 24 - * @symbol ?toCommandOriginData\@ClientAutomationCommandOrigin\@\@UEBA?AUCommandOriginData\@\@XZ + * @vftbl 24 + * @symbol ?toCommandOriginData\@ClientAutomationCommandOrigin\@\@UEBA?AUCommandOriginData\@\@XZ */ virtual struct CommandOriginData toCommandOriginData() const; /** - * @vftbl 29 - * @symbol ?serialize\@ClientAutomationCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@ClientAutomationCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@ClientAutomationCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@ClientAutomationCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0ClientAutomationCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ClientAutomationCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ClientAutomationCommandOrigin(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp index 0e0133d10b..86f7533658 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheBlobStatusPacket.hpp @@ -31,29 +31,29 @@ class ClientCacheBlobStatusPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientCacheBlobStatusPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientCacheBlobStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientCacheBlobStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientCacheBlobStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientCacheBlobStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientCacheBlobStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientCacheBlobStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientCacheBlobStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp index 8e54c0ae97..369230b091 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheMissResponsePacket.hpp @@ -30,33 +30,39 @@ class ClientCacheMissResponsePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientCacheMissResponsePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientCacheMissResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientCacheMissResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientCacheMissResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientCacheMissResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientCacheMissResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientCacheMissResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientCacheMissResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTCACHEMISSRESPONSEPACKET /** - * @symbol ??0ClientCacheMissResponsePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ClientCacheMissResponsePacket(); +#endif + /** + * @symbol ??0ClientCacheMissResponsePacket\@\@QEAA\@XZ */ MCAPI ClientCacheMissResponsePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp index 3991d5eab2..f3c045556a 100644 --- a/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCacheStatusPacket.hpp @@ -30,33 +30,33 @@ class ClientCacheStatusPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientCacheStatusPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientCacheStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientCacheStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientCacheStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientCacheStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientCacheStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientCacheStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientCacheStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ClientCacheStatusPacket\@\@QEAA\@XZ + * @symbol ??0ClientCacheStatusPacket\@\@QEAA\@XZ */ MCAPI ClientCacheStatusPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp index 7dfee17c62..3225f2456f 100644 --- a/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientCheatAbilityPacket.hpp @@ -25,33 +25,33 @@ class ClientCheatAbilityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientCheatAbilityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientCheatAbilityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientCheatAbilityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientCheatAbilityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientCheatAbilityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientCheatAbilityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientCheatAbilityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientCheatAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientCheatAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ClientCheatAbilityPacket\@\@QEAA\@XZ + * @symbol ??0ClientCheatAbilityPacket\@\@QEAA\@XZ */ MCAPI ClientCheatAbilityPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp b/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp index 5bc56cd1d2..0a730b5b26 100644 --- a/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp +++ b/LiteLoader/include/llapi/mc/ClientChunkGenerationValidationData.hpp @@ -10,32 +10,31 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ClientChunkGenerationValidationData. - * - */ -struct ClientChunkGenerationValidationData { + +class ClientChunkGenerationValidationData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTCHUNKGENERATIONVALIDATIONDATA public: - struct ClientChunkGenerationValidationData& operator=(struct ClientChunkGenerationValidationData const &) = delete; - ClientChunkGenerationValidationData(struct ClientChunkGenerationValidationData const &) = delete; + class ClientChunkGenerationValidationData& operator=(class ClientChunkGenerationValidationData const &) = delete; + ClientChunkGenerationValidationData(class ClientChunkGenerationValidationData const &) = delete; ClientChunkGenerationValidationData() = delete; #endif public: /** - * @symbol ?captureServerChunkData\@ClientChunkGenerationValidationData\@\@QEAAXAEAVChunkSource\@\@\@Z + * @symbol ?captureServerChunkData\@ClientChunkGenerationValidationData\@\@QEAAXAEAVChunkSource\@\@\@Z */ MCAPI void captureServerChunkData(class ChunkSource &); //protected: /** - * @symbol ?_captureChunkData\@ClientChunkGenerationValidationData\@\@IEAAXAEAV?$map\@VChunkPos\@\@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\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEAVChunkSource\@\@\@Z + * @symbol ?_captureChunkData\@ClientChunkGenerationValidationData\@\@IEAAXAEAV?$map\@VChunkPos\@\@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\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEAVChunkSource\@\@\@Z */ MCAPI void _captureChunkData(class std::map, struct std::less, class std::allocator>>> &, class ChunkSource &); -}; \ No newline at end of file +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp b/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp new file mode 100644 index 0000000000..7c83536389 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ClientInputLockComponent.hpp @@ -0,0 +1,44 @@ +/** + * @file ClientInputLockComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct ClientInputLockComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTINPUTLOCKCOMPONENT +public: + struct ClientInputLockComponent& operator=(struct ClientInputLockComponent const &) = delete; + ClientInputLockComponent(struct ClientInputLockComponent const &) = delete; + ClientInputLockComponent() = delete; +#endif + +public: + /** + * @symbol ?hasAnyLock\@ClientInputLockComponent\@\@QEBA_NXZ + */ + MCAPI bool hasAnyLock() const; + /** + * @symbol ?hasLockCategory\@ClientInputLockComponent\@\@QEBA_NW4ClientInputLockCategory\@\@\@Z + */ + MCAPI bool hasLockCategory(enum class ClientInputLockCategory) const; + /** + * @symbol ?hasLockType\@ClientInputLockComponent\@\@QEBA_NW4ClientInputLockType\@\@\@Z + */ + MCAPI bool hasLockType(enum class ClientInputLockType) const; + /** + * @symbol ?setLockCategory\@ClientInputLockComponent\@\@QEAAXW4ClientInputLockCategory\@\@_N\@Z + */ + MCAPI void setLockCategory(enum class ClientInputLockCategory, bool); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp b/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp index 1fb80ff5b6..80509c0ac2 100644 --- a/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientInputUpdateSystem.hpp @@ -28,8 +28,12 @@ class ClientInputUpdateSystem { public: /** - * @symbol ?create\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ClientInputUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?extractRawHIDInput\@ClientInputUpdateSystem\@\@SAXAEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NAEAURawMoveInputComponent\@\@AEBVMoveInputHandler\@\@PEBUSneakingComponent\@\@\@Z + */ + MCAPI static void extractRawHIDInput(class LayeredAbilities const &, class SynchedActorData const &, bool, struct RawMoveInputComponent &, class MoveInputHandler const &, struct SneakingComponent const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp b/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp index 904d89afb7..046290729d 100644 --- a/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientInteractStopRidingSystem.hpp @@ -28,12 +28,12 @@ class ClientInteractStopRidingSystem { public: /** - * @symbol ?createSystem\@ClientInteractStopRidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ClientInteractStopRidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tick\@ClientInteractStopRidingSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURuntimeIDComponent\@\@\@\@\@Z + * @symbol ?tick\@ClientInteractStopRidingSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURuntimeIDComponent\@\@\@\@\@Z */ MCAPI static void tick(class StrictEntityContext &, struct PassengerComponent const &, struct StateVectorComponent const &, class EntityModifierT &, class ViewT, struct RuntimeIDComponent const>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientLevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ClientLevelEventCoordinator.hpp index fa45e7ec01..1910d5f9d2 100644 --- a/LiteLoader/include/llapi/mc/ClientLevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ClientLevelEventCoordinator.hpp @@ -30,4 +30,4 @@ class ClientLevelEventCoordinator { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp index 2f9e098d6d..637d689cb6 100644 --- a/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ClientPlayerEventCoordinator.hpp @@ -30,16 +30,16 @@ class ClientPlayerEventCoordinator { public: /** - * @symbol ?sendPlayerDestroyedBlock\@ClientPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@\@Z + * @symbol ?sendPlayerDestroyedBlock\@ClientPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlock\@\@\@Z */ MCAPI void sendPlayerDestroyedBlock(class Player &, class Block const &); /** - * @symbol ?sendPlayerInput\@ClientPlayerEventCoordinator\@\@QEAAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z + * @symbol ?sendPlayerInput\@ClientPlayerEventCoordinator\@\@QEAAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z */ MCAPI void sendPlayerInput(struct IPlayerMovementProxy &, class MoveInputHandler &); /** - * @symbol ?sendStartDestroyBlock\@ClientPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAE\@Z + * @symbol ?sendStartDestroyBlock\@ClientPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAE\@Z */ MCAPI void sendStartDestroyBlock(class Player &, class BlockPos const &, unsigned char &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp b/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp index bbea62ff8d..38632af11e 100644 --- a/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientPlayerInputFilterSystem.hpp @@ -28,16 +28,16 @@ class ClientPlayerInputFilterSystem { public: /** - * @symbol ?create\@ClientPlayerInputFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ClientPlayerInputFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); //private: /** - * @symbol ?tickSystem\@ClientPlayerInputFilterSystem\@\@CAXAEAVStrictEntityContext\@\@AEBVLoadingStateComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerInputRequestComponent\@\@\@\@\@Z + * @symbol ?tickSystem\@ClientPlayerInputFilterSystem\@\@CAXAEAVStrictEntityContext\@\@AEBVLoadingStateComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerInputRequestComponent\@\@\@\@\@Z */ MCAPI static void tickSystem(class StrictEntityContext &, class LoadingStateComponent const &, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientPlayerRewindSystem.hpp b/LiteLoader/include/llapi/mc/ClientPlayerRewindSystem.hpp index 5bcca96b7e..7ee01bbdba 100644 --- a/LiteLoader/include/llapi/mc/ClientPlayerRewindSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientPlayerRewindSystem.hpp @@ -28,16 +28,16 @@ class ClientPlayerRewindSystem { public: /** - * @symbol ?createSystem\@ClientPlayerRewindSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ClientPlayerRewindSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doClientPlayerRewindSystem\@ClientPlayerRewindSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVReplayStateComponent\@\@\@Z + * @symbol ?_doClientPlayerRewindSystem\@ClientPlayerRewindSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVReplayStateComponent\@\@\@Z */ MCAPI static void _doClientPlayerRewindSystem(class StrictEntityContext const &, class ActorOwnerComponent &, class ReplayStateComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientReplayStatePolicy.hpp b/LiteLoader/include/llapi/mc/ClientReplayStatePolicy.hpp index bd7776a66c..0f943a5a68 100644 --- a/LiteLoader/include/llapi/mc/ClientReplayStatePolicy.hpp +++ b/LiteLoader/include/llapi/mc/ClientReplayStatePolicy.hpp @@ -30,42 +30,42 @@ class ClientReplayStatePolicy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientReplayStatePolicy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isReplayNeeded\@ClientReplayStatePolicy\@\@UEBA_NW4AdvanceFrameResult\@\@\@Z + * @vftbl 1 + * @symbol ?isReplayNeeded\@ClientReplayStatePolicy\@\@UEBA_NW4AdvanceFrameResult\@\@\@Z */ virtual bool isReplayNeeded(enum class AdvanceFrameResult) const; /** - * @vftbl 2 - * @symbol ?canRewindToFrame\@ClientReplayStatePolicy\@\@UEAA_NAEAUIActorMovementProxy\@\@_K1\@Z + * @vftbl 2 + * @symbol ?canRewindToFrame\@ClientReplayStatePolicy\@\@UEAA_NAEAUIActorMovementProxy\@\@_K1\@Z */ virtual bool canRewindToFrame(struct IActorMovementProxy &, unsigned __int64, unsigned __int64); /** - * @vftbl 3 - * @symbol ?shouldCorrectMovement\@ClientReplayStatePolicy\@\@UEAA?AUMovementCorrection\@\@AEAUIActorMovementProxy\@\@AEBVPlayerAuthInputPacket\@\@_K\@Z + * @vftbl 3 + * @symbol ?shouldCorrectMovement\@ClientReplayStatePolicy\@\@UEAA?AUMovementCorrection\@\@AEAUIActorMovementProxy\@\@AEBVPlayerAuthInputPacket\@\@_K\@Z */ virtual struct MovementCorrection shouldCorrectMovement(struct IActorMovementProxy &, class PlayerAuthInputPacket const &, unsigned __int64); /** - * @vftbl 4 - * @symbol ?flagUnsupportedMovement\@ClientReplayStatePolicy\@\@UEAAX_K\@Z + * @vftbl 4 + * @symbol ?flagUnsupportedMovement\@ClientReplayStatePolicy\@\@UEAAX_K\@Z */ virtual void flagUnsupportedMovement(unsigned __int64); /** - * @vftbl 5 - * @symbol ?storeCurrentFrameSupported\@ClientReplayStatePolicy\@\@UEAAX_KAEAUIActorMovementProxy\@\@\@Z + * @vftbl 5 + * @symbol ?storeCurrentFrameSupported\@ClientReplayStatePolicy\@\@UEAAX_KAEAUIActorMovementProxy\@\@\@Z */ virtual void storeCurrentFrameSupported(unsigned __int64, struct IActorMovementProxy &); /** - * @symbol ?_checkSupportedFrame\@ClientReplayStatePolicy\@\@QEBA_NAEAUIActorMovementProxy\@\@\@Z + * @symbol ?_checkSupportedFrame\@ClientReplayStatePolicy\@\@QEBA_NAEAUIActorMovementProxy\@\@\@Z */ MCAPI bool _checkSupportedFrame(struct IActorMovementProxy &) const; /** - * @symbol ?_isSupportedMovementMode\@ClientReplayStatePolicy\@\@QEBA_NAEBUIMobMovementProxy\@\@\@Z + * @symbol ?_isSupportedMovementMode\@ClientReplayStatePolicy\@\@QEBA_NAEBUIMobMovementProxy\@\@\@Z */ MCAPI bool _isSupportedMovementMode(struct IMobMovementProxy const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp index 3469678290..3f182723c5 100644 --- a/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClientRequestPlaceholderBlock.hpp @@ -31,198 +31,203 @@ class ClientRequestPlaceholderBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientRequestPlaceholderBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@ClientRequestPlaceholderBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0ClientRequestPlaceholderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0ClientRequestPlaceholderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI ClientRequestPlaceholderBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp b/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp index 4d1f5c3fff..8cac945791 100644 --- a/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/ClientStopGlidingSystem.hpp @@ -11,42 +11,42 @@ #undef BEFORE_EXTRA -struct ClientStopGlidingSystem { +class ClientStopGlidingSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIENTSTOPGLIDINGSYSTEM public: - struct ClientStopGlidingSystem& operator=(struct ClientStopGlidingSystem const &) = delete; - ClientStopGlidingSystem(struct ClientStopGlidingSystem const &) = delete; + class ClientStopGlidingSystem& operator=(class ClientStopGlidingSystem const &) = delete; + ClientStopGlidingSystem(class ClientStopGlidingSystem const &) = delete; ClientStopGlidingSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientStopGlidingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@ClientStopGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@U?$Read\@UStateVectorComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@ClientStopGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@U?$Read\@UStateVectorComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, class FlagComponent>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?createClientStopGlidingSystem\@ClientStopGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientStopGlidingSystem\@ClientStopGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientStopGlidingSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp index 03499ea1f3..d82496745d 100644 --- a/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientToServerHandshakePacket.hpp @@ -30,33 +30,33 @@ class ClientToServerHandshakePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientToServerHandshakePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientToServerHandshakePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientToServerHandshakePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientToServerHandshakePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientToServerHandshakePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientToServerHandshakePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientToServerHandshakePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientToServerHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ClientToServerHandshakePacket\@\@QEAA\@XZ + * @symbol ??0ClientToServerHandshakePacket\@\@QEAA\@XZ */ MCAPI ClientToServerHandshakePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientVibrationComponent.hpp b/LiteLoader/include/llapi/mc/ClientVibrationComponent.hpp index 7b390adccd..47cfede7e7 100644 --- a/LiteLoader/include/llapi/mc/ClientVibrationComponent.hpp +++ b/LiteLoader/include/llapi/mc/ClientVibrationComponent.hpp @@ -28,12 +28,12 @@ class ClientVibrationComponent { public: /** - * @symbol ?getTicksSinceLastVibration\@ClientVibrationComponent\@\@QEBA?AV?$optional\@_K\@std\@\@AEBVILevel\@\@\@Z + * @symbol ?getTicksSinceLastVibration\@ClientVibrationComponent\@\@QEBA?AV?$optional\@_K\@std\@\@AEBVILevel\@\@\@Z */ MCAPI class std::optional getTicksSinceLastVibration(class ILevel const &) const; /** - * @symbol ?setLastVibrationTick\@ClientVibrationComponent\@\@QEAAXUTick\@\@\@Z + * @symbol ?setLastVibrationTick\@ClientVibrationComponent\@\@QEAAXUTick\@\@\@Z */ MCAPI void setLastVibrationTick(struct Tick); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp index 6e813d68fd..19b4075750 100644 --- a/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundDebugRendererPacket.hpp @@ -30,41 +30,47 @@ class ClientboundDebugRendererPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientboundDebugRendererPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientboundDebugRendererPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientboundDebugRendererPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientboundDebugRendererPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientboundDebugRendererPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientboundDebugRendererPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientboundDebugRendererPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientboundDebugRendererPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTBOUNDDEBUGRENDERERPACKET /** - * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ClientboundDebugRendererPacket(); + MCVAPI ~ClientboundDebugRendererPacket(); +#endif /** - * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z + * @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(enum class ClientboundDebugRendererPacket::Type); + MCAPI ClientboundDebugRendererPacket(std::string, class mce::Color const &, class Vec3 const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000>>); /** - * @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 + * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@XZ */ - MCAPI ClientboundDebugRendererPacket(std::string, class mce::Color const &, class Vec3 const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000>>); + MCAPI ClientboundDebugRendererPacket(); + /** + * @symbol ??0ClientboundDebugRendererPacket\@\@QEAA\@W4Type\@0\@\@Z + */ + MCAPI ClientboundDebugRendererPacket(enum class ClientboundDebugRendererPacket::Type); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp index 9d1ed18526..616fdebbb8 100644 --- a/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ClientboundMapItemDataPacket.hpp @@ -31,41 +31,47 @@ class ClientboundMapItemDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClientboundMapItemDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ClientboundMapItemDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ClientboundMapItemDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ClientboundMapItemDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ClientboundMapItemDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ClientboundMapItemDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ClientboundMapItemDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ClientboundMapItemDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLIENTBOUNDMAPITEMDATAPACKET /** - * @symbol ??0ClientboundMapItemDataPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ClientboundMapItemDataPacket(); + MCVAPI ~ClientboundMapItemDataPacket(); +#endif /** - * @symbol ??0ClientboundMapItemDataPacket\@\@QEAA\@V?$not_null\@PEAVMapItemSavedData\@\@\@gsl\@\@AEAVLevel\@\@\@Z + * @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 + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClimateParameters.hpp b/LiteLoader/include/llapi/mc/ClimateParameters.hpp index 6f16061904..5aeb3d7391 100644 --- a/LiteLoader/include/llapi/mc/ClimateParameters.hpp +++ b/LiteLoader/include/llapi/mc/ClimateParameters.hpp @@ -12,11 +12,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ClimateParameters. - * - */ -struct ClimateParameters { + +class ClimateParameters { #define AFTER_EXTRA // Add Member There @@ -24,19 +21,19 @@ struct ClimateParameters { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CLIMATEPARAMETERS public: - struct ClimateParameters& operator=(struct ClimateParameters const &) = delete; - ClimateParameters(struct ClimateParameters const &) = delete; + class ClimateParameters& operator=(class ClimateParameters const &) = delete; + ClimateParameters(class ClimateParameters const &) = delete; ClimateParameters() = delete; #endif public: /** - * @symbol ??0ClimateParameters\@\@QEAA\@UParameter\@ClimateUtils\@\@00000M\@Z + * @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 + * @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/ClimateUtils.hpp b/LiteLoader/include/llapi/mc/ClimateUtils.hpp index 7a813ff9e8..ba3ce1db7d 100644 --- a/LiteLoader/include/llapi/mc/ClimateUtils.hpp +++ b/LiteLoader/include/llapi/mc/ClimateUtils.hpp @@ -32,7 +32,7 @@ struct Parameter { #undef AFTER_EXTRA /** - * @symbol ?squareDistance\@ClimateUtils\@\@YA_JAEBV?$array\@UParameter\@ClimateUtils\@\@$06\@std\@\@AEBUTargetSpace\@1\@\@Z + * @symbol ?squareDistance\@ClimateUtils\@\@YA_JAEBV?$array\@UParameter\@ClimateUtils\@\@$06\@std\@\@AEBUTargetSpace\@1\@\@Z */ MCAPI __int64 squareDistance(class std::array const &, struct ClimateUtils::TargetSpace const &); diff --git a/LiteLoader/include/llapi/mc/ClipDefaults.hpp b/LiteLoader/include/llapi/mc/ClipDefaults.hpp index 56205eeef2..8ae72e9c50 100644 --- a/LiteLoader/include/llapi/mc/ClipDefaults.hpp +++ b/LiteLoader/include/llapi/mc/ClipDefaults.hpp @@ -20,7 +20,7 @@ namespace ClipDefaults { #undef AFTER_EXTRA /** - * @symbol ?CHECK_ALL_PICKABLE_BLOCKS\@ClipDefaults\@\@3V?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@B + * @symbol ?CHECK_ALL_PICKABLE_BLOCKS\@ClipDefaults\@\@3V?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@B */ MCAPI extern class std::function const CHECK_ALL_PICKABLE_BLOCKS; diff --git a/LiteLoader/include/llapi/mc/ClipParameters.hpp b/LiteLoader/include/llapi/mc/ClipParameters.hpp index 60dfcfaf8a..f4e167cd32 100644 --- a/LiteLoader/include/llapi/mc/ClipParameters.hpp +++ b/LiteLoader/include/llapi/mc/ClipParameters.hpp @@ -28,11 +28,11 @@ struct ClipParameters { public: /** - * @symbol ??0ClipParameters\@\@QEAA\@AEBVVec3\@\@0AEBV?$function\@$$A6A_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z\@std\@\@\@Z + * @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 ??1ClipParameters\@\@QEAA\@XZ + * @symbol ??1ClipParameters\@\@QEAA\@XZ */ MCAPI ~ClipParameters(); diff --git a/LiteLoader/include/llapi/mc/ClockItem.hpp b/LiteLoader/include/llapi/mc/ClockItem.hpp index c05292da9d..e3e99914c5 100644 --- a/LiteLoader/include/llapi/mc/ClockItem.hpp +++ b/LiteLoader/include/llapi/mc/ClockItem.hpp @@ -32,88 +32,88 @@ class ClockItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 118 - * @symbol ?getIconInfo\@ClockItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@ClockItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 120 - * @symbol ?getAnimationFrameFor\@ClockItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@ClockItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @symbol ??0ClockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ClockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ClockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp b/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp index 69f678cea7..cfb7453577 100644 --- a/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp +++ b/LiteLoader/include/llapi/mc/ClockSpriteCalculator.hpp @@ -29,20 +29,20 @@ class ClockSpriteCalculator { public: /** - * @symbol ??0ClockSpriteCalculator\@\@QEAA\@XZ + * @symbol ??0ClockSpriteCalculator\@\@QEAA\@XZ */ MCAPI ClockSpriteCalculator(); /** - * @symbol ?getFrame\@ClockSpriteCalculator\@\@QEBAHXZ + * @symbol ?getFrame\@ClockSpriteCalculator\@\@QEBAHXZ */ MCAPI int getFrame() const; /** - * @symbol ?update\@ClockSpriteCalculator\@\@QEAAHAEAVActor\@\@_N\@Z + * @symbol ?update\@ClockSpriteCalculator\@\@QEAAHAEBVBlockSource\@\@AEBVVec3\@\@_N\@Z */ - MCAPI int update(class Actor &, bool); + MCAPI int update(class BlockSource const &, class Vec3 const &, bool); /** - * @symbol ?update\@ClockSpriteCalculator\@\@QEAAHAEBVBlockSource\@\@AEBVVec3\@\@_N\@Z + * @symbol ?update\@ClockSpriteCalculator\@\@QEAAHAEAVActor\@\@_N\@Z */ - MCAPI int update(class BlockSource const &, class Vec3 const &, bool); + MCAPI int update(class Actor &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CloneCommand.hpp b/LiteLoader/include/llapi/mc/CloneCommand.hpp index 5118ae7e13..3e1bc135b9 100644 --- a/LiteLoader/include/llapi/mc/CloneCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloneCommand.hpp @@ -31,18 +31,18 @@ class CloneCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CloneCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@CloneCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@CloneCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@CloneCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@CloneCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp index 6f252577f5..f42b2adee6 100644 --- a/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp +++ b/LiteLoader/include/llapi/mc/CloseWebSocketCommand.hpp @@ -31,17 +31,17 @@ class CloseWebSocketCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CloseWebSocketCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@CloseWebSocketCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@CloseWebSocketCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@CloseWebSocketCommand\@\@SAXAEAVCommandRegistry\@\@AEAVIMinecraftApp\@\@\@Z + * @symbol ?setup\@CloseWebSocketCommand\@\@SAXAEAVCommandRegistry\@\@AEAVIMinecraftApp\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class IMinecraftApp &); @@ -49,8 +49,8 @@ class CloseWebSocketCommand : public Command { private: /** - * @symbol ?mApp\@CloseWebSocketCommand\@\@0PEAVIMinecraftApp\@\@EA + * @symbol ?mApp\@CloseWebSocketCommand\@\@0PEAVIMinecraftApp\@\@EA */ MCAPI static class IMinecraftApp * mApp; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClothBlock.hpp b/LiteLoader/include/llapi/mc/ClothBlock.hpp index ce96e20769..65e1f462f9 100644 --- a/LiteLoader/include/llapi/mc/ClothBlock.hpp +++ b/LiteLoader/include/llapi/mc/ClothBlock.hpp @@ -31,233 +31,218 @@ class ClothBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClothBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ClothBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z - */ - virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; - /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ClothBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @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 134 - * @symbol ?isAuxValueRelevantForPicking\@ClothBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ClothBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@ClothBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 185 - * @symbol __unk_vfn_185 - */ - virtual void __unk_vfn_185(); - /** - * @vftbl 187 - * @symbol ?getResourceItem\@ClothBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_178(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@ClothBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CLOTHBLOCK /** - * @symbol ?canDamperVibrations\@ClothBlock\@\@UEBA_NXZ + * @symbol ?canDamperVibrations\@ClothBlock\@\@UEBA_NXZ */ MCVAPI bool canDamperVibrations() const; /** - * @symbol ?canOccludeVibrations\@ClothBlock\@\@UEBA_NXZ + * @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 + * @symbol ??0ClothBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ClothBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ClothBlockItem.hpp b/LiteLoader/include/llapi/mc/ClothBlockItem.hpp index 736d67a56a..5aa6c7ccbc 100644 --- a/LiteLoader/include/llapi/mc/ClothBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ClothBlockItem.hpp @@ -32,88 +32,88 @@ class ClothBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ClothBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@ClothBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@ClothBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ 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 + * @vftbl 95 + * @symbol ?buildDescriptionId\@ClothBlockItem\@\@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 + * @symbol ??0ClothBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z */ MCAPI ClothBlockItem(std::string const &, int, class Block const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoalItem.hpp b/LiteLoader/include/llapi/mc/CoalItem.hpp index 7c0a61367a..95db3601f9 100644 --- a/LiteLoader/include/llapi/mc/CoalItem.hpp +++ b/LiteLoader/include/llapi/mc/CoalItem.hpp @@ -32,88 +32,88 @@ class CoalItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoalItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@CoalItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@CoalItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 128 - * @symbol ?getFurnaceXPmultiplier\@CoalItem\@\@UEBAMAEBVItemStackBase\@\@\@Z + * @vftbl 128 + * @symbol ?getFurnaceXPmultiplier\@CoalItem\@\@UEBAMAEBVItemStackBase\@\@\@Z */ virtual float getFurnaceXPmultiplier(class ItemStackBase const &) const; /** - * @symbol ??0CoalItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@\@Z + * @symbol ??0CoalItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@\@Z */ MCAPI CoalItem(std::string const &, int, enum class CoalItem::Type); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp index 0db441de46..7f02b70703 100644 --- a/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/CobblestoneBlock.hpp @@ -31,198 +31,203 @@ class CobblestoneBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CobblestoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 159 - * @symbol ?tryGetInfested\@CobblestoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 159 + * @symbol ?tryGetInfested\@CobblestoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0CobblestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0CobblestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI CobblestoneBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CocoaBlock.hpp b/LiteLoader/include/llapi/mc/CocoaBlock.hpp index dc7f6becd2..a848c64118 100644 --- a/LiteLoader/include/llapi/mc/CocoaBlock.hpp +++ b/LiteLoader/include/llapi/mc/CocoaBlock.hpp @@ -31,258 +31,263 @@ class CocoaBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CocoaBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@CocoaBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@CocoaBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@CocoaBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CocoaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CocoaBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CocoaBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@CocoaBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@CocoaBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COCOABLOCK /** - * @symbol ?canBeSilkTouched\@CocoaBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@CocoaBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0CocoaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CocoaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CocoaBlock(std::string const &, int); /** - * @symbol ?isSupportedBy\@CocoaBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isSupportedBy\@CocoaBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isSupportedBy(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodeBuilder.hpp b/LiteLoader/include/llapi/mc/CodeBuilder.hpp index c392464c77..3f08353942 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilder.hpp @@ -33,51 +33,51 @@ struct DataMessage; #undef AFTER_EXTRA /** - * @symbol ?deserialize\@CodeBuilder\@\@YA?AUMCRESULT\@\@AEBVValue\@Json\@\@AEAURequestHeader\@1\@\@Z + * @symbol ?deserialize\@CodeBuilder\@\@YA?AUMCRESULT\@\@AEBVValue\@Json\@\@AEAURequestHeader\@1\@\@Z */ MCAPI struct MCRESULT deserialize(class Json::Value const &, struct CodeBuilder::RequestHeader &); /** - * @symbol ?fromString\@CodeBuilder\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAW4EncryptionCipherMode\@1\@\@Z - */ - MCAPI bool fromString(std::string const &, enum class CodeBuilder::EncryptionCipherMode &); - /** - * @symbol ?fromString\@CodeBuilder\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAW4RequestPurpose\@1\@\@Z + * @symbol ?fromString\@CodeBuilder\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAW4RequestPurpose\@1\@\@Z */ MCAPI bool fromString(std::string const &, enum class CodeBuilder::RequestPurpose &); /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUAgentMessage\@1\@\@Z + * @symbol ?fromString\@CodeBuilder\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAW4EncryptionCipherMode\@1\@\@Z */ - MCAPI std::string serialize(struct CodeBuilder::AgentMessage const &); + 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\@\@Z */ 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\@\@AEBUChatMessage\@1\@AEBV23\@\@Z - */ - MCAPI std::string serialize(struct CodeBuilder::ChatMessage const &, std::string const &); - /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandMessage\@1\@\@Z + * @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\@\@AEBUDataMessage\@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::DataMessage 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\@\@AEBUEncryptionResult\@1\@\@Z + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEncryptionResult\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::EncryptionResult const &); /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUErrorMessage\@1\@\@Z + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUErrorMessage\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::ErrorMessage const &); /** - * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEventMessage\@1\@\@Z + * @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\@\@AEBUEventMessage\@1\@\@Z */ MCAPI std::string serialize(struct CodeBuilder::EventMessage const &); /** - * @symbol ?toString\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ResponsePurpose\@1\@\@Z + * @symbol ?serialize\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUAgentMessage\@1\@\@Z + */ + MCAPI std::string serialize(struct CodeBuilder::AgentMessage const &); + /** + * @symbol ?toString\@CodeBuilder\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ResponsePurpose\@1\@\@Z */ MCAPI std::string toString(enum class CodeBuilder::ResponsePurpose); diff --git a/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp index 018a6e12b9..bdbffb19cc 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderActorInfoCommand.hpp @@ -29,18 +29,18 @@ class CodeBuilderActorInfoCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CodeBuilderActorInfoCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@CodeBuilderActorInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@CodeBuilderActorInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@CodeBuilderActorInfoCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@CodeBuilderActorInfoCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp index 00407d1639..2c6794b6db 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderCommand.hpp @@ -31,18 +31,18 @@ class CodeBuilderCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CodeBuilderCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@CodeBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@CodeBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@CodeBuilderCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@CodeBuilderCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp index 4b316625ba..b12de3e3ef 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderPacket.hpp @@ -31,29 +31,35 @@ class CodeBuilderPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CodeBuilderPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CodeBuilderPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CodeBuilderPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CodeBuilderPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CodeBuilderPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CodeBuilderPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CodeBuilderPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CodeBuilderPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CODEBUILDERPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CodeBuilderPacket(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderServerCommands.hpp b/LiteLoader/include/llapi/mc/CodeBuilderServerCommands.hpp index 8c0f7d90db..9b88c9005d 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderServerCommands.hpp @@ -28,8 +28,8 @@ class CodeBuilderServerCommands { public: /** - * @symbol ?setupStandardServer\@CodeBuilderServerCommands\@\@SAXAEAVMinecraft\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setupStandardServer\@CodeBuilderServerCommands\@\@SAXAEAVMinecraft\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void setupStandardServer(class Minecraft &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp index 14658f9bbd..48a64f5eef 100644 --- a/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/CodeBuilderSourcePacket.hpp @@ -28,33 +28,33 @@ class CodeBuilderSourcePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CodeBuilderSourcePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CodeBuilderSourcePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CodeBuilderSourcePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CodeBuilderSourcePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CodeBuilderSourcePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CodeBuilderSourcePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CodeBuilderSourcePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CodeBuilderSourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0CodeBuilderSourcePacket\@\@QEAA\@XZ + * @symbol ??0CodeBuilderSourcePacket\@\@QEAA\@XZ */ MCAPI CodeBuilderSourcePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp index 772914a5be..d56ae6086f 100644 --- a/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/CodeScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure CodeScreenCapabilities. - * - */ -struct CodeScreenCapabilities { + +class CodeScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,27 @@ struct CodeScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CODESCREENCAPABILITIES public: - struct CodeScreenCapabilities& operator=(struct CodeScreenCapabilities const &) = delete; - CodeScreenCapabilities(struct CodeScreenCapabilities const &) = delete; + class CodeScreenCapabilities& operator=(class CodeScreenCapabilities const &) = delete; + CodeScreenCapabilities(class CodeScreenCapabilities const &) = delete; CodeScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CodeScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UCodeScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UCodeScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CODESCREENCAPABILITIES + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CodeScreenCapabilities(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CodebuilderComponent.hpp b/LiteLoader/include/llapi/mc/CodebuilderComponent.hpp index 94de13f57c..16337d1ff8 100644 --- a/LiteLoader/include/llapi/mc/CodebuilderComponent.hpp +++ b/LiteLoader/include/llapi/mc/CodebuilderComponent.hpp @@ -28,20 +28,20 @@ class CodebuilderComponent { public: /** - * @symbol ?getCodeStatus\@CodebuilderComponent\@\@QEBA?AW4CodeStatus\@CodeBuilderExecutionState\@\@XZ + * @symbol ?getCodeStatus\@CodebuilderComponent\@\@QEBA?AW4CodeStatus\@CodeBuilderExecutionState\@\@XZ */ MCAPI enum class CodeBuilderExecutionState::CodeStatus getCodeStatus() const; /** - * @symbol ?resetCodeStatus\@CodebuilderComponent\@\@QEAAXXZ + * @symbol ?resetCodeStatus\@CodebuilderComponent\@\@QEAAXXZ */ MCAPI void resetCodeStatus(); /** - * @symbol ?setCodeStatus\@CodebuilderComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCodeStatus\@CodebuilderComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCodeStatus(std::string const &); /** - * @symbol ?stringToCodeStatus\@CodebuilderComponent\@\@QEBA?AW4CodeStatus\@CodeBuilderExecutionState\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?stringToCodeStatus\@CodebuilderComponent\@\@QEBA?AW4CodeStatus\@CodeBuilderExecutionState\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class CodeBuilderExecutionState::CodeStatus stringToCodeStatus(std::string const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CollidableMobNotifierSystem.hpp b/LiteLoader/include/llapi/mc/CollidableMobNotifierSystem.hpp index 8851d5c2dc..54a305247a 100644 --- a/LiteLoader/include/llapi/mc/CollidableMobNotifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/CollidableMobNotifierSystem.hpp @@ -28,16 +28,16 @@ class CollidableMobNotifierSystem { public: /** - * @symbol ?createSystem\@CollidableMobNotifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@CollidableMobNotifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickNotifier\@CollidableMobNotifierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@AEAULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@\@Z + * @symbol ?tickNotifier\@CollidableMobNotifierSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorFirstTick\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@AEAULocalSpatialEntityFetcherFactoryComponent\@\@AEAVLocalSpatialEntityFetcher\@\@\@Z */ - MCAPI static void tickNotifier(class StrictEntityContext const &, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, class ViewT>>, class ViewT>>, class EntityModifierT>, struct LocalSpatialEntityFetcherFactoryComponent &, class LocalSpatialEntityFetcher &); + MCAPI static void tickNotifier(class StrictEntityContext const &, struct AABBShapeComponent const &, struct DimensionTypeComponent const &, class ViewT>, struct Exclude>>, class ViewT>>, class EntityModifierT>, struct LocalSpatialEntityFetcherFactoryComponent &, class LocalSpatialEntityFetcher &); /** - * @symbol ?tickSystem\@CollidableMobNotifierSystem\@\@SAXV?$OptionalGlobalT\@ULocalSpatialEntityFetcherFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@Z + * @symbol ?tickSystem\@CollidableMobNotifierSystem\@\@SAXV?$OptionalGlobalT\@ULocalSpatialEntityFetcherFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorRemovedFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UActorFirstTick\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tickSystem(class OptionalGlobalT, class ViewT, class FlagComponent, class FlagComponent>, struct Exclude>, struct AABBShapeComponent const, struct DimensionTypeComponent const>, class ViewT>>, class ViewT>>, class EntityModifierT>); + MCAPI static void tickSystem(class OptionalGlobalT, class ViewT, class FlagComponent>, struct Exclude>, struct AABBShapeComponent const, struct DimensionTypeComponent const>, class ViewT>, struct Exclude>>, class ViewT>>, class EntityModifierT>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp b/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp index cbd05b57a0..d56704c305 100644 --- a/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CollisionBoxDefinition.hpp @@ -31,19 +31,19 @@ struct CollisionBoxDefinition { public: /** - * @symbol ?setHeight\@CollisionBoxDefinition\@\@QEAAXAEBM\@Z + * @symbol ?setHeight\@CollisionBoxDefinition\@\@QEAAXAEBM\@Z */ MCAPI void setHeight(float const &); /** - * @symbol ?setWidth\@CollisionBoxDefinition\@\@QEAAXAEBM\@Z + * @symbol ?setWidth\@CollisionBoxDefinition\@\@QEAAXAEBM\@Z */ MCAPI void setWidth(float const &); /** - * @symbol ?buildSchema\@CollisionBoxDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCollisionBoxDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@CollisionBoxDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UCollisionBoxDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); /** - * @symbol ?mBoxEpsilon\@CollisionBoxDefinition\@\@2MB + * @symbol ?mBoxEpsilon\@CollisionBoxDefinition\@\@2MB */ MCAPI static float const mBoxEpsilon; diff --git a/LiteLoader/include/llapi/mc/Color2Definition.hpp b/LiteLoader/include/llapi/mc/Color2Definition.hpp index cc6006f191..970c3711b2 100644 --- a/LiteLoader/include/llapi/mc/Color2Definition.hpp +++ b/LiteLoader/include/llapi/mc/Color2Definition.hpp @@ -31,7 +31,7 @@ struct Color2Definition { public: /** - * @symbol ?buildSchema\@Color2Definition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UColor2Definition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@Color2Definition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UColor2Definition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/ColorChannel.hpp b/LiteLoader/include/llapi/mc/ColorChannel.hpp index 8165707c9b..8ac28ae090 100644 --- a/LiteLoader/include/llapi/mc/ColorChannel.hpp +++ b/LiteLoader/include/llapi/mc/ColorChannel.hpp @@ -30,8 +30,8 @@ class ColorChannel { public: /** - * @symbol ?INVALID\@ColorChannel\@\@2V1\@B + * @symbol ?INVALID\@ColorChannel\@\@2V1\@B */ MCAPI static class ColorChannel const INVALID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ColorDefinition.hpp b/LiteLoader/include/llapi/mc/ColorDefinition.hpp index 5bf22e02dc..9a648dfd0a 100644 --- a/LiteLoader/include/llapi/mc/ColorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ColorDefinition.hpp @@ -31,11 +31,11 @@ struct ColorDefinition { public: /** - * @symbol ?setColorChoice\@ColorDefinition\@\@QEAAXAEBH\@Z + * @symbol ?setColorChoice\@ColorDefinition\@\@QEAAXAEBH\@Z */ MCAPI void setColorChoice(int const &); /** - * @symbol ?buildSchema\@ColorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UColorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ColorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UColorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/ColorFormat.hpp b/LiteLoader/include/llapi/mc/ColorFormat.hpp index fb3ae02a89..5763a5a9ef 100644 --- a/LiteLoader/include/llapi/mc/ColorFormat.hpp +++ b/LiteLoader/include/llapi/mc/ColorFormat.hpp @@ -50,103 +50,103 @@ LIAPI std::string& transferColorCodeToConsole(std::string& str, bool keepColorCo #undef AFTER_EXTRA /** - * @symbol ?AQUA\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AQUA\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const AQUA; /** - * @symbol ?BLACK\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLACK\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BLACK; /** - * @symbol ?BLUE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLUE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BLUE; /** - * @symbol ?BOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BOLD; /** - * @symbol ?ColorCodeFromColor\@ColorFormat\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?ColorCodeFromColor\@ColorFormat\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI std::string ColorCodeFromColor(class mce::Color const &); /** - * @symbol ?ColorFromColorCode\@ColorFormat\@\@YAPEBVColor\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?ColorFromColorCode\@ColorFormat\@\@YAPEBVColor\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class mce::Color const * ColorFromColorCode(std::string const &); /** - * @symbol ?DARK_AQUA\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DARK_AQUA\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DARK_AQUA; /** - * @symbol ?DARK_BLUE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DARK_BLUE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DARK_BLUE; /** - * @symbol ?DARK_GRAY\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DARK_GRAY\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DARK_GRAY; /** - * @symbol ?DARK_GREEN\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DARK_GREEN\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DARK_GREEN; /** - * @symbol ?DARK_PURPLE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DARK_PURPLE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DARK_PURPLE; /** - * @symbol ?DARK_RED\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DARK_RED\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DARK_RED; /** - * @symbol ?ESCAPE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ESCAPE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ESCAPE; /** - * @symbol ?FromString\@ColorFormat\@\@YA?BV?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?FromString\@ColorFormat\@\@YA?BV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ - MCAPI class gsl::basic_string_span const FromString(std::string const &); + MCAPI class std::basic_string_view> const FromString(std::string const &); /** - * @symbol ?GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const GOLD; /** - * @symbol ?GRAY\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?GRAY\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const GRAY; /** - * @symbol ?GREEN\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?GREEN\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const GREEN; /** - * @symbol ?ITALIC\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ITALIC\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ITALIC; /** - * @symbol ?LIGHT_PURPLE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?LIGHT_PURPLE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const LIGHT_PURPLE; /** - * @symbol ?MINECOIN_GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MINECOIN_GOLD\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const MINECOIN_GOLD; /** - * @symbol ?OBFUSCATED\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OBFUSCATED\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OBFUSCATED; /** - * @symbol ?RED\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RED\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const RED; /** - * @symbol ?RESET\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RESET\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const RESET; /** - * @symbol ?WHITE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?WHITE\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const WHITE; /** - * @symbol ?YELLOW\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?YELLOW\@ColorFormat\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const YELLOW; diff --git a/LiteLoader/include/llapi/mc/ColoredBlock.hpp b/LiteLoader/include/llapi/mc/ColoredBlock.hpp index bf6b83b1c2..fb76083872 100644 --- a/LiteLoader/include/llapi/mc/ColoredBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredBlock.hpp @@ -31,223 +31,228 @@ class ColoredBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ColoredBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ColoredBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@ColoredBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@ColoredBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ColoredBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@ColoredBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 185 + * @symbol ?getMapColor\@ColoredBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@ColoredBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@ColoredBlock\@\@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 ??0ColoredBlock\@\@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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp index 7dae865071..2259190b6b 100644 --- a/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/ColoredTorchBlock.hpp @@ -31,245 +31,250 @@ class ColoredTorchBlock : public TorchBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ColoredTorchBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@ColoredTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@ColoredTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ColoredTorchBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ColoredTorchBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ColoredTorchBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@ColoredTorchBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@ColoredTorchBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ColoredTorchBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@ColoredTorchBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ColoredTorchBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@ColoredTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@ColoredTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@ColoredTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0ColoredTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ColoredTorchColor\@\@\@Z + * @symbol ??0ColoredTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ColoredTorchColor\@\@\@Z */ MCAPI ColoredTorchBlock(std::string const &, int, enum class ColoredTorchColor); /** - * @symbol ?getItemForColor\@ColoredTorchBlock\@\@SA?AVItemInstance\@\@W4ColoredTorchColor\@\@\@Z + * @symbol ?getItemForColor\@ColoredTorchBlock\@\@SA?AVItemInstance\@\@W4ColoredTorchColor\@\@\@Z */ MCAPI static class ItemInstance getItemForColor(enum class ColoredTorchColor); //private: /** - * @symbol ?_getColor\@ColoredTorchBlock\@\@AEBA?AW4ColoredTorchColor\@\@AEBVBlock\@\@\@Z + * @symbol ?_getColor\@ColoredTorchBlock\@\@AEBA?AW4ColoredTorchColor\@\@AEBVBlock\@\@\@Z */ MCAPI enum class ColoredTorchColor _getColor(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ColumnUtils.hpp b/LiteLoader/include/llapi/mc/ColumnUtils.hpp index 3794e9a395..65fd176fe6 100644 --- a/LiteLoader/include/llapi/mc/ColumnUtils.hpp +++ b/LiteLoader/include/llapi/mc/ColumnUtils.hpp @@ -27,11 +27,11 @@ struct ColumnRange { #undef AFTER_EXTRA /** - * @symbol ?scanColumn\@ColumnUtils\@\@YA?AV?$optional\@UColumnRange\@ColumnUtils\@\@\@std\@\@AEBVBlockPos\@\@HV?$function\@$$A6A_NAEBVBlockPos\@\@\@Z\@3\@1\@Z + * @symbol ?scanColumn\@ColumnUtils\@\@YA?AV?$optional\@UColumnRange\@ColumnUtils\@\@\@std\@\@AEBVBlockPos\@\@HV?$function\@$$A6A_NAEBVBlockPos\@\@\@Z\@3\@1\@Z */ MCAPI class std::optional scanColumn(class BlockPos const &, int, class std::function, class std::function); /** - * @symbol ?scanColumnWithinPosBiome\@ColumnUtils\@\@YA?AV?$optional\@UColumnRange\@ColumnUtils\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HV?$function\@$$A6A_NAEBVBlockPos\@\@\@Z\@3\@2\@Z + * @symbol ?scanColumnWithinPosBiome\@ColumnUtils\@\@YA?AV?$optional\@UColumnRange\@ColumnUtils\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HV?$function\@$$A6A_NAEBVBlockPos\@\@\@Z\@3\@2\@Z */ MCAPI class std::optional scanColumnWithinPosBiome(class IBlockWorldGenAPI &, class BlockPos const &, int, class std::function, class std::function); diff --git a/LiteLoader/include/llapi/mc/CombatRegenerationComponent.hpp b/LiteLoader/include/llapi/mc/CombatRegenerationComponent.hpp index 5ff58fdfe8..fe176b70ff 100644 --- a/LiteLoader/include/llapi/mc/CombatRegenerationComponent.hpp +++ b/LiteLoader/include/llapi/mc/CombatRegenerationComponent.hpp @@ -30,20 +30,20 @@ class CombatRegenerationComponent { public: /** - * @symbol ?tick\@CombatRegenerationComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?tick\@CombatRegenerationComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void tick(class Actor &); //private: /** - * @symbol ?_applyCombatBuffsToMob\@CombatRegenerationComponent\@\@AEAAXAEAVActor\@\@0\@Z + * @symbol ?_applyCombatBuffsToMob\@CombatRegenerationComponent\@\@AEAAXAEAVActor\@\@0\@Z */ MCAPI void _applyCombatBuffsToMob(class Actor &, class Actor &); /** - * @symbol ?_getDefinition\@CombatRegenerationComponent\@\@AEBAPEBVCombatRegenerationDefinition\@\@AEAVActor\@\@\@Z + * @symbol ?_getDefinition\@CombatRegenerationComponent\@\@AEBAPEBVCombatRegenerationDefinition\@\@AEAVActor\@\@\@Z */ MCAPI class CombatRegenerationDefinition const * _getDefinition(class Actor &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CombatRegenerationDefinition.hpp b/LiteLoader/include/llapi/mc/CombatRegenerationDefinition.hpp index d6341eeb98..74218ddcae 100644 --- a/LiteLoader/include/llapi/mc/CombatRegenerationDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CombatRegenerationDefinition.hpp @@ -31,8 +31,8 @@ class CombatRegenerationDefinition { public: /** - * @symbol ?buildSchema\@CombatRegenerationDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCombatRegenerationDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@CombatRegenerationDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VCombatRegenerationDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CombatRegenerationListener.hpp b/LiteLoader/include/llapi/mc/CombatRegenerationListener.hpp index 16137fa442..5869deddac 100644 --- a/LiteLoader/include/llapi/mc/CombatRegenerationListener.hpp +++ b/LiteLoader/include/llapi/mc/CombatRegenerationListener.hpp @@ -30,54 +30,14 @@ class CombatRegenerationListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CombatRegenerationListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol ?onEvent\@CombatRegenerationListener\@\@UEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z */ - 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 __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @symbol __unk_vfn_5 - */ - virtual void __unk_vfn_5(); - /** - * @vftbl 6 - * @symbol __unk_vfn_6 - */ - virtual void __unk_vfn_6(); - /** - * @vftbl 7 - * @symbol __unk_vfn_7 - */ - virtual void __unk_vfn_7(); - /** - * @vftbl 8 - * @symbol __unk_vfn_8 - */ - virtual void __unk_vfn_8(); - /** - * @vftbl 9 - * @symbol ?onActorDeath\@CombatRegenerationListener\@\@UEAA?AW4EventResult\@\@AEAVActor\@\@AEBVActorDamageSource\@\@W4ActorType\@\@\@Z - */ - virtual enum class EventResult onActorDeath(class Actor &, class ActorDamageSource const &, enum class ActorType); + virtual enum class EventResult onEvent(struct ActorNotificationEvent const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CombatRegenerationSystem.hpp b/LiteLoader/include/llapi/mc/CombatRegenerationSystem.hpp index 3505562c2e..e510799c86 100644 --- a/LiteLoader/include/llapi/mc/CombatRegenerationSystem.hpp +++ b/LiteLoader/include/llapi/mc/CombatRegenerationSystem.hpp @@ -30,19 +30,19 @@ class CombatRegenerationSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CombatRegenerationSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@CombatRegenerationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@CombatRegenerationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CombinedHotbarAndInventoryContainerValidation.hpp b/LiteLoader/include/llapi/mc/CombinedHotbarAndInventoryContainerValidation.hpp index 816618685d..49e4881ba9 100644 --- a/LiteLoader/include/llapi/mc/CombinedHotbarAndInventoryContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/CombinedHotbarAndInventoryContainerValidation.hpp @@ -31,60 +31,60 @@ class CombinedHotbarAndInventoryContainerValidation : public ContainerValidation public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CombinedHotbarAndInventoryContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@CombinedHotbarAndInventoryContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@CombinedHotbarAndInventoryContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@CombinedHotbarAndInventoryContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@CombinedHotbarAndInventoryContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMBINEDHOTBARANDINVENTORYCONTAINERVALIDATION /** - * @symbol ?canItemMoveToContainer\@CombinedHotbarAndInventoryContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@CombinedHotbarAndInventoryContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Command.hpp b/LiteLoader/include/llapi/mc/Command.hpp index c95cf4be5a..7fb8b17d1c 100644 --- a/LiteLoader/include/llapi/mc/Command.hpp +++ b/LiteLoader/include/llapi/mc/Command.hpp @@ -53,78 +53,95 @@ class Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ virtual ~Command(); /** - * @vftbl 1 - * @symbol ?execute\@XPCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?collectOptionalArguments\@Command\@\@MEAA_NXZ */ +protected: + virtual bool collectOptionalArguments(); + /** + * @vftbl 2 + * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + */ +public: virtual void execute(class CommandOrigin const &, class CommandOutput &) const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMAND /** - * @symbol ??0Command\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Command(); +#endif + /** + * @symbol ??0Command\@\@QEAA\@XZ */ MCAPI Command(); /** - * @symbol ?getCommandName\@Command\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCommandName\@Command\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getCommandName() const; /** - * @symbol ?getVersion\@Command\@\@QEBAHXZ + * @symbol ?getVersion\@Command\@\@QEBAHXZ */ MCAPI int getVersion() const; /** - * @symbol ?hasFlag\@Command\@\@QEBA_NUCommandFlag\@\@\@Z + * @symbol ?hasFlag\@Command\@\@QEBA_NUCommandFlag\@\@\@Z */ MCAPI bool hasFlag(struct CommandFlag) const; /** - * @symbol ?run\@Command\@\@QEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?run\@Command\@\@QEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void run(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?WILDCARD_TOKEN\@Command\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?WILDCARD_TOKEN\@Command\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const WILDCARD_TOKEN; /** - * @symbol ?validRange\@Command\@\@SA_NHHHAEAVCommandOutput\@\@\@Z + * @symbol ?shouldUseCommandOriginRotation\@Command\@\@SA_NAEBVCommandOrigin\@\@H\@Z */ - MCAPI static bool validRange(int, int, int, class CommandOutput &); + MCAPI static bool shouldUseCommandOriginRotation(class CommandOrigin const &, int); /** - * @symbol ?validRange\@Command\@\@SA_NMMMAEAVCommandOutput\@\@\@Z + * @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: /** - * @symbol ?getRegistry\@Command\@\@IEBAAEBVCommandRegistry\@\@XZ + * @symbol ?getRegistry\@Command\@\@IEBAAEBVCommandRegistry\@\@XZ */ MCAPI class CommandRegistry const & getRegistry() const; /** - * @symbol ?sendTelemetry\@Command\@\@IEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?sendTelemetry\@Command\@\@IEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void sendTelemetry(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?shouldSendTelemetry\@Command\@\@IEBA_NAEBVCommandOrigin\@\@\@Z + * @symbol ?shouldSendTelemetry\@Command\@\@IEBA_NAEBVCommandOrigin\@\@\@Z */ MCAPI bool shouldSendTelemetry(class CommandOrigin const &) const; /** - * @symbol ?getPlayerFromOrigin\@Command\@\@KAPEAVPlayer\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?getPlayerFromOrigin\@Command\@\@KAPEAVPlayer\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI static class Player * getPlayerFromOrigin(class CommandOrigin const &); /** - * @symbol ?isTemplateLockedAction\@Command\@\@KA_NAEBVCommandOrigin\@\@\@Z + * @symbol ?isTemplateLockedAction\@Command\@\@KA_NAEBVCommandOrigin\@\@\@Z */ MCAPI static bool isTemplateLockedAction(class CommandOrigin const &); /** - * @symbol ?isWildcard\@Command\@\@KA_NAEBVCommandSelectorBase\@\@\@Z + * @symbol ?isWildcard\@Command\@\@KA_NAEBVCommandSelectorBase\@\@\@Z */ MCAPI static bool isWildcard(class CommandSelectorBase const &); /** - * @symbol ?validData\@Command\@\@KA_NHAEAGAEAVCommandOutput\@\@\@Z + * @symbol ?validData\@Command\@\@KA_NHAEAGAEAVCommandOutput\@\@\@Z */ MCAPI static bool validData(int, unsigned short &, class CommandOutput &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandArea.hpp b/LiteLoader/include/llapi/mc/CommandArea.hpp index 40603b2e6f..b4b5483c58 100644 --- a/LiteLoader/include/llapi/mc/CommandArea.hpp +++ b/LiteLoader/include/llapi/mc/CommandArea.hpp @@ -28,20 +28,20 @@ class CommandArea { public: /** - * @symbol ??0CommandArea\@\@QEAA\@V?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CommandArea\@\@QEAA\@V?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CommandArea(std::unique_ptr); /** - * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEAAAEAVBlockSource\@\@XZ + * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEAAAEAVBlockSource\@\@XZ */ MCAPI class BlockSource & getDimensionBlockSource(); /** - * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEBAAEBVBlockSource\@\@XZ + * @symbol ?getDimensionBlockSource\@CommandArea\@\@QEBAAEBVBlockSource\@\@XZ */ MCAPI class BlockSource const & getDimensionBlockSource() const; /** - * @symbol ??1CommandArea\@\@QEAA\@XZ + * @symbol ??1CommandArea\@\@QEAA\@XZ */ MCAPI ~CommandArea(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp index 4411280387..87cd58000f 100644 --- a/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp +++ b/LiteLoader/include/llapi/mc/CommandAreaFactory.hpp @@ -30,40 +30,40 @@ class CommandAreaFactory { public: /** - * @symbol ??0CommandAreaFactory\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0CommandAreaFactory\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI CommandAreaFactory(class Dimension &); /** - * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z + * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0_N11\@Z */ - MCAPI std::unique_ptr findArea(class BlockPos const &, class BlockPos const &, int, bool, bool) const; + MCAPI std::unique_ptr findArea(class BlockPos const &, class BlockPos const &, bool, bool, bool) const; /** - * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0_N11\@Z + * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z */ - MCAPI std::unique_ptr findArea(class BlockPos const &, class BlockPos const &, bool, bool, bool) const; + MCAPI std::unique_ptr findArea(class BlockPos const &, class BlockPos const &, int, bool, bool) const; /** - * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z + * @symbol ?findArea\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z */ MCAPI std::unique_ptr findArea(class BlockPos const &, int, bool, bool) const; /** - * @symbol ?findAreaWithBuffer\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z + * @symbol ?findAreaWithBuffer\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z */ - MCAPI std::unique_ptr findAreaWithBuffer(class BlockPos const &, class BlockPos const &, int, bool, bool) const; + MCAPI std::unique_ptr findAreaWithBuffer(class BlockPos const &, int, bool, bool) const; /** - * @symbol ?findAreaWithBuffer\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H_N1\@Z + * @symbol ?findAreaWithBuffer\@CommandAreaFactory\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N1\@Z */ - MCAPI std::unique_ptr findAreaWithBuffer(class BlockPos const &, int, bool, bool) const; + MCAPI std::unique_ptr findAreaWithBuffer(class BlockPos const &, class BlockPos const &, int, bool, bool) const; /** - * @symbol ?shouldAllowNonTickingPlayerAndTickingAreaChunks\@CommandAreaFactory\@\@SA_NH\@Z + * @symbol ?shouldAllowNonTickingPlayerAndTickingAreaChunks\@CommandAreaFactory\@\@SA_NH\@Z */ MCAPI static bool shouldAllowNonTickingPlayerAndTickingAreaChunks(int); //private: /** - * @symbol ?_getArea\@CommandAreaFactory\@\@AEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBUBounds\@\@_N11\@Z + * @symbol ?_getArea\@CommandAreaFactory\@\@AEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBUBounds\@\@_N11\@Z */ MCAPI std::unique_ptr _getArea(struct Bounds const &, bool, bool, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlock.hpp b/LiteLoader/include/llapi/mc/CommandBlock.hpp index 3d0a9505c3..a1c7b25969 100644 --- a/LiteLoader/include/llapi/mc/CommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlock.hpp @@ -31,327 +31,332 @@ class CommandBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CommandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@CommandBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@CommandBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@CommandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@CommandBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@CommandBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CommandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@CommandBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@CommandBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CommandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CommandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CommandBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_194(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 195 + * @symbol __unk_vfn_195 */ virtual void __unk_vfn_195(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @vftbl 198 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @vftbl 199 + * @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 + * @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_COMMANDBLOCK /** - * @symbol ?hasComparatorSignal\@CommandBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@CommandBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@CommandBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@CommandBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0CommandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CommandBlockMode\@\@\@Z + * @symbol ??0CommandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CommandBlockMode\@\@\@Z */ MCAPI CommandBlock(std::string const &, int, enum class CommandBlockMode); /** - * @symbol ?execute\@CommandBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?execute\@CommandBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void execute(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?getMode\@CommandBlock\@\@QEBA?AW4CommandBlockMode\@\@XZ + * @symbol ?getMode\@CommandBlock\@\@QEBA?AW4CommandBlockMode\@\@XZ */ MCAPI enum class CommandBlockMode getMode() const; /** - * @symbol ?updateBlock\@CommandBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@W4CommandBlockMode\@\@_N\@Z + * @symbol ?updateBlock\@CommandBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@W4CommandBlockMode\@\@_N\@Z */ MCAPI void updateBlock(class BlockSource &, class BlockPos const &, enum class CommandBlockMode, bool) const; /** - * @symbol ?_getCommandBlockActor\@CommandBlock\@\@SAPEAVCommandBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getCommandBlockActor\@CommandBlock\@\@SAPEAVCommandBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class CommandBlockActor * _getCommandBlockActor(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_execute\@CommandBlock\@\@AEBAXAEAVBlockSource\@\@AEAVCommandBlockActor\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_execute\@CommandBlock\@\@AEBAXAEAVBlockSource\@\@AEAVCommandBlockActor\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void _execute(class BlockSource &, class CommandBlockActor &, class BlockPos const &, bool) const; /** - * @symbol ?_executeChain\@CommandBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_executeChain\@CommandBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _executeChain(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_executeChainBlock\@CommandBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVCommandBlockActor\@\@_N\@Z + * @symbol ?_executeChainBlock\@CommandBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVCommandBlockActor\@\@_N\@Z */ MCAPI bool _executeChainBlock(class BlockSource &, class BlockPos const &, class CommandBlockActor &, bool) const; /** - * @symbol ?_installCircuit\@CommandBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_installCircuit\@CommandBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void _installCircuit(class BlockSource &, class BlockPos const &, bool) const; private: /** - * @symbol ?mCBModeMap\@CommandBlock\@\@0PAHA + * @symbol ?mCBModeMap\@CommandBlock\@\@0PAHA */ MCAPI static int mCBModeMap[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp index 77433ddc97..406cfc4800 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockActor.hpp @@ -31,198 +31,198 @@ class CommandBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@CommandBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@CommandBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@CommandBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@CommandBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 4 - * @symbol ?saveBlockData\@CommandBlockActor\@\@UEBAXAEAVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 4 + * @symbol ?saveBlockData\@CommandBlockActor\@\@UEBAXAEAVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void saveBlockData(class CompoundTag &, class BlockSource &) const; /** - * @vftbl 5 - * @symbol ?loadBlockData\@CommandBlockActor\@\@UEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 5 + * @symbol ?loadBlockData\@CommandBlockActor\@\@UEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void loadBlockData(class CompoundTag const &, class BlockSource &, class DataLoadHelper &); /** - * @vftbl 6 - * @symbol ?onCustomTagLoadDone\@CommandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 6 + * @symbol ?onCustomTagLoadDone\@CommandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onCustomTagLoadDone(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@CommandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@CommandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 11 - * @symbol ?onPlace\@CommandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 11 + * @symbol ?onPlace\@CommandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onPlace(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 24 - * @symbol ?getCustomName\@CommandBlockActor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 24 + * @symbol ?getCustomName\@CommandBlockActor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getCustomName() const; /** - * @vftbl 25 - * @symbol ?getFilteredCustomName\@CommandBlockActor\@\@UEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUIProfanityContext\@\@\@Z + * @vftbl 25 + * @symbol ?getFilteredCustomName\@CommandBlockActor\@\@UEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUIProfanityContext\@\@\@Z */ virtual std::string const & getFilteredCustomName(class UIProfanityContext const &); /** - * @vftbl 27 - * @symbol ?setCustomName\@CommandBlockActor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 27 + * @symbol ?setCustomName\@CommandBlockActor\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setCustomName(std::string const &); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@CommandBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@CommandBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@CommandBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @vftbl 39 - * @symbol ?_playerCanUpdate\@CommandBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z + * @vftbl 39 + * @symbol ?_playerCanUpdate\@CommandBlockActor\@\@MEBA_NAEBVPlayer\@\@\@Z */ virtual bool _playerCanUpdate(class Player const &) const; /** - * @symbol ??0CommandBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4CommandBlockMode\@\@\@Z + * @symbol ??0CommandBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4CommandBlockMode\@\@\@Z */ MCAPI CommandBlockActor(class BlockPos const &, enum class CommandBlockMode); /** - * @symbol ?getBaseCommandBlock\@CommandBlockActor\@\@QEAAAEAVBaseCommandBlock\@\@XZ + * @symbol ?getBaseCommandBlock\@CommandBlockActor\@\@QEAAAEAVBaseCommandBlock\@\@XZ */ MCAPI class BaseCommandBlock & getBaseCommandBlock(); /** - * @symbol ?getCommand\@CommandBlockActor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCommand\@CommandBlockActor\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getCommand() const; /** - * @symbol ?getCommandBlock\@CommandBlockActor\@\@QEBAPEBVCommandBlock\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getCommandBlock\@CommandBlockActor\@\@QEBAPEBVCommandBlock\@\@AEAVBlockSource\@\@\@Z */ MCAPI class CommandBlock const * getCommandBlock(class BlockSource &) const; /** - * @symbol ?getConditionalMode\@CommandBlockActor\@\@QEBA_NAEAVBlockSource\@\@\@Z + * @symbol ?getConditionalMode\@CommandBlockActor\@\@QEBA_NAEAVBlockSource\@\@\@Z */ MCAPI bool getConditionalMode(class BlockSource &) const; /** - * @symbol ?getDelayOnActivation\@CommandBlockActor\@\@QEBAHXZ + * @symbol ?getDelayOnActivation\@CommandBlockActor\@\@QEBAHXZ */ MCAPI int getDelayOnActivation() const; /** - * @symbol ?getMode\@CommandBlockActor\@\@QEBA?AW4CommandBlockMode\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getMode\@CommandBlockActor\@\@QEBA?AW4CommandBlockMode\@\@AEAVBlockSource\@\@\@Z */ MCAPI enum class CommandBlockMode getMode(class BlockSource &) const; /** - * @symbol ?getPowered\@CommandBlockActor\@\@QEBA_NXZ + * @symbol ?getPowered\@CommandBlockActor\@\@QEBA_NXZ */ MCAPI bool getPowered() const; /** - * @symbol ?getSuccessCount\@CommandBlockActor\@\@QEBAHXZ + * @symbol ?getSuccessCount\@CommandBlockActor\@\@QEBAHXZ */ MCAPI int getSuccessCount() const; /** - * @symbol ?getTickDelay\@CommandBlockActor\@\@QEBAHXZ + * @symbol ?getTickDelay\@CommandBlockActor\@\@QEBAHXZ */ MCAPI int getTickDelay() const; /** - * @symbol ?isAutomatic\@CommandBlockActor\@\@QEBA_NXZ + * @symbol ?isAutomatic\@CommandBlockActor\@\@QEBA_NXZ */ MCAPI bool isAutomatic() const; /** - * @symbol ?markConditionMet\@CommandBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?markConditionMet\@CommandBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool markConditionMet(class BlockSource &); /** - * @symbol ?markForSaving\@CommandBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?markForSaving\@CommandBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void markForSaving(class BlockSource &); /** - * @symbol ?markForSaving\@CommandBlockActor\@\@QEAAXAEAVBlockSource\@\@H_N\@Z + * @symbol ?markForSaving\@CommandBlockActor\@\@QEAAXAEAVBlockSource\@\@H_N\@Z */ MCAPI void markForSaving(class BlockSource &, int, bool); /** - * @symbol ?performCommand\@CommandBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?performCommand\@CommandBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool performCommand(class BlockSource &); /** - * @symbol ?setPowered\@CommandBlockActor\@\@QEAAX_N\@Z + * @symbol ?setPowered\@CommandBlockActor\@\@QEAAX_N\@Z */ MCAPI void setPowered(bool); /** - * @symbol ?setSuccessCount\@CommandBlockActor\@\@QEAAXH\@Z + * @symbol ?setSuccessCount\@CommandBlockActor\@\@QEAAXH\@Z */ MCAPI void setSuccessCount(int); /** - * @symbol ?updateBlock\@CommandBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4CommandBlockMode\@\@_N33H3\@Z + * @symbol ?updateBlock\@CommandBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4CommandBlockMode\@\@_N33H3\@Z */ MCAPI void updateBlock(class BlockSource &, std::string const &, std::string const &, enum class CommandBlockMode, bool, bool, bool, int, bool); /** - * @symbol ?wasConditionMet\@CommandBlockActor\@\@QEAA_NXZ + * @symbol ?wasConditionMet\@CommandBlockActor\@\@QEAA_NXZ */ MCAPI bool wasConditionMet(); //private: /** - * @symbol ?_setAutomatic\@CommandBlockActor\@\@AEAAXAEAVBlockSource\@\@_NW4CommandBlockMode\@\@\@Z + * @symbol ?_setAutomatic\@CommandBlockActor\@\@AEAAXAEAVBlockSource\@\@_NW4CommandBlockMode\@\@\@Z */ MCAPI void _setAutomatic(class BlockSource &, bool, enum class CommandBlockMode); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp b/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp index c8ef4d8c7c..933cd9fcd5 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockComponent.hpp @@ -29,60 +29,60 @@ class CommandBlockComponent { public: /** - * @symbol ??0CommandBlockComponent\@\@QEAA\@XZ + * @symbol ??0CommandBlockComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI CommandBlockComponent(); + MCAPI CommandBlockComponent(class CommandBlockComponent &&); /** - * @symbol ??0CommandBlockComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0CommandBlockComponent\@\@QEAA\@XZ */ - MCAPI CommandBlockComponent(class CommandBlockComponent &&); + MCAPI CommandBlockComponent(); /** - * @symbol ?addAdditionalSaveData\@CommandBlockComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@CommandBlockComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?decrementTickCount\@CommandBlockComponent\@\@QEAAHXZ + * @symbol ?decrementTickCount\@CommandBlockComponent\@\@QEAAHXZ */ MCAPI int decrementTickCount(); /** - * @symbol ?getBaseCommandBlock\@CommandBlockComponent\@\@QEAAAEAVBaseCommandBlock\@\@XZ + * @symbol ?getBaseCommandBlock\@CommandBlockComponent\@\@QEAAAEAVBaseCommandBlock\@\@XZ */ MCAPI class BaseCommandBlock & getBaseCommandBlock(); /** - * @symbol ?getCurrentTickCount\@CommandBlockComponent\@\@QEBAHXZ + * @symbol ?getCurrentTickCount\@CommandBlockComponent\@\@QEBAHXZ */ MCAPI int getCurrentTickCount() const; /** - * @symbol ?getTicking\@CommandBlockComponent\@\@QEBA_NXZ + * @symbol ?getTicking\@CommandBlockComponent\@\@QEBA_NXZ */ MCAPI bool getTicking() const; /** - * @symbol ?initFromDefinition\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?onCommandBlockUpdate\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NV34\@H2\@Z + * @symbol ?onCommandBlockUpdate\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NV34\@H2\@Z */ MCAPI void onCommandBlockUpdate(class Actor &, std::string const &, bool, std::string, int, bool); /** - * @symbol ??4CommandBlockComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4CommandBlockComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CommandBlockComponent & operator=(class CommandBlockComponent &&); /** - * @symbol ?readAdditionalSaveData\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?resetCurrentTick\@CommandBlockComponent\@\@QEAAXXZ + * @symbol ?resetCurrentTick\@CommandBlockComponent\@\@QEAAXXZ */ MCAPI void resetCurrentTick(); /** - * @symbol ?setLastOutput\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setLastOutput\@CommandBlockComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setLastOutput(class Actor &, std::string const &); /** - * @symbol ?setTicking\@CommandBlockComponent\@\@QEAAX_N\@Z + * @symbol ?setTicking\@CommandBlockComponent\@\@QEAAX_N\@Z */ MCAPI void setTicking(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockDescription.hpp b/LiteLoader/include/llapi/mc/CommandBlockDescription.hpp index 1536c7123f..3583ad0819 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockDescription.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class CommandBlockDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@CommandBlockDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@CommandBlockDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~CommandBlockDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@CommandBlockDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@CommandBlockDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCKDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@CommandBlockDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~CommandBlockDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockName.hpp b/LiteLoader/include/llapi/mc/CommandBlockName.hpp index d43f2a4ed2..b090ef98f2 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockName.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockName.hpp @@ -33,28 +33,28 @@ class CommandBlockName { public: /** - * @symbol ??0CommandBlockName\@\@QEAA\@_K\@Z + * @symbol ??0CommandBlockName\@\@QEAA\@_K\@Z */ MCAPI CommandBlockName(unsigned __int64); /** - * @symbol ?getDescriptionId\@CommandBlockName\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@CommandBlockName\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescriptionId() const; /** - * @symbol ??BCommandBlockName\@\@QEBA_KXZ + * @symbol ??BCommandBlockName\@\@QEBA_KXZ */ MCAPI operator unsigned __int64() const; /** - * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z - */ - MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; - /** - * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@HAEAVCommandOutput\@\@\@Z + * @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\@\@H\@Z */ MCAPI class CommandBlockNameResult resolveBlock(int) const; + /** + * @symbol ?resolveBlock\@CommandBlockName\@\@QEBA?AVCommandBlockNameResult\@\@AEBV?$vector\@VBlockStateCommandParam\@\@V?$allocator\@VBlockStateCommandParam\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z + */ + MCAPI class CommandBlockNameResult resolveBlock(std::vector const &, class CommandOutput &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockNameResult.hpp b/LiteLoader/include/llapi/mc/CommandBlockNameResult.hpp index 4c76db2b2b..f559c41455 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockNameResult.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockNameResult.hpp @@ -29,28 +29,28 @@ class CommandBlockNameResult { public: /** - * @symbol ??0CommandBlockNameResult\@\@QEAA\@AEBVHashedString\@\@PEBVBlock\@\@_N\@Z + * @symbol ??0CommandBlockNameResult\@\@QEAA\@AEBVHashedString\@\@PEBVBlock\@\@_N\@Z */ MCAPI CommandBlockNameResult(class HashedString const &, class Block const *, bool); /** - * @symbol ?getBlock\@CommandBlockNameResult\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getBlock\@CommandBlockNameResult\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getBlock() const; /** - * @symbol ?getResult\@CommandBlockNameResult\@\@QEBA?AW4Result\@1\@XZ + * @symbol ?getResult\@CommandBlockNameResult\@\@QEBA?AW4Result\@1\@XZ */ MCAPI enum class CommandBlockNameResult::Result getResult() const; /** - * @symbol ?isComplexAlias\@CommandBlockNameResult\@\@QEBA_NXZ + * @symbol ?isComplexAlias\@CommandBlockNameResult\@\@QEBA_NXZ */ MCAPI bool isComplexAlias() const; /** - * @symbol ?isSameBlock\@CommandBlockNameResult\@\@QEBA_NAEBVBlock\@\@_N\@Z + * @symbol ?isSameBlock\@CommandBlockNameResult\@\@QEBA_NAEBVBlock\@\@_N\@Z */ MCAPI bool isSameBlock(class Block const &, bool) const; /** - * @symbol ??1CommandBlockNameResult\@\@QEAA\@XZ + * @symbol ??1CommandBlockNameResult\@\@QEAA\@XZ */ MCAPI ~CommandBlockNameResult(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockSystem.hpp b/LiteLoader/include/llapi/mc/CommandBlockSystem.hpp index f8940b181f..f90269d95e 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockSystem.hpp @@ -30,19 +30,19 @@ class CommandBlockSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandBlockSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@CommandBlockSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@CommandBlockSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp index 92c145114a..4edc3c7077 100644 --- a/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandBlockUpdatePacket.hpp @@ -29,37 +29,43 @@ class CommandBlockUpdatePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandBlockUpdatePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CommandBlockUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CommandBlockUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CommandBlockUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CommandBlockUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CommandBlockUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CommandBlockUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CommandBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDBLOCKUPDATEPACKET /** - * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CommandBlockUpdatePacket(); + MCVAPI ~CommandBlockUpdatePacket(); +#endif /** - * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z */ MCAPI CommandBlockUpdatePacket(class CommandBlockUpdatePacket const &); + /** + * @symbol ??0CommandBlockUpdatePacket\@\@QEAA\@XZ + */ + MCAPI CommandBlockUpdatePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp b/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp index 1f49aade92..748554400a 100644 --- a/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp +++ b/LiteLoader/include/llapi/mc/CommandChainedSubcommand.hpp @@ -28,12 +28,12 @@ class CommandChainedSubcommand { public: /** - * @symbol ?getCommand\@CommandChainedSubcommand\@\@QEBAPEAVCommand\@\@XZ + * @symbol ?getCommand\@CommandChainedSubcommand\@\@QEBAPEBVCommand\@\@XZ */ - MCAPI class Command * getCommand() const; + MCAPI class Command const * getCommand() const; /** - * @symbol ?setCommand\@CommandChainedSubcommand\@\@QEAAXV?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setCommand\@CommandChainedSubcommand\@\@QEAAXV?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setCommand(std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandContext.hpp b/LiteLoader/include/llapi/mc/CommandContext.hpp index 2659b247bd..321348ca6d 100644 --- a/LiteLoader/include/llapi/mc/CommandContext.hpp +++ b/LiteLoader/include/llapi/mc/CommandContext.hpp @@ -51,16 +51,16 @@ class CommandContext { public: /** - * @symbol ??0CommandContext\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@2\@H\@Z + * @symbol ??0CommandContext\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@2\@H\@Z */ MCAPI CommandContext(std::string const &, std::unique_ptr, int); /** - * @symbol ?getCommandOrigin\@CommandContext\@\@QEBAAEBVCommandOrigin\@\@XZ + * @symbol ?getCommandOrigin\@CommandContext\@\@QEBAAEBVCommandOrigin\@\@XZ */ MCAPI class CommandOrigin const & getCommandOrigin() const; /** - * @symbol ??1CommandContext\@\@QEAA\@XZ + * @symbol ??1CommandContext\@\@QEAA\@XZ */ MCAPI ~CommandContext(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandDispatcher.hpp b/LiteLoader/include/llapi/mc/CommandDispatcher.hpp index ae30d50a33..92cfca7b86 100644 --- a/LiteLoader/include/llapi/mc/CommandDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/CommandDispatcher.hpp @@ -29,18 +29,18 @@ class CommandDispatcher { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandDispatcher(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?performCommand\@CommandDispatcher\@\@UEAAHAEBVCommandOrigin\@\@AEAVCommand\@\@\@Z + * @vftbl 1 + * @symbol ?performCommand\@CommandDispatcher\@\@UEAAHAEBVCommandOrigin\@\@AEAVCommand\@\@\@Z */ virtual int performCommand(class CommandOrigin const &, class Command &); /** - * @symbol ??0CommandDispatcher\@\@QEAA\@XZ + * @symbol ??0CommandDispatcher\@\@QEAA\@XZ */ MCAPI CommandDispatcher(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandFilePath.hpp b/LiteLoader/include/llapi/mc/CommandFilePath.hpp index a1e3a6128e..e36dabe07e 100644 --- a/LiteLoader/include/llapi/mc/CommandFilePath.hpp +++ b/LiteLoader/include/llapi/mc/CommandFilePath.hpp @@ -27,20 +27,20 @@ class CommandFilePath { public: /** - * @symbol ??0CommandFilePath\@\@QEAA\@XZ + * @symbol ??0CommandFilePath\@\@QEAA\@XZ */ MCAPI CommandFilePath(); /** - * @symbol ?findInvalidCharacter\@CommandFilePath\@\@QEBAHXZ + * @symbol ?findInvalidCharacter\@CommandFilePath\@\@QEBAHXZ */ MCAPI int findInvalidCharacter() const; /** - * @symbol ?getText\@CommandFilePath\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getText\@CommandFilePath\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getText() const; /** - * @symbol ??1CommandFilePath\@\@QEAA\@XZ + * @symbol ??1CommandFilePath\@\@QEAA\@XZ */ MCAPI ~CommandFilePath(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp b/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp index 895c58ddfb..77a515e45e 100644 --- a/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp +++ b/LiteLoader/include/llapi/mc/CommandFunctionEntry.hpp @@ -30,18 +30,18 @@ class CommandFunctionEntry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandFunctionEntry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@CommandFunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@CommandFunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ virtual void execute(class FunctionManager &, class CommandOrigin const &, enum class FunctionQueueOrder); /** - * @symbol ??0CommandFunctionEntry\@\@QEAA\@V?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CommandFunctionEntry\@\@QEAA\@V?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CommandFunctionEntry(std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandIntegerRange.hpp b/LiteLoader/include/llapi/mc/CommandIntegerRange.hpp index 60cbeac195..bdecdf043e 100644 --- a/LiteLoader/include/llapi/mc/CommandIntegerRange.hpp +++ b/LiteLoader/include/llapi/mc/CommandIntegerRange.hpp @@ -31,16 +31,16 @@ class CommandIntegerRange { public: /** - * @symbol ??0CommandIntegerRange\@\@QEAA\@XZ + * @symbol ??0CommandIntegerRange\@\@QEAA\@HH_N\@Z */ - MCAPI CommandIntegerRange(); + MCAPI CommandIntegerRange(int, int, bool); /** - * @symbol ??0CommandIntegerRange\@\@QEAA\@HH_N\@Z + * @symbol ??0CommandIntegerRange\@\@QEAA\@XZ */ - MCAPI CommandIntegerRange(int, int, bool); + MCAPI CommandIntegerRange(); /** - * @symbol ?isWithinRange\@CommandIntegerRange\@\@QEBA_NH\@Z + * @symbol ?isWithinRange\@CommandIntegerRange\@\@QEBA_NH\@Z */ MCAPI bool isWithinRange(int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandItem.hpp b/LiteLoader/include/llapi/mc/CommandItem.hpp index a1899eef60..dc1f426402 100644 --- a/LiteLoader/include/llapi/mc/CommandItem.hpp +++ b/LiteLoader/include/llapi/mc/CommandItem.hpp @@ -32,32 +32,32 @@ class CommandItem { public: /** - * @symbol ??0CommandItem\@\@QEAA\@XZ + * @symbol ??0CommandItem\@\@QEAA\@XZ */ MCAPI CommandItem(); /** - * @symbol ??0CommandItem\@\@QEAA\@HF_N\@Z + * @symbol ??0CommandItem\@\@QEAA\@HF_N\@Z */ MCAPI CommandItem(int, short, bool); /** - * @symbol ??0CommandItem\@\@QEAA\@_K\@Z + * @symbol ??0CommandItem\@\@QEAA\@_K\@Z */ MCAPI CommandItem(unsigned __int64); /** - * @symbol ?createInstance\@CommandItem\@\@QEBA?AV?$optional\@VItemInstance\@\@\@std\@\@HHPEAVCommandOutput\@\@_N\@Z + * @symbol ?createInstance\@CommandItem\@\@QEBA?AV?$optional\@VItemInstance\@\@\@std\@\@HHPEAVCommandOutput\@\@_N\@Z */ MCAPI class std::optional createInstance(int, int, class CommandOutput *, bool) const; /** - * @symbol ?getId\@CommandItem\@\@QEBAHXZ + * @symbol ?getId\@CommandItem\@\@QEBAHXZ */ MCAPI int getId() const; /** - * @symbol ??BCommandItem\@\@QEBA_NXZ + * @symbol ??BCommandItem\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ??BCommandItem\@\@QEBA_KXZ + * @symbol ??BCommandItem\@\@QEBA_KXZ */ MCAPI operator unsigned __int64() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandLexer.hpp b/LiteLoader/include/llapi/mc/CommandLexer.hpp index e4aa3cc10a..4680954828 100644 --- a/LiteLoader/include/llapi/mc/CommandLexer.hpp +++ b/LiteLoader/include/llapi/mc/CommandLexer.hpp @@ -30,24 +30,24 @@ class CommandLexer { public: /** - * @symbol ??0CommandLexer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0CommandLexer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI CommandLexer(std::string const &); /** - * @symbol ?next\@CommandLexer\@\@QEBAAEBUToken\@1\@XZ + * @symbol ?next\@CommandLexer\@\@QEBAAEBUToken\@1\@XZ */ MCAPI struct CommandLexer::Token const & next() const; /** - * @symbol ?step\@CommandLexer\@\@QEAAXXZ + * @symbol ?step\@CommandLexer\@\@QEAAXXZ */ MCAPI void step(); /** - * @symbol ?isDigit\@CommandLexer\@\@SA_ND\@Z + * @symbol ?isDigit\@CommandLexer\@\@SA_ND\@Z */ MCAPI static bool isDigit(char); /** - * @symbol ?isFilePathCharacter\@CommandLexer\@\@SA_ND\@Z + * @symbol ?isFilePathCharacter\@CommandLexer\@\@SA_ND\@Z */ MCAPI static bool isFilePathCharacter(char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandMessage.hpp b/LiteLoader/include/llapi/mc/CommandMessage.hpp index 5c3258d45c..dc65b48103 100644 --- a/LiteLoader/include/llapi/mc/CommandMessage.hpp +++ b/LiteLoader/include/llapi/mc/CommandMessage.hpp @@ -39,16 +39,16 @@ class CommandMessage { public: /** - * @symbol ??0CommandMessage\@\@QEAA\@XZ + * @symbol ??0CommandMessage\@\@QEAA\@XZ */ MCAPI CommandMessage(); /** - * @symbol ?getMessage\@CommandMessage\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?getMessage\@CommandMessage\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI std::string getMessage(class CommandOrigin const &) const; /** - * @symbol ??1CommandMessage\@\@QEAA\@XZ + * @symbol ??1CommandMessage\@\@QEAA\@XZ */ MCAPI ~CommandMessage(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandName.hpp b/LiteLoader/include/llapi/mc/CommandName.hpp index 839e439ba6..1af3e4ccf4 100644 --- a/LiteLoader/include/llapi/mc/CommandName.hpp +++ b/LiteLoader/include/llapi/mc/CommandName.hpp @@ -28,7 +28,7 @@ struct CommandName { public: /** - * @symbol ??1CommandName\@\@QEAA\@XZ + * @symbol ??1CommandName\@\@QEAA\@XZ */ MCAPI ~CommandName(); diff --git a/LiteLoader/include/llapi/mc/CommandOrigin.hpp b/LiteLoader/include/llapi/mc/CommandOrigin.hpp index 489e4bc53e..13845bf2f9 100644 --- a/LiteLoader/include/llapi/mc/CommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/CommandOrigin.hpp @@ -43,191 +43,191 @@ LIAPI ServerPlayer* getPlayer() const; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@VirtualCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@ActorCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const = 0; /** - * @vftbl 2 - * @symbol ?getName\@VirtualCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ActorCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const = 0; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@VirtualCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@ActorCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const = 0; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@VirtualCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@ActorCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const = 0; /** - * @vftbl 5 - * @symbol ?getRotation\@VirtualCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@ActorCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const = 0; /** - * @vftbl 6 - * @symbol ?getLevel\@VirtualCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@ActorCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const = 0; /** - * @vftbl 7 - * @symbol ?getDimension\@VirtualCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@ActorCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const = 0; /** - * @vftbl 8 - * @symbol ?getEntity\@VirtualCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@ActorCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const = 0; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@VirtualCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ActorCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const = 0; /** - * @vftbl 10 - * @symbol ?clone\@VirtualCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ActorCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const = 0; /** - * @vftbl 11 - * @symbol ?getCursorHitBlockPos\@CommandOrigin\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @vftbl 11 + * @symbol ?getCursorHitBlockPos\@CommandOrigin\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getCursorHitBlockPos() const; /** - * @vftbl 12 - * @symbol ?getCursorHitPos\@CommandOrigin\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ + * @vftbl 12 + * @symbol ?getCursorHitPos\@CommandOrigin\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ */ virtual class std::optional getCursorHitPos() const; /** - * @vftbl 13 - * @symbol ?hasChatPerms\@CommandOrigin\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?hasChatPerms\@CommandOrigin\@\@UEBA_NXZ */ virtual bool hasChatPerms() const; /** - * @vftbl 14 - * @symbol ?hasTellPerms\@CommandOrigin\@\@UEBA_NXZ + * @vftbl 14 + * @symbol ?hasTellPerms\@CommandOrigin\@\@UEBA_NXZ */ virtual bool hasTellPerms() const; /** - * @vftbl 15 - * @symbol ?canUseAbility\@CommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z + * @vftbl 15 + * @symbol ?canUseAbility\@CommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z */ virtual bool canUseAbility(enum class AbilitiesIndex) const; /** - * @vftbl 16 - * @symbol ?isWorldBuilder\@CommandOrigin\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?isWorldBuilder\@CommandOrigin\@\@UEBA_NXZ */ virtual bool isWorldBuilder() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@CommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@CommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@CommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@CommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 19 - * @symbol ?getSourceId\@CommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ + * @vftbl 19 + * @symbol ?getSourceId\@CommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ */ virtual class NetworkIdentifier const & getSourceId() const; /** - * @vftbl 20 - * @symbol ?getSourceSubId\@CommandOrigin\@\@UEBA?AW4SubClientId\@\@XZ + * @vftbl 20 + * @symbol ?getSourceSubId\@CommandOrigin\@\@UEBA?AW4SubClientId\@\@XZ */ virtual enum class SubClientId getSourceSubId() const; /** - * @vftbl 21 - * @symbol ?getOutputReceiver\@CommandOrigin\@\@UEBAAEBV1\@XZ + * @vftbl 21 + * @symbol ?getOutputReceiver\@CommandOrigin\@\@UEBAAEBV1\@XZ */ virtual class CommandOrigin const & getOutputReceiver() const; /** - * @vftbl 22 - * @symbol ?getIdentity\@CommandOrigin\@\@UEBA?AUCommandOriginIdentity\@\@XZ + * @vftbl 22 + * @symbol ?getIdentity\@CommandOrigin\@\@UEBA?AUCommandOriginIdentity\@\@XZ */ virtual struct CommandOriginIdentity getIdentity() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@VirtualCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ActorCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const = 0; /** - * @vftbl 24 - * @symbol ?toCommandOriginData\@CommandOrigin\@\@UEBA?AUCommandOriginData\@\@XZ + * @vftbl 24 + * @symbol ?toCommandOriginData\@CommandOrigin\@\@UEBA?AUCommandOriginData\@\@XZ */ virtual struct CommandOriginData toCommandOriginData() const; /** - * @vftbl 25 - * @symbol ?getUUID\@CommandOrigin\@\@UEBAAEBVUUID\@mce\@\@XZ + * @vftbl 25 + * @symbol ?getUUID\@CommandOrigin\@\@UEBAAEBVUUID\@mce\@\@XZ */ virtual class mce::UUID const & getUUID() const; /** - * @vftbl 26 - * @symbol ?handleCommandOutputCallback\@CommandOrigin\@\@UEBAXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z + * @vftbl 26 + * @symbol ?handleCommandOutputCallback\@CommandOrigin\@\@UEBAXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z */ virtual void handleCommandOutputCallback(int, std::string &&, class Json::Value &&) const; /** - * @vftbl 27 - * @symbol ?updateValues\@CommandOrigin\@\@UEAAXXZ + * @vftbl 27 + * @symbol ?updateValues\@CommandOrigin\@\@UEAAXXZ */ virtual void updateValues(); /** - * @vftbl 28 - * @symbol ?getExecutePosition\@CommandOrigin\@\@UEBA?BVVec3\@\@HAEBVCommandPositionFloat\@\@\@Z + * @vftbl 28 + * @symbol ?getExecutePosition\@CommandOrigin\@\@UEBA?BVVec3\@\@HAEBVCommandPositionFloat\@\@\@Z */ virtual class Vec3 const getExecutePosition(int, class CommandPositionFloat const &) const; /** - * @vftbl 29 - * @symbol ?serialize\@CommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@CommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@VirtualCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@ActorCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const = 0; /** - * @vftbl 31 - * @symbol ?_setUUID\@CommandOrigin\@\@MEAAXAEBVUUID\@mce\@\@\@Z + * @vftbl 31 + * @symbol ?_setUUID\@CommandOrigin\@\@MEAAXAEBVUUID\@mce\@\@\@Z */ virtual void _setUUID(class mce::UUID const &); /** - * @symbol ??0CommandOrigin\@\@QEAA\@XZ + * @symbol ??0CommandOrigin\@\@QEAA\@XZ */ MCAPI CommandOrigin(); /** - * @symbol ?getAreaAt\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N\@Z + * @symbol ?getAreaAt\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N\@Z */ MCAPI std::unique_ptr getAreaAt(class BlockPos const &, class BlockPos const &, int, bool) const; /** - * @symbol ?getAreaAt\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?getAreaAt\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z */ MCAPI std::unique_ptr getAreaAt(class BlockPos const &, int) const; /** - * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N\@Z + * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0H_N\@Z */ MCAPI std::unique_ptr getAreaAtWithBuffer(class BlockPos const &, class BlockPos const &, int, bool) const; /** - * @symbol ?getAreaAtWithBuffer\@CommandOrigin\@\@QEBA?AV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@H\@Z + * @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 + * @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 + * @symbol ?fromCommandOriginData\@CommandOrigin\@\@SA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@AEBUCommandOriginData\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI static std::unique_ptr fromCommandOriginData(struct CommandOriginData const &, class Bedrock::NonOwnerPointer const &, class NetworkIdentifier const &, enum class SubClientId); @@ -235,8 +235,8 @@ LIAPI ServerPlayer* getPlayer() const; protected: /** - * @symbol ?sUnknownSource\@CommandOrigin\@\@1VNetworkIdentifier\@\@A + * @symbol ?sUnknownSource\@CommandOrigin\@\@1VNetworkIdentifier\@\@A */ MCAPI static class NetworkIdentifier sUnknownSource; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandOriginData.hpp b/LiteLoader/include/llapi/mc/CommandOriginData.hpp index 2dbc6f3e8c..fbd412252b 100644 --- a/LiteLoader/include/llapi/mc/CommandOriginData.hpp +++ b/LiteLoader/include/llapi/mc/CommandOriginData.hpp @@ -23,19 +23,19 @@ struct CommandOriginData { #undef AFTER_EXTRA public: /** - * @symbol ??0CommandOriginData\@\@QEAA\@XZ + * @symbol ??0CommandOriginData\@\@QEAA\@XZ */ MCAPI CommandOriginData(); /** - * @symbol ??0CommandOriginData\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0CommandOriginData\@\@QEAA\@AEBU0\@\@Z */ MCAPI CommandOriginData(struct CommandOriginData const &); /** - * @symbol ??4CommandOriginData\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4CommandOriginData\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct CommandOriginData & operator=(struct CommandOriginData const &); /** - * @symbol ??1CommandOriginData\@\@QEAA\@XZ + * @symbol ??1CommandOriginData\@\@QEAA\@XZ */ MCAPI ~CommandOriginData(); diff --git a/LiteLoader/include/llapi/mc/CommandOriginIdentity.hpp b/LiteLoader/include/llapi/mc/CommandOriginIdentity.hpp index e14d45ec8c..c0673dc03a 100644 --- a/LiteLoader/include/llapi/mc/CommandOriginIdentity.hpp +++ b/LiteLoader/include/llapi/mc/CommandOriginIdentity.hpp @@ -28,7 +28,7 @@ struct CommandOriginIdentity { public: /** - * @symbol ??1CommandOriginIdentity\@\@QEAA\@XZ + * @symbol ??1CommandOriginIdentity\@\@QEAA\@XZ */ MCAPI ~CommandOriginIdentity(); diff --git a/LiteLoader/include/llapi/mc/CommandOriginLoader.hpp b/LiteLoader/include/llapi/mc/CommandOriginLoader.hpp index 34ac57cba6..83efce0451 100644 --- a/LiteLoader/include/llapi/mc/CommandOriginLoader.hpp +++ b/LiteLoader/include/llapi/mc/CommandOriginLoader.hpp @@ -30,22 +30,28 @@ class CommandOriginLoader { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandOriginLoader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@CommandOriginLoader\@\@UEAA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @vftbl 1 + * @symbol ?load\@CommandOriginLoader\@\@UEAA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@\@Z */ virtual std::unique_ptr load(class CompoundTag const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDORIGINLOADER /** - * @symbol ??0CommandOriginLoader\@\@QEAA\@AEAVServerLevel\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CommandOriginLoader(); +#endif + /** + * @symbol ??0CommandOriginLoader\@\@QEAA\@AEAVServerLevel\@\@\@Z */ MCAPI CommandOriginLoader(class ServerLevel &); /** - * @symbol ?load\@CommandOriginLoader\@\@SA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z + * @symbol ?load\@CommandOriginLoader\@\@SA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class ServerLevel &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandOutput.hpp b/LiteLoader/include/llapi/mc/CommandOutput.hpp index 77b3bd8b35..a9277c787f 100644 --- a/LiteLoader/include/llapi/mc/CommandOutput.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutput.hpp @@ -103,88 +103,88 @@ class CommandOutput { public: /** - * @symbol ??0CommandOutput\@\@QEAA\@W4CommandOutputType\@\@\@Z + * @symbol ??0CommandOutput\@\@QEAA\@W4CommandOutputType\@\@\@Z */ MCAPI CommandOutput(enum class CommandOutputType); /** - * @symbol ??0CommandOutput\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CommandOutput\@\@QEAA\@AEBV0\@\@Z */ MCAPI CommandOutput(class CommandOutput const &); /** - * @symbol ?addToResultList\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?addToResultList\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z */ - MCAPI void addToResultList(std::string const &, std::string const &); + MCAPI void addToResultList(std::string const &, class Actor const &); /** - * @symbol ?addToResultList\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z + * @symbol ?addToResultList\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ - MCAPI void addToResultList(std::string const &, class Actor const &); + MCAPI void addToResultList(std::string const &, std::string const &); /** - * @symbol ?empty\@CommandOutput\@\@QEBA_NXZ + * @symbol ?empty\@CommandOutput\@\@QEBA_NXZ */ MCAPI bool empty() const; /** - * @symbol ?error\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z + * @symbol ?error\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z */ MCAPI void error(std::string const &, std::vector const &); /** - * @symbol ?forceOutput\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z + * @symbol ?forceOutput\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z */ MCAPI void forceOutput(std::string const &, std::vector const &); /** - * @symbol ?getData\@CommandOutput\@\@QEBAAEBVCommandPropertyBag\@\@XZ + * @symbol ?getData\@CommandOutput\@\@QEBAAEBVCommandPropertyBag\@\@XZ */ MCAPI class CommandPropertyBag const & getData() const; /** - * @symbol ?getMessages\@CommandOutput\@\@QEBAAEBV?$vector\@VCommandOutputMessage\@\@V?$allocator\@VCommandOutputMessage\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMessages\@CommandOutput\@\@QEBAAEBV?$vector\@VCommandOutputMessage\@\@V?$allocator\@VCommandOutputMessage\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getMessages() const; /** - * @symbol ?getSuccessCount\@CommandOutput\@\@QEBAHXZ + * @symbol ?getSuccessCount\@CommandOutput\@\@QEBAHXZ */ MCAPI int getSuccessCount() const; /** - * @symbol ?getType\@CommandOutput\@\@QEBA?AW4CommandOutputType\@\@XZ + * @symbol ?getType\@CommandOutput\@\@QEBA?AW4CommandOutputType\@\@XZ */ MCAPI enum class CommandOutputType getType() const; /** - * @symbol ?hasErrorMessage\@CommandOutput\@\@QEBA_NXZ + * @symbol ?hasErrorMessage\@CommandOutput\@\@QEBA_NXZ */ MCAPI bool hasErrorMessage() const; /** - * @symbol ?hasPlayerText\@CommandOutput\@\@QEBA_NXZ + * @symbol ?hasPlayerText\@CommandOutput\@\@QEBA_NXZ */ MCAPI bool hasPlayerText() const; /** - * @symbol ?load\@CommandOutput\@\@QEAAXW4CommandOutputType\@\@H$$QEAV?$vector\@VCommandOutputMessage\@\@V?$allocator\@VCommandOutputMessage\@\@\@std\@\@\@std\@\@$$QEAV?$unique_ptr\@VCommandPropertyBag\@\@U?$default_delete\@VCommandPropertyBag\@\@\@std\@\@\@4\@\@Z + * @symbol ?load\@CommandOutput\@\@QEAAXW4CommandOutputType\@\@H$$QEAV?$vector\@VCommandOutputMessage\@\@V?$allocator\@VCommandOutputMessage\@\@\@std\@\@\@std\@\@$$QEAV?$unique_ptr\@VCommandPropertyBag\@\@U?$default_delete\@VCommandPropertyBag\@\@\@std\@\@\@4\@\@Z */ MCAPI void load(enum class CommandOutputType, int, std::vector &&, std::unique_ptr &&); /** - * @symbol ?setHasPlayerText\@CommandOutput\@\@QEAAXXZ + * @symbol ?setHasPlayerText\@CommandOutput\@\@QEAAXXZ */ MCAPI void setHasPlayerText(); /** - * @symbol ?success\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z + * @symbol ?success\@CommandOutput\@\@QEAAXXZ */ - MCAPI void success(std::string const &, std::vector const &); + MCAPI void success(); /** - * @symbol ?success\@CommandOutput\@\@QEAAXXZ + * @symbol ?success\@CommandOutput\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@\@Z */ - MCAPI void success(); + MCAPI void success(std::string const &, std::vector const &); /** - * @symbol ?wantsData\@CommandOutput\@\@QEBA_NXZ + * @symbol ?wantsData\@CommandOutput\@\@QEBA_NXZ */ MCAPI bool wantsData() const; /** - * @symbol ??1CommandOutput\@\@QEAA\@XZ + * @symbol ??1CommandOutput\@\@QEAA\@XZ */ MCAPI ~CommandOutput(); //private: /** - * @symbol ?addMessage\@CommandOutput\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@W4CommandOutputMessageType\@\@\@Z + * @symbol ?addMessage\@CommandOutput\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VCommandOutputParameter\@\@V?$allocator\@VCommandOutputParameter\@\@\@std\@\@\@3\@W4CommandOutputMessageType\@\@\@Z */ MCAPI void addMessage(std::string const &, std::vector const &, enum class CommandOutputMessageType); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp index 6519d2510a..9d8e1f5dd5 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputMessage.hpp @@ -29,36 +29,36 @@ class CommandOutputMessage { public: /** - * @symbol ??0CommandOutputMessage\@\@QEAA\@W4CommandOutputMessageType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$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 + * @symbol ??0CommandOutputMessage\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI CommandOutputMessage(enum class CommandOutputMessageType, std::string const &, std::vector &&); + MCAPI CommandOutputMessage(class CommandOutputMessage &&); /** - * @symbol ??0CommandOutputMessage\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CommandOutputMessage\@\@QEAA\@AEBV0\@\@Z */ MCAPI CommandOutputMessage(class CommandOutputMessage const &); /** - * @symbol ??0CommandOutputMessage\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0CommandOutputMessage\@\@QEAA\@W4CommandOutputMessageType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ - MCAPI CommandOutputMessage(class CommandOutputMessage &&); + MCAPI CommandOutputMessage(enum class CommandOutputMessageType, std::string const &, std::vector &&); /** - * @symbol ?getMessageId\@CommandOutputMessage\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getMessageId\@CommandOutputMessage\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getMessageId() const; /** - * @symbol ?getParams\@CommandOutputMessage\@\@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 + * @symbol ?getParams\@CommandOutputMessage\@\@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 & getParams() const; /** - * @symbol ?getType\@CommandOutputMessage\@\@QEBA?AW4CommandOutputMessageType\@\@XZ + * @symbol ?getType\@CommandOutputMessage\@\@QEBA?AW4CommandOutputMessageType\@\@XZ */ MCAPI enum class CommandOutputMessageType getType() const; /** - * @symbol ?getUserMessage\@CommandOutputMessage\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getUserMessage\@CommandOutputMessage\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getUserMessage() const; /** - * @symbol ??1CommandOutputMessage\@\@QEAA\@XZ + * @symbol ??1CommandOutputMessage\@\@QEAA\@XZ */ MCAPI ~CommandOutputMessage(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp index e79e346f54..35083ae7dc 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputPacket.hpp @@ -30,37 +30,43 @@ class CommandOutputPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandOutputPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CommandOutputPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CommandOutputPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CommandOutputPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CommandOutputPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CommandOutputPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CommandOutputPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CommandOutputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDOUTPUTPACKET /** - * @symbol ??0CommandOutputPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CommandOutputPacket(); + MCVAPI ~CommandOutputPacket(); +#endif /** - * @symbol ??0CommandOutputPacket\@\@QEAA\@AEBVCommandOrigin\@\@AEBVCommandOutput\@\@\@Z + * @symbol ??0CommandOutputPacket\@\@QEAA\@AEBVCommandOrigin\@\@AEBVCommandOutput\@\@\@Z */ MCAPI CommandOutputPacket(class CommandOrigin const &, class CommandOutput const &); + /** + * @symbol ??0CommandOutputPacket\@\@QEAA\@XZ + */ + MCAPI CommandOutputPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp index b3ec429327..819303b08a 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputParameter.hpp @@ -29,76 +29,76 @@ class CommandOutputParameter { public: /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI CommandOutputParameter(bool); + MCAPI CommandOutputParameter(std::vector const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); + MCAPI CommandOutputParameter(class CommandOutputParameter &&); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@VBlockPos\@\@\@Z */ MCAPI CommandOutputParameter(class BlockPos); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBD\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBD\@Z */ MCAPI CommandOutputParameter(char const *); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@M\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@M\@Z */ MCAPI CommandOutputParameter(float); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@H\@Z */ MCAPI CommandOutputParameter(int); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@_N\@Z + */ + MCAPI CommandOutputParameter(bool); + /** + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI CommandOutputParameter(std::string const &); + /** + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI CommandOutputParameter(class Actor const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBVActor\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@PEBVActor\@\@\@Z */ MCAPI CommandOutputParameter(class Actor const *); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@W4NoCountType\@0\@\@Z */ - MCAPI CommandOutputParameter(std::vector const &); + MCAPI CommandOutputParameter(enum class CommandOutputParameter::NoCountType); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CommandOutputParameter(std::vector const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVPlayer\@\@V?$allocator\@PEBVPlayer\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$vector\@PEBVPlayer\@\@V?$allocator\@PEBVPlayer\@\@\@std\@\@\@std\@\@\@Z */ 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\@AEBV0\@\@Z */ - MCAPI CommandOutputParameter(std::string const &); + MCAPI CommandOutputParameter(class CommandOutputParameter const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VActor\@\@\@\@\@Z */ MCAPI CommandOutputParameter(class CommandSelectorResults const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z + * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z */ MCAPI CommandOutputParameter(class CommandSelectorResults const &); /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@AEBV0\@\@Z - */ - MCAPI CommandOutputParameter(class CommandOutputParameter const &); - /** - * @symbol ??0CommandOutputParameter\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI CommandOutputParameter(class CommandOutputParameter &&); - /** - * @symbol ??4CommandOutputParameter\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4CommandOutputParameter\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CommandOutputParameter & operator=(class CommandOutputParameter &&); /** - * @symbol ??1CommandOutputParameter\@\@QEAA\@XZ + * @symbol ??1CommandOutputParameter\@\@QEAA\@XZ */ MCAPI ~CommandOutputParameter(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandOutputSender.hpp b/LiteLoader/include/llapi/mc/CommandOutputSender.hpp index 4971a6a819..0b22dd0486 100644 --- a/LiteLoader/include/llapi/mc/CommandOutputSender.hpp +++ b/LiteLoader/include/llapi/mc/CommandOutputSender.hpp @@ -30,94 +30,94 @@ class CommandOutputSender { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandOutputSender(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?send\@CommandOutputSender\@\@UEAAXAEBVCommandOrigin\@\@AEBVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?send\@CommandOutputSender\@\@UEAAXAEBVCommandOrigin\@\@AEBVCommandOutput\@\@\@Z */ virtual void send(class CommandOrigin const &, class CommandOutput const &); /** - * @vftbl 2 - * @symbol ?registerOutputCallback\@CommandOutputSender\@\@UEAAXAEBV?$function\@$$A6AXAEAVAutomationCmdOutput\@\@\@Z\@std\@\@\@Z + * @vftbl 2 + * @symbol ?registerOutputCallback\@CommandOutputSender\@\@UEAAXAEBV?$function\@$$A6AXAEAVAutomationCmdOutput\@\@\@Z\@std\@\@\@Z */ virtual void registerOutputCallback(class std::function const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ + * @vftbl 8 + * @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 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 13 + * @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 ??0CommandOutputSender\@\@QEAA\@XZ + * @symbol ??0CommandOutputSender\@\@QEAA\@XZ */ MCAPI CommandOutputSender(); /** - * @symbol ?sendToAdmins\@CommandOutputSender\@\@QEAAXAEBVCommandOrigin\@\@AEBVCommandOutput\@\@W4CommandPermissionLevel\@\@\@Z + * @symbol ?sendToAdmins\@CommandOutputSender\@\@QEAAXAEBVCommandOrigin\@\@AEBVCommandOutput\@\@W4CommandPermissionLevel\@\@\@Z */ MCAPI void sendToAdmins(class CommandOrigin const &, class CommandOutput const &, enum class CommandPermissionLevel); /** - * @symbol ?translate\@CommandOutputSender\@\@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\@\@AEBV23\@\@Z + * @symbol ?translate\@CommandOutputSender\@\@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\@\@AEBV23\@\@Z */ MCAPI static std::vector translate(std::vector const &); //protected: /** - * @symbol ?_toJson\@CommandOutputSender\@\@IEBA?AVValue\@Json\@\@AEBVCommandOutput\@\@\@Z + * @symbol ?_toJson\@CommandOutputSender\@\@IEBA?AVValue\@Json\@\@AEBVCommandOutput\@\@\@Z */ MCAPI class Json::Value _toJson(class CommandOutput const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandParameterData.hpp b/LiteLoader/include/llapi/mc/CommandParameterData.hpp index 298659534a..94a2f5ade4 100644 --- a/LiteLoader/include/llapi/mc/CommandParameterData.hpp +++ b/LiteLoader/include/llapi/mc/CommandParameterData.hpp @@ -66,20 +66,20 @@ class CommandParameterData { public: /** - * @symbol ??0CommandParameterData\@\@QEAA\@V?$typeid_t\@VCommandRegistry\@\@\@\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@2\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@ZPEBDW4CommandParameterDataType\@\@7H_NH\@Z + * @symbol ??0CommandParameterData\@\@QEAA\@V?$typeid_t\@VCommandRegistry\@\@\@\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@2\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@ZPEBDW4CommandParameterDataType\@\@7H_NH\@Z */ MCAPI CommandParameterData(class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const, char const *, enum class CommandParameterDataType, char const *, int, bool, int); /** - * @symbol ??0CommandParameterData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CommandParameterData\@\@QEAA\@AEBV0\@\@Z */ MCAPI CommandParameterData(class CommandParameterData const &); /** - * @symbol ?addOptions\@CommandParameterData\@\@QEAAAEAV1\@W4CommandParameterOption\@\@\@Z + * @symbol ?addOptions\@CommandParameterData\@\@QEAAAEAV1\@W4CommandParameterOption\@\@\@Z */ MCAPI class CommandParameterData & addOptions(enum class CommandParameterOption); /** - * @symbol ??1CommandParameterData\@\@QEAA\@XZ + * @symbol ??1CommandParameterData\@\@QEAA\@XZ */ MCAPI ~CommandParameterData(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandPosition.hpp b/LiteLoader/include/llapi/mc/CommandPosition.hpp index 76d2b8a990..f12b198f23 100644 --- a/LiteLoader/include/llapi/mc/CommandPosition.hpp +++ b/LiteLoader/include/llapi/mc/CommandPosition.hpp @@ -37,36 +37,36 @@ class CommandPosition { public: /** - * @symbol ??0CommandPosition\@\@QEAA\@XZ + * @symbol ??0CommandPosition\@\@QEAA\@XZ */ MCAPI CommandPosition(); /** - * @symbol ??0CommandPosition\@\@QEAA\@AEBVVec3\@\@\@Z + * @symbol ??0CommandPosition\@\@QEAA\@AEBVVec3\@\@\@Z */ MCAPI CommandPosition(class Vec3 const &); /** - * @symbol ?getBlockPos\@CommandPosition\@\@QEBA?AVBlockPos\@\@AEBVVec3\@\@0\@Z + * @symbol ?getBlockPos\@CommandPosition\@\@QEBA?AVBlockPos\@\@AEBVVec3\@\@0\@Z */ MCAPI class BlockPos getBlockPos(class Vec3 const &, class Vec3 const &) const; /** - * @symbol ?getBlockPos\@CommandPosition\@\@QEBA?AVBlockPos\@\@HAEBVCommandOrigin\@\@AEBVVec3\@\@\@Z + * @symbol ?getBlockPos\@CommandPosition\@\@QEBA?AVBlockPos\@\@HAEBVCommandOrigin\@\@AEBVVec3\@\@\@Z */ MCAPI class BlockPos getBlockPos(int, class CommandOrigin const &, class Vec3 const &) const; /** - * @symbol ?getPosition\@CommandPosition\@\@QEBA?AVVec3\@\@AEBV2\@0\@Z + * @symbol ?getPosition\@CommandPosition\@\@QEBA?AVVec3\@\@AEBV2\@0\@Z */ MCAPI class Vec3 getPosition(class Vec3 const &, class Vec3 const &) const; /** - * @symbol ?getPosition\@CommandPosition\@\@QEBA?AVVec3\@\@HAEBVCommandOrigin\@\@AEBV2\@\@Z + * @symbol ?getPosition\@CommandPosition\@\@QEBA?AVVec3\@\@HAEBVCommandOrigin\@\@AEBV2\@\@Z */ MCAPI class Vec3 getPosition(int, class CommandOrigin const &, class Vec3 const &) const; /** - * @symbol ?load\@CommandPosition\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?load\@CommandPosition\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void load(class CompoundTag const &); /** - * @symbol ?serialize\@CommandPosition\@\@QEBA?AVCompoundTag\@\@XZ + * @symbol ?serialize\@CommandPosition\@\@QEBA?AVCompoundTag\@\@XZ */ MCAPI class CompoundTag serialize() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp index 101484047f..7b51d8a834 100644 --- a/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/CommandPropertyBag.hpp @@ -30,32 +30,32 @@ class CommandPropertyBag { public: /** - * @symbol ??0CommandPropertyBag\@\@QEAA\@XZ + * @symbol ??0CommandPropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z */ - MCAPI CommandPropertyBag(); + MCAPI CommandPropertyBag(class Json::Value const &); /** - * @symbol ??0CommandPropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z + * @symbol ??0CommandPropertyBag\@\@QEAA\@XZ */ - MCAPI CommandPropertyBag(class Json::Value const &); + MCAPI CommandPropertyBag(); /** - * @symbol ?addToResultList\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @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 ?clone\@CommandPropertyBag\@\@QEBA?AV?$unique_ptr\@VCommandPropertyBag\@\@U?$default_delete\@VCommandPropertyBag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?clone\@CommandPropertyBag\@\@QEBA?AV?$unique_ptr\@VCommandPropertyBag\@\@U?$default_delete\@VCommandPropertyBag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr clone() const; /** - * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z + * @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 BlockPos const &); + 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 + * @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 + * @symbol ?set\@CommandPropertyBag\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ - MCAPI void set(std::string const &, class Vec3); + MCAPI void set(std::string const &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandRawText.hpp b/LiteLoader/include/llapi/mc/CommandRawText.hpp index ca9fca9ee5..fefdbdc798 100644 --- a/LiteLoader/include/llapi/mc/CommandRawText.hpp +++ b/LiteLoader/include/llapi/mc/CommandRawText.hpp @@ -37,8 +37,8 @@ inline operator std::string()const public: /** - * @symbol ?getText\@CommandRawText\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getText\@CommandRawText\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getText() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandRegistry.hpp b/LiteLoader/include/llapi/mc/CommandRegistry.hpp index 3af45bbea9..836358ae8f 100644 --- a/LiteLoader/include/llapi/mc/CommandRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandRegistry.hpp @@ -12,6 +12,7 @@ #include "typeid_t.hpp" // Include Headers or Declare Types Here class CommandParameterData; +#include "RelativeFloat.hpp" #include "CommandFlag.hpp" #include "CommandPosition.hpp" #include "CommandPositionFloat.hpp" @@ -552,340 +553,344 @@ class CommandRegistry { public: /** - * @symbol ??0CommandRegistry\@\@QEAA\@XZ + * @symbol ??0CommandRegistry\@\@QEAA\@XZ */ MCAPI CommandRegistry(); /** - * @symbol ?addEnumValueConstraints\@CommandRegistry\@\@QEAAXAEBV?$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\@W4SemanticConstraint\@\@\@Z + * @symbol ?addEnumValueConstraints\@CommandRegistry\@\@QEAAXAEBV?$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\@W4SemanticConstraint\@\@\@Z */ MCAPI void addEnumValueConstraints(std::string const &, std::vector const &, enum class SemanticConstraint); /** - * @symbol ?addEnumValues\@CommandRegistry\@\@QEAAHAEBV?$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 + * @symbol ?addEnumValues\@CommandRegistry\@\@QEAAHAEBV?$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 */ MCAPI int addEnumValues(std::string const &, std::vector const &); /** - * @symbol ?addSoftEnum\@CommandRegistry\@\@QEAAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?addSoftEnum\@CommandRegistry\@\@QEAAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI int addSoftEnum(std::string const &, std::vector); /** - * @symbol ?addSoftEnumValues\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?addSoftEnumValues\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI void addSoftEnumValues(std::string const &, std::vector); /** - * @symbol ?buildSelector\@CommandRegistry\@\@QEBA_NAEBUActorSelectorArgs\@\@PEAVCommandSelectorBase\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 + * @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 ?generateDocumentationMetadata\@CommandRegistry\@\@QEBA?AVValue\@Json\@\@_N\@Z + * @symbol ?fireCommandParseTableTelemetry\@CommandRegistry\@\@QEBAXAEBVIMinecraftEventing\@\@_N\@Z + */ + MCAPI void fireCommandParseTableTelemetry(class IMinecraftEventing const &, bool) const; + /** + * @symbol ?generateDocumentationMetadata\@CommandRegistry\@\@QEBA?AVValue\@Json\@\@_N\@Z */ MCAPI class Json::Value generateDocumentationMetadata(bool) const; /** - * @symbol ?getAliases\@CommandRegistry\@\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getAliases\@CommandRegistry\@\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector getAliases(std::string const &) const; /** - * @symbol ?getAlphabeticalLookup\@CommandRegistry\@\@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\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?getAlphabeticalLookup\@CommandRegistry\@\@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\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI std::vector getAlphabeticalLookup(class CommandOrigin const &) const; /** - * @symbol ?getCommandName\@CommandRegistry\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getCommandName\@CommandRegistry\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string getCommandName(std::string const &) const; /** - * @symbol ?getCommandOverloadSyntaxInformation\@CommandRegistry\@\@QEBA?AUCommandSyntaxInformation\@\@AEBVCommandOrigin\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getCommandOverloadSyntaxInformation\@CommandRegistry\@\@QEBA?AUCommandSyntaxInformation\@\@AEBVCommandOrigin\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct CommandSyntaxInformation getCommandOverloadSyntaxInformation(class CommandOrigin const &, std::string const &) const; /** - * @symbol ?getCommandStatus\@CommandRegistry\@\@QEBA?AW4CommandStatus\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getCommandStatus\@CommandRegistry\@\@QEBA?AW4CommandStatus\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class CommandStatus getCommandStatus(std::string const &) const; /** - * @symbol ?isCommandOfType\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CommandTypeFlag\@\@\@Z + * @symbol ?isCommandOfType\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CommandTypeFlag\@\@\@Z */ MCAPI bool isCommandOfType(std::string const &, enum class CommandTypeFlag) const; /** - * @symbol ?isValidCommand\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isValidCommand\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isValidCommand(std::string const &) const; /** - * @symbol ?registerAlias\@CommandRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?registerAlias\@CommandRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI void registerAlias(std::string, std::string); /** - * @symbol ?registerCommand\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDW4CommandPermissionLevel\@\@UCommandFlag\@\@3\@Z + * @symbol ?registerCommand\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDW4CommandPermissionLevel\@\@UCommandFlag\@\@3\@Z */ MCAPI void registerCommand(std::string const &, char const *, enum class CommandPermissionLevel, struct CommandFlag, struct CommandFlag); /** - * @symbol ?removeSoftEnumValues\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?removeSoftEnumValues\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI void removeSoftEnumValues(std::string const &, std::vector); /** - * @symbol ?requiresCheatsEnabled\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?requiresCheatsEnabled\@CommandRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool requiresCheatsEnabled(std::string const &) const; /** - * @symbol ?serializeAvailableCommands\@CommandRegistry\@\@QEBA?AVAvailableCommandsPacket\@\@XZ + * @symbol ?serializeAvailableCommands\@CommandRegistry\@\@QEBA?AVAvailableCommandsPacket\@\@XZ */ MCAPI class AvailableCommandsPacket serializeAvailableCommands() const; /** - * @symbol ?setCommandRegistrationOverride\@CommandRegistry\@\@QEAAXV?$function\@$$A6AXAEAUCommandFlag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?setCommandRegistrationOverride\@CommandRegistry\@\@QEAAXV?$function\@$$A6AXAEAUCommandFlag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI void setCommandRegistrationOverride(class std::function); /** - * @symbol ?setNetworkUpdateCallback\@CommandRegistry\@\@QEAAXV?$function\@$$A6AXAEBVPacket\@\@\@Z\@std\@\@\@Z + * @symbol ?setNetworkUpdateCallback\@CommandRegistry\@\@QEAAXV?$function\@$$A6AXAEBVPacket\@\@\@Z\@std\@\@\@Z */ MCAPI void setNetworkUpdateCallback(class std::function); /** - * @symbol ?setScoreCallback\@CommandRegistry\@\@QEAAXV?$function\@$$A6AHAEA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z\@std\@\@\@Z + * @symbol ?setScoreCallback\@CommandRegistry\@\@QEAAXV?$function\@$$A6AHAEA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z\@std\@\@\@Z */ MCAPI void setScoreCallback(class std::function); /** - * @symbol ?setSoftEnumValues\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?setSoftEnumValues\@CommandRegistry\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI void setSoftEnumValues(std::string const &, std::vector); /** - * @symbol ??1CommandRegistry\@\@QEAA\@XZ + * @symbol ??1CommandRegistry\@\@QEAA\@XZ */ MCAPI ~CommandRegistry(); /** - * @symbol ?COMMAND_NAME_ENUM_NAME\@CommandRegistry\@\@2PEBDEB + * @symbol ?COMMAND_NAME_ENUM_NAME\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * COMMAND_NAME_ENUM_NAME; /** - * @symbol ?FUNCTION_NAME_SOFTENUM_NAME\@CommandRegistry\@\@2PEBDEB + * @symbol ?FUNCTION_NAME_SOFTENUM_NAME\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * FUNCTION_NAME_SOFTENUM_NAME; /** - * @symbol ?HASITEM_PARAM_DATA\@CommandRegistry\@\@2PEBDEB + * @symbol ?HASITEM_PARAM_DATA\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * HASITEM_PARAM_DATA; /** - * @symbol ?HASITEM_PARAM_ITEM\@CommandRegistry\@\@2PEBDEB + * @symbol ?HASITEM_PARAM_ITEM\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * HASITEM_PARAM_ITEM; /** - * @symbol ?HASITEM_PARAM_LOCATION\@CommandRegistry\@\@2PEBDEB + * @symbol ?HASITEM_PARAM_LOCATION\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * HASITEM_PARAM_LOCATION; /** - * @symbol ?HASITEM_PARAM_QUANTITY\@CommandRegistry\@\@2PEBDEB + * @symbol ?HASITEM_PARAM_QUANTITY\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * HASITEM_PARAM_QUANTITY; /** - * @symbol ?HASITEM_PARAM_SLOT\@CommandRegistry\@\@2PEBDEB + * @symbol ?HASITEM_PARAM_SLOT\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * HASITEM_PARAM_SLOT; /** - * @symbol ?TAG_VALUES_SOFTENUM_NAME\@CommandRegistry\@\@2PEBDEB + * @symbol ?TAG_VALUES_SOFTENUM_NAME\@CommandRegistry\@\@2PEBDEB */ MCAPI static char const * TAG_VALUES_SOFTENUM_NAME; //private: /** - * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z + * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z */ - MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); + MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); /** - * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z + * @symbol ?_addEnumValuesInternal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@std\@\@\@2\@\@4\@V?$typeid_t\@VCommandRegistry\@\@\@\@P81\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV34\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z\@Z */ - MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); + MCAPI class CommandRegistry::Symbol _addEnumValuesInternal(std::string const &, std::vector> const &, class typeid_t, bool ( CommandRegistry::*)(void *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const); /** - * @symbol ?_addFunctionSoftEnum\@CommandRegistry\@\@AEAA?AVSymbol\@1\@XZ + * @symbol ?_addFunctionSoftEnum\@CommandRegistry\@\@AEAA?AVSymbol\@1\@XZ */ MCAPI class CommandRegistry::Symbol _addFunctionSoftEnum(); /** - * @symbol ?_getConstrainedParamEnumSymbol\@CommandRegistry\@\@AEBA?AVSymbol\@1\@V21\@\@Z + * @symbol ?_getConstrainedParamEnumSymbol\@CommandRegistry\@\@AEBA?AVSymbol\@1\@V21\@\@Z */ MCAPI class CommandRegistry::Symbol _getConstrainedParamEnumSymbol(class CommandRegistry::Symbol) const; /** - * @symbol ?_isCommandElementValid\@CommandRegistry\@\@AEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_isCommandElementValid\@CommandRegistry\@\@AEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _isCommandElementValid(std::string const &) const; /** - * @symbol ?_matchesEnumConstraintsSet\@CommandRegistry\@\@AEBA_NAEBVSymbol\@1\@AEBVCommandOrigin\@\@0W4SemanticConstraint\@\@\@Z + * @symbol ?_matchesEnumConstraintsSet\@CommandRegistry\@\@AEBA_NAEBVSymbol\@1\@AEBVCommandOrigin\@\@0W4SemanticConstraint\@\@\@Z */ MCAPI bool _matchesEnumConstraintsSet(class CommandRegistry::Symbol const &, class CommandOrigin const &, class CommandRegistry::Symbol const &, enum class SemanticConstraint) const; /** - * @symbol ?addEnumValuesToExisting\@CommandRegistry\@\@AEAAXIAEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?addEnumValuesToExisting\@CommandRegistry\@\@AEAAXIAEBV?$vector\@U?$pair\@_K_K\@std\@\@V?$allocator\@U?$pair\@_K_K\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void addEnumValuesToExisting(unsigned int, std::vector> const &); /** - * @symbol ?addPostfix\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addPostfix\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CommandRegistry::Symbol addPostfix(std::string const &); /** - * @symbol ?addRule\@CommandRegistry\@\@AEAAXVSymbol\@1\@$$QEAV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@std\@\@V?$function\@$$A6APEAUParseToken\@CommandRegistry\@\@AEAU12\@VSymbol\@2\@\@Z\@4\@VCommandVersion\@\@\@Z + * @symbol ?addRule\@CommandRegistry\@\@AEAAXVSymbol\@1\@$$QEAV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@std\@\@V?$function\@$$A6APEAUParseToken\@CommandRegistry\@\@AEAU12\@VSymbol\@2\@\@Z\@4\@VCommandVersion\@\@\@Z */ MCAPI void addRule(class CommandRegistry::Symbol, std::vector &&, class std::function, class CommandVersion); /** - * @symbol ?addSemanticConstraint\@CommandRegistry\@\@AEAAXW4SemanticConstraint\@\@\@Z + * @symbol ?addSemanticConstraint\@CommandRegistry\@\@AEAAXW4SemanticConstraint\@\@\@Z */ MCAPI void addSemanticConstraint(enum class SemanticConstraint); /** - * @symbol ?addSoftTerminal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addSoftTerminal\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CommandRegistry::Symbol addSoftTerminal(std::string const &); /** - * @symbol ?buildFirstSet\@CommandRegistry\@\@AEBAXAEAUParseTable\@1\@VSymbol\@1\@I\@Z + * @symbol ?buildFirstSet\@CommandRegistry\@\@AEBAXAEAUParseTable\@1\@VSymbol\@1\@I\@Z */ MCAPI void buildFirstSet(struct CommandRegistry::ParseTable &, class CommandRegistry::Symbol, unsigned int) const; /** - * @symbol ?buildFollowSet\@CommandRegistry\@\@AEBAXAEAUParseTable\@1\@VSymbol\@1\@IAEAV?$set\@VSymbol\@CommandRegistry\@\@U?$less\@VSymbol\@CommandRegistry\@\@\@std\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@4\@\@std\@\@\@Z + * @symbol ?buildFollowSet\@CommandRegistry\@\@AEBAXAEAUParseTable\@1\@VSymbol\@1\@IAEAV?$set\@VSymbol\@CommandRegistry\@\@U?$less\@VSymbol\@CommandRegistry\@\@\@std\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@4\@\@std\@\@\@Z */ MCAPI void buildFollowSet(struct CommandRegistry::ParseTable &, class CommandRegistry::Symbol, unsigned int, class std::set, class std::allocator> &) const; /** - * @symbol ?buildOptionalRuleChain\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBUSignature\@1\@AEBV?$vector\@VCommandParameterData\@\@V?$allocator\@VCommandParameterData\@\@\@std\@\@\@std\@\@AEBV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@5\@\@Z + * @symbol ?buildOptionalRuleChain\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEBUSignature\@1\@AEBV?$vector\@VCommandParameterData\@\@V?$allocator\@VCommandParameterData\@\@\@std\@\@\@std\@\@AEBV?$vector\@VSymbol\@CommandRegistry\@\@V?$allocator\@VSymbol\@CommandRegistry\@\@\@std\@\@\@5\@\@Z */ MCAPI class CommandRegistry::Symbol buildOptionalRuleChain(struct CommandRegistry::Signature const &, std::vector const &, std::vector const &); /** - * @symbol ?buildOverload\@CommandRegistry\@\@AEAAXAEAUOverload\@1\@\@Z - */ - MCAPI void buildOverload(struct CommandRegistry::Overload &); - /** - * @symbol ?buildParseTable\@CommandRegistry\@\@AEBAXI\@Z + * @symbol ?buildParseTable\@CommandRegistry\@\@AEBAXI\@Z */ MCAPI void buildParseTable(unsigned int) const; /** - * @symbol ?buildRules\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEAUSignature\@1\@AEBV?$vector\@PEAUOverload\@CommandRegistry\@\@V?$allocator\@PEAUOverload\@CommandRegistry\@\@\@std\@\@\@std\@\@_K\@Z + * @symbol ?buildRules\@CommandRegistry\@\@AEAA?AVSymbol\@1\@AEAUSignature\@1\@AEBV?$vector\@PEAUOverload\@CommandRegistry\@\@V?$allocator\@PEAUOverload\@CommandRegistry\@\@\@std\@\@\@std\@\@_K\@Z */ MCAPI class CommandRegistry::Symbol buildRules(struct CommandRegistry::Signature &, std::vector const &, unsigned __int64); /** - * @symbol ?checkOriginCommandFlags\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@UCommandFlag\@\@W4CommandPermissionLevel\@\@\@Z + * @symbol ?checkOriginCommandFlags\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@UCommandFlag\@\@W4CommandPermissionLevel\@\@\@Z */ MCAPI bool checkOriginCommandFlags(class CommandOrigin const &, struct CommandFlag, enum class CommandPermissionLevel) const; /** - * @symbol ?createCommand\@CommandRegistry\@\@AEBA?AV?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@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\@\@3\@\@Z + * @symbol ?createCommand\@CommandRegistry\@\@AEBA?AV?$unique_ptr\@VCommand\@\@U?$default_delete\@VCommand\@\@\@std\@\@\@std\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@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\@\@3\@\@Z */ MCAPI std::unique_ptr createCommand(struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const; /** - * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUSignature\@1\@AEBV23\@AEBUOverload\@1\@IPEAI3\@Z + * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z */ - MCAPI std::string describe(struct CommandRegistry::Signature const &, std::string const &, struct CommandRegistry::Overload const &, unsigned int, unsigned int *, unsigned int *) const; + MCAPI std::string describe(class CommandRegistry::Symbol) const; /** - * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandParameterData\@\@\@Z + * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandParameterData\@\@\@Z */ MCAPI std::string describe(class CommandParameterData const &) const; /** - * @symbol ?describe\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z + * @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 ?findCommand\@CommandRegistry\@\@AEAAPEAUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?findCommand\@CommandRegistry\@\@AEAAPEAUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct CommandRegistry::Signature * findCommand(std::string const &); /** - * @symbol ?findCommand\@CommandRegistry\@\@AEBAPEBUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?findCommand\@CommandRegistry\@\@AEBAPEBUSignature\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct CommandRegistry::Signature const * findCommand(std::string const &) const; /** - * @symbol ?findEnumValue\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?findEnumValue\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CommandRegistry::Symbol findEnumValue(std::string const &) const; /** - * @symbol ?findIdentifierInfo\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?findIdentifierInfo\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CommandRegistry::Symbol findIdentifierInfo(std::string const &) const; /** - * @symbol ?findPostfix\@CommandRegistry\@\@AEBA?AVSymbol\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 + * @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 + * @symbol ?forEachNonTerminal\@CommandRegistry\@\@AEBAXV?$function\@$$A6AXVSymbol\@CommandRegistry\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachNonTerminal(class std::function) const; /** - * @symbol ?getEnumData\@CommandRegistry\@\@AEBA_KAEBUParseToken\@1\@\@Z + * @symbol ?getEnumData\@CommandRegistry\@\@AEBA_KAEBUParseToken\@1\@\@Z */ MCAPI unsigned __int64 getEnumData(struct CommandRegistry::ParseToken const &) const; /** - * @symbol ?getInvertableFilter\@CommandRegistry\@\@AEBA?AU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@AEBUParseToken\@1\@\@Z + * @symbol ?getInvertableFilter\@CommandRegistry\@\@AEBA?AU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@AEBUParseToken\@1\@\@Z */ MCAPI struct InvertableFilter getInvertableFilter(struct CommandRegistry::ParseToken const &) const; /** - * @symbol ?isValid\@CommandRegistry\@\@AEBA_NVSymbol\@1\@\@Z + * @symbol ?isValid\@CommandRegistry\@\@AEBA_NVSymbol\@1\@\@Z */ MCAPI bool isValid(class CommandRegistry::Symbol) const; /** - * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUOverload\@1\@\@Z + * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUOverload\@1\@\@Z */ MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Overload const &) const; /** - * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z + * @symbol ?originCanRun\@CommandRegistry\@\@AEBA_NAEBVCommandOrigin\@\@AEBUSignature\@1\@\@Z */ MCAPI bool originCanRun(class CommandOrigin const &, struct CommandRegistry::Signature const &) const; /** - * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NAEAUActorSelectorArgs\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@Z + * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NAEAUActorSelectorArgs\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@\@Z */ MCAPI bool parseSelector(struct ActorSelectorArgs &, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &) const; /** - * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NPEAVCommandSelectorBase\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@_N\@Z + * @symbol ?parseSelector\@CommandRegistry\@\@AEBA_NPEAVCommandSelectorBase\@\@AEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@6\@_N\@Z */ MCAPI bool parseSelector(class CommandSelectorBase *, struct CommandRegistry::ParseToken const &, class CommandOrigin const &, int, std::string &, std::vector &, bool) const; /** - * @symbol ?registerOverloadInternal\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@AEAUOverload\@1\@\@Z + * @symbol ?registerOverloadInternal\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@AEAUOverload\@1\@\@Z */ MCAPI void registerOverloadInternal(struct CommandRegistry::Signature &, struct CommandRegistry::Overload &); /** - * @symbol ?setupOverloadRules\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@AEAUOverload\@1\@\@Z + * @symbol ?setupOverloadRules\@CommandRegistry\@\@AEAAXAEAUSignature\@1\@\@Z */ - MCAPI void setupOverloadRules(struct CommandRegistry::Signature &, struct CommandRegistry::Overload &); + MCAPI void setupOverloadRules(struct CommandRegistry::Signature &); /** - * @symbol ?symbolToString\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z + * @symbol ?symbolToString\@CommandRegistry\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VSymbol\@1\@\@Z */ MCAPI std::string symbolToString(class CommandRegistry::Symbol) const; /** - * @symbol ?_removeStringQuotes\@CommandRegistry\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @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 ?collapse\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@\@Z + * @symbol ?buildOverload\@CommandRegistry\@\@CAXAEAUOverload\@1\@\@Z + */ + MCAPI static void buildOverload(struct CommandRegistry::Overload &); + /** + * @symbol ?collapse\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@\@Z */ MCAPI static struct CommandRegistry::ParseToken * collapse(struct CommandRegistry::ParseToken &, class CommandRegistry::Symbol); /** - * @symbol ?collapseOn\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@1\@Z + * @symbol ?collapseOn\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@1\@Z */ MCAPI static struct CommandRegistry::ParseToken * collapseOn(struct CommandRegistry::ParseToken &, class CommandRegistry::Symbol, class CommandRegistry::Symbol); /** - * @symbol ?expand\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@\@Z + * @symbol ?expand\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@\@Z */ MCAPI static struct CommandRegistry::ParseToken * expand(struct CommandRegistry::ParseToken &, class CommandRegistry::Symbol); /** - * @symbol ?expandExcept\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@1\@Z + * @symbol ?expandExcept\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@1\@Z */ MCAPI static struct CommandRegistry::ParseToken * expandExcept(struct CommandRegistry::ParseToken &, class CommandRegistry::Symbol, class CommandRegistry::Symbol); /** - * @symbol ?fold\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@1\@Z + * @symbol ?fold\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@1\@Z */ MCAPI static struct CommandRegistry::ParseToken * fold(struct CommandRegistry::ParseToken &, class CommandRegistry::Symbol, class CommandRegistry::Symbol); /** - * @symbol ?kill\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@\@Z + * @symbol ?kill\@CommandRegistry\@\@CAPEAUParseToken\@1\@AEAU21\@VSymbol\@1\@\@Z */ MCAPI static struct CommandRegistry::ParseToken * kill(struct CommandRegistry::ParseToken &, class CommandRegistry::Symbol); /** - * @symbol ?readFloat\@CommandRegistry\@\@CA_NAEAMAEBUParseToken\@1\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z + * @symbol ?readFloat\@CommandRegistry\@\@CA_NAEAMAEBUParseToken\@1\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z */ MCAPI static bool readFloat(float &, struct CommandRegistry::ParseToken const &, std::string &, std::vector &); /** - * @symbol ?readInt\@CommandRegistry\@\@CA_NAEAHAEBUParseToken\@1\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z + * @symbol ?readInt\@CommandRegistry\@\@CA_NAEAHAEBUParseToken\@1\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z */ MCAPI static bool readInt(int &, struct CommandRegistry::ParseToken const &, std::string &, std::vector &); /** - * @symbol ?readRelativeCoordinate\@CommandRegistry\@\@CA_NAEA_NAEAMAEBUParseToken\@1\@_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z + * @symbol ?readRelativeCoordinate\@CommandRegistry\@\@CA_NAEA_NAEAMAEBUParseToken\@1\@_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z */ MCAPI static bool readRelativeCoordinate(bool &, float &, struct CommandRegistry::ParseToken const &, bool, std::string &, std::vector &); private: /** - * @symbol ?ParseRuleSymbols\@CommandRegistry\@\@0QBU?$pair\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@ZVSymbol\@1\@\@std\@\@B + * @symbol ?ParseRuleSymbols\@CommandRegistry\@\@0QBU?$pair\@P8CommandRegistry\@\@EBA_NPEAXAEBUParseToken\@1\@AEBVCommandOrigin\@\@HAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@ZVSymbol\@1\@\@std\@\@B */ MCAPI static struct std::pair &) const, class CommandRegistry::Symbol> const ParseRuleSymbols[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp index d73bfe3060..0fcf6464d0 100644 --- a/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/CommandRequestPacket.hpp @@ -31,45 +31,51 @@ class CommandRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CommandRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CommandRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CommandRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CommandRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CommandRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CommandRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CommandRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CommandRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMMANDREQUESTPACKET /** - * @symbol ??0CommandRequestPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CommandRequestPacket(); + MCVAPI ~CommandRequestPacket(); +#endif /** - * @symbol ??0CommandRequestPacket\@\@QEAA\@AEAVCommandContext\@\@_N\@Z + * @symbol ??0CommandRequestPacket\@\@QEAA\@AEAVCommandContext\@\@_N\@Z */ MCAPI CommandRequestPacket(class CommandContext &, bool); /** - * @symbol ?createCommandContext\@CommandRequestPacket\@\@QEBA?AV?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@AEBVNetworkIdentifier\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@\@Z + * @symbol ??0CommandRequestPacket\@\@QEAA\@XZ + */ + MCAPI CommandRequestPacket(); + /** + * @symbol ?createCommandContext\@CommandRequestPacket\@\@QEBA?AV?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@AEBVNetworkIdentifier\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@\@Z */ MCAPI std::unique_ptr createCommandContext(class NetworkIdentifier const &, class Bedrock::NonOwnerPointer const &) const; /** - * @symbol ?getInternalSource\@CommandRequestPacket\@\@QEBA_NXZ + * @symbol ?getInternalSource\@CommandRequestPacket\@\@QEBA_NXZ */ MCAPI bool getInternalSource() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandResponse.hpp b/LiteLoader/include/llapi/mc/CommandResponse.hpp index 208f433131..75996276d3 100644 --- a/LiteLoader/include/llapi/mc/CommandResponse.hpp +++ b/LiteLoader/include/llapi/mc/CommandResponse.hpp @@ -31,24 +31,24 @@ class CommandResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CommandResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@CommandResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@CommandResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@CommandResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@CommandResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@CommandResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@CommandResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandResponseBase.hpp b/LiteLoader/include/llapi/mc/CommandResponseBase.hpp index 02c4d0d9b6..2519fbf4ac 100644 --- a/LiteLoader/include/llapi/mc/CommandResponseBase.hpp +++ b/LiteLoader/include/llapi/mc/CommandResponseBase.hpp @@ -28,24 +28,32 @@ class CommandResponseBase { public: /** - * @symbol ??1CommandResponseBase\@\@QEAA\@XZ + * @symbol ??1CommandResponseBase\@\@QEAA\@XZ */ MCAPI ~CommandResponseBase(); /** - * @symbol ?NameID\@CommandResponseBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@CommandResponseBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; //protected: /** - * @symbol ?_addCommand\@CommandResponseBase\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_addCommand\@CommandResponseBase\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _addCommand(std::string const &); /** - * @symbol ?_executeAction\@CommandResponseBase\@\@IEBAXAEAVRenderParams\@\@\@Z + * @symbol ?_executeAction\@CommandResponseBase\@\@IEBAXAEAVRenderParams\@\@\@Z */ MCAPI void _executeAction(class RenderParams &) const; +//private: + /** + * @symbol ?_compileCommands\@CommandResponseBase\@\@AEBAXAEAVLevel\@\@\@Z + */ + MCAPI void _compileCommands(class Level &) const; + protected: -}; \ No newline at end of file +private: + +}; diff --git a/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp index f329266b19..a7005169d9 100644 --- a/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp +++ b/LiteLoader/include/llapi/mc/CommandSelectorBase.hpp @@ -60,159 +60,159 @@ class CommandSelectorBase { public: /** - * @symbol ?addFamilyFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z + * @symbol ?addFamilyFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z */ MCAPI void addFamilyFilter(struct InvertableFilter const &); /** - * @symbol ?addFilter\@CommandSelectorBase\@\@QEAAXV?$function\@$$A6A_NAEBVCommandOrigin\@\@AEBVActor\@\@\@Z\@std\@\@\@Z + * @symbol ?addFilter\@CommandSelectorBase\@\@QEAAXV?$function\@$$A6A_NAEBVCommandOrigin\@\@AEBVActor\@\@\@Z\@std\@\@\@Z */ MCAPI void addFilter(class std::function); /** - * @symbol ?addGameModeFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@W4GameType\@\@\@\@\@Z + * @symbol ?addGameModeFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@W4GameType\@\@\@\@\@Z */ MCAPI void addGameModeFilter(struct InvertableFilter const &); /** - * @symbol ?addHasItemFilter\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@H\@3\@AEBVCommandIntegerRange\@\@W4EquipmentSlot\@\@2\@Z + * @symbol ?addHasItemFilter\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@H\@3\@AEBVCommandIntegerRange\@\@W4EquipmentSlot\@\@2\@Z */ MCAPI void addHasItemFilter(std::string const &, class std::optional, class CommandIntegerRange const &, enum class EquipmentSlot, class CommandIntegerRange const &); /** - * @symbol ?addLevelFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@HH\@std\@\@\@Z + * @symbol ?addLevelFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@HH\@std\@\@\@Z */ MCAPI void addLevelFilter(struct std::pair const &); /** - * @symbol ?addNameFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z + * @symbol ?addNameFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z */ MCAPI void addNameFilter(struct InvertableFilter const &); /** - * @symbol ?addScoreFilter\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AHAEA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z\@3\@\@Z + * @symbol ?addScoreFilter\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandIntegerRange\@\@V?$function\@$$A6AHAEA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z\@3\@\@Z */ MCAPI void addScoreFilter(std::string const &, class CommandIntegerRange const &, class std::function); /** - * @symbol ?addTagFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z + * @symbol ?addTagFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z */ MCAPI void addTagFilter(struct InvertableFilter const &); /** - * @symbol ?addTypeFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z + * @symbol ?addTypeFilter\@CommandSelectorBase\@\@QEAAXAEBU?$InvertableFilter\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@\@Z */ MCAPI void addTypeFilter(struct InvertableFilter const &); /** - * @symbol ?addXRotationFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@MM\@std\@\@\@Z + * @symbol ?addXRotationFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@MM\@std\@\@\@Z */ MCAPI void addXRotationFilter(struct std::pair const &); /** - * @symbol ?addYRotationFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@MM\@std\@\@\@Z + * @symbol ?addYRotationFilter\@CommandSelectorBase\@\@QEAAXAEBU?$pair\@MM\@std\@\@\@Z */ MCAPI void addYRotationFilter(struct std::pair const &); /** - * @symbol ?compile\@CommandSelectorBase\@\@QEAA_NAEBVCommandOrigin\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?compile\@CommandSelectorBase\@\@QEAA_NAEBVCommandOrigin\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool compile(class CommandOrigin const &, std::string &); /** - * @symbol ?getName\@CommandSelectorBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@CommandSelectorBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName() const; /** - * @symbol ?getOrder\@CommandSelectorBase\@\@QEBA?AW4CommandSelectionOrder\@\@XZ + * @symbol ?getOrder\@CommandSelectorBase\@\@QEBA?AW4CommandSelectionOrder\@\@XZ */ MCAPI enum class CommandSelectionOrder getOrder() const; /** - * @symbol ?getResultCount\@CommandSelectorBase\@\@QEBA_KXZ + * @symbol ?getResultCount\@CommandSelectorBase\@\@QEBA_KXZ */ MCAPI unsigned __int64 getResultCount() const; /** - * @symbol ?hasName\@CommandSelectorBase\@\@QEBA_NXZ + * @symbol ?hasName\@CommandSelectorBase\@\@QEBA_NXZ */ MCAPI bool hasName() const; /** - * @symbol ?isExplicitIdSelector\@CommandSelectorBase\@\@QEBA_NXZ + * @symbol ?isExplicitIdSelector\@CommandSelectorBase\@\@QEBA_NXZ */ MCAPI bool isExplicitIdSelector() const; /** - * @symbol ?setBox\@CommandSelectorBase\@\@QEAAXVBlockPos\@\@\@Z + * @symbol ?setBox\@CommandSelectorBase\@\@QEAAXAEBVVec3\@\@\@Z */ - MCAPI void setBox(class BlockPos); + MCAPI void setBox(class Vec3 const &); /** - * @symbol ?setExcludeAgents\@CommandSelectorBase\@\@QEAAX_N\@Z + * @symbol ?setExcludeAgents\@CommandSelectorBase\@\@QEAAX_N\@Z */ MCAPI void setExcludeAgents(bool); /** - * @symbol ?setExplicitIdSelector\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setExplicitIdSelector\@CommandSelectorBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setExplicitIdSelector(std::string const &); /** - * @symbol ?setIncludeDeadPlayers\@CommandSelectorBase\@\@QEAAX_N\@Z + * @symbol ?setIncludeDeadPlayers\@CommandSelectorBase\@\@QEAAX_N\@Z */ MCAPI void setIncludeDeadPlayers(bool); /** - * @symbol ?setOrder\@CommandSelectorBase\@\@QEAAXW4CommandSelectionOrder\@\@\@Z + * @symbol ?setOrder\@CommandSelectorBase\@\@QEAAXW4CommandSelectionOrder\@\@\@Z */ MCAPI void setOrder(enum class CommandSelectionOrder); /** - * @symbol ?setPosition\@CommandSelectorBase\@\@QEAAXAEBVCommandPosition\@\@\@Z + * @symbol ?setPosition\@CommandSelectorBase\@\@QEAAXAEBVCommandPosition\@\@\@Z */ MCAPI void setPosition(class CommandPosition const &); /** - * @symbol ?setRadiusMax\@CommandSelectorBase\@\@QEAAXM\@Z + * @symbol ?setRadiusMax\@CommandSelectorBase\@\@QEAAXM\@Z */ MCAPI void setRadiusMax(float); /** - * @symbol ?setRadiusMin\@CommandSelectorBase\@\@QEAAXM\@Z + * @symbol ?setRadiusMin\@CommandSelectorBase\@\@QEAAXM\@Z */ MCAPI void setRadiusMin(float); /** - * @symbol ?setResultCount\@CommandSelectorBase\@\@QEAAX_K_N\@Z + * @symbol ?setResultCount\@CommandSelectorBase\@\@QEAAX_K_N\@Z */ MCAPI void setResultCount(unsigned __int64, bool); /** - * @symbol ?setType\@CommandSelectorBase\@\@QEAAXW4CommandSelectionType\@\@\@Z + * @symbol ?setType\@CommandSelectorBase\@\@QEAAXW4CommandSelectionType\@\@\@Z */ MCAPI void setType(enum class CommandSelectionType); /** - * @symbol ?setVersion\@CommandSelectorBase\@\@QEAAXH\@Z + * @symbol ?setVersion\@CommandSelectorBase\@\@QEAAXH\@Z */ MCAPI void setVersion(int); /** - * @symbol ??1CommandSelectorBase\@\@QEAA\@XZ + * @symbol ??1CommandSelectorBase\@\@QEAA\@XZ */ MCAPI ~CommandSelectorBase(); //protected: /** - * @symbol ??0CommandSelectorBase\@\@IEAA\@_N\@Z + * @symbol ??0CommandSelectorBase\@\@IEAA\@_N\@Z */ MCAPI CommandSelectorBase(bool); /** - * @symbol ?newResults\@CommandSelectorBase\@\@IEBA?AV?$shared_ptr\@V?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@\@std\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?newResults\@CommandSelectorBase\@\@IEBA?AV?$shared_ptr\@V?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@\@std\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI class std::shared_ptr> newResults(class CommandOrigin const &) const; //private: /** - * @symbol ?compareName\@CommandSelectorBase\@\@AEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?compareName\@CommandSelectorBase\@\@AEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool compareName(std::string const &) const; /** - * @symbol ?filter\@CommandSelectorBase\@\@AEBA_NAEBVCommandOrigin\@\@AEAVActor\@\@\@Z + * @symbol ?filter\@CommandSelectorBase\@\@AEBA_NAEBVCommandOrigin\@\@AEAVActor\@\@\@Z */ MCAPI bool filter(class CommandOrigin const &, class Actor &) const; /** - * @symbol ?isExpansionAllowed\@CommandSelectorBase\@\@AEBA_NAEBVCommandOrigin\@\@\@Z + * @symbol ?isExpansionAllowed\@CommandSelectorBase\@\@AEBA_NAEBVCommandOrigin\@\@\@Z */ MCAPI bool isExpansionAllowed(class CommandOrigin const &) const; /** - * @symbol ?matchFamily\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z + * @symbol ?matchFamily\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z */ MCAPI bool matchFamily(class Actor const &) const; /** - * @symbol ?matchName\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z + * @symbol ?matchName\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z */ MCAPI bool matchName(class Actor const &) const; /** - * @symbol ?matchTag\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z + * @symbol ?matchTag\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z */ MCAPI bool matchTag(class Actor const &) const; /** - * @symbol ?matchType\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z + * @symbol ?matchType\@CommandSelectorBase\@\@AEBA_NAEBVActor\@\@\@Z */ MCAPI bool matchType(class Actor const &) const; @@ -220,4 +220,4 @@ class CommandSelectorBase { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp b/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp index afa2599ae7..8569ec3e7a 100644 --- a/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp +++ b/LiteLoader/include/llapi/mc/CommandSelectorUtil.hpp @@ -20,8 +20,8 @@ namespace CommandSelectorUtil { #undef AFTER_EXTRA /** - * @symbol ?isValidSelector\@CommandSelectorUtil\@\@YA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?isValidSelector\@CommandSelectorUtil\@\@YA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool isValidSelector(class gsl::basic_string_span); + MCAPI bool isValidSelector(class std::basic_string_view>); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp b/LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp index bc9fb3909a..445e808101 100644 --- a/LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CommandSoftEnumRegistry.hpp @@ -32,16 +32,16 @@ class CommandSoftEnumRegistry { public: /** - * @symbol ??0CommandSoftEnumRegistry\@\@QEAA\@PEAVCommandRegistry\@\@\@Z + * @symbol ??0CommandSoftEnumRegistry\@\@QEAA\@PEAVCommandRegistry\@\@\@Z */ MCAPI CommandSoftEnumRegistry(class CommandRegistry *); /** - * @symbol ?updateSoftEnum\@CommandSoftEnumRegistry\@\@QEAAXW4SoftEnumUpdateType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z + * @symbol ?updateSoftEnum\@CommandSoftEnumRegistry\@\@QEAAXW4SoftEnumUpdateType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@\@Z */ MCAPI void updateSoftEnum(enum class SoftEnumUpdateType, std::string const &, std::vector); /** - * @symbol ??1CommandSoftEnumRegistry\@\@QEAA\@XZ + * @symbol ??1CommandSoftEnumRegistry\@\@QEAA\@XZ */ MCAPI ~CommandSoftEnumRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp b/LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp index fdf2f81d7d..457ba9b91c 100644 --- a/LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp +++ b/LiteLoader/include/llapi/mc/CommandSyntaxInformation.hpp @@ -27,11 +27,11 @@ struct CommandSyntaxInformation { public: /** - * @symbol ??0CommandSyntaxInformation\@\@QEAA\@XZ + * @symbol ??0CommandSyntaxInformation\@\@QEAA\@XZ */ MCAPI CommandSyntaxInformation(); /** - * @symbol ??1CommandSyntaxInformation\@\@QEAA\@XZ + * @symbol ??1CommandSyntaxInformation\@\@QEAA\@XZ */ MCAPI ~CommandSyntaxInformation(); diff --git a/LiteLoader/include/llapi/mc/CommandUtils.hpp b/LiteLoader/include/llapi/mc/CommandUtils.hpp index 82145e7450..adfb7fd93b 100644 --- a/LiteLoader/include/llapi/mc/CommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/CommandUtils.hpp @@ -23,115 +23,119 @@ namespace CommandUtils { #undef AFTER_EXTRA /** - * @symbol ?CMD_INPUT_UNICODE_TRANSLATE_MAP\@CommandUtils\@\@3V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@\@2\@\@std\@\@B + * @symbol ?CMD_INPUT_UNICODE_TRANSLATE_MAP\@CommandUtils\@\@3V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@\@2\@\@std\@\@B */ MCAPI extern std::vector> const CMD_INPUT_UNICODE_TRANSLATE_MAP; /** - * @symbol ?addItemInstanceComponents\@CommandUtils\@\@YA_NAEAVItemInstance\@\@AEBVValue\@Json\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addItemInstanceComponents\@CommandUtils\@\@YA_NAEAVItemInstance\@\@AEBVValue\@Json\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool addItemInstanceComponents(class ItemInstance &, class Json::Value const &, std::string &); /** - * @symbol ?addtoCSVList\@CommandUtils\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?addtoCSVList\@CommandUtils\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI void addtoCSVList(std::string &, std::string const &); /** - * @symbol ?alterSpawnableEntities\@CommandUtils\@\@YAXAEAVLevelData\@\@AEBUActorDefinitionIdentifier\@\@AEAU3\@\@Z + * @symbol ?alterSpawnableEntities\@CommandUtils\@\@YAXAEAVLevelData\@\@AEBUActorDefinitionIdentifier\@\@AEAU3\@\@Z */ MCAPI void alterSpawnableEntities(class LevelData &, struct ActorDefinitionIdentifier const &, struct ActorDefinitionIdentifier &); /** - * @symbol ?broadcastPlayerSpawnedMobEvent\@CommandUtils\@\@YAXAEBVActor\@\@AEAV2\@\@Z + * @symbol ?broadcastPlayerSpawnedMobEvent\@CommandUtils\@\@YAXAEBVActor\@\@AEAV2\@\@Z */ MCAPI void broadcastPlayerSpawnedMobEvent(class Actor const &, class Actor &); /** - * @symbol ?canBeSummoned\@CommandUtils\@\@YA_NAEBUActorDefinitionIdentifier\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?canBeSummoned\@CommandUtils\@\@YA_NAEBUActorDefinitionIdentifier\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI bool canBeSummoned(struct ActorDefinitionIdentifier const &, class CommandOrigin const &); /** - * @symbol ?clearBlockEntityContents\@CommandUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?clearBlockEntityContents\@CommandUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void clearBlockEntityContents(class BlockSource &, class BlockPos const &); /** - * @symbol ?clearBlockEntityLootTable\@CommandUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?clearBlockEntityLootTable\@CommandUtils\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void clearBlockEntityLootTable(class BlockSource &, class BlockPos const &); /** - * @symbol ?convertBlockEntityTag\@CommandUtils\@\@YAXAEAVCompoundTag\@\@AEBVBlockActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?convertBlockEntityTag\@CommandUtils\@\@YAXAEAVCompoundTag\@\@AEBVBlockActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI void convertBlockEntityTag(class CompoundTag &, class BlockActor const &, class BlockPos const &); /** - * @symbol ?createItemStack\@CommandUtils\@\@YA?AVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z + * @symbol ?createItemStack\@CommandUtils\@\@YA?AVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z */ MCAPI class ItemStack createItemStack(std::string const &, int, int); /** - * @symbol ?createItemStacks\@CommandUtils\@\@YA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemInstance\@\@HAEAH\@Z + * @symbol ?createItemStacks\@CommandUtils\@\@YA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemInstance\@\@HAEAH\@Z */ MCAPI std::vector createItemStacks(class ItemInstance const &, int, int &); /** - * @symbol ?createMapData\@CommandUtils\@\@YA_NAEAVActor\@\@AEAVItemInstance\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?createMapData\@CommandUtils\@\@YA_NAEAVActor\@\@AEAVItemInstance\@\@AEAVCommandOutput\@\@\@Z */ MCAPI bool createMapData(class Actor &, class ItemInstance &, class CommandOutput &); /** - * @symbol ?displayLocalizableMessage\@CommandUtils\@\@YAX_NAEAVPlayer\@\@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\@\@4\@\@Z + * @symbol ?displayLocalizableMessage\@CommandUtils\@\@YAX_NAEAVPlayer\@\@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\@\@4\@\@Z */ MCAPI void displayLocalizableMessage(bool, class Player &, std::string const &, std::vector const &); /** - * @symbol ?getActorName\@CommandUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z + * @symbol ?getActorName\@CommandUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z */ MCAPI std::string getActorName(class Actor const &); /** - * @symbol ?getFeetBlockPos\@CommandUtils\@\@YA?AVBlockPos\@\@PEBVActor\@\@\@Z + * @symbol ?getFeetBlockPos\@CommandUtils\@\@YA?AVBlockPos\@\@PEBVActor\@\@\@Z */ MCAPI class BlockPos getFeetBlockPos(class Actor const *); /** - * @symbol ?getFeetPos\@CommandUtils\@\@YA?AVVec3\@\@PEBVActor\@\@\@Z + * @symbol ?getFeetPos\@CommandUtils\@\@YA?AVVec3\@\@PEBVActor\@\@\@Z */ MCAPI class Vec3 getFeetPos(class Actor const *); /** - * @symbol ?getInvalidCommandEntities\@CommandUtils\@\@YA?AV?$vector\@W4ActorType\@\@V?$allocator\@W4ActorType\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getInvalidCommandEntities\@CommandUtils\@\@YA?AV?$vector\@W4ActorType\@\@V?$allocator\@W4ActorType\@\@\@std\@\@\@std\@\@_N0\@Z + */ + MCAPI std::vector getInvalidCommandEntities(bool, bool); + /** + * @symbol ?getInvalidCommandEntities\@CommandUtils\@\@YA?AV?$vector\@W4ActorType\@\@V?$allocator\@W4ActorType\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getInvalidCommandEntities(); /** - * @symbol ?getOriginPlayer\@CommandUtils\@\@YAPEBVPlayer\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?getOriginPlayer\@CommandUtils\@\@YAPEBVPlayer\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI class Player const * getOriginPlayer(class CommandOrigin const &); /** - * @symbol ?getTelemetryErrorList\@CommandUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandOutput\@\@\@Z + * @symbol ?getTelemetryErrorList\@CommandUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCommandOutput\@\@\@Z */ MCAPI std::string getTelemetryErrorList(class CommandOutput const &); /** - * @symbol ?isActiveTickingChunk\@CommandUtils\@\@YA_NUTick\@\@0\@Z + * @symbol ?isActiveTickingChunk\@CommandUtils\@\@YA_NUTick\@\@0\@Z */ MCAPI bool isActiveTickingChunk(struct Tick, struct Tick); /** - * @symbol ?isFunctionValid\@CommandUtils\@\@YA_NAEAVCommandOutput\@\@AEAVFunctionEntry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isFunctionValid\@CommandUtils\@\@YA_NAEAVCommandOutput\@\@AEAVFunctionEntry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isFunctionValid(class CommandOutput &, class FunctionEntry &, std::string const &); /** - * @symbol ?isPlayerSpawnedMob\@CommandUtils\@\@YA_NAEBVActor\@\@0\@Z + * @symbol ?isPlayerSpawnedMob\@CommandUtils\@\@YA_NAEBVActor\@\@0\@Z */ MCAPI bool isPlayerSpawnedMob(class Actor const &, class Actor const &); /** - * @symbol ?isValidCommandEntity\@CommandUtils\@\@YA_NAEBV?$vector\@W4ActorType\@\@V?$allocator\@W4ActorType\@\@\@std\@\@\@std\@\@W4ActorType\@\@\@Z + * @symbol ?isValidCommandEntity\@CommandUtils\@\@YA_NAEBV?$vector\@W4ActorType\@\@V?$allocator\@W4ActorType\@\@\@std\@\@\@std\@\@W4ActorType\@\@\@Z */ MCAPI bool isValidCommandEntity(std::vector const &, enum class ActorType); /** - * @symbol ?nameEntity\@CommandUtils\@\@YAXAEAVActor\@\@_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?nameEntity\@CommandUtils\@\@YAXAEAVActor\@\@_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void nameEntity(class Actor &, bool, std::string const &); /** - * @symbol ?setInitEvent\@CommandUtils\@\@YAXAEAUActorDefinitionIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setInitEvent\@CommandUtils\@\@YAXAEAUActorDefinitionIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setInitEvent(struct ActorDefinitionIdentifier &, std::string const &); /** - * @symbol ?spawnEntityAt\@CommandUtils\@\@YAPEAVActor\@\@AEAVBlockSource\@\@AEBVVec3\@\@AEBUActorDefinitionIdentifier\@\@AEAUActorUniqueID\@\@PEAV2\@\@Z + * @symbol ?spawnEntityAt\@CommandUtils\@\@YAPEAVActor\@\@AEAVBlockSource\@\@AEBVVec3\@\@AEBUActorDefinitionIdentifier\@\@AEAUActorUniqueID\@\@PEAV2\@\@Z */ MCAPI class Actor * spawnEntityAt(class BlockSource &, class Vec3 const &, struct ActorDefinitionIdentifier const &, struct ActorUniqueID &, class Actor *); /** - * @symbol ?toJsonResult\@CommandUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBVValue\@Json\@\@\@Z + * @symbol ?toJsonResult\@CommandUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBVValue\@Json\@\@\@Z */ MCAPI std::string toJsonResult(std::string const &, class Json::Value const &); /** - * @symbol ?validatePath\@CommandUtils\@\@YA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCommandOutput\@\@AEBVCommandFilePath\@\@\@Z + * @symbol ?validatePath\@CommandUtils\@\@YA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCommandOutput\@\@AEBVCommandFilePath\@\@\@Z */ MCAPI std::string const validatePath(class CommandOutput &, class CommandFilePath const &); diff --git a/LiteLoader/include/llapi/mc/CommandVersion.hpp b/LiteLoader/include/llapi/mc/CommandVersion.hpp index 734374321c..a8af0311c5 100644 --- a/LiteLoader/include/llapi/mc/CommandVersion.hpp +++ b/LiteLoader/include/llapi/mc/CommandVersion.hpp @@ -34,32 +34,32 @@ class CommandVersion { public: /** - * @symbol ??0CommandVersion\@\@QEAA\@HH\@Z + * @symbol ??0CommandVersion\@\@QEAA\@HH\@Z */ MCAPI CommandVersion(int, int); /** - * @symbol ?covers\@CommandVersion\@\@QEBA_NAEBV1\@\@Z + * @symbol ?covers\@CommandVersion\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool covers(class CommandVersion const &) const; /** - * @symbol ?getSemVersionFromCommandVersion\@CommandVersion\@\@QEBA?AVSemVersion\@\@XZ + * @symbol ?getSemVersionFromCommandVersion\@CommandVersion\@\@QEBA?AVSemVersion\@\@XZ */ MCAPI class SemVersion getSemVersionFromCommandVersion() const; /** - * @symbol ?isCompatible\@CommandVersion\@\@QEBA_NH\@Z + * @symbol ?isCompatible\@CommandVersion\@\@QEBA_NH\@Z */ MCAPI bool isCompatible(int) const; /** - * @symbol ?CurrentVersion\@CommandVersion\@\@2HB + * @symbol ?CurrentVersion\@CommandVersion\@\@2HB */ MCAPI static int const CurrentVersion; /** - * @symbol ?getSemVersionFromCommandVersion\@CommandVersion\@\@SA?AVSemVersion\@\@H\@Z + * @symbol ?getSemVersionFromCommandVersion\@CommandVersion\@\@SA?AVSemVersion\@\@H\@Z */ MCAPI static class SemVersion getSemVersionFromCommandVersion(int); /** - * @symbol ?getVersionMapping\@CommandVersion\@\@SA?BW4CurrentCmdVersion\@\@AEBVSemVersion\@\@\@Z + * @symbol ?getVersionMapping\@CommandVersion\@\@SA?BW4CurrentCmdVersion\@\@AEBVSemVersion\@\@\@Z */ MCAPI static enum class CurrentCmdVersion const getVersionMapping(class SemVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommandWildcardInt.hpp b/LiteLoader/include/llapi/mc/CommandWildcardInt.hpp index 6e9579b534..f871b40409 100644 --- a/LiteLoader/include/llapi/mc/CommandWildcardInt.hpp +++ b/LiteLoader/include/llapi/mc/CommandWildcardInt.hpp @@ -29,16 +29,16 @@ class CommandWildcardInt { public: /** - * @symbol ??0CommandWildcardInt\@\@QEAA\@XZ + * @symbol ??0CommandWildcardInt\@\@QEAA\@XZ */ MCAPI CommandWildcardInt(); /** - * @symbol ?getValue\@CommandWildcardInt\@\@QEBAHXZ + * @symbol ?getValue\@CommandWildcardInt\@\@QEBAHXZ */ MCAPI int getValue() const; /** - * @symbol ?isWildcard\@CommandWildcardInt\@\@QEBA_NXZ + * @symbol ?isWildcard\@CommandWildcardInt\@\@QEBA_NXZ */ MCAPI bool isWildcard() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Common.hpp b/LiteLoader/include/llapi/mc/Common.hpp index e108674ee9..8b15d1af76 100644 --- a/LiteLoader/include/llapi/mc/Common.hpp +++ b/LiteLoader/include/llapi/mc/Common.hpp @@ -19,26 +19,31 @@ namespace Common { #define AFTER_EXTRA // Add Member There +struct BuildInfo {}; #undef AFTER_EXTRA /** - * @symbol ?getGameDevVersionString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getBuildInfo\@Common\@\@YA?AUBuildInfo\@1\@XZ + */ + MCAPI struct Common::BuildInfo getBuildInfo(); + /** + * @symbol ?getGameDevVersionString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getGameDevVersionString(); /** - * @symbol ?getGameSemVerString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getGameSemVerString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getGameSemVerString(); /** - * @symbol ?getGameVersionString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getGameVersionString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getGameVersionString(); /** - * @symbol ?getGameVersionStringNet\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getGameVersionStringNet\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getGameVersionStringNet(); /** - * @symbol ?getServerVersionString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getServerVersionString\@Common\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getServerVersionString(); diff --git a/LiteLoader/include/llapi/mc/CommonResourceDefinitionMap.hpp b/LiteLoader/include/llapi/mc/CommonResourceDefinitionMap.hpp index 4ad64c9d68..73f89f1f55 100644 --- a/LiteLoader/include/llapi/mc/CommonResourceDefinitionMap.hpp +++ b/LiteLoader/include/llapi/mc/CommonResourceDefinitionMap.hpp @@ -29,48 +29,48 @@ class CommonResourceDefinitionMap { public: /** - * @symbol ??0CommonResourceDefinitionMap\@\@QEAA\@XZ + * @symbol ??0CommonResourceDefinitionMap\@\@QEAA\@XZ */ MCAPI CommonResourceDefinitionMap(); /** - * @symbol ?getAnimateScriptArray\@CommonResourceDefinitionMap\@\@QEBAAEBV?$vector\@UNamedMolangScript\@\@V?$allocator\@UNamedMolangScript\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAnimateScriptArray\@CommonResourceDefinitionMap\@\@QEBAAEBV?$vector\@UNamedMolangScript\@\@V?$allocator\@UNamedMolangScript\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAnimateScriptArray() const; /** - * @symbol ?getAnimationControllers\@CommonResourceDefinitionMap\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@VActorAnimationControllerPtr\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@VActorAnimationControllerPtr\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getAnimationControllers\@CommonResourceDefinitionMap\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@VActorAnimationControllerPtr\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@VActorAnimationControllerPtr\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getAnimationControllers() const; /** - * @symbol ?getAnimations\@CommonResourceDefinitionMap\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@VActorSkeletalAnimationPtr\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@VActorSkeletalAnimationPtr\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getAnimations\@CommonResourceDefinitionMap\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@VActorSkeletalAnimationPtr\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@VActorSkeletalAnimationPtr\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getAnimations() const; /** - * @symbol ?getVariableSettings\@CommonResourceDefinitionMap\@\@QEBAAEBV?$vector\@UMolangVariableSettings\@\@V?$allocator\@UMolangVariableSettings\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getVariableSettings\@CommonResourceDefinitionMap\@\@QEBAAEBV?$vector\@UMolangVariableSettings\@\@V?$allocator\@UMolangVariableSettings\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getVariableSettings() const; /** - * @symbol ?isCommonResourceDefinitionMapEmpty\@CommonResourceDefinitionMap\@\@QEBA_NXZ + * @symbol ?isCommonResourceDefinitionMapEmpty\@CommonResourceDefinitionMap\@\@QEBA_NXZ */ MCAPI bool isCommonResourceDefinitionMapEmpty() const; /** - * @symbol ?mergeActorAnimateScriptArray\@CommonResourceDefinitionMap\@\@QEAAXAEBV?$vector\@UNamedMolangScript\@\@V?$allocator\@UNamedMolangScript\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?mergeActorAnimateScriptArray\@CommonResourceDefinitionMap\@\@QEAAXAEBV?$vector\@UNamedMolangScript\@\@V?$allocator\@UNamedMolangScript\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void mergeActorAnimateScriptArray(std::vector const &); /** - * @symbol ?mergeAnimation\@CommonResourceDefinitionMap\@\@QEAAXAEBVHashedString\@\@VActorSkeletalAnimationPtr\@\@\@Z + * @symbol ?mergeAnimation\@CommonResourceDefinitionMap\@\@QEAAXAEBVHashedString\@\@VActorSkeletalAnimationPtr\@\@\@Z */ MCAPI void mergeAnimation(class HashedString const &, class ActorSkeletalAnimationPtr); /** - * @symbol ?mergeAnimationController\@CommonResourceDefinitionMap\@\@QEAAXAEBVHashedString\@\@VActorAnimationControllerPtr\@\@\@Z + * @symbol ?mergeAnimationController\@CommonResourceDefinitionMap\@\@QEAAXAEBVHashedString\@\@VActorAnimationControllerPtr\@\@\@Z */ MCAPI void mergeAnimationController(class HashedString const &, class ActorAnimationControllerPtr); //private: /** - * @symbol ?_getAnimationResourceDefinitionLock\@CommonResourceDefinitionMap\@\@CAAEAVrecursive_mutex\@std\@\@XZ + * @symbol ?_getAnimationResourceDefinitionLock\@CommonResourceDefinitionMap\@\@CAAEAVrecursive_mutex\@std\@\@XZ */ MCAPI static class std::recursive_mutex & _getAnimationResourceDefinitionLock(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CommunitySiftConfig.hpp b/LiteLoader/include/llapi/mc/CommunitySiftConfig.hpp index 3e24a66a4d..b30c5bece2 100644 --- a/LiteLoader/include/llapi/mc/CommunitySiftConfig.hpp +++ b/LiteLoader/include/llapi/mc/CommunitySiftConfig.hpp @@ -27,11 +27,11 @@ struct CommunitySiftConfig { public: /** - * @symbol ??0CommunitySiftConfig\@\@QEAA\@XZ + * @symbol ??0CommunitySiftConfig\@\@QEAA\@XZ */ MCAPI CommunitySiftConfig(); /** - * @symbol ??1CommunitySiftConfig\@\@QEAA\@XZ + * @symbol ??1CommunitySiftConfig\@\@QEAA\@XZ */ MCAPI ~CommunitySiftConfig(); diff --git a/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp b/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp index 6c2a67d26a..286e7c087b 100644 --- a/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp +++ b/LiteLoader/include/llapi/mc/CommunitySiftProcessor.hpp @@ -29,80 +29,80 @@ class CommunitySiftProcessor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~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 + * @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 */ 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 + * @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 */ 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 + * @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 */ 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 + * @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 */ 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 + * @vftbl 5 + * @symbol ?processJoinEvent\@CommunitySiftProcessor\@\@UEAAXAEBVPlayer\@\@\@Z */ virtual void processJoinEvent(class Player const &); /** - * @vftbl 6 - * @symbol ?processLeaveEvent\@CommunitySiftProcessor\@\@UEAAXAEBVPlayer\@\@\@Z + * @vftbl 6 + * @symbol ?processLeaveEvent\@CommunitySiftProcessor\@\@UEAAXAEBVPlayer\@\@\@Z */ virtual void processLeaveEvent(class Player const &); /** - * @vftbl 7 - * @symbol ?onStartShutdown\@CommunitySiftProcessor\@\@UEAAXXZ + * @vftbl 7 + * @symbol ?onStartShutdown\@CommunitySiftProcessor\@\@UEAAXXZ */ virtual void onStartShutdown(); /** - * @symbol ??0CommunitySiftProcessor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVScheduler\@\@\@Z + * @symbol ??0CommunitySiftProcessor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVScheduler\@\@\@Z */ MCAPI CommunitySiftProcessor(std::string const &, std::string const &, class Scheduler &); //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\@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 */ 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\@\@0\@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 &)>); /** - * @symbol ?_processEvent\@CommunitySiftProcessor\@\@AEAAXAEBVPlayer\@\@W4TextProcessingEventOrigin\@\@PEBVUserEntityIdentifierComponent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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\@\@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\@\@0\@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 ?_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\@\@0\@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 ?_validateCommunitySiftConfiguration\@CommunitySiftProcessor\@\@AEAA_NXZ + * @symbol ?_validateCommunitySiftConfiguration\@CommunitySiftProcessor\@\@AEAA_NXZ */ MCAPI bool _validateCommunitySiftConfiguration(); /** - * @symbol ?_createConfigFromJson\@CommunitySiftProcessor\@\@CA?AUCommunitySiftConfig\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp b/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp index 1df69d9754..a052a56692 100644 --- a/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp +++ b/LiteLoader/include/llapi/mc/CompactionListenerEnv.hpp @@ -30,112 +30,112 @@ class CompactionListenerEnv { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompactionListenerEnv(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?NewSequentialFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@2\@\@Z + * @vftbl 1 + * @symbol ?NewSequentialFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@2\@\@Z */ virtual class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @vftbl 2 - * @symbol ?NewRandomAccessFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@2\@\@Z + * @vftbl 2 + * @symbol ?NewRandomAccessFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@2\@\@Z */ virtual class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @vftbl 3 - * @symbol ?NewWritableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 3 + * @symbol ?NewWritableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 4 - * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 4 + * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 5 - * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool FileExists(std::string const &); /** - * @vftbl 6 - * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @vftbl 6 + * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ virtual class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @vftbl 7 - * @symbol ?DeleteFileA\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?DeleteFileA\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteFileA(std::string const &); /** - * @vftbl 8 - * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status CreateDir(std::string const &); /** - * @vftbl 9 - * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteDir(std::string const &); /** - * @vftbl 10 - * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @vftbl 10 + * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ virtual class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @vftbl 11 - * @symbol ?RenameFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 11 + * @symbol ?RenameFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @vftbl 12 - * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z + * @vftbl 12 + * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z */ virtual class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @vftbl 13 - * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z + * @vftbl 13 + * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z */ virtual class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @vftbl 14 - * @symbol ?Schedule\@CompactionListenerEnv\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 14 + * @symbol ?Schedule\@CompactionListenerEnv\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void Schedule(void ( *)(void *), void *); /** - * @vftbl 15 - * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 15 + * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void StartThread(void ( *)(void *), void *); /** - * @vftbl 16 - * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status GetTestDirectory(std::string *); /** - * @vftbl 17 - * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z + * @vftbl 17 + * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z */ virtual class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @vftbl 18 - * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ + * @vftbl 18 + * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ */ virtual unsigned __int64 NowMicros(); /** - * @vftbl 19 - * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z + * @vftbl 19 + * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); /** - * @symbol ??0CompactionListenerEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z + * @symbol ??0CompactionListenerEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z */ MCAPI CompactionListenerEnv(class leveldb::Env *); /** - * @symbol ?setCompactionCallback\@CompactionListenerEnv\@\@QEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z + * @symbol ?setCompactionCallback\@CompactionListenerEnv\@\@QEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z */ MCAPI void setCompactionCallback(class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp index 64738896f9..178a45f179 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlock.hpp @@ -31,296 +31,301 @@ class ComparatorBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComparatorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@ComparatorBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@ComparatorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 59 - * @symbol ?getDirectSignal\@ComparatorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 59 + * @symbol ?getDirectSignal\@ComparatorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ComparatorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ComparatorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 116 - * @symbol ?triggerEvent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @vftbl 116 + * @symbol ?triggerEvent\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@ComparatorBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ComparatorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@ComparatorBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@ComparatorBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ComparatorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@ComparatorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@ComparatorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@ComparatorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ComparatorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPARATORBLOCK /** - * @symbol ?isInteractiveBlock\@ComparatorBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@ComparatorBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0ComparatorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0ComparatorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI ComparatorBlock(std::string const &, int, bool); //private: /** - * @symbol ?_installCircuit\@ComparatorBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_installCircuit\@ComparatorBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void _installCircuit(class BlockSource &, class BlockPos const &, bool) const; /** - * @symbol ?_refreshOutputState\@ComparatorBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_refreshOutputState\@ComparatorBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void _refreshOutputState(class BlockSource &, class BlockPos const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp index ae11f13509..59a2ebc4ec 100644 --- a/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorBlockActor.hpp @@ -31,78 +31,78 @@ class ComparatorBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComparatorBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ComparatorBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ComparatorBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@ComparatorBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@ComparatorBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@ComparatorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@ComparatorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 40 - * @symbol ?getOutputSignal\@ComparatorBlockActor\@\@UEAAHXZ + * @vftbl 40 + * @symbol ?getOutputSignal\@ComparatorBlockActor\@\@UEAAHXZ */ virtual int getOutputSignal(); /** - * @vftbl 41 - * @symbol ?setOutputSignal\@ComparatorBlockActor\@\@UEAAXH\@Z + * @vftbl 41 + * @symbol ?setOutputSignal\@ComparatorBlockActor\@\@UEAAXH\@Z */ virtual void setOutputSignal(int); /** - * @symbol ??0ComparatorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0ComparatorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI ComparatorBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp b/LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp index f669e08497..c362ce9620 100644 --- a/LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/ComparatorCapacitor.hpp @@ -32,68 +32,68 @@ enum class Mode; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComparatorCapacitor(); + virtual void __unk_vfn_0(); /** - * @vftbl 11 - * @symbol ?addSource\@ComparatorCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@ComparatorCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@ComparatorCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@ComparatorCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 15 - * @symbol ?cacheValues\@ComparatorCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 15 + * @symbol ?cacheValues\@ComparatorCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void cacheValues(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 16 - * @symbol ?updateDependencies\@ComparatorCapacitor\@\@UEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?updateDependencies\@ComparatorCapacitor\@\@UEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z */ virtual void updateDependencies(class CircuitSceneGraph &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@ComparatorCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@ComparatorCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @symbol ??0ComparatorCapacitor\@\@QEAA\@XZ + * @symbol ??0ComparatorCapacitor\@\@QEAA\@XZ */ MCAPI ComparatorCapacitor(); /** - * @symbol ?clearAnalogStrength\@ComparatorCapacitor\@\@QEAAXE\@Z + * @symbol ?clearAnalogStrength\@ComparatorCapacitor\@\@QEAAXE\@Z */ MCAPI void clearAnalogStrength(unsigned char); /** - * @symbol ?getOldStrength\@ComparatorCapacitor\@\@QEAAHXZ + * @symbol ?getOldStrength\@ComparatorCapacitor\@\@QEAAHXZ */ MCAPI int getOldStrength(); /** - * @symbol ?isSubtractMode\@ComparatorCapacitor\@\@QEAA_NXZ + * @symbol ?isSubtractMode\@ComparatorCapacitor\@\@QEAA_NXZ */ MCAPI bool isSubtractMode(); /** - * @symbol ?setAnalogStrength\@ComparatorCapacitor\@\@QEAAXHE\@Z + * @symbol ?setAnalogStrength\@ComparatorCapacitor\@\@QEAAXHE\@Z */ MCAPI void setAnalogStrength(int, unsigned char); /** - * @symbol ?setMode\@ComparatorCapacitor\@\@QEAAXW4Mode\@1\@\@Z + * @symbol ?setMode\@ComparatorCapacitor\@\@QEAAXW4Mode\@1\@\@Z */ MCAPI void setMode(enum class ComparatorCapacitor::Mode); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompassItem.hpp b/LiteLoader/include/llapi/mc/CompassItem.hpp index 033ea21ff7..6439052bdf 100644 --- a/LiteLoader/include/llapi/mc/CompassItem.hpp +++ b/LiteLoader/include/llapi/mc/CompassItem.hpp @@ -32,83 +32,83 @@ class CompassItem : public AbstractCompassItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompassItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@CompassItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@CompassItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0CompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CompassItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp b/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp index 4472489c45..415f31ed20 100644 --- a/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp +++ b/LiteLoader/include/llapi/mc/CompassSpriteCalculator.hpp @@ -30,44 +30,44 @@ class CompassSpriteCalculator { public: /** - * @symbol ??0CompassSpriteCalculator\@\@QEAA\@V?$function\@$$A6A?AVBlockPos\@\@PEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@V?$function\@$$A6A_NPEBVBlockSource\@\@PEAVActor\@\@\@Z\@2\@MM\@Z + * @symbol ??0CompassSpriteCalculator\@\@QEAA\@V?$function\@$$A6A?AVBlockPos\@\@PEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@V?$function\@$$A6A_NPEBVBlockSource\@\@PEAVActor\@\@\@Z\@2\@MM\@Z */ MCAPI CompassSpriteCalculator(class std::function, class std::function, float, float); /** - * @symbol ?getFrame\@CompassSpriteCalculator\@\@QEBAHXZ + * @symbol ?getFrame\@CompassSpriteCalculator\@\@QEBAHXZ */ MCAPI int getFrame() const; /** - * @symbol ?update\@CompassSpriteCalculator\@\@QEAAHAEAVActor\@\@_N\@Z + * @symbol ?update\@CompassSpriteCalculator\@\@QEAAHAEAVActor\@\@_N\@Z */ MCAPI int update(class Actor &, bool); /** - * @symbol ?updateFromPosition\@CompassSpriteCalculator\@\@QEAAHPEBVBlockSource\@\@AEBVBlockPos\@\@MMM_N22\@Z + * @symbol ?updateFromPosition\@CompassSpriteCalculator\@\@QEAAHPEBVBlockSource\@\@AEBVBlockPos\@\@MMM_N22\@Z */ MCAPI int updateFromPosition(class BlockSource const *, class BlockPos const &, float, float, float, bool, bool, bool); /** - * @symbol ?updateFromPosition\@CompassSpriteCalculator\@\@QEAAHPEBVBlockSource\@\@PEAVActor\@\@MMM_N2\@Z + * @symbol ?updateFromPosition\@CompassSpriteCalculator\@\@QEAAHPEBVBlockSource\@\@PEAVActor\@\@MMM_N2\@Z */ MCAPI int updateFromPosition(class BlockSource const *, class Actor *, float, float, float, bool, bool); /** - * @symbol ??1CompassSpriteCalculator\@\@QEAA\@XZ + * @symbol ??1CompassSpriteCalculator\@\@QEAA\@XZ */ MCAPI ~CompassSpriteCalculator(); /** - * @symbol ?isInLastDeathDimension\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A_NPEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ + * @symbol ?isInLastDeathDimension\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A_NPEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ */ MCAPI static class std::function isInLastDeathDimension(); /** - * @symbol ?isInOverworldDimension\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A_NPEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ + * @symbol ?isInOverworldDimension\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A_NPEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ */ MCAPI static class std::function isInOverworldDimension(); /** - * @symbol ?pointTowardsLastDeathLocation\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A?AVBlockPos\@\@PEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ + * @symbol ?pointTowardsLastDeathLocation\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A?AVBlockPos\@\@PEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ */ MCAPI static class std::function pointTowardsLastDeathLocation(); /** - * @symbol ?pointTowardsSpawnPoint\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A?AVBlockPos\@\@PEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ + * @symbol ?pointTowardsSpawnPoint\@CompassSpriteCalculator\@\@SA?AV?$function\@$$A6A?AVBlockPos\@\@PEBVBlockSource\@\@PEAVActor\@\@\@Z\@std\@\@XZ */ MCAPI static class std::function pointTowardsSpawnPoint(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp index 48b0418435..3adeba82e5 100644 --- a/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/CompletedUsingItemPacket.hpp @@ -30,37 +30,43 @@ class CompletedUsingItemPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompletedUsingItemPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CompletedUsingItemPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CompletedUsingItemPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CompletedUsingItemPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CompletedUsingItemPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CompletedUsingItemPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CompletedUsingItemPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CompletedUsingItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPLETEDUSINGITEMPACKET /** - * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CompletedUsingItemPacket(); +#endif + /** + * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@XZ */ MCAPI CompletedUsingItemPacket(); /** - * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z + * @symbol ??0CompletedUsingItemPacket\@\@QEAA\@FH\@Z */ MCAPI CompletedUsingItemPacket(short, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp b/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp new file mode 100644 index 0000000000..4d4f7427b9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ComplexAliasDescriptor.hpp @@ -0,0 +1,89 @@ +/** + * @file ComplexAliasDescriptor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "ItemDescriptor.hpp" +#include "Json.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ComplexAliasDescriptor { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_COMPLEXALIASDESCRIPTOR +public: + class ComplexAliasDescriptor& operator=(class ComplexAliasDescriptor const &) = delete; + ComplexAliasDescriptor(class ComplexAliasDescriptor const &) = delete; + ComplexAliasDescriptor() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol ?clone\@ComplexAliasDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::unique_ptr clone() const; + /** + * @vftbl 1 + * @symbol ?sameItems\@ComplexAliasDescriptor\@\@UEBA_NAEBUBaseDescriptor\@ItemDescriptor\@\@_N\@Z + */ + virtual bool sameItems(struct ItemDescriptor::BaseDescriptor const &, bool) const; + /** + * @vftbl 2 + * @symbol ?sameItem\@ComplexAliasDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z + */ + virtual bool sameItem(struct ItemDescriptor::ItemEntry const &, bool) const; + /** + * @vftbl 3 + * @symbol ?getFullName\@ComplexAliasDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string const & getFullName() const; + /** + * @vftbl 4 + * @symbol ?getItem\@ComplexAliasDescriptor\@\@UEBA?AUItemEntry\@ItemDescriptor\@\@XZ + */ + virtual struct ItemDescriptor::ItemEntry getItem() const; + /** + * @vftbl 5 + * @symbol ?forEachItemUntil\@ComplexAliasDescriptor\@\@UEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z + */ + virtual bool forEachItemUntil(class std::function) const; + /** + * @vftbl 6 + * @symbol ?toMap\@ComplexAliasDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ + */ + virtual class std::map, class std::allocator>> toMap() const; + /** + * @vftbl 7 + * @symbol ?save\@ComplexAliasDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ + */ + virtual class std::optional save() const; + /** + * @vftbl 9 + * @symbol ?serialize\@ComplexAliasDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void serialize(class BinaryStream &) const; + /** + * @vftbl 10 + * @symbol ?getType\@ComplexAliasDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ + */ + virtual enum class ItemDescriptor::InternalType getType() const; + /** + * @vftbl 12 + * @symbol ?getHash\@ComplexAliasDescriptor\@\@UEBA_KXZ + */ + virtual unsigned __int64 getHash() const; + /** + * @symbol ??0ComplexAliasDescriptor\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI ComplexAliasDescriptor(std::string const &); + +}; diff --git a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp index ec8a3e3f10..5533b5f27c 100644 --- a/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ComplexInventoryTransaction.hpp @@ -40,59 +40,63 @@ InventoryTransaction data; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComplexInventoryTransaction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?postLoadItems\@ComplexInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @vftbl 3 + * @symbol ?postLoadItems\@ComplexInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ virtual void postLoadItems(class BlockPalette &, bool); /** - * @vftbl 4 - * @symbol ?handle\@ComplexInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + * @vftbl 4 + * @symbol ?handle\@ComplexInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z */ virtual enum class InventoryTransactionError handle(class Player &, bool) const; /** - * @vftbl 5 - * @symbol ?onTransactionError\@ComplexInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z + * @vftbl 5 + * @symbol ?onTransactionError\@ComplexInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z */ virtual void onTransactionError(class Player &, enum class InventoryTransactionError) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPLEXINVENTORYTRANSACTION /** - * @symbol ?read\@ComplexInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ComplexInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ MCVAPI void read(class ReadOnlyBinaryStream &); /** - * @symbol ?write\@ComplexInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@ComplexInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z */ MCVAPI void write(class BinaryStream &) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ComplexInventoryTransaction(); #endif /** - * @symbol ??0ComplexInventoryTransaction\@\@QEAA\@W4Type\@0\@\@Z + * @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 + * @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); + 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\@AEBVInventoryTransaction\@\@\@Z + * @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, class InventoryTransaction const &); + 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 + * @symbol ?getTransactionTypeName\@ComplexInventoryTransaction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@1\@\@Z */ MCAPI static std::string const getTransactionTypeName(enum class ComplexInventoryTransaction::Type); @@ -100,8 +104,8 @@ InventoryTransaction data; private: /** - * @symbol ?transactionTypeMap\@ComplexInventoryTransaction\@\@0V?$BidirectionalUnorderedMap\@W4Type\@ComplexInventoryTransaction\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?transactionTypeMap\@ComplexInventoryTransaction\@\@0V?$BidirectionalUnorderedMap\@W4Type\@ComplexInventoryTransaction\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const transactionTypeMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComplexItem.hpp b/LiteLoader/include/llapi/mc/ComplexItem.hpp index 855d048702..5a59287d95 100644 --- a/LiteLoader/include/llapi/mc/ComplexItem.hpp +++ b/LiteLoader/include/llapi/mc/ComplexItem.hpp @@ -32,89 +32,93 @@ class ComplexItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComplexItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 133 - * @symbol ?getUpdatePacket\@ComplexItem\@\@UEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@\@Z + * @vftbl 133 + * @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; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPLEXITEM /** - * @symbol ?isComplex\@ComplexItem\@\@UEBA_NXZ + * @symbol ?isComplex\@ComplexItem\@\@UEBA_NXZ */ MCVAPI bool isComplex() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ComplexItem(); #endif /** - * @symbol ??0ComplexItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ComplexItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ComplexItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComponentComparer.hpp b/LiteLoader/include/llapi/mc/ComponentComparer.hpp index 2aabd0662e..258707c054 100644 --- a/LiteLoader/include/llapi/mc/ComponentComparer.hpp +++ b/LiteLoader/include/llapi/mc/ComponentComparer.hpp @@ -20,15 +20,15 @@ namespace ComponentComparer { #undef AFTER_EXTRA /** - * @symbol ?GETDIFF_NOT_IMPLEMENTED\@ComponentComparer\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?GETDIFF_NOT_IMPLEMENTED\@ComponentComparer\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const GETDIFF_NOT_IMPLEMENTED; /** - * @symbol ?TOSTRING_NOT_IMPLEMENTED\@ComponentComparer\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TOSTRING_NOT_IMPLEMENTED\@ComponentComparer\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const TOSTRING_NOT_IMPLEMENTED; /** - * @symbol ?getDiffMessage\@ComponentComparer\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDAEBV23\@1\@Z + * @symbol ?getDiffMessage\@ComponentComparer\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDAEBV23\@1\@Z */ MCAPI std::string getDiffMessage(char const *, std::string const &, std::string const &); diff --git a/LiteLoader/include/llapi/mc/ComponentInfo.hpp b/LiteLoader/include/llapi/mc/ComponentInfo.hpp index 1f8be292ce..25b7dc1f2e 100644 --- a/LiteLoader/include/llapi/mc/ComponentInfo.hpp +++ b/LiteLoader/include/llapi/mc/ComponentInfo.hpp @@ -27,19 +27,19 @@ struct ComponentInfo { public: /** - * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ComponentInfo & operator=(struct ComponentInfo const &); /** - * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ComponentInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ComponentInfo & operator=(struct ComponentInfo &&); /** - * @symbol ??1ComponentInfo\@\@QEAA\@XZ + * @symbol ??1ComponentInfo\@\@QEAA\@XZ */ MCAPI ~ComponentInfo(); /** - * @symbol ?bindType\@ComponentInfo\@\@SAXXZ + * @symbol ?bindType\@ComponentInfo\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/ComponentItem.hpp b/LiteLoader/include/llapi/mc/ComponentItem.hpp index e1f5814f86..defcb6469b 100644 --- a/LiteLoader/include/llapi/mc/ComponentItem.hpp +++ b/LiteLoader/include/llapi/mc/ComponentItem.hpp @@ -34,507 +34,507 @@ class ComponentItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComponentItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initServer\@ComponentItem\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?initServer\@ComponentItem\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual bool initServer(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?tearDown\@ComponentItem\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?tearDown\@ComponentItem\@\@UEAAXXZ */ virtual void tearDown(); /** - * @vftbl 3 - * @symbol ?setDescriptionId\@ComponentItem\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?setDescriptionId\@ComponentItem\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class ComponentItem & setDescriptionId(std::string const &); /** - * @vftbl 4 - * @symbol ?getDescriptionId\@ComponentItem\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getDescriptionId\@ComponentItem\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getDescriptionId() const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 10 - * @symbol ?executeEvent\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z + * @vftbl 10 + * @symbol ?executeEvent\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(class ItemStackBase &, std::string const &, class RenderParams &) const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?isArmor\@ComponentItem\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?isArmor\@ComponentItem\@\@UEBA_NXZ */ virtual bool isArmor() const; /** - * @vftbl 13 - * @symbol ?isBlockPlanterItem\@ComponentItem\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?isBlockPlanterItem\@ComponentItem\@\@UEBA_NXZ */ virtual bool isBlockPlanterItem() const; /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol ?isDamageable\@ComponentItem\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?isDamageable\@ComponentItem\@\@UEBA_NXZ */ virtual bool isDamageable() const; /** - * @vftbl 18 - * @symbol ?isDyeable\@ComponentItem\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isDyeable\@ComponentItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol ?isDye\@ComponentItem\@\@UEBA_NXZ + * @vftbl 19 + * @symbol ?isDye\@ComponentItem\@\@UEBA_NXZ */ virtual bool isDye() const; /** - * @vftbl 22 - * @symbol ?isFood\@ComponentItem\@\@UEBA_NXZ + * @vftbl 22 + * @symbol ?isFood\@ComponentItem\@\@UEBA_NXZ */ virtual bool isFood() const; /** - * @vftbl 23 - * @symbol ?isThrowable\@ComponentItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@ComponentItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 24 - * @symbol ?isUseable\@ComponentItem\@\@UEBA_NXZ + * @vftbl 24 + * @symbol ?isUseable\@ComponentItem\@\@UEBA_NXZ */ virtual bool isUseable() const; /** - * @vftbl 25 - * @symbol ?getComponent\@ComponentItem\@\@UEBAPEAVItemComponent\@\@AEBVHashedString\@\@\@Z + * @vftbl 25 + * @symbol ?getComponent\@ComponentItem\@\@UEBAPEAVItemComponent\@\@AEBVHashedString\@\@\@Z */ virtual class ItemComponent * getComponent(class HashedString const &) const; /** - * @vftbl 27 - * @symbol ?getFood\@ComponentItem\@\@UEBAPEAVIFoodItemComponent\@\@XZ + * @vftbl 27 + * @symbol ?getFood\@ComponentItem\@\@UEBAPEAVIFoodItemComponent\@\@XZ */ virtual class IFoodItemComponent * getFood() const; /** - * @vftbl 30 - * @symbol ?setMaxDamage\@ComponentItem\@\@UEAAAEAVItem\@\@H\@Z + * @vftbl 30 + * @symbol ?setMaxDamage\@ComponentItem\@\@UEAAAEAVItem\@\@H\@Z */ virtual class Item & setMaxDamage(int); /** - * @vftbl 39 - * @symbol ?buildNetworkTag\@ComponentItem\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 39 + * @symbol ?buildNetworkTag\@ComponentItem\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 40 - * @symbol ?initializeFromNetwork\@ComponentItem\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 40 + * @symbol ?initializeFromNetwork\@ComponentItem\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @vftbl 41 - * @symbol ?validateFromNetwork\@ComponentItem\@\@UEAA?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 + * @vftbl 41 + * @symbol ?validateFromNetwork\@ComponentItem\@\@UEAA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ virtual std::vector validateFromNetwork(class CompoundTag const &); /** - * @vftbl 42 - * @symbol ?getBlockShape\@ComponentItem\@\@UEBA?AW4BlockShape\@\@XZ + * @vftbl 42 + * @symbol ?getBlockShape\@ComponentItem\@\@UEBA?AW4BlockShape\@\@XZ */ virtual enum class BlockShape getBlockShape() const; /** - * @vftbl 43 - * @symbol ?canBeDepleted\@ComponentItem\@\@UEBA_NXZ + * @vftbl 43 + * @symbol ?canBeDepleted\@ComponentItem\@\@UEBA_NXZ */ virtual bool canBeDepleted() const; /** - * @vftbl 44 - * @symbol ?canDestroySpecial\@ComponentItem\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 44 + * @symbol ?canDestroySpecial\@ComponentItem\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroySpecial(class Block const &) const; /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@ComponentItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@ComponentItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 47 - * @symbol ?getMaxDamage\@ComponentItem\@\@UEBAFXZ + * @vftbl 47 + * @symbol ?getMaxDamage\@ComponentItem\@\@UEBAFXZ */ virtual short getMaxDamage() const; /** - * @vftbl 48 - * @symbol ?getAttackDamage\@ComponentItem\@\@UEBAHXZ + * @vftbl 48 + * @symbol ?getAttackDamage\@ComponentItem\@\@UEBAHXZ */ virtual int getAttackDamage() const; /** - * @vftbl 50 - * @symbol ?isGlint\@ComponentItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@ComponentItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 55 - * @symbol ?canDestroyInCreative\@ComponentItem\@\@UEBA_NXZ + * @vftbl 55 + * @symbol ?canDestroyInCreative\@ComponentItem\@\@UEBA_NXZ */ virtual bool canDestroyInCreative() const; /** - * @vftbl 56 - * @symbol ?isDestructive\@ComponentItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@ComponentItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@ComponentItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@ComponentItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 59 - * @symbol ?requiresInteract\@ComponentItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@ComponentItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@ComponentItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@ComponentItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@ComponentItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@ComponentItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@ComponentItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@ComponentItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@ComponentItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@ComponentItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 64 - * @symbol ?getArmorValue\@ComponentItem\@\@UEBAHXZ + * @vftbl 64 + * @symbol ?getArmorValue\@ComponentItem\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@ComponentItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@ComponentItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 68 - * @symbol ?getDamageChance\@ComponentItem\@\@UEBAHH\@Z + * @vftbl 68 + * @symbol ?getDamageChance\@ComponentItem\@\@UEBAHH\@Z */ virtual int getDamageChance(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 73 - * @symbol ?getColor\@ComponentItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @vftbl 73 + * @symbol ?getColor\@ComponentItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ virtual class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?clearColor\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 76 + * @symbol ?clearColor\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void clearColor(class ItemStackBase &) const; /** - * @vftbl 78 - * @symbol ?setColor\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z + * @vftbl 78 + * @symbol ?setColor\@ComponentItem\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z */ virtual void setColor(class ItemStackBase &, class mce::Color const &) const; /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@ComponentItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@ComponentItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@ComponentItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ComponentItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@ComponentItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@ComponentItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@ComponentItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@ComponentItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@ComponentItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@ComponentItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@ComponentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@ComponentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 90 - * @symbol ?hitActor\@ComponentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 90 + * @symbol ?hitActor\@ComponentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hitActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 91 - * @symbol ?hitBlock\@ComponentItem\@\@UEBAXAEAVItemStack\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVMob\@\@\@Z + * @vftbl 91 + * @symbol ?hitBlock\@ComponentItem\@\@UEBAXAEAVItemStack\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVMob\@\@\@Z */ virtual void hitBlock(class ItemStack &, class Block const &, class BlockPos const &, class Mob &) const; /** - * @vftbl 92 - * @symbol ?mineBlock\@ComponentItem\@\@UEBA_NAEAVItemInstance\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 92 + * @symbol ?mineBlock\@ComponentItem\@\@UEBA_NAEAVItemInstance\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemInstance &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@ComponentItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@ComponentItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 94 - * @symbol ?buildDescriptionName\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 94 + * @symbol ?buildDescriptionName\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 96 - * @symbol ?buildEffectDescriptionName\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 96 + * @symbol ?buildEffectDescriptionName\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 100 - * @symbol ?getMaxStackSize\@ComponentItem\@\@UEBAEAEBVItemDescriptor\@\@\@Z + * @vftbl 100 + * @symbol ?getMaxStackSize\@ComponentItem\@\@UEBAEAEBVItemDescriptor\@\@\@Z */ virtual unsigned char getMaxStackSize(class ItemDescriptor const &) const; /** - * @vftbl 103 - * @symbol ?getCooldownType\@ComponentItem\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 103 + * @symbol ?getCooldownType\@ComponentItem\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getCooldownType() const; /** - * @vftbl 104 - * @symbol ?getCooldownTime\@ComponentItem\@\@UEBAHXZ + * @vftbl 104 + * @symbol ?getCooldownTime\@ComponentItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; /** - * @vftbl 116 - * @symbol ?initClient\@ComponentItem\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 116 + * @symbol ?initClient\@ComponentItem\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void initClient(class Json::Value &, class SemVersion const &); /** - * @vftbl 117 - * @symbol ?setIconInfo\@ComponentItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@ComponentItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@ComponentItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 119 - * @symbol ?getInteractText\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z + * @vftbl 119 + * @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 - * @symbol ?getAnimationFrameFor\@ComponentItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@ComponentItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 121 - * @symbol ?isEmissive\@ComponentItem\@\@UEBA_NH\@Z + * @vftbl 121 + * @symbol ?isEmissive\@ComponentItem\@\@UEBA_NH\@Z */ virtual bool isEmissive(int) const; /** - * @vftbl 124 - * @symbol ?canBeCharged\@ComponentItem\@\@UEBA_NXZ + * @vftbl 124 + * @symbol ?canBeCharged\@ComponentItem\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @vftbl 129 - * @symbol ?getAuxValuesDescription\@ComponentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 129 + * @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 - * @symbol ?_checkUseOnPermissions\@ComponentItem\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z + * @vftbl 130 + * @symbol ?_checkUseOnPermissions\@ComponentItem\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@ComponentItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@ComponentItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@ComponentItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@ComponentItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPONENTITEM /** - * @symbol ?getVariant\@ComponentItem\@\@UEBAHHH_N\@Z + * @symbol ?getVariant\@ComponentItem\@\@UEBAHHH_N\@Z */ MCVAPI int getVariant(int, int, bool) const; /** - * @symbol ?hasCustomColor\@ComponentItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?hasCustomColor\@ComponentItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool hasCustomColor(class ItemStackBase const &) const; /** - * @symbol ?isComponentBased\@ComponentItem\@\@UEBA_NXZ + * @symbol ?isComponentBased\@ComponentItem\@\@UEBA_NXZ */ MCVAPI bool isComponentBased() const; /** - * @symbol ?useVariant\@ComponentItem\@\@UEBA_NHH_N\@Z + * @symbol ?useVariant\@ComponentItem\@\@UEBA_NHH_N\@Z */ MCVAPI bool useVariant(int, int, bool) const; #endif /** - * @symbol ??0ComponentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0ComponentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI ComponentItem(std::string const &, short); /** - * @symbol ?_addCerealItemsToMap\@ComponentItem\@\@QEAAXXZ + * @symbol ?_addCerealItemsToMap\@ComponentItem\@\@QEAAXXZ */ MCAPI void _addCerealItemsToMap(); /** - * @symbol ?_buildItemsFileSchema\@ComponentItem\@\@QEAA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VComponentItem\@\@\@JsonUtil\@\@\@std\@\@AEAV23\@_NVSemVersion\@\@\@Z + * @symbol ?_buildItemsFileSchema\@ComponentItem\@\@QEAA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VComponentItem\@\@\@JsonUtil\@\@\@std\@\@AEAV23\@_NVSemVersion\@\@\@Z */ 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\@\@\@Z */ MCAPI bool _validateClientSchemaAndInitItem(class Json::Value &, class SemVersion const &); /** - * @symbol ?_validateServerSchemaAndInitItem\@ComponentItem\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_validateServerSchemaAndInitItem\@ComponentItem\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool _validateServerSchemaAndInitItem(class Json::Value &, class SemVersion const &); /** - * @symbol ?checkComponentDataForContentErrors\@ComponentItem\@\@QEBA_NXZ + * @symbol ?checkComponentDataForContentErrors\@ComponentItem\@\@QEBA_NXZ */ MCAPI bool checkComponentDataForContentErrors() const; /** - * @symbol ?executeTrigger\@ComponentItem\@\@QEBA_NAEAVItemStackBase\@\@AEBVDefinitionTrigger\@\@AEAVRenderParams\@\@\@Z + * @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 + * @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 + * @symbol ?parseJsonEvents\@ComponentItem\@\@QEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool parseJsonEvents(class Json::Value const &, class SemVersion const &); /** - * @symbol ?createItemAbstractCerealSchema\@ComponentItem\@\@SA?AUSchema\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createItemAbstractCerealSchema\@ComponentItem\@\@SA?AUSchema\@reflection\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static struct reflection::Schema createItemAbstractCerealSchema(std::string const &); /** - * @symbol ?registerItemComponentTypes\@ComponentItem\@\@SAXXZ + * @symbol ?registerItemComponentTypes\@ComponentItem\@\@SAXXZ */ MCAPI static void registerItemComponentTypes(); /** - * @symbol ?upgradeJson\@ComponentItem\@\@SA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@\@Z + * @symbol ?upgradeJson\@ComponentItem\@\@SA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@V?$optional\@VSemVersion\@\@\@3\@\@Z */ MCAPI static bool upgradeJson(std::string &, class Core::Path const &, class std::optional); //private: /** - * @symbol ?_buildItemPropertiesNetworkTag\@ComponentItem\@\@AEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_buildItemPropertiesNetworkTag\@ComponentItem\@\@AEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr _buildItemPropertiesNetworkTag() const; /** - * @symbol ?_executeEvent\@ComponentItem\@\@AEBAXAEAVItemStackBase\@\@AEBV?$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\@\@4\@AEAVRenderParams\@\@\@Z + * @symbol ?_executeEvent\@ComponentItem\@\@AEBAXAEAVItemStackBase\@\@AEBV?$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\@\@4\@AEAVRenderParams\@\@\@Z */ MCAPI void _executeEvent(class ItemStackBase &, std::string const &, std::vector> &, class RenderParams &) const; /** - * @symbol ?_forceExecuteTrigger\@ComponentItem\@\@AEBA_NAEAVItemStackBase\@\@AEBVDefinitionTrigger\@\@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 + * @symbol ?_forceExecuteTrigger\@ComponentItem\@\@AEBA_NAEAVItemStackBase\@\@AEBVDefinitionTrigger\@\@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 */ MCAPI bool _forceExecuteTrigger(class ItemStackBase &, class DefinitionTrigger const &, std::vector> &, class RenderParams &) const; /** - * @symbol ?_loadComponentsFromNetworkTag\@ComponentItem\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_loadComponentsFromNetworkTag\@ComponentItem\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ MCAPI void _loadComponentsFromNetworkTag(std::string const &, class CompoundTag const &); /** - * @symbol ?_loadItemPropertiesNetworkTag\@ComponentItem\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_loadItemPropertiesNetworkTag\@ComponentItem\@\@AEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void _loadItemPropertiesNetworkTag(class CompoundTag const &); /** - * @symbol ?_loadItemTagsNetworkTag\@ComponentItem\@\@AEAAXAEBVListTag\@\@\@Z + * @symbol ?_loadItemTagsNetworkTag\@ComponentItem\@\@AEAAXAEBVListTag\@\@\@Z */ MCAPI void _loadItemTagsNetworkTag(class ListTag const &); private: /** - * @symbol ?mDocumentUpgrader\@ComponentItem\@\@0VCerealDocumentUpgrader\@\@A + * @symbol ?mDocumentUpgrader\@ComponentItem\@\@0VCerealDocumentUpgrader\@\@A */ MCAPI static class CerealDocumentUpgrader mDocumentUpgrader; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComponentNetRelevancyRegistry.hpp b/LiteLoader/include/llapi/mc/ComponentNetRelevancyRegistry.hpp index cd5c649793..18a3edc843 100644 --- a/LiteLoader/include/llapi/mc/ComponentNetRelevancyRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ComponentNetRelevancyRegistry.hpp @@ -36,20 +36,20 @@ struct NetSerializationCallbacks { public: /** - * @symbol ?getFilteredDefinitionsForServer\@ComponentNetRelevancyRegistry\@\@QEBA?AVDefinitionInstanceGroup\@\@AEBV2\@\@Z + * @symbol ?getFilteredDefinitionsForServer\@ComponentNetRelevancyRegistry\@\@QEBA?AVDefinitionInstanceGroup\@\@AEBV2\@\@Z */ MCAPI class DefinitionInstanceGroup getFilteredDefinitionsForServer(class DefinitionInstanceGroup const &) const; /** - * @symbol ?registerNetSerialization\@ComponentNetRelevancyRegistry\@\@QEAAAEAUNetSerializationCallbacks\@1\@AEBVHashedString\@\@V?$function\@$$A6A_NAEBVDefinitionInstanceGroup\@\@AEAVCompoundTag\@\@\@Z\@std\@\@\@Z + * @symbol ?registerNetSerialization\@ComponentNetRelevancyRegistry\@\@QEAAAEAUNetSerializationCallbacks\@1\@AEBVHashedString\@\@V?$function\@$$A6A_NAEBVDefinitionInstanceGroup\@\@AEAVCompoundTag\@\@\@Z\@std\@\@\@Z */ MCAPI struct ComponentNetRelevancyRegistry::NetSerializationCallbacks & registerNetSerialization(class HashedString const &, class std::function); /** - * @symbol ?serializeComponentDefinitionsForClient\@ComponentNetRelevancyRegistry\@\@QEBA_NAEBVDefinitionInstanceGroup\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?serializeComponentDefinitionsForClient\@ComponentNetRelevancyRegistry\@\@QEBA_NAEBVDefinitionInstanceGroup\@\@AEAVCompoundTag\@\@\@Z */ MCAPI bool serializeComponentDefinitionsForClient(class DefinitionInstanceGroup const &, class CompoundTag &) const; /** - * @symbol ??1ComponentNetRelevancyRegistry\@\@QEAA\@XZ + * @symbol ??1ComponentNetRelevancyRegistry\@\@QEAA\@XZ */ MCAPI ~ComponentNetRelevancyRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompositeDefinition.hpp b/LiteLoader/include/llapi/mc/CompositeDefinition.hpp index 39bd43edd4..8a59d17bb8 100644 --- a/LiteLoader/include/llapi/mc/CompositeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/CompositeDefinition.hpp @@ -31,29 +31,29 @@ class CompositeDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompositeDefinition(); + virtual void __unk_vfn_0(); /** - * @symbol ??0CompositeDefinition\@\@QEAA\@XZ + * @symbol ??0CompositeDefinition\@\@QEAA\@XZ */ MCAPI CompositeDefinition(); /** - * @symbol ?get\@CompositeDefinition\@\@QEBAPEBVBehaviorDefinition\@\@_K\@Z + * @symbol ?get\@CompositeDefinition\@\@QEBAPEBVBehaviorDefinition\@\@_K\@Z */ MCAPI class BehaviorDefinition const * get(unsigned __int64) const; /** - * @symbol ?getCount\@CompositeDefinition\@\@QEBA_KXZ + * @symbol ?getCount\@CompositeDefinition\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCount() const; //protected: /** - * @symbol ?_compositeLoadChildrenBehaviors\@CompositeDefinition\@\@KAXVValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVBehaviorFactory\@\@VBehaviorTreeDefinitionPtr\@\@\@Z + * @symbol ?_compositeLoadChildrenBehaviors\@CompositeDefinition\@\@KAXVValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVBehaviorFactory\@\@VBehaviorTreeDefinitionPtr\@\@\@Z */ MCAPI static void _compositeLoadChildrenBehaviors(class Json::Value, std::vector> &, class BehaviorFactory const &, class BehaviorTreeDefinitionPtr); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompositePackSource.hpp b/LiteLoader/include/llapi/mc/CompositePackSource.hpp index d2878243b9..47f6449ee8 100644 --- a/LiteLoader/include/llapi/mc/CompositePackSource.hpp +++ b/LiteLoader/include/llapi/mc/CompositePackSource.hpp @@ -30,50 +30,50 @@ class CompositePackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompositePackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?forEachPackConst\@CompositePackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z + * @vftbl 1 + * @symbol ?forEachPackConst\@CompositePackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z */ virtual void forEachPackConst(class std::function) const; /** - * @vftbl 2 - * @symbol ?forEachPack\@CompositePackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @vftbl 2 + * @symbol ?forEachPack\@CompositePackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ virtual void forEachPack(class std::function); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?load\@CompositePackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 5 + * @symbol ?load\@CompositePackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual class PackSourceReport load(class IPackManifestFactory &, class gsl::not_null> const &); /** - * @symbol ??0CompositePackSource\@\@QEAA\@XZ + * @symbol ??0CompositePackSource\@\@QEAA\@XZ */ MCAPI CompositePackSource(); /** - * @symbol ??0CompositePackSource\@\@QEAA\@$$QEAV?$vector\@PEAVPackSource\@\@V?$allocator\@PEAVPackSource\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CompositePackSource\@\@QEAA\@$$QEAV?$vector\@PEAVPackSource\@\@V?$allocator\@PEAVPackSource\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CompositePackSource(std::vector &&); /** - * @symbol ?addPackSource\@CompositePackSource\@\@QEAAXPEAVPackSource\@\@\@Z + * @symbol ?addPackSource\@CompositePackSource\@\@QEAAXPEAVPackSource\@\@\@Z */ MCAPI void addPackSource(class PackSource *); /** - * @symbol ?clear\@CompositePackSource\@\@QEAAXXZ + * @symbol ?clear\@CompositePackSource\@\@QEAAXXZ */ MCAPI void clear(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ComposterBlock.hpp b/LiteLoader/include/llapi/mc/ComposterBlock.hpp index 4362f9b23c..be9ddb26ad 100644 --- a/LiteLoader/include/llapi/mc/ComposterBlock.hpp +++ b/LiteLoader/include/llapi/mc/ComposterBlock.hpp @@ -37,336 +37,341 @@ inline void emitBoneMeal(class Level& a1, class BlockSource& a2, class BlockPos public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ComposterBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@ComposterBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@ComposterBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ComposterBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ComposterBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 74 - * @symbol ?onMove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 74 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@ComposterBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@ComposterBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@ComposterBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@ComposterBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ComposterBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ComposterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@ComposterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@ComposterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 194 + * @symbol __unk_vfn_194 */ virtual void __unk_vfn_194(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 195 + * @symbol __unk_vfn_195 */ virtual void __unk_vfn_195(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDescriptionId() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPOSTERBLOCK /** - * @symbol ?hasComparatorSignal\@ComposterBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@ComposterBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; #endif /** - * @symbol ??0ComposterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ComposterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ComposterBlock(std::string const &, int); /** - * @symbol ?addItem\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?addItem\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool addItem(class Container &, int, class ItemStack &, class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?addItems\@ComposterBlock\@\@SAHAEBVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?addItems\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ - MCAPI static int addItems(class ItemStack const &, int, class BlockSource &, class Block const &, class BlockPos const &); + MCAPI static bool addItems(class Container &, int, class ItemStack &, int, class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?addItems\@ComposterBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?addItems\@ComposterBlock\@\@SAHAEBVItemStack\@\@HAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ - MCAPI static bool addItems(class Container &, int, class ItemStack &, int, class BlockSource &, class Block const &, class BlockPos const &); + MCAPI static int addItems(class ItemStack const &, int, class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?empty\@ComposterBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?empty\@ComposterBlock\@\@SAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void empty(class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?extractItem\@ComposterBlock\@\@SA?AVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?extractItem\@ComposterBlock\@\@SA?AVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class ItemStack extractItem(class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?getComposterAt\@ComposterBlock\@\@SAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getComposterAt\@ComposterBlock\@\@SAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class Block const * getComposterAt(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_emitBoneMeal\@ComposterBlock\@\@AEBAXAEAVLevel\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_emitBoneMeal\@ComposterBlock\@\@AEBAXAEAVLevel\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _emitBoneMeal(class Level &, class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_notifyClientComposterUsed\@ComposterBlock\@\@AEBAXAEBVPlayer\@\@FW4POIBlockInteractionType\@MinecraftEventing\@\@\@Z + * @symbol ?_notifyClientComposterUsed\@ComposterBlock\@\@AEBAXAEBVPlayer\@\@FW4POIBlockInteractionType\@MinecraftEventing\@\@\@Z */ MCAPI void _notifyClientComposterUsed(class Player const &, short, enum class MinecraftEventing::POIBlockInteractionType) const; /** - * @symbol ?_getCompostableItems\@ComposterBlock\@\@CAAEBV?$vector\@U?$pair\@HC\@std\@\@V?$allocator\@U?$pair\@HC\@std\@\@\@2\@\@std\@\@AEBVExperiments\@\@\@Z + * @symbol ?_getCompostableItems\@ComposterBlock\@\@CAAEBV?$unordered_map\@_KCU?$hash\@_K\@std\@\@U?$equal_to\@_K\@2\@V?$allocator\@U?$pair\@$$CB_KC\@std\@\@\@2\@\@std\@\@XZ */ - MCAPI static std::vector> const & _getCompostableItems(class Experiments const &); + MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const & _getCompostableItems(); private: /** - * @symbol ?COMPOSTER_DOESNT_BREAK_FALLING_BLOCK_VERSION\@ComposterBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?COMPOSTER_DOESNT_BREAK_FALLING_BLOCK_VERSION\@ComposterBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const COMPOSTER_DOESNT_BREAK_FALLING_BLOCK_VERSION; /** - * @symbol ?PARTICLE_OFFSET\@ComposterBlock\@\@0VVec3\@\@B + * @symbol ?PARTICLE_OFFSET\@ComposterBlock\@\@0VVec3\@\@B */ MCAPI static class Vec3 const PARTICLE_OFFSET; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp index 9440a1839b..4c7081c45e 100644 --- a/LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/CompoundCreatorContainerManagerModel.hpp @@ -31,48 +31,48 @@ class CompoundCreatorContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompoundCreatorContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@CompoundCreatorContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@CompoundCreatorContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@CompoundCreatorContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@CompoundCreatorContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@CompoundCreatorContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@CompoundCreatorContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@CompoundCreatorContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@CompoundCreatorContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@CompoundCreatorContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@CompoundCreatorContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@CompoundCreatorContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@CompoundCreatorContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@CompoundCreatorContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@CompoundCreatorContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0CompoundCreatorContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0CompoundCreatorContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI CompoundCreatorContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundCreatorContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/CompoundCreatorContainerScreenValidator.hpp index 0fb3bad9c1..cf4e6d4c96 100644 --- a/LiteLoader/include/llapi/mc/CompoundCreatorContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/CompoundCreatorContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class CompoundCreatorContainerScreenValidator : public ContainerScreenValidatorB public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompoundCreatorContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0CompoundCreatorContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0CompoundCreatorContainerScreenValidator\@\@QEAA\@XZ */ MCAPI CompoundCreatorContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundCreatorInputValidation.hpp b/LiteLoader/include/llapi/mc/CompoundCreatorInputValidation.hpp index 49d313d363..69e521dceb 100644 --- a/LiteLoader/include/llapi/mc/CompoundCreatorInputValidation.hpp +++ b/LiteLoader/include/llapi/mc/CompoundCreatorInputValidation.hpp @@ -31,54 +31,54 @@ class CompoundCreatorInputValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompoundCreatorInputValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@CompoundCreatorInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@CompoundCreatorInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@CompoundCreatorInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@CompoundCreatorInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@CompoundCreatorInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@CompoundCreatorInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundItem.hpp b/LiteLoader/include/llapi/mc/CompoundItem.hpp index adfd8a8f62..c145a3a384 100644 --- a/LiteLoader/include/llapi/mc/CompoundItem.hpp +++ b/LiteLoader/include/llapi/mc/CompoundItem.hpp @@ -32,142 +32,138 @@ class CompoundItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompoundItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@CompoundItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@CompoundItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@CompoundItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@CompoundItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@CompoundItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@CompoundItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@CompoundItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @symbol ??0CompoundItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVExperiments\@\@\@Z + * @symbol ??0CompoundItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVExperiments\@\@\@Z */ MCAPI CompoundItem(std::string const &, int, class Experiments const &); /** - * @symbol ?getCompoundType\@CompoundItem\@\@SA?AW4CompoundType\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?getCompoundType\@CompoundItem\@\@SA?AW4CompoundType\@\@AEBVItemDescriptor\@\@\@Z */ MCAPI static enum class CompoundType getCompoundType(class ItemDescriptor const &); /** - * @symbol ?getIngredientForCompound\@CompoundItem\@\@SA?AVRecipeIngredient\@\@W4CompoundType\@\@\@Z + * @symbol ?getIngredientForCompound\@CompoundItem\@\@SA?AVRecipeIngredient\@\@W4CompoundType\@\@\@Z */ MCAPI static class RecipeIngredient getIngredientForCompound(enum class CompoundType); /** - * @symbol ?getItemForCompound\@CompoundItem\@\@SA?AVItemInstance\@\@W4CompoundType\@\@H\@Z + * @symbol ?getItemForCompound\@CompoundItem\@\@SA?AVItemInstance\@\@W4CompoundType\@\@H\@Z */ MCAPI static class ItemInstance getItemForCompound(enum class CompoundType, int); /** - * @symbol ?isCompoundItem\@CompoundItem\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isCompoundItem\@CompoundItem\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool isCompoundItem(class ItemStackBase const &); /** - * @symbol ?unregisterSpecialCompounds\@CompoundItem\@\@SAXXZ + * @symbol ?unregisterSpecialCompounds\@CompoundItem\@\@SAXXZ */ MCAPI static void unregisterSpecialCompounds(); //private: /** - * @symbol ?_registerSpecialCompound\@CompoundItem\@\@AEAAXAEBVItemInstance\@\@W4CompoundType\@\@\@Z + * @symbol ?_registerSpecialCompound\@CompoundItem\@\@AEAAXAEBVItemInstance\@\@W4CompoundType\@\@\@Z */ MCAPI void _registerSpecialCompound(class ItemInstance const &, enum class CompoundType); /** - * @symbol ?_registerSpecialCompounds\@CompoundItem\@\@AEAAXAEBVExperiments\@\@\@Z - */ - MCAPI void _registerSpecialCompounds(class Experiments const &); - /** - * @symbol ?_getName\@CompoundItem\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CompoundType\@\@\@Z + * @symbol ?_getName\@CompoundItem\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CompoundType\@\@\@Z */ MCAPI static std::string _getName(enum class CompoundType); private: /** - * @symbol ?mIdToSpecialCompound\@CompoundItem\@\@0V?$unordered_map\@HHU?$hash\@H\@std\@\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHH\@std\@\@\@2\@\@std\@\@A + * @symbol ?mIdToSpecialCompound\@CompoundItem\@\@0V?$unordered_map\@HHU?$hash\@H\@std\@\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHH\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mIdToSpecialCompound; /** - * @symbol ?mTypeToSpecialCompound\@CompoundItem\@\@0V?$unordered_map\@HVItemInstance\@\@U?$hash\@H\@std\@\@U?$equal_to\@H\@3\@V?$allocator\@U?$pair\@$$CBHVItemInstance\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mTypeToSpecialCompound\@CompoundItem\@\@0V?$unordered_map\@HVItemInstance\@\@U?$hash\@H\@std\@\@U?$equal_to\@H\@3\@V?$allocator\@U?$pair\@$$CBHVItemInstance\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mTypeToSpecialCompound; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundTag.hpp b/LiteLoader/include/llapi/mc/CompoundTag.hpp index d8ce8de183..22236de2a0 100644 --- a/LiteLoader/include/llapi/mc/CompoundTag.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTag.hpp @@ -36,7 +36,7 @@ class CompoundTag : public Tag { LIAPI map& value(); template - inline T const* get(class gsl::basic_string_span key) const { + inline T const* get(std::string_view key) const { return (T*)get(key); }; @@ -48,21 +48,20 @@ class CompoundTag : public Tag { LIAPI struct TagMemoryChunk& putIntArray(std::string key, struct TagMemoryChunk val); // get value - LIAPI double getDouble(class gsl::basic_string_span key) const; - LIAPI struct TagMemoryChunk const& getIntArray(class gsl::basic_string_span key) const; - + LIAPI double getDouble(std::string_view key) const; + LIAPI struct TagMemoryChunk const& getIntArray(std::string_view key) const; // get tag - LIAPI class ByteTag const* getByteTag(class gsl::basic_string_span key) const; + LIAPI class ByteTag const* getByteTag(std::string_view key) const; //BDS has implemented this interface //LIAPI class ShortTag const* getShortTag(class gsl::basic_string_span key) const; - LIAPI class FloatTag const* getFloatTag(class gsl::basic_string_span key) const; - LIAPI class DoubleTag const* getDoubleTag(class gsl::basic_string_span key) const; - LIAPI class ByteArrayTag const* getByteArrayTag(class gsl::basic_string_span key) const; + LIAPI class FloatTag const* getFloatTag(std::string_view key) const; + LIAPI class DoubleTag const* getDoubleTag(std::string_view key) const; + LIAPI class ByteArrayTag const* getByteArrayTag(std::string_view key) const; //LIAPI class StringTag const* getStringTag(class gsl::basic_string_span key) const; - LIAPI class IntArrayTag const* getIntArrayTag(class gsl::basic_string_span key) const; - LIAPI class ListTag const* getListTag(class gsl::basic_string_span key) const; - LIAPI class CompoundTag const* getCompoundTag(class gsl::basic_string_span key) const; - LIAPI class Tag* operator[](class gsl::basic_string_span key); + LIAPI class IntArrayTag const* getIntArrayTag(std::string_view key) const; + LIAPI class ListTag const* getListTag(std::string_view key) const; + LIAPI class CompoundTag const* getCompoundTag(std::string_view key) const; + LIAPI class Tag* operator[](std::string_view key); // IO LIAPI void setItemStack(ItemStack* item); @@ -107,245 +106,251 @@ class CompoundTag : public Tag { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompoundTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@CompoundTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@CompoundTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@CompoundTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@CompoundTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@CompoundTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@CompoundTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@CompoundTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@CompoundTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@CompoundTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@CompoundTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 8 - * @symbol ?print\@CompoundTag\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPrintStream\@\@\@Z + * @vftbl 8 + * @symbol ?print\@CompoundTag\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPrintStream\@\@\@Z */ virtual void print(std::string const &, class PrintStream &) const; /** - * @vftbl 9 - * @symbol ?copy\@CompoundTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@CompoundTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@CompoundTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@CompoundTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_COMPOUNDTAG /** - * @symbol ??0CompoundTag\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CompoundTag(); + MCVAPI ~CompoundTag(); +#endif /** - * @symbol ??0CompoundTag\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0CompoundTag\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI CompoundTag(class CompoundTag &&); /** - * @symbol ?append\@CompoundTag\@\@QEAAXAEBV1\@\@Z + * @symbol ??0CompoundTag\@\@QEAA\@XZ + */ + MCAPI CompoundTag(); + /** + * @symbol ?append\@CompoundTag\@\@QEAAXAEBV1\@\@Z */ MCAPI void append(class CompoundTag const &); /** - * @symbol ?begin\@CompoundTag\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ + * @symbol ?begin\@CompoundTag\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ MCAPI class std::_Tree_const_iterator>>> begin() const; /** - * @symbol ?clear\@CompoundTag\@\@QEAAXXZ + * @symbol ?clear\@CompoundTag\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?clone\@CompoundTag\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?clone\@CompoundTag\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr clone() const; /** - * @symbol ?contains\@CompoundTag\@\@QEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Type\@Tag\@\@\@Z + * @symbol ?contains\@CompoundTag\@\@QEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4Type\@Tag\@\@\@Z */ - MCAPI bool contains(class gsl::basic_string_span, enum class Tag::Type) const; + MCAPI bool contains(class std::basic_string_view>, enum class Tag::Type) const; /** - * @symbol ?contains\@CompoundTag\@\@QEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?contains\@CompoundTag\@\@QEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool contains(class gsl::basic_string_span) const; + MCAPI bool contains(class std::basic_string_view>) const; /** - * @symbol ?deepCopy\@CompoundTag\@\@QEAAXAEBV1\@\@Z + * @symbol ?deepCopy\@CompoundTag\@\@QEAAXAEBV1\@\@Z */ MCAPI void deepCopy(class CompoundTag const &); /** - * @symbol ?end\@CompoundTag\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ + * @symbol ?end\@CompoundTag\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTagVariant\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@XZ */ MCAPI class std::_Tree_const_iterator>>> end() const; /** - * @symbol ?get\@CompoundTag\@\@QEAAPEAVTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?get\@CompoundTag\@\@QEAAPEAVTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class Tag * get(class gsl::basic_string_span); + MCAPI class Tag * get(class std::basic_string_view>); /** - * @symbol ?get\@CompoundTag\@\@QEBAPEBVTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?get\@CompoundTag\@\@QEBAPEBVTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class Tag const * get(class gsl::basic_string_span) const; + MCAPI class Tag const * get(class std::basic_string_view>) const; /** - * @symbol ?getBoolean\@CompoundTag\@\@QEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getBoolean\@CompoundTag\@\@QEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool getBoolean(class gsl::basic_string_span) const; + MCAPI bool getBoolean(class std::basic_string_view>) const; /** - * @symbol ?getByte\@CompoundTag\@\@QEBAEV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getByte\@CompoundTag\@\@QEBAEV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI unsigned char getByte(class gsl::basic_string_span) const; + MCAPI unsigned char getByte(class std::basic_string_view>) const; /** - * @symbol ?getByteArray\@CompoundTag\@\@QEBAAEBUTagMemoryChunk\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getByteArray\@CompoundTag\@\@QEBAAEBUTagMemoryChunk\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI struct TagMemoryChunk const & getByteArray(class gsl::basic_string_span) const; + MCAPI struct TagMemoryChunk const & getByteArray(class std::basic_string_view>) const; /** - * @symbol ?getByteTag\@CompoundTag\@\@QEAAPEAVByteTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getByteTag\@CompoundTag\@\@QEAAPEAVByteTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class ByteTag * getByteTag(class gsl::basic_string_span); + MCAPI class ByteTag * getByteTag(class std::basic_string_view>); /** - * @symbol ?getCompound\@CompoundTag\@\@QEAAPEAV1\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getCompound\@CompoundTag\@\@QEAAPEAV1\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class CompoundTag * getCompound(class gsl::basic_string_span); + MCAPI class CompoundTag * getCompound(class std::basic_string_view>); /** - * @symbol ?getCompound\@CompoundTag\@\@QEBAPEBV1\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getCompound\@CompoundTag\@\@QEBAPEBV1\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class CompoundTag const * getCompound(class gsl::basic_string_span) const; + MCAPI class CompoundTag const * getCompound(class std::basic_string_view>) const; /** - * @symbol ?getFloat\@CompoundTag\@\@QEBAMV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getFloat\@CompoundTag\@\@QEBAMV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI float getFloat(class gsl::basic_string_span) const; + MCAPI float getFloat(class std::basic_string_view>) const; /** - * @symbol ?getInt\@CompoundTag\@\@QEBAHV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getInt\@CompoundTag\@\@QEBAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI int getInt(class gsl::basic_string_span) const; + MCAPI int getInt(class std::basic_string_view>) const; /** - * @symbol ?getInt64\@CompoundTag\@\@QEBA_JV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getInt64\@CompoundTag\@\@QEBA_JV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI __int64 getInt64(class gsl::basic_string_span) const; + MCAPI __int64 getInt64(class std::basic_string_view>) const; /** - * @symbol ?getInt64Tag\@CompoundTag\@\@QEAAPEAVInt64Tag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getInt64Tag\@CompoundTag\@\@QEAAPEAVInt64Tag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class Int64Tag * getInt64Tag(class gsl::basic_string_span); + MCAPI class Int64Tag * getInt64Tag(class std::basic_string_view>); /** - * @symbol ?getInt64Tag\@CompoundTag\@\@QEBAPEBVInt64Tag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getInt64Tag\@CompoundTag\@\@QEBAPEBVInt64Tag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class Int64Tag const * getInt64Tag(class gsl::basic_string_span) const; + MCAPI class Int64Tag const * getInt64Tag(class std::basic_string_view>) const; /** - * @symbol ?getIntTag\@CompoundTag\@\@QEAAPEAVIntTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getIntTag\@CompoundTag\@\@QEAAPEAVIntTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class IntTag * getIntTag(class gsl::basic_string_span); + MCAPI class IntTag * getIntTag(class std::basic_string_view>); /** - * @symbol ?getIntTag\@CompoundTag\@\@QEBAPEBVIntTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getIntTag\@CompoundTag\@\@QEBAPEBVIntTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class IntTag const * getIntTag(class gsl::basic_string_span) const; + MCAPI class IntTag const * getIntTag(class std::basic_string_view>) const; /** - * @symbol ?getList\@CompoundTag\@\@QEAAPEAVListTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getList\@CompoundTag\@\@QEBAPEBVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class ListTag * getList(class gsl::basic_string_span); + MCAPI class ListTag const * getList(class std::basic_string_view>) const; /** - * @symbol ?getList\@CompoundTag\@\@QEBAPEBVListTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getList\@CompoundTag\@\@QEAAPEAVListTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class ListTag const * getList(class gsl::basic_string_span) const; + MCAPI class ListTag * getList(class std::basic_string_view>); /** - * @symbol ?getShort\@CompoundTag\@\@QEBAFV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getShort\@CompoundTag\@\@QEBAFV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI short getShort(class gsl::basic_string_span) const; + MCAPI short getShort(class std::basic_string_view>) const; /** - * @symbol ?getShortTag\@CompoundTag\@\@QEBAPEBVShortTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getShortTag\@CompoundTag\@\@QEBAPEBVShortTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class ShortTag const * getShortTag(class gsl::basic_string_span) const; + MCAPI class ShortTag const * getShortTag(class std::basic_string_view>) const; /** - * @symbol ?getString\@CompoundTag\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getString\@CompoundTag\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string const & getString(class gsl::basic_string_span) const; + MCAPI std::string const & getString(class std::basic_string_view>) const; /** - * @symbol ?getStringTag\@CompoundTag\@\@QEBAPEBVStringTag\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getStringTag\@CompoundTag\@\@QEBAPEBVStringTag\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class StringTag const * getStringTag(class gsl::basic_string_span) const; + MCAPI class StringTag const * getStringTag(class std::basic_string_view>) const; /** - * @symbol ?isEmpty\@CompoundTag\@\@QEBA_NXZ + * @symbol ?isEmpty\@CompoundTag\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ??4CompoundTag\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4CompoundTag\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class CompoundTag & operator=(class CompoundTag &&); /** - * @symbol ?put\@CompoundTag\@\@QEAAAEAVTag\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z + * @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 + * @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 + * @symbol ?putBoolean\@CompoundTag\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void putBoolean(std::string, bool); /** - * @symbol ?putByte\@CompoundTag\@\@QEAAAEAEV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@E\@Z + * @symbol ?putByte\@CompoundTag\@\@QEAAAEAEV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@E\@Z */ MCAPI unsigned char & putByte(std::string, unsigned char); /** - * @symbol ?putByteArray\@CompoundTag\@\@QEAAAEAUTagMemoryChunk\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U2\@\@Z + * @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 + * @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 + * @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 ?putFloat\@CompoundTag\@\@QEAAAEAMV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z + * @symbol ?putFloat\@CompoundTag\@\@QEAAAEAMV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z */ MCAPI float & putFloat(std::string, float); /** - * @symbol ?putInt\@CompoundTag\@\@QEAAAEAHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?putInt\@CompoundTag\@\@QEAAAEAHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI int & putInt(std::string, int); /** - * @symbol ?putInt64\@CompoundTag\@\@QEAAAEA_JV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z + * @symbol ?putInt64\@CompoundTag\@\@QEAAAEA_JV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z */ MCAPI __int64 & putInt64(std::string, __int64); /** - * @symbol ?putShort\@CompoundTag\@\@QEAAAEAFV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ?putShort\@CompoundTag\@\@QEAAAEAFV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI short & putShort(std::string, short); /** - * @symbol ?putString\@CompoundTag\@\@QEAAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@0\@Z + * @symbol ?putString\@CompoundTag\@\@QEAAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@0\@Z */ MCAPI std::string & putString(std::string, std::string); /** - * @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 + * @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; /** - * @symbol ?remove\@CompoundTag\@\@QEAA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?remove\@CompoundTag\@\@QEAA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool remove(class gsl::basic_string_span); + MCAPI bool remove(class std::basic_string_view>); /** - * @symbol ?rename\@CompoundTag\@\@QEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?rename\@CompoundTag\@\@QEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ - MCAPI void rename(class gsl::basic_string_span, std::string); + MCAPI void rename(class std::basic_string_view>, std::string); /** - * @symbol ?size\@CompoundTag\@\@QEBA_KXZ + * @symbol ?size\@CompoundTag\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp b/LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp index 8bf5240666..3c11d4f093 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagEditHelper.hpp @@ -30,24 +30,24 @@ class CompoundTagEditHelper { public: /** - * @symbol ?getParent\@CompoundTagEditHelper\@\@QEBAPEBVCompoundTag\@\@XZ + * @symbol ?getParent\@CompoundTagEditHelper\@\@QEBAPEBVCompoundTag\@\@XZ */ MCAPI class CompoundTag const * getParent() const; /** - * @symbol ?replaceWith\@CompoundTagEditHelper\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@3\@\@Z + * @symbol ?replaceWith\@CompoundTagEditHelper\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@3\@\@Z */ MCAPI void replaceWith(std::string const &, std::unique_ptr); /** - * @symbol ??1CompoundTagEditHelper\@\@QEAA\@XZ + * @symbol ??1CompoundTagEditHelper\@\@QEAA\@XZ */ MCAPI ~CompoundTagEditHelper(); //private: /** - * @symbol ?pushChild\@CompoundTagEditHelper\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?pushChild\@CompoundTagEditHelper\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void pushChild(std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp index d805253aae..8f62df6edb 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdater.hpp @@ -30,12 +30,12 @@ class CompoundTagUpdater { public: /** - * @symbol ?update\@CompoundTagUpdater\@\@QEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?update\@CompoundTagUpdater\@\@QEBA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool update(class CompoundTag &) const; /** - * @symbol ??1CompoundTagUpdater\@\@QEAA\@XZ + * @symbol ??1CompoundTagUpdater\@\@QEAA\@XZ */ MCAPI ~CompoundTagUpdater(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp index 27222e4099..53d4802002 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdaterBuilder.hpp @@ -30,36 +30,36 @@ class CompoundTagUpdaterBuilder { public: /** - * @symbol ?edit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$function\@$$A6AXAEAVCompoundTagEditHelper\@\@\@Z\@3\@\@Z + * @symbol ?edit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$function\@$$A6AXAEAVCompoundTagEditHelper\@\@\@Z\@3\@\@Z */ MCAPI class CompoundTagUpdaterBuilder & edit(std::string const &, class std::function &&); /** - * @symbol ?match\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z + * @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 ?matchLiteral\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z + * @symbol ?matchLiteral\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ MCAPI class CompoundTagUpdaterBuilder & matchLiteral(std::string const &, std::string); /** - * @symbol ?popVisit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@XZ + * @symbol ?popVisit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@XZ */ MCAPI class CompoundTagUpdaterBuilder & popVisit(); /** - * @symbol ?remove\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?remove\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CompoundTagUpdaterBuilder & remove(std::string const &); /** - * @symbol ?rename\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?rename\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI class CompoundTagUpdaterBuilder & rename(std::string const &, std::string const &); /** - * @symbol ?tryEdit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$function\@$$A6AXAEAVCompoundTagEditHelper\@\@\@Z\@3\@\@Z + * @symbol ?tryEdit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$function\@$$A6AXAEAVCompoundTagEditHelper\@\@\@Z\@3\@\@Z */ MCAPI class CompoundTagUpdaterBuilder & tryEdit(std::string const &, class std::function &&); /** - * @symbol ?visit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?visit\@CompoundTagUpdaterBuilder\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class CompoundTagUpdaterBuilder & visit(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp b/LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp index d298c811a1..c510a7d087 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagUpdaterContext.hpp @@ -29,28 +29,28 @@ class CompoundTagUpdaterContext { public: /** - * @symbol ??0CompoundTagUpdaterContext\@\@QEAA\@XZ + * @symbol ??0CompoundTagUpdaterContext\@\@QEAA\@XZ */ MCAPI CompoundTagUpdaterContext(); /** - * @symbol ?addUpdater\@CompoundTagUpdaterContext\@\@QEAA?AVCompoundTagUpdaterBuilder\@\@EEE\@Z + * @symbol ?addUpdater\@CompoundTagUpdaterContext\@\@QEAA?AVCompoundTagUpdaterBuilder\@\@EEE\@Z */ MCAPI class CompoundTagUpdaterBuilder addUpdater(unsigned char, unsigned char, unsigned char); /** - * @symbol ?sortUpdaters\@CompoundTagUpdaterContext\@\@QEAAXXZ + * @symbol ?sortUpdaters\@CompoundTagUpdaterContext\@\@QEAAXXZ */ MCAPI void sortUpdaters(); /** - * @symbol ?update\@CompoundTagUpdaterContext\@\@QEAA?AW4CompoundTagUpdaterResult\@\@AEAVCompoundTag\@\@I\@Z + * @symbol ?update\@CompoundTagUpdaterContext\@\@QEAA?AW4CompoundTagUpdaterResult\@\@AEAVCompoundTag\@\@I\@Z */ MCAPI enum class CompoundTagUpdaterResult update(class CompoundTag &, unsigned int); //private: /** - * @symbol ?comparisonPredicate\@CompoundTagUpdaterContext\@\@CA_NAEBV?$unique_ptr\@VCompoundTagUpdater\@\@U?$default_delete\@VCompoundTagUpdater\@\@\@std\@\@\@std\@\@0\@Z + * @symbol ?comparisonPredicate\@CompoundTagUpdaterContext\@\@CA_NAEBV?$unique_ptr\@VCompoundTagUpdater\@\@U?$default_delete\@VCompoundTagUpdater\@\@\@std\@\@\@std\@\@0\@Z */ MCAPI static bool comparisonPredicate(std::unique_ptr const &, std::unique_ptr const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp b/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp index c6fa786133..f910a2c9c5 100644 --- a/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp +++ b/LiteLoader/include/llapi/mc/CompoundTagVariant.hpp @@ -90,24 +90,24 @@ char filler[0x30]; // IDA CompoundTagVariant::emplace public: /** - * @symbol ??0CompoundTagVariant\@\@QEAA\@$$QEAVTag\@\@\@Z + * @symbol ??0CompoundTagVariant\@\@QEAA\@$$QEAVTag\@\@\@Z */ MCAPI CompoundTagVariant(class Tag &&); /** - * @symbol ?emplace\@CompoundTagVariant\@\@QEAAAEAVTag\@\@$$QEAV2\@\@Z + * @symbol ?emplace\@CompoundTagVariant\@\@QEAAAEAVTag\@\@$$QEAV2\@\@Z */ MCAPI class Tag & emplace(class Tag &&); /** - * @symbol ?get\@CompoundTagVariant\@\@QEAAPEAVTag\@\@XZ + * @symbol ?get\@CompoundTagVariant\@\@QEAAPEAVTag\@\@XZ */ MCAPI class Tag * get(); /** - * @symbol ?get\@CompoundTagVariant\@\@QEBAPEBVTag\@\@XZ + * @symbol ?get\@CompoundTagVariant\@\@QEBAPEBVTag\@\@XZ */ MCAPI class Tag const * get() const; /** - * @symbol ??1CompoundTagVariant\@\@QEAA\@XZ + * @symbol ??1CompoundTagVariant\@\@QEAA\@XZ */ MCAPI ~CompoundTagVariant(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp b/LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp index 9ecd0cc7c7..3c22aab887 100644 --- a/LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/CompressedNetworkPeer.hpp @@ -31,32 +31,32 @@ class CompressedNetworkPeer : public NetworkPeer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CompressedNetworkPeer(); + 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 + * @vftbl 1 + * @symbol ?sendPacket\@CompressedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z */ virtual void sendPacket(std::string const &, enum class NetworkPeer::Reliability, enum class Compressibility); /** - * @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 + * @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 */ virtual enum class NetworkPeer::DataStatus receivePacket(std::string &, class std::shared_ptr>>> const &); /** - * @vftbl 3 - * @symbol ?getNetworkStatus\@CompressedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + * @vftbl 3 + * @symbol ?getNetworkStatus\@CompressedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ */ virtual struct NetworkPeer::NetworkStatus getNetworkStatus() const; /** - * @symbol ??0CompressedNetworkPeer\@\@QEAA\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z + * @symbol ??0CompressedNetworkPeer\@\@QEAA\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z */ MCAPI CompressedNetworkPeer(class std::shared_ptr); /** - * @symbol ?setCompressionEnabled\@CompressedNetworkPeer\@\@QEAAX_NUNetworkSettingOptions\@\@\@Z + * @symbol ?setCompressionEnabled\@CompressedNetworkPeer\@\@QEAAX_NUNetworkSettingOptions\@\@\@Z */ MCAPI void setCompressionEnabled(bool, struct NetworkSettingOptions); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp index 3d102fe765..543cdc5bf6 100644 --- a/LiteLoader/include/llapi/mc/ConcreteBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcreteBlock.hpp @@ -31,228 +31,233 @@ class ConcreteBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConcreteBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@ConcreteBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@ConcreteBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ConcreteBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @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 134 - * @symbol ?isAuxValueRelevantForPicking\@ConcreteBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ConcreteBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@ConcreteBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@ConcreteBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0ConcreteBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ConcreteBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ConcreteBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp index 58af4fb273..799edfee2c 100644 --- a/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConcretePowderBlock.hpp @@ -31,266 +31,271 @@ class ConcretePowderBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConcretePowderBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@ConcretePowderBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@ConcretePowderBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 122 - * @symbol ?shouldStopFalling\@ConcretePowderBlock\@\@UEBA_NAEAVActor\@\@\@Z + * @vftbl 122 + * @symbol ?shouldStopFalling\@ConcretePowderBlock\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool shouldStopFalling(class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@ConcretePowderBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ConcretePowderBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ConcretePowderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@ConcretePowderBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@ConcretePowderBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@ConcretePowderBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @symbol ??0ConcretePowderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ConcretePowderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ConcretePowderBlock(std::string const &, int); //private: /** - * @symbol ?_tryTouchWater\@ConcretePowderBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@V?$optional\@W4BlockColor\@\@\@std\@\@\@Z + * @symbol ?_tryTouchWater\@ConcretePowderBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@V?$optional\@W4BlockColor\@\@\@std\@\@\@Z */ MCAPI bool _tryTouchWater(class BlockSource &, class BlockPos const &, class std::optional) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Concurrency.hpp b/LiteLoader/include/llapi/mc/Concurrency.hpp index 22552fe914..78a6b7c61a 100644 --- a/LiteLoader/include/llapi/mc/Concurrency.hpp +++ b/LiteLoader/include/llapi/mc/Concurrency.hpp @@ -20,11 +20,11 @@ namespace Concurrency { #undef AFTER_EXTRA /** - * @symbol ?get_ambient_scheduler\@Concurrency\@\@YAAEBV?$shared_ptr\@Uscheduler_interface\@Concurrency\@\@\@std\@\@XZ + * @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 + * @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 &); diff --git a/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimization.hpp b/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimization.hpp index f72849e975..f57450cf6a 100644 --- a/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimization.hpp +++ b/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimization.hpp @@ -29,15 +29,15 @@ struct ConditionalBandwidthOptimization { public: /** - * @symbol ??4ConditionalBandwidthOptimization\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ConditionalBandwidthOptimization\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ConditionalBandwidthOptimization & operator=(struct ConditionalBandwidthOptimization const &); /** - * @symbol ??4ConditionalBandwidthOptimization\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ConditionalBandwidthOptimization\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ConditionalBandwidthOptimization & operator=(struct ConditionalBandwidthOptimization &&); /** - * @symbol ??1ConditionalBandwidthOptimization\@\@QEAA\@XZ + * @symbol ??1ConditionalBandwidthOptimization\@\@QEAA\@XZ */ MCAPI ~ConditionalBandwidthOptimization(); diff --git a/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationComponent.hpp b/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationComponent.hpp index c955b32f37..212604db48 100644 --- a/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationComponent.hpp +++ b/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationComponent.hpp @@ -30,24 +30,24 @@ class ConditionalBandwidthOptimizationComponent { public: /** - * @symbol ??0ConditionalBandwidthOptimizationComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ConditionalBandwidthOptimizationComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ConditionalBandwidthOptimizationComponent(class ConditionalBandwidthOptimizationComponent &&); /** - * @symbol ?getCurrentOptimizationValues\@ConditionalBandwidthOptimizationComponent\@\@QEAA?AUConditionalBandwidthOptimization\@\@AEAVActor\@\@\@Z + * @symbol ?getCurrentOptimizationValues\@ConditionalBandwidthOptimizationComponent\@\@QEAA?AUConditionalBandwidthOptimization\@\@AEAVActor\@\@\@Z */ MCAPI struct ConditionalBandwidthOptimization getCurrentOptimizationValues(class Actor &); /** - * @symbol ?initFromDefinition\@ConditionalBandwidthOptimizationComponent\@\@QEAAXAEAVActor\@\@AEBVConditionalBandwidthOptimizationDefinition\@\@\@Z + * @symbol ?initFromDefinition\@ConditionalBandwidthOptimizationComponent\@\@QEAAXAEAVActor\@\@AEBVConditionalBandwidthOptimizationDefinition\@\@\@Z */ MCAPI void initFromDefinition(class Actor &, class ConditionalBandwidthOptimizationDefinition const &); /** - * @symbol ??4ConditionalBandwidthOptimizationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ConditionalBandwidthOptimizationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ConditionalBandwidthOptimizationComponent & operator=(class ConditionalBandwidthOptimizationComponent &&); /** - * @symbol ??1ConditionalBandwidthOptimizationComponent\@\@QEAA\@XZ + * @symbol ??1ConditionalBandwidthOptimizationComponent\@\@QEAA\@XZ */ MCAPI ~ConditionalBandwidthOptimizationComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationDefinition.hpp b/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationDefinition.hpp index d79abb2c19..ebd7c605e0 100644 --- a/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ConditionalBandwidthOptimizationDefinition.hpp @@ -31,24 +31,24 @@ class ConditionalBandwidthOptimizationDefinition { public: /** - * @symbol ?addConditionalBandwidthOptimization\@ConditionalBandwidthOptimizationDefinition\@\@QEAAXAEBUConditionalBandwidthOptimization\@\@\@Z + * @symbol ?addConditionalBandwidthOptimization\@ConditionalBandwidthOptimizationDefinition\@\@QEAAXAEBUConditionalBandwidthOptimization\@\@\@Z */ MCAPI void addConditionalBandwidthOptimization(struct ConditionalBandwidthOptimization const &); /** - * @symbol ?addDefaultBandwidthOptimization\@ConditionalBandwidthOptimizationDefinition\@\@QEAAXAEBUConditionalBandwidthOptimization\@\@\@Z + * @symbol ?addDefaultBandwidthOptimization\@ConditionalBandwidthOptimizationDefinition\@\@QEAAXAEBUConditionalBandwidthOptimization\@\@\@Z */ MCAPI void addDefaultBandwidthOptimization(struct ConditionalBandwidthOptimization const &); /** - * @symbol ?initialize\@ConditionalBandwidthOptimizationDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVConditionalBandwidthOptimizationComponent\@\@\@Z + * @symbol ?initialize\@ConditionalBandwidthOptimizationDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVConditionalBandwidthOptimizationComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ConditionalBandwidthOptimizationComponent &) const; /** - * @symbol ??1ConditionalBandwidthOptimizationDefinition\@\@QEAA\@XZ + * @symbol ??1ConditionalBandwidthOptimizationDefinition\@\@QEAA\@XZ */ MCAPI ~ConditionalBandwidthOptimizationDefinition(); /** - * @symbol ?buildSchema\@ConditionalBandwidthOptimizationDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VConditionalBandwidthOptimizationDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ConditionalBandwidthOptimizationDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VConditionalBandwidthOptimizationDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConditionalListFeature.hpp b/LiteLoader/include/llapi/mc/ConditionalListFeature.hpp index 46f863021b..d46f156b71 100644 --- a/LiteLoader/include/llapi/mc/ConditionalListFeature.hpp +++ b/LiteLoader/include/llapi/mc/ConditionalListFeature.hpp @@ -29,18 +29,18 @@ class ConditionalListFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConditionalListFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@ConditionalListFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@ConditionalListFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0ConditionalListFeature\@\@QEAA\@XZ + * @symbol ??0ConditionalListFeature\@\@QEAA\@XZ */ MCAPI ConditionalListFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp b/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp index b557f64b1e..91f4e2bd16 100644 --- a/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/ConditionalRecordingConstBlockSource.hpp @@ -28,20 +28,28 @@ class ConditionalRecordingConstBlockSource { public: /** - * @symbol ??0ConditionalRecordingConstBlockSource\@\@QEAA\@V?$variant\@PEBVIConstBlockSource\@\@VAccessRecordingConstBlockSource\@\@\@std\@\@\@Z + * @symbol ??0ConditionalRecordingConstBlockSource\@\@QEAA\@V?$variant\@PEBVIConstBlockSource\@\@VAccessRecordingConstBlockSource\@\@\@std\@\@\@Z */ MCAPI ConditionalRecordingConstBlockSource(class std::variant); /** - * @symbol ?get\@ConditionalRecordingConstBlockSource\@\@QEAA?AV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@XZ + * @symbol ?get\@ConditionalRecordingConstBlockSource\@\@QEAA?AV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null get(); /** - * @symbol ?takeAccessedBlocks\@ConditionalRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ + * @symbol ??DConditionalRecordingConstBlockSource\@\@QEAAAEBVIConstBlockSource\@\@XZ + */ + MCAPI class IConstBlockSource const & operator*(); + /** + * @symbol ??CConditionalRecordingConstBlockSource\@\@QEAAPEBVIConstBlockSource\@\@XZ + */ + MCAPI class IConstBlockSource const * operator->(); + /** + * @symbol ?takeAccessedBlocks\@ConditionalRecordingConstBlockSource\@\@QEHAA?AUAccessedBlockSourceBlocks\@\@XZ */ MCAPI struct AccessedBlockSourceBlocks takeAccessedBlocks(); /** - * @symbol ??1ConditionalRecordingConstBlockSource\@\@QEAA\@XZ + * @symbol ??1ConditionalRecordingConstBlockSource\@\@QEAA\@XZ */ MCAPI ~ConditionalRecordingConstBlockSource(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConduitBlock.hpp b/LiteLoader/include/llapi/mc/ConduitBlock.hpp index 07c6359782..a13158b6c8 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlock.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlock.hpp @@ -31,203 +31,208 @@ class ConduitBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConduitBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ConduitBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ConduitBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@ConduitBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0ConduitBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0ConduitBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ConduitBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp index 60a87ba576..5253345a60 100644 --- a/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ConduitBlockActor.hpp @@ -31,99 +31,99 @@ class ConduitBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConduitBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ConduitBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ConduitBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@ConduitBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@ConduitBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@ConduitBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@ConduitBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 20 - * @symbol ?hasAlphaLayer\@ConduitBlockActor\@\@UEBA_NXZ + * @vftbl 20 + * @symbol ?hasAlphaLayer\@ConduitBlockActor\@\@UEBA_NXZ */ virtual bool hasAlphaLayer() const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@ConduitBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@ConduitBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@ConduitBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0ConduitBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0ConduitBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI ConduitBlockActor(class BlockPos const &); //private: /** - * @symbol ?_animateTick\@ConduitBlockActor\@\@AEBAXAEAVBlockSource\@\@\@Z + * @symbol ?_animateTick\@ConduitBlockActor\@\@AEBAXAEAVBlockSource\@\@\@Z */ MCAPI void _animateTick(class BlockSource &) const; /** - * @symbol ?_checkShape\@ConduitBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_checkShape\@ConduitBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _checkShape(class BlockSource &); /** - * @symbol ?_updateTarget\@ConduitBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_updateTarget\@ConduitBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _updateTarget(class BlockSource &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConnectionRequest.hpp b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp index c53560afc2..395af399bc 100644 --- a/LiteLoader/include/llapi/mc/ConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/ConnectionRequest.hpp @@ -39,188 +39,184 @@ class ConnectionRequest { public: /** - * @symbol ??0ConnectionRequest\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ConnectionRequest\@\@QEAA\@AEBV0\@\@Z */ MCAPI ConnectionRequest(class ConnectionRequest const &); /** - * @symbol ?getAnimatedImageData\@ConnectionRequest\@\@QEBA?AV?$vector\@VAnimatedImageData\@\@V?$allocator\@VAnimatedImageData\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAnimatedImageData\@ConnectionRequest\@\@QEBA?AV?$vector\@VAnimatedImageData\@\@V?$allocator\@VAnimatedImageData\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getAnimatedImageData() const; /** - * @symbol ?getArmSize\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getArmSize\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getArmSize() const; /** - * @symbol ?getCapeData\@ConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ + * @symbol ?getCapeData\@ConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ */ MCAPI std::vector getCapeData() const; /** - * @symbol ?getCapeId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCapeId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getCapeId() const; /** - * @symbol ?getCapeImageHeight\@ConnectionRequest\@\@QEBAGXZ + * @symbol ?getCapeImageHeight\@ConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getCapeImageHeight() const; /** - * @symbol ?getCapeImageWidth\@ConnectionRequest\@\@QEBAGXZ + * @symbol ?getCapeImageWidth\@ConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getCapeImageWidth() const; /** - * @symbol ?getCertificate\@ConnectionRequest\@\@QEBAPEBVCertificate\@\@XZ + * @symbol ?getCertificate\@ConnectionRequest\@\@QEBAPEBVCertificate\@\@XZ */ MCAPI class Certificate const * getCertificate() const; /** - * @symbol ?getClientPlatformId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getClientPlatformId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getClientPlatformId() const; /** - * @symbol ?getClientPlatformOfflineId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getClientPlatformOfflineId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getClientPlatformOfflineId() const; /** - * @symbol ?getClientPlatformOnlineId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getClientPlatformOnlineId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getClientPlatformOnlineId() const; /** - * @symbol ?getClientRandomId\@ConnectionRequest\@\@QEBA_KXZ + * @symbol ?getClientRandomId\@ConnectionRequest\@\@QEBA_KXZ */ MCAPI unsigned __int64 getClientRandomId() const; /** - * @symbol ?getClientSubId\@ConnectionRequest\@\@QEBA?AW4SubClientId\@\@XZ + * @symbol ?getClientSubId\@ConnectionRequest\@\@QEBA?AW4SubClientId\@\@XZ */ MCAPI enum class SubClientId getClientSubId() const; /** - * @symbol ?getClientThirdPartyName\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getClientThirdPartyName\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getClientThirdPartyName() const; /** - * @symbol ?getDeviceId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDeviceId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDeviceId() const; /** - * @symbol ?getDeviceOS\@ConnectionRequest\@\@QEBA?AW4BuildPlatform\@\@XZ + * @symbol ?getDeviceOS\@ConnectionRequest\@\@QEBA?AW4BuildPlatform\@\@XZ */ MCAPI enum class BuildPlatform getDeviceOS() const; /** - * @symbol ?getPersonaPieces\@ConnectionRequest\@\@QEBA?AV?$vector\@VSerializedPersonaPieceHandle\@\@V?$allocator\@VSerializedPersonaPieceHandle\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getPersonaPieces\@ConnectionRequest\@\@QEBA?AV?$vector\@VSerializedPersonaPieceHandle\@\@V?$allocator\@VSerializedPersonaPieceHandle\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getPersonaPieces() const; /** - * @symbol ?getPieceTintColors\@ConnectionRequest\@\@QEBA?AV?$unordered_map\@W4PieceType\@persona\@\@VTintMapColor\@\@U?$hash\@W4PieceType\@persona\@\@\@std\@\@U?$equal_to\@W4PieceType\@persona\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4PieceType\@persona\@\@VTintMapColor\@\@\@std\@\@\@5\@\@std\@\@XZ + * @symbol ?getPieceTintColors\@ConnectionRequest\@\@QEBA?AV?$unordered_map\@W4PieceType\@persona\@\@VTintMapColor\@\@U?$hash\@W4PieceType\@persona\@\@\@std\@\@U?$equal_to\@W4PieceType\@persona\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4PieceType\@persona\@\@VTintMapColor\@\@\@std\@\@\@5\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> getPieceTintColors() const; /** - * @symbol ?getPlayFabId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlayFabId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPlayFabId() const; /** - * @symbol ?getSelfSignedId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSelfSignedId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSelfSignedId() const; /** - * @symbol ?getSkinAnimationData\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinAnimationData\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinAnimationData() const; /** - * @symbol ?getSkinColor\@ConnectionRequest\@\@QEBA?AVColor\@mce\@\@XZ + * @symbol ?getSkinColor\@ConnectionRequest\@\@QEBA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getSkinColor() const; /** - * @symbol ?getSkinData\@ConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ + * @symbol ?getSkinData\@ConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ */ MCAPI std::vector getSkinData() const; /** - * @symbol ?getSkinGeometry\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinGeometry\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinGeometry() const; /** - * @symbol ?getSkinGeometryEngineVersion\@ConnectionRequest\@\@QEBA?AVSemVersion\@\@XZ + * @symbol ?getSkinGeometryEngineVersion\@ConnectionRequest\@\@QEBA?AVSemVersion\@\@XZ */ MCAPI class SemVersion getSkinGeometryEngineVersion() const; /** - * @symbol ?getSkinId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinId() const; /** - * @symbol ?getSkinImageHeight\@ConnectionRequest\@\@QEBAGXZ + * @symbol ?getSkinImageHeight\@ConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getSkinImageHeight() const; /** - * @symbol ?getSkinImageWidth\@ConnectionRequest\@\@QEBAGXZ + * @symbol ?getSkinImageWidth\@ConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getSkinImageWidth() const; /** - * @symbol ?getSkinResourcePatch\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinResourcePatch\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinResourcePatch() const; /** - * @symbol ?getTenantId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getTenantId\@ConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getTenantId() const; /** - * @symbol ?isCapeOnClassicSkin\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isCapeOnClassicSkin\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isCapeOnClassicSkin() const; /** - * @symbol ?isClientThirdPartyNameOnly\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isClientThirdPartyNameOnly\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isClientThirdPartyNameOnly() const; /** - * @symbol ?isEditorMode\@ConnectionRequest\@\@QEBA_NXZ - */ - MCAPI bool isEditorMode() const; - /** - * @symbol ?isEduMode\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isEduMode\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isEduMode() const; /** - * @symbol ?isOverrideSkin\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isOverrideSkin\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isOverrideSkin() const; /** - * @symbol ?isPersonaSkin\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isPersonaSkin\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isPersonaSkin() const; /** - * @symbol ?isPremiumSkin\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isPremiumSkin\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isPremiumSkin() const; /** - * @symbol ?isTrustedSkin\@ConnectionRequest\@\@QEBA_NXZ + * @symbol ?isTrustedSkin\@ConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isTrustedSkin() const; /** - * @symbol ?toString\@ConnectionRequest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@ConnectionRequest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString(); /** - * @symbol ?verify\@ConnectionRequest\@\@QEAA_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\@\@_J\@Z + * @symbol ?verify\@ConnectionRequest\@\@QEAA_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\@\@_J\@Z */ MCAPI bool verify(std::vector const &, __int64); /** - * @symbol ?verifySelfSigned\@ConnectionRequest\@\@QEAA_NXZ + * @symbol ?verifySelfSigned\@ConnectionRequest\@\@QEAA_NXZ */ MCAPI bool verifySelfSigned(); /** - * @symbol ??1ConnectionRequest\@\@QEAA\@XZ + * @symbol ??1ConnectionRequest\@\@QEAA\@XZ */ MCAPI ~ConnectionRequest(); /** - * @symbol ?fromString\@ConnectionRequest\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@ConnectionRequest\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class ConnectionRequest fromString(std::string const &); //private: /** - * @symbol ??0ConnectionRequest\@\@AEAA\@V?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z + * @symbol ??0ConnectionRequest\@\@AEAA\@V?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ 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\@Z */ MCAPI std::unique_ptr validate(std::unique_ptr, __int64) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Connector.hpp b/LiteLoader/include/llapi/mc/Connector.hpp index 8436da5296..c5433a60af 100644 --- a/LiteLoader/include/llapi/mc/Connector.hpp +++ b/LiteLoader/include/llapi/mc/Connector.hpp @@ -43,94 +43,98 @@ struct NatPunchInfo { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Connector(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?getLocalIp\@Connector\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocalIp\@Connector\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getLocalIp(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?getConnectedGameInfo\@Connector\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ + * @vftbl 5 + * @symbol ?getConnectedGameInfo\@Connector\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ */ virtual class Social::GameConnectionInfo const & getConnectedGameInfo() const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getNatPunchInfo\@Connector\@\@UEBA?AUNatPunchInfo\@1\@XZ + * @vftbl 7 + * @symbol ?getNatPunchInfo\@Connector\@\@UEBA?AUNatPunchInfo\@1\@XZ */ virtual struct Connector::NatPunchInfo getNatPunchInfo() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONNECTOR /** - * @symbol ?addConnectionStateListener\@Connector\@\@UEAAXPEAVConnectionStateListener\@1\@\@Z + * @symbol ?addConnectionStateListener\@Connector\@\@UEAAXPEAVConnectionStateListener\@1\@\@Z */ MCVAPI void addConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?getIPv4Port\@Connector\@\@UEBAGXZ + * @symbol ?getIPv4Port\@Connector\@\@UEBAGXZ */ MCVAPI unsigned short getIPv4Port() const; /** - * @symbol ?getIPv6Port\@Connector\@\@UEBAGXZ + * @symbol ?getIPv6Port\@Connector\@\@UEBAGXZ */ MCVAPI unsigned short getIPv6Port() const; /** - * @symbol ?getLocalIps\@Connector\@\@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\@\@XZ + * @symbol ?getLocalIps\@Connector\@\@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\@\@XZ */ MCVAPI std::vector getLocalIps() const; /** - * @symbol ?getPort\@Connector\@\@UEBAGXZ + * @symbol ?getPort\@Connector\@\@UEBAGXZ */ MCVAPI unsigned short getPort() const; /** - * @symbol ?getRefinedLocalIps\@Connector\@\@UEBA?AV?$vector\@USystemAddress\@RakNet\@\@V?$allocator\@USystemAddress\@RakNet\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getRefinedLocalIps\@Connector\@\@UEBA?AV?$vector\@USystemAddress\@RakNet\@\@V?$allocator\@USystemAddress\@RakNet\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector getRefinedLocalIps() const; /** - * @symbol ?isIPv4Supported\@Connector\@\@UEBA_NXZ + * @symbol ?isIPv4Supported\@Connector\@\@UEBA_NXZ */ MCVAPI bool isIPv4Supported() const; /** - * @symbol ?isIPv6Supported\@Connector\@\@UEBA_NXZ + * @symbol ?isIPv6Supported\@Connector\@\@UEBA_NXZ */ MCVAPI bool isIPv6Supported() const; /** - * @symbol ?removeConnectionStateListener\@Connector\@\@UEAAXPEAVConnectionStateListener\@1\@\@Z + * @symbol ?removeConnectionStateListener\@Connector\@\@UEAAXPEAVConnectionStateListener\@1\@\@Z */ MCVAPI void removeConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?setupNatPunch\@Connector\@\@UEAAX_N\@Z + * @symbol ?setupNatPunch\@Connector\@\@UEAAX_N\@Z */ MCVAPI void setupNatPunch(bool); /** - * @symbol ?startNatPunchingClient\@Connector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @symbol ?startNatPunchingClient\@Connector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ MCVAPI void startNatPunchingClient(std::string const &, unsigned short); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Connector(); #endif /** - * @symbol ??0Connector\@\@QEAA\@AEAUConnectionCallbacks\@0\@\@Z + * @symbol ??0Connector\@\@QEAA\@AEAUConnectionCallbacks\@0\@\@Z */ MCAPI Connector(struct Connector::ConnectionCallbacks &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp b/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp index c482b4c8df..5848c6429e 100644 --- a/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp +++ b/LiteLoader/include/llapi/mc/ConsoleChunkBlender.hpp @@ -32,56 +32,56 @@ enum class BlenderMode; public: /** - * @symbol ??0ConsoleChunkBlender\@\@QEAA\@XZ + * @symbol ??0ConsoleChunkBlender\@\@QEAA\@XZ */ MCAPI ConsoleChunkBlender(); /** - * @symbol ?blendChunk\@ConsoleChunkBlender\@\@QEAAXAEAVLevelChunk\@\@0W4BlenderMode\@1\@\@Z + * @symbol ?blendChunk\@ConsoleChunkBlender\@\@QEAAXAEAVLevelChunk\@\@0W4BlenderMode\@1\@\@Z */ MCAPI void blendChunk(class LevelChunk &, class LevelChunk &, enum class ConsoleChunkBlender::BlenderMode); /** - * @symbol ?setInterpolants\@ConsoleChunkBlender\@\@QEAAXMMMM\@Z + * @symbol ?setInterpolants\@ConsoleChunkBlender\@\@QEAAXMMMM\@Z */ MCAPI void setInterpolants(float, float, float, float); /** - * @symbol ??1ConsoleChunkBlender\@\@QEAA\@XZ + * @symbol ??1ConsoleChunkBlender\@\@QEAA\@XZ */ MCAPI ~ConsoleChunkBlender(); //protected: /** - * @symbol ?_blendChunkEnd4J\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0\@Z + * @symbol ?_blendChunkEnd4J\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0\@Z */ MCAPI void _blendChunkEnd4J(class LevelChunk &, class LevelChunk &); /** - * @symbol ?_blendChunkNether4J\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0\@Z + * @symbol ?_blendChunkNether4J\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0\@Z */ MCAPI void _blendChunkNether4J(class LevelChunk &, class LevelChunk &); /** - * @symbol ?_blendChunkOverworld\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0W4ShiftBlockTypes\@1\@\@Z + * @symbol ?_blendChunkOverworld\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0W4ShiftBlockTypes\@1\@\@Z */ MCAPI void _blendChunkOverworld(class LevelChunk &, class LevelChunk &, enum class ConsoleChunkBlender::ShiftBlockTypes); /** - * @symbol ?_copyColumnFromGeneratedChunkNether\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0HH\@Z + * @symbol ?_copyColumnFromGeneratedChunkNether\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0HH\@Z */ MCAPI void _copyColumnFromGeneratedChunkNether(class LevelChunk &, class LevelChunk &, int, int); /** - * @symbol ?_copyColumnFromGeneratedChunkOverworld\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0HHW4ShiftBlockTypes\@1\@\@Z + * @symbol ?_copyColumnFromGeneratedChunkOverworld\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@0HHW4ShiftBlockTypes\@1\@\@Z */ MCAPI void _copyColumnFromGeneratedChunkOverworld(class LevelChunk &, class LevelChunk &, int, int, enum class ConsoleChunkBlender::ShiftBlockTypes); /** - * @symbol ?_findTopMostWaterHeight\@ConsoleChunkBlender\@\@IEAA?AVChunkLocalHeight\@\@AEAVLevelChunk\@\@HHAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@\@Z + * @symbol ?_findTopMostWaterHeight\@ConsoleChunkBlender\@\@IEAA?AVChunkLocalHeight\@\@AEAVLevelChunk\@\@HHAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@\@Z */ MCAPI class ChunkLocalHeight _findTopMostWaterHeight(class LevelChunk &, int, int, class std::unordered_set, struct std::equal_to, class std::allocator> const &); /** - * @symbol ?_prepInterpTable\@ConsoleChunkBlender\@\@IEAAXXZ + * @symbol ?_prepInterpTable\@ConsoleChunkBlender\@\@IEAAXXZ */ MCAPI void _prepInterpTable(); /** - * @symbol ?_shiftColumnBySetBlocks\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@HHH_NVChunkLocalHeight\@\@W4ShiftBlockTypes\@1\@AEBUOverworldBlendRules\@\@\@Z + * @symbol ?_shiftColumnBySetBlocks\@ConsoleChunkBlender\@\@IEAAXAEAVLevelChunk\@\@HHH_NVChunkLocalHeight\@\@W4ShiftBlockTypes\@1\@AEBUOverworldBlendRules\@\@\@Z */ MCAPI void _shiftColumnBySetBlocks(class LevelChunk &, int, int, int, bool, class ChunkLocalHeight, enum class ConsoleChunkBlender::ShiftBlockTypes, struct OverworldBlendRules const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp b/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp index c2211fec3f..d86f901364 100644 --- a/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp +++ b/LiteLoader/include/llapi/mc/ConsoleGameTestListener.hpp @@ -30,24 +30,24 @@ class ConsoleGameTestListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConsoleGameTestListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onTestStructureLoaded\@ConsoleGameTestListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 1 + * @symbol ?onTestStructureLoaded\@ConsoleGameTestListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestStructureLoaded(class gametest::BaseGameTestInstance &); /** - * @vftbl 2 - * @symbol ?onTestPassed\@ConsoleGameTestListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 2 + * @symbol ?onTestPassed\@ConsoleGameTestListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestPassed(class gametest::BaseGameTestInstance &); /** - * @vftbl 3 - * @symbol ?onTestFailed\@ConsoleGameTestListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 3 + * @symbol ?onTestFailed\@ConsoleGameTestListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestFailed(class gametest::BaseGameTestInstance &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConsoleInputReader.hpp b/LiteLoader/include/llapi/mc/ConsoleInputReader.hpp index 38573851a6..ab52b6de82 100644 --- a/LiteLoader/include/llapi/mc/ConsoleInputReader.hpp +++ b/LiteLoader/include/llapi/mc/ConsoleInputReader.hpp @@ -29,20 +29,20 @@ class ConsoleInputReader { public: /** - * @symbol ??0ConsoleInputReader\@\@QEAA\@XZ + * @symbol ??0ConsoleInputReader\@\@QEAA\@XZ */ MCAPI ConsoleInputReader(); /** - * @symbol ?getLine\@ConsoleInputReader\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getLine\@ConsoleInputReader\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool getLine(std::string &); /** - * @symbol ?unblockReading\@ConsoleInputReader\@\@QEAAXXZ + * @symbol ?unblockReading\@ConsoleInputReader\@\@QEAAXXZ */ MCAPI void unblockReading(); /** - * @symbol ??1ConsoleInputReader\@\@QEAA\@XZ + * @symbol ??1ConsoleInputReader\@\@QEAA\@XZ */ MCAPI ~ConsoleInputReader(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConstBlockSourceComponent.hpp b/LiteLoader/include/llapi/mc/ConstBlockSourceComponent.hpp deleted file mode 100644 index 8fbc97df8b..0000000000 --- a/LiteLoader/include/llapi/mc/ConstBlockSourceComponent.hpp +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @file ConstBlockSourceComponent.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure ConstBlockSourceComponent. - * - */ -struct ConstBlockSourceComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONSTBLOCKSOURCECOMPONENT -public: - ConstBlockSourceComponent() = delete; -#endif - -public: - /** - * @symbol ??0ConstBlockSourceComponent@@QEAA@V?$not_null@PEBVIConstBlockSource@@@gsl@@@Z - * @hash 919502812 - */ - MCAPI ConstBlockSourceComponent(class gsl::not_null); - /** - * @symbol ??0ConstBlockSourceComponent@@QEAA@AEBU0@@Z - * @hash 1400650805 - */ - MCAPI ConstBlockSourceComponent(struct ConstBlockSourceComponent const &); - /** - * @symbol ?getBlockSource@ConstBlockSourceComponent@@QEBAAEBVIConstBlockSource@@XZ - * @hash -477456552 - */ - MCAPI class IConstBlockSource const & getBlockSource() const; - /** - * @symbol ??4ConstBlockSourceComponent@@QEAAAEAU0@AEBU0@@Z - * @hash -1927115858 - */ - MCAPI struct ConstBlockSourceComponent & operator=(struct ConstBlockSourceComponent const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ConstDeserializeDataParams.hpp b/LiteLoader/include/llapi/mc/ConstDeserializeDataParams.hpp index 62407daf70..334d774fe5 100644 --- a/LiteLoader/include/llapi/mc/ConstDeserializeDataParams.hpp +++ b/LiteLoader/include/llapi/mc/ConstDeserializeDataParams.hpp @@ -28,7 +28,7 @@ struct ConstDeserializeDataParams { public: /** - * @symbol ??1ConstDeserializeDataParams\@\@QEAA\@XZ + * @symbol ??1ConstDeserializeDataParams\@\@QEAA\@XZ */ MCAPI ~ConstDeserializeDataParams(); diff --git a/LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp b/LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp index f38e4105ea..ca076b2b14 100644 --- a/LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ConsumeItemDefinition.hpp @@ -32,9 +32,9 @@ class ConsumeItemDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConsumeItemDefinition(); + virtual void __unk_vfn_0(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConsumeItemNode.hpp b/LiteLoader/include/llapi/mc/ConsumeItemNode.hpp index 977f5f412d..5feec84fa8 100644 --- a/LiteLoader/include/llapi/mc/ConsumeItemNode.hpp +++ b/LiteLoader/include/llapi/mc/ConsumeItemNode.hpp @@ -29,18 +29,18 @@ class ConsumeItemNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConsumeItemNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@ConsumeItemNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@ConsumeItemNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @symbol ??0ConsumeItemNode\@\@QEAA\@XZ + * @symbol ??0ConsumeItemNode\@\@QEAA\@XZ */ MCAPI ConsumeItemNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ConsumerComponent.hpp b/LiteLoader/include/llapi/mc/ConsumerComponent.hpp index f96ee5e105..96f6dabe23 100644 --- a/LiteLoader/include/llapi/mc/ConsumerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ConsumerComponent.hpp @@ -30,53 +30,53 @@ class ConsumerComponent : public BaseCircuitComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ConsumerComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol ?canConsumerPower\@ConsumerComponent\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?canConsumerPower\@ConsumerComponent\@\@UEBA_NXZ */ virtual bool canConsumerPower() const; /** - * @vftbl 11 - * @symbol ?addSource\@ConsumerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@ConsumerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@ConsumerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@ConsumerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@ConsumerComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@ConsumerComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol ?isSecondaryPowered\@ConsumerComponent\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isSecondaryPowered\@ConsumerComponent\@\@UEBA_NXZ */ virtual bool isSecondaryPowered() const; /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@ConsumerComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@ConsumerComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @symbol ??0ConsumerComponent\@\@QEAA\@XZ + * @symbol ??0ConsumerComponent\@\@QEAA\@XZ */ MCAPI ConsumerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Container.hpp b/LiteLoader/include/llapi/mc/Container.hpp index 2d8f8bb59f..2375611f52 100644 --- a/LiteLoader/include/llapi/mc/Container.hpp +++ b/LiteLoader/include/llapi/mc/Container.hpp @@ -31,9 +31,9 @@ class Container { LIAPI int getSize(); // static?? - LIAPI bool hasContainer(Vec3& pos, int dim); + LIAPI bool hasContainer(class Vec3& pos, int dim); // static?? - LIAPI Container* getContainerAt(Vec3& pos, int dim); + LIAPI Container* getContainerAt(class Vec3& pos, int dim); #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTAINER public: @@ -43,251 +43,264 @@ class Container { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Container(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?init\@Container\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?init\@Container\@\@UEAAXXZ */ virtual void init(); /** - * @vftbl 2 - * @symbol ?serverInitItemStackIds\@SimpleContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @vftbl 2 + * @symbol ?serverInitItemStackIds\@CraftingContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ virtual void serverInitItemStackIds(int, int, class std::function) = 0; /** - * @vftbl 3 - * @symbol ?addContentChangeListener\@Container\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z + * @vftbl 3 + * @symbol ?addContentChangeListener\@Container\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z */ virtual void addContentChangeListener(class ContainerContentChangeListener *); /** - * @vftbl 4 - * @symbol ?removeContentChangeListener\@Container\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z + * @vftbl 4 + * @symbol ?removeContentChangeListener\@Container\@\@UEAAXPEAVContainerContentChangeListener\@\@\@Z */ virtual void removeContentChangeListener(class ContainerContentChangeListener *); /** - * @vftbl 5 - * @symbol ?getItem\@SimpleContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 5 + * @symbol ?getItem\@FillingContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const = 0; /** - * @vftbl 6 - * @symbol ?hasRoomForItem\@Container\@\@UEAA_NAEBVItemStack\@\@\@Z + * @vftbl 6 + * @symbol ?hasRoomForItem\@Container\@\@UEAA_NAEBVItemStack\@\@\@Z */ virtual bool hasRoomForItem(class ItemStack const &); /** - * @vftbl 7 - * @symbol ?addItem\@Container\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 7 + * @symbol ?addItem\@Container\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool addItem(class ItemStack &); /** - * @vftbl 8 - * @symbol ?addItemToFirstEmptySlot\@Container\@\@UEAA_NAEBVItemStack\@\@\@Z + * @vftbl 8 + * @symbol ?addItemToFirstEmptySlot\@Container\@\@UEAA_NAEBVItemStack\@\@\@Z */ virtual bool addItemToFirstEmptySlot(class ItemStack const &); /** - * @vftbl 9 - * @symbol ?setItem\@SimplePlayerContainer\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 9 + * @symbol ?setItem\@Inventory\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &) = 0; /** - * @vftbl 10 - * @symbol ?setItemWithForceBalance\@Container\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 10 + * @symbol ?setItemWithForceBalance\@Container\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 11 - * @symbol ?removeItem\@Container\@\@UEAAXHH\@Z + * @vftbl 11 + * @symbol ?removeItem\@Container\@\@UEAAXHH\@Z */ virtual void removeItem(int, int); /** - * @vftbl 12 - * @symbol ?removeAllItems\@Container\@\@UEAAXXZ + * @vftbl 12 + * @symbol ?removeAllItems\@Container\@\@UEAAXXZ */ virtual void removeAllItems(); /** - * @vftbl 13 - * @symbol ?dropContents\@Container\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z + * @vftbl 13 + * @symbol ?dropContents\@Container\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z */ virtual void dropContents(class BlockSource &, class Vec3 const &, bool); /** - * @vftbl 14 - * @symbol ?getContainerSize\@SimpleContainer\@\@UEBAHXZ + * @vftbl 14 + * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const = 0; /** - * @vftbl 15 - * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ + * @vftbl 15 + * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const = 0; /** - * @vftbl 16 - * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 16 + * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &) = 0; /** - * @vftbl 17 - * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 17 + * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &) = 0; /** - * @vftbl 18 - * @symbol ?getSlotCopies\@Container\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 18 + * @symbol ?getSlotCopies\@Container\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSlotCopies() const; /** - * @vftbl 19 - * @symbol ?getSlots\@Container\@\@UEBA?BV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 19 + * @symbol ?getSlots\@Container\@\@UEBA?BV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const getSlots() const; /** - * @vftbl 20 - * @symbol ?getItemCount\@Container\@\@UEBAHAEBVItemStack\@\@\@Z + * @vftbl 20 + * @symbol ?getEmptySlotsCount\@Container\@\@UEBAHXZ + */ + virtual int getEmptySlotsCount() const; + /** + * @vftbl 21 + * @symbol ?getItemCount\@Container\@\@UEBAHAEBVItemStack\@\@\@Z */ virtual int getItemCount(class ItemStack const &) const; /** - * @vftbl 21 - * @symbol ?findFirstSlotForItem\@Container\@\@UEBAHAEBVItemStack\@\@\@Z + * @vftbl 22 + * @symbol ?findFirstSlotForItem\@Container\@\@UEBAHAEBVItemStack\@\@\@Z */ virtual int findFirstSlotForItem(class ItemStack const &) const; /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 23 + * @symbol __unk_vfn_23 */ - virtual void __unk_vfn_22(); + virtual void __unk_vfn_23(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_23(); + virtual void __unk_vfn_24(); /** - * @vftbl 24 - * @symbol ?setContainerChanged\@Container\@\@UEAAXH\@Z + * @vftbl 25 + * @symbol ?setContainerChanged\@Container\@\@UEAAXH\@Z */ virtual void setContainerChanged(int); /** - * @vftbl 25 - * @symbol ?setContainerMoved\@Container\@\@UEAAXXZ + * @vftbl 26 + * @symbol ?setContainerMoved\@Container\@\@UEAAXXZ */ virtual void setContainerMoved(); /** - * @vftbl 26 - * @symbol ?setCustomName\@Container\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 27 + * @symbol ?setCustomName\@Container\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setCustomName(std::string const &); /** - * @vftbl 27 - * @symbol ?hasCustomName\@Container\@\@UEBA_NXZ + * @vftbl 28 + * @symbol ?hasCustomName\@Container\@\@UEBA_NXZ */ virtual bool hasCustomName() const; /** - * @vftbl 28 - * @symbol ?readAdditionalSaveData\@Container\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 29 + * @symbol ?readAdditionalSaveData\@Container\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &); /** - * @vftbl 29 - * @symbol ?addAdditionalSaveData\@Container\@\@UEAAXAEAVCompoundTag\@\@\@Z + * @vftbl 30 + * @symbol ?addAdditionalSaveData\@Container\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &); /** - * @vftbl 30 - * @symbol ?createTransactionContext\@Container\@\@UEAAXV?$function\@$$A6AXAEAVContainer\@\@HAEBVItemStack\@\@1\@Z\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z + * @vftbl 31 + * @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 31 - * @symbol ?initializeContainerContents\@Container\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 32 + * @symbol ?initializeContainerContents\@Container\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void initializeContainerContents(class BlockSource &); /** - * @vftbl 32 - * @symbol ?isEmpty\@Container\@\@UEBA_NXZ + * @vftbl 33 + * @symbol ?isEmpty\@Container\@\@UEBA_NXZ */ virtual bool isEmpty() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINER /** - * @symbol ?canPullOutItem\@Container\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@Container\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@Container\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@Container\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Container(); #endif /** - * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI Container(enum class ContainerType, std::string const &, bool); /** - * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@\@Z + * @symbol ??0Container\@\@QEAA\@W4ContainerType\@\@\@Z */ MCAPI Container(enum class ContainerType); /** - * @symbol ??0Container\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0Container\@\@QEAA\@AEBV0\@\@Z */ MCAPI Container(class Container const &); /** - * @symbol ?getContainerType\@Container\@\@QEBA?AW4ContainerType\@\@XZ + * @symbol ?getContainerType\@Container\@\@QEBA?AW4ContainerType\@\@XZ */ MCAPI enum class ContainerType getContainerType() const; /** - * @symbol ?getGameplayContainerType\@Container\@\@QEBA?AW4ContainerType\@\@XZ + * @symbol ?getGameplayContainerType\@Container\@\@QEBA?AW4ContainerType\@\@XZ */ MCAPI enum class ContainerType getGameplayContainerType() const; /** - * @symbol ?getItemCount\@Container\@\@QEAAHV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?getItemCount\@Container\@\@QEAAHV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI int getItemCount(class std::function); /** - * @symbol ?getRedstoneSignalFromContainer\@Container\@\@QEAAHAEAVBlockSource\@\@\@Z + * @symbol ?getRedstoneSignalFromContainer\@Container\@\@QEAAHAEAVBlockSource\@\@\@Z */ MCAPI int getRedstoneSignalFromContainer(class BlockSource &); /** - * @symbol ?getRuntimeId\@Container\@\@QEBAAEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@XZ + * @symbol ?getRuntimeId\@Container\@\@QEBAAEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@XZ */ MCAPI class TypedRuntimeId const & getRuntimeId() const; /** - * @symbol ?initRuntimeId\@Container\@\@QEAAXXZ + * @symbol ?initRuntimeId\@Container\@\@QEAAXXZ */ MCAPI void initRuntimeId(); /** - * @symbol ?serverInitItemStackIdsAll\@Container\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIdsAll\@Container\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void serverInitItemStackIdsAll(class std::function); /** - * @symbol ?setGameplayContainerType\@Container\@\@QEAAXW4ContainerType\@\@\@Z + * @symbol ?setGameplayContainerType\@Container\@\@QEAAXW4ContainerType\@\@\@Z */ MCAPI void setGameplayContainerType(enum class ContainerType); /** - * @symbol ?triggerTransactionChange\@Container\@\@QEAAXHAEBVItemStack\@\@0\@Z + * @symbol ?triggerTransactionChange\@Container\@\@QEAAXHAEBVItemStack\@\@0\@Z */ MCAPI void triggerTransactionChange(int, class ItemStack const &, class ItemStack const &); /** - * @symbol ?getContainerTypeId\@Container\@\@SA?AW4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getContainerTypeId\@Container\@\@SA?AW4ContainerType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class ContainerType getContainerTypeId(std::string const &); /** - * @symbol ?getContainerTypeName\@Container\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ContainerType\@\@\@Z + * @symbol ?getContainerTypeName\@Container\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ContainerType\@\@\@Z */ MCAPI static std::string const & getContainerTypeName(enum class ContainerType); //protected: /** - * @symbol ?_initRuntimeId\@Container\@\@IEAAXAEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?_getEmptySlotsCount\@Container\@\@IEBAHHH\@Z + */ + MCAPI int _getEmptySlotsCount(int, int) const; + /** + * @symbol ?_initRuntimeId\@Container\@\@IEAAXAEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z */ MCAPI void _initRuntimeId(class TypedRuntimeId const &); /** - * @symbol ?_serverInitId\@Container\@\@IEAAXHAEAVItemStack\@\@V?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?_serverInitId\@Container\@\@IEAAXHAEAVItemStack\@\@V?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void _serverInitId(int, class ItemStack &, class std::function); protected: /** - * @symbol ?containerTypeMap\@Container\@\@1V?$BidirectionalUnorderedMap\@W4ContainerType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?containerTypeMap\@Container\@\@1V?$BidirectionalUnorderedMap\@W4ContainerType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const containerTypeMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp index 05f9f3f612..ec8c43926c 100644 --- a/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerClosePacket.hpp @@ -30,37 +30,43 @@ class ContainerClosePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerClosePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ContainerClosePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ContainerClosePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ContainerClosePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ContainerClosePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ContainerClosePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ContainerClosePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ContainerClosePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERCLOSEPACKET /** - * @symbol ??0ContainerClosePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ContainerClosePacket(); + MCVAPI ~ContainerClosePacket(); +#endif /** - * @symbol ??0ContainerClosePacket\@\@QEAA\@W4ContainerID\@\@_N\@Z + * @symbol ??0ContainerClosePacket\@\@QEAA\@W4ContainerID\@\@_N\@Z */ MCAPI ContainerClosePacket(enum class ContainerID, bool); + /** + * @symbol ??0ContainerClosePacket\@\@QEAA\@XZ + */ + MCAPI ContainerClosePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerComponent.hpp b/LiteLoader/include/llapi/mc/ContainerComponent.hpp index 7bcdb6efd4..99e153ce38 100644 --- a/LiteLoader/include/llapi/mc/ContainerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ContainerComponent.hpp @@ -29,133 +29,139 @@ class ContainerComponent { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@ContainerComponent\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@ContainerComponent\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERCOMPONENT /** - * @symbol ??0ContainerComponent\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerComponent(); +#endif + /** + * @symbol ??0ContainerComponent\@\@QEAA\@XZ */ MCAPI ContainerComponent(); /** - * @symbol ??0ContainerComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ContainerComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ContainerComponent(class ContainerComponent &&); /** - * @symbol ?_getRawContainerPtr\@ContainerComponent\@\@QEAAPEAVFillingContainer\@\@XZ + * @symbol ?_getRawContainerPtr\@ContainerComponent\@\@QEAAPEAVFillingContainer\@\@XZ */ MCAPI class FillingContainer * _getRawContainerPtr(); /** - * @symbol ?addAdditionalSaveData\@ContainerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@ContainerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemActor\@\@\@Z + * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemActor\@\@\@Z */ MCAPI bool addItem(class ItemActor &); /** - * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@\@Z + * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@\@Z */ MCAPI bool addItem(class ItemStack &); /** - * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@HH\@Z + * @symbol ?addItem\@ContainerComponent\@\@QEAA_NAEAVItemStack\@\@HH\@Z */ MCAPI bool addItem(class ItemStack &, int, int); /** - * @symbol ?canBeSiphonedFrom\@ContainerComponent\@\@QEBA_NXZ + * @symbol ?canBeSiphonedFrom\@ContainerComponent\@\@QEBA_NXZ */ MCAPI bool canBeSiphonedFrom() const; /** - * @symbol ?canOpenContainer\@ContainerComponent\@\@QEBA_NAEBVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?canOpenContainer\@ContainerComponent\@\@QEBA_NAEBVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI bool canOpenContainer(class Actor const &, class Player &) const; /** - * @symbol ?countItemsOfType\@ContainerComponent\@\@QEBAHAEBVItemStack\@\@\@Z + * @symbol ?countItemsOfType\@ContainerComponent\@\@QEBAHAEBVItemStack\@\@\@Z */ MCAPI int countItemsOfType(class ItemStack const &) const; /** - * @symbol ?dropContents\@ContainerComponent\@\@QEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z + * @symbol ?dropContents\@ContainerComponent\@\@QEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z */ MCAPI void dropContents(class BlockSource &, class Vec3 const &, bool); /** - * @symbol ?findFirstSlotForItem\@ContainerComponent\@\@QEBAHAEBVItemStack\@\@\@Z + * @symbol ?findFirstSlotForItem\@ContainerComponent\@\@QEBAHAEBVItemStack\@\@\@Z */ MCAPI int findFirstSlotForItem(class ItemStack const &) const; /** - * @symbol ?getContainerSize\@ContainerComponent\@\@QEBAHXZ + * @symbol ?getContainerSize\@ContainerComponent\@\@QEBAHXZ */ MCAPI int getContainerSize() const; /** - * @symbol ?getItem\@ContainerComponent\@\@QEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@ContainerComponent\@\@QEBAAEBVItemStack\@\@H\@Z */ MCAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getSlots\@ContainerComponent\@\@QEBA?BV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSlots\@ContainerComponent\@\@QEBA?BV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const getSlots() const; /** - * @symbol ?hasRoomForItem\@ContainerComponent\@\@QEAA_NAEBVItemActor\@\@\@Z + * @symbol ?hasRoomForItem\@ContainerComponent\@\@QEAA_NAEBVItemActor\@\@\@Z */ MCAPI bool hasRoomForItem(class ItemActor const &); /** - * @symbol ?hasRoomForItem\@ContainerComponent\@\@QEAA_NAEBVItemStack\@\@\@Z + * @symbol ?hasRoomForItem\@ContainerComponent\@\@QEAA_NAEBVItemStack\@\@\@Z */ MCAPI bool hasRoomForItem(class ItemStack const &); /** - * @symbol ?initFromDefinition\@ContainerComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@ContainerComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?isEmpty\@ContainerComponent\@\@QEBA_NXZ + * @symbol ?isEmpty\@ContainerComponent\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?isPrivate\@ContainerComponent\@\@QEBA_NXZ + * @symbol ?isPrivate\@ContainerComponent\@\@QEBA_NXZ */ MCAPI bool isPrivate() const; /** - * @symbol ?openContainer\@ContainerComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?openContainer\@ContainerComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI bool openContainer(class Actor &, class Player &); /** - * @symbol ??4ContainerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ContainerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ContainerComponent & operator=(class ContainerComponent &&); /** - * @symbol ?readAdditionalSaveData\@ContainerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@ContainerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?rebuildContainer\@ContainerComponent\@\@QEAAXAEAVActor\@\@W4ContainerType\@\@H_NH2\@Z + * @symbol ?rebuildContainer\@ContainerComponent\@\@QEAAXAEAVActor\@\@W4ContainerType\@\@H_NH2\@Z */ MCAPI void rebuildContainer(class Actor &, enum class ContainerType, int, bool, int, bool); /** - * @symbol ?removeItem\@ContainerComponent\@\@QEAAXHH\@Z + * @symbol ?removeItem\@ContainerComponent\@\@QEAAXHH\@Z */ MCAPI void removeItem(int, int); /** - * @symbol ?removeItemsOfType\@ContainerComponent\@\@QEAAXAEBVItemStack\@\@H\@Z + * @symbol ?removeItemsOfType\@ContainerComponent\@\@QEAAXAEBVItemStack\@\@H\@Z */ MCAPI void removeItemsOfType(class ItemStack const &, int); /** - * @symbol ?serverInitItemStackIds\@ContainerComponent\@\@QEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@ContainerComponent\@\@QEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setCustomName\@ContainerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCustomName\@ContainerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCustomName(std::string const &); /** - * @symbol ?setItem\@ContainerComponent\@\@QEAA_NHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ContainerComponent\@\@QEAA_NHAEBVItemStack\@\@\@Z */ MCAPI bool setItem(int, class ItemStack const &); /** - * @symbol ?setLootTable\@ContainerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?setLootTable\@ContainerComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI void setLootTable(std::string const &, int); /** - * @symbol ?unpackLootTable\@ContainerComponent\@\@QEAAXAEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?unpackLootTable\@ContainerComponent\@\@QEAAXAEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void unpackLootTable(class Level &, class AutomaticID); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp b/LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp index 796f395a4d..be49ac48d5 100644 --- a/LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp +++ b/LiteLoader/include/llapi/mc/ContainerContentChangeListener.hpp @@ -29,5 +29,11 @@ class ContainerContentChangeListener { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERCONTENTCHANGELISTENER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerContentChangeListener(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerDescription.hpp b/LiteLoader/include/llapi/mc/ContainerDescription.hpp index ce72cf1d56..a5413abe2e 100644 --- a/LiteLoader/include/llapi/mc/ContainerDescription.hpp +++ b/LiteLoader/include/llapi/mc/ContainerDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class ContainerDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@ContainerDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@ContainerDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~ContainerDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@ContainerDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@ContainerDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@ContainerDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~ContainerDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp index 612e4e15ed..9ba75baea0 100644 --- a/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerManagerModel.hpp @@ -30,134 +30,140 @@ class ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getContainerId\@ContainerManagerModel\@\@UEBA?AW4ContainerID\@\@XZ + * @vftbl 1 + * @symbol ?getContainerId\@ContainerManagerModel\@\@UEBA?AW4ContainerID\@\@XZ */ virtual enum class ContainerID getContainerId() const; /** - * @vftbl 2 - * @symbol ?setContainerId\@ContainerManagerModel\@\@UEAAXW4ContainerID\@\@\@Z + * @vftbl 2 + * @symbol ?setContainerId\@ContainerManagerModel\@\@UEAAXW4ContainerID\@\@\@Z */ virtual void setContainerId(enum class ContainerID); /** - * @vftbl 3 - * @symbol ?getContainerType\@ContainerManagerModel\@\@UEBA?AW4ContainerType\@\@XZ + * @vftbl 3 + * @symbol ?getContainerType\@ContainerManagerModel\@\@UEBA?AW4ContainerType\@\@XZ */ virtual enum class ContainerType getContainerType() const; /** - * @vftbl 4 - * @symbol ?setContainerType\@ContainerManagerModel\@\@UEAAXW4ContainerType\@\@\@Z + * @vftbl 4 + * @symbol ?setContainerType\@ContainerManagerModel\@\@UEAAXW4ContainerType\@\@\@Z */ virtual void setContainerType(enum class ContainerType); /** - * @vftbl 5 - * @symbol ?serverInitItemStackIds\@ContainerManagerModel\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?serverInitItemStackIds\@ContainerManagerModel\@\@UEAAXXZ */ virtual void serverInitItemStackIds(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@TradeContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@HorseContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const = 0; /** - * @vftbl 7 - * @symbol ?setSlot\@TradeContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@HorseContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool) = 0; /** - * @vftbl 8 - * @symbol ?getSlot\@TradeContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@HorseContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const = 0; /** - * @vftbl 9 - * @symbol ?setData\@ElementConstructorContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@ElementConstructorContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int) = 0; /** - * @vftbl 10 - * @symbol ?broadcastChanges\@TradeContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@FurnaceContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges() = 0; /** - * @vftbl 11 - * @symbol ?tick\@ContainerManagerModel\@\@MEAA_NXZ + * @vftbl 11 + * @symbol ?tick\@ContainerManagerModel\@\@MEAA_NXZ */ virtual bool tick(); /** - * @vftbl 12 - * @symbol ?debitPlayerLevels\@ContainerManagerModel\@\@UEAAXH\@Z + * @vftbl 12 + * @symbol ?debitPlayerLevels\@ContainerManagerModel\@\@UEAAXH\@Z */ virtual void debitPlayerLevels(int); /** - * @vftbl 13 - * @symbol ?isCreativeMode\@ContainerManagerModel\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?isCreativeMode\@ContainerManagerModel\@\@UEBA_NXZ */ virtual bool isCreativeMode() const; /** - * @vftbl 14 - * @symbol ?isClientSide\@ContainerManagerModel\@\@UEBA_NXZ + * @vftbl 14 + * @symbol ?isClientSide\@ContainerManagerModel\@\@UEBA_NXZ */ virtual bool isClientSide() const; /** - * @vftbl 15 - * @symbol ?isServerAuthoritative\@ContainerManagerModel\@\@UEBA_NXZ + * @vftbl 15 + * @symbol ?isServerAuthoritative\@ContainerManagerModel\@\@UEBA_NXZ */ virtual bool isServerAuthoritative() const; /** - * @vftbl 16 - * @symbol ?isValid\@ContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@ContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@TradeContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@DispenserContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit() = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERMANAGERMODEL /** - * @symbol ??0ContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerManagerModel(); +#endif + /** + * @symbol ??0ContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@\@Z */ MCAPI ContainerManagerModel(enum class ContainerID, class Player &); /** - * @symbol ?getPlayer\@ContainerManagerModel\@\@QEBAAEAVPlayer\@\@XZ + * @symbol ?getPlayer\@ContainerManagerModel\@\@QEBAAEAVPlayer\@\@XZ */ MCAPI class Player & getPlayer() const; /** - * @symbol ?postInit\@ContainerManagerModel\@\@QEAAXXZ + * @symbol ?postInit\@ContainerManagerModel\@\@QEAAXXZ */ MCAPI void postInit(); //protected: /** - * @symbol ?_addContainer\@ContainerManagerModel\@\@IEAAXV?$shared_ptr\@VContainerModel\@\@\@std\@\@\@Z + * @symbol ?_addContainer\@ContainerManagerModel\@\@IEAAXV?$shared_ptr\@VContainerModel\@\@\@std\@\@\@Z */ MCAPI void _addContainer(class std::shared_ptr); /** - * @symbol ?_containerScreenContext\@ContainerManagerModel\@\@IEAA?AVContainerScreenContext\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_containerScreenContext\@ContainerManagerModel\@\@IEAA?AVContainerScreenContext\@\@UActorUniqueID\@\@\@Z */ - MCAPI class ContainerScreenContext _containerScreenContext(class BlockPos const &); + MCAPI class ContainerScreenContext _containerScreenContext(struct ActorUniqueID); /** - * @symbol ?_containerScreenContext\@ContainerManagerModel\@\@IEAA?AVContainerScreenContext\@\@UActorUniqueID\@\@\@Z + * @symbol ?_containerScreenContext\@ContainerManagerModel\@\@IEAA?AVContainerScreenContext\@\@AEBVBlockPos\@\@\@Z */ - MCAPI class ContainerScreenContext _containerScreenContext(struct ActorUniqueID); + MCAPI class ContainerScreenContext _containerScreenContext(class BlockPos const &); /** - * @symbol ?_getContainer\@ContainerManagerModel\@\@IEBA?AV?$shared_ptr\@VContainerModel\@\@\@std\@\@W4ContainerEnumName\@\@\@Z + * @symbol ?_getContainer\@ContainerManagerModel\@\@IEBA?AV?$shared_ptr\@VContainerModel\@\@\@std\@\@W4ContainerEnumName\@\@\@Z */ MCAPI class std::shared_ptr _getContainer(enum class ContainerEnumName) const; /** - * @symbol ?_isPlayerInRangeOfPosition\@ContainerManagerModel\@\@IEBA_NAEBVBlockPos\@\@M\@Z + * @symbol ?_isPlayerInRangeOfPosition\@ContainerManagerModel\@\@IEBA_NAEBVBlockPos\@\@M\@Z */ MCAPI bool _isPlayerInRangeOfPosition(class BlockPos const &, float) const; /** - * @symbol ?_appendCopies\@ContainerManagerModel\@\@KAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBV23\@\@Z + * @symbol ?_appendCopies\@ContainerManagerModel\@\@KAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBV23\@\@Z */ MCAPI static void _appendCopies(std::vector &, std::vector const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerModel.hpp b/LiteLoader/include/llapi/mc/ContainerModel.hpp index 719673c2cf..52248af85c 100644 --- a/LiteLoader/include/llapi/mc/ContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/ContainerModel.hpp @@ -30,216 +30,220 @@ class ContainerModel { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@ContainerModel\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@ContainerModel\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~ContainerModel(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?postInit\@ContainerModel\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?postInit\@ContainerModel\@\@UEAAXXZ */ virtual void postInit(); /** - * @vftbl 3 - * @symbol ?releaseResources\@ContainerModel\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?releaseResources\@ContainerModel\@\@UEAAXXZ */ virtual void releaseResources(); /** - * @vftbl 4 - * @symbol ?getContainerSize\@ContainerModel\@\@UEBAHXZ + * @vftbl 4 + * @symbol ?getContainerSize\@ContainerModel\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 5 - * @symbol ?getFilteredContainerSize\@ContainerModel\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getFilteredContainerSize\@ContainerModel\@\@UEBAHXZ */ virtual int getFilteredContainerSize() const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getContainerWeakRef\@ContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ + * @vftbl 7 + * @symbol ?getContainerWeakRef\@ContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ */ virtual class ContainerWeakRef getContainerWeakRef() const; /** - * @vftbl 8 - * @symbol ?getItemStack\@ContainerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getItemStack\@ContainerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItemStack(int) const; /** - * @vftbl 9 - * @symbol ?getItems\@ContainerModel\@\@UEBAAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?getItems\@ContainerModel\@\@UEBAAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getItems() const; /** - * @vftbl 10 - * @symbol ?getItemInstance\@ContainerModel\@\@UEBAAEBVItemInstance\@\@H\@Z + * @vftbl 10 + * @symbol ?getItemInstance\@ContainerModel\@\@UEBAAEBVItemInstance\@\@H\@Z */ virtual class ItemInstance const & getItemInstance(int) const; /** - * @vftbl 11 - * @symbol ?getItemStackBase\@ContainerModel\@\@UEBAAEBVItemStackBase\@\@H\@Z + * @vftbl 11 + * @symbol ?getItemStackBase\@ContainerModel\@\@UEBAAEBVItemStackBase\@\@H\@Z */ virtual class ItemStackBase const & getItemStackBase(int) const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?setItem\@ContainerModel\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 13 + * @symbol ?setItem\@ContainerModel\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 14 - * @symbol ?isValid\@ContainerModel\@\@UEAA_NXZ + * @vftbl 14 + * @symbol ?isValid\@ContainerModel\@\@UEAA_NXZ */ virtual bool isValid(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol ?getItemExpandStatus\@ContainerModel\@\@UEBA?AW4ContainerExpandStatus\@\@H\@Z + * @vftbl 17 + * @symbol ?getItemExpandStatus\@ContainerModel\@\@UEBA?AW4ContainerExpandStatus\@\@H\@Z */ virtual enum class ContainerExpandStatus getItemExpandStatus(int) const; /** - * @vftbl 18 - * @symbol ?getItemGroupName\@ContainerModel\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 18 + * @symbol ?getItemGroupName\@ContainerModel\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ virtual std::string const & getItemGroupName(int) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?_getContainer\@ContainerModel\@\@MEBAPEAVContainer\@\@XZ + * @vftbl 20 + * @symbol ?_getContainer\@ContainerModel\@\@MEBAPEAVContainer\@\@XZ */ virtual class Container * _getContainer() const; /** - * @vftbl 21 - * @symbol ?_getContainerOffset\@ContainerModel\@\@MEBAHXZ + * @vftbl 21 + * @symbol ?_getContainerOffset\@ContainerModel\@\@MEBAHXZ */ virtual int _getContainerOffset() const; /** - * @vftbl 22 - * @symbol ?_onItemChanged\@ContainerModel\@\@MEAAXHAEBVItemStack\@\@0\@Z + * @vftbl 22 + * @symbol ?_onItemChanged\@ContainerModel\@\@MEAAXHAEBVItemStack\@\@0\@Z */ virtual void _onItemChanged(int, class ItemStack const &, class ItemStack const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERMODEL /** - * @symbol ?isExpanableItemFiltered\@ContainerModel\@\@UEBA_NH\@Z + * @symbol ?isExpanableItemFiltered\@ContainerModel\@\@UEBA_NH\@Z */ MCVAPI bool isExpanableItemFiltered(int) const; /** - * @symbol ?isItemFiltered\@ContainerModel\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isItemFiltered\@ContainerModel\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool isItemFiltered(class ItemStackBase const &) const; /** - * @symbol ?isItemInstanceBased\@ContainerModel\@\@UEBA_NXZ + * @symbol ?isItemInstanceBased\@ContainerModel\@\@UEBA_NXZ */ MCVAPI bool isItemInstanceBased() const; /** - * @symbol ?switchItemExpando\@ContainerModel\@\@UEAAXH\@Z + * @symbol ?switchItemExpando\@ContainerModel\@\@UEAAXH\@Z */ MCVAPI void switchItemExpando(int); /** - * @symbol ?tick\@ContainerModel\@\@UEAAXH\@Z + * @symbol ?tick\@ContainerModel\@\@UEAAXH\@Z */ MCVAPI void tick(int); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerModel(); #endif /** - * @symbol ??0ContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HW4ContainerCategory\@\@_N\@Z + * @symbol ??0ContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HW4ContainerCategory\@\@_N\@Z */ MCAPI ContainerModel(enum class ContainerEnumName, int, enum class ContainerCategory, bool); /** - * @symbol ?_useLegacyTransactions\@ContainerModel\@\@QEBA_NXZ + * @symbol ?_useLegacyTransactions\@ContainerModel\@\@QEBA_NXZ */ MCAPI bool _useLegacyTransactions() const; /** - * @symbol ?getContainerEnumName\@ContainerModel\@\@QEBA?AW4ContainerEnumName\@\@XZ + * @symbol ?getContainerEnumName\@ContainerModel\@\@QEBA?AW4ContainerEnumName\@\@XZ */ MCAPI enum class ContainerEnumName getContainerEnumName() const; /** - * @symbol ?getContainerSlot\@ContainerModel\@\@QEBAHH\@Z + * @symbol ?getContainerSlot\@ContainerModel\@\@QEBAHH\@Z */ MCAPI int getContainerSlot(int) const; /** - * @symbol ?getContainerStringName\@ContainerModel\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getContainerStringName\@ContainerModel\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getContainerStringName() const; /** - * @symbol ?getModelSlot\@ContainerModel\@\@QEBAHH\@Z + * @symbol ?getModelSlot\@ContainerModel\@\@QEBAHH\@Z */ MCAPI int getModelSlot(int) const; /** - * @symbol ?initContainerRuntimeId\@ContainerModel\@\@QEAAXXZ + * @symbol ?initContainerRuntimeId\@ContainerModel\@\@QEAAXXZ */ MCAPI void initContainerRuntimeId(); /** - * @symbol ?isContainerSlotInRange\@ContainerModel\@\@QEBA_NH\@Z + * @symbol ?isContainerSlotInRange\@ContainerModel\@\@QEBA_NH\@Z */ MCAPI bool isContainerSlotInRange(int) const; /** - * @symbol ?isIntermediaryCategory\@ContainerModel\@\@QEBA_NXZ + * @symbol ?isIntermediaryCategory\@ContainerModel\@\@QEBA_NXZ */ MCAPI bool isIntermediaryCategory() const; /** - * @symbol ?networkUpdateItem\@ContainerModel\@\@QEAAXHAEBVItemStack\@\@0\@Z + * @symbol ?networkUpdateItem\@ContainerModel\@\@QEAAXHAEBVItemStack\@\@0\@Z */ MCAPI void networkUpdateItem(int, class ItemStack const &, class ItemStack const &); /** - * @symbol ?registerOnContainerChangedCallback\@ContainerModel\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z + * @symbol ?registerOnContainerChangedCallback\@ContainerModel\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z */ MCAPI void registerOnContainerChangedCallback(class std::function); /** - * @symbol ?registerPlayerNotificationCallback\@ContainerModel\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z + * @symbol ?registerPlayerNotificationCallback\@ContainerModel\@\@QEAAXV?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z */ MCAPI void registerPlayerNotificationCallback(class std::function); /** - * @symbol ?serverInitItemStackIds\@ContainerModel\@\@QEAAXXZ + * @symbol ?serverInitItemStackIds\@ContainerModel\@\@QEAAXXZ */ MCAPI void serverInitItemStackIds(); /** - * @symbol ?setClientUIContainer\@ContainerModel\@\@QEAAXPEAVSparseContainerClient\@\@\@Z + * @symbol ?setClientUIContainer\@ContainerModel\@\@QEAAXPEAVSparseContainerClient\@\@\@Z */ MCAPI void setClientUIContainer(class SparseContainerClient *); /** - * @symbol ?setItemSource\@ContainerModel\@\@QEAAXHAEBUSlotData\@\@\@Z + * @symbol ?setItemSource\@ContainerModel\@\@QEAAXHAEBUSlotData\@\@\@Z */ MCAPI void setItemSource(int, struct SlotData const &); //protected: /** - * @symbol ?_init\@ContainerModel\@\@IEAAXXZ + * @symbol ?_init\@ContainerModel\@\@IEAAXXZ */ MCAPI void _init(); /** - * @symbol ?_notifyPlayer\@ContainerModel\@\@IEAAXHAEBVItemStack\@\@0\@Z + * @symbol ?_notifyPlayer\@ContainerModel\@\@IEAAXHAEBVItemStack\@\@0\@Z */ MCAPI void _notifyPlayer(int, class ItemStack const &, class ItemStack const &); //private: /** - * @symbol ?_onClientUIItemNetworkChanged\@ContainerModel\@\@AEAAXHAEBVItemStack\@\@0\@Z + * @symbol ?_onClientUIItemNetworkChanged\@ContainerModel\@\@AEAAXHAEBVItemStack\@\@0\@Z */ MCAPI void _onClientUIItemNetworkChanged(int, class ItemStack const &, class ItemStack const &); @@ -247,4 +251,4 @@ class ContainerModel { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp index 5e94d1b7e0..ec3367a3f9 100644 --- a/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerOpenPacket.hpp @@ -30,37 +30,43 @@ class ContainerOpenPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerOpenPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ContainerOpenPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ContainerOpenPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ContainerOpenPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ContainerOpenPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ContainerOpenPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ContainerOpenPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ContainerOpenPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINEROPENPACKET /** - * @symbol ??0ContainerOpenPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerOpenPacket(); +#endif + /** + * @symbol ??0ContainerOpenPacket\@\@QEAA\@XZ */ MCAPI ContainerOpenPacket(); /** - * @symbol ??0ContainerOpenPacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@AEBVBlockPos\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0ContainerOpenPacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@AEBVBlockPos\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI ContainerOpenPacket(enum class ContainerID, enum class ContainerType, class BlockPos const &, struct ActorUniqueID const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp index 9f49c2a475..d2ee40a04b 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenContext.hpp @@ -29,32 +29,32 @@ class ContainerScreenContext { public: /** - * @symbol ??0ContainerScreenContext\@\@QEAA\@XZ + * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBUActorUniqueID\@\@\@Z */ - MCAPI ContainerScreenContext(); + MCAPI ContainerScreenContext(class Player &, enum class ContainerType, struct ActorUniqueID const &); /** - * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBVBlockPos\@\@\@Z */ MCAPI ContainerScreenContext(class Player &, enum class ContainerType, class BlockPos const &); /** - * @symbol ??0ContainerScreenContext\@\@QEAA\@AEAVPlayer\@\@W4ContainerType\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0ContainerScreenContext\@\@QEAA\@XZ */ - MCAPI ContainerScreenContext(class Player &, enum class ContainerType, struct ActorUniqueID const &); + MCAPI ContainerScreenContext(); /** - * @symbol ?getPlayer\@ContainerScreenContext\@\@QEBAAEAVPlayer\@\@XZ + * @symbol ?getPlayer\@ContainerScreenContext\@\@QEBAAEAVPlayer\@\@XZ */ MCAPI class Player & getPlayer() const; /** - * @symbol ?getScreenContainerType\@ContainerScreenContext\@\@QEBA?AW4ContainerType\@\@XZ + * @symbol ?getScreenContainerType\@ContainerScreenContext\@\@QEBA?AW4ContainerType\@\@XZ */ MCAPI enum class ContainerType getScreenContainerType() const; /** - * @symbol ?tryGetActor\@ContainerScreenContext\@\@QEBAPEAVActor\@\@XZ + * @symbol ?tryGetActor\@ContainerScreenContext\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * tryGetActor() const; /** - * @symbol ?tryGetBlockActor\@ContainerScreenContext\@\@QEBAPEAVBlockActor\@\@XZ + * @symbol ?tryGetBlockActor\@ContainerScreenContext\@\@QEBAPEAVBlockActor\@\@XZ */ MCAPI class BlockActor * tryGetBlockActor() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenValidation.hpp b/LiteLoader/include/llapi/mc/ContainerScreenValidation.hpp index 0c613156de..0b0089c333 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenValidation.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenValidation.hpp @@ -30,107 +30,111 @@ class ContainerScreenValidation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerScreenValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tryCraft\@ContainerScreenValidation\@\@UEAA?AUContainerValidationResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?tryCraft\@ContainerScreenValidation\@\@UEAA?AUContainerValidationResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationResult tryCraft(std::unique_ptr); /** - * @vftbl 2 - * @symbol ?getCraftResults\@ContainerScreenValidation\@\@UEAA?AUContainerValidationCraftResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?getCraftResults\@ContainerScreenValidation\@\@UEAA?AUContainerValidationCraftResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResults(std::unique_ptr); /** - * @vftbl 3 - * @symbol ?tryActivate\@ContainerScreenValidation\@\@UEAA?AUContainerValidationResult\@\@XZ + * @vftbl 3 + * @symbol ?tryActivate\@ContainerScreenValidation\@\@UEAA?AUContainerValidationResult\@\@XZ */ virtual struct ContainerValidationResult tryActivate(); /** - * @symbol ??0ContainerScreenValidation\@\@QEAA\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@V?$unordered_map\@W4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@U?$hash\@W4ContainerEnumName\@\@\@3\@U?$equal_to\@W4ContainerEnumName\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ??0ContainerScreenValidation\@\@QEAA\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@V?$unordered_map\@W4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@U?$hash\@W4ContainerEnumName\@\@\@3\@U?$equal_to\@W4ContainerEnumName\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCAPI ContainerScreenValidation(class ContainerScreenContext const &, enum class ContainerValidationCaller, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>>); /** - * @symbol ?getOrCreateSparseContainer\@ContainerScreenValidation\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z + * @symbol ?getOrCreateSparseContainer\@ContainerScreenValidation\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z */ MCAPI class std::shared_ptr getOrCreateSparseContainer(enum class ContainerEnumName); /** - * @symbol ?isCraftingImplemented\@ContainerScreenValidation\@\@QEAA_NXZ + * @symbol ?isCraftingImplemented\@ContainerScreenValidation\@\@QEAA_NXZ */ MCAPI bool isCraftingImplemented(); /** - * @symbol ?logServerAuthUntrustedFail\@ContainerScreenValidation\@\@QEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?logServerAuthUntrustedFail\@ContainerScreenValidation\@\@QEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void logServerAuthUntrustedFail(std::string const &) const; /** - * @symbol ?tryCommitActionResults\@ContainerScreenValidation\@\@QEAA_NXZ + * @symbol ?tryCommitActionResults\@ContainerScreenValidation\@\@QEAA_NXZ */ MCAPI bool tryCommitActionResults(); /** - * @symbol ?tryConsume\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H\@Z + * @symbol ?tryConsume\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H\@Z */ MCAPI struct ContainerValidationResult tryConsume(struct ContainerValidationSlotData const &, int); /** - * @symbol ?tryDestroy\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H\@Z + * @symbol ?tryDestroy\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H\@Z */ MCAPI struct ContainerValidationResult tryDestroy(struct ContainerValidationSlotData const &, int); /** - * @symbol ?tryDrop\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H_N\@Z + * @symbol ?tryDrop\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H_N\@Z */ MCAPI struct ContainerValidationResult tryDrop(struct ContainerValidationSlotData const &, int, bool); /** - * @symbol ?tryPlaceInItemContainer\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H\@Z + * @symbol ?tryPlaceInItemContainer\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@H\@Z */ MCAPI struct ContainerValidationResult tryPlaceInItemContainer(struct ContainerValidationSlotData const &, int); /** - * @symbol ?trySwap\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@0\@Z + * @symbol ?trySwap\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@0\@Z */ MCAPI struct ContainerValidationResult trySwap(struct ContainerValidationSlotData const &, struct ContainerValidationSlotData const &); /** - * @symbol ?tryTransfer\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@0H_N\@Z + * @symbol ?tryTransfer\@ContainerScreenValidation\@\@QEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@0H_N\@Z */ MCAPI struct ContainerValidationResult tryTransfer(struct ContainerValidationSlotData const &, struct ContainerValidationSlotData const &, int, bool); /** - * @symbol ?makeContainerScreenValidation\@ContainerScreenValidation\@\@SA?AV?$unique_ptr\@VContainerScreenValidation\@\@U?$default_delete\@VContainerScreenValidation\@\@\@std\@\@\@std\@\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@V?$unordered_map\@W4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@U?$hash\@W4ContainerEnumName\@\@\@3\@U?$equal_to\@W4ContainerEnumName\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@\@std\@\@\@3\@\@3\@\@Z + * @symbol ?makeContainerScreenValidation\@ContainerScreenValidation\@\@SA?AV?$unique_ptr\@VContainerScreenValidation\@\@U?$default_delete\@VContainerScreenValidation\@\@\@std\@\@\@std\@\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@V?$unordered_map\@W4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@U?$hash\@W4ContainerEnumName\@\@\@3\@U?$equal_to\@W4ContainerEnumName\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4ContainerEnumName\@\@V?$shared_ptr\@VContainer\@\@\@std\@\@\@std\@\@\@3\@\@3\@\@Z */ MCAPI static std::unique_ptr makeContainerScreenValidation(class ContainerScreenContext const &, enum class ContainerValidationCaller, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>>); //protected: /** - * @symbol ?_tryAddItem\@ContainerScreenValidation\@\@IEAAHAEAUContainerValidationSlotInfo\@\@H_N\@Z + * @symbol ?_tryAddItem\@ContainerScreenValidation\@\@IEAAHAEAUContainerValidationSlotInfo\@\@H_N\@Z */ MCAPI int _tryAddItem(struct ContainerValidationSlotInfo &, int, bool); /** - * @symbol ?_tryRemoveItem\@ContainerScreenValidation\@\@IEAA?AVItemStack\@\@AEAUContainerValidationSlotInfo\@\@H\@Z + * @symbol ?_tryRemoveItem\@ContainerScreenValidation\@\@IEAA?AVItemStack\@\@AEAUContainerValidationSlotInfo\@\@H\@Z */ MCAPI class ItemStack _tryRemoveItem(struct ContainerValidationSlotInfo &, int); /** - * @symbol ?_trySetItem\@ContainerScreenValidation\@\@IEAAHAEAUContainerValidationSlotInfo\@\@AEBVItemStack\@\@_N2\@Z + * @symbol ?_trySetItem\@ContainerScreenValidation\@\@IEAAHAEAUContainerValidationSlotInfo\@\@AEBVItemStack\@\@_N2\@Z */ MCAPI int _trySetItem(struct ContainerValidationSlotInfo &, class ItemStack const &, bool, bool); /** - * @symbol ?_tryTransferSpecial\@ContainerScreenValidation\@\@IEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@HW4ContainerScreenRequestActionType\@\@\@Z + * @symbol ?_tryTransferSpecial\@ContainerScreenValidation\@\@IEAA?AUContainerValidationResult\@\@AEBUContainerValidationSlotData\@\@HW4ContainerScreenRequestActionType\@\@\@Z */ MCAPI struct ContainerValidationResult _tryTransferSpecial(struct ContainerValidationSlotData const &, int, enum class ContainerScreenRequestActionType); //private: /** - * @symbol ?_commit\@ContainerScreenValidation\@\@AEAAXXZ + * @symbol ?_commit\@ContainerScreenValidation\@\@AEAAXXZ */ MCAPI void _commit(); /** - * @symbol ?_createContainerValidatorSlotInfo\@ContainerScreenValidation\@\@AEAA?AUContainerValidationSlotInfo\@\@AEBUContainerValidationSlotData\@\@\@Z + * @symbol ?_createContainerValidatorSlotInfo\@ContainerScreenValidation\@\@AEAA?AUContainerValidationSlotInfo\@\@AEBUContainerValidationSlotData\@\@\@Z */ MCAPI struct ContainerValidationSlotInfo _createContainerValidatorSlotInfo(struct ContainerValidationSlotData const &); /** - * @symbol ?_getOrCreateContainerValidator\@ContainerScreenValidation\@\@AEAA?AV?$shared_ptr\@$$CBVContainerValidationBase\@\@\@std\@\@W4ContainerEnumName\@\@\@Z + * @symbol ?_dropItems\@ContainerScreenValidation\@\@AEAA_NXZ + */ + MCAPI bool _dropItems(); + /** + * @symbol ?_getOrCreateContainerValidator\@ContainerScreenValidation\@\@AEAA?AV?$shared_ptr\@$$CBVContainerValidationBase\@\@\@std\@\@W4ContainerEnumName\@\@\@Z */ MCAPI class std::shared_ptr _getOrCreateContainerValidator(enum class ContainerEnumName); /** - * @symbol ?_propagateContainers\@ContainerScreenValidation\@\@AEAA_NXZ + * @symbol ?_propagateContainers\@ContainerScreenValidation\@\@AEAA_NXZ */ MCAPI bool _propagateContainers(); @@ -138,4 +142,4 @@ class ContainerScreenValidation { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenValidationActivate.hpp b/LiteLoader/include/llapi/mc/ContainerScreenValidationActivate.hpp index d4d7d6474e..dbe233be59 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenValidationActivate.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenValidationActivate.hpp @@ -29,14 +29,14 @@ class ContainerScreenValidationActivate : public ContainerScreenValidation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerScreenValidationActivate(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?tryActivate\@ContainerScreenValidationActivate\@\@EEAA?AUContainerValidationResult\@\@XZ + * @vftbl 3 + * @symbol ?tryActivate\@ContainerScreenValidationActivate\@\@EEAA?AUContainerValidationResult\@\@XZ */ virtual struct ContainerValidationResult tryActivate(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenValidationCrafting.hpp b/LiteLoader/include/llapi/mc/ContainerScreenValidationCrafting.hpp index 302abc1787..58a6f1b2e1 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenValidationCrafting.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenValidationCrafting.hpp @@ -28,27 +28,27 @@ class ContainerScreenValidationCrafting { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerScreenValidationCrafting(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tryCraft\@ContainerScreenValidationCrafting\@\@UEAA?AUContainerValidationResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?tryCraft\@ContainerScreenValidationCrafting\@\@UEAA?AUContainerValidationResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationResult tryCraft(std::unique_ptr); /** - * @vftbl 2 - * @symbol ?getCraftResults\@ContainerScreenValidationCrafting\@\@UEAA?AUContainerValidationCraftResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?getCraftResults\@ContainerScreenValidationCrafting\@\@UEAA?AUContainerValidationCraftResult\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResults(std::unique_ptr); //private: /** - * @symbol ?_appendCraftResult\@ContainerScreenValidationCrafting\@\@AEAAXAEAUContainerValidationCraftResult\@\@\@Z + * @symbol ?_appendCraftResult\@ContainerScreenValidationCrafting\@\@AEAAXAEAUContainerValidationCraftResult\@\@\@Z */ MCAPI void _appendCraftResult(struct ContainerValidationCraftResult &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp b/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp index 2bb028a5b9..9c26c13519 100644 --- a/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp +++ b/LiteLoader/include/llapi/mc/ContainerScreenValidatorBase.hpp @@ -30,28 +30,34 @@ class ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerScreenValidatorBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?postCommitItemRemoved\@ContainerScreenValidatorBase\@\@UEAA?AV?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@W4ContainerEnumName\@\@HAEBVItemStack\@\@\@Z + * @vftbl 1 + * @symbol ?postCommitItemRemoved\@ContainerScreenValidatorBase\@\@UEAA?AV?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@W4ContainerEnumName\@\@HAEBVItemStack\@\@\@Z */ virtual class std::shared_ptr postCommitItemRemoved(enum class ContainerEnumName, int, class ItemStack const &); /** - * @vftbl 2 - * @symbol ?isCraftingImplemented\@ContainerScreenValidatorBase\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?isCraftingImplemented\@ContainerScreenValidatorBase\@\@UEAA_NXZ */ virtual bool isCraftingImplemented(); /** - * @vftbl 3 - * @symbol ?getCraftResult\@ContainerScreenValidatorBase\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?getCraftResult\@ContainerScreenValidatorBase\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResult(class ContainerScreenContext const &, class ContainerScreenValidation &, std::unique_ptr); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERSCREENVALIDATORBASE /** - * @symbol ?isValidContainerForScreen\@ContainerScreenValidatorBase\@\@QEBA_NW4ContainerEnumName\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerScreenValidatorBase(); +#endif + /** + * @symbol ?isValidContainerForScreen\@ContainerScreenValidatorBase\@\@QEBA_NW4ContainerEnumName\@\@\@Z */ MCAPI bool isValidContainerForScreen(enum class ContainerEnumName) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp index 68de81c40b..3e25dd2856 100644 --- a/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ContainerSetDataPacket.hpp @@ -30,37 +30,43 @@ class ContainerSetDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContainerSetDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ContainerSetDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ContainerSetDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ContainerSetDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ContainerSetDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ContainerSetDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ContainerSetDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ContainerSetDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERSETDATAPACKET /** - * @symbol ??0ContainerSetDataPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerSetDataPacket(); +#endif + /** + * @symbol ??0ContainerSetDataPacket\@\@QEAA\@XZ */ MCAPI ContainerSetDataPacket(); /** - * @symbol ??0ContainerSetDataPacket\@\@QEAA\@W4ContainerID\@\@HH\@Z + * @symbol ??0ContainerSetDataPacket\@\@QEAA\@W4ContainerID\@\@HH\@Z */ MCAPI ContainerSetDataPacket(enum class ContainerID, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp b/LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp index 6a769c7f7f..e4426b3956 100644 --- a/LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp +++ b/LiteLoader/include/llapi/mc/ContainerSizeChangeListener.hpp @@ -29,5 +29,11 @@ class ContainerSizeChangeListener { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERSIZECHANGELISTENER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ContainerSizeChangeListener(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerUtility.hpp b/LiteLoader/include/llapi/mc/ContainerUtility.hpp index 59a43e99f3..2b36ffaede 100644 --- a/LiteLoader/include/llapi/mc/ContainerUtility.hpp +++ b/LiteLoader/include/llapi/mc/ContainerUtility.hpp @@ -22,7 +22,7 @@ namespace ContainerUtility { #undef AFTER_EXTRA /** - * @symbol ?getNotNoneTypeContainerComponentFromActor\@ContainerUtility\@\@YAPEAVContainerComponent\@\@PEAVActor\@\@\@Z + * @symbol ?getNotNoneTypeContainerComponentFromActor\@ContainerUtility\@\@YAPEAVContainerComponent\@\@PEAVActor\@\@\@Z */ MCAPI class ContainerComponent * getNotNoneTypeContainerComponentFromActor(class Actor *); diff --git a/LiteLoader/include/llapi/mc/ContainerValidationBase.hpp b/LiteLoader/include/llapi/mc/ContainerValidationBase.hpp index c234d60072..56c115e2da 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationBase.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationBase.hpp @@ -31,41 +31,41 @@ class ContainerValidationBase { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTAINERVALIDATIONBASE /** - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ MCVAPI bool canDestroy(class ContainerScreenContext const &) const; /** - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ MCVAPI int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @symbol ?getContainerOffset\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @symbol ?getContainerOffset\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ MCVAPI int getContainerOffset(class ContainerScreenContext const &) const; /** - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ MCVAPI int getContainerSize(class ContainerScreenContext const &, class Container const &) const; /** - * @symbol ?isItemAllowedInSlot\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @symbol ?isItemAllowedInSlot\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ MCVAPI bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @symbol ?isItemAllowedToAdd\@ContainerValidationBase\@\@UEBA_NAEBVItemStack\@\@\@Z + * @symbol ?isItemAllowedToAdd\@ContainerValidationBase\@\@UEBA_NAEBVItemStack\@\@\@Z */ MCVAPI bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ MCVAPI bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ MCVAPI bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerValidationCommitObject.hpp b/LiteLoader/include/llapi/mc/ContainerValidationCommitObject.hpp index a7c763895b..640672a7d5 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationCommitObject.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationCommitObject.hpp @@ -28,8 +28,8 @@ class ContainerValidationCommitObject { public: /** - * @symbol ?append\@ContainerValidationCommitObject\@\@SAXV?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@AEAV?$vector\@V?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?append\@ContainerValidationCommitObject\@\@SAXV?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@AEAV?$vector\@V?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static void append(class std::shared_ptr, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerValidationCraftResult.hpp b/LiteLoader/include/llapi/mc/ContainerValidationCraftResult.hpp index 7c840e2ba4..5d1248dad1 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationCraftResult.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationCraftResult.hpp @@ -27,15 +27,15 @@ struct ContainerValidationCraftResult { public: /** - * @symbol ??0ContainerValidationCraftResult\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ContainerValidationCraftResult\@\@QEAA\@XZ */ - MCAPI ContainerValidationCraftResult(struct ContainerValidationCraftResult &&); + MCAPI ContainerValidationCraftResult(); /** - * @symbol ??0ContainerValidationCraftResult\@\@QEAA\@XZ + * @symbol ??0ContainerValidationCraftResult\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI ContainerValidationCraftResult(); + MCAPI ContainerValidationCraftResult(struct ContainerValidationCraftResult &&); /** - * @symbol ??1ContainerValidationCraftResult\@\@QEAA\@XZ + * @symbol ??1ContainerValidationCraftResult\@\@QEAA\@XZ */ MCAPI ~ContainerValidationCraftResult(); diff --git a/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp b/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp index 17cc699a03..6ec3e50119 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationDebug.hpp @@ -28,8 +28,8 @@ class ContainerValidationDebug { public: /** - * @symbol ??0ContainerValidationDebug\@\@QEAA\@W4ContainerValidationCaller\@\@\@Z + * @symbol ??0ContainerValidationDebug\@\@QEAA\@W4ContainerValidationCaller\@\@\@Z */ MCAPI ContainerValidationDebug(enum class ContainerValidationCaller); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp b/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp index 34f12dcd86..affbe8e78b 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationOperation.hpp @@ -28,7 +28,7 @@ struct ContainerValidationOperation { public: /** - * @symbol ??0ContainerValidationOperation\@\@QEAA\@W4ContainerValidationOperationType\@\@AEBUContainerValidationSlotData\@\@HAEBVItemStack\@\@\@Z + * @symbol ??0ContainerValidationOperation\@\@QEAA\@W4ContainerValidationOperationType\@\@AEBUContainerValidationSlotData\@\@HAEBVItemStack\@\@\@Z */ MCAPI ContainerValidationOperation(enum class ContainerValidationOperationType, struct ContainerValidationSlotData const &, int, class ItemStack const &); diff --git a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp index ef1d518521..ff1b178606 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationResult.hpp @@ -30,23 +30,23 @@ struct ContainerValidationResult { public: /** - * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z + * @symbol ??0ContainerValidationResult\@\@QEAA\@$$QEAV?$vector\@UContainerValidationOperation\@\@V?$allocator\@UContainerValidationOperation\@\@\@std\@\@\@std\@\@W4ContainerValidationOutcome\@\@W4ContainerScreenRequestActionType\@\@\@Z */ - MCAPI ContainerValidationResult(enum class ContainerValidationOutcome); + MCAPI ContainerValidationResult(std::vector &&, enum class ContainerValidationOutcome, enum class ContainerScreenRequestActionType); /** - * @symbol ??0ContainerValidationResult\@\@QEAA\@$$QEAV?$vector\@UContainerValidationOperation\@\@V?$allocator\@UContainerValidationOperation\@\@\@std\@\@\@std\@\@W4ContainerValidationOutcome\@\@W4ContainerScreenRequestActionType\@\@\@Z + * @symbol ??0ContainerValidationResult\@\@QEAA\@W4ContainerValidationOutcome\@\@\@Z */ - MCAPI ContainerValidationResult(std::vector &&, enum class ContainerValidationOutcome, enum class ContainerScreenRequestActionType); + MCAPI ContainerValidationResult(enum class ContainerValidationOutcome); /** - * @symbol ?isSuccess\@ContainerValidationResult\@\@QEBA_NXZ + * @symbol ?isSuccess\@ContainerValidationResult\@\@QEBA_NXZ */ MCAPI bool isSuccess() const; /** - * @symbol ?tryGetOperation\@ContainerValidationResult\@\@QEBAPEBUContainerValidationOperation\@\@W4ContainerValidationOperationType\@\@\@Z + * @symbol ?tryGetOperation\@ContainerValidationResult\@\@QEBAPEBUContainerValidationOperation\@\@W4ContainerValidationOperationType\@\@\@Z */ MCAPI struct ContainerValidationOperation const * tryGetOperation(enum class ContainerValidationOperationType) const; /** - * @symbol ??1ContainerValidationResult\@\@QEAA\@XZ + * @symbol ??1ContainerValidationResult\@\@QEAA\@XZ */ MCAPI ~ContainerValidationResult(); diff --git a/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp b/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp index 57c71aebe9..3ba11f5261 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationSlotData.hpp @@ -27,19 +27,19 @@ struct ContainerValidationSlotData { public: /** - * @symbol ??0ContainerValidationSlotData\@\@QEAA\@XZ + * @symbol ??0ContainerValidationSlotData\@\@QEAA\@XZ */ MCAPI ContainerValidationSlotData(); /** - * @symbol ??0ContainerValidationSlotData\@\@QEAA\@W4ContainerEnumName\@\@H\@Z + * @symbol ??0ContainerValidationSlotData\@\@QEAA\@W4ContainerEnumName\@\@H\@Z */ MCAPI ContainerValidationSlotData(enum class ContainerEnumName, int); /** - * @symbol ?matches\@ContainerValidationSlotData\@\@QEBA_NAEBU1\@\@Z + * @symbol ?matches\@ContainerValidationSlotData\@\@QEBA_NAEBU1\@\@Z */ MCAPI bool matches(struct ContainerValidationSlotData const &) const; /** - * @symbol ?AUTOPLACE\@ContainerValidationSlotData\@\@2U1\@B + * @symbol ?AUTOPLACE\@ContainerValidationSlotData\@\@2U1\@B */ MCAPI static struct ContainerValidationSlotData const AUTOPLACE; diff --git a/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp b/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp index 57af613493..ebb9f5e418 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidationSlotInfo.hpp @@ -28,23 +28,23 @@ struct ContainerValidationSlotInfo { public: /** - * @symbol ??0ContainerValidationSlotInfo\@\@QEAA\@AEBUContainerValidationSlotData\@\@V?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@V?$shared_ptr\@$$CBVContainerValidationBase\@\@\@3\@\@Z + * @symbol ??0ContainerValidationSlotInfo\@\@QEAA\@AEBUContainerValidationSlotData\@\@V?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@V?$shared_ptr\@$$CBVContainerValidationBase\@\@\@3\@\@Z */ MCAPI ContainerValidationSlotInfo(struct ContainerValidationSlotData const &, class std::shared_ptr, class std::shared_ptr); /** - * @symbol ?getItem\@ContainerValidationSlotInfo\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getItem\@ContainerValidationSlotInfo\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getItem() const; /** - * @symbol ??BContainerValidationSlotInfo\@\@QEBA_NXZ + * @symbol ??BContainerValidationSlotInfo\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ?setItem\@ContainerValidationSlotInfo\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ContainerValidationSlotInfo\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setItem(class ItemStack const &); /** - * @symbol ??1ContainerValidationSlotInfo\@\@QEAA\@XZ + * @symbol ??1ContainerValidationSlotInfo\@\@QEAA\@XZ */ MCAPI ~ContainerValidationSlotInfo(); diff --git a/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp b/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp index 6c3d5e2c37..0033bfaaf9 100644 --- a/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp +++ b/LiteLoader/include/llapi/mc/ContainerValidatorFactory.hpp @@ -30,16 +30,16 @@ class ContainerValidatorFactory { public: /** - * @symbol ?createContainerScreenValidator\@ContainerValidatorFactory\@\@SA?AV?$unique_ptr\@VContainerScreenValidatorBase\@\@U?$default_delete\@VContainerScreenValidatorBase\@\@\@std\@\@\@std\@\@AEBVContainerScreenContext\@\@\@Z + * @symbol ?createContainerScreenValidator\@ContainerValidatorFactory\@\@SA?AV?$unique_ptr\@VContainerScreenValidatorBase\@\@U?$default_delete\@VContainerScreenValidatorBase\@\@\@std\@\@\@std\@\@AEBVContainerScreenContext\@\@\@Z */ MCAPI static std::unique_ptr createContainerScreenValidator(class ContainerScreenContext const &); /** - * @symbol ?createContainerValidator\@ContainerValidatorFactory\@\@SA?AV?$shared_ptr\@$$CBVContainerValidationBase\@\@\@std\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@\@Z + * @symbol ?createContainerValidator\@ContainerValidatorFactory\@\@SA?AV?$shared_ptr\@$$CBVContainerValidationBase\@\@\@std\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@W4ContainerValidationCaller\@\@\@Z */ MCAPI static class std::shared_ptr createContainerValidator(enum class ContainerEnumName, class ContainerScreenContext const &, enum class ContainerValidationCaller); /** - * @symbol ?getBackingContainer\@ContainerValidatorFactory\@\@SAPEAVContainer\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@\@Z + * @symbol ?getBackingContainer\@ContainerValidatorFactory\@\@SAPEAVContainer\@\@W4ContainerEnumName\@\@AEBVContainerScreenContext\@\@\@Z */ MCAPI static class Container * getBackingContainer(enum class ContainerEnumName, class ContainerScreenContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp index 677e324826..058f24071f 100644 --- a/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp +++ b/LiteLoader/include/llapi/mc/ContainerWeakRef.hpp @@ -29,24 +29,24 @@ class ContainerWeakRef { public: /** - * @symbol ??0ContainerWeakRef\@\@QEAA\@XZ + * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBUActorUniqueID\@\@W4ActorContainerType\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z */ - MCAPI ContainerWeakRef(); + MCAPI ContainerWeakRef(struct ActorUniqueID const &, enum class ActorContainerType, class TypedRuntimeId const &); /** - * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBVBlockPos\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z + * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBVBlockPos\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z */ MCAPI ContainerWeakRef(class BlockPos const &, class TypedRuntimeId const &); /** - * @symbol ??0ContainerWeakRef\@\@QEAA\@AEBUActorUniqueID\@\@W4ActorContainerType\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z + * @symbol ??0ContainerWeakRef\@\@QEAA\@XZ */ - MCAPI ContainerWeakRef(struct ActorUniqueID const &, enum class ActorContainerType, class TypedRuntimeId const &); + MCAPI ContainerWeakRef(); /** - * @symbol ??BContainerWeakRef\@\@QEBA_NXZ + * @symbol ??BContainerWeakRef\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ??1ContainerWeakRef\@\@QEAA\@XZ + * @symbol ??1ContainerWeakRef\@\@QEAA\@XZ */ MCAPI ~ContainerWeakRef(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContentIdentity.hpp b/LiteLoader/include/llapi/mc/ContentIdentity.hpp index 56bfd9e873..133d534e7e 100644 --- a/LiteLoader/include/llapi/mc/ContentIdentity.hpp +++ b/LiteLoader/include/llapi/mc/ContentIdentity.hpp @@ -25,56 +25,56 @@ class ContentIdentity { #undef AFTER_EXTRA public: /** - * @symbol ??0ContentIdentity\@\@QEAA\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0ContentIdentity\@\@QEAA\@AEBVUUID\@mce\@\@\@Z */ MCAPI ContentIdentity(class mce::UUID const &); /** - * @symbol ??0ContentIdentity\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ContentIdentity\@\@QEAA\@XZ */ - MCAPI ContentIdentity(class ContentIdentity &&); + MCAPI ContentIdentity(); /** - * @symbol ??0ContentIdentity\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ContentIdentity\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ContentIdentity(class ContentIdentity const &); + MCAPI ContentIdentity(class ContentIdentity &&); /** - * @symbol ??0ContentIdentity\@\@QEAA\@XZ + * @symbol ??0ContentIdentity\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ContentIdentity(); + MCAPI ContentIdentity(class ContentIdentity const &); /** - * @symbol ?asString\@ContentIdentity\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?asString\@ContentIdentity\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string asString() const; /** - * @symbol ?getAsUUID\@ContentIdentity\@\@QEBAAEBVUUID\@mce\@\@XZ + * @symbol ?getAsUUID\@ContentIdentity\@\@QEBAAEBVUUID\@mce\@\@XZ */ MCAPI class mce::UUID const & getAsUUID() const; /** - * @symbol ?isValid\@ContentIdentity\@\@QEBA_NXZ + * @symbol ?isValid\@ContentIdentity\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??9ContentIdentity\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9ContentIdentity\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class ContentIdentity const &) const; /** - * @symbol ??4ContentIdentity\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ContentIdentity\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ContentIdentity & operator=(class ContentIdentity const &); /** - * @symbol ??4ContentIdentity\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ContentIdentity\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ContentIdentity & operator=(class ContentIdentity &&); /** - * @symbol ??8ContentIdentity\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8ContentIdentity\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class ContentIdentity const &) const; /** - * @symbol ?EMPTY\@ContentIdentity\@\@2V1\@A + * @symbol ?EMPTY\@ContentIdentity\@\@2V1\@A */ MCAPI static class ContentIdentity EMPTY; /** - * @symbol ?fromString\@ContentIdentity\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@ContentIdentity\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class ContentIdentity fromString(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContentLog.hpp b/LiteLoader/include/llapi/mc/ContentLog.hpp index f447129334..73a1b41560 100644 --- a/LiteLoader/include/llapi/mc/ContentLog.hpp +++ b/LiteLoader/include/llapi/mc/ContentLog.hpp @@ -29,40 +29,40 @@ class ContentLog { public: /** - * @symbol ??0ContentLog\@\@QEAA\@XZ + * @symbol ??0ContentLog\@\@QEAA\@XZ */ MCAPI ContentLog(); /** - * @symbol ?isEnabled\@ContentLog\@\@QEBA_NXZ + * @symbol ?isEnabled\@ContentLog\@\@QEBA_NXZ */ MCAPI bool isEnabled() const; /** - * @symbol ?log\@ContentLog\@\@QEAAX_NW4LogLevel\@\@W4LogArea\@\@ZZ + * @symbol ?log\@ContentLog\@\@QEAAX_NW4LogLevel\@\@W4LogArea\@\@ZZ */ MCAPI void log(bool, enum class LogLevel, enum class LogArea, ...); /** - * @symbol ?unregisterEndPoint\@ContentLog\@\@QEAAXV?$not_null\@PEAVContentLogEndPoint\@\@\@gsl\@\@\@Z + * @symbol ?unregisterEndPoint\@ContentLog\@\@QEAAXV?$not_null\@PEAVContentLogEndPoint\@\@\@gsl\@\@\@Z */ MCAPI void unregisterEndPoint(class gsl::not_null); /** - * @symbol ?updateEnabledStatus\@ContentLog\@\@QEAAXXZ + * @symbol ?updateEnabledStatus\@ContentLog\@\@QEAAXXZ */ MCAPI void updateEnabledStatus(); /** - * @symbol ?getLogAreaName\@ContentLog\@\@SAPEBDW4LogArea\@\@\@Z + * @symbol ?getLogAreaName\@ContentLog\@\@SAPEBDW4LogArea\@\@\@Z */ MCAPI static char const * getLogAreaName(enum class LogArea); /** - * @symbol ?getLogLevelName\@ContentLog\@\@SAPEBDW4LogLevel\@\@\@Z + * @symbol ?getLogLevelName\@ContentLog\@\@SAPEBDW4LogLevel\@\@\@Z */ MCAPI static char const * getLogLevelName(enum class LogLevel); //private: /** - * @symbol ?_writeToLog\@ContentLog\@\@AEAAX_NW4LogArea\@\@W4LogLevel\@\@AEAPEAD\@Z + * @symbol ?_writeToLog\@ContentLog\@\@AEAAX_NW4LogArea\@\@W4LogLevel\@\@AEAPEAD\@Z */ MCAPI void _writeToLog(bool, enum class LogArea, enum class LogLevel, char *&); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp b/LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp index a58007d8a6..064a72cbf2 100644 --- a/LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/ContentLogEndPoint.hpp @@ -30,17 +30,17 @@ class ContentLogEndPoint { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTENTLOGENDPOINT /** - * @symbol ?log\@ContentLogEndPoint\@\@UEAAXPEBD\@Z + * @symbol ?log\@ContentLogEndPoint\@\@UEAAXPEBD\@Z */ MCVAPI void log(char const *); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ContentLogEndPoint(); #endif /** - * @symbol ??0ContentLogEndPoint\@\@QEAA\@XZ + * @symbol ??0ContentLogEndPoint\@\@QEAA\@XZ */ MCAPI ContentLogEndPoint(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp b/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp index f09b1f75fc..430ef63a65 100644 --- a/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/ContentLogFileEndPoint.hpp @@ -32,33 +32,33 @@ class ContentLogFileEndPoint { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTENTLOGFILEENDPOINT /** - * @symbol ?flush\@ContentLogFileEndPoint\@\@UEAAXXZ + * @symbol ?flush\@ContentLogFileEndPoint\@\@UEAAXXZ */ MCVAPI void flush(); /** - * @symbol ?isEnabled\@ContentLogFileEndPoint\@\@UEBA_NXZ + * @symbol ?isEnabled\@ContentLogFileEndPoint\@\@UEBA_NXZ */ MCVAPI bool isEnabled() const; /** - * @symbol ?log\@ContentLogFileEndPoint\@\@UEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z + * @symbol ?log\@ContentLogFileEndPoint\@\@UEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z */ MCVAPI void log(enum class LogArea, enum class LogLevel, char const *); /** - * @symbol ?logOnlyOnce\@ContentLogFileEndPoint\@\@UEBA_NXZ + * @symbol ?logOnlyOnce\@ContentLogFileEndPoint\@\@UEBA_NXZ */ MCVAPI bool logOnlyOnce() const; /** - * @symbol ?setEnabled\@ContentLogFileEndPoint\@\@UEAAX_N\@Z + * @symbol ?setEnabled\@ContentLogFileEndPoint\@\@UEAAX_N\@Z */ MCVAPI void setEnabled(bool); #endif /** - * @symbol ??0ContentLogFileEndPoint\@\@QEAA\@VPath\@Core\@\@0\@Z + * @symbol ??0ContentLogFileEndPoint\@\@QEAA\@VPath\@Core\@\@0\@Z */ MCAPI ContentLogFileEndPoint(class Core::Path, class Core::Path); /** - * @symbol ?FILE_NAME\@ContentLogFileEndPoint\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?FILE_NAME\@ContentLogFileEndPoint\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const FILE_NAME; + MCAPI static class std::basic_string_view> const FILE_NAME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContentTierIncompatibleReason.hpp b/LiteLoader/include/llapi/mc/ContentTierIncompatibleReason.hpp index 82f7311049..08d4dc1ec9 100644 --- a/LiteLoader/include/llapi/mc/ContentTierIncompatibleReason.hpp +++ b/LiteLoader/include/llapi/mc/ContentTierIncompatibleReason.hpp @@ -30,20 +30,20 @@ class ContentTierIncompatibleReason { public: /** - * @symbol ??0ContentTierIncompatibleReason\@\@QEAA\@I\@Z + * @symbol ??0ContentTierIncompatibleReason\@\@QEAA\@I\@Z */ MCAPI ContentTierIncompatibleReason(unsigned int); /** - * @symbol ?getExpandedI18nErrorList\@ContentTierIncompatibleReason\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@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 + * @symbol ?getExpandedI18nErrorList\@ContentTierIncompatibleReason\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@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 */ MCAPI std::string getExpandedI18nErrorList(std::string const &, std::vector const &) const; /** - * @symbol ?NoError\@ContentTierIncompatibleReason\@\@2V1\@A + * @symbol ?NoError\@ContentTierIncompatibleReason\@\@2V1\@A */ MCAPI static class ContentTierIncompatibleReason NoError; /** - * @symbol ?getExpandedI18nErrorList\@ContentTierIncompatibleReason\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IAEBV23\@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 + * @symbol ?getExpandedI18nErrorList\@ContentTierIncompatibleReason\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IAEBV23\@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 */ MCAPI static std::string getExpandedI18nErrorList(unsigned int, std::string const &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContentTierManager.hpp b/LiteLoader/include/llapi/mc/ContentTierManager.hpp index de2d932dd9..090665d1ce 100644 --- a/LiteLoader/include/llapi/mc/ContentTierManager.hpp +++ b/LiteLoader/include/llapi/mc/ContentTierManager.hpp @@ -25,22 +25,29 @@ class ContentTierManager { public: class ContentTierManager& operator=(class ContentTierManager const &) = delete; ContentTierManager(class ContentTierManager const &) = delete; + ContentTierManager() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ContentTierManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getContentTierInfo\@ContentTierManager\@\@UEBA?AVContentTierInfo\@\@XZ + * @vftbl 1 + * @symbol ?getContentTierInfo\@ContentTierManager\@\@UEBA?AVContentTierInfo\@\@XZ */ virtual class ContentTierInfo getContentTierInfo() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CONTENTTIERMANAGER /** - * @symbol ??0ContentTierManager\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ContentTierManager(); + MCVAPI ~ContentTierManager(); +#endif + /** + * @symbol ??0ContentTierManager\@\@QEAA\@V?$function\@$$A6A_NXZ\@std\@\@\@Z + */ + MCAPI ContentTierManager(class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ContextAccessor.hpp b/LiteLoader/include/llapi/mc/ContextAccessor.hpp deleted file mode 100644 index 70c45c4b64..0000000000 --- a/LiteLoader/include/llapi/mc/ContextAccessor.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file ContextAccessor.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ContextAccessor. - * - */ -class ContextAccessor { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CONTEXTACCESSOR -public: - class ContextAccessor& operator=(class ContextAccessor const &) = delete; - ContextAccessor(class ContextAccessor const &) = delete; - ContextAccessor() = delete; -#endif - -public: - /** - * @symbol ??1ContextAccessor@@QEAA@XZ - * @hash -1187341070 - */ - MCAPI ~ContextAccessor(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp b/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp index 3085482571..6d5d2b67a9 100644 --- a/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp +++ b/LiteLoader/include/llapi/mc/ContextMessageLogger.hpp @@ -28,12 +28,12 @@ class ContextMessageLogger { public: /** - * @symbol ?log\@ContextMessageLogger\@\@QEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z + * @symbol ?log\@ContextMessageLogger\@\@QEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z */ MCAPI void log(enum class LogArea, enum class LogLevel, char const *); /** - * @symbol ?shouldMessagePostToParentMessageLoggers\@ContextMessageLogger\@\@QEAA_NXZ + * @symbol ?shouldMessagePostToParentMessageLoggers\@ContextMessageLogger\@\@QEAA_NXZ */ MCAPI bool shouldMessagePostToParentMessageLoggers(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Control.hpp b/LiteLoader/include/llapi/mc/Control.hpp index a4c3b47584..cf3c9593aa 100644 --- a/LiteLoader/include/llapi/mc/Control.hpp +++ b/LiteLoader/include/llapi/mc/Control.hpp @@ -30,4 +30,4 @@ class Control { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystem.hpp b/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystem.hpp index 2d29502388..644927b15a 100644 --- a/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystem.hpp +++ b/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystem.hpp @@ -28,12 +28,12 @@ class ControlledByLocalInstanceSystem { public: /** - * @symbol ?createCalculateControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBUConfig\@1\@\@Z + * @symbol ?createCalculateControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystem\@\@SA?AUTickingSystemWithInfo\@\@AEBUConfig\@1\@\@Z */ MCAPI static struct TickingSystemWithInfo createCalculateControlledByLocalInstanceSystem(struct ControlledByLocalInstanceSystem::Config const &); /** - * @symbol ?createWasControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createWasControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createWasControlledByLocalInstanceSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp b/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp index f1a3c656c4..1b1fa32605 100644 --- a/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/ControlledByLocalInstanceSystemImpl.hpp @@ -25,8 +25,8 @@ class ControlledByLocalInstanceSystemImpl { public: /** - * @symbol ?_wasControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystemImpl\@\@SAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasControlledByLocalInstanceFlag\@\@\@\@\@\@\@Z + * @symbol ?_wasControlledByLocalInstanceSystem\@ControlledByLocalInstanceSystemImpl\@\@SAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasControlledByLocalInstanceFlag\@\@\@\@\@\@\@Z */ MCAPI static void _wasControlledByLocalInstanceSystem(class StrictEntityContext const &, class EntityModifierT>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ControlledByPlayerDefinition.hpp b/LiteLoader/include/llapi/mc/ControlledByPlayerDefinition.hpp index 0d62e61360..2a03bad8fc 100644 --- a/LiteLoader/include/llapi/mc/ControlledByPlayerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ControlledByPlayerDefinition.hpp @@ -30,16 +30,16 @@ class ControlledByPlayerDefinition { public: /** - * @symbol ??0ControlledByPlayerDefinition\@\@QEAA\@XZ + * @symbol ??0ControlledByPlayerDefinition\@\@QEAA\@XZ */ MCAPI ControlledByPlayerDefinition(); /** - * @symbol ?initialize\@ControlledByPlayerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVControlledByPlayerGoal\@\@\@Z + * @symbol ?initialize\@ControlledByPlayerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVControlledByPlayerGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ControlledByPlayerGoal &) const; /** - * @symbol ?buildSchema\@ControlledByPlayerDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VControlledByPlayerDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@ControlledByPlayerDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VControlledByPlayerDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp b/LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp index 7a5dd23f35..de9ebad358 100644 --- a/LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/ControlledByPlayerGoal.hpp @@ -30,56 +30,56 @@ class ControlledByPlayerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ControlledByPlayerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ControlledByPlayerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ControlledByPlayerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ControlledByPlayerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ControlledByPlayerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ControlledByPlayerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ControlledByPlayerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ControlledByPlayerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ControlledByPlayerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ControlledByPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ControlledByPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ControlledByPlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0ControlledByPlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI ControlledByPlayerGoal(class Mob &); //private: /** - * @symbol ?_canBeControlledByPassenger\@ControlledByPlayerGoal\@\@AEAA_NXZ + * @symbol ?_canBeControlledByPassenger\@ControlledByPlayerGoal\@\@AEAA_NXZ */ MCAPI bool _canBeControlledByPassenger(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp b/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp index 2447e7393b..4e8d24c172 100644 --- a/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/CooldownItemComponent.hpp @@ -30,47 +30,47 @@ class CooldownItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CooldownItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VCooldownItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VCooldownItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VCooldownItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VCooldownItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?bindType\@CooldownItemComponent\@\@SAXXZ + * @symbol ?bindType\@CooldownItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@CooldownItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@CooldownItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CopperBehavior.hpp b/LiteLoader/include/llapi/mc/CopperBehavior.hpp index d2ba626ffa..d75b427ab9 100644 --- a/LiteLoader/include/llapi/mc/CopperBehavior.hpp +++ b/LiteLoader/include/llapi/mc/CopperBehavior.hpp @@ -30,52 +30,52 @@ class CopperBehavior { public: /** - * @symbol ??0CopperBehavior\@\@QEAA\@W4CopperType\@\@AEBVHashedString\@\@AEBV?$function\@$$A6AAEBVBlock\@\@AEBVHashedString\@\@AEBV1\@\@Z\@std\@\@\@Z + * @symbol ??0CopperBehavior\@\@QEAA\@W4CopperType\@\@AEBVHashedString\@\@11AEBV?$function\@$$A6AAEBVBlock\@\@AEBVHashedString\@\@AEBV1\@\@Z\@std\@\@\@Z */ - MCAPI CopperBehavior(enum class CopperType, class HashedString const &, class std::function const &); + MCAPI CopperBehavior(enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &, class std::function const &); /** - * @symbol ??0CopperBehavior\@\@QEAA\@W4CopperType\@\@AEBVHashedString\@\@11AEBV?$function\@$$A6AAEBVBlock\@\@AEBVHashedString\@\@AEBV1\@\@Z\@std\@\@\@Z + * @symbol ??0CopperBehavior\@\@QEAA\@W4CopperType\@\@AEBVHashedString\@\@AEBV?$function\@$$A6AAEBVBlock\@\@AEBVHashedString\@\@AEBV1\@\@Z\@std\@\@\@Z */ - MCAPI CopperBehavior(enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &, class std::function const &); + MCAPI CopperBehavior(enum class CopperType, class HashedString const &, class std::function const &); /** - * @symbol ?canDecrementAge\@CopperBehavior\@\@QEBA_NXZ + * @symbol ?canDecrementAge\@CopperBehavior\@\@QEBA_NXZ */ MCAPI bool canDecrementAge() const; /** - * @symbol ?getCorrespondingWaxedBlock\@CopperBehavior\@\@QEBAAEBVBlock\@\@AEBV2\@\@Z + * @symbol ?getCorrespondingWaxedBlock\@CopperBehavior\@\@QEBAAEBVBlock\@\@AEBV2\@\@Z */ MCAPI class Block const & getCorrespondingWaxedBlock(class Block const &) const; /** - * @symbol ?isWaxable\@CopperBehavior\@\@QEBA_NXZ + * @symbol ?isWaxable\@CopperBehavior\@\@QEBA_NXZ */ MCAPI bool isWaxable() const; /** - * @symbol ?isWaxed\@CopperBehavior\@\@QEBA_NXZ + * @symbol ?isWaxed\@CopperBehavior\@\@QEBA_NXZ */ MCAPI bool isWaxed() const; /** - * @symbol ?tryDecrementAge\@CopperBehavior\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryDecrementAge\@CopperBehavior\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool tryDecrementAge(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?tryIncrementAge\@CopperBehavior\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z + * @symbol ?tryIncrementAge\@CopperBehavior\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@MM\@Z */ MCAPI bool tryIncrementAge(class BlockSource &, class BlockPos const &, float, float) const; /** - * @symbol ?use\@CopperBehavior\@\@QEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?use\@CopperBehavior\@\@QEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @symbol ??1CopperBehavior\@\@QEAA\@XZ + * @symbol ??1CopperBehavior\@\@QEAA\@XZ */ MCAPI ~CopperBehavior(); //private: /** - * @symbol ?_incrementAge\@CopperBehavior\@\@AEBAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@M\@Z + * @symbol ?_incrementAge\@CopperBehavior\@\@AEBAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@M\@Z */ MCAPI void _incrementAge(class BlockSource &, class Block const &, class BlockPos const &, float) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CopperBlock.hpp b/LiteLoader/include/llapi/mc/CopperBlock.hpp index b37eab89a2..0c256f8b2d 100644 --- a/LiteLoader/include/llapi/mc/CopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/CopperBlock.hpp @@ -31,246 +31,251 @@ class CopperBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CopperBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 16 - * @symbol ?onLightningHit\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?onLightningHit\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 28 - * @symbol ?tryGetCopperBehavior\@CopperBlock\@\@UEBAPEBVCopperBehavior\@\@XZ + * @vftbl 28 + * @symbol ?tryGetCopperBehavior\@CopperBlock\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 194 + * @symbol __unk_vfn_194 */ virtual void __unk_vfn_194(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 195 + * @symbol __unk_vfn_195 */ virtual void __unk_vfn_195(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 198 + * @symbol __unk_vfn_198 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_198(); /** - * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@\@Z + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - MCAPI CopperBlock(std::string const &, int, enum class CopperType, class HashedString const &); + MCAPI std::string const & getDescriptionId() const; /** - * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@22\@Z + * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@22\@Z */ MCAPI CopperBlock(std::string const &, int, enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &); + /** + * @symbol ??0CopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4CopperType\@\@AEBVHashedString\@\@\@Z + */ + MCAPI CopperBlock(std::string const &, int, enum class CopperType, class HashedString const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CopperSlabInternal.hpp b/LiteLoader/include/llapi/mc/CopperSlabInternal.hpp index 31740830ab..7a2f52b052 100644 --- a/LiteLoader/include/llapi/mc/CopperSlabInternal.hpp +++ b/LiteLoader/include/llapi/mc/CopperSlabInternal.hpp @@ -22,7 +22,7 @@ namespace CopperSlabInternal { #undef AFTER_EXTRA /** - * @symbol ?BlockLegacy_nullptr\@CopperSlabInternal\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?BlockLegacy_nullptr\@CopperSlabInternal\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr BlockLegacy_nullptr; diff --git a/LiteLoader/include/llapi/mc/CopperUtil.hpp b/LiteLoader/include/llapi/mc/CopperUtil.hpp index fe4e5bd5be..4e5faa8556 100644 --- a/LiteLoader/include/llapi/mc/CopperUtil.hpp +++ b/LiteLoader/include/llapi/mc/CopperUtil.hpp @@ -22,15 +22,15 @@ namespace CopperUtil { #undef AFTER_EXTRA /** - * @symbol ?WAX_OFF_COLOR\@CopperUtil\@\@3VColor\@mce\@\@B + * @symbol ?WAX_OFF_COLOR\@CopperUtil\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WAX_OFF_COLOR; /** - * @symbol ?WAX_ON_COLOR\@CopperUtil\@\@3VColor\@mce\@\@B + * @symbol ?WAX_ON_COLOR\@CopperUtil\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WAX_ON_COLOR; /** - * @symbol ?trySendWaxingTelemetryEventToClient\@CopperUtil\@\@YAXAEAVPlayer\@\@AEBVBlockLegacy\@\@\@Z + * @symbol ?trySendWaxingTelemetryEventToClient\@CopperUtil\@\@YAXAEAVPlayer\@\@AEBVBlockLegacy\@\@\@Z */ MCAPI void trySendWaxingTelemetryEventToClient(class Player &, class BlockLegacy const &); diff --git a/LiteLoader/include/llapi/mc/Coral.hpp b/LiteLoader/include/llapi/mc/Coral.hpp index fcc804e171..856b7ebc5a 100644 --- a/LiteLoader/include/llapi/mc/Coral.hpp +++ b/LiteLoader/include/llapi/mc/Coral.hpp @@ -31,312 +31,317 @@ class Coral : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Coral(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@Coral\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @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 + * @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 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@Coral\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@Coral\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@Coral\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@Coral\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@Coral\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @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 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer\@Coral\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@Coral\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@Coral\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @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 + * @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 + * @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 + * @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 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@Coral\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @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 134 - * @symbol ?isAuxValueRelevantForPicking\@Coral\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@Coral\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 - * @symbol ?getColor\@Coral\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@Coral\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@Coral\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@Coral\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@Coral\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@Coral\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@Coral\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@Coral\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@Coral\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@Coral\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@Coral\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@Coral\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@Coral\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @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 + * @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 + * @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 + * @symbol ?checkAlive\@Coral\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void checkAlive(class BlockSource &, class BlockPos const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralBlock.hpp b/LiteLoader/include/llapi/mc/CoralBlock.hpp index 5217f52ad9..8f55732c64 100644 --- a/LiteLoader/include/llapi/mc/CoralBlock.hpp +++ b/LiteLoader/include/llapi/mc/CoralBlock.hpp @@ -31,251 +31,256 @@ class CoralBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@CoralBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@CoralBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@CoralBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@CoralBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@CoralBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@CoralBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@CoralBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CoralBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@CoralBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@CoralBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CoralBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0CoralBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CoralBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CoralBlock(std::string const &, int); /** - * @symbol ?DEAD_CORAL_BIT\@CoralBlock\@\@2HB + * @symbol ?DEAD_CORAL_BIT\@CoralBlock\@\@2HB */ MCAPI static int const DEAD_CORAL_BIT; /** - * @symbol ?DEAD_CORAL_OFFSET\@CoralBlock\@\@2HB + * @symbol ?DEAD_CORAL_OFFSET\@CoralBlock\@\@2HB */ MCAPI static int const DEAD_CORAL_OFFSET; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralCrustFeature.hpp b/LiteLoader/include/llapi/mc/CoralCrustFeature.hpp index 7d04310f44..1c5b33caa5 100644 --- a/LiteLoader/include/llapi/mc/CoralCrustFeature.hpp +++ b/LiteLoader/include/llapi/mc/CoralCrustFeature.hpp @@ -31,42 +31,42 @@ class CoralCrustFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralCrustFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@CoralCrustFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@CoralCrustFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_canOverwrite\@CoralCrustFeature\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canOverwrite\@CoralCrustFeature\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canOverwrite(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?_getCropOffsetFromRot\@CoralCrustFeature\@\@AEBA?AVBlockPos\@\@HH\@Z + * @symbol ?_getCropOffsetFromRot\@CoralCrustFeature\@\@AEBA?AVBlockPos\@\@HH\@Z */ MCAPI class BlockPos _getCropOffsetFromRot(int, int) const; /** - * @symbol ?_getOffsetFromRot\@CoralCrustFeature\@\@AEBA?AVBlockPos\@\@HH\@Z + * @symbol ?_getOffsetFromRot\@CoralCrustFeature\@\@AEBA?AVBlockPos\@\@HH\@Z */ MCAPI class BlockPos _getOffsetFromRot(int, int) const; /** - * @symbol ?_placeCoral\@CoralCrustFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@H\@Z + * @symbol ?_placeCoral\@CoralCrustFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@H\@Z */ MCAPI void _placeCoral(class BlockSource &, class BlockPos const &, class Random &, std::vector &, std::vector> &, int) const; /** - * @symbol ?_placeCoralBase\@CoralCrustFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVLegacyStructureTemplate\@\@AEAVLegacyStructureSettings\@\@\@Z + * @symbol ?_placeCoralBase\@CoralCrustFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVLegacyStructureTemplate\@\@AEAVLegacyStructureSettings\@\@\@Z */ MCAPI void _placeCoralBase(class BlockSource &, class BlockPos const &, class Random &, class LegacyStructureTemplate &, class LegacyStructureSettings &) const; /** - * @symbol ?_placeSideDecorations\@CoralCrustFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@E\@Z + * @symbol ?_placeSideDecorations\@CoralCrustFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@E\@Z */ MCAPI void _placeSideDecorations(class BlockSource &, class BlockPos const &, class Random &, unsigned char) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralFan.hpp b/LiteLoader/include/llapi/mc/CoralFan.hpp index 43d0b63e48..6f6bb25163 100644 --- a/LiteLoader/include/llapi/mc/CoralFan.hpp +++ b/LiteLoader/include/llapi/mc/CoralFan.hpp @@ -31,316 +31,327 @@ class CoralFan : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralFan(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@CoralFan\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@CoralFan\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@CoralFan\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CoralFan\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@CoralFan\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@CoralFan\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@CoralFan\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@CoralFan\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@CoralFan\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@CoralFan\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@CoralFan\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 87 - * @symbol ?mayConsumeFertilizer\@CoralFan\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@CoralFan\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@CoralFan\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@CoralFan\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CoralFan\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CoralFan\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@CoralFan\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@CoralFan\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@CoralFan\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@CoralFan\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@CoralFan\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 - * @symbol ?getColor\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@CoralFan\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@CoralFan\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CoralFan\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@CoralFan\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@CoralFan\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@CoralFan\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@CoralFan\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CoralFan\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@CoralFan\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@CoralFan\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@CoralFan\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?checkAlive\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?checkAlive\@CoralFan\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CORALFAN + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CoralFan(); +#endif /** - * @symbol ??0CoralFan\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CoralFan\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CoralFan(std::string const &, int); /** - * @symbol ?CORAL_FAN_NAMES\@CoralFan\@\@2QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?CORAL_FAN_NAMES\@CoralFan\@\@2QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const CORAL_FAN_NAMES[]; /** - * @symbol ?CORAL_FAN_NAMES_COUNT\@CoralFan\@\@2HB + * @symbol ?CORAL_FAN_NAMES_COUNT\@CoralFan\@\@2HB */ MCAPI static int const CORAL_FAN_NAMES_COUNT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp index 2583831565..cd69ef3f29 100644 --- a/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanBlockItem.hpp @@ -32,93 +32,93 @@ class CoralFanBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralFanBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@CoralFanBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@CoralFanBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@CoralFanBlockItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@CoralFanBlockItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@CoralFanBlockItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@CoralFanBlockItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0CoralFanBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CoralFanBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CoralFanBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralFanHang.hpp b/LiteLoader/include/llapi/mc/CoralFanHang.hpp index 067977728d..3a39479430 100644 --- a/LiteLoader/include/llapi/mc/CoralFanHang.hpp +++ b/LiteLoader/include/llapi/mc/CoralFanHang.hpp @@ -31,262 +31,267 @@ class CoralFanHang : public CoralFan { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralFanHang(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@CoralFanHang\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@CoralFanHang\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@CoralFanHang\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CoralFanHang\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@CoralFanHang\@\@EEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@CoralFanHang\@\@EEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CoralFanHang\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CoralFanHang\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@CoralFanHang\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@CoralFanHang\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@CoralFanHang\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CoralFanHang\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@CoralFanHang\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CoralFanHang\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@CoralFanHang\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@CoralFanHang\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@CoralFanHang\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?checkAlive\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?checkAlive\@CoralFanHang\@\@EEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??0CoralFanHang\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CoralFanHang\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CoralFanHang(std::string const &, int); /** - * @symbol ?hasSupport\@CoralFanHang\@\@SA_NAEBVBlock\@\@E\@Z + * @symbol ?hasSupport\@CoralFanHang\@\@SA_NAEBVBlock\@\@E\@Z */ MCAPI static bool hasSupport(class Block const &, unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralFeature.hpp b/LiteLoader/include/llapi/mc/CoralFeature.hpp index 30f53a8d91..db95d4ab2a 100644 --- a/LiteLoader/include/llapi/mc/CoralFeature.hpp +++ b/LiteLoader/include/llapi/mc/CoralFeature.hpp @@ -31,66 +31,66 @@ class CoralFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@CoralFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@CoralFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_buildHand\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z + * @symbol ?_buildHand\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z */ MCAPI void _buildHand(class BlockSource &, class BlockPos const &, class Random &, std::vector &, std::vector> &, class gsl::not_null) const; /** - * @symbol ?_buildPlantArm\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@8\@E_N\@Z + * @symbol ?_buildPlantArm\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@8\@E_N\@Z */ MCAPI void _buildPlantArm(class BlockSource &, class Random &, class BlockPos const &, class gsl::not_null, std::vector &, std::vector> &, unsigned char, bool) const; /** - * @symbol ?_buildPlantLike\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z + * @symbol ?_buildPlantLike\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z */ MCAPI void _buildPlantLike(class BlockSource &, class BlockPos const &, class Random &, std::vector &, std::vector> &, class gsl::not_null) const; /** - * @symbol ?_buildSmallClump\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z + * @symbol ?_buildSmallClump\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z */ MCAPI void _buildSmallClump(class BlockSource &, class BlockPos const &, class Random &, std::vector &, std::vector> &, class gsl::not_null) const; /** - * @symbol ?_buildSpire\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z + * @symbol ?_buildSpire\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAV?$vector\@U?$pair\@VBlockPos\@\@E\@std\@\@V?$allocator\@U?$pair\@VBlockPos\@\@E\@std\@\@\@2\@\@6\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@\@Z */ MCAPI void _buildSpire(class BlockSource &, class BlockPos const &, class Random &, std::vector &, std::vector> &, class gsl::not_null) const; /** - * @symbol ?_canOverwrite\@CoralFeature\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_canOverwrite\@CoralFeature\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI bool _canOverwrite(class BlockSource const &, class BlockPos const &, int) const; /** - * @symbol ?_placeSideDecorations\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@E\@Z + * @symbol ?_placeSideDecorations\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@E\@Z */ MCAPI void _placeSideDecorations(class BlockSource &, class BlockPos const &, class Random &, unsigned char) const; /** - * @symbol ?_randomDirectionExcept\@CoralFeature\@\@AEBAEAEAVRandom\@\@E\@Z + * @symbol ?_randomDirectionExcept\@CoralFeature\@\@AEBAEAEAVRandom\@\@E\@Z */ MCAPI unsigned char _randomDirectionExcept(class Random &, unsigned char) const; /** - * @symbol ?_setBlock\@CoralFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@H\@Z + * @symbol ?_setBlock\@CoralFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@H\@Z */ MCAPI bool _setBlock(class BlockSource &, class BlockPos const &, class gsl::not_null, int) const; /** - * @symbol ?_setBlockOnSolid\@CoralFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@H\@Z + * @symbol ?_setBlockOnSolid\@CoralFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@H\@Z */ MCAPI bool _setBlockOnSolid(class BlockSource &, class BlockPos const &, class gsl::not_null, int) const; /** - * @symbol ?_starCorners\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@MH_N\@Z + * @symbol ?_starCorners\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@MH_N\@Z */ MCAPI void _starCorners(class BlockSource &, class Random &, class BlockPos const &, class gsl::not_null, float, int, bool) const; /** - * @symbol ?_starFormation\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@MH_N\@Z + * @symbol ?_starFormation\@CoralFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@MH_N\@Z */ MCAPI void _starFormation(class BlockSource &, class Random &, class BlockPos const &, class gsl::not_null, float, int, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CoralHangFeature.hpp b/LiteLoader/include/llapi/mc/CoralHangFeature.hpp index b04da8132b..f08369642c 100644 --- a/LiteLoader/include/llapi/mc/CoralHangFeature.hpp +++ b/LiteLoader/include/llapi/mc/CoralHangFeature.hpp @@ -31,14 +31,14 @@ class CoralHangFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CoralHangFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@CoralHangFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@CoralHangFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Core.hpp b/LiteLoader/include/llapi/mc/Core.hpp index 1e62f3cd12..a2911e329d 100644 --- a/LiteLoader/include/llapi/mc/Core.hpp +++ b/LiteLoader/include/llapi/mc/Core.hpp @@ -130,35 +130,31 @@ enum class FileAccessType; #undef AFTER_EXTRA /** - * @symbol ?RESULT_FAILED_MESSAGE\@Core\@\@3PEBDEB + * @symbol ?RESULT_FAILED_MESSAGE\@Core\@\@3PEBDEB */ MCAPI extern char const * RESULT_FAILED_MESSAGE; /** - * @symbol ?RESULT_NOT_IMPLEMENTED_MESSAGE\@Core\@\@3PEBDEB + * @symbol ?RESULT_NOT_IMPLEMENTED_MESSAGE\@Core\@\@3PEBDEB */ MCAPI extern char const * RESULT_NOT_IMPLEMENTED_MESSAGE; /** - * @symbol ?RESULT_SUCCEEDED_MESSAGE\@Core\@\@3PEBDEB + * @symbol ?RESULT_SUCCEEDED_MESSAGE\@Core\@\@3PEBDEB */ MCAPI extern char const * RESULT_SUCCEEDED_MESSAGE; /** - * @symbol ??ICore\@\@YA_KW4DirectoryIterationFlags\@0\@0\@Z + * @symbol ??ICore\@\@YA_KW4DirectoryIterationFlags\@0\@0\@Z */ MCAPI unsigned __int64 operator&(enum class Core::DirectoryIterationFlags, enum class Core::DirectoryIterationFlags); /** - * @symbol ??UCore\@\@YA?AW4DirectoryIterationFlags\@0\@W410\@0\@Z + * @symbol ??UCore\@\@YA?AW4DirectoryIterationFlags\@0\@W410\@0\@Z */ MCAPI enum class Core::DirectoryIterationFlags operator|(enum class Core::DirectoryIterationFlags, enum class Core::DirectoryIterationFlags); /** - * @symbol ?sRootStorageArea\@Core\@\@3V?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@A + * @symbol ?sRootStorageArea\@Core\@\@3V?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@A */ MCAPI extern class std::shared_ptr sRootStorageArea; /** - * @symbol ?starts_with\@Core\@\@YA_NVStringSpan\@1\@0\@Z - */ - MCAPI bool starts_with(class Core::StringSpan, class Core::StringSpan); - /** - * @symbol ?transferDirectory\@Core\@\@YA?AVResult\@1\@PEAVFileSystemImpl\@1\@AEBVPath\@1\@01AEBV?$function\@$$A6A?AVResult\@Core\@\@AEBVPath\@2\@0\@Z\@std\@\@\@Z + * @symbol ?transferDirectory\@Core\@\@YA?AVResult\@1\@PEAVFileSystemImpl\@1\@AEBVPath\@1\@01AEBV?$function\@$$A6A?AVResult\@Core\@\@AEBVPath\@2\@0\@Z\@std\@\@\@Z */ MCAPI class Core::Result transferDirectory(class Core::FileSystemImpl *, class Core::Path const &, class Core::FileSystemImpl *, class Core::Path const &, class std::function const &); diff --git a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp index b1e9cd6c72..69e96b0d22 100644 --- a/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp +++ b/LiteLoader/include/llapi/mc/CorrectPlayerMovePredictionPacket.hpp @@ -31,29 +31,35 @@ class CorrectPlayerMovePredictionPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CorrectPlayerMovePredictionPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CorrectPlayerMovePredictionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CorrectPlayerMovePredictionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CorrectPlayerMovePredictionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CorrectPlayerMovePredictionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CorrectPlayerMovePredictionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CorrectPlayerMovePredictionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CorrectPlayerMovePredictionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CORRECTPLAYERMOVEPREDICTIONPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CorrectPlayerMovePredictionPacket(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp index 4c81c2cf22..a98f369335 100644 --- a/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandleNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -31,18 +31,18 @@ class CraftHandleNonImplemented_DEPRECATEDASKTYLAING : public CraftHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandleNonImplemented_DEPRECATEDASKTYLAING(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @symbol ??0CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandleNonImplemented_DEPRECATEDASKTYLAING(class ItemStackRequestActionCraftHandler &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp index da426a555b..fc727a87d0 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerBase.hpp @@ -31,79 +31,85 @@ class CraftHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleConsumedItem\@CraftHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@W4ContainerEnumName\@\@EAEBVItemStack\@\@\@Z + * @vftbl 1 + * @symbol ?handleConsumedItem\@CraftHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@W4ContainerEnumName\@\@EAEBVItemStack\@\@\@Z */ virtual enum class ItemStackNetResult handleConsumedItem(enum class ContainerEnumName, unsigned char, class ItemStack const &); /** - * @vftbl 2 - * @symbol ?preHandleAction\@CraftHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@W4ItemStackRequestActionType\@\@\@Z + * @vftbl 2 + * @symbol ?preHandleAction\@CraftHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@W4ItemStackRequestActionType\@\@\@Z */ virtual enum class ItemStackNetResult preHandleAction(enum class ItemStackRequestActionType); /** - * @vftbl 3 - * @symbol ?endRequestBatch\@CraftHandlerBase\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?endRequestBatch\@CraftHandlerBase\@\@UEAAXXZ */ virtual void endRequestBatch(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerSmithingTable\@\@EEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandleNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &) = 0; /** - * @vftbl 5 - * @symbol ?_postCraftRequest\@CraftHandlerBase\@\@MEAAX_N\@Z + * @vftbl 5 + * @symbol ?_postCraftRequest\@CraftHandlerBase\@\@MEAAX_N\@Z */ virtual void _postCraftRequest(bool); /** - * @vftbl 6 - * @symbol ?_getLevelRecipes\@CraftHandlerBase\@\@MEBAPEBVRecipes\@\@XZ + * @vftbl 6 + * @symbol ?_getLevelRecipes\@CraftHandlerBase\@\@MEBAPEBVRecipes\@\@XZ */ virtual class Recipes const * _getLevelRecipes() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CRAFTHANDLERBASE /** - * @symbol ??0CraftHandlerBase\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CraftHandlerBase(); +#endif + /** + * @symbol ??0CraftHandlerBase\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerBase(class ItemStackRequestActionCraftHandler &); /** - * @symbol ?_isNonImplementedTrustClientResults\@CraftHandlerBase\@\@QEBA_NXZ + * @symbol ?_isNonImplementedTrustClientResults\@CraftHandlerBase\@\@QEBA_NXZ */ MCAPI bool _isNonImplementedTrustClientResults() const; /** - * @symbol ?endRequest\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z + * @symbol ?endRequest\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z */ MCAPI enum class ItemStackNetResult endRequest(enum class ItemStackNetResult); /** - * @symbol ?handleCraftAction\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@W42\@\@Z + * @symbol ?handleCraftAction\@CraftHandlerBase\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@W42\@\@Z */ MCAPI enum class ItemStackNetResult handleCraftAction(class ItemStackRequestActionCraftBase const &, enum class ItemStackNetResult); /** - * @symbol ?isCraftRequest\@CraftHandlerBase\@\@QEAA_NXZ + * @symbol ?isCraftRequest\@CraftHandlerBase\@\@QEAA_NXZ */ MCAPI bool isCraftRequest(); /** - * @symbol ?postRequest\@CraftHandlerBase\@\@QEAAX_N\@Z + * @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 + * @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 + * @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 + * @symbol ?_validateRequestSlot\@CraftHandlerBase\@\@IEAA?AUItemStackRequestHandlerSlotInfo\@\@UItemStackRequestSlotInfo\@\@\@Z */ MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp index 152a346b58..109f24772b 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerCrafting.hpp @@ -30,55 +30,55 @@ class CraftHandlerCrafting { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerCrafting(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleConsumedItem\@CraftHandlerCrafting\@\@UEAA?AW4ItemStackNetResult\@\@W4ContainerEnumName\@\@EAEBVItemStack\@\@\@Z + * @vftbl 1 + * @symbol ?handleConsumedItem\@CraftHandlerCrafting\@\@UEAA?AW4ItemStackNetResult\@\@W4ContainerEnumName\@\@EAEBVItemStack\@\@\@Z */ virtual enum class ItemStackNetResult handleConsumedItem(enum class ContainerEnumName, unsigned char, class ItemStack const &); /** - * @vftbl 2 - * @symbol ?preHandleAction\@CraftHandlerCrafting\@\@UEAA?AW4ItemStackNetResult\@\@W4ItemStackRequestActionType\@\@\@Z + * @vftbl 2 + * @symbol ?preHandleAction\@CraftHandlerCrafting\@\@UEAA?AW4ItemStackNetResult\@\@W4ItemStackRequestActionType\@\@\@Z */ virtual enum class ItemStackNetResult preHandleAction(enum class ItemStackRequestActionType); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerCrafting\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandlerCrafting\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?_getLevelRecipes\@CraftHandlerCrafting\@\@EEBAPEBVRecipes\@\@XZ + * @vftbl 6 + * @symbol ?_getLevelRecipes\@CraftHandlerCrafting\@\@EEBAPEBVRecipes\@\@XZ */ virtual class Recipes const * _getLevelRecipes() const; /** - * @symbol ??0CraftHandlerCrafting\@\@QEAA\@_NAEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandlerCrafting\@\@QEAA\@_NAEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerCrafting(bool, class Player &, class ItemStackRequestActionCraftHandler &); //private: /** - * @symbol ?_handleAutoCraft\@CraftHandlerCrafting\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftRecipeAuto\@\@\@Z + * @symbol ?_handleAutoCraft\@CraftHandlerCrafting\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftRecipeAuto\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleAutoCraft(class ItemStackRequestActionCraftRecipeAuto const &); /** - * @symbol ?_handleCraftOutput\@CraftHandlerCrafting\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z + * @symbol ?_handleCraftOutput\@CraftHandlerCrafting\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleCraftOutput(class ItemStackRequestActionCraft, 12> const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp b/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp index cf24f4c53a..a8dfed53fc 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerEnchant.hpp @@ -31,40 +31,40 @@ class CraftHandlerEnchant : public CraftHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?endRequestBatch\@CraftHandlerEnchant\@\@MEAAXXZ + * @vftbl 3 + * @symbol ?endRequestBatch\@CraftHandlerEnchant\@\@MEAAXXZ */ virtual void endRequestBatch(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerEnchant\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandlerEnchant\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @vftbl 5 - * @symbol ?_postCraftRequest\@CraftHandlerEnchant\@\@MEAAX_N\@Z + * @vftbl 5 + * @symbol ?_postCraftRequest\@CraftHandlerEnchant\@\@MEAAX_N\@Z */ virtual void _postCraftRequest(bool); /** - * @symbol ??0CraftHandlerEnchant\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandlerEnchant\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerEnchant(class Player &, class ItemStackRequestActionCraftHandler &); //private: /** - * @symbol ?_getEnchantingModel\@CraftHandlerEnchant\@\@AEBAAEAVEnchantingContainerManagerModel\@\@XZ + * @symbol ?_getEnchantingModel\@CraftHandlerEnchant\@\@AEBAAEAVEnchantingContainerManagerModel\@\@XZ */ MCAPI class EnchantingContainerManagerModel & _getEnchantingModel() const; /** - * @symbol ?_handleEnchant\@CraftHandlerEnchant\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z + * @symbol ?_handleEnchant\@CraftHandlerEnchant\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleEnchant(class ItemStackRequestActionCraft, 12> const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp index 676547642d..e6a99c488e 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerGrindstone.hpp @@ -31,43 +31,43 @@ class CraftHandlerGrindstone : public CraftHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerGrindstone(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerGrindstone\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandlerGrindstone\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @vftbl 5 - * @symbol ?_postCraftRequest\@CraftHandlerGrindstone\@\@EEAAX_N\@Z + * @vftbl 5 + * @symbol ?_postCraftRequest\@CraftHandlerGrindstone\@\@EEAAX_N\@Z */ virtual void _postCraftRequest(bool); /** - * @symbol ??0CraftHandlerGrindstone\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandlerGrindstone\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerGrindstone(class Player &, class ItemStackRequestActionCraftHandler &); //private: /** - * @symbol ?_createResultItem\@CraftHandlerGrindstone\@\@AEAA?AVItemStack\@\@AEBV2\@0\@Z + * @symbol ?_createResultItem\@CraftHandlerGrindstone\@\@AEAA?AVItemStack\@\@AEBV2\@0\@Z */ MCAPI class ItemStack _createResultItem(class ItemStack const &, class ItemStack const &); /** - * @symbol ?_getExperienceFromItem\@CraftHandlerGrindstone\@\@AEBAHAEBVItemStack\@\@\@Z + * @symbol ?_getExperienceFromItem\@CraftHandlerGrindstone\@\@AEBAHAEBVItemStack\@\@\@Z */ 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\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEA_N\@Z */ MCAPI class ItemStack _getResultItemWithNoEnchants(std::vector const &, bool &); /** - * @symbol ?_resolveNetIdAndValidate\@CraftHandlerGrindstone\@\@AEAA_NW4ContainerEnumName\@\@EAEBUItemStackNetIdVariant\@\@\@Z + * @symbol ?_resolveNetIdAndValidate\@CraftHandlerGrindstone\@\@AEAA_NW4ContainerEnumName\@\@EAEBUItemStackNetIdVariant\@\@\@Z */ MCAPI bool _resolveNetIdAndValidate(enum class ContainerEnumName, unsigned char, struct ItemStackNetIdVariant const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp b/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp index 1e5e76de0d..4c8a5eda82 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerLoom.hpp @@ -31,18 +31,18 @@ class CraftHandlerLoom : public CraftHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerLoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerLoom\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandlerLoom\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @symbol ??0CraftHandlerLoom\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandlerLoom\@\@QEAA\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerLoom(class ItemStackRequestActionCraftHandler &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp b/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp index f33ad7d7cf..fe61a34fec 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerSmithingTable.hpp @@ -29,23 +29,23 @@ class CraftHandlerSmithingTable : public CraftHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerSmithingTable(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerSmithingTable\@\@EEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandlerSmithingTable\@\@EEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @vftbl 6 - * @symbol ?_getLevelRecipes\@CraftHandlerSmithingTable\@\@EEBAPEBVRecipes\@\@XZ + * @vftbl 6 + * @symbol ?_getLevelRecipes\@CraftHandlerSmithingTable\@\@EEBAPEBVRecipes\@\@XZ */ virtual class Recipes const * _getLevelRecipes() const; /** - * @symbol ??0CraftHandlerSmithingTable\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandlerSmithingTable\@\@QEAA\@AEAVPlayer\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerSmithingTable(class Player &, class ItemStackRequestActionCraftHandler &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp b/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp index 3f9be12104..aba9215a62 100644 --- a/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp +++ b/LiteLoader/include/llapi/mc/CraftHandlerTrade.hpp @@ -30,62 +30,62 @@ class CraftHandlerTrade { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftHandlerTrade(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleConsumedItem\@CraftHandlerTrade\@\@EEAA?AW4ItemStackNetResult\@\@W4ContainerEnumName\@\@EAEBVItemStack\@\@\@Z + * @vftbl 1 + * @symbol ?handleConsumedItem\@CraftHandlerTrade\@\@EEAA?AW4ItemStackNetResult\@\@W4ContainerEnumName\@\@EAEBVItemStack\@\@\@Z */ virtual enum class ItemStackNetResult handleConsumedItem(enum class ContainerEnumName, unsigned char, class ItemStack const &); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_handleCraftAction\@CraftHandlerTrade\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @vftbl 4 + * @symbol ?_handleCraftAction\@CraftHandlerTrade\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ virtual enum class ItemStackNetResult _handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @vftbl 5 - * @symbol ?_postCraftRequest\@CraftHandlerTrade\@\@EEAAX_N\@Z + * @vftbl 5 + * @symbol ?_postCraftRequest\@CraftHandlerTrade\@\@EEAAX_N\@Z */ virtual void _postCraftRequest(bool); /** - * @symbol ??0CraftHandlerTrade\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z + * @symbol ??0CraftHandlerTrade\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionCraftHandler\@\@\@Z */ MCAPI CraftHandlerTrade(class ContainerScreenContext const &, class ItemStackRequestActionCraftHandler &); //private: /** - * @symbol ?_getMerchantRecipeFromNetId\@CraftHandlerTrade\@\@AEAA?AV?$tuple\@W4ItemStackNetResult\@\@PEBVMerchantRecipe\@\@\@std\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?_getMerchantRecipeFromNetId\@CraftHandlerTrade\@\@AEAA?AV?$tuple\@W4ItemStackNetResult\@\@PEBVMerchantRecipe\@\@\@std\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI class std::tuple _getMerchantRecipeFromNetId(class TypedServerNetId const &); /** - * @symbol ?_handleTrade1\@CraftHandlerTrade\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z + * @symbol ?_handleTrade1\@CraftHandlerTrade\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionCraft\@V?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@$0M\@\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleTrade1(class ItemStackRequestActionCraft, 12> const &); /** - * @symbol ?_initResultItem\@CraftHandlerTrade\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?_initResultItem\@CraftHandlerTrade\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI enum class ItemStackNetResult _initResultItem(class TypedServerNetId const &); /** - * @symbol ?_initTrade2Consumes\@CraftHandlerTrade\@\@AEAA?AW4ItemStackNetResult\@\@XZ + * @symbol ?_initTrade2Consumes\@CraftHandlerTrade\@\@AEAA?AW4ItemStackNetResult\@\@XZ */ MCAPI enum class ItemStackNetResult _initTrade2Consumes(); /** - * @symbol ?_matchesAuxValueTrade2\@CraftHandlerTrade\@\@AEBA_NAEBVItemStackBase\@\@0\@Z + * @symbol ?_matchesAuxValueTrade2\@CraftHandlerTrade\@\@AEBA_NAEBVItemStackBase\@\@0\@Z */ MCAPI bool _matchesAuxValueTrade2(class ItemStackBase const &, class ItemStackBase const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftUISetResultNameEvent.hpp b/LiteLoader/include/llapi/mc/CraftUISetResultNameEvent.hpp index a313318c66..612e544a05 100644 --- a/LiteLoader/include/llapi/mc/CraftUISetResultNameEvent.hpp +++ b/LiteLoader/include/llapi/mc/CraftUISetResultNameEvent.hpp @@ -25,7 +25,7 @@ struct CraftUISetResultNameEvent { public: /** - * @symbol ??1CraftUISetResultNameEvent\@\@QEAA\@XZ + * @symbol ??1CraftUISetResultNameEvent\@\@QEAA\@XZ */ MCAPI ~CraftUISetResultNameEvent(); diff --git a/LiteLoader/include/llapi/mc/CraftableCompounds.hpp b/LiteLoader/include/llapi/mc/CraftableCompounds.hpp index 38b14e57c6..6b398e090f 100644 --- a/LiteLoader/include/llapi/mc/CraftableCompounds.hpp +++ b/LiteLoader/include/llapi/mc/CraftableCompounds.hpp @@ -29,50 +29,56 @@ class CraftableCompounds { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftableCompounds(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_registerCompound\@CraftableCompounds\@\@MEAAXAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@\@Z + * @vftbl 1 + * @symbol ?_registerCompound\@CraftableCompounds\@\@MEAAXAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@\@Z */ virtual void _registerCompound(std::vector const &, class ItemStack const &, enum class LabTableReactionType, enum class CompoundContainerType); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CRAFTABLECOMPOUNDS /** - * @symbol ??0CraftableCompounds\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CraftableCompounds(); +#endif + /** + * @symbol ??0CraftableCompounds\@\@QEAA\@XZ */ MCAPI CraftableCompounds(); /** - * @symbol ?getComponents\@CraftableCompounds\@\@QEBAPEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?getComponents\@CraftableCompounds\@\@QEBAPEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVItemDescriptor\@\@\@Z */ MCAPI std::vector const * getComponents(class ItemDescriptor const &) const; /** - * @symbol ?getCompound\@CraftableCompounds\@\@QEAAAEBVItemStack\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getCompound\@CraftableCompounds\@\@QEAAAEBVItemStack\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ MCAPI class ItemStack const & getCompound(std::vector const &); /** - * @symbol ?getReaction\@CraftableCompounds\@\@QEAA?AW4LabTableReactionType\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getReaction\@CraftableCompounds\@\@QEAA?AW4LabTableReactionType\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ MCAPI enum class LabTableReactionType getReaction(std::vector const &); /** - * @symbol ?registerCompounds\@CraftableCompounds\@\@QEAAXXZ + * @symbol ?registerCompounds\@CraftableCompounds\@\@QEAAXXZ */ MCAPI void registerCompounds(); //protected: /** - * @symbol ?_getCompoundId\@CraftableCompounds\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@3\@\@Z + * @symbol ?_getCompoundId\@CraftableCompounds\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@3\@\@Z */ MCAPI std::string _getCompoundId(std::vector const &); /** - * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@\@Z + * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@\@Z */ MCAPI void _registerCompound(std::vector const &, class ItemStack const &, enum class LabTableReactionType, enum class CompoundContainerType); /** - * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@W4CompoundType\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@H\@Z + * @symbol ?_registerCompound\@CraftableCompounds\@\@IEAAXAEBV?$vector\@UChemistryIngredient\@\@V?$allocator\@UChemistryIngredient\@\@\@std\@\@\@std\@\@W4CompoundType\@\@W4LabTableReactionType\@\@W4CompoundContainerType\@\@H\@Z */ MCAPI void _registerCompound(std::vector const &, enum class CompoundType, enum class LabTableReactionType, enum class CompoundContainerType, int); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingContainer.hpp b/LiteLoader/include/llapi/mc/CraftingContainer.hpp index 75433d9004..92787bfee0 100644 --- a/LiteLoader/include/llapi/mc/CraftingContainer.hpp +++ b/LiteLoader/include/llapi/mc/CraftingContainer.hpp @@ -31,67 +31,73 @@ class CraftingContainer : public Container { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftingContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?serverInitItemStackIds\@CraftingContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @vftbl 2 + * @symbol ?serverInitItemStackIds\@CraftingContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ virtual void serverInitItemStackIds(int, int, class std::function); /** - * @vftbl 5 - * @symbol ?getItem\@CraftingContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 5 + * @symbol ?getItem\@CraftingContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const; /** - * @vftbl 9 - * @symbol ?setItem\@CraftingContainer\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 9 + * @symbol ?setItem\@CraftingContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 14 - * @symbol ?getContainerSize\@CraftingContainer\@\@UEBAHXZ + * @vftbl 14 + * @symbol ?getContainerSize\@CraftingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 15 - * @symbol ?getMaxStackSize\@CraftingContainer\@\@UEBAHXZ + * @vftbl 15 + * @symbol ?getMaxStackSize\@CraftingContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 16 - * @symbol ?startOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 16 + * @symbol ?startOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 - * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 17 + * @symbol ?stopOpen\@CraftingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 23 + * @symbol __unk_vfn_23 */ - virtual void __unk_vfn_22(); + virtual void __unk_vfn_23(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_23(); + virtual void __unk_vfn_24(); /** - * @vftbl 24 - * @symbol ?setContainerChanged\@CraftingContainer\@\@UEAAXH\@Z + * @vftbl 25 + * @symbol ?setContainerChanged\@CraftingContainer\@\@UEAAXH\@Z */ virtual void setContainerChanged(int); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CRAFTINGCONTAINER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CraftingContainer(); +#endif /** - * @symbol ??0CraftingContainer\@\@QEAA\@HH\@Z + * @symbol ??0CraftingContainer\@\@QEAA\@HH\@Z */ MCAPI CraftingContainer(int, int); /** - * @symbol ?getItem\@CraftingContainer\@\@QEBAAEBVItemStack\@\@HH\@Z + * @symbol ?getItem\@CraftingContainer\@\@QEBAAEBVItemStack\@\@HH\@Z */ MCAPI class ItemStack const & getItem(int, int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/CraftingContainerScreenValidator.hpp index 9aebb1adec..64aa9b7c14 100644 --- a/LiteLoader/include/llapi/mc/CraftingContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/CraftingContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class CraftingContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftingContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0CraftingContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0CraftingContainerScreenValidator\@\@QEAA\@XZ */ MCAPI CraftingContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingDataEntry.hpp b/LiteLoader/include/llapi/mc/CraftingDataEntry.hpp index b11075c1c2..005394226f 100644 --- a/LiteLoader/include/llapi/mc/CraftingDataEntry.hpp +++ b/LiteLoader/include/llapi/mc/CraftingDataEntry.hpp @@ -30,20 +30,20 @@ class CraftingDataEntry { public: /** - * @symbol ?fillFromMultiRecipe\@CraftingDataEntry\@\@QEAAXAEBVMultiRecipe\@\@\@Z + * @symbol ?fillFromMultiRecipe\@CraftingDataEntry\@\@QEAAXAEBVMultiRecipe\@\@\@Z */ MCAPI void fillFromMultiRecipe(class MultiRecipe const &); /** - * @symbol ?fillFromRecipe\@CraftingDataEntry\@\@QEAAXAEBVRecipe\@\@\@Z + * @symbol ?fillFromRecipe\@CraftingDataEntry\@\@QEAAXAEBVRecipe\@\@\@Z */ MCAPI void fillFromRecipe(class Recipe const &); /** - * @symbol ?write\@CraftingDataEntry\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@CraftingDataEntry\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void write(class BinaryStream &) const; /** - * @symbol ??1CraftingDataEntry\@\@QEAA\@XZ + * @symbol ??1CraftingDataEntry\@\@QEAA\@XZ */ MCAPI ~CraftingDataEntry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp index 589d173362..607212c4a3 100644 --- a/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingDataPacket.hpp @@ -30,37 +30,37 @@ class CraftingDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftingDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CraftingDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CraftingDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CraftingDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CraftingDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CraftingDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CraftingDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CraftingDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0CraftingDataPacket\@\@QEAA\@XZ + * @symbol ??0CraftingDataPacket\@\@QEAA\@XZ */ MCAPI CraftingDataPacket(); /** - * @symbol ?prepareFromRecipes\@CraftingDataPacket\@\@SA?AV?$unique_ptr\@VCraftingDataPacket\@\@U?$default_delete\@VCraftingDataPacket\@\@\@std\@\@\@std\@\@AEBVRecipes\@\@_N\@Z + * @symbol ?prepareFromRecipes\@CraftingDataPacket\@\@SA?AV?$unique_ptr\@VCraftingDataPacket\@\@U?$default_delete\@VCraftingDataPacket\@\@\@std\@\@\@std\@\@AEBVRecipes\@\@_N\@Z */ MCAPI static std::unique_ptr prepareFromRecipes(class Recipes const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp index 0ad3d58480..820522be5d 100644 --- a/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/CraftingEventPacket.hpp @@ -57,33 +57,33 @@ class CraftingEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftingEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CraftingEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CraftingEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CraftingEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CraftingEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CraftingEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CraftingEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CraftingEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0CraftingEventPacket\@\@QEAA\@XZ + * @symbol ??0CraftingEventPacket\@\@QEAA\@XZ */ MCAPI CraftingEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/CraftingInputContainerValidation.hpp index 2db2f6588f..7e2d0a5dc9 100644 --- a/LiteLoader/include/llapi/mc/CraftingInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/CraftingInputContainerValidation.hpp @@ -31,54 +31,54 @@ class CraftingInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CraftingInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@CraftingInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@CraftingInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@CraftingInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@CraftingInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CraftingTag.hpp b/LiteLoader/include/llapi/mc/CraftingTag.hpp index 950d3e84ba..74ef6ad535 100644 --- a/LiteLoader/include/llapi/mc/CraftingTag.hpp +++ b/LiteLoader/include/llapi/mc/CraftingTag.hpp @@ -22,19 +22,19 @@ namespace CraftingTag { #undef AFTER_EXTRA /** - * @symbol ?CARTOGRAPHY_TABLE\@CraftingTag\@\@3VHashedString\@\@B + * @symbol ?CARTOGRAPHY_TABLE\@CraftingTag\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CARTOGRAPHY_TABLE; /** - * @symbol ?CRAFTING_TABLE\@CraftingTag\@\@3VHashedString\@\@B + * @symbol ?CRAFTING_TABLE\@CraftingTag\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CRAFTING_TABLE; /** - * @symbol ?SMITHING_TABLE\@CraftingTag\@\@3VHashedString\@\@B + * @symbol ?SMITHING_TABLE\@CraftingTag\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SMITHING_TABLE; /** - * @symbol ?STONECUTTER\@CraftingTag\@\@3VHashedString\@\@B + * @symbol ?STONECUTTER\@CraftingTag\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const STONECUTTER; diff --git a/LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp b/LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp index aee03a0b53..45aa55cd4c 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpAssertData.hpp @@ -30,8 +30,8 @@ class CrashDumpAssertData { public: /** - * @symbol ?kFormat\@CrashDumpAssertData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpAssertData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDumpEventData.hpp b/LiteLoader/include/llapi/mc/CrashDumpEventData.hpp index 761182f0b2..73627fea16 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpEventData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpEventData.hpp @@ -30,11 +30,11 @@ struct CrashDumpEventData { public: /** - * @symbol ??0CrashDumpEventData\@\@QEAA\@W4CrashDumpLogStringID\@\@0\@Z + * @symbol ??0CrashDumpEventData\@\@QEAA\@W4CrashDumpLogStringID\@\@0\@Z */ MCAPI CrashDumpEventData(enum class CrashDumpLogStringID, enum class CrashDumpLogStringID); /** - * @symbol ?kFormat\@CrashDumpEventData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpEventData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; diff --git a/LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp b/LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp index c291c4e845..2e9b1af834 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpFrameData.hpp @@ -30,11 +30,11 @@ struct CrashDumpFrameData { public: /** - * @symbol ??0CrashDumpFrameData\@\@QEAA\@HH_KMMMM\@Z + * @symbol ??0CrashDumpFrameData\@\@QEAA\@HH_KMMMM\@Z */ MCAPI CrashDumpFrameData(int, int, unsigned __int64, float, float, float, float); /** - * @symbol ?kFormat\@CrashDumpFrameData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpFrameData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; diff --git a/LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp b/LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp index 7d8de3f061..728ac95d90 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpGameplayData.hpp @@ -30,8 +30,8 @@ class CrashDumpGameplayData { public: /** - * @symbol ?kFormat\@CrashDumpGameplayData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpGameplayData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp b/LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp index fb98b572aa..b0d2071244 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpGlobalData.hpp @@ -30,8 +30,8 @@ class CrashDumpGlobalData { public: /** - * @symbol ?kFormat\@CrashDumpGlobalData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpGlobalData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp b/LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp index e8b789c90c..3b9cd7874a 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpKeyValueData.hpp @@ -30,11 +30,11 @@ struct CrashDumpKeyValueData { public: /** - * @symbol ??0CrashDumpKeyValueData\@\@QEAA\@W4CrashDumpLogStringID\@\@0H_K\@Z + * @symbol ??0CrashDumpKeyValueData\@\@QEAA\@W4CrashDumpLogStringID\@\@0H_K\@Z */ MCAPI CrashDumpKeyValueData(enum class CrashDumpLogStringID, enum class CrashDumpLogStringID, int, unsigned __int64); /** - * @symbol ?kFormat\@CrashDumpKeyValueData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpKeyValueData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; diff --git a/LiteLoader/include/llapi/mc/CrashDumpLog.hpp b/LiteLoader/include/llapi/mc/CrashDumpLog.hpp index 3f62c90b13..343b631c8e 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpLog.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpLog.hpp @@ -30,43 +30,43 @@ class CrashDumpLog { public: /** - * @symbol ?logEvent\@CrashDumpLog\@\@SAXAEBUCrashDumpEventData\@\@\@Z + * @symbol ?logEvent\@CrashDumpLog\@\@SAXAEBUCrashDumpEventData\@\@\@Z */ MCAPI static void logEvent(struct CrashDumpEventData const &); /** - * @symbol ?logFrame\@CrashDumpLog\@\@SAXAEBUCrashDumpFrameData\@\@\@Z + * @symbol ?logFrame\@CrashDumpLog\@\@SAXAEBUCrashDumpFrameData\@\@\@Z */ MCAPI static void logFrame(struct CrashDumpFrameData const &); /** - * @symbol ?logKeyValue\@CrashDumpLog\@\@SAXAEBUCrashDumpKeyValueData\@\@\@Z + * @symbol ?logKeyValue\@CrashDumpLog\@\@SAXAEBUCrashDumpKeyValueData\@\@\@Z */ MCAPI static void logKeyValue(struct CrashDumpKeyValueData const &); /** - * @symbol ?setAssertMessage\@CrashDumpLog\@\@SAXPEBDH00\@Z + * @symbol ?setAssertMessage\@CrashDumpLog\@\@SAXPEBDH00\@Z */ MCAPI static void setAssertMessage(char const *, int, char const *, char const *); /** - * @symbol ?setDeviceSessionID\@CrashDumpLog\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setDeviceSessionID\@CrashDumpLog\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool setDeviceSessionID(std::string const &); /** - * @symbol ?setGameVersion\@CrashDumpLog\@\@SAXPEBD\@Z + * @symbol ?setGameVersion\@CrashDumpLog\@\@SAXPEBD\@Z */ MCAPI static void setGameVersion(char const *); /** - * @symbol ?setPlatform\@CrashDumpLog\@\@SAXPEBD\@Z + * @symbol ?setPlatform\@CrashDumpLog\@\@SAXPEBD\@Z */ MCAPI static void setPlatform(char const *); /** - * @symbol ?setTotalMemory\@CrashDumpLog\@\@SAX_K\@Z + * @symbol ?setTotalMemory\@CrashDumpLog\@\@SAX_K\@Z */ MCAPI static void setTotalMemory(unsigned __int64); /** - * @symbol ?startCrashDumpLogThread\@CrashDumpLog\@\@SA_NXZ + * @symbol ?startCrashDumpLogThread\@CrashDumpLog\@\@SA_NXZ */ MCAPI static bool startCrashDumpLogThread(); /** - * @symbol ?stopCrashDumpLogThread\@CrashDumpLog\@\@SAXXZ + * @symbol ?stopCrashDumpLogThread\@CrashDumpLog\@\@SAXXZ */ MCAPI static void stopCrashDumpLogThread(); @@ -74,64 +74,64 @@ class CrashDumpLog { //private: /** - * @symbol ?crashDumpLogThreadRoutine\@CrashDumpLog\@\@CAXXZ + * @symbol ?crashDumpLogThreadRoutine\@CrashDumpLog\@\@CAXXZ */ MCAPI static void crashDumpLogThreadRoutine(); protected: /** - * @symbol ?mAllData\@CrashDumpLog\@\@1PEAUCrashDump_AllData\@\@EA + * @symbol ?mAllData\@CrashDumpLog\@\@1PEAUCrashDump_AllData\@\@EA */ MCAPI static struct CrashDump_AllData * mAllData; private: /** - * @symbol ?mAssertDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mAssertDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mAssertDataMutex; /** - * @symbol ?mCrashDumpLog_logThread\@CrashDumpLog\@\@0V?$unique_ptr\@Vthread\@std\@\@U?$default_delete\@Vthread\@std\@\@\@2\@\@std\@\@A + * @symbol ?mCrashDumpLog_logThread\@CrashDumpLog\@\@0V?$unique_ptr\@Vthread\@std\@\@U?$default_delete\@Vthread\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::unique_ptr mCrashDumpLog_logThread; /** - * @symbol ?mCrashDumpThreadMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mCrashDumpThreadMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mCrashDumpThreadMutex; /** - * @symbol ?mCrashDumpThreadMutexCV\@CrashDumpLog\@\@0Vcondition_variable\@std\@\@A + * @symbol ?mCrashDumpThreadMutexCV\@CrashDumpLog\@\@0Vcondition_variable\@std\@\@A */ MCAPI static class std::condition_variable mCrashDumpThreadMutexCV; /** - * @symbol ?mEventDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mEventDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mEventDataMutex; /** - * @symbol ?mFrameDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mFrameDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mFrameDataMutex; /** - * @symbol ?mGameplayDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mGameplayDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mGameplayDataMutex; /** - * @symbol ?mGlobalDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mGlobalDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mGlobalDataMutex; /** - * @symbol ?mIsThreadRunning\@CrashDumpLog\@\@0_NA + * @symbol ?mIsThreadRunning\@CrashDumpLog\@\@0_NA */ MCAPI static bool mIsThreadRunning; /** - * @symbol ?mKeyValueDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mKeyValueDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mKeyValueDataMutex; /** - * @symbol ?mPlayerDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mPlayerDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mPlayerDataMutex; /** - * @symbol ?mRenderDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A + * @symbol ?mRenderDataMutex\@CrashDumpLog\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mRenderDataMutex; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDumpLogUtils.hpp b/LiteLoader/include/llapi/mc/CrashDumpLogUtils.hpp index af243d19a7..8565553731 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpLogUtils.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpLogUtils.hpp @@ -28,8 +28,8 @@ class CrashDumpLogUtils { public: /** - * @symbol ?getTagFromOptions\@CrashDumpLogUtils\@\@SA?AW4CrashDumpLogStringID\@\@_KV?$span\@$$CBW4CrashDumpLogStringID\@\@$0?0\@gsl\@\@\@Z + * @symbol ?getTagFromOptions\@CrashDumpLogUtils\@\@SA?AW4CrashDumpLogStringID\@\@_KV?$span\@$$CBW4CrashDumpLogStringID\@\@$0?0\@gsl\@\@\@Z */ MCAPI static enum class CrashDumpLogStringID getTagFromOptions(unsigned __int64, class gsl::span); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp b/LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp index 29efdc5f4c..dda17b8c2e 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpPlayerData.hpp @@ -30,8 +30,8 @@ class CrashDumpPlayerData { public: /** - * @symbol ?kFormat\@CrashDumpPlayerData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpPlayerData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp b/LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp index 0fef0769d6..77fc98f467 100644 --- a/LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDumpRenderData.hpp @@ -30,8 +30,8 @@ class CrashDumpRenderData { public: /** - * @symbol ?kFormat\@CrashDumpRenderData\@\@2QBUCrashDumpFormatEntryImpl\@\@B + * @symbol ?kFormat\@CrashDumpRenderData\@\@2QBUCrashDumpFormatEntryImpl\@\@B */ MCAPI static struct CrashDumpFormatEntryImpl const kFormat[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrashDump_AllData.hpp b/LiteLoader/include/llapi/mc/CrashDump_AllData.hpp index 080535dc4a..85be2335e2 100644 --- a/LiteLoader/include/llapi/mc/CrashDump_AllData.hpp +++ b/LiteLoader/include/llapi/mc/CrashDump_AllData.hpp @@ -27,7 +27,7 @@ struct CrashDump_AllData { public: /** - * @symbol ??0CrashDump_AllData\@\@QEAA\@XZ + * @symbol ??0CrashDump_AllData\@\@QEAA\@XZ */ MCAPI CrashDump_AllData(); diff --git a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp index 15140e4c32..d5d32f699e 100644 --- a/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreatePhotoPacket.hpp @@ -30,33 +30,33 @@ class CreatePhotoPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CreatePhotoPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CreatePhotoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CreatePhotoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CreatePhotoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CreatePhotoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CreatePhotoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CreatePhotoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CreatePhotoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0CreatePhotoPacket\@\@QEAA\@XZ + * @symbol ??0CreatePhotoPacket\@\@QEAA\@XZ */ MCAPI CreatePhotoPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreatedOutputContainerValidation.hpp b/LiteLoader/include/llapi/mc/CreatedOutputContainerValidation.hpp index abb9fda434..c661ac4089 100644 --- a/LiteLoader/include/llapi/mc/CreatedOutputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/CreatedOutputContainerValidation.hpp @@ -31,68 +31,68 @@ class CreatedOutputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CreatedOutputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@CreatedOutputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@CreatedOutputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATEDOUTPUTCONTAINERVALIDATION /** - * @symbol ?canItemMoveToContainer\@CreatedOutputContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@CreatedOutputContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @symbol ?isItemAllowedInSlot\@CreatedOutputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @symbol ?isItemAllowedInSlot\@CreatedOutputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ MCVAPI bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @symbol ?isItemAllowedToAdd\@CreatedOutputContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @symbol ?isItemAllowedToAdd\@CreatedOutputContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ MCVAPI bool isItemAllowedToAdd(class ItemStack const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp index d4fa7a4fad..a6c0addec4 100644 --- a/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/CreativeContentPacket.hpp @@ -30,37 +30,43 @@ class CreativeContentPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CreativeContentPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@CreativeContentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@CreativeContentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@CreativeContentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@CreativeContentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@CreativeContentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@CreativeContentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@CreativeContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVECONTENTPACKET /** - * @symbol ??0CreativeContentPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CreativeContentPacket(); + MCVAPI ~CreativeContentPacket(); +#endif /** - * @symbol ??0CreativeContentPacket\@\@QEAA\@AEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0CreativeContentPacket\@\@QEAA\@AEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI CreativeContentPacket(std::vector const &); + /** + * @symbol ??0CreativeContentPacket\@\@QEAA\@XZ + */ + MCAPI CreativeContentPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp b/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp index 4203fab8ee..7d7a4383df 100644 --- a/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp +++ b/LiteLoader/include/llapi/mc/CreativeGroupInfo.hpp @@ -28,29 +28,35 @@ class CreativeGroupInfo { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVEGROUPINFO /** - * @symbol ??0CreativeGroupInfo\@\@QEAA\@PEAVCreativeItemRegistry\@\@W4CreativeItemCategory\@\@AEBVHashedString\@\@IAEBVItemInstance\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI CreativeGroupInfo(class CreativeItemRegistry *, enum class CreativeItemCategory, class HashedString const &, unsigned int, class ItemInstance const &); + MCVAPI ~CreativeGroupInfo(); +#endif /** - * @symbol ??0CreativeGroupInfo\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0CreativeGroupInfo\@\@QEAA\@AEBV0\@\@Z */ MCAPI CreativeGroupInfo(class CreativeGroupInfo const &); /** - * @symbol ?addCreativeItem\@CreativeGroupInfo\@\@QEAAXPEAVCreativeItemEntry\@\@\@Z + * @symbol ??0CreativeGroupInfo\@\@QEAA\@PEAVCreativeItemRegistry\@\@W4CreativeItemCategory\@\@AEBVHashedString\@\@IAEBVItemInstance\@\@\@Z + */ + MCAPI CreativeGroupInfo(class CreativeItemRegistry *, enum class CreativeItemCategory, class HashedString const &, unsigned int, class ItemInstance const &); + /** + * @symbol ?addCreativeItem\@CreativeGroupInfo\@\@QEAAXPEAVCreativeItemEntry\@\@\@Z */ MCAPI void addCreativeItem(class CreativeItemEntry *); /** - * @symbol ?getIcon\@CreativeGroupInfo\@\@QEBA?BVItemInstance\@\@XZ + * @symbol ?getIcon\@CreativeGroupInfo\@\@QEBA?BVItemInstance\@\@XZ */ MCAPI class ItemInstance const getIcon() const; /** - * @symbol ?getIndex\@CreativeGroupInfo\@\@QEBAIXZ + * @symbol ?getIndex\@CreativeGroupInfo\@\@QEBAIXZ */ MCAPI unsigned int getIndex() const; /** - * @symbol ?getName\@CreativeGroupInfo\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@CreativeGroupInfo\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const getName() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp index b7a9a275a6..7a6fe2a640 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemEntry.hpp @@ -30,36 +30,36 @@ class CreativeItemEntry { public: /** - * @symbol ??0CreativeItemEntry\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@I\@Z + * @symbol ??0CreativeItemEntry\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI CreativeItemEntry(class CreativeItemRegistry *, class TypedServerNetId const &, class ItemInstance const &, unsigned int); + MCAPI CreativeItemEntry(class CreativeItemEntry &&); /** - * @symbol ??0CreativeItemEntry\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0CreativeItemEntry\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@I\@Z */ - MCAPI CreativeItemEntry(class CreativeItemEntry &&); + MCAPI CreativeItemEntry(class CreativeItemRegistry *, class TypedServerNetId const &, class ItemInstance const &, unsigned int); /** - * @symbol ?getCreativeNetId\@CreativeItemEntry\@\@QEBAAEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@XZ + * @symbol ?getCreativeNetId\@CreativeItemEntry\@\@QEBAAEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@XZ */ MCAPI class TypedServerNetId const & getCreativeNetId() const; /** - * @symbol ?getGroup\@CreativeItemEntry\@\@QEBAPEAVCreativeGroupInfo\@\@XZ + * @symbol ?getGroup\@CreativeItemEntry\@\@QEBAPEAVCreativeGroupInfo\@\@XZ */ MCAPI class CreativeGroupInfo * getGroup() const; /** - * @symbol ?getIndex\@CreativeItemEntry\@\@QEBAIXZ + * @symbol ?getIndex\@CreativeItemEntry\@\@QEBAIXZ */ MCAPI unsigned int getIndex() const; /** - * @symbol ?getItemInstance\@CreativeItemEntry\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getItemInstance\@CreativeItemEntry\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getItemInstance() const; //private: /** - * @symbol ?_setGroup\@CreativeItemEntry\@\@AEAAXPEAVCreativeGroupInfo\@\@\@Z + * @symbol ?_setGroup\@CreativeItemEntry\@\@AEAAXPEAVCreativeGroupInfo\@\@\@Z */ MCAPI void _setGroup(class CreativeGroupInfo *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp b/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp index 7af5eac3af..2ab610bf63 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemGroupCategory.hpp @@ -28,33 +28,39 @@ class CreativeItemGroupCategory { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVEITEMGROUPCATEGORY /** - * @symbol ??0CreativeItemGroupCategory\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI CreativeItemGroupCategory(); + MCVAPI ~CreativeItemGroupCategory(); +#endif /** - * @symbol ??0CreativeItemGroupCategory\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CreativeItemCategory\@\@\@Z + * @symbol ??0CreativeItemGroupCategory\@\@QEAA\@PEAVCreativeItemRegistry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CreativeItemCategory\@\@\@Z */ MCAPI CreativeItemGroupCategory(class CreativeItemRegistry *, std::string const &, enum class CreativeItemCategory); /** - * @symbol ?addAnonymousGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@XZ + * @symbol ??0CreativeItemGroupCategory\@\@QEAA\@XZ + */ + MCAPI CreativeItemGroupCategory(); + /** + * @symbol ?addAnonymousGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@XZ */ MCAPI class CreativeGroupInfo * addAnonymousGroup(); /** - * @symbol ?addChildGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@AEBVHashedString\@\@AEBVItemInstance\@\@\@Z + * @symbol ?addChildGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@AEBVHashedString\@\@AEBVItemInstance\@\@\@Z */ MCAPI class CreativeGroupInfo * addChildGroup(class HashedString const &, class ItemInstance const &); /** - * @symbol ?getChildGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@AEBVHashedString\@\@\@Z + * @symbol ?getChildGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@AEBVHashedString\@\@\@Z */ MCAPI class CreativeGroupInfo * getChildGroup(class HashedString const &); /** - * @symbol ?getCreativeCategory\@CreativeItemGroupCategory\@\@QEAA?AW4CreativeItemCategory\@\@XZ + * @symbol ?getCreativeCategory\@CreativeItemGroupCategory\@\@QEAA?AW4CreativeItemCategory\@\@XZ */ MCAPI enum class CreativeItemCategory getCreativeCategory(); /** - * @symbol ?getOrAddTailAnonymousGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@XZ + * @symbol ?getOrAddTailAnonymousGroup\@CreativeItemGroupCategory\@\@QEAAPEAVCreativeGroupInfo\@\@XZ */ MCAPI class CreativeGroupInfo * getOrAddTailAnonymousGroup(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp b/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp index 2485ded8d0..12d5d79930 100644 --- a/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/CreativeItemRegistry.hpp @@ -28,89 +28,95 @@ class CreativeItemRegistry { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_CREATIVEITEMREGISTRY /** - * @symbol ??0CreativeItemRegistry\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CreativeItemRegistry(); +#endif + /** + * @symbol ??0CreativeItemRegistry\@\@QEAA\@XZ */ MCAPI CreativeItemRegistry(); /** - * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI class CreativeItemEntry * findCreativeItemEntry(class TypedServerNetId const &); /** - * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBVItemInstance\@\@\@Z + * @symbol ?findCreativeItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBVItemInstance\@\@\@Z */ MCAPI class CreativeItemEntry * findCreativeItemEntry(class ItemInstance const &); /** - * @symbol ?getCreativeCategory\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemGroupCategory\@\@W4CreativeItemCategory\@\@\@Z + * @symbol ?getCreativeCategory\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemGroupCategory\@\@W4CreativeItemCategory\@\@\@Z */ MCAPI class CreativeItemGroupCategory * getCreativeCategory(enum class CreativeItemCategory); /** - * @symbol ?getCreativeGroup\@CreativeItemRegistry\@\@QEAAPEAVCreativeGroupInfo\@\@I\@Z + * @symbol ?getCreativeGroup\@CreativeItemRegistry\@\@QEAAPEAVCreativeGroupInfo\@\@I\@Z */ MCAPI class CreativeGroupInfo * getCreativeGroup(unsigned int); /** - * @symbol ?getCreativeItemEntries\@CreativeItemRegistry\@\@QEAAAEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getCreativeItemEntries\@CreativeItemRegistry\@\@QEAAAEBV?$vector\@VCreativeItemEntry\@\@V?$allocator\@VCreativeItemEntry\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getCreativeItemEntries(); /** - * @symbol ?getItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@I\@Z + * @symbol ?getItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@I\@Z */ MCAPI class CreativeItemEntry * getItemEntry(unsigned int); /** - * @symbol ?newCreativeCategory\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemGroupCategory\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CreativeItemCategory\@\@\@Z + * @symbol ?newCreativeCategory\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemGroupCategory\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CreativeItemCategory\@\@\@Z */ MCAPI class CreativeItemGroupCategory * newCreativeCategory(std::string const &, enum class CreativeItemCategory); /** - * @symbol ?newCreativeGroup\@CreativeItemRegistry\@\@QEAAPEAVCreativeGroupInfo\@\@W4CreativeItemCategory\@\@AEBVHashedString\@\@AEBVItemInstance\@\@\@Z + * @symbol ?newCreativeGroup\@CreativeItemRegistry\@\@QEAAPEAVCreativeGroupInfo\@\@W4CreativeItemCategory\@\@AEBVHashedString\@\@AEBVItemInstance\@\@\@Z */ MCAPI class CreativeGroupInfo * newCreativeGroup(enum class CreativeItemCategory, class HashedString const &, class ItemInstance const &); /** - * @symbol ?newItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@\@Z + * @symbol ?newItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@AEBV?$TypedServerNetId\@UCreativeItemNetIdTag\@\@I$0A\@\@\@AEBVItemInstance\@\@\@Z */ MCAPI class CreativeItemEntry * newItemEntry(class TypedServerNetId const &, class ItemInstance const &); /** - * @symbol ?resetGroups\@CreativeItemRegistry\@\@QEAAXXZ + * @symbol ?resetGroups\@CreativeItemRegistry\@\@QEAAXXZ */ MCAPI void resetGroups(); /** - * @symbol ?updateItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@IAEBVItemInstance\@\@\@Z + * @symbol ?updateItemEntry\@CreativeItemRegistry\@\@QEAAPEAVCreativeItemEntry\@\@IAEBVItemInstance\@\@\@Z */ MCAPI class CreativeItemEntry * updateItemEntry(unsigned int, class ItemInstance const &); /** - * @symbol ?updateNetIdMap\@CreativeItemRegistry\@\@QEAAXXZ + * @symbol ?updateNetIdMap\@CreativeItemRegistry\@\@QEAAXXZ */ MCAPI void updateNetIdMap(); /** - * @symbol ?current\@CreativeItemRegistry\@\@SAPEAV1\@XZ + * @symbol ?current\@CreativeItemRegistry\@\@SAPEAV1\@XZ */ MCAPI static class CreativeItemRegistry * current(); /** - * @symbol ?forEachCreativeItemInstance\@CreativeItemRegistry\@\@SAXV?$function\@$$A6A_NAEAVItemInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachCreativeItemInstance\@CreativeItemRegistry\@\@SAXV?$function\@$$A6A_NAEAVItemInstance\@\@\@Z\@std\@\@\@Z */ MCAPI static void forEachCreativeItemInstance(class std::function); /** - * @symbol ?mCreativeListMutex\@CreativeItemRegistry\@\@2Vmutex\@std\@\@A + * @symbol ?mCreativeListMutex\@CreativeItemRegistry\@\@2Vmutex\@std\@\@A */ MCAPI static class std::mutex mCreativeListMutex; /** - * @symbol ?reset\@CreativeItemRegistry\@\@SAXXZ + * @symbol ?reset\@CreativeItemRegistry\@\@SAXXZ */ MCAPI static void reset(); /** - * @symbol ?setCurrentRegistry\@CreativeItemRegistry\@\@SAX$$QEAV?$unique_ptr\@VCreativeItemRegistry\@\@U?$default_delete\@VCreativeItemRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setCurrentRegistry\@CreativeItemRegistry\@\@SAX$$QEAV?$unique_ptr\@VCreativeItemRegistry\@\@U?$default_delete\@VCreativeItemRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void setCurrentRegistry(std::unique_ptr &&); //private: /** - * @symbol ?_forEachCreativeItemInstance\@CreativeItemRegistry\@\@AEAAXV?$function\@$$A6A_NAEAVItemInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?_forEachCreativeItemInstance\@CreativeItemRegistry\@\@AEAAXV?$function\@$$A6A_NAEAVItemInstance\@\@\@Z\@std\@\@\@Z */ MCAPI void _forEachCreativeItemInstance(class std::function); private: /** - * @symbol ?mCurrentRegistry\@CreativeItemRegistry\@\@0V?$unique_ptr\@VCreativeItemRegistry\@\@U?$default_delete\@VCreativeItemRegistry\@\@\@std\@\@\@std\@\@A + * @symbol ?mCurrentRegistry\@CreativeItemRegistry\@\@0V?$unique_ptr\@VCreativeItemRegistry\@\@U?$default_delete\@VCreativeItemRegistry\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mCurrentRegistry; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp index 779b59fa3b..619acb6bbd 100644 --- a/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp +++ b/LiteLoader/include/llapi/mc/CreatorMetadataUtils.hpp @@ -5,9 +5,9 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" -#include "Scripting.hpp" #include "Json.hpp" +#include "Scripting.hpp" +#include "Core.hpp" #define BEFORE_EXTRA @@ -20,27 +20,35 @@ namespace CreatorMetadataUtils { #undef AFTER_EXTRA /** - * @symbol ?generateCommandsDocumentation\@CreatorMetadataUtils\@\@YAXAEAVCommandRegistry\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?_generateBlocksMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@XZ */ - MCAPI void generateCommandsDocumentation(class CommandRegistry &, class Core::Path const &); + MCAPI class Json::Value _generateBlocksMetadataJson(); /** - * @symbol ?generateModuleDocumentation\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@AEBUModuleBinding\@Scripting\@\@AEBUSupportedBindingModule\@5\@AEBUModuleBindingBundle\@5\@\@Z + * @symbol ?_generateScriptingModuleMetadataJson\@CreatorMetadataUtils\@\@YA?AVValue\@Json\@\@AEBUModuleBinding\@Scripting\@\@AEBUSupportedBindingModule\@5\@AEBUModuleBindingBundle\@5\@\@Z */ - MCAPI class Json::Value generateModuleDocumentation(struct Scripting::ModuleBinding const &, struct Scripting::SupportedBindingModule const &, struct Scripting::ModuleBindingBundle const &); + MCAPI class Json::Value _generateScriptingModuleMetadataJson(struct Scripting::ModuleBinding const &, struct Scripting::SupportedBindingModule const &, struct Scripting::ModuleBindingBundle const &); + /** + * @symbol ?generateBlocksDocumentation\@CreatorMetadataUtils\@\@YAXAEBVPath\@Core\@\@\@Z + */ + MCAPI void generateBlocksDocumentation(class Core::Path const &); + /** + * @symbol ?generateCommandsDocumentation\@CreatorMetadataUtils\@\@YAXAEAVCommandRegistry\@\@AEBVPath\@Core\@\@\@Z + */ + MCAPI void generateCommandsDocumentation(class CommandRegistry &, class Core::Path const &); /** - * @symbol ?generateScriptingDocumentation\@CreatorMetadataUtils\@\@YAXAEAVScriptEngine\@Scripting\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?generateScriptingDocumentation\@CreatorMetadataUtils\@\@YAXAEAVScriptEngine\@Scripting\@\@AEBVPath\@Core\@\@\@Z */ MCAPI void generateScriptingDocumentation(class Scripting::ScriptEngine &, class Core::Path const &); /** - * @symbol ?getGameSemVersionAsString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getGameSemVersionAsString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getGameSemVersionAsString(); /** - * @symbol ?scriptingVersionToString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUVersion\@Scripting\@\@\@Z + * @symbol ?scriptingVersionToString\@CreatorMetadataUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUVersion\@Scripting\@\@\@Z */ MCAPI std::string scriptingVersionToString(struct Scripting::Version const &); /** - * @symbol ?writeJsonMetadataToFile\@CreatorMetadataUtils\@\@YA_NAEBVValue\@Json\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?writeJsonMetadataToFile\@CreatorMetadataUtils\@\@YA_NAEBVValue\@Json\@\@AEBVPath\@Core\@\@\@Z */ MCAPI bool writeJsonMetadataToFile(class Json::Value const &, class Core::Path const &); diff --git a/LiteLoader/include/llapi/mc/Creeper.hpp b/LiteLoader/include/llapi/mc/Creeper.hpp index 17f59e5424..1bf1ac3722 100644 --- a/LiteLoader/include/llapi/mc/Creeper.hpp +++ b/LiteLoader/include/llapi/mc/Creeper.hpp @@ -32,173 +32,168 @@ class Creeper : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Creeper(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Creeper\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Creeper\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@Creeper\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Creeper\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Creeper\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Creeper\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Creeper\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Creeper\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Creeper(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getSwellDir\@Creeper\@\@QEAAHXZ + * @symbol ?getSwellDir\@Creeper\@\@QEAAHXZ */ MCAPI int getSwellDir(); /** - * @symbol ?getSwelling\@Creeper\@\@QEBAMM\@Z + * @symbol ?getSwelling\@Creeper\@\@QEBAMM\@Z */ MCAPI float getSwelling(float) const; /** - * @symbol ?tryGetFromEntity\@Creeper\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Creeper\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class Creeper * tryGetFromEntity(class EntityContext &, bool); //private: /** - * @symbol ?_setSwellDir\@Creeper\@\@AEAAXH\@Z + * @symbol ?_setSwellDir\@Creeper\@\@AEAAXH\@Z */ MCAPI void _setSwellDir(int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CroakGoal.hpp b/LiteLoader/include/llapi/mc/CroakGoal.hpp index ef181c4154..ce2c85021d 100644 --- a/LiteLoader/include/llapi/mc/CroakGoal.hpp +++ b/LiteLoader/include/llapi/mc/CroakGoal.hpp @@ -28,48 +28,48 @@ class CroakGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CroakGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@CroakGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@CroakGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@CroakGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@CroakGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@CroakGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@CroakGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@CroakGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@CroakGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@CroakGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@CroakGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0CroakGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0CroakGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI CroakGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CropBlock.hpp b/LiteLoader/include/llapi/mc/CropBlock.hpp index 24245f364f..55fd8d5b58 100644 --- a/LiteLoader/include/llapi/mc/CropBlock.hpp +++ b/LiteLoader/include/llapi/mc/CropBlock.hpp @@ -31,297 +31,306 @@ class CropBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CropBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?hasTag\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?hasTag\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@CropBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@CropBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@CropBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@CropBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@CropBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@CropBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 118 - * @symbol ?executeEvent\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @vftbl 118 + * @symbol ?executeEvent\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ virtual void executeEvent(class BlockSource &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@CropBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@CropBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CropBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@CropBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 194 + * @symbol __unk_vfn_194 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_194(); /** - * @vftbl 194 - * @symbol ?getBaseSeed\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ + * @vftbl 195 + * @symbol ?getBaseSeed\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 195 - * @symbol ?getBaseCrop\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ + * @vftbl 196 + * @symbol ?getBaseCrop\@CropBlock\@\@MEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 196 - * @symbol ?getSeedNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z + * @vftbl 197 + * @symbol ?getSeedNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z */ virtual int getSeedNum(class Randomize &, int, int) const; /** - * @vftbl 197 - * @symbol ?getCropNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z + * @vftbl 198 + * @symbol ?getCropNum\@CropBlock\@\@MEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CROPBLOCK /** - * @symbol ?canBeSilkTouched\@CropBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@CropBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~CropBlock(); #endif /** - * @symbol ??0CropBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CropBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CropBlock(std::string const &, int); //private: /** - * @symbol ?getGrowthSpeed\@CropBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getGrowthSpeed\@CropBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI float getGrowthSpeed(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrossbowEnchant.hpp b/LiteLoader/include/llapi/mc/CrossbowEnchant.hpp index 003b330032..9c40494855 100644 --- a/LiteLoader/include/llapi/mc/CrossbowEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CrossbowEnchant.hpp @@ -31,91 +31,91 @@ class CrossbowEnchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CrossbowEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isCompatibleWith\@CrossbowEnchant\@\@UEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 1 + * @symbol ?isCompatibleWith\@CrossbowEnchant\@\@UEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool isCompatibleWith(enum class Enchant::Type) const; /** - * @vftbl 2 - * @symbol ?getMinCost\@CrossbowEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@CrossbowEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@CrossbowEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@CrossbowEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?getMaxLevel\@CrossbowEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@CrossbowEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@CrossbowEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@CrossbowEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; /** - * @symbol ??0CrossbowEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0CrossbowEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI CrossbowEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI CrossbowEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); //private: private: /** - * @symbol ?VALID_ENCHANTMENTS\@CrossbowEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B + * @symbol ?VALID_ENCHANTMENTS\@CrossbowEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const VALID_ENCHANTMENTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CrossbowItem.hpp b/LiteLoader/include/llapi/mc/CrossbowItem.hpp index e31f1a23f9..d5134b3d45 100644 --- a/LiteLoader/include/llapi/mc/CrossbowItem.hpp +++ b/LiteLoader/include/llapi/mc/CrossbowItem.hpp @@ -32,157 +32,157 @@ class CrossbowItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CrossbowItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getMaxUseDuration\@CrossbowItem\@\@UEBAHPEBVItemStack\@\@\@Z + * @vftbl 6 + * @symbol ?getMaxUseDuration\@CrossbowItem\@\@UEBAHPEBVItemStack\@\@\@Z */ virtual int getMaxUseDuration(class ItemStack const *) const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@CrossbowItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@CrossbowItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@CrossbowItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@CrossbowItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@CrossbowItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@CrossbowItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@CrossbowItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@CrossbowItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @vftbl 112 - * @symbol ?enchantProjectile\@CrossbowItem\@\@UEBAXAEBVItemStackBase\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?enchantProjectile\@CrossbowItem\@\@UEBAXAEBVItemStackBase\@\@AEAVActor\@\@\@Z */ virtual void enchantProjectile(class ItemStackBase const &, class Actor &) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@CrossbowItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@CrossbowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@CrossbowItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 120 - * @symbol ?getAnimationFrameFor\@CrossbowItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@CrossbowItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 124 - * @symbol ?canBeCharged\@CrossbowItem\@\@UEBA_NXZ + * @vftbl 124 + * @symbol ?canBeCharged\@CrossbowItem\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @vftbl 126 - * @symbol ?playSoundIncrementally\@CrossbowItem\@\@UEBAXAEBVItemStack\@\@AEAVMob\@\@\@Z + * @vftbl 126 + * @symbol ?playSoundIncrementally\@CrossbowItem\@\@UEBAXAEBVItemStack\@\@AEAVMob\@\@\@Z */ virtual void playSoundIncrementally(class ItemStack const &, class Mob &) const; /** - * @symbol ??0CrossbowItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CrossbowItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CrossbowItem(std::string const &, int); //private: /** - * @symbol ?_getMaxUseDuration\@CrossbowItem\@\@AEBA?BHAEBVItemStack\@\@\@Z + * @symbol ?_getMaxUseDuration\@CrossbowItem\@\@AEBA?BHAEBVItemStack\@\@\@Z */ MCAPI int const _getMaxUseDuration(class ItemStack const &) const; /** - * @symbol ?_getShootDir\@CrossbowItem\@\@AEBA?AVVec3\@\@AEBVPlayer\@\@M\@Z + * @symbol ?_getShootDir\@CrossbowItem\@\@AEBA?AVVec3\@\@AEBVPlayer\@\@M\@Z */ MCAPI class Vec3 _getShootDir(class Player const &, float) const; /** - * @symbol ?_shootArrow\@CrossbowItem\@\@AEBAXAEBVItemInstance\@\@0AEAVPlayer\@\@\@Z + * @symbol ?_shootArrow\@CrossbowItem\@\@AEBAXAEBVItemInstance\@\@0AEAVPlayer\@\@\@Z */ MCAPI void _shootArrow(class ItemInstance const &, class ItemInstance const &, class Player &) const; /** - * @symbol ?_shootFirework\@CrossbowItem\@\@AEBAXAEBVItemInstance\@\@AEAVPlayer\@\@\@Z + * @symbol ?_shootFirework\@CrossbowItem\@\@AEBAXAEBVItemInstance\@\@AEAVPlayer\@\@\@Z */ MCAPI void _shootFirework(class ItemInstance const &, class Player &) const; private: /** - * @symbol ?DEFAULT_USE_DURATION\@CrossbowItem\@\@0HB + * @symbol ?DEFAULT_USE_DURATION\@CrossbowItem\@\@0HB */ MCAPI static int const DEFAULT_USE_DURATION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp index 48d5105f9d..94a9ffa386 100644 --- a/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/CryingObsidianBlock.hpp @@ -31,208 +31,213 @@ class CryingObsidianBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CryingObsidianBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@CryingObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@CryingObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@CryingObsidianBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@CryingObsidianBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@CryingObsidianBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@CryingObsidianBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0CryingObsidianBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0CryingObsidianBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI CryingObsidianBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Crypto.hpp b/LiteLoader/include/llapi/mc/Crypto.hpp index 58b46e1861..f19e35978b 100644 --- a/LiteLoader/include/llapi/mc/Crypto.hpp +++ b/LiteLoader/include/llapi/mc/Crypto.hpp @@ -30,7 +30,7 @@ class md5 { #undef AFTER_EXTRA /** - * @symbol ?init\@Crypto\@\@YAXXZ + * @symbol ?init\@Crypto\@\@YAXXZ */ MCAPI void init(); diff --git a/LiteLoader/include/llapi/mc/CryptoUtils.hpp b/LiteLoader/include/llapi/mc/CryptoUtils.hpp index 1d66cf34ab..fbaf560867 100644 --- a/LiteLoader/include/llapi/mc/CryptoUtils.hpp +++ b/LiteLoader/include/llapi/mc/CryptoUtils.hpp @@ -23,11 +23,11 @@ namespace CryptoUtils { #undef AFTER_EXTRA /** - * @symbol ?getDirectroyChecksum\@CryptoUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?getDirectroyChecksum\@CryptoUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCAPI std::string getDirectroyChecksum(class Core::Path const &); /** - * @symbol ?getFileChecksum\@CryptoUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?getFileChecksum\@CryptoUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCAPI std::string getFileChecksum(class Core::Path const &); diff --git a/LiteLoader/include/llapi/mc/CurrentRailBlockDataComponent.hpp b/LiteLoader/include/llapi/mc/CurrentRailBlockDataComponent.hpp deleted file mode 100644 index a2cc3aeed5..0000000000 --- a/LiteLoader/include/llapi/mc/CurrentRailBlockDataComponent.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file CurrentRailBlockDataComponent.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure CurrentRailBlockDataComponent. - * - */ -struct CurrentRailBlockDataComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_CURRENTRAILBLOCKDATACOMPONENT -public: - struct CurrentRailBlockDataComponent& operator=(struct CurrentRailBlockDataComponent const &) = delete; - CurrentRailBlockDataComponent(struct CurrentRailBlockDataComponent const &) = delete; - CurrentRailBlockDataComponent() = delete; -#endif - -public: - /** - * @symbol ??1CurrentRailBlockDataComponent@@QEAA@XZ - * @hash 933994621 - */ - MCAPI ~CurrentRailBlockDataComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp b/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp index 00c4e87ca8..a382ae13ec 100644 --- a/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp +++ b/LiteLoader/include/llapi/mc/CurrentSwimAmountSystem.hpp @@ -28,16 +28,16 @@ class CurrentSwimAmountSystem { public: /** - * @symbol ?createSystem\@CurrentSwimAmountSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@CurrentSwimAmountSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doCurrentSwimAmountSystem\@CurrentSwimAmountSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUCurrentSwimAmountComponent\@\@AEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?_doCurrentSwimAmountSystem\@CurrentSwimAmountSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUCurrentSwimAmountComponent\@\@AEBUSynchedActorDataComponent\@\@\@Z */ MCAPI static void _doCurrentSwimAmountSystem(class StrictEntityContext const &, struct CurrentSwimAmountComponent &, struct SynchedActorDataComponent const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp b/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp index 8266eabe96..c0685cfc1c 100644 --- a/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CurseBindingEnchant.hpp @@ -31,49 +31,49 @@ class CurseBindingEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CurseBindingEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@CurseBindingEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@CurseBindingEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@CurseBindingEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@CurseBindingEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CURSEBINDINGENCHANT /** - * @symbol ?isTreasureOnly\@CurseBindingEnchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@CurseBindingEnchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; #endif /** - * @symbol ??0CurseBindingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0CurseBindingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI CurseBindingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI CurseBindingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp b/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp index ff12f448c1..f99396a39b 100644 --- a/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/CurseVanishingEnchant.hpp @@ -31,49 +31,49 @@ class CurseVanishingEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CurseVanishingEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@CurseVanishingEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@CurseVanishingEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@CurseVanishingEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@CurseVanishingEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CURSEVANISHINGENCHANT /** - * @symbol ?isTreasureOnly\@CurseVanishingEnchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@CurseVanishingEnchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; #endif /** - * @symbol ??0CurseVanishingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0CurseVanishingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI CurseVanishingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI CurseVanishingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CursorContainerValidation.hpp b/LiteLoader/include/llapi/mc/CursorContainerValidation.hpp index 9327c4d4b6..e42f70ea5c 100644 --- a/LiteLoader/include/llapi/mc/CursorContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/CursorContainerValidation.hpp @@ -31,60 +31,60 @@ class CursorContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CursorContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@CursorContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@CursorContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_CURSORCONTAINERVALIDATION /** - * @symbol ?canItemMoveToContainer\@CursorContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@CursorContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CustomSaveComponent.hpp b/LiteLoader/include/llapi/mc/CustomSaveComponent.hpp index f16a8fcb7e..613c46abb3 100644 --- a/LiteLoader/include/llapi/mc/CustomSaveComponent.hpp +++ b/LiteLoader/include/llapi/mc/CustomSaveComponent.hpp @@ -30,8 +30,8 @@ class CustomSaveComponent { public: /** - * @symbol ?save\@CustomSaveComponent\@\@QEAA_NAEAVLevelStorage\@\@AEAVActor\@\@\@Z + * @symbol ?save\@CustomSaveComponent\@\@QEAA_NAEAVLevelStorage\@\@AEAVActor\@\@\@Z */ MCAPI bool save(class LevelStorage &, class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp index 373089b23a..ceaa8d5f19 100644 --- a/LiteLoader/include/llapi/mc/CutCopperSlab.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperSlab.hpp @@ -31,246 +31,251 @@ class CutCopperSlab : public SlabBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CutCopperSlab(); + virtual void __unk_vfn_0(); /** - * @vftbl 16 - * @symbol ?onLightningHit\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?onLightningHit\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 28 - * @symbol ?tryGetCopperBehavior\@CutCopperSlab\@\@UEBAPEBVCopperBehavior\@\@XZ + * @vftbl 28 + * @symbol ?tryGetCopperBehavior\@CutCopperSlab\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CutCopperSlab\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CutCopperSlab\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CutCopperSlab\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 194 + * @symbol __unk_vfn_194 */ virtual void __unk_vfn_194(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 195 + * @symbol __unk_vfn_195 */ virtual void __unk_vfn_195(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 198 + * @symbol __unk_vfn_198 + */ + virtual void __unk_vfn_198(); + /** + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDescriptionId() const; /** - * @symbol ??0CutCopperSlab\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVHashedString\@\@W4CopperType\@\@2\@Z + * @symbol ??0CutCopperSlab\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVHashedString\@\@W4CopperType\@\@2\@Z */ MCAPI CutCopperSlab(std::string const &, int, bool, class HashedString const &, enum class CopperType, class HashedString const &); /** - * @symbol ??0CutCopperSlab\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVHashedString\@\@W4CopperType\@\@222\@Z + * @symbol ??0CutCopperSlab\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVHashedString\@\@W4CopperType\@\@222\@Z */ MCAPI CutCopperSlab(std::string const &, int, bool, class HashedString const &, enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp index cffbb3e6f9..f94f02e38f 100644 --- a/LiteLoader/include/llapi/mc/CutCopperStairs.hpp +++ b/LiteLoader/include/llapi/mc/CutCopperStairs.hpp @@ -31,246 +31,251 @@ class CutCopperStairs : public StairBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~CutCopperStairs(); + virtual void __unk_vfn_0(); /** - * @vftbl 16 - * @symbol ?onLightningHit\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?onLightningHit\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 28 - * @symbol ?tryGetCopperBehavior\@CutCopperStairs\@\@UEBAPEBVCopperBehavior\@\@XZ + * @vftbl 28 + * @symbol ?tryGetCopperBehavior\@CutCopperStairs\@\@UEBAPEBVCopperBehavior\@\@XZ */ virtual class CopperBehavior const * tryGetCopperBehavior() const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@CutCopperStairs\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@CutCopperStairs\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@CutCopperStairs\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 194 + * @symbol __unk_vfn_194 */ virtual void __unk_vfn_194(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 195 + * @symbol __unk_vfn_195 */ virtual void __unk_vfn_195(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 198 + * @symbol __unk_vfn_198 */ - MCAPI std::string const & getDescriptionId() const; + virtual void __unk_vfn_198(); /** - * @symbol ??0CutCopperStairs\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@W4CopperType\@\@AEBVHashedString\@\@\@Z + * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - MCAPI CutCopperStairs(std::string const &, int, class BlockLegacy const &, enum class CopperType, class HashedString const &); + MCAPI std::string const & getDescriptionId() const; /** - * @symbol ??0CutCopperStairs\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@W4CopperType\@\@AEBVHashedString\@\@33\@Z + * @symbol ??0CutCopperStairs\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@W4CopperType\@\@AEBVHashedString\@\@33\@Z */ MCAPI CutCopperStairs(std::string const &, int, class BlockLegacy const &, enum class CopperType, class HashedString const &, class HashedString const &, class HashedString const &); + /** + * @symbol ??0CutCopperStairs\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@W4CopperType\@\@AEBVHashedString\@\@\@Z + */ + MCAPI CutCopperStairs(std::string const &, int, class BlockLegacy const &, enum class CopperType, class HashedString const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DBChunkStorage.hpp b/LiteLoader/include/llapi/mc/DBChunkStorage.hpp index 7ed9aff5d7..f95b404a63 100644 --- a/LiteLoader/include/llapi/mc/DBChunkStorage.hpp +++ b/LiteLoader/include/llapi/mc/DBChunkStorage.hpp @@ -34,194 +34,186 @@ class DBChunkStorage : public ChunkSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DBChunkStorage(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shutdown\@DBChunkStorage\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?shutdown\@DBChunkStorage\@\@UEAAXXZ */ virtual void shutdown(); /** - * @vftbl 2 - * @symbol ?isShutdownDone\@DBChunkStorage\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?isShutdownDone\@DBChunkStorage\@\@UEAA_NXZ */ virtual bool isShutdownDone(); /** - * @vftbl 5 - * @symbol ?isChunkKnown\@DBChunkStorage\@\@UEAA_NAEBVChunkPos\@\@\@Z + * @vftbl 5 + * @symbol ?isChunkKnown\@DBChunkStorage\@\@UEAA_NAEBVChunkPos\@\@\@Z */ virtual bool isChunkKnown(class ChunkPos const &); /** - * @vftbl 6 - * @symbol ?isChunkSaved\@DBChunkStorage\@\@UEAA_NAEBVChunkPos\@\@\@Z + * @vftbl 6 + * @symbol ?isChunkSaved\@DBChunkStorage\@\@UEAA_NAEBVChunkPos\@\@\@Z */ virtual bool isChunkSaved(class ChunkPos const &); /** - * @vftbl 9 - * @symbol ?postProcess\@DBChunkStorage\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + * @vftbl 9 + * @symbol ?postProcess\@DBChunkStorage\@\@UEAA_NAEAVChunkViewSource\@\@\@Z */ virtual bool postProcess(class ChunkViewSource &); /** - * @vftbl 10 - * @symbol ?checkAndReplaceChunk\@DBChunkStorage\@\@UEAAXAEAVChunkViewSource\@\@AEAVLevelChunk\@\@\@Z + * @vftbl 10 + * @symbol ?checkAndReplaceChunk\@DBChunkStorage\@\@UEAAXAEAVChunkViewSource\@\@AEAVLevelChunk\@\@\@Z */ virtual void checkAndReplaceChunk(class ChunkViewSource &, class LevelChunk &); /** - * @vftbl 11 - * @symbol ?loadChunk\@DBChunkStorage\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @vftbl 11 + * @symbol ?loadChunk\@DBChunkStorage\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ virtual void loadChunk(class LevelChunk &, bool); /** - * @vftbl 13 - * @symbol ?saveLiveChunk\@DBChunkStorage\@\@UEAA_NAEAVLevelChunk\@\@\@Z + * @vftbl 13 + * @symbol ?saveLiveChunk\@DBChunkStorage\@\@UEAA_NAEAVLevelChunk\@\@\@Z */ virtual bool saveLiveChunk(class LevelChunk &); /** - * @vftbl 14 - * @symbol ?writeEntityChunkTransfer\@DBChunkStorage\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @vftbl 14 + * @symbol ?writeEntityChunkTransfer\@DBChunkStorage\@\@UEAAXAEAVLevelChunk\@\@\@Z */ virtual void writeEntityChunkTransfer(class LevelChunk &); /** - * @vftbl 15 - * @symbol ?writeEntityChunkTransfersToUnloadedChunk\@DBChunkStorage\@\@UEAAXAEBVChunkKey\@\@AEBV?$vector\@UActorUnloadedChunkTransferEntry\@\@V?$allocator\@UActorUnloadedChunkTransferEntry\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 15 + * @symbol ?writeEntityChunkTransfersToUnloadedChunk\@DBChunkStorage\@\@UEAAXAEBVChunkKey\@\@AEBV?$vector\@UActorUnloadedChunkTransferEntry\@\@V?$allocator\@UActorUnloadedChunkTransferEntry\@\@\@std\@\@\@std\@\@\@Z */ virtual void writeEntityChunkTransfersToUnloadedChunk(class ChunkKey const &, std::vector const &); /** - * @vftbl 16 - * @symbol ?hintDiscardBatchBegin\@DBChunkStorage\@\@UEAAXXZ + * @vftbl 16 + * @symbol ?hintDiscardBatchBegin\@DBChunkStorage\@\@UEAAXXZ */ virtual void hintDiscardBatchBegin(); /** - * @vftbl 17 - * @symbol ?hintDiscardBatchEnd\@DBChunkStorage\@\@UEAAXXZ + * @vftbl 17 + * @symbol ?hintDiscardBatchEnd\@DBChunkStorage\@\@UEAAXXZ */ virtual void hintDiscardBatchEnd(); /** - * @vftbl 18 - * @symbol ?acquireDiscarded\@DBChunkStorage\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z + * @vftbl 18 + * @symbol ?acquireDiscarded\@DBChunkStorage\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z */ virtual void acquireDiscarded(class std::unique_ptr); /** - * @vftbl 20 - * @symbol ?flushPendingDiscardedChunkWrites\@DBChunkStorage\@\@UEAAXXZ + * @vftbl 20 + * @symbol ?flushPendingDiscardedChunkWrites\@DBChunkStorage\@\@UEAAXXZ */ virtual void flushPendingDiscardedChunkWrites(); /** - * @vftbl 21 - * @symbol ?flushThreadBatch\@DBChunkStorage\@\@UEAAXXZ + * @vftbl 21 + * @symbol ?flushThreadBatch\@DBChunkStorage\@\@UEAAXXZ */ virtual void flushThreadBatch(); /** - * @vftbl 27 - * @symbol ?tryGetBlendingDataProvider\@DBChunkStorage\@\@UEAA?AV?$unique_ptr\@VBlendingDataProvider\@\@U?$default_delete\@VBlendingDataProvider\@\@\@std\@\@\@std\@\@XZ + * @vftbl 27 + * @symbol ?tryGetBlendingDataProvider\@DBChunkStorage\@\@UEAA?AV?$unique_ptr\@VBlendingDataProvider\@\@U?$default_delete\@VBlendingDataProvider\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryGetBlendingDataProvider(); /** - * @vftbl 28 - * @symbol ?loadLevelChunkMetaDataDictionary\@DBChunkStorage\@\@UEAA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + * @vftbl 28 + * @symbol ?loadLevelChunkMetaDataDictionary\@DBChunkStorage\@\@UEAA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ */ virtual class std::shared_ptr loadLevelChunkMetaDataDictionary(); /** - * @symbol ??0DBChunkStorage\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEAVDBStorage\@\@AEAVScheduler\@\@AEBVExperiments\@\@\@Z + * @symbol ??0DBChunkStorage\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEAVDBStorage\@\@AEAVScheduler\@\@AEBVExperiments\@\@\@Z */ MCAPI DBChunkStorage(std::unique_ptr, class DBStorage &, class Scheduler &, class Experiments const &); /** - * @symbol ?freeCaches\@DBChunkStorage\@\@QEAAXXZ + * @symbol ?freeCaches\@DBChunkStorage\@\@QEAAXXZ */ MCAPI void freeCaches(); /** - * @symbol ?_getBlenderMode\@DBChunkStorage\@\@SA?AW4BlenderMode\@ConsoleChunkBlender\@\@AEBVLevelChunk\@\@AEBVExperiments\@\@\@Z + * @symbol ?_getBlenderMode\@DBChunkStorage\@\@SA?AW4BlenderMode\@ConsoleChunkBlender\@\@AEBVLevelChunk\@\@AEBVExperiments\@\@\@Z */ MCAPI static enum class ConsoleChunkBlender::BlenderMode _getBlenderMode(class LevelChunk const &, class Experiments const &); /** - * @symbol ?deserializeActorStorageToString\@DBChunkStorage\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NAEBV23\@V?$function\@$$A6A_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@3\@\@Z + * @symbol ?deserializeActorStorageToString\@DBChunkStorage\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NAEBV23\@V?$function\@$$A6A_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z\@3\@\@Z */ - MCAPI static std::string deserializeActorStorageToString(bool, std::string const &, class std::function, std::string &)>); + MCAPI static std::string deserializeActorStorageToString(bool, std::string const &, class std::function>, std::string &)>); //private: /** - * @symbol ?_cacheSeamlessChunkBlendingData\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$shared_ptr\@VBlendingData\@\@\@std\@\@\@std\@\@VChunkPos\@\@_NV?$shared_ptr\@VBlendingData\@\@\@3\@\@Z + * @symbol ?_cacheSeamlessChunkBlendingData\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$shared_ptr\@VBlendingData\@\@\@std\@\@\@std\@\@VChunkPos\@\@_NV?$shared_ptr\@VBlendingData\@\@\@3\@\@Z */ MCAPI struct std::pair> _cacheSeamlessChunkBlendingData(class ChunkPos, bool, class std::shared_ptr); /** - * @symbol ?_checkSubChunksUseAbsoluteIndices\@DBChunkStorage\@\@AEBA_NVDBChunkStorageKey\@\@AEBVLevelChunk\@\@AEA_N\@Z + * @symbol ?_checkSubChunksUseAbsoluteIndices\@DBChunkStorage\@\@AEBA_NVDBChunkStorageKey\@\@AEBVLevelChunk\@\@AEA_N\@Z */ MCAPI bool _checkSubChunksUseAbsoluteIndices(class DBChunkStorageKey, class LevelChunk const &, bool &) const; /** - * @symbol ?_deserializeIndependentActorStorage\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_deserializeIndependentActorStorage\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _deserializeIndependentActorStorage(class LevelChunk &, std::string const &); /** - * @symbol ?_getChunkNeighbors\@DBChunkStorage\@\@AEAA?AVNeighbors\@LevelChunk\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?_getChunkNeighbors\@DBChunkStorage\@\@AEAA?AVNeighbors\@LevelChunk\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class LevelChunk::Neighbors _getChunkNeighbors(class ChunkPos, class AutomaticID); /** - * @symbol ?_getLevelChunkFormat\@DBChunkStorage\@\@AEAA?AV?$optional\@W4LevelChunkFormat\@\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z - */ - MCAPI class std::optional _getLevelChunkFormat(class gsl::basic_string_span, std::string &); - /** - * @symbol ?_hasChunk\@DBChunkStorage\@\@AEAA_NAEBVDBChunkStorageKey\@\@\@Z + * @symbol ?_hasChunk\@DBChunkStorage\@\@AEAA_NAEBVDBChunkStorageKey\@\@\@Z */ MCAPI bool _hasChunk(class DBChunkStorageKey const &); /** - * @symbol ?_hasChunkUncached\@DBChunkStorage\@\@AEAA_NAEBVDBChunkStorageKey\@\@\@Z + * @symbol ?_hasChunkUncached\@DBChunkStorage\@\@AEAA_NAEBVDBChunkStorageKey\@\@\@Z */ MCAPI bool _hasChunkUncached(class DBChunkStorageKey const &); /** - * @symbol ?_levelChunkCanBeUsedForBlending\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$unique_ptr\@UPersistentBlendData\@\@U?$default_delete\@UPersistentBlendData\@\@\@std\@\@\@std\@\@\@std\@\@AEBVDBChunkStorageKey\@\@\@Z + * @symbol ?_levelChunkCanBeUsedForBlending\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$unique_ptr\@UPersistentBlendData\@\@U?$default_delete\@UPersistentBlendData\@\@\@std\@\@\@std\@\@\@std\@\@AEBVDBChunkStorageKey\@\@\@Z */ MCAPI struct std::pair> _levelChunkCanBeUsedForBlending(class DBChunkStorageKey const &); /** - * @symbol ?_loadChunkFromDB\@DBChunkStorage\@\@AEAA_NAEAVLevelChunk\@\@0AEAVChunkViewSource\@\@\@Z + * @symbol ?_loadChunkFromDB\@DBChunkStorage\@\@AEAA_NAEAVLevelChunk\@\@0AEAVChunkViewSource\@\@\@Z */ MCAPI bool _loadChunkFromDB(class LevelChunk &, class LevelChunk &, class ChunkViewSource &); /** - * @symbol ?_saveBlendData\@DBChunkStorage\@\@AEBAXAEAVLevelStorageWriteBatch\@\@AEBV?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UPersistentBlendData\@\@\@Z + * @symbol ?_saveBlendData\@DBChunkStorage\@\@AEBAXAEAVLevelStorageWriteBatch\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@4\@UPersistentBlendData\@\@\@Z */ - MCAPI void _saveBlendData(class LevelStorageWriteBatch &, class gsl::basic_string_span const &, std::string &, struct PersistentBlendData) const; + MCAPI void _saveBlendData(class LevelStorageWriteBatch &, class std::basic_string_view> const &, std::string &, struct PersistentBlendData) const; /** - * @symbol ?_serializeChunk\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@AEAVLevelStorageWriteBatch\@\@_N\@Z + * @symbol ?_serializeChunk\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@AEAVLevelStorageWriteBatch\@\@_N\@Z */ MCAPI void _serializeChunk(class LevelChunk &, class LevelStorageWriteBatch &, bool); /** - * @symbol ?_serializeEntities\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@AEAVLevelStorageWriteBatch\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?_serializeEntities\@DBChunkStorage\@\@AEAAXAEAVLevelChunk\@\@AEAVLevelStorageWriteBatch\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void _serializeEntities(class LevelChunk &, class LevelStorageWriteBatch &, std::string &, bool); /** - * @symbol ?_tryGetBlendingDataForChunk\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$shared_ptr\@VBlendingData\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @symbol ?_tryGetBlendingDataForChunk\@DBChunkStorage\@\@AEAA?AU?$pair\@_NV?$shared_ptr\@VBlendingData\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ MCAPI struct std::pair> _tryGetBlendingDataForChunk(class ChunkPos const &); /** - * @symbol ?_upgradeActorStorage\@DBChunkStorage\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VChunkKey\@\@AEAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?_upgradeActorStorage\@DBChunkStorage\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VChunkKey\@\@AEAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string _upgradeActorStorage(class ChunkKey, class gsl::basic_string_span &); + MCAPI std::string _upgradeActorStorage(class ChunkKey, class std::basic_string_view> &); /** - * @symbol ?_writeActorDigest\@DBChunkStorage\@\@AEAAXAEAVLevelStorageWriteBatch\@\@AEBVChunkKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_writeActorDigest\@DBChunkStorage\@\@AEAAXAEAVLevelStorageWriteBatch\@\@AEBVChunkKey\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _writeActorDigest(class LevelStorageWriteBatch &, class ChunkKey const &, std::string const &); /** - * @symbol ?_writeActorDigestFormatVersion\@DBChunkStorage\@\@AEAAXAEAVLevelStorageWriteBatch\@\@AEBVChunkKey\@\@W4ActorDigestFormat\@\@\@Z - */ - MCAPI void _writeActorDigestFormatVersion(class LevelStorageWriteBatch &, class ChunkKey const &, enum class ActorDigestFormat); - /** - * @symbol ?_writeDiscardChunksBatch\@DBChunkStorage\@\@AEAAXXZ + * @symbol ?_writeDiscardChunksBatch\@DBChunkStorage\@\@AEAAXXZ */ MCAPI void _writeDiscardChunksBatch(); /** - * @symbol ?_deserializeChunkActorStorageKeys\@DBChunkStorage\@\@CA?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\@\@AEAVIDataInput\@\@\@Z + * @symbol ?_deserializeChunkActorStorageKeys\@DBChunkStorage\@\@CA?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\@\@AEAVIDataInput\@\@\@Z */ MCAPI static std::vector _deserializeChunkActorStorageKeys(class IDataInput &); private: /** - * @symbol ?threadBatch\@DBChunkStorage\@\@0V?$ThreadLocalObject\@VLevelStorageWriteBatch\@\@V?$allocator\@VLevelStorageWriteBatch\@\@\@std\@\@\@Threading\@Bedrock\@\@A + * @symbol ?threadBatch\@DBChunkStorage\@\@0V?$ThreadLocalObject\@VLevelStorageWriteBatch\@\@V?$allocator\@VLevelStorageWriteBatch\@\@\@std\@\@\@Threading\@Bedrock\@\@A */ MCAPI static class Bedrock::Threading::ThreadLocalObject> threadBatch; /** - * @symbol ?threadBuffer\@DBChunkStorage\@\@0V?$ThreadLocalObject\@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\@\@Threading\@Bedrock\@\@A + * @symbol ?threadBuffer\@DBChunkStorage\@\@0V?$ThreadLocalObject\@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\@\@Threading\@Bedrock\@\@A */ MCAPI static class Bedrock::Threading::ThreadLocalObject> threadBuffer; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp b/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp index d1e30bdc6a..2042dc5f0d 100644 --- a/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp +++ b/LiteLoader/include/llapi/mc/DBLoggingUtils.hpp @@ -20,8 +20,8 @@ namespace DBLoggingUtils { #undef AFTER_EXTRA /** - * @symbol ?toPrintableDBKey\@DBLoggingUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?toPrintableDBKey\@DBLoggingUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string toPrintableDBKey(class gsl::basic_string_span const &); + MCAPI std::string toPrintableDBKey(class std::basic_string_view> const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/DBStorage.hpp b/LiteLoader/include/llapi/mc/DBStorage.hpp index ab53eaf9e8..22f14df64f 100644 --- a/LiteLoader/include/llapi/mc/DBStorage.hpp +++ b/LiteLoader/include/llapi/mc/DBStorage.hpp @@ -41,226 +41,230 @@ struct PendingWriteResult { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DBStorage(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?addStorageObserver\@DBStorage\@\@UEAAXV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?addStorageObserver\@DBStorage\@\@UEAAXV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@\@Z */ virtual void addStorageObserver(std::unique_ptr); /** - * @vftbl 2 - * @symbol ?getCompoundTag\@DBStorage\@\@UEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 2 + * @symbol ?getCompoundTag\@DBStorage\@\@UEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z */ virtual std::unique_ptr getCompoundTag(std::string const &, enum class DBHelpers::Category); /** - * @vftbl 3 - * @symbol ?hasKey\@DBStorage\@\@UEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 3 + * @symbol ?hasKey\@DBStorage\@\@UEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4Category\@DBHelpers\@\@\@Z */ - virtual bool hasKey(class gsl::basic_string_span, enum class DBHelpers::Category) const; + virtual bool hasKey(class std::basic_string_view>, enum class DBHelpers::Category) const; /** - * @vftbl 4 - * @symbol ?forEachKeyWithPrefix\@DBStorage\@\@UEBAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Category\@DBHelpers\@\@AEBV?$function\@$$A6AXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z\@std\@\@\@Z + * @vftbl 4 + * @symbol ?forEachKeyWithPrefix\@DBStorage\@\@UEBAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4Category\@DBHelpers\@\@AEBV?$function\@$$A6AXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z\@3\@\@Z */ - virtual void forEachKeyWithPrefix(class gsl::basic_string_span, enum class DBHelpers::Category, class std::function, class gsl::basic_string_span)> const &) const; + virtual void forEachKeyWithPrefix(class std::basic_string_view>, enum class DBHelpers::Category, class std::function>, class std::basic_string_view>)> const &) const; /** - * @vftbl 5 - * @symbol ?loadLevelData\@DBStorage\@\@UEAA_NAEAVLevelData\@\@\@Z + * @vftbl 5 + * @symbol ?loadLevelData\@DBStorage\@\@UEAA_NAEAVLevelData\@\@\@Z */ virtual bool loadLevelData(class LevelData &); /** - * @vftbl 6 - * @symbol ?createChunkStorage\@DBStorage\@\@UEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z + * @vftbl 6 + * @symbol ?createChunkStorage\@DBStorage\@\@UEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z */ virtual std::unique_ptr createChunkStorage(std::unique_ptr, enum class StorageVersion); /** - * @vftbl 7 - * @symbol ?saveLevelData\@DBStorage\@\@UEAAXAEBVLevelData\@\@\@Z + * @vftbl 7 + * @symbol ?saveLevelData\@DBStorage\@\@UEAAXAEBVLevelData\@\@\@Z */ virtual void saveLevelData(class LevelData const &); /** - * @vftbl 8 - * @symbol ?getFullPath\@DBStorage\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 8 + * @symbol ?getFullPath\@DBStorage\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const & getFullPath() const; /** - * @vftbl 9 - * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@$$QEAV43\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 9 + * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@$$QEAV43\@W4Category\@DBHelpers\@\@\@Z */ virtual class std::shared_ptr> saveData(std::string const &, std::string &&, enum class DBHelpers::Category); /** - * @vftbl 10 - * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBVLevelStorageWriteBatch\@\@\@Z + * @vftbl 10 + * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBVLevelStorageWriteBatch\@\@\@Z */ virtual class std::shared_ptr> saveData(class LevelStorageWriteBatch const &); /** - * @vftbl 11 - * @symbol ?deleteData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 11 + * @symbol ?deleteData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z */ virtual class std::shared_ptr> deleteData(std::string const &, enum class DBHelpers::Category); /** - * @vftbl 12 - * @symbol ?getStatistics\@DBStorage\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 12 + * @symbol ?getStatistics\@DBStorage\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void getStatistics(std::string &) const; /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol ?startShutdown\@DBStorage\@\@UEAAXXZ + * @vftbl 15 + * @symbol ?startShutdown\@DBStorage\@\@UEAAXXZ */ virtual void startShutdown(); /** - * @vftbl 16 - * @symbol ?isShuttingDown\@DBStorage\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?isShuttingDown\@DBStorage\@\@UEBA_NXZ */ virtual bool isShuttingDown() const; /** - * @vftbl 17 - * @symbol ?checkShutdownDone\@DBStorage\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?checkShutdownDone\@DBStorage\@\@UEAA_NXZ */ virtual bool checkShutdownDone(); /** - * @vftbl 18 - * @symbol ?loadData\@DBStorage\@\@UEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 18 + * @symbol ?loadData\@DBStorage\@\@UEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z */ - virtual bool loadData(class gsl::basic_string_span, std::string &, enum class DBHelpers::Category) const; + virtual bool loadData(class std::basic_string_view>, std::string &, enum class DBHelpers::Category) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?createSnapshot\@DBStorage\@\@UEAA?AV?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 20 + * @symbol ?createSnapshot\@DBStorage\@\@UEAA?AV?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual std::vector createSnapshot(std::string const &); /** - * @vftbl 21 - * @symbol ?releaseSnapshot\@DBStorage\@\@UEAAXXZ + * @vftbl 21 + * @symbol ?releaseSnapshot\@DBStorage\@\@UEAAXXZ */ virtual void releaseSnapshot(); /** - * @vftbl 22 - * @symbol ?compactStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 22 + * @symbol ?compactStorage\@DBStorage\@\@UEAAXXZ */ virtual void compactStorage(); /** - * @vftbl 23 - * @symbol ?syncAndSuspendStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 23 + * @symbol ?syncAndSuspendStorage\@DBStorage\@\@UEAAXXZ */ virtual void syncAndSuspendStorage(); /** - * @vftbl 24 - * @symbol ?resumeStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 24 + * @symbol ?resumeStorage\@DBStorage\@\@UEAAXXZ */ virtual void resumeStorage(); /** - * @vftbl 25 - * @symbol ?setFlushAllowed\@DBStorage\@\@UEAAX_N\@Z + * @vftbl 25 + * @symbol ?setFlushAllowed\@DBStorage\@\@UEAAX_N\@Z */ virtual void setFlushAllowed(bool); /** - * @vftbl 26 - * @symbol ?flushToPermanentStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 26 + * @symbol ?flushToPermanentStorage\@DBStorage\@\@UEAAXXZ */ virtual void flushToPermanentStorage(); /** - * @vftbl 27 - * @symbol ?freeCaches\@DBStorage\@\@UEAAXXZ + * @vftbl 27 + * @symbol ?freeCaches\@DBStorage\@\@UEAAXXZ */ virtual void freeCaches(); /** - * @vftbl 28 - * @symbol ?setCompactionCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z + * @vftbl 28 + * @symbol ?setCompactionCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z */ virtual void setCompactionCallback(class std::function); /** - * @vftbl 29 - * @symbol ?setCriticalSyncSaveCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @vftbl 29 + * @symbol ?setCriticalSyncSaveCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ virtual void setCriticalSyncSaveCallback(class std::function); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DBSTORAGE /** - * @symbol ?getLevelStorageState\@DBStorage\@\@UEBA?AULevelStorageResult\@Core\@\@XZ + * @symbol ?getLevelStorageState\@DBStorage\@\@UEBA?AULevelStorageResult\@Core\@\@XZ */ MCVAPI struct Core::LevelStorageResult getLevelStorageState() const; /** - * @symbol ?getState\@DBStorage\@\@UEBA?AULevelStorageResult\@Core\@\@XZ + * @symbol ?getState\@DBStorage\@\@UEBA?AULevelStorageResult\@Core\@\@XZ */ MCVAPI struct Core::LevelStorageResult getState() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DBStorage(); #endif /** - * @symbol ??0DBStorage\@\@QEAA\@UDBStorageConfig\@\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0DBStorage\@\@QEAA\@UDBStorageConfig\@\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI DBStorage(struct DBStorageConfig, class gsl::not_null>); /** - * @symbol ?_notifyChunkStorageDestroyed\@DBStorage\@\@QEAAXAEAVDBChunkStorage\@\@\@Z + * @symbol ?_notifyChunkStorageDestroyed\@DBStorage\@\@QEAAXAEAVDBChunkStorage\@\@\@Z */ MCAPI void _notifyChunkStorageDestroyed(class DBChunkStorage &); /** - * @symbol ?tryRepair\@DBStorage\@\@QEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?tryRepair\@DBStorage\@\@QEBA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool tryRepair(class Core::Path const &) const; //protected: /** - * @symbol ?_findCacheEntry\@DBStorage\@\@IEAA?AU?$pair\@PEAVLevelStorageWriteBatch\@\@V?$_Tree_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?_findCacheEntry\@DBStorage\@\@IEAA?AU?$pair\@PEAVLevelStorageWriteBatch\@\@V?$_Tree_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI struct std::pair>>>> _findCacheEntry(std::string const &); /** - * @symbol ?_getAllPendingWrites\@DBStorage\@\@IEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UPendingWriteResult\@DBStorage\@\@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\@\@UPendingWriteResult\@DBStorage\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?_getAllPendingWrites\@DBStorage\@\@IEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UPendingWriteResult\@DBStorage\@\@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\@\@UPendingWriteResult\@DBStorage\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::map, class std::allocator>> _getAllPendingWrites() const; /** - * @symbol ?_handleErrorStatus\@DBStorage\@\@IEAAXAEBVStatus\@leveldb\@\@\@Z + * @symbol ?_handleErrorStatus\@DBStorage\@\@IEAAXAEBVStatus\@leveldb\@\@\@Z */ MCAPI void _handleErrorStatus(class leveldb::Status const &); /** - * @symbol ?_mergeIntoDeleteCache\@DBStorage\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z - */ - MCAPI void _mergeIntoDeleteCache(std::string const &, enum class DBHelpers::Category); - /** - * @symbol ?_mergeIntoWriteCache\@DBStorage\@\@IEAAXAEBVLevelStorageWriteBatch\@\@\@Z + * @symbol ?_mergeIntoWriteCache\@DBStorage\@\@IEAAXAEBVLevelStorageWriteBatch\@\@\@Z */ MCAPI void _mergeIntoWriteCache(class LevelStorageWriteBatch const &); /** - * @symbol ?_queueSaveCallback\@DBStorage\@\@IEAAX_N\@Z + * @symbol ?_queueSaveCallback\@DBStorage\@\@IEAAX_N\@Z */ MCAPI void _queueSaveCallback(bool); /** - * @symbol ?_read\@DBStorage\@\@IEBAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Category\@DBHelpers\@\@AEBV?$function\@$$A6AXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z\@std\@\@\@Z + * @symbol ?_read\@DBStorage\@\@IEBAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4Category\@DBHelpers\@\@AEBV?$function\@$$A6AXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z\@3\@\@Z */ - MCAPI void _read(class gsl::basic_string_span, enum class DBHelpers::Category, class std::function, class gsl::basic_string_span)> const &) const; + MCAPI void _read(class std::basic_string_view>, enum class DBHelpers::Category, class std::function>, class std::basic_string_view>)> const &) const; /** - * @symbol ?_readPendingWrite\@DBStorage\@\@IEBA?AUPendingWriteResult\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z + * @symbol ?_readPendingWrite\@DBStorage\@\@IEBA?AUPendingWriteResult\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z */ MCAPI struct DBStorage::PendingWriteResult _readPendingWrite(std::string const &, enum class DBHelpers::Category) const; //private: /** - * @symbol ?_flushWriteCacheToLevelDB\@DBStorage\@\@AEAA?AVTaskResult\@\@XZ + * @symbol ?_flushWriteCacheToLevelDB\@DBStorage\@\@AEAA?AVTaskResult\@\@XZ */ MCAPI class TaskResult _flushWriteCacheToLevelDB(); /** - * @symbol ?_getTelemetryMessage\@DBStorage\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVStatus\@leveldb\@\@\@Z + * @symbol ?_getTelemetryMessage\@DBStorage\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVStatus\@leveldb\@\@\@Z */ MCAPI std::string _getTelemetryMessage(class leveldb::Status const &) const; /** - * @symbol ?_markAsCorrupted\@DBStorage\@\@AEBAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?_markAsCorrupted\@DBStorage\@\@AEBAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI void _markAsCorrupted(class gsl::basic_string_span) const; + MCAPI void _markAsCorrupted(class std::basic_string_view>) const; /** - * @symbol ?_scheduleNextAutoCompaction\@DBStorage\@\@AEAAXXZ + * @symbol ?_removeCorruptedMark\@DBStorage\@\@AEBAXXZ + */ + MCAPI void _removeCorruptedMark() const; + /** + * @symbol ?_scheduleNextAutoCompaction\@DBStorage\@\@AEAAXXZ */ MCAPI void _scheduleNextAutoCompaction(); /** - * @symbol ?_suspendAndPerformSaveAction\@DBStorage\@\@AEAA_NV?$function\@$$A6A?AVTaskResult\@\@XZ\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?_suspendAndPerformSaveAction\@DBStorage\@\@AEAA_NV?$function\@$$A6A?AVTaskResult\@\@XZ\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z */ MCAPI bool _suspendAndPerformSaveAction(class std::function, class std::function); @@ -268,4 +272,4 @@ struct PendingWriteResult { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DBStorageConfig.hpp b/LiteLoader/include/llapi/mc/DBStorageConfig.hpp index 08e51a9686..2d2bc89fe6 100644 --- a/LiteLoader/include/llapi/mc/DBStorageConfig.hpp +++ b/LiteLoader/include/llapi/mc/DBStorageConfig.hpp @@ -28,7 +28,7 @@ struct DBStorageConfig { public: /** - * @symbol ??1DBStorageConfig\@\@QEAA\@XZ + * @symbol ??1DBStorageConfig\@\@QEAA\@XZ */ MCAPI ~DBStorageConfig(); diff --git a/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp b/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp index bb51b1af94..9a5e02afb2 100644 --- a/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp +++ b/LiteLoader/include/llapi/mc/DBStorageEnvironmentChain.hpp @@ -32,48 +32,48 @@ class DBStorageEnvironmentChain { public: /** - * @symbol ??0DBStorageEnvironmentChain\@\@QEAA\@AEBUDBStorageConfig\@\@AEBVPath\@Core\@\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0DBStorageEnvironmentChain\@\@QEAA\@AEBUDBStorageConfig\@\@AEBVPath\@Core\@\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI DBStorageEnvironmentChain(struct DBStorageConfig const &, class Core::Path const &, class gsl::not_null>); /** - * @symbol ?getCompactionListenerEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVCompactionListenerEnv\@\@XZ + * @symbol ?getCompactionListenerEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVCompactionListenerEnv\@\@XZ */ MCAPI class CompactionListenerEnv * getCompactionListenerEnv() const; /** - * @symbol ?getFlushableEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVFlushableEnv\@\@XZ + * @symbol ?getFlushableEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVFlushableEnv\@\@XZ */ MCAPI class FlushableEnv * getFlushableEnv() const; /** - * @symbol ?getRootEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVEnv\@leveldb\@\@XZ + * @symbol ?getRootEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVEnv\@leveldb\@\@XZ */ MCAPI class leveldb::Env * getRootEnv() const; /** - * @symbol ?getSnapshotEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVSnapshotEnv\@\@XZ + * @symbol ?getSnapshotEnv\@DBStorageEnvironmentChain\@\@QEBAPEAVSnapshotEnv\@\@XZ */ MCAPI class SnapshotEnv * getSnapshotEnv() const; /** - * @symbol ?isChainValid\@DBStorageEnvironmentChain\@\@QEBA?AVResult\@Core\@\@_N\@Z + * @symbol ?isChainValid\@DBStorageEnvironmentChain\@\@QEBA?AVResult\@Core\@\@_N\@Z */ MCAPI class Core::Result isChainValid(bool) const; /** - * @symbol ?onFlush\@DBStorageEnvironmentChain\@\@QEAAXXZ + * @symbol ?onFlush\@DBStorageEnvironmentChain\@\@QEAAXXZ */ MCAPI void onFlush(); /** - * @symbol ??1DBStorageEnvironmentChain\@\@QEAA\@XZ + * @symbol ??1DBStorageEnvironmentChain\@\@QEAA\@XZ */ MCAPI ~DBStorageEnvironmentChain(); /** - * @symbol ?isContentKeyValid\@DBStorageEnvironmentChain\@\@SA_NPEAVEnv\@leveldb\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@8\@\@Z + * @symbol ?isContentKeyValid\@DBStorageEnvironmentChain\@\@SA_NPEAVEnv\@leveldb\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@8\@\@Z */ MCAPI static bool isContentKeyValid(class leveldb::Env *, class Core::Path const &, class ContentIdentity const &, std::string const &, class std::shared_ptr); //private: /** - * @symbol ?createFlushableEnv\@DBStorageEnvironmentChain\@\@CA?AV?$unique_ptr\@VFlushableEnv\@\@U?$default_delete\@VFlushableEnv\@\@\@std\@\@\@std\@\@PEAVEnv\@leveldb\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@3\@AEBVPath\@Core\@\@\@Z + * @symbol ?createFlushableEnv\@DBStorageEnvironmentChain\@\@CA?AV?$unique_ptr\@VFlushableEnv\@\@U?$default_delete\@VFlushableEnv\@\@\@std\@\@\@std\@\@PEAVEnv\@leveldb\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@3\@AEBVPath\@Core\@\@\@Z */ MCAPI static std::unique_ptr createFlushableEnv(class leveldb::Env *, class std::shared_ptr, class Core::Path const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp b/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp index 9f4738163c..6d5020f2d0 100644 --- a/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp +++ b/LiteLoader/include/llapi/mc/DBStoragePerformanceData.hpp @@ -30,16 +30,16 @@ class DBStoragePerformanceData { public: /** - * @symbol ?resetAll\@DBStoragePerformanceData\@\@QEAAXXZ + * @symbol ?resetAll\@DBStoragePerformanceData\@\@QEAAXXZ */ MCAPI void resetAll(); /** - * @symbol ?CATEGORY_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$0M\@\@std\@\@A + * @symbol ?CATEGORY_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$0M\@\@std\@\@A */ MCAPI static class std::array CATEGORY_NAMES; /** - * @symbol ?OPERATION_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$03\@std\@\@A + * @symbol ?OPERATION_NAMES\@DBStoragePerformanceData\@\@2V?$array\@PEBD$03\@std\@\@A */ MCAPI static class std::array OPERATION_NAMES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageCommand.hpp b/LiteLoader/include/llapi/mc/DamageCommand.hpp index 91e39f89ef..c3ccbaebfb 100644 --- a/LiteLoader/include/llapi/mc/DamageCommand.hpp +++ b/LiteLoader/include/llapi/mc/DamageCommand.hpp @@ -29,26 +29,26 @@ class DamageCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DamageCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DamageCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DamageCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@DamageCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@DamageCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_applyDamage\@DamageCommand\@\@AEBAXAEAV?$CommandSelectorResults\@VActor\@\@\@\@AEBVActorDamageSource\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_applyDamage\@DamageCommand\@\@AEBAXAEAV?$CommandSelectorResults\@VActor\@\@\@\@AEBVActorDamageSource\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _applyDamage(class CommandSelectorResults &, class ActorDamageSource const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageCondition.hpp b/LiteLoader/include/llapi/mc/DamageCondition.hpp index d7922dd45c..6b31c7ea7c 100644 --- a/LiteLoader/include/llapi/mc/DamageCondition.hpp +++ b/LiteLoader/include/llapi/mc/DamageCondition.hpp @@ -28,7 +28,7 @@ struct DamageCondition { public: /** - * @symbol ??1DamageCondition\@\@QEAA\@XZ + * @symbol ??1DamageCondition\@\@QEAA\@XZ */ MCAPI ~DamageCondition(); diff --git a/LiteLoader/include/llapi/mc/DamageOverTimeComponent.hpp b/LiteLoader/include/llapi/mc/DamageOverTimeComponent.hpp index 7defd61b64..8fd3558da3 100644 --- a/LiteLoader/include/llapi/mc/DamageOverTimeComponent.hpp +++ b/LiteLoader/include/llapi/mc/DamageOverTimeComponent.hpp @@ -30,28 +30,28 @@ class DamageOverTimeComponent { public: /** - * @symbol ?addAdditionalSaveData\@DamageOverTimeComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@DamageOverTimeComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getDamageTime\@DamageOverTimeComponent\@\@QEBAHXZ + * @symbol ?getDamageTime\@DamageOverTimeComponent\@\@QEBAHXZ */ MCAPI int getDamageTime() const; /** - * @symbol ?getDamageTimeInterval\@DamageOverTimeComponent\@\@QEBAHXZ + * @symbol ?getDamageTimeInterval\@DamageOverTimeComponent\@\@QEBAHXZ */ MCAPI int getDamageTimeInterval() const; /** - * @symbol ?getHurtValue\@DamageOverTimeComponent\@\@QEBAHXZ + * @symbol ?getHurtValue\@DamageOverTimeComponent\@\@QEBAHXZ */ MCAPI int getHurtValue() const; /** - * @symbol ?readAdditionalSaveData\@DamageOverTimeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@DamageOverTimeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setDamageTime\@DamageOverTimeComponent\@\@QEAAXH\@Z + * @symbol ?setDamageTime\@DamageOverTimeComponent\@\@QEAAXH\@Z */ MCAPI void setDamageTime(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageOverTimeDefinition.hpp b/LiteLoader/include/llapi/mc/DamageOverTimeDefinition.hpp index 9f964a2723..2fa2201750 100644 --- a/LiteLoader/include/llapi/mc/DamageOverTimeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DamageOverTimeDefinition.hpp @@ -31,12 +31,12 @@ class DamageOverTimeDefinition { public: /** - * @symbol ?initialize\@DamageOverTimeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDamageOverTimeComponent\@\@\@Z + * @symbol ?initialize\@DamageOverTimeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDamageOverTimeComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DamageOverTimeComponent &) const; /** - * @symbol ?buildSchema\@DamageOverTimeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDamageOverTimeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@DamageOverTimeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDamageOverTimeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp b/LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp index 24d2b90437..3a7bfeac2d 100644 --- a/LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp +++ b/LiteLoader/include/llapi/mc/DamageOverTimeSystem.hpp @@ -30,19 +30,19 @@ class DamageOverTimeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DamageOverTimeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@DamageOverTimeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DamageOverTimeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageResponse.hpp b/LiteLoader/include/llapi/mc/DamageResponse.hpp index 91cf1bfd37..d49ef92f5f 100644 --- a/LiteLoader/include/llapi/mc/DamageResponse.hpp +++ b/LiteLoader/include/llapi/mc/DamageResponse.hpp @@ -31,36 +31,36 @@ class DamageResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DamageResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@DamageResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@DamageResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@DamageResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@DamageResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@DamageResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@DamageResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@DamageResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@DamageResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; //private: /** - * @symbol ?repairOrHurtItem\@DamageResponse\@\@AEBAXAEBHAEAVRenderParams\@\@\@Z + * @symbol ?repairOrHurtItem\@DamageResponse\@\@AEBAXAEBHAEAVRenderParams\@\@\@Z */ MCAPI void repairOrHurtItem(int const &, class RenderParams &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp index 57d986bb10..d34e63c4ef 100644 --- a/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorComponent.hpp @@ -29,48 +29,48 @@ class DamageSensorComponent { public: /** - * @symbol ??0DamageSensorComponent\@\@QEAA\@XZ + * @symbol ??0DamageSensorComponent\@\@QEAA\@XZ */ MCAPI DamageSensorComponent(); /** - * @symbol ?getCause\@DamageSensorComponent\@\@QEBA?AW4ActorDamageCause\@\@XZ + * @symbol ?getCause\@DamageSensorComponent\@\@QEBA?AW4ActorDamageCause\@\@XZ */ MCAPI enum class ActorDamageCause getCause() const; /** - * @symbol ?getDamageModifier\@DamageSensorComponent\@\@QEAAMXZ + * @symbol ?getDamageModifier\@DamageSensorComponent\@\@QEAAMXZ */ MCAPI float getDamageModifier(); /** - * @symbol ?getDamageMultipler\@DamageSensorComponent\@\@QEAAMXZ + * @symbol ?getDamageMultipler\@DamageSensorComponent\@\@QEAAMXZ */ MCAPI float getDamageMultipler(); /** - * @symbol ?isFatal\@DamageSensorComponent\@\@QEBA_NXZ + * @symbol ?isFatal\@DamageSensorComponent\@\@QEBA_NXZ */ MCAPI bool isFatal() const; /** - * @symbol ??4DamageSensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4DamageSensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class DamageSensorComponent & operator=(class DamageSensorComponent &&); /** - * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@AEBVActorDamageSource\@\@H_NVVariantParameterList\@\@2\@Z + * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVVariantParameterList\@\@\@Z */ - MCAPI bool recordDamage(class Actor &, class ActorDamageSource const &, int, bool, class VariantParameterList, bool); + MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class VariantParameterList); /** - * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVBlockPos\@\@\@Z + * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@AEBVActorDamageSource\@\@H_NVVariantParameterList\@\@2\@Z */ - MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class BlockPos); + MCAPI bool recordDamage(class Actor &, class ActorDamageSource const &, int, bool, class VariantParameterList, bool); /** - * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVVariantParameterList\@\@\@Z + * @symbol ?recordDamage\@DamageSensorComponent\@\@QEAA_NAEAVActor\@\@PEAV2\@W4ActorDamageCause\@\@H_NVBlockPos\@\@\@Z */ - MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class VariantParameterList); + MCAPI bool recordDamage(class Actor &, class Actor *, enum class ActorDamageCause, int, bool, class BlockPos); //private: /** - * @symbol ?_recordDamage\@DamageSensorComponent\@\@AEAA_NAEAVActor\@\@PEAV2\@AEBW4ActorDamageCause\@\@1H_NVVariantParameterList\@\@3\@Z + * @symbol ?_recordDamage\@DamageSensorComponent\@\@AEAA_NAEAVActor\@\@PEAV2\@AEBW4ActorDamageCause\@\@1H_NVVariantParameterList\@\@3\@Z */ MCAPI bool _recordDamage(class Actor &, class Actor *, enum class ActorDamageCause const &, class Actor *, int, bool, class VariantParameterList, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp b/LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp index b0fbd5ab02..5655aad602 100644 --- a/LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorDefinition.hpp @@ -31,20 +31,20 @@ class DamageSensorDefinition { public: /** - * @symbol ?addDamageSensorTrigger\@DamageSensorDefinition\@\@QEAAXAEBUDamageSensorTrigger\@\@\@Z + * @symbol ?addDamageSensorTrigger\@DamageSensorDefinition\@\@QEAAXAEBUDamageSensorTrigger\@\@\@Z */ MCAPI void addDamageSensorTrigger(struct DamageSensorTrigger const &); /** - * @symbol ?initialize\@DamageSensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDamageSensorComponent\@\@\@Z + * @symbol ?initialize\@DamageSensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDamageSensorComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DamageSensorComponent &) const; /** - * @symbol ?uninitialize\@DamageSensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDamageSensorComponent\@\@\@Z + * @symbol ?uninitialize\@DamageSensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDamageSensorComponent\@\@\@Z */ MCAPI void uninitialize(class EntityContext &, class DamageSensorComponent &) const; /** - * @symbol ?buildSchema\@DamageSensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDamageSensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@DamageSensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDamageSensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp b/LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp index 5ce7f9500d..0c1963a439 100644 --- a/LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp +++ b/LiteLoader/include/llapi/mc/DamageSensorTrigger.hpp @@ -29,15 +29,15 @@ struct DamageSensorTrigger { public: /** - * @symbol ??0DamageSensorTrigger\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0DamageSensorTrigger\@\@QEAA\@AEBU0\@\@Z */ MCAPI DamageSensorTrigger(struct DamageSensorTrigger const &); /** - * @symbol ?setCause\@DamageSensorTrigger\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCause\@DamageSensorTrigger\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCause(std::string const &); /** - * @symbol ??1DamageSensorTrigger\@\@QEAA\@XZ + * @symbol ??1DamageSensorTrigger\@\@QEAA\@XZ */ MCAPI ~DamageSensorTrigger(); diff --git a/LiteLoader/include/llapi/mc/DanceComponent.hpp b/LiteLoader/include/llapi/mc/DanceComponent.hpp index 81cf25236e..6b1c1f231b 100644 --- a/LiteLoader/include/llapi/mc/DanceComponent.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponent.hpp @@ -29,20 +29,20 @@ class DanceComponent { public: /** - * @symbol ??0DanceComponent\@\@QEAA\@XZ + * @symbol ??0DanceComponent\@\@QEAA\@XZ */ MCAPI DanceComponent(); /** - * @symbol ?inListenDistance\@DanceComponent\@\@QEBA_NAEBVVec3\@\@\@Z + * @symbol ?inListenDistance\@DanceComponent\@\@QEBA_NAEBVVec3\@\@\@Z */ MCAPI bool inListenDistance(class Vec3 const &) const; /** - * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@M\@Z */ - MCAPI void initFromDefinition(class Actor &); + MCAPI void initFromDefinition(class Actor &, float); /** - * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@M\@Z + * @symbol ?initFromDefinition\@DanceComponent\@\@QEAAXAEAVActor\@\@\@Z */ - MCAPI void initFromDefinition(class Actor &, float); + MCAPI void initFromDefinition(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DanceComponentInternal.hpp b/LiteLoader/include/llapi/mc/DanceComponentInternal.hpp index ba1972a403..b314785982 100644 --- a/LiteLoader/include/llapi/mc/DanceComponentInternal.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponentInternal.hpp @@ -20,7 +20,7 @@ namespace DanceComponentInternal { #undef AFTER_EXTRA /** - * @symbol ?DEFAULT_DISTANCE\@DanceComponentInternal\@\@3MA + * @symbol ?DEFAULT_DISTANCE\@DanceComponentInternal\@\@3MA */ MCAPI extern float DEFAULT_DISTANCE; diff --git a/LiteLoader/include/llapi/mc/DanceComponentListener.hpp b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp index 226d878a8d..ea4de2e1ed 100644 --- a/LiteLoader/include/llapi/mc/DanceComponentListener.hpp +++ b/LiteLoader/include/llapi/mc/DanceComponentListener.hpp @@ -31,139 +31,134 @@ class DanceComponentListener : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DanceComponentListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol __unk_vfn_26 + * @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 ?levelSoundEvent\@DanceComponentListener\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + * @vftbl 27 + * @symbol ?levelSoundEvent\@DanceComponentListener\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ virtual void levelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DanceSystem.hpp b/LiteLoader/include/llapi/mc/DanceSystem.hpp index 1725e8aba0..743e2ea95d 100644 --- a/LiteLoader/include/llapi/mc/DanceSystem.hpp +++ b/LiteLoader/include/llapi/mc/DanceSystem.hpp @@ -30,19 +30,19 @@ class DanceSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DanceSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@DanceSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DanceSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DashComponent.hpp b/LiteLoader/include/llapi/mc/DashComponent.hpp index 4639fbf0a2..2fcfafb99b 100644 --- a/LiteLoader/include/llapi/mc/DashComponent.hpp +++ b/LiteLoader/include/llapi/mc/DashComponent.hpp @@ -28,16 +28,16 @@ class DashComponent { public: /** - * @symbol ?getCooldownTime\@DashComponent\@\@QEBA?BIXZ + * @symbol ?getCooldownTime\@DashComponent\@\@QEBA?BIXZ */ MCAPI unsigned int const getCooldownTime() const; /** - * @symbol ?getHorizontalMomentum\@DashComponent\@\@QEBA?BMXZ + * @symbol ?getHorizontalMomentum\@DashComponent\@\@QEBA?BMXZ */ MCAPI float const getHorizontalMomentum() const; /** - * @symbol ?getVerticalMomentum\@DashComponent\@\@QEBA?BMXZ + * @symbol ?getVerticalMomentum\@DashComponent\@\@QEBA?BMXZ */ MCAPI float const getVerticalMomentum() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DashDefinition.hpp b/LiteLoader/include/llapi/mc/DashDefinition.hpp index 814c3d85dd..33deae77fe 100644 --- a/LiteLoader/include/llapi/mc/DashDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DashDefinition.hpp @@ -29,16 +29,16 @@ class DashDefinition { public: /** - * @symbol ?initialize\@DashDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDashComponent\@\@\@Z + * @symbol ?initialize\@DashDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDashComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DashComponent &) const; /** - * @symbol ?uninitialize\@DashDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDashComponent\@\@\@Z + * @symbol ?uninitialize\@DashDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDashComponent\@\@\@Z */ MCAPI void uninitialize(class EntityContext &, class DashComponent &) const; /** - * @symbol ?buildSchema\@DashDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDashDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@DashDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDashDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DashSystem.hpp b/LiteLoader/include/llapi/mc/DashSystem.hpp index 3de1add7a8..c7f5fff47e 100644 --- a/LiteLoader/include/llapi/mc/DashSystem.hpp +++ b/LiteLoader/include/llapi/mc/DashSystem.hpp @@ -28,8 +28,8 @@ class DashSystem { public: /** - * @symbol ?createSystem\@DashSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@DashSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DataItem.hpp b/LiteLoader/include/llapi/mc/DataItem.hpp index 55fe8a3bb5..8cd3339d76 100644 --- a/LiteLoader/include/llapi/mc/DataItem.hpp +++ b/LiteLoader/include/llapi/mc/DataItem.hpp @@ -234,7 +234,7 @@ inline T& DataItem::getData() { template inline bool DataItem::setData(T const& value) { - if (this->mType == DataItem2::DATA_ITEM_TYPE) + if (this->mType != DataItem2::DATA_ITEM_TYPE) return false; ((DataItem2*)this)->setData(value); return true; diff --git a/LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp b/LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp index 60c52a3c4c..8d0120e28a 100644 --- a/LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp +++ b/LiteLoader/include/llapi/mc/DatagramHeaderFormat.hpp @@ -31,12 +31,12 @@ class DatagramHeaderFormat { public: /** - * @symbol ?Deserialize\@DatagramHeaderFormat\@\@QEAAXPEAVBitStream\@RakNet\@\@\@Z + * @symbol ?Deserialize\@DatagramHeaderFormat\@\@QEAAXPEAVBitStream\@RakNet\@\@\@Z */ MCAPI void Deserialize(class RakNet::BitStream *); /** - * @symbol ?Serialize\@DatagramHeaderFormat\@\@QEAAXPEAVBitStream\@RakNet\@\@\@Z + * @symbol ?Serialize\@DatagramHeaderFormat\@\@QEAAXPEAVBitStream\@RakNet\@\@\@Z */ MCAPI void Serialize(class RakNet::BitStream *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DateManager.hpp b/LiteLoader/include/llapi/mc/DateManager.hpp index f5247c0aee..82fe6e0688 100644 --- a/LiteLoader/include/llapi/mc/DateManager.hpp +++ b/LiteLoader/include/llapi/mc/DateManager.hpp @@ -32,32 +32,32 @@ enum class TimeZoneType; public: /** - * @symbol ?getCurrentTimestampFileName\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCurrentTimestampFileName\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getCurrentTimestampFileName(); /** - * @symbol ?getRealTime\@DateManager\@\@SA_JXZ + * @symbol ?getRealTime\@DateManager\@\@SA_JXZ */ MCAPI static __int64 getRealTime(); /** - * @symbol ?toDateTime\@DateManager\@\@SA?AUtm\@\@_JW4TimeZoneType\@1\@\@Z + * @symbol ?toDateTime\@DateManager\@\@SA?AUtm\@\@_JW4TimeZoneType\@1\@\@Z */ MCAPI static struct tm toDateTime(__int64, enum class DateManager::TimeZoneType); /** - * @symbol ?toString\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUtm\@\@AEBV23\@\@Z + * @symbol ?toString\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEB_JW4TimeZoneType\@1\@AEBV23\@\@Z */ - MCAPI static std::string toString(struct tm const &, std::string const &); + MCAPI static std::string toString(__int64 const &, enum class DateManager::TimeZoneType, std::string const &); /** - * @symbol ?toString\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEB_JW4TimeZoneType\@1\@AEBV23\@\@Z + * @symbol ?toString\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUtm\@\@AEBV23\@\@Z */ - MCAPI static std::string toString(__int64 const &, enum class DateManager::TimeZoneType, std::string const &); + MCAPI static std::string toString(struct tm const &, std::string const &); /** - * @symbol ?toString_DateTime\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUtm\@\@W4TimeZoneType\@1\@\@Z + * @symbol ?toString_DateTime\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUtm\@\@W4TimeZoneType\@1\@\@Z */ MCAPI static std::string toString_DateTime(struct tm const &, enum class DateManager::TimeZoneType); /** - * @symbol ?toString_DateTime\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEB_JW4TimeZoneType\@1\@\@Z + * @symbol ?toString_DateTime\@DateManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEB_JW4TimeZoneType\@1\@\@Z */ MCAPI static std::string toString_DateTime(__int64 const &, enum class DateManager::TimeZoneType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DayLockCommand.hpp b/LiteLoader/include/llapi/mc/DayLockCommand.hpp index 2936fb2762..a1de6b700d 100644 --- a/LiteLoader/include/llapi/mc/DayLockCommand.hpp +++ b/LiteLoader/include/llapi/mc/DayLockCommand.hpp @@ -31,18 +31,18 @@ class DayLockCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DayLockCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DayLockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DayLockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@DayLockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@DayLockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp index da216a7a92..dcaf4969dd 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlock.hpp @@ -31,264 +31,269 @@ class DaylightDetectorBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DaylightDetectorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@DaylightDetectorBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@DaylightDetectorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@DaylightDetectorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@DaylightDetectorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@DaylightDetectorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@DaylightDetectorBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DaylightDetectorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@DaylightDetectorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@DaylightDetectorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DaylightDetectorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 - * @symbol ?updateShape\@DaylightDetectorBlock\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 195 + * @symbol ?updateShape\@DaylightDetectorBlock\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource &, class BlockPos const &); /** - * @vftbl 195 - * @symbol ?updateSignalStrength\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 196 + * @symbol ?updateSignalStrength\@DaylightDetectorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateSignalStrength(class BlockSource &, class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DAYLIGHTDETECTORBLOCK /** - * @symbol ?isInteractiveBlock\@DaylightDetectorBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@DaylightDetectorBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0DaylightDetectorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0DaylightDetectorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI DaylightDetectorBlock(std::string const &, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp index 2d17a779b4..85b8afe6a3 100644 --- a/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DaylightDetectorBlockActor.hpp @@ -31,58 +31,58 @@ class DaylightDetectorBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DaylightDetectorBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol ?tick\@DaylightDetectorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@DaylightDetectorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0DaylightDetectorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0DaylightDetectorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI DaylightDetectorBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeOpCommand.hpp b/LiteLoader/include/llapi/mc/DeOpCommand.hpp index c46242790e..f870a1edc4 100644 --- a/LiteLoader/include/llapi/mc/DeOpCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeOpCommand.hpp @@ -31,18 +31,18 @@ class DeOpCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeOpCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DeOpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DeOpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@DeOpCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@DeOpCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeadBush.hpp b/LiteLoader/include/llapi/mc/DeadBush.hpp index 15fcd518f7..ccccce9f8f 100644 --- a/LiteLoader/include/llapi/mc/DeadBush.hpp +++ b/LiteLoader/include/llapi/mc/DeadBush.hpp @@ -31,213 +31,224 @@ class DeadBush : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeadBush(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@DeadBush\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@DeadBush\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@DeadBush\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@DeadBush\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@DeadBush\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@DeadBush\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@DeadBush\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@DeadBush\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) 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 + * @symbol ??0DeadBush\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DeadBush(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeadBushFeature.hpp b/LiteLoader/include/llapi/mc/DeadBushFeature.hpp index fceb13a089..fa21430418 100644 --- a/LiteLoader/include/llapi/mc/DeadBushFeature.hpp +++ b/LiteLoader/include/llapi/mc/DeadBushFeature.hpp @@ -31,14 +31,14 @@ class DeadBushFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeadBushFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@DeadBushFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@DeadBushFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp index 61fbd129b2..f94898f999 100644 --- a/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DeathInfoPacket.hpp @@ -28,37 +28,43 @@ class DeathInfoPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeathInfoPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@DeathInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@DeathInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@DeathInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@DeathInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@DeathInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@DeathInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@DeathInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEATHINFOPACKET /** - * @symbol ??0DeathInfoPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DeathInfoPacket(); +#endif + /** + * @symbol ??0DeathInfoPacket\@\@QEAA\@XZ */ MCAPI DeathInfoPacket(); /** - * @symbol ??0DeathInfoPacket\@\@QEAA\@AEBU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@\@Z + * @symbol ??0DeathInfoPacket\@\@QEAA\@AEBU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@\@std\@\@\@Z */ MCAPI DeathInfoPacket(struct std::pair> const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DebugAssertException.hpp b/LiteLoader/include/llapi/mc/DebugAssertException.hpp index 5bf450309a..8118137ff3 100644 --- a/LiteLoader/include/llapi/mc/DebugAssertException.hpp +++ b/LiteLoader/include/llapi/mc/DebugAssertException.hpp @@ -29,25 +29,31 @@ class DebugAssertException { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DebugAssertException(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?what\@DebugAssertException\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?what\@DebugAssertException\@\@UEBAPEBDXZ */ virtual char const * what() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEBUGASSERTEXCEPTION /** - * @symbol ??0DebugAssertException\@\@QEAA\@PEBD00H00\@Z + * @symbol __unk_destructor_-1 */ - MCAPI DebugAssertException(char const *, char const *, char const *, int, char const *, char const *); + MCVAPI ~DebugAssertException(); +#endif /** - * @symbol ??0DebugAssertException\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0DebugAssertException\@\@QEAA\@AEBV0\@\@Z */ MCAPI DebugAssertException(class DebugAssertException const &); /** - * @symbol ?isEnabled\@DebugAssertException\@\@SA_NXZ + * @symbol ??0DebugAssertException\@\@QEAA\@PEBD00H00\@Z + */ + MCAPI DebugAssertException(char const *, char const *, char const *, int, char const *, char const *); + /** + * @symbol ?isEnabled\@DebugAssertException\@\@SA_NXZ */ MCAPI static bool isEnabled(); @@ -55,8 +61,8 @@ class DebugAssertException { private: /** - * @symbol ?WHAT\@DebugAssertException\@\@0QEBDEB + * @symbol ?WHAT\@DebugAssertException\@\@0QEBDEB */ MCAPI static char const *const WHAT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DebugEndPoint.hpp b/LiteLoader/include/llapi/mc/DebugEndPoint.hpp index aaa55e28df..3b5b42e0a6 100644 --- a/LiteLoader/include/llapi/mc/DebugEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/DebugEndPoint.hpp @@ -31,7 +31,7 @@ class DebugEndPoint { public: /** - * @symbol ?initializeContentLogging\@DebugEndPoint\@\@QEAAXAEAVResourcePackManager\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?initializeContentLogging\@DebugEndPoint\@\@QEAAXAEAVResourcePackManager\@\@AEBVPath\@Core\@\@\@Z */ MCAPI void initializeContentLogging(class ResourcePackManager &, class Core::Path const &); @@ -39,8 +39,8 @@ class DebugEndPoint { private: /** - * @symbol ?mAssertAreas\@DebugEndPoint\@\@0V?$unordered_map\@W4LogArea\@\@_NU?$hash\@W4LogArea\@\@\@std\@\@U?$equal_to\@W4LogArea\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4LogArea\@\@_N\@std\@\@\@3\@\@std\@\@B + * @symbol ?mAssertAreas\@DebugEndPoint\@\@0V?$unordered_map\@W4LogArea\@\@_NU?$hash\@W4LogArea\@\@\@std\@\@U?$equal_to\@W4LogArea\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4LogArea\@\@_N\@std\@\@\@3\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const mAssertAreas; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp index d7cd137287..a7c27f5ab6 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoComponent.hpp @@ -29,183 +29,183 @@ class DebugInfoComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DebugInfoComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z + * @vftbl 1 + * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorRemoveEffectEvent const &); /** - * @vftbl 2 - * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z + * @vftbl 2 + * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorNotificationEvent const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol __unk_vfn_26 + * @vftbl 26 + * @symbol __unk_vfn_26 */ virtual void __unk_vfn_26(); /** - * @vftbl 27 - * @symbol __unk_vfn_27 + * @vftbl 27 + * @symbol __unk_vfn_27 */ virtual void __unk_vfn_27(); /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 28 + * @symbol __unk_vfn_28 */ virtual void __unk_vfn_28(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol ?onEvent\@DebugInfoComponent\@\@UEAA?AW4EventResult\@\@AEBUActorDefinitionTriggeredEvent\@\@\@Z + * @vftbl 30 + * @symbol ?onEvent\@DebugInfoComponent\@\@UEAA?AW4EventResult\@\@AEBUActorDefinitionTriggeredEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorDefinitionTriggeredEvent const &); /** - * @symbol ??0DebugInfoComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0DebugInfoComponent\@\@QEAA\@AEBV0\@\@Z */ MCAPI DebugInfoComponent(class DebugInfoComponent const &); /** - * @symbol ??0DebugInfoComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0DebugInfoComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI DebugInfoComponent(class DebugInfoComponent &&); /** - * @symbol ?addListener\@DebugInfoComponent\@\@QEAAXAEBVHashedString\@\@VNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol ?addListener\@DebugInfoComponent\@\@QEAAXAEBVHashedString\@\@VNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI void addListener(class HashedString const &, class NetworkIdentifier, enum class SubClientId); /** - * @symbol ?listenersEmpty\@DebugInfoComponent\@\@QEBA_NXZ + * @symbol ?listenersEmpty\@DebugInfoComponent\@\@QEBA_NXZ */ MCAPI bool listenersEmpty() const; /** - * @symbol ??4DebugInfoComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4DebugInfoComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class DebugInfoComponent & operator=(class DebugInfoComponent &&); /** - * @symbol ?removeListener\@DebugInfoComponent\@\@QEAAXAEBVHashedString\@\@VNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol ?removeListener\@DebugInfoComponent\@\@QEAAXAEBVHashedString\@\@VNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI void removeListener(class HashedString const &, class NetworkIdentifier, enum class SubClientId); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp index e00ecbd553..7dcc82140a 100644 --- a/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/DebugInfoPacket.hpp @@ -30,33 +30,33 @@ class DebugInfoPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DebugInfoPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@DebugInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@DebugInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@DebugInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@DebugInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@DebugInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@DebugInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@DebugInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0DebugInfoPacket\@\@QEAA\@XZ + * @symbol ??0DebugInfoPacket\@\@QEAA\@XZ */ MCAPI DebugInfoPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DebugUtils.hpp b/LiteLoader/include/llapi/mc/DebugUtils.hpp index d90f3cf14f..d433da9260 100644 --- a/LiteLoader/include/llapi/mc/DebugUtils.hpp +++ b/LiteLoader/include/llapi/mc/DebugUtils.hpp @@ -22,51 +22,51 @@ namespace DebugUtils { #undef AFTER_EXTRA /** - * @symbol ?DEFAULT_ASSERT_HANDLER\@DebugUtils\@\@YA_NAEBUAssertHandlerContext\@\@AEA_N\@Z + * @symbol ?DEFAULT_ASSERT_HANDLER\@DebugUtils\@\@YA_NAEBUAssertHandlerContext\@\@AEA_N\@Z */ MCAPI bool DEFAULT_ASSERT_HANDLER(struct AssertHandlerContext const &, bool &); /** - * @symbol ?SET_THREAD_NAME\@DebugUtils\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?SET_THREAD_NAME\@DebugUtils\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void SET_THREAD_NAME(std::string const &); /** - * @symbol ?debugUtilMutex\@DebugUtils\@\@3Vmutex\@std\@\@A + * @symbol ?debugUtilMutex\@DebugUtils\@\@3Vmutex\@std\@\@A */ MCAPI extern class std::mutex debugUtilMutex; /** - * @symbol ?gAssertTelemetryRegistered\@DebugUtils\@\@3_NA + * @symbol ?gAssertTelemetryRegistered\@DebugUtils\@\@3_NA */ MCAPI extern bool gAssertTelemetryRegistered; /** - * @symbol ?gBreakpadSetupFailed\@DebugUtils\@\@3_NA + * @symbol ?gBreakpadSetupFailed\@DebugUtils\@\@3_NA */ MCAPI extern bool gBreakpadSetupFailed; /** - * @symbol ?gDebugAssertCallbacks\@DebugUtils\@\@3V?$vector\@V?$weak_ptr\@V?$function\@$$A6AXAEBUAssertHandlerContext\@\@\@Z\@std\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@V?$function\@$$A6AXAEBUAssertHandlerContext\@\@\@Z\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?gDebugAssertCallbacks\@DebugUtils\@\@3V?$vector\@V?$weak_ptr\@V?$function\@$$A6AXAEBUAssertHandlerContext\@\@\@Z\@std\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@V?$function\@$$A6AXAEBUAssertHandlerContext\@\@\@Z\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI extern std::vector>> gDebugAssertCallbacks; /** - * @symbol ?gFireAssertTelemetry\@DebugUtils\@\@3V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z\@std\@\@A + * @symbol ?gFireAssertTelemetry\@DebugUtils\@\@3V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z\@std\@\@A */ MCAPI extern class std::function gFireAssertTelemetry; /** - * @symbol ?gPublishAssertFullMessage\@DebugUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@A + * @symbol ?gPublishAssertFullMessage\@DebugUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@A */ MCAPI extern std::string gPublishAssertFullMessage; /** - * @symbol ?gShouldDebugBreak\@DebugUtils\@\@3_NA + * @symbol ?gShouldDebugBreak\@DebugUtils\@\@3_NA */ MCAPI extern bool gShouldDebugBreak; /** - * @symbol ?gShouldPresentDialog\@DebugUtils\@\@3_NA + * @symbol ?gShouldPresentDialog\@DebugUtils\@\@3_NA */ MCAPI extern bool gShouldPresentDialog; /** - * @symbol ?gp_assert_handler\@DebugUtils\@\@3V?$ServiceOverrider\@P6A_NAEBUAssertHandlerContext\@\@AEA_N\@Z\@\@A + * @symbol ?gp_assert_handler\@DebugUtils\@\@3V?$ServiceOverrider\@P6A_NAEBUAssertHandlerContext\@\@AEA_N\@Z\@\@A */ MCAPI extern class ServiceOverrider gp_assert_handler; /** - * @symbol ?isDebuggerAttached\@DebugUtils\@\@YA_NXZ + * @symbol ?isDebuggerAttached\@DebugUtils\@\@YA_NXZ */ MCAPI bool isDebuggerAttached(); diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp new file mode 100644 index 0000000000..afd4b6069a --- /dev/null +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlock.hpp @@ -0,0 +1,266 @@ +/** + * @file DecoratedPotBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "FaceDirectionalActorBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DecoratedPotBlock : public FaceDirectionalActorBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DECORATEDPOTBLOCK +public: + class DecoratedPotBlock& operator=(class DecoratedPotBlock const &) = delete; + DecoratedPotBlock(class DecoratedPotBlock const &) = delete; + DecoratedPotBlock() = 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 62 + * @symbol ?canContainLiquid\@DecoratedPotBlock\@\@UEBA_NXZ + */ + virtual bool canContainLiquid() const; + /** + * @vftbl 69 + * @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 + */ + virtual void __unk_vfn_75(); + /** + * @vftbl 82 + * @symbol __unk_vfn_82 + */ + virtual void __unk_vfn_82(); + /** + * @vftbl 101 + * @symbol ?playerWillDestroy\@DecoratedPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + */ + virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; + /** + * @vftbl 102 + * @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 + * @symbol ?asItemInstance\@DecoratedPotBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + */ + virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; + /** + * @vftbl 104 + * @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 + */ + 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 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 156 + * @symbol __unk_vfn_156 + */ + virtual void __unk_vfn_156(); + /** + * @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 170 + * @symbol __unk_vfn_170 + */ + virtual void __unk_vfn_170(); + /** + * @vftbl 174 + * @symbol __unk_vfn_174 + */ + virtual void __unk_vfn_174(); + /** + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getEntityResourceItem\@DecoratedPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + */ + virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; + /** + * @symbol ??0DecoratedPotBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI DecoratedPotBlock(std::string const &, int); + +//private: + /** + * @symbol ?_addUserDataToItemInstance\@DecoratedPotBlock\@\@AEBAXV?$not_null\@PEBVDecoratedPotBlockActor\@\@\@gsl\@\@AEAVItemInstance\@\@\@Z + */ + MCAPI void _addUserDataToItemInstance(class gsl::not_null, class ItemInstance &) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp b/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp new file mode 100644 index 0000000000..92ee84e76b --- /dev/null +++ b/LiteLoader/include/llapi/mc/DecoratedPotBlockActor.hpp @@ -0,0 +1,126 @@ +/** + * @file DecoratedPotBlockActor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BlockActor.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DecoratedPotBlockActor : public BlockActor { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DECORATEDPOTBLOCKACTOR +public: + class DecoratedPotBlockActor& operator=(class DecoratedPotBlockActor const &) = delete; + DecoratedPotBlockActor(class DecoratedPotBlockActor const &) = delete; + DecoratedPotBlockActor() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?load\@DecoratedPotBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + */ + virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); + /** + * @vftbl 2 + * @symbol ?save\@DecoratedPotBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + */ + virtual bool save(class CompoundTag &) const; + /** + * @vftbl 12 + * @symbol __unk_vfn_12 + */ + virtual void __unk_vfn_12(); + /** + * @vftbl 18 + * @symbol __unk_vfn_18 + */ + virtual void __unk_vfn_18(); + /** + * @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 ?_getUpdatePacket\@DecoratedPotBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + */ + virtual std::unique_ptr _getUpdatePacket(class BlockSource &); + /** + * @vftbl 38 + * @symbol ?_onUpdatePacket\@DecoratedPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + */ + virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); + /** + * @symbol ??0DecoratedPotBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + */ + 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 + */ + MCAPI class std::array const & getShardNames() const; + /** + * @symbol ?DEFAULT_SHARD_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; + /** + * @symbol ?saveShardsToTag\@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 &); + /** + * @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 + */ + MCAPI static class std::optional> tryGetShardsFromTag(class CompoundTag const &); + +//protected: + /** + * @symbol ?_resetShardItemNames\@DecoratedPotBlockActor\@\@IEAAXXZ + */ + MCAPI void _resetShardItemNames(); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp b/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp new file mode 100644 index 0000000000..9893bcf217 --- /dev/null +++ b/LiteLoader/include/llapi/mc/DecoratedPotRecipe.hpp @@ -0,0 +1,76 @@ +/** + * @file DecoratedPotRecipe.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Recipe.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DecoratedPotRecipe : public Recipe { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DECORATEDPOTRECIPE +public: + class DecoratedPotRecipe& operator=(class DecoratedPotRecipe const &) = delete; + DecoratedPotRecipe(class DecoratedPotRecipe const &) = delete; + DecoratedPotRecipe() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?assemble\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + */ + virtual std::vector const & assemble(class CraftingContainer &) const; + /** + * @vftbl 2 + * @symbol ?getCraftingSize\@DecoratedPotRecipe\@\@UEBAHXZ + */ + virtual int getCraftingSize() const; + /** + * @vftbl 3 + * @symbol ?getIngredient\@DecoratedPotRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + */ + virtual class RecipeIngredient const & getIngredient(int, int) const; + /** + * @vftbl 4 + * @symbol ?getResultItem\@DecoratedPotRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + */ + virtual std::vector const & getResultItem() const; + /** + * @vftbl 6 + * @symbol ?matches\@DecoratedPotRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + */ + virtual bool matches(class CraftingContainer &, class Level &) const; + /** + * @vftbl 7 + * @symbol ?size\@DecoratedPotRecipe\@\@UEBAHXZ + */ + virtual int size() const; + /** + * @symbol ??0DecoratedPotRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + */ + MCAPI DecoratedPotRecipe(class std::basic_string_view>); + /** + * @symbol ??0DecoratedPotRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z + */ + MCAPI DecoratedPotRecipe(class std::basic_string_view>, class mce::UUID const &); + /** + * @symbol ?ID\@DecoratedPotRecipe\@\@2VUUID\@mce\@\@B + */ + MCAPI static class mce::UUID const ID; + +}; diff --git a/LiteLoader/include/llapi/mc/DecoratorDefinition.hpp b/LiteLoader/include/llapi/mc/DecoratorDefinition.hpp index 6d26b3660d..69893bf93f 100644 --- a/LiteLoader/include/llapi/mc/DecoratorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DecoratorDefinition.hpp @@ -31,16 +31,16 @@ class DecoratorDefinition { public: /** - * @symbol ?get\@DecoratorDefinition\@\@QEBAPEBVBehaviorDefinition\@\@XZ + * @symbol ?get\@DecoratorDefinition\@\@QEBAPEBVBehaviorDefinition\@\@XZ */ MCAPI class BehaviorDefinition const * get() const; //protected: /** - * @symbol ?_decoratorLoadChildBehavior\@DecoratorDefinition\@\@KA?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEBVBehaviorFactory\@\@VBehaviorTreeDefinitionPtr\@\@\@Z + * @symbol ?_decoratorLoadChildBehavior\@DecoratorDefinition\@\@KA?AV?$unique_ptr\@VBehaviorDefinition\@\@U?$default_delete\@VBehaviorDefinition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEBVBehaviorFactory\@\@VBehaviorTreeDefinitionPtr\@\@\@Z */ MCAPI static std::unique_ptr _decoratorLoadChildBehavior(class Json::Value, class BehaviorFactory const &, class BehaviorTreeDefinitionPtr); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DecrementStackEventResponse.hpp b/LiteLoader/include/llapi/mc/DecrementStackEventResponse.hpp index 9c786c557b..cacdd43ee1 100644 --- a/LiteLoader/include/llapi/mc/DecrementStackEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/DecrementStackEventResponse.hpp @@ -31,28 +31,28 @@ class DecrementStackEventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DecrementStackEventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@DecrementStackEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@DecrementStackEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@DecrementStackEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@DecrementStackEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@DecrementStackEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@DecrementStackEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@DecrementStackEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@DecrementStackEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DedicatedServer.hpp b/LiteLoader/include/llapi/mc/DedicatedServer.hpp index 3718c4d38c..afa13999fe 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServer.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServer.hpp @@ -34,69 +34,69 @@ enum class StartResult; public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEDICATEDSERVER /** - * @symbol ?getAutomationClient\@DedicatedServer\@\@EEBA?AV?$not_null\@V?$NonOwnerPointer\@VAutomationClient\@Automation\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getAutomationClient\@DedicatedServer\@\@EEBA?AV?$not_null\@V?$NonOwnerPointer\@VAutomationClient\@Automation\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getAutomationClient() const; /** - * @symbol ?getFileArchiver\@DedicatedServer\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VFileArchiver\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getFileArchiver\@DedicatedServer\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VFileArchiver\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getFileArchiver() const; /** - * @symbol ?getGameModule\@DedicatedServer\@\@EEAAAEAVIGameModuleShared\@\@XZ + * @symbol ?getGameModule\@DedicatedServer\@\@EEAAAEAVIGameModuleShared\@\@XZ */ MCVAPI class IGameModuleShared & getGameModule(); /** - * @symbol ?getPrimaryMinecraft\@DedicatedServer\@\@EEAA?AV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getPrimaryMinecraft\@DedicatedServer\@\@EEAA?AV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getPrimaryMinecraft(); /** - * @symbol ?isDedicatedServer\@DedicatedServer\@\@EEBA_NXZ + * @symbol ?isDedicatedServer\@DedicatedServer\@\@EEBA_NXZ */ MCVAPI bool isDedicatedServer() const; /** - * @symbol ?isEduMode\@DedicatedServer\@\@EEBA_NXZ + * @symbol ?isEduMode\@DedicatedServer\@\@EEBA_NXZ */ MCVAPI bool isEduMode() const; /** - * @symbol ?onNetworkMaxPlayersChanged\@DedicatedServer\@\@EEAAXI\@Z + * @symbol ?onNetworkMaxPlayersChanged\@DedicatedServer\@\@EEAAXI\@Z */ MCVAPI void onNetworkMaxPlayersChanged(unsigned int); /** - * @symbol ?requestServerShutdown\@DedicatedServer\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?requestServerShutdown\@DedicatedServer\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void requestServerShutdown(std::string const &); /** - * @symbol ?stop\@DedicatedServer\@\@UEAA_NXZ + * @symbol ?stop\@DedicatedServer\@\@UEAA_NXZ */ MCVAPI bool stop(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~DedicatedServer(); #endif /** - * @symbol ??0DedicatedServer\@\@QEAA\@XZ + * @symbol ??0DedicatedServer\@\@QEAA\@XZ */ MCAPI DedicatedServer(); /** - * @symbol ?runDedicatedServerLoop\@DedicatedServer\@\@QEAA?AW4StartResult\@1\@AEAVFilePathManager\@Core\@\@AEAVPropertiesSettings\@\@AEAVLevelSettings\@\@AEAVAllowListFile\@\@AEAV?$unique_ptr\@VPermissionsFile\@\@U?$default_delete\@VPermissionsFile\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?runDedicatedServerLoop\@DedicatedServer\@\@QEAA?AW4StartResult\@1\@AEAVFilePathManager\@Core\@\@AEAVPropertiesSettings\@\@AEAVLevelSettings\@\@AEAVAllowListFile\@\@AEAV?$unique_ptr\@VPermissionsFile\@\@U?$default_delete\@VPermissionsFile\@\@\@std\@\@\@std\@\@\@Z */ MCAPI enum class DedicatedServer::StartResult runDedicatedServerLoop(class Core::FilePathManager &, class PropertiesSettings &, class LevelSettings &, class AllowListFile &, std::unique_ptr &); /** - * @symbol ?start\@DedicatedServer\@\@QEAA?AW4StartResult\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActivationArguments\@Bedrock\@\@\@Z + * @symbol ?start\@DedicatedServer\@\@QEAA?AW4StartResult\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActivationArguments\@Bedrock\@\@\@Z */ MCAPI enum class DedicatedServer::StartResult start(std::string const &, class Bedrock::ActivationArguments const &); //private: /** - * @symbol ?initializeHttp\@DedicatedServer\@\@AEAAXW4Implementation\@Http\@Bedrock\@\@\@Z + * @symbol ?initializeHttp\@DedicatedServer\@\@AEAAXW4Implementation\@Http\@Bedrock\@\@\@Z */ MCAPI void initializeHttp(enum class Bedrock::Http::Implementation); /** - * @symbol ?initializeLogging\@DedicatedServer\@\@AEAAXXZ + * @symbol ?initializeLogging\@DedicatedServer\@\@AEAAXXZ */ MCAPI void initializeLogging(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp b/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp index 6422ab0da8..468997a40f 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServerCommands.hpp @@ -31,7 +31,7 @@ class DedicatedServerCommands { public: /** - * @symbol ?setupStandaloneServer\@DedicatedServerCommands\@\@SAXAEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@AEAVIMinecraftApp\@\@AEAVLevel\@\@AEAVLevelStorage\@\@AEAVDedicatedServer\@\@AEAVAllowListFile\@\@\@Z + * @symbol ?setupStandaloneServer\@DedicatedServerCommands\@\@SAXAEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@AEAVIMinecraftApp\@\@AEAVLevel\@\@AEAVLevelStorage\@\@AEAVDedicatedServer\@\@AEAVAllowListFile\@\@\@Z */ MCAPI static void setupStandaloneServer(class gsl::not_null> const &, class IMinecraftApp &, class Level &, class LevelStorage &, class DedicatedServer &, class AllowListFile &); @@ -39,8 +39,8 @@ class DedicatedServerCommands { private: /** - * @symbol ?mSaveAllFileList\@DedicatedServerCommands\@\@0V?$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\@\@A + * @symbol ?mSaveAllFileList\@DedicatedServerCommands\@\@0V?$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\@\@A */ MCAPI static std::vector mSaveAllFileList; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunner.hpp b/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunner.hpp index 52648bc002..e0af921147 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunner.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunner.hpp @@ -28,36 +28,36 @@ class DedicatedServerGameTestRunner { public: /** - * @symbol ??0DedicatedServerGameTestRunner\@\@QEAA\@AEBVTestConfig\@\@AEAVMinecraftGameTest\@\@AEAVServerInstance\@\@AEAVLevel\@\@\@Z + * @symbol ??0DedicatedServerGameTestRunner\@\@QEAA\@AEBVTestConfig\@\@AEAVMinecraftGameTest\@\@AEAVServerInstance\@\@AEAVLevel\@\@\@Z */ MCAPI DedicatedServerGameTestRunner(class TestConfig const &, class MinecraftGameTest &, class ServerInstance &, class Level &); /** - * @symbol ?isDone\@DedicatedServerGameTestRunner\@\@QEBA_NXZ + * @symbol ?isDone\@DedicatedServerGameTestRunner\@\@QEBA_NXZ */ MCAPI bool isDone() const; /** - * @symbol ?tick\@DedicatedServerGameTestRunner\@\@QEAAXXZ + * @symbol ?tick\@DedicatedServerGameTestRunner\@\@QEAAXXZ */ MCAPI void tick(); //private: /** - * @symbol ?_ensureDimension\@DedicatedServerGameTestRunner\@\@AEAAPEAVDimension\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?_ensureDimension\@DedicatedServerGameTestRunner\@\@AEAAPEAVDimension\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class Dimension * _ensureDimension(class AutomaticID); /** - * @symbol ?_runTestGroup\@DedicatedServerGameTestRunner\@\@AEAAXAEBV?$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 ?_runTestGroup\@DedicatedServerGameTestRunner\@\@AEAAXAEBV?$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 void _runTestGroup(std::vector const &); /** - * @symbol ?_saveReport\@DedicatedServerGameTestRunner\@\@AEAA_NXZ + * @symbol ?_saveReport\@DedicatedServerGameTestRunner\@\@AEAA_NXZ */ MCAPI bool _saveReport(); /** - * @symbol ?_writeFile\@DedicatedServerGameTestRunner\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?_writeFile\@DedicatedServerGameTestRunner\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI bool _writeFile(std::string const &, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp b/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp index ab3f9b6ce7..e0e185b3be 100644 --- a/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedServerGameTestRunnerListener.hpp @@ -28,41 +28,41 @@ class DedicatedServerGameTestRunnerListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DedicatedServerGameTestRunnerListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?onTestPassed\@DedicatedServerGameTestRunnerListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 2 + * @symbol ?onTestPassed\@DedicatedServerGameTestRunnerListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestPassed(class gametest::BaseGameTestInstance &); /** - * @vftbl 3 - * @symbol ?onTestFailed\@DedicatedServerGameTestRunnerListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 3 + * @symbol ?onTestFailed\@DedicatedServerGameTestRunnerListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestFailed(class gametest::BaseGameTestInstance &); /** - * @vftbl 4 - * @symbol ?onTestStarted\@DedicatedServerGameTestRunnerListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 4 + * @symbol ?onTestStarted\@DedicatedServerGameTestRunnerListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestStarted(class gametest::BaseGameTestInstance &); //private: /** - * @symbol ?_addTestResult\@DedicatedServerGameTestRunnerListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$optional\@UGameTestError\@gametest\@\@\@3\@\@Z + * @symbol ?_addTestResult\@DedicatedServerGameTestRunnerListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$optional\@UGameTestError\@gametest\@\@\@3\@\@Z */ MCAPI void _addTestResult(std::string const &, std::string const &, class std::optional); /** - * @symbol ?_getTestNameWithRotation\@DedicatedServerGameTestRunnerListener\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBaseGameTestInstance\@gametest\@\@\@Z + * @symbol ?_getTestNameWithRotation\@DedicatedServerGameTestRunnerListener\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBaseGameTestInstance\@gametest\@\@\@Z */ MCAPI static std::string _getTestNameWithRotation(class gametest::BaseGameTestInstance &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp index 0bfcb889aa..6fb52155fc 100644 --- a/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/DedicatedWSServerCommand.hpp @@ -31,17 +31,17 @@ class DedicatedWSServerCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DedicatedWSServerCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DedicatedWSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DedicatedWSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@DedicatedWSServerCommand\@\@SAXAEAVCommandRegistry\@\@AEAVIMinecraftApp\@\@\@Z + * @symbol ?setup\@DedicatedWSServerCommand\@\@SAXAEAVCommandRegistry\@\@AEAVIMinecraftApp\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class IMinecraftApp &); @@ -49,8 +49,8 @@ class DedicatedWSServerCommand : public Command { private: /** - * @symbol ?mApp\@DedicatedWSServerCommand\@\@0PEAVIMinecraftApp\@\@EA + * @symbol ?mApp\@DedicatedWSServerCommand\@\@0PEAVIMinecraftApp\@\@EA */ MCAPI static class IMinecraftApp * mApp; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp index 8cb28b1c44..04e9542279 100644 --- a/LiteLoader/include/llapi/mc/DeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateBlock.hpp @@ -31,213 +31,218 @@ class DeepslateBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeepslateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@DeepslateBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@DeepslateBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 159 - * @symbol ?tryGetInfested\@DeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 159 + * @symbol ?tryGetInfested\@DeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DeepslateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0DeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DeepslateBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp index eb541f5dc9..94d46ab2a3 100644 --- a/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateOreBlock.hpp @@ -31,213 +31,218 @@ class DeepslateOreBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeepslateOreBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@DeepslateOreBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@DeepslateOreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@DeepslateOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DeepslateOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@DeepslateOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@DeepslateOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@DeepslateOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0DeepslateOreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DeepslateOreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DeepslateOreBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp index 356ce6ad8b..7834532d12 100644 --- a/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/DeepslateRedStoneOreBlock.hpp @@ -31,213 +31,218 @@ class DeepslateRedStoneOreBlock : public RedStoneOreBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeepslateRedStoneOreBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@DeepslateRedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@DeepslateRedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DeepslateRedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?_lightUpBlock\@DeepslateRedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?_lightUpBlock\@DeepslateRedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void _lightUpBlock(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??0DeepslateRedStoneOreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0DeepslateRedStoneOreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI DeepslateRedStoneOreBlock(std::string const &, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp index 79f1ff452c..45bd2483d8 100644 --- a/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/DefaultDataLoadHelper.hpp @@ -31,152 +31,152 @@ class DefaultDataLoadHelper { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DefaultDataLoadHelper(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol ?loadActorInternalComponentInfo\@DefaultDataLoadHelper\@\@UEAAPEBUComponentInfo\@InternalComponentRegistry\@\@AEBV?$unordered_map\@VHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@\@std\@\@\@5\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z + * @vftbl 15 + * @symbol ?loadActorInternalComponentInfo\@DefaultDataLoadHelper\@\@UEAAPEBUComponentInfo\@InternalComponentRegistry\@\@AEBV?$unordered_map\@VHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@\@std\@\@\@5\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z */ virtual struct InternalComponentRegistry::ComponentInfo const * loadActorInternalComponentInfo(class std::unordered_map, struct std::equal_to, class std::allocator>> const &, std::string const &); /** - * @vftbl 16 - * @symbol ?getType\@DefaultDataLoadHelper\@\@UEBA?AW4DataLoadHelperType\@\@XZ + * @vftbl 16 + * @symbol ?getType\@DefaultDataLoadHelper\@\@UEBA?AW4DataLoadHelperType\@\@XZ */ virtual enum class DataLoadHelperType getType() const; /** - * @vftbl 17 - * @symbol ?shouldResetTime\@DefaultDataLoadHelper\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?shouldResetTime\@DefaultDataLoadHelper\@\@UEAA_NXZ */ virtual bool shouldResetTime(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEFAULTDATALOADHELPER /** - * @symbol ?loadActorUniqueID\@DefaultDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z + * @symbol ?loadActorUniqueID\@DefaultDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z */ MCVAPI struct ActorUniqueID loadActorUniqueID(struct ActorUniqueID); /** - * @symbol ?loadBlockPosition\@DefaultDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?loadBlockPosition\@DefaultDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ MCVAPI class BlockPos loadBlockPosition(class BlockPos const &); /** - * @symbol ?loadBlockPositionOffset\@DefaultDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?loadBlockPositionOffset\@DefaultDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ MCVAPI class BlockPos loadBlockPositionOffset(class BlockPos const &); /** - * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z + * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ - MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); + MCVAPI class Vec3 loadDirection(class Vec3 const &); /** - * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + * @symbol ?loadDirection\@DefaultDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z */ - MCVAPI class Vec3 loadDirection(class Vec3 const &); + MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); /** - * @symbol ?loadFacingID\@DefaultDataLoadHelper\@\@UEAAEE\@Z + * @symbol ?loadFacingID\@DefaultDataLoadHelper\@\@UEAAEE\@Z */ MCVAPI unsigned char loadFacingID(unsigned char); /** - * @symbol ?loadMirror\@DefaultDataLoadHelper\@\@UEAA?AW4Mirror\@\@W42\@\@Z + * @symbol ?loadMirror\@DefaultDataLoadHelper\@\@UEAA?AW4Mirror\@\@W42\@\@Z */ MCVAPI enum class Mirror loadMirror(enum class Mirror); /** - * @symbol ?loadOwnerID\@DefaultDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z + * @symbol ?loadOwnerID\@DefaultDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z */ MCVAPI struct ActorUniqueID loadOwnerID(struct ActorUniqueID); /** - * @symbol ?loadPosition\@DefaultDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + * @symbol ?loadPosition\@DefaultDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ MCVAPI class Vec3 loadPosition(class Vec3 const &); /** - * @symbol ?loadRotation\@DefaultDataLoadHelper\@\@UEAA?AW4Rotation\@\@W42\@\@Z + * @symbol ?loadRotation\@DefaultDataLoadHelper\@\@UEAA?AW4Rotation\@\@W42\@\@Z */ MCVAPI enum class Rotation loadRotation(enum class Rotation); /** - * @symbol ?loadRotationDegreesX\@DefaultDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationDegreesX\@DefaultDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationDegreesX(float); /** - * @symbol ?loadRotationDegreesY\@DefaultDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationDegreesY\@DefaultDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationDegreesY(float); /** - * @symbol ?loadRotationRadiansX\@DefaultDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationRadiansX\@DefaultDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationRadiansX(float); /** - * @symbol ?loadRotationRadiansY\@DefaultDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationRadiansY\@DefaultDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationRadiansY(float); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefaultLookAngleDefinition.hpp b/LiteLoader/include/llapi/mc/DefaultLookAngleDefinition.hpp index f86594ec21..b961cb8a8b 100644 --- a/LiteLoader/include/llapi/mc/DefaultLookAngleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DefaultLookAngleDefinition.hpp @@ -31,7 +31,7 @@ struct DefaultLookAngleDefinition { public: /** - * @symbol ?buildSchema\@DefaultLookAngleDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UDefaultLookAngleDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@DefaultLookAngleDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UDefaultLookAngleDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp b/LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp index aff660dab0..4a3b909307 100644 --- a/LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp +++ b/LiteLoader/include/llapi/mc/DefaultMobSpawner.hpp @@ -31,14 +31,14 @@ class DefaultMobSpawner : public BaseMobSpawner { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DefaultMobSpawner(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?getPos\@DefaultMobSpawner\@\@UEAAAEBVBlockPos\@\@XZ + * @vftbl 4 + * @symbol ?getPos\@DefaultMobSpawner\@\@UEAAAEBVBlockPos\@\@XZ */ virtual class BlockPos const & getPos(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp index 282f6950c5..fd72ef8a7e 100644 --- a/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/DefaultScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure DefaultScreenCapabilities. - * - */ -struct DefaultScreenCapabilities { + +class DefaultScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,21 @@ struct DefaultScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DEFAULTSCREENCAPABILITIES public: - struct DefaultScreenCapabilities& operator=(struct DefaultScreenCapabilities const &) = delete; - DefaultScreenCapabilities(struct DefaultScreenCapabilities const &) = delete; + class DefaultScreenCapabilities& operator=(class DefaultScreenCapabilities const &) = delete; + DefaultScreenCapabilities(class DefaultScreenCapabilities const &) = delete; DefaultScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DefaultScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UDefaultScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UDefaultScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefaultSculkBehavior.hpp b/LiteLoader/include/llapi/mc/DefaultSculkBehavior.hpp index 516f95b391..78511cb0f0 100644 --- a/LiteLoader/include/llapi/mc/DefaultSculkBehavior.hpp +++ b/LiteLoader/include/llapi/mc/DefaultSculkBehavior.hpp @@ -28,34 +28,34 @@ class DefaultSculkBehavior { public: /** - * @vftbl 0 - * @symbol ?updateDecayDelay\@DefaultSculkBehavior\@\@UEBAHH\@Z + * @vftbl 0 + * @symbol ?updateDecayDelay\@DefaultSculkBehavior\@\@UEBAHH\@Z */ virtual int updateDecayDelay(int) const; /** - * @vftbl 1 - * @symbol ?updateFacingData\@DefaultSculkBehavior\@\@UEBAHHAEBVBlock\@\@\@Z + * @vftbl 1 + * @symbol ?updateFacingData\@DefaultSculkBehavior\@\@UEBAHHAEBVBlock\@\@\@Z */ virtual int updateFacingData(int, class Block const &) const; /** - * @vftbl 2 - * @symbol ?canChangeBlockOnSpread\@DefaultSculkBehavior\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?canChangeBlockOnSpread\@DefaultSculkBehavior\@\@UEBA_NXZ */ virtual bool canChangeBlockOnSpread() const; /** - * @vftbl 3 - * @symbol ?attemptSpreadVeins\@DefaultSculkBehavior\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@HAEAVSculkSpreader\@\@\@Z + * @vftbl 3 + * @symbol ?attemptSpreadVeins\@DefaultSculkBehavior\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@HAEAVSculkSpreader\@\@\@Z */ virtual bool attemptSpreadVeins(class IBlockWorldGenAPI &, class BlockPos const &, class Block const &, int, class SculkSpreader &) const; /** - * @vftbl 4 - * @symbol ?attemptUseCharge\@DefaultSculkBehavior\@\@UEBAHAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@2HHAEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z + * @vftbl 4 + * @symbol ?attemptUseCharge\@DefaultSculkBehavior\@\@UEBAHAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@2HHAEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z */ virtual int attemptUseCharge(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class BlockPos const &, int, int, class Random &, class SculkSpreader &, bool) const; /** - * @vftbl 5 - * @symbol ?onDischarged\@DefaultSculkBehavior\@\@UEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?onDischarged\@DefaultSculkBehavior\@\@UEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onDischarged(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp b/LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp index 58bd15d568..f275c1fc10 100644 --- a/LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/DefendTrustedTargetGoal.hpp @@ -31,46 +31,46 @@ class DefendTrustedTargetGoal : public NearestAttackableTargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DefendTrustedTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DefendTrustedTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DefendTrustedTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 4 - * @symbol ?start\@DefendTrustedTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DefendTrustedTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DefendTrustedTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DefendTrustedTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0DefendTrustedTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@MH_NHW4LevelSoundEvent\@\@AEBVActorDefinitionTrigger\@\@\@Z + * @symbol ??0DefendTrustedTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@MH_NHW4LevelSoundEvent\@\@AEBVActorDefinitionTrigger\@\@\@Z */ MCAPI DefendTrustedTargetGoal(class Mob &, std::vector const &, float, int, bool, int, enum class LevelSoundEvent, class ActorDefinitionTrigger const &); //private: /** - * @symbol ?_findTrustedTarget\@DefendTrustedTargetGoal\@\@AEAA?AUActorUniqueID\@\@AEBVTrustComponent\@\@\@Z + * @symbol ?_findTrustedTarget\@DefendTrustedTargetGoal\@\@AEAA?AUActorUniqueID\@\@AEBVTrustComponent\@\@\@Z */ MCAPI struct ActorUniqueID _findTrustedTarget(class TrustComponent const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp b/LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp index d44b425cff..3b863466a9 100644 --- a/LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DefendVillageTargetDefinition.hpp @@ -30,16 +30,16 @@ class DefendVillageTargetDefinition { public: /** - * @symbol ??0DefendVillageTargetDefinition\@\@QEAA\@XZ + * @symbol ??0DefendVillageTargetDefinition\@\@QEAA\@XZ */ MCAPI DefendVillageTargetDefinition(); /** - * @symbol ?initialize\@DefendVillageTargetDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDefendVillageTargetGoal\@\@\@Z + * @symbol ?initialize\@DefendVillageTargetDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDefendVillageTargetGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DefendVillageTargetGoal &) const; /** - * @symbol ?buildSchema\@DefendVillageTargetDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDefendVillageTargetDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@DefendVillageTargetDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDefendVillageTargetDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp b/LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp index 757a623024..4208a8b230 100644 --- a/LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/DefendVillageTargetGoal.hpp @@ -31,43 +31,43 @@ class DefendVillageTargetGoal : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DefendVillageTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DefendVillageTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DefendVillageTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DefendVillageTargetGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DefendVillageTargetGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 4 - * @symbol ?start\@DefendVillageTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DefendVillageTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DefendVillageTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DefendVillageTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0DefendVillageTargetGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DefendVillageTargetGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DefendVillageTargetGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeferredCommand.hpp b/LiteLoader/include/llapi/mc/DeferredCommand.hpp index 22e10e9143..639bc2f7de 100644 --- a/LiteLoader/include/llapi/mc/DeferredCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCommand.hpp @@ -29,18 +29,18 @@ class DeferredCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeferredCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DeferredCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DeferredCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ virtual void execute(class MinecraftCommands &); /** - * @symbol ??0DeferredCommand\@\@QEAA\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@_N1V?$function\@$$A6AXUMCRESULT\@\@\@Z\@2\@\@Z + * @symbol ??0DeferredCommand\@\@QEAA\@V?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@_N1V?$function\@$$A6AXUMCRESULT\@\@\@Z\@2\@\@Z */ MCAPI DeferredCommand(std::unique_ptr, bool, bool, class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeferredCommandBase.hpp b/LiteLoader/include/llapi/mc/DeferredCommandBase.hpp index be97c2e501..932b7bf74b 100644 --- a/LiteLoader/include/llapi/mc/DeferredCommandBase.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCommandBase.hpp @@ -27,5 +27,11 @@ class DeferredCommandBase { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEFERREDCOMMANDBASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DeferredCommandBase(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp b/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp index 40cc442a54..03eb9c30f1 100644 --- a/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCommandBlockCommand.hpp @@ -29,18 +29,18 @@ class DeferredCommandBlockCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeferredCommandBlockCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DeferredCommandBlockCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DeferredCommandBlockCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ virtual void execute(class MinecraftCommands &); /** - * @symbol ??0DeferredCommandBlockCommand\@\@QEAA\@VBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ??0DeferredCommandBlockCommand\@\@QEAA\@VBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI DeferredCommandBlockCommand(class BlockPos, class BlockSource &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp b/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp index 838140aee3..3d73c85744 100644 --- a/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredCompiledCommand.hpp @@ -29,18 +29,18 @@ class DeferredCompiledCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeferredCompiledCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DeferredCompiledCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DeferredCompiledCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ virtual void execute(class MinecraftCommands &); /** - * @symbol ??0DeferredCompiledCommand\@\@QEAA\@V?$not_null\@PEAVCommand\@\@\@gsl\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0DeferredCompiledCommand\@\@QEAA\@V?$not_null\@PEAVCommand\@\@\@gsl\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@\@Z */ MCAPI DeferredCompiledCommand(class gsl::not_null, std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp b/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp index 82a4b9c409..51b0cc73f7 100644 --- a/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/DeferredDescriptor.hpp @@ -12,86 +12,81 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure DeferredDescriptor. - * - */ -struct DeferredDescriptor { + +class DeferredDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DEFERREDDESCRIPTOR public: - struct DeferredDescriptor& operator=(struct DeferredDescriptor const &) = delete; - DeferredDescriptor(struct DeferredDescriptor const &) = delete; + class DeferredDescriptor& operator=(class DeferredDescriptor const &) = delete; + DeferredDescriptor(class DeferredDescriptor const &) = delete; DeferredDescriptor() = delete; #endif public: /** - * @vftbl 0 - * @symbol ?clone\@DeferredDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ + * @vftbl 0 + * @symbol ?clone\@DeferredDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 2 - * @symbol ?sameItem\@DeferredDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z + * @vftbl 2 + * @symbol ?sameItem\@DeferredDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z */ virtual bool sameItem(struct ItemDescriptor::ItemEntry const &, bool) const; /** - * @vftbl 3 - * @symbol ?getFullName\@DeferredDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getFullName\@DeferredDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getFullName() const; /** - * @vftbl 6 - * @symbol ?toMap\@DeferredDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?toMap\@DeferredDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::map, class std::allocator>> toMap() const; /** - * @vftbl 7 - * @symbol ?save\@DeferredDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ + * @vftbl 7 + * @symbol ?save\@DeferredDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ */ virtual class std::optional save() const; /** - * @vftbl 9 - * @symbol ?serialize\@DeferredDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 9 + * @symbol ?serialize\@DeferredDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void serialize(class BinaryStream &) const; /** - * @vftbl 10 - * @symbol ?getType\@DeferredDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ + * @vftbl 10 + * @symbol ?getType\@DeferredDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ */ virtual enum class ItemDescriptor::InternalType getType() const; /** - * @vftbl 12 - * @symbol ?getHash\@DeferredDescriptor\@\@UEBA_KXZ + * @vftbl 12 + * @symbol ?getHash\@DeferredDescriptor\@\@UEBA_KXZ */ virtual unsigned __int64 getHash() const; /** - * @vftbl 13 - * @symbol ?shouldResolve\@DeferredDescriptor\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?shouldResolve\@DeferredDescriptor\@\@UEBA_NXZ */ virtual bool shouldResolve() const; /** - * @vftbl 14 - * @symbol ?resolve\@DeferredDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ + * @vftbl 14 + * @symbol ?resolve\@DeferredDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr resolve() const; - /** - * @symbol ?deserialize\@DeferredDescriptor\@\@SA?AV?$unique_ptr\@UDeferredDescriptor\@\@U?$default_delete\@UDeferredDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z - */ - MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); //private: /** - * @symbol ?_initFromBlockLegacy\@DeferredDescriptor\@\@AEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@AEBVBlockLegacy\@\@$$QEAV?$WeakPtr\@VItem\@\@\@\@\@Z + * @symbol ?_initFromBlockLegacy\@DeferredDescriptor\@\@AEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@AEBVBlockLegacy\@\@$$QEAV?$WeakPtr\@VItem\@\@\@\@\@Z */ MCAPI std::unique_ptr _initFromBlockLegacy(class BlockLegacy const &, class WeakPtr &&) const; /** - * @symbol ?_initFromItem\@DeferredDescriptor\@\@AEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@$$QEAV?$WeakPtr\@VItem\@\@\@\@F\@Z + * @symbol ?_initFromItem\@DeferredDescriptor\@\@AEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@$$QEAV?$WeakPtr\@VItem\@\@\@\@F\@Z */ MCAPI std::unique_ptr _initFromItem(class WeakPtr &&, short) const; -}; \ No newline at end of file +private: + +}; diff --git a/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp b/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp index 04bf128fb6..1828e7cd80 100644 --- a/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp +++ b/LiteLoader/include/llapi/mc/DeferredScriptCommand.hpp @@ -31,18 +31,18 @@ class DeferredScriptCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeferredScriptCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DeferredScriptCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DeferredScriptCommand\@\@UEAAXAEAVMinecraftCommands\@\@\@Z */ 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\@\@\@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\@\@\@5\@\@Z */ MCAPI DeferredScriptCommand(std::unique_ptr, std::unique_ptr, class Scripting::WeakLifetimeScope, class Scripting::Promise>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefinitionEvent.hpp b/LiteLoader/include/llapi/mc/DefinitionEvent.hpp index 3f68107110..957337d400 100644 --- a/LiteLoader/include/llapi/mc/DefinitionEvent.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionEvent.hpp @@ -28,24 +28,24 @@ class DefinitionEvent { public: /** - * @symbol ??0DefinitionEvent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0DefinitionEvent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI DefinitionEvent(class DefinitionEvent &&); /** - * @symbol ??0DefinitionEvent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0DefinitionEvent\@\@QEAA\@AEBV0\@\@Z */ MCAPI DefinitionEvent(class DefinitionEvent const &); /** - * @symbol ?evaluateEvent\@DefinitionEvent\@\@QEBAXAEAVRenderParams\@\@AEAV?$vector\@UDefinitionModifier\@\@V?$allocator\@UDefinitionModifier\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?evaluateEvent\@DefinitionEvent\@\@QEBAXAEAVRenderParams\@\@AEAV?$vector\@UDefinitionModifier\@\@V?$allocator\@UDefinitionModifier\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void evaluateEvent(class RenderParams &, std::vector &) const; /** - * @symbol ??4DefinitionEvent\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4DefinitionEvent\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class DefinitionEvent & operator=(class DefinitionEvent const &); /** - * @symbol ??1DefinitionEvent\@\@QEAA\@XZ + * @symbol ??1DefinitionEvent\@\@QEAA\@XZ */ MCAPI ~DefinitionEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp b/LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp index 125f71774b..011d1f8122 100644 --- a/LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionEventLoader.hpp @@ -31,16 +31,16 @@ class DefinitionEventLoader { public: /** - * @symbol ?loadEvent\@DefinitionEventLoader\@\@SA?AVDefinitionEvent\@\@VValue\@Json\@\@AEBVSemVersion\@\@W4TypeExecutingEvent\@\@PEBVEventResponseFactory\@\@\@Z + * @symbol ?loadEvent\@DefinitionEventLoader\@\@SA?AVDefinitionEvent\@\@VValue\@Json\@\@AEBVSemVersion\@\@W4TypeExecutingEvent\@\@PEBVEventResponseFactory\@\@\@Z */ MCAPI static class DefinitionEvent loadEvent(class Json::Value, class SemVersion const &, enum class TypeExecutingEvent, class EventResponseFactory const *); //private: /** - * @symbol ?_loadCollection\@DefinitionEventLoader\@\@CAXAEAVDefinitionEvent\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@W4TypeExecutingEvent\@\@PEBVEventResponseFactory\@\@\@Z + * @symbol ?_loadCollection\@DefinitionEventLoader\@\@CAXAEAVDefinitionEvent\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@W4TypeExecutingEvent\@\@PEBVEventResponseFactory\@\@\@Z */ MCAPI static void _loadCollection(class DefinitionEvent &, class Json::Value const &, class SemVersion const &, enum class TypeExecutingEvent, class EventResponseFactory const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DefinitionModifier.hpp b/LiteLoader/include/llapi/mc/DefinitionModifier.hpp index 2bd86cad0d..90ed8f4e55 100644 --- a/LiteLoader/include/llapi/mc/DefinitionModifier.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionModifier.hpp @@ -27,11 +27,11 @@ struct DefinitionModifier { public: /** - * @symbol ??0DefinitionModifier\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0DefinitionModifier\@\@QEAA\@AEBU0\@\@Z */ MCAPI DefinitionModifier(struct DefinitionModifier const &); /** - * @symbol ??1DefinitionModifier\@\@QEAA\@XZ + * @symbol ??1DefinitionModifier\@\@QEAA\@XZ */ MCAPI ~DefinitionModifier(); diff --git a/LiteLoader/include/llapi/mc/DefinitionTrigger.hpp b/LiteLoader/include/llapi/mc/DefinitionTrigger.hpp index 0184484778..935270ca0b 100644 --- a/LiteLoader/include/llapi/mc/DefinitionTrigger.hpp +++ b/LiteLoader/include/llapi/mc/DefinitionTrigger.hpp @@ -30,16 +30,16 @@ class DefinitionTrigger { public: /** - * @symbol ?canTrigger\@DefinitionTrigger\@\@QEBA_NAEAVRenderParams\@\@\@Z + * @symbol ?canTrigger\@DefinitionTrigger\@\@QEBA_NAEAVRenderParams\@\@\@Z */ MCAPI bool canTrigger(class RenderParams &) const; /** - * @symbol ??1DefinitionTrigger\@\@QEAA\@XZ + * @symbol ??1DefinitionTrigger\@\@QEAA\@XZ */ MCAPI ~DefinitionTrigger(); /** - * @symbol ?bindType\@DefinitionTrigger\@\@SAXXZ + * @symbol ?bindType\@DefinitionTrigger\@\@SAXXZ */ MCAPI static void bindType(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DelayActionList.hpp b/LiteLoader/include/llapi/mc/DelayActionList.hpp index 25f8b809a2..bba09337f2 100644 --- a/LiteLoader/include/llapi/mc/DelayActionList.hpp +++ b/LiteLoader/include/llapi/mc/DelayActionList.hpp @@ -29,16 +29,16 @@ class DelayActionList { public: /** - * @symbol ??0DelayActionList\@\@QEAA\@XZ + * @symbol ??0DelayActionList\@\@QEAA\@XZ */ MCAPI DelayActionList(); /** - * @symbol ?queueRequestOrExecuteAction\@DelayActionList\@\@QEAA?AW4QueueRequestResult\@\@VDelayRequest\@\@AEAVServerLevel\@\@AEAVDimension\@\@_K_N\@Z + * @symbol ?queueRequestOrExecuteAction\@DelayActionList\@\@QEAA?AW4QueueRequestResult\@\@VDelayRequest\@\@AEAVServerLevel\@\@AEAVDimension\@\@_K_N\@Z */ MCAPI enum class QueueRequestResult queueRequestOrExecuteAction(class DelayRequest, class ServerLevel &, class Dimension &, unsigned __int64, bool); /** - * @symbol ?tick\@DelayActionList\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@_K\@Z + * @symbol ?tick\@DelayActionList\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@_K\@Z */ MCAPI void tick(class ServerLevel &, class Dimension &, unsigned __int64); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DelayRequest.hpp b/LiteLoader/include/llapi/mc/DelayRequest.hpp index c356cbd6f9..c749320092 100644 --- a/LiteLoader/include/llapi/mc/DelayRequest.hpp +++ b/LiteLoader/include/llapi/mc/DelayRequest.hpp @@ -28,28 +28,28 @@ class DelayRequest { public: /** - * @symbol ??0DelayRequest\@\@QEAA\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@_K\@Z + * @symbol ??0DelayRequest\@\@QEAA\@V?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@_K\@Z */ MCAPI DelayRequest(std::unique_ptr, unsigned __int64); /** - * @symbol ?executeAction\@DelayRequest\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?executeAction\@DelayRequest\@\@QEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void executeAction(class ServerLevel &, class Dimension &); /** - * @symbol ?getAction\@DelayRequest\@\@QEBA?AV?$not_null\@PEAVIRequestAction\@\@\@gsl\@\@XZ + * @symbol ?getAction\@DelayRequest\@\@QEBA?AV?$not_null\@PEAVIRequestAction\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getAction() const; /** - * @symbol ?getTickToExecuteOn\@DelayRequest\@\@QEBA_KXZ + * @symbol ?getTickToExecuteOn\@DelayRequest\@\@QEBA_KXZ */ MCAPI unsigned __int64 getTickToExecuteOn() const; /** - * @symbol ??ODelayRequest\@\@QEBA_NAEBV0\@\@Z + * @symbol ??ODelayRequest\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>(class DelayRequest const &) const; /** - * @symbol ??1DelayRequest\@\@QEAA\@XZ + * @symbol ??1DelayRequest\@\@QEAA\@XZ */ MCAPI ~DelayRequest(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp b/LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp index 14d61c78f3..59c6757573 100644 --- a/LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DelayedAttackDefinition.hpp @@ -30,16 +30,16 @@ class DelayedAttackDefinition { public: /** - * @symbol ??0DelayedAttackDefinition\@\@QEAA\@XZ + * @symbol ??0DelayedAttackDefinition\@\@QEAA\@XZ */ MCAPI DelayedAttackDefinition(); /** - * @symbol ?initialize\@DelayedAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDelayedAttackGoal\@\@\@Z + * @symbol ?initialize\@DelayedAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDelayedAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DelayedAttackGoal &) const; /** - * @symbol ?buildSchema\@DelayedAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDelayedAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@DelayedAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDelayedAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp b/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp index 877a2cebb6..b8895858e8 100644 --- a/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/DelayedAttackGoal.hpp @@ -31,83 +31,83 @@ class DelayedAttackGoal : public MeleeAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DelayedAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DelayedAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DelayedAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DelayedAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DelayedAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DelayedAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DelayedAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DelayedAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DelayedAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DelayedAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DelayedAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DelayedAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DelayedAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_attemptMoveToTarget\@DelayedAttackGoal\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 10 + * @symbol ?_attemptMoveToTarget\@DelayedAttackGoal\@\@EEAAXAEAVActor\@\@\@Z */ virtual void _attemptMoveToTarget(class Actor &); /** - * @symbol ??0DelayedAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DelayedAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DelayedAttackGoal(class Mob &); /** - * @symbol ?isTargetInLineOfSightLegacy\@DelayedAttackGoal\@\@SA_NAEBVMob\@\@AEBVActor\@\@\@Z + * @symbol ?isTargetInLineOfSightLegacy\@DelayedAttackGoal\@\@SA_NAEBVMob\@\@AEBVActor\@\@\@Z */ MCAPI static bool isTargetInLineOfSightLegacy(class Mob const &, class Actor const &); /** - * @symbol ?mMinLineOfSightFixVersion\@DelayedAttackGoal\@\@2VBaseGameVersion\@\@B + * @symbol ?mMinLineOfSightFixVersion\@DelayedAttackGoal\@\@2VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const mMinLineOfSightFixVersion; //private: /** - * @symbol ?_attemptAttack\@DelayedAttackGoal\@\@AEAAXPEAVActor\@\@\@Z + * @symbol ?_attemptAttack\@DelayedAttackGoal\@\@AEAAXPEAVActor\@\@\@Z */ MCAPI void _attemptAttack(class Actor *); /** - * @symbol ?_manageAttackTime\@DelayedAttackGoal\@\@AEAAXXZ + * @symbol ?_manageAttackTime\@DelayedAttackGoal\@\@AEAAXXZ */ MCAPI void _manageAttackTime(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeltaFeature.hpp b/LiteLoader/include/llapi/mc/DeltaFeature.hpp index fd0a881918..89417576b9 100644 --- a/LiteLoader/include/llapi/mc/DeltaFeature.hpp +++ b/LiteLoader/include/llapi/mc/DeltaFeature.hpp @@ -31,22 +31,22 @@ class DeltaFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeltaFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@DeltaFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@DeltaFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_isValidPlacement\@DeltaFeature\@\@AEBA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_isValidPlacement\@DeltaFeature\@\@AEBA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI bool _isValidPlacement(class BlockSource &, class BlockPos) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DenyList.hpp b/LiteLoader/include/llapi/mc/DenyList.hpp index d7268a1e50..0e568dc7e2 100644 --- a/LiteLoader/include/llapi/mc/DenyList.hpp +++ b/LiteLoader/include/llapi/mc/DenyList.hpp @@ -37,28 +37,28 @@ struct Entry { public: /** - * @symbol ?addEntry\@DenyList\@\@QEAAXAEBUEntry\@1\@\@Z + * @symbol ?addEntry\@DenyList\@\@QEAAXAEBUEntry\@1\@\@Z */ MCAPI void addEntry(struct DenyList::Entry const &); /** - * @symbol ?getDuration\@DenyList\@\@QEBA?AW4Duration\@1\@AEBUEntry\@1\@\@Z + * @symbol ?getDuration\@DenyList\@\@QEBA?AW4Duration\@1\@AEBUEntry\@1\@\@Z */ MCAPI enum class DenyList::Duration getDuration(struct DenyList::Entry const &) const; /** - * @symbol ?getMessage\@DenyList\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEntry\@1\@\@Z + * @symbol ?getMessage\@DenyList\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUEntry\@1\@\@Z */ MCAPI std::string const & getMessage(struct DenyList::Entry const &) const; /** - * @symbol ?isBlocked\@DenyList\@\@QEBA_NAEBUEntry\@1\@\@Z + * @symbol ?isBlocked\@DenyList\@\@QEBA_NAEBUEntry\@1\@\@Z */ MCAPI bool isBlocked(struct DenyList::Entry const &) const; /** - * @symbol ?removeEntry\@DenyList\@\@QEAAXAEBUEntry\@1\@\@Z + * @symbol ?removeEntry\@DenyList\@\@QEAAXAEBUEntry\@1\@\@Z */ MCAPI void removeEntry(struct DenyList::Entry const &); /** - * @symbol ??1DenyList\@\@QEAA\@XZ + * @symbol ??1DenyList\@\@QEAA\@XZ */ MCAPI ~DenyList(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Dependencies.hpp b/LiteLoader/include/llapi/mc/Dependencies.hpp index 929192febf..050009068e 100644 --- a/LiteLoader/include/llapi/mc/Dependencies.hpp +++ b/LiteLoader/include/llapi/mc/Dependencies.hpp @@ -27,19 +27,19 @@ struct Dependencies { public: /** - * @symbol ??4Dependencies\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4Dependencies\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct Dependencies & operator=(struct Dependencies const &); /** - * @symbol ??4Dependencies\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4Dependencies\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct Dependencies & operator=(struct Dependencies &&); /** - * @symbol ??1Dependencies\@\@QEAA\@XZ + * @symbol ??1Dependencies\@\@QEAA\@XZ */ MCAPI ~Dependencies(); /** - * @symbol ?bindType\@Dependencies\@\@SAXXZ + * @symbol ?bindType\@Dependencies\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp index 05a331e1d8..08154bbf24 100644 --- a/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/DeprecatedSlabBlockItem.hpp @@ -32,96 +32,102 @@ class DeprecatedSlabBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DeprecatedSlabBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@DeprecatedSlabBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@DeprecatedSlabBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@DeprecatedSlabBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@DeprecatedSlabBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DEPRECATEDSLABBLOCKITEM + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DeprecatedSlabBlockItem(); +#endif //private: /** - * @symbol ?_canConvertToDoubleSlab\@DeprecatedSlabBlockItem\@\@AEBA?AV?$optional\@H\@std\@\@AEAVItemStackBase\@\@AEBVActor\@\@AEBEAEBVBlock\@\@\@Z + * @symbol ?_canConvertToDoubleSlab\@DeprecatedSlabBlockItem\@\@AEBA?AV?$optional\@H\@std\@\@AEAVItemStackBase\@\@AEBVActor\@\@AEBEAEBVBlock\@\@\@Z */ MCAPI class std::optional _canConvertToDoubleSlab(class ItemStackBase &, class Actor const &, unsigned char const &, class Block const &) const; /** - * @symbol ?_findSlabType\@DeprecatedSlabBlockItem\@\@AEBAHAEBVBlock\@\@\@Z + * @symbol ?_findSlabType\@DeprecatedSlabBlockItem\@\@AEBAHAEBVBlock\@\@\@Z */ MCAPI int _findSlabType(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DepthBasedBlockSupplier.hpp b/LiteLoader/include/llapi/mc/DepthBasedBlockSupplier.hpp index 865fdcff79..d4b832d9d8 100644 --- a/LiteLoader/include/llapi/mc/DepthBasedBlockSupplier.hpp +++ b/LiteLoader/include/llapi/mc/DepthBasedBlockSupplier.hpp @@ -30,12 +30,12 @@ class DepthBasedBlockSupplier { public: /** - * @symbol ??0DepthBasedBlockSupplier\@\@QEAA\@VXoroshiroPositionalRandomFactory\@\@PEBVBlock\@\@\@Z + * @symbol ??0DepthBasedBlockSupplier\@\@QEAA\@VXoroshiroPositionalRandomFactory\@\@PEBVBlock\@\@\@Z */ MCAPI DepthBasedBlockSupplier(class XoroshiroPositionalRandomFactory, class Block const *); /** - * @symbol ?getBlock\@DepthBasedBlockSupplier\@\@QEBAPEBVBlock\@\@AEBVBlockPos\@\@PEBV2\@\@Z + * @symbol ?getBlock\@DepthBasedBlockSupplier\@\@QEBAPEBVBlock\@\@AEBVBlockPos\@\@PEBV2\@\@Z */ MCAPI class Block const * getBlock(class BlockPos const &, class Block const *) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DepthBasedBlockSupplierUtils.hpp b/LiteLoader/include/llapi/mc/DepthBasedBlockSupplierUtils.hpp index 3160564ddd..ca9d645619 100644 --- a/LiteLoader/include/llapi/mc/DepthBasedBlockSupplierUtils.hpp +++ b/LiteLoader/include/llapi/mc/DepthBasedBlockSupplierUtils.hpp @@ -20,7 +20,7 @@ namespace DepthBasedBlockSupplierUtils { #undef AFTER_EXTRA /** - * @symbol ?getDepthBasedBlock\@DepthBasedBlockSupplierUtils\@\@YAPEBVBlock\@\@HAEAVIRandom\@\@PEBV2\@1\@Z + * @symbol ?getDepthBasedBlock\@DepthBasedBlockSupplierUtils\@\@YAPEBVBlock\@\@HAEAVIRandom\@\@PEBV2\@1\@Z */ MCAPI class Block const * getDepthBasedBlock(int, class IRandom &, class Block const *, class Block const *); diff --git a/LiteLoader/include/llapi/mc/Description.hpp b/LiteLoader/include/llapi/mc/Description.hpp index 9b20bebe71..5d18df1f90 100644 --- a/LiteLoader/include/llapi/mc/Description.hpp +++ b/LiteLoader/include/llapi/mc/Description.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,27 +30,22 @@ struct Description { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TrustDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@BehaviorTreeDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const = 0; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~Description(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@Description\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@Description\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); /** - * @vftbl 3 - * @symbol ?serializeData\@TrustDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z - */ - virtual void serializeData(class Json::Value &) const = 0; - /** - * @symbol ?parseDescription\@Description\@\@QEAAPEAU1\@UDeserializeDataParams\@\@\@Z + * @symbol ?parseDescription\@Description\@\@QEAAPEAU1\@UDeserializeDataParams\@\@\@Z */ MCAPI struct Description * parseDescription(struct DeserializeDataParams); diff --git a/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp b/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp index 62c675b845..90ed0aadbc 100644 --- a/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp +++ b/LiteLoader/include/llapi/mc/DeserializeDataParams.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure DeserializeDataParams. - * - */ -struct DeserializeDataParams { + +class DeserializeDataParams { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DESERIALIZEDATAPARAMS public: - struct DeserializeDataParams& operator=(struct DeserializeDataParams const &) = delete; - DeserializeDataParams(struct DeserializeDataParams const &) = delete; + class DeserializeDataParams& operator=(class DeserializeDataParams const &) = delete; + DeserializeDataParams(class DeserializeDataParams const &) = delete; DeserializeDataParams() = delete; #endif public: /** - * @symbol ??1DeserializeDataParams\@\@QEAA\@XZ + * @symbol ??1DeserializeDataParams\@\@QEAA\@XZ */ MCAPI ~DeserializeDataParams(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DeserializedChunkLoadedRequest.hpp b/LiteLoader/include/llapi/mc/DeserializedChunkLoadedRequest.hpp index 3dd719235a..38f133f801 100644 --- a/LiteLoader/include/llapi/mc/DeserializedChunkLoadedRequest.hpp +++ b/LiteLoader/include/llapi/mc/DeserializedChunkLoadedRequest.hpp @@ -28,7 +28,7 @@ struct DeserializedChunkLoadedRequest { public: /** - * @symbol ??1DeserializedChunkLoadedRequest\@\@QEAA\@XZ + * @symbol ??1DeserializedChunkLoadedRequest\@\@QEAA\@XZ */ MCAPI ~DeserializedChunkLoadedRequest(); diff --git a/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp b/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp index 6632babe8b..d2d34dc269 100644 --- a/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp +++ b/LiteLoader/include/llapi/mc/DesertPyramidPiece.hpp @@ -31,23 +31,23 @@ class DesertPyramidPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DesertPyramidPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@DesertPyramidPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@DesertPyramidPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@DesertPyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@DesertPyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ??0DesertPyramidPiece\@\@QEAA\@FHH\@Z + * @symbol ??0DesertPyramidPiece\@\@QEAA\@FHH\@Z */ MCAPI DesertPyramidPiece(short, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DesertWellFeature.hpp b/LiteLoader/include/llapi/mc/DesertWellFeature.hpp index 45365975e4..da9e5354b7 100644 --- a/LiteLoader/include/llapi/mc/DesertWellFeature.hpp +++ b/LiteLoader/include/llapi/mc/DesertWellFeature.hpp @@ -31,14 +31,14 @@ class DesertWellFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DesertWellFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@DesertWellFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@DesertWellFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp b/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp index 589d0d3b89..4244d6c78e 100644 --- a/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp +++ b/LiteLoader/include/llapi/mc/DesiredMoveDirectionSystem.hpp @@ -28,12 +28,20 @@ class DesiredMoveDirectionSystem { public: /** - * @symbol ?rotateTowardsControllingPassenger\@DesiredMoveDirectionSystem\@\@SAX_NAEAVVec2\@\@1AEAM2AEBV2\@\@Z + * @symbol ?createDesiredMoveDirectionSystem\@DesiredMoveDirectionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createDesiredMoveDirectionSystem(); + /** + * @symbol ?rotateTowardsControllingPassenger\@DesiredMoveDirectionSystem\@\@SAX_NAEAVVec2\@\@1AEAM2AEBV2\@\@Z */ MCAPI static void rotateTowardsControllingPassenger(bool, class Vec2 &, class Vec2 &, float &, float &, class Vec2 const &); /** - * @symbol ?updateLocalMoveVelocity\@DesiredMoveDirectionSystem\@\@SAXAEAM00AEBVVec3\@\@\@Z + * @symbol ?tickDesiredMoveDirectionSystem\@DesiredMoveDirectionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSynchedActorDataComponent\@\@$$CBUVehicleComponent\@\@UActorHeadRotationComponent\@\@UActorRotationComponent\@\@UMobBodyRotationComponent\@\@UMobTravelComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@UPassengerComponent\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z + */ + MCAPI static void tickDesiredMoveDirectionSystem(class ViewT, class ViewT, struct PassengerComponent>, struct ActorRotationComponent const, struct LocalMoveVelocityComponent const, class Optional const>>); + /** + * @symbol ?updateLocalMoveVelocity\@DesiredMoveDirectionSystem\@\@SAXAEAM00AEBVVec3\@\@\@Z */ MCAPI static void updateLocalMoveVelocity(float &, float &, float &, class Vec3 const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DespawnComponent.hpp b/LiteLoader/include/llapi/mc/DespawnComponent.hpp index 14c5475448..292af5af7f 100644 --- a/LiteLoader/include/llapi/mc/DespawnComponent.hpp +++ b/LiteLoader/include/llapi/mc/DespawnComponent.hpp @@ -30,24 +30,24 @@ class DespawnComponent { public: /** - * @symbol ?onDespawn\@DespawnComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?onDespawn\@DespawnComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void onDespawn(class Actor &); /** - * @symbol ?tick\@DespawnComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?tick\@DespawnComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void tick(class Actor &); //private: /** - * @symbol ?_tryStandardDespawnRules\@DespawnComponent\@\@AEBA_NAEAVActor\@\@AEBVDespawnDefinition\@\@AEAVIWorldAccessor\@1\@\@Z + * @symbol ?_tryStandardDespawnRules\@DespawnComponent\@\@AEBA_NAEAVActor\@\@AEBVDespawnDefinition\@\@AEAVIWorldAccessor\@1\@\@Z */ MCAPI bool _tryStandardDespawnRules(class Actor &, class DespawnDefinition const &, class DespawnComponent::IWorldAccessor &) const; /** - * @symbol ?getDefinition\@DespawnComponent\@\@AEBAAEBVDespawnDefinition\@\@AEAVActor\@\@\@Z + * @symbol ?getDefinition\@DespawnComponent\@\@AEBAAEBVDespawnDefinition\@\@AEAVActor\@\@\@Z */ MCAPI class DespawnDefinition const & getDefinition(class Actor &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DespawnDefinition.hpp b/LiteLoader/include/llapi/mc/DespawnDefinition.hpp index bdf092229e..901afca8f2 100644 --- a/LiteLoader/include/llapi/mc/DespawnDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DespawnDefinition.hpp @@ -31,8 +31,8 @@ class DespawnDefinition { public: /** - * @symbol ?buildSchema\@DespawnDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDespawnDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@DespawnDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDespawnDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DespawnSystem.hpp b/LiteLoader/include/llapi/mc/DespawnSystem.hpp index 10ae53017c..6aef25763f 100644 --- a/LiteLoader/include/llapi/mc/DespawnSystem.hpp +++ b/LiteLoader/include/llapi/mc/DespawnSystem.hpp @@ -30,27 +30,27 @@ class DespawnSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DespawnSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@DespawnSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DespawnSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@DespawnSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVDespawnComponent\@\@\@Z + * @symbol ?_tickComponent\@DespawnSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVDespawnComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class DespawnComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp index 4d141253ff..a894bd232f 100644 --- a/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/DetectorRailBlock.hpp @@ -31,247 +31,252 @@ class DetectorRailBlock : public BaseRailBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DetectorRailBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@DetectorRailBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@DetectorRailBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@DetectorRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@DetectorRailBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@DetectorRailBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@DetectorRailBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@DetectorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DetectorRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@DetectorRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DETECTORRAILBLOCK /** - * @symbol ?hasComparatorSignal\@DetectorRailBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@DetectorRailBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; #endif /** - * @symbol ??0DetectorRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DetectorRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DetectorRailBlock(std::string const &, int); //private: /** - * @symbol ?checkPressed\@DetectorRailBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?checkPressed\@DetectorRailBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void checkPressed(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DialogueCommand.hpp b/LiteLoader/include/llapi/mc/DialogueCommand.hpp index 73fdb59052..285f7e0f33 100644 --- a/LiteLoader/include/llapi/mc/DialogueCommand.hpp +++ b/LiteLoader/include/llapi/mc/DialogueCommand.hpp @@ -31,18 +31,18 @@ class DialogueCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DialogueCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DialogueCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DialogueCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@DialogueCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@DialogueCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DieEventResponse.hpp b/LiteLoader/include/llapi/mc/DieEventResponse.hpp index 1772f8bd27..965bb52473 100644 --- a/LiteLoader/include/llapi/mc/DieEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/DieEventResponse.hpp @@ -31,28 +31,28 @@ class DieEventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DieEventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@DieEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@DieEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@DieEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@DieEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@DieEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@DieEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@DieEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@DieEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DiffListPair.hpp b/LiteLoader/include/llapi/mc/DiffListPair.hpp index 5eae9d8ac2..f770df7101 100644 --- a/LiteLoader/include/llapi/mc/DiffListPair.hpp +++ b/LiteLoader/include/llapi/mc/DiffListPair.hpp @@ -28,7 +28,7 @@ struct DiffListPair { public: /** - * @symbol ??0DiffListPair\@\@QEAA\@_NPEAVActorDefinitionDescriptor\@\@\@Z + * @symbol ??0DiffListPair\@\@QEAA\@_NPEAVActorDefinitionDescriptor\@\@\@Z */ MCAPI DiffListPair(bool, class ActorDefinitionDescriptor *); diff --git a/LiteLoader/include/llapi/mc/DifficultyCommand.hpp b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp index 117a3e4ec8..734d730276 100644 --- a/LiteLoader/include/llapi/mc/DifficultyCommand.hpp +++ b/LiteLoader/include/llapi/mc/DifficultyCommand.hpp @@ -31,18 +31,18 @@ class DifficultyCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DifficultyCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@DifficultyCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@DifficultyCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@DifficultyCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@DifficultyCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DigGoal.hpp b/LiteLoader/include/llapi/mc/DigGoal.hpp index 32b0e683c5..53be040921 100644 --- a/LiteLoader/include/llapi/mc/DigGoal.hpp +++ b/LiteLoader/include/llapi/mc/DigGoal.hpp @@ -28,56 +28,56 @@ class DigGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DigGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DigGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DigGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DigGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DigGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DigGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DigGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DigGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DigGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DigGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DigGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DigGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DigGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DigGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DigGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DigGoal(class Mob &); //private: /** - * @symbol ?_canUse\@DigGoal\@\@AEBA?AW4CanUseResult\@1\@XZ + * @symbol ?_canUse\@DigGoal\@\@AEBA?AW4CanUseResult\@1\@XZ */ MCAPI enum class DigGoal::CanUseResult _canUse() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DiggerItem.hpp b/LiteLoader/include/llapi/mc/DiggerItem.hpp index 29d7b9d2eb..714dca72e6 100644 --- a/LiteLoader/include/llapi/mc/DiggerItem.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItem.hpp @@ -32,121 +32,127 @@ class DiggerItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DiggerItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 48 - * @symbol ?getAttackDamage\@DiggerItem\@\@UEBAHXZ + * @vftbl 48 + * @symbol ?getAttackDamage\@DiggerItem\@\@UEBAHXZ */ virtual int getAttackDamage() const; /** - * @vftbl 49 - * @symbol ?isHandEquipped\@DiggerItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@DiggerItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@DiggerItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@DiggerItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@DiggerItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@DiggerItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@DiggerItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@DiggerItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@DiggerItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@DiggerItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@DiggerItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@DiggerItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIGGERITEM /** - * @symbol ?setBlocks\@DiggerItem\@\@QEAAXAEBV?$vector\@PEBVBlock\@\@V?$allocator\@PEBVBlock\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DiggerItem(); +#endif + /** + * @symbol ?setBlocks\@DiggerItem\@\@QEAAXAEBV?$vector\@PEBVBlock\@\@V?$allocator\@PEBVBlock\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setBlocks(std::vector const &); //protected: /** - * @symbol ??0DiggerItem\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHAEBVTier\@Item\@\@AEBV?$vector\@PEBVBlock\@\@V?$allocator\@PEBVBlock\@\@\@std\@\@\@2\@\@Z + * @symbol ??0DiggerItem\@\@IEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHAEBVTier\@Item\@\@AEBV?$vector\@PEBVBlock\@\@V?$allocator\@PEBVBlock\@\@\@std\@\@\@2\@\@Z */ MCAPI DiggerItem(std::string const &, int, int, class Item::Tier const &, std::vector const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp b/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp index fb303b49bb..999bac95f0 100644 --- a/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DiggerItemComponent.hpp @@ -24,65 +24,68 @@ class DiggerItemComponent { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIGGERITEMCOMPONENT public: class DiggerItemComponent& operator=(class DiggerItemComponent const &) = delete; - DiggerItemComponent(class DiggerItemComponent const &) = delete; DiggerItemComponent() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DiggerItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDiggerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?canDestroySpecial\@DiggerItemComponent\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ??0DiggerItemComponent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI DiggerItemComponent(class DiggerItemComponent const &); + /** + * @symbol ?canDestroySpecial\@DiggerItemComponent\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool canDestroySpecial(class Block const &) const; /** - * @symbol ?getDestroySpeed\@DiggerItemComponent\@\@QEAAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @symbol ?getDestroySpeed\@DiggerItemComponent\@\@QEAAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ MCAPI float getDestroySpeed(class ItemStackBase const &, class Block const &); /** - * @symbol ?mineBlock\@DiggerItemComponent\@\@QEAA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @symbol ?mineBlock\@DiggerItemComponent\@\@QEAA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ MCAPI bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *); /** - * @symbol ?bindType\@DiggerItemComponent\@\@SAXXZ + * @symbol ?bindType\@DiggerItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@DiggerItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@DiggerItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DiggingEnchant.hpp b/LiteLoader/include/llapi/mc/DiggingEnchant.hpp index 8fe351d4c5..fbe6c970cf 100644 --- a/LiteLoader/include/llapi/mc/DiggingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/DiggingEnchant.hpp @@ -31,61 +31,61 @@ class DiggingEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DiggingEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@DiggingEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@DiggingEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@DiggingEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@DiggingEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@DiggingEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@DiggingEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@DiggingEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@DiggingEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; /** - * @symbol ??0DiggingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0DiggingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI DiggingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI DiggingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: private: /** - * @symbol ?VALID_ENCHANTMENTS\@DiggingEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B + * @symbol ?VALID_ENCHANTMENTS\@DiggingEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const VALID_ENCHANTMENTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Dimension.hpp b/LiteLoader/include/llapi/mc/Dimension.hpp index 753073a18e..4f89ec2d10 100644 --- a/LiteLoader/include/llapi/mc/Dimension.hpp +++ b/LiteLoader/include/llapi/mc/Dimension.hpp @@ -36,504 +36,504 @@ class Dimension { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIMENSION /** - * @symbol ?_createChunkBuildOrderPolicy\@Dimension\@\@EEAA?AV?$unique_ptr\@VChunkBuildOrderPolicyBase\@\@U?$default_delete\@VChunkBuildOrderPolicyBase\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_createChunkBuildOrderPolicy\@Dimension\@\@EEAA?AV?$unique_ptr\@VChunkBuildOrderPolicyBase\@\@U?$default_delete\@VChunkBuildOrderPolicyBase\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr _createChunkBuildOrderPolicy(); /** - * @symbol ?deserialize\@Dimension\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?deserialize\@Dimension\@\@UEAAXAEBVCompoundTag\@\@\@Z */ MCVAPI void deserialize(class CompoundTag const &); /** - * @symbol ?forceCheckAllNeighChunkSavedStat\@Dimension\@\@UEBA_NXZ + * @symbol ?forceCheckAllNeighChunkSavedStat\@Dimension\@\@UEBA_NXZ */ MCVAPI bool forceCheckAllNeighChunkSavedStat() const; /** - * @symbol ?getBrightnessDependentFogColor\@Dimension\@\@UEBA?AVColor\@mce\@\@AEBV23\@M\@Z + * @symbol ?getBrightnessDependentFogColor\@Dimension\@\@UEBA?AVColor\@mce\@\@AEBV23\@M\@Z */ MCVAPI class mce::Color getBrightnessDependentFogColor(class mce::Color const &, float) const; /** - * @symbol ?getBrightnessRamp\@Dimension\@\@UEBAAEBVDimensionBrightnessRamp\@\@XZ + * @symbol ?getBrightnessRamp\@Dimension\@\@UEBAAEBVDimensionBrightnessRamp\@\@XZ */ MCVAPI class DimensionBrightnessRamp const & getBrightnessRamp() const; /** - * @symbol ?getClearColorScale\@Dimension\@\@UEAAMXZ + * @symbol ?getClearColorScale\@Dimension\@\@UEAAMXZ */ MCVAPI float getClearColorScale(); /** - * @symbol ?getCloudHeight\@Dimension\@\@UEBAFXZ + * @symbol ?getCloudHeight\@Dimension\@\@UEBAFXZ */ MCVAPI short getCloudHeight() const; /** - * @symbol ?getDefaultBiome\@Dimension\@\@UEBA?AVHashedString\@\@XZ + * @symbol ?getDefaultBiome\@Dimension\@\@UEBA?AVHashedString\@\@XZ */ MCVAPI class HashedString getDefaultBiome() const; /** - * @symbol ?getDimensionId\@Dimension\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getDimensionId\@Dimension\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCVAPI class AutomaticID getDimensionId() const; /** - * @symbol ?getLightTextureImageBuilder\@Dimension\@\@UEBAPEAVBaseLightTextureImageBuilder\@\@XZ + * @symbol ?getLightTextureImageBuilder\@Dimension\@\@UEBAPEAVBaseLightTextureImageBuilder\@\@XZ */ MCVAPI class BaseLightTextureImageBuilder * getLightTextureImageBuilder() const; /** - * @symbol ?getSpawnPos\@Dimension\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?getSpawnPos\@Dimension\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos getSpawnPos() const; /** - * @symbol ?getSpawnYPosition\@Dimension\@\@UEBAHXZ + * @symbol ?getSpawnYPosition\@Dimension\@\@UEBAHXZ */ MCVAPI int getSpawnYPosition() const; /** - * @symbol ?getSunIntensity\@Dimension\@\@UEBAMMAEBVVec3\@\@M\@Z + * @symbol ?getSunIntensity\@Dimension\@\@UEBAMMAEBVVec3\@\@M\@Z */ MCVAPI float getSunIntensity(float, class Vec3 const &, float) const; /** - * @symbol ?getTimeOfDay\@Dimension\@\@MEBAMHM\@Z + * @symbol ?getTimeOfDay\@Dimension\@\@MEBAMHM\@Z */ MCVAPI float getTimeOfDay(int, float) const; /** - * @symbol ?hasBedrockFog\@Dimension\@\@UEAA_NXZ + * @symbol ?hasBedrockFog\@Dimension\@\@UEAA_NXZ */ MCVAPI bool hasBedrockFog(); /** - * @symbol ?hasGround\@Dimension\@\@UEBA_NXZ + * @symbol ?hasGround\@Dimension\@\@UEBA_NXZ */ MCVAPI bool hasGround() const; /** - * @symbol ?hasPrecipitationFog\@Dimension\@\@UEBA_NXZ + * @symbol ?hasPrecipitationFog\@Dimension\@\@UEBA_NXZ */ MCVAPI bool hasPrecipitationFog() const; /** - * @symbol ?init\@Dimension\@\@UEAAXXZ + * @symbol ?init\@Dimension\@\@UEAAXXZ */ MCVAPI void init(); /** - * @symbol ?is2DPositionRelevantForPlayer\@Dimension\@\@UEBA_NAEBVBlockPos\@\@AEAVPlayer\@\@\@Z + * @symbol ?is2DPositionRelevantForPlayer\@Dimension\@\@UEBA_NAEBVBlockPos\@\@AEAVPlayer\@\@\@Z */ MCVAPI bool is2DPositionRelevantForPlayer(class BlockPos const &, class Player &) const; /** - * @symbol ?isActorRelevantForPlayer\@Dimension\@\@UEBA_NAEAVPlayer\@\@AEBVActor\@\@\@Z + * @symbol ?isActorRelevantForPlayer\@Dimension\@\@UEBA_NAEAVPlayer\@\@AEBVActor\@\@\@Z */ MCVAPI bool isActorRelevantForPlayer(class Player &, class Actor const &) const; /** - * @symbol ?isDay\@Dimension\@\@UEBA_NXZ + * @symbol ?isDay\@Dimension\@\@UEBA_NXZ */ MCVAPI bool isDay() const; /** - * @symbol ?isFoggyAt\@Dimension\@\@UEBA_NHH\@Z + * @symbol ?isFoggyAt\@Dimension\@\@UEBA_NHH\@Z */ MCVAPI bool isFoggyAt(int, int) const; /** - * @symbol ?isNaturalDimension\@Dimension\@\@UEBA_NXZ + * @symbol ?isNaturalDimension\@Dimension\@\@UEBA_NXZ */ MCVAPI bool isNaturalDimension() const; /** - * @symbol ?isValidSpawn\@Dimension\@\@UEBA_NHH\@Z + * @symbol ?isValidSpawn\@Dimension\@\@UEBA_NHH\@Z */ MCVAPI bool isValidSpawn(int, int) const; /** - * @symbol ?mayRespawnViaBed\@Dimension\@\@UEBA_NXZ + * @symbol ?mayRespawnViaBed\@Dimension\@\@UEBA_NXZ */ MCVAPI bool mayRespawnViaBed() const; /** - * @symbol ?onBlockChanged\@Dimension\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@IAEBVBlock\@\@2HPEBUActorBlockSyncMessage\@\@W4BlockChangedEventTarget\@\@PEAVActor\@\@\@Z + * @symbol ?onBlockChanged\@Dimension\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@IAEBVBlock\@\@2HPEBUActorBlockSyncMessage\@\@W4BlockChangedEventTarget\@\@PEAVActor\@\@\@Z */ MCVAPI void onBlockChanged(class BlockSource &, class BlockPos const &, unsigned int, class Block const &, class Block const &, int, struct ActorBlockSyncMessage const *, enum class BlockChangedEventTarget, class Actor *); /** - * @symbol ?onBlockEvent\@Dimension\@\@UEAAXAEAVBlockSource\@\@HHHHH\@Z + * @symbol ?onBlockEvent\@Dimension\@\@UEAAXAEAVBlockSource\@\@HHHHH\@Z */ MCVAPI void onBlockEvent(class BlockSource &, int, int, int, int, int); /** - * @symbol ?onChunkLoaded\@Dimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@Dimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkLoaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?onLevelDestruction\@Dimension\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onLevelDestruction\@Dimension\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onLevelDestruction(std::string const &); /** - * @symbol ?sendBroadcast\@Dimension\@\@UEAAXAEBVPacket\@\@PEAVPlayer\@\@\@Z + * @symbol ?sendBroadcast\@Dimension\@\@UEAAXAEBVPacket\@\@PEAVPlayer\@\@\@Z */ MCVAPI void sendBroadcast(class Packet const &, class Player *); /** - * @symbol ?serialize\@Dimension\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?sendPacketForPosition\@Dimension\@\@UEAAXAEBVBlockPos\@\@AEBVPacket\@\@PEBVPlayer\@\@\@Z + */ + MCVAPI void sendPacketForPosition(class BlockPos const &, class Packet const &, class Player const *); + /** + * @symbol ?serialize\@Dimension\@\@UEBAXAEAVCompoundTag\@\@\@Z */ MCVAPI void serialize(class CompoundTag &) const; /** - * @symbol ?showSky\@Dimension\@\@UEBA_NXZ + * @symbol ?showSky\@Dimension\@\@UEBA_NXZ */ MCVAPI bool showSky() const; /** - * @symbol ?startLeaveGame\@Dimension\@\@UEAAXXZ + * @symbol ?startLeaveGame\@Dimension\@\@UEAAXXZ */ MCVAPI void startLeaveGame(); /** - * @symbol ?tick\@Dimension\@\@UEAAXXZ + * @symbol ?tick\@Dimension\@\@UEAAXXZ */ MCVAPI void tick(); /** - * @symbol ?tickRedstone\@Dimension\@\@UEAAXXZ + * @symbol ?tickRedstone\@Dimension\@\@UEAAXXZ */ MCVAPI void tickRedstone(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~Dimension(); #endif /** - * @symbol ??0Dimension\@\@QEAA\@AEAVILevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@VDimensionHeightRange\@\@AEAVScheduler\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0Dimension\@\@QEAA\@AEAVILevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@VDimensionHeightRange\@\@AEAVScheduler\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI Dimension(class ILevel &, class AutomaticID, class DimensionHeightRange, class Scheduler &, std::string); /** - * @symbol ?addActorUnloadedChunkTransferToQueue\@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 + * @symbol ?addActorUnloadedChunkTransferToQueue\@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 addActorUnloadedChunkTransferToQueue(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); /** - * @symbol ?addPlayerToReplication\@Dimension\@\@QEAAXAEBVWeakEntityRef\@\@\@Z + * @symbol ?addPlayerToReplication\@Dimension\@\@QEAAXAEBVWeakEntityRef\@\@\@Z */ MCAPI void addPlayerToReplication(class WeakEntityRef const &); /** - * @symbol ?addWither\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?addWither\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void addWither(struct ActorUniqueID const &); /** - * @symbol ?clearPlayerReplicationList\@Dimension\@\@QEAAXXZ + * @symbol ?clearPlayerReplicationList\@Dimension\@\@QEAAXXZ */ MCAPI void clearPlayerReplicationList(); /** - * @symbol ?distanceToNearestPlayerSqr2D\@Dimension\@\@QEAAMVVec3\@\@\@Z + * @symbol ?distanceToNearestPlayerSqr2D\@Dimension\@\@QEAAMVVec3\@\@\@Z */ MCAPI float distanceToNearestPlayerSqr2D(class Vec3); /** - * @symbol ?fetchAnyInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z + * @symbol ?fetchAnyInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z */ MCAPI class Player * fetchAnyInteractablePlayer(class Vec3 const &, float) const; /** - * @symbol ?fetchEntity\@Dimension\@\@QEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z + * @symbol ?fetchEntity\@Dimension\@\@QEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z */ MCAPI class Actor * fetchEntity(struct ActorUniqueID, bool) const; /** - * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@M\@Z + * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@M\@Z */ MCAPI class Player * fetchNearestAttackablePlayer(class Actor &, float); /** - * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@VBlockPos\@\@MPEAVActor\@\@\@Z + * @symbol ?fetchNearestAttackablePlayer\@Dimension\@\@QEAAPEAVPlayer\@\@VBlockPos\@\@MPEAVActor\@\@\@Z */ MCAPI class Player * fetchNearestAttackablePlayer(class BlockPos, float, class Actor *); /** - * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z + * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M\@Z */ MCAPI class Player * fetchNearestInteractablePlayer(class Vec3 const &, float) const; /** - * @symbol ?fetchNearestInteractablePlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEAVActor\@\@M\@Z + * @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 + * @symbol ?fetchNearestPlayer\@Dimension\@\@QEBAPEAVPlayer\@\@AEBVVec3\@\@M_NV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ MCAPI class Player * fetchNearestPlayer(class Vec3 const &, float, bool, class std::function) const; /** - * @symbol ?findPlayer\@Dimension\@\@QEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?findPlayer\@Dimension\@\@QEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ MCAPI class Player * findPlayer(class std::function) const; /** - * @symbol ?flagEntityforChunkMove\@Dimension\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?flagEntityforChunkMove\@Dimension\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void flagEntityforChunkMove(class Actor &); /** - * @symbol ?flushLevelChunkGarbageCollector\@Dimension\@\@QEAAXXZ + * @symbol ?flushLevelChunkGarbageCollector\@Dimension\@\@QEAAXXZ */ MCAPI void flushLevelChunkGarbageCollector(); /** - * @symbol ?flushRunTimeLighting\@Dimension\@\@QEAAXXZ + * @symbol ?flushRunTimeLighting\@Dimension\@\@QEAAXXZ */ MCAPI void flushRunTimeLighting(); /** - * @symbol ?forEachPlayer\@Dimension\@\@QEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPlayer\@Dimension\@\@QEBAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachPlayer(class std::function) const; /** - * @symbol ?forceSaveVillageManager\@Dimension\@\@QEAAXXZ + * @symbol ?forceSaveVillageManager\@Dimension\@\@QEAAXXZ */ MCAPI void forceSaveVillageManager(); /** - * @symbol ?getBlockEventDispatcher\@Dimension\@\@QEAAAEAVBlockEventDispatcher\@\@XZ + * @symbol ?getBlockEventDispatcher\@Dimension\@\@QEAAAEAVBlockEventDispatcher\@\@XZ */ MCAPI class BlockEventDispatcher & getBlockEventDispatcher(); /** - * @symbol ?getBlockSourceFromMainChunkSource\@Dimension\@\@QEBAAEAVBlockSource\@\@XZ + * @symbol ?getBlockSourceFromMainChunkSource\@Dimension\@\@QEBAAEAVBlockSource\@\@XZ */ MCAPI class BlockSource & getBlockSourceFromMainChunkSource() const; /** - * @symbol ?getChunkBuildOrderPolicy\@Dimension\@\@QEAAAEAVChunkBuildOrderPolicyBase\@\@XZ + * @symbol ?getChunkBuildOrderPolicy\@Dimension\@\@QEAAAEAVChunkBuildOrderPolicyBase\@\@XZ */ MCAPI class ChunkBuildOrderPolicyBase & getChunkBuildOrderPolicy(); /** - * @symbol ?getChunkLoadActionList\@Dimension\@\@QEAA?AV?$not_null\@PEAVChunkLoadActionList\@\@\@gsl\@\@XZ + * @symbol ?getChunkLoadActionList\@Dimension\@\@QEAA?AV?$not_null\@PEAVChunkLoadActionList\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getChunkLoadActionList(); /** - * @symbol ?getChunkSource\@Dimension\@\@QEBAAEAVChunkSource\@\@XZ + * @symbol ?getChunkSource\@Dimension\@\@QEBAAEAVChunkSource\@\@XZ */ MCAPI class ChunkSource & getChunkSource() const; /** - * @symbol ?getCircuitSystem\@Dimension\@\@QEAAAEAVCircuitSystem\@\@XZ + * @symbol ?getCircuitSystem\@Dimension\@\@QEAAAEAVCircuitSystem\@\@XZ */ MCAPI class CircuitSystem & getCircuitSystem(); /** - * @symbol ?getDelayActionList\@Dimension\@\@QEAA?AV?$not_null\@PEAVDelayActionList\@\@\@gsl\@\@XZ + * @symbol ?getDelayActionList\@Dimension\@\@QEAA?AV?$not_null\@PEAVDelayActionList\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getDelayActionList(); /** - * @symbol ?getDisplayEntities\@Dimension\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getDisplayEntities\@Dimension\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getDisplayEntities(); /** - * @symbol ?getEntityIdMap\@Dimension\@\@QEAAAEAV?$unordered_map\@UActorUniqueID\@\@VWeakEntityRef\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@4\@V?$allocator\@U?$pair\@$$CBUActorUniqueID\@\@VWeakEntityRef\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getEntityIdMap\@Dimension\@\@QEAAAEAV?$unordered_map\@UActorUniqueID\@\@VWeakEntityRef\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@4\@V?$allocator\@U?$pair\@$$CBUActorUniqueID\@\@VWeakEntityRef\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getEntityIdMap(); /** - * @symbol ?getFeatureTerrainAdjustments\@Dimension\@\@QEAAAEAVFeatureTerrainAdjustments\@\@XZ + * @symbol ?getFeatureTerrainAdjustments\@Dimension\@\@QEAAAEAVFeatureTerrainAdjustments\@\@XZ */ MCAPI class FeatureTerrainAdjustments & getFeatureTerrainAdjustments(); /** - * @symbol ?getGameEventDispatcher\@Dimension\@\@QEBAPEAVGameEventDispatcher\@\@XZ + * @symbol ?getGameEventDispatcher\@Dimension\@\@QEBAPEAVGameEventDispatcher\@\@XZ */ MCAPI class GameEventDispatcher * getGameEventDispatcher() const; /** - * @symbol ?getHeight\@Dimension\@\@QEBAFXZ + * @symbol ?getHeight\@Dimension\@\@QEBAFXZ */ MCAPI short getHeight() const; /** - * @symbol ?getHeightInSubchunks\@Dimension\@\@QEBAGXZ + * @symbol ?getHeightInSubchunks\@Dimension\@\@QEBAGXZ */ MCAPI unsigned short getHeightInSubchunks() const; /** - * @symbol ?getHeightRange\@Dimension\@\@QEBAAEBVDimensionHeightRange\@\@XZ + * @symbol ?getHeightRange\@Dimension\@\@QEBAAEBVDimensionHeightRange\@\@XZ */ MCAPI class DimensionHeightRange const & getHeightRange() const; /** - * @symbol ?getLevel\@Dimension\@\@QEBAAEAVLevel\@\@XZ + * @symbol ?getLevel\@Dimension\@\@QEBAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel() const; /** - * @symbol ?getLevelConst\@Dimension\@\@QEBAAEBVLevel\@\@XZ + * @symbol ?getLevelConst\@Dimension\@\@QEBAAEBVLevel\@\@XZ */ MCAPI class Level const & getLevelConst() const; /** - * @symbol ?getMinHeight\@Dimension\@\@QEBAFXZ + * @symbol ?getMinHeight\@Dimension\@\@QEBAFXZ */ MCAPI short getMinHeight() const; /** - * @symbol ?getMoonBrightness\@Dimension\@\@QEBAMXZ + * @symbol ?getMoonBrightness\@Dimension\@\@QEBAMXZ */ MCAPI float getMoonBrightness() const; /** - * @symbol ?getMoonPhase\@Dimension\@\@QEBAHXZ + * @symbol ?getMoonPhase\@Dimension\@\@QEBAHXZ */ MCAPI int getMoonPhase() const; /** - * @symbol ?getPopCap\@Dimension\@\@QEBAMH_N\@Z + * @symbol ?getPopCap\@Dimension\@\@QEBAMH_N\@Z */ MCAPI float getPopCap(int, bool) const; /** - * @symbol ?getSeasons\@Dimension\@\@QEAAAEAVSeasons\@\@XZ + * @symbol ?getSeasons\@Dimension\@\@QEAAAEAVSeasons\@\@XZ */ MCAPI class Seasons & getSeasons(); /** - * @symbol ?getSkyDarken\@Dimension\@\@QEBA?AUBrightness\@\@XZ + * @symbol ?getSkyDarken\@Dimension\@\@QEBA?AUBrightness\@\@XZ */ MCAPI struct Brightness getSkyDarken() const; /** - * @symbol ?getSunAngle\@Dimension\@\@QEBAMM\@Z + * @symbol ?getSunAngle\@Dimension\@\@QEBAMM\@Z */ MCAPI float getSunAngle(float) const; /** - * @symbol ?getTickingAreas\@Dimension\@\@QEAAAEAVTickingAreaList\@\@XZ + * @symbol ?getTickingAreas\@Dimension\@\@QEAAAEAVTickingAreaList\@\@XZ */ MCAPI class TickingAreaList & getTickingAreas(); /** - * @symbol ?getTickingAreasConst\@Dimension\@\@QEBAAEBVTickingAreaList\@\@XZ + * @symbol ?getTickingAreasConst\@Dimension\@\@QEBAAEBVTickingAreaList\@\@XZ */ MCAPI class TickingAreaList const & getTickingAreasConst() const; /** - * @symbol ?getTimeOfDay\@Dimension\@\@QEBAMM\@Z + * @symbol ?getTimeOfDay\@Dimension\@\@QEBAMM\@Z */ MCAPI float getTimeOfDay(float) const; /** - * @symbol ?getVillageManager\@Dimension\@\@QEBAAEBV?$unique_ptr\@VVillageManager\@\@U?$default_delete\@VVillageManager\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getVillageManager\@Dimension\@\@QEBAAEBV?$unique_ptr\@VVillageManager\@\@U?$default_delete\@VVillageManager\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr const & getVillageManager() const; /** - * @symbol ?getWeakRef\@Dimension\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@XZ + * @symbol ?getWeakRef\@Dimension\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@XZ */ MCAPI class WeakRefT> getWeakRef(); /** - * @symbol ?getWeather\@Dimension\@\@QEBAAEAVWeather\@\@XZ + * @symbol ?getWeather\@Dimension\@\@QEBAAEAVWeather\@\@XZ */ MCAPI class Weather & getWeather() const; /** - * @symbol ?getWorldGenerator\@Dimension\@\@QEBAPEAVWorldGenerator\@\@XZ + * @symbol ?getWorldGenerator\@Dimension\@\@QEBAPEAVWorldGenerator\@\@XZ */ MCAPI class WorldGenerator * getWorldGenerator() const; /** - * @symbol ?hasCeiling\@Dimension\@\@QEBA_NXZ + * @symbol ?hasCeiling\@Dimension\@\@QEBA_NXZ */ MCAPI bool hasCeiling() const; /** - * @symbol ?hasSkylight\@Dimension\@\@QEBA_NXZ + * @symbol ?hasSkylight\@Dimension\@\@QEBA_NXZ */ MCAPI bool hasSkylight() const; /** - * @symbol ?isChunkKnown\@Dimension\@\@QEBA_NAEBVChunkPos\@\@\@Z + * @symbol ?isChunkKnown\@Dimension\@\@QEBA_NAEBVChunkPos\@\@\@Z */ MCAPI bool isChunkKnown(class ChunkPos const &) const; /** - * @symbol ?isClientSideGenerationEnabled\@Dimension\@\@QEBA?B_NXZ + * @symbol ?isClientSideGenerationEnabled\@Dimension\@\@QEBA?B_NXZ */ MCAPI bool const isClientSideGenerationEnabled() const; /** - * @symbol ?isHeightWithinRange\@Dimension\@\@QEBA_NAEBF\@Z + * @symbol ?isHeightWithinRange\@Dimension\@\@QEBA_NAEBF\@Z */ MCAPI bool isHeightWithinRange(short const &) const; /** - * @symbol ?isLeaveGameDone\@Dimension\@\@QEAA_NXZ + * @symbol ?isLeaveGameDone\@Dimension\@\@QEAA_NXZ */ MCAPI bool isLeaveGameDone(); /** - * @symbol ?isRedstoneTick\@Dimension\@\@QEAA_NXZ + * @symbol ?isRedstoneTick\@Dimension\@\@QEAA_NXZ */ MCAPI bool isRedstoneTick(); /** - * @symbol ?isSubChunkHeightWithinRange\@Dimension\@\@QEBA_NAEBF\@Z + * @symbol ?isSubChunkHeightWithinRange\@Dimension\@\@QEBA_NAEBF\@Z */ MCAPI bool isSubChunkHeightWithinRange(short const &) const; /** - * @symbol ?isUltraWarm\@Dimension\@\@QEBA_NXZ + * @symbol ?isUltraWarm\@Dimension\@\@QEBA_NXZ */ MCAPI bool isUltraWarm() const; /** - * @symbol ?onStaticTickingAreaAdded\@Dimension\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onStaticTickingAreaAdded\@Dimension\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void onStaticTickingAreaAdded(std::string const &); /** - * @symbol ?pauseAndFlushTaskGroups\@Dimension\@\@QEAAXXZ + * @symbol ?pauseAndFlushTaskGroups\@Dimension\@\@QEAAXXZ */ MCAPI void pauseAndFlushTaskGroups(); /** - * @symbol ?processPlayerReplication\@Dimension\@\@QEAAXXZ + * @symbol ?processPlayerReplication\@Dimension\@\@QEAAXXZ */ MCAPI void processPlayerReplication(); /** - * @symbol ?registerEntity\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?registerEntity\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void registerEntity(struct ActorUniqueID const &, class WeakRefT); /** - * @symbol ?removeActorByID\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?removeActorByID\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void removeActorByID(struct ActorUniqueID const &); /** - * @symbol ?removeWither\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?removeWither\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void removeWither(struct ActorUniqueID const &); /** - * @symbol ?sendPacketForEntity\@Dimension\@\@QEAAXAEBVActor\@\@AEBVPacket\@\@PEBVPlayer\@\@\@Z + * @symbol ?sendPacketForEntity\@Dimension\@\@QEAAXAEBVActor\@\@AEBVPacket\@\@PEBVPlayer\@\@\@Z */ MCAPI void sendPacketForEntity(class Actor const &, class Packet const &, class Player const *); /** - * @symbol ?sendPacketForPosition\@Dimension\@\@QEAAXAEBVBlockPos\@\@AEBVPacket\@\@PEBVPlayer\@\@\@Z - */ - MCAPI void sendPacketForPosition(class BlockPos const &, class Packet const &, class Player const *); - /** - * @symbol ?sendPacketToClients\@Dimension\@\@QEAAXAEBVPacket\@\@V?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?sendPacketToClients\@Dimension\@\@QEAAXAEBVPacket\@\@V?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void sendPacketToClients(class Packet const &, std::vector); /** - * @symbol ?setCeiling\@Dimension\@\@QEAAX_N\@Z + * @symbol ?setCeiling\@Dimension\@\@QEAAX_N\@Z */ MCAPI void setCeiling(bool); /** - * @symbol ?setSkylight\@Dimension\@\@QEAAX_N\@Z + * @symbol ?setSkylight\@Dimension\@\@QEAAX_N\@Z */ MCAPI void setSkylight(bool); /** - * @symbol ?setUltraWarm\@Dimension\@\@QEAAX_N\@Z + * @symbol ?setUltraWarm\@Dimension\@\@QEAAX_N\@Z */ MCAPI void setUltraWarm(bool); /** - * @symbol ?transferEntity\@Dimension\@\@QEAAXAEBVChunkPos\@\@AEBVVec3\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z + * @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 + * @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 Actor &, class LevelChunk *); + MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); /** - * @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 + * @symbol ?transferEntityToUnloadedChunk\@Dimension\@\@QEAAXAEAVActor\@\@PEAVLevelChunk\@\@\@Z */ - MCAPI void transferEntityToUnloadedChunk(class ChunkPos const &, class ChunkPos const &, class AutomaticID, std::string &, std::unique_ptr); + MCAPI void transferEntityToUnloadedChunk(class Actor &, class LevelChunk *); /** - * @symbol ?tryGarbageCollectStructures\@Dimension\@\@QEAAXXZ + * @symbol ?tryGarbageCollectStructures\@Dimension\@\@QEAAXXZ */ MCAPI void tryGarbageCollectStructures(); /** - * @symbol ?tryLoadLimboEntities\@Dimension\@\@QEAAXAEBVChunkPos\@\@\@Z + * @symbol ?tryLoadLimboEntities\@Dimension\@\@QEAAXAEBVChunkPos\@\@\@Z */ MCAPI void tryLoadLimboEntities(class ChunkPos const &); /** - * @symbol ?unregisterDisplayEntity\@Dimension\@\@QEAAXV?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?unregisterDisplayEntity\@Dimension\@\@QEAAXV?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void unregisterDisplayEntity(class WeakRefT); /** - * @symbol ?unregisterEntity\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?unregisterEntity\@Dimension\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void unregisterEntity(struct ActorUniqueID const &); /** - * @symbol ?updateBlockLight\@Dimension\@\@QEAAXAEBVBlockPos\@\@UBrightness\@\@111_N\@Z + * @symbol ?updateBlockLight\@Dimension\@\@QEAAXAEBVBlockPos\@\@UBrightness\@\@111_N\@Z */ MCAPI void updateBlockLight(class BlockPos const &, struct Brightness, struct Brightness, struct Brightness, struct Brightness, bool); /** - * @symbol ?updateDimensionBlockSourceTick\@Dimension\@\@QEAAXXZ + * @symbol ?updateDimensionBlockSourceTick\@Dimension\@\@QEAAXXZ */ MCAPI void updateDimensionBlockSourceTick(); /** - * @symbol ?CurrentLimboEntitiesVersion\@Dimension\@\@2W4LimboEntitiesVersion\@\@B + * @symbol ?CurrentLimboEntitiesVersion\@Dimension\@\@2W4LimboEntitiesVersion\@\@B */ MCAPI static enum class LimboEntitiesVersion const CurrentLimboEntitiesVersion; /** - * @symbol ?LOW_CPU_PACKET_BLOCK_LIMIT\@Dimension\@\@2IB + * @symbol ?LOW_CPU_PACKET_BLOCK_LIMIT\@Dimension\@\@2IB */ MCAPI static unsigned int const LOW_CPU_PACKET_BLOCK_LIMIT; /** - * @symbol ?MOON_BRIGHTNESS_PER_PHASE\@Dimension\@\@2QBMB + * @symbol ?MOON_BRIGHTNESS_PER_PHASE\@Dimension\@\@2QBMB */ MCAPI static float const MOON_BRIGHTNESS_PER_PHASE[]; /** - * @symbol ?STRUCTURE_PRUNE_INTERVAL\@Dimension\@\@2V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@B + * @symbol ?STRUCTURE_PRUNE_INTERVAL\@Dimension\@\@2V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@B */ MCAPI static class std::chrono::duration<__int64, struct std::ratio<1, 1>> const STRUCTURE_PRUNE_INTERVAL; //protected: /** - * @symbol ?_completeEntityTransfer\@Dimension\@\@IEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@_N\@Z + * @symbol ?_completeEntityTransfer\@Dimension\@\@IEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@_N\@Z */ MCAPI void _completeEntityTransfer(class OwnerPtrT, bool); //private: /** - * @symbol ?_processEntityChunkTransfers\@Dimension\@\@AEAAXXZ + * @symbol ?_processEntityChunkTransfers\@Dimension\@\@AEAAXXZ */ MCAPI void _processEntityChunkTransfers(); /** - * @symbol ?_sendBlockEntityUpdatePacket\@Dimension\@\@AEAAXAEBVNetworkBlockPosition\@\@\@Z + * @symbol ?_sendBlockEntityUpdatePacket\@Dimension\@\@AEAAXAEBVNetworkBlockPosition\@\@\@Z */ MCAPI void _sendBlockEntityUpdatePacket(class NetworkBlockPosition const &); /** - * @symbol ?_sendBlocksChangedPackets\@Dimension\@\@AEAAXXZ + * @symbol ?_sendBlocksChangedPackets\@Dimension\@\@AEAAXXZ */ MCAPI void _sendBlocksChangedPackets(); /** - * @symbol ?_tickEntityChunkMoves\@Dimension\@\@AEAAXXZ + * @symbol ?_tickEntityChunkMoves\@Dimension\@\@AEAAXXZ */ MCAPI void _tickEntityChunkMoves(); @@ -541,4 +541,4 @@ class Dimension { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp b/LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp index 09a73d0856..6d9120bf73 100644 --- a/LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp +++ b/LiteLoader/include/llapi/mc/DimensionBrightnessRamp.hpp @@ -30,23 +30,23 @@ class DimensionBrightnessRamp { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DimensionBrightnessRamp(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?buildBrightnessRamp\@DimensionBrightnessRamp\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?buildBrightnessRamp\@DimensionBrightnessRamp\@\@UEAAXXZ */ virtual void buildBrightnessRamp(); /** - * @vftbl 2 - * @symbol ?getBaseAmbientValue\@DimensionBrightnessRamp\@\@UEBAMXZ + * @vftbl 2 + * @symbol ?getBaseAmbientValue\@DimensionBrightnessRamp\@\@UEBAMXZ */ virtual float getBaseAmbientValue() const; /** - * @symbol ?getBrightnessRampValue\@DimensionBrightnessRamp\@\@QEBAMH\@Z + * @symbol ?getBrightnessRampValue\@DimensionBrightnessRamp\@\@QEBAMH\@Z */ MCAPI float getBrightnessRampValue(int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionChunkMoveSystem.hpp b/LiteLoader/include/llapi/mc/DimensionChunkMoveSystem.hpp index 56166b8389..5d355205c4 100644 --- a/LiteLoader/include/llapi/mc/DimensionChunkMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/DimensionChunkMoveSystem.hpp @@ -28,8 +28,8 @@ class DimensionChunkMoveSystem { public: /** - * @symbol ?createDimensionChunkMoveSystem\@DimensionChunkMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createDimensionChunkMoveSystem\@DimensionChunkMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createDimensionChunkMoveSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionConversionData.hpp b/LiteLoader/include/llapi/mc/DimensionConversionData.hpp index 079e3e65bf..bad4635323 100644 --- a/LiteLoader/include/llapi/mc/DimensionConversionData.hpp +++ b/LiteLoader/include/llapi/mc/DimensionConversionData.hpp @@ -30,16 +30,16 @@ class DimensionConversionData { public: /** - * @symbol ??0DimensionConversionData\@\@QEAA\@AEBVVec3\@\@H\@Z + * @symbol ??0DimensionConversionData\@\@QEAA\@AEBVVec3\@\@H\@Z */ MCAPI DimensionConversionData(class Vec3 const &, int); /** - * @symbol ?getNetherScale\@DimensionConversionData\@\@QEBAHXZ + * @symbol ?getNetherScale\@DimensionConversionData\@\@QEBAHXZ */ MCAPI int getNetherScale() const; /** - * @symbol ?getOverworldSpawnPoint\@DimensionConversionData\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getOverworldSpawnPoint\@DimensionConversionData\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getOverworldSpawnPoint() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp index 2ac9950fae..44457b3aab 100644 --- a/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDataPacket.hpp @@ -29,33 +29,39 @@ class DimensionDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DimensionDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@DimensionDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@DimensionDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@DimensionDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@DimensionDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@DimensionDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@DimensionDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@DimensionDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIMENSIONDATAPACKET /** - * @symbol ??0DimensionDataPacket\@\@QEAA\@AEBVDimensionDefinitionGroup\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DimensionDataPacket(); +#endif + /** + * @symbol ??0DimensionDataPacket\@\@QEAA\@AEBVDimensionDefinitionGroup\@\@\@Z */ MCAPI DimensionDataPacket(class DimensionDefinitionGroup const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionDataSerializer.hpp b/LiteLoader/include/llapi/mc/DimensionDataSerializer.hpp index 6a87851d6f..d46f997738 100644 --- a/LiteLoader/include/llapi/mc/DimensionDataSerializer.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDataSerializer.hpp @@ -30,28 +30,28 @@ class DimensionDataSerializer { public: /** - * @symbol ?createSaveID\@DimensionDataSerializer\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + * @symbol ?createSaveID\@DimensionDataSerializer\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z */ MCAPI std::string createSaveID(std::string const &, std::string const &); /** - * @symbol ?deleteDataWithID\@DimensionDataSerializer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?deleteDataWithID\@DimensionDataSerializer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void deleteDataWithID(std::string const &, class LevelStorage &); /** - * @symbol ?forEachKeyWithDimensionPrefix\@DimensionDataSerializer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVLevelStorage\@\@AEBV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z\@3\@\@Z + * @symbol ?forEachKeyWithDimensionPrefix\@DimensionDataSerializer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVLevelStorage\@\@AEBV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z\@3\@\@Z */ MCAPI void forEachKeyWithDimensionPrefix(std::string const &, std::string const &, class LevelStorage &, class std::function const &); /** - * @symbol ?saveDataWithID\@DimensionDataSerializer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?saveDataWithID\@DimensionDataSerializer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void saveDataWithID(std::string const &, class CompoundTag const &, class LevelStorage &); //protected: /** - * @symbol ?_createLevelStorageID\@DimensionDataSerializer\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@00\@Z + * @symbol ?_createLevelStorageID\@DimensionDataSerializer\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@00\@Z */ MCAPI std::string _createLevelStorageID(std::string const &, std::string const &, std::string const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp index 0a75a65e69..a3a8ec2d4a 100644 --- a/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDefinitionGroup.hpp @@ -29,24 +29,24 @@ class DimensionDefinitionGroup { public: /** - * @symbol ??0DimensionDefinitionGroup\@\@QEAA\@QEAVResourcePackManager\@\@_N\@Z + * @symbol ??0DimensionDefinitionGroup\@\@QEAA\@QEAVResourcePackManager\@\@_N\@Z */ MCAPI DimensionDefinitionGroup(class ResourcePackManager *const, bool); /** - * @symbol ?getDimensionDefinition\@DimensionDefinitionGroup\@\@QEBA?AV?$optional\@UDimensionDefinition\@DimensionDefinitionGroup\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getDimensionDefinition\@DimensionDefinitionGroup\@\@QEBA?AV?$optional\@UDimensionDefinition\@DimensionDefinitionGroup\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::optional getDimensionDefinition(std::string const &) const; /** - * @symbol ?isEmpty\@DimensionDefinitionGroup\@\@QEBA_NXZ + * @symbol ?isEmpty\@DimensionDefinitionGroup\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?tryAddDimensionDefinitionByString\@DimensionDefinitionGroup\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryAddDimensionDefinitionByString\@DimensionDefinitionGroup\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool tryAddDimensionDefinitionByString(std::string const &); /** - * @symbol ??1DimensionDefinitionGroup\@\@QEAA\@XZ + * @symbol ??1DimensionDefinitionGroup\@\@QEAA\@XZ */ MCAPI ~DimensionDefinitionGroup(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionDocument.hpp b/LiteLoader/include/llapi/mc/DimensionDocument.hpp index 72df0ea135..06293ee511 100644 --- a/LiteLoader/include/llapi/mc/DimensionDocument.hpp +++ b/LiteLoader/include/llapi/mc/DimensionDocument.hpp @@ -27,15 +27,15 @@ struct DimensionDocument { public: /** - * @symbol ??0DimensionDocument\@\@QEAA\@XZ + * @symbol ??0DimensionDocument\@\@QEAA\@XZ */ MCAPI DimensionDocument(); /** - * @symbol ??1DimensionDocument\@\@QEAA\@XZ + * @symbol ??1DimensionDocument\@\@QEAA\@XZ */ MCAPI ~DimensionDocument(); /** - * @symbol ?bindType\@DimensionDocument\@\@SAXXZ + * @symbol ?bindType\@DimensionDocument\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/DimensionFactory.hpp b/LiteLoader/include/llapi/mc/DimensionFactory.hpp new file mode 100644 index 0000000000..b5f674e74b --- /dev/null +++ b/LiteLoader/include/llapi/mc/DimensionFactory.hpp @@ -0,0 +1,62 @@ +/** + * @file DimensionFactory.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DimensionFactory { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIMENSIONFACTORY +public: + class DimensionFactory& operator=(class DimensionFactory const &) = delete; + DimensionFactory(class DimensionFactory const &) = delete; + DimensionFactory() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?create\@DimensionFactory\@\@UEBA?AV?$OwnerPtrT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + virtual class OwnerPtrT> create(std::string const &) const; + /** + * @vftbl 2 + * @symbol ?initializeDimension\@DimensionFactory\@\@UEBAXAEAVDimension\@\@\@Z + */ + virtual void initializeDimension(class Dimension &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIMENSIONFACTORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DimensionFactory(); +#endif + /** + * @symbol ??0DimensionFactory\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@\@gsl\@\@V?$not_null\@V?$NonOwnerPointer\@VScheduler\@\@\@Bedrock\@\@\@2\@\@Z + */ + MCAPI DimensionFactory(class gsl::not_null>, class gsl::not_null>); + /** + * @symbol ?getDimensionOwnerPtrFactory\@DimensionFactory\@\@QEAAAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ + */ + MCAPI class OwnerPtrFactory & getDimensionOwnerPtrFactory(); + /** + * @symbol ?getDimensionOwnerPtrFactory\@DimensionFactory\@\@QEBAAEBV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ + */ + MCAPI class OwnerPtrFactory const & getDimensionOwnerPtrFactory() const; + +}; diff --git a/LiteLoader/include/llapi/mc/DimensionManager.hpp b/LiteLoader/include/llapi/mc/DimensionManager.hpp new file mode 100644 index 0000000000..7eb40eb59d --- /dev/null +++ b/LiteLoader/include/llapi/mc/DimensionManager.hpp @@ -0,0 +1,69 @@ +/** + * @file DimensionManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class DimensionManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIMENSIONMANAGER +public: + class DimensionManager& operator=(class DimensionManager const &) = delete; + DimensionManager(class DimensionManager const &) = delete; + DimensionManager() = delete; +#endif + +public: + /** + * @symbol ??0DimensionManager\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIDimensionFactory\@\@\@Bedrock\@\@\@gsl\@\@\@Z + */ + MCAPI DimensionManager(class gsl::not_null>); + /** + * @symbol ?forEachDimension\@DimensionManager\@\@QEAAXV?$function\@$$A6A_NAEAVDimension\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachDimension(class std::function); + /** + * @symbol ?forEachDimension\@DimensionManager\@\@QEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachDimension(class std::function) const; + /** + * @symbol ?getDimension\@DimensionManager\@\@QEBA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI class WeakRefT> getDimension(class AutomaticID) const; + /** + * @symbol ?getOrCreateDimension\@DimensionManager\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI class WeakRefT> getOrCreateDimension(class AutomaticID); + /** + * @symbol ?getRandomDimension\@DimensionManager\@\@QEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@AEAVRandom\@\@\@Z + */ + MCAPI class WeakRefT> getRandomDimension(class Random &); + /** + * @symbol ?hasDimensions\@DimensionManager\@\@QEBA_NXZ + */ + MCAPI bool hasDimensions() const; + /** + * @symbol ?registerOnNewDimensionCreated\@DimensionManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEAVDimension\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnNewDimensionCreated(class std::function); + /** + * @symbol ?shutdown\@DimensionManager\@\@QEAAXXZ + */ + MCAPI void shutdown(); + /** + * @symbol ??1DimensionManager\@\@QEAA\@XZ + */ + MCAPI ~DimensionManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/DimensionStateComponent.hpp b/LiteLoader/include/llapi/mc/DimensionStateComponent.hpp index 1def40312d..458ec1cc00 100644 --- a/LiteLoader/include/llapi/mc/DimensionStateComponent.hpp +++ b/LiteLoader/include/llapi/mc/DimensionStateComponent.hpp @@ -28,8 +28,8 @@ class DimensionStateComponent { public: /** - * @symbol ??0DimensionStateComponent\@\@QEAA\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ??0DimensionStateComponent\@\@QEAA\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI DimensionStateComponent(class std::chrono::time_point>>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionStateSystem.hpp b/LiteLoader/include/llapi/mc/DimensionStateSystem.hpp index 707945c692..e562787cbb 100644 --- a/LiteLoader/include/llapi/mc/DimensionStateSystem.hpp +++ b/LiteLoader/include/llapi/mc/DimensionStateSystem.hpp @@ -29,12 +29,12 @@ class DimensionStateSystem { public: /** - * @symbol ?isDimensionReady\@DimensionStateSystem\@\@SA_NAEBVEntityContext\@\@\@Z + * @symbol ?isDimensionReady\@DimensionStateSystem\@\@SA_NAEBVEntityContext\@\@\@Z */ MCAPI static bool isDimensionReady(class EntityContext const &); /** - * @symbol ?setDimensionState\@DimensionStateSystem\@\@SAXAEAVEntityContext\@\@W4DimensionState\@DimensionStateComponent\@\@\@Z + * @symbol ?setDimensionState\@DimensionStateSystem\@\@SAXAEAVEntityContext\@\@W4DimensionState\@DimensionStateComponent\@\@\@Z */ MCAPI static void setDimensionState(class EntityContext &, enum class DimensionStateComponent::DimensionState); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DimensionTransitionComponent.hpp b/LiteLoader/include/llapi/mc/DimensionTransitionComponent.hpp index a7a5df2897..a85c544abb 100644 --- a/LiteLoader/include/llapi/mc/DimensionTransitionComponent.hpp +++ b/LiteLoader/include/llapi/mc/DimensionTransitionComponent.hpp @@ -28,35 +28,35 @@ struct DimensionTransitionComponent { public: /** - * @symbol ?addAdditionalSaveData\@DimensionTransitionComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@DimensionTransitionComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?readAdditionalSaveData\@DimensionTransitionComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@DimensionTransitionComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?AXIS_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AXIS_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const AXIS_TAG; /** - * @symbol ?COMPONENT_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?COMPONENT_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const COMPONENT_TAG; /** - * @symbol ?DIMENSION_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIMENSION_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIMENSION_TAG; /** - * @symbol ?POSITION_X_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?POSITION_X_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const POSITION_X_TAG; /** - * @symbol ?POSITION_Y_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?POSITION_Y_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const POSITION_Y_TAG; /** - * @symbol ?POSITION_Z_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?POSITION_Z_TAG\@DimensionTransitionComponent\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const POSITION_Z_TAG; diff --git a/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp b/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp index 08cc523f0a..8d9c2bbf91 100644 --- a/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp +++ b/LiteLoader/include/llapi/mc/DimensionTransitionSystem.hpp @@ -28,36 +28,36 @@ class DimensionTransitionSystem { public: /** - * @symbol ?_tickVehicleDismount\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@Z + * @symbol ?_tickVehicleDismount\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@Z */ MCAPI static void _tickVehicleDismount(class ViewT>, class ViewT, struct VehicleComponent const>, class EntityModifierT, class FlagComponent>); /** - * @symbol ?createPortalTransition\@DimensionTransitionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPortalTransition\@DimensionTransitionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPortalTransition(); /** - * @symbol ?createReadyToContinueServer\@DimensionTransitionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createReadyToContinueServer\@DimensionTransitionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createReadyToContinueServer(); /** - * @symbol ?createVehicleDismount\@DimensionTransitionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createVehicleDismount\@DimensionTransitionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createVehicleDismount(); /** - * @symbol ?removeChangeDimensionRequest\@DimensionTransitionSystem\@\@SAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@\@Z + * @symbol ?removeChangeDimensionRequest\@DimensionTransitionSystem\@\@SAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@\@Z */ MCAPI static void removeChangeDimensionRequest(class StrictEntityContext const &, class EntityModifierT); /** - * @symbol ?requestPlayerChangeDimension\@DimensionTransitionSystem\@\@SAXAEBVStrictEntityContext\@\@V?$unique_ptr\@VChangeDimensionRequest\@\@U?$default_delete\@VChangeDimensionRequest\@\@\@std\@\@\@std\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VDimensionStateComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@_N\@Z + * @symbol ?requestPlayerChangeDimension\@DimensionTransitionSystem\@\@SAXAEBVStrictEntityContext\@\@V?$unique_ptr\@VChangeDimensionRequest\@\@U?$default_delete\@VChangeDimensionRequest\@\@\@std\@\@\@std\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPlayerChangeDimensionRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@VDimensionStateComponent\@\@UStateVectorComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@_N\@Z */ MCAPI static void requestPlayerChangeDimension(class StrictEntityContext const &, std::unique_ptr, class ViewT>, class ViewT, class EntityModifierT, bool); /** - * @symbol ?shouldLevelWaitForSystem\@DimensionTransitionSystem\@\@SA_NAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPlayerChangeDimensionRequestComponent\@\@\@\@\@Z + * @symbol ?shouldLevelWaitForSystem\@DimensionTransitionSystem\@\@SA_NAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPlayerChangeDimensionRequestComponent\@\@\@\@\@Z */ MCAPI static bool shouldLevelWaitForSystem(class StrictEntityContext const &, class ViewT); /** - * @symbol ?tryHandleChangeDimensionRequestLevel\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@UPlayerChangeDimensionRequestComponent\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@AEBV?$function\@$$A6A_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z\@std\@\@AEBV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@5\@\@Z + * @symbol ?tryHandleChangeDimensionRequestLevel\@DimensionTransitionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@UPlayerChangeDimensionRequestComponent\@\@VActorOwnerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPlayerChangeDimensionRequestComponent\@\@\@\@AEBV?$function\@$$A6A_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z\@std\@\@AEBV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@5\@\@Z */ MCAPI static void tryHandleChangeDimensionRequestLevel(class ViewT>, struct PlayerChangeDimensionRequestComponent, class ActorOwnerComponent>, class EntityModifierT, class std::function const &, class std::function const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DiodeBlock.hpp b/LiteLoader/include/llapi/mc/DiodeBlock.hpp index 8d0744f24b..b380383713 100644 --- a/LiteLoader/include/llapi/mc/DiodeBlock.hpp +++ b/LiteLoader/include/llapi/mc/DiodeBlock.hpp @@ -31,315 +31,326 @@ class DiodeBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DiodeBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@DiodeBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@DiodeBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 59 - * @symbol ?getDirectSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 59 + * @symbol ?getDirectSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getDirectSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@DiodeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@DiodeBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@DiodeBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@DiodeBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DiodeBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@DiodeBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@DiodeBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?getSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 194 + * @symbol ?getSignal\@DiodeBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual int getSignal(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 194 - * @symbol ?isLocked\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 195 + * @symbol ?isLocked\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 195 - * @symbol ?isSameDiode\@DiodeBlock\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 196 + * @symbol ?isSameDiode\@DiodeBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isSameDiode(class Block const &) const; /** - * @vftbl 196 - * @symbol ?shouldPrioritize\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 197 + * @symbol ?shouldPrioritize\@DiodeBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldPrioritize(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 197 - * @symbol ?isOn\@DiodeBlock\@\@MEBA_NXZ + * @vftbl 198 + * @symbol ?isOn\@DiodeBlock\@\@MEBA_NXZ */ virtual bool isOn() const; /** - * @vftbl 198 - * @symbol ?shouldTurnOn\@DiodeBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 199 + * @symbol ?shouldTurnOn\@DiodeBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool shouldTurnOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 199 - * @symbol ?getInputSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 200 + * @symbol ?getInputSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getInputSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 200 - * @symbol ?isAlternateInput\@DiodeBlock\@\@MEBA_NAEBVBlock\@\@\@Z + * @vftbl 201 + * @symbol ?isAlternateInput\@DiodeBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 201 - * @symbol ?getAlternateSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 202 + * @symbol ?getAlternateSignal\@DiodeBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getAlternateSignal(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 202 - * @symbol ?getOutputSignal\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 203 + * @symbol ?getOutputSignal\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getOutputSignal(class Block const &) const; /** - * @vftbl 203 - * @symbol ?getTurnOffDelay\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 204 + * @symbol ?getTurnOffDelay\@DiodeBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOffDelay(class Block const &) const; /** - * @vftbl 204 - * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 205 + * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const = 0; /** - * @vftbl 205 - * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z + * @vftbl 206 + * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const = 0; /** - * @vftbl 206 - * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z + * @vftbl 207 + * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIODEBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DiodeBlock(); +#endif /** - * @symbol ??0DiodeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0DiodeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI DiodeBlock(std::string const &, int, bool); /** - * @symbol ?isDiode\@DiodeBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isDiode\@DiodeBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isDiode(class Block const &); //protected: /** - * @symbol ?getAlternateSignalAt\@DiodeBlock\@\@IEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?getAlternateSignalAt\@DiodeBlock\@\@IEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI int getAlternateSignalAt(class BlockSource &, class BlockPos const &, int) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectActorMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectActorMovementProxy.hpp index 65a52cd7f3..66f18f2d62 100644 --- a/LiteLoader/include/llapi/mc/DirectActorMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectActorMovementProxy.hpp @@ -30,4 +30,4 @@ class DirectActorMovementProxy { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp index 2b85b75f3e..44de1c6b6f 100644 --- a/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectAgentMobMovementProxy.hpp @@ -11,36 +11,36 @@ #undef BEFORE_EXTRA -struct DirectAgentMobMovementProxy { +class DirectAgentMobMovementProxy { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DIRECTAGENTMOBMOVEMENTPROXY public: - struct DirectAgentMobMovementProxy& operator=(struct DirectAgentMobMovementProxy const &) = delete; - DirectAgentMobMovementProxy(struct DirectAgentMobMovementProxy const &) = delete; + class DirectAgentMobMovementProxy& operator=(class DirectAgentMobMovementProxy const &) = delete; + DirectAgentMobMovementProxy(class DirectAgentMobMovementProxy const &) = delete; DirectAgentMobMovementProxy() = delete; #endif public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIRECTAGENTMOBMOVEMENTPROXY /** - * @symbol ?getSlideOffset\@DirectAgentMobMovementProxy\@\@UEBA?AVVec2\@\@XZ + * @symbol ?getSlideOffset\@DirectAgentMobMovementProxy\@\@UEBA?AVVec2\@\@XZ */ MCVAPI class Vec2 getSlideOffset() const; /** - * @symbol ?isFlying\@DirectAgentMobMovementProxy\@\@UEBA_NXZ + * @symbol ?isFlying\@DirectAgentMobMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isFlying() const; /** - * @symbol ?setIsFlying\@DirectAgentMobMovementProxy\@\@UEAAX_N\@Z + * @symbol ?setIsFlying\@DirectAgentMobMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void setIsFlying(bool); /** - * @symbol ?setSlideOffset\@DirectAgentMobMovementProxy\@\@UEAAXAEBVVec2\@\@\@Z + * @symbol ?setSlideOffset\@DirectAgentMobMovementProxy\@\@UEAAXAEBVVec2\@\@\@Z */ MCVAPI void setSlideOffset(class Vec2 const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectMobMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectMobMovementProxy.hpp index b14181065b..8b52339c65 100644 --- a/LiteLoader/include/llapi/mc/DirectMobMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectMobMovementProxy.hpp @@ -30,4 +30,4 @@ class DirectMobMovementProxy { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp index 1586c37793..b233877a2f 100644 --- a/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/DirectPlayerMovementProxy.hpp @@ -31,301 +31,297 @@ class DirectPlayerMovementProxy { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIRECTPLAYERMOVEMENTPROXY /** - * @symbol ?_applyStateToComponents\@DirectPlayerMovementProxy\@\@MEAAXXZ + * @symbol ?_applyStateToComponents\@DirectPlayerMovementProxy\@\@MEAAXXZ */ MCVAPI void _applyStateToComponents(); /** - * @symbol ?_extractStateFromComponents\@DirectPlayerMovementProxy\@\@MEAAXXZ + * @symbol ?_extractStateFromComponents\@DirectPlayerMovementProxy\@\@MEAAXXZ */ MCVAPI void _extractStateFromComponents(); /** - * @symbol ?_getPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAVPlayer\@\@XZ + * @symbol ?_getPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAVPlayer\@\@XZ */ MCVAPI class Player * _getPlayer(); /** - * @symbol ?_onMovePlayerPacketNormal\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z + * @symbol ?_onMovePlayerPacketNormal\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z */ MCVAPI void _onMovePlayerPacketNormal(class Vec3 const &, class Vec2 const &, float); /** - * @symbol ?_resetPos\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z + * @symbol ?_resetPos\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void _resetPos(bool); /** - * @symbol ?_setPositionMode\@DirectPlayerMovementProxy\@\@UEAAXH\@Z + * @symbol ?_setPositionMode\@DirectPlayerMovementProxy\@\@UEAAXH\@Z */ MCVAPI void _setPositionMode(int); /** - * @symbol ?areHandsBusy\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?areHandsBusy\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool areHandsBusy() const; /** - * @symbol ?checkMovementStats\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@\@Z + * @symbol ?checkMovementStats\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@\@Z */ MCVAPI void checkMovementStats(class Vec3 const &); /** - * @symbol ?fireEventPersonaEmotePlayed\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z + * @symbol ?fireEventPersonaEmotePlayed\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void fireEventPersonaEmotePlayed(bool); /** - * @symbol ?getAbilities\@DirectPlayerMovementProxy\@\@UEBAAEBVLayeredAbilities\@\@XZ + * @symbol ?getAbilities\@DirectPlayerMovementProxy\@\@UEBAAEBVLayeredAbilities\@\@XZ */ MCVAPI class LayeredAbilities const & getAbilities() const; /** - * @symbol ?getAbilityBool\@DirectPlayerMovementProxy\@\@UEBA_NW4AbilitiesIndex\@\@\@Z + * @symbol ?getAbilityBool\@DirectPlayerMovementProxy\@\@UEBA_NW4AbilitiesIndex\@\@\@Z */ MCVAPI bool getAbilityBool(enum class AbilitiesIndex) const; /** - * @symbol ?getAbilityFloat\@DirectPlayerMovementProxy\@\@UEBAMW4AbilitiesIndex\@\@\@Z + * @symbol ?getAbilityFloat\@DirectPlayerMovementProxy\@\@UEBAMW4AbilitiesIndex\@\@\@Z */ MCVAPI float getAbilityFloat(enum class AbilitiesIndex) const; /** - * @symbol ?getBob\@DirectPlayerMovementProxy\@\@UEBAMXZ + * @symbol ?getBob\@DirectPlayerMovementProxy\@\@UEBAMXZ */ MCVAPI float getBob() const; /** - * @symbol ?getClientInstance\@DirectPlayerMovementProxy\@\@UEBAPEBUIClientInstanceProxy\@\@XZ + * @symbol ?getClientInstance\@DirectPlayerMovementProxy\@\@UEAAPEAUIClientInstanceProxy\@\@XZ */ - MCVAPI struct IClientInstanceProxy const * getClientInstance() const; + MCVAPI struct IClientInstanceProxy * getClientInstance(); /** - * @symbol ?getClientInstance\@DirectPlayerMovementProxy\@\@UEAAPEAUIClientInstanceProxy\@\@XZ + * @symbol ?getClientInstance\@DirectPlayerMovementProxy\@\@UEBAPEBUIClientInstanceProxy\@\@XZ */ - MCVAPI struct IClientInstanceProxy * getClientInstance(); + MCVAPI struct IClientInstanceProxy const * getClientInstance() const; /** - * @symbol ?getCurrentTick\@DirectPlayerMovementProxy\@\@UEBAAEBUTick\@\@XZ + * @symbol ?getCurrentTick\@DirectPlayerMovementProxy\@\@UEBAAEBUTick\@\@XZ */ MCVAPI struct Tick const & getCurrentTick() const; /** - * @symbol ?getGlidingTicks\@DirectPlayerMovementProxy\@\@UEBAHXZ + * @symbol ?getGlidingTicks\@DirectPlayerMovementProxy\@\@UEBAHXZ */ MCVAPI int getGlidingTicks() const; /** - * @symbol ?getInputMode\@DirectPlayerMovementProxy\@\@UEBA?AW4InputMode\@\@XZ + * @symbol ?getInputMode\@DirectPlayerMovementProxy\@\@UEBA?AW4InputMode\@\@XZ */ MCVAPI enum class InputMode getInputMode() const; /** - * @symbol ?getItemUseMovementModifier\@DirectPlayerMovementProxy\@\@UEBAMXZ + * @symbol ?getItemUseMovementModifier\@DirectPlayerMovementProxy\@\@UEBAMXZ */ MCVAPI float getItemUseMovementModifier() const; /** - * @symbol ?getJumpRidingScale\@DirectPlayerMovementProxy\@\@UEAAMXZ + * @symbol ?getJumpRidingScale\@DirectPlayerMovementProxy\@\@UEAAMXZ */ MCVAPI float getJumpRidingScale(); /** - * @symbol ?getLastBob\@DirectPlayerMovementProxy\@\@UEBAMXZ + * @symbol ?getLastBob\@DirectPlayerMovementProxy\@\@UEBAMXZ */ MCVAPI float getLastBob() const; /** - * @symbol ?getLastDelta\@DirectPlayerMovementProxy\@\@UEBA?AVVec3\@\@XZ + * @symbol ?getLastDelta\@DirectPlayerMovementProxy\@\@UEBA?AVVec3\@\@XZ */ MCVAPI class Vec3 getLastDelta() const; /** - * @symbol ?getLastPos\@DirectPlayerMovementProxy\@\@UEBA?AVVec3\@\@XZ + * @symbol ?getLastPos\@DirectPlayerMovementProxy\@\@UEBA?AVVec3\@\@XZ */ MCVAPI class Vec3 getLastPos() const; /** - * @symbol ?getLoadingState\@DirectPlayerMovementProxy\@\@UEBA?AW4LoadingState\@\@XZ + * @symbol ?getLoadingState\@DirectPlayerMovementProxy\@\@UEBA?AW4LoadingState\@\@XZ */ MCVAPI enum class LoadingState getLoadingState() const; /** - * @symbol ?getMoveInputHandler\@DirectPlayerMovementProxy\@\@UEAAPEAVMoveInputHandler\@\@XZ + * @symbol ?getMoveInputHandler\@DirectPlayerMovementProxy\@\@UEAAPEAVMoveInputHandler\@\@XZ */ MCVAPI class MoveInputHandler * getMoveInputHandler(); /** - * @symbol ?getPlayMode\@DirectPlayerMovementProxy\@\@UEBA?AW4ClientPlayMode\@\@XZ + * @symbol ?getPlayMode\@DirectPlayerMovementProxy\@\@UEBA?AW4ClientPlayMode\@\@XZ */ MCVAPI enum class ClientPlayMode getPlayMode() const; /** - * @symbol ?getPlayerPaddleForce\@DirectPlayerMovementProxy\@\@UEBAMW4Side\@\@\@Z + * @symbol ?getPlayerPaddleForce\@DirectPlayerMovementProxy\@\@UEBAMW4Side\@\@\@Z */ MCVAPI float getPlayerPaddleForce(enum class Side) const; /** - * @symbol ?getVRMoveAdjustAngle\@DirectPlayerMovementProxy\@\@UEBAMXZ + * @symbol ?getSneakHeight\@DirectPlayerMovementProxy\@\@UEBAMXZ */ - MCVAPI float getVRMoveAdjustAngle() const; + MCVAPI float getSneakHeight() const; /** - * @symbol ?hasMoveInput\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?getVRMoveAdjustAngle\@DirectPlayerMovementProxy\@\@UEBAMXZ */ - MCVAPI bool hasMoveInput() const; + MCVAPI float getVRMoveAdjustAngle() const; /** - * @symbol ?isAdventureSettingsAutoJump\@DirectPlayerMovementProxy\@\@UEAA_NXZ + * @symbol ?isAdventureSettingsAutoJump\@DirectPlayerMovementProxy\@\@UEAA_NXZ */ MCVAPI bool isAdventureSettingsAutoJump(); /** - * @symbol ?isArmorFlyEnabled\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isArmorFlyEnabled\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isArmorFlyEnabled() const; /** - * @symbol ?isAutoJumpEnabled\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isAutoJumpEnabled\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isAutoJumpEnabled() const; /** - * @symbol ?isAutoJumping\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isAutoJumping\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isAutoJumping() const; /** - * @symbol ?isEmoting\@DirectPlayerMovementProxy\@\@UEAA_NXZ + * @symbol ?isEmoting\@DirectPlayerMovementProxy\@\@UEAA_NXZ */ MCVAPI bool isEmoting(); /** - * @symbol ?isFlying\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isFlying\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isFlying() const; /** - * @symbol ?isLocalPlayer\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isLocalPlayer\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isLocalPlayer() const; /** - * @symbol ?isPaddling\@DirectPlayerMovementProxy\@\@UEBA_NW4Side\@\@\@Z + * @symbol ?isPaddling\@DirectPlayerMovementProxy\@\@UEBA_NW4Side\@\@\@Z */ MCVAPI bool isPaddling(enum class Side) const; /** - * @symbol ?isServerAuthoritativeMovement\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isServerAuthoritativeMovement\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isServerAuthoritativeMovement() const; /** - * @symbol ?isSleeping\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isSleeping\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isSleeping() const; /** - * @symbol ?isSlowedByItemUse\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isSlowedByItemUse\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isSlowedByItemUse() const; /** - * @symbol ?isSpectator\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isSpectator\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isSpectator() const; /** - * @symbol ?isUsingItem\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?isUsingItem\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isUsingItem() const; /** - * @symbol ?registerFramewiseActionOrStop\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?registerFramewiseActionOrStop\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void registerFramewiseActionOrStop(); /** - * @symbol ?sendClientAuthInput\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?sendClientAuthInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendClientAuthInput(); /** - * @symbol ?sendInput\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?sendInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendInput(); /** - * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPlayerActionPacket\@\@\@Z + * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPassengerJumpPacket\@\@\@Z */ - MCVAPI void sendPacket(class PlayerActionPacket &); + MCVAPI void sendPacket(class PassengerJumpPacket &); /** - * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPassengerJumpPacket\@\@\@Z + * @symbol ?sendPacket\@DirectPlayerMovementProxy\@\@UEAAXAEAVPlayerActionPacket\@\@\@Z */ - MCVAPI void sendPacket(class PassengerJumpPacket &); + MCVAPI void sendPacket(class PlayerActionPacket &); /** - * @symbol ?sendPlayerInput\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?sendPlayerInput\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendPlayerInput(); /** - * @symbol ?sendPlayerMove\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?sendPlayerMove\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendPlayerMove(); /** - * @symbol ?sendPosition\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?sendPosition\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void sendPosition(); /** - * @symbol ?sendRequestAbilityPacket\@DirectPlayerMovementProxy\@\@UEAAXW4AbilitiesIndex\@\@_N\@Z + * @symbol ?sendRequestAbilityPacket\@DirectPlayerMovementProxy\@\@UEAAXW4AbilitiesIndex\@\@_N\@Z */ MCVAPI void sendRequestAbilityPacket(enum class AbilitiesIndex, bool); /** - * @symbol ?setAbilityBool\@DirectPlayerMovementProxy\@\@UEAAXW4AbilitiesIndex\@\@_N\@Z + * @symbol ?setAbilityBool\@DirectPlayerMovementProxy\@\@UEAAXW4AbilitiesIndex\@\@_N\@Z */ MCVAPI void setAbilityBool(enum class AbilitiesIndex, bool); /** - * @symbol ?setAbilityFloat\@DirectPlayerMovementProxy\@\@UEAAXW4AbilitiesIndex\@\@M\@Z + * @symbol ?setAbilityFloat\@DirectPlayerMovementProxy\@\@UEAAXW4AbilitiesIndex\@\@M\@Z */ MCVAPI void setAbilityFloat(enum class AbilitiesIndex, float); /** - * @symbol ?setAutoJumping\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z + * @symbol ?setAutoJumping\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void setAutoJumping(bool); /** - * @symbol ?setBob\@DirectPlayerMovementProxy\@\@UEAAXM\@Z + * @symbol ?setBob\@DirectPlayerMovementProxy\@\@UEAAXM\@Z */ MCVAPI void setBob(float); /** - * @symbol ?setCurrentLocalMoveVelocity\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec2\@\@\@Z + * @symbol ?setCurrentLocalMoveVelocity\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec2\@\@\@Z */ MCVAPI void setCurrentLocalMoveVelocity(class Vec2 const &); /** - * @symbol ?setEmotingStatus\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z + * @symbol ?setEmotingStatus\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void setEmotingStatus(bool); /** - * @symbol ?setHandsBusy\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z + * @symbol ?setHandsBusy\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void setHandsBusy(bool); /** - * @symbol ?setHasMoveInput\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z - */ - MCVAPI void setHasMoveInput(bool); - /** - * @symbol ?setJumpRidingScale\@DirectPlayerMovementProxy\@\@UEAAXM\@Z + * @symbol ?setJumpRidingScale\@DirectPlayerMovementProxy\@\@UEAAXM\@Z */ MCVAPI void setJumpRidingScale(float); /** - * @symbol ?setLastBob\@DirectPlayerMovementProxy\@\@UEAAXM\@Z + * @symbol ?setLastBob\@DirectPlayerMovementProxy\@\@UEAAXM\@Z */ MCVAPI void setLastBob(float); /** - * @symbol ?setLastDelta\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@\@Z + * @symbol ?setLastDelta\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@\@Z */ MCVAPI void setLastDelta(class Vec3 const &); /** - * @symbol ?setLastPos\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@\@Z + * @symbol ?setLastPos\@DirectPlayerMovementProxy\@\@UEAAXAEBVVec3\@\@\@Z */ MCVAPI void setLastPos(class Vec3 const &); /** - * @symbol ?setPlayerPaddleForce\@DirectPlayerMovementProxy\@\@UEAAXW4Side\@\@M\@Z + * @symbol ?setPlayerPaddleForce\@DirectPlayerMovementProxy\@\@UEAAXW4Side\@\@M\@Z */ MCVAPI void setPlayerPaddleForce(enum class Side, float); /** - * @symbol ?setWasAutoJumping\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z + * @symbol ?setWasAutoJumping\@DirectPlayerMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void setWasAutoJumping(bool); /** - * @symbol ?shouldSendPosition\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?shouldSendPosition\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool shouldSendPosition() const; /** - * @symbol ?startGliding\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?startGliding\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void startGliding(); /** - * @symbol ?stopGliding\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?stopGliding\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void stopGliding(); /** - * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEBAPEBUIPlayerMovementProxy\@\@XZ + * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAUIPlayerMovementProxy\@\@XZ */ - MCVAPI struct IPlayerMovementProxy const * tryAsPlayer() const; + MCVAPI struct IPlayerMovementProxy * tryAsPlayer(); /** - * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEAAPEAUIPlayerMovementProxy\@\@XZ + * @symbol ?tryAsPlayer\@DirectPlayerMovementProxy\@\@UEBAPEBUIPlayerMovementProxy\@\@XZ */ - MCVAPI struct IPlayerMovementProxy * tryAsPlayer(); + MCVAPI struct IPlayerMovementProxy const * tryAsPlayer() const; /** - * @symbol ?tryGetPlayerActionComponent\@DirectPlayerMovementProxy\@\@UEAAPEAUPlayerActionComponent\@\@XZ + * @symbol ?tryGetPlayerActionComponent\@DirectPlayerMovementProxy\@\@UEAAPEAUPlayerActionComponent\@\@XZ */ MCVAPI struct PlayerActionComponent * tryGetPlayerActionComponent(); /** - * @symbol ?updateClientPlayerInputState\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?updateClientPlayerInputState\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void updateClientPlayerInputState(); /** - * @symbol ?updateTouch\@DirectPlayerMovementProxy\@\@UEAAXXZ + * @symbol ?updateTouch\@DirectPlayerMovementProxy\@\@UEAAXXZ */ MCVAPI void updateTouch(); /** - * @symbol ?wasAutoJumping\@DirectPlayerMovementProxy\@\@UEBA_NXZ + * @symbol ?wasAutoJumping\@DirectPlayerMovementProxy\@\@UEBA_NXZ */ MCVAPI bool wasAutoJumping() const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Direction.hpp b/LiteLoader/include/llapi/mc/Direction.hpp index 508a445504..ee9e82ea9a 100644 --- a/LiteLoader/include/llapi/mc/Direction.hpp +++ b/LiteLoader/include/llapi/mc/Direction.hpp @@ -32,40 +32,40 @@ enum class Type; public: /** - * @symbol ?DIRECTION_CLOCKWISE\@Direction\@\@2QBW4Type\@1\@B + * @symbol ?DIRECTION_CLOCKWISE\@Direction\@\@2QBW4Type\@1\@B */ MCAPI static enum class Direction::Type const DIRECTION_CLOCKWISE[]; /** - * @symbol ?DIRECTION_COUNTER_CLOCKWISE\@Direction\@\@2QBW4Type\@1\@B + * @symbol ?DIRECTION_COUNTER_CLOCKWISE\@Direction\@\@2QBW4Type\@1\@B */ MCAPI static enum class Direction::Type const DIRECTION_COUNTER_CLOCKWISE[]; /** - * @symbol ?DIRECTION_FACING\@Direction\@\@2QBEB + * @symbol ?DIRECTION_FACING\@Direction\@\@2QBEB */ MCAPI static unsigned char const DIRECTION_FACING[]; /** - * @symbol ?DIRECTION_OPPOSITE\@Direction\@\@2QBW4Type\@1\@B + * @symbol ?DIRECTION_OPPOSITE\@Direction\@\@2QBW4Type\@1\@B */ MCAPI static enum class Direction::Type const DIRECTION_OPPOSITE[]; /** - * @symbol ?FACING_DIRECTION\@Direction\@\@2QBW4Type\@1\@B + * @symbol ?FACING_DIRECTION\@Direction\@\@2QBW4Type\@1\@B */ MCAPI static enum class Direction::Type const FACING_DIRECTION[]; /** - * @symbol ?STEP_X\@Direction\@\@2QBHB + * @symbol ?STEP_X\@Direction\@\@2QBHB */ MCAPI static int const STEP_X[]; /** - * @symbol ?STEP_Z\@Direction\@\@2QBHB + * @symbol ?STEP_Z\@Direction\@\@2QBHB */ MCAPI static int const STEP_Z[]; /** - * @symbol ?convertFacingDirectionToDirection\@Direction\@\@SA?AW4Type\@1\@E\@Z + * @symbol ?convertFacingDirectionToDirection\@Direction\@\@SA?AW4Type\@1\@E\@Z */ MCAPI static enum class Direction::Type convertFacingDirectionToDirection(unsigned char); /** - * @symbol ?getDirection\@Direction\@\@SA?AW4Type\@1\@MM\@Z + * @symbol ?getDirection\@Direction\@\@SA?AW4Type\@1\@MM\@Z */ MCAPI static enum class Direction::Type getDirection(float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp index ac320a7a59..90a8777981 100644 --- a/LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackAccessStrategy.hpp @@ -32,123 +32,104 @@ class DirectoryPackAccessStrategy : public PackAccessStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DirectoryPackAccessStrategy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPackSize\@DirectoryPackAccessStrategy\@\@UEBA_KXZ + * @vftbl 1 + * @symbol ?getPackSize\@DirectoryPackAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const; /** - * @vftbl 2 - * @symbol ?getPackLocation\@DirectoryPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @vftbl 2 + * @symbol ?getPackLocation\@DirectoryPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ */ virtual class ResourceLocation const & getPackLocation() const; /** - * @vftbl 3 - * @symbol ?getPackName\@DirectoryPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getPackName\@DirectoryPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getPackName() const; /** - * @vftbl 4 - * @symbol ?isWritable\@DirectoryPackAccessStrategy\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isWritable\@DirectoryPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const; /** - * @vftbl 5 - * @symbol ?setIsTrusted\@DirectoryPackAccessStrategy\@\@UEAAX_N\@Z + * @vftbl 5 + * @symbol ?setIsTrusted\@DirectoryPackAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool); /** - * @vftbl 6 - * @symbol ?isTrusted\@DirectoryPackAccessStrategy\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isTrusted\@DirectoryPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const; /** - * @vftbl 7 - * @symbol ?hasAsset\@DirectoryPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N\@Z + * @vftbl 7 + * @symbol ?hasAsset\@DirectoryPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ - virtual bool hasAsset(class Core::Path const &, bool) const; + virtual bool hasAsset(class Core::Path const &, bool, bool) const; /** - * @vftbl 8 - * @symbol ?hasFolder\@DirectoryPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @vftbl 8 + * @symbol ?hasFolder\@DirectoryPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool hasFolder(class Core::Path const &) const; /** - * @vftbl 9 - * @symbol ?getAsset\@DirectoryPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 9 + * @symbol ?getAsset\@DirectoryPackAccessStrategy\@\@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; /** - * @vftbl 10 - * @symbol ?deleteAsset\@DirectoryPackAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @vftbl 10 + * @symbol ?deleteAsset\@DirectoryPackAccessStrategy\@\@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 &); /** - * @vftbl 11 - * @symbol ?writeAsset\@DirectoryPackAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 11 + * @symbol ?writeAsset\@DirectoryPackAccessStrategy\@\@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 &); /** - * @vftbl 12 - * @symbol ?forEachIn\@DirectoryPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @vftbl 12 + * @symbol ?forEachIn\@DirectoryPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ virtual void forEachIn(class Core::Path const &, class std::function, bool) const; /** - * @vftbl 13 - * @symbol ?forEachInAssetSet\@DirectoryPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@\@Z + * @vftbl 13 + * @symbol ?forEachInAssetSet\@DirectoryPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@\@Z */ virtual void forEachInAssetSet(class Core::Path const &, class std::function) const; /** - * @vftbl 14 - * @symbol ?getStrategyType\@DirectoryPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ + * @vftbl 14 + * @symbol ?getStrategyType\@DirectoryPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ */ virtual enum class PackAccessStrategyType getStrategyType() const; /** - * @vftbl 16 - * @symbol ?createSubPack\@DirectoryPackAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @vftbl 16 + * @symbol ?createSubPack\@DirectoryPackAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ virtual std::unique_ptr createSubPack(class Core::Path const &) const; /** - * @vftbl 18 - * @symbol ?canRecurse\@DirectoryPackAccessStrategy\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?canRecurse\@DirectoryPackAccessStrategy\@\@UEBA_NXZ */ virtual bool canRecurse() const; /** - * @vftbl 19 - * @symbol ?unload\@DirectoryPackAccessStrategy\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?unload\@DirectoryPackAccessStrategy\@\@UEAAXXZ */ virtual void unload(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIRECTORYPACKACCESSSTRATEGY /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @symbol __unk_destructor_-1 */ - 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 ?_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); + MCVAPI ~DirectoryPackAccessStrategy(); +#endif /** - * @symbol ??0DirectoryPackAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@_N\@Z + * @symbol ??0DirectoryPackAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@_N\@Z */ MCAPI DirectoryPackAccessStrategy(class ResourceLocation const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectoryPackSource.hpp b/LiteLoader/include/llapi/mc/DirectoryPackSource.hpp index 4b3744fb82..83586abe4f 100644 --- a/LiteLoader/include/llapi/mc/DirectoryPackSource.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackSource.hpp @@ -32,60 +32,64 @@ class DirectoryPackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DirectoryPackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getPackOrigin\@DirectoryPackSource\@\@UEBA?AW4PackOrigin\@\@XZ + * @vftbl 3 + * @symbol ?getPackOrigin\@DirectoryPackSource\@\@UEBA?AW4PackOrigin\@\@XZ */ virtual enum class PackOrigin getPackOrigin() const; /** - * @vftbl 4 - * @symbol ?getPackType\@DirectoryPackSource\@\@UEBA?AW4PackType\@\@XZ + * @vftbl 4 + * @symbol ?getPackType\@DirectoryPackSource\@\@UEBA?AW4PackType\@\@XZ */ virtual enum class PackType getPackType() const; /** - * @vftbl 5 - * @symbol ?load\@DirectoryPackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 5 + * @symbol ?load\@DirectoryPackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual class PackSourceReport load(class IPackManifestFactory &, class gsl::not_null> const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DIRECTORYPACKSOURCE /** - * @symbol ?forEachPack\@DirectoryPackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPack\@DirectoryPackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPack(class std::function); /** - * @symbol ?forEachPackConst\@DirectoryPackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPackConst\@DirectoryPackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPackConst(class std::function) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DirectoryPackSource(); #endif /** - * @symbol ??0DirectoryPackSource\@\@QEAA\@AEBVPath\@Core\@\@W4PackType\@\@W4PackOrigin\@\@_N\@Z + * @symbol ??0DirectoryPackSource\@\@QEAA\@AEBVPath\@Core\@\@W4PackType\@\@W4PackOrigin\@\@_N\@Z */ MCAPI DirectoryPackSource(class Core::Path const &, enum class PackType, enum class PackOrigin, bool); /** - * @symbol ?getPath\@DirectoryPackSource\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getPath\@DirectoryPackSource\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer const & getPath() const; /** - * @symbol ?removePack\@DirectoryPackSource\@\@QEAA_NAEBVPath\@Core\@\@\@Z + * @symbol ?removePack\@DirectoryPackSource\@\@QEAA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool removePack(class Core::Path const &); /** - * @symbol ?checkAndRemoveIncompletePacks\@DirectoryPackSource\@\@SAXAEBVPath\@Core\@\@\@Z + * @symbol ?checkAndRemoveIncompletePacks\@DirectoryPackSource\@\@SAXAEBVPath\@Core\@\@\@Z */ MCAPI static void checkAndRemoveIncompletePacks(class Core::Path const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp b/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp index 35c6ea9c68..4b37fd94d3 100644 --- a/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/DirectoryPackWithEncryptionAccessStrategy.hpp @@ -33,140 +33,140 @@ class DirectoryPackWithEncryptionAccessStrategy : public PackAccessStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DirectoryPackWithEncryptionAccessStrategy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPackSize\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_KXZ + * @vftbl 1 + * @symbol ?getPackSize\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const; /** - * @vftbl 2 - * @symbol ?getPackLocation\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @vftbl 2 + * @symbol ?getPackLocation\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ */ virtual class ResourceLocation const & getPackLocation() const; /** - * @vftbl 3 - * @symbol ?getPackName\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getPackName\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getPackName() const; /** - * @vftbl 4 - * @symbol ?isWritable\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isWritable\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const; /** - * @vftbl 5 - * @symbol ?setIsTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAX_N\@Z + * @vftbl 5 + * @symbol ?setIsTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool); /** - * @vftbl 6 - * @symbol ?isTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const; /** - * @vftbl 7 - * @symbol ?hasAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N\@Z + * @vftbl 7 + * @symbol ?hasAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ - virtual bool hasAsset(class Core::Path const &, bool) const; + virtual bool hasAsset(class Core::Path const &, bool, bool) const; /** - * @vftbl 8 - * @symbol ?hasFolder\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @vftbl 8 + * @symbol ?hasFolder\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool hasFolder(class Core::Path const &) const; /** - * @vftbl 9 - * @symbol ?getAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 9 + * @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; /** - * @vftbl 10 - * @symbol ?deleteAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @vftbl 10 + * @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 &); /** - * @vftbl 11 - * @symbol ?writeAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 11 + * @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 &); /** - * @vftbl 12 - * @symbol ?forEachIn\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @vftbl 12 + * @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; /** - * @vftbl 14 - * @symbol ?getStrategyType\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ + * @vftbl 14 + * @symbol ?getStrategyType\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ */ virtual enum class PackAccessStrategyType getStrategyType() const; /** - * @vftbl 16 - * @symbol ?createSubPack\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @vftbl 16 + * @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; /** - * @vftbl 17 - * @symbol ?generateAssetSet\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA?AW4PackAccessAssetGenerationResult\@\@XZ + * @vftbl 17 + * @symbol ?generateAssetSet\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAA?AW4PackAccessAssetGenerationResult\@\@XZ */ virtual enum class PackAccessAssetGenerationResult generateAssetSet(); /** - * @vftbl 19 - * @symbol ?unload\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?unload\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAXXZ */ virtual void unload(); /** - * @vftbl 20 - * @symbol ?hasUpgradeFiles\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ + * @vftbl 20 + * @symbol ?hasUpgradeFiles\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool hasUpgradeFiles() const; /** - * @vftbl 21 - * @symbol ?readContentIdentity\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ + * @vftbl 21 + * @symbol ?readContentIdentity\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ */ virtual class ContentIdentity readContentIdentity() const; /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 26 + * @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 ??0DirectoryPackWithEncryptionAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@0AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0DirectoryPackWithEncryptionAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@0AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI DirectoryPackWithEncryptionAccessStrategy(class ResourceLocation const &, class ResourceLocation const &, class gsl::not_null> const &); //private: /** - * @symbol ?_getUnencryptedAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@AEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getUnencryptedAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@AEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _getUnencryptedAsset(class Core::Path const &, std::string &) const; /** - * @symbol ?_hasUnencryptedAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@AEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?_hasUnencryptedAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@AEBA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool _hasUnencryptedAsset(class Core::Path const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirtBlock.hpp b/LiteLoader/include/llapi/mc/DirtBlock.hpp index dea815e892..2641573e62 100644 --- a/LiteLoader/include/llapi/mc/DirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/DirtBlock.hpp @@ -31,268 +31,273 @@ class DirtBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DirtBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@DirtBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@DirtBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@DirtBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@DirtBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 95 - * @symbol ?tryToTill\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @vftbl 95 + * @symbol ?tryToTill\@DirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z */ virtual bool tryToTill(class BlockSource &, class BlockPos const &, class Actor &, class ItemStack &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@DirtBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@DirtBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@DirtBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@DirtBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@DirtBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DirtBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@DirtBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@DirtBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@DirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@DirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@DirtBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DirtBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0DirtBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DirtBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DirtBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp b/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp index 354e423401..01dccc31ea 100644 --- a/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp +++ b/LiteLoader/include/llapi/mc/DirtyTicksCounter.hpp @@ -29,31 +29,31 @@ struct DirtyTicksCounter { public: /** - * @symbol ??0DirtyTicksCounter\@\@QEAA\@XZ + * @symbol ??0DirtyTicksCounter\@\@QEAA\@XZ */ MCAPI DirtyTicksCounter(); /** - * @symbol ?getTicksSinceLastChange\@DirtyTicksCounter\@\@QEBAHXZ + * @symbol ?getTicksSinceLastChange\@DirtyTicksCounter\@\@QEBAHXZ */ MCAPI int getTicksSinceLastChange() const; /** - * @symbol ?getTotalDirtyTicks\@DirtyTicksCounter\@\@QEBAHXZ + * @symbol ?getTotalDirtyTicks\@DirtyTicksCounter\@\@QEBAHXZ */ MCAPI int getTotalDirtyTicks() const; /** - * @symbol ??EDirtyTicksCounter\@\@QEAAAEAU0\@XZ + * @symbol ??EDirtyTicksCounter\@\@QEAAAEAU0\@XZ */ MCAPI struct DirtyTicksCounter & operator++(); /** - * @symbol ?reset\@DirtyTicksCounter\@\@QEAAXXZ + * @symbol ?reset\@DirtyTicksCounter\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?touch\@DirtyTicksCounter\@\@QEAAXXZ + * @symbol ?touch\@DirtyTicksCounter\@\@QEAAXXZ */ MCAPI void touch(); /** - * @symbol ?max\@DirtyTicksCounter\@\@SA?AU1\@XZ + * @symbol ?max\@DirtyTicksCounter\@\@SA?AU1\@XZ */ MCAPI static struct DirtyTicksCounter max(); diff --git a/LiteLoader/include/llapi/mc/DiscFeature.hpp b/LiteLoader/include/llapi/mc/DiscFeature.hpp index 1e077215f9..1c6c8b746c 100644 --- a/LiteLoader/include/llapi/mc/DiscFeature.hpp +++ b/LiteLoader/include/llapi/mc/DiscFeature.hpp @@ -29,18 +29,18 @@ class DiscFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DiscFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@DiscFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@DiscFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0DiscFeature\@\@QEAA\@AEBVBlock\@\@H\@Z + * @symbol ??0DiscFeature\@\@QEAA\@AEBVBlock\@\@H\@Z */ MCAPI DiscFeature(class Block const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp b/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp index 29d0a1c41d..4a31cf8dc2 100644 --- a/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp +++ b/LiteLoader/include/llapi/mc/DiscFragmentItem.hpp @@ -30,88 +30,88 @@ class DiscFragmentItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DiscFragmentItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@DiscFragmentItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@DiscFragmentItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@DiscFragmentItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @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; /** - * @symbol ??0DiscFragmentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DiscFragmentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DiscFragmentItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp index 4221e6e93b..cb7ebe6405 100644 --- a/LiteLoader/include/llapi/mc/DisconnectPacket.hpp +++ b/LiteLoader/include/llapi/mc/DisconnectPacket.hpp @@ -30,37 +30,43 @@ class DisconnectPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DisconnectPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@DisconnectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@DisconnectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@DisconnectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@DisconnectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@DisconnectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@DisconnectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@DisconnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@DisconnectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DISCONNECTPACKET /** - * @symbol ??0DisconnectPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI DisconnectPacket(); + MCVAPI ~DisconnectPacket(); +#endif /** - * @symbol ??0DisconnectPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ??0DisconnectPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI DisconnectPacket(std::string const &, bool); + /** + * @symbol ??0DisconnectPacket\@\@QEAA\@XZ + */ + MCAPI DisconnectPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp b/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp index 57231ad19e..005ea30faf 100644 --- a/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp +++ b/LiteLoader/include/llapi/mc/DispatcherUpdateSystem.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure DispatcherUpdateSystem. - * - */ -struct DispatcherUpdateSystem { + +class DispatcherUpdateSystem { #define AFTER_EXTRA // Add Member There @@ -23,26 +20,26 @@ struct DispatcherUpdateSystem { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DISPATCHERUPDATESYSTEM public: - struct DispatcherUpdateSystem& operator=(struct DispatcherUpdateSystem const &) = delete; - DispatcherUpdateSystem(struct DispatcherUpdateSystem const &) = delete; + class DispatcherUpdateSystem& operator=(class DispatcherUpdateSystem const &) = delete; + DispatcherUpdateSystem(class DispatcherUpdateSystem const &) = delete; DispatcherUpdateSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DispatcherUpdateSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@DispatcherUpdateSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DispatcherUpdateSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DispenserBlock.hpp b/LiteLoader/include/llapi/mc/DispenserBlock.hpp index 6737585173..fe04e620d2 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlock.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlock.hpp @@ -31,297 +31,302 @@ class DispenserBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DispenserBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@DispenserBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@DispenserBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@DispenserBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@DispenserBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@DispenserBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DispenserBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@DispenserBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@DispenserBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@DispenserBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@DispenserBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@DispenserBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DispenserBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getTickDelay\@DispenserBlock\@\@UEBAHXZ + * @vftbl 195 + * @symbol ?getTickDelay\@DispenserBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 195 - * @symbol ?dispenseFrom\@DispenserBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 196 + * @symbol ?dispenseFrom\@DispenserBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DISPENSERBLOCK /** - * @symbol ?hasComparatorSignal\@DispenserBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@DispenserBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isContainerBlock\@DispenserBlock\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@DispenserBlock\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isInteractiveBlock\@DispenserBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@DispenserBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0DispenserBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DispenserBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DispenserBlock(std::string const &, int); /** - * @symbol ?ejectItem\@DispenserBlock\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@\@Z + * @symbol ?ejectItem\@DispenserBlock\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@\@Z */ MCAPI static void ejectItem(class BlockSource &, class Vec3 const &, unsigned char, class ItemStack const &); //protected: /** - * @symbol ?ejectItem\@DispenserBlock\@\@IEBAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@AEAVContainer\@\@H\@Z + * @symbol ?ejectItem\@DispenserBlock\@\@IEBAXAEAVBlockSource\@\@AEBVVec3\@\@EAEBVItemStack\@\@AEAVContainer\@\@H\@Z */ MCAPI void ejectItem(class BlockSource &, class Vec3 const &, unsigned char, class ItemStack const &, class Container &, int) const; /** - * @symbol ?getDispensePosition\@DispenserBlock\@\@IEBA?AVVec3\@\@AEAVBlockSource\@\@AEBV2\@\@Z + * @symbol ?getDispensePosition\@DispenserBlock\@\@IEBA?AVVec3\@\@AEAVBlockSource\@\@AEBV2\@\@Z */ MCAPI class Vec3 getDispensePosition(class BlockSource &, class Vec3 const &) const; /** - * @symbol ?getFacing\@DispenserBlock\@\@IEBAEAEBVBlock\@\@\@Z + * @symbol ?getFacing\@DispenserBlock\@\@IEBAEAEBVBlock\@\@\@Z */ MCAPI unsigned char getFacing(class Block const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp index 39f16deaa7..2d2ad611c9 100644 --- a/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DispenserBlockActor.hpp @@ -31,89 +31,89 @@ class DispenserBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DISPENSERBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@DispenserBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@DispenserBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@DispenserBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@DispenserBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?getContainer\@DispenserBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@DispenserBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@DispenserBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@DispenserBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@DispenserBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@DispenserBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@DispenserBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@DispenserBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@DispenserBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@DispenserBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@DispenserBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @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 + * @symbol ?getRandomSlot\@DispenserBlockActor\@\@UEAAHXZ */ MCVAPI int getRandomSlot(); /** - * @symbol ?load\@DispenserBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@DispenserBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onMove\@DispenserBlockActor\@\@UEAAXXZ + * @symbol ?onMove\@DispenserBlockActor\@\@UEAAXXZ */ MCVAPI void onMove(); /** - * @symbol ?save\@DispenserBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@DispenserBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@DispenserBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@DispenserBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@DispenserBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@DispenserBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@DispenserBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@DispenserBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@DispenserBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@DispenserBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~DispenserBlockActor(); #endif /** - * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@W4BlockActorType\@\@\@Z + * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@\@Z */ - MCAPI DispenserBlockActor(class BlockPos, enum class BlockActorType); + MCAPI DispenserBlockActor(class BlockPos); /** - * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0DispenserBlockActor\@\@QEAA\@VBlockPos\@\@W4BlockActorType\@\@\@Z */ - MCAPI DispenserBlockActor(class BlockPos); + MCAPI DispenserBlockActor(class BlockPos, enum class BlockActorType); //protected: /** - * @symbol ?initItems\@DispenserBlockActor\@\@IEAAXXZ + * @symbol ?initItems\@DispenserBlockActor\@\@IEAAXXZ */ MCAPI void initItems(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp index afdecbb695..a2345804c7 100644 --- a/LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/DispenserContainerManagerModel.hpp @@ -31,18 +31,18 @@ class DispenserContainerManagerModel : public LevelContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DispenserContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 17 - * @symbol ?_postInit\@DispenserContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@DispenserContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0DispenserContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0DispenserContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI DispenserContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp b/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp index c6506bde37..491e806fc6 100644 --- a/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DisplayNameItemComponent.hpp @@ -30,51 +30,51 @@ class DisplayNameItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DisplayNameItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDisplayNameItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getDescriptionId\@DisplayNameItemComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@DisplayNameItemComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDescriptionId() const; /** - * @symbol ?bindType\@DisplayNameItemComponent\@\@SAXXZ + * @symbol ?bindType\@DisplayNameItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@DisplayNameItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@DisplayNameItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DisplayObjective.hpp b/LiteLoader/include/llapi/mc/DisplayObjective.hpp index 7f6cd2b3ed..a0d881ceaf 100644 --- a/LiteLoader/include/llapi/mc/DisplayObjective.hpp +++ b/LiteLoader/include/llapi/mc/DisplayObjective.hpp @@ -30,36 +30,36 @@ class DisplayObjective { public: /** - * @symbol ??0DisplayObjective\@\@QEAA\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z + * @symbol ??0DisplayObjective\@\@QEAA\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z */ MCAPI DisplayObjective(class Objective const &, enum class ObjectiveSortOrder); /** - * @symbol ?getBelowNameStringForId\@DisplayObjective\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUScoreboardId\@\@\@Z + * @symbol ?getBelowNameStringForId\@DisplayObjective\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUScoreboardId\@\@\@Z */ MCAPI std::string const getBelowNameStringForId(struct ScoreboardId const &) const; /** - * @symbol ?getObjective\@DisplayObjective\@\@QEBAAEBVObjective\@\@XZ + * @symbol ?getObjective\@DisplayObjective\@\@QEBAAEBVObjective\@\@XZ */ MCAPI class Objective const & getObjective() const; /** - * @symbol ?getSortOrder\@DisplayObjective\@\@QEBA?AW4ObjectiveSortOrder\@\@XZ + * @symbol ?getSortOrder\@DisplayObjective\@\@QEBA?AW4ObjectiveSortOrder\@\@XZ */ MCAPI enum class ObjectiveSortOrder getSortOrder() const; /** - * @symbol ?isDisplaying\@DisplayObjective\@\@QEBA_NAEBVObjective\@\@\@Z + * @symbol ?isDisplaying\@DisplayObjective\@\@QEBA_NAEBVObjective\@\@\@Z */ MCAPI bool isDisplaying(class Objective const &) const; /** - * @symbol ?isValid\@DisplayObjective\@\@QEBA_NXZ + * @symbol ?isValid\@DisplayObjective\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?deserialize\@DisplayObjective\@\@SA?AV1\@AEBVCompoundTag\@\@AEBVScoreboard\@\@\@Z + * @symbol ?deserialize\@DisplayObjective\@\@SA?AV1\@AEBVCompoundTag\@\@AEBVScoreboard\@\@\@Z */ MCAPI static class DisplayObjective deserialize(class CompoundTag const &, class Scoreboard const &); /** - * @symbol ?serialize\@DisplayObjective\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z + * @symbol ?serialize\@DisplayObjective\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z */ MCAPI static std::unique_ptr serialize(class DisplayObjective const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DistanceConstraint.hpp b/LiteLoader/include/llapi/mc/DistanceConstraint.hpp index bc0ac04cbe..0430910bc4 100644 --- a/LiteLoader/include/llapi/mc/DistanceConstraint.hpp +++ b/LiteLoader/include/llapi/mc/DistanceConstraint.hpp @@ -30,16 +30,16 @@ class DistanceConstraint { public: /** - * @symbol ??0DistanceConstraint\@\@QEAA\@MMM\@Z + * @symbol ??0DistanceConstraint\@\@QEAA\@MMM\@Z */ MCAPI DistanceConstraint(float, float, float); /** - * @symbol ?setup\@DistanceConstraint\@\@QEAAMAEBVVec3\@\@0MM\@Z + * @symbol ?setup\@DistanceConstraint\@\@QEAAMAEBVVec3\@\@0MM\@Z */ MCAPI float setup(class Vec3 const &, class Vec3 const &, float, float); /** - * @symbol ?solve\@DistanceConstraint\@\@QEAAXAEAVVec3\@\@0\@Z + * @symbol ?solve\@DistanceConstraint\@\@QEAAXAEAVVec3\@\@0\@Z */ MCAPI void solve(class Vec3 &, class Vec3 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Dolphin.hpp b/LiteLoader/include/llapi/mc/Dolphin.hpp index ec9ef1b0ae..468c347535 100644 --- a/LiteLoader/include/llapi/mc/Dolphin.hpp +++ b/LiteLoader/include/llapi/mc/Dolphin.hpp @@ -32,163 +32,158 @@ class Dolphin : public WaterAnimal { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Dolphin\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Dolphin\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Dolphin(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Dolphin\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Dolphin\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 - */ - virtual void __unk_vfn_193(); - /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@Dolphin\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Dolphin\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 334 - * @symbol ?createAIGoals\@Dolphin\@\@UEAA_NXZ + * @vftbl 331 + * @symbol ?createAIGoals\@Dolphin\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Dolphin\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Dolphin\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Dolphin\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Dolphin\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Dolphin(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DolphinBoostSystem.hpp b/LiteLoader/include/llapi/mc/DolphinBoostSystem.hpp index 029a57bdff..0580c68272 100644 --- a/LiteLoader/include/llapi/mc/DolphinBoostSystem.hpp +++ b/LiteLoader/include/llapi/mc/DolphinBoostSystem.hpp @@ -28,24 +28,24 @@ class DolphinBoostSystem { public: /** - * @symbol ?_tickScan\@DolphinBoostSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@AEAUScanForDolphinTimerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UScanForDolphin\@\@\@\@\@\@\@Z + * @symbol ?_tickScan\@DolphinBoostSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@AEAUScanForDolphinTimerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UScanForDolphin\@\@\@\@\@\@\@Z */ MCAPI static void _tickScan(class StrictEntityContext const &, struct SynchedActorDataComponent const &, struct ScanForDolphinTimerComponent &, class EntityModifierT>); /** - * @symbol ?_tickSwimSpeedModifier\@DolphinBoostSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@AEAUSwimSpeedMultiplierComponent\@\@V?$Optional\@V?$FlagComponent\@UScanForDolphin\@\@\@\@\@\@V?$Optional\@V?$FlagComponent\@UIsNearDolphinsFlag\@\@\@\@\@\@\@Z + * @symbol ?_tickSwimSpeedModifier\@DolphinBoostSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@AEAUSwimSpeedMultiplierComponent\@\@V?$Optional\@V?$FlagComponent\@UScanForDolphin\@\@\@\@\@\@V?$Optional\@V?$FlagComponent\@UIsNearDolphinsFlag\@\@\@\@\@\@\@Z */ MCAPI static void _tickSwimSpeedModifier(class StrictEntityContext const &, struct SynchedActorDataComponent const &, struct SwimSpeedMultiplierComponent &, class Optional>, class Optional>); /** - * @symbol ?createFindDolphinsSystem\@DolphinBoostSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createFindDolphinsSystem\@DolphinBoostSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createFindDolphinsSystem(); /** - * @symbol ?createScanSystem\@DolphinBoostSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createScanSystem\@DolphinBoostSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createScanSystem(); /** - * @symbol ?createSwimSpeedModifierSystem\@DolphinBoostSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSwimSpeedModifierSystem\@DolphinBoostSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSwimSpeedModifierSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DolphinMoveControl.hpp b/LiteLoader/include/llapi/mc/DolphinMoveControl.hpp index a2681c8fda..95df94c801 100644 --- a/LiteLoader/include/llapi/mc/DolphinMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/DolphinMoveControl.hpp @@ -30,42 +30,42 @@ class DolphinMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DolphinMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@DolphinMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DolphinMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0DolphinMoveControl\@\@QEAA\@XZ + * @symbol ??0DolphinMoveControl\@\@QEAA\@XZ */ MCAPI DolphinMoveControl(); //private: /** - * @symbol ?_calcRotX\@DolphinMoveControl\@\@AEAAMMMM\@Z + * @symbol ?_calcRotX\@DolphinMoveControl\@\@AEAAMMMM\@Z */ MCAPI float _calcRotX(float, float, float); /** - * @symbol ?_calcRotY\@DolphinMoveControl\@\@AEAAMMM\@Z + * @symbol ?_calcRotY\@DolphinMoveControl\@\@AEAAMMM\@Z */ MCAPI float _calcRotY(float, float); /** - * @symbol ?_clearOfObstacles\@DolphinMoveControl\@\@AEBA_NAEBVMob\@\@MMH\@Z + * @symbol ?_clearOfObstacles\@DolphinMoveControl\@\@AEBA_NAEBVMob\@\@MMH\@Z */ MCAPI bool _clearOfObstacles(class Mob const &, float, float, int) const; /** - * @symbol ?_isInWater\@DolphinMoveControl\@\@AEBA_NAEBVMob\@\@\@Z + * @symbol ?_isInWater\@DolphinMoveControl\@\@AEBA_NAEBVMob\@\@\@Z */ MCAPI bool _isInWater(class Mob const &) const; /** - * @symbol ?_setupBreach\@DolphinMoveControl\@\@AEAAXAEAVMob\@\@\@Z + * @symbol ?_setupBreach\@DolphinMoveControl\@\@AEAAXAEAVMob\@\@\@Z */ MCAPI void _setupBreach(class Mob &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DoorBlock.hpp b/LiteLoader/include/llapi/mc/DoorBlock.hpp index f2a159d459..0173632b04 100644 --- a/LiteLoader/include/llapi/mc/DoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoorBlock.hpp @@ -32,345 +32,350 @@ class DoorBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DoorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNextBlockPermutation\@DoorBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 3 + * @symbol ?getNextBlockPermutation\@DoorBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 56 - * @symbol ?canFillAtPos\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 56 + * @symbol ?canFillAtPos\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canFillAtPos(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 58 - * @symbol ?onFillBlock\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?onFillBlock\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@DoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@DoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@DoorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @symbol ?getSecondPart\@DoorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@DoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 146 - * @symbol ?getVariant\@DoorBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DoorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@DoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@DoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@DoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@DoorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@DoorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@DoorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOORBLOCK /** - * @symbol ?canBeSilkTouched\@DoorBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@DoorBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isDoorBlock\@DoorBlock\@\@UEBA_NXZ + * @symbol ?isDoorBlock\@DoorBlock\@\@UEBA_NXZ */ MCVAPI bool isDoorBlock() const; /** - * @symbol ?isInteractiveBlock\@DoorBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@DoorBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0DoorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@W4DoorType\@0\@\@Z + * @symbol ??0DoorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@W4DoorType\@0\@\@Z */ MCAPI DoorBlock(std::string const &, int, class Material const &, enum class DoorBlock::DoorType); /** - * @symbol ?getBlockedDirection\@DoorBlock\@\@QEBA?AW4Type\@Direction\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlockedDirection\@DoorBlock\@\@QEBA?AW4Type\@Direction\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI enum class Direction::Type getBlockedDirection(class IConstBlockSource const &, class BlockPos const &) const; /** - * @symbol ?getDir\@DoorBlock\@\@QEBAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getDir\@DoorBlock\@\@QEBAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI int getDir(class IConstBlockSource const &, class BlockPos const &) const; /** - * @symbol ?getDoorBlocks\@DoorBlock\@\@QEBAXAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAPEBVBlock\@\@2\@Z + * @symbol ?getDoorBlocks\@DoorBlock\@\@QEBAXAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAPEBVBlock\@\@2\@Z */ MCAPI void getDoorBlocks(class IConstBlockSource const &, class BlockPos const &, class Block const *&, class Block const *&) const; /** - * @symbol ?getDoorThickness\@DoorBlock\@\@QEBAMXZ + * @symbol ?getDoorThickness\@DoorBlock\@\@QEBAMXZ */ MCAPI float getDoorThickness() const; /** - * @symbol ?isToggled\@DoorBlock\@\@QEBA_NAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isToggled\@DoorBlock\@\@QEBA_NAEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isToggled(class IConstBlockSource const &, class BlockPos const &) const; /** - * @symbol ?setToggled\@DoorBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@_N\@Z + * @symbol ?setToggled\@DoorBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@_N\@Z */ MCAPI void setToggled(class BlockSource &, class BlockPos const &, class Actor *, bool) const; /** - * @symbol ?getDoorFacing\@DoorBlock\@\@SAEH\@Z + * @symbol ?getDoorFacing\@DoorBlock\@\@SAEH\@Z */ MCAPI static unsigned char getDoorFacing(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp b/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp index 34fc2e1a04..40f7fc0cff 100644 --- a/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp +++ b/LiteLoader/include/llapi/mc/DoorInteractGoal.hpp @@ -31,59 +31,65 @@ class DoorInteractGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DoorInteractGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DoorInteractGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DoorInteractGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DoorInteractGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DoorInteractGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DoorInteractGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DoorInteractGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@DoorInteractGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DoorInteractGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DoorInteractGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DoorInteractGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOORINTERACTGOAL /** - * @symbol ??0DoorInteractGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DoorInteractGoal(); +#endif + /** + * @symbol ??0DoorInteractGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DoorInteractGoal(class Mob &); //protected: /** - * @symbol ?_doorBlocksPath\@DoorInteractGoal\@\@IEBA_NXZ + * @symbol ?_doorBlocksPath\@DoorInteractGoal\@\@IEBA_NXZ */ MCAPI bool _doorBlocksPath() const; //private: /** - * @symbol ?_findBlockingDoorAtPos\@DoorInteractGoal\@\@CAPEBVDoorBlock\@\@AEBVBlockPos\@\@AEBVMob\@\@PEAVPath\@\@AEAW4Type\@Direction\@\@3\@Z + * @symbol ?_findBlockingDoorAtPos\@DoorInteractGoal\@\@CAPEBVDoorBlock\@\@AEBVBlockPos\@\@AEBVMob\@\@PEAVPath\@\@AEAW4Type\@Direction\@\@3\@Z */ MCAPI static class DoorBlock const * _findBlockingDoorAtPos(class BlockPos const &, class Mob const &, class Path *, enum class Direction::Type &, enum class Direction::Type &); @@ -91,4 +97,4 @@ class DoorInteractGoal { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DoorItem.hpp b/LiteLoader/include/llapi/mc/DoorItem.hpp index 64e4d88413..3c11678782 100644 --- a/LiteLoader/include/llapi/mc/DoorItem.hpp +++ b/LiteLoader/include/llapi/mc/DoorItem.hpp @@ -33,87 +33,87 @@ class DoorItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DoorItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@DoorItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@DoorItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0DoorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4DoorType\@DoorBlock\@\@\@Z + * @symbol ??0DoorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4DoorType\@DoorBlock\@\@\@Z */ MCAPI DoorItem(std::string const &, int, enum class DoorBlock::DoorType); /** - * @symbol ?place\@DoorItem\@\@SA_NPEAVBlockSource\@\@HHHHPEBVBlock\@\@\@Z + * @symbol ?place\@DoorItem\@\@SA_NPEAVBlockSource\@\@HHHHPEBVBlock\@\@\@Z */ MCAPI static bool place(class BlockSource *, int, int, int, int, class Block const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp index 2672b15e36..b5b9d41ad4 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantBlock.hpp @@ -31,357 +31,362 @@ class DoublePlantBlock : public BushBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DoublePlantBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNextBlockPermutation\@DoublePlantBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 3 + * @symbol ?getNextBlockPermutation\@DoublePlantBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * getNextBlockPermutation(class Block const &) const; /** - * @vftbl 7 - * @symbol ?randomlyModifyPosition\@DoublePlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z + * @vftbl 7 + * @symbol ?randomlyModifyPosition\@DoublePlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@AEAH\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &, int &) const; /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@DoublePlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@DoublePlantBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@DoublePlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@DoublePlantBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@DoublePlantBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@DoublePlantBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@DoublePlantBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @symbol ?getSecondPart\@DoublePlantBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@DoublePlantBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@DoublePlantBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @symbol ?spawnResources\@DoublePlantBlock\@\@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\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 115 - * @symbol ?canBeBuiltOver\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 115 + * @symbol ?canBeBuiltOver\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@DoublePlantBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@DoublePlantBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@DoublePlantBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@DoublePlantBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 - * @symbol ?getColor\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 138 - * @symbol ?getColorForParticle\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 138 + * @symbol ?getColorForParticle\@DoublePlantBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 143 - * @symbol ?getVisualShape\@DoublePlantBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@DoublePlantBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@DoublePlantBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@DoublePlantBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@DoublePlantBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 - * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 180 + * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@DoublePlantBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@DoublePlantBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@DoublePlantBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@DoublePlantBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@DoublePlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@DoublePlantBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?checkAlive\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?checkAlive\@DoublePlantBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOUBLEPLANTBLOCK /** - * @symbol ?canBeSilkTouched\@DoublePlantBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@DoublePlantBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0DoublePlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DoublePlantBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DoublePlantBlock(std::string const &, int); /** - * @symbol ?getType\@DoublePlantBlock\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?getType\@DoublePlantBlock\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI int getType(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?placeAt\@DoublePlantBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4DoublePlantType\@\@HPEAVActor\@\@\@Z + * @symbol ?placeAt\@DoublePlantBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4DoublePlantType\@\@HPEAVActor\@\@\@Z */ MCAPI bool placeAt(class BlockSource &, class BlockPos const &, enum class DoublePlantType, int, class Actor *) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DoublePlantFeature.hpp b/LiteLoader/include/llapi/mc/DoublePlantFeature.hpp index 421d21e07c..990fb19717 100644 --- a/LiteLoader/include/llapi/mc/DoublePlantFeature.hpp +++ b/LiteLoader/include/llapi/mc/DoublePlantFeature.hpp @@ -31,18 +31,18 @@ class DoublePlantFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DoublePlantFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@DoublePlantFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@DoublePlantFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?place\@DoublePlantFeature\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@W4DoublePlantType\@\@\@Z + * @symbol ?place\@DoublePlantFeature\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@W4DoublePlantType\@\@\@Z */ MCAPI bool place(class BlockSource &, class BlockPos const &, class Random &, enum class DoublePlantType) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DoubleTag.hpp b/LiteLoader/include/llapi/mc/DoubleTag.hpp index c960d8cdcc..fa370d070e 100644 --- a/LiteLoader/include/llapi/mc/DoubleTag.hpp +++ b/LiteLoader/include/llapi/mc/DoubleTag.hpp @@ -39,48 +39,48 @@ double val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DoubleTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@DoubleTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@DoubleTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@DoubleTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@DoubleTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@DoubleTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@DoubleTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@DoubleTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@DoubleTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@DoubleTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; /** - * @symbol ??0DoubleTag\@\@QEAA\@XZ + * @symbol ??0DoubleTag\@\@QEAA\@XZ */ MCAPI DoubleTag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp b/LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp index f4d7391787..143b6aff24 100644 --- a/LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/DouseFireSubcomponent.hpp @@ -29,47 +29,47 @@ class DouseFireSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DouseFireSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@DouseFireSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@DouseFireSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@DouseFireSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@DouseFireSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DOUSEFIRESUBCOMPONENT /** - * @symbol ?readfromJSON\@DouseFireSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?readfromJSON\@DouseFireSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCVAPI void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @symbol ?writetoJSON\@DouseFireSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?writetoJSON\@DouseFireSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ MCVAPI void writetoJSON(class Json::Value &) const; #endif /** - * @symbol ??0DouseFireSubcomponent\@\@QEAA\@XZ + * @symbol ??0DouseFireSubcomponent\@\@QEAA\@XZ */ MCAPI DouseFireSubcomponent(); /** - * @symbol ?douseFire\@DouseFireSubcomponent\@\@QEAAXAEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?douseFire\@DouseFireSubcomponent\@\@QEAAXAEAVActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void douseFire(class Actor &, class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonBaseGoal.hpp b/LiteLoader/include/llapi/mc/DragonBaseGoal.hpp index 0316b5c38e..a11a0fd5f8 100644 --- a/LiteLoader/include/llapi/mc/DragonBaseGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonBaseGoal.hpp @@ -29,9 +29,15 @@ class DragonBaseGoal { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DRAGONBASEGOAL /** - * @symbol ??0DragonBaseGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DragonBaseGoal(); +#endif + /** + * @symbol ??0DragonBaseGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DragonBaseGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp b/LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp index 7eb78dfc73..794a6edf5d 100644 --- a/LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonBaseGoalDefinition.hpp @@ -29,22 +29,28 @@ class DragonBaseGoalDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonBaseGoalDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?validateMobType\@DragonBaseGoalDefinition\@\@UEBA_NAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?validateMobType\@DragonBaseGoalDefinition\@\@UEBA_NAEAVMob\@\@\@Z */ virtual bool validateMobType(class Mob &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DRAGONBASEGOALDEFINITION /** - * @symbol ??0DragonBaseGoalDefinition\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~DragonBaseGoalDefinition(); +#endif + /** + * @symbol ??0DragonBaseGoalDefinition\@\@QEAA\@XZ */ MCAPI DragonBaseGoalDefinition(); /** - * @symbol ?initialize\@DragonBaseGoalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonBaseGoal\@\@\@Z + * @symbol ?initialize\@DragonBaseGoalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonBaseGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DragonBaseGoal &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp b/LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp index 640d1f6ecc..4d1ef1245a 100644 --- a/LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonChargePlayerDefinition.hpp @@ -30,16 +30,16 @@ class DragonChargePlayerDefinition { public: /** - * @symbol ??0DragonChargePlayerDefinition\@\@QEAA\@XZ + * @symbol ??0DragonChargePlayerDefinition\@\@QEAA\@XZ */ MCAPI DragonChargePlayerDefinition(); /** - * @symbol ?initialize\@DragonChargePlayerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonChargePlayerGoal\@\@\@Z + * @symbol ?initialize\@DragonChargePlayerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonChargePlayerGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DragonChargePlayerGoal &) const; /** - * @symbol ?buildSchema\@DragonChargePlayerDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDragonChargePlayerDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@DragonChargePlayerDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDragonChargePlayerDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp b/LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp index bf219fa8b0..bd486fadd0 100644 --- a/LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonChargePlayerGoal.hpp @@ -30,48 +30,48 @@ class DragonChargePlayerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonChargePlayerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonChargePlayerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonChargePlayerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonChargePlayerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonChargePlayerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonChargePlayerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonChargePlayerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonChargePlayerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonChargePlayerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonChargePlayerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonChargePlayerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonChargePlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonChargePlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonChargePlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DragonChargePlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DragonChargePlayerGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonDeathGoal.hpp b/LiteLoader/include/llapi/mc/DragonDeathGoal.hpp index c5da93eb5c..d2b483b1b6 100644 --- a/LiteLoader/include/llapi/mc/DragonDeathGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonDeathGoal.hpp @@ -30,58 +30,58 @@ class DragonDeathGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonDeathGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonDeathGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonDeathGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonDeathGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonDeathGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonDeathGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonDeathGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonDeathGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonDeathGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DRAGONDEATHGOAL /** - * @symbol ?canContinueToUse\@DragonDeathGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@DragonDeathGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); /** - * @symbol ?canUse\@DragonDeathGoal\@\@UEAA_NXZ + * @symbol ?canUse\@DragonDeathGoal\@\@UEAA_NXZ */ MCVAPI bool canUse(); #endif /** - * @symbol ??0DragonDeathGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z + * @symbol ??0DragonDeathGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z */ MCAPI DragonDeathGoal(class EnderDragon &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp index 198143f290..e4d68b9d71 100644 --- a/LiteLoader/include/llapi/mc/DragonEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/DragonEggBlock.hpp @@ -31,236 +31,241 @@ class DragonEggBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonEggBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@DragonEggBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@DragonEggBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@DragonEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 109 - * @symbol ?attack\@DragonEggBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@DragonEggBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@DragonEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@DragonEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getDustColor\@DragonEggBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@DragonEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @symbol ??0DragonEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DragonEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DragonEggBlock(std::string const &, int); //private: /** - * @symbol ?_teleport\@DragonEggBlock\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_teleport\@DragonEggBlock\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _teleport(class BlockSource &, class Random &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonFireball.hpp b/LiteLoader/include/llapi/mc/DragonFireball.hpp index dff56ed7fa..3d25f8d435 100644 --- a/LiteLoader/include/llapi/mc/DragonFireball.hpp +++ b/LiteLoader/include/llapi/mc/DragonFireball.hpp @@ -32,148 +32,148 @@ class DragonFireball : public Fireball { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~DragonFireball(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@DragonFireball\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@DragonFireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@DragonFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@DragonFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); /** - * @vftbl 280 - * @symbol ?getTrailParticle\@DragonFireball\@\@MEAA?AW4ParticleType\@\@XZ + * @vftbl 278 + * @symbol ?getTrailParticle\@DragonFireball\@\@MEAA?AW4ParticleType\@\@XZ */ virtual enum class ParticleType getTrailParticle(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DRAGONFIREBALL /** - * @symbol ?shouldBurn\@DragonFireball\@\@MEAA_NXZ + * @symbol ?shouldBurn\@DragonFireball\@\@MEAA_NXZ */ MCVAPI bool shouldBurn(); #endif /** - * @symbol ??0DragonFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0DragonFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI DragonFireball(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?SPLASH_RANGE\@DragonFireball\@\@2MA + * @symbol ?SPLASH_RANGE\@DragonFireball\@\@2MA */ MCAPI static float SPLASH_RANGE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp b/LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp index 321fdec238..1c0cde7013 100644 --- a/LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonFlamingDefinition.hpp @@ -30,26 +30,26 @@ class DragonFlamingDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonFlamingDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?validateMobType\@DragonFlamingDefinition\@\@UEBA_NAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?validateMobType\@DragonFlamingDefinition\@\@UEBA_NAEAVMob\@\@\@Z */ virtual bool validateMobType(class Mob &) const; /** - * @symbol ??0DragonFlamingDefinition\@\@QEAA\@XZ + * @symbol ??0DragonFlamingDefinition\@\@QEAA\@XZ */ MCAPI DragonFlamingDefinition(); /** - * @symbol ?initialize\@DragonFlamingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonFlamingGoal\@\@\@Z + * @symbol ?initialize\@DragonFlamingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonFlamingGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DragonFlamingGoal &) const; /** - * @symbol ?buildSchema\@DragonFlamingDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDragonFlamingDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@DragonFlamingDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDragonFlamingDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp b/LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp index e572fe5dfe..ab3e85221c 100644 --- a/LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonFlamingGoal.hpp @@ -30,48 +30,48 @@ class DragonFlamingGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonFlamingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonFlamingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonFlamingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonFlamingGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonFlamingGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonFlamingGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonFlamingGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonFlamingGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonFlamingGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonFlamingGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonFlamingGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonFlamingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonFlamingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonFlamingGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DragonFlamingGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DragonFlamingGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp b/LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp index 2852cbd821..dd6c24ab68 100644 --- a/LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonHoldingPatternGoal.hpp @@ -30,56 +30,56 @@ class DragonHoldingPatternGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonHoldingPatternGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonHoldingPatternGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonHoldingPatternGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonHoldingPatternGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonHoldingPatternGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonHoldingPatternGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonHoldingPatternGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonHoldingPatternGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonHoldingPatternGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonHoldingPatternGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonHoldingPatternGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonHoldingPatternGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonHoldingPatternGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonHoldingPatternGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z + * @symbol ??0DragonHoldingPatternGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z */ MCAPI DragonHoldingPatternGoal(class EnderDragon &); //private: /** - * @symbol ?findNewTarget\@DragonHoldingPatternGoal\@\@AEAAXXZ + * @symbol ?findNewTarget\@DragonHoldingPatternGoal\@\@AEAAXXZ */ MCAPI void findNewTarget(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonLandingGoal.hpp b/LiteLoader/include/llapi/mc/DragonLandingGoal.hpp index 7162c73824..5f7ef08ad4 100644 --- a/LiteLoader/include/llapi/mc/DragonLandingGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonLandingGoal.hpp @@ -30,56 +30,56 @@ class DragonLandingGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonLandingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonLandingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonLandingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonLandingGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonLandingGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonLandingGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonLandingGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonLandingGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonLandingGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonLandingGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonLandingGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonLandingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonLandingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonLandingGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z + * @symbol ??0DragonLandingGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z */ MCAPI DragonLandingGoal(class EnderDragon &); //private: /** - * @symbol ?findNewTarget\@DragonLandingGoal\@\@AEAAXXZ + * @symbol ?findNewTarget\@DragonLandingGoal\@\@AEAAXXZ */ MCAPI void findNewTarget(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonScanningGoal.hpp b/LiteLoader/include/llapi/mc/DragonScanningGoal.hpp index 72d4aa2a67..cc8cd7b00f 100644 --- a/LiteLoader/include/llapi/mc/DragonScanningGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonScanningGoal.hpp @@ -30,47 +30,47 @@ class DragonScanningGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonScanningGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonScanningGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonScanningGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonScanningGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonScanningGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonScanningGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonScanningGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonScanningGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonScanningGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonScanningGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonScanningGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonScanningGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonScanningGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonScanningGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z + * @symbol ??0DragonScanningGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z */ MCAPI DragonScanningGoal(class EnderDragon &); @@ -78,16 +78,16 @@ class DragonScanningGoal { private: /** - * @symbol ?SITTING_ATTACK_VIEW_RANGE\@DragonScanningGoal\@\@0MA + * @symbol ?SITTING_ATTACK_VIEW_RANGE\@DragonScanningGoal\@\@0MA */ MCAPI static float SITTING_ATTACK_VIEW_RANGE; /** - * @symbol ?SITTING_CHARGE_VIEW_RANGE\@DragonScanningGoal\@\@0MA + * @symbol ?SITTING_CHARGE_VIEW_RANGE\@DragonScanningGoal\@\@0MA */ MCAPI static float SITTING_CHARGE_VIEW_RANGE; /** - * @symbol ?SITTING_SCANNING_IDLE_TICKS\@DragonScanningGoal\@\@0HA + * @symbol ?SITTING_SCANNING_IDLE_TICKS\@DragonScanningGoal\@\@0HA */ MCAPI static int SITTING_SCANNING_IDLE_TICKS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp b/LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp index c3b8b642e7..2b9f196e0a 100644 --- a/LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DragonStrafePlayerDefinition.hpp @@ -30,16 +30,16 @@ class DragonStrafePlayerDefinition { public: /** - * @symbol ??0DragonStrafePlayerDefinition\@\@QEAA\@XZ + * @symbol ??0DragonStrafePlayerDefinition\@\@QEAA\@XZ */ MCAPI DragonStrafePlayerDefinition(); /** - * @symbol ?initialize\@DragonStrafePlayerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonStrafePlayerGoal\@\@\@Z + * @symbol ?initialize\@DragonStrafePlayerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDragonStrafePlayerGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DragonStrafePlayerGoal &) const; /** - * @symbol ?buildSchema\@DragonStrafePlayerDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDragonStrafePlayerDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@DragonStrafePlayerDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDragonStrafePlayerDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp b/LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp index 76e15989d7..66e55557db 100644 --- a/LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonStrafePlayerGoal.hpp @@ -30,64 +30,64 @@ class DragonStrafePlayerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonStrafePlayerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonStrafePlayerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonStrafePlayerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonStrafePlayerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonStrafePlayerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonStrafePlayerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonStrafePlayerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonStrafePlayerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonStrafePlayerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonStrafePlayerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonStrafePlayerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonStrafePlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonStrafePlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonStrafePlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DragonStrafePlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DragonStrafePlayerGoal(class Mob &); //private: /** - * @symbol ?findNewTarget\@DragonStrafePlayerGoal\@\@AEAAXXZ + * @symbol ?findNewTarget\@DragonStrafePlayerGoal\@\@AEAAXXZ */ MCAPI void findNewTarget(); /** - * @symbol ?navigateToNextPathNode\@DragonStrafePlayerGoal\@\@AEAAXXZ + * @symbol ?navigateToNextPathNode\@DragonStrafePlayerGoal\@\@AEAAXXZ */ MCAPI void navigateToNextPathNode(); /** - * @symbol ?setTarget\@DragonStrafePlayerGoal\@\@AEAAXPEAVActor\@\@\@Z + * @symbol ?setTarget\@DragonStrafePlayerGoal\@\@AEAAXPEAVActor\@\@\@Z */ MCAPI void setTarget(class Actor *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp b/LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp index dfd51e8c65..fddf95f949 100644 --- a/LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp +++ b/LiteLoader/include/llapi/mc/DragonTakeoffGoal.hpp @@ -30,56 +30,56 @@ class DragonTakeoffGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DragonTakeoffGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DragonTakeoffGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DragonTakeoffGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DragonTakeoffGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DragonTakeoffGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DragonTakeoffGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DragonTakeoffGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DragonTakeoffGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DragonTakeoffGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DragonTakeoffGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DragonTakeoffGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DragonTakeoffGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DragonTakeoffGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DragonTakeoffGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z + * @symbol ??0DragonTakeoffGoal\@\@QEAA\@AEAVEnderDragon\@\@\@Z */ MCAPI DragonTakeoffGoal(class EnderDragon &); //private: /** - * @symbol ?_findNewTarget\@DragonTakeoffGoal\@\@AEAAXXZ + * @symbol ?_findNewTarget\@DragonTakeoffGoal\@\@AEAAXXZ */ MCAPI void _findNewTarget(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp index 1cdfa13346..e69c55ff55 100644 --- a/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/DriedKelpBlock.hpp @@ -31,193 +31,198 @@ class DriedKelpBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DriedKelpBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0DriedKelpBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0DriedKelpBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI DriedKelpBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DrinkMilkGoal.hpp b/LiteLoader/include/llapi/mc/DrinkMilkGoal.hpp index aa9866a125..e35acdf8f9 100644 --- a/LiteLoader/include/llapi/mc/DrinkMilkGoal.hpp +++ b/LiteLoader/include/llapi/mc/DrinkMilkGoal.hpp @@ -28,48 +28,48 @@ class DrinkMilkGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DrinkMilkGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DrinkMilkGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DrinkMilkGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DrinkMilkGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DrinkMilkGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DrinkMilkGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DrinkMilkGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DrinkMilkGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DrinkMilkGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DrinkMilkGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DrinkMilkGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DrinkMilkGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DrinkMilkGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DrinkMilkGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DrinkMilkGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DrinkMilkGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DrinkPotionData.hpp b/LiteLoader/include/llapi/mc/DrinkPotionData.hpp index 68623f3133..0d9a559cba 100644 --- a/LiteLoader/include/llapi/mc/DrinkPotionData.hpp +++ b/LiteLoader/include/llapi/mc/DrinkPotionData.hpp @@ -21,14 +21,17 @@ struct DrinkPotionData { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_DRINKPOTIONDATA public: - struct DrinkPotionData& operator=(struct DrinkPotionData const &) = delete; DrinkPotionData(struct DrinkPotionData const &) = delete; DrinkPotionData() = delete; #endif public: /** - * @symbol ??1DrinkPotionData\@\@QEAA\@XZ + * @symbol ??4DrinkPotionData\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct DrinkPotionData & operator=(struct DrinkPotionData const &); + /** + * @symbol ??1DrinkPotionData\@\@QEAA\@XZ */ MCAPI ~DrinkPotionData(); diff --git a/LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp b/LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp index c5d72c17a1..4eb323c6ef 100644 --- a/LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp +++ b/LiteLoader/include/llapi/mc/DrinkPotionGoal.hpp @@ -30,47 +30,47 @@ class DrinkPotionGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DrinkPotionGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DrinkPotionGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DrinkPotionGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DrinkPotionGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DrinkPotionGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DrinkPotionGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DrinkPotionGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DrinkPotionGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DrinkPotionGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DrinkPotionGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DrinkPotionGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DrinkPotionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DrinkPotionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0DrinkPotionGoal\@\@QEAA\@AEAVMob\@\@MAEBV?$vector\@UDrinkPotionData\@\@V?$allocator\@UDrinkPotionData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0DrinkPotionGoal\@\@QEAA\@AEAVMob\@\@MAEBV?$vector\@UDrinkPotionData\@\@V?$allocator\@UDrinkPotionData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI DrinkPotionGoal(class Mob &, float, std::vector const &); @@ -78,12 +78,12 @@ class DrinkPotionGoal { private: /** - * @symbol ?SPEED_MODIFIER_DRINKING_UUID\@DrinkPotionGoal\@\@0VUUID\@mce\@\@B + * @symbol ?SPEED_MODIFIER_DRINKING_UUID\@DrinkPotionGoal\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SPEED_MODIFIER_DRINKING_UUID; /** - * @symbol ?THROTTLE_COOLDOWN\@DrinkPotionGoal\@\@0HB + * @symbol ?THROTTLE_COOLDOWN\@DrinkPotionGoal\@\@0HB */ MCAPI static int const THROTTLE_COOLDOWN; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DripleafFeature.hpp b/LiteLoader/include/llapi/mc/DripleafFeature.hpp index 1126c04007..7b0ae9de05 100644 --- a/LiteLoader/include/llapi/mc/DripleafFeature.hpp +++ b/LiteLoader/include/llapi/mc/DripleafFeature.hpp @@ -31,22 +31,22 @@ class DripleafFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DripleafFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@DripleafFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@DripleafFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_placeBigDripleaf\@DripleafFeature\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_placeBigDripleaf\@DripleafFeature\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI static bool _placeBigDripleaf(class BlockSource &, class BlockPos const &, class Random &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DripstoneClusterFeature.hpp b/LiteLoader/include/llapi/mc/DripstoneClusterFeature.hpp index 1546f2d306..c87e04016e 100644 --- a/LiteLoader/include/llapi/mc/DripstoneClusterFeature.hpp +++ b/LiteLoader/include/llapi/mc/DripstoneClusterFeature.hpp @@ -30,30 +30,30 @@ class DripstoneClusterFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DripstoneClusterFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@DripstoneClusterFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@DripstoneClusterFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; //private: /** - * @symbol ?_getDripstoneHeight\@DripstoneClusterFeature\@\@CAHAEAVRandom\@\@HHMH\@Z + * @symbol ?_getDripstoneHeight\@DripstoneClusterFeature\@\@CAHAEAVRandom\@\@HHMH\@Z */ MCAPI static int _getDripstoneHeight(class Random &, int, int, float, int); /** - * @symbol ?_placeColumn\@DripstoneClusterFeature\@\@CA_NAEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHMNHM\@Z + * @symbol ?_placeColumn\@DripstoneClusterFeature\@\@CA_NAEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHMNHM\@Z */ MCAPI static bool _placeColumn(class IBlockWorldGenAPI &, class Random &, class BlockPos const &, int, int, float, double, int, float); /** - * @symbol ?_replaceBlocksWithDripstoneBlocks\@DripstoneClusterFeature\@\@CAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HE\@Z + * @symbol ?_replaceBlocksWithDripstoneBlocks\@DripstoneClusterFeature\@\@CAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HE\@Z */ MCAPI static void _replaceBlocksWithDripstoneBlocks(class IBlockWorldGenAPI &, class BlockPos const &, int, unsigned char); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DripstoneUtils.hpp b/LiteLoader/include/llapi/mc/DripstoneUtils.hpp index 54af450c25..f288b12022 100644 --- a/LiteLoader/include/llapi/mc/DripstoneUtils.hpp +++ b/LiteLoader/include/llapi/mc/DripstoneUtils.hpp @@ -27,55 +27,55 @@ struct PointedDripstoneBasePos { #undef AFTER_EXTRA /** - * @symbol ?buildBaseToTipColumn\@DripstoneUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@EH_N\@Z + * @symbol ?buildBaseToTipColumn\@DripstoneUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@EH_N\@Z */ MCAPI void buildBaseToTipColumn(class IBlockWorldGenAPI &, class BlockPos const &, unsigned char, int, bool); /** - * @symbol ?canBeAdjacentToWater\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canBeAdjacentToWater\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canBeAdjacentToWater(class IBlockWorldGenAPI &, class BlockPos const &); /** - * @symbol ?canPlacePool\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canPlacePool\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canPlacePool(class IBlockWorldGenAPI &, class BlockPos const &); /** - * @symbol ?getDripstoneHeight\@DripstoneUtils\@\@YAMMMMM\@Z + * @symbol ?getDripstoneHeight\@DripstoneUtils\@\@YAMMMMM\@Z */ MCAPI float getDripstoneHeight(float, float, float, float); /** - * @symbol ?getPlacementBlock\@DripstoneUtils\@\@YAAEBVBlock\@\@EAEBW4DripstoneThickness\@\@\@Z + * @symbol ?getPlacementBlock\@DripstoneUtils\@\@YAAEBVBlock\@\@EAEBW4DripstoneThickness\@\@\@Z */ MCAPI class Block const & getPlacementBlock(unsigned char, enum class DripstoneThickness const &); /** - * @symbol ?getPointedDripstoneBasePos\@DripstoneUtils\@\@YA?AV?$optional\@UPointedDripstoneBasePos\@DripstoneUtils\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?getPointedDripstoneBasePos\@DripstoneUtils\@\@YA?AV?$optional\@UPointedDripstoneBasePos\@DripstoneUtils\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI class std::optional getPointedDripstoneBasePos(class IBlockWorldGenAPI &, class BlockPos const &, class Random &); /** - * @symbol ?isCircleMostlyEmbeddedInStone\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?isCircleMostlyEmbeddedInStone\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@H\@Z */ MCAPI bool isCircleMostlyEmbeddedInStone(class IBlockWorldGenAPI &, class BlockPos const &, int); /** - * @symbol ?isDripstoneBaseOrLava\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isDripstoneBaseOrLava\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isDripstoneBaseOrLava(class IBlockWorldGenAPI const &, class BlockPos const &); /** - * @symbol ?isEmptyOrWater\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isEmptyOrWater\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isEmptyOrWater(class IBlockWorldGenAPI const &, class BlockPos const &); /** - * @symbol ?isEmptyOrWaterOrLava\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isEmptyOrWaterOrLava\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isEmptyOrWaterOrLava(class IBlockWorldGenAPI const &, class BlockPos const &); /** - * @symbol ?isLava\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isLava\@DripstoneUtils\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isLava(class IBlockWorldGenAPI const &, class BlockPos const &); /** - * @symbol ?placeDripstoneBlockIfPossible\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?placeDripstoneBlockIfPossible\@DripstoneUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool placeDripstoneBlockIfPossible(class IBlockWorldGenAPI &, class BlockPos const &); /** - * @symbol ?replaceableByDripstone\@DripstoneUtils\@\@YA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?replaceableByDripstone\@DripstoneUtils\@\@YA_NAEBVBlockLegacy\@\@\@Z */ MCAPI bool replaceableByDripstone(class BlockLegacy const &); diff --git a/LiteLoader/include/llapi/mc/DropItemForDefinition.hpp b/LiteLoader/include/llapi/mc/DropItemForDefinition.hpp index d50677ac84..bf0c747107 100644 --- a/LiteLoader/include/llapi/mc/DropItemForDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DropItemForDefinition.hpp @@ -30,16 +30,16 @@ class DropItemForDefinition { public: /** - * @symbol ??0DropItemForDefinition\@\@QEAA\@XZ + * @symbol ??0DropItemForDefinition\@\@QEAA\@XZ */ MCAPI DropItemForDefinition(); /** - * @symbol ?initialize\@DropItemForDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDropItemForGoal\@\@\@Z + * @symbol ?initialize\@DropItemForDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVDropItemForGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class DropItemForGoal &) const; /** - * @symbol ?buildSchema\@DropItemForDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDropItemForDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@DropItemForDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VDropItemForDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DropItemForGoal.hpp b/LiteLoader/include/llapi/mc/DropItemForGoal.hpp index 4d781e664f..8941a454bf 100644 --- a/LiteLoader/include/llapi/mc/DropItemForGoal.hpp +++ b/LiteLoader/include/llapi/mc/DropItemForGoal.hpp @@ -31,68 +31,68 @@ class DropItemForGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DropItemForGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@DropItemForGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DropItemForGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@DropItemForGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@DropItemForGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@DropItemForGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@DropItemForGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@DropItemForGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@DropItemForGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@DropItemForGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@DropItemForGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@DropItemForGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@DropItemForGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@DropItemForGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@DropItemForGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 17 - * @symbol ?findTargetBlock\@DropItemForGoal\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?findTargetBlock\@DropItemForGoal\@\@UEAA_NXZ */ virtual bool findTargetBlock(); /** - * @symbol ??0DropItemForGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0DropItemForGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI DropItemForGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DropperBlock.hpp b/LiteLoader/include/llapi/mc/DropperBlock.hpp index 58e36d8d7b..5197724359 100644 --- a/LiteLoader/include/llapi/mc/DropperBlock.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlock.hpp @@ -31,212 +31,217 @@ class DropperBlock : public DispenserBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DropperBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@DropperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 195 - * @symbol ?dispenseFrom\@DropperBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 196 + * @symbol ?dispenseFrom\@DropperBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void dispenseFrom(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??0DropperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0DropperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI DropperBlock(std::string const &, int); /** - * @symbol ?getAttachedFace\@DropperBlock\@\@SAHH\@Z + * @symbol ?getAttachedFace\@DropperBlock\@\@SAHH\@Z */ MCAPI static int getAttachedFace(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DropperBlockActor.hpp b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp index 69322fba70..3b7f56e478 100644 --- a/LiteLoader/include/llapi/mc/DropperBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/DropperBlockActor.hpp @@ -32,37 +32,37 @@ class DropperBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_DROPPERBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@DropperBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@DropperBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@DropperBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@DropperBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?getName\@DropperBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@DropperBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; #endif /** - * @symbol ??0DropperBlockActor\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0DropperBlockActor\@\@QEAA\@VBlockPos\@\@\@Z */ MCAPI DropperBlockActor(class BlockPos); /** - * @symbol ?pushOutItems\@DropperBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?pushOutItems\@DropperBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool pushOutItems(class BlockSource &); //private: /** - * @symbol ?_addItem\@DropperBlockActor\@\@AEAA_NAEAVContainer\@\@AEAVItemStack\@\@H\@Z + * @symbol ?_addItem\@DropperBlockActor\@\@AEAA_NAEAVContainer\@\@AEAVItemStack\@\@H\@Z */ MCAPI bool _addItem(class Container &, class ItemStack &, int); /** - * @symbol ?_getContainerAt\@DropperBlockActor\@\@AEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?_getContainerAt\@DropperBlockActor\@\@AEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI class Container * _getContainerAt(class BlockSource &, class Vec3 const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp index 61aa6ab233..12a7e81b94 100644 --- a/LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/DropperContainerManagerModel.hpp @@ -31,18 +31,18 @@ class DropperContainerManagerModel : public LevelContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DropperContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 17 - * @symbol ?_postInit\@DropperContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@DropperContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0DropperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0DropperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI DropperContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DryingOutTimerComponent.hpp b/LiteLoader/include/llapi/mc/DryingOutTimerComponent.hpp index 0ee9bea7c2..6741c29666 100644 --- a/LiteLoader/include/llapi/mc/DryingOutTimerComponent.hpp +++ b/LiteLoader/include/llapi/mc/DryingOutTimerComponent.hpp @@ -30,32 +30,32 @@ class DryingOutTimerComponent { public: /** - * @symbol ??0DryingOutTimerComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0DryingOutTimerComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI DryingOutTimerComponent(class DryingOutTimerComponent &&); /** - * @symbol ?addAdditionalSaveData\@DryingOutTimerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@DryingOutTimerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?canBeAffectedByWaterBottle\@DryingOutTimerComponent\@\@QEBA_NXZ + * @symbol ?canBeAffectedByWaterBottle\@DryingOutTimerComponent\@\@QEBA_NXZ */ MCAPI bool canBeAffectedByWaterBottle() const; /** - * @symbol ??4DryingOutTimerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4DryingOutTimerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class DryingOutTimerComponent & operator=(class DryingOutTimerComponent &&); /** - * @symbol ?readAdditionalSaveData\@DryingOutTimerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@DryingOutTimerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?refillTimeWithWaterBottle\@DryingOutTimerComponent\@\@QEAAXXZ + * @symbol ?refillTimeWithWaterBottle\@DryingOutTimerComponent\@\@QEAAXXZ */ MCAPI void refillTimeWithWaterBottle(); /** - * @symbol ??1DryingOutTimerComponent\@\@QEAA\@XZ + * @symbol ??1DryingOutTimerComponent\@\@QEAA\@XZ */ MCAPI ~DryingOutTimerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DryingOutTimerSystem.hpp b/LiteLoader/include/llapi/mc/DryingOutTimerSystem.hpp index 5904df5de9..f89df0ec01 100644 --- a/LiteLoader/include/llapi/mc/DryingOutTimerSystem.hpp +++ b/LiteLoader/include/llapi/mc/DryingOutTimerSystem.hpp @@ -30,19 +30,19 @@ class DryingOutTimerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DryingOutTimerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@DryingOutTimerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DryingOutTimerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp b/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp index c2cc07fec9..065a111758 100644 --- a/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DurabilityItemComponent.hpp @@ -28,67 +28,67 @@ class DurabilityItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DurabilityItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDurabilityItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getDamageChance\@DurabilityItemComponent\@\@QEBAHH\@Z + * @symbol ?getDamageChance\@DurabilityItemComponent\@\@QEBAHH\@Z */ MCAPI int getDamageChance(int) const; /** - * @symbol ?getDamageChanceRange\@DurabilityItemComponent\@\@QEBA?AUIntRange\@\@XZ + * @symbol ?getDamageChanceRange\@DurabilityItemComponent\@\@QEBA?AUIntRange\@\@XZ */ MCAPI struct IntRange getDamageChanceRange() const; /** - * @symbol ?getMaxDamage\@DurabilityItemComponent\@\@QEBAHXZ + * @symbol ?getMaxDamage\@DurabilityItemComponent\@\@QEBAHXZ */ MCAPI int getMaxDamage() const; /** - * @symbol ?setMaxDamage\@DurabilityItemComponent\@\@QEAAXH\@Z + * @symbol ?setMaxDamage\@DurabilityItemComponent\@\@QEAAXH\@Z */ MCAPI void setMaxDamage(int); /** - * @symbol ?bindType\@DurabilityItemComponent\@\@SAXXZ + * @symbol ?bindType\@DurabilityItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@DurabilityItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@DurabilityItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); /** - * @symbol ?registerVersionUpgrades\@DurabilityItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@DurabilityItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DwellerComponent.hpp b/LiteLoader/include/llapi/mc/DwellerComponent.hpp index 960868517e..9ef671516d 100644 --- a/LiteLoader/include/llapi/mc/DwellerComponent.hpp +++ b/LiteLoader/include/llapi/mc/DwellerComponent.hpp @@ -31,168 +31,168 @@ enum class DwellingType; public: /** - * @symbol ?DecrementDwellingUpdateInterval\@DwellerComponent\@\@QEAAXXZ + * @symbol ?DecrementDwellingUpdateInterval\@DwellerComponent\@\@QEAAXXZ */ MCAPI void DecrementDwellingUpdateInterval(); /** - * @symbol ??0DwellerComponent\@\@QEAA\@XZ + * @symbol ??0DwellerComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI DwellerComponent(); + MCAPI DwellerComponent(class DwellerComponent &&); /** - * @symbol ??0DwellerComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0DwellerComponent\@\@QEAA\@XZ */ - MCAPI DwellerComponent(class DwellerComponent &&); + MCAPI DwellerComponent(); /** - * @symbol ?addAdditionalSaveData\@DwellerComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z + * @symbol ?addAdditionalSaveData\@DwellerComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &, class Actor const &) const; /** - * @symbol ?checkandUpdateDwellingStatus\@DwellerComponent\@\@QEAAXAEBVActor\@\@PEAVVillage\@\@\@Z + * @symbol ?checkandUpdateDwellingStatus\@DwellerComponent\@\@QEAAXAEBVActor\@\@PEAVVillage\@\@\@Z */ MCAPI void checkandUpdateDwellingStatus(class Actor const &, class Village *); /** - * @symbol ?clearPreferredProfession\@DwellerComponent\@\@QEAAXXZ + * @symbol ?clearPreferredProfession\@DwellerComponent\@\@QEAAXXZ */ MCAPI void clearPreferredProfession(); /** - * @symbol ?fixupProfession\@DwellerComponent\@\@QEAAXAEBVActor\@\@PEAVVillage\@\@\@Z + * @symbol ?fixupProfession\@DwellerComponent\@\@QEAAXAEBVActor\@\@PEAVVillage\@\@\@Z */ MCAPI void fixupProfession(class Actor const &, class Village *); /** - * @symbol ?getCanFindPOI\@DwellerComponent\@\@QEBA_NXZ + * @symbol ?getCanFindPOI\@DwellerComponent\@\@QEBA_NXZ */ MCAPI bool getCanFindPOI() const; /** - * @symbol ?getDwellerRole\@DwellerComponent\@\@QEBA?AW4DwellerRole\@\@XZ + * @symbol ?getDwellerRole\@DwellerComponent\@\@QEBA?AW4DwellerRole\@\@XZ */ MCAPI enum class DwellerRole getDwellerRole() const; /** - * @symbol ?getDwellingUniqueID\@DwellerComponent\@\@QEBA?AVUUID\@mce\@\@XZ + * @symbol ?getDwellingUniqueID\@DwellerComponent\@\@QEBA?AVUUID\@mce\@\@XZ */ MCAPI class mce::UUID getDwellingUniqueID() const; /** - * @symbol ?getDwellingUpdateInterval\@DwellerComponent\@\@QEBA_KXZ + * @symbol ?getDwellingUpdateInterval\@DwellerComponent\@\@QEBA_KXZ */ MCAPI unsigned __int64 getDwellingUpdateInterval() const; /** - * @symbol ?getFixUpRole\@DwellerComponent\@\@QEBA_NXZ + * @symbol ?getFixUpRole\@DwellerComponent\@\@QEBA_NXZ */ MCAPI bool getFixUpRole() const; /** - * @symbol ?getPreferredProfession\@DwellerComponent\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getPreferredProfession\@DwellerComponent\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getPreferredProfession() const; /** - * @symbol ?getUpdateIntervalBase\@DwellerComponent\@\@QEBA_KXZ + * @symbol ?getUpdateIntervalBase\@DwellerComponent\@\@QEBA_KXZ */ MCAPI unsigned __int64 getUpdateIntervalBase() const; /** - * @symbol ?getUpdateIntervalVariant\@DwellerComponent\@\@QEBAHXZ + * @symbol ?getUpdateIntervalVariant\@DwellerComponent\@\@QEBAHXZ */ MCAPI int getUpdateIntervalVariant() const; /** - * @symbol ?getVillage\@DwellerComponent\@\@QEBA?BV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVActor\@\@\@Z + * @symbol ?getVillage\@DwellerComponent\@\@QEBA?BV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVActor\@\@\@Z */ MCAPI class std::weak_ptr const getVillage(class Actor const &) const; /** - * @symbol ?getVillageCenter\@DwellerComponent\@\@QEBA?AVBlockPos\@\@AEBVActor\@\@\@Z + * @symbol ?getVillageCenter\@DwellerComponent\@\@QEBA?AVBlockPos\@\@AEBVActor\@\@\@Z */ MCAPI class BlockPos getVillageCenter(class Actor const &) const; /** - * @symbol ?hasDwelling\@DwellerComponent\@\@QEBA_NXZ + * @symbol ?hasDwelling\@DwellerComponent\@\@QEBA_NXZ */ MCAPI bool hasDwelling() const; /** - * @symbol ?hasPreferredProfession\@DwellerComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?hasPreferredProfession\@DwellerComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool hasPreferredProfession(class Actor const &) const; /** - * @symbol ?initFromDefinition\@DwellerComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@DwellerComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?isWithinRestriction\@DwellerComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?isWithinRestriction\@DwellerComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool isWithinRestriction(class Actor const &) const; /** - * @symbol ?needsToFixupProfession\@DwellerComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ?needsToFixupProfession\@DwellerComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool needsToFixupProfession(class Actor const &) const; /** - * @symbol ?needsToFixupVillageRole\@DwellerComponent\@\@QEBA_NAEBVActor\@\@PEAVVillage\@\@\@Z + * @symbol ?needsToFixupVillageRole\@DwellerComponent\@\@QEBA_NAEBVActor\@\@PEAVVillage\@\@\@Z */ MCAPI bool needsToFixupVillageRole(class Actor const &, class Village *) const; /** - * @symbol ?onDeath\@DwellerComponent\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@\@Z + * @symbol ?onDeath\@DwellerComponent\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@\@Z */ MCAPI void onDeath(class Actor &, class ActorDamageSource const &); /** - * @symbol ?onDimensionChange\@DwellerComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?onDimensionChange\@DwellerComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void onDimensionChange(class Actor &); /** - * @symbol ?onRemove\@DwellerComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?onRemove\@DwellerComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void onRemove(class Actor &); /** - * @symbol ??4DwellerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4DwellerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class DwellerComponent & operator=(class DwellerComponent &&); /** - * @symbol ?readAdditionalSaveData\@DwellerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@DwellerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setDwellingUniqueID\@DwellerComponent\@\@QEAAXAEAVActor\@\@VUUID\@mce\@\@\@Z + * @symbol ?setDwellingUniqueID\@DwellerComponent\@\@QEAAXAEAVActor\@\@VUUID\@mce\@\@\@Z */ MCAPI void setDwellingUniqueID(class Actor &, class mce::UUID); /** - * @symbol ?setDwellingUpdateInterval\@DwellerComponent\@\@QEAAX_K\@Z + * @symbol ?setDwellingUpdateInterval\@DwellerComponent\@\@QEAAX_K\@Z */ MCAPI void setDwellingUpdateInterval(unsigned __int64); /** - * @symbol ?setFixUpRole\@DwellerComponent\@\@QEAAX_N\@Z + * @symbol ?setFixUpRole\@DwellerComponent\@\@QEAAX_N\@Z */ MCAPI void setFixUpRole(bool); /** - * @symbol ?setLastHurtByMob\@DwellerComponent\@\@QEAAXAEAVActor\@\@PEAVMob\@\@\@Z + * @symbol ?setLastHurtByMob\@DwellerComponent\@\@QEAAXAEAVActor\@\@PEAVMob\@\@\@Z */ MCAPI void setLastHurtByMob(class Actor &, class Mob *); /** - * @symbol ?trySetPreferredProfession\@DwellerComponent\@\@QEAA_NAEBVActor\@\@AEBVHashedString\@\@\@Z + * @symbol ?trySetPreferredProfession\@DwellerComponent\@\@QEAA_NAEBVActor\@\@AEBVHashedString\@\@\@Z */ MCAPI bool trySetPreferredProfession(class Actor const &, class HashedString const &); /** - * @symbol ?tryToFixupRole\@DwellerComponent\@\@QEAA_NAEBVActor\@\@PEAVVillage\@\@\@Z + * @symbol ?tryToFixupRole\@DwellerComponent\@\@QEAA_NAEBVActor\@\@PEAVVillage\@\@\@Z */ MCAPI bool tryToFixupRole(class Actor const &, class Village *); /** - * @symbol ?tryToMigrate\@DwellerComponent\@\@QEAA_NAEAVActor\@\@PEAVVillage\@\@1\@Z + * @symbol ?tryToMigrate\@DwellerComponent\@\@QEAA_NAEAVActor\@\@PEAVVillage\@\@1\@Z */ MCAPI bool tryToMigrate(class Actor &, class Village *, class Village *); /** - * @symbol ?wantsToMigrate\@DwellerComponent\@\@QEBA_NAEBVActor\@\@PEAVVillage\@\@\@Z + * @symbol ?wantsToMigrate\@DwellerComponent\@\@QEBA_NAEBVActor\@\@PEAVVillage\@\@\@Z */ MCAPI bool wantsToMigrate(class Actor const &, class Village *) const; /** - * @symbol ??1DwellerComponent\@\@QEAA\@XZ + * @symbol ??1DwellerComponent\@\@QEAA\@XZ */ MCAPI ~DwellerComponent(); //private: /** - * @symbol ?_isLockedInToProfession\@DwellerComponent\@\@AEBA_NAEBVActor\@\@\@Z + * @symbol ?_isLockedInToProfession\@DwellerComponent\@\@AEBA_NAEBVActor\@\@\@Z */ MCAPI bool _isLockedInToProfession(class Actor const &) const; private: /** - * @symbol ?DWELLING_ROLES\@DwellerComponent\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DwellerRole\@\@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\@\@W4DwellerRole\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?DWELLING_ROLES\@DwellerComponent\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DwellerRole\@\@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\@\@W4DwellerRole\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const DWELLING_ROLES; /** - * @symbol ?DWELLING_TYPES\@DwellerComponent\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DwellingType\@DwellerComponent\@\@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\@\@W4DwellingType\@DwellerComponent\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?DWELLING_TYPES\@DwellerComponent\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DwellingType\@DwellerComponent\@\@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\@\@W4DwellingType\@DwellerComponent\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const DWELLING_TYPES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DwellerDescription.hpp b/LiteLoader/include/llapi/mc/DwellerDescription.hpp index ba2020b80f..8ad6e233c1 100644 --- a/LiteLoader/include/llapi/mc/DwellerDescription.hpp +++ b/LiteLoader/include/llapi/mc/DwellerDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class DwellerDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@DwellerDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@DwellerDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~DwellerDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@DwellerDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@DwellerDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DWELLERDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@DwellerDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~DwellerDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DwellerSystem.hpp b/LiteLoader/include/llapi/mc/DwellerSystem.hpp index 5375c53a92..3ec94918cd 100644 --- a/LiteLoader/include/llapi/mc/DwellerSystem.hpp +++ b/LiteLoader/include/llapi/mc/DwellerSystem.hpp @@ -30,19 +30,19 @@ class DwellerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DwellerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?registerEvents\@DwellerSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z + * @vftbl 1 + * @symbol ?registerEvents\@DwellerSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z */ virtual void registerEvents(class entt::basic_dispatcher> &); /** - * @vftbl 2 - * @symbol ?tick\@DwellerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@DwellerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DyeColorUtil.hpp b/LiteLoader/include/llapi/mc/DyeColorUtil.hpp index 76688ff7fc..1eddaf3620 100644 --- a/LiteLoader/include/llapi/mc/DyeColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/DyeColorUtil.hpp @@ -30,32 +30,32 @@ class DyeColorUtil { public: /** - * @symbol ?COLOR_TO_AUX\@DyeColorUtil\@\@2V?$array\@F$0BA\@\@std\@\@B + * @symbol ?COLOR_TO_AUX\@DyeColorUtil\@\@2V?$array\@F$0BA\@\@std\@\@B */ MCAPI static class std::array const COLOR_TO_AUX; /** - * @symbol ?DEPRECATED_DYE_AUX_VALUES\@DyeColorUtil\@\@2V?$array\@F$03\@std\@\@B + * @symbol ?DEPRECATED_DYE_AUX_VALUES\@DyeColorUtil\@\@2V?$array\@F$03\@std\@\@B */ MCAPI static class std::array const DEPRECATED_DYE_AUX_VALUES; /** - * @symbol ?DYE_AUX_VALUES\@DyeColorUtil\@\@2V?$array\@F$0BA\@\@std\@\@B + * @symbol ?DYE_AUX_VALUES\@DyeColorUtil\@\@2V?$array\@F$0BA\@\@std\@\@B */ MCAPI static class std::array const DYE_AUX_VALUES; /** - * @symbol ?getAuxValue\@DyeColorUtil\@\@SAHW4ItemColor\@\@\@Z + * @symbol ?getAuxValue\@DyeColorUtil\@\@SAHW4ItemColor\@\@\@Z */ MCAPI static int getAuxValue(enum class ItemColor); /** - * @symbol ?getItemColor\@DyeColorUtil\@\@SA?AW4ItemColor\@\@H\@Z + * @symbol ?getItemColor\@DyeColorUtil\@\@SA?AW4ItemColor\@\@H\@Z */ MCAPI static enum class ItemColor getItemColor(int); /** - * @symbol ?getRandomItemColor\@DyeColorUtil\@\@SA?AW4ItemColor\@\@AEAVRandom\@\@\@Z + * @symbol ?getRandomItemColor\@DyeColorUtil\@\@SA?AW4ItemColor\@\@AEAVRandom\@\@\@Z */ MCAPI static enum class ItemColor getRandomItemColor(class Random &); /** - * @symbol ?mColorMap\@DyeColorUtil\@\@2V?$array\@W4ItemColor\@\@$0BE\@\@std\@\@B + * @symbol ?mColorMap\@DyeColorUtil\@\@2V?$array\@W4ItemColor\@\@$0BE\@\@std\@\@B */ MCAPI static class std::array const mColorMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DyePowderItem.hpp b/LiteLoader/include/llapi/mc/DyePowderItem.hpp index 195b1fb181..3d6f37f23d 100644 --- a/LiteLoader/include/llapi/mc/DyePowderItem.hpp +++ b/LiteLoader/include/llapi/mc/DyePowderItem.hpp @@ -32,118 +32,118 @@ class DyePowderItem : public FertilizerItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DyePowderItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?isDye\@DyePowderItem\@\@UEBA_NXZ + * @vftbl 19 + * @symbol ?isDye\@DyePowderItem\@\@UEBA_NXZ */ virtual bool isDye() const; /** - * @vftbl 20 - * @symbol ?getItemColor\@DyePowderItem\@\@UEBA?AW4ItemColor\@\@XZ + * @vftbl 20 + * @symbol ?getItemColor\@DyePowderItem\@\@UEBA?AW4ItemColor\@\@XZ */ virtual enum class ItemColor getItemColor() const; /** - * @vftbl 21 - * @symbol ?isFertilizer\@DyePowderItem\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isFertilizer\@DyePowderItem\@\@UEBA_NXZ */ virtual bool isFertilizer() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@DyePowderItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@DyePowderItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@DyePowderItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@DyePowderItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@DyePowderItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@DyePowderItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@DyePowderItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?_useOn\@DyePowderItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@DyePowderItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0DyePowderItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemColor\@\@_N2\@Z + * @symbol ??0DyePowderItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemColor\@\@_N2\@Z */ MCAPI DyePowderItem(std::string const &, int, enum class ItemColor, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp b/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp index 9cdbeee4be..ee194e1bc4 100644 --- a/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/DyePowderItemComponent.hpp @@ -30,51 +30,51 @@ class DyePowderItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DyePowderItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDyePowderItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VDyePowderItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VDyePowderItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?isValidAuxValue\@DyePowderItemComponent\@\@QEBA_NH\@Z + * @symbol ?isValidAuxValue\@DyePowderItemComponent\@\@QEBA_NH\@Z */ MCAPI bool isValidAuxValue(int) const; /** - * @symbol ?bindType\@DyePowderItemComponent\@\@SAXXZ + * @symbol ?bindType\@DyePowderItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@DyePowderItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@DyePowderItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DyeableComponent.hpp b/LiteLoader/include/llapi/mc/DyeableComponent.hpp index ef1af7ce5a..ce7659537e 100644 --- a/LiteLoader/include/llapi/mc/DyeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/DyeableComponent.hpp @@ -30,40 +30,40 @@ class DyeableComponent { public: /** - * @symbol ?appendFormattedHovertext\@DyeableComponent\@\@QEBAXAEBVItemStackBase\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?appendFormattedHovertext\@DyeableComponent\@\@QEBAXAEBVItemStackBase\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void appendFormattedHovertext(class ItemStackBase const &, std::string &, bool) const; /** - * @symbol ?clearColor\@DyeableComponent\@\@QEBAXAEAVItemStackBase\@\@\@Z + * @symbol ?clearColor\@DyeableComponent\@\@QEBAXAEAVItemStackBase\@\@\@Z */ MCAPI void clearColor(class ItemStackBase &) const; /** - * @symbol ?getColor\@DyeableComponent\@\@QEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?getColor\@DyeableComponent\@\@QEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ MCAPI class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @symbol ?hasCustomColor\@DyeableComponent\@\@QEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?hasCustomColor\@DyeableComponent\@\@QEBA_NAEBVItemStackBase\@\@\@Z */ MCAPI bool hasCustomColor(class ItemStackBase const &) const; /** - * @symbol ?setColor\@DyeableComponent\@\@QEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?setColor\@DyeableComponent\@\@QEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z */ MCAPI void setColor(class ItemStackBase &, class mce::Color const &) const; /** - * @symbol ?DEFAULT_HORSE_LEATHER_COLOR\@DyeableComponent\@\@2VColor\@mce\@\@A + * @symbol ?DEFAULT_HORSE_LEATHER_COLOR\@DyeableComponent\@\@2VColor\@mce\@\@A */ MCAPI static class mce::Color DEFAULT_HORSE_LEATHER_COLOR; /** - * @symbol ?DEFAULT_LEATHER_COLOR\@DyeableComponent\@\@2VColor\@mce\@\@A + * @symbol ?DEFAULT_LEATHER_COLOR\@DyeableComponent\@\@2VColor\@mce\@\@A */ MCAPI static class mce::Color DEFAULT_LEATHER_COLOR; /** - * @symbol ?ResetDefaultLeatherColor\@DyeableComponent\@\@SAXXZ + * @symbol ?ResetDefaultLeatherColor\@DyeableComponent\@\@SAXXZ */ MCAPI static void ResetDefaultLeatherColor(); /** - * @symbol ?getIdentifier\@DyeableComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@DyeableComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DyeableDefinition.hpp b/LiteLoader/include/llapi/mc/DyeableDefinition.hpp index 0a9d74048a..95f83e26df 100644 --- a/LiteLoader/include/llapi/mc/DyeableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DyeableDefinition.hpp @@ -31,7 +31,7 @@ struct DyeableDefinition { public: /** - * @symbol ?buildSchema\@DyeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UDyeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@DyeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UDyeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/DynamicAmbientSound.hpp b/LiteLoader/include/llapi/mc/DynamicAmbientSound.hpp index 5740265165..cecd056b1b 100644 --- a/LiteLoader/include/llapi/mc/DynamicAmbientSound.hpp +++ b/LiteLoader/include/llapi/mc/DynamicAmbientSound.hpp @@ -28,7 +28,7 @@ struct DynamicAmbientSound { public: /** - * @symbol ??1DynamicAmbientSound\@\@QEAA\@XZ + * @symbol ??1DynamicAmbientSound\@\@QEAA\@XZ */ MCAPI ~DynamicAmbientSound(); diff --git a/LiteLoader/include/llapi/mc/DynamicJumpControl.hpp b/LiteLoader/include/llapi/mc/DynamicJumpControl.hpp index e7375ec88b..4ca9895787 100644 --- a/LiteLoader/include/llapi/mc/DynamicJumpControl.hpp +++ b/LiteLoader/include/llapi/mc/DynamicJumpControl.hpp @@ -29,53 +29,53 @@ class DynamicJumpControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~DynamicJumpControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@DynamicJumpControl\@\@UEAAXAEAVMob\@\@PEAUJumpControlDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@DynamicJumpControl\@\@UEAAXAEAVMob\@\@PEAUJumpControlDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct JumpControlDescription *); /** - * @vftbl 2 - * @symbol ?clone\@DynamicJumpControl\@\@UEBA?AV?$unique_ptr\@VJumpControl\@\@U?$default_delete\@VJumpControl\@\@\@std\@\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?clone\@DynamicJumpControl\@\@UEBA?AV?$unique_ptr\@VJumpControl\@\@U?$default_delete\@VJumpControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 3 - * @symbol ?tick\@DynamicJumpControl\@\@MEAAXAEAVJumpControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@DynamicJumpControl\@\@MEAAXAEAVJumpControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class JumpControlComponent &, class Mob &); /** - * @vftbl 4 - * @symbol ?getJumpDelay\@DynamicJumpControl\@\@MEBAHAEBVJumpControlComponent\@\@\@Z + * @vftbl 4 + * @symbol ?getJumpDelay\@DynamicJumpControl\@\@MEBAHAEBVJumpControlComponent\@\@\@Z */ virtual int getJumpDelay(class JumpControlComponent const &) const; /** - * @vftbl 5 - * @symbol ?getJumpPower\@DynamicJumpControl\@\@MEBAMAEBVJumpControlComponent\@\@\@Z + * @vftbl 5 + * @symbol ?getJumpPower\@DynamicJumpControl\@\@MEBAMAEBVJumpControlComponent\@\@\@Z */ virtual float getJumpPower(class JumpControlComponent const &) const; /** - * @vftbl 6 - * @symbol ?getJumpType\@DynamicJumpControl\@\@MEBA?AW4JumpType\@\@AEBVJumpControlComponent\@\@\@Z + * @vftbl 6 + * @symbol ?getJumpType\@DynamicJumpControl\@\@MEBA?AW4JumpType\@\@AEBVJumpControlComponent\@\@\@Z */ virtual enum class JumpType getJumpType(class JumpControlComponent const &) const; /** - * @vftbl 7 - * @symbol ?setJumpType\@DynamicJumpControl\@\@MEAAXAEAVJumpControlComponent\@\@W4JumpType\@\@\@Z + * @vftbl 7 + * @symbol ?setJumpType\@DynamicJumpControl\@\@MEAAXAEAVJumpControlComponent\@\@W4JumpType\@\@\@Z */ virtual void setJumpType(class JumpControlComponent &, enum class JumpType); /** - * @vftbl 8 - * @symbol ?resetSpeedModifier\@DynamicJumpControl\@\@MEAAXAEBVJumpControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 8 + * @symbol ?resetSpeedModifier\@DynamicJumpControl\@\@MEAAXAEBVJumpControlComponent\@\@AEAVMob\@\@\@Z */ virtual void resetSpeedModifier(class JumpControlComponent const &, class Mob &); /** - * @symbol ??0DynamicJumpControl\@\@QEAA\@XZ + * @symbol ??0DynamicJumpControl\@\@QEAA\@XZ */ MCAPI DynamicJumpControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp b/LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp index dad3c856b0..a9959df1a5 100644 --- a/LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/DynamicJumpControlDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class DynamicJumpControlDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@DynamicJumpControlDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@DynamicJumpControlDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~DynamicJumpControlDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@DynamicJumpControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@DynamicJumpControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_DYNAMICJUMPCONTROLDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@DynamicJumpControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~DynamicJumpControlDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DynamicProperties.hpp b/LiteLoader/include/llapi/mc/DynamicProperties.hpp index 9984e631a1..eeb16e250c 100644 --- a/LiteLoader/include/llapi/mc/DynamicProperties.hpp +++ b/LiteLoader/include/llapi/mc/DynamicProperties.hpp @@ -28,60 +28,60 @@ class DynamicProperties { public: /** - * @symbol ?deserialize\@DynamicProperties\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?deserialize\@DynamicProperties\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void deserialize(class CompoundTag const &); /** - * @symbol ?getCollectionCount\@DynamicProperties\@\@QEBA_KXZ + * @symbol ?getCollectionCount\@DynamicProperties\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCollectionCount() const; /** - * @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 + * @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 ?removeDynamicProperty\@DynamicProperties\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?removeDynamicProperty\@DynamicProperties\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI bool removeDynamicProperty(std::string const &, std::string const &); /** - * @symbol ?serialize\@DynamicProperties\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?serialize\@DynamicProperties\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr serialize() const; /** - * @symbol ?setDynamicProperty\@DynamicProperties\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@0\@Z + * @symbol ?setDynamicProperty\@DynamicProperties\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@0\@Z */ MCAPI void setDynamicProperty(std::string const &, class std::variant const &, std::string const &); /** - * @symbol ?writeToLevelStorage\@DynamicProperties\@\@QEAAXAEAVLevelStorage\@\@\@Z + * @symbol ?writeToLevelStorage\@DynamicProperties\@\@QEAAXAEAVLevelStorage\@\@\@Z */ MCAPI void writeToLevelStorage(class LevelStorage &); /** - * @symbol ??1DynamicProperties\@\@QEAA\@XZ + * @symbol ??1DynamicProperties\@\@QEAA\@XZ */ MCAPI ~DynamicProperties(); /** - * @symbol ?STORAGE_TAG\@DynamicProperties\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_TAG\@DynamicProperties\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_TAG; /** - * @symbol ?bindType\@DynamicProperties\@\@SAXXZ + * @symbol ?bindType\@DynamicProperties\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?readFromLevelStorage\@DynamicProperties\@\@SA?AV?$unique_ptr\@VDynamicProperties\@\@U?$default_delete\@VDynamicProperties\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?readFromLevelStorage\@DynamicProperties\@\@SA?AV?$unique_ptr\@VDynamicProperties\@\@U?$default_delete\@VDynamicProperties\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z */ MCAPI static std::unique_ptr readFromLevelStorage(class LevelStorage &); /** - * @symbol ?validateDynamicProperty\@DynamicProperties\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUDynamicPropertyDefinition\@\@AEBV23\@PEBV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@\@Z + * @symbol ?validateDynamicProperty\@DynamicProperties\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUDynamicPropertyDefinition\@\@AEBV23\@PEBV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@\@Z */ MCAPI static std::string validateDynamicProperty(struct DynamicPropertyDefinition const *, std::string const &, class std::variant const *); //private: /** - * @symbol ?_getPropertyVariant\@DynamicProperties\@\@CA?AVmeta_any\@entt\@\@AEBV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z + * @symbol ?_getPropertyVariant\@DynamicProperties\@\@CA?AVmeta_any\@entt\@\@AEBV?$variant\@M_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z */ MCAPI static class entt::meta_any _getPropertyVariant(class std::variant const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DynamicPropertiesComponent.hpp b/LiteLoader/include/llapi/mc/DynamicPropertiesComponent.hpp index 62b253c87f..f185aff754 100644 --- a/LiteLoader/include/llapi/mc/DynamicPropertiesComponent.hpp +++ b/LiteLoader/include/llapi/mc/DynamicPropertiesComponent.hpp @@ -28,20 +28,20 @@ class DynamicPropertiesComponent { public: /** - * @symbol ??0DynamicPropertiesComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0DynamicPropertiesComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI DynamicPropertiesComponent(class DynamicPropertiesComponent &&); /** - * @symbol ?addAdditionalSaveData\@DynamicPropertiesComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@DynamicPropertiesComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getProperties\@DynamicPropertiesComponent\@\@QEAAAEAVDynamicProperties\@\@XZ + * @symbol ?getProperties\@DynamicPropertiesComponent\@\@QEAAAEAVDynamicProperties\@\@XZ */ MCAPI class DynamicProperties & getProperties(); /** - * @symbol ??4DynamicPropertiesComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4DynamicPropertiesComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class DynamicPropertiesComponent & operator=(class DynamicPropertiesComponent &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp b/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp index 91f7849182..779ec0ef1b 100644 --- a/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DynamicPropertiesDefinition.hpp @@ -28,36 +28,36 @@ class DynamicPropertiesDefinition { public: /** - * @symbol ?clear\@DynamicPropertiesDefinition\@\@QEAAXXZ + * @symbol ?clear\@DynamicPropertiesDefinition\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?defineProperty\@DynamicPropertiesDefinition\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UDynamicPropertyDefinition\@\@_K\@Z + * @symbol ?defineProperty\@DynamicPropertiesDefinition\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UDynamicPropertyDefinition\@\@_K\@Z */ MCAPI bool defineProperty(std::string const &, struct DynamicPropertyDefinition, unsigned __int64); /** - * @symbol ?tryGetPropertyDefinition\@DynamicPropertiesDefinition\@\@QEBAPEBUDynamicPropertyDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryGetPropertyDefinition\@DynamicPropertiesDefinition\@\@QEBAPEBUDynamicPropertyDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct DynamicPropertyDefinition const * tryGetPropertyDefinition(std::string const &) const; /** - * @symbol ?tryMergeDefinitions\@DynamicPropertiesDefinition\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV1\@AEBV23\@_K\@Z + * @symbol ?tryMergeDefinitions\@DynamicPropertiesDefinition\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV1\@AEBV23\@_K\@Z */ MCAPI std::string tryMergeDefinitions(class DynamicPropertiesDefinition const &, std::string const &, unsigned __int64); /** - * @symbol ??1DynamicPropertiesDefinition\@\@QEAA\@XZ + * @symbol ??1DynamicPropertiesDefinition\@\@QEAA\@XZ */ MCAPI ~DynamicPropertiesDefinition(); /** - * @symbol ?clearAll\@DynamicPropertiesDefinition\@\@SAXAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?clearAll\@DynamicPropertiesDefinition\@\@SAXAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VActorDefinition\@\@U?$default_delete\@VActorDefinition\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI static void clearAll(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &); //private: /** - * @symbol ?_canMergeDefinitions\@DynamicPropertiesDefinition\@\@AEBA_NAEBV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KAEAV23\@\@Z + * @symbol ?_canMergeDefinitions\@DynamicPropertiesDefinition\@\@AEBA_NAEBV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KAEAV23\@\@Z */ MCAPI bool _canMergeDefinitions(class DynamicPropertiesDefinition const &, std::string const &, unsigned __int64, std::string &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/DynamicPropertyDefinition.hpp b/LiteLoader/include/llapi/mc/DynamicPropertyDefinition.hpp index fc69827815..34894cca36 100644 --- a/LiteLoader/include/llapi/mc/DynamicPropertyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/DynamicPropertyDefinition.hpp @@ -28,7 +28,7 @@ struct DynamicPropertyDefinition { public: /** - * @symbol ??1DynamicPropertyDefinition\@\@QEAA\@XZ + * @symbol ??1DynamicPropertyDefinition\@\@QEAA\@XZ */ MCAPI ~DynamicPropertyDefinition(); diff --git a/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp index d29953673a..2382db81ce 100644 --- a/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/EDUWorldsScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure EDUWorldsScreenCapabilities. - * - */ -struct EDUWorldsScreenCapabilities { + +class EDUWorldsScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,21 @@ struct EDUWorldsScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EDUWORLDSSCREENCAPABILITIES public: - struct EDUWorldsScreenCapabilities& operator=(struct EDUWorldsScreenCapabilities const &) = delete; - EDUWorldsScreenCapabilities(struct EDUWorldsScreenCapabilities const &) = delete; + class EDUWorldsScreenCapabilities& operator=(class EDUWorldsScreenCapabilities const &) = delete; + EDUWorldsScreenCapabilities(class EDUWorldsScreenCapabilities const &) = delete; EDUWorldsScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EDUWorldsScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UEDUWorldsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UEDUWorldsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Easing.hpp b/LiteLoader/include/llapi/mc/Easing.hpp index f1d0be93bd..a6a26182cd 100644 --- a/LiteLoader/include/llapi/mc/Easing.hpp +++ b/LiteLoader/include/llapi/mc/Easing.hpp @@ -28,8 +28,20 @@ class Easing { public: /** - * @symbol ?bindType\@Easing\@\@SAXXZ + * @symbol ?bindType\@Easing\@\@SAXXZ */ MCAPI static void bindType(); + /** + * @symbol ?getStringFromEasingType\@Easing\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4EasingType\@\@\@Z + */ + MCAPI static std::string const & getStringFromEasingType(enum class EasingType); + +//private: + +private: + /** + * @symbol ?mEasingFuncs\@Easing\@\@0V?$vector\@V?$function\@$$A6AMMMM\@Z\@std\@\@V?$allocator\@V?$function\@$$A6AMMMM\@Z\@std\@\@\@2\@\@std\@\@A + */ + MCAPI static std::vector> mEasingFuncs; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EatBlockDefinition.hpp b/LiteLoader/include/llapi/mc/EatBlockDefinition.hpp index 997b59575c..2d82abe1f5 100644 --- a/LiteLoader/include/llapi/mc/EatBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EatBlockDefinition.hpp @@ -30,20 +30,20 @@ class EatBlockDefinition { public: /** - * @symbol ??0EatBlockDefinition\@\@QEAA\@XZ + * @symbol ??0EatBlockDefinition\@\@QEAA\@XZ */ MCAPI EatBlockDefinition(); /** - * @symbol ?addSuccessChanceExpressionNode\@EatBlockDefinition\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?addSuccessChanceExpressionNode\@EatBlockDefinition\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void addSuccessChanceExpressionNode(class ExpressionNode const &); /** - * @symbol ?initialize\@EatBlockDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVEatBlockGoal\@\@\@Z + * @symbol ?initialize\@EatBlockDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVEatBlockGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class EatBlockGoal &) const; /** - * @symbol ?buildSchema\@EatBlockDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEatBlockDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@EatBlockDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEatBlockDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EatBlockGoal.hpp b/LiteLoader/include/llapi/mc/EatBlockGoal.hpp index b2cc57cabf..9fb2b714af 100644 --- a/LiteLoader/include/llapi/mc/EatBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/EatBlockGoal.hpp @@ -30,52 +30,52 @@ class EatBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EatBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EatBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EatBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@EatBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@EatBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@EatBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@EatBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@EatBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@EatBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@EatBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EatBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EatBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EatBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0EatBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0EatBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI EatBlockGoal(class Mob &); /** - * @symbol ?getEatSuccessChance\@EatBlockGoal\@\@QEBAMAEAVActor\@\@\@Z + * @symbol ?getEatSuccessChance\@EatBlockGoal\@\@QEBAMAEAVActor\@\@\@Z */ MCAPI float getEatSuccessChance(class Actor &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp b/LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp index b4e1e694f0..51c4f2542f 100644 --- a/LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/EatCarriedItemGoal.hpp @@ -30,47 +30,47 @@ class EatCarriedItemGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EatCarriedItemGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EatCarriedItemGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EatCarriedItemGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@EatCarriedItemGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@EatCarriedItemGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@EatCarriedItemGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@EatCarriedItemGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@EatCarriedItemGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@EatCarriedItemGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@EatCarriedItemGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EatCarriedItemGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EatCarriedItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EatCarriedItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0EatCarriedItemGoal\@\@QEAA\@AEAVMob\@\@H\@Z + * @symbol ??0EatCarriedItemGoal\@\@QEAA\@AEAVMob\@\@H\@Z */ MCAPI EatCarriedItemGoal(class Mob &, int); @@ -78,12 +78,12 @@ class EatCarriedItemGoal { private: /** - * @symbol ?CHEW_CHANCE\@EatCarriedItemGoal\@\@0HB + * @symbol ?CHEW_CHANCE\@EatCarriedItemGoal\@\@0HB */ MCAPI static int const CHEW_CHANCE; /** - * @symbol ?EATING_TIME\@EatCarriedItemGoal\@\@0HB + * @symbol ?EATING_TIME\@EatCarriedItemGoal\@\@0HB */ MCAPI static int const EATING_TIME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EatMobGoal.hpp b/LiteLoader/include/llapi/mc/EatMobGoal.hpp index 57b9a933db..861b1c9f5d 100644 --- a/LiteLoader/include/llapi/mc/EatMobGoal.hpp +++ b/LiteLoader/include/llapi/mc/EatMobGoal.hpp @@ -28,48 +28,48 @@ class EatMobGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EatMobGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EatMobGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EatMobGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@EatMobGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@EatMobGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@EatMobGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@EatMobGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@EatMobGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@EatMobGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@EatMobGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EatMobGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EatMobGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EatMobGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0EatMobGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0EatMobGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI EatMobGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp b/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp index 318ccbd23b..5757f1b46a 100644 --- a/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/EconomyTradeableComponent.hpp @@ -30,164 +30,164 @@ class EconomyTradeableComponent { public: /** - * @symbol ??0EconomyTradeableComponent\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0EconomyTradeableComponent\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI EconomyTradeableComponent(class Actor &); /** - * @symbol ?addAdditionalSaveData\@EconomyTradeableComponent\@\@QEAAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@EconomyTradeableComponent\@\@QEAAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &); /** - * @symbol ?createDataPacket\@EconomyTradeableComponent\@\@QEAA?AVUpdateTradePacket\@\@W4ContainerID\@\@\@Z + * @symbol ?createDataPacket\@EconomyTradeableComponent\@\@QEAA?AVUpdateTradePacket\@\@W4ContainerID\@\@\@Z */ MCAPI class UpdateTradePacket createDataPacket(enum class ContainerID); /** - * @symbol ?fixVillagerTierToMatchTradeList\@EconomyTradeableComponent\@\@QEAAXPEAVMerchantRecipeList\@\@\@Z + * @symbol ?fixVillagerTierToMatchTradeList\@EconomyTradeableComponent\@\@QEAAXPEAVMerchantRecipeList\@\@\@Z */ MCAPI void fixVillagerTierToMatchTradeList(class MerchantRecipeList *); /** - * @symbol ?getCurrentCuredDiscount\@EconomyTradeableComponent\@\@QEBA?AUIntRange\@\@XZ + * @symbol ?getCurrentCuredDiscount\@EconomyTradeableComponent\@\@QEBA?AUIntRange\@\@XZ */ MCAPI struct IntRange getCurrentCuredDiscount() const; /** - * @symbol ?getCurrentNearbyCuredDiscount\@EconomyTradeableComponent\@\@QEBAHXZ + * @symbol ?getCurrentNearbyCuredDiscount\@EconomyTradeableComponent\@\@QEBAHXZ */ MCAPI int getCurrentNearbyCuredDiscount() const; /** - * @symbol ?getCurrentTradeExp\@EconomyTradeableComponent\@\@QEBAIXZ + * @symbol ?getCurrentTradeExp\@EconomyTradeableComponent\@\@QEBAIXZ */ MCAPI unsigned int getCurrentTradeExp() const; /** - * @symbol ?getDisplayName\@EconomyTradeableComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDisplayName\@EconomyTradeableComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDisplayName() const; /** - * @symbol ?getInteraction\@EconomyTradeableComponent\@\@QEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@EconomyTradeableComponent\@\@QEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Player &, class ActorInteraction &); /** - * @symbol ?getOffers\@EconomyTradeableComponent\@\@QEAAPEAVMerchantRecipeList\@\@XZ + * @symbol ?getOffers\@EconomyTradeableComponent\@\@QEAAPEAVMerchantRecipeList\@\@XZ */ MCAPI class MerchantRecipeList * getOffers(); /** - * @symbol ?getRiches\@EconomyTradeableComponent\@\@QEBAHXZ + * @symbol ?getRiches\@EconomyTradeableComponent\@\@QEBAHXZ */ MCAPI int getRiches() const; /** - * @symbol ?getTradeTier\@EconomyTradeableComponent\@\@QEBAIXZ + * @symbol ?getTradeTier\@EconomyTradeableComponent\@\@QEBAIXZ */ MCAPI unsigned int getTradeTier() const; /** - * @symbol ?hasSupplyRemaining\@EconomyTradeableComponent\@\@QEBA_NXZ + * @symbol ?hasSupplyRemaining\@EconomyTradeableComponent\@\@QEBA_NXZ */ MCAPI bool hasSupplyRemaining() const; /** - * @symbol ?initFromDefinition\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?initFromDefinition\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void initFromDefinition(); /** - * @symbol ?loadDisplayName\@EconomyTradeableComponent\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?loadDisplayName\@EconomyTradeableComponent\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & loadDisplayName(); /** - * @symbol ?loadOffersFromTag\@EconomyTradeableComponent\@\@QEAAXPEBVCompoundTag\@\@\@Z + * @symbol ?loadOffersFromTag\@EconomyTradeableComponent\@\@QEAAXPEBVCompoundTag\@\@\@Z */ MCAPI void loadOffersFromTag(class CompoundTag const *); /** - * @symbol ?matchExpAndTier\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?matchExpAndTier\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void matchExpAndTier(); /** - * @symbol ?newServerAiStep\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?newServerAiStep\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void newServerAiStep(); /** - * @symbol ?notifyTrade\@EconomyTradeableComponent\@\@QEAAXH\@Z + * @symbol ?notifyTrade\@EconomyTradeableComponent\@\@QEAAXH\@Z */ MCAPI void notifyTrade(int); /** - * @symbol ?readAdditionalSaveData\@EconomyTradeableComponent\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@EconomyTradeableComponent\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?reloadComponent\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?reloadComponent\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void reloadComponent(); /** - * @symbol ?resupplyTrades\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?resupplyTrades\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void resupplyTrades(); /** - * @symbol ?setNearbyCuredDiscount\@EconomyTradeableComponent\@\@QEAAXH\@Z + * @symbol ?setNearbyCuredDiscount\@EconomyTradeableComponent\@\@QEAAXH\@Z */ MCAPI void setNearbyCuredDiscount(int); /** - * @symbol ?setOffers\@EconomyTradeableComponent\@\@QEAAXAEAVMerchantRecipeList\@\@\@Z + * @symbol ?setOffers\@EconomyTradeableComponent\@\@QEAAXAEAVMerchantRecipeList\@\@\@Z */ MCAPI void setOffers(class MerchantRecipeList &); /** - * @symbol ?setRiches\@EconomyTradeableComponent\@\@QEAAXH\@Z + * @symbol ?setRiches\@EconomyTradeableComponent\@\@QEAAXH\@Z */ MCAPI void setRiches(int); /** - * @symbol ?shouldConvertTrades\@EconomyTradeableComponent\@\@QEBA_NXZ + * @symbol ?shouldConvertTrades\@EconomyTradeableComponent\@\@QEBA_NXZ */ MCAPI bool shouldConvertTrades() const; /** - * @symbol ?shouldPersistTrades\@EconomyTradeableComponent\@\@QEBA_NXZ + * @symbol ?shouldPersistTrades\@EconomyTradeableComponent\@\@QEBA_NXZ */ MCAPI bool shouldPersistTrades() const; /** - * @symbol ?showTradeScreen\@EconomyTradeableComponent\@\@QEAA_NXZ + * @symbol ?showTradeScreen\@EconomyTradeableComponent\@\@QEAA_NXZ */ MCAPI bool showTradeScreen(); /** - * @symbol ?tickDiscountDegradationTimer\@EconomyTradeableComponent\@\@QEAAXUTick\@\@\@Z + * @symbol ?tickDiscountDegradationTimer\@EconomyTradeableComponent\@\@QEAAXUTick\@\@\@Z */ MCAPI void tickDiscountDegradationTimer(struct Tick); /** - * @symbol ?tryIncrementCuredDiscount\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?tryIncrementCuredDiscount\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void tryIncrementCuredDiscount(); /** - * @symbol ?tryIncrementNearbyCuredDiscount\@EconomyTradeableComponent\@\@QEAAXXZ + * @symbol ?tryIncrementNearbyCuredDiscount\@EconomyTradeableComponent\@\@QEAAXXZ */ MCAPI void tryIncrementNearbyCuredDiscount(); /** - * @symbol ?tryToTransferOldOffers\@EconomyTradeableComponent\@\@QEAAXPEAVMerchantRecipeList\@\@\@Z + * @symbol ?tryToTransferOldOffers\@EconomyTradeableComponent\@\@QEAAXPEAVMerchantRecipeList\@\@\@Z */ MCAPI void tryToTransferOldOffers(class MerchantRecipeList *); /** - * @symbol ?isUseNewTradeScreen\@EconomyTradeableComponent\@\@SA_NAEBVActor\@\@\@Z + * @symbol ?isUseNewTradeScreen\@EconomyTradeableComponent\@\@SA_NAEBVActor\@\@\@Z */ MCAPI static bool isUseNewTradeScreen(class Actor const &); //private: /** - * @symbol ?_generateTrades\@EconomyTradeableComponent\@\@AEAA_NXZ + * @symbol ?_generateTrades\@EconomyTradeableComponent\@\@AEAA_NXZ */ MCAPI bool _generateTrades(); /** - * @symbol ?_getTradeTable\@EconomyTradeableComponent\@\@AEAAPEAUTradeTable\@\@XZ + * @symbol ?_getTradeTable\@EconomyTradeableComponent\@\@AEAAPEAUTradeTable\@\@XZ */ MCAPI struct TradeTable * _getTradeTable(); /** - * @symbol ?_getTradeTierFromCurrentExp\@EconomyTradeableComponent\@\@AEBAIXZ + * @symbol ?_getTradeTierFromCurrentExp\@EconomyTradeableComponent\@\@AEBAIXZ */ MCAPI unsigned int _getTradeTierFromCurrentExp() const; /** - * @symbol ?_rearrangeTradeList\@EconomyTradeableComponent\@\@AEAAXAEAV?$vector\@UTrade\@\@V?$allocator\@UTrade\@\@\@std\@\@\@std\@\@_K\@Z + * @symbol ?_rearrangeTradeList\@EconomyTradeableComponent\@\@AEAAXAEAV?$vector\@UTrade\@\@V?$allocator\@UTrade\@\@\@std\@\@\@std\@\@_K\@Z */ MCAPI void _rearrangeTradeList(std::vector &, unsigned __int64); /** - * @symbol ?_setMaxTradeTier\@EconomyTradeableComponent\@\@AEAAXH\@Z + * @symbol ?_setMaxTradeTier\@EconomyTradeableComponent\@\@AEAAXH\@Z */ MCAPI void _setMaxTradeTier(int); /** - * @symbol ?_setTradeTier\@EconomyTradeableComponent\@\@AEAAXH\@Z + * @symbol ?_setTradeTier\@EconomyTradeableComponent\@\@AEAAXH\@Z */ MCAPI void _setTradeTier(int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EconomyTradeableComponentInternal.hpp b/LiteLoader/include/llapi/mc/EconomyTradeableComponentInternal.hpp index 35044c0f12..6a9ebe3eba 100644 --- a/LiteLoader/include/llapi/mc/EconomyTradeableComponentInternal.hpp +++ b/LiteLoader/include/llapi/mc/EconomyTradeableComponentInternal.hpp @@ -20,7 +20,7 @@ namespace EconomyTradeableComponentInternal { #undef AFTER_EXTRA /** - * @symbol ?_filterTradeByBiome\@EconomyTradeableComponentInternal\@\@YAHAEAV?$vector\@UTradeItem\@\@V?$allocator\@UTradeItem\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?_filterTradeByBiome\@EconomyTradeableComponentInternal\@\@YAHAEAV?$vector\@UTradeItem\@\@V?$allocator\@UTradeItem\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI int _filterTradeByBiome(std::vector &, int); diff --git a/LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp b/LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp index b6c66d82ac..7f89d75187 100644 --- a/LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp +++ b/LiteLoader/include/llapi/mc/EconomyTradeableDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class EconomyTradeableDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@EconomyTradeableDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@EconomyTradeableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~EconomyTradeableDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@EconomyTradeableDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@EconomyTradeableDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ECONOMYTRADEABLEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@EconomyTradeableDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~EconomyTradeableDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EcsEventDispatcher.hpp b/LiteLoader/include/llapi/mc/EcsEventDispatcher.hpp index 26eccf1512..0773c937ab 100644 --- a/LiteLoader/include/llapi/mc/EcsEventDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/EcsEventDispatcher.hpp @@ -28,8 +28,8 @@ class EcsEventDispatcher { public: /** - * @symbol ?update\@EcsEventDispatcher\@\@QEAAXXZ + * @symbol ?update\@EcsEventDispatcher\@\@QEAAXXZ */ MCAPI void update(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EditorActorPauseTickNeededComponent.hpp b/LiteLoader/include/llapi/mc/EditorActorPauseTickNeededComponent.hpp deleted file mode 100644 index 3ba662cf2a..0000000000 --- a/LiteLoader/include/llapi/mc/EditorActorPauseTickNeededComponent.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file EditorActorPauseTickNeededComponent.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure EditorActorPauseTickNeededComponent. - * - */ -struct EditorActorPauseTickNeededComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EDITORACTORPAUSETICKNEEDEDCOMPONENT -public: - struct EditorActorPauseTickNeededComponent& operator=(struct EditorActorPauseTickNeededComponent const &) = delete; - EditorActorPauseTickNeededComponent(struct EditorActorPauseTickNeededComponent const &) = delete; - EditorActorPauseTickNeededComponent() = delete; -#endif - -public: - /** - * @symbol ??1EditorActorPauseTickNeededComponent@@QEAA@XZ - * @hash -1833443719 - */ - MCAPI ~EditorActorPauseTickNeededComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EditorBootstrapper.hpp b/LiteLoader/include/llapi/mc/EditorBootstrapper.hpp index 7b9db0255d..ea25749dbd 100644 --- a/LiteLoader/include/llapi/mc/EditorBootstrapper.hpp +++ b/LiteLoader/include/llapi/mc/EditorBootstrapper.hpp @@ -25,16 +25,16 @@ class EditorBootstrapper { public: /** - * @symbol ?EDITOR_MODE_ARGUMENT_KEY\@EditorBootstrapper\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EDITOR_MODE_ARGUMENT_KEY\@EditorBootstrapper\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EDITOR_MODE_ARGUMENT_KEY; /** - * @symbol ?EDITOR_MODE_ARGUMENT_VALUE\@EditorBootstrapper\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EDITOR_MODE_ARGUMENT_VALUE\@EditorBootstrapper\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EDITOR_MODE_ARGUMENT_VALUE; /** - * @symbol ?getPackCapability\@EditorBootstrapper\@\@SA?AVPackCapability\@\@V?$optional\@_N\@std\@\@\@Z + * @symbol ?getPackCapability\@EditorBootstrapper\@\@SA?AVPackCapability\@\@V?$optional\@_N\@std\@\@\@Z */ MCAPI static class PackCapability getPackCapability(class std::optional); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp index 20f66ae372..f15d65d43d 100644 --- a/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp +++ b/LiteLoader/include/llapi/mc/EditorNetworkPacket.hpp @@ -28,33 +28,33 @@ class EditorNetworkPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EditorNetworkPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@EditorNetworkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@EditorNetworkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@EditorNetworkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@EditorNetworkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@EditorNetworkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EditorNetworkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EditorNetworkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0EditorNetworkPacket\@\@QEAA\@XZ + * @symbol ??0EditorNetworkPacket\@\@QEAA\@XZ */ MCAPI EditorNetworkPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp index 4c0ed02509..6199c1a039 100644 --- a/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/EditorTickFilterSystem.hpp @@ -28,16 +28,16 @@ class EditorTickFilterSystem { public: /** - * @symbol ?_addPauseTickNeeded\@EditorTickFilterSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorTickNeededComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UEditorActorPauseTickNeededFlag\@\@\@\@\@\@\@Z + * @symbol ?_addPauseTickNeeded\@EditorTickFilterSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorTickNeededComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UEditorActorPauseTickNeededFlag\@\@\@\@\@\@\@Z */ MCAPI static void _addPauseTickNeeded(class StrictEntityContext &, class ActorTickNeededComponent &, class EntityModifierT> &); /** - * @symbol ?createAddPauseTickNeeded\@EditorTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createAddPauseTickNeeded\@EditorTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAddPauseTickNeeded(); /** - * @symbol ?createRemoveActorTickNeeded\@EditorTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createRemoveActorTickNeeded\@EditorTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createRemoveActorTickNeeded(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EduAppConfigs.hpp b/LiteLoader/include/llapi/mc/EduAppConfigs.hpp index 31bb253eff..dd41002e3d 100644 --- a/LiteLoader/include/llapi/mc/EduAppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/EduAppConfigs.hpp @@ -30,8 +30,8 @@ class EduAppConfigs { public: /** - * @symbol ?EDUResourcePack\@EduAppConfigs\@\@2UPackIdVersion\@\@B + * @symbol ?EDUResourcePack\@EduAppConfigs\@\@2UPackIdVersion\@\@B */ MCAPI static struct PackIdVersion const EDUResourcePack; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp b/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp index b8f69a565c..80ba5a52d7 100644 --- a/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp +++ b/LiteLoader/include/llapi/mc/EduSharedUriResource.hpp @@ -29,23 +29,23 @@ struct EduSharedUriResource { public: /** - * @symbol ??0EduSharedUriResource\@\@QEAA\@XZ + * @symbol ??0EduSharedUriResource\@\@QEAA\@AEBVCompoundTag\@\@\@Z */ - MCAPI EduSharedUriResource(); + MCAPI EduSharedUriResource(class CompoundTag const &); /** - * @symbol ??0EduSharedUriResource\@\@QEAA\@AEBVCompoundTag\@\@\@Z + * @symbol ??0EduSharedUriResource\@\@QEAA\@XZ */ - MCAPI EduSharedUriResource(class CompoundTag const &); + MCAPI EduSharedUriResource(); /** - * @symbol ??1EduSharedUriResource\@\@QEAA\@XZ + * @symbol ??1EduSharedUriResource\@\@QEAA\@XZ */ MCAPI ~EduSharedUriResource(); /** - * @symbol ?fromTag\@EduSharedUriResource\@\@SA?AU1\@AEBVCompoundTag\@\@\@Z + * @symbol ?fromTag\@EduSharedUriResource\@\@SA?AU1\@AEBVCompoundTag\@\@\@Z */ MCAPI static struct EduSharedUriResource fromTag(class CompoundTag const &); /** - * @symbol ?toTag\@EduSharedUriResource\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBU1\@\@Z + * @symbol ?toTag\@EduSharedUriResource\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBU1\@\@Z */ MCAPI static std::unique_ptr toTag(struct EduSharedUriResource const &); diff --git a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp index 6eb0d5dca5..3fa78312e4 100644 --- a/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp +++ b/LiteLoader/include/llapi/mc/EduUriResourcePacket.hpp @@ -30,37 +30,43 @@ class EduUriResourcePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EduUriResourcePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@EduUriResourcePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@EduUriResourcePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@EduUriResourcePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@EduUriResourcePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@EduUriResourcePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EduUriResourcePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EduUriResourcePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUURIRESOURCEPACKET /** - * @symbol ??0EduUriResourcePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EduUriResourcePacket(); +#endif + /** + * @symbol ??0EduUriResourcePacket\@\@QEAA\@XZ */ MCAPI EduUriResourcePacket(); /** - * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z + * @symbol ??0EduUriResourcePacket\@\@QEAA\@AEBUEduSharedUriResource\@\@\@Z */ MCAPI EduUriResourcePacket(struct EduSharedUriResource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EducationEditionOfferValue.hpp b/LiteLoader/include/llapi/mc/EducationEditionOfferValue.hpp index cb69399bb6..e648aea5a2 100644 --- a/LiteLoader/include/llapi/mc/EducationEditionOfferValue.hpp +++ b/LiteLoader/include/llapi/mc/EducationEditionOfferValue.hpp @@ -30,8 +30,8 @@ class EducationEditionOfferValue { public: /** - * @symbol ??4EducationEditionOfferValue\@\@QEAAAEAV0\@W4EducationEditionOffer\@\@\@Z + * @symbol ??4EducationEditionOfferValue\@\@QEAAAEAV0\@W4EducationEditionOffer\@\@\@Z */ MCAPI class EducationEditionOfferValue & operator=(enum class EducationEditionOffer); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp index 89ba9e1750..bcc403e9de 100644 --- a/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLevelSettings.hpp @@ -23,31 +23,31 @@ struct EducationLevelSettings { #undef AFTER_EXTRA public: /** - * @symbol ??0EducationLevelSettings\@\@QEAA\@XZ + * @symbol ??0EducationLevelSettings\@\@QEAA\@XZ */ MCAPI EducationLevelSettings(); /** - * @symbol ??0EducationLevelSettings\@\@QEAA\@AEBU0\@\@Z + * @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 + * @symbol ?getCommandOverrideFunctor\@EducationLevelSettings\@\@QEBA?AV?$function\@$$A6AXAEAUCommandFlag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@XZ */ MCAPI class std::function getCommandOverrideFunctor() const; /** - * @symbol ??4EducationLevelSettings\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4EducationLevelSettings\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct EducationLevelSettings & operator=(struct EducationLevelSettings const &); /** - * @symbol ?save\@EducationLevelSettings\@\@QEAAXAEBVLevelLooseFileStorage\@\@\@Z + * @symbol ?save\@EducationLevelSettings\@\@QEAAXAEBVLevelLooseFileStorage\@\@\@Z */ MCAPI void save(class LevelLooseFileStorage const &); /** - * @symbol ??1EducationLevelSettings\@\@QEAA\@XZ + * @symbol ??1EducationLevelSettings\@\@QEAA\@XZ */ MCAPI ~EducationLevelSettings(); /** - * @symbol ?DEFAULT_BORDER_PATH\@EducationLevelSettings\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEFAULT_BORDER_PATH\@EducationLevelSettings\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DEFAULT_BORDER_PATH; diff --git a/LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp b/LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp index b747ee7749..038846caa8 100644 --- a/LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/EducationLocalLevelSettings.hpp @@ -28,8 +28,8 @@ class EducationLocalLevelSettings { public: /** - * @symbol ??1EducationLocalLevelSettings\@\@QEAA\@XZ + * @symbol ??1EducationLocalLevelSettings\@\@QEAA\@XZ */ MCAPI ~EducationLocalLevelSettings(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EducationMetadata.hpp b/LiteLoader/include/llapi/mc/EducationMetadata.hpp index 1ff6850d27..2eb1fe1597 100644 --- a/LiteLoader/include/llapi/mc/EducationMetadata.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadata.hpp @@ -31,19 +31,19 @@ enum class UserType; public: /** - * @symbol ??0EducationMetadata\@\@QEAA\@XZ + * @symbol ??0EducationMetadata\@\@QEAA\@XZ */ MCAPI EducationMetadata(); /** - * @symbol ??1EducationMetadata\@\@QEAA\@XZ + * @symbol ??1EducationMetadata\@\@QEAA\@XZ */ MCAPI ~EducationMetadata(); /** - * @symbol ?STRING_TO_CONTENT_TYPE\@EducationMetadata\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ContentType\@EducationMetadata\@\@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\@\@W4ContentType\@EducationMetadata\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?STRING_TO_CONTENT_TYPE\@EducationMetadata\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ContentType\@EducationMetadata\@\@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\@\@W4ContentType\@EducationMetadata\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const STRING_TO_CONTENT_TYPE; /** - * @symbol ?STRING_TO_USER_TYPE\@EducationMetadata\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4UserType\@EducationMetadata\@\@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\@\@W4UserType\@EducationMetadata\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?STRING_TO_USER_TYPE\@EducationMetadata\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4UserType\@EducationMetadata\@\@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\@\@W4UserType\@EducationMetadata\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const STRING_TO_USER_TYPE; diff --git a/LiteLoader/include/llapi/mc/EducationMetadataError.hpp b/LiteLoader/include/llapi/mc/EducationMetadataError.hpp index c8ffbdb544..736fee98a2 100644 --- a/LiteLoader/include/llapi/mc/EducationMetadataError.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadataError.hpp @@ -31,23 +31,29 @@ class EducationMetadataError : public PackError { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EducationMetadataError(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getLocErrorMessageMap\@EducationMetadataError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocErrorMessageMap\@EducationMetadataError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocErrorMessageMap() const; /** - * @vftbl 3 - * @symbol ?getEventErrorMessageMap\@EducationMetadataError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getEventErrorMessageMap\@EducationMetadataError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getEventErrorMessageMap() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUCATIONMETADATAERROR /** - * @symbol ??0EducationMetadataError\@\@QEAA\@W4PackParseErrorType\@\@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 __unk_destructor_-1 + */ + MCVAPI ~EducationMetadataError(); +#endif + /** + * @symbol ??0EducationMetadataError\@\@QEAA\@W4PackParseErrorType\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI EducationMetadataError(enum class PackParseErrorType, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp b/LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp index e9709c473c..1db902bf9b 100644 --- a/LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp +++ b/LiteLoader/include/llapi/mc/EducationMetadataUtils.hpp @@ -23,11 +23,11 @@ namespace EducationMetadataUtils { #undef AFTER_EXTRA /** - * @symbol ?parse\@EducationMetadataUtils\@\@YA?AUEducationMetadata\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@AEAVPackReport\@\@\@Z + * @symbol ?parse\@EducationMetadataUtils\@\@YA?AUEducationMetadata\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@4\@AEAVPackReport\@\@\@Z */ MCAPI struct EducationMetadata parse(std::string const &, std::vector &, class PackReport &); /** - * @symbol ?parseEducationMetadataContent\@EducationMetadataUtils\@\@YAXAEBVValue\@Json\@\@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\@\@AEAUEducationMetadata\@\@AEAVPackReport\@\@\@Z + * @symbol ?parseEducationMetadataContent\@EducationMetadataUtils\@\@YAXAEBVValue\@Json\@\@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\@\@AEAUEducationMetadata\@\@AEAVPackReport\@\@\@Z */ MCAPI void parseEducationMetadataContent(class Json::Value const &, std::vector &, struct EducationMetadata &, class PackReport &); diff --git a/LiteLoader/include/llapi/mc/EducationOptions.hpp b/LiteLoader/include/llapi/mc/EducationOptions.hpp index 3b8e1421d8..4bb3ed36fd 100644 --- a/LiteLoader/include/llapi/mc/EducationOptions.hpp +++ b/LiteLoader/include/llapi/mc/EducationOptions.hpp @@ -31,53 +31,53 @@ class EducationOptions { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUCATIONOPTIONS /** - * @symbol ?onActiveResourcePacksChanged\@EducationOptions\@\@UEAAXAEAVResourcePackManager\@\@\@Z + * @symbol ?onActiveResourcePacksChanged\@EducationOptions\@\@UEAAXAEAVResourcePackManager\@\@\@Z */ MCVAPI void onActiveResourcePacksChanged(class ResourcePackManager &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~EducationOptions(); #endif /** - * @symbol ??0EducationOptions\@\@QEAA\@PEAVResourcePackManager\@\@\@Z + * @symbol ??0EducationOptions\@\@QEAA\@PEAVResourcePackManager\@\@\@Z */ MCAPI EducationOptions(class ResourcePackManager *); /** - * @symbol ?init\@EducationOptions\@\@QEAAXAEBVLevelData\@\@\@Z + * @symbol ?init\@EducationOptions\@\@QEAAXAEBVLevelData\@\@\@Z */ MCAPI void init(class LevelData const &); /** - * @symbol ?getPackCapability\@EducationOptions\@\@SA?AVPackCapability\@\@XZ + * @symbol ?getPackCapability\@EducationOptions\@\@SA?AVPackCapability\@\@XZ */ MCAPI static class PackCapability getPackCapability(); /** - * @symbol ?isBaseCodeBuilderEnabled\@EducationOptions\@\@SA_NXZ + * @symbol ?isBaseCodeBuilderEnabled\@EducationOptions\@\@SA_NXZ */ MCAPI static bool isBaseCodeBuilderEnabled(); /** - * @symbol ?isChemistryEnabled\@EducationOptions\@\@SA_NXZ + * @symbol ?isChemistryEnabled\@EducationOptions\@\@SA_NXZ */ MCAPI static bool isChemistryEnabled(); /** - * @symbol ?isCodeBuilderEnabled\@EducationOptions\@\@SA_NXZ + * @symbol ?isCodeBuilderEnabled\@EducationOptions\@\@SA_NXZ */ MCAPI static bool isCodeBuilderEnabled(); /** - * @symbol ?isEducationEnabled\@EducationOptions\@\@SA_NXZ + * @symbol ?isEducationEnabled\@EducationOptions\@\@SA_NXZ */ MCAPI static bool isEducationEnabled(); //private: /** - * @symbol ?_getCurrentOptions\@EducationOptions\@\@CA?AV?$ServiceReference\@VEducationOptions\@\@\@\@XZ + * @symbol ?_getCurrentOptions\@EducationOptions\@\@CA?AV?$ServiceReference\@VEducationOptions\@\@\@\@XZ */ MCAPI static class ServiceReference _getCurrentOptions(); private: /** - * @symbol ?DEFAULT_OPTION\@EducationOptions\@\@0V1\@A + * @symbol ?DEFAULT_OPTION\@EducationOptions\@\@0V1\@A */ MCAPI static class EducationOptions DEFAULT_OPTION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp index 28972c0ca4..225d314f4c 100644 --- a/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/EducationSettingsPacket.hpp @@ -30,37 +30,43 @@ class EducationSettingsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EducationSettingsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@EducationSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@EducationSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@EducationSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@EducationSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@EducationSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EducationSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EducationSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EDUCATIONSETTINGSPACKET /** - * @symbol ??0EducationSettingsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EducationSettingsPacket(); +#endif + /** + * @symbol ??0EducationSettingsPacket\@\@QEAA\@XZ */ MCAPI EducationSettingsPacket(); /** - * @symbol ??0EducationSettingsPacket\@\@QEAA\@UEducationLevelSettings\@\@\@Z + * @symbol ??0EducationSettingsPacket\@\@QEAA\@UEducationLevelSettings\@\@\@Z */ MCAPI EducationSettingsPacket(struct EducationLevelSettings); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EffectCommand.hpp b/LiteLoader/include/llapi/mc/EffectCommand.hpp index 8813d3b3fd..a51c75865d 100644 --- a/LiteLoader/include/llapi/mc/EffectCommand.hpp +++ b/LiteLoader/include/llapi/mc/EffectCommand.hpp @@ -31,26 +31,26 @@ class EffectCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EffectCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@EffectCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@EffectCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@EffectCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@EffectCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?clear\@EffectCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?clear\@EffectCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void clear(class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EggItem.hpp b/LiteLoader/include/llapi/mc/EggItem.hpp index a43c15ec3e..d2b63ed763 100644 --- a/LiteLoader/include/llapi/mc/EggItem.hpp +++ b/LiteLoader/include/llapi/mc/EggItem.hpp @@ -32,89 +32,89 @@ class EggItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EggItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@EggItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@EggItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@EggItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@EggItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@EggItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@EggItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ElementBlock.hpp b/LiteLoader/include/llapi/mc/ElementBlock.hpp index 9e29417155..031b5a2761 100644 --- a/LiteLoader/include/llapi/mc/ElementBlock.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlock.hpp @@ -31,240 +31,245 @@ class ElementBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ElementBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@ElementBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@ElementBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@ElementBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@ElementBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 157 - * @symbol ?tryLegacyUpgrade\@ElementBlock\@\@UEBAPEBVBlock\@\@G\@Z + * @vftbl 157 + * @symbol ?tryLegacyUpgrade\@ElementBlock\@\@UEBAPEBVBlock\@\@G\@Z */ virtual class Block const * tryLegacyUpgrade(unsigned short) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@ElementBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0ElementBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ElementType\@\@\@Z + * @symbol ??0ElementBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ElementType\@\@\@Z */ MCAPI ElementBlock(std::string const &, int, enum class ElementType); /** - * @symbol ?getElementInfo\@ElementBlock\@\@SA?AUElementInfo\@\@W4ElementType\@\@\@Z + * @symbol ?getElementInfo\@ElementBlock\@\@SA?AUElementInfo\@\@W4ElementType\@\@\@Z */ MCAPI static struct ElementInfo getElementInfo(enum class ElementType); /** - * @symbol ?getIngredientForElement\@ElementBlock\@\@SA?AVRecipeIngredient\@\@W4ElementType\@\@H\@Z + * @symbol ?getIngredientForElement\@ElementBlock\@\@SA?AVRecipeIngredient\@\@W4ElementType\@\@H\@Z */ MCAPI static class RecipeIngredient getIngredientForElement(enum class ElementType, int); /** - * @symbol ?getItemForElement\@ElementBlock\@\@SA?AVItemInstance\@\@W4ElementType\@\@H\@Z + * @symbol ?getItemForElement\@ElementBlock\@\@SA?AVItemInstance\@\@W4ElementType\@\@H\@Z */ MCAPI static class ItemInstance getItemForElement(enum class ElementType, int); /** - * @symbol ?initElements\@ElementBlock\@\@SAXXZ + * @symbol ?initElements\@ElementBlock\@\@SAXXZ */ MCAPI static void initElements(); /** - * @symbol ?isElement\@ElementBlock\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isElement\@ElementBlock\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool isElement(class ItemStackBase const &); /** - * @symbol ?shutdownElements\@ElementBlock\@\@SAXXZ + * @symbol ?shutdownElements\@ElementBlock\@\@SAXXZ */ MCAPI static void shutdownElements(); /** - * @symbol ?tryGetBlockLegacyForElement\@ElementBlock\@\@SAPEBVBlockLegacy\@\@W4ElementType\@\@\@Z + * @symbol ?tryGetBlockLegacyForElement\@ElementBlock\@\@SAPEBVBlockLegacy\@\@W4ElementType\@\@\@Z */ MCAPI static class BlockLegacy const * tryGetBlockLegacyForElement(enum class ElementType); @@ -272,8 +277,8 @@ class ElementBlock : public BlockLegacy { private: /** - * @symbol ?mElements\@ElementBlock\@\@0V?$vector\@PEBVBlockLegacy\@\@V?$allocator\@PEBVBlockLegacy\@\@\@std\@\@\@std\@\@A + * @symbol ?mElements\@ElementBlock\@\@0V?$vector\@PEBVBlockLegacy\@\@V?$allocator\@PEBVBlockLegacy\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector mElements; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ElementBlockItem.hpp b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp index 997becbf58..f7b9c008ea 100644 --- a/LiteLoader/include/llapi/mc/ElementBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ElementBlockItem.hpp @@ -32,79 +32,79 @@ class ElementBlockItem : public AuxDataBlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ElementBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 105 - * @symbol ?fixupCommon\@ElementBlockItem\@\@EEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 105 + * @symbol ?fixupCommon\@ElementBlockItem\@\@EEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp index 0da13d23ef..f4a0320fc0 100644 --- a/LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/ElementConstructorContainerManagerModel.hpp @@ -31,48 +31,48 @@ class ElementConstructorContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ElementConstructorContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@ElementConstructorContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@ElementConstructorContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@ElementConstructorContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@ElementConstructorContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@ElementConstructorContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@ElementConstructorContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@ElementConstructorContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@ElementConstructorContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@ElementConstructorContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@ElementConstructorContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@ElementConstructorContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@ElementConstructorContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@ElementConstructorContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@ElementConstructorContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0ElementConstructorContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0ElementConstructorContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI ElementConstructorContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ElementConstructorContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/ElementConstructorContainerScreenValidator.hpp index 8bf028d18c..635e8fadee 100644 --- a/LiteLoader/include/llapi/mc/ElementConstructorContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/ElementConstructorContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class ElementConstructorContainerScreenValidator : public ContainerScreenValidat public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ElementConstructorContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0ElementConstructorContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0ElementConstructorContainerScreenValidator\@\@QEAA\@XZ */ MCAPI ElementConstructorContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EmergeGoal.hpp b/LiteLoader/include/llapi/mc/EmergeGoal.hpp index a55a63b4e2..cd1224ea9e 100644 --- a/LiteLoader/include/llapi/mc/EmergeGoal.hpp +++ b/LiteLoader/include/llapi/mc/EmergeGoal.hpp @@ -28,48 +28,48 @@ class EmergeGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EmergeGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EmergeGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EmergeGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@EmergeGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@EmergeGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@EmergeGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@EmergeGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@EmergeGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@EmergeGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@EmergeGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EmergeGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EmergeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EmergeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0EmergeGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0EmergeGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI EmergeGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EmitJumpPreventedEventSystem.hpp b/LiteLoader/include/llapi/mc/EmitJumpPreventedEventSystem.hpp new file mode 100644 index 0000000000..3102caa712 --- /dev/null +++ b/LiteLoader/include/llapi/mc/EmitJumpPreventedEventSystem.hpp @@ -0,0 +1,24 @@ +/** + * @file EmitJumpPreventedEventSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace EmitJumpPreventedEventSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSystem\@EmitJumpPreventedEventSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp index 87f37ef0ca..17dd7cb9fa 100644 --- a/LiteLoader/include/llapi/mc/EmoteListPacket.hpp +++ b/LiteLoader/include/llapi/mc/EmoteListPacket.hpp @@ -30,41 +30,47 @@ class EmoteListPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EmoteListPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@EmoteListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@EmoteListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@EmoteListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@EmoteListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@EmoteListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EmoteListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EmoteListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EmoteListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EMOTELISTPACKET /** - * @symbol ??0EmoteListPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI EmoteListPacket(); + MCVAPI ~EmoteListPacket(); +#endif /** - * @symbol ??0EmoteListPacket\@\@QEAA\@VActorRuntimeID\@\@\@Z + * @symbol ??0EmoteListPacket\@\@QEAA\@VActorRuntimeID\@\@\@Z */ MCAPI EmoteListPacket(class ActorRuntimeID); /** - * @symbol ?MAX_EMOTE_PIECE_IDS\@EmoteListPacket\@\@2HB + * @symbol ??0EmoteListPacket\@\@QEAA\@XZ + */ + MCAPI EmoteListPacket(); + /** + * @symbol ?MAX_EMOTE_PIECE_IDS\@EmoteListPacket\@\@2HB */ MCAPI static int const MAX_EMOTE_PIECE_IDS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EmotePacket.hpp b/LiteLoader/include/llapi/mc/EmotePacket.hpp index edc7cc7d61..604813e05b 100644 --- a/LiteLoader/include/llapi/mc/EmotePacket.hpp +++ b/LiteLoader/include/llapi/mc/EmotePacket.hpp @@ -30,45 +30,51 @@ class EmotePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EmotePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@EmotePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@EmotePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@EmotePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@EmotePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@EmotePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EmotePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EmotePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EmotePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EMOTEPACKET /** - * @symbol ??0EmotePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EmotePacket(); +#endif + /** + * @symbol ??0EmotePacket\@\@QEAA\@XZ */ MCAPI EmotePacket(); /** - * @symbol ?isServerSide\@EmotePacket\@\@QEBA_NXZ + * @symbol ?isServerSide\@EmotePacket\@\@QEBA_NXZ */ MCAPI bool isServerSide() const; /** - * @symbol ?setEmoteChatMute\@EmotePacket\@\@QEAAXXZ + * @symbol ?setEmoteChatMute\@EmotePacket\@\@QEAAXXZ */ MCAPI void setEmoteChatMute(); /** - * @symbol ?setServerSide\@EmotePacket\@\@QEAAXXZ + * @symbol ?setServerSide\@EmotePacket\@\@QEAAXXZ */ MCAPI void setServerSide(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp b/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp index 0964bfd67c..58cf97dc68 100644 --- a/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp +++ b/LiteLoader/include/llapi/mc/EmotePlayedTelemetryDataComponent.hpp @@ -28,7 +28,7 @@ struct EmotePlayedTelemetryDataComponent { public: /** - * @symbol ??1EmotePlayedTelemetryDataComponent\@\@QEAA\@XZ + * @symbol ??1EmotePlayedTelemetryDataComponent\@\@QEAA\@XZ */ MCAPI ~EmotePlayedTelemetryDataComponent(); diff --git a/LiteLoader/include/llapi/mc/EmptyLootItem.hpp b/LiteLoader/include/llapi/mc/EmptyLootItem.hpp index b73fcc3169..f603317299 100644 --- a/LiteLoader/include/llapi/mc/EmptyLootItem.hpp +++ b/LiteLoader/include/llapi/mc/EmptyLootItem.hpp @@ -30,9 +30,9 @@ class EmptyLootItem { public: /** - * @vftbl 0 - * @symbol ?_createItem\@EmptyLootItem\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 0 + * @symbol ?_createItem\@EmptyLootItem\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool _createItem(std::vector &, class Random &, class LootTableContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EmptyMapItem.hpp b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp index 281aa3e58b..bd8a2d5e94 100644 --- a/LiteLoader/include/llapi/mc/EmptyMapItem.hpp +++ b/LiteLoader/include/llapi/mc/EmptyMapItem.hpp @@ -32,115 +32,115 @@ class EmptyMapItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EmptyMapItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 59 - * @symbol ?requiresInteract\@EmptyMapItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@EmptyMapItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@EmptyMapItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@EmptyMapItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@EmptyMapItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@EmptyMapItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 119 - * @symbol ?getInteractText\@EmptyMapItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z + * @vftbl 119 + * @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 - * @symbol ?getUpdatePacket\@ComplexItem\@\@UEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@\@Z + * @vftbl 133 + * @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; /** - * @symbol ??0EmptyMapItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0EmptyMapItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI EmptyMapItem(std::string const &, short); /** - * @symbol ?addPlayerMarker\@EmptyMapItem\@\@SAXAEAVItemStack\@\@\@Z + * @symbol ?addPlayerMarker\@EmptyMapItem\@\@SAXAEAVItemStack\@\@\@Z */ MCAPI static void addPlayerMarker(class ItemStack &); /** - * @symbol ?addPlayerMarker\@EmptyMapItem\@\@SAXAEAVItemInstance\@\@\@Z + * @symbol ?addPlayerMarker\@EmptyMapItem\@\@SAXAEAVItemInstance\@\@\@Z */ MCAPI static void addPlayerMarker(class ItemInstance &); /** - * @symbol ?isLocatorMap\@EmptyMapItem\@\@SA_NAEBVItemStack\@\@\@Z + * @symbol ?isLocatorMap\@EmptyMapItem\@\@SA_NAEBVItemStack\@\@\@Z */ MCAPI static bool isLocatorMap(class ItemStack const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp index 63d53c8284..764e418e69 100644 --- a/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnableEncryptionCommand.hpp @@ -31,17 +31,17 @@ class EnableEncryptionCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnableEncryptionCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@EnableEncryptionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@EnableEncryptionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@EnableEncryptionCommand\@\@SAXAEAVCommandRegistry\@\@AEAVIMinecraftApp\@\@\@Z + * @symbol ?setup\@EnableEncryptionCommand\@\@SAXAEAVCommandRegistry\@\@AEAVIMinecraftApp\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class IMinecraftApp &); @@ -49,8 +49,8 @@ class EnableEncryptionCommand : public Command { private: /** - * @symbol ?mApp\@EnableEncryptionCommand\@\@0PEAVIMinecraftApp\@\@EA + * @symbol ?mApp\@EnableEncryptionCommand\@\@0PEAVIMinecraftApp\@\@EA */ MCAPI static class IMinecraftApp * mApp; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Enchant.hpp b/LiteLoader/include/llapi/mc/Enchant.hpp index b019ddf87e..83b1dbd719 100644 --- a/LiteLoader/include/llapi/mc/Enchant.hpp +++ b/LiteLoader/include/llapi/mc/Enchant.hpp @@ -111,177 +111,181 @@ enum class Type : uint8_t public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Enchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isCompatibleWith\@Enchant\@\@UEBA_NW4Type\@1\@\@Z + * @vftbl 1 + * @symbol ?isCompatibleWith\@Enchant\@\@UEBA_NW4Type\@1\@\@Z */ virtual bool isCompatibleWith(enum class Enchant::Type) const; /** - * @vftbl 2 - * @symbol ?getMinCost\@Enchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@Enchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@Enchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@Enchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 4 - * @symbol ?getMinLevel\@Enchant\@\@UEBAHXZ + * @vftbl 4 + * @symbol ?getMinLevel\@Enchant\@\@UEBAHXZ */ virtual int getMinLevel() const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@Enchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@Enchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 6 - * @symbol ?getDamageProtection\@Enchant\@\@UEBAHHAEBVActorDamageSource\@\@\@Z + * @vftbl 6 + * @symbol ?getDamageProtection\@Enchant\@\@UEBAHHAEBVActorDamageSource\@\@\@Z */ virtual int getDamageProtection(int, class ActorDamageSource const &) const; /** - * @vftbl 7 - * @symbol ?getDamageBonus\@Enchant\@\@UEBAMHAEBVActor\@\@\@Z + * @vftbl 7 + * @symbol ?getDamageBonus\@Enchant\@\@UEBAMHAEBVActor\@\@\@Z */ virtual float getDamageBonus(int, class Actor const &) const; /** - * @vftbl 8 - * @symbol ?doPostAttack\@Enchant\@\@UEBAXAEAVActor\@\@0H\@Z + * @vftbl 8 + * @symbol ?doPostAttack\@Enchant\@\@UEBAXAEAVActor\@\@0H\@Z */ virtual void doPostAttack(class Actor &, class Actor &, int) const; /** - * @vftbl 9 - * @symbol ?doPostHurt\@Enchant\@\@UEBAXAEAVItemInstance\@\@AEAVActor\@\@1H\@Z + * @vftbl 9 + * @symbol ?doPostHurt\@Enchant\@\@UEBAXAEAVItemInstance\@\@AEAVActor\@\@1H\@Z */ virtual void doPostHurt(class ItemInstance &, class Actor &, class Actor &, int) const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@Enchant\@\@EEBA_NW4Type\@1\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@Enchant\@\@EEBA_NW4Type\@1\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANT /** - * @symbol ?isDiscoverable\@Enchant\@\@UEBA_NXZ + * @symbol ?isDiscoverable\@Enchant\@\@UEBA_NXZ */ MCVAPI bool isDiscoverable() const; /** - * @symbol ?isMeleeDamageEnchant\@Enchant\@\@UEBA_NXZ + * @symbol ?isMeleeDamageEnchant\@Enchant\@\@UEBA_NXZ */ MCVAPI bool isMeleeDamageEnchant() const; /** - * @symbol ?isProtectionEnchant\@Enchant\@\@UEBA_NXZ + * @symbol ?isProtectionEnchant\@Enchant\@\@UEBA_NXZ */ MCVAPI bool isProtectionEnchant() const; /** - * @symbol ?isTreasureOnly\@Enchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@Enchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Enchant(); #endif /** - * @symbol ??0Enchant\@\@QEAA\@W4Type\@0\@W4Frequency\@0\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH_N\@Z + * @symbol ??0Enchant\@\@QEAA\@W4Type\@0\@W4Frequency\@0\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI Enchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int, bool); + MCAPI Enchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); /** - * @symbol ??0Enchant\@\@QEAA\@W4Type\@0\@W4Frequency\@0\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0Enchant\@\@QEAA\@W4Type\@0\@W4Frequency\@0\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH_N\@Z */ - MCAPI Enchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI Enchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int, bool); /** - * @symbol ?canEnchant\@Enchant\@\@QEBA_NH_N\@Z + * @symbol ?canEnchant\@Enchant\@\@QEBA_NH_N\@Z */ MCAPI bool canEnchant(int, bool) const; /** - * @symbol ?getDescription\@Enchant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescription\@Enchant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescription() const; /** - * @symbol ?getDescriptionId\@Enchant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@Enchant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescriptionId() const; /** - * @symbol ?getEnchantType\@Enchant\@\@QEBA?AW4Type\@1\@XZ + * @symbol ?getEnchantType\@Enchant\@\@QEBA?AW4Type\@1\@XZ */ MCAPI enum class Enchant::Type getEnchantType() const; /** - * @symbol ?getFrequency\@Enchant\@\@QEBA?AW4Frequency\@1\@XZ + * @symbol ?getFrequency\@Enchant\@\@QEBA?AW4Frequency\@1\@XZ */ MCAPI enum class Enchant::Frequency getFrequency() const; /** - * @symbol ?getStringId\@Enchant\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getStringId\@Enchant\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getStringId() const; /** - * @symbol ?isAvailable\@Enchant\@\@QEBA_NXZ + * @symbol ?isAvailable\@Enchant\@\@QEBA_NXZ */ MCAPI bool isAvailable() const; /** - * @symbol ?isDisabled\@Enchant\@\@QEBA_NXZ + * @symbol ?isDisabled\@Enchant\@\@QEBA_NXZ */ MCAPI bool isDisabled() const; /** - * @symbol ?isLootable\@Enchant\@\@QEBA_NXZ + * @symbol ?isLootable\@Enchant\@\@QEBA_NXZ */ MCAPI bool isLootable() const; /** - * @symbol ?enchantSlotFromString\@Enchant\@\@SA?AW4Slot\@1\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?enchantSlotFromString\@Enchant\@\@SA?AW4Slot\@1\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI static enum class Enchant::Slot enchantSlotFromString(class gsl::basic_string_span); + MCAPI static enum class Enchant::Slot enchantSlotFromString(class std::basic_string_view>); /** - * @symbol ?getEnchant\@Enchant\@\@SAPEBV1\@AEBW4Type\@1\@\@Z + * @symbol ?getEnchant\@Enchant\@\@SAPEBV1\@AEBW4Type\@1\@\@Z */ MCAPI static class Enchant const * getEnchant(enum class Enchant::Type const &); /** - * @symbol ?initEnchants\@Enchant\@\@SAXXZ + * @symbol ?initEnchants\@Enchant\@\@SAXXZ */ MCAPI static void initEnchants(); /** - * @symbol ?mEnchantNameToType\@Enchant\@\@2V?$unordered_map\@VHashedString\@\@W4Type\@Enchant\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@W4Type\@Enchant\@\@\@std\@\@\@5\@\@std\@\@A + * @symbol ?mEnchantNameToType\@Enchant\@\@2V?$unordered_map\@VHashedString\@\@W4Type\@Enchant\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@W4Type\@Enchant\@\@\@std\@\@\@5\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mEnchantNameToType; /** - * @symbol ?mEnchantSlotTypeEnumToStringMap\@Enchant\@\@2V?$unordered_map\@W4Slot\@Enchant\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UEnchantSlotEnumHasher\@\@U?$equal_to\@W4Slot\@Enchant\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4Slot\@Enchant\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mEnchantSlotTypeEnumToStringMap\@Enchant\@\@2V?$unordered_map\@W4Slot\@Enchant\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UEnchantSlotEnumHasher\@\@U?$equal_to\@W4Slot\@Enchant\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4Slot\@Enchant\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_map, class std::allocator>> mEnchantSlotTypeEnumToStringMap; /** - * @symbol ?mEnchantSlotTypeNameToEnumMap\@Enchant\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Slot\@Enchant\@\@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\@\@W4Slot\@Enchant\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mEnchantSlotTypeNameToEnumMap\@Enchant\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Slot\@Enchant\@\@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\@\@W4Slot\@Enchant\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mEnchantSlotTypeNameToEnumMap; /** - * @symbol ?mEnchants\@Enchant\@\@2V?$vector\@V?$unique_ptr\@VEnchant\@\@U?$default_delete\@VEnchant\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VEnchant\@\@U?$default_delete\@VEnchant\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mEnchants\@Enchant\@\@2V?$vector\@V?$unique_ptr\@VEnchant\@\@U?$default_delete\@VEnchant\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VEnchant\@\@U?$default_delete\@VEnchant\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mEnchants; /** - * @symbol ?shutdownEnchants\@Enchant\@\@SAXXZ + * @symbol ?shutdownEnchants\@Enchant\@\@SAXXZ */ MCAPI static void shutdownEnchants(); /** - * @symbol ?stringFromEnchantSlot\@Enchant\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4Slot\@1\@\@Z + * @symbol ?stringFromEnchantSlot\@Enchant\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4Slot\@1\@\@Z */ MCAPI static std::string stringFromEnchantSlot(enum class Enchant::Slot const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp b/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp index b3edfe2425..7c381467db 100644 --- a/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantBookForTradingFunction.hpp @@ -32,33 +32,33 @@ class EnchantBookForTradingFunction { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANTBOOKFORTRADINGFUNCTION /** - * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAHAEAVItemStack\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAHAEAVItemStack\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z */ MCVAPI int apply(class ItemStack &, class Random &, struct Trade const &, class LootTableContext &); /** - * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAHAEAVItemInstance\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAHAEAVItemInstance\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z */ MCVAPI int apply(class ItemInstance &, class Random &, struct Trade const &, class LootTableContext &); /** - * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCVAPI void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantBookForTradingFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCVAPI void apply(class ItemStack &, class Random &, class LootTableContext &); #endif /** - * @symbol ?deserialize\@EnchantBookForTradingFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@EnchantBookForTradingFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_getRandomEnchantAndCalculateCost\@EnchantBookForTradingFunction\@\@AEBA?AVEnchantmentInstance\@\@AEAVItemStackBase\@\@AEAVRandom\@\@AEAH\@Z + * @symbol ?_getRandomEnchantAndCalculateCost\@EnchantBookForTradingFunction\@\@AEBA?AVEnchantmentInstance\@\@AEAVItemStackBase\@\@AEAVRandom\@\@AEAH\@Z */ MCAPI class EnchantmentInstance _getRandomEnchantAndCalculateCost(class ItemStackBase &, class Random &, int &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantCommand.hpp b/LiteLoader/include/llapi/mc/EnchantCommand.hpp index 3d0c5fcf89..3016fd08de 100644 --- a/LiteLoader/include/llapi/mc/EnchantCommand.hpp +++ b/LiteLoader/include/llapi/mc/EnchantCommand.hpp @@ -31,18 +31,18 @@ class EnchantCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@EnchantCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@EnchantCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@EnchantCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@EnchantCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp b/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp index 503188c405..fde67d6098 100644 --- a/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantRandomEquipmentFunction.hpp @@ -32,23 +32,23 @@ class EnchantRandomEquipmentFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantRandomEquipmentFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@EnchantRandomEquipmentFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@EnchantRandomEquipmentFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@EnchantRandomEquipmentFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@EnchantRandomEquipmentFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@EnchantRandomEquipmentFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@EnchantRandomEquipmentFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp b/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp index ce3134bbc1..8e9953fbdd 100644 --- a/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantRandomlyFunction.hpp @@ -32,23 +32,23 @@ class EnchantRandomlyFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantRandomlyFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@EnchantRandomlyFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@EnchantRandomlyFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantUtils.hpp b/LiteLoader/include/llapi/mc/EnchantUtils.hpp index abbfa243da..8073f62b16 100644 --- a/LiteLoader/include/llapi/mc/EnchantUtils.hpp +++ b/LiteLoader/include/llapi/mc/EnchantUtils.hpp @@ -31,168 +31,168 @@ class EnchantUtils { public: /** - * @symbol ?MAX_EXP_REPAIR_COST\@EnchantUtils\@\@2HB + * @symbol ?MAX_EXP_REPAIR_COST\@EnchantUtils\@\@2HB */ MCAPI static int const MAX_EXP_REPAIR_COST; /** - * @symbol ?PROTECTIONFACTOR_PRIMARYCAP\@EnchantUtils\@\@2HB + * @symbol ?PROTECTIONFACTOR_PRIMARYCAP\@EnchantUtils\@\@2HB */ MCAPI static int const PROTECTIONFACTOR_PRIMARYCAP; /** - * @symbol ?PROTECTIONFACTOR_SECONDARYCAP\@EnchantUtils\@\@2HB + * @symbol ?PROTECTIONFACTOR_SECONDARYCAP\@EnchantUtils\@\@2HB */ MCAPI static int const PROTECTIONFACTOR_SECONDARYCAP; /** - * @symbol ?appendEnchantToFormattedText\@EnchantUtils\@\@SAXW4Type\@Enchant\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?appendEnchantToFormattedText\@EnchantUtils\@\@SAXW4Type\@Enchant\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z */ - MCAPI static void appendEnchantToFormattedText(enum class Enchant::Type, class gsl::basic_string_span, std::string &); + MCAPI static void appendEnchantToFormattedText(enum class Enchant::Type, class std::basic_string_view>, std::string &); /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z + * @symbol ?applyEnchant\@EnchantUtils\@\@SAHAEAVItemStackBase\@\@AEBVItemEnchants\@\@_N\@Z */ MCAPI static int applyEnchant(class ItemStackBase &, class ItemEnchants const &, bool); /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z + * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z */ MCAPI static bool applyEnchant(class ItemStackBase &, class EnchantmentInstance const &, bool); /** - * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z + * @symbol ?applyEnchant\@EnchantUtils\@\@SA_NAEAVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z */ MCAPI static bool applyEnchant(class ItemStackBase &, enum class Enchant::Type, int, bool); /** - * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z + * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@AEBVEnchantmentInstance\@\@_N\@Z */ MCAPI static struct EnchantResult canEnchant(class ItemStackBase const &, class EnchantmentInstance const &, bool); /** - * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z + * @symbol ?canEnchant\@EnchantUtils\@\@SA?AUEnchantResult\@\@AEBVItemStackBase\@\@W4Type\@Enchant\@\@H_N\@Z */ MCAPI static struct EnchantResult canEnchant(class ItemStackBase const &, enum class Enchant::Type, int, bool); /** - * @symbol ?combineEnchantedItems\@EnchantUtils\@\@SAHAEBVItemStack\@\@0AEAV2\@_N\@Z + * @symbol ?combineEnchantedItems\@EnchantUtils\@\@SAHAEBVItemStack\@\@0AEAV2\@_N\@Z */ MCAPI static int combineEnchantedItems(class ItemStack const &, class ItemStack const &, class ItemStack &, bool); /** - * @symbol ?determineActivation\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@\@Z + * @symbol ?determineActivation\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@\@Z */ MCAPI static int determineActivation(enum class Enchant::Type); /** - * @symbol ?determineCompatibility\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@\@Z + * @symbol ?determineCompatibility\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@\@Z */ MCAPI static int determineCompatibility(enum class Enchant::Type); /** - * @symbol ?doPostDamageEffects\@EnchantUtils\@\@SAXAEAVActor\@\@0\@Z + * @symbol ?doPostDamageEffects\@EnchantUtils\@\@SAXAEAVActor\@\@0\@Z */ MCAPI static void doPostDamageEffects(class Actor &, class Actor &); /** - * @symbol ?doPostHurtEffects\@EnchantUtils\@\@SAXAEAVMob\@\@0\@Z + * @symbol ?doPostHurtEffects\@EnchantUtils\@\@SAXAEAVMob\@\@0\@Z */ MCAPI static void doPostHurtEffects(class Mob &, class Mob &); /** - * @symbol ?generateEnchantedBook\@EnchantUtils\@\@SA?AVItemInstance\@\@AEBVEnchantmentInstance\@\@\@Z + * @symbol ?generateEnchantedBook\@EnchantUtils\@\@SA?AVItemInstance\@\@AEBVEnchantmentInstance\@\@\@Z */ MCAPI static class ItemInstance generateEnchantedBook(class EnchantmentInstance const &); /** - * @symbol ?getAvailableEnchantmentResults\@EnchantUtils\@\@SA?AV?$vector\@U?$pair\@VEnchantmentInstance\@\@H\@std\@\@V?$allocator\@U?$pair\@VEnchantmentInstance\@\@H\@std\@\@\@2\@\@std\@\@PEBVItem\@\@H_N\@Z + * @symbol ?getAvailableEnchantmentResults\@EnchantUtils\@\@SA?AV?$vector\@U?$pair\@VEnchantmentInstance\@\@H\@std\@\@V?$allocator\@U?$pair\@VEnchantmentInstance\@\@H\@std\@\@\@2\@\@std\@\@PEBVItem\@\@H_N\@Z */ MCAPI static std::vector> getAvailableEnchantmentResults(class Item const *, int, bool); /** - * @symbol ?getBookCasePositions\@EnchantUtils\@\@SA?AV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?getBookCasePositions\@EnchantUtils\@\@SA?AV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI static std::vector getBookCasePositions(class BlockSource &, class Vec3 const &); /** - * @symbol ?getCurses\@EnchantUtils\@\@SAXAEBVItemStackBase\@\@AEAV?$vector\@VEnchantmentInstance\@\@V?$allocator\@VEnchantmentInstance\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getCurses\@EnchantUtils\@\@SAXAEBVItemStackBase\@\@AEAV?$vector\@VEnchantmentInstance\@\@V?$allocator\@VEnchantmentInstance\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void getCurses(class ItemStackBase const &, std::vector &); /** - * @symbol ?getDamageReduction\@EnchantUtils\@\@SAMAEBVActorDamageSource\@\@AEBVMob\@\@\@Z + * @symbol ?getDamageReduction\@EnchantUtils\@\@SAMAEBVActorDamageSource\@\@AEBVMob\@\@\@Z */ MCAPI static float getDamageReduction(class ActorDamageSource const &, class Mob const &); /** - * @symbol ?getEnchantCosts\@EnchantUtils\@\@SA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@AEBVItemStackBase\@\@H\@Z + * @symbol ?getEnchantCosts\@EnchantUtils\@\@SA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@AEBVItemStackBase\@\@H\@Z */ MCAPI static std::vector getEnchantCosts(class ItemStackBase const &, int); /** - * @symbol ?getEnchantLevel\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?getEnchantLevel\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@AEBVItemStackBase\@\@\@Z */ MCAPI static int getEnchantLevel(enum class Enchant::Type, class ItemStackBase const &); /** - * @symbol ?getEnchantNameAndLevel\@EnchantUtils\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@Enchant\@\@H\@Z + * @symbol ?getEnchantNameAndLevel\@EnchantUtils\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@Enchant\@\@H\@Z */ MCAPI static std::string getEnchantNameAndLevel(enum class Enchant::Type, int); /** - * @symbol ?getEnchantingTablePositions\@EnchantUtils\@\@SA?AV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?getEnchantingTablePositions\@EnchantUtils\@\@SA?AV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI static std::vector getEnchantingTablePositions(class BlockSource &, class Vec3 const &); /** - * @symbol ?getEnchantmentId\@EnchantUtils\@\@SA?AW4Type\@Enchant\@\@AEBVHashedString\@\@\@Z + * @symbol ?getEnchantmentId\@EnchantUtils\@\@SA?AW4Type\@Enchant\@\@AEBVHashedString\@\@\@Z */ MCAPI static enum class Enchant::Type getEnchantmentId(class HashedString const &); /** - * @symbol ?getLegalEnchants\@EnchantUtils\@\@SA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@PEBVItem\@\@\@Z + * @symbol ?getLegalEnchants\@EnchantUtils\@\@SA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@PEBVItem\@\@\@Z */ MCAPI static std::vector getLegalEnchants(class Item const *); /** - * @symbol ?getLootableRandomEnchantIndex\@EnchantUtils\@\@SAHAEAVRandom\@\@\@Z + * @symbol ?getLootableRandomEnchantIndex\@EnchantUtils\@\@SAHAEAVRandom\@\@\@Z */ MCAPI static int getLootableRandomEnchantIndex(class Random &); /** - * @symbol ?getMeleeDamageBonus\@EnchantUtils\@\@SAMAEBVActor\@\@AEAV2\@\@Z + * @symbol ?getMeleeDamageBonus\@EnchantUtils\@\@SAMAEBVActor\@\@AEAV2\@\@Z */ MCAPI static float getMeleeDamageBonus(class Actor const &, class Actor &); /** - * @symbol ?getRandomDamagedItemWithMending\@EnchantUtils\@\@SAAEBVItemStack\@\@AEBVMob\@\@\@Z + * @symbol ?getRandomDamagedItemWithMending\@EnchantUtils\@\@SAAEBVItemStack\@\@AEBVMob\@\@\@Z */ MCAPI static class ItemStack const & getRandomDamagedItemWithMending(class Mob const &); /** - * @symbol ?getRandomItemWith\@EnchantUtils\@\@SAAEBVItemStack\@\@W4Type\@Enchant\@\@AEBVMob\@\@W4EquipmentFilter\@\@\@Z + * @symbol ?getRandomItemWith\@EnchantUtils\@\@SAAEBVItemStack\@\@W4Type\@Enchant\@\@AEBVMob\@\@W4EquipmentFilter\@\@\@Z */ MCAPI static class ItemStack const & getRandomItemWith(enum class Enchant::Type, class Mob const &, enum class EquipmentFilter); /** - * @symbol ?getRandomName\@EnchantUtils\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRandomName\@EnchantUtils\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getRandomName(); /** - * @symbol ?getTotalProtectionLevels\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@AEBVMob\@\@\@Z + * @symbol ?getTotalProtectionLevels\@EnchantUtils\@\@SAHW4Type\@Enchant\@\@AEBVMob\@\@\@Z */ MCAPI static int getTotalProtectionLevels(enum class Enchant::Type, class Mob const &); /** - * @symbol ?hasCurse\@EnchantUtils\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?hasCurse\@EnchantUtils\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool hasCurse(class ItemStackBase const &); /** - * @symbol ?hasEnchant\@EnchantUtils\@\@SA_NW4Type\@Enchant\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?hasEnchant\@EnchantUtils\@\@SA_NW4Type\@Enchant\@\@AEBVItemStackBase\@\@\@Z */ MCAPI static bool hasEnchant(enum class Enchant::Type, class ItemStackBase const &); /** - * @symbol ?isCurse\@EnchantUtils\@\@SA_NW4Type\@Enchant\@\@\@Z + * @symbol ?isCurse\@EnchantUtils\@\@SA_NW4Type\@Enchant\@\@\@Z */ MCAPI static bool isCurse(enum class Enchant::Type); /** - * @symbol ?randomlyEnchant\@EnchantUtils\@\@SAXAEAVItemStack\@\@HH_N\@Z + * @symbol ?randomlyEnchant\@EnchantUtils\@\@SAXAEAVItemStack\@\@HH_N\@Z */ MCAPI static void randomlyEnchant(class ItemStack &, int, int, bool); /** - * @symbol ?randomlyEnchant\@EnchantUtils\@\@SAXAEAVItemInstance\@\@HH_N\@Z + * @symbol ?randomlyEnchant\@EnchantUtils\@\@SAXAEAVItemInstance\@\@HH_N\@Z */ MCAPI static void randomlyEnchant(class ItemInstance &, int, int, bool); /** - * @symbol ?removeEnchants\@EnchantUtils\@\@SAXAEAVItemStack\@\@\@Z + * @symbol ?removeEnchants\@EnchantUtils\@\@SAXAEAVItemStack\@\@\@Z */ MCAPI static void removeEnchants(class ItemStack &); /** - * @symbol ?selectEnchantments\@EnchantUtils\@\@SA?AVItemEnchants\@\@PEBVItem\@\@HH_N\@Z + * @symbol ?selectEnchantments\@EnchantUtils\@\@SA?AVItemEnchants\@\@PEBVItem\@\@HH_N\@Z */ MCAPI static class ItemEnchants selectEnchantments(class Item const *, int, int, bool); //private: /** - * @symbol ?_convertBookCheck\@EnchantUtils\@\@CAXAEAVItemStackBase\@\@\@Z + * @symbol ?_convertBookCheck\@EnchantUtils\@\@CAXAEAVItemStackBase\@\@\@Z */ MCAPI static void _convertBookCheck(class ItemStackBase &); private: /** - * @symbol ?mEnchantmentNames\@EnchantUtils\@\@0V?$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\@\@A + * @symbol ?mEnchantmentNames\@EnchantUtils\@\@0V?$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\@\@A */ MCAPI static std::vector mEnchantmentNames; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp b/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp index 6d6e8a1ff0..e9fa9d04a3 100644 --- a/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp +++ b/LiteLoader/include/llapi/mc/EnchantWithLevelsFunction.hpp @@ -32,25 +32,25 @@ class EnchantWithLevelsFunction { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANTWITHLEVELSFUNCTION /** - * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAHAEAVItemStack\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ - MCVAPI int apply(class ItemStack &, class Random &, struct Trade const &, class LootTableContext &); + MCVAPI void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAHAEAVItemInstance\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ - MCVAPI int apply(class ItemInstance &, class Random &, struct Trade const &, class LootTableContext &); + MCVAPI void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAHAEAVItemStack\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z */ - MCVAPI void apply(class ItemStack &, class Random &, class LootTableContext &); + MCVAPI int apply(class ItemStack &, class Random &, struct Trade const &, class LootTableContext &); /** - * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?apply\@EnchantWithLevelsFunction\@\@UEAAHAEAVItemInstance\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z */ - MCVAPI void apply(class ItemInstance &, class Random &, class LootTableContext &); + MCVAPI int apply(class ItemInstance &, class Random &, struct Trade const &, class LootTableContext &); #endif /** - * @symbol ?deserialize\@EnchantWithLevelsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@EnchantWithLevelsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp index 8274b11a92..edda22f26e 100644 --- a/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp +++ b/LiteLoader/include/llapi/mc/EnchantedBookItem.hpp @@ -32,93 +32,93 @@ class EnchantedBookItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantedBookItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 50 - * @symbol ?isGlint\@EnchantedBookItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@EnchantedBookItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@EnchantedBookItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@EnchantedBookItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@EnchantedBookItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@EnchantedBookItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @symbol ??0EnchantedBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0EnchantedBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI EnchantedBookItem(std::string const &, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp index defc8fd879..518435a8c9 100644 --- a/LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingContainerManagerModel.hpp @@ -31,60 +31,60 @@ class EnchantingContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantingContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@EnchantingContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@EnchantingContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@EnchantingContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@EnchantingContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@EnchantingContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@EnchantingContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@EnchantingContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@EnchantingContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@EnchantingContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@EnchantingContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@EnchantingContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@EnchantingContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@EnchantingContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@EnchantingContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0EnchantingContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0EnchantingContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI EnchantingContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?getEnchantOptions\@EnchantingContainerManagerModel\@\@QEBAAEBV?$vector\@VItemEnchantOption\@\@V?$allocator\@VItemEnchantOption\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getEnchantOptions\@EnchantingContainerManagerModel\@\@QEBAAEBV?$vector\@VItemEnchantOption\@\@V?$allocator\@VItemEnchantOption\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getEnchantOptions() const; /** - * @symbol ?recalculateOptions\@EnchantingContainerManagerModel\@\@QEAAXXZ + * @symbol ?recalculateOptions\@EnchantingContainerManagerModel\@\@QEAAXXZ */ MCAPI void recalculateOptions(); /** - * @symbol ?NUM_OPTIONS\@EnchantingContainerManagerModel\@\@2HB + * @symbol ?NUM_OPTIONS\@EnchantingContainerManagerModel\@\@2HB */ MCAPI static int const NUM_OPTIONS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantingContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/EnchantingContainerScreenValidator.hpp index 009548faa5..a8e7284178 100644 --- a/LiteLoader/include/llapi/mc/EnchantingContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class EnchantingContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantingContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0EnchantingContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0EnchantingContainerScreenValidator\@\@QEAA\@XZ */ MCAPI EnchantingContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantingInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/EnchantingInputContainerValidation.hpp index 944e273e79..801ebdb2b0 100644 --- a/LiteLoader/include/llapi/mc/EnchantingInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingInputContainerValidation.hpp @@ -31,55 +31,55 @@ class EnchantingInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantingInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@EnchantingInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@EnchantingInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@EnchantingInputContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@EnchantingInputContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@EnchantingInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@EnchantingInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANTINGINPUTCONTAINERVALIDATION /** - * @symbol ?getAvailableSetCount\@EnchantingInputContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @symbol ?getAvailableSetCount\@EnchantingInputContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ MCVAPI int getAvailableSetCount(int, class ItemStackBase const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantingMaterialContainerValidation.hpp b/LiteLoader/include/llapi/mc/EnchantingMaterialContainerValidation.hpp index 0f36927e91..d2ace42c93 100644 --- a/LiteLoader/include/llapi/mc/EnchantingMaterialContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingMaterialContainerValidation.hpp @@ -31,54 +31,54 @@ class EnchantingMaterialContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantingMaterialContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@EnchantingMaterialContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@EnchantingMaterialContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@EnchantingMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@EnchantingMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp index 35ee3db656..682c2bc602 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlock.hpp @@ -31,218 +31,223 @@ class EnchantingTableBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantingTableBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@EnchantingTableBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@EnchantingTableBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@EnchantingTableBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@EnchantingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@EnchantingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCHANTINGTABLEBLOCK /** - * @symbol ?isCraftingBlock\@EnchantingTableBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@EnchantingTableBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@EnchantingTableBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@EnchantingTableBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0EnchantingTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EnchantingTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EnchantingTableBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp index 8922222755..b16416f6e4 100644 --- a/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EnchantingTableBlockActor.hpp @@ -31,83 +31,83 @@ class EnchantingTableBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnchantingTableBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@EnchantingTableBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@EnchantingTableBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@EnchantingTableBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@EnchantingTableBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@EnchantingTableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@EnchantingTableBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 26 - * @symbol ?getName\@EnchantingTableBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 26 + * @symbol ?getName\@EnchantingTableBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@EnchantingTableBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@EnchantingTableBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@EnchantingTableBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0EnchantingTableBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0EnchantingTableBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI EnchantingTableBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnchantmentInstance.hpp b/LiteLoader/include/llapi/mc/EnchantmentInstance.hpp index 8a370b0c17..993c7ff1f4 100644 --- a/LiteLoader/include/llapi/mc/EnchantmentInstance.hpp +++ b/LiteLoader/include/llapi/mc/EnchantmentInstance.hpp @@ -30,32 +30,32 @@ class EnchantmentInstance { public: /** - * @symbol ??0EnchantmentInstance\@\@QEAA\@XZ + * @symbol ??0EnchantmentInstance\@\@QEAA\@XZ */ MCAPI EnchantmentInstance(); /** - * @symbol ??0EnchantmentInstance\@\@QEAA\@W4Type\@Enchant\@\@H\@Z + * @symbol ??0EnchantmentInstance\@\@QEAA\@W4Type\@Enchant\@\@H\@Z */ MCAPI EnchantmentInstance(enum class Enchant::Type, int); /** - * @symbol ?getEnchantLevel\@EnchantmentInstance\@\@QEBAHXZ + * @symbol ?getEnchantLevel\@EnchantmentInstance\@\@QEBAHXZ */ MCAPI int getEnchantLevel() const; /** - * @symbol ?getEnchantType\@EnchantmentInstance\@\@QEBA?AW4Type\@Enchant\@\@XZ + * @symbol ?getEnchantType\@EnchantmentInstance\@\@QEBA?AW4Type\@Enchant\@\@XZ */ MCAPI enum class Enchant::Type getEnchantType() const; /** - * @symbol ??8EnchantmentInstance\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8EnchantmentInstance\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class EnchantmentInstance const &) const; /** - * @symbol ?setEnchantLevel\@EnchantmentInstance\@\@QEAAXH\@Z + * @symbol ?setEnchantLevel\@EnchantmentInstance\@\@QEAAXH\@Z */ MCAPI void setEnchantLevel(int); /** - * @symbol ?setEnchantType\@EnchantmentInstance\@\@QEAAXW4Type\@Enchant\@\@\@Z + * @symbol ?setEnchantType\@EnchantmentInstance\@\@QEAAXW4Type\@Enchant\@\@\@Z */ MCAPI void setEnchantType(enum class Enchant::Type); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp b/LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp index 8c94cd3f8c..7e470fda2c 100644 --- a/LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedFileAccessStrategy.hpp @@ -33,77 +33,77 @@ class EncryptedFileAccessStrategy : public DirectoryPackAccessStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EncryptedFileAccessStrategy(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?isWritable\@EncryptedFileAccessStrategy\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isWritable\@EncryptedFileAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const; /** - * @vftbl 6 - * @symbol ?isTrusted\@EncryptedFileAccessStrategy\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isTrusted\@EncryptedFileAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const; /** - * @vftbl 7 - * @symbol ?hasAsset\@EncryptedFileAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N\@Z + * @vftbl 7 + * @symbol ?hasAsset\@EncryptedFileAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ - virtual bool hasAsset(class Core::Path const &, bool) const; + virtual bool hasAsset(class Core::Path const &, bool, bool) const; /** - * @vftbl 9 - * @symbol ?getAsset\@EncryptedFileAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 9 + * @symbol ?getAsset\@EncryptedFileAccessStrategy\@\@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; /** - * @vftbl 10 - * @symbol ?deleteAsset\@EncryptedFileAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @vftbl 10 + * @symbol ?deleteAsset\@EncryptedFileAccessStrategy\@\@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 &); /** - * @vftbl 11 - * @symbol ?writeAsset\@EncryptedFileAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 11 + * @symbol ?writeAsset\@EncryptedFileAccessStrategy\@\@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 &); /** - * @vftbl 16 - * @symbol ?createSubPack\@EncryptedFileAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @vftbl 16 + * @symbol ?createSubPack\@EncryptedFileAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ virtual std::unique_ptr createSubPack(class Core::Path const &) const; /** - * @vftbl 17 - * @symbol ?generateAssetSet\@EncryptedFileAccessStrategy\@\@UEAA?AW4PackAccessAssetGenerationResult\@\@XZ + * @vftbl 17 + * @symbol ?generateAssetSet\@EncryptedFileAccessStrategy\@\@UEAA?AW4PackAccessAssetGenerationResult\@\@XZ */ virtual enum class PackAccessAssetGenerationResult generateAssetSet(); /** - * @vftbl 21 - * @symbol ?readContentIdentity\@EncryptedFileAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ + * @vftbl 21 + * @symbol ?readContentIdentity\@EncryptedFileAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ */ virtual class ContentIdentity readContentIdentity() const; /** - * @symbol ??0EncryptedFileAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@_NV?$optional\@V?$unordered_map\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@U?$equal_to\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@V?$allocator\@U?$pair\@$$CBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@4\@\@std\@\@\@std\@\@\@Z + * @symbol ??0EncryptedFileAccessStrategy\@\@QEAA\@AEBVResourceLocation\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@_NV?$optional\@V?$unordered_map\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@U?$equal_to\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@4\@V?$allocator\@U?$pair\@$$CBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@4\@\@std\@\@\@std\@\@\@Z */ MCAPI EncryptedFileAccessStrategy(class ResourceLocation const &, class ContentIdentity const &, class gsl::not_null> const &, bool, class std::optional, std::string, struct std::hash>, struct std::equal_to>, class std::allocator const, std::string>>>>); /** - * @symbol ?isValidEncryptedPack\@EncryptedFileAccessStrategy\@\@SA_NAEBVPath\@Core\@\@AEAVContentIdentity\@\@\@Z + * @symbol ?isValidEncryptedPack\@EncryptedFileAccessStrategy\@\@SA_NAEBVPath\@Core\@\@AEAVContentIdentity\@\@\@Z */ MCAPI static bool isValidEncryptedPack(class Core::Path const &, class ContentIdentity &); //protected: /** - * @symbol ?_getContentsFile\@EncryptedFileAccessStrategy\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_getContentsFile\@EncryptedFileAccessStrategy\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string _getContentsFile(); //private: /** - * @symbol ?_getContentIdentityFromEncryptedStream\@EncryptedFileAccessStrategy\@\@CA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVContentIdentity\@\@\@Z + * @symbol ?_getContentIdentityFromEncryptedStream\@EncryptedFileAccessStrategy\@\@CA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVContentIdentity\@\@\@Z */ MCAPI static bool _getContentIdentityFromEncryptedStream(std::string &, class ContentIdentity &); /** - * @symbol ?_transformStream\@EncryptedFileAccessStrategy\@\@CAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_K\@Z + * @symbol ?_transformStream\@EncryptedFileAccessStrategy\@\@CAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_K\@Z */ MCAPI static void _transformStream(std::string &, std::string const &, unsigned __int64); @@ -111,4 +111,4 @@ class EncryptedFileAccessStrategy : public DirectoryPackAccessStrategy { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp b/LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp index a18a801cdb..65d0f5bc9e 100644 --- a/LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedNetworkPeer.hpp @@ -31,37 +31,43 @@ class EncryptedNetworkPeer : public NetworkPeer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EncryptedNetworkPeer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?sendPacket\@EncryptedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z + * @vftbl 1 + * @symbol ?sendPacket\@EncryptedNetworkPeer\@\@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\@EncryptedNetworkPeer\@\@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 + * @vftbl 2 + * @symbol ?receivePacket\@EncryptedNetworkPeer\@\@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\@EncryptedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + * @vftbl 3 + * @symbol ?getNetworkStatus\@EncryptedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ */ virtual struct NetworkPeer::NetworkStatus getNetworkStatus() const; /** - * @vftbl 7 - * @symbol ?isEncrypted\@EncryptedNetworkPeer\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?isEncrypted\@EncryptedNetworkPeer\@\@UEBA_NXZ */ virtual bool isEncrypted() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENCRYPTEDNETWORKPEER /** - * @symbol ??0EncryptedNetworkPeer\@\@QEAA\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EncryptedNetworkPeer(); +#endif + /** + * @symbol ??0EncryptedNetworkPeer\@\@QEAA\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z */ MCAPI EncryptedNetworkPeer(class std::shared_ptr); /** - * @symbol ?enableEncryption\@EncryptedNetworkPeer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?enableEncryption\@EncryptedNetworkPeer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void enableEncryption(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp b/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp index 2e2577e0f4..6dd11cbcdf 100644 --- a/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedProxyEnv.hpp @@ -30,108 +30,108 @@ class EncryptedProxyEnv { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EncryptedProxyEnv(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?NewSequentialFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z + * @vftbl 1 + * @symbol ?NewSequentialFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z */ virtual class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @vftbl 2 - * @symbol ?NewRandomAccessFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z + * @vftbl 2 + * @symbol ?NewRandomAccessFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z */ virtual class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @vftbl 3 - * @symbol ?NewWritableFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @vftbl 3 + * @symbol ?NewWritableFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ virtual class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 4 - * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 4 + * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 5 - * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool FileExists(std::string const &); /** - * @vftbl 6 - * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @vftbl 6 + * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ virtual class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @vftbl 7 - * @symbol ?DeleteFileA\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?DeleteFileA\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteFileA(std::string const &); /** - * @vftbl 8 - * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status CreateDir(std::string const &); /** - * @vftbl 9 - * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteDir(std::string const &); /** - * @vftbl 10 - * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @vftbl 10 + * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ virtual class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @vftbl 11 - * @symbol ?RenameFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 11 + * @symbol ?RenameFile\@EncryptedProxyEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @vftbl 12 - * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z + * @vftbl 12 + * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z */ virtual class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @vftbl 13 - * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z + * @vftbl 13 + * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z */ virtual class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @vftbl 14 - * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 14 + * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void Schedule(void ( *)(void *), void *); /** - * @vftbl 15 - * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 15 + * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void StartThread(void ( *)(void *), void *); /** - * @vftbl 16 - * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status GetTestDirectory(std::string *); /** - * @vftbl 17 - * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z + * @vftbl 17 + * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z */ virtual class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @vftbl 18 - * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ + * @vftbl 18 + * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ */ virtual unsigned __int64 NowMicros(); /** - * @vftbl 19 - * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z + * @vftbl 19 + * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); /** - * @symbol ??0EncryptedProxyEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@AEBVContentIdentity\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4EncryptedProxyReadMode\@\@\@Z + * @symbol ??0EncryptedProxyEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@AEBVContentIdentity\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4EncryptedProxyReadMode\@\@\@Z */ MCAPI EncryptedProxyEnv(class leveldb::Env *, class ContentIdentity const &, std::string const &, enum class EncryptedProxyReadMode); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp b/LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp index 124ce18997..b790cd756e 100644 --- a/LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp +++ b/LiteLoader/include/llapi/mc/EncryptedZipTransforms.hpp @@ -31,23 +31,23 @@ class EncryptedZipTransforms { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EncryptedZipTransforms(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readTransform\@EncryptedZipTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?readTransform\@EncryptedZipTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z */ virtual bool readTransform(std::vector &) const; /** - * @vftbl 2 - * @symbol ?writeTransform\@EncryptedZipTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?writeTransform\@EncryptedZipTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z */ virtual bool writeTransform(std::vector &) const; /** - * @symbol ??0EncryptedZipTransforms\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0EncryptedZipTransforms\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI EncryptedZipTransforms(class gsl::not_null> const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndCityFeature.hpp b/LiteLoader/include/llapi/mc/EndCityFeature.hpp index 31dae18afa..b2d17de3de 100644 --- a/LiteLoader/include/llapi/mc/EndCityFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndCityFeature.hpp @@ -31,33 +31,33 @@ class EndCityFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndCityFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@EndCityFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@EndCityFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@EndCityFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@EndCityFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@EndCityFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@EndCityFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@EndCityFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@EndCityFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0EndCityFeature\@\@QEAA\@AEAVDimension\@\@AEAI\@Z + * @symbol ??0EndCityFeature\@\@QEAA\@AEAVDimension\@\@AEAI\@Z */ MCAPI EndCityFeature(class Dimension &, unsigned int &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndCityPieces.hpp b/LiteLoader/include/llapi/mc/EndCityPieces.hpp index ba228792b0..3c3cc1d4d2 100644 --- a/LiteLoader/include/llapi/mc/EndCityPieces.hpp +++ b/LiteLoader/include/llapi/mc/EndCityPieces.hpp @@ -45,36 +45,36 @@ enum class SectionType; public: /** - * @symbol ?init\@EndCityPieces\@\@SAXXZ + * @symbol ?init\@EndCityPieces\@\@SAXXZ */ MCAPI static void init(); /** - * @symbol ?startHouseTower\@EndCityPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@W4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @symbol ?startHouseTower\@EndCityPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@W4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI static void startHouseTower(class gsl::not_null>, class BlockPos const &, enum class Rotation, std::vector> &, class Random &); //private: /** - * @symbol ?_addHelper\@EndCityPieces\@\@CAPEAVEndCityPiece\@1\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$unique_ptr\@VEndCityPiece\@EndCityPieces\@\@U?$default_delete\@VEndCityPiece\@EndCityPieces\@\@\@std\@\@\@4\@\@Z + * @symbol ?_addHelper\@EndCityPieces\@\@CAPEAVEndCityPiece\@1\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$unique_ptr\@VEndCityPiece\@EndCityPieces\@\@U?$default_delete\@VEndCityPiece\@EndCityPieces\@\@\@std\@\@\@4\@\@Z */ MCAPI static class EndCityPieces::EndCityPiece * _addHelper(std::vector> &, std::unique_ptr); /** - * @symbol ?_createPiece\@EndCityPieces\@\@CA?AV?$unique_ptr\@VEndCityPiece\@EndCityPieces\@\@U?$default_delete\@VEndCityPiece\@EndCityPieces\@\@\@std\@\@\@std\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@PEAVEndCityPiece\@1\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Rotation\@\@_N\@Z + * @symbol ?_createPiece\@EndCityPieces\@\@CA?AV?$unique_ptr\@VEndCityPiece\@EndCityPieces\@\@U?$default_delete\@VEndCityPiece\@EndCityPieces\@\@\@std\@\@\@std\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@PEAVEndCityPiece\@1\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Rotation\@\@_N\@Z */ MCAPI static std::unique_ptr _createPiece(class gsl::not_null>, class EndCityPieces::EndCityPiece *, class BlockPos const &, std::string const &, enum class Rotation, bool); /** - * @symbol ?_recursiveChildren\@EndCityPieces\@\@CA_NV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$vector\@V?$unique_ptr\@VSectionGenerator\@EndCityPieces\@\@U?$default_delete\@VSectionGenerator\@EndCityPieces\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VSectionGenerator\@EndCityPieces\@\@U?$default_delete\@VSectionGenerator\@EndCityPieces\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@W4SectionType\@1\@HPEAVEndCityPiece\@1\@AEBVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@5\@AEAVRandom\@\@\@Z + * @symbol ?_recursiveChildren\@EndCityPieces\@\@CA_NV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$vector\@V?$unique_ptr\@VSectionGenerator\@EndCityPieces\@\@U?$default_delete\@VSectionGenerator\@EndCityPieces\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VSectionGenerator\@EndCityPieces\@\@U?$default_delete\@VSectionGenerator\@EndCityPieces\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@W4SectionType\@1\@HPEAVEndCityPiece\@1\@AEBVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@5\@AEAVRandom\@\@\@Z */ MCAPI static bool _recursiveChildren(class gsl::not_null>, std::vector> const &, enum class EndCityPieces::SectionType, int, class EndCityPieces::EndCityPiece *, class BlockPos const &, std::vector> &, class Random &); private: /** - * @symbol ?mInsertSettings\@EndCityPieces\@\@0VLegacyStructureSettings\@\@A + * @symbol ?mInsertSettings\@EndCityPieces\@\@0VLegacyStructureSettings\@\@A */ MCAPI static class LegacyStructureSettings mInsertSettings; /** - * @symbol ?mOverwriteSettings\@EndCityPieces\@\@0VLegacyStructureSettings\@\@A + * @symbol ?mOverwriteSettings\@EndCityPieces\@\@0VLegacyStructureSettings\@\@A */ MCAPI static class LegacyStructureSettings mOverwriteSettings; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndCityStart.hpp b/LiteLoader/include/llapi/mc/EndCityStart.hpp index d3f3c8b6b1..8fb3be44e4 100644 --- a/LiteLoader/include/llapi/mc/EndCityStart.hpp +++ b/LiteLoader/include/llapi/mc/EndCityStart.hpp @@ -31,22 +31,22 @@ class EndCityStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndCityStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?isValid\@EndCityStart\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isValid\@EndCityStart\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0EndCityStart\@\@QEAA\@AEAVDimension\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z + * @symbol ??0EndCityStart\@\@QEAA\@AEAVDimension\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z */ MCAPI EndCityStart(class Dimension &, class Random &, class ChunkPos const &); /** - * @symbol ?getYPositionForFeature\@EndCityStart\@\@SAHAEBVChunkPos\@\@AEAVDimension\@\@\@Z + * @symbol ?getYPositionForFeature\@EndCityStart\@\@SAHAEBVChunkPos\@\@AEAVDimension\@\@\@Z */ MCAPI static int getYPositionForFeature(class ChunkPos const &, class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp index 6905170d1a..03913e7b90 100644 --- a/LiteLoader/include/llapi/mc/EndCrystalItem.hpp +++ b/LiteLoader/include/llapi/mc/EndCrystalItem.hpp @@ -32,93 +32,93 @@ class EndCrystalItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndCrystalItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 50 - * @symbol ?isGlint\@EndCrystalItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@EndCrystalItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@EndCrystalItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@EndCrystalItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@EndCrystalItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@EndCrystalItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0EndCrystalItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EndCrystalItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EndCrystalItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndDragonFight.hpp b/LiteLoader/include/llapi/mc/EndDragonFight.hpp index 846a81a78f..cfc0f0581c 100644 --- a/LiteLoader/include/llapi/mc/EndDragonFight.hpp +++ b/LiteLoader/include/llapi/mc/EndDragonFight.hpp @@ -37,144 +37,144 @@ struct GateWayGenerator { public: /** - * @symbol ??0EndDragonFight\@\@QEAA\@AEAVBlockSource\@\@\@Z + * @symbol ??0EndDragonFight\@\@QEAA\@AEAVBlockSource\@\@\@Z */ MCAPI EndDragonFight(class BlockSource &); /** - * @symbol ?loadData\@EndDragonFight\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?loadData\@EndDragonFight\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void loadData(class CompoundTag const &); /** - * @symbol ?onCrystalDestroyed\@EndDragonFight\@\@QEAAXAEBVEnderCrystal\@\@AEBVActorDamageSource\@\@\@Z + * @symbol ?onCrystalDestroyed\@EndDragonFight\@\@QEAAXAEBVEnderCrystal\@\@AEBVActorDamageSource\@\@\@Z */ MCAPI void onCrystalDestroyed(class EnderCrystal const &, class ActorDamageSource const &); /** - * @symbol ?resetSpikeCrystals\@EndDragonFight\@\@QEAAXXZ + * @symbol ?resetSpikeCrystals\@EndDragonFight\@\@QEAAXXZ */ MCAPI void resetSpikeCrystals(); /** - * @symbol ?saveData\@EndDragonFight\@\@QEAAXAEAVCompoundTag\@\@\@Z + * @symbol ?saveData\@EndDragonFight\@\@QEAAXAEAVCompoundTag\@\@\@Z */ MCAPI void saveData(class CompoundTag &); /** - * @symbol ?spawnNewGatewayChunks\@EndDragonFight\@\@QEAAXAEBVBlockPos\@\@_N1\@Z + * @symbol ?spawnNewGatewayChunks\@EndDragonFight\@\@QEAAXAEBVBlockPos\@\@_N1\@Z */ MCAPI void spawnNewGatewayChunks(class BlockPos const &, bool, bool); /** - * @symbol ?tick\@EndDragonFight\@\@QEAAXXZ + * @symbol ?tick\@EndDragonFight\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?tryRespawn\@EndDragonFight\@\@QEAAXXZ + * @symbol ?tryRespawn\@EndDragonFight\@\@QEAAXXZ */ MCAPI void tryRespawn(); /** - * @symbol ?verifyExitPositions\@EndDragonFight\@\@QEAAXAEAVEndGatewayBlockActor\@\@\@Z + * @symbol ?verifyExitPositions\@EndDragonFight\@\@QEAAXAEAVEndGatewayBlockActor\@\@\@Z */ MCAPI void verifyExitPositions(class EndGatewayBlockActor &); /** - * @symbol ??1EndDragonFight\@\@QEAA\@XZ + * @symbol ??1EndDragonFight\@\@QEAA\@XZ */ MCAPI ~EndDragonFight(); //private: /** - * @symbol ?_canSpawnNewGateway\@EndDragonFight\@\@AEBA_NPEAVChunkViewSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canSpawnNewGateway\@EndDragonFight\@\@AEBA_NPEAVChunkViewSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canSpawnNewGateway(class ChunkViewSource *, class BlockPos const &) const; /** - * @symbol ?_createNewDragon\@EndDragonFight\@\@AEAAXXZ + * @symbol ?_createNewDragon\@EndDragonFight\@\@AEAAXXZ */ MCAPI void _createNewDragon(); /** - * @symbol ?_findExitPortal\@EndDragonFight\@\@AEAA?AUBuildMatch\@\@XZ + * @symbol ?_findExitPortal\@EndDragonFight\@\@AEAA?AUBuildMatch\@\@XZ */ MCAPI struct BuildMatch _findExitPortal(); /** - * @symbol ?_initializeDragon\@EndDragonFight\@\@AEAAXAEAVEnderDragon\@\@\@Z + * @symbol ?_initializeDragon\@EndDragonFight\@\@AEAAXAEAVEnderDragon\@\@\@Z */ MCAPI void _initializeDragon(class EnderDragon &); /** - * @symbol ?_makeEndIslandFeature\@EndDragonFight\@\@AEAAXAEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_makeEndIslandFeature\@EndDragonFight\@\@AEAAXAEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI void _makeEndIslandFeature(class BlockSource &, class BlockPos); /** - * @symbol ?_placeAndLinkNewGatewayPair\@EndDragonFight\@\@AEAAXXZ + * @symbol ?_placeAndLinkNewGatewayPair\@EndDragonFight\@\@AEAAXXZ */ MCAPI void _placeAndLinkNewGatewayPair(); /** - * @symbol ?_setEndGatewayBlockActorExitPosition\@EndDragonFight\@\@AEAA_NAEAVBlockSource\@\@0AEBVBlockPos\@\@1_N\@Z + * @symbol ?_setEndGatewayBlockActorExitPosition\@EndDragonFight\@\@AEAA_NAEAVBlockSource\@\@0AEBVBlockPos\@\@1_N\@Z */ MCAPI bool _setEndGatewayBlockActorExitPosition(class BlockSource &, class BlockSource &, class BlockPos const &, class BlockPos const &, bool); /** - * @symbol ?_setEndGatewayExitPositions\@EndDragonFight\@\@AEAAXXZ + * @symbol ?_setEndGatewayExitPositions\@EndDragonFight\@\@AEAAXXZ */ MCAPI void _setEndGatewayExitPositions(); /** - * @symbol ?_setRespawnStage\@EndDragonFight\@\@AEAAXW4RespawnAnimation\@\@\@Z + * @symbol ?_setRespawnStage\@EndDragonFight\@\@AEAAXW4RespawnAnimation\@\@\@Z */ MCAPI void _setRespawnStage(enum class RespawnAnimation); /** - * @symbol ?_spawnExitPortal\@EndDragonFight\@\@AEAAX_N\@Z + * @symbol ?_spawnExitPortal\@EndDragonFight\@\@AEAAX_N\@Z */ MCAPI void _spawnExitPortal(bool); /** - * @symbol ?_spawnNewGatewayChunksTask\@EndDragonFight\@\@AEAAXAEAV?$tuple\@W4GatewayTask\@EndDragonFight\@\@UGateWayGenerator\@2\@U32\@\@std\@\@\@Z + * @symbol ?_spawnNewGatewayChunksTask\@EndDragonFight\@\@AEAAXAEAV?$tuple\@W4GatewayTask\@EndDragonFight\@\@UGateWayGenerator\@2\@U32\@\@std\@\@\@Z */ MCAPI void _spawnNewGatewayChunksTask(class std::tuple &); /** - * @symbol ?_spawnNewGatewayPair\@EndDragonFight\@\@AEAAXXZ + * @symbol ?_spawnNewGatewayPair\@EndDragonFight\@\@AEAAXXZ */ MCAPI void _spawnNewGatewayPair(); /** - * @symbol ?_tickRespawnAnimation\@EndDragonFight\@\@AEAAXAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?_tickRespawnAnimation\@EndDragonFight\@\@AEAAXAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI void _tickRespawnAnimation(std::vector const &, int); /** - * @symbol ?_updateCrystalCount\@EndDragonFight\@\@AEAAXXZ + * @symbol ?_updateCrystalCount\@EndDragonFight\@\@AEAAXXZ */ MCAPI void _updateCrystalCount(); /** - * @symbol ?_verifyExitPositionsTask\@EndDragonFight\@\@AEAAXAEAV?$tuple\@W4GatewayTask\@EndDragonFight\@\@UGateWayGenerator\@2\@U32\@\@std\@\@\@Z + * @symbol ?_verifyExitPositionsTask\@EndDragonFight\@\@AEAAXAEAV?$tuple\@W4GatewayTask\@EndDragonFight\@\@UGateWayGenerator\@2\@U32\@\@std\@\@\@Z */ MCAPI void _verifyExitPositionsTask(class std::tuple &); private: /** - * @symbol ?ARENA_SIZE_CHUNKS\@EndDragonFight\@\@0HB + * @symbol ?ARENA_SIZE_CHUNKS\@EndDragonFight\@\@0HB */ MCAPI static int const ARENA_SIZE_CHUNKS; /** - * @symbol ?DEFAULT_PORTAL_LOCATION\@EndDragonFight\@\@0VBlockPos\@\@B + * @symbol ?DEFAULT_PORTAL_LOCATION\@EndDragonFight\@\@0VBlockPos\@\@B */ MCAPI static class BlockPos const DEFAULT_PORTAL_LOCATION; /** - * @symbol ?GATEWAY_CHUNK_RADIUS\@EndDragonFight\@\@0HB + * @symbol ?GATEWAY_CHUNK_RADIUS\@EndDragonFight\@\@0HB */ MCAPI static int const GATEWAY_CHUNK_RADIUS; /** - * @symbol ?GATEWAY_COUNT\@EndDragonFight\@\@0HB + * @symbol ?GATEWAY_COUNT\@EndDragonFight\@\@0HB */ MCAPI static int const GATEWAY_COUNT; /** - * @symbol ?GATEWAY_DISTANCE\@EndDragonFight\@\@0HB + * @symbol ?GATEWAY_DISTANCE\@EndDragonFight\@\@0HB */ MCAPI static int const GATEWAY_DISTANCE; /** - * @symbol ?GATEWAY_HEIGHT\@EndDragonFight\@\@0HB + * @symbol ?GATEWAY_HEIGHT\@EndDragonFight\@\@0HB */ MCAPI static int const GATEWAY_HEIGHT; /** - * @symbol ?TIME_BETWEEN_CRYSTAL_SCANS\@EndDragonFight\@\@0HB + * @symbol ?TIME_BETWEEN_CRYSTAL_SCANS\@EndDragonFight\@\@0HB */ MCAPI static int const TIME_BETWEEN_CRYSTAL_SCANS; /** - * @symbol ?TIME_BETWEEN_PLAYER_SCANS\@EndDragonFight\@\@0HB + * @symbol ?TIME_BETWEEN_PLAYER_SCANS\@EndDragonFight\@\@0HB */ MCAPI static int const TIME_BETWEEN_PLAYER_SCANS; /** - * @symbol ?TIME_BETWEEN_PORTAL_SCANS\@EndDragonFight\@\@0HB + * @symbol ?TIME_BETWEEN_PORTAL_SCANS\@EndDragonFight\@\@0HB */ MCAPI static int const TIME_BETWEEN_PORTAL_SCANS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp index 2634db5587..97c178c68b 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlock.hpp @@ -31,239 +31,244 @@ class EndGatewayBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndGatewayBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?newBlockEntity\@EndGatewayBlock\@\@UEBA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 2 + * @symbol ?newBlockEntity\@EndGatewayBlock\@\@UEBA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class std::shared_ptr newBlockEntity(class BlockPos const &, class Block const &) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@EndGatewayBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@EndGatewayBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@EndGatewayBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@EndGatewayBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@EndGatewayBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@EndGatewayBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@EndGatewayBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@EndGatewayBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@EndGatewayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@EndGatewayBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDGATEWAYBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@EndGatewayBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@EndGatewayBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0EndGatewayBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EndGatewayBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EndGatewayBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp index 01acc23457..37ee99e0c3 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayBlockActor.hpp @@ -31,140 +31,140 @@ class EndGatewayBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndGatewayBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@EndGatewayBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@EndGatewayBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@EndGatewayBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@EndGatewayBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@EndGatewayBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@EndGatewayBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@EndGatewayBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@EndGatewayBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 16 - * @symbol ?triggerEvent\@EndGatewayBlockActor\@\@UEAAXHH\@Z + * @vftbl 16 + * @symbol ?triggerEvent\@EndGatewayBlockActor\@\@UEAAXHH\@Z */ virtual void triggerEvent(int, int); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 20 - * @symbol ?hasAlphaLayer\@EndGatewayBlockActor\@\@UEBA_NXZ + * @vftbl 20 + * @symbol ?hasAlphaLayer\@EndGatewayBlockActor\@\@UEBA_NXZ */ virtual bool hasAlphaLayer() const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@EndGatewayBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @symbol ?_getUpdatePacket\@EndGatewayBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ??0EndGatewayBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0EndGatewayBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI EndGatewayBlockActor(class BlockPos const &); /** - * @symbol ?canTeleport\@EndGatewayBlockActor\@\@QEBA_NPEBVGetCollisionShapeInterface\@\@AEBVBlockSource\@\@\@Z + * @symbol ?canTeleport\@EndGatewayBlockActor\@\@QEBA_NPEBVGetCollisionShapeInterface\@\@AEBVBlockSource\@\@\@Z */ MCAPI bool canTeleport(class GetCollisionShapeInterface const *, class BlockSource const &) const; /** - * @symbol ?getExitPosition\@EndGatewayBlockActor\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getExitPosition\@EndGatewayBlockActor\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getExitPosition() const; /** - * @symbol ?getParticleAmount\@EndGatewayBlockActor\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getParticleAmount\@EndGatewayBlockActor\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI int getParticleAmount(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?setExitPosition\@EndGatewayBlockActor\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setExitPosition\@EndGatewayBlockActor\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setExitPosition(class BlockPos const &); /** - * @symbol ?teleportEntity\@EndGatewayBlockActor\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?teleportEntity\@EndGatewayBlockActor\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void teleportEntity(class Actor &); /** - * @symbol ?COOLDOWN_TIME\@EndGatewayBlockActor\@\@2HB + * @symbol ?COOLDOWN_TIME\@EndGatewayBlockActor\@\@2HB */ MCAPI static int const COOLDOWN_TIME; /** - * @symbol ?EVENT_COOLDOWN\@EndGatewayBlockActor\@\@2HB + * @symbol ?EVENT_COOLDOWN\@EndGatewayBlockActor\@\@2HB */ MCAPI static int const EVENT_COOLDOWN; /** - * @symbol ?SPAWN_TIME\@EndGatewayBlockActor\@\@2HB + * @symbol ?SPAWN_TIME\@EndGatewayBlockActor\@\@2HB */ MCAPI static int const SPAWN_TIME; /** - * @symbol ?findExitPortal\@EndGatewayBlockActor\@\@SA?AVBlockPos\@\@AEAVWorldGenerator\@\@AEBV2\@\@Z + * @symbol ?findExitPortal\@EndGatewayBlockActor\@\@SA?AVBlockPos\@\@AEAVWorldGenerator\@\@AEBV2\@\@Z */ MCAPI static class BlockPos findExitPortal(class WorldGenerator &, class BlockPos const &); /** - * @symbol ?findTallestBlock\@EndGatewayBlockActor\@\@SA?AVBlockPos\@\@AEAVBlockSource\@\@AEBV2\@H_N\@Z + * @symbol ?findTallestBlock\@EndGatewayBlockActor\@\@SA?AVBlockPos\@\@AEAVBlockSource\@\@AEBV2\@H_N\@Z */ MCAPI static class BlockPos findTallestBlock(class BlockSource &, class BlockPos const &, int, bool); /** - * @symbol ?findValidSpawnAround\@EndGatewayBlockActor\@\@SA?AVBlockPos\@\@AEAVBlockSource\@\@AEBV2\@_NH\@Z + * @symbol ?findValidSpawnAround\@EndGatewayBlockActor\@\@SA?AVBlockPos\@\@AEAVBlockSource\@\@AEBV2\@_NH\@Z */ MCAPI static class BlockPos findValidSpawnAround(class BlockSource &, class BlockPos const &, bool, int); //private: /** - * @symbol ?_getHighestSection\@EndGatewayBlockActor\@\@CAHAEAVWorldGenerator\@\@AEAVBlockVolume\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getHighestSection\@EndGatewayBlockActor\@\@CAHAEAVWorldGenerator\@\@AEAVBlockVolume\@\@AEBVBlockPos\@\@\@Z */ MCAPI static int _getHighestSection(class WorldGenerator &, class BlockVolume &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndGatewayFeature.hpp b/LiteLoader/include/llapi/mc/EndGatewayFeature.hpp index 45824faa62..e3cc2fdaa1 100644 --- a/LiteLoader/include/llapi/mc/EndGatewayFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndGatewayFeature.hpp @@ -31,14 +31,20 @@ class EndGatewayFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndGatewayFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@EndGatewayFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@EndGatewayFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDGATEWAYFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EndGatewayFeature(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndIslandFeature.hpp b/LiteLoader/include/llapi/mc/EndIslandFeature.hpp index 7896cf110b..9be69e2460 100644 --- a/LiteLoader/include/llapi/mc/EndIslandFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndIslandFeature.hpp @@ -31,14 +31,20 @@ class EndIslandFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndIslandFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@EndIslandFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@EndIslandFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDISLANDFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EndIslandFeature(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndPodiumFeature.hpp b/LiteLoader/include/llapi/mc/EndPodiumFeature.hpp index 336aad96bd..b671163928 100644 --- a/LiteLoader/include/llapi/mc/EndPodiumFeature.hpp +++ b/LiteLoader/include/llapi/mc/EndPodiumFeature.hpp @@ -31,42 +31,48 @@ class EndPodiumFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndPodiumFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@EndPodiumFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@EndPodiumFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDPODIUMFEATURE /** - * @symbol ??0EndPodiumFeature\@\@QEAA\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EndPodiumFeature(); +#endif + /** + * @symbol ??0EndPodiumFeature\@\@QEAA\@_N\@Z */ MCAPI EndPodiumFeature(bool); /** - * @symbol ?CORNER_ROUNDING\@EndPodiumFeature\@\@2MB + * @symbol ?CORNER_ROUNDING\@EndPodiumFeature\@\@2MB */ MCAPI static float const CORNER_ROUNDING; /** - * @symbol ?END_PODIUM_CHUNK_POSITION\@EndPodiumFeature\@\@2VBlockPos\@\@B + * @symbol ?END_PODIUM_CHUNK_POSITION\@EndPodiumFeature\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const END_PODIUM_CHUNK_POSITION; /** - * @symbol ?END_PODIUM_LOCATION\@EndPodiumFeature\@\@2VBlockPos\@\@B + * @symbol ?END_PODIUM_LOCATION\@EndPodiumFeature\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const END_PODIUM_LOCATION; /** - * @symbol ?PODIUM_PILLAR_HEIGHT\@EndPodiumFeature\@\@2HB + * @symbol ?PODIUM_PILLAR_HEIGHT\@EndPodiumFeature\@\@2HB */ MCAPI static int const PODIUM_PILLAR_HEIGHT; /** - * @symbol ?PODIUM_RADIUS\@EndPodiumFeature\@\@2HB + * @symbol ?PODIUM_RADIUS\@EndPodiumFeature\@\@2HB */ MCAPI static int const PODIUM_RADIUS; /** - * @symbol ?RIM_RADIUS\@EndPodiumFeature\@\@2HB + * @symbol ?RIM_RADIUS\@EndPodiumFeature\@\@2HB */ MCAPI static int const RIM_RADIUS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp index 2d09fe06bf..dc4f8600ed 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlock.hpp @@ -31,259 +31,264 @@ class EndPortalBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndPortalBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@EndPortalBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@EndPortalBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@EndPortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@EndPortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@EndPortalBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@EndPortalBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@EndPortalBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@EndPortalBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@EndPortalBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@EndPortalBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@EndPortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@EndPortalBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@EndPortalBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 194 + * @symbol ?getEntityResourceItem\@EndPortalBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDPORTALBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@EndPortalBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@EndPortalBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0EndPortalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EndPortalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EndPortalBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp index c7ba5ee877..2176d3c6cd 100644 --- a/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalBlockActor.hpp @@ -31,53 +31,53 @@ class EndPortalBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndPortalBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0EndPortalBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0EndPortalBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI EndPortalBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp index 04cfb70d74..471b807b09 100644 --- a/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalFrameBlock.hpp @@ -31,256 +31,261 @@ class EndPortalFrameBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndPortalFrameBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@EndPortalFrameBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@EndPortalFrameBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@EndPortalFrameBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@EndPortalFrameBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@EndPortalFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@EndPortalFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@EndPortalFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@EndPortalFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@EndPortalFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@EndPortalFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@EndPortalFrameBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@EndPortalFrameBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@EndPortalFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@EndPortalFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDPORTALFRAMEBLOCK /** - * @symbol ?hasComparatorSignal\@EndPortalFrameBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@EndPortalFrameBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@EndPortalFrameBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@EndPortalFrameBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0EndPortalFrameBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EndPortalFrameBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EndPortalFrameBlock(std::string const &, int); //private: /** - * @symbol ?createPortal\@EndPortalFrameBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?createPortal\@EndPortalFrameBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void createPortal(class BlockSource &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndPortalShape.hpp b/LiteLoader/include/llapi/mc/EndPortalShape.hpp index 18c4132243..830d58b012 100644 --- a/LiteLoader/include/llapi/mc/EndPortalShape.hpp +++ b/LiteLoader/include/llapi/mc/EndPortalShape.hpp @@ -30,20 +30,20 @@ class EndPortalShape { public: /** - * @symbol ??0EndPortalShape\@\@QEAA\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ??0EndPortalShape\@\@QEAA\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI EndPortalShape(class BlockSource &, class BlockPos); /** - * @symbol ?getOrigin\@EndPortalShape\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getOrigin\@EndPortalShape\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getOrigin() const; /** - * @symbol ?isValid\@EndPortalShape\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?isValid\@EndPortalShape\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool isValid(class BlockSource &); /** - * @symbol ??1EndPortalShape\@\@QEAA\@XZ + * @symbol ??1EndPortalShape\@\@QEAA\@XZ */ MCAPI ~EndPortalShape(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndRodBlock.hpp b/LiteLoader/include/llapi/mc/EndRodBlock.hpp index 234bbdd436..529b6eb7ff 100644 --- a/LiteLoader/include/llapi/mc/EndRodBlock.hpp +++ b/LiteLoader/include/llapi/mc/EndRodBlock.hpp @@ -31,258 +31,263 @@ class EndRodBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndRodBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@EndRodBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@EndRodBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@EndRodBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@EndRodBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@EndRodBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@EndRodBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@EndRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@EndRodBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 - * @symbol ?animateTick\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@EndRodBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@EndRodBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@EndRodBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@EndRodBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@EndRodBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0EndRodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EndRodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EndRodBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndTag.hpp b/LiteLoader/include/llapi/mc/EndTag.hpp index d1d0f46bf0..a96452f77d 100644 --- a/LiteLoader/include/llapi/mc/EndTag.hpp +++ b/LiteLoader/include/llapi/mc/EndTag.hpp @@ -36,44 +36,44 @@ class EndTag : public Tag { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@EndTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@EndTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@EndTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@EndTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@EndTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@EndTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@EndTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@EndTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@EndTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@EndTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@EndTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@EndTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@EndTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@EndTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp index b54183efaf..2f3ba8c9bc 100644 --- a/LiteLoader/include/llapi/mc/EnderChestBlock.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlock.hpp @@ -31,214 +31,219 @@ class EnderChestBlock : public ChestBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnderChestBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@EnderChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@EnderChestBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@EnderChestBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@EnderChestBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@EnderChestBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@EnderChestBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDERCHESTBLOCK /** - * @symbol ?canBeSilkTouched\@EnderChestBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@EnderChestBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0EnderChestBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EnderChestBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EnderChestBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp b/LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp index 285ea513e8..beb14f5e3b 100644 --- a/LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestBlockActor.hpp @@ -31,28 +31,28 @@ class EnderChestBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDERCHESTBLOCKACTOR /** - * @symbol ?canPullOutItem\@EnderChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@EnderChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@EnderChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@EnderChestBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?getName\@EnderChestBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@EnderChestBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?playCloseSound\@EnderChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playCloseSound\@EnderChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playCloseSound(class BlockSource &); /** - * @symbol ?playOpenSound\@EnderChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playOpenSound\@EnderChestBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playOpenSound(class BlockSource &); #endif /** - * @symbol ??0EnderChestBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorRendererId\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0EnderChestBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorRendererId\@\@AEBVBlockPos\@\@\@Z */ MCAPI EnderChestBlockActor(enum class BlockActorType, std::string const &, enum class BlockActorRendererId, class BlockPos const &); @@ -60,8 +60,8 @@ class EnderChestBlockActor { private: /** - * @symbol ?ITEMS_SIZE\@EnderChestBlockActor\@\@0HB + * @symbol ?ITEMS_SIZE\@EnderChestBlockActor\@\@0HB */ MCAPI static int const ITEMS_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderChestContainer.hpp b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp index 8b3e284286..33874c6fff 100644 --- a/LiteLoader/include/llapi/mc/EnderChestContainer.hpp +++ b/LiteLoader/include/llapi/mc/EnderChestContainer.hpp @@ -30,37 +30,37 @@ class EnderChestContainer : public FillingContainer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnderChestContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 16 - * @symbol ?startOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 16 + * @symbol ?startOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 - * @symbol ?stopOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 17 + * @symbol ?stopOpen\@EnderChestContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 23 + * @symbol __unk_vfn_23 */ - virtual void __unk_vfn_22(); + virtual void __unk_vfn_23(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_23(); + virtual void __unk_vfn_24(); /** - * @symbol ??0EnderChestContainer\@\@QEAA\@XZ + * @symbol ??0EnderChestContainer\@\@QEAA\@XZ */ MCAPI EnderChestContainer(); /** - * @symbol ?ITEMS_SIZE\@EnderChestContainer\@\@2HB + * @symbol ?ITEMS_SIZE\@EnderChestContainer\@\@2HB */ MCAPI static int const ITEMS_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderCrystal.hpp b/LiteLoader/include/llapi/mc/EnderCrystal.hpp index 80b22df581..83b1a3f4ad 100644 --- a/LiteLoader/include/llapi/mc/EnderCrystal.hpp +++ b/LiteLoader/include/llapi/mc/EnderCrystal.hpp @@ -31,170 +31,160 @@ class EnderCrystal : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@EnderCrystal\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); + virtual void __unk_vfn_16(); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@EnderCrystal\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z - */ - virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); - /** - * @vftbl 16 - * @symbol __unk_destructor_16 - */ - virtual ~EnderCrystal(); - /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@EnderCrystal\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@EnderCrystal\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@EnderCrystal\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@EnderCrystal\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@EnderCrystal\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@EnderCrystal\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@EnderCrystal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@EnderCrystal\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@EnderCrystal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@EnderCrystal\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@EnderCrystal\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@EnderCrystal\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@EnderCrystal\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@EnderCrystal\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0EnderCrystal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0EnderCrystal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI EnderCrystal(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?setBeamTarget\@EnderCrystal\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setBeamTarget\@EnderCrystal\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setBeamTarget(class BlockPos const &); /** - * @symbol ?setCrystalDamagedCallback\@EnderCrystal\@\@QEAAXV?$function\@$$A6AXAEAVEnderCrystal\@\@AEBVActorDamageSource\@\@\@Z\@std\@\@\@Z + * @symbol ?setCrystalDamagedCallback\@EnderCrystal\@\@QEAAXV?$function\@$$A6AXAEAVEnderCrystal\@\@AEBVActorDamageSource\@\@\@Z\@std\@\@\@Z */ MCAPI void setCrystalDamagedCallback(class std::function); /** - * @symbol ?HEAL_DISTANCE\@EnderCrystal\@\@2MB + * @symbol ?HEAL_DISTANCE\@EnderCrystal\@\@2MB */ MCAPI static float const HEAL_DISTANCE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderDragon.hpp b/LiteLoader/include/llapi/mc/EnderDragon.hpp index fe81751cd5..747f06b4b5 100644 --- a/LiteLoader/include/llapi/mc/EnderDragon.hpp +++ b/LiteLoader/include/llapi/mc/EnderDragon.hpp @@ -32,340 +32,335 @@ class EnderDragon : public Monster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@EnderDragon\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@EnderDragon\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~EnderDragon(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@EnderDragon\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@EnderDragon\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@EnderDragon\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@EnderDragon\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 82 - * @symbol ?getHeadLookVector\@EnderDragon\@\@UEBA?AVVec3\@\@M\@Z + * @vftbl 81 + * @symbol ?getHeadLookVector\@EnderDragon\@\@UEBA?AVVec3\@\@M\@Z */ virtual class Vec3 getHeadLookVector(float) const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 93 - * @symbol ?isImmobile\@EnderDragon\@\@UEBA_NXZ + * @vftbl 92 + * @symbol ?isImmobile\@EnderDragon\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 121 - * @symbol ?setSitting\@EnderDragon\@\@UEAAX_N\@Z + * @vftbl 120 + * @symbol ?setSitting\@EnderDragon\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@EnderDragon\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@EnderDragon\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@EnderDragon\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@EnderDragon\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@EnderDragon\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@EnderDragon\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@EnderDragon\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@EnderDragon\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 208 - * @symbol ?canBeAffected\@EnderDragon\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@EnderDragon\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@EnderDragon\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@EnderDragon\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@EnderDragon\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@EnderDragon\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@EnderDragon\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@EnderDragon\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@EnderDragon\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@EnderDragon\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@EnderDragon\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@EnderDragon\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 352 - * @symbol ?tickDeath\@EnderDragon\@\@MEAAXXZ + * @vftbl 349 + * @symbol ?tickDeath\@EnderDragon\@\@MEAAXXZ */ virtual void tickDeath(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENDERDRAGON /** - * @symbol ?canExistInPeaceful\@EnderDragon\@\@UEBA_NXZ + * @symbol ?canExistInPeaceful\@EnderDragon\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; /** - * @symbol ?isFishable\@EnderDragon\@\@UEBA_NXZ + * @symbol ?isFishable\@EnderDragon\@\@UEBA_NXZ */ MCVAPI bool isFishable() const; #endif /** - * @symbol ??0EnderDragon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0EnderDragon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI EnderDragon(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?dieNaturally\@EnderDragon\@\@QEAAXXZ + * @symbol ?dieNaturally\@EnderDragon\@\@QEAAXXZ */ MCAPI void dieNaturally(); /** - * @symbol ?findClosestNode\@EnderDragon\@\@QEAAHAEBVVec3\@\@\@Z + * @symbol ?findClosestNode\@EnderDragon\@\@QEAAHAEBVVec3\@\@\@Z */ MCAPI int findClosestNode(class Vec3 const &); /** - * @symbol ?findClosestNode\@EnderDragon\@\@QEAAHXZ + * @symbol ?findClosestNode\@EnderDragon\@\@QEAAHXZ */ MCAPI int findClosestNode(); /** - * @symbol ?findPath\@EnderDragon\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@HHPEAVPathfinderNode\@\@\@Z + * @symbol ?findPath\@EnderDragon\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@HHPEAVPathfinderNode\@\@\@Z */ MCAPI std::unique_ptr findPath(int, int, class PathfinderNode *); /** - * @symbol ?getFlameCount\@EnderDragon\@\@QEBAHXZ + * @symbol ?getFlameCount\@EnderDragon\@\@QEBAHXZ */ MCAPI int getFlameCount() const; /** - * @symbol ?getFlapTime\@EnderDragon\@\@QEBAMXZ + * @symbol ?getFlapTime\@EnderDragon\@\@QEBAMXZ */ MCAPI float getFlapTime() const; /** - * @symbol ?getHeadPos\@EnderDragon\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getHeadPos\@EnderDragon\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getHeadPos() const; /** - * @symbol ?getLatencyPos\@EnderDragon\@\@QEBA?BV?$vector\@MV?$allocator\@M\@std\@\@\@std\@\@HM\@Z + * @symbol ?getLatencyPos\@EnderDragon\@\@QEBA?BV?$vector\@MV?$allocator\@M\@std\@\@\@std\@\@HM\@Z */ MCAPI std::vector const getLatencyPos(int, float) const; /** - * @symbol ?getNumCrystalsAlive\@EnderDragon\@\@QEAAHXZ + * @symbol ?getNumCrystalsAlive\@EnderDragon\@\@QEAAHXZ */ MCAPI int getNumCrystalsAlive(); /** - * @symbol ?getTargetPos\@EnderDragon\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getTargetPos\@EnderDragon\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getTargetPos() const; /** - * @symbol ?incrementFlameCount\@EnderDragon\@\@QEAAXXZ + * @symbol ?incrementFlameCount\@EnderDragon\@\@QEAAXXZ */ MCAPI void incrementFlameCount(); /** - * @symbol ?onCrystalDestroyed\@EnderDragon\@\@QEAAXAEBVEnderCrystal\@\@VBlockPos\@\@AEBVActorDamageSource\@\@\@Z + * @symbol ?onCrystalDestroyed\@EnderDragon\@\@QEAAXAEBVEnderCrystal\@\@VBlockPos\@\@AEBVActorDamageSource\@\@\@Z */ MCAPI void onCrystalDestroyed(class EnderCrystal const &, class BlockPos, class ActorDamageSource const &); /** - * @symbol ?postAiStep\@EnderDragon\@\@QEAAXXZ + * @symbol ?postAiStep\@EnderDragon\@\@QEAAXXZ */ MCAPI void postAiStep(); /** - * @symbol ?resetFlameCount\@EnderDragon\@\@QEAAXXZ + * @symbol ?resetFlameCount\@EnderDragon\@\@QEAAXXZ */ MCAPI void resetFlameCount(); /** - * @symbol ?setDragonKilledCallback\@EnderDragon\@\@QEAAXV?$function\@$$A6AXAEAVEnderDragon\@\@\@Z\@std\@\@\@Z + * @symbol ?setDragonKilledCallback\@EnderDragon\@\@QEAAXV?$function\@$$A6AXAEAVEnderDragon\@\@\@Z\@std\@\@\@Z */ MCAPI void setDragonKilledCallback(class std::function); /** - * @symbol ?setHasDragonPreviouslyBeenKilled\@EnderDragon\@\@QEAAX_N\@Z + * @symbol ?setHasDragonPreviouslyBeenKilled\@EnderDragon\@\@QEAAX_N\@Z */ MCAPI void setHasDragonPreviouslyBeenKilled(bool); /** - * @symbol ?setNumCrystalsAlive\@EnderDragon\@\@QEAAXH\@Z + * @symbol ?setNumCrystalsAlive\@EnderDragon\@\@QEAAXH\@Z */ MCAPI void setNumCrystalsAlive(int); /** - * @symbol ?setTargetPos\@EnderDragon\@\@QEAAXVVec3\@\@\@Z + * @symbol ?setTargetPos\@EnderDragon\@\@QEAAXVVec3\@\@\@Z */ MCAPI void setTargetPos(class Vec3); /** - * @symbol ?setTurnSpeed\@EnderDragon\@\@QEAAXM\@Z + * @symbol ?setTurnSpeed\@EnderDragon\@\@QEAAXM\@Z */ MCAPI void setTurnSpeed(float); //protected: /** - * @symbol ?_hurt\@EnderDragon\@\@IEAA_NPEAVAABB\@\@AEBVActorDamageSource\@\@M\@Z + * @symbol ?_hurt\@EnderDragon\@\@IEAA_NPEAVAABB\@\@AEBVActorDamageSource\@\@M\@Z */ MCAPI bool _hurt(class AABB *, class ActorDamageSource const &, float); //private: /** - * @symbol ?_checkCrystals\@EnderDragon\@\@AEAAXXZ + * @symbol ?_checkCrystals\@EnderDragon\@\@AEAAXXZ */ MCAPI void _checkCrystals(); /** - * @symbol ?_checkWalls\@EnderDragon\@\@AEAA_NVAABB\@\@\@Z + * @symbol ?_checkWalls\@EnderDragon\@\@AEAA_NVAABB\@\@\@Z */ MCAPI bool _checkWalls(class AABB); /** - * @symbol ?_hurtEntities\@EnderDragon\@\@AEBAXV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z + * @symbol ?_hurtEntities\@EnderDragon\@\@AEBAXV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z */ MCAPI void _hurtEntities(class gsl::span, -1>) const; /** - * @symbol ?_knockBack\@EnderDragon\@\@AEBAXV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z + * @symbol ?_knockBack\@EnderDragon\@\@AEBAXV?$span\@V?$not_null\@PEAVActor\@\@\@gsl\@\@$0?0\@gsl\@\@\@Z */ MCAPI void _knockBack(class gsl::span, -1>) const; /** - * @symbol ?_reconstructPath\@EnderDragon\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVPathfinderNode\@\@0W4PathCompletionType\@\@\@Z + * @symbol ?_reconstructPath\@EnderDragon\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVPathfinderNode\@\@0W4PathCompletionType\@\@\@Z */ MCAPI std::unique_ptr _reconstructPath(class PathfinderNode &, class PathfinderNode &, enum class PathCompletionType); /** - * @symbol ?_isDragonImmuneBlock\@EnderDragon\@\@CA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?_isDragonImmuneBlock\@EnderDragon\@\@CA_NAEBVBlockLegacy\@\@\@Z */ MCAPI static bool _isDragonImmuneBlock(class BlockLegacy const &); @@ -373,20 +368,20 @@ class EnderDragon : public Monster { private: /** - * @symbol ?GROWL_INTERVAL_MAX\@EnderDragon\@\@0HA + * @symbol ?GROWL_INTERVAL_MAX\@EnderDragon\@\@0HA */ MCAPI static int GROWL_INTERVAL_MAX; /** - * @symbol ?GROWL_INTERVAL_MIN\@EnderDragon\@\@0HA + * @symbol ?GROWL_INTERVAL_MIN\@EnderDragon\@\@0HA */ MCAPI static int GROWL_INTERVAL_MIN; /** - * @symbol ?MAX_PATH_RADIUS\@EnderDragon\@\@0HA + * @symbol ?MAX_PATH_RADIUS\@EnderDragon\@\@0HA */ MCAPI static int MAX_PATH_RADIUS; /** - * @symbol ?SITTING_ALLOWED_DAMAGE_PERCENTAGE\@EnderDragon\@\@0MA + * @symbol ?SITTING_ALLOWED_DAMAGE_PERCENTAGE\@EnderDragon\@\@0MA */ MCAPI static float SITTING_ALLOWED_DAMAGE_PERCENTAGE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp index 95aff30b54..0d544879be 100644 --- a/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/EnderDragonPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class EnderDragonPostAIStepSystem { public: /** - * @symbol ?createSystem\@EnderDragonPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@EnderDragonPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doEnderDragonPostAIStepSystem\@EnderDragonPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doEnderDragonPostAIStepSystem\@EnderDragonPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doEnderDragonPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderEyeItem.hpp b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp index 231d4717de..089ffead1b 100644 --- a/LiteLoader/include/llapi/mc/EnderEyeItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderEyeItem.hpp @@ -32,88 +32,88 @@ class EnderEyeItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnderEyeItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@EnderEyeItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@EnderEyeItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@EnderEyeItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@EnderEyeItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @symbol ??0EnderEyeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EnderEyeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EnderEyeItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderMan.hpp b/LiteLoader/include/llapi/mc/EnderMan.hpp index f07cd6e9ac..5e8725a56e 100644 --- a/LiteLoader/include/llapi/mc/EnderMan.hpp +++ b/LiteLoader/include/llapi/mc/EnderMan.hpp @@ -32,211 +32,201 @@ class EnderMan : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~EnderMan(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@EnderMan\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@EnderMan\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 132 - * @symbol ?shouldRender\@EnderMan\@\@UEBA_NXZ + * @vftbl 131 + * @symbol ?shouldRender\@EnderMan\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 134 - * @symbol ?getAmbientSound\@EnderMan\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@EnderMan\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 209 - * @symbol ?canBeAffectedByArrow\@EnderMan\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z + * @vftbl 208 + * @symbol ?canBeAffectedByArrow\@EnderMan\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@EnderMan\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@EnderMan\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@EnderMan\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@EnderMan\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@EnderMan\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@EnderMan\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 286 - * @symbol ?hurtEffects\@EnderMan\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 283 + * @symbol ?hurtEffects\@EnderMan\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 291 - * @symbol ?aiStep\@EnderMan\@\@UEAAXXZ - */ - virtual void aiStep(); - /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 349 - * @symbol ?newServerAiStep\@EnderMan\@\@UEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@EnderMan\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0EnderMan\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0EnderMan\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI EnderMan(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getCarryingBlock\@EnderMan\@\@QEBAAEBVBlock\@\@XZ + * @symbol ?getCarryingBlock\@EnderMan\@\@QEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getCarryingBlock() const; /** - * @symbol ?setCarryingBlock\@EnderMan\@\@QEAAXAEBVBlock\@\@\@Z + * @symbol ?setCarryingBlock\@EnderMan\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void setCarryingBlock(class Block const &); /** - * @symbol ?SPEED_MODIFIER_ATTACKING\@EnderMan\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?SPEED_MODIFIER_ATTACKING\@EnderMan\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr SPEED_MODIFIER_ATTACKING; /** - * @symbol ?SPEED_MODIFIER_ATTACKING_UUID\@EnderMan\@\@2VUUID\@mce\@\@B + * @symbol ?SPEED_MODIFIER_ATTACKING_UUID\@EnderMan\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SPEED_MODIFIER_ATTACKING_UUID; /** - * @symbol ?mMayTake\@EnderMan\@\@2V?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@A + * @symbol ?mMayTake\@EnderMan\@\@2V?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@A */ MCAPI static class std::set, class std::allocator> mMayTake; /** - * @symbol ?shutdown\@EnderMan\@\@SAXXZ + * @symbol ?shutdown\@EnderMan\@\@SAXXZ */ MCAPI static void shutdown(); @@ -244,8 +234,8 @@ class EnderMan : public Monster { private: /** - * @symbol ?mMayTakeIsSetup\@EnderMan\@\@0_NA + * @symbol ?mMayTakeIsSetup\@EnderMan\@\@0_NA */ MCAPI static bool mMayTakeIsSetup; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp index cb701e6543..aac0f6bc4c 100644 --- a/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/EnderManPreAIStepSystem.hpp @@ -28,12 +28,12 @@ class EnderManPreAIStepSystem { public: /** - * @symbol ?createSystem\@EnderManPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@EnderManPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tick\@EnderManPreAIStepSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@UEnderManFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + * @symbol ?tick\@EnderManPreAIStepSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UEnderManFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ - MCAPI static void tick(class ViewT, class FlagComponent, class FlagComponent, class FlagComponent>>, class EntityModifierT>); + MCAPI static void tick(class ViewT, class FlagComponent, class FlagComponent>>, class EntityModifierT>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp b/LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp index f529551813..3298ec56e5 100644 --- a/LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/EndermanLeaveBlockGoal.hpp @@ -30,48 +30,48 @@ class EndermanLeaveBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndermanLeaveBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EndermanLeaveBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EndermanLeaveBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@EndermanLeaveBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EndermanLeaveBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EndermanLeaveBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EndermanLeaveBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0EndermanLeaveBlockGoal\@\@QEAA\@AEAVEnderMan\@\@\@Z + * @symbol ??0EndermanLeaveBlockGoal\@\@QEAA\@AEAVEnderMan\@\@\@Z */ MCAPI EndermanLeaveBlockGoal(class EnderMan &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp b/LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp index 6d2a6110b0..1070c636c0 100644 --- a/LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/EndermanTakeBlockGoal.hpp @@ -30,63 +30,63 @@ class EndermanTakeBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EndermanTakeBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EndermanTakeBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EndermanTakeBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@EndermanTakeBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EndermanTakeBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EndermanTakeBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EndermanTakeBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?getRandomNearbyBlockPos\@EndermanTakeBlockGoal\@\@MEBA?AVBlockPos\@\@AEBVVec3\@\@\@Z + * @vftbl 10 + * @symbol ?getRandomNearbyBlockPos\@EndermanTakeBlockGoal\@\@MEBA?AVBlockPos\@\@AEBVVec3\@\@\@Z */ virtual class BlockPos getRandomNearbyBlockPos(class Vec3 const &) const; /** - * @symbol ??0EndermanTakeBlockGoal\@\@QEAA\@AEAVEnderMan\@\@\@Z + * @symbol ??0EndermanTakeBlockGoal\@\@QEAA\@AEAVEnderMan\@\@\@Z */ MCAPI EndermanTakeBlockGoal(class EnderMan &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Endermite.hpp b/LiteLoader/include/llapi/mc/Endermite.hpp index d16c011afb..0f3fe98318 100644 --- a/LiteLoader/include/llapi/mc/Endermite.hpp +++ b/LiteLoader/include/llapi/mc/Endermite.hpp @@ -32,168 +32,163 @@ class Endermite : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Endermite(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Endermite\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Endermite\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Endermite\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Endermite\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Endermite\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Endermite\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Endermite\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Endermite\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@Endermite\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Endermite\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Endermite\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Endermite\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Endermite\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Endermite\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Endermite(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnderpearlItem.hpp b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp index 5620a91d28..c335f28714 100644 --- a/LiteLoader/include/llapi/mc/EnderpearlItem.hpp +++ b/LiteLoader/include/llapi/mc/EnderpearlItem.hpp @@ -32,102 +32,102 @@ class EnderpearlItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnderpearlItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@EnderpearlItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@EnderpearlItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@EnderpearlItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@EnderpearlItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 103 - * @symbol ?getCooldownType\@EnderpearlItem\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 103 + * @symbol ?getCooldownType\@EnderpearlItem\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getCooldownType() const; /** - * @vftbl 104 - * @symbol ?getCooldownTime\@EnderpearlItem\@\@UEBAHXZ + * @vftbl 104 + * @symbol ?getCooldownTime\@EnderpearlItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; /** - * @symbol ??0EnderpearlItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0EnderpearlItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI EnderpearlItem(std::string const &, int); /** - * @symbol ?ENDER_PEARL_COOLDOWN\@EnderpearlItem\@\@2VHashedString\@\@B + * @symbol ?ENDER_PEARL_COOLDOWN\@EnderpearlItem\@\@2VHashedString\@\@B */ MCAPI static class HashedString const ENDER_PEARL_COOLDOWN; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp index e0f3e55179..2ebc1bed3a 100644 --- a/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntitiesEnteredVolumeComponent.hpp @@ -28,8 +28,8 @@ class EntitiesEnteredVolumeComponent { public: /** - * @symbol ??1EntitiesEnteredVolumeComponent\@\@QEAA\@XZ + * @symbol ??1EntitiesEnteredVolumeComponent\@\@QEAA\@XZ */ MCAPI ~EntitiesEnteredVolumeComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp index bcbb5fc3d6..af6e6de9a0 100644 --- a/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntitiesExitedVolumeComponent.hpp @@ -28,8 +28,8 @@ class EntitiesExitedVolumeComponent { public: /** - * @symbol ??1EntitiesExitedVolumeComponent\@\@QEAA\@XZ + * @symbol ??1EntitiesExitedVolumeComponent\@\@QEAA\@XZ */ MCAPI ~EntitiesExitedVolumeComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp index 3238f9d0e1..1d9b49b4f0 100644 --- a/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntitiesInsideVolumeComponent.hpp @@ -28,8 +28,8 @@ class EntitiesInsideVolumeComponent { public: /** - * @symbol ??1EntitiesInsideVolumeComponent\@\@QEAA\@XZ + * @symbol ??1EntitiesInsideVolumeComponent\@\@QEAA\@XZ */ MCAPI ~EntitiesInsideVolumeComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp b/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp index 4ef1eabd4a..14bd5db5af 100644 --- a/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntitiesPendingEnterVolumeComponent.hpp @@ -28,12 +28,12 @@ class EntitiesPendingEnterVolumeComponent { public: /** - * @symbol ??0EntitiesPendingEnterVolumeComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0EntitiesPendingEnterVolumeComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI EntitiesPendingEnterVolumeComponent(class EntitiesPendingEnterVolumeComponent &&); /** - * @symbol ??1EntitiesPendingEnterVolumeComponent\@\@QEAA\@XZ + * @symbol ??1EntitiesPendingEnterVolumeComponent\@\@QEAA\@XZ */ MCAPI ~EntitiesPendingEnterVolumeComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityComponentFactoryBase.hpp b/LiteLoader/include/llapi/mc/EntityComponentFactoryBase.hpp index 977cab579a..556355083a 100644 --- a/LiteLoader/include/llapi/mc/EntityComponentFactoryBase.hpp +++ b/LiteLoader/include/llapi/mc/EntityComponentFactoryBase.hpp @@ -31,17 +31,17 @@ class EntityComponentFactoryBase { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYCOMPONENTFACTORYBASE /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~EntityComponentFactoryBase(); #endif /** - * @symbol ?addComponents\@EntityComponentFactoryBase\@\@QEBAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@AEBVDefinitionInstanceGroup\@\@\@Z + * @symbol ?addComponents\@EntityComponentFactoryBase\@\@QEBAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@AEBVDefinitionInstanceGroup\@\@\@Z */ MCAPI void addComponents(class EntityRegistry &, class EntityContext &, class DefinitionInstanceGroup const &) const; /** - * @symbol ?removeComponents\@EntityComponentFactoryBase\@\@QEBAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@AEBVDefinitionInstanceGroup\@\@\@Z + * @symbol ?removeComponents\@EntityComponentFactoryBase\@\@QEBAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@AEBVDefinitionInstanceGroup\@\@\@Z */ MCAPI void removeComponents(class EntityRegistry &, class EntityContext &, class DefinitionInstanceGroup const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp b/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp index 27359e6721..2e9cdc04e7 100644 --- a/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp +++ b/LiteLoader/include/llapi/mc/EntityComponentFactoryCereal.hpp @@ -25,17 +25,20 @@ class EntityComponentFactoryCereal { public: class EntityComponentFactoryCereal& operator=(class EntityComponentFactoryCereal const &) = delete; EntityComponentFactoryCereal(class EntityComponentFactoryCereal const &) = delete; - EntityComponentFactoryCereal() = delete; #endif public: /** - * @symbol ?serializeComponentDefinitions\@EntityComponentFactoryCereal\@\@QEBAXAEAVDefinitionInstanceGroup\@\@AEBV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBVSemVersion\@\@\@Z + * @symbol ??0EntityComponentFactoryCereal\@\@QEAA\@XZ + */ + MCAPI EntityComponentFactoryCereal(); + /** + * @symbol ?serializeComponentDefinitions\@EntityComponentFactoryCereal\@\@QEBAXAEAVDefinitionInstanceGroup\@\@AEBV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBVSemVersion\@\@\@Z */ MCAPI void serializeComponentDefinitions(class DefinitionInstanceGroup &, class rapidjson::GenericValue, class rapidjson::MemoryPoolAllocator> const &, class SemVersion const &) const; /** - * @symbol ?tryGetDefinitionSerializer\@EntityComponentFactoryCereal\@\@QEBAPEAVICerealDefinitionSerializer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryGetDefinitionSerializer\@EntityComponentFactoryCereal\@\@QEBAPEAVICerealDefinitionSerializer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class ICerealDefinitionSerializer * tryGetDefinitionSerializer(std::string const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityComponentFactoryJson.hpp b/LiteLoader/include/llapi/mc/EntityComponentFactoryJson.hpp index 75bbfe7f15..1ba4b9f934 100644 --- a/LiteLoader/include/llapi/mc/EntityComponentFactoryJson.hpp +++ b/LiteLoader/include/llapi/mc/EntityComponentFactoryJson.hpp @@ -29,9 +29,15 @@ class EntityComponentFactoryJson { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYCOMPONENTFACTORYJSON /** - * @symbol ?tryGetDefinitionSerializer\@EntityComponentFactoryJson\@\@QEBAPEAVIJsonDefinitionSerializer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EntityComponentFactoryJson(); +#endif + /** + * @symbol ?tryGetDefinitionSerializer\@EntityComponentFactoryJson\@\@QEBAPEAVIJsonDefinitionSerializer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class IJsonDefinitionSerializer * tryGetDefinitionSerializer(std::string const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityContext.hpp b/LiteLoader/include/llapi/mc/EntityContext.hpp index 4e0bad5ff6..2ba388259f 100644 --- a/LiteLoader/include/llapi/mc/EntityContext.hpp +++ b/LiteLoader/include/llapi/mc/EntityContext.hpp @@ -3,25 +3,24 @@ * */ #pragma once -#define AUTO_GENERATED + #include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here -template <> -class WeakRefT { - char filler[24]; -}; +#include "EntityContextBase.hpp" + #undef BEFORE_EXTRA /** * @brief MC class EntityContext. * */ -class EntityContext { +class EntityContext : public EntityContextBase { #define AFTER_EXTRA // Add Member There +#define DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXT #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXT public: diff --git a/LiteLoader/include/llapi/mc/EntityContextBase.hpp b/LiteLoader/include/llapi/mc/EntityContextBase.hpp index 2d3425783e..d19d84608f 100644 --- a/LiteLoader/include/llapi/mc/EntityContextBase.hpp +++ b/LiteLoader/include/llapi/mc/EntityContextBase.hpp @@ -18,8 +18,12 @@ class EntityContextBase { #define AFTER_EXTRA -// Add Member There + // Add Member There +public: + class EntityRegistryBase* mRegistry; + const class EntityId mEntity; +#define DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXTBASE #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYCONTEXTBASE public: @@ -30,40 +34,40 @@ class EntityContextBase { public: /** - * @symbol ??0EntityContextBase\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z + * @symbol ??0EntityContextBase\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z */ MCAPI EntityContextBase(class EntityRegistryBase &, class EntityId); /** - * @symbol ?isValid\@EntityContextBase\@\@QEBA_NXZ + * @symbol ?isValid\@EntityContextBase\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??8EntityContextBase\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8EntityContextBase\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class EntityContextBase const &) const; //protected: /** - * @symbol ?_assertValid\@EntityContextBase\@\@IEBAXXZ + * @symbol ?_assertValid\@EntityContextBase\@\@IEBAXXZ */ MCAPI void _assertValid() const; /** - * @symbol ?_enttRegistry\@EntityContextBase\@\@IEAAAEAV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@XZ + * @symbol ?_enttRegistry\@EntityContextBase\@\@IEAAAEAV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@XZ */ MCAPI class entt::basic_registry> & _enttRegistry(); /** - * @symbol ?_enttRegistry\@EntityContextBase\@\@IEBAAEBV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@XZ + * @symbol ?_enttRegistry\@EntityContextBase\@\@IEBAAEBV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@XZ */ MCAPI class entt::basic_registry> const & _enttRegistry() const; /** - * @symbol ?_getEntityId\@EntityContextBase\@\@IEBA?AVEntityId\@\@XZ + * @symbol ?_getEntityId\@EntityContextBase\@\@IEBA?AVEntityId\@\@XZ */ MCAPI class EntityId _getEntityId() const; /** - * @symbol ?_getRegistryId\@EntityContextBase\@\@IEBAIXZ + * @symbol ?_getRegistryId\@EntityContextBase\@\@IEBAIXZ */ MCAPI unsigned int _getRegistryId() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityEnterVolumeSystem.hpp b/LiteLoader/include/llapi/mc/EntityEnterVolumeSystem.hpp index 7cfac5e2ff..7355471f99 100644 --- a/LiteLoader/include/llapi/mc/EntityEnterVolumeSystem.hpp +++ b/LiteLoader/include/llapi/mc/EntityEnterVolumeSystem.hpp @@ -31,31 +31,31 @@ class EntityEnterVolumeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EntityEnterVolumeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@EntityEnterVolumeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@EntityEnterVolumeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ??0EntityEnterVolumeSystem\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0EntityEnterVolumeSystem\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI EntityEnterVolumeSystem(class gsl::not_null>); //private: /** - * @symbol ?_tick\@EntityEnterVolumeSystem\@\@AEBAXAEAVEntityContext\@\@AEAVVolumeBoundsComponent\@\@\@Z + * @symbol ?_tick\@EntityEnterVolumeSystem\@\@AEBAXAEAVEntityContext\@\@AEAVVolumeBoundsComponent\@\@\@Z */ MCAPI void _tick(class EntityContext &, class VolumeBoundsComponent &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityEnterVolumeSystemUtil.hpp b/LiteLoader/include/llapi/mc/EntityEnterVolumeSystemUtil.hpp index f5077c754f..77ccf57592 100644 --- a/LiteLoader/include/llapi/mc/EntityEnterVolumeSystemUtil.hpp +++ b/LiteLoader/include/llapi/mc/EntityEnterVolumeSystemUtil.hpp @@ -22,15 +22,15 @@ namespace EntityEnterVolumeSystemUtil { #undef AFTER_EXTRA /** - * @symbol ?_addActor\@EntityEnterVolumeSystemUtil\@\@YAXAEBVActor\@\@AEAVEntitiesEnteredVolumeComponent\@\@AEAVEntitiesInsideVolumeComponent\@\@\@Z + * @symbol ?_addActor\@EntityEnterVolumeSystemUtil\@\@YAXAEBVActor\@\@AEAVEntitiesEnteredVolumeComponent\@\@AEAVEntitiesInsideVolumeComponent\@\@\@Z */ MCAPI void _addActor(class Actor const &, class EntitiesEnteredVolumeComponent &, class EntitiesInsideVolumeComponent &); /** - * @symbol ?_boundsContainsActor\@EntityEnterVolumeSystemUtil\@\@YA_NAEBVActor\@\@AEBVVolumeBoundsComponent\@\@AEBVDimension\@\@\@Z + * @symbol ?_boundsContainsActor\@EntityEnterVolumeSystemUtil\@\@YA_NAEBVActor\@\@AEBVVolumeBoundsComponent\@\@AEBVDimension\@\@\@Z */ MCAPI bool _boundsContainsActor(class Actor const &, class VolumeBoundsComponent const &, class Dimension const &); /** - * @symbol ?_removeEmptyComponents\@EntityEnterVolumeSystemUtil\@\@YAXAEAVEntityContext\@\@AEAVEntitiesEnteredVolumeComponent\@\@AEAVEntitiesInsideVolumeComponent\@\@\@Z + * @symbol ?_removeEmptyComponents\@EntityEnterVolumeSystemUtil\@\@YAXAEAVEntityContext\@\@AEAVEntitiesEnteredVolumeComponent\@\@AEAVEntitiesInsideVolumeComponent\@\@\@Z */ MCAPI void _removeEmptyComponents(class EntityContext &, class EntitiesEnteredVolumeComponent &, class EntitiesInsideVolumeComponent &); diff --git a/LiteLoader/include/llapi/mc/EntityExitVolumeSystem.hpp b/LiteLoader/include/llapi/mc/EntityExitVolumeSystem.hpp index 22aa134a64..bd8390abec 100644 --- a/LiteLoader/include/llapi/mc/EntityExitVolumeSystem.hpp +++ b/LiteLoader/include/llapi/mc/EntityExitVolumeSystem.hpp @@ -31,31 +31,31 @@ class EntityExitVolumeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EntityExitVolumeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@EntityExitVolumeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@EntityExitVolumeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ??0EntityExitVolumeSystem\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0EntityExitVolumeSystem\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI EntityExitVolumeSystem(class gsl::not_null>); //private: /** - * @symbol ?_tick\@EntityExitVolumeSystem\@\@AEBAXAEAVEntityContext\@\@AEAVVolumeBoundsComponent\@\@AEAVEntitiesInsideVolumeComponent\@\@\@Z + * @symbol ?_tick\@EntityExitVolumeSystem\@\@AEBAXAEAVEntityContext\@\@AEAVVolumeBoundsComponent\@\@AEAVEntitiesInsideVolumeComponent\@\@\@Z */ MCAPI void _tick(class EntityContext &, class VolumeBoundsComponent &, class EntitiesInsideVolumeComponent &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityFactory.hpp b/LiteLoader/include/llapi/mc/EntityFactory.hpp index b979a9a175..dc3a713b60 100644 --- a/LiteLoader/include/llapi/mc/EntityFactory.hpp +++ b/LiteLoader/include/llapi/mc/EntityFactory.hpp @@ -28,16 +28,16 @@ class EntityFactory { public: /** - * @symbol ??0EntityFactory\@\@QEAA\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@\@Z + * @symbol ??0EntityFactory\@\@QEAA\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@\@Z */ MCAPI EntityFactory(class gsl::not_null); /** - * @symbol ?create\@EntityFactory\@\@QEAA?AVStrictEntityContextOwner\@\@XZ + * @symbol ?create\@EntityFactory\@\@QEAA?AVStrictEntityContextOwner\@\@XZ */ MCAPI class StrictEntityContextOwner create(); /** - * @symbol ?destroy\@EntityFactory\@\@QEAAX$$QEAVStrictEntityContextOwner\@\@\@Z + * @symbol ?destroy\@EntityFactory\@\@QEAAX$$QEAVStrictEntityContextOwner\@\@\@Z */ MCAPI void destroy(class StrictEntityContextOwner &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp b/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp index 69309b9f37..5c49f4f8a7 100644 --- a/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp +++ b/LiteLoader/include/llapi/mc/EntityGlobalComponentsUtility.hpp @@ -22,11 +22,11 @@ namespace EntityGlobalComponentsUtility { #undef AFTER_EXTRA /** - * @symbol ?initializeGlobalComponents\@EntityGlobalComponentsUtility\@\@YAXAEAVEntityRegistry\@\@\@Z + * @symbol ?initializeGlobalComponents\@EntityGlobalComponentsUtility\@\@YAXAEAVEntityRegistry\@\@\@Z */ MCAPI void initializeGlobalComponents(class EntityRegistry &); /** - * @symbol ?removeGlobalComponents\@EntityGlobalComponentsUtility\@\@YAXAEAVEntityRegistry\@\@\@Z + * @symbol ?removeGlobalComponents\@EntityGlobalComponentsUtility\@\@YAXAEAVEntityRegistry\@\@\@Z */ MCAPI void removeGlobalComponents(class EntityRegistry &); diff --git a/LiteLoader/include/llapi/mc/EntityGoalFactory.hpp b/LiteLoader/include/llapi/mc/EntityGoalFactory.hpp index edd307eb2b..79e1d85e64 100644 --- a/LiteLoader/include/llapi/mc/EntityGoalFactory.hpp +++ b/LiteLoader/include/llapi/mc/EntityGoalFactory.hpp @@ -30,16 +30,16 @@ class EntityGoalFactory { public: /** - * @symbol ?tryGetDefinitionSerializer\@EntityGoalFactory\@\@QEAAPEAVIJsonDefinitionSerializer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryGetDefinitionSerializer\@EntityGoalFactory\@\@QEAAPEAVIJsonDefinitionSerializer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class IJsonDefinitionSerializer * tryGetDefinitionSerializer(std::string const &); /** - * @symbol ??1EntityGoalFactory\@\@QEAA\@XZ + * @symbol ??1EntityGoalFactory\@\@QEAA\@XZ */ MCAPI ~EntityGoalFactory(); /** - * @symbol ?addGoals\@EntityGoalFactory\@\@SAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@AEBVDefinitionInstanceGroup\@\@\@Z + * @symbol ?addGoals\@EntityGoalFactory\@\@SAXAEAVEntityRegistry\@\@AEAVEntityContext\@\@AEBVDefinitionInstanceGroup\@\@\@Z */ MCAPI static void addGoals(class EntityRegistry &, class EntityContext &, class DefinitionInstanceGroup const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityGoalUtility.hpp b/LiteLoader/include/llapi/mc/EntityGoalUtility.hpp index c527b306fa..30bdba9812 100644 --- a/LiteLoader/include/llapi/mc/EntityGoalUtility.hpp +++ b/LiteLoader/include/llapi/mc/EntityGoalUtility.hpp @@ -22,7 +22,7 @@ namespace EntityGoalUtility { #undef AFTER_EXTRA /** - * @symbol ?getNumericNodeSpecifier\@EntityGoalUtility\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @symbol ?getNumericNodeSpecifier\@EntityGoalUtility\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ MCAPI std::string getNumericNodeSpecifier(unsigned short); diff --git a/LiteLoader/include/llapi/mc/EntityNetId.hpp b/LiteLoader/include/llapi/mc/EntityNetId.hpp index 173de1e1f2..2f319dacb9 100644 --- a/LiteLoader/include/llapi/mc/EntityNetId.hpp +++ b/LiteLoader/include/llapi/mc/EntityNetId.hpp @@ -30,8 +30,8 @@ class EntityNetId { public: /** - * @symbol ?_serverGetEntityNetId\@EntityNetId\@\@SA?AV1\@AEBVEntityContext\@\@\@Z + * @symbol ?_serverGetEntityNetId\@EntityNetId\@\@SA?AV1\@AEBVEntityContext\@\@\@Z */ MCAPI static class EntityNetId _serverGetEntityNetId(class EntityContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityOptionalOwnerRef.hpp b/LiteLoader/include/llapi/mc/EntityOptionalOwnerRef.hpp index ee13322de4..abba367e34 100644 --- a/LiteLoader/include/llapi/mc/EntityOptionalOwnerRef.hpp +++ b/LiteLoader/include/llapi/mc/EntityOptionalOwnerRef.hpp @@ -29,24 +29,24 @@ class EntityOptionalOwnerRef { public: /** - * @symbol ??0EntityOptionalOwnerRef\@\@QEAA\@XZ + * @symbol ??0EntityOptionalOwnerRef\@\@QEAA\@XZ */ MCAPI EntityOptionalOwnerRef(); /** - * @symbol ?isSet\@EntityOptionalOwnerRef\@\@QEBA_NXZ + * @symbol ?isSet\@EntityOptionalOwnerRef\@\@QEBA_NXZ */ MCAPI bool isSet() const; /** - * @symbol ?setOwnedRef\@EntityOptionalOwnerRef\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?setOwnedRef\@EntityOptionalOwnerRef\@\@QEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void setOwnedRef(class OwnerPtrT); /** - * @symbol ?setWeakRef\@EntityOptionalOwnerRef\@\@QEAAXV?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?setWeakRef\@EntityOptionalOwnerRef\@\@QEAAXV?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI void setWeakRef(class WeakRefT); /** - * @symbol ?tryGet\@EntityOptionalOwnerRef\@\@QEBA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@XZ + * @symbol ?tryGet\@EntityOptionalOwnerRef\@\@QEBA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@XZ */ MCAPI class StackRefResultT tryGet() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp index 5c54dd4c6c..c4b93d9299 100644 --- a/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntityPlacerItemComponent.hpp @@ -30,63 +30,63 @@ class EntityPlacerItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EntityPlacerItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?useOn\@EntityPlacerItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 3 + * @symbol ?useOn\@EntityPlacerItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VEntityPlacerItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?dispense\@EntityPlacerItemComponent\@\@QEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @symbol ?dispense\@EntityPlacerItemComponent\@\@QEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ MCAPI bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @symbol ?bindType\@EntityPlacerItemComponent\@\@SAXXZ + * @symbol ?bindType\@EntityPlacerItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@EntityPlacerItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@EntityPlacerItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); //private: /** - * @symbol ?_positionAndRotateActor\@EntityPlacerItemComponent\@\@AEBAXAEAVActor\@\@VVec3\@\@EAEBV3\@PEBVBlockLegacy\@\@\@Z + * @symbol ?_positionAndRotateActor\@EntityPlacerItemComponent\@\@AEBAXAEAVActor\@\@VVec3\@\@EAEBV3\@PEBVBlockLegacy\@\@\@Z */ MCAPI void _positionAndRotateActor(class Actor &, class Vec3, unsigned char, class Vec3 const &, class BlockLegacy const *) const; /** - * @symbol ?_setActorCustomName\@EntityPlacerItemComponent\@\@AEBAXAEAVActor\@\@AEBVItemStack\@\@\@Z + * @symbol ?_setActorCustomName\@EntityPlacerItemComponent\@\@AEBAXAEAVActor\@\@AEBVItemStack\@\@\@Z */ MCAPI void _setActorCustomName(class Actor &, class ItemStack const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityRefTraits.hpp b/LiteLoader/include/llapi/mc/EntityRefTraits.hpp new file mode 100644 index 0000000000..740d883d1c --- /dev/null +++ b/LiteLoader/include/llapi/mc/EntityRefTraits.hpp @@ -0,0 +1,20 @@ + +#pragma once +#include "llapi/Global.h" + +#include "EntityContext.hpp" +#include "WeakStorageEntity.hpp" +#include "StackResultStorageEntity.hpp" +#include "OwnerStorageEntity.hpp" +#include "EntityRegistry.hpp" + +struct EntityRefTraits { +public: + using StackRef = EntityContext; + using WeakStorage = WeakStorageEntity; + using OwnerStorage = OwnerStorageEntity; + using OwnerStackRef = StackRef; + using StackResultStorage = StackResultStorageEntity; +}; + +struct EntityConstRefTraits : public EntityRefTraits {}; diff --git a/LiteLoader/include/llapi/mc/EntityRegistry.hpp b/LiteLoader/include/llapi/mc/EntityRegistry.hpp index 84a69e52be..46782f0094 100644 --- a/LiteLoader/include/llapi/mc/EntityRegistry.hpp +++ b/LiteLoader/include/llapi/mc/EntityRegistry.hpp @@ -3,30 +3,30 @@ * */ #pragma once -#define AUTO_GENERATED + #include "llapi/Global.h" #define BEFORE_EXTRA +#include "EntityRegistryBase.hpp" + #undef BEFORE_EXTRA /** * @brief MC class EntityRegistry. * */ -class EntityRegistry { - +class EntityRegistry : public EntityRegistryBase, public std::enable_shared_from_this { #define AFTER_EXTRA - #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYREGISTRY -public: - class EntityRegistry& operator=(class EntityRegistry const &) = delete; - EntityRegistry(class EntityRegistry const &) = delete; + public: + class EntityRegistry& operator=(class EntityRegistry const&) = delete; + EntityRegistry(class EntityRegistry const&) = delete; EntityRegistry() = delete; #endif -public: + public: /** * @symbol ?getWeakRef\@EntityRegistry\@\@QEAA?AV?$WeakRefT\@UEntityRegistryRefTraits\@\@\@\@XZ */ @@ -36,13 +36,13 @@ class EntityRegistry { */ MCAPI ~EntityRegistry(); -//protected: + // protected: /** * @symbol ??0EntityRegistry\@\@IEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI EntityRegistry(std::string); -//private: + // private: /** * @symbol ?_createEntity\@EntityRegistry\@\@AEAA?AVEntityContext\@\@XZ */ @@ -52,8 +52,8 @@ class EntityRegistry { */ MCAPI void _destroyEntity(class EntityContext); -protected: - -private: + protected: + private: +}; -}; \ No newline at end of file +#include "EntityRegistryRefTraits.hpp" \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EntityRegistryBase.hpp b/LiteLoader/include/llapi/mc/EntityRegistryBase.hpp index 4526136a3e..cf0dd8c256 100644 --- a/LiteLoader/include/llapi/mc/EntityRegistryBase.hpp +++ b/LiteLoader/include/llapi/mc/EntityRegistryBase.hpp @@ -18,7 +18,14 @@ class EntityRegistryBase { #define AFTER_EXTRA -// Add Member There + // Add Member There +public: + struct ICanModifyComponentPoolDuringView {}; + + entt::basic_registry* mRegistry; + std::optional mViewedEntity; + std::unique_ptr mCanModifyDuringView; + bool mViewUsesViewedContext; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ENTITYREGISTRYBASE @@ -30,24 +37,24 @@ class EntityRegistryBase { public: /** - * @symbol ??0EntityRegistryBase\@\@QEAA\@AEAV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@\@Z + * @symbol ??0EntityRegistryBase\@\@QEAA\@AEAV?$basic_registry\@VEntityId\@\@V?$allocator\@VEntityId\@\@\@std\@\@\@entt\@\@\@Z */ MCAPI EntityRegistryBase(class entt::basic_registry> &); /** - * @symbol ?isValidEntity\@EntityRegistryBase\@\@QEBA_NAEBVEntityContextBase\@\@\@Z + * @symbol ?isValidEntity\@EntityRegistryBase\@\@QEBA_NAEBVEntityContextBase\@\@\@Z */ MCAPI bool isValidEntity(class EntityContextBase const &) const; //protected: /** - * @symbol ?_assertValidRegistry\@EntityRegistryBase\@\@IEBAXAEBVEntityContextBase\@\@\@Z + * @symbol ?_assertValidRegistry\@EntityRegistryBase\@\@IEBAXAEBVEntityContextBase\@\@\@Z */ MCAPI void _assertValidRegistry(class EntityContextBase const &) const; protected: /** - * @symbol ?mRegistryCount\@EntityRegistryBase\@\@1U?$atomic\@I\@std\@\@A + * @symbol ?mRegistryCount\@EntityRegistryBase\@\@1U?$atomic\@I\@std\@\@A */ MCAPI static struct std::atomic mRegistryCount; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityRegistryRefTraits.hpp b/LiteLoader/include/llapi/mc/EntityRegistryRefTraits.hpp new file mode 100644 index 0000000000..62fffdf8a2 --- /dev/null +++ b/LiteLoader/include/llapi/mc/EntityRegistryRefTraits.hpp @@ -0,0 +1,20 @@ +#pragma once + +#include "llapi/Global.h" +#include "EntityRegistry.hpp" + +class EntityRegistryOwned : public EntityRegistry { +public: + entt::basic_registry mOwnedRegistry; +}; + +struct EntityRegistryRefTraits { +public: + using StackRef = EntityRegistry; + using WeakStorage = WeakStorageSharePtr; + using StackResultStorage = StackResultStorageSharePtr; + using OwnerStackRef = EntityRegistryOwned; + using OwnerStorage = OwnerStorageSharePtr; +}; + +struct EntityRegistryConstRefTraits : public EntityRegistryRefTraits {}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/EntitySensorComponent.hpp b/LiteLoader/include/llapi/mc/EntitySensorComponent.hpp index 5c154bb045..ce7d73110b 100644 --- a/LiteLoader/include/llapi/mc/EntitySensorComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntitySensorComponent.hpp @@ -29,23 +29,23 @@ class EntitySensorComponent { public: /** - * @symbol ??0EntitySensorComponent\@\@QEAA\@XZ + * @symbol ??0EntitySensorComponent\@\@QEAA\@XZ */ MCAPI EntitySensorComponent(); /** - * @symbol ??0EntitySensorComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0EntitySensorComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI EntitySensorComponent(class EntitySensorComponent &&); /** - * @symbol ?evaluateActor\@EntitySensorComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?evaluateActor\@EntitySensorComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void evaluateActor(class Actor &); /** - * @symbol ??4EntitySensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4EntitySensorComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class EntitySensorComponent & operator=(class EntitySensorComponent &&); /** - * @symbol ??1EntitySensorComponent\@\@QEAA\@XZ + * @symbol ??1EntitySensorComponent\@\@QEAA\@XZ */ MCAPI ~EntitySensorComponent(); @@ -53,8 +53,8 @@ class EntitySensorComponent { private: /** - * @symbol ?NO_MAX_COUNT\@EntitySensorComponent\@\@0HB + * @symbol ?NO_MAX_COUNT\@EntitySensorComponent\@\@0HB */ MCAPI static int const NO_MAX_COUNT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp b/LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp index 9bdcbb1e57..8a750a1b21 100644 --- a/LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EntitySensorDefinition.hpp @@ -30,16 +30,16 @@ class EntitySensorDefinition { public: /** - * @symbol ??0EntitySensorDefinition\@\@QEAA\@XZ + * @symbol ??0EntitySensorDefinition\@\@QEAA\@XZ */ MCAPI EntitySensorDefinition(); /** - * @symbol ?initialize\@EntitySensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVEntitySensorComponent\@\@\@Z + * @symbol ?initialize\@EntitySensorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVEntitySensorComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class EntitySensorComponent &) const; /** - * @symbol ?buildSchema\@EntitySensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEntitySensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@EntitySensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEntitySensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitySensorSystem.hpp b/LiteLoader/include/llapi/mc/EntitySensorSystem.hpp index 9a2f30e234..af6499cbfd 100644 --- a/LiteLoader/include/llapi/mc/EntitySensorSystem.hpp +++ b/LiteLoader/include/llapi/mc/EntitySensorSystem.hpp @@ -30,19 +30,19 @@ class EntitySensorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EntitySensorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@EntitySensorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@EntitySensorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp index 8b4bb33d4e..11a29b1f30 100644 --- a/LiteLoader/include/llapi/mc/EntityServerPacket.hpp +++ b/LiteLoader/include/llapi/mc/EntityServerPacket.hpp @@ -30,27 +30,33 @@ class EntityServerPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EntityServerPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?write\@EntityServerPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EntityServerPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EntityServerPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EntityServerPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYSERVERPACKET /** - * @symbol ??0EntityServerPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI EntityServerPacket(); + MCVAPI ~EntityServerPacket(); +#endif /** - * @symbol ??0EntityServerPacket\@\@QEAA\@AEBVEntityContext\@\@\@Z + * @symbol ??0EntityServerPacket\@\@QEAA\@AEBVEntityContext\@\@\@Z */ MCAPI EntityServerPacket(class EntityContext const &); + /** + * @symbol ??0EntityServerPacket\@\@QEAA\@XZ + */ + MCAPI EntityServerPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitySet.hpp b/LiteLoader/include/llapi/mc/EntitySet.hpp index fc4918c885..c12b6d506e 100644 --- a/LiteLoader/include/llapi/mc/EntitySet.hpp +++ b/LiteLoader/include/llapi/mc/EntitySet.hpp @@ -28,32 +28,32 @@ class EntitySet { public: /** - * @symbol ??0EntitySet\@\@QEAA\@XZ + * @symbol ??0EntitySet\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI EntitySet(); + MCAPI EntitySet(class EntitySet &&); /** - * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0EntitySet\@\@QEAA\@XZ */ - MCAPI EntitySet(class EntitySet const &); + MCAPI EntitySet(); /** - * @symbol ??0EntitySet\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0EntitySet\@\@QEAA\@AEBV0\@\@Z */ - MCAPI EntitySet(class EntitySet &&); + MCAPI EntitySet(class EntitySet const &); /** - * @symbol ?add\@EntitySet\@\@QEAA_NAEBVEntityContext\@\@\@Z + * @symbol ?add\@EntitySet\@\@QEAA_NAEBVEntityContext\@\@\@Z */ MCAPI bool add(class EntityContext const &); /** - * @symbol ?erase\@EntitySet\@\@QEAA?AV?$_List_const_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CB_KVWeakEntityRef\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@V23\@\@Z + * @symbol ?erase\@EntitySet\@\@QEAA?AV?$_List_const_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CB_KVWeakEntityRef\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@V23\@\@Z */ MCAPI class std::_List_const_iterator>>> erase(class std::_List_const_iterator>>>); /** - * @symbol ?find\@EntitySet\@\@QEBA?AVWeakEntityRef\@\@AEBVEntityContext\@\@\@Z + * @symbol ?find\@EntitySet\@\@QEBA?AVWeakEntityRef\@\@AEBVEntityContext\@\@\@Z */ MCAPI class WeakEntityRef find(class EntityContext const &) const; /** - * @symbol ??4EntitySet\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4EntitySet\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class EntitySet & operator=(class EntitySet &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityStorageKeyComponent.hpp b/LiteLoader/include/llapi/mc/EntityStorageKeyComponent.hpp index b9e987d513..01aabd6f74 100644 --- a/LiteLoader/include/llapi/mc/EntityStorageKeyComponent.hpp +++ b/LiteLoader/include/llapi/mc/EntityStorageKeyComponent.hpp @@ -28,20 +28,20 @@ class EntityStorageKeyComponent { public: /** - * @symbol ??0EntityStorageKeyComponent\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0EntityStorageKeyComponent\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI EntityStorageKeyComponent(std::string const &); /** - * @symbol ?addAdditionalSaveData\@EntityStorageKeyComponent\@\@QEBAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@EntityStorageKeyComponent\@\@QEBAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class Actor const &, class CompoundTag &) const; /** - * @symbol ?readAdditionalSaveData\@EntityStorageKeyComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?readAdditionalSaveData\@EntityStorageKeyComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &); /** - * @symbol ??1EntityStorageKeyComponent\@\@QEAA\@XZ + * @symbol ??1EntityStorageKeyComponent\@\@QEAA\@XZ */ MCAPI ~EntityStorageKeyComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntityStorageKeySystem.hpp b/LiteLoader/include/llapi/mc/EntityStorageKeySystem.hpp index d68508daff..9363614cd7 100644 --- a/LiteLoader/include/llapi/mc/EntityStorageKeySystem.hpp +++ b/LiteLoader/include/llapi/mc/EntityStorageKeySystem.hpp @@ -28,20 +28,20 @@ class EntityStorageKeySystem { public: /** - * @symbol ?generateStorageKey\@EntityStorageKeySystem\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z + * @symbol ?generateStorageKey\@EntityStorageKeySystem\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z */ MCAPI static std::string generateStorageKey(__int64); /** - * @symbol ?getIsDirtySinceSerialization\@EntityStorageKeySystem\@\@SA_NAEAVEntityContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getIsDirtySinceSerialization\@EntityStorageKeySystem\@\@SA_NAEAVEntityContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool getIsDirtySinceSerialization(class EntityContext &, std::string const &); /** - * @symbol ?setDirtyFromNonSerializedState\@EntityStorageKeySystem\@\@SAXAEAVEntityContext\@\@\@Z + * @symbol ?setDirtyFromNonSerializedState\@EntityStorageKeySystem\@\@SAXAEAVEntityContext\@\@\@Z */ MCAPI static void setDirtyFromNonSerializedState(class EntityContext &); /** - * @symbol ?setLastSerializedState\@EntityStorageKeySystem\@\@SAXAEAVEntityContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setLastSerializedState\@EntityStorageKeySystem\@\@SAXAEAVEntityContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void setLastSerializedState(class EntityContext &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitySystems.hpp b/LiteLoader/include/llapi/mc/EntitySystems.hpp index ad4e6a0961..40f2dead8c 100644 --- a/LiteLoader/include/llapi/mc/EntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystems.hpp @@ -31,61 +31,61 @@ class EntitySystems { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ENTITYSYSTEMS /** - * @symbol ?registerTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z + * @symbol ?registerTickingSystem\@EntitySystems\@\@UEAAXV?$span\@$$CBV?$typeid_t\@USystemCategory\@\@\@\@$0?0\@gsl\@\@V?$unique_ptr\@VITickingSystem\@\@U?$default_delete\@VITickingSystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z */ MCVAPI void registerTickingSystem(class gsl::span const, -1>, std::unique_ptr, struct SystemInfo const &); /** - * @symbol ?tickMovementCatchup\@EntitySystems\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?tickMovementCatchup\@EntitySystems\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ MCVAPI void tickMovementCatchup(class EntityRegistry &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~EntitySystems(); #endif /** - * @symbol ??0EntitySystems\@\@QEAA\@V?$unique_ptr\@UIEntitySystemsCollection\@\@U?$default_delete\@UIEntitySystemsCollection\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z + * @symbol ??0EntitySystems\@\@QEAA\@V?$unique_ptr\@UIEntitySystemsCollection\@\@U?$default_delete\@UIEntitySystemsCollection\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ MCAPI EntitySystems(std::unique_ptr, std::string); /** - * @symbol ??0EntitySystems\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0EntitySystems\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI EntitySystems(std::string); /** - * @symbol ?getPlayerInteractionSystem\@EntitySystems\@\@QEAAAEAVPlayerInteractionSystem\@\@XZ + * @symbol ?getPlayerInteractionSystem\@EntitySystems\@\@QEAAAEAVPlayerInteractionSystem\@\@XZ */ MCAPI class PlayerInteractionSystem & getPlayerInteractionSystem(); /** - * @symbol ?registerEditorOnlyTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z + * @symbol ?registerEditorOnlyTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z */ MCAPI void registerEditorOnlyTickingSystem(struct TickingSystemWithInfo &&); /** - * @symbol ?registerEvents\@EntitySystems\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?registerEvents\@EntitySystems\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void registerEvents(class EntityRegistry &); /** - * @symbol ?registerGameOnlyTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z + * @symbol ?registerGameOnlyTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z */ MCAPI void registerGameOnlyTickingSystem(struct TickingSystemWithInfo &&); /** - * @symbol ?registerMovementTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z + * @symbol ?registerMovementTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z */ MCAPI void registerMovementTickingSystem(struct TickingSystemWithInfo &&); /** - * @symbol ?registerSystem\@EntitySystems\@\@QEAAXV?$unique_ptr\@UISystem\@\@U?$default_delete\@UISystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z + * @symbol ?registerSystem\@EntitySystems\@\@QEAAXV?$unique_ptr\@UISystem\@\@U?$default_delete\@UISystem\@\@\@std\@\@\@std\@\@AEBUSystemInfo\@\@\@Z */ MCAPI void registerSystem(std::unique_ptr, struct SystemInfo const &); /** - * @symbol ?registerTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z + * @symbol ?registerTickingSystem\@EntitySystems\@\@QEAAX$$QEAUTickingSystemWithInfo\@\@\@Z */ MCAPI void registerTickingSystem(struct TickingSystemWithInfo &&); /** - * @symbol ?tick\@EntitySystems\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?tick\@EntitySystems\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void tick(class EntityRegistry &); /** - * @symbol ?tickEditor\@EntitySystems\@\@QEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?tickEditor\@EntitySystems\@\@QEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void tickEditor(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp b/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp index 70ddaa51b3..280c510115 100644 --- a/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystemsCollection.hpp @@ -22,7 +22,7 @@ namespace EntitySystemsCollection { #undef AFTER_EXTRA /** - * @symbol ?create\@EntitySystemsCollection\@\@YA?AV?$unique_ptr\@UIEntitySystemsCollection\@\@U?$default_delete\@UIEntitySystemsCollection\@\@\@std\@\@\@std\@\@XZ + * @symbol ?create\@EntitySystemsCollection\@\@YA?AV?$unique_ptr\@UIEntitySystemsCollection\@\@U?$default_delete\@UIEntitySystemsCollection\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr create(); diff --git a/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp b/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp index 1dab7c2e91..0122c3d22f 100644 --- a/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp +++ b/LiteLoader/include/llapi/mc/EntitySystemsInfo.hpp @@ -28,11 +28,11 @@ struct EntitySystemsInfo { public: /** - * @symbol ??1EntitySystemsInfo\@\@QEAA\@XZ + * @symbol ??1EntitySystemsInfo\@\@QEAA\@XZ */ MCAPI ~EntitySystemsInfo(); /** - * @symbol ?bindType\@EntitySystemsInfo\@\@SAXXZ + * @symbol ?bindType\@EntitySystemsInfo\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/EntityTypes.hpp b/LiteLoader/include/llapi/mc/EntityTypes.hpp index ebee743854..99dec574d3 100644 --- a/LiteLoader/include/llapi/mc/EntityTypes.hpp +++ b/LiteLoader/include/llapi/mc/EntityTypes.hpp @@ -31,12 +31,12 @@ class EntityTypes { public: /** - * @symbol ?parseJson\@EntityTypes\@\@QEAA_NAEBVValue\@Json\@\@\@Z + * @symbol ?parseJson\@EntityTypes\@\@QEAA_NAEBVValue\@Json\@\@\@Z */ MCAPI bool parseJson(class Json::Value const &); /** - * @symbol ??1EntityTypes\@\@QEAA\@XZ + * @symbol ??1EntityTypes\@\@QEAA\@XZ */ MCAPI ~EntityTypes(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp b/LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp index 748ed13499..192be805b6 100644 --- a/LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp +++ b/LiteLoader/include/llapi/mc/EnvironmentRequirement.hpp @@ -30,11 +30,11 @@ struct EnvironmentRequirement { public: /** - * @symbol ?addBlockDescriptor\@EnvironmentRequirement\@\@QEAAXAEBVBlockDescriptor\@\@\@Z + * @symbol ?addBlockDescriptor\@EnvironmentRequirement\@\@QEAAXAEBVBlockDescriptor\@\@\@Z */ MCAPI void addBlockDescriptor(class BlockDescriptor const &); /** - * @symbol ??1EnvironmentRequirement\@\@QEAA\@XZ + * @symbol ??1EnvironmentRequirement\@\@QEAA\@XZ */ MCAPI ~EnvironmentRequirement(); diff --git a/LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp b/LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp index 7232d34892..e52d5c8454 100644 --- a/LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EnvironmentSensorDefinition.hpp @@ -31,12 +31,12 @@ class EnvironmentSensorDefinition { public: /** - * @symbol ?addEnvironmentTrigger\@EnvironmentSensorDefinition\@\@QEAAXAEBVActorDefinitionTrigger\@\@\@Z + * @symbol ?addEnvironmentTrigger\@EnvironmentSensorDefinition\@\@QEAAXAEBVActorDefinitionTrigger\@\@\@Z */ MCAPI void addEnvironmentTrigger(class ActorDefinitionTrigger const &); /** - * @symbol ?buildSchema\@EnvironmentSensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEnvironmentSensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@EnvironmentSensorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEnvironmentSensorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp b/LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp index 94753860d9..770993c3db 100644 --- a/LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp +++ b/LiteLoader/include/llapi/mc/EnvironmentSensorSystem.hpp @@ -30,19 +30,19 @@ class EnvironmentSensorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EnvironmentSensorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@EnvironmentSensorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@EnvironmentSensorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EquipItemComponent.hpp b/LiteLoader/include/llapi/mc/EquipItemComponent.hpp index 9dad951c5b..84b72c372a 100644 --- a/LiteLoader/include/llapi/mc/EquipItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/EquipItemComponent.hpp @@ -30,12 +30,12 @@ class EquipItemComponent { public: /** - * @symbol ?onEquipItemPickedUp\@EquipItemComponent\@\@QEAAXVItemStack\@\@H\@Z + * @symbol ?onEquipItemPickedUp\@EquipItemComponent\@\@QEAAXVItemStack\@\@H\@Z */ MCAPI void onEquipItemPickedUp(class ItemStack, int); /** - * @symbol ??1EquipItemComponent\@\@QEAA\@XZ + * @symbol ??1EquipItemComponent\@\@QEAA\@XZ */ MCAPI ~EquipItemComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EquipItemGoal.hpp b/LiteLoader/include/llapi/mc/EquipItemGoal.hpp index fa31c49dc5..1bfe59fef2 100644 --- a/LiteLoader/include/llapi/mc/EquipItemGoal.hpp +++ b/LiteLoader/include/llapi/mc/EquipItemGoal.hpp @@ -30,56 +30,56 @@ class EquipItemGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EquipItemGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@EquipItemGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@EquipItemGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@EquipItemGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@EquipItemGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@EquipItemGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@EquipItemGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@EquipItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@EquipItemGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0EquipItemGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0EquipItemGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI EquipItemGoal(class Mob &); //private: /** - * @symbol ?_dropItem\@EquipItemGoal\@\@AEBAXAEBVItemStack\@\@\@Z + * @symbol ?_dropItem\@EquipItemGoal\@\@AEBAXAEBVItemStack\@\@\@Z */ MCAPI void _dropItem(class ItemStack const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EquipmentSlots.hpp b/LiteLoader/include/llapi/mc/EquipmentSlots.hpp index 8e4b961f6e..56bd52e3dd 100644 --- a/LiteLoader/include/llapi/mc/EquipmentSlots.hpp +++ b/LiteLoader/include/llapi/mc/EquipmentSlots.hpp @@ -22,15 +22,15 @@ namespace EquipmentSlots { #undef AFTER_EXTRA /** - * @symbol ?equipmentSlotToString\@EquipmentSlots\@\@YAPEBDW4EquipmentSlot\@\@\@Z + * @symbol ?equipmentSlotToString\@EquipmentSlots\@\@YAPEBDW4EquipmentSlot\@\@\@Z */ MCAPI char const * equipmentSlotToString(enum class EquipmentSlot); /** - * @symbol ?hashToEquipmentSlot\@EquipmentSlots\@\@YA?AW4EquipmentSlot\@\@AEB_K\@Z + * @symbol ?hashToEquipmentSlot\@EquipmentSlots\@\@YA?AW4EquipmentSlot\@\@AEB_K\@Z */ MCAPI enum class EquipmentSlot hashToEquipmentSlot(unsigned __int64 const &); /** - * @symbol ?stringToEquipmentSlot\@EquipmentSlots\@\@YA?AW4EquipmentSlot\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?stringToEquipmentSlot\@EquipmentSlots\@\@YA?AW4EquipmentSlot\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class EquipmentSlot stringToEquipmentSlot(std::string const &); diff --git a/LiteLoader/include/llapi/mc/EquipmentTableDefinition.hpp b/LiteLoader/include/llapi/mc/EquipmentTableDefinition.hpp index 56edbafec8..90ed5be0f5 100644 --- a/LiteLoader/include/llapi/mc/EquipmentTableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EquipmentTableDefinition.hpp @@ -31,7 +31,7 @@ struct EquipmentTableDefinition { public: /** - * @symbol ?buildSchema\@EquipmentTableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEquipmentTableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@EquipmentTableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEquipmentTableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/EquippableComponent.hpp b/LiteLoader/include/llapi/mc/EquippableComponent.hpp index 39f5fab754..638efc1d27 100644 --- a/LiteLoader/include/llapi/mc/EquippableComponent.hpp +++ b/LiteLoader/include/llapi/mc/EquippableComponent.hpp @@ -30,40 +30,40 @@ class EquippableComponent { public: /** - * @symbol ??0EquippableComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0EquippableComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI EquippableComponent(class EquippableComponent &&); /** - * @symbol ?createDataPacket\@EquippableComponent\@\@QEBA?AVUpdateEquipPacket\@\@AEAVActor\@\@W4ContainerID\@\@\@Z + * @symbol ?createDataPacket\@EquippableComponent\@\@QEBA?AVUpdateEquipPacket\@\@AEAVActor\@\@W4ContainerID\@\@\@Z */ MCAPI class UpdateEquipPacket createDataPacket(class Actor &, enum class ContainerID) const; /** - * @symbol ?createTag\@EquippableComponent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVActor\@\@\@Z + * @symbol ?createTag\@EquippableComponent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVActor\@\@\@Z */ MCAPI std::unique_ptr createTag(class Actor &) const; /** - * @symbol ?getSlotCount\@EquippableComponent\@\@QEBAHXZ + * @symbol ?getSlotCount\@EquippableComponent\@\@QEBAHXZ */ MCAPI int getSlotCount() const; /** - * @symbol ?hasSlotAllowedItems\@EquippableComponent\@\@QEBA_NH\@Z + * @symbol ?hasSlotAllowedItems\@EquippableComponent\@\@QEBA_NH\@Z */ MCAPI bool hasSlotAllowedItems(int) const; /** - * @symbol ?onItemChanged\@EquippableComponent\@\@QEBA_NAEAVActor\@\@_KAEBVItemStack\@\@\@Z + * @symbol ?onItemChanged\@EquippableComponent\@\@QEBA_NAEAVActor\@\@_KAEBVItemStack\@\@\@Z */ MCAPI bool onItemChanged(class Actor &, unsigned __int64, class ItemStack const &) const; /** - * @symbol ??4EquippableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4EquippableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class EquippableComponent & operator=(class EquippableComponent &&); /** - * @symbol ?tryGetSlotAllowedItems\@EquippableComponent\@\@QEBAPEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?tryGetSlotAllowedItems\@EquippableComponent\@\@QEBAPEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI std::vector const * tryGetSlotAllowedItems(int) const; /** - * @symbol ??1EquippableComponent\@\@QEAA\@XZ + * @symbol ??1EquippableComponent\@\@QEAA\@XZ */ MCAPI ~EquippableComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EquippableDefinition.hpp b/LiteLoader/include/llapi/mc/EquippableDefinition.hpp index 97b42bfcc1..b86e747fec 100644 --- a/LiteLoader/include/llapi/mc/EquippableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/EquippableDefinition.hpp @@ -31,12 +31,12 @@ class EquippableDefinition { public: /** - * @symbol ?initialize\@EquippableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVEquippableComponent\@\@\@Z + * @symbol ?initialize\@EquippableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVEquippableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class EquippableComponent &) const; /** - * @symbol ?buildSchema\@EquippableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEquippableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@EquippableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VEquippableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ErrorPathStack.hpp b/LiteLoader/include/llapi/mc/ErrorPathStack.hpp index b27b445588..21a887b88b 100644 --- a/LiteLoader/include/llapi/mc/ErrorPathStack.hpp +++ b/LiteLoader/include/llapi/mc/ErrorPathStack.hpp @@ -28,12 +28,12 @@ class ErrorPathStack { public: /** - * @symbol ??0ErrorPathStack\@\@QEAA\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z + * @symbol ??0ErrorPathStack\@\@QEAA\@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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ MCAPI ErrorPathStack(std::vector &, std::string const &); /** - * @symbol ??1ErrorPathStack\@\@QEAA\@XZ + * @symbol ??1ErrorPathStack\@\@QEAA\@XZ */ MCAPI ~ErrorPathStack(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EventCommand.hpp b/LiteLoader/include/llapi/mc/EventCommand.hpp index 587995f839..a4cf6584e8 100644 --- a/LiteLoader/include/llapi/mc/EventCommand.hpp +++ b/LiteLoader/include/llapi/mc/EventCommand.hpp @@ -31,18 +31,18 @@ class EventCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EventCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@EventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@EventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@EventCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@EventCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EventCoordinatorRegistration.hpp b/LiteLoader/include/llapi/mc/EventCoordinatorRegistration.hpp index a94ec7d74c..b909707120 100644 --- a/LiteLoader/include/llapi/mc/EventCoordinatorRegistration.hpp +++ b/LiteLoader/include/llapi/mc/EventCoordinatorRegistration.hpp @@ -20,15 +20,15 @@ namespace EventCoordinatorRegistration { #undef AFTER_EXTRA /** - * @symbol ?registerClientEventCoordinators\@EventCoordinatorRegistration\@\@YAXAEAVLevel\@\@\@Z + * @symbol ?registerClientEventCoordinators\@EventCoordinatorRegistration\@\@YAXAEAVLevel\@\@\@Z */ MCAPI void registerClientEventCoordinators(class Level &); /** - * @symbol ?registerServerEventCoordinators\@EventCoordinatorRegistration\@\@YAXAEAVServerLevel\@\@\@Z + * @symbol ?registerServerEventCoordinators\@EventCoordinatorRegistration\@\@YAXAEAVServerLevel\@\@\@Z */ MCAPI void registerServerEventCoordinators(class ServerLevel &); /** - * @symbol ?registerSharedEventCoordinators\@EventCoordinatorRegistration\@\@YAXAEAVLevel\@\@\@Z + * @symbol ?registerSharedEventCoordinators\@EventCoordinatorRegistration\@\@YAXAEAVLevel\@\@\@Z */ MCAPI void registerSharedEventCoordinators(class Level &); diff --git a/LiteLoader/include/llapi/mc/EventPacket.hpp b/LiteLoader/include/llapi/mc/EventPacket.hpp index 076e0f7f8d..68cbf17163 100644 --- a/LiteLoader/include/llapi/mc/EventPacket.hpp +++ b/LiteLoader/include/llapi/mc/EventPacket.hpp @@ -83,101 +83,107 @@ class EventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@EventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@EventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@EventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@EventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@EventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@EventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@EventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@EventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVENTPACKET /** - * @symbol ??0EventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EventPacket(); +#endif + /** + * @symbol ??0EventPacket\@\@QEAA\@XZ */ MCAPI EventPacket(); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@_N\@Z + * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z */ - MCAPI EventPacket(class Player const *, enum class MinecraftEventing::AchievementIds, bool); + MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z */ - MCAPI EventPacket(class Player const *, class gsl::not_null); + MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, enum class ActorType); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVActor\@\@\@gsl\@\@W4InteractionType\@MinecraftEventing\@\@\@Z + * @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\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@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 *, class AutomaticID); + MCAPI EventPacket(class Player const &, std::string const &, int); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ - MCAPI EventPacket(class Player const *, class AutomaticID, class AutomaticID); + MCAPI EventPacket(class Player const *, class AutomaticID); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@PEBVActor\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@W4ActorDamageCause\@\@W4ActorType\@\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z */ - MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, enum class ActorType); + MCAPI EventPacket(class Player const *, short, unsigned int, short); /** - * @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\@\@HHW4ActorDamageCause\@\@_N\@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 *, int, int, enum class ActorDamageCause, bool); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI EventPacket(class Player const *, int, class gsl::not_null); + MCAPI EventPacket(class Player const &, std::string const &); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HHW4ActorDamageCause\@\@_N\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z */ - MCAPI EventPacket(class Player const *, int, int, enum class ActorDamageCause, bool); + MCAPI EventPacket(class Player const *, std::string const &, int, int, std::string const &); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@FIF\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@_N\@Z */ - MCAPI EventPacket(class Player const *, short, unsigned int, short); + MCAPI EventPacket(class Player const *, enum class MinecraftEventing::AchievementIds, bool); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBVRaid\@\@_N\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBVRaid\@\@_N\@Z */ MCAPI EventPacket(class Player const *, class Raid const &, bool); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$not_null\@PEBVMob\@\@\@gsl\@\@\@Z */ - MCAPI EventPacket(class Player const *, std::string const &, int, int, std::string const &); + MCAPI EventPacket(class Player const *, class gsl::not_null); /** - * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBUData\@0\@\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ - MCAPI EventPacket(class Player const *, struct EventPacket::Data const &); + MCAPI EventPacket(class Player const *, class AutomaticID, class AutomaticID); /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@W4MovementEventType\@\@MMMMM\@Z + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@HV?$not_null\@PEBVActor\@\@\@gsl\@\@\@Z */ - MCAPI EventPacket(class Player const &, enum class MovementEventType, float, float, float, float, float); + 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 + * @symbol ??0EventPacket\@\@QEAA\@PEBVPlayer\@\@AEBUData\@0\@\@Z */ - MCAPI EventPacket(class Player const &, std::string const &, int); + MCAPI EventPacket(class Player const *, struct EventPacket::Data const &); /** - * @symbol ??0EventPacket\@\@QEAA\@AEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 &, std::string const &); + MCAPI EventPacket(class Player const *, class Actor const *, class gsl::not_null, enum class ActorDamageCause, std::string, int, enum class ActorType); /** - * @symbol ??4EventPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4EventPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class EventPacket & operator=(class EventPacket &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EventResponse.hpp b/LiteLoader/include/llapi/mc/EventResponse.hpp index 67ddd47252..1406c59d30 100644 --- a/LiteLoader/include/llapi/mc/EventResponse.hpp +++ b/LiteLoader/include/llapi/mc/EventResponse.hpp @@ -31,24 +31,30 @@ class EventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~EventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@EventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@EventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2() = 0; /** - * @vftbl 3 - * @symbol ?buildSchema\@EventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@EventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVENTRESPONSE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EventResponse(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EventResponseCollection.hpp b/LiteLoader/include/llapi/mc/EventResponseCollection.hpp index 98caa26455..452d8c6cd2 100644 --- a/LiteLoader/include/llapi/mc/EventResponseCollection.hpp +++ b/LiteLoader/include/llapi/mc/EventResponseCollection.hpp @@ -31,7 +31,7 @@ struct EventResponseCollection { public: /** - * @symbol ?buildSchema\@EventResponseCollection\@\@SA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVSemVersion\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @symbol ?buildSchema\@EventResponseCollection\@\@SA?AV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVSemVersion\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ MCAPI static class std::shared_ptr> buildSchema(std::string const &, class SemVersion const &, class Factory const &); diff --git a/LiteLoader/include/llapi/mc/EventResponseFactory.hpp b/LiteLoader/include/llapi/mc/EventResponseFactory.hpp index e830ece6f7..17221d523b 100644 --- a/LiteLoader/include/llapi/mc/EventResponseFactory.hpp +++ b/LiteLoader/include/llapi/mc/EventResponseFactory.hpp @@ -26,17 +26,26 @@ class EventResponseFactory { public: class EventResponseFactory& operator=(class EventResponseFactory const &) = delete; EventResponseFactory(class EventResponseFactory const &) = delete; - EventResponseFactory() = delete; #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVENTRESPONSEFACTORY /** - * @symbol ?getSchema\@EventResponseFactory\@\@QEBAAEBV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~EventResponseFactory(); +#endif + /** + * @symbol ??0EventResponseFactory\@\@QEAA\@XZ + */ + MCAPI EventResponseFactory(); + /** + * @symbol ?getSchema\@EventResponseFactory\@\@QEBAAEBV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr> const & getSchema() const; /** - * @symbol ?initSchema\@EventResponseFactory\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@\@Z + * @symbol ?initSchema\@EventResponseFactory\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@\@Z */ MCAPI void initSchema(std::string const &, class SemVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EventingRequest.hpp b/LiteLoader/include/llapi/mc/EventingRequest.hpp index 61d522b915..3ee74bb195 100644 --- a/LiteLoader/include/llapi/mc/EventingRequest.hpp +++ b/LiteLoader/include/llapi/mc/EventingRequest.hpp @@ -28,15 +28,15 @@ struct EventingRequest { public: /** - * @symbol ??1EventingRequest\@\@QEAA\@XZ + * @symbol ??1EventingRequest\@\@QEAA\@XZ */ MCAPI ~EventingRequest(); /** - * @symbol ?addPersonaEmotePlayed\@EventingRequest\@\@SA?AU1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NH\@Z + * @symbol ?addPersonaEmotePlayed\@EventingRequest\@\@SA?AU1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NH\@Z */ MCAPI static struct EventingRequest addPersonaEmotePlayed(std::string const &, bool, int); /** - * @symbol ?addPlayerBounced\@EventingRequest\@\@SA?AU1\@AEBUActorUniqueID\@\@AEBVBlock\@\@H\@Z + * @symbol ?addPlayerBounced\@EventingRequest\@\@SA?AU1\@AEBUActorUniqueID\@\@AEBVBlock\@\@H\@Z */ MCAPI static struct EventingRequest addPlayerBounced(struct ActorUniqueID const &, class Block const &, int); diff --git a/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp b/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp index e86a1f05f3..a2148c3346 100644 --- a/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp +++ b/LiteLoader/include/llapi/mc/EventingRequestQueueComponent.hpp @@ -28,11 +28,11 @@ struct EventingRequestQueueComponent { public: /** - * @symbol ??0EventingRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0EventingRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI EventingRequestQueueComponent(struct EventingRequestQueueComponent &&); /** - * @symbol ??1EventingRequestQueueComponent\@\@QEAA\@XZ + * @symbol ??1EventingRequestQueueComponent\@\@QEAA\@XZ */ MCAPI ~EventingRequestQueueComponent(); diff --git a/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp b/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp index 0dff9df669..fc51b21180 100644 --- a/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/EventingRequestSystem.hpp @@ -28,16 +28,16 @@ class EventingRequestSystem { public: /** - * @symbol ?createSystem\@EventingRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@EventingRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_eventingRequestSystem\@EventingRequestSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUEventingRequestQueueComponent\@\@AEAVLevelComponent\@\@\@Z + * @symbol ?_eventingRequestSystem\@EventingRequestSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUEventingRequestQueueComponent\@\@AEAVLevelComponent\@\@\@Z */ MCAPI static void _eventingRequestSystem(class StrictEntityContext const &, struct EventingRequestQueueComponent &, class LevelComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EvocationFang.hpp b/LiteLoader/include/llapi/mc/EvocationFang.hpp index 1886dcb4e7..474658f3a6 100644 --- a/LiteLoader/include/llapi/mc/EvocationFang.hpp +++ b/LiteLoader/include/llapi/mc/EvocationFang.hpp @@ -31,141 +31,141 @@ class EvocationFang : public Actor { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~EvocationFang(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@EvocationFang\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@EvocationFang\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@EvocationFang\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@EvocationFang\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@EvocationFang\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@EvocationFang\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@EvocationFang\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@EvocationFang\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0EvocationFang\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0EvocationFang\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI EvocationFang(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); //private: /** - * @symbol ?_dealDamageTo\@EvocationFang\@\@AEAAXAEAVMob\@\@\@Z + * @symbol ?_dealDamageTo\@EvocationFang\@\@AEAAXAEAVMob\@\@\@Z */ MCAPI void _dealDamageTo(class Mob &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EvocationIllager.hpp b/LiteLoader/include/llapi/mc/EvocationIllager.hpp index f5f9ead98c..c4c0e619b5 100644 --- a/LiteLoader/include/llapi/mc/EvocationIllager.hpp +++ b/LiteLoader/include/llapi/mc/EvocationIllager.hpp @@ -32,169 +32,164 @@ class EvocationIllager : public HumanoidMonster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@EvocationIllager\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@EvocationIllager\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~EvocationIllager(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@EvocationIllager\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@EvocationIllager\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@EvocationIllager\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@EvocationIllager\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 306 - * @symbol ?isAlliedTo\@EvocationIllager\@\@UEAA_NPEAVMob\@\@\@Z + * @vftbl 303 + * @symbol ?isAlliedTo\@EvocationIllager\@\@UEAA_NPEAVMob\@\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@EvocationIllager\@\@MEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@EvocationIllager\@\@MEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EVOCATIONILLAGER /** - * @symbol ?canExistInPeaceful\@EvocationIllager\@\@UEBA_NXZ + * @symbol ?canExistInPeaceful\@EvocationIllager\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; #endif /** - * @symbol ??0EvocationIllager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0EvocationIllager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI EvocationIllager(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExecuteCommand.hpp b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp index 99080bd42b..7e883a8965 100644 --- a/LiteLoader/include/llapi/mc/ExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteCommand.hpp @@ -31,18 +31,18 @@ class ExecuteCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExecuteCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ExecuteCommand\@\@SAXAEAVCommandRegistry\@\@_NH\@Z + * @symbol ?setup\@ExecuteCommand\@\@SAXAEAVCommandRegistry\@\@_NH\@Z */ MCAPI static void setup(class CommandRegistry &, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExecuteCommandHelpers.hpp b/LiteLoader/include/llapi/mc/ExecuteCommandHelpers.hpp index 113ea4ee7d..c38fce5877 100644 --- a/LiteLoader/include/llapi/mc/ExecuteCommandHelpers.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteCommandHelpers.hpp @@ -20,11 +20,11 @@ namespace ExecuteCommandHelpers { #undef AFTER_EXTRA /** - * @symbol ?handleResult\@ExecuteCommandHelpers\@\@YAXAEBVCommand\@\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?handleResult\@ExecuteCommandHelpers\@\@YAXAEBVCommand\@\@AEBV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void handleResult(class Command const &, std::vector const &, class CommandOutput &); /** - * @symbol ?runCommand\@ExecuteCommandHelpers\@\@YAXAEBVCommand\@\@AEBVCommandOrigin\@\@AEBVActor\@\@AEAV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?runCommand\@ExecuteCommandHelpers\@\@YAXAEBVCommand\@\@AEBVCommandOrigin\@\@AEBVActor\@\@AEAV?$vector\@PEBVActor\@\@V?$allocator\@PEBVActor\@\@\@std\@\@\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void runCommand(class Command const &, class CommandOrigin const &, class Actor const &, std::vector &, class CommandOutput &); diff --git a/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp index 38bea73681..b067351aef 100644 --- a/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ExecuteContextCommandOrigin.hpp @@ -30,124 +30,124 @@ class ExecuteContextCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExecuteContextCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@ExecuteContextCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@ExecuteContextCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@ExecuteContextCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ExecuteContextCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@ExecuteContextCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@ExecuteContextCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@ExecuteContextCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@ExecuteContextCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@ExecuteContextCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@ExecuteContextCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@ExecuteContextCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@ExecuteContextCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@ExecuteContextCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@ExecuteContextCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@ExecuteContextCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@ExecuteContextCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@ExecuteContextCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ExecuteContextCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@ExecuteContextCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ExecuteContextCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@ExecuteContextCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ExecuteContextCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 27 - * @symbol ?updateValues\@ExecuteContextCommandOrigin\@\@UEAAXXZ + * @vftbl 27 + * @symbol ?updateValues\@ExecuteContextCommandOrigin\@\@UEAAXXZ */ virtual void updateValues(); /** - * @vftbl 28 - * @symbol ?getExecutePosition\@ExecuteContextCommandOrigin\@\@UEBA?BVVec3\@\@HAEBVCommandPositionFloat\@\@\@Z + * @vftbl 28 + * @symbol ?getExecutePosition\@ExecuteContextCommandOrigin\@\@UEBA?BVVec3\@\@HAEBVCommandPositionFloat\@\@\@Z */ virtual class Vec3 const getExecutePosition(int, class CommandPositionFloat const &) const; /** - * @vftbl 29 - * @symbol ?serialize\@ExecuteContextCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@ExecuteContextCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@ExecuteContextCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@ExecuteContextCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0ExecuteContextCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEBVVec3\@\@AEBV?$optional\@VVec2\@\@\@std\@\@00W4ActorLocation\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevel\@\@\@Z + * @symbol ??0ExecuteContextCommandOrigin\@\@QEAA\@UActorUniqueID\@\@AEBVVec3\@\@AEBV?$optional\@VVec2\@\@\@std\@\@00W4ActorLocation\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevel\@\@\@Z */ MCAPI ExecuteContextCommandOrigin(struct ActorUniqueID, class Vec3 const &, class std::optional const &, struct ActorUniqueID, struct ActorUniqueID, enum class ActorLocation, class AutomaticID, class Level &); /** - * @symbol ?getPositionEntity\@ExecuteContextCommandOrigin\@\@QEAAPEBVActor\@\@XZ + * @symbol ?getPositionEntity\@ExecuteContextCommandOrigin\@\@QEAAPEBVActor\@\@XZ */ MCAPI class Actor const * getPositionEntity(); /** - * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void setDimension(class AutomaticID const &); /** - * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBVDimension\@\@\@Z + * @symbol ?setDimension\@ExecuteContextCommandOrigin\@\@QEAAXAEBVDimension\@\@\@Z */ MCAPI void setDimension(class Dimension const &); /** - * @symbol ?setExecutionEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?setExecutionEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void setExecutionEntity(class Actor const &); /** - * @symbol ?setPosition\@ExecuteContextCommandOrigin\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setPosition\@ExecuteContextCommandOrigin\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setPosition(class Vec3 const &); /** - * @symbol ?setPositionEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?setPositionEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void setPositionEntity(class Actor const &); /** - * @symbol ?setRotation\@ExecuteContextCommandOrigin\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setRotation\@ExecuteContextCommandOrigin\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setRotation(class Vec2 const &); /** - * @symbol ?setRotationEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?setRotationEntity\@ExecuteContextCommandOrigin\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void setRotationEntity(class Actor const &); /** - * @symbol ?load\@ExecuteContextCommandOrigin\@\@SA?AV?$unique_ptr\@VExecuteContextCommandOrigin\@\@U?$default_delete\@VExecuteContextCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z + * @symbol ?load\@ExecuteContextCommandOrigin\@\@SA?AV?$unique_ptr\@VExecuteContextCommandOrigin\@\@U?$default_delete\@VExecuteContextCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class ServerLevel &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp b/LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp index 9514a28c74..fd38a24414 100644 --- a/LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp +++ b/LiteLoader/include/llapi/mc/ExhaustionAttributeDelegate.hpp @@ -31,18 +31,18 @@ class ExhaustionAttributeDelegate : public AttributeInstanceDelegate { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExhaustionAttributeDelegate(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@ExhaustionAttributeDelegate\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@ExhaustionAttributeDelegate\@\@UEAAXXZ */ virtual void tick(); /** - * @symbol ??0ExhaustionAttributeDelegate\@\@QEAA\@AEBVAttributeInstance\@\@\@Z + * @symbol ??0ExhaustionAttributeDelegate\@\@QEAA\@AEBVAttributeInstance\@\@\@Z */ MCAPI ExhaustionAttributeDelegate(class AttributeInstance const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExhaustionComponent.hpp b/LiteLoader/include/llapi/mc/ExhaustionComponent.hpp index 48a41bdd39..07c3f4b0de 100644 --- a/LiteLoader/include/llapi/mc/ExhaustionComponent.hpp +++ b/LiteLoader/include/llapi/mc/ExhaustionComponent.hpp @@ -28,36 +28,36 @@ class ExhaustionComponent { public: /** - * @symbol ?getAttackValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getAttackValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getAttackValue() const; /** - * @symbol ?getHealValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getHealValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getHealValue() const; /** - * @symbol ?getJumpValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getJumpValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getJumpValue() const; /** - * @symbol ?getMiningValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getMiningValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getMiningValue() const; /** - * @symbol ?getSprintJumpValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getSprintJumpValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getSprintJumpValue() const; /** - * @symbol ?getSprintValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getSprintValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getSprintValue() const; /** - * @symbol ?getSwimValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getSwimValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getSwimValue() const; /** - * @symbol ?getWalkValue\@ExhaustionComponent\@\@QEBAMXZ + * @symbol ?getWalkValue\@ExhaustionComponent\@\@QEBAMXZ */ MCAPI float getWalkValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExhaustionDefinition.hpp b/LiteLoader/include/llapi/mc/ExhaustionDefinition.hpp index b0682f356e..ad37922b25 100644 --- a/LiteLoader/include/llapi/mc/ExhaustionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ExhaustionDefinition.hpp @@ -29,12 +29,12 @@ class ExhaustionDefinition { public: /** - * @symbol ?initialize\@ExhaustionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExhaustionComponent\@\@\@Z + * @symbol ?initialize\@ExhaustionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExhaustionComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ExhaustionComponent &) const; /** - * @symbol ?buildSchema\@ExhaustionDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExhaustionDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ExhaustionDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExhaustionDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp b/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp index 143e6b9272..f7eb73b52a 100644 --- a/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp +++ b/LiteLoader/include/llapi/mc/ExitVehicleSystem.hpp @@ -11,46 +11,46 @@ #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_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExitVehicleSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@ExitVehicleSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 + * @vftbl 3 + * @symbol ?tick\@ExitVehicleSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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, 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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 + * @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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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, 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 + * @symbol ?createSystem\@ExitVehicleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp b/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp deleted file mode 100644 index c75446ad37..0000000000 --- a/LiteLoader/include/llapi/mc/ExitVehicleSystemImpl.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file ExitVehicleSystemImpl.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ExitVehicleSystemImpl. - * - */ -class ExitVehicleSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXITVEHICLESYSTEMIMPL -public: - class ExitVehicleSystemImpl& operator=(class ExitVehicleSystemImpl const &) = delete; - ExitVehicleSystemImpl(class ExitVehicleSystemImpl const &) = delete; - ExitVehicleSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?tryPlaceAt\@ExitVehicleSystemImpl\@\@SA_NAEBVVec3\@\@AEBVAABB\@\@AEBVIConstBlockSource\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z - */ - MCAPI static bool tryPlaceAt(class Vec3 const &, class AABB const &, class IConstBlockSource const &, class optional_ref); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp b/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp index ff010bf2dc..c0ebf48a30 100644 --- a/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp +++ b/LiteLoader/include/llapi/mc/ExpectedAnywhereConsume.hpp @@ -25,7 +25,7 @@ struct ExpectedAnywhereConsume { public: /** - * @symbol ??0ExpectedAnywhereConsume\@\@QEAA\@AEBVItemStack\@\@I\@Z + * @symbol ??0ExpectedAnywhereConsume\@\@QEAA\@AEBVItemStack\@\@I\@Z */ MCAPI ExpectedAnywhereConsume(class ItemStack const &, unsigned int); diff --git a/LiteLoader/include/llapi/mc/ExpectedSlotConsume.hpp b/LiteLoader/include/llapi/mc/ExpectedSlotConsume.hpp index da7b2a6ed5..0c89ba21a2 100644 --- a/LiteLoader/include/llapi/mc/ExpectedSlotConsume.hpp +++ b/LiteLoader/include/llapi/mc/ExpectedSlotConsume.hpp @@ -25,7 +25,7 @@ struct ExpectedSlotConsume { public: /** - * @symbol ??0ExpectedSlotConsume\@\@QEAA\@W4ContainerEnumName\@\@EAEBVItemStack\@\@E\@Z + * @symbol ??0ExpectedSlotConsume\@\@QEAA\@W4ContainerEnumName\@\@EAEBVItemStack\@\@E\@Z */ MCAPI ExpectedSlotConsume(enum class ContainerEnumName, unsigned char, class ItemStack const &, unsigned char); diff --git a/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp b/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp index 6f68f825fd..a4d91841c8 100644 --- a/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceCostCommitObject.hpp @@ -28,28 +28,28 @@ class ExperienceCostCommitObject { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExperienceCostCommitObject(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?append\@ExperienceCostCommitObject\@\@UEAA_NPEAVContainerValidationCommitObject\@\@\@Z + * @vftbl 1 + * @symbol ?append\@ExperienceCostCommitObject\@\@UEAA_NPEAVContainerValidationCommitObject\@\@\@Z */ virtual bool append(class ContainerValidationCommitObject *); /** - * @vftbl 2 - * @symbol ?canCommit\@ExperienceCostCommitObject\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 2 + * @symbol ?canCommit\@ExperienceCostCommitObject\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canCommit(class ContainerScreenContext const &) const; /** - * @vftbl 3 - * @symbol ?commit\@ExperienceCostCommitObject\@\@UEAAXAEBVContainerScreenContext\@\@\@Z + * @vftbl 3 + * @symbol ?commit\@ExperienceCostCommitObject\@\@UEAAXAEBVContainerScreenContext\@\@\@Z */ virtual void commit(class ContainerScreenContext const &); /** - * @symbol ??0ExperienceCostCommitObject\@\@QEAA\@H\@Z + * @symbol ??0ExperienceCostCommitObject\@\@QEAA\@H\@Z */ MCAPI ExperienceCostCommitObject(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp index 144f4fe3f2..5907616c45 100644 --- a/LiteLoader/include/llapi/mc/ExperienceOrb.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceOrb.hpp @@ -33,199 +33,194 @@ enum class DropType; public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ExperienceOrb\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ExperienceOrb\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ExperienceOrb(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@ExperienceOrb\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@ExperienceOrb\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@ExperienceOrb\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 90 - * @symbol ?playerTouch\@ExperienceOrb\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 89 + * @symbol ?playerTouch\@ExperienceOrb\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@ExperienceOrb\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@ExperienceOrb\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 257 - * @symbol ?doWaterSplashEffect\@ExperienceOrb\@\@MEAAXXZ + * @vftbl 255 + * @symbol ?doWaterSplashEffect\@ExperienceOrb\@\@MEAAXXZ */ virtual void doWaterSplashEffect(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@ExperienceOrb\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@ExperienceOrb\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ExperienceOrb\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ExperienceOrb\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ExperienceOrb\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ExperienceOrb\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol ?_playStepSound\@ExperienceOrb\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@ExperienceOrb\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0ExperienceOrb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ExperienceOrb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ExperienceOrb(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getIconIndex\@ExperienceOrb\@\@QEBAHXZ + * @symbol ?getIconIndex\@ExperienceOrb\@\@QEBAHXZ */ MCAPI int getIconIndex() const; /** - * @symbol ?postNormalTick\@ExperienceOrb\@\@QEAAXXZ + * @symbol ?postNormalTick\@ExperienceOrb\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?setValue\@ExperienceOrb\@\@QEAAXH\@Z + * @symbol ?setValue\@ExperienceOrb\@\@QEAAXH\@Z */ MCAPI void setValue(int); /** - * @symbol ?spawnOrbs\@ExperienceOrb\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@HHW4DropType\@1\@PEAVPlayer\@\@\@Z + * @symbol ?spawnOrbs\@ExperienceOrb\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@HHW4DropType\@1\@PEAVPlayer\@\@\@Z */ MCAPI static void spawnOrbs(class BlockSource &, class Vec3 const &, int, int, enum class ExperienceOrb::DropType, class Player *); /** - * @symbol ?spawnOrbs\@ExperienceOrb\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@HW4DropType\@1\@PEAVPlayer\@\@\@Z + * @symbol ?spawnOrbs\@ExperienceOrb\@\@SAXAEAVBlockSource\@\@AEBVVec3\@\@HW4DropType\@1\@PEAVPlayer\@\@\@Z */ MCAPI static void spawnOrbs(class BlockSource &, class Vec3 const &, int, enum class ExperienceOrb::DropType, class Player *); //private: /** - * @symbol ?_handleMending\@ExperienceOrb\@\@AEAAXAEAVPlayer\@\@\@Z + * @symbol ?_handleMending\@ExperienceOrb\@\@AEAAXAEAVPlayer\@\@\@Z */ MCAPI void _handleMending(class Player &); /** - * @symbol ?_spawnOrb\@ExperienceOrb\@\@CAXAEAVBlockSource\@\@AEAVLevel\@\@AEBVVec3\@\@H\@Z + * @symbol ?_spawnOrb\@ExperienceOrb\@\@CAXAEAVBlockSource\@\@AEAVLevel\@\@AEBVVec3\@\@H\@Z */ MCAPI static void _spawnOrb(class BlockSource &, class Level &, class Vec3 const &, int); /** - * @symbol ?_tryMergeExistingOrbs\@ExperienceOrb\@\@CA_NAEAVBlockSource\@\@AEBVVec3\@\@H\@Z + * @symbol ?_tryMergeExistingOrbs\@ExperienceOrb\@\@CA_NAEAVBlockSource\@\@AEBVVec3\@\@H\@Z */ MCAPI static bool _tryMergeExistingOrbs(class BlockSource &, class Vec3 const &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperienceOrbPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/ExperienceOrbPostNormalTickSystem.hpp deleted file mode 100644 index 769fbd45e3..0000000000 --- a/LiteLoader/include/llapi/mc/ExperienceOrbPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ExperienceOrbPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ExperienceOrbPostNormalTickSystem. - * - */ -class ExperienceOrbPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXPERIENCEORBPOSTNORMALTICKSYSTEM -public: - class ExperienceOrbPostNormalTickSystem& operator=(class ExperienceOrbPostNormalTickSystem const &) = delete; - ExperienceOrbPostNormalTickSystem(class ExperienceOrbPostNormalTickSystem const &) = delete; - ExperienceOrbPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@ExperienceOrbPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doExperienceOrbPostNormalTickSystem\@ExperienceOrbPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doExperienceOrbPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExperiencePotion.hpp b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp index 267c0ce8fc..500b7640e2 100644 --- a/LiteLoader/include/llapi/mc/ExperiencePotion.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotion.hpp @@ -32,138 +32,138 @@ class ExperiencePotion : public Throwable { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ExperiencePotion(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?getThrowPower\@ExperiencePotion\@\@MEAAMXZ + * @vftbl 276 + * @symbol ?getThrowPower\@ExperiencePotion\@\@MEAAMXZ */ virtual float getThrowPower(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); /** - * @vftbl 280 - * @symbol ?getThrowUpAngleOffset\@ExperiencePotion\@\@MEAAMXZ + * @vftbl 278 + * @symbol ?getThrowUpAngleOffset\@ExperiencePotion\@\@MEAAMXZ */ virtual float getThrowUpAngleOffset(); /** - * @vftbl 281 - * @symbol ?getGravity\@ExperiencePotion\@\@MEAAMXZ + * @vftbl 279 + * @symbol ?getGravity\@ExperiencePotion\@\@MEAAMXZ */ virtual float getGravity(); /** - * @symbol ??0ExperiencePotion\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ExperiencePotion\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ExperiencePotion(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp index 66f040f8e8..7100fdfbc4 100644 --- a/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp +++ b/LiteLoader/include/llapi/mc/ExperiencePotionItem.hpp @@ -32,98 +32,98 @@ class ExperiencePotionItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExperiencePotionItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@ExperiencePotionItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@ExperiencePotionItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 50 - * @symbol ?isGlint\@ExperiencePotionItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@ExperiencePotionItem\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@ExperiencePotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@ExperiencePotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@ExperiencePotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ExperiencePotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @symbol ??0ExperiencePotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ExperiencePotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ExperiencePotionItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperienceRewardCommitObject.hpp b/LiteLoader/include/llapi/mc/ExperienceRewardCommitObject.hpp index 8b93e4ca91..bcaeb1cf36 100644 --- a/LiteLoader/include/llapi/mc/ExperienceRewardCommitObject.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceRewardCommitObject.hpp @@ -28,28 +28,28 @@ class ExperienceRewardCommitObject { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExperienceRewardCommitObject(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?append\@ExperienceRewardCommitObject\@\@UEAA_NPEAVContainerValidationCommitObject\@\@\@Z + * @vftbl 1 + * @symbol ?append\@ExperienceRewardCommitObject\@\@UEAA_NPEAVContainerValidationCommitObject\@\@\@Z */ virtual bool append(class ContainerValidationCommitObject *); /** - * @vftbl 2 - * @symbol ?canCommit\@ExperienceRewardCommitObject\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 2 + * @symbol ?canCommit\@ExperienceRewardCommitObject\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canCommit(class ContainerScreenContext const &) const; /** - * @vftbl 3 - * @symbol ?commit\@ExperienceRewardCommitObject\@\@UEAAXAEBVContainerScreenContext\@\@\@Z + * @vftbl 3 + * @symbol ?commit\@ExperienceRewardCommitObject\@\@UEAAXAEBVContainerScreenContext\@\@\@Z */ virtual void commit(class ContainerScreenContext const &); /** - * @symbol ??0ExperienceRewardCommitObject\@\@QEAA\@H\@Z + * @symbol ??0ExperienceRewardCommitObject\@\@QEAA\@H\@Z */ MCAPI ExperienceRewardCommitObject(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp b/LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp index a336691a5a..beb87ec608 100644 --- a/LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceRewardComponent.hpp @@ -30,31 +30,31 @@ class ExperienceRewardComponent { public: /** - * @symbol ?addAdditionalSaveData\@ExperienceRewardComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@ExperienceRewardComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getIsExperienceDropEnabled\@ExperienceRewardComponent\@\@QEBA_NXZ + * @symbol ?getIsExperienceDropEnabled\@ExperienceRewardComponent\@\@QEBA_NXZ */ MCAPI bool getIsExperienceDropEnabled() const; /** - * @symbol ?getOnBredExperience\@ExperienceRewardComponent\@\@QEBAHAEAVActor\@\@\@Z + * @symbol ?getOnBredExperience\@ExperienceRewardComponent\@\@QEBAHAEAVActor\@\@\@Z */ MCAPI int getOnBredExperience(class Actor &) const; /** - * @symbol ?getOnDeathExperience\@ExperienceRewardComponent\@\@QEBAHAEAVActor\@\@\@Z + * @symbol ?getOnDeathExperience\@ExperienceRewardComponent\@\@QEBAHAEAVActor\@\@\@Z */ MCAPI int getOnDeathExperience(class Actor &) const; /** - * @symbol ??4ExperienceRewardComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ExperienceRewardComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ExperienceRewardComponent & operator=(class ExperienceRewardComponent &&); /** - * @symbol ?readAdditionalSaveData\@ExperienceRewardComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@ExperienceRewardComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setIsExperienceDropEnabled\@ExperienceRewardComponent\@\@QEAAX_N\@Z + * @symbol ?setIsExperienceDropEnabled\@ExperienceRewardComponent\@\@QEAAX_N\@Z */ MCAPI void setIsExperienceDropEnabled(bool); @@ -62,8 +62,8 @@ class ExperienceRewardComponent { private: /** - * @symbol ?mIsExperienceDropEnabledTag\@ExperienceRewardComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?mIsExperienceDropEnabledTag\@ExperienceRewardComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const mIsExperienceDropEnabledTag; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp b/LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp index e7a7e10210..7422891d98 100644 --- a/LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ExperienceRewardDefinition.hpp @@ -31,20 +31,20 @@ class ExperienceRewardDefinition { public: /** - * @symbol ?addBredExpressionNode\@ExperienceRewardDefinition\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?addBredExpressionNode\@ExperienceRewardDefinition\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void addBredExpressionNode(class ExpressionNode const &); /** - * @symbol ?addDeathExpressionNode\@ExperienceRewardDefinition\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?addDeathExpressionNode\@ExperienceRewardDefinition\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void addDeathExpressionNode(class ExpressionNode const &); /** - * @symbol ?initialize\@ExperienceRewardDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExperienceRewardComponent\@\@\@Z + * @symbol ?initialize\@ExperienceRewardDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExperienceRewardComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ExperienceRewardComponent &) const; /** - * @symbol ?buildSchema\@ExperienceRewardDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExperienceRewardDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ExperienceRewardDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExperienceRewardDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExperimentStorage.hpp b/LiteLoader/include/llapi/mc/ExperimentStorage.hpp index 16e4e75c9d..2a8c45b72b 100644 --- a/LiteLoader/include/llapi/mc/ExperimentStorage.hpp +++ b/LiteLoader/include/llapi/mc/ExperimentStorage.hpp @@ -29,20 +29,20 @@ class ExperimentStorage { public: /** - * @symbol ?isAnyToggleEnabled\@ExperimentStorage\@\@QEBA_NXZ + * @symbol ?isAnyToggleEnabled\@ExperimentStorage\@\@QEBA_NXZ */ MCAPI bool isAnyToggleEnabled() const; /** - * @symbol ??4ExperimentStorage\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ExperimentStorage\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ExperimentStorage & operator=(class ExperimentStorage const &); /** - * @symbol ?wereAnyExperimentsEverToggled\@ExperimentStorage\@\@QEBA_NXZ + * @symbol ?wereAnyExperimentsEverToggled\@ExperimentStorage\@\@QEBA_NXZ */ MCAPI bool wereAnyExperimentsEverToggled() const; /** - * @symbol ??1ExperimentStorage\@\@QEAA\@XZ + * @symbol ??1ExperimentStorage\@\@QEAA\@XZ */ MCAPI ~ExperimentStorage(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Experiments.hpp b/LiteLoader/include/llapi/mc/Experiments.hpp index dd70bc6a8a..2cc2f15c73 100644 --- a/LiteLoader/include/llapi/mc/Experiments.hpp +++ b/LiteLoader/include/llapi/mc/Experiments.hpp @@ -29,68 +29,72 @@ class Experiments { public: /** - * @symbol ?DataDrivenBiomes\@Experiments\@\@QEBA_NXZ + * @symbol ?DataDrivenBiomes\@Experiments\@\@QEBA_NXZ */ MCAPI bool DataDrivenBiomes() const; /** - * @symbol ?DataDrivenItems\@Experiments\@\@QEBA_NXZ + * @symbol ?DataDrivenItems\@Experiments\@\@QEBA_NXZ */ MCAPI bool DataDrivenItems() const; /** - * @symbol ??0Experiments\@\@QEAA\@XZ + * @symbol ??0Experiments\@\@QEAA\@XZ */ MCAPI Experiments(); /** - * @symbol ?Gametest\@Experiments\@\@QEBA_NXZ + * @symbol ?Gametest\@Experiments\@\@QEBA_NXZ */ MCAPI bool Gametest() const; /** - * @symbol ?NextMajorUpdate\@Experiments\@\@QEBA_NXZ + * @symbol ?NextMajorUpdate\@Experiments\@\@QEBA_NXZ */ MCAPI bool NextMajorUpdate() const; /** - * @symbol ?UpcomingCreatorFeatures\@Experiments\@\@QEBA_NXZ + * @symbol ?Sniffer\@Experiments\@\@QEBA_NXZ + */ + MCAPI bool Sniffer() const; + /** + * @symbol ?UpcomingCreatorFeatures\@Experiments\@\@QEBA_NXZ */ MCAPI bool UpcomingCreatorFeatures() const; /** - * @symbol ?getExperimentsActiveAsJSONList\@Experiments\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getExperimentsActiveAsJSONList\@Experiments\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getExperimentsActiveAsJSONList() const; /** - * @symbol ?getExperimentsActiveForTelemetry\@Experiments\@\@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 + * @symbol ?getExperimentsActiveForTelemetry\@Experiments\@\@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 getExperimentsActiveForTelemetry() const; /** - * @symbol ?getTagData\@Experiments\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?getTagData\@Experiments\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void getTagData(class CompoundTag const &); /** - * @symbol ?isExperimentEnabled\@Experiments\@\@QEBA_NW4AllExperiments\@\@\@Z + * @symbol ?isExperimentEnabled\@Experiments\@\@QEBA_NW4AllExperiments\@\@\@Z */ MCAPI bool isExperimentEnabled(enum class AllExperiments) const; /** - * @symbol ?setExperimentEnabled\@Experiments\@\@QEAAXW4AllExperiments\@\@_N\@Z + * @symbol ?setExperimentEnabled\@Experiments\@\@QEAAXW4AllExperiments\@\@_N\@Z */ MCAPI void setExperimentEnabled(enum class AllExperiments, bool); /** - * @symbol ?setTagData\@Experiments\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?setTagData\@Experiments\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void setTagData(class CompoundTag &) const; /** - * @symbol ??1Experiments\@\@QEAA\@XZ + * @symbol ??1Experiments\@\@QEAA\@XZ */ MCAPI ~Experiments(); /** - * @symbol ?MinecraftExplorer\@Experiments\@\@SA_NXZ + * @symbol ?MinecraftExplorer\@Experiments\@\@SA_NXZ */ MCAPI static bool MinecraftExplorer(); /** - * @symbol ?getExperimentTextID\@Experiments\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4AllExperiments\@\@\@Z + * @symbol ?getExperimentTextID\@Experiments\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4AllExperiments\@\@\@Z */ MCAPI static std::string const & getExperimentTextID(enum class AllExperiments); /** - * @symbol ?getToggleNames\@Experiments\@\@SAAEBV?$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 + * @symbol ?getToggleNames\@Experiments\@\@SAAEBV?$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 static std::vector const & getToggleNames(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExpiringTick.hpp b/LiteLoader/include/llapi/mc/ExpiringTick.hpp index 0359de135f..a298f77317 100644 --- a/LiteLoader/include/llapi/mc/ExpiringTick.hpp +++ b/LiteLoader/include/llapi/mc/ExpiringTick.hpp @@ -28,24 +28,24 @@ class ExpiringTick { public: /** - * @symbol ??0ExpiringTick\@\@QEAA\@UTick\@\@G\@Z + * @symbol ??0ExpiringTick\@\@QEAA\@UTick\@\@G\@Z */ MCAPI ExpiringTick(struct Tick, unsigned short); /** - * @symbol ?getExpireAtTick\@ExpiringTick\@\@QEBA?AUTick\@\@XZ + * @symbol ?getExpireAtTick\@ExpiringTick\@\@QEBA?AUTick\@\@XZ */ MCAPI struct Tick getExpireAtTick() const; /** - * @symbol ?getNormalizedElapsedTime\@ExpiringTick\@\@QEBAMAEBUTick\@\@\@Z + * @symbol ?getNormalizedElapsedTime\@ExpiringTick\@\@QEBAMAEBUTick\@\@\@Z */ MCAPI float getNormalizedElapsedTime(struct Tick const &) const; /** - * @symbol ?isActive\@ExpiringTick\@\@QEBA_NUTick\@\@\@Z + * @symbol ?isActive\@ExpiringTick\@\@QEBA_NUTick\@\@\@Z */ MCAPI bool isActive(struct Tick) const; /** - * @symbol ?isExpired\@ExpiringTick\@\@QEBA_NUTick\@\@\@Z + * @symbol ?isExpired\@ExpiringTick\@\@QEBA_NUTick\@\@\@Z */ MCAPI bool isExpired(struct Tick) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExplodeComponent.hpp b/LiteLoader/include/llapi/mc/ExplodeComponent.hpp index d446043d6a..30b290be96 100644 --- a/LiteLoader/include/llapi/mc/ExplodeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ExplodeComponent.hpp @@ -29,52 +29,52 @@ class ExplodeComponent { public: /** - * @symbol ??0ExplodeComponent\@\@QEAA\@XZ + * @symbol ??0ExplodeComponent\@\@QEAA\@XZ */ MCAPI ExplodeComponent(); /** - * @symbol ?addAdditionalSaveData\@ExplodeComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@ExplodeComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?explode\@ExplodeComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?explode\@ExplodeComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z */ MCAPI void explode(class Actor &, class Vec3 const &); /** - * @symbol ?getFuseLength\@ExplodeComponent\@\@QEBAHXZ + * @symbol ?getFuseLength\@ExplodeComponent\@\@QEBAHXZ */ MCAPI int getFuseLength() const; /** - * @symbol ?getInitialFuseLength\@ExplodeComponent\@\@QEBAHXZ + * @symbol ?getInitialFuseLength\@ExplodeComponent\@\@QEBAHXZ */ MCAPI int getInitialFuseLength() const; /** - * @symbol ?getIsFuseLit\@ExplodeComponent\@\@QEBA_NXZ + * @symbol ?getIsFuseLit\@ExplodeComponent\@\@QEBA_NXZ */ MCAPI bool getIsFuseLit() const; /** - * @symbol ?isFuseLit\@ExplodeComponent\@\@QEBA_NXZ + * @symbol ?isFuseLit\@ExplodeComponent\@\@QEBA_NXZ */ MCAPI bool isFuseLit() const; /** - * @symbol ?readAdditionalSaveData\@ExplodeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@ExplodeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?requiresTntExplodeGameRuleEnabled\@ExplodeComponent\@\@QEBA_NXZ + * @symbol ?requiresTntExplodeGameRuleEnabled\@ExplodeComponent\@\@QEBA_NXZ */ MCAPI bool requiresTntExplodeGameRuleEnabled() const; /** - * @symbol ?setAllowUnderwater\@ExplodeComponent\@\@QEAAX_N\@Z + * @symbol ?setAllowUnderwater\@ExplodeComponent\@\@QEAAX_N\@Z */ MCAPI void setAllowUnderwater(bool); /** - * @symbol ?setFuseLength\@ExplodeComponent\@\@QEAAXH\@Z + * @symbol ?setFuseLength\@ExplodeComponent\@\@QEAAXH\@Z */ MCAPI void setFuseLength(int); /** - * @symbol ?setTntExpodeGameRuleRequired\@ExplodeComponent\@\@QEAAXXZ + * @symbol ?setTntExpodeGameRuleRequired\@ExplodeComponent\@\@QEAAXXZ */ MCAPI void setTntExpodeGameRuleRequired(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExplodeDefinition.hpp b/LiteLoader/include/llapi/mc/ExplodeDefinition.hpp index 7f3b8250ec..e7835103f5 100644 --- a/LiteLoader/include/llapi/mc/ExplodeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ExplodeDefinition.hpp @@ -30,20 +30,20 @@ class ExplodeDefinition { public: /** - * @symbol ??0ExplodeDefinition\@\@QEAA\@XZ + * @symbol ??0ExplodeDefinition\@\@QEAA\@XZ */ MCAPI ExplodeDefinition(); /** - * @symbol ?initialize\@ExplodeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExplodeComponent\@\@\@Z + * @symbol ?initialize\@ExplodeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExplodeComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ExplodeComponent &) const; /** - * @symbol ?uninitialize\@ExplodeDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@ExplodeDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@ExplodeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExplodeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ExplodeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExplodeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExplodeSystem.hpp b/LiteLoader/include/llapi/mc/ExplodeSystem.hpp index 2bc064d95e..d819be04b2 100644 --- a/LiteLoader/include/llapi/mc/ExplodeSystem.hpp +++ b/LiteLoader/include/llapi/mc/ExplodeSystem.hpp @@ -30,19 +30,19 @@ class ExplodeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExplodeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@ExplodeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@ExplodeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp b/LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp index 64889f958d..003280f401 100644 --- a/LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp +++ b/LiteLoader/include/llapi/mc/ExplorationMapFunction.hpp @@ -32,23 +32,23 @@ class ExplorationMapFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExplorationMapFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@ExplorationMapFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@ExplorationMapFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@ExplorationMapFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@ExplorationMapFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@ExplorationMapFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@ExplorationMapFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExploreOutskirtsDefinition.hpp b/LiteLoader/include/llapi/mc/ExploreOutskirtsDefinition.hpp index aa891cddb3..e913431309 100644 --- a/LiteLoader/include/llapi/mc/ExploreOutskirtsDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ExploreOutskirtsDefinition.hpp @@ -30,16 +30,16 @@ class ExploreOutskirtsDefinition { public: /** - * @symbol ??0ExploreOutskirtsDefinition\@\@QEAA\@XZ + * @symbol ??0ExploreOutskirtsDefinition\@\@QEAA\@XZ */ MCAPI ExploreOutskirtsDefinition(); /** - * @symbol ?initialize\@ExploreOutskirtsDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExploreOutskirtsGoal\@\@\@Z + * @symbol ?initialize\@ExploreOutskirtsDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVExploreOutskirtsGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ExploreOutskirtsGoal &) const; /** - * @symbol ?buildSchema\@ExploreOutskirtsDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExploreOutskirtsDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@ExploreOutskirtsDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VExploreOutskirtsDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp b/LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp index 1cb934f823..298a39f170 100644 --- a/LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp +++ b/LiteLoader/include/llapi/mc/ExploreOutskirtsGoal.hpp @@ -30,48 +30,48 @@ class ExploreOutskirtsGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExploreOutskirtsGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ExploreOutskirtsGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ExploreOutskirtsGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@ExploreOutskirtsGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@ExploreOutskirtsGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ExploreOutskirtsGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ExploreOutskirtsGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ExploreOutskirtsGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ExploreOutskirtsGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ExploreOutskirtsGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ExploreOutskirtsGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ExploreOutskirtsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ExploreOutskirtsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ExploreOutskirtsGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0ExploreOutskirtsGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI ExploreOutskirtsGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Explosion.hpp b/LiteLoader/include/llapi/mc/Explosion.hpp index 4b70e81764..20ac9f6bb7 100644 --- a/LiteLoader/include/llapi/mc/Explosion.hpp +++ b/LiteLoader/include/llapi/mc/Explosion.hpp @@ -30,44 +30,44 @@ class Explosion { public: /** - * @symbol ??0Explosion\@\@QEAA\@AEAVBlockSource\@\@PEAVActor\@\@AEBVVec3\@\@M\@Z + * @symbol ??0Explosion\@\@QEAA\@AEAVBlockSource\@\@PEAVActor\@\@AEBVVec3\@\@M\@Z */ MCAPI Explosion(class BlockSource &, class Actor *, class Vec3 const &, float); /** - * @symbol ?explode\@Explosion\@\@QEAAXXZ + * @symbol ?explode\@Explosion\@\@QEAAXXZ */ MCAPI void explode(); /** - * @symbol ?overrideInWater\@Explosion\@\@QEAAX_N\@Z + * @symbol ?overrideInWater\@Explosion\@\@QEAAX_N\@Z */ MCAPI void overrideInWater(bool); /** - * @symbol ?setAllowUnderwater\@Explosion\@\@QEAAX_N\@Z + * @symbol ?setAllowUnderwater\@Explosion\@\@QEAAX_N\@Z */ MCAPI void setAllowUnderwater(bool); /** - * @symbol ?setBreaking\@Explosion\@\@QEAAX_N\@Z + * @symbol ?setBreaking\@Explosion\@\@QEAAX_N\@Z */ MCAPI void setBreaking(bool); /** - * @symbol ?setFire\@Explosion\@\@QEAAX_N\@Z + * @symbol ?setFire\@Explosion\@\@QEAAX_N\@Z */ MCAPI void setFire(bool); /** - * @symbol ?setMaxResistance\@Explosion\@\@QEAAXM\@Z + * @symbol ?setMaxResistance\@Explosion\@\@QEAAXM\@Z */ MCAPI void setMaxResistance(float); /** - * @symbol ??1Explosion\@\@QEAA\@XZ + * @symbol ??1Explosion\@\@QEAA\@XZ */ MCAPI ~Explosion(); //private: /** - * @symbol ?_getActorsInRange\@Explosion\@\@AEBA?AV?$vector\@V?$not_null\@PEAVActor\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVActor\@\@\@gsl\@\@\@std\@\@\@std\@\@PEAVActor\@\@M\@Z + * @symbol ?_getActorsInRange\@Explosion\@\@AEBA?AV?$vector\@V?$not_null\@PEAVActor\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVActor\@\@\@gsl\@\@\@std\@\@\@std\@\@PEAVActor\@\@M\@Z */ MCAPI std::vector> _getActorsInRange(class Actor *, float) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp b/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp index 496afa71f7..50d78ca4c6 100644 --- a/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp +++ b/LiteLoader/include/llapi/mc/ExplosionDecayFunction.hpp @@ -32,23 +32,23 @@ class ExplosionDecayFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExplosionDecayFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@ExplosionDecayFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@ExplosionDecayFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@ExplosionDecayFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@ExplosionDecayFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@ExplosionDecayFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@ExplosionDecayFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExplosionStartedEvent.hpp b/LiteLoader/include/llapi/mc/ExplosionStartedEvent.hpp index b319ab13f0..ee16e8ce70 100644 --- a/LiteLoader/include/llapi/mc/ExplosionStartedEvent.hpp +++ b/LiteLoader/include/llapi/mc/ExplosionStartedEvent.hpp @@ -27,11 +27,11 @@ struct ExplosionStartedEvent { public: /** - * @symbol ??0ExplosionStartedEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ExplosionStartedEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ExplosionStartedEvent(struct ExplosionStartedEvent const &); /** - * @symbol ??1ExplosionStartedEvent\@\@QEAA\@XZ + * @symbol ??1ExplosionStartedEvent\@\@QEAA\@XZ */ MCAPI ~ExplosionStartedEvent(); diff --git a/LiteLoader/include/llapi/mc/ExpressionNode.hpp b/LiteLoader/include/llapi/mc/ExpressionNode.hpp index 4ea82bf479..be84d70e51 100644 --- a/LiteLoader/include/llapi/mc/ExpressionNode.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionNode.hpp @@ -43,312 +43,312 @@ class ExpressionNode { #undef AFTER_EXTRA public: /** - * @symbol ??0ExpressionNode\@\@QEAA\@XZ + * @symbol ??0ExpressionNode\@\@QEAA\@XZ */ MCAPI ExpressionNode(); /** - * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z + * @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(float); + MCAPI ExpressionNode(std::string const &, enum class MolangVersion, class gsl::span); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @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(class Json::Value const &, enum class MolangVersion, class gsl::span); + MCAPI ExpressionNode(std::string const &, class SemVersion const &, class gsl::span); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ - MCAPI ExpressionNode(class Json::Value const &, class SemVersion const &, class gsl::span); + MCAPI ExpressionNode(class Json::Value const &, enum class MolangVersion, class gsl::span); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEAUMolangScriptArg\@\@W4ExpressionOp\@\@\@Z */ - MCAPI ExpressionNode(std::string const &, enum class MolangVersion, class gsl::span); + MCAPI ExpressionNode(struct MolangScriptArg &, enum class ExpressionOp); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@M\@Z */ - MCAPI ExpressionNode(std::string const &, class SemVersion const &, class gsl::span); + MCAPI ExpressionNode(float); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ExpressionNode(class ExpressionNode const &); + MCAPI ExpressionNode(class ExpressionNode &&); /** - * @symbol ??0ExpressionNode\@\@QEAA\@AEAUMolangScriptArg\@\@W4ExpressionOp\@\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ - MCAPI ExpressionNode(struct MolangScriptArg &, enum class ExpressionOp); + MCAPI ExpressionNode(class Json::Value const &, class SemVersion const &, class gsl::span); /** - * @symbol ??0ExpressionNode\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ExpressionNode\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ExpressionNode(class ExpressionNode &&); + MCAPI ExpressionNode(class ExpressionNode const &); /** - * @symbol ?clear\@ExpressionNode\@\@QEAAXXZ + * @symbol ?clear\@ExpressionNode\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?evalAsFloat\@ExpressionNode\@\@QEBAMAEAVRenderParams\@\@\@Z + * @symbol ?evalAsFloat\@ExpressionNode\@\@QEBAMAEAVRenderParams\@\@\@Z */ MCAPI float evalAsFloat(class RenderParams &) const; /** - * @symbol ?evalGeneric\@ExpressionNode\@\@QEBAAEBUMolangScriptArg\@\@AEAVRenderParams\@\@\@Z + * @symbol ?evalGeneric\@ExpressionNode\@\@QEBAAEBUMolangScriptArg\@\@AEAVRenderParams\@\@\@Z */ MCAPI struct MolangScriptArg const & evalGeneric(class RenderParams &) const; /** - * @symbol ?getExpressionString\@ExpressionNode\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getExpressionString\@ExpressionNode\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - MCAPI std::string const & getExpressionString(); + MCAPI std::string const getExpressionString() const; /** - * @symbol ?getExpressionString\@ExpressionNode\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getExpressionString\@ExpressionNode\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ - MCAPI std::string const getExpressionString() const; + MCAPI std::string const & getExpressionString(); /** - * @symbol ?getMolangVersion\@ExpressionNode\@\@QEBA?BW4MolangVersion\@\@XZ + * @symbol ?getMolangVersion\@ExpressionNode\@\@QEBA?BW4MolangVersion\@\@XZ */ MCAPI enum class MolangVersion const getMolangVersion() const; /** - * @symbol ?getTreeHash\@ExpressionNode\@\@QEBA_K_N\@Z + * @symbol ?getTreeHash\@ExpressionNode\@\@QEBA_K_N\@Z */ MCAPI unsigned __int64 getTreeHash(bool) const; /** - * @symbol ?getTreeString\@ExpressionNode\@\@QEBA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?getTreeString\@ExpressionNode\@\@QEBA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI bool getTreeString(std::string &, bool) const; /** - * @symbol ?hasDisallowedQueries\@ExpressionNode\@\@QEBA_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 ?hasDisallowedQueries\@ExpressionNode\@\@QEBA_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 bool hasDisallowedQueries(std::vector const &) const; /** - * @symbol ?hasMadd\@ExpressionNode\@\@QEBA_NXZ + * @symbol ?hasMadd\@ExpressionNode\@\@QEBA_NXZ */ MCAPI bool hasMadd() const; /** - * @symbol ?hasSideEffects\@ExpressionNode\@\@QEBA_N_N\@Z + * @symbol ?hasSideEffects\@ExpressionNode\@\@QEBA_N_N\@Z */ MCAPI bool hasSideEffects(bool) const; /** - * @symbol ?isInitialized\@ExpressionNode\@\@QEBA_NXZ + * @symbol ?isInitialized\@ExpressionNode\@\@QEBA_NXZ */ MCAPI bool isInitialized() const; /** - * @symbol ?isValid\@ExpressionNode\@\@QEBA_NXZ + * @symbol ?isValid\@ExpressionNode\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z + * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@XZ */ - MCAPI enum class MolangCompileResult link(enum class MolangVersion) const; + MCAPI enum class MolangCompileResult link() const; /** - * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@XZ + * @symbol ?link\@ExpressionNode\@\@QEBA?AW4MolangCompileResult\@\@W4MolangVersion\@\@\@Z */ - MCAPI enum class MolangCompileResult link() const; + MCAPI enum class MolangCompileResult link(enum class MolangVersion) const; /** - * @symbol ?moveConstantChildToValueIfFloatOrHashType\@ExpressionNode\@\@QEAAXH\@Z + * @symbol ?moveConstantChildToValueIfFloatOrHashType\@ExpressionNode\@\@QEAAXH\@Z */ MCAPI void moveConstantChildToValueIfFloatOrHashType(int); /** - * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@M\@Z + * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@M\@Z */ MCAPI class ExpressionNode & operator=(float); /** - * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ExpressionNode\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ExpressionNode & operator=(class ExpressionNode const &); /** - * @symbol ??8ExpressionNode\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8ExpressionNode\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class ExpressionNode const &) const; /** - * @symbol ?parse\@ExpressionNode\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z + * @symbol ?parse\@ExpressionNode\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@V?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@\@Z */ MCAPI bool parse(std::string const &, enum class MolangVersion, class gsl::span); /** - * @symbol ??1ExpressionNode\@\@QEAA\@XZ + * @symbol ??1ExpressionNode\@\@QEAA\@XZ */ MCAPI ~ExpressionNode(); /** - * @symbol ?bindType\@ExpressionNode\@\@SAXXZ + * @symbol ?bindType\@ExpressionNode\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?buildExpressionOpTable\@ExpressionNode\@\@SAXXZ + * @symbol ?buildExpressionOpTable\@ExpressionNode\@\@SAXXZ */ MCAPI static void buildExpressionOpTable(); /** - * @symbol ?fast_atof_positiveOnly\@ExpressionNode\@\@SAMAEAPEBD\@Z + * @symbol ?fast_atof_positiveOnly\@ExpressionNode\@\@SAMAEAPEBD\@Z */ MCAPI static float fast_atof_positiveOnly(char const *&); /** - * @symbol ?getExperiments\@ExpressionNode\@\@SAAEAVExperiments\@\@XZ + * @symbol ?getExperiments\@ExpressionNode\@\@SAAEAVExperiments\@\@XZ */ MCAPI static class Experiments & getExperiments(); /** - * @symbol ?getOpFriendlyName\@ExpressionNode\@\@SAPEBDW4ExpressionOp\@\@\@Z + * @symbol ?getOpFriendlyName\@ExpressionNode\@\@SAPEBDW4ExpressionOp\@\@\@Z */ MCAPI static char const * getOpFriendlyName(enum class ExpressionOp); /** - * @symbol ?getQueryFunctionMutex\@ExpressionNode\@\@SAAEAVrecursive_mutex\@std\@\@XZ + * @symbol ?getQueryFunctionMutex\@ExpressionNode\@\@SAAEAVrecursive_mutex\@std\@\@XZ */ MCAPI static class std::recursive_mutex & getQueryFunctionMutex(); /** - * @symbol ?mAliasOpTokens\@ExpressionNode\@\@2V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ExpressionOp\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ExpressionOp\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mAliasOpTokens\@ExpressionNode\@\@2V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ExpressionOp\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ExpressionOp\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mAliasOpTokens; /** - * @symbol ?mExpressionOpTokens\@ExpressionNode\@\@2V?$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\@\@A + * @symbol ?mExpressionOpTokens\@ExpressionNode\@\@2V?$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\@\@A */ MCAPI static std::vector mExpressionOpTokens; /** - * @symbol ?queryFunctionAccessorFromString\@ExpressionNode\@\@SAPEBV?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4MolangVersion\@\@AEAW4MolangQueryFunctionReturnType\@\@_N\@Z + * @symbol ?queryFunctionAccessorFromString\@ExpressionNode\@\@SAPEBV?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4MolangVersion\@\@AEAW4MolangQueryFunctionReturnType\@\@_N\@Z */ MCAPI static class std::function const &)> const * queryFunctionAccessorFromString(std::string const &, enum class MolangVersion, enum class MolangQueryFunctionReturnType &, bool); /** - * @symbol ?registerQueryFunction\@ExpressionNode\@\@SAAEAUMolangQueryFunction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@4\@0W4MolangQueryFunctionReturnType\@\@VHashedString\@\@_K4AEBV?$initializer_list\@H\@4\@\@Z + * @symbol ?registerQueryFunction\@ExpressionNode\@\@SAAEAUMolangQueryFunction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@4\@0W4MolangQueryFunctionReturnType\@\@VHashedString\@\@_K4AEBV?$initializer_list\@H\@4\@\@Z */ MCAPI static struct MolangQueryFunction & registerQueryFunction(std::string const &, class std::function const &)>, std::string const &, enum class MolangQueryFunctionReturnType, class HashedString, unsigned __int64, unsigned __int64, class std::initializer_list const &); /** - * @symbol ?setExperiments\@ExpressionNode\@\@SAXAEBVExperiments\@\@\@Z + * @symbol ?setExperiments\@ExpressionNode\@\@SAXAEBVExperiments\@\@\@Z */ MCAPI static void setExperiments(class Experiments const &); /** - * @symbol ?unregisterQueryFunction\@ExpressionNode\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VHashedString\@\@\@Z + * @symbol ?unregisterQueryFunction\@ExpressionNode\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VHashedString\@\@\@Z */ MCAPI static void unregisterQueryFunction(std::string const &, class HashedString); //private: /** - * @symbol ?_buildTree\@ExpressionNode\@\@AEAA_NAEBUExpressionOpBitField\@\@W4MolangVersion\@\@\@Z + * @symbol ?_buildTree\@ExpressionNode\@\@AEAA_NAEBUExpressionOpBitField\@\@W4MolangVersion\@\@\@Z */ MCAPI bool _buildTree(struct ExpressionOpBitField const &, enum class MolangVersion); /** - * @symbol ?_checkAllOperationsAreValid\@ExpressionNode\@\@AEBA_NXZ + * @symbol ?_checkAllOperationsAreValid\@ExpressionNode\@\@AEBA_NXZ */ MCAPI bool _checkAllOperationsAreValid() const; /** - * @symbol ?_hasDisallowedQueryPtrs\@ExpressionNode\@\@AEBA_NAEBV?$vector\@PEBV?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@V?$allocator\@PEBV?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_hasDisallowedQueryPtrs\@ExpressionNode\@\@AEBA_NAEBV?$vector\@PEBV?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@V?$allocator\@PEBV?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI bool _hasDisallowedQueryPtrs(std::vector> const &)> const *> const &) const; /** - * @symbol ?_optimize\@ExpressionNode\@\@AEAA_NW4MolangVersion\@\@\@Z + * @symbol ?_optimize\@ExpressionNode\@\@AEAA_NW4MolangVersion\@\@\@Z */ MCAPI bool _optimize(enum class MolangVersion); /** - * @symbol ?_processBinaryExpressions\@ExpressionNode\@\@AEAA_NV?$function\@$$A6A_NW4ExpressionOp\@\@\@Z\@std\@\@\@Z + * @symbol ?_processBinaryExpressions\@ExpressionNode\@\@AEAA_NV?$function\@$$A6A_NW4ExpressionOp\@\@\@Z\@std\@\@\@Z */ MCAPI bool _processBinaryExpressions(class std::function); /** - * @symbol ?_processTernaryAndConditionalExpressions\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?_processTernaryAndConditionalExpressions\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool _processTernaryAndConditionalExpressions(); /** - * @symbol ?_readNextToken\@ExpressionNode\@\@AEAA_NAEAPEBDAEBV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@W4MolangVersion\@\@\@Z + * @symbol ?_readNextToken\@ExpressionNode\@\@AEAA_NAEAPEBDAEBV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@W4MolangVersion\@\@\@Z */ MCAPI bool _readNextToken(char const *&, class gsl::span const &, enum class MolangVersion); /** - * @symbol ?_setExpressionStringWithoutRelink\@ExpressionNode\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_setExpressionStringWithoutRelink\@ExpressionNode\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _setExpressionStringWithoutRelink(std::string const &); /** - * @symbol ?_tokenize\@ExpressionNode\@\@AEAA_NPEBDAEAUExpressionOpBitField\@\@AEBV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@W4MolangVersion\@\@\@Z + * @symbol ?_tokenize\@ExpressionNode\@\@AEAA_NPEBDAEAUExpressionOpBitField\@\@AEBV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@W4MolangVersion\@\@\@Z */ MCAPI bool _tokenize(char const *, struct ExpressionOpBitField &, class gsl::span const &, enum class MolangVersion); /** - * @symbol ?_validate\@ExpressionNode\@\@AEBA_NW4MolangVersion\@\@_NH\@Z + * @symbol ?_validate\@ExpressionNode\@\@AEBA_NW4MolangVersion\@\@_NH\@Z */ MCAPI bool _validate(enum class MolangVersion, bool, int) const; /** - * @symbol ?_validateChildrenAreNumerical\@ExpressionNode\@\@AEBA_NW4MolangVersion\@\@\@Z + * @symbol ?_validateChildrenAreNumerical\@ExpressionNode\@\@AEBA_NW4MolangVersion\@\@\@Z */ MCAPI bool _validateChildrenAreNumerical(enum class MolangVersion) const; /** - * @symbol ?findClosingOp\@ExpressionNode\@\@AEBA_NAEA_KW4ExpressionOp\@\@\@Z + * @symbol ?findClosingOp\@ExpressionNode\@\@AEBA_NAEA_KW4ExpressionOp\@\@\@Z */ MCAPI bool findClosingOp(unsigned __int64 &, enum class ExpressionOp) const; /** - * @symbol ?optimizeFunctionCallParams\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?optimizeFunctionCallParams\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool optimizeFunctionCallParams(); /** - * @symbol ?processArrays\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processArrays\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processArrays(); /** - * @symbol ?processBinaryExpression\@ExpressionNode\@\@AEAA_NW4ExpressionOp\@\@\@Z + * @symbol ?processBinaryExpression\@ExpressionNode\@\@AEAA_NW4ExpressionOp\@\@\@Z */ MCAPI bool processBinaryExpression(enum class ExpressionOp); /** - * @symbol ?processMathFuncs\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processMathFuncs\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processMathFuncs(); /** - * @symbol ?processMemberAccessors\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processMemberAccessors\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processMemberAccessors(); /** - * @symbol ?processNegativesAndLogicalNots\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processNegativesAndLogicalNots\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processNegativesAndLogicalNots(); /** - * @symbol ?processQueriesAndFunctions\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processQueriesAndFunctions\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processQueriesAndFunctions(); /** - * @symbol ?processSections\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processSections\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processSections(); /** - * @symbol ?processSemicolons\@ExpressionNode\@\@AEAA_NXZ + * @symbol ?processSemicolons\@ExpressionNode\@\@AEAA_NXZ */ MCAPI bool processSemicolons(); /** - * @symbol ?processUnaryExpression\@ExpressionNode\@\@AEAA_NW4ExpressionOp\@\@\@Z + * @symbol ?processUnaryExpression\@ExpressionNode\@\@AEAA_NW4ExpressionOp\@\@\@Z */ MCAPI bool processUnaryExpression(enum class ExpressionOp); /** - * @symbol ?_buildProgram\@ExpressionNode\@\@CA?AW4MolangCompileResult\@\@AEAUMolangProgramBuildState\@\@PEBV1\@W4MolangVersion\@\@\@Z + * @symbol ?_buildProgram\@ExpressionNode\@\@CA?AW4MolangCompileResult\@\@AEAUMolangProgramBuildState\@\@PEBV1\@W4MolangVersion\@\@\@Z */ MCAPI static enum class MolangCompileResult _buildProgram(struct MolangProgramBuildState &, class ExpressionNode const *, enum class MolangVersion); /** - * @symbol ?_getOrCreateReferencedMemberVariableScriptArg\@ExpressionNode\@\@CAPEAUMolangScriptArg\@\@AEAUMolangEvalParams\@\@AEBV1\@\@Z + * @symbol ?_getOrCreateReferencedMemberVariableScriptArg\@ExpressionNode\@\@CAPEAUMolangScriptArg\@\@AEAUMolangEvalParams\@\@AEBV1\@\@Z */ MCAPI static struct MolangScriptArg * _getOrCreateReferencedMemberVariableScriptArg(struct MolangEvalParams &, class ExpressionNode const &); /** - * @symbol ?_getQueryFunctionAccessor\@ExpressionNode\@\@CA_NAEAUMolangScriptArg\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@W4MolangQueryFunctionReturnType\@\@AEBVHashedString\@\@\@Z + * @symbol ?_getQueryFunctionAccessor\@ExpressionNode\@\@CA_NAEAUMolangScriptArg\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MolangVersion\@\@W4MolangQueryFunctionReturnType\@\@AEBVHashedString\@\@\@Z */ MCAPI static bool _getQueryFunctionAccessor(struct MolangScriptArg &, std::string const &, enum class MolangVersion, enum class MolangQueryFunctionReturnType, class HashedString const &); /** - * @symbol ?_getScriptArgFromMemberAccessedVariable\@ExpressionNode\@\@CAPEBUMolangScriptArg\@\@AEAUMolangEvalParams\@\@AEBV1\@\@Z + * @symbol ?_getScriptArgFromMemberAccessedVariable\@ExpressionNode\@\@CAPEBUMolangScriptArg\@\@AEAUMolangEvalParams\@\@AEBV1\@\@Z */ MCAPI static struct MolangScriptArg const * _getScriptArgFromMemberAccessedVariable(struct MolangEvalParams &, class ExpressionNode const &); /** - * @symbol ?_initializeMolangQueries\@ExpressionNode\@\@CA_NXZ + * @symbol ?_initializeMolangQueries\@ExpressionNode\@\@CA_NXZ */ MCAPI static bool _initializeMolangQueries(); /** - * @symbol ?_writeScriptArgToMemberAccessedVariable\@ExpressionNode\@\@CAXAEAUMolangEvalParams\@\@AEBV1\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?_writeScriptArgToMemberAccessedVariable\@ExpressionNode\@\@CAXAEAUMolangEvalParams\@\@AEBV1\@AEBUMolangScriptArg\@\@\@Z */ MCAPI static void _writeScriptArgToMemberAccessedVariable(struct MolangEvalParams &, class ExpressionNode const &, struct MolangScriptArg const &); /** - * @symbol ?_writeScriptArgToMolangVariable\@ExpressionNode\@\@CAXAEAVMolangVariableMap\@\@W4MolangVariableIndex\@\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?_writeScriptArgToMolangVariable\@ExpressionNode\@\@CAXAEAVMolangVariableMap\@\@W4MolangVariableIndex\@\@AEBUMolangScriptArg\@\@\@Z */ MCAPI static void _writeScriptArgToMolangVariable(class MolangVariableMap &, enum class MolangVariableIndex, struct MolangScriptArg const &); private: /** - * @symbol ?_defaultUnknownQueryFunction\@ExpressionNode\@\@0V?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@A + * @symbol ?_defaultUnknownQueryFunction\@ExpressionNode\@\@0V?$function\@$$A6AAEBUMolangScriptArg\@\@AEAVRenderParams\@\@AEBV?$vector\@VExpressionNode\@\@V?$allocator\@VExpressionNode\@\@\@std\@\@\@std\@\@\@Z\@std\@\@A */ MCAPI static class std::function const &)> _defaultUnknownQueryFunction; /** - * @symbol ?mExperiments\@ExpressionNode\@\@0VExperimentStorage\@\@A + * @symbol ?mExperiments\@ExpressionNode\@\@0VExperimentStorage\@\@A */ MCAPI static class ExperimentStorage mExperiments; /** - * @symbol ?mMolangInitialized\@ExpressionNode\@\@0_NA + * @symbol ?mMolangInitialized\@ExpressionNode\@\@0_NA */ MCAPI static bool mMolangInitialized; /** - * @symbol ?mQueryFunctionAccessors\@ExpressionNode\@\@0V?$unordered_multimap\@VHashedString\@\@UMolangQueryFunction\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UMolangQueryFunction\@\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mQueryFunctionAccessors\@ExpressionNode\@\@0V?$unordered_multimap\@VHashedString\@\@UMolangQueryFunction\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UMolangQueryFunction\@\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_multimap, struct std::equal_to, class std::allocator>> mQueryFunctionAccessors; /** - * @symbol ?mQuerySets\@ExpressionNode\@\@0V?$unordered_map\@VHashedString\@\@V?$unordered_set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@VHashedString\@\@\@3\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$unordered_set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@VHashedString\@\@\@3\@\@std\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mQuerySets\@ExpressionNode\@\@0V?$unordered_map\@VHashedString\@\@V?$unordered_set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@VHashedString\@\@\@3\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$unordered_set\@VHashedString\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@VHashedString\@\@\@3\@\@std\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>, struct std::hash, struct std::equal_to, class std::allocator, struct std::equal_to, class std::allocator>>>> mQuerySets; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExpressionNodeSerializer.hpp b/LiteLoader/include/llapi/mc/ExpressionNodeSerializer.hpp index 1d73ad9e2b..99a6f3f198 100644 --- a/LiteLoader/include/llapi/mc/ExpressionNodeSerializer.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionNodeSerializer.hpp @@ -20,23 +20,23 @@ namespace ExpressionNodeSerializer { #undef AFTER_EXTRA /** - * @symbol ?fromFloat\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@M\@Z + * @symbol ?fromFloat\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@M\@Z */ MCAPI void fromFloat(class ExpressionNode &, float); /** - * @symbol ?fromInt\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@H\@Z + * @symbol ?fromInt\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@H\@Z */ MCAPI void fromInt(class ExpressionNode &, int); /** - * @symbol ?fromProxy\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@UExpressionNodeProxy\@1\@\@Z + * @symbol ?fromProxy\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@UExpressionNodeProxy\@1\@\@Z */ MCAPI void fromProxy(class ExpressionNode &, struct ExpressionNodeSerializer::ExpressionNodeProxy); /** - * @symbol ?fromString\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBedrockLoadContext\@\@\@Z + * @symbol ?fromString\@ExpressionNodeSerializer\@\@YAXAEAVExpressionNode\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBedrockLoadContext\@\@\@Z */ MCAPI void fromString(class ExpressionNode &, std::string const &, class BedrockLoadContext const &); /** - * @symbol ?toProxy\@ExpressionNodeSerializer\@\@YA?AUExpressionNodeProxy\@1\@AEBVExpressionNode\@\@\@Z + * @symbol ?toProxy\@ExpressionNodeSerializer\@\@YA?AUExpressionNodeProxy\@1\@AEBVExpressionNode\@\@\@Z */ MCAPI struct ExpressionNodeSerializer::ExpressionNodeProxy toProxy(class ExpressionNode const &); diff --git a/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp b/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp index 13f810d604..27a92a301f 100644 --- a/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp +++ b/LiteLoader/include/llapi/mc/ExpressionOpBitField.hpp @@ -30,24 +30,24 @@ struct ExpressionOpBitField { public: /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000000\@Z + * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00000\@Z */ - MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; + MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00000\@Z + * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00\@Z */ - MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; + MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000\@Z + * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000\@Z */ MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@000\@Z + * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@000\@Z */ MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; /** - * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@00\@Z + * @symbol ?areBitsSet\@ExpressionOpBitField\@\@QEBA_NW4ExpressionOp\@\@0000000\@Z */ - MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; + MCAPI bool areBitsSet(enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp, enum class ExpressionOp) const; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp b/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp index 24cd3721f7..be336d054e 100644 --- a/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp +++ b/LiteLoader/include/llapi/mc/ExtendedCertificate.hpp @@ -30,20 +30,20 @@ class ExtendedCertificate { public: /** - * @symbol ?getIdentity\@ExtendedCertificate\@\@SA?AVUUID\@mce\@\@AEBVCertificate\@\@\@Z + * @symbol ?getIdentity\@ExtendedCertificate\@\@SA?AVUUID\@mce\@\@AEBVCertificate\@\@\@Z */ MCAPI static class mce::UUID getIdentity(class Certificate const &); /** - * @symbol ?getIdentityName\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@\@Z + * @symbol ?getIdentityName\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@\@Z */ MCAPI static std::string getIdentityName(class Certificate const &); /** - * @symbol ?getXuid\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@\@Z + * @symbol ?getXuid\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCertificate\@\@\@Z */ - MCAPI static std::string getXuid(class Certificate const &); + MCAPI static std::string getXuid(class Certificate const *); /** - * @symbol ?getXuid\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCertificate\@\@\@Z + * @symbol ?getXuid\@ExtendedCertificate\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@\@Z */ - MCAPI static std::string getXuid(class Certificate const *); + MCAPI static std::string getXuid(class Certificate const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp index 0be597175b..bbd8b4769e 100644 --- a/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp +++ b/LiteLoader/include/llapi/mc/ExtendedStreamReadResult.hpp @@ -24,12 +24,19 @@ struct ExtendedStreamReadResult { public: struct ExtendedStreamReadResult& operator=(struct ExtendedStreamReadResult const &) = delete; ExtendedStreamReadResult(struct ExtendedStreamReadResult const &) = delete; - ExtendedStreamReadResult() = delete; #endif public: /** - * @symbol ??1ExtendedStreamReadResult\@\@QEAA\@XZ + * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@XZ + */ + MCAPI ExtendedStreamReadResult(); + /** + * @symbol ??0ExtendedStreamReadResult\@\@QEAA\@W4StreamReadResult\@\@\@Z + */ + MCAPI ExtendedStreamReadResult(enum class StreamReadResult); + /** + * @symbol ??1ExtendedStreamReadResult\@\@QEAA\@XZ */ MCAPI ~ExtendedStreamReadResult(); diff --git a/LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp index ce921e1556..954d883131 100644 --- a/LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp +++ b/LiteLoader/include/llapi/mc/ExternalFileLevelStorage.hpp @@ -24,63 +24,63 @@ namespace ExternalFileLevelStorage { #undef AFTER_EXTRA /** - * @symbol ?_readLevelDataFromFile\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@AEBVPath\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z + * @symbol ?_readLevelDataFromFile\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@AEBVPath\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z */ MCAPI class Core::Result _readLevelDataFromFile(class Core::Path const &, std::string const &, class LevelData &); /** - * @symbol ?_writeLevelDat\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@AEBVLevelData\@\@\@Z + * @symbol ?_writeLevelDat\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@AEBVLevelData\@\@\@Z */ MCAPI bool _writeLevelDat(class Core::Path const &, class LevelData const &); /** - * @symbol ?getAccessStrategy\@ExternalFileLevelStorage\@\@YA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?getAccessStrategy\@ExternalFileLevelStorage\@\@YA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI std::unique_ptr getAccessStrategy(class Core::Path const &, class ContentIdentity const &, class gsl::not_null> const &); /** - * @symbol ?getImportantFiles\@ExternalFileLevelStorage\@\@YA?BV?$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 + * @symbol ?getImportantFiles\@ExternalFileLevelStorage\@\@YA?BV?$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 getImportantFiles(); /** - * @symbol ?getLevelIDFromPath\@ExternalFileLevelStorage\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@0\@Z + * @symbol ?getLevelIDFromPath\@ExternalFileLevelStorage\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@0\@Z */ MCAPI std::string getLevelIDFromPath(class Core::Path const &, class Core::Path const &); /** - * @symbol ?isLevelMarkedForSync\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@\@Z + * @symbol ?isLevelMarkedForSync\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool isLevelMarkedForSync(class Core::Path const &); /** - * @symbol ?makeReadableLevelnameFile\@ExternalFileLevelStorage\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?makeReadableLevelnameFile\@ExternalFileLevelStorage\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void makeReadableLevelnameFile(class Core::Path const &, std::string const &); /** - * @symbol ?readLevelDataFromData\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z + * @symbol ?readLevelDataFromData\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z */ MCAPI class Core::Result readLevelDataFromData(std::string const &, class LevelData &); /** - * @symbol ?readLevelDataFromFile\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@AEBVPath\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z + * @symbol ?readLevelDataFromFile\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@AEBVPath\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z */ MCAPI class Core::Result readLevelDataFromFile(class Core::Path const &, std::string const &, class LevelData &); /** - * @symbol ?readShallowLevelSummaryFromSyncFile\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAULevelSummary\@\@\@Z + * @symbol ?readShallowLevelSummaryFromSyncFile\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAULevelSummary\@\@\@Z */ MCAPI bool readShallowLevelSummaryFromSyncFile(class Core::Path const &, std::string const &, struct LevelSummary &); /** - * @symbol ?readSyncFileData\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_J2AEA_N\@Z + * @symbol ?readSyncFileData\@ExternalFileLevelStorage\@\@YA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_J2AEA_N\@Z */ MCAPI bool readSyncFileData(class Core::Path const &, std::string &, __int64 &, __int64 &, bool &); /** - * @symbol ?saveLevelData\@ExternalFileLevelStorage\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@_N\@Z + * @symbol ?saveLevelData\@ExternalFileLevelStorage\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@_N\@Z */ MCAPI void saveLevelData(class Core::Path const &, std::string const &, class LevelData const &, bool); /** - * @symbol ?saveLevelDataToPath\@ExternalFileLevelStorage\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z + * @symbol ?saveLevelDataToPath\@ExternalFileLevelStorage\@\@YAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z */ MCAPI void saveLevelDataToPath(class Core::Path const &, std::string const &, class LevelData const &); /** - * @symbol ?saveLevelDisplayDataToCache\@ExternalFileLevelStorage\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@V?$not_null\@PEAVTaskGroup\@\@\@gsl\@\@\@Z + * @symbol ?saveLevelDisplayDataToCache\@ExternalFileLevelStorage\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@V?$not_null\@PEAVTaskGroup\@\@\@gsl\@\@\@Z */ MCAPI void saveLevelDisplayDataToCache(std::string const &, class LevelData const &, class gsl::not_null); /** - * @symbol ?validateLevelDat\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@VPath\@3\@\@Z + * @symbol ?validateLevelDat\@ExternalFileLevelStorage\@\@YA?AVResult\@Core\@\@VPath\@3\@\@Z */ MCAPI class Core::Result validateLevelDat(class Core::Path); diff --git a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp index dc6ff857b8..73214b8d16 100644 --- a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp +++ b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageMetadata.hpp @@ -20,7 +20,7 @@ namespace ExternalFileLevelStorageMetadata { #undef AFTER_EXTRA /** - * @symbol ?saveLevelMetadata\@ExternalFileLevelStorageMetadata\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z + * @symbol ?saveLevelMetadata\@ExternalFileLevelStorageMetadata\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z */ MCAPI void saveLevelMetadata(std::string const &, class LevelData const &); diff --git a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp index ade3c9532f..2d8e405628 100644 --- a/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp +++ b/LiteLoader/include/llapi/mc/ExternalFileLevelStorageSource.hpp @@ -32,136 +32,140 @@ class ExternalFileLevelStorageSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ExternalFileLevelStorageSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@ExternalFileLevelStorageSource\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@ExternalFileLevelStorageSource\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?getLevelData\@ExternalFileLevelStorageSource\@\@UEBA?AVLevelData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?getLevelData\@ExternalFileLevelStorageSource\@\@UEBA?AVLevelData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class LevelData getLevelData(std::string const &) const; /** - * @vftbl 3 - * @symbol ?getLevelData\@ExternalFileLevelStorageSource\@\@UEBA?AVResult\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z + * @vftbl 3 + * @symbol ?getLevelData\@ExternalFileLevelStorageSource\@\@UEBA?AVResult\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelData\@\@\@Z */ virtual class Core::Result getLevelData(std::string const &, class LevelData &) const; /** - * @vftbl 4 - * @symbol ?saveLevelData\@ExternalFileLevelStorageSource\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z + * @vftbl 4 + * @symbol ?saveLevelData\@ExternalFileLevelStorageSource\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z */ virtual void saveLevelData(std::string const &, class LevelData const &); /** - * @vftbl 5 - * @symbol ?getLevelList\@ExternalFileLevelStorageSource\@\@UEAAXAEAV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?getLevelList\@ExternalFileLevelStorageSource\@\@UEAAXAEAV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@\@Z */ virtual void getLevelList(std::vector> &); /** - * @vftbl 6 - * @symbol ?createLevelStorage\@ExternalFileLevelStorageSource\@\@UEAA?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@8\@V?$unique_ptr\@VLevelStorageEventing\@\@U?$default_delete\@VLevelStorageEventing\@\@\@std\@\@\@3\@\@Z + * @vftbl 6 + * @symbol ?createLevelStorage\@ExternalFileLevelStorageSource\@\@UEAA?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@8\@V?$unique_ptr\@VLevelStorageEventing\@\@U?$default_delete\@VLevelStorageEventing\@\@\@std\@\@\@3\@\@Z */ virtual std::unique_ptr createLevelStorage(class Scheduler &, std::string const &, class ContentIdentity const &, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &, class gsl::not_null>, std::unique_ptr); /** - * @vftbl 7 - * @symbol ?createLevelLooseStorage\@ExternalFileLevelStorageSource\@\@UEAA?AV?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 7 + * @symbol ?createLevelLooseStorage\@ExternalFileLevelStorageSource\@\@UEAA?AV?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual std::unique_ptr createLevelLooseStorage(std::string const &, class ContentIdentity const &, class gsl::not_null> const &); /** - * @vftbl 8 - * @symbol ?isNewLevelIdAcceptable\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?isNewLevelIdAcceptable\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool isNewLevelIdAcceptable(std::string const &); /** - * @vftbl 9 - * @symbol ?deleteLevel\@ExternalFileLevelStorageSource\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?deleteLevel\@ExternalFileLevelStorageSource\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void deleteLevel(std::string const &); /** - * @vftbl 10 - * @symbol ?renameLevel\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 10 + * @symbol ?renameLevel\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual bool renameLevel(std::string const &, std::string const &); /** - * @vftbl 11 - * @symbol ?renameLevel\@ExternalFileLevelStorageSource\@\@UEAAXAEAVLevelData\@\@AEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 11 + * @symbol ?renameLevel\@ExternalFileLevelStorageSource\@\@UEAAXAEAVLevelData\@\@AEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void renameLevel(class LevelData &, class Core::Path const &, std::string const &); /** - * @vftbl 12 - * @symbol ?createBackupCopyOfWorld\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @vftbl 12 + * @symbol ?createBackupCopyOfWorld\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ virtual bool createBackupCopyOfWorld(std::string const &, std::string const &, std::string const &); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol ?isLevelMarkedForSync\@ExternalFileLevelStorageSource\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @vftbl 16 + * @symbol ?isLevelMarkedForSync\@ExternalFileLevelStorageSource\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool isLevelMarkedForSync(class Core::Path const &) const; /** - * @vftbl 17 - * @symbol ?isLevelPartiallyCopied\@ExternalFileLevelStorageSource\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @vftbl 17 + * @symbol ?isLevelPartiallyCopied\@ExternalFileLevelStorageSource\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool isLevelPartiallyCopied(class Core::Path const &) const; /** - * @vftbl 18 - * @symbol ?getLevelDatFoundPath\@ExternalFileLevelStorageSource\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @vftbl 18 + * @symbol ?getLevelDatFoundPath\@ExternalFileLevelStorageSource\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ virtual class Core::PathBuffer getLevelDatFoundPath(class Core::Path const &) const; /** - * @vftbl 19 - * @symbol ?getBasePath\@ExternalFileLevelStorageSource\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 19 + * @symbol ?getBasePath\@ExternalFileLevelStorageSource\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getBasePath() const; /** - * @vftbl 20 - * @symbol ?getPathToLevel\@ExternalFileLevelStorageSource\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 20 + * @symbol ?getPathToLevel\@ExternalFileLevelStorageSource\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class Core::PathBuffer const getPathToLevel(std::string const &) const; /** - * @vftbl 21 - * @symbol ?getPathToLevelInfo\@ExternalFileLevelStorageSource\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 21 + * @symbol ?getPathToLevelInfo\@ExternalFileLevelStorageSource\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual class Core::PathBuffer const getPathToLevelInfo(std::string const &, bool) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_EXTERNALFILELEVELSTORAGESOURCE /** - * @symbol ?convertLevel\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAVProgressListener\@\@\@Z + * @symbol ?convertLevel\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAVProgressListener\@\@\@Z */ MCVAPI bool convertLevel(std::string const &, class ProgressListener *); /** - * @symbol ?isBetaRetailLevel\@ExternalFileLevelStorageSource\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isBetaRetailLevel\@ExternalFileLevelStorageSource\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool isBetaRetailLevel(std::string const &) const; /** - * @symbol ?isConvertible\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isConvertible\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool isConvertible(std::string const &); /** - * @symbol ?requiresConversion\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?requiresConversion\@ExternalFileLevelStorageSource\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool requiresConversion(std::string const &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ExternalFileLevelStorageSource(); #endif /** - * @symbol ??0ExternalFileLevelStorageSource\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VSaveTransactionManager\@\@\@Bedrock\@\@\@2\@\@Z + * @symbol ??0ExternalFileLevelStorageSource\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VSaveTransactionManager\@\@\@Bedrock\@\@\@2\@\@Z */ MCAPI ExternalFileLevelStorageSource(class gsl::not_null> const &, class gsl::not_null> const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp b/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp index 2195bc7e5f..91a6fb2a0d 100644 --- a/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp +++ b/LiteLoader/include/llapi/mc/ExternalLinkSettings.hpp @@ -11,22 +11,22 @@ #undef BEFORE_EXTRA -struct ExternalLinkSettings { +class ExternalLinkSettings { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_EXTERNALLINKSETTINGS public: - struct ExternalLinkSettings& operator=(struct ExternalLinkSettings const &) = delete; - ExternalLinkSettings(struct ExternalLinkSettings const &) = delete; + class ExternalLinkSettings& operator=(class ExternalLinkSettings const &) = delete; + ExternalLinkSettings(class ExternalLinkSettings const &) = delete; ExternalLinkSettings() = delete; #endif public: /** - * @symbol ??1ExternalLinkSettings\@\@QEAA\@XZ + * @symbol ??1ExternalLinkSettings\@\@QEAA\@XZ */ MCAPI ~ExternalLinkSettings(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp b/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp index 166972ab27..39ddeea6d7 100644 --- a/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp +++ b/LiteLoader/include/llapi/mc/ExternalRecipeStore.hpp @@ -30,12 +30,12 @@ class ExternalRecipeStore { public: /** - * @symbol ?registerBlockReduction\@ExternalRecipeStore\@\@QEAAXAEBVItemStack\@\@$$QEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerBlockReduction\@ExternalRecipeStore\@\@QEAAXAEBVItemStack\@\@$$QEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerBlockReduction(class ItemStack const &, std::vector &&); /** - * @symbol ?setBlockReducer\@ExternalRecipeStore\@\@QEAAXPEAVBlockReducer\@\@\@Z + * @symbol ?setBlockReducer\@ExternalRecipeStore\@\@QEAAXPEAVBlockReducer\@\@\@Z */ MCAPI void setBlockReducer(class BlockReducer *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EyeOfEnder.hpp b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp index 3d8777427b..2a54fd4d80 100644 --- a/LiteLoader/include/llapi/mc/EyeOfEnder.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnder.hpp @@ -31,141 +31,141 @@ class EyeOfEnder : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@EyeOfEnder\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@EyeOfEnder\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~EyeOfEnder(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 47 - * @symbol ?lerpMotion\@EyeOfEnder\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 47 + * @symbol ?lerpMotion\@EyeOfEnder\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 49 - * @symbol ?normalTick\@EyeOfEnder\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@EyeOfEnder\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@EyeOfEnder\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@EyeOfEnder\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0EyeOfEnder\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0EyeOfEnder\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI EyeOfEnder(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?preNormalTick\@EyeOfEnder\@\@QEAAXXZ + * @symbol ?preNormalTick\@EyeOfEnder\@\@QEAAXXZ */ MCAPI void preNormalTick(); /** - * @symbol ?signalTo\@EyeOfEnder\@\@QEAAXAEBVPlayer\@\@AEAVBlockPos\@\@\@Z + * @symbol ?signalTo\@EyeOfEnder\@\@QEAAXAEBVPlayer\@\@AEAVBlockPos\@\@\@Z */ MCAPI void signalTo(class Player const &, class BlockPos &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp index 3964ff4862..2941027717 100644 --- a/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/EyeOfEnderPreNormalTickSystem.hpp @@ -28,16 +28,16 @@ class EyeOfEnderPreNormalTickSystem { public: /** - * @symbol ?createSystem\@EyeOfEnderPreNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@EyeOfEnderPreNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doEyeOfEnderPreNormalTickSystem\@EyeOfEnderPreNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doEyeOfEnderPreNormalTickSystem\@EyeOfEnderPreNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doEyeOfEnderPreNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp index 5785c4975e..e67e868bab 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalActorBlock.hpp @@ -31,213 +31,224 @@ class FaceDirectionalActorBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FaceDirectionalActorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 148 - * @symbol ?getRenderBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 148 + * @symbol ?getRenderBlock\@FaceDirectionalActorBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@FaceDirectionalActorBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@FaceDirectionalActorBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 - * @symbol ?getFaceFlip\@FaceDirectionalActorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + * @vftbl 150 + * @symbol ?getFaceFlip\@FaceDirectionalActorBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0FaceDirectionalActorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_NM\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALACTORBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FaceDirectionalActorBlock(); +#endif + /** + * @symbol ??0FaceDirectionalActorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_NM\@Z */ MCAPI FaceDirectionalActorBlock(std::string const &, int, class Material const &, bool, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp index 36c4fee08c..ac0501f11b 100644 --- a/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp +++ b/LiteLoader/include/llapi/mc/FaceDirectionalBlock.hpp @@ -31,230 +31,241 @@ class FaceDirectionalBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FaceDirectionalBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@FaceDirectionalBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@FaceDirectionalBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 148 - * @symbol ?getRenderBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 148 + * @symbol ?getRenderBlock\@FaceDirectionalBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@FaceDirectionalBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@FaceDirectionalBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 - * @symbol ?getFaceFlip\@FaceDirectionalBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + * @vftbl 150 + * @symbol ?getFaceFlip\@FaceDirectionalBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0FaceDirectionalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_NM\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FACEDIRECTIONALBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FaceDirectionalBlock(); +#endif + /** + * @symbol ??0FaceDirectionalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_NM\@Z */ MCAPI FaceDirectionalBlock(std::string const &, int, class Material const &, bool, float); /** - * @symbol ?getFaceFlipStatic\@FaceDirectionalBlock\@\@SA?AW4Flip\@\@EAEBVBlock\@\@_N\@Z + * @symbol ?getFaceFlipStatic\@FaceDirectionalBlock\@\@SA?AW4Flip\@\@EAEBVBlock\@\@_N\@Z */ MCAPI static enum class Flip getFaceFlipStatic(unsigned char, class Block const &, bool); /** - * @symbol ?getFacingDirection\@FaceDirectionalBlock\@\@SAEAEBVBlock\@\@_N\@Z + * @symbol ?getFacingDirection\@FaceDirectionalBlock\@\@SAEAEBVBlock\@\@_N\@Z */ MCAPI static unsigned char getFacingDirection(class Block const &, bool); /** - * @symbol ?getMappedFaceStatic\@FaceDirectionalBlock\@\@SAEEAEBVBlock\@\@_N\@Z + * @symbol ?getMappedFaceStatic\@FaceDirectionalBlock\@\@SAEEAEBVBlock\@\@_N\@Z */ MCAPI static unsigned char getMappedFaceStatic(unsigned char, class Block const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Facing.hpp b/LiteLoader/include/llapi/mc/Facing.hpp index 135b06d642..ca32a7cca8 100644 --- a/LiteLoader/include/llapi/mc/Facing.hpp +++ b/LiteLoader/include/llapi/mc/Facing.hpp @@ -39,172 +39,172 @@ enum class Axis : int; public: /** - * @symbol ?ALL_EXCEPT\@Facing\@\@2V?$array\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@$05\@std\@\@B + * @symbol ?ALL_EXCEPT\@Facing\@\@2V?$array\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@$05\@std\@\@B */ MCAPI static class std::array, 6> const ALL_EXCEPT; /** - * @symbol ?ALL_EXCEPT_AXIS_Y\@Facing\@\@2V?$array\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@$05\@std\@\@B + * @symbol ?ALL_EXCEPT_AXIS_Y\@Facing\@\@2V?$array\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@$05\@std\@\@B */ MCAPI static class std::array, 6> const ALL_EXCEPT_AXIS_Y; /** - * @symbol ?ALL_FACES\@Facing\@\@2V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@B + * @symbol ?ALL_FACES\@Facing\@\@2V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@B */ MCAPI static std::vector const ALL_FACES; /** - * @symbol ?BY2DDATA\@Facing\@\@2QBW4Name\@1\@B + * @symbol ?BY2DDATA\@Facing\@\@2QBW4Name\@1\@B */ MCAPI static enum class Facing::Name const BY2DDATA[]; /** - * @symbol ?DIRECTIONS\@Facing\@\@2QBW4Name\@1\@B + * @symbol ?DIRECTIONS\@Facing\@\@2QBW4Name\@1\@B */ MCAPI static enum class Facing::Name const DIRECTIONS[]; /** - * @symbol ?DIRECTION\@Facing\@\@2QBVBlockPos\@\@B + * @symbol ?DIRECTION\@Facing\@\@2QBVBlockPos\@\@B */ MCAPI static class BlockPos const DIRECTION[]; /** - * @symbol ?FACINGMASK\@Facing\@\@2QBEB + * @symbol ?FACINGMASK\@Facing\@\@2QBEB */ MCAPI static unsigned char const FACINGMASK[]; /** - * @symbol ?FACINGMASK_INV\@Facing\@\@2QBEB + * @symbol ?FACINGMASK_INV\@Facing\@\@2QBEB */ MCAPI static unsigned char const FACINGMASK_INV[]; /** - * @symbol ?NORMAL\@Facing\@\@2QBVVec3\@\@B + * @symbol ?NORMAL\@Facing\@\@2QBVVec3\@\@B */ MCAPI static class Vec3 const NORMAL[]; /** - * @symbol ?OPPOSITE_FACING\@Facing\@\@2QBEB + * @symbol ?OPPOSITE_FACING\@Facing\@\@2QBEB */ MCAPI static unsigned char const OPPOSITE_FACING[]; /** - * @symbol ?STEP_X\@Facing\@\@2QBHB + * @symbol ?STEP_X\@Facing\@\@2QBHB */ MCAPI static int const STEP_X[]; /** - * @symbol ?STEP_Y\@Facing\@\@2QBHB + * @symbol ?STEP_Y\@Facing\@\@2QBHB */ MCAPI static int const STEP_Y[]; /** - * @symbol ?STEP_Z\@Facing\@\@2QBHB + * @symbol ?STEP_Z\@Facing\@\@2QBHB */ MCAPI static int const STEP_Z[]; /** - * @symbol ?convertDirectionToFacingDirection\@Facing\@\@SAEW4Type\@Direction\@\@\@Z + * @symbol ?convertDirectionToFacingDirection\@Facing\@\@SAEW4Type\@Direction\@\@\@Z */ MCAPI static unsigned char convertDirectionToFacingDirection(enum class Direction::Type); /** - * @symbol ?convertWeirdoDirectionToFacingDirection\@Facing\@\@SAEW4WeirdoDirection\@\@\@Z + * @symbol ?convertWeirdoDirectionToFacingDirection\@Facing\@\@SAEW4WeirdoDirection\@\@\@Z */ MCAPI static unsigned char convertWeirdoDirectionToFacingDirection(enum class WeirdoDirection); /** - * @symbol ?convertYRotationToFacingDirection\@Facing\@\@SAEM\@Z + * @symbol ?convertYRotationToFacingDirection\@Facing\@\@SAEM\@Z */ MCAPI static unsigned char convertYRotationToFacingDirection(float); /** - * @symbol ?from2DDataValue\@Facing\@\@SA?AW4Name\@1\@H\@Z + * @symbol ?from2DDataValue\@Facing\@\@SA?AW4Name\@1\@H\@Z */ MCAPI static enum class Facing::Name from2DDataValue(int); /** - * @symbol ?fromVec3\@Facing\@\@SAEAEBVVec3\@\@\@Z + * @symbol ?fromVec3\@Facing\@\@SAEAEBVVec3\@\@\@Z */ MCAPI static unsigned char fromVec3(class Vec3 const &); /** - * @symbol ?getAxis\@Facing\@\@SA?AW4Axis\@1\@E\@Z + * @symbol ?getAxis\@Facing\@\@SA?AW4Axis\@1\@E\@Z */ MCAPI static enum class Facing::Axis getAxis(unsigned char); /** - * @symbol ?getAxisFromStandingRotation\@Facing\@\@SA?AV?$optional\@W4Axis\@Facing\@\@\@std\@\@H\@Z + * @symbol ?getAxisFromStandingRotation\@Facing\@\@SA?AV?$optional\@W4Axis\@Facing\@\@\@std\@\@H\@Z */ MCAPI static class std::optional getAxisFromStandingRotation(int); /** - * @symbol ?getClockWise\@Facing\@\@SAEE\@Z + * @symbol ?getClockWise\@Facing\@\@SAEE\@Z */ MCAPI static unsigned char getClockWise(unsigned char); /** - * @symbol ?getClosestRotation\@Facing\@\@SA?AW4Rotation\@1\@M\@Z + * @symbol ?getClosestRotation\@Facing\@\@SA?AW4Rotation\@1\@M\@Z */ MCAPI static enum class Facing::Rotation getClosestRotation(float); /** - * @symbol ?getCounterClockWise\@Facing\@\@SAEE\@Z + * @symbol ?getCounterClockWise\@Facing\@\@SAEE\@Z */ MCAPI static unsigned char getCounterClockWise(unsigned char); /** - * @symbol ?getFaceLocation\@Facing\@\@SA?AVVec3\@\@EMM\@Z + * @symbol ?getFaceLocation\@Facing\@\@SA?AVVec3\@\@EMM\@Z */ MCAPI static class Vec3 getFaceLocation(unsigned char, float, float); /** - * @symbol ?getFaceLocationXY\@Facing\@\@SA?AVVec2\@\@EAEBVVec3\@\@\@Z + * @symbol ?getFaceLocationXY\@Facing\@\@SA?AVVec2\@\@EAEBVVec3\@\@\@Z */ MCAPI static class Vec2 getFaceLocationXY(unsigned char, class Vec3 const &); /** - * @symbol ?getFacingDirection\@Facing\@\@SAEAEBVVec3\@\@0\@Z + * @symbol ?getFacingDirection\@Facing\@\@SAEAEBVVec3\@\@0\@Z */ MCAPI static unsigned char getFacingDirection(class Vec3 const &, class Vec3 const &); /** - * @symbol ?getMostPrioritizedFacingDirection\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@AEBVVec2\@\@E_N\@Z + * @symbol ?getMostPrioritizedFacingDirection\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@AEBVVec2\@\@E_N\@Z */ MCAPI static std::vector getMostPrioritizedFacingDirection(class Vec2 const &, unsigned char, bool); /** - * @symbol ?getMostPrioritizedFacingDirectionFromViewVector\@Facing\@\@SA?AV?$array\@E$05\@std\@\@AEBVVec2\@\@\@Z + * @symbol ?getMostPrioritizedFacingDirectionFromViewVector\@Facing\@\@SA?AV?$array\@E$05\@std\@\@AEBVVec2\@\@\@Z */ MCAPI static class std::array getMostPrioritizedFacingDirectionFromViewVector(class Vec2 const &); /** - * @symbol ?getOpposite\@Facing\@\@SAEE\@Z + * @symbol ?getOpposite\@Facing\@\@SAEE\@Z */ MCAPI static unsigned char getOpposite(unsigned char); /** - * @symbol ?getRandomFace\@Facing\@\@SAHAEAVRandom\@\@\@Z + * @symbol ?getRandomFace\@Facing\@\@SAHAEAVRandom\@\@\@Z */ MCAPI static int getRandomFace(class Random &); /** - * @symbol ?getRandomFaceHorizontal\@Facing\@\@SAHAEAVRandom\@\@\@Z + * @symbol ?getRandomFaceHorizontal\@Facing\@\@SAHAEAVRandom\@\@\@Z */ MCAPI static int getRandomFaceHorizontal(class Random &); /** - * @symbol ?getRotationMatrix\@Facing\@\@SA?AU?$mat\@$02$02M$0A\@\@glm\@\@EW4Rotation\@1\@\@Z + * @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 + * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ */ - MCAPI static std::vector getShuffledDirections(class Random &); + MCAPI static std::vector getShuffledDirections(); /** - * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ + * @symbol ?getShuffledDirections\@Facing\@\@SA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@AEAVRandom\@\@\@Z */ - MCAPI static std::vector getShuffledDirections(); + MCAPI static std::vector getShuffledDirections(class Random &); /** - * @symbol ?getStepX\@Facing\@\@SAHE\@Z + * @symbol ?getStepX\@Facing\@\@SAHE\@Z */ MCAPI static int getStepX(unsigned char); /** - * @symbol ?getStepY\@Facing\@\@SAHE\@Z + * @symbol ?getStepY\@Facing\@\@SAHE\@Z */ MCAPI static int getStepY(unsigned char); /** - * @symbol ?getStepZ\@Facing\@\@SAHE\@Z + * @symbol ?getStepZ\@Facing\@\@SAHE\@Z */ MCAPI static int getStepZ(unsigned char); /** - * @symbol ?isValidDirection\@Facing\@\@SA_NH\@Z + * @symbol ?isValidDirection\@Facing\@\@SA_NH\@Z */ MCAPI static bool isValidDirection(int); /** - * @symbol ?makeDirectionArray\@Facing\@\@SA?AV?$array\@E$05\@std\@\@EEE\@Z + * @symbol ?makeDirectionArray\@Facing\@\@SA?AV?$array\@E$05\@std\@\@EEE\@Z */ MCAPI static class std::array makeDirectionArray(unsigned char, unsigned char, unsigned char); /** - * @symbol ?rotateFace\@Facing\@\@SAEEW4Rotation\@1\@\@Z + * @symbol ?rotateFace\@Facing\@\@SAEEW4Rotation\@1\@\@Z */ MCAPI static unsigned char rotateFace(unsigned char, enum class Facing::Rotation); /** - * @symbol ?rotateFaceAroundGivenFace\@Facing\@\@SAEEEW4Rotation\@1\@\@Z + * @symbol ?rotateFaceAroundGivenFace\@Facing\@\@SAEEEW4Rotation\@1\@\@Z */ MCAPI static unsigned char rotateFaceAroundGivenFace(unsigned char, unsigned char, enum class Facing::Rotation); /** - * @symbol ?toString\@Facing\@\@SA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@E\@Z + * @symbol ?toString\@Facing\@\@SA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@E\@Z */ - MCAPI static class gsl::basic_string_span toString(unsigned char); + MCAPI static class std::basic_string_view> toString(unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FakeBatteryMonitorInterface.hpp b/LiteLoader/include/llapi/mc/FakeBatteryMonitorInterface.hpp index 98ab9b2da1..4a26c6aca1 100644 --- a/LiteLoader/include/llapi/mc/FakeBatteryMonitorInterface.hpp +++ b/LiteLoader/include/llapi/mc/FakeBatteryMonitorInterface.hpp @@ -29,23 +29,23 @@ class FakeBatteryMonitorInterface { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FakeBatteryMonitorInterface(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getBatteryStatus\@FakeBatteryMonitorInterface\@\@UEBA?AW4BatteryStatus\@\@XZ + * @vftbl 1 + * @symbol ?getBatteryStatus\@FakeBatteryMonitorInterface\@\@UEBA?AW4BatteryStatus\@\@XZ */ virtual enum class BatteryStatus getBatteryStatus() const; /** - * @vftbl 2 - * @symbol ?getBatteryLevel\@FakeBatteryMonitorInterface\@\@UEBAMXZ + * @vftbl 2 + * @symbol ?getBatteryLevel\@FakeBatteryMonitorInterface\@\@UEBAMXZ */ virtual float getBatteryLevel() const; /** - * @symbol ??0FakeBatteryMonitorInterface\@\@QEAA\@XZ + * @symbol ??0FakeBatteryMonitorInterface\@\@QEAA\@XZ */ MCAPI FakeBatteryMonitorInterface(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FakeThermalMonitorInterface.hpp b/LiteLoader/include/llapi/mc/FakeThermalMonitorInterface.hpp index 1ebe771fde..4dd6dcc1fc 100644 --- a/LiteLoader/include/llapi/mc/FakeThermalMonitorInterface.hpp +++ b/LiteLoader/include/llapi/mc/FakeThermalMonitorInterface.hpp @@ -29,28 +29,28 @@ class FakeThermalMonitorInterface { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FakeThermalMonitorInterface(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getThermalState\@FakeThermalMonitorInterface\@\@UEBA?AW4ThermalState\@\@XZ + * @vftbl 1 + * @symbol ?getThermalState\@FakeThermalMonitorInterface\@\@UEBA?AW4ThermalState\@\@XZ */ virtual enum class ThermalState getThermalState() const; /** - * @vftbl 2 - * @symbol ?getThermalValueCelsius\@FakeThermalMonitorInterface\@\@UEBAMXZ + * @vftbl 2 + * @symbol ?getThermalValueCelsius\@FakeThermalMonitorInterface\@\@UEBAMXZ */ virtual float getThermalValueCelsius() const; /** - * @vftbl 3 - * @symbol ?isLowBatteryModeEnabled\@FakeThermalMonitorInterface\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?isLowBatteryModeEnabled\@FakeThermalMonitorInterface\@\@UEBA_NXZ */ virtual bool isLowBatteryModeEnabled() const; /** - * @symbol ??0FakeThermalMonitorInterface\@\@QEAA\@XZ + * @symbol ??0FakeThermalMonitorInterface\@\@QEAA\@XZ */ MCAPI FakeThermalMonitorInterface(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp b/LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp index da216bb105..761aa63229 100644 --- a/LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/FallenTreeTrunk.hpp @@ -31,19 +31,19 @@ class FallenTreeTrunk { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FallenTreeTrunk(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeTrunk\@FallenTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + * @vftbl 1 + * @symbol ?placeTrunk\@FallenTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z */ virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; /** - * @vftbl 2 - * @symbol ?getTreeHeight\@FallenTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?getTreeHeight\@FallenTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z */ virtual int getTreeHeight(class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FallingBlock.hpp b/LiteLoader/include/llapi/mc/FallingBlock.hpp index 7d9ab7e979..5d83c10a3a 100644 --- a/LiteLoader/include/llapi/mc/FallingBlock.hpp +++ b/LiteLoader/include/llapi/mc/FallingBlock.hpp @@ -32,207 +32,207 @@ class FallingBlock : public PredictableProjectile { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@FallingBlock\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@FallingBlock\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~FallingBlock(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 44 - * @symbol ?teleportTo\@FallingBlock\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@FallingBlock\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 - * @symbol ?normalTick\@FallingBlock\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@FallingBlock\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@FallingBlock\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@FallingBlock\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@FallingBlock\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@FallingBlock\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@FallingBlock\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@FallingBlock\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@FallingBlock\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@FallingBlock\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 183 - * @symbol ?causeFallDamage\@FallingBlock\@\@UEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@FallingBlock\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@FallingBlock\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@FallingBlock\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@FallingBlock\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@FallingBlock\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@FallingBlock\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@FallingBlock\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@FallingBlock\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@FallingBlock\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FALLINGBLOCK /** - * @symbol ?getDeletionDelayTimeSeconds\@FallingBlock\@\@UEBAMXZ + * @symbol ?getDeletionDelayTimeSeconds\@FallingBlock\@\@UEBAMXZ */ MCVAPI float getDeletionDelayTimeSeconds() const; #endif /** - * @symbol ??0FallingBlock\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0FallingBlock\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI FallingBlock(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?breakBlock\@FallingBlock\@\@QEAAXXZ + * @symbol ?breakBlock\@FallingBlock\@\@QEAAXXZ */ MCAPI void breakBlock(); /** - * @symbol ?doNormalTick\@FallingBlock\@\@QEAAXAEAVITickDelegate\@\@\@Z + * @symbol ?doNormalTick\@FallingBlock\@\@QEAAXAEAVITickDelegate\@\@\@Z */ MCAPI void doNormalTick(class ITickDelegate &); /** - * @symbol ?getFallingBlock\@FallingBlock\@\@QEBAAEBVBlock\@\@XZ + * @symbol ?getFallingBlock\@FallingBlock\@\@QEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getFallingBlock() const; /** - * @symbol ?setFallDamageAmount\@FallingBlock\@\@QEAAXM\@Z + * @symbol ?setFallDamageAmount\@FallingBlock\@\@QEAAXM\@Z */ MCAPI void setFallDamageAmount(float); /** - * @symbol ?setFallingBlock\@FallingBlock\@\@QEAAXAEBVBlock\@\@_N\@Z + * @symbol ?setFallingBlock\@FallingBlock\@\@QEAAXAEBVBlock\@\@_N\@Z */ MCAPI void setFallingBlock(class Block const &, bool); //private: /** - * @symbol ?_waitRemoval\@FallingBlock\@\@AEAAXXZ + * @symbol ?_waitRemoval\@FallingBlock\@\@AEAAXXZ */ MCAPI void _waitRemoval(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FallingBlockDelegate.hpp b/LiteLoader/include/llapi/mc/FallingBlockDelegate.hpp deleted file mode 100644 index b62d96e852..0000000000 --- a/LiteLoader/include/llapi/mc/FallingBlockDelegate.hpp +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @file FallingBlockDelegate.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class FallingBlockDelegate. - * - */ -class FallingBlockDelegate { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FALLINGBLOCKDELEGATE -public: - class FallingBlockDelegate& operator=(class FallingBlockDelegate const &) = delete; - FallingBlockDelegate(class FallingBlockDelegate const &) = delete; - FallingBlockDelegate() = delete; -#endif - -public: - /** - * @vftbl 0 - * @hash 642659509 - */ - virtual ~FallingBlockDelegate(); - /** - * @vftbl 1 - * @symbol ?onLand@FallingBlockDelegate@@UEAAXAEBVHeavyBlock@@AEAVIBlockSource@@AEBVBlockPos@@@Z - * @hash -1497706854 - */ - virtual void onLand(class HeavyBlock const &, class IBlockSource &, class BlockPos const &); - /** - * @vftbl 2 - * @symbol ?breakBlock@FallingBlockDelegate@@UEAAXAEAVFallingBlock@@@Z - * @hash 1468803508 - */ - virtual void breakBlock(class FallingBlock &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FallingBlockNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/FallingBlockNormalTickSystem.hpp index 611230aa0f..0cfceaa8ad 100644 --- a/LiteLoader/include/llapi/mc/FallingBlockNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/FallingBlockNormalTickSystem.hpp @@ -28,20 +28,20 @@ class FallingBlockNormalTickSystem { public: /** - * @symbol ?createSystem\@FallingBlockNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@FallingBlockNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doFallingBlockNormalTickSystem\@FallingBlockNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVITickDelegate\@\@\@Z + * @symbol ?_doFallingBlockNormalTickSystem\@FallingBlockNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVITickDelegate\@\@\@Z */ MCAPI static void _doFallingBlockNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &, class ITickDelegate &); /** - * @symbol ?_tickFallingBlockNormalTickSystem\@FallingBlockNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z + * @symbol ?_tickFallingBlockNormalTickSystem\@FallingBlockNormalTickSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@VActorOwnerComponent\@\@\@\@\@Z */ MCAPI static void _tickFallingBlockNormalTickSystem(class ViewT, class FlagComponent>, class ActorOwnerComponent>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FamilyTypeDefinition.hpp b/LiteLoader/include/llapi/mc/FamilyTypeDefinition.hpp index cfb16a17fb..645965d33d 100644 --- a/LiteLoader/include/llapi/mc/FamilyTypeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FamilyTypeDefinition.hpp @@ -31,11 +31,11 @@ struct FamilyTypeDefinition { public: /** - * @symbol ?addFamilyName\@FamilyTypeDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addFamilyName\@FamilyTypeDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addFamilyName(std::string const &); /** - * @symbol ?buildSchema\@FamilyTypeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFamilyTypeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@FamilyTypeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFamilyTypeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp b/LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp index 64fe1aabb9..751be558fa 100644 --- a/LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/FancyTreeCanopy.hpp @@ -31,14 +31,14 @@ class FancyTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FancyTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@FancyTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@FancyTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp b/LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp index aff1bc914d..63bec76ed1 100644 --- a/LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/FancyTreeTrunk.hpp @@ -38,31 +38,31 @@ class FoliageCoords { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FancyTreeTrunk(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeTrunk\@FancyTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + * @vftbl 1 + * @symbol ?placeTrunk\@FancyTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z */ virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; /** - * @vftbl 2 - * @symbol ?getTreeHeight\@FancyTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?getTreeHeight\@FancyTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z */ virtual int getTreeHeight(class Random &) const; //private: /** - * @symbol ?_checkLine\@FancyTreeTrunk\@\@AEBAHAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1AEBUTreeParams\@TreeHelper\@\@\@Z + * @symbol ?_checkLine\@FancyTreeTrunk\@\@AEBAHAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1AEBUTreeParams\@TreeHelper\@\@\@Z */ MCAPI int _checkLine(class IBlockWorldGenAPI &, class BlockPos const &, class BlockPos const &, struct TreeHelper::TreeParams const &) const; /** - * @symbol ?_placeLimb\@FancyTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?_placeLimb\@FancyTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1\@Z */ MCAPI void _placeLimb(class IBlockWorldGenAPI &, class BlockPos const &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FarmBlock.hpp b/LiteLoader/include/llapi/mc/FarmBlock.hpp index 00f864a744..c4b8b5a3c5 100644 --- a/LiteLoader/include/llapi/mc/FarmBlock.hpp +++ b/LiteLoader/include/llapi/mc/FarmBlock.hpp @@ -31,248 +31,253 @@ class FarmBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FarmBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@FarmBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@FarmBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@FarmBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@FarmBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 72 - * @symbol ?transformOnFall\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z + * @vftbl 72 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@FarmBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@FarmBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@FarmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@FarmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@FarmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@FarmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@FarmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FARMBLOCK /** - * @symbol ?canBeSilkTouched\@FarmBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@FarmBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0FarmBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FarmBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FarmBlock(std::string const &, int); /** - * @symbol ?BLOCK_AABB\@FarmBlock\@\@2VAABB\@\@A + * @symbol ?BLOCK_AABB\@FarmBlock\@\@2VAABB\@\@A */ MCAPI static class AABB BLOCK_AABB; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Feature.hpp b/LiteLoader/include/llapi/mc/Feature.hpp index 3c7b9a034b..6ffd769a62 100644 --- a/LiteLoader/include/llapi/mc/Feature.hpp +++ b/LiteLoader/include/llapi/mc/Feature.hpp @@ -31,40 +31,46 @@ class Feature : public IFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Feature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@Feature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@Feature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @vftbl 2 - * @symbol ?isValidPlacement\@IFeature\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?isValidPlacement\@IFeature\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool isValidPlacement(std::string const &); /** - * @vftbl 3 - * @symbol ?place\@WeepingVinesClusterFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@CoralHangFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FEATURE /** - * @symbol ??0Feature\@\@QEAA\@PEAVActor\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Feature(); +#endif + /** + * @symbol ??0Feature\@\@QEAA\@PEAVActor\@\@\@Z */ MCAPI Feature(class Actor *); //protected: /** - * @symbol ?_placeBlock\@Feature\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?_placeBlock\@Feature\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool _placeBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?_setManuallyPlaced\@Feature\@\@IEAAXPEAVActor\@\@\@Z + * @symbol ?_setManuallyPlaced\@Feature\@\@IEAAXPEAVActor\@\@\@Z */ MCAPI void _setManuallyPlaced(class Actor *); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeatureHelper.hpp b/LiteLoader/include/llapi/mc/FeatureHelper.hpp index 570a0242c3..7526646c01 100644 --- a/LiteLoader/include/llapi/mc/FeatureHelper.hpp +++ b/LiteLoader/include/llapi/mc/FeatureHelper.hpp @@ -22,23 +22,23 @@ namespace FeatureHelper { #undef AFTER_EXTRA /** - * @symbol ?isEmptyBlock\@FeatureHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isEmptyBlock\@FeatureHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isEmptyBlock(class IBlockWorldGenAPI const &, class BlockPos const &); /** - * @symbol ?makeFeatureRenderParams\@FeatureHelper\@\@YA?AVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAVMolangVariableMap\@\@\@Z + * @symbol ?makeFeatureRenderParams\@FeatureHelper\@\@YA?AVRenderParams\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAVMolangVariableMap\@\@\@Z */ MCAPI class RenderParams makeFeatureRenderParams(class BlockSource &, class BlockPos const &, class MolangVariableMap &); /** - * @symbol ?passesAllowList\@FeatureHelper\@\@YA_NAEBVBlock\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?passesAllowList\@FeatureHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI bool passesAllowList(class Block const &, std::vector const &); + MCAPI bool passesAllowList(class IBlockWorldGenAPI const &, class BlockPos const &, std::vector const &); /** - * @symbol ?passesAllowList\@FeatureHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?passesAllowList\@FeatureHelper\@\@YA_NAEBVBlock\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI bool passesAllowList(class IBlockWorldGenAPI const &, class BlockPos const &, std::vector const &); + MCAPI bool passesAllowList(class Block const &, std::vector const &); /** - * @symbol ?placeBlock\@FeatureHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?placeBlock\@FeatureHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI class std::optional placeBlock(class IBlockWorldGenAPI &, class BlockPos const &, class Block const &); diff --git a/LiteLoader/include/llapi/mc/FeaturePoolElement.hpp b/LiteLoader/include/llapi/mc/FeaturePoolElement.hpp index 0239f51aa3..d902114662 100644 --- a/LiteLoader/include/llapi/mc/FeaturePoolElement.hpp +++ b/LiteLoader/include/llapi/mc/FeaturePoolElement.hpp @@ -32,23 +32,23 @@ class FeaturePoolElement : public StructurePoolElement { public: /** - * @vftbl 0 - * @symbol ?getSize\@FeaturePoolElement\@\@UEBA?AVBlockPos\@\@W4Rotation\@\@\@Z + * @vftbl 0 + * @symbol ?getSize\@FeaturePoolElement\@\@UEBA?AVBlockPos\@\@W4Rotation\@\@\@Z */ virtual class BlockPos getSize(enum class Rotation) const; /** - * @vftbl 2 - * @symbol ?getJigsawMarkers\@FeaturePoolElement\@\@UEBA?AV?$vector\@VJigsawBlockInfo\@\@V?$allocator\@VJigsawBlockInfo\@\@\@std\@\@\@std\@\@VBlockPos\@\@AEAVLegacyStructureSettings\@\@PEAVBlockSource\@\@\@Z + * @vftbl 2 + * @symbol ?getJigsawMarkers\@FeaturePoolElement\@\@UEBA?AV?$vector\@VJigsawBlockInfo\@\@V?$allocator\@VJigsawBlockInfo\@\@\@std\@\@\@std\@\@VBlockPos\@\@AEAVLegacyStructureSettings\@\@PEAVBlockSource\@\@\@Z */ virtual std::vector getJigsawMarkers(class BlockPos, class LegacyStructureSettings &, class BlockSource *) const; /** - * @vftbl 7 - * @symbol ?place\@FeaturePoolElement\@\@UEBA_NAEAVBlockSource\@\@VBlockPos\@\@W4Rotation\@\@VBoundingBox\@\@AEAVRandom\@\@AEAV?$unordered_map\@VBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@1\@Z + * @vftbl 7 + * @symbol ?place\@FeaturePoolElement\@\@UEBA_NAEAVBlockSource\@\@VBlockPos\@\@W4Rotation\@\@VBoundingBox\@\@AEAVRandom\@\@AEAV?$unordered_map\@VBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@1\@Z */ virtual bool place(class BlockSource &, class BlockPos, enum class Rotation, class BoundingBox, class Random &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, class BlockPos) const; /** - * @symbol ??0FeaturePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@V?$WeakRefT\@UFeatureRefTraits\@\@\@\@\@Z + * @symbol ??0FeaturePoolElement\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@V?$WeakRefT\@UFeatureRefTraits\@\@\@\@\@Z */ MCAPI FeaturePoolElement(class gsl::not_null>, class WeakRefT); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeatureRegistry.hpp b/LiteLoader/include/llapi/mc/FeatureRegistry.hpp index 0a8d3160cd..a784353ae2 100644 --- a/LiteLoader/include/llapi/mc/FeatureRegistry.hpp +++ b/LiteLoader/include/llapi/mc/FeatureRegistry.hpp @@ -31,116 +31,116 @@ struct FeatureBinaryJsonFormat; public: /** - * @symbol ??0FeatureRegistry\@\@QEAA\@XZ + * @symbol ??0FeatureRegistry\@\@QEAA\@XZ */ MCAPI FeatureRegistry(); /** - * @symbol ?forEachFeature\@FeatureRegistry\@\@QEBAXV?$function\@$$A6AXAEBVHashedString\@\@V?$WeakRefT\@UFeatureRefTraits\@\@\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachFeature\@FeatureRegistry\@\@QEBAXV?$function\@$$A6AXAEBVHashedString\@\@V?$WeakRefT\@UFeatureRefTraits\@\@\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachFeature(class std::function)>) const; /** - * @symbol ?getLargeFeaturePasses\@FeatureRegistry\@\@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 + * @symbol ?getLargeFeaturePasses\@FeatureRegistry\@\@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 getLargeFeaturePasses() const; /** - * @symbol ?getSmallFeaturePasses\@FeatureRegistry\@\@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 + * @symbol ?getSmallFeaturePasses\@FeatureRegistry\@\@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 getSmallFeaturePasses() const; /** - * @symbol ?isFeaturePassDefined\@FeatureRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isFeaturePassDefined\@FeatureRegistry\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isFeaturePassDefined(std::string const &) const; /** - * @symbol ?loadFromDefinitions\@FeatureRegistry\@\@QEAAXAEAVIWorldRegistriesProvider\@\@AEBVResourcePackManager\@\@AEBVExperiments\@\@_N\@Z + * @symbol ?loadFromDefinitions\@FeatureRegistry\@\@QEAAXAEAVIWorldRegistriesProvider\@\@AEBVResourcePackManager\@\@AEBVExperiments\@\@_N\@Z */ MCAPI void loadFromDefinitions(class IWorldRegistriesProvider &, class ResourcePackManager const &, class Experiments const &, bool); /** - * @symbol ?lookupByName\@FeatureRegistry\@\@QEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookupByName\@FeatureRegistry\@\@QEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class WeakRefT lookupByName(std::string const &) const; /** - * @symbol ?lookupOrReserveFeature\@FeatureRegistry\@\@QEAA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookupOrReserveFeature\@FeatureRegistry\@\@QEAA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class WeakRefT lookupOrReserveFeature(std::string const &); /** - * @symbol ?reserveFeature\@FeatureRegistry\@\@QEAA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?reserveFeature\@FeatureRegistry\@\@QEAA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class WeakRefT reserveFeature(std::string const &); /** - * @symbol ?reverseLookupString\@FeatureRegistry\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVIFeature\@\@\@Z + * @symbol ?reverseLookupString\@FeatureRegistry\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVIFeature\@\@\@Z */ MCAPI std::string const & reverseLookupString(class IFeature const &); /** - * @symbol ?setLargeFeaturePasses\@FeatureRegistry\@\@QEAAXV?$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 ?setLargeFeaturePasses\@FeatureRegistry\@\@QEAAXV?$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 void setLargeFeaturePasses(std::vector); /** - * @symbol ?setSmallFeaturePasses\@FeatureRegistry\@\@QEAAXV?$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 ?setSmallFeaturePasses\@FeatureRegistry\@\@QEAAXV?$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 void setSmallFeaturePasses(std::vector); /** - * @symbol ?AFTER_SKY_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AFTER_SKY_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const AFTER_SKY_PASS; /** - * @symbol ?AFTER_SURFACE_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AFTER_SURFACE_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const AFTER_SURFACE_PASS; /** - * @symbol ?AFTER_UNDERGROUND_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AFTER_UNDERGROUND_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const AFTER_UNDERGROUND_PASS; /** - * @symbol ?BEFORE_SKY_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BEFORE_SKY_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BEFORE_SKY_PASS; /** - * @symbol ?BEFORE_SURFACE_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BEFORE_SURFACE_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BEFORE_SURFACE_PASS; /** - * @symbol ?BEFORE_UNDERGROUND_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BEFORE_UNDERGROUND_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BEFORE_UNDERGROUND_PASS; /** - * @symbol ?FINAL_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?FINAL_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const FINAL_PASS; /** - * @symbol ?FIRST_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?FIRST_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const FIRST_PASS; /** - * @symbol ?PREGENERATION_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PREGENERATION_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PREGENERATION_PASS; /** - * @symbol ?SKY_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SKY_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SKY_PASS; /** - * @symbol ?SURFACE_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SURFACE_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SURFACE_PASS; /** - * @symbol ?UNDERGROUND_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?UNDERGROUND_PASS\@FeatureRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const UNDERGROUND_PASS; //private: /** - * @symbol ?_featureNamespaceFromInput\@FeatureRegistry\@\@AEAA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + * @symbol ?_featureNamespaceFromInput\@FeatureRegistry\@\@AEAA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z */ MCAPI std::string const _featureNamespaceFromInput(std::string const &, std::string const &); /** - * @symbol ?_registerFeature\@FeatureRegistry\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIFeature\@\@U?$default_delete\@VIFeature\@\@\@std\@\@\@3\@\@Z + * @symbol ?_registerFeature\@FeatureRegistry\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIFeature\@\@U?$default_delete\@VIFeature\@\@\@std\@\@\@3\@\@Z */ MCAPI void _registerFeature(std::string const &, std::unique_ptr); /** - * @symbol ?_setupFeature\@FeatureRegistry\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVIWorldRegistriesProvider\@\@AEBVResourcePackManager\@\@AEBV23\@2AEBVSemVersion\@\@\@Z + * @symbol ?_setupFeature\@FeatureRegistry\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVIWorldRegistriesProvider\@\@AEBVResourcePackManager\@\@AEBV23\@2AEBVSemVersion\@\@\@Z */ MCAPI std::string _setupFeature(class IWorldRegistriesProvider &, class ResourcePackManager const &, std::string const &, std::string const &, class SemVersion const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp index 42244eb587..637f35af97 100644 --- a/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp +++ b/LiteLoader/include/llapi/mc/FeatureRegistryPacket.hpp @@ -30,33 +30,39 @@ class FeatureRegistryPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FeatureRegistryPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@FeatureRegistryPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@FeatureRegistryPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@FeatureRegistryPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@FeatureRegistryPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@FeatureRegistryPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@FeatureRegistryPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@FeatureRegistryPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FEATUREREGISTRYPACKET /** - * @symbol ??0FeatureRegistryPacket\@\@QEAA\@AEBV?$vector\@UFeatureBinaryJsonFormat\@FeatureRegistry\@\@V?$allocator\@UFeatureBinaryJsonFormat\@FeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FeatureRegistryPacket(); +#endif + /** + * @symbol ??0FeatureRegistryPacket\@\@QEAA\@AEBV?$vector\@UFeatureBinaryJsonFormat\@FeatureRegistry\@\@V?$allocator\@UFeatureBinaryJsonFormat\@FeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI FeatureRegistryPacket(std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeatureTerrainAdjustments.hpp b/LiteLoader/include/llapi/mc/FeatureTerrainAdjustments.hpp index 3978154d92..a06b337b23 100644 --- a/LiteLoader/include/llapi/mc/FeatureTerrainAdjustments.hpp +++ b/LiteLoader/include/llapi/mc/FeatureTerrainAdjustments.hpp @@ -36,52 +36,52 @@ struct Descriptions { public: /** - * @symbol ?at\@FeatureTerrainAdjustments\@\@QEAA?AUDescriptions\@1\@AEBVChunkPos\@\@\@Z + * @symbol ?at\@FeatureTerrainAdjustments\@\@QEAA?AUDescriptions\@1\@AEBVChunkPos\@\@\@Z */ MCAPI struct FeatureTerrainAdjustments::Descriptions at(class ChunkPos const &); /** - * @symbol ?garbageCollectDescriptions\@FeatureTerrainAdjustments\@\@QEAAXXZ + * @symbol ?garbageCollectDescriptions\@FeatureTerrainAdjustments\@\@QEAAXXZ */ MCAPI void garbageCollectDescriptions(); /** - * @symbol ?setBeardAndShaver\@FeatureTerrainAdjustments\@\@QEAA?AV?$shared_ptr\@_N\@std\@\@AEBVBoundingBox\@\@HMM\@Z + * @symbol ?setBeardAndShaver\@FeatureTerrainAdjustments\@\@QEAA?AV?$shared_ptr\@_N\@std\@\@AEBVBoundingBox\@\@HMM\@Z */ MCAPI class std::shared_ptr setBeardAndShaver(class BoundingBox const &, int, float, float); /** - * @symbol ?setBeardifier\@FeatureTerrainAdjustments\@\@QEAA?AV?$shared_ptr\@_N\@std\@\@AEBVBoundingBox\@\@H\@Z + * @symbol ?setBeardifier\@FeatureTerrainAdjustments\@\@QEAA?AV?$shared_ptr\@_N\@std\@\@AEBVBoundingBox\@\@H\@Z */ MCAPI class std::shared_ptr setBeardifier(class BoundingBox const &, int); /** - * @symbol ?setBury\@FeatureTerrainAdjustments\@\@QEAA?AV?$shared_ptr\@_N\@std\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?setBury\@FeatureTerrainAdjustments\@\@QEAA?AV?$shared_ptr\@_N\@std\@\@AEBVBoundingBox\@\@\@Z */ MCAPI class std::shared_ptr setBury(class BoundingBox const &); /** - * @symbol ??1FeatureTerrainAdjustments\@\@QEAA\@XZ + * @symbol ??1FeatureTerrainAdjustments\@\@QEAA\@XZ */ MCAPI ~FeatureTerrainAdjustments(); /** - * @symbol ?calculateContribution\@FeatureTerrainAdjustments\@\@SAMAEBUDescriptions\@1\@AEBVBlockPos\@\@M\@Z + * @symbol ?calculateContribution\@FeatureTerrainAdjustments\@\@SAMAEBUDescriptions\@1\@AEBVBlockPos\@\@M\@Z */ MCAPI static float calculateContribution(struct FeatureTerrainAdjustments::Descriptions const &, class BlockPos const &, float); /** - * @symbol ?getBeardKernel\@FeatureTerrainAdjustments\@\@SAAEAUBeardKernel\@\@XZ + * @symbol ?getBeardKernel\@FeatureTerrainAdjustments\@\@SAAEAUBeardKernel\@\@XZ */ MCAPI static struct BeardKernel & getBeardKernel(); /** - * @symbol ?shouldDoTerrainAdjustments\@FeatureTerrainAdjustments\@\@SA_NAEBUDescriptions\@1\@\@Z + * @symbol ?shouldDoTerrainAdjustments\@FeatureTerrainAdjustments\@\@SA_NAEBUDescriptions\@1\@\@Z */ MCAPI static bool shouldDoTerrainAdjustments(struct FeatureTerrainAdjustments::Descriptions const &); //private: /** - * @symbol ?_insertDescriptions\@FeatureTerrainAdjustments\@\@AEAA?AV?$shared_ptr\@_N\@std\@\@AEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@3\@$$QEAV?$function\@$$A6AXAEAUDescriptions\@FeatureTerrainAdjustments\@\@V?$weak_ptr\@_N\@std\@\@\@Z\@3\@\@Z + * @symbol ?_insertDescriptions\@FeatureTerrainAdjustments\@\@AEAA?AV?$shared_ptr\@_N\@std\@\@AEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@3\@$$QEAV?$function\@$$A6AXAEAUDescriptions\@FeatureTerrainAdjustments\@\@V?$weak_ptr\@_N\@std\@\@\@Z\@3\@\@Z */ MCAPI class std::shared_ptr _insertDescriptions(std::vector const &, class std::function)> &&); private: /** - * @symbol ?mBeardKernel\@FeatureTerrainAdjustments\@\@0UBeardKernel\@\@A + * @symbol ?mBeardKernel\@FeatureTerrainAdjustments\@\@0UBeardKernel\@\@A */ MCAPI static struct BeardKernel mBeardKernel; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeatureTerrainAdjustmentsUtil.hpp b/LiteLoader/include/llapi/mc/FeatureTerrainAdjustmentsUtil.hpp index d5b279f5a1..c198e50681 100644 --- a/LiteLoader/include/llapi/mc/FeatureTerrainAdjustmentsUtil.hpp +++ b/LiteLoader/include/llapi/mc/FeatureTerrainAdjustmentsUtil.hpp @@ -22,7 +22,7 @@ namespace FeatureTerrainAdjustmentsUtil { #undef AFTER_EXTRA /** - * @symbol ?_findIntersectingChunks\@FeatureTerrainAdjustmentsUtil\@\@YA?AV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0\@Z + * @symbol ?_findIntersectingChunks\@FeatureTerrainAdjustmentsUtil\@\@YA?AV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@0\@Z */ MCAPI std::vector _findIntersectingChunks(class BlockPos const &, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/FeatureToggles.hpp b/LiteLoader/include/llapi/mc/FeatureToggles.hpp index adf7246a7a..a266c9647f 100644 --- a/LiteLoader/include/llapi/mc/FeatureToggles.hpp +++ b/LiteLoader/include/llapi/mc/FeatureToggles.hpp @@ -29,57 +29,63 @@ class FeatureToggles { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FEATURETOGGLES /** - * @symbol ??0FeatureToggles\@\@QEAA\@AEAVAppPlatform\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FeatureToggles(); +#endif + /** + * @symbol ??0FeatureToggles\@\@QEAA\@AEAVAppPlatform\@\@\@Z */ MCAPI FeatureToggles(class AppPlatform &); /** - * @symbol ?get\@FeatureToggles\@\@QEAAPEAVOption\@\@W4FeatureOptionID\@\@\@Z + * @symbol ?get\@FeatureToggles\@\@QEAAPEAVOption\@\@W4FeatureOptionID\@\@\@Z */ MCAPI class Option * get(enum class FeatureOptionID); /** - * @symbol ?isEnabled\@FeatureToggles\@\@QEBA_NW4FeatureOptionID\@\@\@Z + * @symbol ?isEnabled\@FeatureToggles\@\@QEBA_NW4FeatureOptionID\@\@\@Z */ MCAPI bool isEnabled(enum class FeatureOptionID) const; //private: /** - * @symbol ?_getDisableIfOtherOptionDisabledSetupCallback\@FeatureToggles\@\@AEBA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@W4FeatureOptionID\@\@\@Z + * @symbol ?_getDisableIfOtherOptionDisabledSetupCallback\@FeatureToggles\@\@AEBA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@W4FeatureOptionID\@\@\@Z */ MCAPI class std::function _getDisableIfOtherOptionDisabledSetupCallback(enum class FeatureOptionID) const; /** - * @symbol ?_getDisabledIfOptionExpectationsNotMetSetupCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@0\@Z + * @symbol ?_getDisabledIfOptionExpectationsNotMetSetupCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@0\@Z */ MCAPI class std::function _getDisabledIfOptionExpectationsNotMetSetupCallback(std::vector, std::vector); /** - * @symbol ?_getDisabledIfOtherOptionsEnabledSetupCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@\@Z + * @symbol ?_getDisabledIfOtherOptionsEnabledSetupCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEAVOption\@\@\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@\@Z */ MCAPI class std::function _getDisabledIfOtherOptionsEnabledSetupCallback(std::vector); /** - * @symbol ?_getLockIfInGameOrOptionExpectationsNotMetLockCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEA_N\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@0\@Z + * @symbol ?_getLockIfInGameOrOptionExpectationsNotMetLockCallback\@FeatureToggles\@\@AEAA?AV?$function\@$$A6AXAEA_N\@Z\@std\@\@V?$vector\@W4FeatureOptionID\@\@V?$allocator\@W4FeatureOptionID\@\@\@std\@\@\@3\@0\@Z */ MCAPI class std::function _getLockIfInGameOrOptionExpectationsNotMetLockCallback(std::vector, std::vector); /** - * @symbol ?_initialize\@FeatureToggles\@\@AEAAXAEAVAppPlatform\@\@\@Z + * @symbol ?_initialize\@FeatureToggles\@\@AEAAXAEAVAppPlatform\@\@\@Z */ MCAPI void _initialize(class AppPlatform &); /** - * @symbol ?_registerFeature\@FeatureToggles\@\@AEAAXW4FeatureOptionTabID\@\@W4FeatureOptionID\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2_N1V?$function\@$$A6AXAEAVOption\@\@\@Z\@5\@V?$function\@$$A6AXAEA_N\@Z\@5\@\@Z + * @symbol ?_registerFeature\@FeatureToggles\@\@AEAAXW4FeatureOptionTabID\@\@W4FeatureOptionID\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2_N1V?$function\@$$A6AXAEAVOption\@\@\@Z\@5\@V?$function\@$$A6AXAEA_N\@Z\@5\@\@Z */ MCAPI void _registerFeature(enum class FeatureOptionTabID, enum class FeatureOptionID, std::string const &, std::string const &, bool, enum class FeatureOptionID, class std::function, class std::function); /** - * @symbol ?_registerFeatures\@FeatureToggles\@\@AEAAXXZ + * @symbol ?_registerFeatures\@FeatureToggles\@\@AEAAXXZ */ MCAPI void _registerFeatures(); /** - * @symbol ?_setupDependencies\@FeatureToggles\@\@AEAAXXZ + * @symbol ?_setupDependencies\@FeatureToggles\@\@AEAAXXZ */ MCAPI void _setupDependencies(); private: /** - * @symbol ?mFeatureToggles\@FeatureToggles\@\@0V?$unique_ptr\@VFeatureToggles\@\@U?$default_delete\@VFeatureToggles\@\@\@std\@\@\@std\@\@A + * @symbol ?mFeatureToggles\@FeatureToggles\@\@0V?$unique_ptr\@VFeatureToggles\@\@U?$default_delete\@VFeatureToggles\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mFeatureToggles; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp b/LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp index e344de3d8a..16aa8494cc 100644 --- a/LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp +++ b/LiteLoader/include/llapi/mc/FeatureTypeFactory.hpp @@ -30,12 +30,12 @@ class FeatureTypeFactory { public: /** - * @symbol ??0FeatureTypeFactory\@\@QEAA\@XZ + * @symbol ??0FeatureTypeFactory\@\@QEAA\@XZ */ MCAPI FeatureTypeFactory(); /** - * @symbol ?processFeature\@FeatureTypeFactory\@\@QEBAXAEAVIWorldRegistriesProvider\@\@AEBVResourcePackManager\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?processFeature\@FeatureTypeFactory\@\@QEBAXAEAVIWorldRegistriesProvider\@\@AEBVResourcePackManager\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI void processFeature(class IWorldRegistriesProvider &, class ResourcePackManager const &, std::string const &, class Json::Value &, class SemVersion const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FeedItem.hpp b/LiteLoader/include/llapi/mc/FeedItem.hpp index f18c6f08ec..a548dbcb9b 100644 --- a/LiteLoader/include/llapi/mc/FeedItem.hpp +++ b/LiteLoader/include/llapi/mc/FeedItem.hpp @@ -34,19 +34,19 @@ struct Effect { public: /** - * @symbol ??0FeedItem\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0FeedItem\@\@QEAA\@AEBU0\@\@Z */ MCAPI FeedItem(struct FeedItem const &); /** - * @symbol ?addEffect\@FeedItem\@\@QEAAXAEBUEffect\@1\@\@Z + * @symbol ?addEffect\@FeedItem\@\@QEAAXAEBUEffect\@1\@\@Z */ MCAPI void addEffect(struct FeedItem::Effect const &); /** - * @symbol ??4FeedItem\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4FeedItem\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct FeedItem & operator=(struct FeedItem &&); /** - * @symbol ??1FeedItem\@\@QEAA\@XZ + * @symbol ??1FeedItem\@\@QEAA\@XZ */ MCAPI ~FeedItem(); diff --git a/LiteLoader/include/llapi/mc/FeelingHappyGoal.hpp b/LiteLoader/include/llapi/mc/FeelingHappyGoal.hpp new file mode 100644 index 0000000000..28f25ba1cb --- /dev/null +++ b/LiteLoader/include/llapi/mc/FeelingHappyGoal.hpp @@ -0,0 +1,43 @@ +/** + * @file FeelingHappyGoal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BaseTimedActorFlagGoal.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class FeelingHappyGoal : public BaseTimedActorFlagGoal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FEELINGHAPPYGOAL +public: + class FeelingHappyGoal& operator=(class FeelingHappyGoal const &) = delete; + FeelingHappyGoal(class FeelingHappyGoal const &) = delete; + FeelingHappyGoal() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @symbol ??0FeelingHappyGoal\@\@QEAA\@AEAVMob\@\@\@Z + */ + MCAPI FeelingHappyGoal(class Mob &); + +}; diff --git a/LiteLoader/include/llapi/mc/FenceBlock.hpp b/LiteLoader/include/llapi/mc/FenceBlock.hpp index 86e60d1467..3fa8ab129c 100644 --- a/LiteLoader/include/llapi/mc/FenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceBlock.hpp @@ -31,281 +31,286 @@ class FenceBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FenceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@FenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@FenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@FenceBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@FenceBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@FenceBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@FenceBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@FenceBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@FenceBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@FenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@FenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@FenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@FenceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@FenceBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@FenceBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@FenceBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@FenceBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@FenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@FenceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@FenceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@FenceBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 185 + * @symbol ?getMapColor\@FenceBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@FenceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@FenceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FENCEBLOCK /** - * @symbol ?canBeSilkTouched\@FenceBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@FenceBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isFenceBlock\@FenceBlock\@\@UEBA_NXZ + * @symbol ?isFenceBlock\@FenceBlock\@\@UEBA_NXZ */ MCVAPI bool isFenceBlock() const; #endif /** - * @symbol ??0FenceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0FenceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI FenceBlock(std::string const &, int, class Material const &); /** - * @symbol ?fetchPathableNeighbors\@FenceBlock\@\@QEBAXAEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@\@Z + * @symbol ?fetchPathableNeighbors\@FenceBlock\@\@QEBAXAEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@\@Z */ MCAPI void fetchPathableNeighbors(std::vector &, class BlockSource &, class BlockPos const &, class Vec3 const &) const; @@ -313,8 +318,8 @@ class FenceBlock : public BlockLegacy { private: /** - * @symbol ?FENCE_DOESNT_BREAK_FALLING_BLOCK_VERSION\@FenceBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?FENCE_DOESNT_BREAK_FALLING_BLOCK_VERSION\@FenceBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const FENCE_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp index 7f76237f44..6f14b502ad 100644 --- a/LiteLoader/include/llapi/mc/FenceGateBlock.hpp +++ b/LiteLoader/include/llapi/mc/FenceGateBlock.hpp @@ -31,279 +31,284 @@ class FenceGateBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FenceGateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@FenceGateBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@FenceGateBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@FenceGateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@FenceGateBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@FenceGateBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@FenceGateBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 85 - * @symbol ?ignoreEntitiesOnPistonMove\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 85 + * @symbol ?ignoreEntitiesOnPistonMove\@FenceGateBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool ignoreEntitiesOnPistonMove(class Block const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@FenceGateBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@FenceGateBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@FenceGateBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@FenceGateBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@FenceGateBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FENCEGATEBLOCK /** - * @symbol ?isFenceGateBlock\@FenceGateBlock\@\@UEBA_NXZ + * @symbol ?isFenceGateBlock\@FenceGateBlock\@\@UEBA_NXZ */ MCVAPI bool isFenceGateBlock() const; /** - * @symbol ?isInteractiveBlock\@FenceGateBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@FenceGateBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0FenceGateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4WoodType\@\@\@Z + * @symbol ??0FenceGateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4WoodType\@\@\@Z */ MCAPI FenceGateBlock(std::string const &, int, enum class WoodType); /** - * @symbol ?resolveIsInWall\@FenceGateBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?resolveIsInWall\@FenceGateBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void resolveIsInWall(class BlockSource &, class BlockPos const &) const; //private: /** - * @symbol ?_onOpenChanged\@FenceGateBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_onOpenChanged\@FenceGateBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _onOpenChanged(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_setOpen\@FenceGateBlock\@\@AEBAXAEAVBlockSource\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@AEBVBlockPos\@\@PEAVPlayer\@\@_N\@Z + * @symbol ?_setOpen\@FenceGateBlock\@\@AEBAXAEAVBlockSource\@\@V?$not_null\@PEBVBlock\@\@\@gsl\@\@AEBVBlockPos\@\@PEAVPlayer\@\@_N\@Z */ MCAPI void _setOpen(class BlockSource &, class gsl::not_null, class BlockPos const &, class Player *, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FertilizeFarmBlockDefinition.hpp b/LiteLoader/include/llapi/mc/FertilizeFarmBlockDefinition.hpp index 3dc5ca725f..3764e31dae 100644 --- a/LiteLoader/include/llapi/mc/FertilizeFarmBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FertilizeFarmBlockDefinition.hpp @@ -28,16 +28,16 @@ class FertilizeFarmBlockDefinition { public: /** - * @symbol ??0FertilizeFarmBlockDefinition\@\@QEAA\@XZ + * @symbol ??0FertilizeFarmBlockDefinition\@\@QEAA\@XZ */ MCAPI FertilizeFarmBlockDefinition(); /** - * @symbol ?initialize\@FertilizeFarmBlockDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVFertilizeFarmBlockGoal\@\@\@Z + * @symbol ?initialize\@FertilizeFarmBlockDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVFertilizeFarmBlockGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class FertilizeFarmBlockGoal &) const; /** - * @symbol ?buildSchema\@FertilizeFarmBlockDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VFertilizeFarmBlockDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@FertilizeFarmBlockDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VFertilizeFarmBlockDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FertilizeFarmBlockGoal.hpp b/LiteLoader/include/llapi/mc/FertilizeFarmBlockGoal.hpp index 76462e4c69..76f84e4765 100644 --- a/LiteLoader/include/llapi/mc/FertilizeFarmBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/FertilizeFarmBlockGoal.hpp @@ -29,74 +29,74 @@ class FertilizeFarmBlockGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FertilizeFarmBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FertilizeFarmBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FertilizeFarmBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FertilizeFarmBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FertilizeFarmBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FertilizeFarmBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FertilizeFarmBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FertilizeFarmBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FertilizeFarmBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FertilizeFarmBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FertilizeFarmBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FertilizeFarmBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FertilizeFarmBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@FertilizeFarmBlockGoal\@\@MEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@FertilizeFarmBlockGoal\@\@MEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @symbol ??0FertilizeFarmBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0FertilizeFarmBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI FertilizeFarmBlockGoal(class Mob &); //protected: /** - * @symbol ?tryFertilizeCrop\@FertilizeFarmBlockGoal\@\@IEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryFertilizeCrop\@FertilizeFarmBlockGoal\@\@IEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool tryFertilizeCrop(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_findFertilizer\@FertilizeFarmBlockGoal\@\@AEAA_NXZ + * @symbol ?_findFertilizer\@FertilizeFarmBlockGoal\@\@AEAA_NXZ */ MCAPI bool _findFertilizer(); @@ -104,4 +104,4 @@ class FertilizeFarmBlockGoal : public BaseMoveToBlockGoal { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FertilizerItem.hpp b/LiteLoader/include/llapi/mc/FertilizerItem.hpp index 704cc29777..01a7f341a7 100644 --- a/LiteLoader/include/llapi/mc/FertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/FertilizerItem.hpp @@ -32,102 +32,108 @@ class FertilizerItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FertilizerItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @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 + * @vftbl 10 + * @symbol ?executeEvent\@FertilizerItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(class ItemStackBase &, std::string const &, class RenderParams &) const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 21 - * @symbol ?isFertilizer\@FertilizerItem\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isFertilizer\@FertilizerItem\@\@UEBA_NXZ */ virtual bool isFertilizer() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@FertilizerItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@FertilizerItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 - * @symbol ?_useOn\@FertilizerItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@FertilizerItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FERTILIZERITEM /** - * @symbol ??0FertilizerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4FertilizerType\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FertilizerItem(); +#endif + /** + * @symbol ??0FertilizerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4FertilizerType\@\@\@Z */ MCAPI FertilizerItem(std::string const &, int, enum class FertilizerType); /** - * @symbol ?getFertilizerType\@FertilizerItem\@\@QEBA?AW4FertilizerType\@\@XZ + * @symbol ?getFertilizerType\@FertilizerItem\@\@QEBA?AW4FertilizerType\@\@XZ */ MCAPI enum class FertilizerType getFertilizerType() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FileAccessTransforms.hpp b/LiteLoader/include/llapi/mc/FileAccessTransforms.hpp index b2c2dcc7b0..bd50e822a1 100644 --- a/LiteLoader/include/llapi/mc/FileAccessTransforms.hpp +++ b/LiteLoader/include/llapi/mc/FileAccessTransforms.hpp @@ -31,13 +31,13 @@ class FileAccessTransforms { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILEACCESSTRANSFORMS /** - * @symbol ?readTransform\@FileAccessTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z + * @symbol ?readTransform\@FileAccessTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z */ MCVAPI bool readTransform(std::vector &) const; /** - * @symbol ?writeTransform\@FileAccessTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z + * @symbol ?writeTransform\@FileAccessTransforms\@\@UEBA_NAEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z */ MCVAPI bool writeTransform(std::vector &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FileArchiver.hpp b/LiteLoader/include/llapi/mc/FileArchiver.hpp index 6f58061675..d8dbf64724 100644 --- a/LiteLoader/include/llapi/mc/FileArchiver.hpp +++ b/LiteLoader/include/llapi/mc/FileArchiver.hpp @@ -39,56 +39,56 @@ struct Result { public: /** - * @symbol ??0FileArchiver\@\@QEAA\@AEAVScheduler\@\@AEAVILevelListCache\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@AEAVIResourcePackRepository\@\@_NV?$unique_ptr\@VIWorldConverter\@FileArchiver\@\@U?$default_delete\@VIWorldConverter\@FileArchiver\@\@\@std\@\@\@std\@\@V?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@4\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@4\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@7\@\@Z + * @symbol ??0FileArchiver\@\@QEAA\@AEAVScheduler\@\@AEAVILevelListCache\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@AEAVIResourcePackRepository\@\@_NV?$unique_ptr\@VIWorldConverter\@FileArchiver\@\@U?$default_delete\@VIWorldConverter\@FileArchiver\@\@\@std\@\@\@std\@\@V?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@4\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@4\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@7\@\@Z */ MCAPI FileArchiver(class Scheduler &, class ILevelListCache &, class gsl::not_null> const &, class IResourcePackRepository &, bool, std::unique_ptr, class gsl::not_null>, class gsl::not_null>, class std::function); /** - * @symbol ?exportPack\@FileArchiver\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@UResult\@FileArchiver\@\@\@Threading\@Bedrock\@\@\@std\@\@AEBVPath\@Core\@\@0\@Z + * @symbol ?exportPack\@FileArchiver\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@UResult\@FileArchiver\@\@\@Threading\@Bedrock\@\@\@std\@\@AEBVPath\@Core\@\@0\@Z */ MCAPI class std::shared_ptr> exportPack(class Core::Path const &, class Core::Path const &); /** - * @symbol ?exportPack\@FileArchiver\@\@QEAAXAEBVPath\@Core\@\@0V?$function\@$$A6AXAEAUResult\@FileArchiver\@\@\@Z\@std\@\@\@Z + * @symbol ?exportPack\@FileArchiver\@\@QEAAXAEBVPath\@Core\@\@0V?$function\@$$A6AXAEAUResult\@FileArchiver\@\@\@Z\@std\@\@\@Z */ MCAPI void exportPack(class Core::Path const &, class Core::Path const &, class std::function); /** - * @symbol ?setWorldConverter\@FileArchiver\@\@QEAAXV?$unique_ptr\@VIWorldConverter\@FileArchiver\@\@U?$default_delete\@VIWorldConverter\@FileArchiver\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setWorldConverter\@FileArchiver\@\@QEAAXV?$unique_ptr\@VIWorldConverter\@FileArchiver\@\@U?$default_delete\@VIWorldConverter\@FileArchiver\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setWorldConverter(std::unique_ptr); /** - * @symbol ?EXTENSION_ADDON\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXTENSION_ADDON\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXTENSION_ADDON; /** - * @symbol ?EXTENSION_EDITOR_ADDON\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXTENSION_EDITOR_ADDON\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXTENSION_EDITOR_ADDON; /** - * @symbol ?EXTENSION_PROJECT\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXTENSION_PROJECT\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXTENSION_PROJECT; /** - * @symbol ?EXTENSION_RESOURCEPACK\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXTENSION_RESOURCEPACK\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXTENSION_RESOURCEPACK; /** - * @symbol ?EXTENSION_TEMPLATE\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXTENSION_TEMPLATE\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXTENSION_TEMPLATE; /** - * @symbol ?EXTENSION_VANILLA\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EXTENSION_VANILLA\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EXTENSION_VANILLA; /** - * @symbol ?IMPORT_LOCK_FILE\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IMPORT_LOCK_FILE\@FileArchiver\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const IMPORT_LOCK_FILE; //private: /** - * @symbol ?_printLevelResultMessage\@FileArchiver\@\@AEAAXAEBUResult\@1\@\@Z + * @symbol ?_printLevelResultMessage\@FileArchiver\@\@AEAAXAEBUResult\@1\@\@Z */ MCAPI void _printLevelResultMessage(struct FileArchiver::Result const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FileChunkInfo.hpp b/LiteLoader/include/llapi/mc/FileChunkInfo.hpp index dad2c2e702..4d9e071356 100644 --- a/LiteLoader/include/llapi/mc/FileChunkInfo.hpp +++ b/LiteLoader/include/llapi/mc/FileChunkInfo.hpp @@ -30,15 +30,15 @@ struct FileChunkInfo { public: /** - * @symbol ??0FileChunkInfo\@\@QEAA\@H_K0\@Z + * @symbol ??0FileChunkInfo\@\@QEAA\@H_K0\@Z */ MCAPI FileChunkInfo(int, unsigned __int64, unsigned __int64); /** - * @symbol ?isValid\@FileChunkInfo\@\@QEBA_NXZ + * @symbol ?isValid\@FileChunkInfo\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?size\@FileChunkInfo\@\@QEBAHXZ + * @symbol ?size\@FileChunkInfo\@\@QEBAHXZ */ MCAPI int size() const; diff --git a/LiteLoader/include/llapi/mc/FileChunkManager.hpp b/LiteLoader/include/llapi/mc/FileChunkManager.hpp index 3eb78fcc19..ab93662119 100644 --- a/LiteLoader/include/llapi/mc/FileChunkManager.hpp +++ b/LiteLoader/include/llapi/mc/FileChunkManager.hpp @@ -29,40 +29,40 @@ class FileChunkManager { public: /** - * @symbol ??0FileChunkManager\@\@QEAA\@XZ + * @symbol ??0FileChunkManager\@\@QEAA\@XZ */ MCAPI FileChunkManager(); /** - * @symbol ?getChunkInfo\@FileChunkManager\@\@QEBA?AUFileChunkInfo\@\@H\@Z + * @symbol ?getChunkInfo\@FileChunkManager\@\@QEBA?AUFileChunkInfo\@\@H\@Z */ MCAPI struct FileChunkInfo getChunkInfo(int) const; /** - * @symbol ?getChunks\@FileChunkManager\@\@QEBAAEBV?$vector\@UFileChunkInfo\@\@V?$allocator\@UFileChunkInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getChunks\@FileChunkManager\@\@QEBAAEBV?$vector\@UFileChunkInfo\@\@V?$allocator\@UFileChunkInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getChunks() const; /** - * @symbol ?getTotalNumberOfChunks\@FileChunkManager\@\@QEAAHXZ + * @symbol ?getTotalNumberOfChunks\@FileChunkManager\@\@QEAAHXZ */ MCAPI int getTotalNumberOfChunks(); /** - * @symbol ?reset\@FileChunkManager\@\@QEAAXXZ + * @symbol ?reset\@FileChunkManager\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?reset\@FileChunkManager\@\@QEAAX_KI\@Z + * @symbol ?reset\@FileChunkManager\@\@QEAAX_KI\@Z */ MCAPI void reset(unsigned __int64, unsigned int); /** - * @symbol ??1FileChunkManager\@\@QEAA\@XZ + * @symbol ??1FileChunkManager\@\@QEAA\@XZ */ MCAPI ~FileChunkManager(); //private: /** - * @symbol ?_generateChunkInfo\@FileChunkManager\@\@AEAAXXZ + * @symbol ?_generateChunkInfo\@FileChunkManager\@\@AEAAXXZ */ MCAPI void _generateChunkInfo(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FileInfo.hpp b/LiteLoader/include/llapi/mc/FileInfo.hpp index 8981fde9b0..502d87c90e 100644 --- a/LiteLoader/include/llapi/mc/FileInfo.hpp +++ b/LiteLoader/include/llapi/mc/FileInfo.hpp @@ -29,11 +29,11 @@ struct FileInfo { public: /** - * @symbol ??0FileInfo\@\@QEAA\@VPath\@Core\@\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0FileInfo\@\@QEAA\@VPath\@Core\@\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI FileInfo(class Core::Path, int, std::string); /** - * @symbol ??1FileInfo\@\@QEAA\@XZ + * @symbol ??1FileInfo\@\@QEAA\@XZ */ MCAPI ~FileInfo(); diff --git a/LiteLoader/include/llapi/mc/FileSecureStorage.hpp b/LiteLoader/include/llapi/mc/FileSecureStorage.hpp index 1dc382ae28..475abc6fdc 100644 --- a/LiteLoader/include/llapi/mc/FileSecureStorage.hpp +++ b/LiteLoader/include/llapi/mc/FileSecureStorage.hpp @@ -31,56 +31,56 @@ class FileSecureStorage { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FileSecureStorage(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?add\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 1 + * @symbol ?add\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual bool add(std::string const &, std::string const &); /** - * @vftbl 2 - * @symbol ?addOrUpdate\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 2 + * @symbol ?addOrUpdate\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual bool addOrUpdate(std::string const &, std::string const &); /** - * @vftbl 3 - * @symbol ?remove\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?remove\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool remove(std::string const &); /** - * @vftbl 4 - * @symbol ?get\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z + * @vftbl 4 + * @symbol ?get\@FileSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ virtual bool get(std::string const &, std::string &); /** - * @symbol ??0FileSecureStorage\@\@QEAA\@AEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@2\@PEAVISecureStorageKeySystem\@\@AEBVPath\@2\@PEAVStorageSystem\@0\@\@Z + * @symbol ??0FileSecureStorage\@\@QEAA\@AEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@2\@PEAVISecureStorageKeySystem\@\@AEBVPath\@2\@PEAVStorageSystem\@0\@\@Z */ MCAPI FileSecureStorage(class Core::PathBuffer const &, class Core::PathBuffer> const &, class ISecureStorageKeySystem *, class Core::Path const &, class FileSecureStorage::StorageSystem *); //protected: /** - * @symbol ?_init\@FileSecureStorage\@\@IEAA_N_N\@Z + * @symbol ?_init\@FileSecureStorage\@\@IEAA_N_N\@Z */ MCAPI bool _init(bool); //private: /** - * @symbol ?_contentKeyObfuscator\@FileSecureStorage\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + * @symbol ?_contentKeyObfuscator\@FileSecureStorage\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z */ MCAPI std::string _contentKeyObfuscator(std::string const &, std::string const &); /** - * @symbol ?_getSecureStorageKey\@FileSecureStorage\@\@AEBA?AVSecureStorageKey\@\@XZ + * @symbol ?_getSecureStorageKey\@FileSecureStorage\@\@AEBA?AVSecureStorageKey\@\@XZ */ MCAPI class SecureStorageKey _getSecureStorageKey() const; /** - * @symbol ?_initalizeSymmetricEncyrption\@FileSecureStorage\@\@AEAAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?_initalizeSymmetricEncyrption\@FileSecureStorage\@\@AEAAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void _initalizeSymmetricEncyrption(std::string &, bool); /** - * @symbol ?_rebuildSecureStorageFile\@FileSecureStorage\@\@AEAAXXZ + * @symbol ?_rebuildSecureStorageFile\@FileSecureStorage\@\@AEAAXXZ */ MCAPI void _rebuildSecureStorageFile(); @@ -88,4 +88,4 @@ class FileSecureStorage { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp b/LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp index 95e38b2cb3..fa8a9bbcba 100644 --- a/LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/FileSystemFileAccess.hpp @@ -31,48 +31,48 @@ class FileSystemFileAccess { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FileSystemFileAccess(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fopen\@FileSystemFileAccess\@\@UEAAPEAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?fopen\@FileSystemFileAccess\@\@UEAAPEAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void * fopen(class Core::Path const &, std::string const &); /** - * @vftbl 2 - * @symbol ?fclose\@FileSystemFileAccess\@\@UEAAHPEAX\@Z + * @vftbl 2 + * @symbol ?fclose\@FileSystemFileAccess\@\@UEAAHPEAX\@Z */ virtual int fclose(void *); /** - * @vftbl 3 - * @symbol ?fseek\@FileSystemFileAccess\@\@UEAAHPEAX_JH\@Z + * @vftbl 3 + * @symbol ?fseek\@FileSystemFileAccess\@\@UEAAHPEAX_JH\@Z */ virtual int fseek(void *, __int64, int); /** - * @vftbl 4 - * @symbol ?ftell\@FileSystemFileAccess\@\@UEAA_JPEAX\@Z + * @vftbl 4 + * @symbol ?ftell\@FileSystemFileAccess\@\@UEAA_JPEAX\@Z */ virtual __int64 ftell(void *); /** - * @vftbl 5 - * @symbol ?getReadInterface\@FileSystemFileAccess\@\@UEBAPEBVIFileReadAccess\@\@XZ + * @vftbl 5 + * @symbol ?getReadInterface\@FileSystemFileAccess\@\@UEBAPEBVIFileReadAccess\@\@XZ */ virtual class IFileReadAccess const * getReadInterface() const; /** - * @vftbl 6 - * @symbol ?getWriteInterface\@FileSystemFileAccess\@\@UEAAPEAVIFileWriteAccess\@\@XZ + * @vftbl 6 + * @symbol ?getWriteInterface\@FileSystemFileAccess\@\@UEAAPEAVIFileWriteAccess\@\@XZ */ virtual class IFileWriteAccess * getWriteInterface(); /** - * @vftbl 7 - * @symbol ?unload\@FileSystemFileAccess\@\@UEAAXXZ + * @vftbl 7 + * @symbol ?unload\@FileSystemFileAccess\@\@UEAAXXZ */ virtual void unload(); /** - * @symbol ??0FileSystemFileAccess\@\@QEAA\@W4FileSystemMode\@\@\@Z + * @symbol ??0FileSystemFileAccess\@\@QEAA\@W4FileSystemMode\@\@\@Z */ MCAPI FileSystemFileAccess(enum class FileSystemMode); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FileUploadManager.hpp b/LiteLoader/include/llapi/mc/FileUploadManager.hpp index f84a2b3bcd..b3ed479657 100644 --- a/LiteLoader/include/llapi/mc/FileUploadManager.hpp +++ b/LiteLoader/include/llapi/mc/FileUploadManager.hpp @@ -32,64 +32,70 @@ class FileUploadManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FileUploadManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getUploadProgress\@FileUploadManager\@\@UEBAMXZ + * @vftbl 1 + * @symbol ?getUploadProgress\@FileUploadManager\@\@UEBAMXZ */ virtual float getUploadProgress() const; /** - * @vftbl 2 - * @symbol ?uploadFileToRealmStorage\@ResourcePackFileUploadManager\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@H0\@Z + * @vftbl 2 + * @symbol ?uploadFileToRealmStorage\@ResourcePackFileUploadManager\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@H0\@Z */ virtual void uploadFileToRealmStorage(std::string const &, class Core::Path const &, int, std::string const &) = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILEUPLOADMANAGER /** - * @symbol ??0FileUploadManager\@\@QEAA\@AEAVTaskGroup\@\@V?$shared_ptr\@VIFileChunkUploader\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FileUploadManager(); +#endif + /** + * @symbol ??0FileUploadManager\@\@QEAA\@AEAVTaskGroup\@\@V?$shared_ptr\@VIFileChunkUploader\@\@\@std\@\@\@Z */ MCAPI FileUploadManager(class TaskGroup &, class std::shared_ptr); /** - * @symbol ?addCallbackQueue\@FileUploadManager\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?addCallbackQueue\@FileUploadManager\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void addCallbackQueue(class std::function); /** - * @symbol ?setFailed\@FileUploadManager\@\@QEAAXW4UploadError\@\@\@Z + * @symbol ?setFailed\@FileUploadManager\@\@QEAAXW4UploadError\@\@\@Z */ MCAPI void setFailed(enum class UploadError); /** - * @symbol ?setUseStream\@FileUploadManager\@\@QEAAX_N\@Z + * @symbol ?setUseStream\@FileUploadManager\@\@QEAAX_N\@Z */ MCAPI void setUseStream(bool); /** - * @symbol ?update\@FileUploadManager\@\@QEAAXXZ + * @symbol ?update\@FileUploadManager\@\@QEAAXXZ */ MCAPI void update(); /** - * @symbol ?uploadChunk\@FileUploadManager\@\@QEAAXH\@Z + * @symbol ?uploadChunk\@FileUploadManager\@\@QEAAXH\@Z */ MCAPI void uploadChunk(int); /** - * @symbol ?uploadFile\@FileUploadManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@_NAEBVValue\@Json\@\@\@Z + * @symbol ?uploadFile\@FileUploadManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@_NAEBVValue\@Json\@\@\@Z */ MCAPI void uploadFile(std::string const &, class Core::Path const &, bool, class Json::Value const &); //protected: /** - * @symbol ?_generateMultiPartHelper\@FileUploadManager\@\@IEAAXXZ + * @symbol ?_generateMultiPartHelper\@FileUploadManager\@\@IEAAXXZ */ MCAPI void _generateMultiPartHelper(); /** - * @symbol ?_resumeUpload\@FileUploadManager\@\@IEAAXXZ + * @symbol ?_resumeUpload\@FileUploadManager\@\@IEAAXXZ */ MCAPI void _resumeUpload(); /** - * @symbol ?_uploadChunk\@FileUploadManager\@\@IEAAXAEBUFileChunkInfo\@\@\@Z + * @symbol ?_uploadChunk\@FileUploadManager\@\@IEAAXAEBUFileChunkInfo\@\@\@Z */ MCAPI void _uploadChunk(struct FileChunkInfo const &); /** - * @symbol ?_uploadStream\@FileUploadManager\@\@IEAAXXZ + * @symbol ?_uploadStream\@FileUploadManager\@\@IEAAXXZ */ MCAPI void _uploadStream(); @@ -97,14 +103,14 @@ class FileUploadManager { protected: /** - * @symbol ?CHUNK_UPLOAD_SIZE\@FileUploadManager\@\@1HB + * @symbol ?CHUNK_UPLOAD_SIZE\@FileUploadManager\@\@1HB */ MCAPI static int const CHUNK_UPLOAD_SIZE; private: /** - * @symbol ?BOUNDARY\@FileUploadManager\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BOUNDARY\@FileUploadManager\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BOUNDARY; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FillCommand.hpp b/LiteLoader/include/llapi/mc/FillCommand.hpp index 2426db8bf3..56d6d576cb 100644 --- a/LiteLoader/include/llapi/mc/FillCommand.hpp +++ b/LiteLoader/include/llapi/mc/FillCommand.hpp @@ -31,18 +31,18 @@ class FillCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FillCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@FillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@FillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@FillCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@FillCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FillContainerFunction.hpp b/LiteLoader/include/llapi/mc/FillContainerFunction.hpp index a0102bd444..c40173da76 100644 --- a/LiteLoader/include/llapi/mc/FillContainerFunction.hpp +++ b/LiteLoader/include/llapi/mc/FillContainerFunction.hpp @@ -32,23 +32,23 @@ class FillContainerFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FillContainerFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@FillContainerFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@FillContainerFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@FillContainerFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@FillContainerFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@FillContainerFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@FillContainerFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FillingContainer.hpp b/LiteLoader/include/llapi/mc/FillingContainer.hpp index 306dedccd6..6e76f0bd2d 100644 --- a/LiteLoader/include/llapi/mc/FillingContainer.hpp +++ b/LiteLoader/include/llapi/mc/FillingContainer.hpp @@ -30,170 +30,167 @@ class FillingContainer : public Container { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FillingContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?serverInitItemStackIds\@FillingContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @vftbl 2 + * @symbol ?serverInitItemStackIds\@FillingContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ virtual void serverInitItemStackIds(int, int, class std::function); /** - * @vftbl 5 - * @symbol ?getItem\@FillingContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 5 + * @symbol ?getItem\@FillingContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const; /** - * @vftbl 9 - * @symbol ?setItem\@FillingContainer\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 9 + * @symbol ?setItem\@FillingContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 10 - * @symbol ?setItemWithForceBalance\@FillingContainer\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 10 + * @symbol ?setItemWithForceBalance\@FillingContainer\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 11 - * @symbol ?removeItem\@FillingContainer\@\@UEAAXHH\@Z + * @vftbl 11 + * @symbol ?removeItem\@FillingContainer\@\@UEAAXHH\@Z */ virtual void removeItem(int, int); /** - * @vftbl 14 - * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ + * @vftbl 14 + * @symbol ?getContainerSize\@FillingContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 15 - * @symbol ?getMaxStackSize\@FillingContainer\@\@UEBAHXZ + * @vftbl 15 + * @symbol ?getMaxStackSize\@FillingContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 16 - * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 16 + * @symbol ?startOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 - * @symbol ?stopOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 17 + * @symbol ?stopOpen\@FillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 23 + * @symbol __unk_vfn_23 */ - virtual void __unk_vfn_22(); + virtual void __unk_vfn_23(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_23(); + virtual void __unk_vfn_24(); /** - * @vftbl 33 - * @symbol ?add\@FillingContainer\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 34 + * @symbol ?add\@FillingContainer\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 34 - * @symbol ?canAdd\@FillingContainer\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 35 + * @symbol ?canAdd\@FillingContainer\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canAdd(class ItemStack const &) const; /** - * @vftbl 35 - * @symbol ?clearSlot\@FillingContainer\@\@UEAAXH\@Z + * @vftbl 36 + * @symbol ?clearSlot\@FillingContainer\@\@UEAAXH\@Z */ virtual void clearSlot(int); /** - * @vftbl 36 - * @symbol ?clearInventory\@FillingContainer\@\@UEAAHH\@Z + * @vftbl 37 + * @symbol ?clearInventory\@FillingContainer\@\@UEAAHH\@Z */ virtual int clearInventory(int); /** - * @vftbl 37 - * @symbol ?load\@FillingContainer\@\@UEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z + * @vftbl 38 + * @symbol ?load\@FillingContainer\@\@UEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z */ virtual void load(class ListTag const &, class SemVersion const &, class Level &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILLINGCONTAINER /** - * @vftbl 38 - * @symbol ?getEmptySlotsCount\@FillingContainer\@\@UEBAHXZ + * @symbol __unk_destructor_-1 */ - virtual int getEmptySlotsCount() const; + MCVAPI ~FillingContainer(); +#endif /** - * @symbol ??0FillingContainer\@\@QEAA\@PEAVPlayer\@\@HW4ContainerType\@\@\@Z + * @symbol ??0FillingContainer\@\@QEAA\@PEAVPlayer\@\@HW4ContainerType\@\@\@Z */ MCAPI FillingContainer(class Player *, int, enum class ContainerType); /** - * @symbol ?getHotbarSize\@FillingContainer\@\@QEBAHXZ + * @symbol ?getHotbarSize\@FillingContainer\@\@QEBAHXZ */ MCAPI int getHotbarSize() const; /** - * @symbol ?getSlotWithItem\@FillingContainer\@\@QEBAHAEBVItemStack\@\@_N1\@Z + * @symbol ?getSlotWithItem\@FillingContainer\@\@QEBAHAEBVItemStack\@\@_N1\@Z */ MCAPI int getSlotWithItem(class ItemStack const &, bool, bool) const; /** - * @symbol ?hasResource\@FillingContainer\@\@QEAA_NH\@Z + * @symbol ?hasResource\@FillingContainer\@\@QEAA_NH\@Z */ MCAPI bool hasResource(int); /** - * @symbol ??4FillingContainer\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4FillingContainer\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class FillingContainer & operator=(class FillingContainer const &); /** - * @symbol ?removeResource\@FillingContainer\@\@QEAAHAEBVItemStack\@\@_N1H\@Z + * @symbol ?removeResource\@FillingContainer\@\@QEAAHAEBVItemStack\@\@_N1H\@Z */ MCAPI int removeResource(class ItemStack const &, bool, bool, int); /** - * @symbol ?removeResource\@FillingContainer\@\@QEAA_NH\@Z + * @symbol ?removeResource\@FillingContainer\@\@QEAA_NH\@Z */ MCAPI bool removeResource(int); /** - * @symbol ?save\@FillingContainer\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@FillingContainer\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ?swapSlots\@FillingContainer\@\@QEAAXHH\@Z + * @symbol ?swapSlots\@FillingContainer\@\@QEAAXHH\@Z */ MCAPI void swapSlots(int, int); //protected: /** - * @symbol ?_addResource\@FillingContainer\@\@IEAAHAEBVItemStack\@\@\@Z + * @symbol ?_addResource\@FillingContainer\@\@IEAAHAEBVItemStack\@\@\@Z */ MCAPI int _addResource(class ItemStack const &); /** - * @symbol ?_doDrop\@FillingContainer\@\@IEAAXAEAVItemStack\@\@_N\@Z + * @symbol ?_doDrop\@FillingContainer\@\@IEAAXAEAVItemStack\@\@_N\@Z */ MCAPI void _doDrop(class ItemStack &, bool); /** - * @symbol ?_fixBackwardCompabilityItem\@FillingContainer\@\@IEAAXAEAVItemStack\@\@\@Z + * @symbol ?_fixBackwardCompabilityItem\@FillingContainer\@\@IEAAXAEAVItemStack\@\@\@Z */ MCAPI void _fixBackwardCompabilityItem(class ItemStack &); /** - * @symbol ?_getEmptySlotsCount\@FillingContainer\@\@IEBAHHH\@Z - */ - MCAPI int _getEmptySlotsCount(int, int) const; - /** - * @symbol ?_getFreeSlot\@FillingContainer\@\@IEBAHXZ + * @symbol ?_getFreeSlot\@FillingContainer\@\@IEBAHXZ */ MCAPI int _getFreeSlot() const; /** - * @symbol ?_getSlot\@FillingContainer\@\@IEBAHH\@Z + * @symbol ?_getSlot\@FillingContainer\@\@IEBAHH\@Z */ MCAPI int _getSlot(int) const; /** - * @symbol ?_getSlotWithRemainingSpace\@FillingContainer\@\@IEBAHAEBVItemStack\@\@\@Z + * @symbol ?_getSlotWithRemainingSpace\@FillingContainer\@\@IEBAHAEBVItemStack\@\@\@Z */ MCAPI int _getSlotWithRemainingSpace(class ItemStack const &) const; /** - * @symbol ?_isCreative\@FillingContainer\@\@IEBA_NXZ + * @symbol ?_isCreative\@FillingContainer\@\@IEBA_NXZ */ MCAPI bool _isCreative() const; /** - * @symbol ?_release\@FillingContainer\@\@IEAAXH\@Z + * @symbol ?_release\@FillingContainer\@\@IEAAXH\@Z */ MCAPI void _release(int); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterGroup.hpp b/LiteLoader/include/llapi/mc/FilterGroup.hpp index f363e45869..6cb07bc01d 100644 --- a/LiteLoader/include/llapi/mc/FilterGroup.hpp +++ b/LiteLoader/include/llapi/mc/FilterGroup.hpp @@ -33,84 +33,84 @@ enum class CollectionType; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterGroup(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_createSubgroup\@BiomeFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z + * @vftbl 1 + * @symbol ?_createSubgroup\@ActorFilterGroup\@\@MEBA?AV?$shared_ptr\@VFilterGroup\@\@\@std\@\@W4CollectionType\@FilterGroup\@\@\@Z */ virtual class std::shared_ptr _createSubgroup(enum class FilterGroup::CollectionType) const = 0; /** - * @vftbl 2 - * @symbol ?_setupContext\@FilterGroup\@\@MEBA_NAEBVFilterTest\@\@AEAUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?_setupContext\@FilterGroup\@\@MEBA_NAEBVFilterTest\@\@AEAUFilterContext\@\@\@Z */ virtual bool _setupContext(class FilterTest const &, struct FilterContext &) const; /** - * @vftbl 3 - * @symbol ?_handleUnknownMember\@FilterGroup\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @vftbl 3 + * @symbol ?_handleUnknownMember\@FilterGroup\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ virtual bool _handleUnknownMember(std::string const &, class Json::Value const &); /** - * @symbol ??0FilterGroup\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0FilterGroup\@\@QEAA\@AEBV0\@\@Z */ MCAPI FilterGroup(class FilterGroup const &); /** - * @symbol ?addFilterTest\@FilterGroup\@\@QEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @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 + * @symbol ?addFilterTest\@FilterGroup\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFilterInputs\@\@\@Z */ MCAPI bool addFilterTest(std::string const &, struct FilterInputs const &); /** - * @symbol ?empty\@FilterGroup\@\@QEBA_NXZ + * @symbol ?empty\@FilterGroup\@\@QEBA_NXZ */ MCAPI bool empty() const; /** - * @symbol ?evaluate\@FilterGroup\@\@QEBA_NAEAV?$array\@UFilterContext\@\@$09\@std\@\@\@Z + * @symbol ?evaluate\@FilterGroup\@\@QEBA_NAEAV?$array\@UFilterContext\@\@$09\@std\@\@\@Z */ MCAPI bool evaluate(class std::array &) const; /** - * @symbol ?getChildren\@FilterGroup\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VFilterGroup\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VFilterGroup\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getChildren\@FilterGroup\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VFilterGroup\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VFilterGroup\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getChildren() const; /** - * @symbol ?getMembers\@FilterGroup\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VFilterTest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VFilterTest\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getMembers\@FilterGroup\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VFilterTest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VFilterTest\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getMembers() const; /** - * @symbol ?parse\@FilterGroup\@\@QEAA_NAEBVValue\@Json\@\@\@Z + * @symbol ?parse\@FilterGroup\@\@QEAA_NAEBVValue\@Json\@\@\@Z */ MCAPI bool parse(class Json::Value const &); /** - * @symbol ?serialize\@FilterGroup\@\@QEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?serialize\@FilterGroup\@\@QEBAXAEAVValue\@Json\@\@\@Z */ MCAPI void serialize(class Json::Value &) const; //protected: /** - * @symbol ?_parseFilterInputs\@FilterGroup\@\@IEAA_NAEBVValue\@Json\@\@AEBUDefinition\@FilterTest\@\@AEAUFilterInputs\@\@\@Z + * @symbol ?_parseFilterInputs\@FilterGroup\@\@IEAA_NAEBVValue\@Json\@\@AEBUDefinition\@FilterTest\@\@AEAUFilterInputs\@\@\@Z */ MCAPI bool _parseFilterInputs(class Json::Value const &, struct FilterTest::Definition const &, struct FilterInputs &); /** - * @symbol ?_parseFilterParam\@FilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBVValue\@Json\@\@AEBUFilterParamDefinition\@\@AEAVFilterInput\@\@\@Z + * @symbol ?_parseFilterParam\@FilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBVValue\@Json\@\@AEBUFilterParamDefinition\@\@AEAVFilterInput\@\@\@Z */ MCAPI bool _parseFilterParam(std::string const &, std::string const &, class Json::Value const &, struct FilterParamDefinition const &, class FilterInput &); /** - * @symbol ?_parseMember\@FilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_parseMember\@FilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI bool _parseMember(std::string const &, class Json::Value const &); /** - * @symbol ?_parseObject\@FilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_parseObject\@FilterGroup\@\@IEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI bool _parseObject(std::string const &, class Json::Value const &); /** - * @symbol ?_parseTest\@FilterGroup\@\@IEAA_NAEBVValue\@Json\@\@\@Z + * @symbol ?_parseTest\@FilterGroup\@\@IEAA_NAEBVValue\@Json\@\@\@Z */ MCAPI bool _parseTest(class Json::Value const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterInput.hpp b/LiteLoader/include/llapi/mc/FilterInput.hpp index f71c288024..f4ecf79e37 100644 --- a/LiteLoader/include/llapi/mc/FilterInput.hpp +++ b/LiteLoader/include/llapi/mc/FilterInput.hpp @@ -29,20 +29,20 @@ class FilterInput { public: /** - * @symbol ??0FilterInput\@\@QEAA\@H\@Z + * @symbol ??0FilterInput\@\@QEAA\@H\@Z */ MCAPI FilterInput(int); /** - * @symbol ??4FilterInput\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4FilterInput\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class FilterInput & operator=(class FilterInput const &); /** - * @symbol ??4FilterInput\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4FilterInput\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class FilterInput & operator=(class FilterInput &&); /** - * @symbol ??1FilterInput\@\@QEAA\@XZ + * @symbol ??1FilterInput\@\@QEAA\@XZ */ MCAPI ~FilterInput(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp b/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp index 7d6f932271..45b3363d6f 100644 --- a/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FilterInputDefinition.hpp @@ -10,30 +10,27 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure FilterInputDefinition. - * - */ -struct FilterInputDefinition { + +class FilterInputDefinition { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_FILTERINPUTDEFINITION public: - struct FilterInputDefinition& operator=(struct FilterInputDefinition const &) = delete; - FilterInputDefinition(struct FilterInputDefinition const &) = delete; + class FilterInputDefinition& operator=(class FilterInputDefinition const &) = delete; + FilterInputDefinition(class FilterInputDefinition const &) = delete; FilterInputDefinition() = delete; #endif public: /** - * @symbol ??0FilterInputDefinition\@\@QEAA\@VFilterInput\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0FilterInputDefinition\@\@QEAA\@VFilterInput\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI FilterInputDefinition(class FilterInput, std::string const &); /** - * @symbol ??1FilterInputDefinition\@\@QEAA\@XZ + * @symbol ??1FilterInputDefinition\@\@QEAA\@XZ */ MCAPI ~FilterInputDefinition(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterInputs.hpp b/LiteLoader/include/llapi/mc/FilterInputs.hpp index 7a4b4ce5ef..6306680bd1 100644 --- a/LiteLoader/include/llapi/mc/FilterInputs.hpp +++ b/LiteLoader/include/llapi/mc/FilterInputs.hpp @@ -28,7 +28,7 @@ struct FilterInputs { public: /** - * @symbol ??1FilterInputs\@\@QEAA\@XZ + * @symbol ??1FilterInputs\@\@QEAA\@XZ */ MCAPI ~FilterInputs(); diff --git a/LiteLoader/include/llapi/mc/FilterList.hpp b/LiteLoader/include/llapi/mc/FilterList.hpp index b92b733d2c..f1062be3ef 100644 --- a/LiteLoader/include/llapi/mc/FilterList.hpp +++ b/LiteLoader/include/llapi/mc/FilterList.hpp @@ -23,11 +23,11 @@ namespace FilterList { #undef AFTER_EXTRA /** - * @symbol ?findFilterDefinition\@FilterList\@\@YAPEBUDefinition\@FilterTest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?findFilterDefinition\@FilterList\@\@YAPEBUDefinition\@FilterTest\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct FilterTest::Definition const * findFilterDefinition(std::string const &); /** - * @symbol ?initialize\@FilterList\@\@YAXXZ + * @symbol ?initialize\@FilterList\@\@YAXXZ */ MCAPI void initialize(); diff --git a/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp b/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp index 7b8b783e8f..1d9475d270 100644 --- a/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FilterParamDefinition.hpp @@ -28,12 +28,16 @@ struct FilterParamDefinition { public: /** - * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4FilterParamOption\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z + * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4FilterParamOption\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z */ MCAPI FilterParamDefinition(enum class FilterParamType, enum class FilterParamRequirement, std::string, enum class FilterParamOption, class FilterInput, struct FilterStringMap); /** - * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z + * @symbol ??0FilterParamDefinition\@\@QEAA\@W4FilterParamType\@\@W4FilterParamRequirement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VFilterInput\@\@UFilterStringMap\@\@\@Z */ MCAPI FilterParamDefinition(enum class FilterParamType, enum class FilterParamRequirement, std::string, class FilterInput, struct FilterStringMap); + /** + * @symbol ??1FilterParamDefinition\@\@QEAA\@XZ + */ + MCAPI ~FilterParamDefinition(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FilterStringMap.hpp b/LiteLoader/include/llapi/mc/FilterStringMap.hpp index ee30c4eaf8..86e0d0d440 100644 --- a/LiteLoader/include/llapi/mc/FilterStringMap.hpp +++ b/LiteLoader/include/llapi/mc/FilterStringMap.hpp @@ -29,19 +29,19 @@ struct FilterStringMap { public: /** - * @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 + * @symbol ??0FilterStringMap\@\@QEAA\@AEBU0\@\@Z */ - MCAPI FilterStringMap(class std::initializer_list>); + MCAPI FilterStringMap(struct FilterStringMap const &); /** - * @symbol ??0FilterStringMap\@\@QEAA\@AEBU0\@\@Z + * @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(struct FilterStringMap const &); + MCAPI FilterStringMap(class std::initializer_list>); /** - * @symbol ??4FilterStringMap\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4FilterStringMap\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct FilterStringMap & operator=(struct FilterStringMap &&); /** - * @symbol ??1FilterStringMap\@\@QEAA\@XZ + * @symbol ??1FilterStringMap\@\@QEAA\@XZ */ MCAPI ~FilterStringMap(); diff --git a/LiteLoader/include/llapi/mc/FilterTest.hpp b/LiteLoader/include/llapi/mc/FilterTest.hpp index c045f95d58..4725db842d 100644 --- a/LiteLoader/include/llapi/mc/FilterTest.hpp +++ b/LiteLoader/include/llapi/mc/FilterTest.hpp @@ -37,63 +37,69 @@ struct Definition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@FilterTest\@\@UEAA_NAEBUDefinition\@1\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@FilterTest\@\@UEAA_NAEBUDefinition\@1\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@TargetDistanceTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@FilterTestGameRule\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const = 0; /** - * @vftbl 3 - * @symbol ?finalizeParsedValue\@FilterTest\@\@UEAAXAEAVIWorldRegistriesProvider\@\@\@Z + * @vftbl 3 + * @symbol ?finalizeParsedValue\@FilterTest\@\@UEAAXAEAVIWorldRegistriesProvider\@\@\@Z */ virtual void finalizeParsedValue(class IWorldRegistriesProvider &); /** - * @vftbl 4 - * @symbol ?getName\@TargetDistanceTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@FilterTestGameRule\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const = 0; + virtual class std::basic_string_view> getName() const = 0; /** - * @vftbl 5 - * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeDomain() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@FilterTestDimensionWeather\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@FilterTestGameRule\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEST /** - * @symbol ?serialize\@FilterTest\@\@QEBA?AVValue\@Json\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTest(); +#endif + /** + * @symbol ?serialize\@FilterTest\@\@QEBA?AVValue\@Json\@\@XZ */ MCAPI class Json::Value serialize() const; //protected: /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NAEBVHashedString\@\@0\@Z + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_N_N0\@Z */ - MCAPI bool _testValuesWithOperator(class HashedString const &, class HashedString const &) const; + MCAPI bool _testValuesWithOperator(bool, bool) const; /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NMM\@Z */ - MCAPI bool _testValuesWithOperator(int, int) const; + MCAPI bool _testValuesWithOperator(float, float) const; /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NMM\@Z + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NAEBVHashedString\@\@0\@Z */ - MCAPI bool _testValuesWithOperator(float, float) const; + MCAPI bool _testValuesWithOperator(class HashedString const &, class HashedString const &) const; /** - * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_N_N0\@Z + * @symbol ?_testValuesWithOperator\@FilterTest\@\@IEBA_NHH\@Z */ - MCAPI bool _testValuesWithOperator(bool, bool) const; + MCAPI bool _testValuesWithOperator(int, int) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp b/LiteLoader/include/llapi/mc/FilterTestAltitude.hpp index 61c1984af2..07882cc0e4 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 : public FilterTest { +class FilterTestAltitude { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestAltitude : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestAltitude(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestAltitude\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@FilterTestAltitude\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~FilterTestAltitude(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestBiome.hpp b/LiteLoader/include/llapi/mc/FilterTestBiome.hpp index dd33d4faee..dff9bc208a 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 : public FilterTest { +class FilterTestBiome { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestBiome : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestBiome(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestBiome\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@FilterTestBiome\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~FilterTestBiome(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp b/LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp index baa54e68bc..acad2b97a4 100644 --- a/LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiomeHasTag.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestBiomeHasTag. * */ -class FilterTestBiomeHasTag : public FilterTest { +class FilterTestBiomeHasTag { #define AFTER_EXTRA // Add Member There @@ -32,32 +32,53 @@ class FilterTestBiomeHasTag : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestBiomeHasTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestBiomeHasTag\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleTagIDFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestBiomeHasTag\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 3 - * @symbol ?finalizeParsedValue\@FilterTestBiomeHasTag\@\@UEAAXAEAVIWorldRegistriesProvider\@\@\@Z + * @vftbl 3 + * @symbol ?finalizeParsedValue\@FilterTestBiomeHasTag\@\@UEAAXAEAVIWorldRegistriesProvider\@\@\@Z */ virtual void finalizeParsedValue(class IWorldRegistriesProvider &); /** - * @vftbl 4 - * @symbol ?getName\@FilterTestBiomeHasTag\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@FilterTestBiomeHasTag\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + 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\@SimpleTagIDFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTBIOMEHASTAG + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestBiomeHasTag(); +#endif //private: /** - * @symbol ?_evalBiome\@FilterTestBiomeHasTag\@\@AEBA_NAEBVBiome\@\@AEBUFilterContext\@\@\@Z + * @symbol ?_evalBiome\@FilterTestBiomeHasTag\@\@AEBA_NAEBVBiome\@\@AEBUFilterContext\@\@\@Z */ MCAPI bool _evalBiome(class Biome const &, struct FilterContext const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp b/LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp index 918a28a816..0671284a79 100644 --- a/LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiomeHumid.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestBiomeHumid. * */ -class FilterTestBiomeHumid : public FilterTest { +class FilterTestBiomeHumid { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestBiomeHumid : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestBiomeHumid(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestBiomeHumid\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestBiomeHumid\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestBiomeHumid\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestBiomeHumid\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTBIOMEHUMID + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestBiomeHumid(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp b/LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp index d08bea6b45..1c85da5dde 100644 --- a/LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBiomeSnowCovered.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestBiomeSnowCovered. * */ -class FilterTestBiomeSnowCovered : public FilterTest { +class FilterTestBiomeSnowCovered { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestBiomeSnowCovered : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestBiomeSnowCovered(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestBiomeSnowCovered\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestBiomeSnowCovered\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestBiomeSnowCovered\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestBiomeSnowCovered\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTBIOMESNOWCOVERED + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestBiomeSnowCovered(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestBrightness.hpp b/LiteLoader/include/llapi/mc/FilterTestBrightness.hpp index 586422aa9d..d0d116b60b 100644 --- a/LiteLoader/include/llapi/mc/FilterTestBrightness.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestBrightness.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestBrightness. * */ -class FilterTestBrightness : public FilterTest { +class FilterTestBrightness { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestBrightness : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestBrightness(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestBrightness\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestBrightness\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestBrightness\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestBrightness\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTBRIGHTNESS + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestBrightness(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestClock.hpp b/LiteLoader/include/llapi/mc/FilterTestClock.hpp index 005b118f77..03f7184aac 100644 --- a/LiteLoader/include/llapi/mc/FilterTestClock.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestClock.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestClock. * */ -class FilterTestClock : public FilterTest { +class FilterTestClock { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestClock : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestClock(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestClock\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestClock\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestClock\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestClock\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTCLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestClock(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestDaytime.hpp b/LiteLoader/include/llapi/mc/FilterTestDaytime.hpp index 88cba9ac87..f9527ecd74 100644 --- a/LiteLoader/include/llapi/mc/FilterTestDaytime.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDaytime.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestDaytime. * */ -class FilterTestDaytime : public FilterTest { +class FilterTestDaytime { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestDaytime : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestDaytime(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestDaytime\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestDaytime\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestDaytime\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestDaytime\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTDAYTIME + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestDaytime(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp b/LiteLoader/include/llapi/mc/FilterTestDifficulty.hpp index ec3ae73f82..0d8964584d 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 : public FilterTest { +class FilterTestDifficulty { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestDifficulty : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestDifficulty(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestDifficulty\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@FilterTestDifficulty\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~FilterTestDifficulty(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp b/LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp index e1ca37b442..a2466f2018 100644 --- a/LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDimensionWeather.hpp @@ -32,29 +32,29 @@ class FilterTestDimensionWeather : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestDimensionWeather(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@FilterTestDimensionWeather\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@FilterTestDimensionWeather\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestDimensionWeather\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@FilterTestDimensionWeather\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestDimensionWeather\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@FilterTestDimensionWeather\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@FilterTestDimensionWeather\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@FilterTestDimensionWeather\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp b/LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp index 68f410cf54..37feb9abe7 100644 --- a/LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestDistanceToNearestPlayer.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestDistanceToNearestPlayer. * */ -class FilterTestDistanceToNearestPlayer : public FilterTest { +class FilterTestDistanceToNearestPlayer { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestDistanceToNearestPlayer : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestDistanceToNearestPlayer(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestDistanceToNearestPlayer\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestDistanceToNearestPlayer\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestDistanceToNearestPlayer\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestDistanceToNearestPlayer\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTDISTANCETONEARESTPLAYER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestDistanceToNearestPlayer(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestGameRule.hpp b/LiteLoader/include/llapi/mc/FilterTestGameRule.hpp index f9cf37f8bd..89df1a733d 100644 --- a/LiteLoader/include/llapi/mc/FilterTestGameRule.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestGameRule.hpp @@ -32,29 +32,35 @@ class FilterTestGameRule : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestGameRule(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@FilterTestGameRule\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@FilterTestGameRule\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestGameRule\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@FilterTestGameRule\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestGameRule\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@FilterTestGameRule\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; /** - * @vftbl 6 - * @symbol ?_serializeValue\@FilterTestGameRule\@\@MEBA?AVValue\@Json\@\@XZ + * @vftbl 6 + * @symbol ?_serializeValue\@FilterTestGameRule\@\@MEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTGAMERULE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestGameRule(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp b/LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp index 138e0212c6..c46555ccc9 100644 --- a/LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestHasTradeSupply.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestHasTradeSupply. * */ -class FilterTestHasTradeSupply : public FilterTest { +class FilterTestHasTradeSupply { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestHasTradeSupply : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestHasTradeSupply(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestHasTradeSupply\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestHasTradeSupply\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestHasTradeSupply\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestHasTradeSupply\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTHASTRADESUPPLY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestHasTradeSupply(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp b/LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp index 093d065e54..bddb93faa9 100644 --- a/LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestHourlyClock.hpp @@ -32,24 +32,30 @@ class FilterTestHourlyClock : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestHourlyClock(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setup\@FilterTestHourlyClock\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@FilterTestHourlyClock\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z */ virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestHourlyClock\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 2 + * @symbol ?evaluate\@FilterTestHourlyClock\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestHourlyClock\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 4 + * @symbol ?getName\@FilterTestHourlyClock\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class std::basic_string_view> getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTHOURLYCLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestHourlyClock(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp b/LiteLoader/include/llapi/mc/FilterTestLightLevel.hpp index efc90be725..09bb19817e 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 : public FilterTest { +class FilterTestLightLevel { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,39 @@ class FilterTestLightLevel : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestLightLevel(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestLightLevel\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@FilterTestLightLevel\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp b/LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp index ad90b23b64..2d78d6569b 100644 --- a/LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestMoonIntensity.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestMoonIntensity. * */ -class FilterTestMoonIntensity : public FilterTest { +class FilterTestMoonIntensity { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestMoonIntensity : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestMoonIntensity(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestMoonIntensity\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestMoonIntensity\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestMoonIntensity\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestMoonIntensity\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTMOONINTENSITY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestMoonIntensity(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp b/LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp index 9aae9bae61..2d4b402c86 100644 --- a/LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestMoonPhase.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestMoonPhase. * */ -class FilterTestMoonPhase : public FilterTest { +class FilterTestMoonPhase { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestMoonPhase : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestMoonPhase(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestMoonPhase\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestMoonPhase\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestMoonPhase\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestMoonPhase\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTMOONPHASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestMoonPhase(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp b/LiteLoader/include/llapi/mc/FilterTestTemperatureType.hpp index 8a07e60216..6f358cacfb 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 : public FilterTest { +class FilterTestTemperatureType { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestTemperatureType : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestTemperatureType(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestTemperatureType\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @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 4 - * @symbol ?getName\@FilterTestTemperatureType\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @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 gsl::basic_string_span getName() const; + 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 + */ + MCVAPI ~FilterTestTemperatureType(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp b/LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp index 272306e45d..e2409be17d 100644 --- a/LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp +++ b/LiteLoader/include/llapi/mc/FilterTestTemperatureValue.hpp @@ -17,7 +17,7 @@ * @brief MC class FilterTestTemperatureValue. * */ -class FilterTestTemperatureValue : public FilterTest { +class FilterTestTemperatureValue { #define AFTER_EXTRA // Add Member There @@ -32,19 +32,45 @@ class FilterTestTemperatureValue : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTestTemperatureValue(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@FilterTestTemperatureValue\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@FilterTestTemperatureValue\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@FilterTestTemperatureValue\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@FilterTestTemperatureValue\@\@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 gsl::basic_string_span getName() const; + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeValue() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTESTTEMPERATUREVALUE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTestTemperatureValue(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp index fb689a9a75..eb9cc9502a 100644 --- a/LiteLoader/include/llapi/mc/FilterTextPacket.hpp +++ b/LiteLoader/include/llapi/mc/FilterTextPacket.hpp @@ -30,37 +30,43 @@ class FilterTextPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FilterTextPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@FilterTextPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@FilterTextPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@FilterTextPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@FilterTextPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@FilterTextPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@FilterTextPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@FilterTextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@FilterTextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FILTERTEXTPACKET /** - * @symbol ??0FilterTextPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FilterTextPacket(); +#endif + /** + * @symbol ??0FilterTextPacket\@\@QEAA\@XZ */ MCAPI FilterTextPacket(); /** - * @symbol ??0FilterTextPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ??0FilterTextPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI FilterTextPacket(std::string const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp b/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp index ea17740fa6..4e2405621f 100644 --- a/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/FinalizeMoveSystem.hpp @@ -28,8 +28,8 @@ class FinalizeMoveSystem { public: /** - * @symbol ?create\@FinalizeMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@FinalizeMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindActorDefinition.hpp b/LiteLoader/include/llapi/mc/FindActorDefinition.hpp index e9dd5bf59e..f71f25def7 100644 --- a/LiteLoader/include/llapi/mc/FindActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FindActorDefinition.hpp @@ -32,14 +32,14 @@ class FindActorDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindActorDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@FindActorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@FindActorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindActorNode.hpp b/LiteLoader/include/llapi/mc/FindActorNode.hpp index 488d3e1e8d..c605ed82df 100644 --- a/LiteLoader/include/llapi/mc/FindActorNode.hpp +++ b/LiteLoader/include/llapi/mc/FindActorNode.hpp @@ -29,23 +29,23 @@ class FindActorNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindActorNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@FindActorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@FindActorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@FindActorNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@FindActorNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0FindActorNode\@\@QEAA\@XZ + * @symbol ??0FindActorNode\@\@QEAA\@XZ */ MCAPI FindActorNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindBlockDefinition.hpp b/LiteLoader/include/llapi/mc/FindBlockDefinition.hpp index ee6ebe9f7c..759d9f8575 100644 --- a/LiteLoader/include/llapi/mc/FindBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FindBlockDefinition.hpp @@ -32,14 +32,14 @@ class FindBlockDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindBlockDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@FindBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@FindBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindBlockNode.hpp b/LiteLoader/include/llapi/mc/FindBlockNode.hpp index fc1face968..260fa0d67f 100644 --- a/LiteLoader/include/llapi/mc/FindBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/FindBlockNode.hpp @@ -29,23 +29,23 @@ class FindBlockNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindBlockNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@FindBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@FindBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@FindBlockNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@FindBlockNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0FindBlockNode\@\@QEAA\@XZ + * @symbol ??0FindBlockNode\@\@QEAA\@XZ */ MCAPI FindBlockNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindCoverGoal.hpp b/LiteLoader/include/llapi/mc/FindCoverGoal.hpp index 9a5c1a6429..ea9e6cb694 100644 --- a/LiteLoader/include/llapi/mc/FindCoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindCoverGoal.hpp @@ -30,60 +30,60 @@ class FindCoverGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindCoverGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FindCoverGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FindCoverGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FindCoverGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FindCoverGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FindCoverGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FindCoverGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FindCoverGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FindCoverGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FindCoverGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FindCoverGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FindCoverGoal\@\@QEAA\@AEAVMob\@\@MM\@Z + * @symbol ??0FindCoverGoal\@\@QEAA\@AEAVMob\@\@MM\@Z */ MCAPI FindCoverGoal(class Mob &, float, float); /** - * @symbol ?getMob\@FindCoverGoal\@\@QEBAAEBVMob\@\@XZ + * @symbol ?getMob\@FindCoverGoal\@\@QEBAAEBVMob\@\@XZ */ MCAPI class Mob const & getMob() const; //private: /** - * @symbol ?getHidePos\@FindCoverGoal\@\@AEBA_NAEAVVec3\@\@\@Z + * @symbol ?getHidePos\@FindCoverGoal\@\@AEBA_NAEAVVec3\@\@\@Z */ MCAPI bool getHidePos(class Vec3 &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindMountGoal.hpp b/LiteLoader/include/llapi/mc/FindMountGoal.hpp index 4cfce2dc78..45e9a80b62 100644 --- a/LiteLoader/include/llapi/mc/FindMountGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindMountGoal.hpp @@ -30,52 +30,52 @@ class FindMountGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindMountGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FindMountGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FindMountGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FindMountGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FindMountGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FindMountGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FindMountGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FindMountGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FindMountGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FindMountGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FindMountGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FindMountGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FindMountGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FindMountGoal\@\@QEAA\@AEAVMob\@\@MH_N1MH\@Z + * @symbol ??0FindMountGoal\@\@QEAA\@AEAVMob\@\@MH_N1MH\@Z */ MCAPI FindMountGoal(class Mob &, float, int, bool, bool, float, int); /** - * @symbol ?isInMountRange\@FindMountGoal\@\@QEAA_NXZ + * @symbol ?isInMountRange\@FindMountGoal\@\@QEAA_NXZ */ MCAPI bool isInMountRange(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp b/LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp index 099e5af1bd..554fc3b301 100644 --- a/LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp +++ b/LiteLoader/include/llapi/mc/FindUnderwaterTreasureGoal.hpp @@ -30,48 +30,48 @@ class FindUnderwaterTreasureGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FindUnderwaterTreasureGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FindUnderwaterTreasureGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FindUnderwaterTreasureGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FindUnderwaterTreasureGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FindUnderwaterTreasureGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@FindUnderwaterTreasureGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@FindUnderwaterTreasureGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@FindUnderwaterTreasureGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FindUnderwaterTreasureGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FindUnderwaterTreasureGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FindUnderwaterTreasureGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FindUnderwaterTreasureGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FindUnderwaterTreasureGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FindUnderwaterTreasureGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FindUnderwaterTreasureGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FindUnderwaterTreasureGoal\@\@QEAA\@AEAVMob\@\@MHH\@Z + * @symbol ??0FindUnderwaterTreasureGoal\@\@QEAA\@AEAVMob\@\@MHH\@Z */ MCAPI FindUnderwaterTreasureGoal(class Mob &, float, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireBlock.hpp b/LiteLoader/include/llapi/mc/FireBlock.hpp index 8723fab1ae..7dbee3598b 100644 --- a/LiteLoader/include/llapi/mc/FireBlock.hpp +++ b/LiteLoader/include/llapi/mc/FireBlock.hpp @@ -31,281 +31,286 @@ class FireBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FireBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@FireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@FireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@FireBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@FireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@FireBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 89 - * @symbol ?mayPick\@FireBlock\@\@UEBA_NXZ + * @vftbl 89 + * @symbol ?mayPick\@FireBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 92 - * @symbol ?mayPlace\@FireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@FireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@FireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIREBLOCK /** - * @symbol ?canBeSilkTouched\@FireBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@FireBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@FireBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@FireBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0FireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FireBlock(std::string const &, int); /** - * @symbol ?checkBurn\@FireBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HAEAVRandomize\@\@H\@Z + * @symbol ?checkBurn\@FireBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HAEAVRandomize\@\@H\@Z */ MCAPI void checkBurn(class BlockSource &, class BlockPos const &, int, class Randomize &, int) const; /** - * @symbol ?isSolidToppedBlock\@FireBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isSolidToppedBlock\@FireBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isSolidToppedBlock(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_tryAddToTickingQueue\@FireBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_tryAddToTickingQueue\@FireBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void _tryAddToTickingQueue(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?_trySpawnBlueFire\@FireBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_trySpawnBlueFire\@FireBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _trySpawnBlueFire(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?getFireOdds\@FireBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getFireOdds\@FireBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI float getFireOdds(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?isValidFireLocation\@FireBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isValidFireLocation\@FireBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isValidFireLocation(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireChargeItem.hpp b/LiteLoader/include/llapi/mc/FireChargeItem.hpp index 377ef91d31..277b25266e 100644 --- a/LiteLoader/include/llapi/mc/FireChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireChargeItem.hpp @@ -32,102 +32,102 @@ class FireChargeItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FireChargeItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@FireChargeItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@FireChargeItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@FireChargeItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@FireChargeItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@FireChargeItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@FireChargeItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@FireChargeItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@FireChargeItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0FireChargeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FireChargeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FireChargeItem(std::string const &, int); /** - * @symbol ?LEVEL_SOUND_EVENT_VOLUME\@FireChargeItem\@\@2HB + * @symbol ?LEVEL_SOUND_EVENT_VOLUME\@FireChargeItem\@\@2HB */ MCAPI static int const LEVEL_SOUND_EVENT_VOLUME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireImmuneDefinition.hpp b/LiteLoader/include/llapi/mc/FireImmuneDefinition.hpp index dc268cea53..2cf36f8eea 100644 --- a/LiteLoader/include/llapi/mc/FireImmuneDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FireImmuneDefinition.hpp @@ -31,15 +31,15 @@ struct FireImmuneDefinition { public: /** - * @symbol ?initialize\@FireImmuneDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@FireImmuneDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@FireImmuneDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@FireImmuneDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@FireImmuneDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFireImmuneDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@FireImmuneDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFireImmuneDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/Fireball.hpp b/LiteLoader/include/llapi/mc/Fireball.hpp index 1f7b0d4041..8587b8984e 100644 --- a/LiteLoader/include/llapi/mc/Fireball.hpp +++ b/LiteLoader/include/llapi/mc/Fireball.hpp @@ -32,192 +32,196 @@ class Fireball : public PredictableProjectile { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Fireball(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Fireball\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Fireball\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@Fireball\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@Fireball\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 88 - * @symbol ?getBrightness\@Fireball\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?getBrightness\@Fireball\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@Fireball\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Fireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 143 - * @symbol ?getPickRadius\@Fireball\@\@UEAAMXZ + * @vftbl 142 + * @symbol ?getPickRadius\@Fireball\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@Fireball\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@Fireball\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@Fireball\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@Fireball\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Fireball\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Fireball\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Fireball\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Fireball\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?getInertia\@Fireball\@\@MEAAMXZ + * @vftbl 276 + * @symbol ?getInertia\@Fireball\@\@MEAAMXZ */ virtual float getInertia(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); /** - * @vftbl 280 - * @symbol ?getTrailParticle\@Fireball\@\@MEAA?AW4ParticleType\@\@XZ + * @vftbl 278 + * @symbol ?getTrailParticle\@Fireball\@\@MEAA?AW4ParticleType\@\@XZ */ virtual enum class ParticleType getTrailParticle(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIREBALL /** - * @symbol ?canMakeStepSound\@Fireball\@\@MEBA_NXZ + * @symbol ?canMakeStepSound\@Fireball\@\@MEBA_NXZ */ MCVAPI bool canMakeStepSound() const; /** - * @symbol ?onHit\@Fireball\@\@MEAAXAEBVHitResult\@\@\@Z + * @symbol ?onHit\@Fireball\@\@MEAAXAEBVHitResult\@\@\@Z */ MCVAPI void onHit(class HitResult const &); /** - * @symbol ?shouldBurn\@Fireball\@\@MEAA_NXZ + * @symbol ?shouldBurn\@Fireball\@\@MEAA_NXZ */ MCVAPI bool shouldBurn(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Fireball(); #endif /** - * @symbol ??0Fireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Fireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Fireball(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp index 506c18f8ca..3204ee416a 100644 --- a/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworkChargeItem.hpp @@ -34,155 +34,155 @@ enum class Shape; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FireworkChargeItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 18 - * @symbol ?isDyeable\@FireworkChargeItem\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isDyeable\@FireworkChargeItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@FireworkChargeItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@FireworkChargeItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@FireworkChargeItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@FireworkChargeItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 73 - * @symbol ?getColor\@FireworkChargeItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @vftbl 73 + * @symbol ?getColor\@FireworkChargeItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ virtual class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 115 - * @symbol ?isSameItem\@FireworkChargeItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + * @vftbl 115 + * @symbol ?isSameItem\@FireworkChargeItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z */ virtual bool isSameItem(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 + * @symbol ??0FireworkChargeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FireworkChargeItem(std::string const &, int); /** - * @symbol ?TAG_EXPLOSION\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_EXPLOSION\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_EXPLOSION; /** - * @symbol ?TAG_E_COLORS\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_E_COLORS\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_E_COLORS; /** - * @symbol ?TAG_E_FADECOLORS\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_E_FADECOLORS\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_E_FADECOLORS; /** - * @symbol ?TAG_E_FLICKER\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_E_FLICKER\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_E_FLICKER; /** - * @symbol ?TAG_E_TRAIL\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_E_TRAIL\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_E_TRAIL; /** - * @symbol ?TAG_E_TYPE\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_E_TYPE\@FireworkChargeItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_E_TYPE; /** - * @symbol ?getFormattedHoverText\@FireworkChargeItem\@\@SAXAEBVCompoundTag\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV34\@\@Z + * @symbol ?getFormattedHoverText\@FireworkChargeItem\@\@SAXAEBVCompoundTag\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV34\@\@Z */ MCAPI static void getFormattedHoverText(class CompoundTag const &, std::string &, std::string const &); /** - * @symbol ?initFireworkChargeItem\@FireworkChargeItem\@\@SAAEBVItemInstance\@\@AEAV2\@W4Shape\@1\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@2_N3\@Z + * @symbol ?initFireworkChargeItem\@FireworkChargeItem\@\@SAAEBVItemInstance\@\@AEAV2\@W4Shape\@1\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@2_N3\@Z */ MCAPI static class ItemInstance const & initFireworkChargeItem(class ItemInstance &, enum class FireworkChargeItem::Shape, std::vector, std::vector, bool, bool); /** - * @symbol ?initFireworkChargeItem\@FireworkChargeItem\@\@SAAEBVItemStack\@\@AEAV2\@W4Shape\@1\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@2_N3\@Z + * @symbol ?initFireworkChargeItem\@FireworkChargeItem\@\@SAAEBVItemStack\@\@AEAV2\@W4Shape\@1\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@2_N3\@Z */ MCAPI static class ItemStack const & initFireworkChargeItem(class ItemStack &, enum class FireworkChargeItem::Shape, std::vector, std::vector, bool, bool); /** - * @symbol ?setColor\@FireworkChargeItem\@\@SAXAEAVItemStackBase\@\@\@Z + * @symbol ?setColor\@FireworkChargeItem\@\@SAXAEAVItemStackBase\@\@\@Z */ MCAPI static void setColor(class ItemStackBase &); //private: /** - * @symbol ?_initFireworkChargeItem\@FireworkChargeItem\@\@CAXAEAVItemStackBase\@\@W4Shape\@1\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@2_N3\@Z + * @symbol ?_initFireworkChargeItem\@FireworkChargeItem\@\@CAXAEAVItemStackBase\@\@W4Shape\@1\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@2_N3\@Z */ MCAPI static void _initFireworkChargeItem(class ItemStackBase &, enum class FireworkChargeItem::Shape, std::vector, std::vector, bool, bool); /** - * @symbol ?appendColors\@FireworkChargeItem\@\@CAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@EV?$allocator\@E\@std\@\@\@3\@\@Z + * @symbol ?appendColors\@FireworkChargeItem\@\@CAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@EV?$allocator\@E\@std\@\@\@3\@\@Z */ MCAPI static void appendColors(std::string &, std::vector); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireworksItem.hpp b/LiteLoader/include/llapi/mc/FireworksItem.hpp index 44b7da5380..1329d408f5 100644 --- a/LiteLoader/include/llapi/mc/FireworksItem.hpp +++ b/LiteLoader/include/llapi/mc/FireworksItem.hpp @@ -32,123 +32,123 @@ class FireworksItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FireworksItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@FireworksItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@FireworksItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@FireworksItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@FireworksItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@FireworksItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@FireworksItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@FireworksItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@FireworksItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 - * @symbol ?_useOn\@FireworksItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@FireworksItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0FireworksItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FireworksItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FireworksItem(std::string const &, int); /** - * @symbol ?TAG_EXPLOSIONS\@FireworksItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_EXPLOSIONS\@FireworksItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_EXPLOSIONS; /** - * @symbol ?TAG_E_FLIGHT\@FireworksItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_E_FLIGHT\@FireworksItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_E_FLIGHT; /** - * @symbol ?TAG_FIREWORKS\@FireworksItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_FIREWORKS\@FireworksItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_FIREWORKS; /** - * @symbol ?initFireworksRocketItem\@FireworksItem\@\@SAAEBVItemInstance\@\@AEAV2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?initFireworksRocketItem\@FireworksItem\@\@SAAEBVItemInstance\@\@AEAV2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI static class ItemInstance const & initFireworksRocketItem(class ItemInstance &, std::vector const &, int); /** - * @symbol ?initFireworksRocketItem\@FireworksItem\@\@SAAEBVItemStack\@\@AEAV2\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?initFireworksRocketItem\@FireworksItem\@\@SAAEBVItemStack\@\@AEAV2\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI static class ItemStack const & initFireworksRocketItem(class ItemStack &, std::vector const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireworksRecipe.hpp b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp index b90a0e06c6..b90c8d9092 100644 --- a/LiteLoader/include/llapi/mc/FireworksRecipe.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRecipe.hpp @@ -31,52 +31,52 @@ class FireworksRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FireworksRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@FireworksRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@FireworksRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@FireworksRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@FireworksRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@FireworksRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 5 - * @symbol ?isShapeless\@FireworksRecipe\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isShapeless\@FireworksRecipe\@\@UEBA_NXZ */ virtual bool isShapeless() const; /** - * @vftbl 6 - * @symbol ?matches\@FireworksRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@FireworksRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@FireworksRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@FireworksRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0FireworksRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@PEBVUUID\@mce\@\@\@Z + * @symbol ??0FireworksRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEBVUUID\@mce\@\@\@Z */ - MCAPI FireworksRecipe(class gsl::basic_string_span, class mce::UUID const *); + MCAPI FireworksRecipe(class std::basic_string_view>, class mce::UUID const *); /** - * @symbol ?ID\@FireworksRecipe\@\@2VUUID\@mce\@\@A + * @symbol ?ID\@FireworksRecipe\@\@2VUUID\@mce\@\@A */ MCAPI static class mce::UUID ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp index 4d1e46afb4..35538199af 100644 --- a/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp +++ b/LiteLoader/include/llapi/mc/FireworksRocketActor.hpp @@ -32,180 +32,175 @@ class FireworksRocketActor : public PredictableProjectile { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~FireworksRocketActor(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 47 - * @symbol ?lerpMotion\@FireworksRocketActor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 47 + * @symbol ?lerpMotion\@FireworksRocketActor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 49 - * @symbol ?normalTick\@FireworksRocketActor\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@FireworksRocketActor\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@FireworksRocketActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@FireworksRocketActor\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@FireworksRocketActor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@FireworksRocketActor\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@FireworksRocketActor\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@FireworksRocketActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@FireworksRocketActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@FireworksRocketActor\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@FireworksRocketActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0FireworksRocketActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0FireworksRocketActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI FireworksRocketActor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?init\@FireworksRocketActor\@\@QEAAXAEAVLevel\@\@AEBVVec3\@\@AEBVCompoundTag\@\@1UActorUniqueID\@\@_N\@Z + * @symbol ?init\@FireworksRocketActor\@\@QEAAXAEAVLevel\@\@AEBVVec3\@\@AEBVCompoundTag\@\@1UActorUniqueID\@\@_N\@Z */ MCAPI void init(class Level &, class Vec3 const &, class CompoundTag const &, class Vec3 const &, struct ActorUniqueID, bool); /** - * @symbol ?isAttachedToEntity\@FireworksRocketActor\@\@QEBA_NXZ + * @symbol ?isAttachedToEntity\@FireworksRocketActor\@\@QEBA_NXZ */ MCAPI bool isAttachedToEntity() const; /** - * @symbol ?postNormalTick\@FireworksRocketActor\@\@QEAAXXZ + * @symbol ?postNormalTick\@FireworksRocketActor\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?setDispensed\@FireworksRocketActor\@\@QEAAX_N\@Z + * @symbol ?setDispensed\@FireworksRocketActor\@\@QEAAX_N\@Z */ MCAPI void setDispensed(bool); //private: /** - * @symbol ?checkAchievement\@FireworksRocketActor\@\@AEBAXXZ + * @symbol ?checkAchievement\@FireworksRocketActor\@\@AEBAXXZ */ MCAPI void checkAchievement() const; /** - * @symbol ?dealExplosionDamage\@FireworksRocketActor\@\@AEAAXXZ + * @symbol ?dealExplosionDamage\@FireworksRocketActor\@\@AEAAXXZ */ MCAPI void dealExplosionDamage(); /** - * @symbol ?initTagData\@FireworksRocketActor\@\@AEAAXAEAVRandom\@\@\@Z + * @symbol ?initTagData\@FireworksRocketActor\@\@AEAAXAEAVRandom\@\@\@Z */ MCAPI void initTagData(class Random &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FireworksRocketActorPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/FireworksRocketActorPostNormalTickSystem.hpp deleted file mode 100644 index 3d0d2a258e..0000000000 --- a/LiteLoader/include/llapi/mc/FireworksRocketActorPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file FireworksRocketActorPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class FireworksRocketActorPostNormalTickSystem. - * - */ -class FireworksRocketActorPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FIREWORKSROCKETACTORPOSTNORMALTICKSYSTEM -public: - class FireworksRocketActorPostNormalTickSystem& operator=(class FireworksRocketActorPostNormalTickSystem const &) = delete; - FireworksRocketActorPostNormalTickSystem(class FireworksRocketActorPostNormalTickSystem const &) = delete; - FireworksRocketActorPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@FireworksRocketActorPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doFireworksRocketActorPostNormalTickSystem\@FireworksRocketActorPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doFireworksRocketActorPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/Fish.hpp b/LiteLoader/include/llapi/mc/Fish.hpp index f99b5d30e2..30e97d8ff5 100644 --- a/LiteLoader/include/llapi/mc/Fish.hpp +++ b/LiteLoader/include/llapi/mc/Fish.hpp @@ -32,167 +32,163 @@ class Fish : public WaterAnimal { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Fish\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Fish\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Fish(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Fish\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 53 - * @symbol ?startRiding\@Fish\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 53 + * @symbol ?startRiding\@Fish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Fish\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Fish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_301(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_305(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 331 + * @symbol ?createAIGoals\@Fish\@\@UEAA_NXZ */ - virtual void __unk_vfn_308(); + virtual bool createAIGoals(); /** - * @vftbl 334 - * @symbol ?createAIGoals\@Fish\@\@UEAA_NXZ + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual bool createAIGoals(); + virtual void __unk_vfn_351(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FISH /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @symbol __unk_destructor_-1 */ - virtual void __unk_vfn_354(); + MCVAPI ~Fish(); +#endif /** - * @symbol ??0Fish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Fish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Fish(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@Fish\@\@QEAAXXZ + * @symbol ?postNormalTick\@Fish\@\@QEAAXXZ */ MCAPI void postNormalTick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FishPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/FishPostNormalTickSystem.hpp deleted file mode 100644 index ed069d4e38..0000000000 --- a/LiteLoader/include/llapi/mc/FishPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file FishPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class FishPostNormalTickSystem. - * - */ -class FishPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FISHPOSTNORMALTICKSYSTEM -public: - class FishPostNormalTickSystem& operator=(class FishPostNormalTickSystem const &) = delete; - FishPostNormalTickSystem(class FishPostNormalTickSystem const &) = delete; - FishPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@FishPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doFishPostNormalTickSystem\@FishPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doFishPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FishingEnchant.hpp b/LiteLoader/include/llapi/mc/FishingEnchant.hpp index 7fd4c9e576..92f7e224da 100644 --- a/LiteLoader/include/llapi/mc/FishingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/FishingEnchant.hpp @@ -31,48 +31,48 @@ class FishingEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FishingEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@FishingEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@FishingEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@FishingEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@FishingEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@FishingEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@FishingEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @symbol ??0FishingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0FishingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI FishingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI FishingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FishingHook.hpp b/LiteLoader/include/llapi/mc/FishingHook.hpp index 8c05e4891c..2fa97e6468 100644 --- a/LiteLoader/include/llapi/mc/FishingHook.hpp +++ b/LiteLoader/include/llapi/mc/FishingHook.hpp @@ -31,222 +31,217 @@ class FishingHook : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@FishingHook\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@FishingHook\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~FishingHook(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@FishingHook\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@FishingHook\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@FishingHook\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@FishingHook\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@FishingHook\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@FishingHook\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@FishingHook\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 164 - * @symbol ?save\@FishingHook\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 163 + * @symbol ?save\@FishingHook\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@FishingHook\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@FishingHook\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@FishingHook\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@FishingHook\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 247 - * @symbol ?shouldDropDeathLoot\@FishingHook\@\@UEBA_NXZ + * @vftbl 246 + * @symbol ?shouldDropDeathLoot\@FishingHook\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0FishingHook\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0FishingHook\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI FishingHook(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getFishingTarget\@FishingHook\@\@QEAAPEAVActor\@\@XZ + * @symbol ?getFishingTarget\@FishingHook\@\@QEAAPEAVActor\@\@XZ */ MCAPI class Actor * getFishingTarget(); /** - * @symbol ?getOwner\@FishingHook\@\@QEAAPEAVActor\@\@XZ + * @symbol ?getOwner\@FishingHook\@\@QEAAPEAVActor\@\@XZ */ MCAPI class Actor * getOwner(); /** - * @symbol ?postNormalTick\@FishingHook\@\@QEAAXXZ + * @symbol ?postNormalTick\@FishingHook\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?retrieve\@FishingHook\@\@QEAAHXZ + * @symbol ?retrieve\@FishingHook\@\@QEAAHXZ */ MCAPI int retrieve(); /** - * @symbol ?BOBBER_SIZE\@FishingHook\@\@2MB + * @symbol ?BOBBER_SIZE\@FishingHook\@\@2MB */ MCAPI static float const BOBBER_SIZE; //protected: /** - * @symbol ?_fishPosEvent\@FishingHook\@\@IEAAXXZ + * @symbol ?_fishPosEvent\@FishingHook\@\@IEAAXXZ */ MCAPI void _fishPosEvent(); /** - * @symbol ?_fishTeaseEvent\@FishingHook\@\@IEAAXXZ + * @symbol ?_fishTeaseEvent\@FishingHook\@\@IEAAXXZ */ MCAPI void _fishTeaseEvent(); /** - * @symbol ?_fishhookEvent\@FishingHook\@\@IEAAXXZ + * @symbol ?_fishhookEvent\@FishingHook\@\@IEAAXXZ */ MCAPI void _fishhookEvent(); /** - * @symbol ?_getWaterPercentage\@FishingHook\@\@IEAAMXZ + * @symbol ?_getWaterPercentage\@FishingHook\@\@IEAAMXZ */ MCAPI float _getWaterPercentage(); /** - * @symbol ?_hitCheck\@FishingHook\@\@IEAA?AVHitResult\@\@XZ + * @symbol ?_hitCheck\@FishingHook\@\@IEAA?AVHitResult\@\@XZ */ MCAPI class HitResult _hitCheck(); /** - * @symbol ?_pullCloser\@FishingHook\@\@IEAAXAEAVActor\@\@M\@Z + * @symbol ?_pullCloser\@FishingHook\@\@IEAAXAEAVActor\@\@M\@Z */ MCAPI void _pullCloser(class Actor &, float); /** - * @symbol ?_serverHooked\@FishingHook\@\@IEAA_NXZ + * @symbol ?_serverHooked\@FishingHook\@\@IEAA_NXZ */ MCAPI bool _serverHooked(); /** - * @symbol ?_serverLured\@FishingHook\@\@IEAA_NXZ + * @symbol ?_serverLured\@FishingHook\@\@IEAA_NXZ */ MCAPI bool _serverLured(); /** - * @symbol ?_updateGravity\@FishingHook\@\@IEAAXXZ + * @symbol ?_updateGravity\@FishingHook\@\@IEAAXXZ */ MCAPI void _updateGravity(); /** - * @symbol ?_updateServer\@FishingHook\@\@IEAAXXZ + * @symbol ?_updateServer\@FishingHook\@\@IEAAXXZ */ MCAPI void _updateServer(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FishingHookPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/FishingHookPostNormalTickSystem.hpp deleted file mode 100644 index 4944dc38d3..0000000000 --- a/LiteLoader/include/llapi/mc/FishingHookPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file FishingHookPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class FishingHookPostNormalTickSystem. - * - */ -class FishingHookPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FISHINGHOOKPOSTNORMALTICKSYSTEM -public: - class FishingHookPostNormalTickSystem& operator=(class FishingHookPostNormalTickSystem const &) = delete; - FishingHookPostNormalTickSystem(class FishingHookPostNormalTickSystem const &) = delete; - FishingHookPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@FishingHookPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doFishingHookPostNormalTickSystem\@FishingHookPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doFishingHookPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FishingRodItem.hpp b/LiteLoader/include/llapi/mc/FishingRodItem.hpp index ddaf28fb39..66d7e02086 100644 --- a/LiteLoader/include/llapi/mc/FishingRodItem.hpp +++ b/LiteLoader/include/llapi/mc/FishingRodItem.hpp @@ -32,128 +32,128 @@ class FishingRodItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FishingRodItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 49 - * @symbol ?isHandEquipped\@FishingRodItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@FishingRodItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 59 - * @symbol ?requiresInteract\@FishingRodItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@FishingRodItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@FishingRodItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@FishingRodItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@FishingRodItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@FishingRodItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@FishingRodItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@FishingRodItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@FishingRodItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@FishingRodItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@FishingRodItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@FishingRodItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@FishingRodItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@FishingRodItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 119 - * @symbol ?getInteractText\@FishingRodItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z + * @vftbl 119 + * @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 - * @symbol ?getAnimationFrameFor\@FishingRodItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@FishingRodItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @symbol ??0FishingRodItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FishingRodItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FishingRodItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp index 8282ff47ef..70364e0d84 100644 --- a/LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleXRoom.hpp @@ -30,19 +30,19 @@ class FitDoubleXRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitDoubleXRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitDoubleXRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitDoubleXRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitDoubleXRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitDoubleXRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp index 3cf0f6c165..65a09e2a82 100644 --- a/LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleXYRoom.hpp @@ -30,19 +30,19 @@ class FitDoubleXYRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitDoubleXYRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitDoubleXYRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitDoubleXYRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitDoubleXYRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitDoubleXYRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp index e21d695b7c..057799c97a 100644 --- a/LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleYRoom.hpp @@ -30,19 +30,19 @@ class FitDoubleYRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitDoubleYRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitDoubleYRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitDoubleYRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitDoubleYRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitDoubleYRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp index f0c9fb63ff..db42965301 100644 --- a/LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleYZRoom.hpp @@ -30,19 +30,19 @@ class FitDoubleYZRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitDoubleYZRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitDoubleYZRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitDoubleYZRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitDoubleYZRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitDoubleYZRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp b/LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp index 97c35fec35..63105df66d 100644 --- a/LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitDoubleZRoom.hpp @@ -30,19 +30,19 @@ class FitDoubleZRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitDoubleZRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitDoubleZRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitDoubleZRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitDoubleZRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitDoubleZRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitSimpleRoom.hpp b/LiteLoader/include/llapi/mc/FitSimpleRoom.hpp index bcc56fab48..efddb9b15c 100644 --- a/LiteLoader/include/llapi/mc/FitSimpleRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitSimpleRoom.hpp @@ -30,19 +30,19 @@ class FitSimpleRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitSimpleRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitSimpleRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitSimpleRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitSimpleRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitSimpleRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp b/LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp index 6a21e8a2ff..3210561a7d 100644 --- a/LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp +++ b/LiteLoader/include/llapi/mc/FitSimpleTopRoom.hpp @@ -30,19 +30,19 @@ class FitSimpleTopRoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FitSimpleTopRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fits\@FitSimpleTopRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z + * @vftbl 1 + * @symbol ?fits\@FitSimpleTopRoom\@\@UEBA_NAEBVRoomDefinition\@\@\@Z */ virtual bool fits(class RoomDefinition const &) const; /** - * @vftbl 2 - * @symbol ?create\@FitSimpleTopRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?create\@FitSimpleTopRoom\@\@UEAA?AV?$unique_ptr\@VOceanMonumentPiece\@\@U?$default_delete\@VOceanMonumentPiece\@\@\@std\@\@\@std\@\@AEAHV?$shared_ptr\@VRoomDefinition\@\@\@3\@AEAVRandom\@\@\@Z */ virtual std::unique_ptr create(int &, class std::shared_ptr, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FixedBiomeSource.hpp b/LiteLoader/include/llapi/mc/FixedBiomeSource.hpp index 0cc56fd42f..0f51f827fc 100644 --- a/LiteLoader/include/llapi/mc/FixedBiomeSource.hpp +++ b/LiteLoader/include/llapi/mc/FixedBiomeSource.hpp @@ -30,47 +30,47 @@ class FixedBiomeSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FixedBiomeSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fillBiomes\@FixedBiomeSource\@\@UEBAXAEAVLevelChunk\@\@AEBVChunkLocalNoiseCache\@\@\@Z + * @vftbl 1 + * @symbol ?fillBiomes\@FixedBiomeSource\@\@UEBAXAEAVLevelChunk\@\@AEBVChunkLocalNoiseCache\@\@\@Z */ virtual void fillBiomes(class LevelChunk &, class ChunkLocalNoiseCache const &) const; /** - * @vftbl 2 - * @symbol ?getBiomeArea\@FixedBiomeSource\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + * @vftbl 2 + * @symbol ?getBiomeArea\@FixedBiomeSource\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z */ virtual class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; /** - * @vftbl 3 - * @symbol ?getBiomeArea\@FixedBiomeSource\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@IAEBUGetBiomeOptions\@\@\@Z + * @vftbl 3 + * @symbol ?getBiomeArea\@FixedBiomeSource\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@IAEBUGetBiomeOptions\@\@\@Z */ virtual class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int, struct GetBiomeOptions const &) const; /** - * @vftbl 4 - * @symbol ?containsOnly\@FixedBiomeSource\@\@UEBA_NHHHHV?$span\@$$CB_K$0?0\@gsl\@\@\@Z + * @vftbl 4 + * @symbol ?containsOnly\@FixedBiomeSource\@\@UEBA_NHHHHV?$span\@$$CB_K$0?0\@gsl\@\@\@Z */ virtual bool containsOnly(int, int, int, int, class gsl::span) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FIXEDBIOMESOURCE /** - * @symbol ?getBiome\@FixedBiomeSource\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBiome\@FixedBiomeSource\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z */ MCVAPI class Biome const * getBiome(class BlockPos const &) const; /** - * @symbol ?getBiome\@FixedBiomeSource\@\@UEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@\@Z + * @symbol ?getBiome\@FixedBiomeSource\@\@UEBAPEBVBiome\@\@AEBUGetBiomeOptions\@\@\@Z */ MCVAPI class Biome const * getBiome(struct GetBiomeOptions const &) const; /** - * @symbol ?getBiome\@FixedBiomeSource\@\@UEBAPEBVBiome\@\@HHH\@Z + * @symbol ?getBiome\@FixedBiomeSource\@\@UEBAPEBVBiome\@\@HHH\@Z */ MCVAPI class Biome const * getBiome(int, int, int) const; #endif /** - * @symbol ??0FixedBiomeSource\@\@QEAA\@AEBVBiome\@\@\@Z + * @symbol ??0FixedBiomeSource\@\@QEAA\@AEBVBiome\@\@\@Z */ MCAPI FixedBiomeSource(class Biome const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp b/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp index 525224206a..b4b24ffcaf 100644 --- a/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlagAllPassengersForPositioningSystem.hpp @@ -25,8 +25,8 @@ class FlagAllPassengersForPositioningSystem { public: /** - * @symbol ?create\@FlagAllPassengersForPositioningSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@FlagAllPassengersForPositioningSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp index 8122172ac8..661ca4e612 100644 --- a/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlagPassengerRemovalSystem.hpp @@ -28,12 +28,12 @@ class FlagPassengerRemovalSystem { public: /** - * @symbol ?createDeferredSystem\@FlagPassengerRemovalSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createDeferredSystem\@FlagPassengerRemovalSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createDeferredSystem(); /** - * @symbol ?tickDeferredPassengerRemoval\@FlagPassengerRemovalSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z + * @symbol ?tickDeferredPassengerRemoval\@FlagPassengerRemovalSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPendingRemovePassengersComponent\@\@\@\@\@Z */ MCAPI static void tickDeferredPassengerRemoval(class StrictEntityContext const &, struct VehicleComponent const &, class ViewT>>, class EntityModifierT); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp b/LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp index f93c13639e..175b1cb517 100644 --- a/LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp +++ b/LiteLoader/include/llapi/mc/FlatWorldGenerator.hpp @@ -32,73 +32,73 @@ class FlatWorldGenerator { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FLATWORLDGENERATOR /** - * @symbol ?decorateWorldGenLoadChunk\@FlatWorldGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z + * @symbol ?decorateWorldGenLoadChunk\@FlatWorldGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z */ MCVAPI void decorateWorldGenLoadChunk(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &) const; /** - * @symbol ?decorateWorldGenPostProcess\@FlatWorldGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @symbol ?decorateWorldGenPostProcess\@FlatWorldGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z */ MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; /** - * @symbol ?findNearestStructureFeature\@FlatWorldGenerator\@\@UEAA_NW4StructureFeatureType\@\@AEBVBlockPos\@\@AEAV3\@_N\@Z + * @symbol ?findNearestStructureFeature\@FlatWorldGenerator\@\@UEAA_NW4StructureFeatureType\@\@AEBVBlockPos\@\@AEAV3\@_N\@Z */ MCVAPI bool findNearestStructureFeature(enum class StructureFeatureType, class BlockPos const &, class BlockPos &, bool); /** - * @symbol ?findSpawnPosition\@FlatWorldGenerator\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?findSpawnPosition\@FlatWorldGenerator\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos findSpawnPosition() const; /** - * @symbol ?findStructureFeatureTypeAt\@FlatWorldGenerator\@\@UEAA?AW4StructureFeatureType\@\@AEBVBlockPos\@\@\@Z + * @symbol ?findStructureFeatureTypeAt\@FlatWorldGenerator\@\@UEAA?AW4StructureFeatureType\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class StructureFeatureType findStructureFeatureTypeAt(class BlockPos const &); /** - * @symbol ?garbageCollectBlueprints\@FlatWorldGenerator\@\@UEAAXV?$buffer_span\@VChunkPos\@\@\@\@\@Z + * @symbol ?garbageCollectBlueprints\@FlatWorldGenerator\@\@UEAAXV?$buffer_span\@VChunkPos\@\@\@\@\@Z */ MCVAPI void garbageCollectBlueprints(class buffer_span); /** - * @symbol ?getBiomeArea\@FlatWorldGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + * @symbol ?getBiomeArea\@FlatWorldGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z */ MCVAPI class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; /** - * @symbol ?getBiomeSource\@FlatWorldGenerator\@\@UEBAAEBVBiomeSource\@\@XZ + * @symbol ?getBiomeSource\@FlatWorldGenerator\@\@UEBAAEBVBiomeSource\@\@XZ */ MCVAPI class BiomeSource const & getBiomeSource() const; /** - * @symbol ?getBlockVolumeDimensions\@FlatWorldGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ + * @symbol ?getBlockVolumeDimensions\@FlatWorldGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ */ MCVAPI struct WorldGenerator::BlockVolumeDimensions getBlockVolumeDimensions() const; /** - * @symbol ?isStructureFeatureTypeAt\@FlatWorldGenerator\@\@UEBA_NAEBVBlockPos\@\@W4StructureFeatureType\@\@\@Z + * @symbol ?isStructureFeatureTypeAt\@FlatWorldGenerator\@\@UEBA_NAEBVBlockPos\@\@W4StructureFeatureType\@\@\@Z */ MCVAPI bool isStructureFeatureTypeAt(class BlockPos const &, enum class StructureFeatureType) const; /** - * @symbol ?loadChunk\@FlatWorldGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @symbol ?loadChunk\@FlatWorldGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ MCVAPI void loadChunk(class LevelChunk &, bool); /** - * @symbol ?postProcess\@FlatWorldGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + * @symbol ?postProcess\@FlatWorldGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z */ MCVAPI bool postProcess(class ChunkViewSource &); /** - * @symbol ?prepareAndComputeHeights\@FlatWorldGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@_NH\@Z + * @symbol ?prepareAndComputeHeights\@FlatWorldGenerator\@\@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\@FlatWorldGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z + * @symbol ?prepareHeights\@FlatWorldGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z */ MCVAPI void prepareHeights(class BlockVolume &, class ChunkPos const &, bool); #endif /** - * @symbol ??0FlatWorldGenerator\@\@QEAA\@AEAVDimension\@\@IAEBVValue\@Json\@\@\@Z + * @symbol ??0FlatWorldGenerator\@\@QEAA\@AEAVDimension\@\@IAEBVValue\@Json\@\@\@Z */ MCAPI FlatWorldGenerator(class Dimension &, unsigned int, class Json::Value const &); //private: /** - * @symbol ?_generatePrototypeBlockValues\@FlatWorldGenerator\@\@AEAAXAEBVFlatWorldGeneratorOptions\@\@F\@Z + * @symbol ?_generatePrototypeBlockValues\@FlatWorldGenerator\@\@AEAAXAEBVFlatWorldGeneratorOptions\@\@F\@Z */ MCAPI void _generatePrototypeBlockValues(class FlatWorldGeneratorOptions const &, short); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp b/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp index 150b76e0a1..90fe284191 100644 --- a/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp +++ b/LiteLoader/include/llapi/mc/FlatWorldGeneratorOptions.hpp @@ -31,24 +31,24 @@ class FlatWorldGeneratorOptions { public: /** - * @symbol ??0FlatWorldGeneratorOptions\@\@QEAA\@AEBVValue\@Json\@\@AEBVBlockPalette\@\@AEBVLevelData\@\@\@Z + * @symbol ??0FlatWorldGeneratorOptions\@\@QEAA\@AEBVValue\@Json\@\@AEBVBlockPalette\@\@AEBVLevelData\@\@\@Z */ MCAPI FlatWorldGeneratorOptions(class Json::Value const &, class BlockPalette const &, class LevelData const &); /** - * @symbol ??1FlatWorldGeneratorOptions\@\@QEAA\@XZ + * @symbol ??1FlatWorldGeneratorOptions\@\@QEAA\@XZ */ MCAPI ~FlatWorldGeneratorOptions(); /** - * @symbol ?getLayers\@FlatWorldGeneratorOptions\@\@SA?AVValue\@Json\@\@AEBVLevelData\@\@\@Z + * @symbol ?getLayers\@FlatWorldGeneratorOptions\@\@SA?AVValue\@Json\@\@AEBVLevelData\@\@\@Z */ MCAPI static class Json::Value getLayers(class LevelData const &); //protected: /** - * @symbol ?_load\@FlatWorldGeneratorOptions\@\@IEAA_NAEBVValue\@Json\@\@AEBVBlockPalette\@\@AEBVLevelData\@\@\@Z + * @symbol ?_load\@FlatWorldGeneratorOptions\@\@IEAA_NAEBVValue\@Json\@\@AEBVBlockPalette\@\@AEBVLevelData\@\@\@Z */ MCAPI bool _load(class Json::Value const &, class BlockPalette const &, class LevelData const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FleeSunGoal.hpp b/LiteLoader/include/llapi/mc/FleeSunGoal.hpp index e45749449f..280fcb0dc2 100644 --- a/LiteLoader/include/llapi/mc/FleeSunGoal.hpp +++ b/LiteLoader/include/llapi/mc/FleeSunGoal.hpp @@ -31,33 +31,33 @@ class FleeSunGoal : public FindCoverGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FleeSunGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FleeSunGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FleeSunGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FleeSunGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FleeSunGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FleeSunGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0FleeSunGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI FleeSunGoal(class Mob &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp index be3c168949..e653a7f291 100644 --- a/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp +++ b/LiteLoader/include/llapi/mc/FlintAndSteelItem.hpp @@ -32,108 +32,108 @@ class FlintAndSteelItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlintAndSteelItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@FlintAndSteelItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@FlintAndSteelItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@FlintAndSteelItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@FlintAndSteelItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@FlintAndSteelItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@FlintAndSteelItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@FlintAndSteelItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@FlintAndSteelItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@FlintAndSteelItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@FlintAndSteelItem\@\@MEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@FlintAndSteelItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@FlintAndSteelItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0FlintAndSteelItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FlintAndSteelItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FlintAndSteelItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FloatComponent.hpp b/LiteLoader/include/llapi/mc/FloatComponent.hpp index b730d1d8ba..3f7389845b 100644 --- a/LiteLoader/include/llapi/mc/FloatComponent.hpp +++ b/LiteLoader/include/llapi/mc/FloatComponent.hpp @@ -25,7 +25,7 @@ struct FloatComponent { public: /** - * @symbol ?getDiff\@FloatComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z + * @symbol ?getDiff\@FloatComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z */ MCAPI static class std::optional getDiff(struct FloatComponent const &, struct FloatComponent const &); diff --git a/LiteLoader/include/llapi/mc/FloatGoal.hpp b/LiteLoader/include/llapi/mc/FloatGoal.hpp index 609e32ccef..a19281af0b 100644 --- a/LiteLoader/include/llapi/mc/FloatGoal.hpp +++ b/LiteLoader/include/llapi/mc/FloatGoal.hpp @@ -30,48 +30,48 @@ class FloatGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FloatGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FloatGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FloatGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@FloatGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FloatGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FloatGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FloatGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FloatGoal\@\@QEAA\@AEAVMob\@\@_N\@Z + * @symbol ??0FloatGoal\@\@QEAA\@AEAVMob\@\@_N\@Z */ MCAPI FloatGoal(class Mob &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FloatNavigation.hpp b/LiteLoader/include/llapi/mc/FloatNavigation.hpp index dbe0263643..ea1202a966 100644 --- a/LiteLoader/include/llapi/mc/FloatNavigation.hpp +++ b/LiteLoader/include/llapi/mc/FloatNavigation.hpp @@ -31,14 +31,14 @@ class FloatNavigation : public PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FloatNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?travel\@FloatNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAM22\@Z + * @vftbl 10 + * @symbol ?travel\@FloatNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAM22\@Z */ virtual bool travel(class NavigationComponent &, class Mob &, float &, float &, float &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FloatRange.hpp b/LiteLoader/include/llapi/mc/FloatRange.hpp index 0a445d23d4..50a14442ff 100644 --- a/LiteLoader/include/llapi/mc/FloatRange.hpp +++ b/LiteLoader/include/llapi/mc/FloatRange.hpp @@ -31,11 +31,11 @@ struct FloatRange { public: /** - * @symbol ?getValue\@FloatRange\@\@QEBAMAEAVRandom\@\@\@Z + * @symbol ?getValue\@FloatRange\@\@QEBAMAEAVRandom\@\@\@Z */ MCAPI float getValue(class Random &) const; /** - * @symbol ?parseJson\@FloatRange\@\@QEAA_NAEBVValue\@Json\@\@MM\@Z + * @symbol ?parseJson\@FloatRange\@\@QEAA_NAEBVValue\@Json\@\@MM\@Z */ MCAPI bool parseJson(class Json::Value const &, float, float); diff --git a/LiteLoader/include/llapi/mc/FloatTag.hpp b/LiteLoader/include/llapi/mc/FloatTag.hpp index f401367a41..d4e7ee60b8 100644 --- a/LiteLoader/include/llapi/mc/FloatTag.hpp +++ b/LiteLoader/include/llapi/mc/FloatTag.hpp @@ -39,52 +39,58 @@ float val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FloatTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@FloatTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@FloatTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@FloatTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@FloatTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@FloatTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@FloatTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@FloatTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@FloatTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@FloatTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@FloatTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@FloatTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@FloatTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@FloatTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@FloatTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FLOATTAG /** - * @symbol ??0FloatTag\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FloatTag(); +#endif + /** + * @symbol ??0FloatTag\@\@QEAA\@XZ */ MCAPI FloatTag(); /** - * @symbol ??0FloatTag\@\@QEAA\@M\@Z + * @symbol ??0FloatTag\@\@QEAA\@M\@Z */ MCAPI FloatTag(float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FloatWanderGoal.hpp b/LiteLoader/include/llapi/mc/FloatWanderGoal.hpp index fdb0a2314b..1785b8c2cb 100644 --- a/LiteLoader/include/llapi/mc/FloatWanderGoal.hpp +++ b/LiteLoader/include/llapi/mc/FloatWanderGoal.hpp @@ -30,56 +30,56 @@ class FloatWanderGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FloatWanderGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FloatWanderGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FloatWanderGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@FloatWanderGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FloatWanderGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FloatWanderGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FloatWanderGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FloatWanderGoal\@\@QEAA\@AEAVMob\@\@MMM_N1UFloatRange\@\@\@Z + * @symbol ??0FloatWanderGoal\@\@QEAA\@AEAVMob\@\@MMM_N1UFloatRange\@\@\@Z */ MCAPI FloatWanderGoal(class Mob &, float, float, float, bool, bool, struct FloatRange); //private: /** - * @symbol ?_canReach\@FloatWanderGoal\@\@AEAA_NAEBVVec3\@\@M\@Z + * @symbol ?_canReach\@FloatWanderGoal\@\@AEAA_NAEBVVec3\@\@M\@Z */ MCAPI bool _canReach(class Vec3 const &, float); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FloatsInLiquidDefinition.hpp b/LiteLoader/include/llapi/mc/FloatsInLiquidDefinition.hpp index 00785b6e43..c5ad60a2b4 100644 --- a/LiteLoader/include/llapi/mc/FloatsInLiquidDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FloatsInLiquidDefinition.hpp @@ -31,7 +31,7 @@ struct FloatsInLiquidDefinition { public: /** - * @symbol ?buildSchema\@FloatsInLiquidDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFloatsInLiquidDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@FloatsInLiquidDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFloatsInLiquidDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/FlockingComponent.hpp b/LiteLoader/include/llapi/mc/FlockingComponent.hpp index f46e0c7682..de7408baaa 100644 --- a/LiteLoader/include/llapi/mc/FlockingComponent.hpp +++ b/LiteLoader/include/llapi/mc/FlockingComponent.hpp @@ -29,56 +29,56 @@ class FlockingComponent { public: /** - * @symbol ??0FlockingComponent\@\@QEAA\@XZ + * @symbol ??0FlockingComponent\@\@QEAA\@XZ */ MCAPI FlockingComponent(); /** - * @symbol ??0FlockingComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0FlockingComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI FlockingComponent(class FlockingComponent &&); /** - * @symbol ?addFlockMember\@FlockingComponent\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?addFlockMember\@FlockingComponent\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void addFlockMember(struct ActorUniqueID); /** - * @symbol ?breakFlock\@FlockingComponent\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?breakFlock\@FlockingComponent\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void breakFlock(class Actor const &); /** - * @symbol ?calculateFlockVector\@FlockingComponent\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?calculateFlockVector\@FlockingComponent\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void calculateFlockVector(class Actor const &); /** - * @symbol ?calculateGoalHeading\@FlockingComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?calculateGoalHeading\@FlockingComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void calculateGoalHeading(class Mob &); /** - * @symbol ?canJoinFlock\@FlockingComponent\@\@QEBA_NAEAVActor\@\@\@Z + * @symbol ?canJoinFlock\@FlockingComponent\@\@QEBA_NAEAVActor\@\@\@Z */ MCAPI bool canJoinFlock(class Actor &) const; /** - * @symbol ?joinFlock\@FlockingComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?joinFlock\@FlockingComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void joinFlock(class Actor &); /** - * @symbol ?manageNeighborhood\@FlockingComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?manageNeighborhood\@FlockingComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void manageNeighborhood(class Actor &); /** - * @symbol ?mergeNeighborhoods\@FlockingComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?mergeNeighborhoods\@FlockingComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void mergeNeighborhoods(class Actor &); /** - * @symbol ??4FlockingComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4FlockingComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class FlockingComponent & operator=(class FlockingComponent &&); /** - * @symbol ?updateNeighborhoodData\@FlockingComponent\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?updateNeighborhoodData\@FlockingComponent\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void updateNeighborhoodData(class Actor const &); /** - * @symbol ?validateVariantEntityTypes\@FlockingComponent\@\@QEBA_NAEBVActor\@\@0\@Z + * @symbol ?validateVariantEntityTypes\@FlockingComponent\@\@QEBA_NAEBVActor\@\@0\@Z */ MCAPI bool validateVariantEntityTypes(class Actor const &, class Actor const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlockingDefinition.hpp b/LiteLoader/include/llapi/mc/FlockingDefinition.hpp index fcc1f2a89a..9e9f66eef9 100644 --- a/LiteLoader/include/llapi/mc/FlockingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FlockingDefinition.hpp @@ -30,16 +30,16 @@ class FlockingDefinition { public: /** - * @symbol ??0FlockingDefinition\@\@QEAA\@XZ + * @symbol ??0FlockingDefinition\@\@QEAA\@XZ */ MCAPI FlockingDefinition(); /** - * @symbol ?initialize\@FlockingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVFlockingComponent\@\@\@Z + * @symbol ?initialize\@FlockingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVFlockingComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class FlockingComponent &) const; /** - * @symbol ?buildSchema\@FlockingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VFlockingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@FlockingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VFlockingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlockingSystem.hpp b/LiteLoader/include/llapi/mc/FlockingSystem.hpp index e4d66f57de..d8a5b94dd4 100644 --- a/LiteLoader/include/llapi/mc/FlockingSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlockingSystem.hpp @@ -30,19 +30,19 @@ class FlockingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlockingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@FlockingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@FlockingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlockingUtility.hpp b/LiteLoader/include/llapi/mc/FlockingUtility.hpp index 977ee362e3..3357502c4c 100644 --- a/LiteLoader/include/llapi/mc/FlockingUtility.hpp +++ b/LiteLoader/include/llapi/mc/FlockingUtility.hpp @@ -22,15 +22,15 @@ namespace FlockingUtility { #undef AFTER_EXTRA /** - * @symbol ?checkForSteeringCollision\@FlockingUtility\@\@YA_NAEAVActor\@\@AEBVVec3\@\@MAEAV3\@\@Z + * @symbol ?checkForSteeringCollision\@FlockingUtility\@\@YA_NAEAVActor\@\@AEBVVec3\@\@MAEAV3\@\@Z */ MCAPI bool checkForSteeringCollision(class Actor &, class Vec3 const &, float, class Vec3 &); /** - * @symbol ?chooseRandomDirection\@FlockingUtility\@\@YAXAEAVActor\@\@AEAVVec3\@\@\@Z + * @symbol ?chooseRandomDirection\@FlockingUtility\@\@YAXAEAVActor\@\@AEAVVec3\@\@\@Z */ MCAPI void chooseRandomDirection(class Actor &, class Vec3 &); /** - * @symbol ?getWaterHeights\@FlockingUtility\@\@YAXAEBVActor\@\@AEAM1\@Z + * @symbol ?getWaterHeights\@FlockingUtility\@\@YAXAEBVActor\@\@AEAM1\@Z */ MCAPI void getWaterHeights(class Actor const &, float &, float &); diff --git a/LiteLoader/include/llapi/mc/FlowerBlock.hpp b/LiteLoader/include/llapi/mc/FlowerBlock.hpp index c8e327f6ad..bdbdcedae7 100644 --- a/LiteLoader/include/llapi/mc/FlowerBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerBlock.hpp @@ -31,273 +31,278 @@ class FlowerBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlowerBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@FlowerBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@FlowerBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@FlowerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@FlowerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@FlowerBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@FlowerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@FlowerBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@FlowerBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@FlowerBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@FlowerBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@FlowerBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@FlowerBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@FlowerBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@FlowerBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@FlowerBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 179 - * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 180 + * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@FlowerBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@FlowerBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@FlowerBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0FlowerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@AEBVMaterial\@\@\@Z + * @symbol ??0FlowerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@AEBVMaterial\@\@\@Z */ MCAPI FlowerBlock(std::string const &, int, enum class FlowerBlock::Type, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlowerFeature.hpp b/LiteLoader/include/llapi/mc/FlowerFeature.hpp index 04c6a7f62e..c38010ac73 100644 --- a/LiteLoader/include/llapi/mc/FlowerFeature.hpp +++ b/LiteLoader/include/llapi/mc/FlowerFeature.hpp @@ -31,26 +31,32 @@ class FlowerFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlowerFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@FlowerFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@FlowerFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FLOWERFEATURE /** - * @symbol ??0FlowerFeature\@\@QEAA\@AEBVBlock\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FlowerFeature(); +#endif + /** + * @symbol ??0FlowerFeature\@\@QEAA\@AEBVBlock\@\@\@Z */ MCAPI FlowerFeature(class Block const &); //private: /** - * @symbol ?_placeMushroom\@FlowerFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandom\@\@\@Z + * @symbol ?_placeMushroom\@FlowerFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandom\@\@\@Z */ MCAPI bool _placeMushroom(class BlockSource &, class BlockPos const &, class Block const &, class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlowerHelper.hpp b/LiteLoader/include/llapi/mc/FlowerHelper.hpp index 08fde2cdd5..8d1397f5fd 100644 --- a/LiteLoader/include/llapi/mc/FlowerHelper.hpp +++ b/LiteLoader/include/llapi/mc/FlowerHelper.hpp @@ -22,11 +22,11 @@ namespace FlowerHelper { #undef AFTER_EXTRA /** - * @symbol ?getRandomFlowerBlock\@FlowerHelper\@\@YAAEBVBlock\@\@AEBVBiome\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVBiomeRegistry\@\@AEBVPerlinSimplexNoise\@\@\@Z + * @symbol ?getRandomFlowerBlock\@FlowerHelper\@\@YAAEBVBlock\@\@AEBVBiome\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVBiomeRegistry\@\@AEBVPerlinSimplexNoise\@\@\@Z */ MCAPI class Block const & getRandomFlowerBlock(class Biome const &, class BlockPos const &, class Random &, class BiomeRegistry &, class PerlinSimplexNoise const &); /** - * @symbol ?getRandomFlowerBlock\@FlowerHelper\@\@YAAEBVBlock\@\@W4FlowerPlacementType\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBVPerlinSimplexNoise\@\@\@Z + * @symbol ?getRandomFlowerBlock\@FlowerHelper\@\@YAAEBVBlock\@\@W4FlowerPlacementType\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBVPerlinSimplexNoise\@\@\@Z */ MCAPI class Block const & getRandomFlowerBlock(enum class FlowerPlacementType, class BlockPos const &, class Random &, class PerlinSimplexNoise const &); diff --git a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp index 2db8eccd08..50112902b5 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlock.hpp @@ -31,283 +31,288 @@ class FlowerPotBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlowerPotBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@FlowerPotBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@FlowerPotBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@FlowerPotBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@FlowerPotBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@FlowerPotBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@FlowerPotBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@FlowerPotBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@FlowerPotBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FLOWERPOTBLOCK /** - * @symbol ?isInteractiveBlock\@FlowerPotBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@FlowerPotBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; /** - * @symbol ?waterSpreadCausesSpawn\@FlowerPotBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@FlowerPotBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0FlowerPotBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FlowerPotBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FlowerPotBlock(std::string const &, int); /** - * @symbol ?isSupportedBlock\@FlowerPotBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isSupportedBlock\@FlowerPotBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isSupportedBlock(class Block const &); //private: /** - * @symbol ?_tryPlaceFlower\@FlowerPotBlock\@\@AEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_tryPlaceFlower\@FlowerPotBlock\@\@AEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _tryPlaceFlower(class Player &, class BlockPos const &) const; /** - * @symbol ?_tryTakeFlower\@FlowerPotBlock\@\@AEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_tryTakeFlower\@FlowerPotBlock\@\@AEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _tryTakeFlower(class Player &, class BlockPos const &) const; /** - * @symbol ?_updateFlowerPotEntity\@FlowerPotBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVFlowerPotBlockActor\@\@PEBVBlock\@\@AEAVActor\@\@\@Z + * @symbol ?_updateFlowerPotEntity\@FlowerPotBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVFlowerPotBlockActor\@\@PEBVBlock\@\@AEAVActor\@\@\@Z */ MCAPI void _updateFlowerPotEntity(class BlockSource &, class BlockPos const &, class FlowerPotBlockActor *, class Block const *, class Actor &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp index 952d832f16..74d071ecbc 100644 --- a/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FlowerPotBlockActor.hpp @@ -31,86 +31,86 @@ class FlowerPotBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlowerPotBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@FlowerPotBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@FlowerPotBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@FlowerPotBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@FlowerPotBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 8 - * @symbol ?onChanged\@FlowerPotBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@FlowerPotBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@FlowerPotBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@FlowerPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@FlowerPotBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0FlowerPotBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0FlowerPotBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI FlowerPotBlockActor(class BlockPos const &); /** - * @symbol ?getPlantItem\@FlowerPotBlockActor\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getPlantItem\@FlowerPotBlockActor\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getPlantItem() const; /** - * @symbol ?setPlantItem\@FlowerPotBlockActor\@\@QEAAXPEBVBlock\@\@\@Z + * @symbol ?setPlantItem\@FlowerPotBlockActor\@\@QEAAXPEBVBlock\@\@\@Z */ MCAPI void setPlantItem(class Block const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlushableEnv.hpp b/LiteLoader/include/llapi/mc/FlushableEnv.hpp index 41ee6443e9..5c44cd8952 100644 --- a/LiteLoader/include/llapi/mc/FlushableEnv.hpp +++ b/LiteLoader/include/llapi/mc/FlushableEnv.hpp @@ -30,108 +30,114 @@ class FlushableEnv { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlushableEnv(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?NewSequentialFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@2\@\@Z + * @vftbl 1 + * @symbol ?NewSequentialFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@2\@\@Z */ virtual class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @vftbl 2 - * @symbol ?NewRandomAccessFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@2\@\@Z + * @vftbl 2 + * @symbol ?NewRandomAccessFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@2\@\@Z */ virtual class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @vftbl 3 - * @symbol ?NewWritableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 3 + * @symbol ?NewWritableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 4 - * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 4 + * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 5 - * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool FileExists(std::string const &); /** - * @vftbl 6 - * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @vftbl 6 + * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ virtual class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @vftbl 7 - * @symbol ?DeleteFileA\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?DeleteFileA\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteFileA(std::string const &); /** - * @vftbl 8 - * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status CreateDir(std::string const &); /** - * @vftbl 9 - * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteDir(std::string const &); /** - * @vftbl 10 - * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @vftbl 10 + * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ virtual class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @vftbl 11 - * @symbol ?RenameFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 11 + * @symbol ?RenameFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @vftbl 12 - * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z + * @vftbl 12 + * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z */ virtual class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @vftbl 13 - * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z + * @vftbl 13 + * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z */ virtual class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @vftbl 14 - * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 14 + * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void Schedule(void ( *)(void *), void *); /** - * @vftbl 15 - * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 15 + * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void StartThread(void ( *)(void *), void *); /** - * @vftbl 16 - * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status GetTestDirectory(std::string *); /** - * @vftbl 17 - * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z + * @vftbl 17 + * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z */ virtual class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @vftbl 18 - * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ + * @vftbl 18 + * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ */ virtual unsigned __int64 NowMicros(); /** - * @vftbl 19 - * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z + * @vftbl 19 + * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FLUSHABLEENV /** - * @symbol ??0FlushableEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FlushableEnv(); +#endif + /** + * @symbol ??0FlushableEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z */ MCAPI FlushableEnv(class leveldb::Env *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp b/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp index f0633a25ac..1d4e95fa8f 100644 --- a/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp +++ b/LiteLoader/include/llapi/mc/FlushableStorageAreaEnv.hpp @@ -31,113 +31,113 @@ class FlushableStorageAreaEnv { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlushableStorageAreaEnv(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?NewSequentialFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@2\@\@Z + * @vftbl 1 + * @symbol ?NewSequentialFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@2\@\@Z */ virtual class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @vftbl 2 - * @symbol ?NewRandomAccessFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@2\@\@Z + * @vftbl 2 + * @symbol ?NewRandomAccessFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@2\@\@Z */ virtual class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @vftbl 3 - * @symbol ?NewWritableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 3 + * @symbol ?NewWritableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 4 - * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z + * @vftbl 4 + * @symbol ?NewAppendableFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@2\@\@Z */ virtual class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 5 - * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool FileExists(std::string const &); /** - * @vftbl 6 - * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @vftbl 6 + * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ virtual class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @vftbl 7 - * @symbol ?DeleteFileA\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?DeleteFileA\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteFileA(std::string const &); /** - * @vftbl 8 - * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status CreateDir(std::string const &); /** - * @vftbl 9 - * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteDir(std::string const &); /** - * @vftbl 10 - * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @vftbl 10 + * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ virtual class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @vftbl 11 - * @symbol ?RenameFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 11 + * @symbol ?RenameFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @vftbl 12 - * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z + * @vftbl 12 + * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z */ virtual class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @vftbl 13 - * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z + * @vftbl 13 + * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z */ virtual class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @vftbl 14 - * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 14 + * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void Schedule(void ( *)(void *), void *); /** - * @vftbl 15 - * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 15 + * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void StartThread(void ( *)(void *), void *); /** - * @vftbl 16 - * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status GetTestDirectory(std::string *); /** - * @vftbl 17 - * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z + * @vftbl 17 + * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z */ virtual class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @vftbl 18 - * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ + * @vftbl 18 + * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ */ virtual unsigned __int64 NowMicros(); /** - * @vftbl 19 - * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z + * @vftbl 19 + * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); /** - * @vftbl 20 - * @symbol ?flushToPermanentStorage\@FlushableStorageAreaEnv\@\@UEAAXXZ + * @vftbl 20 + * @symbol ?flushToPermanentStorage\@FlushableStorageAreaEnv\@\@UEAAXXZ */ virtual void flushToPermanentStorage(); /** - * @symbol ??0FlushableStorageAreaEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@\@Z + * @symbol ??0FlushableStorageAreaEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@V?$shared_ptr\@VFileStorageArea\@Core\@\@\@std\@\@\@Z */ MCAPI FlushableStorageAreaEnv(class leveldb::Env *, class std::shared_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlyDefinition.hpp b/LiteLoader/include/llapi/mc/FlyDefinition.hpp index 5fae3b96f1..6dcb9ffcc8 100644 --- a/LiteLoader/include/llapi/mc/FlyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FlyDefinition.hpp @@ -32,14 +32,14 @@ class FlyDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlyDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@FlyDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@FlyDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlyMoveControl.hpp b/LiteLoader/include/llapi/mc/FlyMoveControl.hpp index 8aab90f738..150ec39de7 100644 --- a/LiteLoader/include/llapi/mc/FlyMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/FlyMoveControl.hpp @@ -30,18 +30,18 @@ class FlyMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlyMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@FlyMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@FlyMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0FlyMoveControl\@\@QEAA\@XZ + * @symbol ??0FlyMoveControl\@\@QEAA\@XZ */ MCAPI FlyMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlyNode.hpp b/LiteLoader/include/llapi/mc/FlyNode.hpp index 7a241452ed..b9282af815 100644 --- a/LiteLoader/include/llapi/mc/FlyNode.hpp +++ b/LiteLoader/include/llapi/mc/FlyNode.hpp @@ -29,23 +29,23 @@ class FlyNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlyNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@FlyNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@FlyNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@FlyNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@FlyNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0FlyNode\@\@QEAA\@XZ + * @symbol ??0FlyNode\@\@QEAA\@XZ */ MCAPI FlyNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp b/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp index a39ab1b02f..e0d5a033e7 100644 --- a/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlySpeedControlSystem.hpp @@ -28,8 +28,8 @@ class FlySpeedControlSystem { public: /** - * @symbol ?createFlySpeedControlSystem\@FlySpeedControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createFlySpeedControlSystem\@FlySpeedControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createFlySpeedControlSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp b/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp index 6dd9995e34..3d8225db0f 100644 --- a/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlyTravelSystem.hpp @@ -28,8 +28,12 @@ class FlyTravelSystem { public: /** - * @symbol ?getPlayerFlySpeed\@FlyTravelSystem\@\@SAMAEBVLayeredAbilities\@\@VSynchedActorDataReader\@\@\@Z + * @symbol ?createFlyTravelSystem\@FlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createFlyTravelSystem(); + /** + * @symbol ?getPlayerFlySpeed\@FlyTravelSystem\@\@SAMAEBVLayeredAbilities\@\@VSynchedActorDataReader\@\@\@Z */ MCAPI static float getPlayerFlySpeed(class LayeredAbilities const &, class SynchedActorDataReader); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp index e9bccc52b7..8bddddc7ad 100644 --- a/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/FlyTriggerSystem.hpp @@ -28,12 +28,20 @@ class FlyTriggerSystem { public: /** - * @symbol ?createSystem\@FlyTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@FlyTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickEntity\@FlyTriggerSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBUAdventureSettingsComponent\@\@AEBUMoveInputComponent\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@AEAUAbilitiesComponent\@\@AEAUFallDistanceComponent\@\@AEAUSynchedActorDataComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z + * @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 */ - MCAPI static void tickEntity(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct AdventureSettingsComponent const &, struct MoveInputComponent const &, class Optional, class Optional, struct AbilitiesComponent &, struct FallDistanceComponent &, struct SynchedActorDataComponent &, struct VanillaClientGameplayComponent &, class ViewT>, class EntityModifierT); + 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); -}; \ No newline at end of file +//private: + /** + * @symbol ?_checkForFlyTrigger\@FlyTriggerSystem\@\@CA_NAEBUAbilitiesComponent\@\@PEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@\@Z + */ + MCAPI static bool _checkForFlyTrigger(struct AbilitiesComponent const &, struct PassengerComponent const *, class ViewT>); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp b/LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp index 25051fb913..b7bafc803f 100644 --- a/LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/FlyingPathNavigation.hpp @@ -31,61 +31,61 @@ class FlyingPathNavigation : public PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FlyingPathNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@FlyingPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@FlyingPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct NavigationDescription *); /** - * @vftbl 2 - * @symbol ?tick\@FlyingPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@FlyingPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class NavigationComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?getTempMobPos\@FlyingPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z + * @vftbl 3 + * @symbol ?getTempMobPos\@FlyingPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z */ virtual class Vec3 getTempMobPos(class Mob const &) const; /** - * @vftbl 4 - * @symbol ?createPath\@FlyingPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z + * @vftbl 4 + * @symbol ?createPath\@FlyingPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Vec3 const &); /** - * @vftbl 5 - * @symbol ?createPath\@FlyingPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z + * @vftbl 5 + * @symbol ?createPath\@FlyingPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Actor &); /** - * @vftbl 9 - * @symbol ?stop\@FlyingPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 9 + * @symbol ?stop\@FlyingPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void stop(class NavigationComponent &, class Mob &); /** - * @vftbl 11 - * @symbol ?canUpdatePath\@FlyingPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z + * @vftbl 11 + * @symbol ?canUpdatePath\@FlyingPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z */ virtual bool canUpdatePath(class Mob const &) const; /** - * @vftbl 12 - * @symbol ?updatePath\@FlyingPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 12 + * @symbol ?updatePath\@FlyingPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void updatePath(class NavigationComponent &, class Mob &); //private: /** - * @symbol ?_restorePreviousGravityFlag\@FlyingPathNavigation\@\@AEAAXAEAVMob\@\@\@Z + * @symbol ?_restorePreviousGravityFlag\@FlyingPathNavigation\@\@AEAAXAEAVMob\@\@\@Z */ MCAPI void _restorePreviousGravityFlag(class Mob &); /** - * @symbol ?_storePreviousGravityFlag\@FlyingPathNavigation\@\@AEAAXAEAVMob\@\@\@Z + * @symbol ?_storePreviousGravityFlag\@FlyingPathNavigation\@\@AEAAXAEAVMob\@\@\@Z */ MCAPI void _storePreviousGravityFlag(class Mob &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FlyingSpeedDefinition.hpp b/LiteLoader/include/llapi/mc/FlyingSpeedDefinition.hpp index d2d0799620..aa4b0511e0 100644 --- a/LiteLoader/include/llapi/mc/FlyingSpeedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FlyingSpeedDefinition.hpp @@ -31,7 +31,7 @@ struct FlyingSpeedDefinition { public: /** - * @symbol ?buildSchema\@FlyingSpeedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFlyingSpeedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@FlyingSpeedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFlyingSpeedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/FogCommand.hpp b/LiteLoader/include/llapi/mc/FogCommand.hpp index 253e11faf4..59e4ef92be 100644 --- a/LiteLoader/include/llapi/mc/FogCommand.hpp +++ b/LiteLoader/include/llapi/mc/FogCommand.hpp @@ -31,18 +31,18 @@ class FogCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FogCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@FogCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@FogCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@FogCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@FogCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FogCommandComponent.hpp b/LiteLoader/include/llapi/mc/FogCommandComponent.hpp index fda3b61ae0..46307acb37 100644 --- a/LiteLoader/include/llapi/mc/FogCommandComponent.hpp +++ b/LiteLoader/include/llapi/mc/FogCommandComponent.hpp @@ -30,32 +30,32 @@ class FogCommandComponent { public: /** - * @symbol ?addAdditionalSaveData\@FogCommandComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@FogCommandComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getFogSettingsStack\@FogCommandComponent\@\@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 + * @symbol ?getFogSettingsStack\@FogCommandComponent\@\@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 getFogSettingsStack() const; /** - * @symbol ??4FogCommandComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4FogCommandComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class FogCommandComponent & operator=(class FogCommandComponent &&); /** - * @symbol ?popFogSetting\@FogCommandComponent\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?popFogSetting\@FogCommandComponent\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool popFogSetting(std::string const &); /** - * @symbol ?pushFogSetting\@FogCommandComponent\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?pushFogSetting\@FogCommandComponent\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI bool pushFogSetting(std::string const &, std::string const &); /** - * @symbol ?readAdditionalSaveData\@FogCommandComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@FogCommandComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?removeFogSettings\@FogCommandComponent\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeFogSettings\@FogCommandComponent\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool removeFogSettings(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FogCommandSettings.hpp b/LiteLoader/include/llapi/mc/FogCommandSettings.hpp index cd18f204b4..4e8c1d5f01 100644 --- a/LiteLoader/include/llapi/mc/FogCommandSettings.hpp +++ b/LiteLoader/include/llapi/mc/FogCommandSettings.hpp @@ -25,7 +25,7 @@ struct FogCommandSettings { public: /** - * @symbol ??1FogCommandSettings\@\@QEAA\@XZ + * @symbol ??1FogCommandSettings\@\@QEAA\@XZ */ MCAPI ~FogCommandSettings(); diff --git a/LiteLoader/include/llapi/mc/FogCommandUtil.hpp b/LiteLoader/include/llapi/mc/FogCommandUtil.hpp index bb81e1d14d..daca785ef9 100644 --- a/LiteLoader/include/llapi/mc/FogCommandUtil.hpp +++ b/LiteLoader/include/llapi/mc/FogCommandUtil.hpp @@ -22,15 +22,15 @@ namespace FogCommandUtil { #undef AFTER_EXTRA /** - * @symbol ?pop\@FogCommandUtil\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVFogCommandComponent\@\@\@Z + * @symbol ?pop\@FogCommandUtil\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVFogCommandComponent\@\@\@Z */ MCAPI bool pop(std::string const &, std::string const &, class CommandOutput &, class Player &, class FogCommandComponent &); /** - * @symbol ?push\@FogCommandUtil\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVFogCommandComponent\@\@\@Z + * @symbol ?push\@FogCommandUtil\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVFogCommandComponent\@\@\@Z */ MCAPI bool push(std::string const &, std::string const &, class CommandOutput &, class Player &, class FogCommandComponent &); /** - * @symbol ?remove\@FogCommandUtil\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVFogCommandComponent\@\@\@Z + * @symbol ?remove\@FogCommandUtil\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVCommandOutput\@\@AEAVPlayer\@\@AEAVFogCommandComponent\@\@\@Z */ MCAPI bool remove(std::string const &, std::string const &, class CommandOutput &, class Player &, class FogCommandComponent &); diff --git a/LiteLoader/include/llapi/mc/FogDefinition.hpp b/LiteLoader/include/llapi/mc/FogDefinition.hpp index d2b47e35d5..594f392938 100644 --- a/LiteLoader/include/llapi/mc/FogDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FogDefinition.hpp @@ -30,79 +30,79 @@ struct FogDefinition { public: /** - * @symbol ?DEFAULT_DISTANCE_AIR_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_AIR_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_AIR_SETTING; /** - * @symbol ?DEFAULT_DISTANCE_LAVA_RESISTANCE_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_LAVA_RESISTANCE_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_LAVA_RESISTANCE_SETTING; /** - * @symbol ?DEFAULT_DISTANCE_LAVA_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_LAVA_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_LAVA_SETTING; /** - * @symbol ?DEFAULT_DISTANCE_NETHER_AIR_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_NETHER_AIR_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_NETHER_AIR_SETTING; /** - * @symbol ?DEFAULT_DISTANCE_POWDER_SNOW_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_POWDER_SNOW_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_POWDER_SNOW_SETTING; /** - * @symbol ?DEFAULT_DISTANCE_WATER_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_WATER_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_WATER_SETTING; /** - * @symbol ?DEFAULT_DISTANCE_WEATHER_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B + * @symbol ?DEFAULT_DISTANCE_WEATHER_SETTING\@FogDefinition\@\@2UFogDistanceSetting\@\@B */ MCAPI static struct FogDistanceSetting const DEFAULT_DISTANCE_WEATHER_SETTING; /** - * @symbol ?DEFAULT_FOG_AIR_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_AIR_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_AIR_SETTING; /** - * @symbol ?DEFAULT_FOG_DEFINITION\@FogDefinition\@\@2U1\@B + * @symbol ?DEFAULT_FOG_DEFINITION\@FogDefinition\@\@2U1\@B */ MCAPI static struct FogDefinition const DEFAULT_FOG_DEFINITION; /** - * @symbol ?DEFAULT_FOG_LAVA_RESISTANCE_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_LAVA_RESISTANCE_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_LAVA_RESISTANCE_SETTING; /** - * @symbol ?DEFAULT_FOG_LAVA_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_LAVA_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_LAVA_SETTING; /** - * @symbol ?DEFAULT_FOG_NETHER_AIR_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_NETHER_AIR_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_NETHER_AIR_SETTING; /** - * @symbol ?DEFAULT_FOG_POWDER_SNOW_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_POWDER_SNOW_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_POWDER_SNOW_SETTING; /** - * @symbol ?DEFAULT_FOG_WATER_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_WATER_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_WATER_SETTING; /** - * @symbol ?DEFAULT_FOG_WEATHER_SETTING\@FogDefinition\@\@2UFogSetting\@\@B + * @symbol ?DEFAULT_FOG_WEATHER_SETTING\@FogDefinition\@\@2UFogSetting\@\@B */ MCAPI static struct FogSetting const DEFAULT_FOG_WEATHER_SETTING; /** - * @symbol ?DEFAULT_VOLUME_COEFFICIENT_AIR_SETTING\@FogDefinition\@\@2UFogVolumetricCoefficientSetting\@\@B + * @symbol ?DEFAULT_VOLUME_COEFFICIENT_AIR_SETTING\@FogDefinition\@\@2UFogVolumetricCoefficientSetting\@\@B */ MCAPI static struct FogVolumetricCoefficientSetting const DEFAULT_VOLUME_COEFFICIENT_AIR_SETTING; /** - * @symbol ?DEFAULT_VOLUME_COEFFICIENT_CLOUD_SETTING\@FogDefinition\@\@2UFogVolumetricCoefficientSetting\@\@B + * @symbol ?DEFAULT_VOLUME_COEFFICIENT_CLOUD_SETTING\@FogDefinition\@\@2UFogVolumetricCoefficientSetting\@\@B */ MCAPI static struct FogVolumetricCoefficientSetting const DEFAULT_VOLUME_COEFFICIENT_CLOUD_SETTING; /** - * @symbol ?DEFAULT_VOLUME_COEFFICIENT_WATER_SETTING\@FogDefinition\@\@2UFogVolumetricCoefficientSetting\@\@B + * @symbol ?DEFAULT_VOLUME_COEFFICIENT_WATER_SETTING\@FogDefinition\@\@2UFogVolumetricCoefficientSetting\@\@B */ MCAPI static struct FogVolumetricCoefficientSetting const DEFAULT_VOLUME_COEFFICIENT_WATER_SETTING; /** - * @symbol ?isValidIdentifier\@FogDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isValidIdentifier\@FogDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isValidIdentifier(std::string const &); diff --git a/LiteLoader/include/llapi/mc/FogDistanceSetting.hpp b/LiteLoader/include/llapi/mc/FogDistanceSetting.hpp index 88333f7c80..fe9182860f 100644 --- a/LiteLoader/include/llapi/mc/FogDistanceSetting.hpp +++ b/LiteLoader/include/llapi/mc/FogDistanceSetting.hpp @@ -30,7 +30,7 @@ struct FogDistanceSetting { public: /** - * @symbol ?ZERO_SETTING\@FogDistanceSetting\@\@2U1\@B + * @symbol ?ZERO_SETTING\@FogDistanceSetting\@\@2U1\@B */ MCAPI static struct FogDistanceSetting const ZERO_SETTING; diff --git a/LiteLoader/include/llapi/mc/FogSetting.hpp b/LiteLoader/include/llapi/mc/FogSetting.hpp index 9234be34eb..cf93e08513 100644 --- a/LiteLoader/include/llapi/mc/FogSetting.hpp +++ b/LiteLoader/include/llapi/mc/FogSetting.hpp @@ -28,7 +28,7 @@ struct FogSetting { public: /** - * @symbol ?ZERO_SETTING\@FogSetting\@\@2U1\@B + * @symbol ?ZERO_SETTING\@FogSetting\@\@2U1\@B */ MCAPI static struct FogSetting const ZERO_SETTING; diff --git a/LiteLoader/include/llapi/mc/FogTransitionSetting.hpp b/LiteLoader/include/llapi/mc/FogTransitionSetting.hpp index 402f1b4680..475a8e5e0d 100644 --- a/LiteLoader/include/llapi/mc/FogTransitionSetting.hpp +++ b/LiteLoader/include/llapi/mc/FogTransitionSetting.hpp @@ -28,7 +28,7 @@ struct FogTransitionSetting { public: /** - * @symbol ?ZERO_SETTING\@FogTransitionSetting\@\@2U1\@B + * @symbol ?ZERO_SETTING\@FogTransitionSetting\@\@2U1\@B */ MCAPI static struct FogTransitionSetting const ZERO_SETTING; diff --git a/LiteLoader/include/llapi/mc/FogVolumetricCoefficientSetting.hpp b/LiteLoader/include/llapi/mc/FogVolumetricCoefficientSetting.hpp index d2c611420b..dde9a8a526 100644 --- a/LiteLoader/include/llapi/mc/FogVolumetricCoefficientSetting.hpp +++ b/LiteLoader/include/llapi/mc/FogVolumetricCoefficientSetting.hpp @@ -30,7 +30,7 @@ struct FogVolumetricCoefficientSetting { public: /** - * @symbol ?ZERO_SETTING\@FogVolumetricCoefficientSetting\@\@2U1\@B + * @symbol ?ZERO_SETTING\@FogVolumetricCoefficientSetting\@\@2U1\@B */ MCAPI static struct FogVolumetricCoefficientSetting const ZERO_SETTING; diff --git a/LiteLoader/include/llapi/mc/FogVolumetricDensitySetting.hpp b/LiteLoader/include/llapi/mc/FogVolumetricDensitySetting.hpp index 6feb0da665..e33a216756 100644 --- a/LiteLoader/include/llapi/mc/FogVolumetricDensitySetting.hpp +++ b/LiteLoader/include/llapi/mc/FogVolumetricDensitySetting.hpp @@ -30,15 +30,15 @@ struct FogVolumetricDensitySetting { public: /** - * @symbol ?UNIFORM_MAX_DENSITY_HEIGHT\@FogVolumetricDensitySetting\@\@2MB + * @symbol ?UNIFORM_MAX_DENSITY_HEIGHT\@FogVolumetricDensitySetting\@\@2MB */ MCAPI static float const UNIFORM_MAX_DENSITY_HEIGHT; /** - * @symbol ?UNIFORM_ZERO_DENSITY_HEIGHT\@FogVolumetricDensitySetting\@\@2MB + * @symbol ?UNIFORM_ZERO_DENSITY_HEIGHT\@FogVolumetricDensitySetting\@\@2MB */ MCAPI static float const UNIFORM_ZERO_DENSITY_HEIGHT; /** - * @symbol ?ZERO_SETTING\@FogVolumetricDensitySetting\@\@2U1\@B + * @symbol ?ZERO_SETTING\@FogVolumetricDensitySetting\@\@2U1\@B */ MCAPI static struct FogVolumetricDensitySetting const ZERO_SETTING; diff --git a/LiteLoader/include/llapi/mc/FoliageColor.hpp b/LiteLoader/include/llapi/mc/FoliageColor.hpp index e5017c3b6f..256e38e5b8 100644 --- a/LiteLoader/include/llapi/mc/FoliageColor.hpp +++ b/LiteLoader/include/llapi/mc/FoliageColor.hpp @@ -32,88 +32,88 @@ enum class PaletteName; public: /** - * @symbol ?getBirchColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getBirchColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getBirchColor(float, float); /** - * @symbol ?getDefaultColor\@FoliageColor\@\@SAHXZ + * @symbol ?getDefaultColor\@FoliageColor\@\@SAHXZ */ MCAPI static int getDefaultColor(); /** - * @symbol ?getEvergreenColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getEvergreenColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getEvergreenColor(float, float); /** - * @symbol ?getFoliageColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getFoliageColor\@FoliageColor\@\@SAHW4PaletteName\@1\@MM\@Z */ - MCAPI static int getFoliageColor(float, float); + MCAPI static int getFoliageColor(enum class FoliageColor::PaletteName, float, float); /** - * @symbol ?getFoliageColor\@FoliageColor\@\@SAHW4PaletteName\@1\@MM\@Z + * @symbol ?getFoliageColor\@FoliageColor\@\@SAHMM\@Z */ - MCAPI static int getFoliageColor(enum class FoliageColor::PaletteName, float, float); + MCAPI static int getFoliageColor(float, float); /** - * @symbol ?getMapBirchColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getMapBirchColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getMapBirchColor(float, float); /** - * @symbol ?getMapEvergreenColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getMapEvergreenColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getMapEvergreenColor(float, float); /** - * @symbol ?getMapFoliageColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getMapFoliageColor\@FoliageColor\@\@SAHMM\@Z */ MCAPI static int getMapFoliageColor(float, float); /** - * @symbol ?getMapGrassColor\@FoliageColor\@\@SAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getMapGrassColor\@FoliageColor\@\@SAHMM\@Z */ - MCAPI static int getMapGrassColor(class BlockSource &, class BlockPos const &); + MCAPI static int getMapGrassColor(float, float); /** - * @symbol ?getMapGrassColor\@FoliageColor\@\@SAHMM\@Z + * @symbol ?getMapGrassColor\@FoliageColor\@\@SAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - MCAPI static int getMapGrassColor(float, float); + MCAPI static int getMapGrassColor(class BlockSource &, class BlockPos const &); //private: private: /** - * @symbol ?FOLIAGE_BOTTOM_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?FOLIAGE_BOTTOM_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const FOLIAGE_BOTTOM_LEFT; /** - * @symbol ?FOLIAGE_BOTTOM_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?FOLIAGE_BOTTOM_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const FOLIAGE_BOTTOM_RIGHT; /** - * @symbol ?FOLIAGE_TOP_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?FOLIAGE_TOP_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const FOLIAGE_TOP_LEFT; /** - * @symbol ?FOLIAGE_TOP_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?FOLIAGE_TOP_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const FOLIAGE_TOP_RIGHT; /** - * @symbol ?GRASS_BOTTOM_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?GRASS_BOTTOM_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const GRASS_BOTTOM_LEFT; /** - * @symbol ?GRASS_BOTTOM_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?GRASS_BOTTOM_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const GRASS_BOTTOM_RIGHT; /** - * @symbol ?GRASS_TOP_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?GRASS_TOP_LEFT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const GRASS_TOP_LEFT; /** - * @symbol ?GRASS_TOP_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B + * @symbol ?GRASS_TOP_RIGHT\@FoliageColor\@\@0VColor\@mce\@\@B */ MCAPI static class mce::Color const GRASS_TOP_RIGHT; /** - * @symbol ?mFoliagePalettes\@FoliageColor\@\@0V?$array\@V?$unique_ptr\@V?$array\@H$0BAAAA\@\@std\@\@U?$default_delete\@V?$array\@H$0BAAAA\@\@std\@\@\@2\@\@std\@\@$04\@std\@\@A + * @symbol ?mFoliagePalettes\@FoliageColor\@\@0V?$array\@V?$unique_ptr\@V?$array\@H$0BAAAA\@\@std\@\@U?$default_delete\@V?$array\@H$0BAAAA\@\@std\@\@\@2\@\@std\@\@$04\@std\@\@A */ MCAPI static class std::array>, 5> mFoliagePalettes; /** - * @symbol ?mGrassPalettes\@FoliageColor\@\@0V?$array\@V?$unique_ptr\@V?$array\@H$0BAAAA\@\@std\@\@U?$default_delete\@V?$array\@H$0BAAAA\@\@std\@\@\@2\@\@std\@\@$04\@std\@\@A + * @symbol ?mGrassPalettes\@FoliageColor\@\@0V?$array\@V?$unique_ptr\@V?$array\@H$0BAAAA\@\@std\@\@U?$default_delete\@V?$array\@H$0BAAAA\@\@std\@\@\@2\@\@std\@\@$04\@std\@\@A */ MCAPI static class std::array>, 5> mGrassPalettes; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp b/LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp index 0c3ac42f98..e8ef308a68 100644 --- a/LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowCaravanGoal.hpp @@ -30,60 +30,60 @@ class FollowCaravanGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FollowCaravanGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FollowCaravanGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FollowCaravanGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FollowCaravanGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FollowCaravanGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FollowCaravanGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FollowCaravanGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FollowCaravanGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FollowCaravanGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FollowCaravanGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FollowCaravanGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FollowCaravanGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FollowCaravanGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FollowCaravanGoal\@\@QEAA\@AEAVMob\@\@MHAEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0FollowCaravanGoal\@\@QEAA\@AEAVMob\@\@MHAEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI FollowCaravanGoal(class Mob &, float, int, std::vector const &); //private: /** - * @symbol ?checkCaravanType\@FollowCaravanGoal\@\@AEAA_NPEAVMob\@\@\@Z + * @symbol ?checkCaravanType\@FollowCaravanGoal\@\@AEAA_NPEAVMob\@\@\@Z */ MCAPI bool checkCaravanType(class Mob *); /** - * @symbol ?firstIsLeashed\@FollowCaravanGoal\@\@AEAA_NPEAVMob\@\@H\@Z + * @symbol ?firstIsLeashed\@FollowCaravanGoal\@\@AEAA_NPEAVMob\@\@H\@Z */ MCAPI bool firstIsLeashed(class Mob *, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FollowFlockGoal.hpp b/LiteLoader/include/llapi/mc/FollowFlockGoal.hpp index a6de8e7f8d..8f8ac2a93e 100644 --- a/LiteLoader/include/llapi/mc/FollowFlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowFlockGoal.hpp @@ -30,48 +30,48 @@ class FollowFlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FollowFlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FollowFlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FollowFlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FollowFlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FollowFlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@FollowFlockGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@FollowFlockGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@FollowFlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FollowFlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FollowFlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FollowFlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FollowFlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FollowFlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FollowFlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FollowFlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FollowFlockGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0FollowFlockGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI FollowFlockGoal(class Mob &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FollowMobGoal.hpp b/LiteLoader/include/llapi/mc/FollowMobGoal.hpp index 2297385928..cd3eef7a6d 100644 --- a/LiteLoader/include/llapi/mc/FollowMobGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowMobGoal.hpp @@ -30,56 +30,56 @@ class FollowMobGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FollowMobGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FollowMobGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FollowMobGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FollowMobGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FollowMobGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FollowMobGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FollowMobGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FollowMobGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FollowMobGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FollowMobGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FollowMobGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FollowMobGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FollowMobGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FollowMobGoal\@\@QEAA\@AEAVMob\@\@MMH\@Z + * @symbol ??0FollowMobGoal\@\@QEAA\@AEAVMob\@\@MMH\@Z */ MCAPI FollowMobGoal(class Mob &, float, float, int); //private: /** - * @symbol ?_setWantedMob\@FollowMobGoal\@\@AEAA_NXZ + * @symbol ?_setWantedMob\@FollowMobGoal\@\@AEAA_NXZ */ MCAPI bool _setWantedMob(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp b/LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp index 7a70777ef6..80e5c85922 100644 --- a/LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowOwnerGoal.hpp @@ -30,58 +30,58 @@ class FollowOwnerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FollowOwnerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FollowOwnerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FollowOwnerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FollowOwnerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FollowOwnerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FollowOwnerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FollowOwnerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FollowOwnerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FollowOwnerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FollowOwnerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FollowOwnerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FollowOwnerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FollowOwnerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?onPlayerDimensionChanged\@FollowOwnerGoal\@\@UEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @vftbl 9 + * @symbol ?onPlayerDimensionChanged\@FollowOwnerGoal\@\@UEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ virtual void onPlayerDimensionChanged(class Player *, class AutomaticID, class AutomaticID); /** - * @symbol ??0FollowOwnerGoal\@\@QEAA\@AEAVMob\@\@MMM_N1M\@Z + * @symbol ??0FollowOwnerGoal\@\@QEAA\@AEAVMob\@\@MMM_N1M\@Z */ MCAPI FollowOwnerGoal(class Mob &, float, float, float, bool, bool, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FollowParentGoal.hpp b/LiteLoader/include/llapi/mc/FollowParentGoal.hpp index 09891d27e3..1deef9980f 100644 --- a/LiteLoader/include/llapi/mc/FollowParentGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowParentGoal.hpp @@ -30,48 +30,48 @@ class FollowParentGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FollowParentGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FollowParentGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FollowParentGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FollowParentGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FollowParentGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FollowParentGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FollowParentGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FollowParentGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FollowParentGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FollowParentGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FollowParentGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FollowParentGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FollowParentGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FollowParentGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0FollowParentGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI FollowParentGoal(class Mob &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp b/LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp index 8d3f90357d..03ef41fb4c 100644 --- a/LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp +++ b/LiteLoader/include/llapi/mc/FollowTargetCaptainGoal.hpp @@ -30,56 +30,56 @@ class FollowTargetCaptainGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FollowTargetCaptainGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@FollowTargetCaptainGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@FollowTargetCaptainGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@FollowTargetCaptainGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@FollowTargetCaptainGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@FollowTargetCaptainGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@FollowTargetCaptainGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@FollowTargetCaptainGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@FollowTargetCaptainGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@FollowTargetCaptainGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@FollowTargetCaptainGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@FollowTargetCaptainGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@FollowTargetCaptainGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0FollowTargetCaptainGoal\@\@QEAA\@AEAVMob\@\@MMM\@Z + * @symbol ??0FollowTargetCaptainGoal\@\@QEAA\@AEAVMob\@\@MMM\@Z */ MCAPI FollowTargetCaptainGoal(class Mob &, float, float, float); //private: /** - * @symbol ?_determineMovePos\@FollowTargetCaptainGoal\@\@AEAAXXZ + * @symbol ?_determineMovePos\@FollowTargetCaptainGoal\@\@AEAAXXZ */ MCAPI void _determineMovePos(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FoodConstants.hpp b/LiteLoader/include/llapi/mc/FoodConstants.hpp index ba216a417d..3b3c64b273 100644 --- a/LiteLoader/include/llapi/mc/FoodConstants.hpp +++ b/LiteLoader/include/llapi/mc/FoodConstants.hpp @@ -22,59 +22,59 @@ namespace FoodConstants { #undef AFTER_EXTRA /** - * @symbol ?FOOD_SATURATION_GOOD\@FoodConstants\@\@3MB + * @symbol ?FOOD_SATURATION_GOOD\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SATURATION_GOOD; /** - * @symbol ?FOOD_SATURATION_LOW\@FoodConstants\@\@3MB + * @symbol ?FOOD_SATURATION_LOW\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SATURATION_LOW; /** - * @symbol ?FOOD_SATURATION_MAX\@FoodConstants\@\@3MB + * @symbol ?FOOD_SATURATION_MAX\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SATURATION_MAX; /** - * @symbol ?FOOD_SATURATION_NORMAL\@FoodConstants\@\@3MB + * @symbol ?FOOD_SATURATION_NORMAL\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SATURATION_NORMAL; /** - * @symbol ?FOOD_SATURATION_POOR\@FoodConstants\@\@3MB + * @symbol ?FOOD_SATURATION_POOR\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SATURATION_POOR; /** - * @symbol ?FOOD_SATURATION_SUPERNATURAL\@FoodConstants\@\@3MB + * @symbol ?FOOD_SATURATION_SUPERNATURAL\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SATURATION_SUPERNATURAL; /** - * @symbol ?FOOD_SPRINT_LEVEL\@FoodConstants\@\@3MB + * @symbol ?FOOD_SPRINT_LEVEL\@FoodConstants\@\@3MB */ MCAPI extern float const FOOD_SPRINT_LEVEL; /** - * @symbol ?HEALTH_TICK_COUNT\@FoodConstants\@\@3HB + * @symbol ?HEALTH_TICK_COUNT\@FoodConstants\@\@3HB */ MCAPI extern int const HEALTH_TICK_COUNT; /** - * @symbol ?HEAL_LEVEL\@FoodConstants\@\@3HB + * @symbol ?HEAL_LEVEL\@FoodConstants\@\@3HB */ MCAPI extern int const HEAL_LEVEL; /** - * @symbol ?MAX_EXHAUSTION\@FoodConstants\@\@3MB + * @symbol ?MAX_EXHAUSTION\@FoodConstants\@\@3MB */ MCAPI extern float const MAX_EXHAUSTION; /** - * @symbol ?MAX_FOOD\@FoodConstants\@\@3HB + * @symbol ?MAX_FOOD\@FoodConstants\@\@3HB */ MCAPI extern int const MAX_FOOD; /** - * @symbol ?MAX_SATURATION\@FoodConstants\@\@3MB + * @symbol ?MAX_SATURATION\@FoodConstants\@\@3MB */ MCAPI extern float const MAX_SATURATION; /** - * @symbol ?START_SATURATION\@FoodConstants\@\@3MB + * @symbol ?START_SATURATION\@FoodConstants\@\@3MB */ MCAPI extern float const START_SATURATION; /** - * @symbol ?STARVE_LEVEL\@FoodConstants\@\@3HB + * @symbol ?STARVE_LEVEL\@FoodConstants\@\@3HB */ MCAPI extern int const STARVE_LEVEL; diff --git a/LiteLoader/include/llapi/mc/FoodItemComponent.hpp b/LiteLoader/include/llapi/mc/FoodItemComponent.hpp index 70d8ba01b6..5bb0bc7447 100644 --- a/LiteLoader/include/llapi/mc/FoodItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/FoodItemComponent.hpp @@ -30,49 +30,49 @@ class FoodItemComponent { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FOODITEMCOMPONENT /** - * @symbol ?canAlwaysEat\@FoodItemComponent\@\@UEBA_NXZ + * @symbol ?canAlwaysEat\@FoodItemComponent\@\@UEBA_NXZ */ MCVAPI bool canAlwaysEat() const; /** - * @symbol ?eatItem\@FoodItemComponent\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVActor\@\@AEAVLevel\@\@\@Z + * @symbol ?eatItem\@FoodItemComponent\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVActor\@\@AEAVLevel\@\@\@Z */ MCVAPI class Item const * eatItem(class ItemStack &, class Actor &, class Level &); /** - * @symbol ?getNutrition\@FoodItemComponent\@\@UEBAHXZ + * @symbol ?getNutrition\@FoodItemComponent\@\@UEBAHXZ */ MCVAPI int getNutrition() const; /** - * @symbol ?getSaturationModifier\@FoodItemComponent\@\@UEBAMXZ + * @symbol ?getSaturationModifier\@FoodItemComponent\@\@UEBAMXZ */ MCVAPI float getSaturationModifier() const; /** - * @symbol ?use\@FoodItemComponent\@\@UEAA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?use\@FoodItemComponent\@\@UEAA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCVAPI bool use(class ItemStack &, class Player &); /** - * @symbol ?useTimeDepleted\@FoodItemComponent\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z + * @symbol ?useTimeDepleted\@FoodItemComponent\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z */ MCVAPI class Item const * useTimeDepleted(class ItemStack &, class Player &, class Level &); #endif /** - * @symbol ?getUsingConvertsToItemDescriptor\@FoodItemComponent\@\@QEBA?AVItemDescriptor\@\@XZ + * @symbol ?getUsingConvertsToItemDescriptor\@FoodItemComponent\@\@QEBA?AVItemDescriptor\@\@XZ */ MCAPI class ItemDescriptor getUsingConvertsToItemDescriptor() const; /** - * @symbol ??4FoodItemComponent\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4FoodItemComponent\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class FoodItemComponent & operator=(class FoodItemComponent const &); /** - * @symbol ?bindType\@FoodItemComponent\@\@SAXXZ + * @symbol ?bindType\@FoodItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@FoodItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@FoodItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); /** - * @symbol ?registerVersionUpgrades\@FoodItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@FoodItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FoodItemComponentLegacy.hpp b/LiteLoader/include/llapi/mc/FoodItemComponentLegacy.hpp index c8aa49b8cc..135c7cd68e 100644 --- a/LiteLoader/include/llapi/mc/FoodItemComponentLegacy.hpp +++ b/LiteLoader/include/llapi/mc/FoodItemComponentLegacy.hpp @@ -31,71 +31,71 @@ class FoodItemComponentLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FoodItemComponentLegacy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getNutrition\@FoodItemComponentLegacy\@\@UEBAHXZ + * @vftbl 1 + * @symbol ?getNutrition\@FoodItemComponentLegacy\@\@UEBAHXZ */ virtual int getNutrition() const; /** - * @vftbl 2 - * @symbol ?getSaturationModifier\@FoodItemComponentLegacy\@\@UEBAMXZ + * @vftbl 2 + * @symbol ?getSaturationModifier\@FoodItemComponentLegacy\@\@UEBAMXZ */ virtual float getSaturationModifier() const; /** - * @vftbl 3 - * @symbol ?canAlwaysEat\@FoodItemComponentLegacy\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?canAlwaysEat\@FoodItemComponentLegacy\@\@UEBA_NXZ */ virtual bool canAlwaysEat() const; /** - * @vftbl 4 - * @symbol ?eatItem\@FoodItemComponentLegacy\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVActor\@\@AEAVLevel\@\@\@Z + * @vftbl 4 + * @symbol ?eatItem\@FoodItemComponentLegacy\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVActor\@\@AEAVLevel\@\@\@Z */ virtual class Item const * eatItem(class ItemStack &, class Actor &, class Level &); /** - * @vftbl 5 - * @symbol ?use\@FoodItemComponentLegacy\@\@UEAA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @vftbl 5 + * @symbol ?use\@FoodItemComponentLegacy\@\@UEAA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ virtual bool use(class ItemStack &, class Player &); /** - * @vftbl 6 - * @symbol ?useTimeDepleted\@FoodItemComponentLegacy\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?useTimeDepleted\@FoodItemComponentLegacy\@\@UEAAPEBVItem\@\@AEAVItemStack\@\@AEAVPlayer\@\@AEAVLevel\@\@\@Z */ virtual class Item const * useTimeDepleted(class ItemStack &, class Player &, class Level &); /** - * @symbol ??0FoodItemComponentLegacy\@\@QEAA\@AEAVItem\@\@\@Z + * @symbol ??0FoodItemComponentLegacy\@\@QEAA\@AEAVItem\@\@\@Z */ MCAPI FoodItemComponentLegacy(class Item &); /** - * @symbol ?buildNetworkTag\@FoodItemComponentLegacy\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?buildNetworkTag\@FoodItemComponentLegacy\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr buildNetworkTag() const; /** - * @symbol ?init\@FoodItemComponentLegacy\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?init\@FoodItemComponentLegacy\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool init(class Json::Value &, class SemVersion const &); /** - * @symbol ?initializeFromNetwork\@FoodItemComponentLegacy\@\@SA?AVValue\@Json\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?initializeFromNetwork\@FoodItemComponentLegacy\@\@SA?AVValue\@Json\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static class Json::Value initializeFromNetwork(class CompoundTag const &); //private: /** - * @symbol ?_applyEatEffects\@FoodItemComponentLegacy\@\@AEAAXAEBVItemStack\@\@AEAVActor\@\@AEAVLevel\@\@\@Z + * @symbol ?_applyEatEffects\@FoodItemComponentLegacy\@\@AEAAXAEBVItemStack\@\@AEAVActor\@\@AEAVLevel\@\@\@Z */ MCAPI void _applyEatEffects(class ItemStack const &, class Actor &, class Level &); /** - * @symbol ?_loadEffects\@FoodItemComponentLegacy\@\@AEAAXAEAVValue\@Json\@\@\@Z + * @symbol ?_loadEffects\@FoodItemComponentLegacy\@\@AEAAXAEAVValue\@Json\@\@\@Z */ MCAPI void _loadEffects(class Json::Value &); /** - * @symbol ?_loadRemoveEffects\@FoodItemComponentLegacy\@\@AEAAXAEAVValue\@Json\@\@\@Z + * @symbol ?_loadRemoveEffects\@FoodItemComponentLegacy\@\@AEAAXAEAVValue\@Json\@\@\@Z */ MCAPI void _loadRemoveEffects(class Json::Value &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FormJsonValidator.hpp b/LiteLoader/include/llapi/mc/FormJsonValidator.hpp index 5bdd0a5a4e..686142f4ec 100644 --- a/LiteLoader/include/llapi/mc/FormJsonValidator.hpp +++ b/LiteLoader/include/llapi/mc/FormJsonValidator.hpp @@ -31,36 +31,36 @@ class FormJsonValidator { public: /** - * @symbol ?getContentItemProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@AEBV23\@00000\@Z + * @symbol ?getContentItemProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@AEBV23\@00000\@Z */ MCAPI static class JsonValidator::Property getContentItemProperty(class JsonValidator::Property const &, class JsonValidator::Property const &, class JsonValidator::Property const &, class JsonValidator::Property const &, class JsonValidator::Property const &, class JsonValidator::Property const &); /** - * @symbol ?getControlLockedProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@XZ + * @symbol ?getControlLockedProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@XZ */ MCAPI static class JsonValidator::Property getControlLockedProperty(); /** - * @symbol ?getDropdownProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z + * @symbol ?getDropdownProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z */ MCAPI static class JsonValidator::Property getDropdownProperty(bool); /** - * @symbol ?getLabelProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@XZ + * @symbol ?getLabelProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@XZ */ MCAPI static class JsonValidator::Property getLabelProperty(); /** - * @symbol ?getSliderProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z + * @symbol ?getSliderProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z */ MCAPI static class JsonValidator::Property getSliderProperty(bool); /** - * @symbol ?getStepSliderProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z + * @symbol ?getStepSliderProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z */ MCAPI static class JsonValidator::Property getStepSliderProperty(bool); /** - * @symbol ?getTextInputProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z + * @symbol ?getTextInputProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z */ MCAPI static class JsonValidator::Property getTextInputProperty(bool); /** - * @symbol ?getToggleProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z + * @symbol ?getToggleProperty\@FormJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@_N\@Z */ MCAPI static class JsonValidator::Property getToggleProperty(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FossilFeature.hpp b/LiteLoader/include/llapi/mc/FossilFeature.hpp index b219cd4e5a..2483842f2e 100644 --- a/LiteLoader/include/llapi/mc/FossilFeature.hpp +++ b/LiteLoader/include/llapi/mc/FossilFeature.hpp @@ -31,13 +31,13 @@ class FossilFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FossilFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@FossilFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@FossilFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; @@ -45,8 +45,8 @@ class FossilFeature : public Feature { private: /** - * @symbol ?STRUCTURE_LOCATION_FOSSIL\@FossilFeature\@\@0QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_LOCATION_FOSSIL\@FossilFeature\@\@0QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_LOCATION_FOSSIL[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp b/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp index cb5fa9d184..f2ac66405d 100644 --- a/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp +++ b/LiteLoader/include/llapi/mc/FramewiseActionOrStopSystem.hpp @@ -28,16 +28,16 @@ class FramewiseActionOrStopSystem { public: /** - * @symbol ?createFramewiseActionOrStopSystem\@FramewiseActionOrStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createFramewiseActionOrStopSystem\@FramewiseActionOrStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createFramewiseActionOrStopSystem(); //private: /** - * @symbol ?doFramewiseActionOrStopSystem\@FramewiseActionOrStopSystem\@\@CAXAEAVStrictEntityContext\@\@AEBULocalMoveVelocityComponent\@\@AEAUActionOrStopComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasMoveInputFlag\@\@\@\@\@\@\@Z + * @symbol ?doFramewiseActionOrStopSystem\@FramewiseActionOrStopSystem\@\@CAXAEBULocalMoveVelocityComponent\@\@AEAUActionOrStopComponent\@\@\@Z */ - MCAPI static void doFramewiseActionOrStopSystem(class StrictEntityContext &, struct LocalMoveVelocityComponent const &, struct ActionOrStopComponent &, class EntityModifierT>); + MCAPI static void doFramewiseActionOrStopSystem(struct LocalMoveVelocityComponent const &, struct ActionOrStopComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp index a0f553d84f..91d7a78108 100644 --- a/LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/FreezeOnHitSubcomponent.hpp @@ -31,29 +31,29 @@ class FreezeOnHitSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FreezeOnHitSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@FreezeOnHitSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@FreezeOnHitSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@FreezeOnHitSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@FreezeOnHitSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@FreezeOnHitSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@FreezeOnHitSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@FreezeOnHitSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@FreezeOnHitSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FreezingComponent.hpp b/LiteLoader/include/llapi/mc/FreezingComponent.hpp index fd951ea768..109297fab4 100644 --- a/LiteLoader/include/llapi/mc/FreezingComponent.hpp +++ b/LiteLoader/include/llapi/mc/FreezingComponent.hpp @@ -30,40 +30,40 @@ class FreezingComponent { public: /** - * @symbol ?addAdditionalSaveData\@FreezingComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@FreezingComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?decreaseFreezingEffect\@FreezingComponent\@\@QEAAXXZ + * @symbol ?decreaseFreezingEffect\@FreezingComponent\@\@QEAAXXZ */ MCAPI void decreaseFreezingEffect(); /** - * @symbol ?getFreezingEffectStrength\@FreezingComponent\@\@QEBAMXZ + * @symbol ?getFreezingEffectStrength\@FreezingComponent\@\@QEBAMXZ */ MCAPI float getFreezingEffectStrength() const; /** - * @symbol ?increaseFreezingEffect\@FreezingComponent\@\@QEAAXXZ + * @symbol ?increaseFreezingEffect\@FreezingComponent\@\@QEAAXXZ */ MCAPI void increaseFreezingEffect(); /** - * @symbol ?isFullyFrozen\@FreezingComponent\@\@QEBA_NXZ + * @symbol ?isFullyFrozen\@FreezingComponent\@\@QEBA_NXZ */ MCAPI bool isFullyFrozen() const; /** - * @symbol ?isFullyUnfrozen\@FreezingComponent\@\@QEBA_NXZ + * @symbol ?isFullyUnfrozen\@FreezingComponent\@\@QEBA_NXZ */ MCAPI bool isFullyUnfrozen() const; /** - * @symbol ??8FreezingComponent\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8FreezingComponent\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class FreezingComponent const &) const; /** - * @symbol ?readAdditionalSaveData\@FreezingComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@FreezingComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?resetFreezingEffect\@FreezingComponent\@\@QEAAXXZ + * @symbol ?resetFreezingEffect\@FreezingComponent\@\@QEAAXXZ */ MCAPI void resetFreezingEffect(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FreezingSystem.hpp b/LiteLoader/include/llapi/mc/FreezingSystem.hpp index 1149a9543a..eb6d9cdec3 100644 --- a/LiteLoader/include/llapi/mc/FreezingSystem.hpp +++ b/LiteLoader/include/llapi/mc/FreezingSystem.hpp @@ -30,27 +30,27 @@ class FreezingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FreezingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@FreezingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@FreezingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?FREEZE_EFFECT_UUID\@FreezingSystem\@\@2VUUID\@mce\@\@B + * @symbol ?FREEZE_EFFECT_UUID\@FreezingSystem\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const FREEZE_EFFECT_UUID; /** - * @symbol ?VULNERABLE_MOB_FREEZE_DAMAGE\@FreezingSystem\@\@2HB + * @symbol ?VULNERABLE_MOB_FREEZE_DAMAGE\@FreezingSystem\@\@2HB */ MCAPI static int const VULNERABLE_MOB_FREEZE_DAMAGE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FreezingSystemInternal.hpp b/LiteLoader/include/llapi/mc/FreezingSystemInternal.hpp index 04a3b36558..c1120d8ce6 100644 --- a/LiteLoader/include/llapi/mc/FreezingSystemInternal.hpp +++ b/LiteLoader/include/llapi/mc/FreezingSystemInternal.hpp @@ -22,11 +22,11 @@ namespace FreezingSystemInternal { #undef AFTER_EXTRA /** - * @symbol ?processFreezeEffect\@FreezingSystemInternal\@\@YAXAEAVActor\@\@AEBVFreezingComponent\@\@\@Z + * @symbol ?processFreezeEffect\@FreezingSystemInternal\@\@YAXAEAVActor\@\@AEBVFreezingComponent\@\@\@Z */ MCAPI void processFreezeEffect(class Actor &, class FreezingComponent const &); /** - * @symbol ?tickFreezeComponent\@FreezingSystemInternal\@\@YAXAEAVEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVFreezingComponent\@\@\@Z + * @symbol ?tickFreezeComponent\@FreezingSystemInternal\@\@YAXAEAVEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVFreezingComponent\@\@\@Z */ MCAPI void tickFreezeComponent(class EntityContext &, class ActorOwnerComponent &, class FreezingComponent &); diff --git a/LiteLoader/include/llapi/mc/FrictionModifierDefinition.hpp b/LiteLoader/include/llapi/mc/FrictionModifierDefinition.hpp index 24335dd8d1..9f39f8d203 100644 --- a/LiteLoader/include/llapi/mc/FrictionModifierDefinition.hpp +++ b/LiteLoader/include/llapi/mc/FrictionModifierDefinition.hpp @@ -31,7 +31,7 @@ struct FrictionModifierDefinition { public: /** - * @symbol ?buildSchema\@FrictionModifierDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFrictionModifierDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@FrictionModifierDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UFrictionModifierDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp index d0e4dcef51..2c8bdd075a 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlock.hpp @@ -29,254 +29,259 @@ class FrogSpawnBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FrogSpawnBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@FrogSpawnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@FrogSpawnBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@FrogSpawnBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@FrogSpawnBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@FrogSpawnBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@FrogSpawnBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@FrogSpawnBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@FrogSpawnBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@FrogSpawnBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@FrogSpawnBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FROGSPAWNBLOCK /** - * @symbol ?canBeSilkTouched\@FrogSpawnBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@FrogSpawnBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0FrogSpawnBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FrogSpawnBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FrogSpawnBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp index 67f2576275..0621feef70 100644 --- a/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/FrogSpawnBlockItem.hpp @@ -30,93 +30,93 @@ class FrogSpawnBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FrogSpawnBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@FrogSpawnBlockItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@FrogSpawnBlockItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@FrogSpawnBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@FrogSpawnBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@FrogSpawnBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@FrogSpawnBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0FrogSpawnBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0FrogSpawnBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI FrogSpawnBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp b/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp index bbf757b95f..32f639f4d9 100644 --- a/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp +++ b/LiteLoader/include/llapi/mc/FrostWalkSystem.hpp @@ -28,12 +28,12 @@ class FrostWalkSystem { public: /** - * @symbol ?_tryFrostWalk\@FrostWalkSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_tryFrostWalk\@FrostWalkSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tryFrostWalk(class StrictEntityContext &, class ActorOwnerComponent &); /** - * @symbol ?createSystem\@FrostWalkSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@FrostWalkSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp b/LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp index 52f22a9aad..d508e4c5d1 100644 --- a/LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/FrostWalkerEnchant.hpp @@ -31,54 +31,54 @@ class FrostWalkerEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FrostWalkerEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@FrostWalkerEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@FrostWalkerEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@FrostWalkerEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@FrostWalkerEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@FrostWalkerEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@FrostWalkerEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FROSTWALKERENCHANT /** - * @symbol ?isTreasureOnly\@FrostWalkerEnchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@FrostWalkerEnchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; #endif /** - * @symbol ??0FrostWalkerEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0FrostWalkerEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI FrostWalkerEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI FrostWalkerEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp index d56740305d..04c132c8df 100644 --- a/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FrostedIceBlock.hpp @@ -31,232 +31,237 @@ class FrostedIceBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FrostedIceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@FrostedIceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@FrostedIceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@FrostedIceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@FrostedIceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@FrostedIceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@FrostedIceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@FrostedIceBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@FrostedIceBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FROSTEDICEBLOCK /** - * @symbol ?canBeSilkTouched\@FrostedIceBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@FrostedIceBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0FrostedIceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0FrostedIceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI FrostedIceBlock(std::string const &, int, bool); /** - * @symbol ?_slightlyMelt\@FrostedIceBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z + * @symbol ?_slightlyMelt\@FrostedIceBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI void _slightlyMelt(class BlockSource &, class BlockPos const &, class Random &, bool) const; @@ -264,12 +269,12 @@ class FrostedIceBlock : public BlockLegacy { private: /** - * @symbol ?MAX_AGE\@FrostedIceBlock\@\@0HB + * @symbol ?MAX_AGE\@FrostedIceBlock\@\@0HB */ MCAPI static int const MAX_AGE; /** - * @symbol ?MIN_NEIGHBORS\@FrostedIceBlock\@\@0HB + * @symbol ?MIN_NEIGHBORS\@FrostedIceBlock\@\@0HB */ MCAPI static int const MIN_NEIGHBORS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FuelItemComponent.hpp b/LiteLoader/include/llapi/mc/FuelItemComponent.hpp index aab19389a0..a1248423d0 100644 --- a/LiteLoader/include/llapi/mc/FuelItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/FuelItemComponent.hpp @@ -30,47 +30,47 @@ class FuelItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FuelItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VFuelItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VFuelItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VFuelItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VFuelItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?bindType\@FuelItemComponent\@\@SAXXZ + * @symbol ?bindType\@FuelItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@FuelItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@FuelItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp b/LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp index 85fceb2389..e1e0bcd38d 100644 --- a/LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp +++ b/LiteLoader/include/llapi/mc/FullPlayerInventoryWrapper.hpp @@ -30,44 +30,44 @@ class FullPlayerInventoryWrapper { public: /** - * @symbol ??0FullPlayerInventoryWrapper\@\@QEAA\@AEAVPlayerInventory\@\@AEAVSimpleContainer\@\@1PEAVInventoryTransactionManager\@\@PEAVPlayer\@\@\@Z + * @symbol ??0FullPlayerInventoryWrapper\@\@QEAA\@AEAVPlayerInventory\@\@AEAVSimpleContainer\@\@1PEAVInventoryTransactionManager\@\@PEAVPlayer\@\@\@Z */ MCAPI FullPlayerInventoryWrapper(class PlayerInventory &, class SimpleContainer &, class SimpleContainer &, class InventoryTransactionManager *, class Player *); /** - * @symbol ?clearAllItems\@FullPlayerInventoryWrapper\@\@QEAAHXZ + * @symbol ?clearAllItems\@FullPlayerInventoryWrapper\@\@QEAAHXZ */ MCAPI int clearAllItems(); /** - * @symbol ?getItemCount\@FullPlayerInventoryWrapper\@\@QEAAHV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?getItemCount\@FullPlayerInventoryWrapper\@\@QEAAHV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI int getItemCount(class std::function); /** - * @symbol ?removeResource\@FullPlayerInventoryWrapper\@\@QEAAHAEBVItemStack\@\@V?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@_NH\@Z + * @symbol ?removeResource\@FullPlayerInventoryWrapper\@\@QEAAHAEBVItemStack\@\@V?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@_NH\@Z */ MCAPI int removeResource(class ItemStack const &, class std::function, bool, int); //private: /** - * @symbol ?_clearSimpleContainerItem\@FullPlayerInventoryWrapper\@\@AEAAHAEAVSimpleContainer\@\@W4ContainerID\@\@H\@Z + * @symbol ?_clearSimpleContainerItem\@FullPlayerInventoryWrapper\@\@AEAAHAEAVSimpleContainer\@\@W4ContainerID\@\@H\@Z */ MCAPI int _clearSimpleContainerItem(class SimpleContainer &, enum class ContainerID, int); /** - * @symbol ?_getSimpleContainerItemCount\@FullPlayerInventoryWrapper\@\@AEAAHAEAVSimpleContainer\@\@HV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?_getSimpleContainerItemCount\@FullPlayerInventoryWrapper\@\@AEAAHAEAVSimpleContainer\@\@HV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI int _getSimpleContainerItemCount(class SimpleContainer &, int, class std::function); /** - * @symbol ?_removeCursorItem\@FullPlayerInventoryWrapper\@\@AEAAHAEBVItemStack\@\@_NH\@Z + * @symbol ?_removeCursorItem\@FullPlayerInventoryWrapper\@\@AEAAHAEBVItemStack\@\@_NH\@Z */ MCAPI int _removeCursorItem(class ItemStack const &, bool, int); /** - * @symbol ?_removeSimpleContainerItem\@FullPlayerInventoryWrapper\@\@AEAAHAEAVSimpleContainer\@\@W4ContainerID\@\@HAEBVItemStack\@\@_NH\@Z + * @symbol ?_removeSimpleContainerItem\@FullPlayerInventoryWrapper\@\@AEAAHAEAVSimpleContainer\@\@W4ContainerID\@\@HAEBVItemStack\@\@_NH\@Z */ MCAPI int _removeSimpleContainerItem(class SimpleContainer &, enum class ContainerID, int, class ItemStack const &, bool, int); /** - * @symbol ?_sendCursorSlotPacket\@FullPlayerInventoryWrapper\@\@AEBAXXZ + * @symbol ?_sendCursorSlotPacket\@FullPlayerInventoryWrapper\@\@AEBAXXZ */ MCAPI void _sendCursorSlotPacket() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FunctionAction.hpp b/LiteLoader/include/llapi/mc/FunctionAction.hpp index ce80c4a3c2..8745e4aece 100644 --- a/LiteLoader/include/llapi/mc/FunctionAction.hpp +++ b/LiteLoader/include/llapi/mc/FunctionAction.hpp @@ -30,48 +30,48 @@ class FunctionAction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FunctionAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@FunctionAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@FunctionAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ virtual void execute(class ServerLevel &, class Dimension &); /** - * @vftbl 2 - * @symbol ?serialize\@FunctionAction\@\@UEAAXAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?serialize\@FunctionAction\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void serialize(class CompoundTag &); /** - * @vftbl 3 - * @symbol ??8FunctionAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z + * @vftbl 3 + * @symbol ??8FunctionAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z */ virtual bool operator==(class IRequestAction &) const; /** - * @symbol ??0FunctionAction\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@2\@\@Z + * @symbol ??0FunctionAction\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@2\@\@Z */ MCAPI FunctionAction(std::string const &, std::unique_ptr); /** - * @symbol ?isValidTag\@FunctionAction\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?isValidTag\@FunctionAction\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool isValidTag(class CompoundTag const &); /** - * @symbol ?load\@FunctionAction\@\@SA?AV?$unique_ptr\@VFunctionAction\@\@U?$default_delete\@VFunctionAction\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@\@Z + * @symbol ?load\@FunctionAction\@\@SA?AV?$unique_ptr\@VFunctionAction\@\@U?$default_delete\@VFunctionAction\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class ICommandOriginLoader &); //private: /** - * @symbol ?_printOriginInvalidError\@FunctionAction\@\@AEAAXAEAVServerLevel\@\@\@Z + * @symbol ?_printOriginInvalidError\@FunctionAction\@\@AEAAXAEAVServerLevel\@\@\@Z */ MCAPI void _printOriginInvalidError(class ServerLevel &); /** - * @symbol ?_printOutput\@FunctionAction\@\@AEAAXAEAVServerLevel\@\@H\@Z + * @symbol ?_printOutput\@FunctionAction\@\@AEAAXAEAVServerLevel\@\@H\@Z */ MCAPI void _printOutput(class ServerLevel &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FunctionCommand.hpp b/LiteLoader/include/llapi/mc/FunctionCommand.hpp index 0b55483be0..fad06f789f 100644 --- a/LiteLoader/include/llapi/mc/FunctionCommand.hpp +++ b/LiteLoader/include/llapi/mc/FunctionCommand.hpp @@ -31,18 +31,18 @@ class FunctionCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FunctionCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@FunctionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@FunctionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@FunctionCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@FunctionCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FunctionEntry.hpp b/LiteLoader/include/llapi/mc/FunctionEntry.hpp index f5f045f75f..d5dc6e7296 100644 --- a/LiteLoader/include/llapi/mc/FunctionEntry.hpp +++ b/LiteLoader/include/llapi/mc/FunctionEntry.hpp @@ -30,26 +30,26 @@ class FunctionEntry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FunctionEntry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@FunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@FunctionEntry\@\@UEAAXAEAVFunctionManager\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ virtual void execute(class FunctionManager &, class CommandOrigin const &, enum class FunctionQueueOrder); /** - * @symbol ??0FunctionEntry\@\@QEAA\@W4FunctionState\@\@\@Z + * @symbol ??0FunctionEntry\@\@QEAA\@$$QEAV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@W4FunctionState\@\@\@Z */ - MCAPI FunctionEntry(enum class FunctionState); + MCAPI FunctionEntry(std::vector> &&, enum class FunctionState); /** - * @symbol ??0FunctionEntry\@\@QEAA\@$$QEAV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@W4FunctionState\@\@\@Z + * @symbol ??0FunctionEntry\@\@QEAA\@W4FunctionState\@\@\@Z */ - MCAPI FunctionEntry(std::vector> &&, enum class FunctionState); + MCAPI FunctionEntry(enum class FunctionState); /** - * @symbol ?getErrorState\@FunctionEntry\@\@QEBA?AW4FunctionState\@\@XZ + * @symbol ?getErrorState\@FunctionEntry\@\@QEBA?AW4FunctionState\@\@XZ */ MCAPI enum class FunctionState getErrorState() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FunctionManager.hpp b/LiteLoader/include/llapi/mc/FunctionManager.hpp index b91ac9ba34..2828c0098c 100644 --- a/LiteLoader/include/llapi/mc/FunctionManager.hpp +++ b/LiteLoader/include/llapi/mc/FunctionManager.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Core.hpp" #include "Json.hpp" #define BEFORE_EXTRA @@ -31,59 +32,63 @@ class FunctionManager { public: /** - * @symbol ??0FunctionManager\@\@QEAA\@V?$unique_ptr\@VICommandDispatcher\@\@U?$default_delete\@VICommandDispatcher\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@2\@PEBVGameRule\@\@\@Z + * @symbol ??0FunctionManager\@\@QEAA\@V?$unique_ptr\@VICommandDispatcher\@\@U?$default_delete\@VICommandDispatcher\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@2\@PEBVGameRule\@\@\@Z */ MCAPI FunctionManager(std::unique_ptr, std::unique_ptr, class GameRule const *); /** - * @symbol ?execute\@FunctionManager\@\@QEAAHAEAVFunctionEntry\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z + * @symbol ?execute\@FunctionManager\@\@QEAAHAEAVFunctionEntry\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ MCAPI int execute(class FunctionEntry &, class CommandOrigin const &, enum class FunctionQueueOrder); /** - * @symbol ?getCommandDispatcher\@FunctionManager\@\@QEAAAEAVICommandDispatcher\@\@XZ + * @symbol ?getCommandDispatcher\@FunctionManager\@\@QEAAAEAVICommandDispatcher\@\@XZ */ MCAPI class ICommandDispatcher & getCommandDispatcher(); /** - * @symbol ?getFunction\@FunctionManager\@\@QEAAPEAVFunctionEntry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getFunction\@FunctionManager\@\@QEAAPEAVFunctionEntry\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class FunctionEntry * getFunction(std::string const &); /** - * @symbol ?load\@FunctionManager\@\@QEAAXAEAVResourcePackManager\@\@AEAVCommandRegistry\@\@\@Z + * @symbol ?load\@FunctionManager\@\@QEAAXAEAVResourcePackManager\@\@AEAVCommandRegistry\@\@\@Z */ MCAPI void load(class ResourcePackManager &, class CommandRegistry &); /** - * @symbol ?queueCommands\@FunctionManager\@\@QEAAXAEBV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z + * @symbol ?queueCommands\@FunctionManager\@\@QEAAXAEBV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@W4FunctionQueueOrder\@\@\@Z */ MCAPI void queueCommands(std::vector> const &, class CommandOrigin const &, enum class FunctionQueueOrder); /** - * @symbol ?tick\@FunctionManager\@\@QEAAXXZ + * @symbol ?tick\@FunctionManager\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?getQueueOrderForCommandVersion\@FunctionManager\@\@SA?AW4FunctionQueueOrder\@\@W4CurrentCmdVersion\@\@\@Z + * @symbol ?getFunctionNameFromPath\@FunctionManager\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z + */ + MCAPI static std::string getFunctionNameFromPath(class Core::Path const &); + /** + * @symbol ?getQueueOrderForCommandVersion\@FunctionManager\@\@SA?AW4FunctionQueueOrder\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI static enum class FunctionQueueOrder getQueueOrderForCommandVersion(enum class CurrentCmdVersion); //protected: /** - * @symbol ?_addTickFunctionsFromJson\@FunctionManager\@\@IEAAXAEBVValue\@Json\@\@W4CurrentCmdVersion\@\@\@Z + * @symbol ?_addTickFunctionsFromJson\@FunctionManager\@\@IEAAXAEBVValue\@Json\@\@W4CurrentCmdVersion\@\@\@Z */ MCAPI void _addTickFunctionsFromJson(class Json::Value const &, enum class CurrentCmdVersion); /** - * @symbol ?_processFunctionEntry\@FunctionManager\@\@IEAAXAEBV?$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\@AEAV43\@W4CurrentCmdVersion\@\@AEBVCommandRegistry\@\@\@Z + * @symbol ?_processFunctionEntry\@FunctionManager\@\@IEAAXAEBV?$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\@AEAV43\@W4CurrentCmdVersion\@\@AEBVCommandRegistry\@\@\@Z */ MCAPI void _processFunctionEntry(std::string const &, std::vector const &, std::vector &, enum class CurrentCmdVersion, class CommandRegistry const &); //private: /** - * @symbol ?_addOriginReference\@FunctionManager\@\@AEAAAEBVCommandOrigin\@\@AEBV2\@I\@Z + * @symbol ?_addOriginReference\@FunctionManager\@\@AEAAAEBVCommandOrigin\@\@AEBV2\@I\@Z */ MCAPI class CommandOrigin const & _addOriginReference(class CommandOrigin const &, unsigned int); /** - * @symbol ?_queueCommandsAfterCaller\@FunctionManager\@\@AEAAXAEBV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?_queueCommandsAfterCaller\@FunctionManager\@\@AEAAXAEBV?$vector\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIFunctionEntry\@\@U?$default_delete\@VIFunctionEntry\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI void _queueCommandsAfterCaller(std::vector> const &, class CommandOrigin const &); /** - * @symbol ?_removeOriginReference\@FunctionManager\@\@AEAAXAEBVCommandOrigin\@\@I\@Z + * @symbol ?_removeOriginReference\@FunctionManager\@\@AEAAXAEBVCommandOrigin\@\@I\@Z */ MCAPI void _removeOriginReference(class CommandOrigin const &, unsigned int); @@ -91,4 +96,4 @@ class FunctionManager { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FungusStem.hpp b/LiteLoader/include/llapi/mc/FungusStem.hpp deleted file mode 100644 index cf1f6f577c..0000000000 --- a/LiteLoader/include/llapi/mc/FungusStem.hpp +++ /dev/null @@ -1,238 +0,0 @@ -/** - * @file FungusStem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "RotatedPillarBlock.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class FungusStem. - * - */ -class FungusStem : public RotatedPillarBlock { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_FUNGUSSTEM -public: - class FungusStem& operator=(class FungusStem const &) = delete; - FungusStem(class FungusStem const &) = delete; - FungusStem() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol __unk_destructor_0 - */ - virtual ~FungusStem(); - /** - * @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 131 - * @symbol __unk_vfn_131 - */ - virtual void __unk_vfn_131(); - /** - * @vftbl 156 - * @symbol __unk_vfn_156 - */ - virtual void __unk_vfn_156(); - /** - * @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 170 - * @symbol __unk_vfn_170 - */ - virtual void __unk_vfn_170(); - /** - * @vftbl 174 - * @symbol __unk_vfn_174 - */ - virtual void __unk_vfn_174(); - /** - * @vftbl 177 - * @symbol ?use\@FungusStem\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z - */ - virtual bool use(class Player &, class BlockPos const &, unsigned char) const; - /** - * @vftbl 184 - * @symbol ?getMapColor\@FungusStem\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z - */ - virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; - /** - * @vftbl 185 - * @symbol __unk_vfn_185 - */ - virtual void __unk_vfn_185(); - /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@FungusStem\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z - */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; - /** - * @symbol ??0FungusStem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z - */ - MCAPI FungusStem(std::string const &, int, class Material const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp index e750ea7cd4..53dac89888 100644 --- a/LiteLoader/include/llapi/mc/FurnaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlock.hpp @@ -31,265 +31,270 @@ class FurnaceBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FurnaceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@FurnaceBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@FurnaceBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@FurnaceBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@FurnaceBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 149 - * @symbol ?getMappedFace\@FurnaceBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@FurnaceBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@FurnaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@FurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@FurnaceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@FurnaceBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FURNACEBLOCK /** - * @symbol ?hasComparatorSignal\@FurnaceBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@FurnaceBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isContainerBlock\@FurnaceBlock\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@FurnaceBlock\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isCraftingBlock\@FurnaceBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@FurnaceBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@FurnaceBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@FurnaceBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0FurnaceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0FurnaceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI FurnaceBlock(std::string const &, int, bool); /** - * @symbol ?setLit\@FurnaceBlock\@\@SAX_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4BlockActorType\@\@AEBVBlock\@\@4\@Z + * @symbol ?setLit\@FurnaceBlock\@\@SAX_NAEAVBlockSource\@\@AEBVBlockPos\@\@W4BlockActorType\@\@AEBVBlock\@\@4\@Z */ MCAPI static void setLit(bool, class BlockSource &, class BlockPos const &, enum class BlockActorType, class Block const &, class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp b/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp index e90d7bd555..986cc5f4e9 100644 --- a/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceBlockActor.hpp @@ -31,204 +31,204 @@ class FurnaceBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FURNACEBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@FurnaceBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@FurnaceBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@FurnaceBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@FurnaceBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?canPullOutItem\@FurnaceBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@FurnaceBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@FurnaceBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@FurnaceBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?fixupOnLoad\@FurnaceBlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?fixupOnLoad\@FurnaceBlockActor\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void fixupOnLoad(class LevelChunk &); /** - * @symbol ?getContainer\@FurnaceBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@FurnaceBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@FurnaceBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@FurnaceBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@FurnaceBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@FurnaceBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@FurnaceBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@FurnaceBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@FurnaceBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@FurnaceBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@FurnaceBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@FurnaceBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?load\@FurnaceBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@FurnaceBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onCustomTagLoadDone\@FurnaceBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onCustomTagLoadDone\@FurnaceBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onCustomTagLoadDone(class BlockSource &); /** - * @symbol ?onMove\@FurnaceBlockActor\@\@UEAAXXZ + * @symbol ?onMove\@FurnaceBlockActor\@\@UEAAXXZ */ MCVAPI void onMove(); /** - * @symbol ?onNeighborChanged\@FurnaceBlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onNeighborChanged\@FurnaceBlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void onNeighborChanged(class BlockSource &, class BlockPos const &); /** - * @symbol ?save\@FurnaceBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@FurnaceBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@FurnaceBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@FurnaceBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@FurnaceBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@FurnaceBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@FurnaceBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@FurnaceBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@FurnaceBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@FurnaceBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@FurnaceBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@FurnaceBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~FurnaceBlockActor(); #endif /** - * @symbol ??0FurnaceBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0FurnaceBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI FurnaceBlockActor(class BlockPos const &); /** - * @symbol ?checkForAlternativeFuelAchievement\@FurnaceBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVItemStack\@\@\@Z + * @symbol ?checkForAlternativeFuelAchievement\@FurnaceBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVItemStack\@\@\@Z */ MCAPI void checkForAlternativeFuelAchievement(class BlockSource &, class ItemStack const &); /** - * @symbol ?checkForSmeltEverythingAchievement\@FurnaceBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?checkForSmeltEverythingAchievement\@FurnaceBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void checkForSmeltEverythingAchievement(class BlockSource &); /** - * @symbol ?getLitDuration\@FurnaceBlockActor\@\@QEBAHXZ + * @symbol ?getLitDuration\@FurnaceBlockActor\@\@QEBAHXZ */ MCAPI int getLitDuration() const; /** - * @symbol ?getLitTime\@FurnaceBlockActor\@\@QEBAHXZ + * @symbol ?getLitTime\@FurnaceBlockActor\@\@QEBAHXZ */ MCAPI int getLitTime() const; /** - * @symbol ?getStoredXP\@FurnaceBlockActor\@\@QEBAHXZ + * @symbol ?getStoredXP\@FurnaceBlockActor\@\@QEBAHXZ */ MCAPI int getStoredXP() const; /** - * @symbol ?getTickCount\@FurnaceBlockActor\@\@QEBAHXZ + * @symbol ?getTickCount\@FurnaceBlockActor\@\@QEBAHXZ */ MCAPI int getTickCount() const; /** - * @symbol ?isEmptiedByHopper\@FurnaceBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?isEmptiedByHopper\@FurnaceBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool isEmptiedByHopper(class BlockSource &); /** - * @symbol ?onFurnaceBlockRemoved\@FurnaceBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onFurnaceBlockRemoved\@FurnaceBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void onFurnaceBlockRemoved(class BlockSource &); /** - * @symbol ?setLitDuration\@FurnaceBlockActor\@\@QEAAXH\@Z + * @symbol ?setLitDuration\@FurnaceBlockActor\@\@QEAAXH\@Z */ MCAPI void setLitDuration(int); /** - * @symbol ?setLitTime\@FurnaceBlockActor\@\@QEAAXH\@Z + * @symbol ?setLitTime\@FurnaceBlockActor\@\@QEAAXH\@Z */ MCAPI void setLitTime(int); /** - * @symbol ?setStoredXP\@FurnaceBlockActor\@\@QEAAXH\@Z + * @symbol ?setStoredXP\@FurnaceBlockActor\@\@QEAAXH\@Z */ MCAPI void setStoredXP(int); /** - * @symbol ?setTickCount\@FurnaceBlockActor\@\@QEAAXH\@Z + * @symbol ?setTickCount\@FurnaceBlockActor\@\@QEAAXH\@Z */ MCAPI void setTickCount(int); /** - * @symbol ?storeXPRewardForRemovingWithHopper\@FurnaceBlockActor\@\@QEAAXAEBVItemStackBase\@\@H\@Z + * @symbol ?storeXPRewardForRemovingWithHopper\@FurnaceBlockActor\@\@QEAAXAEBVItemStackBase\@\@H\@Z */ MCAPI void storeXPRewardForRemovingWithHopper(class ItemStackBase const &, int); /** - * @symbol ?withdrawStoredXPReward\@FurnaceBlockActor\@\@QEAAHXZ + * @symbol ?withdrawStoredXPReward\@FurnaceBlockActor\@\@QEAAHXZ */ MCAPI int withdrawStoredXPReward(); /** - * @symbol ?BURN_INTERVAL\@FurnaceBlockActor\@\@2HB + * @symbol ?BURN_INTERVAL\@FurnaceBlockActor\@\@2HB */ MCAPI static int const BURN_INTERVAL; /** - * @symbol ?DEFAULT_SMELTING_TIME\@FurnaceBlockActor\@\@2MB + * @symbol ?DEFAULT_SMELTING_TIME\@FurnaceBlockActor\@\@2MB */ MCAPI static float const DEFAULT_SMELTING_TIME; /** - * @symbol ?getAvailableFuelSetCount\@FurnaceBlockActor\@\@SAHHAEBVItemStackBase\@\@\@Z + * @symbol ?getAvailableFuelSetCount\@FurnaceBlockActor\@\@SAHHAEBVItemStackBase\@\@\@Z */ MCAPI static int getAvailableFuelSetCount(int, class ItemStackBase const &); /** - * @symbol ?getBurnDuration\@FurnaceBlockActor\@\@SAMAEBVItemStackBase\@\@M\@Z + * @symbol ?getBurnDuration\@FurnaceBlockActor\@\@SAMAEBVItemStackBase\@\@M\@Z */ MCAPI static float getBurnDuration(class ItemStackBase const &, float); /** - * @symbol ?getXPRewardFromSmeltingItems\@FurnaceBlockActor\@\@SAHAEBVItemStackBase\@\@H\@Z + * @symbol ?getXPRewardFromSmeltingItems\@FurnaceBlockActor\@\@SAHAEBVItemStackBase\@\@H\@Z */ MCAPI static int getXPRewardFromSmeltingItems(class ItemStackBase const &, int); /** - * @symbol ?isItemAllowedInFuelSlot\@FurnaceBlockActor\@\@SA_NHAEBVItemStackBase\@\@H\@Z + * @symbol ?isItemAllowedInFuelSlot\@FurnaceBlockActor\@\@SA_NHAEBVItemStackBase\@\@H\@Z */ MCAPI static bool isItemAllowedInFuelSlot(int, class ItemStackBase const &, int); //protected: /** - * @symbol ??0FurnaceBlockActor\@\@IEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBVHashedString\@\@W4LevelSoundEvent\@\@W4ContainerType\@\@HAEBVBlock\@\@5\@Z + * @symbol ??0FurnaceBlockActor\@\@IEAA\@W4BlockActorType\@\@AEBVBlockPos\@\@AEBVHashedString\@\@W4LevelSoundEvent\@\@W4ContainerType\@\@HAEBVBlock\@\@5\@Z */ MCAPI FurnaceBlockActor(enum class BlockActorType, class BlockPos const &, class HashedString const &, enum class LevelSoundEvent, enum class ContainerType, int, class Block const &, class Block const &); //private: /** - * @symbol ?_refreshFurnaceBlockLitState\@FurnaceBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_refreshFurnaceBlockLitState\@FurnaceBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _refreshFurnaceBlockLitState(class BlockSource &); /** - * @symbol ?burn\@FurnaceBlockActor\@\@AEAAXAEBVRecipes\@\@\@Z + * @symbol ?burn\@FurnaceBlockActor\@\@AEAAXAEBVRecipes\@\@\@Z */ MCAPI void burn(class Recipes const &); /** - * @symbol ?canBurn\@FurnaceBlockActor\@\@AEAA_NAEBVRecipes\@\@\@Z + * @symbol ?canBurn\@FurnaceBlockActor\@\@AEAA_NAEBVRecipes\@\@\@Z */ MCAPI bool canBurn(class Recipes const &); /** - * @symbol ?_getXPRewardMultiplier\@FurnaceBlockActor\@\@CAMAEBVItemStackBase\@\@\@Z + * @symbol ?_getXPRewardMultiplier\@FurnaceBlockActor\@\@CAMAEBVItemStackBase\@\@\@Z */ MCAPI static float _getXPRewardMultiplier(class ItemStackBase const &); /** - * @symbol ?_roundXPReward\@FurnaceBlockActor\@\@CAHM\@Z + * @symbol ?_roundXPReward\@FurnaceBlockActor\@\@CAHM\@Z */ MCAPI static int _roundXPReward(float); @@ -236,40 +236,40 @@ class FurnaceBlockActor { private: /** - * @symbol ?BURN_DURATION_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BURN_DURATION_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BURN_DURATION_KEY; /** - * @symbol ?BURN_TIME_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BURN_TIME_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BURN_TIME_KEY; /** - * @symbol ?COOK_TIME_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?COOK_TIME_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const COOK_TIME_KEY; /** - * @symbol ?CUSTOM_NAME_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?CUSTOM_NAME_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const CUSTOM_NAME_KEY; /** - * @symbol ?ITEMS_LIST_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ITEMS_LIST_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ITEMS_LIST_KEY; /** - * @symbol ?LAST_FUEL_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?LAST_FUEL_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const LAST_FUEL_KEY; /** - * @symbol ?SLOT_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SLOT_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SLOT_KEY; /** - * @symbol ?STORED_XP_DEPRECATED_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORED_XP_DEPRECATED_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORED_XP_DEPRECATED_KEY; /** - * @symbol ?STORED_XP_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORED_XP_KEY\@FurnaceBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORED_XP_KEY; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp index b3edd9294b..7fff2ef069 100644 --- a/LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceContainerManagerModel.hpp @@ -31,63 +31,69 @@ class FurnaceContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FurnaceContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@FurnaceContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@FurnaceContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@FurnaceContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@FurnaceContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@FurnaceContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@FurnaceContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@FurnaceContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@FurnaceContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@FurnaceContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@FurnaceContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@FurnaceContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@FurnaceContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@FurnaceContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@FurnaceContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FURNACECONTAINERMANAGERMODEL /** - * @symbol ??0FurnaceContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FurnaceContainerManagerModel(); +#endif + /** + * @symbol ??0FurnaceContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI FurnaceContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); //protected: /** - * @symbol ??0FurnaceContainerManagerModel\@\@IEAA\@AEBVHashedString\@\@W4ContainerType\@\@W4BlockActorType\@\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0FurnaceContainerManagerModel\@\@IEAA\@AEBVHashedString\@\@W4ContainerType\@\@W4BlockActorType\@\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI FurnaceContainerManagerModel(class HashedString const &, enum class ContainerType, enum class BlockActorType, enum class ContainerID, class Player &, class BlockPos const &); //private: /** - * @symbol ?_getFurnaceEntity\@FurnaceContainerManagerModel\@\@AEAAPEAVFurnaceBlockActor\@\@XZ + * @symbol ?_getFurnaceEntity\@FurnaceContainerManagerModel\@\@AEAAPEAVFurnaceBlockActor\@\@XZ */ MCAPI class FurnaceBlockActor * _getFurnaceEntity(); /** - * @symbol ?_updateResultSlotInfo\@FurnaceContainerManagerModel\@\@AEAAXXZ + * @symbol ?_updateResultSlotInfo\@FurnaceContainerManagerModel\@\@AEAAXXZ */ MCAPI void _updateResultSlotInfo(); @@ -95,4 +101,4 @@ class FurnaceContainerManagerModel : public ContainerManagerModel { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FurnaceContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/FurnaceContainerScreenValidator.hpp index 2870f01572..7a22385bc5 100644 --- a/LiteLoader/include/llapi/mc/FurnaceContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceContainerScreenValidator.hpp @@ -30,18 +30,24 @@ class FurnaceContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FurnaceContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?postCommitItemRemoved\@FurnaceContainerScreenValidator\@\@UEAA?AV?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@W4ContainerEnumName\@\@HAEBVItemStack\@\@\@Z + * @vftbl 1 + * @symbol ?postCommitItemRemoved\@FurnaceContainerScreenValidator\@\@UEAA?AV?$shared_ptr\@VContainerValidationCommitObject\@\@\@std\@\@W4ContainerEnumName\@\@HAEBVItemStack\@\@\@Z */ virtual class std::shared_ptr postCommitItemRemoved(enum class ContainerEnumName, int, class ItemStack const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_FURNACECONTAINERSCREENVALIDATOR /** - * @symbol ??0FurnaceContainerScreenValidator\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~FurnaceContainerScreenValidator(); +#endif + /** + * @symbol ??0FurnaceContainerScreenValidator\@\@QEAA\@XZ */ MCAPI FurnaceContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FurnaceFuelContainerValidation.hpp b/LiteLoader/include/llapi/mc/FurnaceFuelContainerValidation.hpp index 04a9be04e0..4ce4e3753c 100644 --- a/LiteLoader/include/llapi/mc/FurnaceFuelContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceFuelContainerValidation.hpp @@ -31,50 +31,50 @@ class FurnaceFuelContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FurnaceFuelContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@FurnaceFuelContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@FurnaceFuelContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@FurnaceFuelContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@FurnaceFuelContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@FurnaceFuelContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@FurnaceFuelContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_FURNACEFUELCONTAINERVALIDATION /** - * @symbol ?getContainerOffset\@FurnaceFuelContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @symbol ?getContainerOffset\@FurnaceFuelContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ MCVAPI int getContainerOffset(class ContainerScreenContext const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FurnaceIngredientContainerValidation.hpp b/LiteLoader/include/llapi/mc/FurnaceIngredientContainerValidation.hpp index d70bb86b5d..7c0e91e00c 100644 --- a/LiteLoader/include/llapi/mc/FurnaceIngredientContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceIngredientContainerValidation.hpp @@ -31,54 +31,54 @@ class FurnaceIngredientContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FurnaceIngredientContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@FurnaceIngredientContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@FurnaceIngredientContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/FurnaceResultContainerValidation.hpp b/LiteLoader/include/llapi/mc/FurnaceResultContainerValidation.hpp index 25949e8f10..65a18a57cf 100644 --- a/LiteLoader/include/llapi/mc/FurnaceResultContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/FurnaceResultContainerValidation.hpp @@ -31,54 +31,54 @@ class FurnaceResultContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~FurnaceResultContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@FurnaceResultContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@FurnaceResultContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameCallbacks.hpp b/LiteLoader/include/llapi/mc/GameCallbacks.hpp index 7fdb4080f3..8eeb632619 100644 --- a/LiteLoader/include/llapi/mc/GameCallbacks.hpp +++ b/LiteLoader/include/llapi/mc/GameCallbacks.hpp @@ -30,24 +30,30 @@ class GameCallbacks { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameCallbacks(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1() = 0; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ - virtual void __unk_vfn_2() = 0; + virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?onBeforeSimTick\@GameCallbacks\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?onBeforeSimTick\@GameCallbacks\@\@UEAAXXZ */ virtual void onBeforeSimTick(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMECALLBACKS + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GameCallbacks(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp index 7ce33008f8..e2e783f9f9 100644 --- a/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/GameDirectorEntityServerCommandOrigin.hpp @@ -32,42 +32,42 @@ class GameDirectorEntityServerCommandOrigin : public ActorServerCommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameDirectorEntityServerCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@GameDirectorEntityServerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@GameDirectorEntityServerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@GameDirectorEntityServerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@GameDirectorEntityServerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@GameDirectorEntityServerCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@GameDirectorEntityServerCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@GameDirectorEntityServerCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@GameDirectorEntityServerCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@GameDirectorEntityServerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@GameDirectorEntityServerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @symbol ??0GameDirectorEntityServerCommandOrigin\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0GameDirectorEntityServerCommandOrigin\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI GameDirectorEntityServerCommandOrigin(class Actor &); /** - * @symbol ?load\@GameDirectorEntityServerCommandOrigin\@\@SA?AV?$unique_ptr\@VGameDirectorEntityServerCommandOrigin\@\@U?$default_delete\@VGameDirectorEntityServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@GameDirectorEntityServerCommandOrigin\@\@SA?AV?$unique_ptr\@VGameDirectorEntityServerCommandOrigin\@\@U?$default_delete\@VGameDirectorEntityServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEvent.hpp b/LiteLoader/include/llapi/mc/GameEvent.hpp index 627af97f8f..46b42ce513 100644 --- a/LiteLoader/include/llapi/mc/GameEvent.hpp +++ b/LiteLoader/include/llapi/mc/GameEvent.hpp @@ -30,20 +30,20 @@ class GameEvent { public: /** - * @symbol ?getRadius\@GameEvent\@\@QEBAMXZ + * @symbol ?getRadius\@GameEvent\@\@QEBAMXZ */ MCAPI float getRadius() const; /** - * @symbol ?getRadiusSqrd\@GameEvent\@\@QEBAMXZ + * @symbol ?getRadiusSqrd\@GameEvent\@\@QEBAMXZ */ MCAPI float getRadiusSqrd() const; /** - * @symbol ?getType\@GameEvent\@\@QEBA?BW4GameEventType\@GameEventConfig\@\@XZ + * @symbol ?getType\@GameEvent\@\@QEBA?BW4GameEventType\@GameEventConfig\@\@XZ */ MCAPI enum class GameEventConfig::GameEventType const getType() const; /** - * @symbol ?isCategory\@GameEvent\@\@QEBA_NW4GameEventCategory\@GameEventConfig\@\@\@Z + * @symbol ?isCategory\@GameEvent\@\@QEBA_NW4GameEventCategory\@GameEventConfig\@\@\@Z */ MCAPI bool isCategory(enum class GameEventConfig::GameEventCategory) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventContext.hpp b/LiteLoader/include/llapi/mc/GameEventContext.hpp index b26e2abc18..481815fb7a 100644 --- a/LiteLoader/include/llapi/mc/GameEventContext.hpp +++ b/LiteLoader/include/llapi/mc/GameEventContext.hpp @@ -28,7 +28,7 @@ struct GameEventContext { public: /** - * @symbol ??0GameEventContext\@\@QEAA\@AEBVVec3\@\@PEAVActor\@\@PEBVBlock\@\@\@Z + * @symbol ??0GameEventContext\@\@QEAA\@AEBVVec3\@\@PEAVActor\@\@PEBVBlock\@\@\@Z */ MCAPI GameEventContext(class Vec3 const &, class Actor *, class Block const *); diff --git a/LiteLoader/include/llapi/mc/GameEventDispatcher.hpp b/LiteLoader/include/llapi/mc/GameEventDispatcher.hpp index 801ca7150b..0dfef7398a 100644 --- a/LiteLoader/include/llapi/mc/GameEventDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/GameEventDispatcher.hpp @@ -30,12 +30,12 @@ class GameEventDispatcher { public: /** - * @symbol ?post\@GameEventDispatcher\@\@QEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z + * @symbol ?post\@GameEventDispatcher\@\@QEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z */ - MCAPI void post(class BlockSource &, class Actor *, class GameEvent const &, class BlockPos const &, class Block const *); + MCAPI void post(class BlockSource &, class Actor *, class GameEvent const &, class Vec3 const &, class Block const *); /** - * @symbol ?post\@GameEventDispatcher\@\@QEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVGameEvent\@\@AEBVVec3\@\@PEBVBlock\@\@\@Z + * @symbol ?post\@GameEventDispatcher\@\@QEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVGameEvent\@\@AEBVBlockPos\@\@PEBVBlock\@\@\@Z */ - MCAPI void post(class BlockSource &, class Actor *, class GameEvent const &, class Vec3 const &, class Block const *); + MCAPI void post(class BlockSource &, class Actor *, class GameEvent const &, class BlockPos const &, class Block const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventDynamicRegistration.hpp b/LiteLoader/include/llapi/mc/GameEventDynamicRegistration.hpp index 349adae8c5..8e5a8a9a6f 100644 --- a/LiteLoader/include/llapi/mc/GameEventDynamicRegistration.hpp +++ b/LiteLoader/include/llapi/mc/GameEventDynamicRegistration.hpp @@ -28,28 +28,28 @@ class GameEventDynamicRegistration { public: /** - * @symbol ??0GameEventDynamicRegistration\@\@QEAA\@V?$shared_ptr\@VGameEventListener\@\@\@std\@\@\@Z + * @symbol ??0GameEventDynamicRegistration\@\@QEAA\@V?$shared_ptr\@VGameEventListener\@\@\@std\@\@\@Z */ MCAPI GameEventDynamicRegistration(class std::shared_ptr); /** - * @symbol ?onActorLoadedIntoChunk\@GameEventDynamicRegistration\@\@QEAAXAEBVBlockSource\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?onActorLoadedIntoChunk\@GameEventDynamicRegistration\@\@QEAAXAEBVBlockSource\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void onActorLoadedIntoChunk(class BlockSource const &, class ChunkPos, class AutomaticID); /** - * @symbol ?onActorMovedBetweenChunks\@GameEventDynamicRegistration\@\@QEAAXAEBVBlockSource\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?onActorMovedBetweenChunks\@GameEventDynamicRegistration\@\@QEAAXAEBVBlockSource\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void onActorMovedBetweenChunks(class BlockSource const &, class ChunkPos, class AutomaticID); /** - * @symbol ?onActorRemoved\@GameEventDynamicRegistration\@\@QEAAXXZ + * @symbol ?onActorRemoved\@GameEventDynamicRegistration\@\@QEAAXXZ */ MCAPI void onActorRemoved(); //private: /** - * @symbol ?_onActorChangedChunk\@GameEventDynamicRegistration\@\@AEAAXAEBVBlockSource\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?_onActorChangedChunk\@GameEventDynamicRegistration\@\@AEAAXAEBVBlockSource\@\@VChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void _onActorChangedChunk(class BlockSource const &, class ChunkPos, class AutomaticID); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventListener.hpp b/LiteLoader/include/llapi/mc/GameEventListener.hpp index 0a21244ee8..0d4b531d70 100644 --- a/LiteLoader/include/llapi/mc/GameEventListener.hpp +++ b/LiteLoader/include/llapi/mc/GameEventListener.hpp @@ -29,9 +29,9 @@ class GameEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMEEVENTLISTENER /** - * @symbol ?getDeliveryMode\@GameEventListener\@\@UEBA?AW4DeliveryMode\@1\@XZ + * @symbol ?getDeliveryMode\@GameEventListener\@\@UEBA?AW4DeliveryMode\@1\@XZ */ MCVAPI enum class GameEventListener::DeliveryMode getDeliveryMode() const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp b/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp index 6750a51a75..059635be71 100644 --- a/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp +++ b/LiteLoader/include/llapi/mc/GameEventListenerComponent.hpp @@ -27,28 +27,28 @@ class GameEventListenerComponent { public: /** - * @symbol ??0GameEventListenerComponent\@\@QEAA\@XZ + * @symbol ??0GameEventListenerComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI GameEventListenerComponent(); + MCAPI GameEventListenerComponent(class GameEventListenerComponent &&); /** - * @symbol ??0GameEventListenerComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0GameEventListenerComponent\@\@QEAA\@XZ */ - MCAPI GameEventListenerComponent(class GameEventListenerComponent &&); + MCAPI GameEventListenerComponent(); /** - * @symbol ?initialize\@GameEventListenerComponent\@\@QEAA_NV?$unique_ptr\@VGameEventDynamicRegistration\@\@U?$default_delete\@VGameEventDynamicRegistration\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?initialize\@GameEventListenerComponent\@\@QEAA_NV?$unique_ptr\@VGameEventDynamicRegistration\@\@U?$default_delete\@VGameEventDynamicRegistration\@\@\@std\@\@\@std\@\@\@Z */ MCAPI bool initialize(std::unique_ptr); /** - * @symbol ??4GameEventListenerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4GameEventListenerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class GameEventListenerComponent & operator=(class GameEventListenerComponent &&); /** - * @symbol ?tryGetListenerRegistration\@GameEventListenerComponent\@\@QEBAPEAVGameEventDynamicRegistration\@\@XZ + * @symbol ?tryGetListenerRegistration\@GameEventListenerComponent\@\@QEBAPEAVGameEventDynamicRegistration\@\@XZ */ MCAPI class GameEventDynamicRegistration * tryGetListenerRegistration() const; /** - * @symbol ??1GameEventListenerComponent\@\@QEAA\@XZ + * @symbol ??1GameEventListenerComponent\@\@QEAA\@XZ */ MCAPI ~GameEventListenerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventListenerRegistry.hpp b/LiteLoader/include/llapi/mc/GameEventListenerRegistry.hpp index 39281052b2..7c673f9319 100644 --- a/LiteLoader/include/llapi/mc/GameEventListenerRegistry.hpp +++ b/LiteLoader/include/llapi/mc/GameEventListenerRegistry.hpp @@ -28,12 +28,12 @@ class GameEventListenerRegistry { public: /** - * @symbol ?getListeners\@GameEventListenerRegistry\@\@QEBA?AV?$vector\@V?$reference_wrapper\@VGameEventListener\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VGameEventListener\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getListeners\@GameEventListenerRegistry\@\@QEBA?AV?$vector\@V?$reference_wrapper\@VGameEventListener\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VGameEventListener\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> getListeners() const; /** - * @symbol ?registerListener\@GameEventListenerRegistry\@\@QEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@AEAVGameEventListener\@\@\@Z + * @symbol ?registerListener\@GameEventListenerRegistry\@\@QEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@AEAVGameEventListener\@\@\@Z */ MCAPI class gsl::final_action> registerListener(class GameEventListener &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventMapping.hpp b/LiteLoader/include/llapi/mc/GameEventMapping.hpp index 19563893b3..0e9a1f8c95 100644 --- a/LiteLoader/include/llapi/mc/GameEventMapping.hpp +++ b/LiteLoader/include/llapi/mc/GameEventMapping.hpp @@ -28,11 +28,11 @@ class GameEventMapping { public: /** - * @symbol ?nameToEvent\@GameEventMapping\@\@SAAEBVGameEvent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?nameToEvent\@GameEventMapping\@\@SAAEBVGameEvent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class GameEvent const & nameToEvent(std::string const &); /** - * @symbol ?typeToEvent\@GameEventMapping\@\@SAAEBVGameEvent\@\@W4GameEventType\@GameEventConfig\@\@\@Z + * @symbol ?typeToEvent\@GameEventMapping\@\@SAAEBVGameEvent\@\@W4GameEventType\@GameEventConfig\@\@\@Z */ MCAPI static class GameEvent const & typeToEvent(enum class GameEventConfig::GameEventType); @@ -40,8 +40,8 @@ class GameEventMapping { private: /** - * @symbol ?mGameEventPairs\@GameEventMapping\@\@0V?$vector\@UGameEventPair\@\@V?$allocator\@UGameEventPair\@\@\@std\@\@\@std\@\@B + * @symbol ?mGameEventPairs\@GameEventMapping\@\@0V?$vector\@UGameEventPair\@\@V?$allocator\@UGameEventPair\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const mGameEventPairs; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventMovementTrackingComponent.hpp b/LiteLoader/include/llapi/mc/GameEventMovementTrackingComponent.hpp index c326987ebe..34576fee4b 100644 --- a/LiteLoader/include/llapi/mc/GameEventMovementTrackingComponent.hpp +++ b/LiteLoader/include/llapi/mc/GameEventMovementTrackingComponent.hpp @@ -28,20 +28,20 @@ class GameEventMovementTrackingComponent { public: /** - * @symbol ?initializeFromCode\@GameEventMovementTrackingComponent\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?initializeFromCode\@GameEventMovementTrackingComponent\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void initializeFromCode(class Actor &, bool); /** - * @symbol ?shouldEmitEntityMoveGameEvent\@GameEventMovementTrackingComponent\@\@QEAA_NXZ + * @symbol ?shouldEmitEntityMoveGameEvent\@GameEventMovementTrackingComponent\@\@QEAA_NXZ */ MCAPI bool shouldEmitEntityMoveGameEvent(); /** - * @symbol ?shouldEmitFlapGameEvent\@GameEventMovementTrackingComponent\@\@QEAA_NXZ + * @symbol ?shouldEmitFlapGameEvent\@GameEventMovementTrackingComponent\@\@QEAA_NXZ */ MCAPI bool shouldEmitFlapGameEvent(); /** - * @symbol ?shouldEmitSwimGameEvent\@GameEventMovementTrackingComponent\@\@QEAA_NXZ + * @symbol ?shouldEmitSwimGameEvent\@GameEventMovementTrackingComponent\@\@QEAA_NXZ */ MCAPI bool shouldEmitSwimGameEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventMovementTrackingDefinition.hpp b/LiteLoader/include/llapi/mc/GameEventMovementTrackingDefinition.hpp index 7a0b7cccfe..b52d82d050 100644 --- a/LiteLoader/include/llapi/mc/GameEventMovementTrackingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GameEventMovementTrackingDefinition.hpp @@ -29,12 +29,12 @@ class GameEventMovementTrackingDefinition { public: /** - * @symbol ?initialize\@GameEventMovementTrackingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGameEventMovementTrackingComponent\@\@\@Z + * @symbol ?initialize\@GameEventMovementTrackingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGameEventMovementTrackingComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class GameEventMovementTrackingComponent &) const; /** - * @symbol ?buildSchema\@GameEventMovementTrackingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGameEventMovementTrackingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@GameEventMovementTrackingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGameEventMovementTrackingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventMovementTrackingSystem.hpp b/LiteLoader/include/llapi/mc/GameEventMovementTrackingSystem.hpp index 4f73b2c080..6e96396da6 100644 --- a/LiteLoader/include/llapi/mc/GameEventMovementTrackingSystem.hpp +++ b/LiteLoader/include/llapi/mc/GameEventMovementTrackingSystem.hpp @@ -28,31 +28,31 @@ class GameEventMovementTrackingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameEventMovementTrackingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@GameEventMovementTrackingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GameEventMovementTrackingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickGameEventMovementTrackingComponent\@GameEventMovementTrackingSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVGameEventMovementTrackingComponent\@\@\@Z + * @symbol ?_tickGameEventMovementTrackingComponent\@GameEventMovementTrackingSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVGameEventMovementTrackingComponent\@\@\@Z */ MCAPI static void _tickGameEventMovementTrackingComponent(class ActorOwnerComponent &, class GameEventMovementTrackingComponent &); /** - * @symbol ?_trackMovement\@GameEventMovementTrackingSystem\@\@CAXAEAVActor\@\@AEAVGameEventMovementTrackingComponent\@\@\@Z + * @symbol ?_trackMovement\@GameEventMovementTrackingSystem\@\@CAXAEAVActor\@\@AEAVGameEventMovementTrackingComponent\@\@\@Z */ MCAPI static void _trackMovement(class Actor &, class GameEventMovementTrackingComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventPair.hpp b/LiteLoader/include/llapi/mc/GameEventPair.hpp index 0f40a40ffe..4339582cb0 100644 --- a/LiteLoader/include/llapi/mc/GameEventPair.hpp +++ b/LiteLoader/include/llapi/mc/GameEventPair.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure GameEventPair. - * - */ -struct GameEventPair { + +class GameEventPair { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEEVENTPAIR public: - struct GameEventPair& operator=(struct GameEventPair const &) = delete; - GameEventPair(struct GameEventPair const &) = delete; + class GameEventPair& operator=(class GameEventPair const &) = delete; + GameEventPair(class GameEventPair const &) = delete; GameEventPair() = delete; #endif public: /** - * @symbol ??1GameEventPair\@\@QEAA\@XZ + * @symbol ??1GameEventPair\@\@QEAA\@XZ */ MCAPI ~GameEventPair(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameEventRegistry.hpp b/LiteLoader/include/llapi/mc/GameEventRegistry.hpp index 2e14ffa233..c78d375706 100644 --- a/LiteLoader/include/llapi/mc/GameEventRegistry.hpp +++ b/LiteLoader/include/llapi/mc/GameEventRegistry.hpp @@ -20,179 +20,179 @@ namespace GameEventRegistry { #undef AFTER_EXTRA /** - * @symbol ?blockActivate\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockActivate\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockActivate; /** - * @symbol ?blockAttach\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockAttach\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockAttach; /** - * @symbol ?blockChange\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockChange\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockChange; /** - * @symbol ?blockClose\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockClose\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockClose; /** - * @symbol ?blockDeactivate\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockDeactivate\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockDeactivate; /** - * @symbol ?blockDestroy\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockDestroy\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockDestroy; /** - * @symbol ?blockDetach\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockDetach\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockDetach; /** - * @symbol ?blockOpen\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockOpen\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockOpen; /** - * @symbol ?blockPlace\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?blockPlace\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const blockPlace; /** - * @symbol ?containerClose\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?containerClose\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const containerClose; /** - * @symbol ?containerOpen\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?containerOpen\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const containerOpen; /** - * @symbol ?dispenseFail\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?dispenseFail\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const dispenseFail; /** - * @symbol ?drink\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?drink\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const drink; /** - * @symbol ?eat\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?eat\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const eat; /** - * @symbol ?elytraGlide\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?elytraGlide\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const elytraGlide; /** - * @symbol ?entityAct\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityAct\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityAct; /** - * @symbol ?entityDamage\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityDamage\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityDamage; /** - * @symbol ?entityDie\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityDie\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityDie; /** - * @symbol ?entityInteract\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityInteract\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityInteract; /** - * @symbol ?entityMove\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityMove\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityMove; /** - * @symbol ?entityPlace\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityPlace\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityPlace; /** - * @symbol ?entityRoar\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?entityRoar\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const entityRoar; /** - * @symbol ?equip\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?equip\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const equip; /** - * @symbol ?explode\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?explode\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const explode; /** - * @symbol ?flap\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?flap\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const flap; /** - * @symbol ?fluidPickup\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?fluidPickup\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const fluidPickup; /** - * @symbol ?fluidPlace\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?fluidPlace\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const fluidPlace; /** - * @symbol ?hitGround\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?hitGround\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const hitGround; /** - * @symbol ?invalid\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?invalid\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const invalid; /** - * @symbol ?itemInteractFinish\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?itemInteractFinish\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const itemInteractFinish; /** - * @symbol ?itemInteractStart\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?itemInteractStart\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const itemInteractStart; /** - * @symbol ?lightningStrike\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?lightningStrike\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const lightningStrike; /** - * @symbol ?noteBlockPlay\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?noteBlockPlay\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const noteBlockPlay; /** - * @symbol ?pistonContract\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?pistonContract\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const pistonContract; /** - * @symbol ?pistonExtend\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?pistonExtend\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const pistonExtend; /** - * @symbol ?primeFuse\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?primeFuse\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const primeFuse; /** - * @symbol ?projectileLand\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?projectileLand\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const projectileLand; /** - * @symbol ?projectileShoot\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?projectileShoot\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const projectileShoot; /** - * @symbol ?sculkSensorTendrilsClicking\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?sculkSensorTendrilsClicking\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const sculkSensorTendrilsClicking; /** - * @symbol ?sculkTouch\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?sculkTouch\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const sculkTouch; /** - * @symbol ?shear\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?shear\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const shear; /** - * @symbol ?shriek\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?shriek\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const shriek; /** - * @symbol ?splash\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?splash\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const splash; /** - * @symbol ?swim\@GameEventRegistry\@\@3VGameEvent\@\@B + * @symbol ?swim\@GameEventRegistry\@\@3VGameEvent\@\@B */ MCAPI extern class GameEvent const swim; diff --git a/LiteLoader/include/llapi/mc/GameLightingChecker.hpp b/LiteLoader/include/llapi/mc/GameLightingChecker.hpp index c14c497935..2867495356 100644 --- a/LiteLoader/include/llapi/mc/GameLightingChecker.hpp +++ b/LiteLoader/include/llapi/mc/GameLightingChecker.hpp @@ -20,7 +20,7 @@ namespace GameLightingChecker { #undef AFTER_EXTRA /** - * @symbol ?checkAreaForLighting\@GameLightingChecker\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@1AEAUCheckAreaForLightingResults\@1\@\@Z + * @symbol ?checkAreaForLighting\@GameLightingChecker\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@1AEAUCheckAreaForLightingResults\@1\@\@Z */ MCAPI void checkAreaForLighting(class BlockSource &, class BlockPos const &, class BlockPos const &, struct GameLightingChecker::CheckAreaForLightingResults &); diff --git a/LiteLoader/include/llapi/mc/GameMode.hpp b/LiteLoader/include/llapi/mc/GameMode.hpp index 4bc898181b..4dee9b453e 100644 --- a/LiteLoader/include/llapi/mc/GameMode.hpp +++ b/LiteLoader/include/llapi/mc/GameMode.hpp @@ -31,207 +31,213 @@ class GameMode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameMode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?startDestroyBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@EAEA_N\@Z + * @vftbl 1 + * @symbol ?startDestroyBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@EAEA_N\@Z */ virtual bool startDestroyBlock(class BlockPos const &, unsigned char, bool &); /** - * @vftbl 2 - * @symbol ?destroyBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@E\@Z + * @vftbl 2 + * @symbol ?destroyBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@E\@Z */ virtual bool destroyBlock(class BlockPos const &, unsigned char); /** - * @vftbl 3 - * @symbol ?continueDestroyBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@EAEBVVec3\@\@AEA_N\@Z + * @vftbl 3 + * @symbol ?continueDestroyBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@EAEBVVec3\@\@AEA_N\@Z */ virtual bool continueDestroyBlock(class BlockPos const &, unsigned char, class Vec3 const &, bool &); /** - * @vftbl 4 - * @symbol ?stopDestroyBlock\@GameMode\@\@UEAAXAEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?stopDestroyBlock\@GameMode\@\@UEAAXAEBVBlockPos\@\@\@Z */ virtual void stopDestroyBlock(class BlockPos const &); /** - * @vftbl 5 - * @symbol ?startBuildBlock\@GameMode\@\@UEAAXAEBVBlockPos\@\@E\@Z + * @vftbl 5 + * @symbol ?startBuildBlock\@GameMode\@\@UEAAXAEBVBlockPos\@\@E\@Z */ virtual void startBuildBlock(class BlockPos const &, unsigned char); /** - * @vftbl 6 - * @symbol ?buildBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@E_N\@Z + * @vftbl 6 + * @symbol ?buildBlock\@GameMode\@\@UEAA_NAEBVBlockPos\@\@E_N\@Z */ virtual bool buildBlock(class BlockPos const &, unsigned char, bool); /** - * @vftbl 7 - * @symbol ?continueBuildBlock\@GameMode\@\@UEAAXAEBVBlockPos\@\@E\@Z + * @vftbl 7 + * @symbol ?continueBuildBlock\@GameMode\@\@UEAAXAEBVBlockPos\@\@E\@Z */ virtual void continueBuildBlock(class BlockPos const &, unsigned char); /** - * @vftbl 8 - * @symbol ?stopBuildBlock\@GameMode\@\@UEAAXXZ + * @vftbl 8 + * @symbol ?stopBuildBlock\@GameMode\@\@UEAAXXZ */ virtual void stopBuildBlock(); /** - * @vftbl 9 - * @symbol ?tick\@GameMode\@\@UEAAXXZ + * @vftbl 9 + * @symbol ?tick\@GameMode\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 10 - * @symbol ?getPickRange\@GameMode\@\@UEAAMAEBW4InputMode\@\@_N\@Z + * @vftbl 10 + * @symbol ?getPickRange\@GameMode\@\@UEAAMAEBW4InputMode\@\@_N\@Z */ virtual float getPickRange(enum class InputMode const &, bool); /** - * @vftbl 11 - * @symbol ?useItem\@GameMode\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 11 + * @symbol ?useItem\@GameMode\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool useItem(class ItemStack &); /** - * @vftbl 12 - * @symbol ?useItemOn\@GameMode\@\@UEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z + * @vftbl 12 + * @symbol ?useItemOn\@GameMode\@\@UEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z */ virtual bool useItemOn(class ItemStack &, class BlockPos const &, unsigned char, class Vec3 const &, class Block const *); /** - * @vftbl 13 - * @symbol ?interact\@GameMode\@\@UEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z + * @vftbl 13 + * @symbol ?interact\@GameMode\@\@UEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z */ virtual bool interact(class Actor &, class Vec3 const &); /** - * @vftbl 14 - * @symbol ?attack\@GameMode\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 14 + * @symbol ?attack\@GameMode\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool attack(class Actor &); /** - * @vftbl 15 - * @symbol ?releaseUsingItem\@GameMode\@\@UEAAXXZ + * @vftbl 15 + * @symbol ?releaseUsingItem\@GameMode\@\@UEAAXXZ */ virtual void releaseUsingItem(); /** - * @vftbl 16 - * @symbol ?setTrialMode\@GameMode\@\@UEAAX_N\@Z + * @vftbl 16 + * @symbol ?setTrialMode\@GameMode\@\@UEAAX_N\@Z */ virtual void setTrialMode(bool); /** - * @vftbl 17 - * @symbol ?isInTrialMode\@GameMode\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?isInTrialMode\@GameMode\@\@UEAA_NXZ */ virtual bool isInTrialMode(); /** - * @vftbl 18 - * @symbol ?registerUpsellScreenCallback\@GameMode\@\@UEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z + * @vftbl 18 + * @symbol ?registerUpsellScreenCallback\@GameMode\@\@UEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ virtual void registerUpsellScreenCallback(class std::function); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMEMODE /** - * @symbol ??0GameMode\@\@QEAA\@AEAVPlayer\@\@V?$unique_ptr\@UIGameModeTimer\@\@U?$default_delete\@UIGameModeTimer\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UIGameModeMessenger\@\@U?$default_delete\@UIGameModeMessenger\@\@\@std\@\@\@3\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GameMode(); +#endif + /** + * @symbol ??0GameMode\@\@QEAA\@AEAVPlayer\@\@V?$unique_ptr\@UIGameModeTimer\@\@U?$default_delete\@UIGameModeTimer\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UIGameModeMessenger\@\@U?$default_delete\@UIGameModeMessenger\@\@\@std\@\@\@3\@\@Z */ MCAPI GameMode(class Player &, std::unique_ptr, std::unique_ptr); /** - * @symbol ?_startDestroyBlock\@GameMode\@\@QEAA_NAEBVBlockPos\@\@AEBVVec3\@\@EAEA_N\@Z + * @symbol ?_startDestroyBlock\@GameMode\@\@QEAA_NAEBVBlockPos\@\@AEBVVec3\@\@EAEA_N\@Z */ MCAPI bool _startDestroyBlock(class BlockPos const &, class Vec3 const &, unsigned char, bool &); /** - * @symbol ?_tickContinueDestroyBlock\@GameMode\@\@QEAA_NAEBVBlockPos\@\@AEBVVec3\@\@EAEA_NAEBV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?_tickContinueDestroyBlock\@GameMode\@\@QEAA_NAEBVBlockPos\@\@AEBVVec3\@\@EAEA_NAEBV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI bool _tickContinueDestroyBlock(class BlockPos const &, class Vec3 const &, unsigned char, bool &, class std::function const &); /** - * @symbol ?baseUseItem\@GameMode\@\@QEAA_NAEAVItemStack\@\@\@Z + * @symbol ?baseUseItem\@GameMode\@\@QEAA_NAEAVItemStack\@\@\@Z */ MCAPI bool baseUseItem(class ItemStack &); /** - * @symbol ?createBlockBreakCaptureScope\@GameMode\@\@QEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@V?$function\@$$A6AXAEBVItemStack\@\@0AEBVBlockPos\@\@\@Z\@std\@\@\@Z + * @symbol ?createBlockBreakCaptureScope\@GameMode\@\@QEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@V?$function\@$$A6AXAEBVItemStack\@\@0AEBVBlockPos\@\@\@Z\@std\@\@\@Z */ MCAPI class gsl::final_action> createBlockBreakCaptureScope(class std::function); /** - * @symbol ?getDestroyBlockFace\@GameMode\@\@QEBAEXZ + * @symbol ?getDestroyBlockFace\@GameMode\@\@QEBAEXZ */ MCAPI unsigned char getDestroyBlockFace() const; /** - * @symbol ?getDestroyBlockPos\@GameMode\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getDestroyBlockPos\@GameMode\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getDestroyBlockPos() const; /** - * @symbol ?getDestroyProgress\@GameMode\@\@QEAAMXZ + * @symbol ?getDestroyProgress\@GameMode\@\@QEAAMXZ */ MCAPI float getDestroyProgress(); /** - * @symbol ?getDestroyRate\@GameMode\@\@QEAAMAEBVBlock\@\@\@Z + * @symbol ?getDestroyRate\@GameMode\@\@QEAAMAEBVBlock\@\@\@Z */ MCAPI float getDestroyRate(class Block const &); /** - * @symbol ?getMaxPickRange\@GameMode\@\@QEAAMXZ + * @symbol ?getMaxPickRange\@GameMode\@\@QEAAMXZ */ MCAPI float getMaxPickRange(); /** - * @symbol ?getMaxPickRangeSqr\@GameMode\@\@QEAAMXZ + * @symbol ?getMaxPickRangeSqr\@GameMode\@\@QEAAMXZ */ MCAPI float getMaxPickRangeSqr(); /** - * @symbol ?isLastBuildBlockInteractive\@GameMode\@\@QEBA_NXZ + * @symbol ?isLastBuildBlockInteractive\@GameMode\@\@QEBA_NXZ */ MCAPI bool isLastBuildBlockInteractive() const; /** - * @symbol ?PICKRANGE_CREATIVE_MAXIMUM\@GameMode\@\@2MB + * @symbol ?PICKRANGE_CREATIVE_MAXIMUM\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_CREATIVE_MAXIMUM; /** - * @symbol ?PICKRANGE_CREATIVE_MAXIMUM_SQR\@GameMode\@\@2MB + * @symbol ?PICKRANGE_CREATIVE_MAXIMUM_SQR\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_CREATIVE_MAXIMUM_SQR; /** - * @symbol ?PICKRANGE_GAMEPAD\@GameMode\@\@2MB + * @symbol ?PICKRANGE_GAMEPAD\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_GAMEPAD; /** - * @symbol ?PICKRANGE_MOUSE\@GameMode\@\@2MB + * @symbol ?PICKRANGE_MOUSE\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_MOUSE; /** - * @symbol ?PICKRANGE_SURVIVAL_MAXIMUM\@GameMode\@\@2MB + * @symbol ?PICKRANGE_SURVIVAL_MAXIMUM\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_SURVIVAL_MAXIMUM; /** - * @symbol ?PICKRANGE_SURVIVAL_MAXIMUM_SQR\@GameMode\@\@2MB + * @symbol ?PICKRANGE_SURVIVAL_MAXIMUM_SQR\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_SURVIVAL_MAXIMUM_SQR; /** - * @symbol ?PICKRANGE_TOUCH_CREATIVE\@GameMode\@\@2MB + * @symbol ?PICKRANGE_TOUCH_CREATIVE\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_TOUCH_CREATIVE; /** - * @symbol ?PICKRANGE_TOUCH_SURVIVAL\@GameMode\@\@2MB + * @symbol ?PICKRANGE_TOUCH_SURVIVAL\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_TOUCH_SURVIVAL; /** - * @symbol ?PICKRANGE_VR_CREATIVE\@GameMode\@\@2MB + * @symbol ?PICKRANGE_VR_CREATIVE\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_VR_CREATIVE; /** - * @symbol ?PICKRANGE_VR_SURVIVAL\@GameMode\@\@2MB + * @symbol ?PICKRANGE_VR_SURVIVAL\@GameMode\@\@2MB */ MCAPI static float const PICKRANGE_VR_SURVIVAL; //private: /** - * @symbol ?_canDestroy\@GameMode\@\@AEAA_NAEBVBlockPos\@\@E\@Z + * @symbol ?_canDestroy\@GameMode\@\@AEAA_NAEBVBlockPos\@\@E\@Z */ MCAPI bool _canDestroy(class BlockPos const &, unsigned char); /** - * @symbol ?_canUseBlock\@GameMode\@\@AEAA_NAEBVBlock\@\@\@Z + * @symbol ?_canUseBlock\@GameMode\@\@AEAA_NAEBVBlock\@\@\@Z */ MCAPI bool _canUseBlock(class Block const &); /** - * @symbol ?_creativeDestroyBlock\@GameMode\@\@AEAA_NAEBVBlockPos\@\@E\@Z + * @symbol ?_creativeDestroyBlock\@GameMode\@\@AEAA_NAEBVBlockPos\@\@E\@Z */ MCAPI bool _creativeDestroyBlock(class BlockPos const &, unsigned char); /** - * @symbol ?_enableBlockBreakDelay\@GameMode\@\@AEBA_NXZ + * @symbol ?_enableBlockBreakDelay\@GameMode\@\@AEBA_NXZ */ MCAPI bool _enableBlockBreakDelay() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameModeCommand.hpp b/LiteLoader/include/llapi/mc/GameModeCommand.hpp index 1080c52132..58e2e88190 100644 --- a/LiteLoader/include/llapi/mc/GameModeCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameModeCommand.hpp @@ -31,18 +31,18 @@ class GameModeCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameModeCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GameModeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GameModeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GameModeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GameModeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameModeExt.hpp b/LiteLoader/include/llapi/mc/GameModeExt.hpp index 85938c59c6..b960434172 100644 --- a/LiteLoader/include/llapi/mc/GameModeExt.hpp +++ b/LiteLoader/include/llapi/mc/GameModeExt.hpp @@ -22,11 +22,11 @@ namespace GameModeExt { #undef AFTER_EXTRA /** - * @symbol ?createDefaultMessenger\@GameModeExt\@\@YA?AV?$unique_ptr\@UIGameModeMessenger\@\@U?$default_delete\@UIGameModeMessenger\@\@\@std\@\@\@std\@\@AEAVPlayer\@\@\@Z + * @symbol ?createDefaultMessenger\@GameModeExt\@\@YA?AV?$unique_ptr\@UIGameModeMessenger\@\@U?$default_delete\@UIGameModeMessenger\@\@\@std\@\@\@std\@\@AEAVPlayer\@\@\@Z */ MCAPI std::unique_ptr createDefaultMessenger(class Player &); /** - * @symbol ?createDefaultTimer\@GameModeExt\@\@YA?AV?$unique_ptr\@UIGameModeTimer\@\@U?$default_delete\@UIGameModeTimer\@\@\@std\@\@\@std\@\@AEBVPlayer\@\@\@Z + * @symbol ?createDefaultTimer\@GameModeExt\@\@YA?AV?$unique_ptr\@UIGameModeTimer\@\@U?$default_delete\@UIGameModeTimer\@\@\@std\@\@\@std\@\@AEBVPlayer\@\@\@Z */ MCAPI std::unique_ptr createDefaultTimer(class Player const &); diff --git a/LiteLoader/include/llapi/mc/GameModuleServer.hpp b/LiteLoader/include/llapi/mc/GameModuleServer.hpp index 56e37a6908..50b8427681 100644 --- a/LiteLoader/include/llapi/mc/GameModuleServer.hpp +++ b/LiteLoader/include/llapi/mc/GameModuleServer.hpp @@ -28,9 +28,15 @@ class GameModuleServer { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMEMODULESERVER /** - * @symbol ??0GameModuleServer\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GameModuleServer(); +#endif + /** + * @symbol ??0GameModuleServer\@\@QEAA\@XZ */ MCAPI GameModuleServer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameRule.hpp b/LiteLoader/include/llapi/mc/GameRule.hpp index a6e6c229a8..ac95f21285 100644 --- a/LiteLoader/include/llapi/mc/GameRule.hpp +++ b/LiteLoader/include/llapi/mc/GameRule.hpp @@ -32,105 +32,108 @@ enum class Type; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMERULE public: - class GameRule& operator=(class GameRule const &) = delete; GameRule() = delete; #endif public: /** - * @symbol ??0GameRule\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCAPI GameRule(std::string const &, bool); - /** - * @symbol ??0GameRule\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0GameRule\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI GameRule(class GameRule &&); /** - * @symbol ??0GameRule\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0GameRule\@\@QEAA\@AEBV0\@\@Z */ MCAPI GameRule(class GameRule const &); /** - * @symbol ?allowUseInCommand\@GameRule\@\@QEBA_NXZ + * @symbol ??0GameRule\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI GameRule(std::string const &, bool); + /** + * @symbol ?allowUseInCommand\@GameRule\@\@QEBA_NXZ */ MCAPI bool allowUseInCommand() const; /** - * @symbol ?canBeModifiedByPlayer\@GameRule\@\@QEBA_NXZ + * @symbol ?canBeModifiedByPlayer\@GameRule\@\@QEBA_NXZ */ MCAPI bool canBeModifiedByPlayer() const; /** - * @symbol ?getBool\@GameRule\@\@QEBA_NXZ + * @symbol ?getBool\@GameRule\@\@QEBA_NXZ */ MCAPI bool getBool() const; /** - * @symbol ?getFloat\@GameRule\@\@QEBAMXZ + * @symbol ?getFloat\@GameRule\@\@QEBAMXZ */ MCAPI float getFloat() const; /** - * @symbol ?getInt\@GameRule\@\@QEBAHXZ + * @symbol ?getInt\@GameRule\@\@QEBAHXZ */ MCAPI int getInt() const; /** - * @symbol ?getName\@GameRule\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@GameRule\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getType\@GameRule\@\@QEBA?AW4Type\@1\@XZ + * @symbol ?getType\@GameRule\@\@QEBA?AW4Type\@1\@XZ */ MCAPI enum class GameRule::Type getType() const; /** - * @symbol ?getValue\@GameRule\@\@QEBAAEBTValue\@1\@XZ + * @symbol ?getValue\@GameRule\@\@QEBAAEBTValue\@1\@XZ */ MCAPI union GameRule::Value const & getValue() const; /** - * @symbol ??4GameRule\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4GameRule\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class GameRule & operator=(class GameRule const &); + /** + * @symbol ??4GameRule\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class GameRule & operator=(class GameRule &&); /** - * @symbol ?requiresCheats\@GameRule\@\@QEBA_NXZ + * @symbol ?requiresCheats\@GameRule\@\@QEBA_NXZ */ MCAPI bool requiresCheats() const; /** - * @symbol ?resetType\@GameRule\@\@QEAAXW4Type\@1\@\@Z + * @symbol ?resetType\@GameRule\@\@QEAAXW4Type\@1\@\@Z */ MCAPI void resetType(enum class GameRule::Type); /** - * @symbol ?setBool\@GameRule\@\@QEAA_N_NPEA_NPEAVValidationError\@1\@\@Z + * @symbol ?setBool\@GameRule\@\@QEAA_N_NPEA_NPEAVValidationError\@1\@\@Z */ MCAPI bool setBool(bool, bool *, class GameRule::ValidationError *); /** - * @symbol ?setFloat\@GameRule\@\@QEAA_NMPEA_NPEAVValidationError\@1\@\@Z + * @symbol ?setFloat\@GameRule\@\@QEAA_NMPEA_NPEAVValidationError\@1\@\@Z */ MCAPI bool setFloat(float, bool *, class GameRule::ValidationError *); /** - * @symbol ?setInt\@GameRule\@\@QEAA_NHPEA_NPEAVValidationError\@1\@\@Z + * @symbol ?setInt\@GameRule\@\@QEAA_NHPEA_NPEAVValidationError\@1\@\@Z */ MCAPI bool setInt(int, bool *, class GameRule::ValidationError *); /** - * @symbol ?setTagDataNotFoundCallback\@GameRule\@\@QEAAAEAV1\@V?$function\@$$A6AXAEAVGameRule\@\@\@Z\@std\@\@\@Z + * @symbol ?setTagDataNotFoundCallback\@GameRule\@\@QEAAAEAV1\@V?$function\@$$A6AXAEAVGameRule\@\@\@Z\@std\@\@\@Z */ MCAPI class GameRule & setTagDataNotFoundCallback(class std::function); /** - * @symbol ?setValidateValueCallback\@GameRule\@\@QEAAAEAV1\@V?$function\@$$A6A_NAEBTValue\@GameRule\@\@PEAVValidationError\@2\@\@Z\@std\@\@\@Z + * @symbol ?setValidateValueCallback\@GameRule\@\@QEAAAEAV1\@V?$function\@$$A6A_NAEBTValue\@GameRule\@\@PEAVValidationError\@2\@\@Z\@std\@\@\@Z */ MCAPI class GameRule & setValidateValueCallback(class std::function); /** - * @symbol ??1GameRule\@\@QEAA\@XZ + * @symbol ??1GameRule\@\@QEAA\@XZ */ MCAPI ~GameRule(); //protected: /** - * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@H\@Z + * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@H\@Z */ MCAPI class GameRule & _setDefaultValue(int); /** - * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@_N\@Z + * @symbol ?_setDefaultValue\@GameRule\@\@IEAAAEAV1\@_N\@Z */ MCAPI class GameRule & _setDefaultValue(bool); //private: /** - * @symbol ?_set\@GameRule\@\@AEAA_NAEBTValue\@1\@PEA_NPEAVValidationError\@1\@\@Z + * @symbol ?_set\@GameRule\@\@AEAA_NAEBTValue\@1\@PEA_NPEAVValidationError\@1\@\@Z */ MCAPI bool _set(union GameRule::Value const &, bool *, class GameRule::ValidationError *); @@ -138,4 +141,4 @@ enum class Type; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameRuleCommand.hpp b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp index 03f7b56fb4..50abb0de71 100644 --- a/LiteLoader/include/llapi/mc/GameRuleCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameRuleCommand.hpp @@ -38,34 +38,34 @@ struct InitProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameRuleCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GameRuleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GameRuleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GameRuleCommand\@\@SAXAEAVCommandRegistry\@\@$$QEAUInitProxy\@1\@\@Z + * @symbol ?setup\@GameRuleCommand\@\@SAXAEAVCommandRegistry\@\@$$QEAUInitProxy\@1\@\@Z */ MCAPI static void setup(class CommandRegistry &, struct GameRuleCommand::InitProxy &&); //private: /** - * @symbol ?getGameRule\@GameRuleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?getGameRule\@GameRuleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void getGameRule(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setGameRule\@GameRuleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?setGameRule\@GameRuleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void setGameRule(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?createJsonIndex\@GameRuleCommand\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVGameRule\@\@AEAVValue\@Json\@\@PEAV23\@\@Z + * @symbol ?createJsonIndex\@GameRuleCommand\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVGameRule\@\@AEAVValue\@Json\@\@PEAV23\@\@Z */ MCAPI static void createJsonIndex(std::string const &, class GameRule const &, class Json::Value &, std::string *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameRuleId.hpp b/LiteLoader/include/llapi/mc/GameRuleId.hpp index 8c810962a2..fdf6c5da25 100644 --- a/LiteLoader/include/llapi/mc/GameRuleId.hpp +++ b/LiteLoader/include/llapi/mc/GameRuleId.hpp @@ -28,7 +28,7 @@ struct GameRuleId { public: /** - * @symbol ??0GameRuleId\@\@QEAA\@H\@Z + * @symbol ??0GameRuleId\@\@QEAA\@H\@Z */ MCAPI GameRuleId(int); diff --git a/LiteLoader/include/llapi/mc/GameRules.hpp b/LiteLoader/include/llapi/mc/GameRules.hpp index 9e07786601..ee56b10b4a 100644 --- a/LiteLoader/include/llapi/mc/GameRules.hpp +++ b/LiteLoader/include/llapi/mc/GameRules.hpp @@ -29,124 +29,120 @@ class GameRules { public: /** - * @symbol ??0GameRules\@\@QEAA\@XZ + * @symbol ??0GameRules\@\@QEAA\@AEBV0\@\@Z */ - MCAPI GameRules(); + MCAPI GameRules(class GameRules const &); /** - * @symbol ??0GameRules\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0GameRules\@\@QEAA\@XZ */ - MCAPI GameRules(class GameRules const &); + MCAPI GameRules(); /** - * @symbol ?createAllGameRulesPacket\@GameRules\@\@QEBA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createAllGameRulesPacket\@GameRules\@\@QEBA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr createAllGameRulesPacket() const; /** - * @symbol ?deserializeRules\@GameRules\@\@QEAAXAEBVGameRulesChangedPacketData\@\@\@Z + * @symbol ?deserializeRules\@GameRules\@\@QEAAXAEBVGameRulesChangedPacketData\@\@\@Z */ MCAPI void deserializeRules(class GameRulesChangedPacketData const &); /** - * @symbol ?getBool\@GameRules\@\@QEBA_NUGameRuleId\@\@_N\@Z + * @symbol ?getBool\@GameRules\@\@QEBA_NUGameRuleId\@\@_N\@Z */ MCAPI bool getBool(struct GameRuleId, bool) const; /** - * @symbol ?getInt\@GameRules\@\@QEBAHUGameRuleId\@\@\@Z + * @symbol ?getInt\@GameRules\@\@QEBAHUGameRuleId\@\@\@Z */ MCAPI int getInt(struct GameRuleId) const; /** - * @symbol ?getRule\@GameRules\@\@QEBAPEBVGameRule\@\@UGameRuleId\@\@\@Z + * @symbol ?getRule\@GameRules\@\@QEBAPEBVGameRule\@\@UGameRuleId\@\@\@Z */ MCAPI class GameRule const * getRule(struct GameRuleId) const; /** - * @symbol ?getRules\@GameRules\@\@QEBAAEBV?$vector\@VGameRule\@\@V?$allocator\@VGameRule\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getRules\@GameRules\@\@QEBAAEBV?$vector\@VGameRule\@\@V?$allocator\@VGameRule\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getRules() const; /** - * @symbol ?getTagData\@GameRules\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?getTagData\@GameRules\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void getTagData(class CompoundTag const &); /** - * @symbol ?hasRule\@GameRules\@\@QEBA_NUGameRuleId\@\@\@Z + * @symbol ?hasRule\@GameRules\@\@QEBA_NUGameRuleId\@\@\@Z */ MCAPI bool hasRule(struct GameRuleId) const; /** - * @symbol ?nameToGameRuleIndex\@GameRules\@\@QEBA?AUGameRuleId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?nameToGameRuleIndex\@GameRules\@\@QEBA?AUGameRuleId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct GameRuleId nameToGameRuleIndex(std::string const &) const; /** - * @symbol ?setMarketplaceOverrides\@GameRules\@\@QEAAXXZ + * @symbol ?setMarketplaceOverrides\@GameRules\@\@QEAAXXZ */ MCAPI void setMarketplaceOverrides(); /** - * @symbol ?setRule\@GameRules\@\@QEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@H_NPEA_N2PEAVValidationError\@GameRule\@\@\@Z + * @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, int, bool, bool *, bool *, class GameRule::ValidationError *); + 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 + * @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 + * @symbol ?setRule\@GameRules\@\@QEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@H_NPEA_N2PEAVValidationError\@GameRule\@\@\@Z */ - MCAPI std::unique_ptr setRule(struct GameRuleId, bool, bool, bool *, bool *, class GameRule::ValidationError *); + MCAPI std::unique_ptr setRule(struct GameRuleId, int, bool, bool *, bool *, class GameRule::ValidationError *); /** - * @symbol ?setTagData\@GameRules\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?setTagData\@GameRules\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void setTagData(class CompoundTag &) const; /** - * @symbol ??1GameRules\@\@QEAA\@XZ + * @symbol ??1GameRules\@\@QEAA\@XZ */ MCAPI ~GameRules(); /** - * @symbol ?DEFAULT_PLAYER_SPAWN_RADIUS\@GameRules\@\@2IB + * @symbol ?DEFAULT_PLAYER_SPAWN_RADIUS\@GameRules\@\@2IB */ MCAPI static unsigned int const DEFAULT_PLAYER_SPAWN_RADIUS; /** - * @symbol ?DEFAULT_RANDOMTICKSPEED\@GameRules\@\@2HB + * @symbol ?DEFAULT_RANDOMTICKSPEED\@GameRules\@\@2HB */ MCAPI static int const DEFAULT_RANDOMTICKSPEED; /** - * @symbol ?MAX_FUNCTIONCOMMANDLIMIT\@GameRules\@\@2HB + * @symbol ?MAX_FUNCTIONCOMMANDLIMIT\@GameRules\@\@2HB */ MCAPI static int const MAX_FUNCTIONCOMMANDLIMIT; /** - * @symbol ?MAX_PLAYER_SPAWN_RADIUS\@GameRules\@\@2IB + * @symbol ?MAX_PLAYER_SPAWN_RADIUS\@GameRules\@\@2IB */ MCAPI static unsigned int const MAX_PLAYER_SPAWN_RADIUS; /** - * @symbol ?MAX_RANDOMTICKSPEED\@GameRules\@\@2HB + * @symbol ?MAX_RANDOMTICKSPEED\@GameRules\@\@2HB */ MCAPI static int const MAX_RANDOMTICKSPEED; /** - * @symbol ?MIN_PLAYER_SPAWN_RADIUS\@GameRules\@\@2IB + * @symbol ?MIN_PLAYER_SPAWN_RADIUS\@GameRules\@\@2IB */ MCAPI static unsigned int const MIN_PLAYER_SPAWN_RADIUS; /** - * @symbol ?WORLD_POLICY_TAG_NAME\@GameRules\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?WORLD_POLICY_TAG_NAME\@GameRules\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const WORLD_POLICY_TAG_NAME; //private: /** - * @symbol ?_registerRule\@GameRules\@\@AEAAAEAVGameRule\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UGameRuleId\@\@\@Z + * @symbol ?_registerRule\@GameRules\@\@AEAAAEAVGameRule\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UGameRuleId\@\@\@Z */ MCAPI class GameRule & _registerRule(std::string const &, struct GameRuleId); /** - * @symbol ?_registerRules\@GameRules\@\@AEAAXXZ + * @symbol ?_registerRules\@GameRules\@\@AEAAXXZ */ MCAPI void _registerRules(); /** - * @symbol ?_setGameRule\@GameRules\@\@AEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@PEAVGameRule\@\@TValue\@4\@W4Type\@4\@_NPEA_N4PEAVValidationError\@4\@\@Z + * @symbol ?_setGameRule\@GameRules\@\@AEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@PEAVGameRule\@\@TValue\@4\@W4Type\@4\@_NPEA_N4PEAVValidationError\@4\@\@Z */ MCAPI std::unique_ptr _setGameRule(class GameRule *, union GameRule::Value, enum class GameRule::Type, bool, bool *, bool *, class GameRule::ValidationError *); /** - * @symbol ?_setRule\@GameRules\@\@AEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@TValue\@GameRule\@\@W4Type\@6\@_NPEA_N4PEAVValidationError\@6\@\@Z + * @symbol ?_setRule\@GameRules\@\@AEAA?AV?$unique_ptr\@VGameRulesChangedPacket\@\@U?$default_delete\@VGameRulesChangedPacket\@\@\@std\@\@\@std\@\@UGameRuleId\@\@TValue\@GameRule\@\@W4Type\@6\@_NPEA_N4PEAVValidationError\@6\@\@Z */ MCAPI std::unique_ptr _setRule(struct GameRuleId, union GameRule::Value, enum class GameRule::Type, bool, bool *, bool *, class GameRule::ValidationError *); - /** - * @symbol ?_getMarketplaceGameRulesDefaultMap\@GameRules\@\@CAAEBV?$map\@UGameRuleId\@\@VGameRule\@\@U?$less\@UGameRuleId\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBUGameRuleId\@\@VGameRule\@\@\@std\@\@\@4\@\@std\@\@XZ - */ - MCAPI static class std::map, class std::allocator>> const & _getMarketplaceGameRulesDefaultMap(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp index 4c93eaef46..0f9e3473f3 100644 --- a/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacket.hpp @@ -31,29 +31,29 @@ class GameRulesChangedPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameRulesChangedPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@GameRulesChangedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@GameRulesChangedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@GameRulesChangedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@GameRulesChangedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@GameRulesChangedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@GameRulesChangedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@GameRulesChangedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp b/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp index 2ee2c05f48..be2d27371b 100644 --- a/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp +++ b/LiteLoader/include/llapi/mc/GameRulesChangedPacketData.hpp @@ -30,20 +30,20 @@ class GameRulesChangedPacketData { public: /** - * @symbol ?addRule\@GameRulesChangedPacketData\@\@QEAAXAEBVGameRule\@\@\@Z + * @symbol ?addRule\@GameRulesChangedPacketData\@\@QEAAXAEBVGameRule\@\@\@Z */ MCAPI void addRule(class GameRule const &); /** - * @symbol ?getRules\@GameRulesChangedPacketData\@\@QEBAAEBV?$vector\@VGameRule\@\@V?$allocator\@VGameRule\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getRules\@GameRulesChangedPacketData\@\@QEBAAEBV?$vector\@VGameRule\@\@V?$allocator\@VGameRule\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getRules() const; /** - * @symbol ?setRules\@GameRulesChangedPacketData\@\@QEAAXV?$vector\@VGameRule\@\@V?$allocator\@VGameRule\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setRules\@GameRulesChangedPacketData\@\@QEAAXV?$vector\@VGameRule\@\@V?$allocator\@VGameRule\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setRules(std::vector); /** - * @symbol ??1GameRulesChangedPacketData\@\@QEAA\@XZ + * @symbol ??1GameRulesChangedPacketData\@\@QEAA\@XZ */ MCAPI ~GameRulesChangedPacketData(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameSession.hpp b/LiteLoader/include/llapi/mc/GameSession.hpp index d578cfece8..cc795ea86f 100644 --- a/LiteLoader/include/llapi/mc/GameSession.hpp +++ b/LiteLoader/include/llapi/mc/GameSession.hpp @@ -31,32 +31,32 @@ class GameSession { public: /** - * @symbol ??0GameSession\@\@QEAA\@AEAVNetworkHandler\@\@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 + * @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 NetworkHandler &, std::unique_ptr, class LoopbackPacketSender &, std::unique_ptr, struct std::pair, class OwnerPtrT>, enum class SubClientId); + MCAPI GameSession(class NetworkSystem &, std::unique_ptr, class LoopbackPacketSender &, std::unique_ptr, struct std::pair, class OwnerPtrT>, enum class SubClientId); /** - * @symbol ?getServerNetworkHandler\@GameSession\@\@QEAA?AV?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@XZ + * @symbol ?getServerNetworkHandler\@GameSession\@\@QEAA?AV?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@XZ */ MCAPI class Bedrock::NonOwnerPointer getServerNetworkHandler(); /** - * @symbol ?isLeaveGameDone\@GameSession\@\@QEAA_NXZ + * @symbol ?isLeaveGameDone\@GameSession\@\@QEAA_NXZ */ MCAPI bool isLeaveGameDone(); /** - * @symbol ?setLevel\@GameSession\@\@QEAAXU?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@Z + * @symbol ?setLevel\@GameSession\@\@QEAAXU?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@Z */ MCAPI void setLevel(struct std::pair, class OwnerPtrT>); /** - * @symbol ?startLeaveGame\@GameSession\@\@QEAAXXZ + * @symbol ?startLeaveGame\@GameSession\@\@QEAAXXZ */ MCAPI void startLeaveGame(); /** - * @symbol ?tick\@GameSession\@\@QEAAXXZ + * @symbol ?tick\@GameSession\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ??1GameSession\@\@QEAA\@XZ + * @symbol ??1GameSession\@\@QEAA\@XZ */ MCAPI ~GameSession(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp b/LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp index 8d1a0c581f..1be9fd701d 100644 --- a/LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp +++ b/LiteLoader/include/llapi/mc/GameSpecificNetEventCallback.hpp @@ -30,14 +30,14 @@ class GameSpecificNetEventCallback { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameSpecificNetEventCallback(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handle\@GameSpecificNetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z + * @vftbl 1 + * @symbol ?handle\@GameSpecificNetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ virtual void handle(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestClearTask.hpp b/LiteLoader/include/llapi/mc/GameTestClearTask.hpp index ec17ff3f2d..6fe30fae38 100644 --- a/LiteLoader/include/llapi/mc/GameTestClearTask.hpp +++ b/LiteLoader/include/llapi/mc/GameTestClearTask.hpp @@ -30,16 +30,16 @@ class GameTestClearTask { public: /** - * @symbol ??0GameTestClearTask\@\@QEAA\@AEAVDimension\@\@AEBVBoundingBox\@\@\@Z + * @symbol ??0GameTestClearTask\@\@QEAA\@AEAVDimension\@\@AEBVBoundingBox\@\@\@Z */ MCAPI GameTestClearTask(class Dimension &, class BoundingBox const &); /** - * @symbol ?isDone\@GameTestClearTask\@\@QEBA_NXZ + * @symbol ?isDone\@GameTestClearTask\@\@QEBA_NXZ */ MCAPI bool isDone() const; /** - * @symbol ?tick\@GameTestClearTask\@\@QEAAXXZ + * @symbol ?tick\@GameTestClearTask\@\@QEAAXXZ */ MCAPI void tick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestCommand.hpp b/LiteLoader/include/llapi/mc/GameTestCommand.hpp index db5384b1ce..5fd199633a 100644 --- a/LiteLoader/include/llapi/mc/GameTestCommand.hpp +++ b/LiteLoader/include/llapi/mc/GameTestCommand.hpp @@ -31,58 +31,58 @@ class GameTestCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameTestCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GameTestCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GameTestCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?addGameTestNameEnums\@GameTestCommand\@\@SAXAEAVMinecraftGameTest\@\@AEAVCommandRegistry\@\@\@Z + * @symbol ?addGameTestNameEnums\@GameTestCommand\@\@SAXAEAVMinecraftGameTest\@\@AEAVCommandRegistry\@\@\@Z */ MCAPI static void addGameTestNameEnums(class MinecraftGameTest &, class CommandRegistry &); /** - * @symbol ?setup\@GameTestCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GameTestCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_createTestParameters\@GameTestCommand\@\@AEBA?AUTestParameters\@gametest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?_createTestParameters\@GameTestCommand\@\@AEBA?AUTestParameters\@gametest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI struct gametest::TestParameters _createTestParameters(class BlockSource &, class CommandOrigin const &) const; /** - * @symbol ?_handleCreateTest\@GameTestCommand\@\@AEBAXAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleCreateTest\@GameTestCommand\@\@AEBAXAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleCreateTest(class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleRun\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleRun\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleRun(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleRunNearbyTests\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleRunNearbyTests\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleRunNearbyTests(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleRunSet\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleRunSet\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleRunSet(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleRunThis\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleRunThis\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleRunThis(class MinecraftGameTest &, class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleShowPosition\@GameTestCommand\@\@AEBAXAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleShowPosition\@GameTestCommand\@\@AEBAXAEAVBlockSource\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleShowPosition(class BlockSource &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_runTestAt\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@PEAVCommandOutput\@\@AEBVBlockPos\@\@V?$optional\@W4Rotation\@\@\@std\@\@\@Z + * @symbol ?_runTestAt\@GameTestCommand\@\@AEBAXAEAVMinecraftGameTest\@\@AEAVBlockSource\@\@PEAVCommandOutput\@\@AEBVBlockPos\@\@V?$optional\@W4Rotation\@\@\@std\@\@\@Z */ MCAPI void _runTestAt(class MinecraftGameTest &, class BlockSource &, class CommandOutput *, class BlockPos const &, class std::optional) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp b/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp index 61d20adfc5..49d1287bb7 100644 --- a/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp +++ b/LiteLoader/include/llapi/mc/GameTestInstanceLedger.hpp @@ -30,25 +30,25 @@ class GameTestInstanceLedger { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameTestInstanceLedger(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onTestStructureLoaded\@GameTestInstanceLedger\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 1 + * @symbol ?onTestStructureLoaded\@GameTestInstanceLedger\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestStructureLoaded(class gametest::BaseGameTestInstance &); /** - * @symbol ??0GameTestInstanceLedger\@\@QEAA\@AEAVLevelStorage\@\@\@Z + * @symbol ??0GameTestInstanceLedger\@\@QEAA\@AEAVLevelStorage\@\@\@Z */ MCAPI GameTestInstanceLedger(class LevelStorage &); /** - * @symbol ?clear\@GameTestInstanceLedger\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?clear\@GameTestInstanceLedger\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void clear(class AutomaticID); /** - * @symbol ?getBoundingBoxes\@GameTestInstanceLedger\@\@QEBA?AV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getBoundingBoxes\@GameTestInstanceLedger\@\@QEBA?AV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI std::vector getBoundingBoxes(class AutomaticID) const; @@ -56,8 +56,8 @@ class GameTestInstanceLedger { private: /** - * @symbol ?GAME_TEST_INSTANCE_PREFIX\@GameTestInstanceLedger\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?GAME_TEST_INSTANCE_PREFIX\@GameTestInstanceLedger\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const GAME_TEST_INSTANCE_PREFIX; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp b/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp index fb8d8e5d7e..4532ecf762 100644 --- a/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp +++ b/LiteLoader/include/llapi/mc/GameTestLevelListener.hpp @@ -30,63 +30,68 @@ class GameTestLevelListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameTestLevelListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?onLevelScriptTick\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + * @vftbl 7 + * @symbol __unk_vfn_7 */ - virtual enum class EventResult onLevelScriptTick(class Level &); + virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol ?onLevelTickEnd\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ - virtual void __unk_vfn_8(); + virtual enum class EventResult onLevelTickEnd(class Level &); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?onEvent\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEBULevelNotificationEvent\@\@\@Z + * @vftbl 10 + * @symbol __unk_vfn_10 + */ + virtual void __unk_vfn_10(); + /** + * @vftbl 11 + * @symbol ?onEvent\@GameTestLevelListener\@\@UEAA?AW4EventResult\@\@AEBULevelNotificationEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct LevelNotificationEvent const &); /** - * @symbol ??0GameTestLevelListener\@\@QEAA\@AEAVGameTestTicker\@gametest\@\@\@Z + * @symbol ??0GameTestLevelListener\@\@QEAA\@AEAVGameTestTicker\@gametest\@\@\@Z */ MCAPI GameTestLevelListener(class gametest::GameTestTicker &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp b/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp index 2741b07016..77dc997835 100644 --- a/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp +++ b/LiteLoader/include/llapi/mc/GameTestNetworkAdapter.hpp @@ -28,12 +28,12 @@ class GameTestNetworkAdapter { public: /** - * @symbol ??0GameTestNetworkAdapter\@\@QEAA\@AEAVMinecraftGameTest\@\@\@Z + * @symbol ??0GameTestNetworkAdapter\@\@QEAA\@AEAVMinecraftGameTest\@\@\@Z */ MCAPI GameTestNetworkAdapter(class MinecraftGameTest &); /** - * @symbol ?rungametest\@GameTestNetworkAdapter\@\@QEAAXV?$not_null\@PEAVPacketSender\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVDimension\@\@AEBUTestParameters\@gametest\@\@\@Z + * @symbol ?rungametest\@GameTestNetworkAdapter\@\@QEAAXV?$not_null\@PEAVPacketSender\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVDimension\@\@AEBUTestParameters\@gametest\@\@\@Z */ MCAPI void rungametest(class gsl::not_null, std::string const &, class Dimension &, struct gametest::TestParameters const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestReport.hpp b/LiteLoader/include/llapi/mc/GameTestReport.hpp index 2fbb239842..8a7ccc2b9c 100644 --- a/LiteLoader/include/llapi/mc/GameTestReport.hpp +++ b/LiteLoader/include/llapi/mc/GameTestReport.hpp @@ -30,11 +30,11 @@ struct GameTestReport { public: /** - * @symbol ??1GameTestReport\@\@QEAA\@XZ + * @symbol ??1GameTestReport\@\@QEAA\@XZ */ MCAPI ~GameTestReport(); /** - * @symbol ?bindType\@GameTestReport\@\@SAXXZ + * @symbol ?bindType\@GameTestReport\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp index 265b60329c..1c4e3590c8 100644 --- a/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestRequestPacket.hpp @@ -28,41 +28,41 @@ class GameTestRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameTestRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@GameTestRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@GameTestRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@GameTestRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@GameTestRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@GameTestRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@GameTestRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@GameTestRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0GameTestRequestPacket\@\@QEAA\@XZ + * @symbol ??0GameTestRequestPacket\@\@QEAA\@XZ */ MCAPI GameTestRequestPacket(); /** - * @symbol ?getParams\@GameTestRequestPacket\@\@QEBAAEBUTestParameters\@gametest\@\@XZ + * @symbol ?getParams\@GameTestRequestPacket\@\@QEBAAEBUTestParameters\@gametest\@\@XZ */ MCAPI struct gametest::TestParameters const & getParams() const; /** - * @symbol ?getTestName\@GameTestRequestPacket\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getTestName\@GameTestRequestPacket\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getTestName() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestResult.hpp b/LiteLoader/include/llapi/mc/GameTestResult.hpp index bb4da6d245..d72292a43d 100644 --- a/LiteLoader/include/llapi/mc/GameTestResult.hpp +++ b/LiteLoader/include/llapi/mc/GameTestResult.hpp @@ -28,27 +28,27 @@ struct GameTestResult { public: /** - * @symbol ??0GameTestResult\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0GameTestResult\@\@QEAA\@AEBU0\@\@Z */ MCAPI GameTestResult(struct GameTestResult const &); /** - * @symbol ??4GameTestResult\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4GameTestResult\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct GameTestResult & operator=(struct GameTestResult const &); /** - * @symbol ??4GameTestResult\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4GameTestResult\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct GameTestResult & operator=(struct GameTestResult &&); /** - * @symbol ??8GameTestResult\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8GameTestResult\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct GameTestResult const &) const; /** - * @symbol ??1GameTestResult\@\@QEAA\@XZ + * @symbol ??1GameTestResult\@\@QEAA\@XZ */ MCAPI ~GameTestResult(); /** - * @symbol ?bindType\@GameTestResult\@\@SAXXZ + * @symbol ?bindType\@GameTestResult\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp index 3317c521c9..01710ffd15 100644 --- a/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp +++ b/LiteLoader/include/llapi/mc/GameTestResultsPacket.hpp @@ -28,37 +28,43 @@ class GameTestResultsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GameTestResultsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@GameTestResultsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@GameTestResultsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@GameTestResultsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@GameTestResultsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@GameTestResultsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@GameTestResultsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@GameTestResultsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GAMETESTRESULTSPACKET /** - * @symbol ??0GameTestResultsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI GameTestResultsPacket(); + MCVAPI ~GameTestResultsPacket(); +#endif /** - * @symbol ??0GameTestResultsPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @symbol ??0GameTestResultsPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCAPI GameTestResultsPacket(std::string const &, std::string const &, bool); + /** + * @symbol ??0GameTestResultsPacket\@\@QEAA\@XZ + */ + MCAPI GameTestResultsPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestRunner.hpp b/LiteLoader/include/llapi/mc/GameTestRunner.hpp index 4351fa7430..33ad53b1db 100644 --- a/LiteLoader/include/llapi/mc/GameTestRunner.hpp +++ b/LiteLoader/include/llapi/mc/GameTestRunner.hpp @@ -30,32 +30,32 @@ class GameTestRunner { public: /** - * @symbol ?clearAllTests\@GameTestRunner\@\@SAXAEAVBlockSource\@\@AEAVGameTestTicker\@gametest\@\@AEBV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?clearAllTests\@GameTestRunner\@\@SAXAEAVBlockSource\@\@AEAVGameTestTicker\@gametest\@\@AEBV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void clearAllTests(class BlockSource &, class gametest::GameTestTicker &, std::vector const &); /** - * @symbol ?clearMarkers\@GameTestRunner\@\@SAXAEAVLevel\@\@\@Z + * @symbol ?clearMarkers\@GameTestRunner\@\@SAXAEAVLevel\@\@\@Z */ MCAPI static void clearMarkers(class Level &); /** - * @symbol ?groupTestsIntoBatches\@GameTestRunner\@\@SA?AV?$vector\@VGameTestBatch\@gametest\@\@V?$allocator\@VGameTestBatch\@gametest\@\@\@std\@\@\@std\@\@AEAVGameTestRegistry\@gametest\@\@AEBV?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@3\@H\@Z + * @symbol ?groupTestsIntoBatches\@GameTestRunner\@\@SA?AV?$vector\@VGameTestBatch\@gametest\@\@V?$allocator\@VGameTestBatch\@gametest\@\@\@std\@\@\@std\@\@AEAVGameTestRegistry\@gametest\@\@AEBV?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@3\@H\@Z */ MCAPI static std::vector groupTestsIntoBatches(class gametest::GameTestRegistry &, std::vector> const &, int); /** - * @symbol ?runTest\@GameTestRunner\@\@SAXV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@\@Z + * @symbol ?runTest\@GameTestRunner\@\@SAXV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@\@Z */ MCAPI static void runTest(class std::shared_ptr, class gametest::GameTestTicker &); /** - * @symbol ?runTests\@GameTestRunner\@\@SA?AV?$unique_ptr\@VBaseGameTestBatchRunner\@gametest\@\@U?$default_delete\@VBaseGameTestBatchRunner\@gametest\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEAVGameTestRegistry\@gametest\@\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@3\@AEAVGameTestTicker\@6\@$$QEAUTestParameters\@6\@\@Z + * @symbol ?runTests\@GameTestRunner\@\@SA?AV?$unique_ptr\@VBaseGameTestBatchRunner\@gametest\@\@U?$default_delete\@VBaseGameTestBatchRunner\@gametest\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEAVGameTestRegistry\@gametest\@\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@3\@AEAVGameTestTicker\@6\@$$QEAUTestParameters\@6\@\@Z */ MCAPI static std::unique_ptr runTests(class Dimension &, class gametest::GameTestRegistry &, std::unique_ptr, class gametest::GameTestTicker &, struct gametest::TestParameters &&); //private: /** - * @symbol ?_subdivideBatch\@GameTestRunner\@\@CA?AV?$vector\@V?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@std\@\@V?$allocator\@V?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@AEAV?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@3\@H\@Z + * @symbol ?_subdivideBatch\@GameTestRunner\@\@CA?AV?$vector\@V?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@std\@\@V?$allocator\@V?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@AEAV?$vector\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestFunction\@gametest\@\@\@std\@\@\@2\@\@3\@H\@Z */ MCAPI static std::vector, class std::allocator>>> _subdivideBatch(std::vector> &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameTestSaveData.hpp b/LiteLoader/include/llapi/mc/GameTestSaveData.hpp index 2116c00079..5f07525c3a 100644 --- a/LiteLoader/include/llapi/mc/GameTestSaveData.hpp +++ b/LiteLoader/include/llapi/mc/GameTestSaveData.hpp @@ -25,7 +25,7 @@ struct GameTestSaveData { public: /** - * @symbol ??1GameTestSaveData\@\@QEAA\@XZ + * @symbol ??1GameTestSaveData\@\@QEAA\@XZ */ MCAPI ~GameTestSaveData(); diff --git a/LiteLoader/include/llapi/mc/GameTypeConv.hpp b/LiteLoader/include/llapi/mc/GameTypeConv.hpp index fd46bd1fc3..81d4c6d226 100644 --- a/LiteLoader/include/llapi/mc/GameTypeConv.hpp +++ b/LiteLoader/include/llapi/mc/GameTypeConv.hpp @@ -22,23 +22,23 @@ namespace GameTypeConv { #undef AFTER_EXTRA /** - * @symbol ?gameTypeToNonLocString\@GameTypeConv\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GameType\@\@\@Z + * @symbol ?gameTypeToNonLocString\@GameTypeConv\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GameType\@\@\@Z */ MCAPI std::string gameTypeToNonLocString(enum class GameType); /** - * @symbol ?gameTypeToString\@GameTypeConv\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GameType\@\@\@Z + * @symbol ?gameTypeToString\@GameTypeConv\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GameType\@\@\@Z */ MCAPI std::string gameTypeToString(enum class GameType); /** - * @symbol ?intToGameType\@GameTypeConv\@\@YA?AW4GameType\@\@H\@Z + * @symbol ?intToGameType\@GameTypeConv\@\@YA?AW4GameType\@\@H\@Z */ MCAPI enum class GameType intToGameType(int); /** - * @symbol ?intToGameTypeForCommands\@GameTypeConv\@\@YA?AW4GameType\@\@H\@Z + * @symbol ?intToGameTypeForCommands\@GameTypeConv\@\@YA?AW4GameType\@\@H\@Z */ MCAPI enum class GameType intToGameTypeForCommands(int); /** - * @symbol ?stringToGameType\@GameTypeConv\@\@YA?AW4GameType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?stringToGameType\@GameTypeConv\@\@YA?AW4GameType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class GameType stringToGameType(std::string const &); diff --git a/LiteLoader/include/llapi/mc/GameVersion.hpp b/LiteLoader/include/llapi/mc/GameVersion.hpp index fb0b12e6dc..3da509437c 100644 --- a/LiteLoader/include/llapi/mc/GameVersion.hpp +++ b/LiteLoader/include/llapi/mc/GameVersion.hpp @@ -21,54 +21,55 @@ class GameVersion { // Add Member There #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEVERSION +public: + class GameVersion& operator=(class GameVersion const &) = delete; +#endif + public: /** - * @symbol ??0GameVersion\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0GameVersion\@\@QEAA\@AEBV0\@\@Z */ MCAPI GameVersion(class GameVersion const &); /** - * @symbol ??0GameVersion\@\@QEAA\@XZ + * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z */ - MCAPI GameVersion(); + MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); /** - * @symbol ??0GameVersion\@\@QEAA\@IIIII\@Z + * @symbol ??0GameVersion\@\@QEAA\@XZ */ - MCAPI GameVersion(unsigned int, unsigned int, unsigned int, unsigned int, unsigned int); + MCAPI GameVersion(); /** - * @symbol ??0GameVersion\@\@QEAA\@AEBVListTag\@\@\@Z + * @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 + * @symbol ?asString\@GameVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & asString() const; /** - * @symbol ??MGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??MGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator<(class GameVersion const &) const; /** - * @symbol ??4GameVersion\@\@QEAAAEAV0\@AEBV0\@\@Z - */ - MCAPI class GameVersion & operator=(class GameVersion const &); - /** - * @symbol ??4GameVersion\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4GameVersion\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class GameVersion & operator=(class GameVersion &&); /** - * @symbol ??PGameVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??PGameVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>=(class GameVersion const &) const; /** - * @symbol ?serialize\@GameVersion\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?serialize\@GameVersion\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr serialize() const; /** - * @symbol ??1GameVersion\@\@QEAA\@XZ + * @symbol ??1GameVersion\@\@QEAA\@XZ */ MCAPI ~GameVersion(); /** - * @symbol ?current\@GameVersion\@\@SA?AV1\@XZ + * @symbol ?current\@GameVersion\@\@SA?AV1\@XZ */ MCAPI static class GameVersion current(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GameplayUserManager.hpp b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp new file mode 100644 index 0000000000..b3f327d867 --- /dev/null +++ b/LiteLoader/include/llapi/mc/GameplayUserManager.hpp @@ -0,0 +1,83 @@ +/** + * @file GameplayUserManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GameplayUserManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GAMEPLAYUSERMANAGER +public: + class GameplayUserManager& operator=(class GameplayUserManager const &) = delete; + GameplayUserManager(class GameplayUserManager const &) = delete; +#endif + +public: + /** + * @symbol ??0GameplayUserManager\@\@QEAA\@XZ + */ + MCAPI GameplayUserManager(); + /** + * @symbol ?forEachActiveGameplayUser\@GameplayUserManager\@\@QEAAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachActiveGameplayUser(class std::function); + /** + * @symbol ?forEachActiveGameplayUser\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachActiveGameplayUser(class std::function) const; + /** + * @symbol ?forEachActivePlayer\@GameplayUserManager\@\@QEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachActivePlayer(class std::function); + /** + * @symbol ?forEachActivePlayer\@GameplayUserManager\@\@QEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + */ + MCAPI void forEachActivePlayer(class std::function) const; + /** + * @symbol ?getActiveGameplayUserCount\@GameplayUserManager\@\@QEBA_KXZ + */ + MCAPI unsigned __int64 getActiveGameplayUserCount() const; + /** + * @symbol ?getActiveGameplayUsers\@GameplayUserManager\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector & getActiveGameplayUsers(); + /** + * @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 + */ + MCAPI std::vector> & getGameplayUserEntities(); + /** + * @symbol ?getGameplayUserEntities\@GameplayUserManager\@\@QEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector> const & getGameplayUserEntities() const; + /** + * @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 ?getSuspendedGameplayUsers\@GameplayUserManager\@\@QEBAAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + */ + MCAPI std::vector const & getSuspendedGameplayUsers() const; + /** + * @symbol ??1GameplayUserManager\@\@QEAA\@XZ + */ + MCAPI ~GameplayUserManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/GatheringServerInfo.hpp b/LiteLoader/include/llapi/mc/GatheringServerInfo.hpp index df9273b882..c504e90d93 100644 --- a/LiteLoader/include/llapi/mc/GatheringServerInfo.hpp +++ b/LiteLoader/include/llapi/mc/GatheringServerInfo.hpp @@ -28,8 +28,8 @@ class GatheringServerInfo { public: /** - * @symbol ??1GatheringServerInfo\@\@QEAA\@XZ + * @symbol ??1GatheringServerInfo\@\@QEAA\@XZ */ MCAPI ~GatheringServerInfo(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GeneDefinition.hpp b/LiteLoader/include/llapi/mc/GeneDefinition.hpp index 6928634344..55e14fd30e 100644 --- a/LiteLoader/include/llapi/mc/GeneDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GeneDefinition.hpp @@ -30,11 +30,11 @@ struct GeneDefinition { public: /** - * @symbol ?addGeneticVariant\@GeneDefinition\@\@QEAAXAEBUGeneticVariant\@\@\@Z + * @symbol ?addGeneticVariant\@GeneDefinition\@\@QEAAXAEBUGeneticVariant\@\@\@Z */ MCAPI void addGeneticVariant(struct GeneticVariant const &); /** - * @symbol ??1GeneDefinition\@\@QEAA\@XZ + * @symbol ??1GeneDefinition\@\@QEAA\@XZ */ MCAPI ~GeneDefinition(); diff --git a/LiteLoader/include/llapi/mc/GenericMoveControl.hpp b/LiteLoader/include/llapi/mc/GenericMoveControl.hpp index 8a523550cd..cce0ec9718 100644 --- a/LiteLoader/include/llapi/mc/GenericMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/GenericMoveControl.hpp @@ -30,23 +30,29 @@ class GenericMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GenericMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@GenericMoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@GenericMoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct MoveControlDescription *); /** - * @vftbl 2 - * @symbol ?tick\@GenericMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GenericMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GENERICMOVECONTROL /** - * @symbol ??0GenericMoveControl\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GenericMoveControl(); +#endif + /** + * @symbol ??0GenericMoveControl\@\@QEAA\@XZ */ MCAPI GenericMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp index d9739eacfd..f1ffc8c1a4 100644 --- a/LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/GenericMoveControlDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class GenericMoveControlDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@GenericMoveControlDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@GenericMoveControlDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~GenericMoveControlDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GENERICMOVECONTROLDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~GenericMoveControlDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GenericPathNavigation.hpp b/LiteLoader/include/llapi/mc/GenericPathNavigation.hpp index 41d98e37b4..dfb205857e 100644 --- a/LiteLoader/include/llapi/mc/GenericPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/GenericPathNavigation.hpp @@ -31,34 +31,34 @@ class GenericPathNavigation : public PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GenericPathNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@GenericPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@GenericPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct NavigationDescription *); /** - * @vftbl 2 - * @symbol ?tick\@GenericPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GenericPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class NavigationComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?getTempMobPos\@GenericPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z + * @vftbl 3 + * @symbol ?getTempMobPos\@GenericPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z */ virtual class Vec3 getTempMobPos(class Mob const &) const; /** - * @vftbl 9 - * @symbol ?stop\@GenericPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 9 + * @symbol ?stop\@GenericPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void stop(class NavigationComponent &, class Mob &); /** - * @vftbl 12 - * @symbol ?updatePath\@GenericPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 12 + * @symbol ?updatePath\@GenericPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void updatePath(class NavigationComponent &, class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GeneticVariant.hpp b/LiteLoader/include/llapi/mc/GeneticVariant.hpp index 159bbe82a3..91c5ff9cce 100644 --- a/LiteLoader/include/llapi/mc/GeneticVariant.hpp +++ b/LiteLoader/include/llapi/mc/GeneticVariant.hpp @@ -27,11 +27,11 @@ struct GeneticVariant { public: /** - * @symbol ??0GeneticVariant\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0GeneticVariant\@\@QEAA\@AEBU0\@\@Z */ MCAPI GeneticVariant(struct GeneticVariant const &); /** - * @symbol ??1GeneticVariant\@\@QEAA\@XZ + * @symbol ??1GeneticVariant\@\@QEAA\@XZ */ MCAPI ~GeneticVariant(); diff --git a/LiteLoader/include/llapi/mc/GeneticsComponent.hpp b/LiteLoader/include/llapi/mc/GeneticsComponent.hpp index 036bdc63bf..a97289215b 100644 --- a/LiteLoader/include/llapi/mc/GeneticsComponent.hpp +++ b/LiteLoader/include/llapi/mc/GeneticsComponent.hpp @@ -35,60 +35,60 @@ struct Gene { public: /** - * @symbol ??0GeneticsComponent\@\@QEAA\@XZ + * @symbol ??0GeneticsComponent\@\@QEAA\@XZ */ MCAPI GeneticsComponent(); /** - * @symbol ?addAdditionalSaveData\@GeneticsComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@GeneticsComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?buildDebugInfo\@GeneticsComponent\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?buildDebugInfo\@GeneticsComponent\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void buildDebugInfo(std::string &) const; /** - * @symbol ?findGene\@GeneticsComponent\@\@QEAAPEAUGene\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?findGene\@GeneticsComponent\@\@QEAAPEAUGene\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct GeneticsComponent::Gene * findGene(std::string const &); /** - * @symbol ?fireGeneEvents\@GeneticsComponent\@\@QEBAXAEAVActor\@\@\@Z + * @symbol ?fireGeneEvents\@GeneticsComponent\@\@QEBAXAEAVActor\@\@\@Z */ MCAPI void fireGeneEvents(class Actor &) const; /** - * @symbol ?initializeGenesFromParents\@GeneticsComponent\@\@QEAAXAEAVActor\@\@00\@Z + * @symbol ?initializeGenesFromParents\@GeneticsComponent\@\@QEAAXAEAVActor\@\@00\@Z */ MCAPI void initializeGenesFromParents(class Actor &, class Actor &, class Actor &); /** - * @symbol ??4GeneticsComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4GeneticsComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class GeneticsComponent & operator=(class GeneticsComponent &&); /** - * @symbol ?readAdditionalSaveData\@GeneticsComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@GeneticsComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?INVALID_ALLELE_VALUE\@GeneticsComponent\@\@2HB + * @symbol ?INVALID_ALLELE_VALUE\@GeneticsComponent\@\@2HB */ MCAPI static int const INVALID_ALLELE_VALUE; //private: /** - * @symbol ?_crossParentGenes\@GeneticsComponent\@\@AEAA?AUGene\@1\@AEBUGeneDefinition\@\@AEAU21\@1\@Z + * @symbol ?_crossParentGenes\@GeneticsComponent\@\@AEAA?AUGene\@1\@AEBUGeneDefinition\@\@AEAU21\@1\@Z */ MCAPI struct GeneticsComponent::Gene _crossParentGenes(struct GeneDefinition const &, struct GeneticsComponent::Gene &, struct GeneticsComponent::Gene &); private: /** - * @symbol ?GENE_ARRAY\@GeneticsComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?GENE_ARRAY\@GeneticsComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const GENE_ARRAY; /** - * @symbol ?HIDDEN_ALLELE\@GeneticsComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?HIDDEN_ALLELE\@GeneticsComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const HIDDEN_ALLELE; /** - * @symbol ?MAIN_ALLELE\@GeneticsComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MAIN_ALLELE\@GeneticsComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MAIN_ALLELE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GeneticsDefinition.hpp b/LiteLoader/include/llapi/mc/GeneticsDefinition.hpp index b47f95ec23..ff37c63c27 100644 --- a/LiteLoader/include/llapi/mc/GeneticsDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GeneticsDefinition.hpp @@ -30,19 +30,19 @@ class GeneticsDefinition { public: /** - * @symbol ??0GeneticsDefinition\@\@QEAA\@XZ + * @symbol ??0GeneticsDefinition\@\@QEAA\@XZ */ MCAPI GeneticsDefinition(); /** - * @symbol ?addGeneDefinition\@GeneticsDefinition\@\@QEAAXAEBUGeneDefinition\@\@\@Z + * @symbol ?addGeneDefinition\@GeneticsDefinition\@\@QEAAXAEBUGeneDefinition\@\@\@Z */ MCAPI void addGeneDefinition(struct GeneDefinition const &); /** - * @symbol ?initialize\@GeneticsDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGeneticsComponent\@\@\@Z + * @symbol ?initialize\@GeneticsDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGeneticsComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class GeneticsComponent &) const; /** - * @symbol ?buildSchema\@GeneticsDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGeneticsDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@GeneticsDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGeneticsDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); @@ -50,8 +50,8 @@ class GeneticsDefinition { private: /** - * @symbol ?DEFAULT_MUTATION_RATE\@GeneticsDefinition\@\@0MB + * @symbol ?DEFAULT_MUTATION_RATE\@GeneticsDefinition\@\@0MB */ MCAPI static float const DEFAULT_MUTATION_RATE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GeodeFeature.hpp b/LiteLoader/include/llapi/mc/GeodeFeature.hpp index c0bd94c402..36130507b5 100644 --- a/LiteLoader/include/llapi/mc/GeodeFeature.hpp +++ b/LiteLoader/include/llapi/mc/GeodeFeature.hpp @@ -30,18 +30,18 @@ class GeodeFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GeodeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@GeodeFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@GeodeFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ?canSupportGeode\@GeodeFeature\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?canSupportGeode\@GeodeFeature\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool canSupportGeode(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GeodeFeatureInternal.hpp b/LiteLoader/include/llapi/mc/GeodeFeatureInternal.hpp index 11c9cf6fc1..293865104d 100644 --- a/LiteLoader/include/llapi/mc/GeodeFeatureInternal.hpp +++ b/LiteLoader/include/llapi/mc/GeodeFeatureInternal.hpp @@ -22,7 +22,7 @@ namespace GeodeFeatureInternal { #undef AFTER_EXTRA /** - * @symbol ?geodeInvalidMaterials\@GeodeFeatureInternal\@\@3V?$vector\@W4MaterialType\@\@V?$allocator\@W4MaterialType\@\@\@std\@\@\@std\@\@A + * @symbol ?geodeInvalidMaterials\@GeodeFeatureInternal\@\@3V?$vector\@W4MaterialType\@\@V?$allocator\@W4MaterialType\@\@\@std\@\@\@std\@\@A */ MCAPI extern std::vector geodeInvalidMaterials; diff --git a/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp b/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp new file mode 100644 index 0000000000..69bdd9c47b --- /dev/null +++ b/LiteLoader/include/llapi/mc/GetAttachPosRequestComponent.hpp @@ -0,0 +1,36 @@ +/** + * @file GetAttachPosRequestComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct GetAttachPosRequestComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GETATTACHPOSREQUESTCOMPONENT +public: + struct GetAttachPosRequestComponent& operator=(struct GetAttachPosRequestComponent const &) = delete; + GetAttachPosRequestComponent(struct GetAttachPosRequestComponent const &) = delete; + GetAttachPosRequestComponent() = delete; +#endif + +public: + /** + * @symbol ??4GetAttachPosRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + */ + MCAPI struct GetAttachPosRequestComponent & operator=(struct GetAttachPosRequestComponent &&); + /** + * @symbol ??1GetAttachPosRequestComponent\@\@QEAA\@XZ + */ + MCAPI ~GetAttachPosRequestComponent(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp b/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp index bbd87886d9..c1cd602c57 100644 --- a/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp +++ b/LiteLoader/include/llapi/mc/GetAttachPosSystem.hpp @@ -17,7 +17,11 @@ namespace GetAttachPosSystem { #undef AFTER_EXTRA /** - * @symbol ?getAttachPos\@GetAttachPosSystem\@\@YA?AV?$optional\@VVec3\@\@\@std\@\@AEBVStrictEntityContext\@\@W4ActorLocation\@\@AEBVVec3\@\@AEBUAABBShapeComponent\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@M\@Z + * @symbol ?createSystem\@GetAttachPosSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?getAttachPos\@GetAttachPosSystem\@\@YA?AV?$optional\@VVec3\@\@\@std\@\@AEBVStrictEntityContext\@\@W4ActorLocation\@\@AEBVVec3\@\@AEBUAABBShapeComponent\@\@AEBUActorRotationComponent\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@M\@Z */ MCAPI class std::optional getAttachPos(class StrictEntityContext const &, enum class ActorLocation, class Vec3 const &, struct AABBShapeComponent const &, struct ActorRotationComponent const &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class ViewT>> const &, float); diff --git a/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp b/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp new file mode 100644 index 0000000000..2c528539df --- /dev/null +++ b/LiteLoader/include/llapi/mc/GetAttachPositionUtility.hpp @@ -0,0 +1,36 @@ +/** + * @file GetAttachPositionUtility.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GetAttachPositionUtility { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GETATTACHPOSITIONUTILITY +public: + class GetAttachPositionUtility& operator=(class GetAttachPositionUtility const &) = delete; + GetAttachPositionUtility(class GetAttachPositionUtility const &) = delete; + GetAttachPositionUtility() = delete; +#endif + +public: + /** + * @symbol ?getAttachPos\@GetAttachPositionUtility\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@AEBUGetAttachPositionViews\@\@W4ActorLocation\@\@\@Z + */ + MCAPI static class Vec3 getAttachPos(class StrictEntityContext const &, struct GetAttachPositionViews const &, enum class ActorLocation); + /** + * @symbol ?getAttachPos\@GetAttachPositionUtility\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBVStrictEntityContext\@\@AEBUGetAttachPositionViews\@\@W4ActorLocation\@\@AEBVVec3\@\@\@Z + */ + MCAPI static class std::optional getAttachPos(class StrictEntityContext const &, struct GetAttachPositionViews const &, enum class ActorLocation, class Vec3 const &); + +}; diff --git a/LiteLoader/include/llapi/mc/GetBlocksEntityInside.hpp b/LiteLoader/include/llapi/mc/GetBlocksEntityInside.hpp deleted file mode 100644 index d4e3328932..0000000000 --- a/LiteLoader/include/llapi/mc/GetBlocksEntityInside.hpp +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @file GetBlocksEntityInside.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "SideBySideEntityInsideBlocksComponent.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class GetBlocksEntityInside. - * - */ -class GetBlocksEntityInside { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GETBLOCKSENTITYINSIDE -public: - class GetBlocksEntityInside& operator=(class GetBlocksEntityInside const &) = delete; - GetBlocksEntityInside(class GetBlocksEntityInside const &) = delete; - GetBlocksEntityInside() = delete; -#endif - -public: - /** - * @symbol ?get@GetBlocksEntityInside@@SA?AV?$vector@UInternalData@SideBySideEntityInsideBlocksComponent@@V?$allocator@UInternalData@SideBySideEntityInsideBlocksComponent@@@std@@@std@@AEBVAABB@@AEBVIConstBlockSource@@@Z - * @hash -1354177126 - */ - MCAPI static std::vector get(class AABB const &, class IConstBlockSource const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp index 30cd40d709..b919d3ea5f 100644 --- a/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunkDataCommand.hpp @@ -31,18 +31,18 @@ class GetChunkDataCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetChunkDataCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GetChunkDataCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GetChunkDataCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GetChunkDataCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GetChunkDataCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetChunksCommand.hpp b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp index 8496ed5978..feb8ca7c0d 100644 --- a/LiteLoader/include/llapi/mc/GetChunksCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetChunksCommand.hpp @@ -31,18 +31,18 @@ class GetChunksCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetChunksCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GetChunksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GetChunksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GetChunksCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GetChunksCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetCollisionShapeActorProxy.hpp b/LiteLoader/include/llapi/mc/GetCollisionShapeActorProxy.hpp index f135351b5e..8807531f63 100644 --- a/LiteLoader/include/llapi/mc/GetCollisionShapeActorProxy.hpp +++ b/LiteLoader/include/llapi/mc/GetCollisionShapeActorProxy.hpp @@ -28,63 +28,63 @@ class GetCollisionShapeActorProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetCollisionShapeActorProxy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getFeetAttachPosY\@GetCollisionShapeActorProxy\@\@UEBAMXZ + * @vftbl 1 + * @symbol ?getFeetAttachPosY\@GetCollisionShapeActorProxy\@\@UEBAMXZ */ virtual float getFeetAttachPosY() const; /** - * @vftbl 2 - * @symbol ?canDescendThroughBlock\@GetCollisionShapeActorProxy\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?canDescendThroughBlock\@GetCollisionShapeActorProxy\@\@UEBA_NXZ */ virtual bool canDescendThroughBlock() const; /** - * @vftbl 3 - * @symbol ?getFallDistance\@GetCollisionShapeActorProxy\@\@UEBAMXZ + * @vftbl 3 + * @symbol ?getFallDistance\@GetCollisionShapeActorProxy\@\@UEBAMXZ */ virtual float getFallDistance() const; /** - * @vftbl 4 - * @symbol ?getEntityTypeId\@GetCollisionShapeActorProxy\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 4 + * @symbol ?getEntityTypeId\@GetCollisionShapeActorProxy\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 5 - * @symbol ?isWearingLeatherBoots\@GetCollisionShapeActorProxy\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isWearingLeatherBoots\@GetCollisionShapeActorProxy\@\@UEBA_NXZ */ virtual bool isWearingLeatherBoots() const; /** - * @vftbl 6 - * @symbol ?hasLightWeightFamilyTag\@GetCollisionShapeActorProxy\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?hasLightWeightFamilyTag\@GetCollisionShapeActorProxy\@\@UEBA_NXZ */ virtual bool hasLightWeightFamilyTag() const; /** - * @vftbl 7 - * @symbol ?getAABB\@GetCollisionShapeActorProxy\@\@UEBAAEBVAABB\@\@XZ + * @vftbl 7 + * @symbol ?getAABB\@GetCollisionShapeActorProxy\@\@UEBAAEBVAABB\@\@XZ */ virtual class AABB const & getAABB() const; /** - * @vftbl 8 - * @symbol ?isWorldBuilder\@GetCollisionShapeActorProxy\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?isWorldBuilder\@GetCollisionShapeActorProxy\@\@UEBA_NXZ */ virtual bool isWorldBuilder() const; /** - * @vftbl 9 - * @symbol ?isRiding\@GetCollisionShapeActorProxy\@\@UEBA_NXZ + * @vftbl 9 + * @symbol ?isRiding\@GetCollisionShapeActorProxy\@\@UEBA_NXZ */ virtual bool isRiding() const; /** - * @vftbl 10 - * @symbol ?hasPassenger\@GetCollisionShapeActorProxy\@\@UEBA_NXZ + * @vftbl 10 + * @symbol ?hasPassenger\@GetCollisionShapeActorProxy\@\@UEBA_NXZ */ virtual bool hasPassenger() const; /** - * @symbol ??0GetCollisionShapeActorProxy\@\@QEAA\@AEBUIActorMovementProxy\@\@\@Z + * @symbol ??0GetCollisionShapeActorProxy\@\@QEAA\@AEBUIActorMovementProxy\@\@\@Z */ MCAPI GetCollisionShapeActorProxy(struct IActorMovementProxy const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetControllingPlayerUtility.hpp b/LiteLoader/include/llapi/mc/GetControllingPlayerUtility.hpp index 3989ef3f18..fe21187c08 100644 --- a/LiteLoader/include/llapi/mc/GetControllingPlayerUtility.hpp +++ b/LiteLoader/include/llapi/mc/GetControllingPlayerUtility.hpp @@ -20,15 +20,19 @@ namespace GetControllingPlayerUtility { #undef AFTER_EXTRA /** - * @symbol ?isPassengerControllingVehicle\@GetControllingPlayerUtility\@\@YA_NAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@AEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?hasControllingPassenger\@GetControllingPlayerUtility\@\@YA_NAEBUSynchedActorDataComponent\@\@AEBUVehicleComponent\@\@\@Z + */ + MCAPI bool hasControllingPassenger(struct SynchedActorDataComponent const &, struct VehicleComponent const &); + /** + * @symbol ?isPassengerControllingVehicle\@GetControllingPlayerUtility\@\@YA_NAEBVStrictEntityContext\@\@AEBUVehicleComponent\@\@AEBUSynchedActorDataComponent\@\@\@Z */ MCAPI bool isPassengerControllingVehicle(class StrictEntityContext const &, struct VehicleComponent const &, struct SynchedActorDataComponent const &); /** - * @symbol ?isWASDControlled\@GetControllingPlayerUtility\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?isWASDControlled\@GetControllingPlayerUtility\@\@YA_NAEBUSynchedActorDataComponent\@\@\@Z */ MCAPI bool isWASDControlled(struct SynchedActorDataComponent const &); /** - * @symbol ?tryGetControllingPlayerContext\@GetControllingPlayerUtility\@\@YA?AV?$optional\@VStrictEntityContext\@\@\@std\@\@VStrictEntityContext\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@\@Z + * @symbol ?tryGetControllingPlayerContext\@GetControllingPlayerUtility\@\@YA?AV?$optional\@VStrictEntityContext\@\@\@std\@\@VStrictEntityContext\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@\@\@PEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@\@Z */ MCAPI class std::optional tryGetControllingPlayerContext(class StrictEntityContext, class ViewT const> *, class ViewT const> *, class ViewT>, struct VehicleComponent const> *, class ViewT>, struct VehicleComponent const, struct SynchedActorDataComponent const> *); diff --git a/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp index 413293d614..94e8bb7d9e 100644 --- a/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetEduServerInfoCommand.hpp @@ -31,18 +31,18 @@ class GetEduServerInfoCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetEduServerInfoCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GetEduServerInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GetEduServerInfoCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GetEduServerInfoCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GetEduServerInfoCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp index d62ebc32ce..cc6c690e41 100644 --- a/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockDefinition.hpp @@ -32,14 +32,20 @@ class GetInteractionPositionForBlockDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetInteractionPositionForBlockDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@GetInteractionPositionForBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@GetInteractionPositionForBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GETINTERACTIONPOSITIONFORBLOCKDEFINITION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GetInteractionPositionForBlockDefinition(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp index 5af376f019..3874874857 100644 --- a/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/GetInteractionPositionForBlockNode.hpp @@ -30,31 +30,31 @@ class GetInteractionPositionForBlockNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetInteractionPositionForBlockNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@GetInteractionPositionForBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@GetInteractionPositionForBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@GetInteractionPositionForBlockNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@GetInteractionPositionForBlockNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0GetInteractionPositionForBlockNode\@\@QEAA\@XZ + * @symbol ??0GetInteractionPositionForBlockNode\@\@QEAA\@XZ */ MCAPI GetInteractionPositionForBlockNode(); //private: /** - * @symbol ?parseFacingNameFromString\@GetInteractionPositionForBlockNode\@\@AEAA?AW4Name\@Facing\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?parseFacingNameFromString\@GetInteractionPositionForBlockNode\@\@AEAA?AW4Name\@Facing\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class Facing::Name parseFacingNameFromString(std::string); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp b/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp index 49184883af..18dbd45a4a 100644 --- a/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/GetInterpolatedRidingPositionSystem.hpp @@ -28,8 +28,12 @@ class GetInterpolatedRidingPositionSystem { public: /** - * @symbol ?getInterpolatedRidingPosition\@GetInterpolatedRidingPositionSystem\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z + * @symbol ?createSystem\@GetInterpolatedRidingPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?getInterpolatedRidingPosition\@GetInterpolatedRidingPositionSystem\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCamelFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z */ MCAPI static class Vec3 getInterpolatedRidingPosition(class StrictEntityContext const &, class ViewT, class ViewT, class ViewT>>, class ViewT>, class ViewT>, struct SynchedActorDataComponent const>, class ViewT>, struct StandAnimationComponent const>, class ViewT>, struct MobBodyRotationComponent const>, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetRidingHeightUtility.hpp b/LiteLoader/include/llapi/mc/GetRidingHeightUtility.hpp index d8a0044da1..29781913a8 100644 --- a/LiteLoader/include/llapi/mc/GetRidingHeightUtility.hpp +++ b/LiteLoader/include/llapi/mc/GetRidingHeightUtility.hpp @@ -20,7 +20,7 @@ namespace GetRidingHeightUtility { #undef AFTER_EXTRA /** - * @symbol ?getRidingHeight\@GetRidingHeightUtility\@\@YAMVSynchedActorDataReader\@\@PEBURidingHeightComponent\@\@PEBUAdultRidingHeightOffsetComponent\@\@M\@Z + * @symbol ?getRidingHeight\@GetRidingHeightUtility\@\@YAMVSynchedActorDataReader\@\@PEBURidingHeightComponent\@\@PEBUAdultRidingHeightOffsetComponent\@\@M\@Z */ MCAPI float getRidingHeight(class SynchedActorDataReader, struct RidingHeightComponent const *, struct AdultRidingHeightOffsetComponent const *, float); diff --git a/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp index a673928bbd..9ca2108cd5 100644 --- a/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetSpawnPointCommand.hpp @@ -31,18 +31,18 @@ class GetSpawnPointCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetSpawnPointCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GetSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GetSpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GetSpawnPointCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GetSpawnPointCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp index 5fc5c24797..cba3333816 100644 --- a/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/GetTopSolidBlockCommand.hpp @@ -31,18 +31,18 @@ class GetTopSolidBlockCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GetTopSolidBlockCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GetTopSolidBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GetTopSolidBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GetTopSolidBlockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GetTopSolidBlockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Ghast.hpp b/LiteLoader/include/llapi/mc/Ghast.hpp index deabcdadea..3d066a6691 100644 --- a/LiteLoader/include/llapi/mc/Ghast.hpp +++ b/LiteLoader/include/llapi/mc/Ghast.hpp @@ -32,163 +32,158 @@ class Ghast : public Monster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Ghast\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Ghast\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Ghast(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Ghast\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Ghast\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Ghast\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Ghast\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Ghast\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Ghast\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Ghast\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Ghast\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @symbol ??0Ghast\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Ghast\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Ghast(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GildedBlackstone.hpp b/LiteLoader/include/llapi/mc/GildedBlackstone.hpp index a357a3ae9d..03a772721e 100644 --- a/LiteLoader/include/llapi/mc/GildedBlackstone.hpp +++ b/LiteLoader/include/llapi/mc/GildedBlackstone.hpp @@ -31,203 +31,208 @@ class GildedBlackstone : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GildedBlackstone(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@GildedBlackstone\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@GildedBlackstone\@\@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 ??0GildedBlackstone\@\@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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GiveCommand.hpp b/LiteLoader/include/llapi/mc/GiveCommand.hpp index 5ee5e3180b..873156df5c 100644 --- a/LiteLoader/include/llapi/mc/GiveCommand.hpp +++ b/LiteLoader/include/llapi/mc/GiveCommand.hpp @@ -31,18 +31,18 @@ class GiveCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GiveCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GiveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GiveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GiveCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GiveCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GiveableComponent.hpp b/LiteLoader/include/llapi/mc/GiveableComponent.hpp index d8e40f5c19..70abc65e0b 100644 --- a/LiteLoader/include/llapi/mc/GiveableComponent.hpp +++ b/LiteLoader/include/llapi/mc/GiveableComponent.hpp @@ -30,12 +30,12 @@ class GiveableComponent { public: /** - * @symbol ?getInteraction\@GiveableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@GiveableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ??1GiveableComponent\@\@QEAA\@XZ + * @symbol ??1GiveableComponent\@\@QEAA\@XZ */ MCAPI ~GiveableComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GiveableDefinition.hpp b/LiteLoader/include/llapi/mc/GiveableDefinition.hpp index ff66e1cefd..6d75fa50cd 100644 --- a/LiteLoader/include/llapi/mc/GiveableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GiveableDefinition.hpp @@ -31,16 +31,16 @@ class GiveableDefinition { public: /** - * @symbol ?addGiveableTrigger\@GiveableDefinition\@\@QEAAXAEBUGiveableTrigger\@\@\@Z + * @symbol ?addGiveableTrigger\@GiveableDefinition\@\@QEAAXAEBUGiveableTrigger\@\@\@Z */ MCAPI void addGiveableTrigger(struct GiveableTrigger const &); /** - * @symbol ?initialize\@GiveableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGiveableComponent\@\@\@Z + * @symbol ?initialize\@GiveableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGiveableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class GiveableComponent &) const; /** - * @symbol ?buildSchema\@GiveableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGiveableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@GiveableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGiveableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GiveableTrigger.hpp b/LiteLoader/include/llapi/mc/GiveableTrigger.hpp index e12cf8a4b2..b03c127e49 100644 --- a/LiteLoader/include/llapi/mc/GiveableTrigger.hpp +++ b/LiteLoader/include/llapi/mc/GiveableTrigger.hpp @@ -29,15 +29,15 @@ struct GiveableTrigger { public: /** - * @symbol ??0GiveableTrigger\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0GiveableTrigger\@\@QEAA\@AEBU0\@\@Z */ MCAPI GiveableTrigger(struct GiveableTrigger const &); /** - * @symbol ?addItem\@GiveableTrigger\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?addItem\@GiveableTrigger\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void addItem(class ItemDescriptor const &); /** - * @symbol ??1GiveableTrigger\@\@QEAA\@XZ + * @symbol ??1GiveableTrigger\@\@QEAA\@XZ */ MCAPI ~GiveableTrigger(); diff --git a/LiteLoader/include/llapi/mc/GlassBlock.hpp b/LiteLoader/include/llapi/mc/GlassBlock.hpp index 93e741b0a3..5c77600e3f 100644 --- a/LiteLoader/include/llapi/mc/GlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlassBlock.hpp @@ -31,213 +31,218 @@ class GlassBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlassBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@GlassBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@GlassBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@GlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@GlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@GlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@GlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@GlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@GlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0GlassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N2\@Z + * @symbol ??0GlassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N2\@Z */ MCAPI GlassBlock(std::string const &, int, class Material const &, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp index 5b95d220b1..3984ca46f1 100644 --- a/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlazedTerracottaBlock.hpp @@ -31,203 +31,208 @@ class GlazedTerracottaBlock : public FaceDirectionalBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlazedTerracottaBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@GlazedTerracottaBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@GlazedTerracottaBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@GlazedTerracottaBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@GlazedTerracottaBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0GlazedTerracottaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0GlazedTerracottaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GlazedTerracottaBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlideInputSystem.hpp b/LiteLoader/include/llapi/mc/GlideInputSystem.hpp index bd25f83928..722373c0e1 100644 --- a/LiteLoader/include/llapi/mc/GlideInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlideInputSystem.hpp @@ -28,8 +28,8 @@ class GlideInputSystem { public: /** - * @symbol ?createGlideInputSystem\@GlideInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createGlideInputSystem\@GlideInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createGlideInputSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlideMoveControl.hpp b/LiteLoader/include/llapi/mc/GlideMoveControl.hpp index 4327d550d9..e6a9cde347 100644 --- a/LiteLoader/include/llapi/mc/GlideMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/GlideMoveControl.hpp @@ -30,23 +30,23 @@ class GlideMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlideMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@GlideMoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@GlideMoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct MoveControlDescription *); /** - * @vftbl 2 - * @symbol ?tick\@GlideMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GlideMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0GlideMoveControl\@\@QEAA\@XZ + * @symbol ??0GlideMoveControl\@\@QEAA\@XZ */ MCAPI GlideMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp index 3646f02027..aa7fe1023b 100644 --- a/LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/GlideMoveControlDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class GlideMoveControlDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@GlideMoveControlDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@GlideMoveControlDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~GlideMoveControlDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@GlideMoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@GlideMoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GLIDEMOVECONTROLDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@GlideMoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~GlideMoveControlDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlideMoveSystem.hpp b/LiteLoader/include/llapi/mc/GlideMoveSystem.hpp new file mode 100644 index 0000000000..6b3ec5c17a --- /dev/null +++ b/LiteLoader/include/llapi/mc/GlideMoveSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file GlideMoveSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GlideMoveSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GLIDEMOVESYSTEM +public: + class GlideMoveSystem& operator=(class GlideMoveSystem const &) = delete; + GlideMoveSystem(class GlideMoveSystem const &) = delete; + GlideMoveSystem() = delete; +#endif + +public: + /** + * @symbol ?createGlideMoveSystem\@GlideMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createGlideMoveSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp b/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp index 1aa34b9358..d15b047b9f 100644 --- a/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlideTriggerSystem.hpp @@ -28,16 +28,16 @@ class GlideTriggerSystem { public: /** - * @symbol ?_tickGlideTriggerSystem\@GlideTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUFallFlyTicksComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUVanillaClientGameplayComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?_tickGlideTriggerSystem\@GlideTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUFallFlyTicksComponent\@\@AEBUMoveInputComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUVanillaClientGameplayComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopGlidingRequestFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _tickGlideTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct FallFlyTicksComponent const &, struct MoveInputComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, struct VanillaClientGameplayComponent const &, class Optional const>, class Optional const>, class Optional const>, class Optional const>, class EntityModifierT> &, class IConstBlockSource const &); /** - * @symbol ?createSideBySideSystem\@GlideTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySideSystem\@GlideTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySideSystem(); /** - * @symbol ?createSystem\@GlideTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@GlideTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp new file mode 100644 index 0000000000..2b5b7ea4af --- /dev/null +++ b/LiteLoader/include/llapi/mc/GlidingMoveFinalizeSystem.hpp @@ -0,0 +1,48 @@ +/** + * @file GlidingMoveFinalizeSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GlidingMoveFinalizeSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GLIDINGMOVEFINALIZESYSTEM +public: + class GlidingMoveFinalizeSystem& operator=(class GlidingMoveFinalizeSystem const &) = delete; + GlidingMoveFinalizeSystem(class GlidingMoveFinalizeSystem const &) = delete; + GlidingMoveFinalizeSystem() = delete; +#endif + +public: + /** + * @symbol ?_tickCollisionDamageCalculate\@GlidingMoveFinalizeSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMobTravelComponent\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UGlidingCollisionDamageComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI static void _tickCollisionDamageCalculate(class StrictEntityContext const &, struct MobTravelComponent const &, struct StateVectorComponent const &, class EntityModifierT &, class IConstBlockSource const &); + /** + * @symbol ?_tickCollisionDamageHurt\@GlidingMoveFinalizeSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@AEBUGlidingCollisionDamageComponent\@\@\@Z + */ + MCAPI static void _tickCollisionDamageHurt(class StrictEntityContext &, class ActorOwnerComponent &, struct GlidingCollisionDamageComponent const &); + /** + * @symbol ?createCollisionDamageCalculateSystem\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createCollisionDamageCalculateSystem(); + /** + * @symbol ?createCollisionDamageCalculateSystemSideBySide\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createCollisionDamageCalculateSystemSideBySide(); + /** + * @symbol ?createCollisionDamageHurtSystem\@GlidingMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createCollisionDamageHurtSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/GlobalActorLegacyTickSystem.hpp b/LiteLoader/include/llapi/mc/GlobalActorLegacyTickSystem.hpp index ba0ea874b4..d689d8da2c 100644 --- a/LiteLoader/include/llapi/mc/GlobalActorLegacyTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/GlobalActorLegacyTickSystem.hpp @@ -30,19 +30,19 @@ class GlobalActorLegacyTickSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlobalActorLegacyTickSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@GlobalActorLegacyTickSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GlobalActorLegacyTickSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp index 053dca2034..ad90313f12 100644 --- a/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp +++ b/LiteLoader/include/llapi/mc/GlobalPauseCommand.hpp @@ -31,18 +31,18 @@ class GlobalPauseCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlobalPauseCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@GlobalPauseCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@GlobalPauseCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@GlobalPauseCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@GlobalPauseCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp index 44b69eb1fe..73db357061 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlock.hpp @@ -31,198 +31,203 @@ class GlowItemFrameBlock : public ItemFrameBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlowItemFrameBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 194 - * @symbol ?getSpawnedItemName\@GlowItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 195 + * @symbol ?getSpawnedItemName\@GlowItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ */ virtual class HashedString getSpawnedItemName() const; /** - * @symbol ??0GlowItemFrameBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0GlowItemFrameBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GlowItemFrameBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp b/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp index d49c9f781b..90e255d625 100644 --- a/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/GlowItemFrameBlockActor.hpp @@ -31,53 +31,53 @@ class GlowItemFrameBlockActor : public ItemFrameBlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlowItemFrameBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0GlowItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0GlowItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@\@Z */ MCAPI GlowItemFrameBlockActor(class BlockPos); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp index 7ef7645c97..545edc0174 100644 --- a/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp +++ b/LiteLoader/include/llapi/mc/GlowLichenBlock.hpp @@ -31,234 +31,239 @@ class GlowLichenBlock : public MultifaceBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlowLichenBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@GlowLichenBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@GlowLichenBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 152 - * @symbol ?init\@GlowLichenBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@GlowLichenBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@GlowLichenBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@GlowLichenBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@GlowLichenBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@GlowLichenBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 194 + * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 194 - * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ + * @vftbl 195 + * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GLOWLICHENBLOCK /** - * @symbol ?canBeSilkTouched\@GlowLichenBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@GlowLichenBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0GlowLichenBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0GlowLichenBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI GlowLichenBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlowSquid.hpp b/LiteLoader/include/llapi/mc/GlowSquid.hpp index aba394009a..c7607c52c3 100644 --- a/LiteLoader/include/llapi/mc/GlowSquid.hpp +++ b/LiteLoader/include/llapi/mc/GlowSquid.hpp @@ -32,171 +32,166 @@ class GlowSquid : public Squid { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~GlowSquid(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@GlowSquid\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@GlowSquid\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@GlowSquid\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@GlowSquid\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@GlowSquid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@GlowSquid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@GlowSquid\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@GlowSquid\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?_getInkSquirtSoundEvent\@GlowSquid\@\@MEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 353 + * @symbol ?_getInkSquirtSoundEvent\@GlowSquid\@\@MEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent _getInkSquirtSoundEvent() const; /** - * @symbol ??0GlowSquid\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0GlowSquid\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI GlowSquid(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); //private: /** - * @symbol ?_startGoingDark\@GlowSquid\@\@AEAAXXZ + * @symbol ?_startGoingDark\@GlowSquid\@\@AEAAXXZ */ MCAPI void _startGoingDark(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlowStickItem.hpp b/LiteLoader/include/llapi/mc/GlowStickItem.hpp index 06064adea6..40cc067ea9 100644 --- a/LiteLoader/include/llapi/mc/GlowStickItem.hpp +++ b/LiteLoader/include/llapi/mc/GlowStickItem.hpp @@ -32,101 +32,101 @@ class GlowStickItem : public ChemistryStickItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlowStickItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@GlowStickItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@GlowStickItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@GlowStickItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@GlowStickItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 122 - * @symbol ?getLightEmission\@GlowStickItem\@\@UEBA?AUBrightness\@\@H\@Z + * @vftbl 122 + * @symbol ?getLightEmission\@GlowStickItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @symbol ??0GlowStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0GlowStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GlowStickItem(std::string const &, int); /** - * @symbol ?COLORS\@GlowStickItem\@\@2QBW4ItemColor\@\@B + * @symbol ?COLORS\@GlowStickItem\@\@2QBW4ItemColor\@\@B */ MCAPI static enum class ItemColor const COLORS[]; /** - * @symbol ?MAX_ACTIVE_TICKS\@GlowStickItem\@\@2HB + * @symbol ?MAX_ACTIVE_TICKS\@GlowStickItem\@\@2HB */ MCAPI static int const MAX_ACTIVE_TICKS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GlowStoneFeature.hpp b/LiteLoader/include/llapi/mc/GlowStoneFeature.hpp index 69e1612454..a91da5a0cd 100644 --- a/LiteLoader/include/llapi/mc/GlowStoneFeature.hpp +++ b/LiteLoader/include/llapi/mc/GlowStoneFeature.hpp @@ -31,14 +31,20 @@ class GlowStoneFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GlowStoneFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@GlowStoneFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@GlowStoneFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GLOWSTONEFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~GlowStoneFeature(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoAndGiveItemsToNoteblockGoal.hpp b/LiteLoader/include/llapi/mc/GoAndGiveItemsToNoteblockGoal.hpp index 3e2cc1f1c4..d16d2c3103 100644 --- a/LiteLoader/include/llapi/mc/GoAndGiveItemsToNoteblockGoal.hpp +++ b/LiteLoader/include/llapi/mc/GoAndGiveItemsToNoteblockGoal.hpp @@ -28,48 +28,48 @@ class GoAndGiveItemsToNoteblockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GoAndGiveItemsToNoteblockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@GoAndGiveItemsToNoteblockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@GoAndGiveItemsToNoteblockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@GoAndGiveItemsToNoteblockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@GoAndGiveItemsToNoteblockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@GoAndGiveItemsToNoteblockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@GoAndGiveItemsToNoteblockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@GoAndGiveItemsToNoteblockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@GoAndGiveItemsToNoteblockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@GoAndGiveItemsToNoteblockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@GoAndGiveItemsToNoteblockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@GoAndGiveItemsToNoteblockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@GoAndGiveItemsToNoteblockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0GoAndGiveItemsToNoteblockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0GoAndGiveItemsToNoteblockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI GoAndGiveItemsToNoteblockGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoAndGiveItemsToOwnerGoal.hpp b/LiteLoader/include/llapi/mc/GoAndGiveItemsToOwnerGoal.hpp index 922ef25e0b..9d34d70e1e 100644 --- a/LiteLoader/include/llapi/mc/GoAndGiveItemsToOwnerGoal.hpp +++ b/LiteLoader/include/llapi/mc/GoAndGiveItemsToOwnerGoal.hpp @@ -28,56 +28,56 @@ class GoAndGiveItemsToOwnerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GoAndGiveItemsToOwnerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@GoAndGiveItemsToOwnerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@GoAndGiveItemsToOwnerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@GoAndGiveItemsToOwnerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@GoAndGiveItemsToOwnerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@GoAndGiveItemsToOwnerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@GoAndGiveItemsToOwnerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@GoAndGiveItemsToOwnerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@GoAndGiveItemsToOwnerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@GoAndGiveItemsToOwnerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@GoAndGiveItemsToOwnerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@GoAndGiveItemsToOwnerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@GoAndGiveItemsToOwnerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0GoAndGiveItemsToOwnerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0GoAndGiveItemsToOwnerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI GoAndGiveItemsToOwnerGoal(class Mob &); //private: /** - * @symbol ?_attemptToGiveItem\@GoAndGiveItemsToOwnerGoal\@\@AEAA_NXZ + * @symbol ?_attemptToGiveItem\@GoAndGiveItemsToOwnerGoal\@\@AEAA_NXZ */ MCAPI bool _attemptToGiveItem(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoHomeGoal.hpp b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp index 8ed75c906d..adc7aa3baa 100644 --- a/LiteLoader/include/llapi/mc/GoHomeGoal.hpp +++ b/LiteLoader/include/llapi/mc/GoHomeGoal.hpp @@ -30,68 +30,68 @@ class GoHomeGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GoHomeGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@GoHomeGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@GoHomeGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@GoHomeGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@GoHomeGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@GoHomeGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@GoHomeGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@GoHomeGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@GoHomeGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@GoHomeGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@GoHomeGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@GoHomeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@GoHomeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0GoHomeGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0GoHomeGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI GoHomeGoal(class Mob &); //private: /** - * @symbol ?_getHomeDimension\@GoHomeGoal\@\@AEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?_getHomeDimension\@GoHomeGoal\@\@AEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID _getHomeDimension() const; /** - * @symbol ?_getHomePos\@GoHomeGoal\@\@AEBA?AVBlockPos\@\@XZ + * @symbol ?_getHomePos\@GoHomeGoal\@\@AEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos _getHomePos() const; /** - * @symbol ?_hasRequiredComponents\@GoHomeGoal\@\@AEBA_NXZ + * @symbol ?_hasRequiredComponents\@GoHomeGoal\@\@AEBA_NXZ */ MCAPI bool _hasRequiredComponents() const; /** - * @symbol ?_triggerOnFailedEvents\@GoHomeGoal\@\@AEAAXXZ + * @symbol ?_triggerOnFailedEvents\@GoHomeGoal\@\@AEAAXXZ */ MCAPI void _triggerOnFailedEvents(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Goal.hpp b/LiteLoader/include/llapi/mc/Goal.hpp index 0317b7d650..189a137935 100644 --- a/LiteLoader/include/llapi/mc/Goal.hpp +++ b/LiteLoader/include/llapi/mc/Goal.hpp @@ -29,87 +29,91 @@ class Goal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Goal(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual void __unk_vfn_1() = 0; + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@Goal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@Goal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@Goal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@Goal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4() = 0; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?isTargetGoal\@Goal\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?isTargetGoal\@Goal\@\@UEBA_NXZ */ virtual bool isTargetGoal() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GOAL /** - * @symbol ?onPlayerDimensionChanged\@Goal\@\@UEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @symbol ?onPlayerDimensionChanged\@Goal\@\@UEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ MCVAPI void onPlayerDimensionChanged(class Player *, class AutomaticID, class AutomaticID); /** - * @symbol ?start\@Goal\@\@UEAAXXZ + * @symbol ?start\@Goal\@\@UEAAXXZ */ MCVAPI void start(); /** - * @symbol ?stop\@Goal\@\@UEAAXXZ + * @symbol ?stop\@Goal\@\@UEAAXXZ */ MCVAPI void stop(); /** - * @symbol ?tick\@Goal\@\@UEAAXXZ + * @symbol ?tick\@Goal\@\@UEAAXXZ */ MCVAPI void tick(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Goal(); #endif /** - * @symbol ??0Goal\@\@QEAA\@XZ + * @symbol ??0Goal\@\@QEAA\@XZ */ MCAPI Goal(); /** - * @symbol ?getRequiredControlFlags\@Goal\@\@QEBAHXZ + * @symbol ?getRequiredControlFlags\@Goal\@\@QEBAHXZ */ MCAPI int getRequiredControlFlags() const; /** - * @symbol ?getTypeId\@Goal\@\@QEBAGXZ + * @symbol ?getTypeId\@Goal\@\@QEBAGXZ */ MCAPI unsigned short getTypeId() const; /** - * @symbol ?setRequiredControlFlags\@Goal\@\@QEAAXH\@Z + * @symbol ?setRequiredControlFlags\@Goal\@\@QEAAXH\@Z */ MCAPI void setRequiredControlFlags(int); /** - * @symbol ?setTypeId\@Goal\@\@QEAAXG\@Z + * @symbol ?setTypeId\@Goal\@\@QEAAXG\@Z */ MCAPI void setTypeId(unsigned short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoalDefinition.hpp b/LiteLoader/include/llapi/mc/GoalDefinition.hpp index 954dd5be60..d8ff241572 100644 --- a/LiteLoader/include/llapi/mc/GoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GoalDefinition.hpp @@ -23,55 +23,55 @@ struct GoalDefinition { #undef AFTER_EXTRA public: /** - * @symbol ??0GoalDefinition\@\@QEAA\@XZ + * @symbol ??0GoalDefinition\@\@QEAA\@XZ */ MCAPI GoalDefinition(); /** - * @symbol ??0GoalDefinition\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0GoalDefinition\@\@QEAA\@AEBU0\@\@Z */ MCAPI GoalDefinition(struct GoalDefinition const &); /** - * @symbol ??0GoalDefinition\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0GoalDefinition\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI GoalDefinition(struct GoalDefinition &&); /** - * @symbol ?_getPOITypeFromString\@GoalDefinition\@\@QEAA?AW4POIType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getPOITypeFromString\@GoalDefinition\@\@QEAA?AW4POIType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class POIType _getPOITypeFromString(std::string); /** - * @symbol ??4GoalDefinition\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4GoalDefinition\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct GoalDefinition & operator=(struct GoalDefinition const &); /** - * @symbol ??4GoalDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4GoalDefinition\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct GoalDefinition & operator=(struct GoalDefinition &&); /** - * @symbol ?parse\@GoalDefinition\@\@QEAA_NAEBUConstDeserializeDataParams\@\@H\@Z + * @symbol ?parse\@GoalDefinition\@\@QEAA_NAEBUConstDeserializeDataParams\@\@H\@Z */ MCAPI bool parse(struct ConstDeserializeDataParams const &, int); /** - * @symbol ??1GoalDefinition\@\@QEAA\@XZ + * @symbol ??1GoalDefinition\@\@QEAA\@XZ */ MCAPI ~GoalDefinition(); /** - * @symbol ?CreateGoal\@GoalDefinition\@\@SA?AV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBU1\@\@Z + * @symbol ?CreateGoal\@GoalDefinition\@\@SA?AV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBU1\@\@Z */ MCAPI static std::unique_ptr CreateGoal(class Mob &, struct GoalDefinition const &); /** - * @symbol ?GoalExists\@GoalDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?GoalExists\@GoalDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool GoalExists(std::string const &); /** - * @symbol ?init\@GoalDefinition\@\@SAXXZ + * @symbol ?init\@GoalDefinition\@\@SAXXZ */ MCAPI static void init(); /** - * @symbol ?mGoalMap\@GoalDefinition\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBUGoalDefinition\@\@\@Z\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBUGoalDefinition\@\@\@Z\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mGoalMap\@GoalDefinition\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBUGoalDefinition\@\@\@Z\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBUGoalDefinition\@\@\@Z\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map (class Mob &, struct GoalDefinition const &)>, struct std::hash, struct std::equal_to, class std::allocator (class Mob &, struct GoalDefinition const &)>>>> mGoalMap; /** - * @symbol ?shutdown\@GoalDefinition\@\@SAXXZ + * @symbol ?shutdown\@GoalDefinition\@\@SAXXZ */ MCAPI static void shutdown(); diff --git a/LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp b/LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp index 012f3bf1ee..35f7b1426f 100644 --- a/LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp +++ b/LiteLoader/include/llapi/mc/GoalSelectorComponent.hpp @@ -30,56 +30,56 @@ class GoalSelectorComponent { public: /** - * @symbol ?addGoal\@GoalSelectorComponent\@\@QEAAXHV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addGoal\@GoalSelectorComponent\@\@QEAAXHV?$unique_ptr\@VGoal\@\@U?$default_delete\@VGoal\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void addGoal(int, std::unique_ptr); /** - * @symbol ?buildDebugInfo\@GoalSelectorComponent\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?buildDebugInfo\@GoalSelectorComponent\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void buildDebugInfo(std::string &) const; /** - * @symbol ?clearAllGoals\@GoalSelectorComponent\@\@QEAAXXZ + * @symbol ?clearAllGoals\@GoalSelectorComponent\@\@QEAAXXZ */ MCAPI void clearAllGoals(); /** - * @symbol ?clearNonTargetedGoals\@GoalSelectorComponent\@\@QEAAXXZ + * @symbol ?clearNonTargetedGoals\@GoalSelectorComponent\@\@QEAAXXZ */ MCAPI void clearNonTargetedGoals(); /** - * @symbol ?clearTargetGoals\@GoalSelectorComponent\@\@QEAAXXZ + * @symbol ?clearTargetGoals\@GoalSelectorComponent\@\@QEAAXXZ */ MCAPI void clearTargetGoals(); /** - * @symbol ?getGoalMap\@GoalSelectorComponent\@\@QEAAAEAV?$vector\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@V?$allocator\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getGoalMap\@GoalSelectorComponent\@\@QEAAAEAV?$vector\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@V?$allocator\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> & getGoalMap(); /** - * @symbol ?onPlayerDimensionChanged\@GoalSelectorComponent\@\@QEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @symbol ?onPlayerDimensionChanged\@GoalSelectorComponent\@\@QEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ MCAPI void onPlayerDimensionChanged(class Player *, class AutomaticID, class AutomaticID); /** - * @symbol ?removeGoal\@GoalSelectorComponent\@\@QEAA_NG\@Z + * @symbol ?removeGoal\@GoalSelectorComponent\@\@QEAA_NG\@Z */ MCAPI bool removeGoal(unsigned short); /** - * @symbol ?stopAllGoals\@GoalSelectorComponent\@\@QEAAXXZ + * @symbol ?stopAllGoals\@GoalSelectorComponent\@\@QEAAXXZ */ MCAPI void stopAllGoals(); /** - * @symbol ?stopNonTargetedGoals\@GoalSelectorComponent\@\@QEAAXXZ + * @symbol ?stopNonTargetedGoals\@GoalSelectorComponent\@\@QEAAXXZ */ MCAPI void stopNonTargetedGoals(); //private: /** - * @symbol ?_eraseGoals\@GoalSelectorComponent\@\@AEAAXP6A_NAEAU?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@Z\@Z + * @symbol ?_eraseGoals\@GoalSelectorComponent\@\@AEAAXP6A_NAEAU?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@Z\@Z */ MCAPI void _eraseGoals(bool ( *)(struct std::pair &)); /** - * @symbol ?_findGoalByKey\@GoalSelectorComponent\@\@AEBA?AV?$_Vector_const_iterator\@V?$_Vector_val\@U?$_Simple_types\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@G\@Z + * @symbol ?_findGoalByKey\@GoalSelectorComponent\@\@AEBA?AV?$_Vector_const_iterator\@V?$_Vector_val\@U?$_Simple_types\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@G\@Z */ MCAPI class std::_Vector_const_iterator>>> _findGoalByKey(unsigned short) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp b/LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp index 3fb2076c28..20956d3afc 100644 --- a/LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp +++ b/LiteLoader/include/llapi/mc/GoalSelectorSystem.hpp @@ -30,27 +30,27 @@ class GoalSelectorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GoalSelectorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@GoalSelectorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GoalSelectorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickGoalSelectorComponent\@GoalSelectorSystem\@\@CAXAEAVActorOwnerComponent\@\@\@Z + * @symbol ?_tickGoalSelectorComponent\@GoalSelectorSystem\@\@CAXAEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tickGoalSelectorComponent(class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp b/LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp index afaa65dd6b..4cff1cdac2 100644 --- a/LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp +++ b/LiteLoader/include/llapi/mc/GoalSelectorUtility.hpp @@ -22,15 +22,15 @@ namespace GoalSelectorUtility { #undef AFTER_EXTRA /** - * @symbol ?canUseInSystem\@GoalSelectorUtility\@\@YA_NAEAVPrioritizedGoal\@\@AEAV?$vector\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@V?$allocator\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?canUseInSystem\@GoalSelectorUtility\@\@YA_NAEAVPrioritizedGoal\@\@AEAV?$vector\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@V?$allocator\@U?$pair\@GVPrioritizedGoal\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI bool canUseInSystem(class PrioritizedGoal &, std::vector> &); /** - * @symbol ?tickGoals\@GoalSelectorUtility\@\@YAXAEAVMob\@\@_N\@Z + * @symbol ?tickGoals\@GoalSelectorUtility\@\@YAXAEAVMob\@\@_N\@Z */ MCAPI void tickGoals(class Mob &, bool); /** - * @symbol ?tryStartGoals\@GoalSelectorUtility\@\@YAXAEAVMob\@\@_N\@Z + * @symbol ?tryStartGoals\@GoalSelectorUtility\@\@YAXAEAVMob\@\@_N\@Z */ MCAPI void tryStartGoals(class Mob &, bool); diff --git a/LiteLoader/include/llapi/mc/Goat.hpp b/LiteLoader/include/llapi/mc/Goat.hpp index 45e59edf74..73dea268b1 100644 --- a/LiteLoader/include/llapi/mc/Goat.hpp +++ b/LiteLoader/include/llapi/mc/Goat.hpp @@ -32,189 +32,184 @@ class Goat : public Animal { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Goat\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Goat\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Goat(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 134 - * @symbol ?getAmbientSound\@Goat\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@Goat\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Goat\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Goat\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Goat\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Goat\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Goat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Goat\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Goat\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Goat\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 281 - * @symbol ?getHurtSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ + * @vftbl 279 + * @symbol ?getHurtSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getHurtSound(); /** - * @vftbl 282 - * @symbol ?getDeathSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ + * @vftbl 280 + * @symbol ?getDeathSound\@Goat\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getDeathSound(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Goat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Goat\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Goat(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getHornCount\@Goat\@\@QEBAHXZ + * @symbol ?getHornCount\@Goat\@\@QEBAHXZ */ MCAPI int getHornCount() const; /** - * @symbol ?isScreaming\@Goat\@\@QEAA_NXZ + * @symbol ?isScreaming\@Goat\@\@QEAA_NXZ */ MCAPI bool isScreaming(); /** - * @symbol ?reduceHornCount\@Goat\@\@QEAAXXZ + * @symbol ?reduceHornCount\@Goat\@\@QEAAXXZ */ MCAPI void reduceHornCount(); @@ -222,12 +217,12 @@ class Goat : public Animal { private: /** - * @symbol ?DEFAULT_HORN_COUNT\@Goat\@\@0HA + * @symbol ?DEFAULT_HORN_COUNT\@Goat\@\@0HA */ MCAPI static int DEFAULT_HORN_COUNT; /** - * @symbol ?SCREAMING_GOAT_VARIANT\@Goat\@\@0HA + * @symbol ?SCREAMING_GOAT_VARIANT\@Goat\@\@0HA */ MCAPI static int SCREAMING_GOAT_VARIANT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GoatHornItem.hpp b/LiteLoader/include/llapi/mc/GoatHornItem.hpp index 8d440a4826..560d91352c 100644 --- a/LiteLoader/include/llapi/mc/GoatHornItem.hpp +++ b/LiteLoader/include/llapi/mc/GoatHornItem.hpp @@ -32,107 +32,107 @@ class GoatHornItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GoatHornItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@GoatHornItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@GoatHornItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@GoatHornItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@GoatHornItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 103 - * @symbol ?getCooldownType\@GoatHornItem\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 103 + * @symbol ?getCooldownType\@GoatHornItem\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getCooldownType() const; /** - * @vftbl 104 - * @symbol ?getCooldownTime\@GoatHornItem\@\@UEBAHXZ + * @vftbl 104 + * @symbol ?getCooldownTime\@GoatHornItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; /** - * @vftbl 124 - * @symbol ?canBeCharged\@GoatHornItem\@\@UEBA_NXZ + * @vftbl 124 + * @symbol ?canBeCharged\@GoatHornItem\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @symbol ??0GoatHornItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0GoatHornItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GoatHornItem(std::string const &, int); /** - * @symbol ?addGoatHornVarationSaveData\@GoatHornItem\@\@SAXAEAVGoat\@\@AEAVItemStack\@\@\@Z + * @symbol ?addGoatHornVarationSaveData\@GoatHornItem\@\@SAXAEAVGoat\@\@AEAVItemStack\@\@\@Z */ MCAPI static void addGoatHornVarationSaveData(class Goat &, class ItemStack &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GossipType.hpp b/LiteLoader/include/llapi/mc/GossipType.hpp deleted file mode 100644 index b6737e8e5d..0000000000 --- a/LiteLoader/include/llapi/mc/GossipType.hpp +++ /dev/null @@ -1,78 +0,0 @@ -/** - * @file GossipType.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class GossipType. - * - */ -class GossipType { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GOSSIPTYPE -public: - class GossipType& operator=(class GossipType const &) = delete; - GossipType(class GossipType const &) = delete; - GossipType() = delete; -#endif - -public: - /** - * @symbol ??0GossipType@@QEAA@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@HHHHH@Z - * @hash 407849975 - */ - MCAPI GossipType(std::string const &, int, int, int, int, int); - /** - * @symbol ??1GossipType@@QEAA@XZ - * @hash -1313181725 - */ - MCAPI ~GossipType(); - /** - * @symbol ?MAJOR_NEGATIVE@GossipType@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - * @hash 1304397311 - */ - MCAPI static std::string const MAJOR_NEGATIVE; - /** - * @symbol ?MAJOR_POSITIVE@GossipType@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - * @hash -1711560633 - */ - MCAPI static std::string const MAJOR_POSITIVE; - /** - * @symbol ?MINOR_NEGATIVE@GossipType@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - * @hash 1785538535 - */ - MCAPI static std::string const MINOR_NEGATIVE; - /** - * @symbol ?MINOR_POSITIVE@GossipType@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - * @hash -1230419409 - */ - MCAPI static std::string const MINOR_POSITIVE; - /** - * @symbol ?TRADING@GossipType@@2V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@B - * @hash 203508685 - */ - MCAPI static std::string const TRADING; - /** - * @symbol ?UNRECOGNIZED@GossipType@@2V1@B - * @hash 516191009 - */ - MCAPI static class GossipType const UNRECOGNIZED; - /** - * @symbol ?tryCreateFromJSON@GossipType@@SA?AV1@AEBVValue@Json@@@Z - * @hash 1522413463 - */ - MCAPI static class GossipType tryCreateFromJSON(class Json::Value const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GossipTypeManager.hpp b/LiteLoader/include/llapi/mc/GossipTypeManager.hpp deleted file mode 100644 index 0cb9f7be1d..0000000000 --- a/LiteLoader/include/llapi/mc/GossipTypeManager.hpp +++ /dev/null @@ -1,52 +0,0 @@ -/** - * @file GossipTypeManager.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class GossipTypeManager. - * - */ -class GossipTypeManager { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GOSSIPTYPEMANAGER -public: - class GossipTypeManager& operator=(class GossipTypeManager const &) = delete; - GossipTypeManager(class GossipTypeManager const &) = delete; - GossipTypeManager() = delete; -#endif - -public: - /** - * @symbol ??0GossipTypeManager@@QEAA@AEBVLevelData@@@Z - * @hash 2104917417 - */ - MCAPI GossipTypeManager(class LevelData const &); - /** - * @symbol ?readGossipData@GossipTypeManager@@QEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - * @hash 536482592 - */ - MCAPI void readGossipData(std::string const &); - /** - * @symbol ?shouldUseGossip@GossipTypeManager@@QEBA_NXZ - * @hash 1561412166 - */ - MCAPI bool shouldUseGossip() const; - /** - * @symbol ?GOSSIP_VERSION@GossipTypeManager@@2VBaseGameVersion@@B - * @hash -2054297149 - */ - MCAPI static class BaseGameVersion const GOSSIP_VERSION; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp b/LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp index 78848e4ea6..25d71bb429 100644 --- a/LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/GrantXPSubcomponent.hpp @@ -30,33 +30,33 @@ class GrantXPSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrantXPSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@GrantXPSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@GrantXPSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@GrantXPSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@GrantXPSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@GrantXPSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@GrantXPSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@GrantXPSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@GrantXPSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0GrantXPSubcomponent\@\@QEAA\@XZ + * @symbol ??0GrantXPSubcomponent\@\@QEAA\@XZ */ MCAPI GrantXPSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrassBlock.hpp b/LiteLoader/include/llapi/mc/GrassBlock.hpp index c7a1719e32..2f4dad8d6c 100644 --- a/LiteLoader/include/llapi/mc/GrassBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassBlock.hpp @@ -31,270 +31,275 @@ class GrassBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrassBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@GrassBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@GrassBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 95 - * @symbol ?tryToTill\@GrassBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @vftbl 95 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 107 - * @symbol ?calcVariant\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z + * @vftbl 107 + * @symbol ?calcVariant\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVColor\@mce\@\@\@Z */ virtual int calcVariant(class BlockSource &, class BlockPos const &, class mce::Color const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@GrassBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@GrassBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@GrassBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@GrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@GrassBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@GrassBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@GrassBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@GrassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@GrassBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@GrassBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GRASSBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@GrassBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@GrassBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0GrassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0GrassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GrassBlock(std::string const &, int); /** - * @symbol ?fertilize\@GrassBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@\@Z + * @symbol ?fertilize\@GrassBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandomize\@\@\@Z */ MCAPI bool fertilize(class BlockSource &, class BlockPos const &, class Randomize &) const; /** - * @symbol ?MIN_BRIGHTNESS\@GrassBlock\@\@2UBrightness\@\@B + * @symbol ?MIN_BRIGHTNESS\@GrassBlock\@\@2UBrightness\@\@B */ MCAPI static struct Brightness const MIN_BRIGHTNESS; //private: /** - * @symbol ?_canBeGrass\@GrassBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canBeGrass\@GrassBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canBeGrass(class BlockSource const &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrassPathBlock.hpp b/LiteLoader/include/llapi/mc/GrassPathBlock.hpp index 4bf2265fd2..be500ce162 100644 --- a/LiteLoader/include/llapi/mc/GrassPathBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrassPathBlock.hpp @@ -31,242 +31,247 @@ class GrassPathBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrassPathBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@GrassPathBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@GrassPathBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@GrassPathBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@GrassPathBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@GrassPathBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@GrassPathBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 95 - * @symbol ?tryToTill\@GrassPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @vftbl 95 + * @symbol ?tryToTill\@GrassPathBlock\@\@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 99 + * @symbol ?neighborChanged\@GrassPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@GrassPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@GrassPathBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@GrassPathBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@GrassPathBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@GrassPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@GrassPathBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@GrassPathBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@GrassPathBlock\@\@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 ??0GrassPathBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GrassPathBlock(std::string const &, int); /** - * @symbol ?BLOCK_AABB\@GrassPathBlock\@\@2VAABB\@\@A + * @symbol ?BLOCK_AABB\@GrassPathBlock\@\@2VAABB\@\@A */ MCAPI static class AABB BLOCK_AABB; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GravelBlock.hpp b/LiteLoader/include/llapi/mc/GravelBlock.hpp index 909f15e557..c6c888722f 100644 --- a/LiteLoader/include/llapi/mc/GravelBlock.hpp +++ b/LiteLoader/include/llapi/mc/GravelBlock.hpp @@ -31,233 +31,238 @@ class GravelBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GravelBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@GravelBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@GravelBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@GravelBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@GravelBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@GravelBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?getDustColor\@GravelBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@GravelBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@GravelBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @symbol ??0GravelBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0GravelBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GravelBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrindstoneAdditionalContainerValidation.hpp b/LiteLoader/include/llapi/mc/GrindstoneAdditionalContainerValidation.hpp index cb55455607..73007914cc 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneAdditionalContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneAdditionalContainerValidation.hpp @@ -31,54 +31,54 @@ class GrindstoneAdditionalContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrindstoneAdditionalContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@GrindstoneAdditionalContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@GrindstoneAdditionalContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@GrindstoneAdditionalContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@GrindstoneAdditionalContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp index 23fc360ce1..3e6c9086c4 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneBlock.hpp @@ -31,252 +31,257 @@ class GrindstoneBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrindstoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@GrindstoneBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@GrindstoneBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@GrindstoneBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@GrindstoneBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@GrindstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@GrindstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@GrindstoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@GrindstoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@GrindstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@GrindstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@GrindstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@GrindstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GRINDSTONEBLOCK /** - * @symbol ?isInteractiveBlock\@GrindstoneBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@GrindstoneBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0GrindstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0GrindstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI GrindstoneBlock(std::string const &, int); //private: /** - * @symbol ?_getShape\@GrindstoneBlock\@\@AEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z + * @symbol ?_getShape\@GrindstoneBlock\@\@AEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@\@Z */ MCAPI class AABB const & _getShape(class Block const &, class AABB &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp index 24e2b835f7..ce0292f1c6 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneContainerManagerModel.hpp @@ -31,60 +31,60 @@ class GrindstoneContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrindstoneContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@GrindstoneContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@GrindstoneContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@GrindstoneContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@GrindstoneContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@GrindstoneContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@GrindstoneContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@GrindstoneContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@GrindstoneContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@GrindstoneContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@GrindstoneContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@GrindstoneContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@GrindstoneContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@GrindstoneContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@GrindstoneContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0GrindstoneContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0GrindstoneContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI GrindstoneContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?ADDITIONAL_SLOT\@GrindstoneContainerManagerModel\@\@2HB + * @symbol ?ADDITIONAL_SLOT\@GrindstoneContainerManagerModel\@\@2HB */ MCAPI static int const ADDITIONAL_SLOT; /** - * @symbol ?INPUT_SLOT\@GrindstoneContainerManagerModel\@\@2HB + * @symbol ?INPUT_SLOT\@GrindstoneContainerManagerModel\@\@2HB */ MCAPI static int const INPUT_SLOT; /** - * @symbol ?RESULT_SLOT\@GrindstoneContainerManagerModel\@\@2HB + * @symbol ?RESULT_SLOT\@GrindstoneContainerManagerModel\@\@2HB */ MCAPI static int const RESULT_SLOT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrindstoneContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/GrindstoneContainerScreenValidator.hpp index 069845a5a2..d6968bf4a0 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class GrindstoneContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrindstoneContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0GrindstoneContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0GrindstoneContainerScreenValidator\@\@QEAA\@XZ */ MCAPI GrindstoneContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrindstoneInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/GrindstoneInputContainerValidation.hpp index 8470f5f78d..f61548d5f6 100644 --- a/LiteLoader/include/llapi/mc/GrindstoneInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/GrindstoneInputContainerValidation.hpp @@ -31,54 +31,54 @@ class GrindstoneInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrindstoneInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@GrindstoneInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@GrindstoneInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@GrindstoneInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@GrindstoneInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp new file mode 100644 index 0000000000..bf185a5e50 --- /dev/null +++ b/LiteLoader/include/llapi/mc/GroundAndAirMoveFinalizeSystem.hpp @@ -0,0 +1,44 @@ +/** + * @file GroundAndAirMoveFinalizeSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GroundAndAirMoveFinalizeSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GROUNDANDAIRMOVEFINALIZESYSTEM +public: + class GroundAndAirMoveFinalizeSystem& operator=(class GroundAndAirMoveFinalizeSystem const &) = delete; + GroundAndAirMoveFinalizeSystem(class GroundAndAirMoveFinalizeSystem const &) = delete; + GroundAndAirMoveFinalizeSystem() = delete; +#endif + +public: + /** + * @symbol ?createAirMoveFinalizeSideBySideSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAirMoveFinalizeSideBySideSystem(); + /** + * @symbol ?createAirMoveFinalizeSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAirMoveFinalizeSystem(); + /** + * @symbol ?createGroundMoveFinalizeSideBySideSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createGroundMoveFinalizeSideBySideSystem(); + /** + * @symbol ?createGroundMoveFinalizeSystem\@GroundAndAirMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createGroundMoveFinalizeSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp b/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp new file mode 100644 index 0000000000..4b7c254545 --- /dev/null +++ b/LiteLoader/include/llapi/mc/GroundAndAirMoveSystem.hpp @@ -0,0 +1,44 @@ +/** + * @file GroundAndAirMoveSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GroundAndAirMoveSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GROUNDANDAIRMOVESYSTEM +public: + class GroundAndAirMoveSystem& operator=(class GroundAndAirMoveSystem const &) = delete; + GroundAndAirMoveSystem(class GroundAndAirMoveSystem const &) = delete; + GroundAndAirMoveSystem() = delete; +#endif + +public: + /** + * @symbol ?createAirMoveSideBySideSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAirMoveSideBySideSystem(); + /** + * @symbol ?createAirMoveSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createAirMoveSystem(); + /** + * @symbol ?createGroundMoveSideBySideSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createGroundMoveSideBySideSystem(); + /** + * @symbol ?createGroundMoveSystem\@GroundAndAirMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createGroundMoveSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/GroundOffsetDefinition.hpp b/LiteLoader/include/llapi/mc/GroundOffsetDefinition.hpp index d374e11723..1032b59ed4 100644 --- a/LiteLoader/include/llapi/mc/GroundOffsetDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GroundOffsetDefinition.hpp @@ -31,11 +31,11 @@ struct GroundOffsetDefinition { public: /** - * @symbol ?initialize\@GroundOffsetDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@GroundOffsetDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@GroundOffsetDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UGroundOffsetDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@GroundOffsetDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UGroundOffsetDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp b/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp new file mode 100644 index 0000000000..52390fc4c3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/GroundTravelTypeSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file GroundTravelTypeSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class GroundTravelTypeSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_GROUNDTRAVELTYPESYSTEM +public: + class GroundTravelTypeSystem& operator=(class GroundTravelTypeSystem const &) = delete; + GroundTravelTypeSystem(class GroundTravelTypeSystem const &) = delete; + GroundTravelTypeSystem() = delete; +#endif + +public: + /** + * @symbol ?create\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?createSideBySide\@GroundTravelTypeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSideBySide(); + /** + * @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 + */ + 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 &); + +}; diff --git a/LiteLoader/include/llapi/mc/GroundTravelTypeSystemUtils.hpp b/LiteLoader/include/llapi/mc/GroundTravelTypeSystemUtils.hpp new file mode 100644 index 0000000000..b40f814cde --- /dev/null +++ b/LiteLoader/include/llapi/mc/GroundTravelTypeSystemUtils.hpp @@ -0,0 +1,24 @@ +/** + * @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/GroundedConstraint.hpp b/LiteLoader/include/llapi/mc/GroundedConstraint.hpp index 5af7ea69ed..114c350dbf 100644 --- a/LiteLoader/include/llapi/mc/GroundedConstraint.hpp +++ b/LiteLoader/include/llapi/mc/GroundedConstraint.hpp @@ -30,18 +30,18 @@ class GroundedConstraint { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GroundedConstraint(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isSatisfied\@GroundedConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z + * @vftbl 1 + * @symbol ?isSatisfied\@GroundedConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z */ virtual bool isSatisfied(class IBlockWorldGenAPI const &, class BlockPos const &, enum class Rotation const &) const; /** - * @symbol ??0GroundedConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z + * @symbol ??0GroundedConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z */ MCAPI GroundedConstraint(class StructureTemplate &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp b/LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp index dbabb9afa9..29f46dc6c7 100644 --- a/LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GroupSizeDefinition.hpp @@ -31,8 +31,8 @@ class GroupSizeDefinition { public: /** - * @symbol ?buildSchema\@GroupSizeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGroupSizeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@GroupSizeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGroupSizeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GroupSizeSystem.hpp b/LiteLoader/include/llapi/mc/GroupSizeSystem.hpp index 25549a4c4f..622db6c929 100644 --- a/LiteLoader/include/llapi/mc/GroupSizeSystem.hpp +++ b/LiteLoader/include/llapi/mc/GroupSizeSystem.hpp @@ -30,27 +30,27 @@ class GroupSizeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GroupSizeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@GroupSizeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GroupSizeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@GroupSizeSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVGroupSizeComponent\@\@\@Z + * @symbol ?_tickComponent\@GroupSizeSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVGroupSizeComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class GroupSizeComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrowCropSystem.hpp b/LiteLoader/include/llapi/mc/GrowCropSystem.hpp index e5b3463b4d..46cd427fc1 100644 --- a/LiteLoader/include/llapi/mc/GrowCropSystem.hpp +++ b/LiteLoader/include/llapi/mc/GrowCropSystem.hpp @@ -30,19 +30,19 @@ class GrowCropSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrowCropSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@GrowCropSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@GrowCropSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrowingPlantFeature.hpp b/LiteLoader/include/llapi/mc/GrowingPlantFeature.hpp index e432fc63bd..af3093048c 100644 --- a/LiteLoader/include/llapi/mc/GrowingPlantFeature.hpp +++ b/LiteLoader/include/llapi/mc/GrowingPlantFeature.hpp @@ -29,18 +29,18 @@ class GrowingPlantFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GrowingPlantFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@GrowingPlantFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@GrowingPlantFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0GrowingPlantFeature\@\@QEAA\@XZ + * @symbol ??0GrowingPlantFeature\@\@QEAA\@XZ */ MCAPI GrowingPlantFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrowsCropComponent.hpp b/LiteLoader/include/llapi/mc/GrowsCropComponent.hpp index f5028f61e4..7c7ed6e7dd 100644 --- a/LiteLoader/include/llapi/mc/GrowsCropComponent.hpp +++ b/LiteLoader/include/llapi/mc/GrowsCropComponent.hpp @@ -29,16 +29,16 @@ class GrowsCropComponent { public: /** - * @symbol ??0GrowsCropComponent\@\@QEAA\@XZ + * @symbol ??0GrowsCropComponent\@\@QEAA\@XZ */ MCAPI GrowsCropComponent(); /** - * @symbol ?addAdditionalSaveData\@GrowsCropComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@GrowsCropComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?readAdditionalSaveData\@GrowsCropComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@GrowsCropComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GrowsCropDefinition.hpp b/LiteLoader/include/llapi/mc/GrowsCropDefinition.hpp index a628d20a5c..d550f0fe45 100644 --- a/LiteLoader/include/llapi/mc/GrowsCropDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GrowsCropDefinition.hpp @@ -30,16 +30,16 @@ class GrowsCropDefinition { public: /** - * @symbol ??0GrowsCropDefinition\@\@QEAA\@XZ + * @symbol ??0GrowsCropDefinition\@\@QEAA\@XZ */ MCAPI GrowsCropDefinition(); /** - * @symbol ?initialize\@GrowsCropDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGrowsCropComponent\@\@\@Z + * @symbol ?initialize\@GrowsCropDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGrowsCropComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class GrowsCropComponent &) const; /** - * @symbol ?buildSchema\@GrowsCropDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGrowsCropDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@GrowsCropDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGrowsCropDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Guardian.hpp b/LiteLoader/include/llapi/mc/Guardian.hpp index 70e983f3b3..2edb7db686 100644 --- a/LiteLoader/include/llapi/mc/Guardian.hpp +++ b/LiteLoader/include/llapi/mc/Guardian.hpp @@ -32,236 +32,226 @@ class Guardian : public Monster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Guardian\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Guardian\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Guardian\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Guardian\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Guardian(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 115 - * @symbol ?setTarget\@Guardian\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 114 + * @symbol ?setTarget\@Guardian\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Guardian\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Guardian\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Guardian\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Guardian\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Guardian\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Guardian\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Guardian\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Guardian\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 291 - * @symbol ?aiStep\@Guardian\@\@UEAAXXZ + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void aiStep(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Guardian\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Guardian\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 305 - * @symbol ?getMaxHeadXRot\@Guardian\@\@UEAAMXZ + * @vftbl 302 + * @symbol ?getMaxHeadXRot\@Guardian\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Guardian\@\@MEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Guardian\@\@MEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_GUARDIAN /** - * @symbol ?canSeeInvisible\@Guardian\@\@UEBA_NXZ + * @symbol ?canSeeInvisible\@Guardian\@\@UEBA_NXZ */ MCVAPI bool canSeeInvisible() const; #endif /** - * @symbol ??0Guardian\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Guardian\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Guardian(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getAttackDuration\@Guardian\@\@QEAAHXZ + * @symbol ?getAttackDuration\@Guardian\@\@QEAAHXZ */ MCAPI int getAttackDuration(); /** - * @symbol ?getMoveEyeVector\@Guardian\@\@QEAA?AVVec3\@\@XZ + * @symbol ?getMoveEyeVector\@Guardian\@\@QEAA?AVVec3\@\@XZ */ MCAPI class Vec3 getMoveEyeVector(); /** - * @symbol ?getTargetEntity\@Guardian\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getTargetEntity\@Guardian\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getTargetEntity() const; /** - * @symbol ?isElder\@Guardian\@\@QEBA_NXZ + * @symbol ?isElder\@Guardian\@\@QEBA_NXZ */ MCAPI bool isElder() const; /** - * @symbol ?isElderGhost\@Guardian\@\@QEBA_NXZ + * @symbol ?isElderGhost\@Guardian\@\@QEBA_NXZ */ MCAPI bool isElderGhost() const; /** - * @symbol ?preAiStep\@Guardian\@\@QEAAXXZ + * @symbol ?preAiStep\@Guardian\@\@QEAAXXZ */ MCAPI void preAiStep(); /** - * @symbol ?setAttackTime\@Guardian\@\@QEAAXH\@Z + * @symbol ?setAttackTime\@Guardian\@\@QEAAXH\@Z */ MCAPI void setAttackTime(int); /** - * @symbol ?setElder\@Guardian\@\@QEAAX_N\@Z + * @symbol ?setElder\@Guardian\@\@QEAAX_N\@Z */ MCAPI void setElder(bool); //protected: /** - * @symbol ?registerLoopingSounds\@Guardian\@\@IEAAXXZ + * @symbol ?registerLoopingSounds\@Guardian\@\@IEAAXXZ */ MCAPI void registerLoopingSounds(); @@ -271,12 +261,12 @@ class Guardian : public Monster { private: /** - * @symbol ?ATTACK_TIME\@Guardian\@\@0HB + * @symbol ?ATTACK_TIME\@Guardian\@\@0HB */ MCAPI static int const ATTACK_TIME; /** - * @symbol ?FIRST_DAMAGE_TIME\@Guardian\@\@0HB + * @symbol ?FIRST_DAMAGE_TIME\@Guardian\@\@0HB */ MCAPI static int const FIRST_DAMAGE_TIME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp b/LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp index 759c1d7666..9f2bfb198d 100644 --- a/LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/GuardianAttackDefinition.hpp @@ -30,26 +30,26 @@ class GuardianAttackDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GuardianAttackDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?validateMobType\@GuardianAttackDefinition\@\@UEBA_NAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?validateMobType\@GuardianAttackDefinition\@\@UEBA_NAEAVMob\@\@\@Z */ virtual bool validateMobType(class Mob &) const; /** - * @symbol ??0GuardianAttackDefinition\@\@QEAA\@XZ + * @symbol ??0GuardianAttackDefinition\@\@QEAA\@XZ */ MCAPI GuardianAttackDefinition(); /** - * @symbol ?initialize\@GuardianAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGuardianAttackGoal\@\@\@Z + * @symbol ?initialize\@GuardianAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVGuardianAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class GuardianAttackGoal &) const; /** - * @symbol ?buildSchema\@GuardianAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGuardianAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@GuardianAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VGuardianAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp b/LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp index b2679dda34..4a723d3c12 100644 --- a/LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/GuardianAttackGoal.hpp @@ -30,48 +30,48 @@ class GuardianAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GuardianAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@GuardianAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@GuardianAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@GuardianAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@GuardianAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@GuardianAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@GuardianAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@GuardianAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@GuardianAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@GuardianAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@GuardianAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@GuardianAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@GuardianAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0GuardianAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0GuardianAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI GuardianAttackGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp index 00057eebd6..a3037088ee 100644 --- a/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/GuardianPreAIStepSystem.hpp @@ -28,16 +28,16 @@ class GuardianPreAIStepSystem { public: /** - * @symbol ?createSystem\@GuardianPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@GuardianPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doGuardianPreAIStepSystem\@GuardianPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doGuardianPreAIStepSystem\@GuardianPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doGuardianPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp index e20c520b73..141207d165 100644 --- a/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/GuiDataPickItemPacket.hpp @@ -30,37 +30,43 @@ class GuiDataPickItemPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~GuiDataPickItemPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@GuiDataPickItemPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@GuiDataPickItemPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@GuiDataPickItemPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@GuiDataPickItemPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@GuiDataPickItemPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@GuiDataPickItemPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@GuiDataPickItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_GUIDATAPICKITEMPACKET /** - * @symbol ??0GuiDataPickItemPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI GuiDataPickItemPacket(); + MCVAPI ~GuiDataPickItemPacket(); +#endif /** - * @symbol ??0GuiDataPickItemPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBH\@Z + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HC_CALL.hpp b/LiteLoader/include/llapi/mc/HC_CALL.hpp index 6a60ff9ec8..46cffe4f45 100644 --- a/LiteLoader/include/llapi/mc/HC_CALL.hpp +++ b/LiteLoader/include/llapi/mc/HC_CALL.hpp @@ -26,8 +26,14 @@ struct HC_CALL { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HC_CALL /** - * @symbol ??0HC_CALL\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~HC_CALL(); +#endif + /** + * @symbol ??0HC_CALL\@\@QEAA\@XZ */ MCAPI HC_CALL(); diff --git a/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp b/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp index 35162234f2..299b30972f 100644 --- a/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp +++ b/LiteLoader/include/llapi/mc/HC_WEBSOCKET.hpp @@ -28,51 +28,51 @@ struct HC_WEBSOCKET { public: /** - * @symbol ?AddRef\@HC_WEBSOCKET\@\@QEAAXXZ + * @symbol ?AddRef\@HC_WEBSOCKET\@\@QEAAXXZ */ MCAPI void AddRef(); /** - * @symbol ?Connect\@HC_WEBSOCKET\@\@QEAAJPEBD0PEAUXAsyncBlock\@\@\@Z + * @symbol ?Connect\@HC_WEBSOCKET\@\@QEAAJPEBD0PEAUXAsyncBlock\@\@\@Z */ MCAPI long Connect(char const *, char const *, struct XAsyncBlock *); /** - * @symbol ?DecRef\@HC_WEBSOCKET\@\@QEAAXXZ + * @symbol ?DecRef\@HC_WEBSOCKET\@\@QEAAXXZ */ MCAPI void DecRef(); /** - * @symbol ?Disconnect\@HC_WEBSOCKET\@\@QEAAJXZ + * @symbol ?Disconnect\@HC_WEBSOCKET\@\@QEAAJXZ */ MCAPI long Disconnect(); /** - * @symbol ?Headers\@HC_WEBSOCKET\@\@QEBAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@V12\@Uhttp_header_compare\@\@V?$http_stl_allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@V12\@\@std\@\@\@\@\@std\@\@XZ + * @symbol ?Headers\@HC_WEBSOCKET\@\@QEBAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@V12\@Uhttp_header_compare\@\@V?$http_stl_allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@V12\@\@std\@\@\@\@\@std\@\@XZ */ MCAPI class std::map, class http_stl_allocator>, class std::basic_string, class http_stl_allocator>, struct http_header_compare, class http_stl_allocator, class http_stl_allocator> const, class std::basic_string, class http_stl_allocator>>>> const & Headers() const; /** - * @symbol ?ProxyDecryptsHttps\@HC_WEBSOCKET\@\@QEBA?B_NXZ + * @symbol ?ProxyDecryptsHttps\@HC_WEBSOCKET\@\@QEBA?B_NXZ */ MCAPI bool const ProxyDecryptsHttps() const; /** - * @symbol ?ProxyUri\@HC_WEBSOCKET\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@XZ + * @symbol ?ProxyUri\@HC_WEBSOCKET\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@XZ */ MCAPI class std::basic_string, class http_stl_allocator> const & ProxyUri() const; /** - * @symbol ?Send\@HC_WEBSOCKET\@\@QEAAJPEBDPEAUXAsyncBlock\@\@\@Z + * @symbol ?Send\@HC_WEBSOCKET\@\@QEAAJPEBDPEAUXAsyncBlock\@\@\@Z */ MCAPI long Send(char const *, struct XAsyncBlock *); /** - * @symbol ?Uri\@HC_WEBSOCKET\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@XZ + * @symbol ?Uri\@HC_WEBSOCKET\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@XZ */ MCAPI class std::basic_string, class http_stl_allocator> const & Uri() const; /** - * @symbol ?BinaryMessageFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@PEBEIPEAX\@Z + * @symbol ?BinaryMessageFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@PEBEIPEAX\@Z */ MCAPI static void BinaryMessageFunc(struct HC_WEBSOCKET *, unsigned char const *, unsigned int, void *); /** - * @symbol ?CloseFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@W4HCWebSocketCloseStatus\@\@PEAX\@Z + * @symbol ?CloseFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@W4HCWebSocketCloseStatus\@\@PEAX\@Z */ MCAPI static void CloseFunc(struct HC_WEBSOCKET *, enum class HCWebSocketCloseStatus, void *); /** - * @symbol ?MessageFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@PEBDPEAX\@Z + * @symbol ?MessageFunc\@HC_WEBSOCKET\@\@SAXPEAU1\@PEBDPEAX\@Z */ MCAPI static void MessageFunc(struct HC_WEBSOCKET *, char const *, void *); diff --git a/LiteLoader/include/llapi/mc/HUDContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/HUDContainerScreenValidator.hpp index 42c571f3f3..0e8364b754 100644 --- a/LiteLoader/include/llapi/mc/HUDContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/HUDContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class HUDContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HUDContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0HUDContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0HUDContainerScreenValidator\@\@QEAA\@XZ */ MCAPI HUDContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HangingActor.hpp b/LiteLoader/include/llapi/mc/HangingActor.hpp index 725d4138ac..7f460a8c25 100644 --- a/LiteLoader/include/llapi/mc/HangingActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingActor.hpp @@ -31,234 +31,240 @@ class HangingActor : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@HangingActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@HangingActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@HangingActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@HangingActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~HangingActor(); + virtual void __unk_vfn_16(); /** - * @vftbl 28 - * @symbol ?move\@HangingActor\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 28 + * @symbol ?move\@HangingActor\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void move(class Vec3 const &); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@HangingActor\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@HangingActor\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 88 - * @symbol ?getBrightness\@HangingActor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?getBrightness\@HangingActor\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@HangingActor\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@HangingActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@HangingActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@HangingActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 234 - * @symbol ?setSize\@HangingActor\@\@UEAAXMM\@Z + * @vftbl 233 + * @symbol ?setSize\@HangingActor\@\@UEAAXMM\@Z */ virtual void setSize(float, float); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@HangingActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@HangingActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@HangingActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@HangingActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@HangingActor\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@HangingActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?setDir\@HangingActor\@\@UEAAXH\@Z + * @vftbl 276 + * @symbol ?setDir\@HangingActor\@\@UEAAXH\@Z */ virtual void setDir(int); /** - * @vftbl 279 - * @symbol ?getWidth\@Painting\@\@UEBAHXZ + * @vftbl 277 + * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getWidth() const = 0; /** - * @vftbl 280 - * @symbol ?getHeight\@Painting\@\@UEBAHXZ + * @vftbl 278 + * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getHeight() const = 0; /** - * @vftbl 281 - * @symbol ?dropItem\@Painting\@\@UEAAXXZ + * @vftbl 279 + * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void dropItem() = 0; /** - * @vftbl 282 - * @symbol ?placeHangingEntity\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@H\@Z + * @vftbl 280 + * @symbol ?placeHangingEntity\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@H\@Z */ virtual bool placeHangingEntity(class BlockSource &, int); /** - * @vftbl 283 - * @symbol ?wouldSurvive\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 281 + * @symbol ?wouldSurvive\@HangingActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool wouldSurvive(class BlockSource &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HANGINGACTOR + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~HangingActor(); +#endif /** - * @symbol ??0HangingActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0HangingActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI HangingActor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getDirection\@HangingActor\@\@QEBAHXZ + * @symbol ?getDirection\@HangingActor\@\@QEBAHXZ */ MCAPI int getDirection() const; //protected: /** - * @symbol ?_calculateAABB\@HangingActor\@\@IEAAXXZ + * @symbol ?_calculateAABB\@HangingActor\@\@IEAAXXZ */ MCAPI void _calculateAABB(); /** - * @symbol ?_calculateActorPositionFromPlacementPosition\@HangingActor\@\@IEAAXAEBVBlockPos\@\@\@Z + * @symbol ?_calculateActorPositionFromPlacementPosition\@HangingActor\@\@IEAAXAEBVBlockPos\@\@\@Z */ MCAPI void _calculateActorPositionFromPlacementPosition(class BlockPos const &); /** - * @symbol ?_wouldSurvive\@HangingActor\@\@IEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_wouldSurvive\@HangingActor\@\@IEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI bool _wouldSurvive(class BlockSource &, class BlockPos const &, bool); //private: /** - * @symbol ?_blockContainsObstruction\@HangingActor\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_blockContainsObstruction\@HangingActor\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _blockContainsObstruction(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?_blockIsObstruction\@HangingActor\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_blockIsObstruction\@HangingActor\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _blockIsObstruction(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?_canSurviveOnBlock\@HangingActor\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_canSurviveOnBlock\@HangingActor\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI bool _canSurviveOnBlock(class BlockSource const &, class BlockPos const &, bool) const; @@ -266,8 +272,8 @@ class HangingActor : public Actor { private: /** - * @symbol ?HANGING_OFFSET\@HangingActor\@\@0MB + * @symbol ?HANGING_OFFSET\@HangingActor\@\@0MB */ MCAPI static float const HANGING_OFFSET; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HangingActorItem.hpp b/LiteLoader/include/llapi/mc/HangingActorItem.hpp index fef0268ea4..25f14f0027 100644 --- a/LiteLoader/include/llapi/mc/HangingActorItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingActorItem.hpp @@ -32,83 +32,83 @@ class HangingActorItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HangingActorItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@HangingActorItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@HangingActorItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0HangingActorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z + * @symbol ??0HangingActorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ActorType\@\@\@Z */ MCAPI HangingActorItem(std::string const &, int, enum class ActorType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HangingRoots.hpp b/LiteLoader/include/llapi/mc/HangingRoots.hpp index 0c28dabbc1..3e17faafd1 100644 --- a/LiteLoader/include/llapi/mc/HangingRoots.hpp +++ b/LiteLoader/include/llapi/mc/HangingRoots.hpp @@ -31,238 +31,243 @@ class HangingRoots : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HangingRoots(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@HangingRoots\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@HangingRoots\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@HangingRoots\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@HangingRoots\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@HangingRoots\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@HangingRoots\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@HangingRoots\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@HangingRoots\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@HangingRoots\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@HangingRoots\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@HangingRoots\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@HangingRoots\@\@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 ??0HangingRoots\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI HangingRoots(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp index e3f6c2b67a..d6de7bae38 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlock.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlock.hpp @@ -30,261 +30,266 @@ class HangingSignBlock : public SignBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HangingSignBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@HangingSignBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@HangingSignBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@HangingSignBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@HangingSignBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@HangingSignBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@HangingSignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@HangingSignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 195 - * @symbol ?_getItemInstance\@HangingSignBlock\@\@MEBA?AVItemInstance\@\@XZ + * @vftbl 196 + * @symbol ?_getItemInstance\@HangingSignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 196 - * @symbol ?_getShape\@HangingSignBlock\@\@MEBAXHAEAVAABB\@\@\@Z + * @vftbl 197 + * @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\@SignBlockActor\@\@\@Z */ MCAPI HangingSignBlock(std::string const &, int, bool, enum class SignBlockActor::SignType); /** - * @symbol ?isDoubleChainHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isDoubleChainHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isDoubleChainHangingSign(class Block const &); /** - * @symbol ?isSideAttachedHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isSideAttachedHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isSideAttachedHangingSign(class Block const &); /** - * @symbol ?isVShapedHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isVShapedHangingSign\@HangingSignBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isVShapedHangingSign(class Block const &); //protected: /** - * @symbol ?_canAttachTo\@HangingSignBlock\@\@IEBA_NAEAVBlockSource\@\@VBlockPos\@\@EE\@Z + * @symbol ?_canAttachTo\@HangingSignBlock\@\@IEBA_NAEAVBlockSource\@\@VBlockPos\@\@EE\@Z */ MCAPI bool _canAttachTo(class BlockSource &, class BlockPos, unsigned char, unsigned char) const; //private: /** - * @symbol ?_isHangingSign\@HangingSignBlock\@\@CA_NAEBVBlock\@\@\@Z + * @symbol ?_isHangingSign\@HangingSignBlock\@\@CA_NAEBVBlock\@\@\@Z */ MCAPI static bool _isHangingSign(class Block const &); @@ -292,4 +297,4 @@ class HangingSignBlock : public SignBlock { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp b/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp index 47ee599492..919e138d64 100644 --- a/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignBlockActor.hpp @@ -29,58 +29,58 @@ class HangingSignBlockActor : public SignBlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HangingSignBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getShadowRadius\@HangingSignBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z + * @vftbl 19 + * @symbol ?getShadowRadius\@HangingSignBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0HangingSignBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0HangingSignBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI HangingSignBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HangingSignItem.hpp b/LiteLoader/include/llapi/mc/HangingSignItem.hpp index df9b7417dc..d056f0002c 100644 --- a/LiteLoader/include/llapi/mc/HangingSignItem.hpp +++ b/LiteLoader/include/llapi/mc/HangingSignItem.hpp @@ -31,105 +31,105 @@ class HangingSignItem : public SignItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HangingSignItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@HangingSignItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@HangingSignItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 133 - * @symbol ?getBlockToPlace\@HangingSignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z + * @vftbl 133 + * @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 + * @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\@SignBlockActor\@\@\@Z */ MCAPI HangingSignItem(std::string const &, int, enum class SignBlockActor::SignType); //private: /** - * @symbol ?_getCeilingHangingSignBlock\@HangingSignItem\@\@AEBAPEBVBlock\@\@AEBVActor\@\@AEBEAEBVBlockPos\@\@\@Z + * @symbol ?_getCeilingHangingSignBlock\@HangingSignItem\@\@AEBAPEBVBlock\@\@AEBVActor\@\@AEBEAEBVBlockPos\@\@\@Z */ MCAPI class Block const * _getCeilingHangingSignBlock(class Actor const &, unsigned char const &, class BlockPos const &) const; /** - * @symbol ?_getWallHangingSignBlock\@HangingSignItem\@\@AEBAPEBVBlock\@\@AEBVActor\@\@AEBEAEBVBlockPos\@\@\@Z + * @symbol ?_getWallHangingSignBlock\@HangingSignItem\@\@AEBAPEBVBlock\@\@AEBVActor\@\@AEBEAEBVBlockPos\@\@\@Z */ MCAPI class Block const * _getWallHangingSignBlock(class Actor const &, unsigned char const &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HardcodedAnimationSystem.hpp b/LiteLoader/include/llapi/mc/HardcodedAnimationSystem.hpp index aed2a81dae..89e4eb3afe 100644 --- a/LiteLoader/include/llapi/mc/HardcodedAnimationSystem.hpp +++ b/LiteLoader/include/llapi/mc/HardcodedAnimationSystem.hpp @@ -28,16 +28,16 @@ class HardcodedAnimationSystem { public: /** - * @symbol ?createSystem\@HardcodedAnimationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@HardcodedAnimationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?doHardcodedAnimation\@HardcodedAnimationSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUMobAnimationComponent\@\@AEBUMobBodyRotationComponent\@\@AEBUMobHurtTimeComponent\@\@AEAUMobWalkAnimationComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UBlazeFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@ULavaSlimeFlag\@\@\@\@\@\@V?$Optional\@$$CBUOnFireComponent\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + * @symbol ?doHardcodedAnimation\@HardcodedAnimationSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUMobAnimationComponent\@\@AEBUMobBodyRotationComponent\@\@AEBUMobHurtTimeComponent\@\@AEAUActorWalkAnimationComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UBlazeFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@ULavaSlimeFlag\@\@\@\@\@\@V?$Optional\@$$CBUOnFireComponent\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ - MCAPI static void doHardcodedAnimation(class StrictEntityContext const &, struct MobAnimationComponent &, struct MobBodyRotationComponent const &, struct MobHurtTimeComponent const &, struct MobWalkAnimationComponent &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, class Optional, class Optional const>); + MCAPI static void doHardcodedAnimation(class StrictEntityContext const &, struct MobAnimationComponent &, struct MobBodyRotationComponent const &, struct MobHurtTimeComponent const &, struct ActorWalkAnimationComponent &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, class Optional, class Optional const>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp b/LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp index 633d3bdcd3..6041721e8d 100644 --- a/LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp +++ b/LiteLoader/include/llapi/mc/HardcodedSpawnAreaRegistry.hpp @@ -29,16 +29,16 @@ class HardcodedSpawnAreaRegistry { public: /** - * @symbol ??0HardcodedSpawnAreaRegistry\@\@QEAA\@XZ + * @symbol ??0HardcodedSpawnAreaRegistry\@\@QEAA\@XZ */ MCAPI HardcodedSpawnAreaRegistry(); /** - * @symbol ?getMobSpawnsForType\@HardcodedSpawnAreaRegistry\@\@QEBAAEBV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@W4HardcodedSpawnAreaType\@\@\@Z + * @symbol ?getMobSpawnsForType\@HardcodedSpawnAreaRegistry\@\@QEBAAEBV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@W4HardcodedSpawnAreaType\@\@\@Z */ MCAPI std::vector const & getMobSpawnsForType(enum class HardcodedSpawnAreaType) const; /** - * @symbol ?initMobSpawnsForType\@HardcodedSpawnAreaRegistry\@\@QEAAXW4HardcodedSpawnAreaType\@\@$$QEAV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?initMobSpawnsForType\@HardcodedSpawnAreaRegistry\@\@QEAAXW4HardcodedSpawnAreaType\@\@$$QEAV?$vector\@VMobSpawnerData\@\@V?$allocator\@VMobSpawnerData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void initMobSpawnsForType(enum class HardcodedSpawnAreaType, std::vector &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HarvestFarmBlockDefinition.hpp b/LiteLoader/include/llapi/mc/HarvestFarmBlockDefinition.hpp index dc8cef4458..4c940099bb 100644 --- a/LiteLoader/include/llapi/mc/HarvestFarmBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HarvestFarmBlockDefinition.hpp @@ -30,16 +30,16 @@ class HarvestFarmBlockDefinition { public: /** - * @symbol ??0HarvestFarmBlockDefinition\@\@QEAA\@XZ + * @symbol ??0HarvestFarmBlockDefinition\@\@QEAA\@XZ */ MCAPI HarvestFarmBlockDefinition(); /** - * @symbol ?initialize\@HarvestFarmBlockDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHarvestFarmBlockGoal\@\@\@Z + * @symbol ?initialize\@HarvestFarmBlockDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHarvestFarmBlockGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class HarvestFarmBlockGoal &) const; /** - * @symbol ?buildSchema\@HarvestFarmBlockDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHarvestFarmBlockDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@HarvestFarmBlockDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHarvestFarmBlockDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp b/LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp index 7b7b2d7b5d..9e79491b5e 100644 --- a/LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/HarvestFarmBlockGoal.hpp @@ -31,71 +31,71 @@ class HarvestFarmBlockGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HarvestFarmBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@HarvestFarmBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@HarvestFarmBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@HarvestFarmBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@HarvestFarmBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@HarvestFarmBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@HarvestFarmBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@HarvestFarmBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@HarvestFarmBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@HarvestFarmBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@HarvestFarmBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@HarvestFarmBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@HarvestFarmBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@HarvestFarmBlockGoal\@\@MEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@HarvestFarmBlockGoal\@\@MEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @symbol ??0HarvestFarmBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0HarvestFarmBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI HarvestFarmBlockGoal(class Mob &); //protected: /** - * @symbol ?trySowCrop\@HarvestFarmBlockGoal\@\@IEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?trySowCrop\@HarvestFarmBlockGoal\@\@IEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool trySowCrop(class BlockSource &, class BlockPos const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HasItemFilter.hpp b/LiteLoader/include/llapi/mc/HasItemFilter.hpp index 240813d3bc..3a7138caa3 100644 --- a/LiteLoader/include/llapi/mc/HasItemFilter.hpp +++ b/LiteLoader/include/llapi/mc/HasItemFilter.hpp @@ -28,11 +28,11 @@ struct HasItemFilter { public: /** - * @symbol ??0HasItemFilter\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0HasItemFilter\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI HasItemFilter(struct HasItemFilter &&); /** - * @symbol ??1HasItemFilter\@\@QEAA\@XZ + * @symbol ??1HasItemFilter\@\@QEAA\@XZ */ MCAPI ~HasItemFilter(); diff --git a/LiteLoader/include/llapi/mc/HashedString.hpp b/LiteLoader/include/llapi/mc/HashedString.hpp index 9cc5e65552..abbd03e714 100644 --- a/LiteLoader/include/llapi/mc/HashedString.hpp +++ b/LiteLoader/include/llapi/mc/HashedString.hpp @@ -3,7 +3,7 @@ * */ #pragma once -#define AUTO_GENERATED + #include "llapi/Global.h" #define BEFORE_EXTRA @@ -19,11 +19,11 @@ class HashedString { #define AFTER_EXTRA // Add Member There +public: uint64_t hash; std::string str; int64_t unk; -public: //HashedString(HashedString const& hstr) // : str(hstr.getString()) // , unk(0) @@ -134,4 +134,13 @@ class HashedString { */ MCAPI static class HashedString const & getEmptyString(); -}; \ No newline at end of file +}; + +namespace std { + + template <> + struct hash { + std::size_t operator()(HashedString const& str) const noexcept { return str.getHash(); } + }; + +} // namespace std \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HatchetItem.hpp b/LiteLoader/include/llapi/mc/HatchetItem.hpp index ad69c94a7a..4d28557b61 100644 --- a/LiteLoader/include/llapi/mc/HatchetItem.hpp +++ b/LiteLoader/include/llapi/mc/HatchetItem.hpp @@ -33,93 +33,93 @@ class HatchetItem : public DiggerItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HatchetItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @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 + * @vftbl 10 + * @symbol ?executeEvent\@HatchetItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(class ItemStackBase &, std::string const &, class RenderParams &) const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@HatchetItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@HatchetItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@HatchetItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@HatchetItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @symbol ??0HatchetItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z + * @symbol ??0HatchetItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ MCAPI HatchetItem(std::string const &, int, class Item::Tier const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HayBlockBlock.hpp b/LiteLoader/include/llapi/mc/HayBlockBlock.hpp index c59cb40dae..97b7a1ff03 100644 --- a/LiteLoader/include/llapi/mc/HayBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/HayBlockBlock.hpp @@ -31,208 +31,213 @@ class HayBlockBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HayBlockBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@HayBlockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@HayBlockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@HayBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@HayBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@HayBlockBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@HayBlockBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0HayBlockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0HayBlockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI HayBlockBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HealableComponent.hpp b/LiteLoader/include/llapi/mc/HealableComponent.hpp index 3800a37b4c..e62bc2ee7a 100644 --- a/LiteLoader/include/llapi/mc/HealableComponent.hpp +++ b/LiteLoader/include/llapi/mc/HealableComponent.hpp @@ -30,20 +30,20 @@ class HealableComponent { public: /** - * @symbol ?getInteraction\@HealableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@HealableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); //private: /** - * @symbol ?_useFeedItem\@HealableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@AEBUFeedItem\@\@\@Z + * @symbol ?_useFeedItem\@HealableComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@AEBUFeedItem\@\@\@Z */ MCAPI void _useFeedItem(class Actor &, class Player &, struct FeedItem const &); /** - * @symbol ?_canHeal\@HealableComponent\@\@CA_NAEAVActor\@\@AEBVItemStack\@\@PEBVHealableDefinition\@\@\@Z + * @symbol ?_canHeal\@HealableComponent\@\@CA_NAEAVActor\@\@AEBVItemStack\@\@PEBVHealableDefinition\@\@\@Z */ MCAPI static bool _canHeal(class Actor &, class ItemStack const &, class HealableDefinition const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HealableDefinition.hpp b/LiteLoader/include/llapi/mc/HealableDefinition.hpp index cea7d6de4d..b552763366 100644 --- a/LiteLoader/include/llapi/mc/HealableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HealableDefinition.hpp @@ -30,20 +30,20 @@ class HealableDefinition { public: /** - * @symbol ??0HealableDefinition\@\@QEAA\@XZ + * @symbol ??0HealableDefinition\@\@QEAA\@XZ */ MCAPI HealableDefinition(); /** - * @symbol ?addFeedItem\@HealableDefinition\@\@QEAAXAEBUFeedItem\@\@\@Z + * @symbol ?addFeedItem\@HealableDefinition\@\@QEAAXAEBUFeedItem\@\@\@Z */ MCAPI void addFeedItem(struct FeedItem const &); /** - * @symbol ?addFeedItemByName\@HealableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addFeedItemByName\@HealableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addFeedItemByName(std::string const &); /** - * @symbol ?buildSchema\@HealableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHealableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@HealableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHealableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp b/LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp index e76e20ac51..63a14232d2 100644 --- a/LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp +++ b/LiteLoader/include/llapi/mc/HealthAttributeDelegate.hpp @@ -30,38 +30,38 @@ class HealthAttributeDelegate { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HealthAttributeDelegate(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@HealthAttributeDelegate\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@HealthAttributeDelegate\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?willChange\@HealthAttributeDelegate\@\@UEAA_NMMAEBVAttributeBuff\@\@\@Z + * @vftbl 3 + * @symbol ?willChange\@HealthAttributeDelegate\@\@UEAA_NMMAEBVAttributeBuff\@\@\@Z */ virtual bool willChange(float, float, class AttributeBuff const &); /** - * @vftbl 4 - * @symbol ?change\@HealthAttributeDelegate\@\@UEAAMMMAEBVAttributeBuff\@\@\@Z + * @vftbl 4 + * @symbol ?change\@HealthAttributeDelegate\@\@UEAAMMMAEBVAttributeBuff\@\@\@Z */ virtual float change(float, float, class AttributeBuff const &); /** - * @vftbl 5 - * @symbol ?getBuffValueWithModifiers\@HealthAttributeDelegate\@\@UEBAMAEBVAttributeBuff\@\@\@Z + * @vftbl 5 + * @symbol ?getBuffValueWithModifiers\@HealthAttributeDelegate\@\@UEBAMAEBVAttributeBuff\@\@\@Z */ virtual float getBuffValueWithModifiers(class AttributeBuff const &) const; /** - * @symbol ??0HealthAttributeDelegate\@\@QEAA\@AEBVAttributeInstance\@\@PEAVMob\@\@\@Z + * @symbol ??0HealthAttributeDelegate\@\@QEAA\@AEBVAttributeInstance\@\@PEAVMob\@\@\@Z */ MCAPI HealthAttributeDelegate(class AttributeInstance const &, class Mob *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HeartbeatComponentInternal.hpp b/LiteLoader/include/llapi/mc/HeartbeatComponentInternal.hpp index f47158697b..702743f6ed 100644 --- a/LiteLoader/include/llapi/mc/HeartbeatComponentInternal.hpp +++ b/LiteLoader/include/llapi/mc/HeartbeatComponentInternal.hpp @@ -20,15 +20,15 @@ namespace HeartbeatComponentInternal { #undef AFTER_EXTRA /** - * @symbol ?INTERVAL_KEY\@HeartbeatComponentInternal\@\@3PEBDEB + * @symbol ?INTERVAL_KEY\@HeartbeatComponentInternal\@\@3PEBDEB */ MCAPI extern char const * INTERVAL_KEY; /** - * @symbol ?SOUND_EVENT_DEFAULT_VALUE\@HeartbeatComponentInternal\@\@3PEBDEB + * @symbol ?SOUND_EVENT_DEFAULT_VALUE\@HeartbeatComponentInternal\@\@3PEBDEB */ MCAPI extern char const * SOUND_EVENT_DEFAULT_VALUE; /** - * @symbol ?SOUND_EVENT_KEY\@HeartbeatComponentInternal\@\@3PEBDEB + * @symbol ?SOUND_EVENT_KEY\@HeartbeatComponentInternal\@\@3PEBDEB */ MCAPI extern char const * SOUND_EVENT_KEY; diff --git a/LiteLoader/include/llapi/mc/HeartbeatDefinition.hpp b/LiteLoader/include/llapi/mc/HeartbeatDefinition.hpp index f5c2020fb6..f4ec2f31e8 100644 --- a/LiteLoader/include/llapi/mc/HeartbeatDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HeartbeatDefinition.hpp @@ -29,12 +29,12 @@ class HeartbeatDefinition { public: /** - * @symbol ?initialize\@HeartbeatDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHeartbeatServerComponent\@\@\@Z + * @symbol ?initialize\@HeartbeatDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHeartbeatServerComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class HeartbeatServerComponent &) const; /** - * @symbol ?buildSchema\@HeartbeatDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHeartbeatDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@HeartbeatDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHeartbeatDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HeartbeatServerComponent.hpp b/LiteLoader/include/llapi/mc/HeartbeatServerComponent.hpp index 4a6530bb18..8a9fe5792e 100644 --- a/LiteLoader/include/llapi/mc/HeartbeatServerComponent.hpp +++ b/LiteLoader/include/llapi/mc/HeartbeatServerComponent.hpp @@ -28,12 +28,12 @@ class HeartbeatServerComponent { public: /** - * @symbol ??0HeartbeatServerComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0HeartbeatServerComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI HeartbeatServerComponent(class HeartbeatServerComponent &&); /** - * @symbol ??1HeartbeatServerComponent\@\@QEAA\@XZ + * @symbol ??1HeartbeatServerComponent\@\@QEAA\@XZ */ MCAPI ~HeartbeatServerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HeartbeatServerSystem.hpp b/LiteLoader/include/llapi/mc/HeartbeatServerSystem.hpp index 5c2f284e4e..b9030ed4a5 100644 --- a/LiteLoader/include/llapi/mc/HeartbeatServerSystem.hpp +++ b/LiteLoader/include/llapi/mc/HeartbeatServerSystem.hpp @@ -28,19 +28,19 @@ class HeartbeatServerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HeartbeatServerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@HeartbeatServerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HeartbeatServerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HeavyBlock.hpp b/LiteLoader/include/llapi/mc/HeavyBlock.hpp index 13fdc6037b..0aaae009e3 100644 --- a/LiteLoader/include/llapi/mc/HeavyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HeavyBlock.hpp @@ -31,265 +31,274 @@ class HeavyBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HeavyBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @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 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getDustColor\@TopSnowBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getDustColor\@SuspiciousSandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const = 0; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@TopSnowBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 195 + * @symbol ?getDustParticleName\@SuspiciousSandBlock\@\@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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @vftbl 196 - * @symbol ?onLand\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 197 + * @symbol ?onLand\@HeavyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 197 - * @symbol ?isFreeToFall\@HeavyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 198 + * @symbol ?isFreeToFall\@HeavyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 - * @symbol ?startFalling\@HeavyBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z + * @vftbl 199 + * @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 + * @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 + * @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 + * @symbol ?triggerFallCheck\@HeavyBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void triggerFallCheck(class BlockSource &, class BlockPos const &) const; //protected: /** - * @symbol ?_tickBlocksAround2D\@HeavyBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @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 + * @symbol ?checkSlide\@HeavyBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void checkSlide(class BlockSource &, class BlockPos const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp b/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp index 7d0d38ed51..ca2237a13f 100644 --- a/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp +++ b/LiteLoader/include/llapi/mc/HeightmapWrapper.hpp @@ -28,16 +28,16 @@ class HeightmapWrapper { public: /** - * @symbol ?empty\@HeightmapWrapper\@\@QEBA_NXZ + * @symbol ?empty\@HeightmapWrapper\@\@QEBA_NXZ */ MCAPI bool empty() const; /** - * @symbol ?getHeightAt\@HeightmapWrapper\@\@QEBAFAEBVPos\@\@\@Z + * @symbol ?getHeightAt\@HeightmapWrapper\@\@QEBAFAEBVPos\@\@\@Z */ MCAPI short getHeightAt(class Pos const &) const; /** - * @symbol ?create\@HeightmapWrapper\@\@SA?AV1\@PEBV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@F\@Z + * @symbol ?create\@HeightmapWrapper\@\@SA?AV1\@PEBV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@F\@Z */ MCAPI static class HeightmapWrapper create(std::vector const *, short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HellCaveFeature.hpp b/LiteLoader/include/llapi/mc/HellCaveFeature.hpp index 0da91f5dc4..c47278f69d 100644 --- a/LiteLoader/include/llapi/mc/HellCaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/HellCaveFeature.hpp @@ -32,29 +32,29 @@ class HellCaveFeature : public CaveFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HellCaveFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@HellCaveFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@HellCaveFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?addRoom\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?addRoom\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addRoom(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, class RenderParams &, struct CaveFeatureUtils::CarvingParameters const &, std::vector &) const; /** - * @vftbl 4 - * @symbol ?addTunnel\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMMHHMAEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?addTunnel\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@MMMHHMAEAVRenderParams\@\@AEBUCarvingParameters\@4\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addTunnel(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, float, float, float, int, int, float, class RenderParams &, struct CaveFeatureUtils::CarvingParameters const &, std::vector &) const; /** - * @vftbl 6 - * @symbol ?addFeature\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBVChunkPos\@\@AEAVRandom\@\@1AEAVRenderParams\@\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 6 + * @symbol ?addFeature\@HellCaveFeature\@\@MEBAXAEAVIBlockWorldGenAPI\@\@AEBVChunkPos\@\@AEAVRandom\@\@1AEAVRenderParams\@\@AEAV?$vector\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@V?$allocator\@UCarveEllipsoidParams\@CachedMetaData\@CaveFeature\@\@\@std\@\@\@std\@\@\@Z */ virtual void addFeature(class IBlockWorldGenAPI &, class ChunkPos const &, class Random &, class ChunkPos const &, class RenderParams &, std::vector &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HellFireFeature.hpp b/LiteLoader/include/llapi/mc/HellFireFeature.hpp index f7a794df7f..529ac73e48 100644 --- a/LiteLoader/include/llapi/mc/HellFireFeature.hpp +++ b/LiteLoader/include/llapi/mc/HellFireFeature.hpp @@ -31,14 +31,20 @@ class HellFireFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HellFireFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@HellFireFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@HellFireFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HELLFIREFEATURE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~HellFireFeature(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HellSpringFeature.hpp b/LiteLoader/include/llapi/mc/HellSpringFeature.hpp index 911e9a84ca..f036e05521 100644 --- a/LiteLoader/include/llapi/mc/HellSpringFeature.hpp +++ b/LiteLoader/include/llapi/mc/HellSpringFeature.hpp @@ -31,18 +31,24 @@ class HellSpringFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HellSpringFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@HellSpringFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@HellSpringFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HELLSPRINGFEATURE /** - * @symbol ??0HellSpringFeature\@\@QEAA\@AEBVBlock\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~HellSpringFeature(); +#endif + /** + * @symbol ??0HellSpringFeature\@\@QEAA\@AEBVBlock\@\@_N\@Z */ MCAPI HellSpringFeature(class Block const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HelpCommand.hpp b/LiteLoader/include/llapi/mc/HelpCommand.hpp index 3544adf877..b17ed24163 100644 --- a/LiteLoader/include/llapi/mc/HelpCommand.hpp +++ b/LiteLoader/include/llapi/mc/HelpCommand.hpp @@ -31,30 +31,30 @@ class HelpCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HelpCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@HelpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@HelpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@HelpCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@HelpCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?getCommandHelp\@HelpCommand\@\@AEBAXAEBVCommandRegistry\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?getCommandHelp\@HelpCommand\@\@AEBAXAEBVCommandRegistry\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void getCommandHelp(class CommandRegistry const &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?getHelpPage\@HelpCommand\@\@AEBAXAEBVCommandRegistry\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?getHelpPage\@HelpCommand\@\@AEBAXAEBVCommandRegistry\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void getHelpPage(class CommandRegistry const &, class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HideComponent.hpp b/LiteLoader/include/llapi/mc/HideComponent.hpp index 8ecc1a6b0c..ec3420231a 100644 --- a/LiteLoader/include/llapi/mc/HideComponent.hpp +++ b/LiteLoader/include/llapi/mc/HideComponent.hpp @@ -29,40 +29,40 @@ class HideComponent { public: /** - * @symbol ??0HideComponent\@\@QEAA\@XZ + * @symbol ??0HideComponent\@\@QEAA\@XZ */ MCAPI HideComponent(); /** - * @symbol ?addAdditionalSaveData\@HideComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@HideComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?initFromDefinition\@HideComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@HideComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?isInRaid\@HideComponent\@\@QEAA_NXZ + * @symbol ?isInRaid\@HideComponent\@\@QEAA_NXZ */ MCAPI bool isInRaid(); /** - * @symbol ?isReactingToBell\@HideComponent\@\@QEAA_NXZ + * @symbol ?isReactingToBell\@HideComponent\@\@QEAA_NXZ */ MCAPI bool isReactingToBell(); /** - * @symbol ?readAdditionalSaveData\@HideComponent\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@HideComponent\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setInRaid\@HideComponent\@\@QEAAXXZ + * @symbol ?setInRaid\@HideComponent\@\@QEAAXXZ */ MCAPI void setInRaid(); /** - * @symbol ?setNotHiding\@HideComponent\@\@QEAAXXZ + * @symbol ?setNotHiding\@HideComponent\@\@QEAAXXZ */ MCAPI void setNotHiding(); /** - * @symbol ?setReactingToBell\@HideComponent\@\@QEAAXXZ + * @symbol ?setReactingToBell\@HideComponent\@\@QEAAXXZ */ MCAPI void setReactingToBell(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HideDescription.hpp b/LiteLoader/include/llapi/mc/HideDescription.hpp index 4e37e53392..94705696f9 100644 --- a/LiteLoader/include/llapi/mc/HideDescription.hpp +++ b/LiteLoader/include/llapi/mc/HideDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class HideDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@HideDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@HideDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~HideDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HIDEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@HideDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~HideDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HideGoal.hpp b/LiteLoader/include/llapi/mc/HideGoal.hpp index 3dcab91162..6330646cb5 100644 --- a/LiteLoader/include/llapi/mc/HideGoal.hpp +++ b/LiteLoader/include/llapi/mc/HideGoal.hpp @@ -31,71 +31,71 @@ class HideGoal : public MoveToPOIGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HideGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@HideGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@HideGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@HideGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@HideGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@HideGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@HideGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@HideGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@HideGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@HideGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@HideGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 16 - * @symbol ?_getRepathTime\@HideGoal\@\@MEBA_KXZ + * @vftbl 16 + * @symbol ?_getRepathTime\@HideGoal\@\@MEBA_KXZ */ virtual unsigned __int64 _getRepathTime() const; /** - * @vftbl 17 - * @symbol ?_getOwnedPOI\@HideGoal\@\@MEBA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@W4POIType\@\@\@Z + * @vftbl 17 + * @symbol ?_getOwnedPOI\@HideGoal\@\@MEBA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@W4POIType\@\@\@Z */ virtual class std::weak_ptr _getOwnedPOI(enum class POIType) const; /** - * @symbol ??0HideGoal\@\@QEAA\@AEAVMob\@\@MMMW4POIType\@\@\@Z + * @symbol ??0HideGoal\@\@QEAA\@AEAVMob\@\@MMMW4POIType\@\@\@Z */ MCAPI HideGoal(class Mob &, float, float, float, enum class POIType); //private: /** - * @symbol ?_sendSoundTheAlarmAchievement\@HideGoal\@\@AEBAXXZ + * @symbol ?_sendSoundTheAlarmAchievement\@HideGoal\@\@AEBAXXZ */ MCAPI void _sendSoundTheAlarmAchievement() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HitDetection.hpp b/LiteLoader/include/llapi/mc/HitDetection.hpp index 1be370e8d5..1bc7fad9dd 100644 --- a/LiteLoader/include/llapi/mc/HitDetection.hpp +++ b/LiteLoader/include/llapi/mc/HitDetection.hpp @@ -22,7 +22,7 @@ namespace HitDetection { #undef AFTER_EXTRA /** - * @symbol ?searchActors\@HitDetection\@\@YAXAEBVVec3\@\@M0AEBVAABB\@\@PEAVActor\@\@PEAVPlayer\@\@AEAMAEAPEAV4\@AEAV2\@_N\@Z + * @symbol ?searchActors\@HitDetection\@\@YAXAEBVVec3\@\@M0AEBVAABB\@\@PEAVActor\@\@PEAVPlayer\@\@AEAMAEAPEAV4\@AEAV2\@_N\@Z */ MCAPI void searchActors(class Vec3 const &, float, class Vec3 const &, class AABB const &, class Actor *, class Player *, float &, class Actor *&, class Vec3 &, bool); diff --git a/LiteLoader/include/llapi/mc/HitResult.hpp b/LiteLoader/include/llapi/mc/HitResult.hpp index 4ff0ab2402..c19dbd2f62 100644 --- a/LiteLoader/include/llapi/mc/HitResult.hpp +++ b/LiteLoader/include/llapi/mc/HitResult.hpp @@ -68,52 +68,52 @@ class HitResult { #undef AFTER_EXTRA public: /** - * @symbol ??0HitResult\@\@QEAA\@XZ + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@\@Z */ - MCAPI HitResult(); + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBV0\@\@Z */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &); + MCAPI HitResult(class HitResult const &); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@\@Z + * @symbol ??0HitResult\@\@QEAA\@XZ */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &); + MCAPI HitResult(); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEAVActor\@\@0\@Z */ MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Actor &, class Vec3 const &); /** - * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@00\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@0AEBVBlockPos\@\@E0\@Z */ - MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &); + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class BlockPos const &, unsigned char, class Vec3 const &); /** - * @symbol ??0HitResult\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0HitResult\@\@QEAA\@AEBVVec3\@\@00\@Z */ - MCAPI HitResult(class HitResult &&); + MCAPI HitResult(class Vec3 const &, class Vec3 const &, class Vec3 const &); /** - * @symbol ??0HitResult\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0HitResult\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI HitResult(class HitResult const &); + MCAPI HitResult(class HitResult &&); /** - * @symbol ?distanceTo\@HitResult\@\@QEBAMAEBVActor\@\@\@Z + * @symbol ?distanceTo\@HitResult\@\@QEBAMAEBVActor\@\@\@Z */ MCAPI float distanceTo(class Actor const &) const; /** - * @symbol ?getEntity\@HitResult\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getEntity\@HitResult\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getEntity() const; /** - * @symbol ??4HitResult\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4HitResult\@\@QEAAAEAV0\@AEBV0\@\@Z */ - MCAPI class HitResult & operator=(class HitResult &&); + MCAPI class HitResult & operator=(class HitResult const &); /** - * @symbol ??4HitResult\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4HitResult\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ - MCAPI class HitResult & operator=(class HitResult const &); + MCAPI class HitResult & operator=(class HitResult &&); /** - * @symbol ??1HitResult\@\@QEAA\@XZ + * @symbol ??1HitResult\@\@QEAA\@XZ */ MCAPI ~HitResult(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HitboxComponent.hpp b/LiteLoader/include/llapi/mc/HitboxComponent.hpp index b088fa4211..0933839e95 100644 --- a/LiteLoader/include/llapi/mc/HitboxComponent.hpp +++ b/LiteLoader/include/llapi/mc/HitboxComponent.hpp @@ -29,28 +29,28 @@ class HitboxComponent { public: /** - * @symbol ??0HitboxComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0HitboxComponent\@\@QEAA\@AEBV0\@\@Z */ MCAPI HitboxComponent(class HitboxComponent const &); /** - * @symbol ?addAdditionalSaveData\@HitboxComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@HitboxComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?fromCompoundTag\@HitboxComponent\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?fromCompoundTag\@HitboxComponent\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void fromCompoundTag(class CompoundTag const &); /** - * @symbol ??4HitboxComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4HitboxComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class HitboxComponent & operator=(class HitboxComponent &&); /** - * @symbol ?toCompoundTag\@HitboxComponent\@\@QEAAXAEAVCompoundTag\@\@\@Z + * @symbol ?toCompoundTag\@HitboxComponent\@\@QEAAXAEAVCompoundTag\@\@\@Z */ MCAPI void toCompoundTag(class CompoundTag &); /** - * @symbol ??1HitboxComponent\@\@QEAA\@XZ + * @symbol ??1HitboxComponent\@\@QEAA\@XZ */ MCAPI ~HitboxComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HitboxDefinition.hpp b/LiteLoader/include/llapi/mc/HitboxDefinition.hpp index ee169771ca..108e3528fb 100644 --- a/LiteLoader/include/llapi/mc/HitboxDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HitboxDefinition.hpp @@ -31,16 +31,16 @@ class HitboxDefinition { public: /** - * @symbol ?addAABB\@HitboxDefinition\@\@QEAAXAEBUHitboxJson\@\@\@Z + * @symbol ?addAABB\@HitboxDefinition\@\@QEAAXAEBUHitboxJson\@\@\@Z */ MCAPI void addAABB(struct HitboxJson const &); /** - * @symbol ?initialize\@HitboxDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHitboxComponent\@\@\@Z + * @symbol ?initialize\@HitboxDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHitboxComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class HitboxComponent &) const; /** - * @symbol ?buildSchema\@HitboxDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHitboxDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@HitboxDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHitboxDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoeItem.hpp b/LiteLoader/include/llapi/mc/HoeItem.hpp index 87fdb24d4f..c75e621848 100644 --- a/LiteLoader/include/llapi/mc/HoeItem.hpp +++ b/LiteLoader/include/llapi/mc/HoeItem.hpp @@ -33,88 +33,88 @@ class HoeItem : public DiggerItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoeItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @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 + * @vftbl 10 + * @symbol ?executeEvent\@HoeItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(class ItemStackBase &, std::string const &, class RenderParams &) const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@HoeItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@HoeItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @symbol ??0HoeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@AEBVExperiments\@\@\@Z + * @symbol ??0HoeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@AEBVExperiments\@\@\@Z */ MCAPI HoeItem(std::string const &, int, class Item::Tier const &, class Experiments const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoldBlockSystem.hpp b/LiteLoader/include/llapi/mc/HoldBlockSystem.hpp index 8c63e840c7..d9a00b80fd 100644 --- a/LiteLoader/include/llapi/mc/HoldBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/HoldBlockSystem.hpp @@ -30,27 +30,27 @@ class HoldBlockSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoldBlockSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?registerEvents\@HoldBlockSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z + * @vftbl 1 + * @symbol ?registerEvents\@HoldBlockSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z */ virtual void registerEvents(class entt::basic_dispatcher> &); /** - * @vftbl 2 - * @symbol ?tick\@HoldBlockSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HoldBlockSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_holdBlockSystemOnActorDie\@HoldBlockSystem\@\@CAXAEAUActorDieEvent\@\@\@Z + * @symbol ?_holdBlockSystemOnActorDie\@HoldBlockSystem\@\@CAXAEAUActorDieEvent\@\@\@Z */ MCAPI static void _holdBlockSystemOnActorDie(struct ActorDieEvent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoldGroundGoal.hpp b/LiteLoader/include/llapi/mc/HoldGroundGoal.hpp index 4d9e43a451..50e256a739 100644 --- a/LiteLoader/include/llapi/mc/HoldGroundGoal.hpp +++ b/LiteLoader/include/llapi/mc/HoldGroundGoal.hpp @@ -30,48 +30,48 @@ class HoldGroundGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoldGroundGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@HoldGroundGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@HoldGroundGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@HoldGroundGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@HoldGroundGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@HoldGroundGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@HoldGroundGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@HoldGroundGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@HoldGroundGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@HoldGroundGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@HoldGroundGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@HoldGroundGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@HoldGroundGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0HoldGroundGoal\@\@QEAA\@AEAVMob\@\@M_NMAEBVActorDefinitionTrigger\@\@\@Z + * @symbol ??0HoldGroundGoal\@\@QEAA\@AEAVMob\@\@M_NMAEBVActorDefinitionTrigger\@\@\@Z */ MCAPI HoldGroundGoal(class Mob &, float, bool, float, class ActorDefinitionTrigger const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HomeComponent.hpp b/LiteLoader/include/llapi/mc/HomeComponent.hpp index 4782a78178..4e0e3ce8c4 100644 --- a/LiteLoader/include/llapi/mc/HomeComponent.hpp +++ b/LiteLoader/include/llapi/mc/HomeComponent.hpp @@ -29,52 +29,52 @@ class HomeComponent { public: /** - * @symbol ??0HomeComponent\@\@QEAA\@XZ + * @symbol ??0HomeComponent\@\@QEAA\@XZ */ MCAPI HomeComponent(); /** - * @symbol ?addAdditionalSaveData\@HomeComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@HomeComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getHomeDimension\@HomeComponent\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getHomeDimension\@HomeComponent\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID getHomeDimension() const; /** - * @symbol ?getHomePos\@HomeComponent\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getHomePos\@HomeComponent\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getHomePos() const; /** - * @symbol ?getRestrictionRadius\@HomeComponent\@\@QEBAHXZ + * @symbol ?getRestrictionRadius\@HomeComponent\@\@QEBAHXZ */ MCAPI int getRestrictionRadius() const; /** - * @symbol ?hasRestriction\@HomeComponent\@\@QEBA_NXZ + * @symbol ?hasRestriction\@HomeComponent\@\@QEBA_NXZ */ MCAPI bool hasRestriction() const; /** - * @symbol ?hasValidHomePos\@HomeComponent\@\@QEBA_NXZ + * @symbol ?hasValidHomePos\@HomeComponent\@\@QEBA_NXZ */ MCAPI bool hasValidHomePos() const; /** - * @symbol ?isWithinRestriction\@HomeComponent\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?isWithinRestriction\@HomeComponent\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isWithinRestriction(class BlockPos const &) const; /** - * @symbol ??4HomeComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4HomeComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class HomeComponent & operator=(class HomeComponent &&); /** - * @symbol ?readAdditionalSaveData\@HomeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@HomeComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setHome\@HomeComponent\@\@QEAAXAEBVBlockPos\@\@AEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?setHome\@HomeComponent\@\@QEAAXAEBVBlockPos\@\@AEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void setHome(class BlockPos const &, class AutomaticID const &); /** - * @symbol ?tick\@HomeComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?tick\@HomeComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void tick(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HomeDefinition.hpp b/LiteLoader/include/llapi/mc/HomeDefinition.hpp index 75ab7ca0be..47308a149e 100644 --- a/LiteLoader/include/llapi/mc/HomeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HomeDefinition.hpp @@ -30,16 +30,16 @@ class HomeDefinition { public: /** - * @symbol ??0HomeDefinition\@\@QEAA\@XZ + * @symbol ??0HomeDefinition\@\@QEAA\@XZ */ MCAPI HomeDefinition(); /** - * @symbol ?initialize\@HomeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHomeComponent\@\@\@Z + * @symbol ?initialize\@HomeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVHomeComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class HomeComponent &) const; /** - * @symbol ?buildSchema\@HomeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHomeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@HomeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHomeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HomeSystem.hpp b/LiteLoader/include/llapi/mc/HomeSystem.hpp index 68d4599f92..34f38168ad 100644 --- a/LiteLoader/include/llapi/mc/HomeSystem.hpp +++ b/LiteLoader/include/llapi/mc/HomeSystem.hpp @@ -30,27 +30,27 @@ class HomeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HomeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@HomeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HomeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@HomeSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVHomeComponent\@\@\@Z + * @symbol ?_tickComponent\@HomeSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVHomeComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class HomeComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoneyBlock.hpp b/LiteLoader/include/llapi/mc/HoneyBlock.hpp index e546e3acfb..15a9037503 100644 --- a/LiteLoader/include/llapi/mc/HoneyBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneyBlock.hpp @@ -31,227 +31,232 @@ class HoneyBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoneyBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@HoneyBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@HoneyBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@HoneyBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@HoneyBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 164 - * @symbol ?onStandOn\@HoneyBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@HoneyBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@HoneyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 181 - * @symbol ?getExtraRenderLayers\@HoneyBlock\@\@UEBAHXZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 182 + * @symbol ?getExtraRenderLayers\@HoneyBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0HoneyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0HoneyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI HoneyBlock(std::string const &, int, class Material const &); /** - * @symbol ?triggerSlidingDownEffects\@HoneyBlock\@\@SAXAEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?triggerSlidingDownEffects\@HoneyBlock\@\@SAXAEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI static void triggerSlidingDownEffects(class Actor &, class BlockPos const &, class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp index 6f80028004..a56e696b96 100644 --- a/LiteLoader/include/llapi/mc/HoneycombBlock.hpp +++ b/LiteLoader/include/llapi/mc/HoneycombBlock.hpp @@ -31,193 +31,198 @@ class HoneycombBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoneycombBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0HoneycombBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0HoneycombBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI HoneycombBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HopMoveControl.hpp b/LiteLoader/include/llapi/mc/HopMoveControl.hpp index 0fda259a78..513fde6c5c 100644 --- a/LiteLoader/include/llapi/mc/HopMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/HopMoveControl.hpp @@ -30,23 +30,23 @@ class HopMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HopMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@HopMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HopMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?setWantedPosition\@HopMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z + * @vftbl 3 + * @symbol ?setWantedPosition\@HopMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z */ virtual void setWantedPosition(class MoveControlComponent &, class Mob &, class Vec3 const &, float); /** - * @symbol ??0HopMoveControl\@\@QEAA\@XZ + * @symbol ??0HopMoveControl\@\@QEAA\@XZ */ MCAPI HopMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Hopper.hpp b/LiteLoader/include/llapi/mc/Hopper.hpp index 1b64539d4d..216e0f3146 100644 --- a/LiteLoader/include/llapi/mc/Hopper.hpp +++ b/LiteLoader/include/llapi/mc/Hopper.hpp @@ -20,6 +20,11 @@ class Hopper { #define AFTER_EXTRA // Add Member There +public: + inline bool isEntity() { + return dAccess(this, 5); + } + #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_HOPPER public: @@ -30,79 +35,79 @@ class Hopper { public: /** - * @symbol ??0Hopper\@\@QEAA\@H_N\@Z + * @symbol ??0Hopper\@\@QEAA\@H_N\@Z */ MCAPI Hopper(int, bool); /** - * @symbol ?getCooldownTime\@Hopper\@\@QEBAHXZ + * @symbol ?getCooldownTime\@Hopper\@\@QEBAHXZ */ MCAPI int getCooldownTime() const; /** - * @symbol ?isOnCooldown\@Hopper\@\@QEBA_NXZ + * @symbol ?isOnCooldown\@Hopper\@\@QEBA_NXZ */ MCAPI bool isOnCooldown() const; /** - * @symbol ?setCooldownTime\@Hopper\@\@QEAAXH\@Z + * @symbol ?setCooldownTime\@Hopper\@\@QEAAXH\@Z */ MCAPI void setCooldownTime(int); //protected: /** - * @symbol ?_addItem\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEAVItemStack\@\@HH\@Z + * @symbol ?_addItem\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEAVItemStack\@\@HH\@Z */ MCAPI bool _addItem(class BlockSource &, class Container &, class ItemStack &, int, int); /** - * @symbol ?_getAttachedContainerInBlock\@Hopper\@\@IEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@H\@Z + * @symbol ?_getAttachedContainerInBlock\@Hopper\@\@IEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@H\@Z */ MCAPI class Container * _getAttachedContainerInBlock(class BlockSource &, class Vec3 const &, int); /** - * @symbol ?_getAttachedContainers\@Hopper\@\@IEAA?AV?$vector\@PEAVContainer\@\@V?$allocator\@PEAVContainer\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@H\@Z + * @symbol ?_getAttachedContainers\@Hopper\@\@IEAA?AV?$vector\@PEAVContainer\@\@V?$allocator\@PEAVContainer\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@H\@Z */ MCAPI std::vector _getAttachedContainers(class BlockSource &, class Vec3 const &, int); /** - * @symbol ?_getContainerInBlock\@Hopper\@\@IEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?_getContainerInBlock\@Hopper\@\@IEAAPEAVContainer\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI class Container * _getContainerInBlock(class BlockSource &, class Vec3 const &); /** - * @symbol ?_getContainersAt\@Hopper\@\@IEAA?AV?$vector\@PEAVContainer\@\@V?$allocator\@PEAVContainer\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?_getContainersAt\@Hopper\@\@IEAA?AV?$vector\@PEAVContainer\@\@V?$allocator\@PEAVContainer\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI std::vector _getContainersAt(class BlockSource &, class Vec3 const &); /** - * @symbol ?_getSourceContainers\@Hopper\@\@IEAA?AV?$vector\@PEAVContainer\@\@V?$allocator\@PEAVContainer\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?_getSourceContainers\@Hopper\@\@IEAA?AV?$vector\@PEAVContainer\@\@V?$allocator\@PEAVContainer\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI std::vector _getSourceContainers(class BlockSource &, class Vec3 const &); /** - * @symbol ?_isEmptyContainer\@Hopper\@\@IEAA_NAEAVContainer\@\@H\@Z + * @symbol ?_isEmptyContainer\@Hopper\@\@IEAA_NAEAVContainer\@\@H\@Z */ MCAPI bool _isEmptyContainer(class Container &, int); /** - * @symbol ?_isFullContainer\@Hopper\@\@IEAA_NAEAVContainer\@\@H\@Z + * @symbol ?_isFullContainer\@Hopper\@\@IEAA_NAEAVContainer\@\@H\@Z */ MCAPI bool _isFullContainer(class Container &, int); /** - * @symbol ?_pushOutItems\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@H\@Z + * @symbol ?_pushOutItems\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@H\@Z */ MCAPI bool _pushOutItems(class BlockSource &, class Container &, class Vec3 const &, int); /** - * @symbol ?_tryMoveItems\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@H_N\@Z + * @symbol ?_tryMoveItems\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@H_N\@Z */ MCAPI bool _tryMoveItems(class BlockSource &, class Container &, class Vec3 const &, int, bool); /** - * @symbol ?_tryPullInItemsFromAboveContainer\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@\@Z + * @symbol ?_tryPullInItemsFromAboveContainer\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@\@Z */ MCAPI bool _tryPullInItemsFromAboveContainer(class BlockSource &, class Container &, class Vec3 const &); /** - * @symbol ?_tryPushToComposter\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@VBlockPos\@\@H\@Z + * @symbol ?_tryPushToComposter\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@VBlockPos\@\@H\@Z */ MCAPI bool _tryPushToComposter(class BlockSource &, class Container &, class BlockPos, int); /** - * @symbol ?_tryTakeInItemFromSlot\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@1HH\@Z + * @symbol ?_tryTakeInItemFromSlot\@Hopper\@\@IEAA_NAEAVBlockSource\@\@AEAVContainer\@\@1HH\@Z */ MCAPI bool _tryTakeInItemFromSlot(class BlockSource &, class Container &, class Container &, int, int); //private: /** - * @symbol ?_tryAddItemsFromPos\@Hopper\@\@AEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@\@Z + * @symbol ?_tryAddItemsFromPos\@Hopper\@\@AEAA_NAEAVBlockSource\@\@AEAVContainer\@\@AEBVVec3\@\@\@Z */ MCAPI bool _tryAddItemsFromPos(class BlockSource &, class Container &, class Vec3 const &); @@ -110,4 +115,4 @@ class Hopper { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HopperBlock.hpp b/LiteLoader/include/llapi/mc/HopperBlock.hpp index 57101238af..dd99c79745 100644 --- a/LiteLoader/include/llapi/mc/HopperBlock.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlock.hpp @@ -31,302 +31,307 @@ class HopperBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HopperBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@HopperBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@HopperBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@HopperBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@HopperBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@HopperBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@HopperBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 80 - * @symbol ?getRedstoneProperty\@HopperBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 80 + * @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 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@HopperBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@HopperBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@HopperBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@HopperBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@HopperBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@HopperBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@HopperBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@HopperBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 177 - * @symbol ?use\@HopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@HopperBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@HopperBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_HOPPERBLOCK /** - * @symbol ?hasComparatorSignal\@HopperBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@HopperBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isContainerBlock\@HopperBlock\@\@UEBA_NXZ + * @symbol ?isContainerBlock\@HopperBlock\@\@UEBA_NXZ */ MCVAPI bool isContainerBlock() const; /** - * @symbol ?isInteractiveBlock\@HopperBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@HopperBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0HopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0HopperBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI HopperBlock(std::string const &, int); /** - * @symbol ?getAttachedOffset\@HopperBlock\@\@SA?AVBlockPos\@\@E\@Z + * @symbol ?getAttachedOffset\@HopperBlock\@\@SA?AVBlockPos\@\@E\@Z */ MCAPI static class BlockPos getAttachedOffset(unsigned char); //private: /** - * @symbol ?_getSpoutAABB\@HopperBlock\@\@AEBA?AVAABB\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getSpoutAABB\@HopperBlock\@\@AEBA?AVAABB\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI class AABB _getSpoutAABB(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?_installCircuit\@HopperBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_installCircuit\@HopperBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _installCircuit(class BlockSource &, class BlockPos const &) const; private: /** - * @symbol ?HOPPER_DOESNT_BREAK_FALLING_BLOCK_VERSION\@HopperBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?HOPPER_DOESNT_BREAK_FALLING_BLOCK_VERSION\@HopperBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const HOPPER_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HopperBlockActor.hpp b/LiteLoader/include/llapi/mc/HopperBlockActor.hpp index 11272784b4..04c2f88177 100644 --- a/LiteLoader/include/llapi/mc/HopperBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/HopperBlockActor.hpp @@ -31,117 +31,117 @@ class HopperBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_HOPPERBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@HopperBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@HopperBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@HopperBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@HopperBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?getContainer\@HopperBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@HopperBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@HopperBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@HopperBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@HopperBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@HopperBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@HopperBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@HopperBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@HopperBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@HopperBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@HopperBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@HopperBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?load\@HopperBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@HopperBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onMove\@HopperBlockActor\@\@UEAAXXZ + * @symbol ?onMove\@HopperBlockActor\@\@UEAAXXZ */ MCVAPI void onMove(); /** - * @symbol ?onNeighborChanged\@HopperBlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onNeighborChanged\@HopperBlockActor\@\@UEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCVAPI void onNeighborChanged(class BlockSource &, class BlockPos const &); /** - * @symbol ?save\@HopperBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@HopperBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@HopperBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@HopperBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setContainerChanged\@HopperBlockActor\@\@UEAAXH\@Z + * @symbol ?setContainerChanged\@HopperBlockActor\@\@UEAAXH\@Z */ MCVAPI void setContainerChanged(int); /** - * @symbol ?setItem\@HopperBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@HopperBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@HopperBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@HopperBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@HopperBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@HopperBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@HopperBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@HopperBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0HopperBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0HopperBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI HopperBlockActor(class BlockPos const &); /** - * @symbol ?checkForSmeltEverythingAchievement\@HopperBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?checkForSmeltEverythingAchievement\@HopperBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void checkForSmeltEverythingAchievement(class BlockSource &); /** - * @symbol ?getAttachedFurnace\@HopperBlockActor\@\@QEAAPEAVFurnaceBlockActor\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getAttachedFurnace\@HopperBlockActor\@\@QEAAPEAVFurnaceBlockActor\@\@AEAVBlockSource\@\@\@Z */ MCAPI class FurnaceBlockActor * getAttachedFurnace(class BlockSource &); /** - * @symbol ?isAttachedToChestAndFurnace\@HopperBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?isAttachedToChestAndFurnace\@HopperBlockActor\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool isAttachedToChestAndFurnace(class BlockSource &); /** - * @symbol ?updateCooldownAfterMove\@HopperBlockActor\@\@QEAAXAEBUTick\@\@H\@Z + * @symbol ?updateCooldownAfterMove\@HopperBlockActor\@\@QEAAXAEBUTick\@\@H\@Z */ MCAPI void updateCooldownAfterMove(struct Tick const &, int); //private: /** - * @symbol ?_ensureTickingOrder\@HopperBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z + * @symbol ?_ensureTickingOrder\@HopperBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z */ MCAPI void _ensureTickingOrder(class BlockSource &, int); /** - * @symbol ?_tick\@HopperBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z + * @symbol ?_tick\@HopperBlockActor\@\@AEAAXAEAVBlockSource\@\@H\@Z */ MCAPI void _tick(class BlockSource &, int); /** - * @symbol ?isAttachedToContainerType\@HopperBlockActor\@\@AEAA_NAEAVBlockSource\@\@W4ContainerType\@\@\@Z + * @symbol ?isAttachedToContainerType\@HopperBlockActor\@\@AEAA_NAEAVBlockSource\@\@W4ContainerType\@\@\@Z */ MCAPI bool isAttachedToContainerType(class BlockSource &, enum class ContainerType); /** - * @symbol ?isSourceOfContainerType\@HopperBlockActor\@\@AEAA_NAEAVBlockSource\@\@W4ContainerType\@\@\@Z + * @symbol ?isSourceOfContainerType\@HopperBlockActor\@\@AEAA_NAEAVBlockSource\@\@W4ContainerType\@\@\@Z */ MCAPI bool isSourceOfContainerType(class BlockSource &, enum class ContainerType); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HopperComponent.hpp b/LiteLoader/include/llapi/mc/HopperComponent.hpp index eee34f7fb8..2a6264c8a2 100644 --- a/LiteLoader/include/llapi/mc/HopperComponent.hpp +++ b/LiteLoader/include/llapi/mc/HopperComponent.hpp @@ -29,16 +29,16 @@ class HopperComponent { public: /** - * @symbol ??0HopperComponent\@\@QEAA\@XZ + * @symbol ??0HopperComponent\@\@QEAA\@XZ */ MCAPI HopperComponent(); /** - * @symbol ?getLastPosition\@HopperComponent\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getLastPosition\@HopperComponent\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getLastPosition() const; /** - * @symbol ?pullInItems\@HopperComponent\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?pullInItems\@HopperComponent\@\@QEAA_NAEAVActor\@\@\@Z */ MCAPI bool pullInItems(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp index 1fe7910c53..6c5e9f15e8 100644 --- a/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/HopperContainerManagerModel.hpp @@ -31,22 +31,22 @@ class HopperContainerManagerModel : public LevelContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HopperContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 17 - * @symbol ?_postInit\@HopperContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@HopperContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ - MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); + MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); /** - * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0HopperContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ - MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); + MCAPI HopperContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HopperDefinition.hpp b/LiteLoader/include/llapi/mc/HopperDefinition.hpp index cdcf06b201..76d4d5f8a1 100644 --- a/LiteLoader/include/llapi/mc/HopperDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HopperDefinition.hpp @@ -31,7 +31,7 @@ struct HopperDefinition { public: /** - * @symbol ?buildSchema\@HopperDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UHopperDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@HopperDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UHopperDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/HopperSystem.hpp b/LiteLoader/include/llapi/mc/HopperSystem.hpp index b272fe8dc5..77b9626d88 100644 --- a/LiteLoader/include/llapi/mc/HopperSystem.hpp +++ b/LiteLoader/include/llapi/mc/HopperSystem.hpp @@ -30,19 +30,19 @@ class HopperSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HopperSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@HopperSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HopperSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Horse.hpp b/LiteLoader/include/llapi/mc/Horse.hpp index f5e5fd2830..3e70f667c0 100644 --- a/LiteLoader/include/llapi/mc/Horse.hpp +++ b/LiteLoader/include/llapi/mc/Horse.hpp @@ -32,347 +32,337 @@ class Horse : public Animal { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Horse\@\@EEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Horse\@\@EEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Horse(); + virtual void __unk_vfn_16(); /** - * @vftbl 36 - * @symbol ?getInterpolatedRidingOffset\@Horse\@\@UEBA?AVVec3\@\@MH\@Z + * @vftbl 36 + * @symbol ?getInterpolatedRidingOffset\@Horse\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Horse\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 52 - * @symbol ?positionPassenger\@Horse\@\@UEAAXAEAVActor\@\@M\@Z + * @vftbl 52 + * @symbol ?positionPassenger\@Horse\@\@UEAAXAEAVActor\@\@M\@Z */ virtual void positionPassenger(class Actor &, float); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Horse\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Horse\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 93 - * @symbol ?isImmobile\@Horse\@\@MEBA_NXZ + * @vftbl 92 + * @symbol ?isImmobile\@Horse\@\@MEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 123 - * @symbol ?onFailedTame\@Horse\@\@UEAAXXZ + * @vftbl 122 + * @symbol ?onFailedTame\@Horse\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 127 - * @symbol ?setStanding\@Horse\@\@UEAAX_N\@Z + * @vftbl 126 + * @symbol ?setStanding\@Horse\@\@UEAAX_N\@Z */ virtual void setStanding(bool); /** - * @vftbl 141 - * @symbol ?feed\@Horse\@\@UEAAXH\@Z + * @vftbl 140 + * @symbol ?feed\@Horse\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Horse\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Horse\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 172 - * @symbol ?canFreeze\@Horse\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@Horse\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 181 - * @symbol ?getControllingPlayer\@Horse\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 180 + * @symbol ?getControllingPlayer\@Horse\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 183 - * @symbol ?causeFallDamage\@Horse\@\@MEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@Horse\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 184 - * @symbol ?handleFallDistanceOnServer\@Horse\@\@MEAAXMM_N\@Z + * @vftbl 183 + * @symbol ?handleFallDistanceOnServer\@Horse\@\@MEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Horse\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Horse\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 215 - * @symbol ?openContainerComponent\@Horse\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 214 + * @symbol ?openContainerComponent\@Horse\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void openContainerComponent(class Player &); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@Horse\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Horse\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Horse\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Horse\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Horse\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Horse\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Horse\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Horse\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 286 + * @symbol ?travel\@Horse\@\@UEAAXMMM_N\@Z */ - virtual void __unk_vfn_285(); + virtual void travel(float, float, float, bool); /** - * @vftbl 289 - * @symbol ?travel\@Horse\@\@UEAAXMMM\@Z - */ - virtual void travel(float, float, float); - /** - * @vftbl 291 - * @symbol ?aiStep\@Horse\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Horse\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@Horse\@\@UEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@Horse\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?setType\@Horse\@\@UEAAXH\@Z + * @vftbl 353 + * @symbol ?setType\@Horse\@\@UEAAXH\@Z */ virtual void setType(int); /** - * @vftbl 357 - * @symbol ?getType\@Horse\@\@UEBAHXZ + * @vftbl 354 + * @symbol ?getType\@Horse\@\@UEBAHXZ */ virtual int getType() const; /** - * @vftbl 358 - * @symbol ?setHorseEating\@Horse\@\@UEAAX_N\@Z + * @vftbl 355 + * @symbol ?setHorseEating\@Horse\@\@UEAAX_N\@Z */ virtual void setHorseEating(bool); /** - * @vftbl 359 - * @symbol ?getStandAnim\@Horse\@\@UEBAMM\@Z + * @vftbl 356 + * @symbol ?getStandAnim\@Horse\@\@UEBAMM\@Z */ virtual float getStandAnim(float) const; /** - * @vftbl 360 - * @symbol ?isAdult\@Horse\@\@UEBA_NXZ + * @vftbl 357 + * @symbol ?isAdult\@Horse\@\@UEBA_NXZ */ virtual bool isAdult() const; /** - * @vftbl 361 - * @symbol ?isHorseEating\@Horse\@\@UEBA_NXZ + * @vftbl 358 + * @symbol ?isHorseEating\@Horse\@\@UEBA_NXZ */ virtual bool isHorseEating() const; /** - * @vftbl 362 - * @symbol ?isMouthOpen\@Horse\@\@UEBA_NXZ + * @vftbl 359 + * @symbol ?isMouthOpen\@Horse\@\@UEBA_NXZ */ virtual bool isMouthOpen() const; /** - * @vftbl 363 - * @symbol ?isTailMoving\@Horse\@\@UEBA_NXZ + * @vftbl 360 + * @symbol ?isTailMoving\@Horse\@\@UEBA_NXZ */ virtual bool isTailMoving() const; /** - * @vftbl 364 - * @symbol ?makeMad\@Horse\@\@UEAAXXZ + * @vftbl 361 + * @symbol ?makeMad\@Horse\@\@UEAAXXZ */ virtual void makeMad(); /** - * @vftbl 365 - * @symbol ?tameToPlayer\@Horse\@\@UEAA_NAEAVPlayer\@\@_N\@Z + * @vftbl 362 + * @symbol ?tameToPlayer\@Horse\@\@UEAA_NAEAVPlayer\@\@_N\@Z */ virtual bool tameToPlayer(class Player &, bool); /** - * @symbol ??0Horse\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Horse\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Horse(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getPostTravelType\@Horse\@\@QEAA?AW4HorsePostTravelType\@\@PEAVActor\@\@\@Z + * @symbol ?getPostTravelType\@Horse\@\@QEAA?AW4HorsePostTravelType\@\@PEAVActor\@\@\@Z */ MCAPI enum class HorsePostTravelType getPostTravelType(class Actor *); /** - * @symbol ?postAiStep\@Horse\@\@QEAAXXZ + * @symbol ?postAiStep\@Horse\@\@QEAAXXZ */ MCAPI void postAiStep(); /** - * @symbol ?postNormalTick\@Horse\@\@QEAAXXZ + * @symbol ?postNormalTick\@Horse\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?postTravel\@Horse\@\@QEAAXPEAVActor\@\@_NW4HorsePostTravelType\@\@\@Z + * @symbol ?postTravel\@Horse\@\@QEAAXPEAVActor\@\@_NW4HorsePostTravelType\@\@\@Z */ MCAPI void postTravel(class Actor *, bool, enum class HorsePostTravelType); /** - * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@M\@Z + * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBVVec2\@\@MMM\@Z */ - MCAPI static class Vec3 getInterpolatedRidingOffset(struct RenderRotationComponent const &, struct StandAnimationComponent const &, float); + MCAPI static class Vec3 getInterpolatedRidingOffset(class Vec2 const &, float, float, float); /** - * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBVVec2\@\@MMM\@Z + * @symbol ?getInterpolatedRidingOffset\@Horse\@\@SA?AVVec3\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@M\@Z */ - MCAPI static class Vec3 getInterpolatedRidingOffset(class Vec2 const &, float, float, float); + MCAPI static class Vec3 getInterpolatedRidingOffset(struct RenderRotationComponent const &, struct StandAnimationComponent const &, float); /** - * @symbol ?getNewPassengerPos\@Horse\@\@SA?AVVec3\@\@AEBURenderPositionComponent\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@MM\@Z + * @symbol ?getNewPassengerPos\@Horse\@\@SA?AVVec3\@\@AEBURenderPositionComponent\@\@AEBURenderRotationComponent\@\@AEBUStandAnimationComponent\@\@MM\@Z */ MCAPI static class Vec3 getNewPassengerPos(struct RenderPositionComponent const &, struct RenderRotationComponent const &, struct StandAnimationComponent const &, float, float); /** - * @symbol ?setHorseFlag\@Horse\@\@SAXVSynchedActorDataWriter\@\@W4HorseFlags\@\@_N\@Z + * @symbol ?setHorseFlag\@Horse\@\@SAXVSynchedActorDataWriter\@\@W4HorseFlags\@\@_N\@Z */ MCAPI static void setHorseFlag(class SynchedActorDataWriter, enum class HorseFlags, bool); //private: /** - * @symbol ?_setHorseFlag\@Horse\@\@AEAAXW4HorseFlags\@\@_N\@Z + * @symbol ?_setHorseFlag\@Horse\@\@AEAAXW4HorseFlags\@\@_N\@Z */ MCAPI void _setHorseFlag(enum class HorseFlags, bool); /** - * @symbol ?_setHorseType\@Horse\@\@AEAA_NAEAW4ActorType\@\@\@Z + * @symbol ?_setHorseType\@Horse\@\@AEAA_NAEAW4ActorType\@\@\@Z */ MCAPI bool _setHorseType(enum class ActorType &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp index 4db4a8f09f..0dba7c1ccc 100644 --- a/LiteLoader/include/llapi/mc/HorseArmorItem.hpp +++ b/LiteLoader/include/llapi/mc/HorseArmorItem.hpp @@ -34,126 +34,126 @@ enum class Tier; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HorseArmorItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 18 - * @symbol ?isDyeable\@HorseArmorItem\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isDyeable\@HorseArmorItem\@\@UEBA_NXZ */ virtual bool isDyeable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@HorseArmorItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@HorseArmorItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 64 - * @symbol ?getArmorValue\@HorseArmorItem\@\@UEBAHXZ + * @vftbl 64 + * @symbol ?getArmorValue\@HorseArmorItem\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 73 - * @symbol ?getColor\@HorseArmorItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @vftbl 73 + * @symbol ?getColor\@HorseArmorItem\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ virtual class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @vftbl 74 - * @symbol ?hasCustomColor\@HorseArmorItem\@\@UEBA_NPEBVCompoundTag\@\@\@Z + * @vftbl 74 + * @symbol ?hasCustomColor\@HorseArmorItem\@\@UEBA_NPEBVCompoundTag\@\@\@Z */ virtual bool hasCustomColor(class CompoundTag const *) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 77 - * @symbol ?clearColor\@HorseArmorItem\@\@UEBAXPEAVCompoundTag\@\@\@Z + * @vftbl 77 + * @symbol ?clearColor\@HorseArmorItem\@\@UEBAXPEAVCompoundTag\@\@\@Z */ virtual void clearColor(class CompoundTag *) const; /** - * @vftbl 78 - * @symbol ?setColor\@HorseArmorItem\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z + * @vftbl 78 + * @symbol ?setColor\@HorseArmorItem\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z */ virtual void setColor(class ItemStackBase &, class mce::Color const &) const; /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@HorseArmorItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@HorseArmorItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @symbol ??0HorseArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHW4Tier\@0\@\@Z + * @symbol ??0HorseArmorItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHW4Tier\@0\@\@Z */ MCAPI HorseArmorItem(std::string const &, int, int, enum class HorseArmorItem::Tier); /** - * @symbol ?getTier\@HorseArmorItem\@\@QEBA?AW4Tier\@1\@XZ + * @symbol ?getTier\@HorseArmorItem\@\@QEBA?AW4Tier\@1\@XZ */ MCAPI enum class HorseArmorItem::Tier getTier() const; /** - * @symbol ?mHealthPerTier\@HorseArmorItem\@\@2QBHB + * @symbol ?mHealthPerTier\@HorseArmorItem\@\@2QBHB */ MCAPI static int const mHealthPerTier[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp index fd108dd12a..a39901622c 100644 --- a/LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/HorseContainerManagerModel.hpp @@ -31,33 +31,33 @@ class HorseContainerManagerModel : public LevelContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HorseContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@HorseContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@HorseContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@HorseContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@HorseContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@HorseContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@HorseContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 17 - * @symbol ?_postInit\@HorseContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@HorseContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0HorseContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0HorseContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI HorseContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HorseContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/HorseContainerScreenValidator.hpp index c333f31e77..2b31bcd0c3 100644 --- a/LiteLoader/include/llapi/mc/HorseContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/HorseContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class HorseContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HorseContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0HorseContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0HorseContainerScreenValidator\@\@QEAA\@XZ */ MCAPI HorseContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HorseEquipContainerValidation.hpp b/LiteLoader/include/llapi/mc/HorseEquipContainerValidation.hpp index bc16a5dc48..8d4a3b58f0 100644 --- a/LiteLoader/include/llapi/mc/HorseEquipContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/HorseEquipContainerValidation.hpp @@ -31,58 +31,58 @@ class HorseEquipContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HorseEquipContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@HorseEquipContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@HorseEquipContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@HorseEquipContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@HorseEquipContainerValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@HorseEquipContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@HorseEquipContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@HorseEquipContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@HorseEquipContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; /** - * @symbol ??0HorseEquipContainerValidation\@\@QEAA\@AEBVContainerScreenContext\@\@\@Z + * @symbol ??0HorseEquipContainerValidation\@\@QEAA\@AEBVContainerScreenContext\@\@\@Z */ MCAPI HorseEquipContainerValidation(class ContainerScreenContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HorseMovement.hpp b/LiteLoader/include/llapi/mc/HorseMovement.hpp index 5220e5c9c3..95a11f9fc1 100644 --- a/LiteLoader/include/llapi/mc/HorseMovement.hpp +++ b/LiteLoader/include/llapi/mc/HorseMovement.hpp @@ -17,11 +17,11 @@ namespace HorseMovement { #undef AFTER_EXTRA /** - * @symbol ?allowStandSliding\@HorseMovement\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?allowStandSliding\@HorseMovement\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool allowStandSliding(class EntityContext const &); /** - * @symbol ?setAllowStandSliding\@HorseMovement\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setAllowStandSliding\@HorseMovement\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setAllowStandSliding(class EntityContext &, bool); diff --git a/LiteLoader/include/llapi/mc/HorsePostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/HorsePostNormalTickSystem.hpp deleted file mode 100644 index 26a0005074..0000000000 --- a/LiteLoader/include/llapi/mc/HorsePostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file HorsePostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class HorsePostNormalTickSystem. - * - */ -class HorsePostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_HORSEPOSTNORMALTICKSYSTEM -public: - class HorsePostNormalTickSystem& operator=(class HorsePostNormalTickSystem const &) = delete; - HorsePostNormalTickSystem(class HorsePostNormalTickSystem const &) = delete; - HorsePostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@HorsePostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doHorsePostNormalTickSystem\@HorsePostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doHorsePostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp b/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp index cbe6ba33d7..49fef207b9 100644 --- a/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/HorsePostTravelSystem.hpp @@ -25,16 +25,16 @@ class HorsePostTravelSystem { public: /** - * @symbol ?createSystem\@HorsePostTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@HorsePostTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doHorsePostTravelSystem\@HorsePostTravelSystem\@\@CAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundPreTravelFlag\@\@\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doHorsePostTravelSystem\@HorsePostTravelSystem\@\@CAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundPreTravelFlag\@\@\@\@\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doHorsePostTravelSystem(class StrictEntityContext const &, class Optional const>, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp b/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp index 39e38e36b9..0d594edad4 100644 --- a/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/HorsePreTravelSystem.hpp @@ -25,8 +25,8 @@ class HorsePreTravelSystem { public: /** - * @symbol ?createHorsePreTravelSystem\@HorsePreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createHorsePreTravelSystem\@HorsePreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createHorsePreTravelSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HotbarContainerValidation.hpp b/LiteLoader/include/llapi/mc/HotbarContainerValidation.hpp index b81e106f41..4a6039b712 100644 --- a/LiteLoader/include/llapi/mc/HotbarContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/HotbarContainerValidation.hpp @@ -31,60 +31,60 @@ class HotbarContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HotbarContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@HotbarContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@HotbarContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@HotbarContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@HotbarContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_HOTBARCONTAINERVALIDATION /** - * @symbol ?canItemMoveToContainer\@HotbarContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@HotbarContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoverGoal.hpp b/LiteLoader/include/llapi/mc/HoverGoal.hpp index 053ff5384c..2566cf4bf3 100644 --- a/LiteLoader/include/llapi/mc/HoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/HoverGoal.hpp @@ -30,48 +30,48 @@ class HoverGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoverGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@HoverGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@HoverGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@HoverGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@HoverGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@HoverGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@HoverGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@HoverGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@HoverGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@HoverGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@HoverGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0HoverGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0HoverGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI HoverGoal(class Mob &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoverMoveControl.hpp b/LiteLoader/include/llapi/mc/HoverMoveControl.hpp index fe065f485f..cba9f135ad 100644 --- a/LiteLoader/include/llapi/mc/HoverMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/HoverMoveControl.hpp @@ -30,18 +30,18 @@ class HoverMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoverMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@HoverMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HoverMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0HoverMoveControl\@\@QEAA\@XZ + * @symbol ??0HoverMoveControl\@\@QEAA\@XZ */ MCAPI HoverMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HoverPathNavigation.hpp b/LiteLoader/include/llapi/mc/HoverPathNavigation.hpp index eec47969ea..7805ac19f5 100644 --- a/LiteLoader/include/llapi/mc/HoverPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/HoverPathNavigation.hpp @@ -31,49 +31,49 @@ class HoverPathNavigation : public PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HoverPathNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@HoverPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@HoverPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct NavigationDescription *); /** - * @vftbl 2 - * @symbol ?tick\@HoverPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HoverPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class NavigationComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?getTempMobPos\@HoverPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z + * @vftbl 3 + * @symbol ?getTempMobPos\@HoverPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z */ virtual class Vec3 getTempMobPos(class Mob const &) const; /** - * @vftbl 4 - * @symbol ?createPath\@HoverPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z + * @vftbl 4 + * @symbol ?createPath\@HoverPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Vec3 const &); /** - * @vftbl 5 - * @symbol ?createPath\@HoverPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z + * @vftbl 5 + * @symbol ?createPath\@HoverPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Actor &); /** - * @vftbl 9 - * @symbol ?stop\@HoverPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 9 + * @symbol ?stop\@HoverPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void stop(class NavigationComponent &, class Mob &); /** - * @vftbl 11 - * @symbol ?canUpdatePath\@HoverPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z + * @vftbl 11 + * @symbol ?canUpdatePath\@HoverPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z */ virtual bool canUpdatePath(class Mob const &) const; /** - * @vftbl 12 - * @symbol ?updatePath\@HoverPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 12 + * @symbol ?updatePath\@HoverPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void updatePath(class NavigationComponent &, class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HttpHeaders.hpp b/LiteLoader/include/llapi/mc/HttpHeaders.hpp index b8d62da78e..ff7865bb89 100644 --- a/LiteLoader/include/llapi/mc/HttpHeaders.hpp +++ b/LiteLoader/include/llapi/mc/HttpHeaders.hpp @@ -32,32 +32,32 @@ enum class ParseState; public: /** - * @symbol ??0HttpHeaders\@\@QEAA\@XZ + * @symbol ??0HttpHeaders\@\@QEAA\@XZ */ MCAPI HttpHeaders(); /** - * @symbol ?clear\@HttpHeaders\@\@QEAAXXZ + * @symbol ?clear\@HttpHeaders\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?getHeader\@HttpHeaders\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z + * @symbol ?getHeader\@HttpHeaders\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ MCAPI bool getHeader(std::string const &, std::string &) const; /** - * @symbol ?getState\@HttpHeaders\@\@QEAA?AW4ParseState\@1\@XZ + * @symbol ?getState\@HttpHeaders\@\@QEAA?AW4ParseState\@1\@XZ */ MCAPI enum class HttpHeaders::ParseState getState(); /** - * @symbol ?getStatusCode\@HttpHeaders\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getStatusCode\@HttpHeaders\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getStatusCode() const; /** - * @symbol ?parse\@HttpHeaders\@\@QEAA?AW4ParseState\@1\@AEAVBitStream\@RakNet\@\@\@Z + * @symbol ?parse\@HttpHeaders\@\@QEAA?AW4ParseState\@1\@AEAVBitStream\@RakNet\@\@\@Z */ MCAPI enum class HttpHeaders::ParseState parse(class RakNet::BitStream &); /** - * @symbol ??1HttpHeaders\@\@QEAA\@XZ + * @symbol ??1HttpHeaders\@\@QEAA\@XZ */ MCAPI ~HttpHeaders(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp index 714edc2445..f5c6b3d36c 100644 --- a/LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/HudContainerManagerModel.hpp @@ -31,43 +31,43 @@ class HudContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HudContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@HudContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@HudContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@HudContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@HudContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@HudContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@HudContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@HudContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@HudContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@HudContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@HudContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 17 - * @symbol ?_postInit\@HudContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@HudContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0HudContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@\@Z + * @symbol ??0HudContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@\@Z */ MCAPI HudContainerManagerModel(enum class ContainerID, class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HudContainerModel.hpp b/LiteLoader/include/llapi/mc/HudContainerModel.hpp index 973bce6bec..4eb6456842 100644 --- a/LiteLoader/include/llapi/mc/HudContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/HudContainerModel.hpp @@ -31,66 +31,66 @@ class HudContainerModel : public ContainerModel { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@HudContainerModel\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@HudContainerModel\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~HudContainerModel(); + virtual void __unk_vfn_1(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getContainerWeakRef\@HudContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ + * @vftbl 7 + * @symbol ?getContainerWeakRef\@HudContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ */ virtual class ContainerWeakRef getContainerWeakRef() const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 14 - * @symbol ?isValid\@HudContainerModel\@\@UEAA_NXZ + * @vftbl 14 + * @symbol ?isValid\@HudContainerModel\@\@UEAA_NXZ */ virtual bool isValid(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?_getContainer\@HudContainerModel\@\@EEBAPEAVContainer\@\@XZ + * @vftbl 20 + * @symbol ?_getContainer\@HudContainerModel\@\@EEBAPEAVContainer\@\@XZ */ virtual class Container * _getContainer() const; /** - * @symbol ??0HudContainerModel\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@\@Z + * @symbol ??0HudContainerModel\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@\@Z */ MCAPI HudContainerModel(enum class ContainerEnumName, class Player &); //private: /** - * @symbol ?_refreshContainer\@HudContainerModel\@\@AEAAXXZ + * @symbol ?_refreshContainer\@HudContainerModel\@\@AEAAXXZ */ MCAPI void _refreshContainer(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp index e40d6fd0e2..e4d63cf6eb 100644 --- a/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/HudScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure HudScreenCapabilities. - * - */ -struct HudScreenCapabilities { + +class HudScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,21 @@ struct HudScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_HUDSCREENCAPABILITIES public: - struct HudScreenCapabilities& operator=(struct HudScreenCapabilities const &) = delete; - HudScreenCapabilities(struct HudScreenCapabilities const &) = delete; + class HudScreenCapabilities& operator=(class HudScreenCapabilities const &) = delete; + HudScreenCapabilities(class HudScreenCapabilities const &) = delete; HudScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HudScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UHudScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UHudScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HugeFungusFeature.hpp b/LiteLoader/include/llapi/mc/HugeFungusFeature.hpp index 3a951359be..2bba0a5196 100644 --- a/LiteLoader/include/llapi/mc/HugeFungusFeature.hpp +++ b/LiteLoader/include/llapi/mc/HugeFungusFeature.hpp @@ -31,18 +31,24 @@ class HugeFungusFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HugeFungusFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@HugeFungusFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@HugeFungusFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HUGEFUNGUSFEATURE /** - * @symbol ??0HugeFungusFeature\@\@QEAA\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~HugeFungusFeature(); +#endif + /** + * @symbol ??0HugeFungusFeature\@\@QEAA\@_N\@Z */ MCAPI HugeFungusFeature(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp index 8af6f64727..a19465d9b6 100644 --- a/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomBlock.hpp @@ -31,236 +31,241 @@ class HugeMushroomBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HugeMushroomBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@HugeMushroomBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@HugeMushroomBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@HugeMushroomBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@HugeMushroomBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@HugeMushroomBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@HugeMushroomBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@HugeMushroomBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@HugeMushroomBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0HugeMushroomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@W4Type\@0\@\@Z + * @symbol ??0HugeMushroomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@W4Type\@0\@\@Z */ MCAPI HugeMushroomBlock(std::string const &, int, class Material const &, enum class HugeMushroomBlock::Type); //private: /** - * @symbol ?_getBlockItemWithState\@HugeMushroomBlock\@\@AEBA?AVItemInstance\@\@AEBVBlock\@\@W4MushroomOuterType\@\@\@Z + * @symbol ?_getBlockItemWithState\@HugeMushroomBlock\@\@AEBA?AVItemInstance\@\@AEBVBlock\@\@W4MushroomOuterType\@\@\@Z */ MCAPI class ItemInstance _getBlockItemWithState(class Block const &, enum class MushroomOuterType) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp b/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp index 4a43522923..423956009a 100644 --- a/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp +++ b/LiteLoader/include/llapi/mc/HugeMushroomFeature.hpp @@ -30,34 +30,40 @@ class HugeMushroomFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HugeMushroomFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@HugeMushroomFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@HugeMushroomFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HUGEMUSHROOMFEATURE /** - * @symbol ??0HugeMushroomFeature\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI HugeMushroomFeature(); + MCVAPI ~HugeMushroomFeature(); +#endif /** - * @symbol ??0HugeMushroomFeature\@\@QEAA\@H\@Z + * @symbol ??0HugeMushroomFeature\@\@QEAA\@H\@Z */ MCAPI HugeMushroomFeature(int); /** - * @symbol ?placeFixed\@HugeMushroomFeature\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ??0HugeMushroomFeature\@\@QEAA\@XZ + */ + MCAPI HugeMushroomFeature(); + /** + * @symbol ?placeFixed\@HugeMushroomFeature\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI bool placeFixed(class BlockSource &, class BlockPos const &, int, int) const; //private: /** - * @symbol ?_canSurvive\@HugeMushroomFeature\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_canSurvive\@HugeMushroomFeature\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _canSurvive(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HumanoidMonster.hpp b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp index 5962b5925b..2536f80df9 100644 --- a/LiteLoader/include/llapi/mc/HumanoidMonster.hpp +++ b/LiteLoader/include/llapi/mc/HumanoidMonster.hpp @@ -32,162 +32,163 @@ class HumanoidMonster : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~HumanoidMonster(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@HumanoidMonster\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@HumanoidMonster\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@HumanoidMonster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@HumanoidMonster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@HumanoidMonster\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@HumanoidMonster\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 299 - * @symbol ?getItemUseDuration\@HumanoidMonster\@\@UEBAHXZ + * @vftbl 296 + * @symbol ?getItemUseDuration\@HumanoidMonster\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 307 - * @symbol ?doHurtTarget\@HumanoidMonster\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 304 + * @symbol ?doHurtTarget\@HumanoidMonster\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 + */ + virtual void __unk_vfn_305(); + /** + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_351(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HUMANOIDMONSTER /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @symbol __unk_destructor_-1 */ - virtual void __unk_vfn_354(); + MCVAPI ~HumanoidMonster(); +#endif /** - * @symbol ??0HumanoidMonster\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0HumanoidMonster\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI HumanoidMonster(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); @@ -195,20 +196,20 @@ class HumanoidMonster : public Monster { private: /** - * @symbol ?MAX_ENCHANTED_ARMOR_CHANCE\@HumanoidMonster\@\@0MB + * @symbol ?MAX_ENCHANTED_ARMOR_CHANCE\@HumanoidMonster\@\@0MB */ MCAPI static float const MAX_ENCHANTED_ARMOR_CHANCE; /** - * @symbol ?MAX_ENCHANTED_WEAPON_CHANCE\@HumanoidMonster\@\@0MB + * @symbol ?MAX_ENCHANTED_WEAPON_CHANCE\@HumanoidMonster\@\@0MB */ MCAPI static float const MAX_ENCHANTED_WEAPON_CHANCE; /** - * @symbol ?MAX_PICKUP_LOOT_CHANCE\@HumanoidMonster\@\@0MB + * @symbol ?MAX_PICKUP_LOOT_CHANCE\@HumanoidMonster\@\@0MB */ MCAPI static float const MAX_PICKUP_LOOT_CHANCE; /** - * @symbol ?MAX_WEARING_ARMOR_CHANCE\@HumanoidMonster\@\@0MB + * @symbol ?MAX_WEARING_ARMOR_CHANCE\@HumanoidMonster\@\@0MB */ MCAPI static float const MAX_WEARING_ARMOR_CHANCE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp b/LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp index 8f032008cf..b53ad2b996 100644 --- a/LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp +++ b/LiteLoader/include/llapi/mc/HungerAttributeDelegate.hpp @@ -31,23 +31,23 @@ class HungerAttributeDelegate : public AttributeInstanceDelegate { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HungerAttributeDelegate(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@HungerAttributeDelegate\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@HungerAttributeDelegate\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol ?notify\@HungerAttributeDelegate\@\@UEAAX_J\@Z + * @vftbl 2 + * @symbol ?notify\@HungerAttributeDelegate\@\@UEAAX_J\@Z */ virtual void notify(__int64); /** - * @symbol ??0HungerAttributeDelegate\@\@QEAA\@AEBVAttributeInstance\@\@PEAVPlayer\@\@\@Z + * @symbol ??0HungerAttributeDelegate\@\@QEAA\@AEBVAttributeInstance\@\@PEAVPlayer\@\@\@Z */ MCAPI HungerAttributeDelegate(class AttributeInstance const &, class Player *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp index 59ef929c90..3e856833b9 100644 --- a/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp +++ b/LiteLoader/include/llapi/mc/HurtArmorPacket.hpp @@ -30,37 +30,43 @@ class HurtArmorPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HurtArmorPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@HurtArmorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@HurtArmorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@HurtArmorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@HurtArmorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@HurtArmorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@HurtArmorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@HurtArmorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HURTARMORPACKET /** - * @symbol ??0HurtArmorPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI HurtArmorPacket(); + MCVAPI ~HurtArmorPacket(); +#endif /** - * @symbol ??0HurtArmorPacket\@\@QEAA\@W4ActorDamageCause\@\@HV?$bitset\@$03\@std\@\@\@Z + * @symbol ??0HurtArmorPacket\@\@QEAA\@W4ActorDamageCause\@\@HV?$bitset\@$03\@std\@\@\@Z */ MCAPI HurtArmorPacket(enum class ActorDamageCause, int, class std::bitset<4>); + /** + * @symbol ??0HurtArmorPacket\@\@QEAA\@XZ + */ + MCAPI HurtArmorPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp b/LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp index 65b664bf5b..0edb767211 100644 --- a/LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/HurtByTargetGoal.hpp @@ -31,43 +31,43 @@ class HurtByTargetGoal : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HurtByTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@HurtByTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@HurtByTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 4 - * @symbol ?start\@HurtByTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@HurtByTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@HurtByTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@HurtByTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?alertOther\@HurtByTargetGoal\@\@MEAAXPEAVMob\@\@0\@Z + * @vftbl 11 + * @symbol ?alertOther\@HurtByTargetGoal\@\@MEAAXPEAVMob\@\@0\@Z */ virtual void alertOther(class Mob *, class Mob *); /** - * @symbol ??0HurtByTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ??0HurtByTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI HurtByTargetGoal(class Mob &, std::vector const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp b/LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp index be293de75f..5ba0f8de75 100644 --- a/LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/HurtOnConditionDefinition.hpp @@ -31,12 +31,12 @@ class HurtOnConditionDefinition { public: /** - * @symbol ?addDamageCondition\@HurtOnConditionDefinition\@\@QEAAXAEBUDamageCondition\@\@\@Z + * @symbol ?addDamageCondition\@HurtOnConditionDefinition\@\@QEAAXAEBUDamageCondition\@\@\@Z */ MCAPI void addDamageCondition(struct DamageCondition const &); /** - * @symbol ?buildSchema\@HurtOnConditionDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHurtOnConditionDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@HurtOnConditionDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VHurtOnConditionDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp b/LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp index 92a5cdb699..74c81f06ca 100644 --- a/LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp +++ b/LiteLoader/include/llapi/mc/HurtOnConditionSystem.hpp @@ -30,19 +30,19 @@ class HurtOnConditionSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HurtOnConditionSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@HurtOnConditionSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@HurtOnConditionSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp b/LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp index b3e74290b4..0983903a9d 100644 --- a/LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/HurtOwnerSubcomponent.hpp @@ -30,33 +30,33 @@ class HurtOwnerSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~HurtOwnerSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@HurtOwnerSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@HurtOwnerSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@HurtOwnerSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@HurtOwnerSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@HurtOwnerSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@HurtOwnerSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@HurtOwnerSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@HurtOwnerSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0HurtOwnerSubcomponent\@\@QEAA\@XZ + * @symbol ??0HurtOwnerSubcomponent\@\@QEAA\@XZ */ MCAPI HurtOwnerSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/I18n.hpp b/LiteLoader/include/llapi/mc/I18n.hpp index 50015d35cd..877123062e 100644 --- a/LiteLoader/include/llapi/mc/I18n.hpp +++ b/LiteLoader/include/llapi/mc/I18n.hpp @@ -42,160 +42,160 @@ class I18n { public: /** - * @symbol ?NeutralLangCode\@I18n\@\@2QBDB + * @symbol ?NeutralLangCode\@I18n\@\@2QBDB */ MCAPI static char const NeutralLangCode[]; /** - * @symbol ?addI18nObserver\@I18n\@\@SAXAEAVI18nObserver\@\@\@Z + * @symbol ?addI18nObserver\@I18n\@\@SAXAEAVI18nObserver\@\@\@Z */ MCAPI static void addI18nObserver(class I18nObserver &); /** - * @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 + * @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 + * @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 + * @symbol ?chooseLanguage\@I18n\@\@SAXAEBVLocalization\@\@\@Z */ MCAPI static void chooseLanguage(class Localization const &); /** - * @symbol ?findAvailableLanguageNames\@I18n\@\@SA?AV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@AEAVResourcePackManager\@\@\@Z + * @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 */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> findAvailableLanguageNames(class ResourcePackManager &); /** - * @symbol ?findAvailableLanguages\@I18n\@\@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\@\@AEAVResourcePackManager\@\@\@Z + * @symbol ?findAvailableLanguages\@I18n\@\@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\@\@AEAVResourcePackManager\@\@\@Z */ MCAPI static std::vector findAvailableLanguages(class ResourcePackManager &); /** - * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@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\@PEBVLocalization\@\@\@Z + * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@PEBVLocalization\@\@\@Z */ - MCAPI static std::string get(std::string const &, std::vector const &, class Localization const *); + MCAPI static std::string get(std::string const &, class Localization const *); /** - * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@PEBVLocalization\@\@\@Z + * @symbol ?get\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@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\@PEBVLocalization\@\@\@Z */ - MCAPI static std::string get(std::string const &, class Localization const *); + MCAPI static std::string get(std::string const &, std::vector const &, class Localization const *); /** - * @symbol ?getCurrentLanguage\@I18n\@\@SA?AV?$optional_ref\@$$CBVLocalization\@\@\@\@XZ + * @symbol ?getCurrentLanguage\@I18n\@\@SA?AV?$optional_ref\@$$CBVLocalization\@\@\@\@XZ */ MCAPI static class optional_ref getCurrentLanguage(); /** - * @symbol ?getLanguageCodesFromPack\@I18n\@\@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\@\@AEBVPackAccessStrategy\@\@\@Z + * @symbol ?getLanguageCodesFromPack\@I18n\@\@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\@\@AEBVPackAccessStrategy\@\@\@Z */ MCAPI static std::vector getLanguageCodesFromPack(class PackAccessStrategy const &); /** - * @symbol ?getLocaleFor\@I18n\@\@SAAEBVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getLocaleFor\@I18n\@\@SAAEBVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Localization const & getLocaleFor(std::string const &); /** - * @symbol ?getPackKeywordValue\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackManifest\@\@AEBV23\@\@Z + * @symbol ?getPackKeywordValue\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackManifest\@\@AEBV23\@\@Z */ MCAPI static std::string getPackKeywordValue(class PackManifest const &, std::string const &); /** - * @symbol ?getPackKeywordValueForTelemetry\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackManifest\@\@AEBV23\@\@Z + * @symbol ?getPackKeywordValueForTelemetry\@I18n\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackManifest\@\@AEBV23\@\@Z */ MCAPI static std::string getPackKeywordValueForTelemetry(class PackManifest const &, std::string const &); /** - * @symbol ?isPackKeyword\@I18n\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isPackKeyword\@I18n\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isPackKeyword(std::string const &); /** - * @symbol ?loadAllLanguages\@I18n\@\@SAXAEAVResourcePackManager\@\@\@Z + * @symbol ?loadAllLanguages\@I18n\@\@SAXAEAVResourcePackManager\@\@\@Z */ MCAPI static void loadAllLanguages(class ResourcePackManager &); /** - * @symbol ?loadLanguageKeywordsFromPack\@I18n\@\@SAXAEBVPackManifest\@\@AEBVPackAccessStrategy\@\@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 ?loadLanguageKeywordsFromPack\@I18n\@\@SAXAEBVPackManifest\@\@AEBVPackAccessStrategy\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI static void loadLanguageKeywordsFromPack(class PackManifest const &, class PackAccessStrategy const &, std::vector const &); //private: /** - * @symbol ?_findAvailableLanguageNames\@I18n\@\@CAXAEBVValue\@Json\@\@AEAV?$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\@\@\@Z + * @symbol ?_findAvailableLanguageNames\@I18n\@\@CAXAEBVValue\@Json\@\@AEAV?$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\@\@\@Z */ MCAPI static void _findAvailableLanguageNames(class Json::Value const &, class std::unordered_map, struct std::equal_to, class std::allocator>> &); /** - * @symbol ?_findAvailableLanguages\@I18n\@\@CAXAEBVValue\@Json\@\@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 ?_findAvailableLanguages\@I18n\@\@CAXAEBVValue\@Json\@\@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 _findAvailableLanguages(class Json::Value const &, std::vector &); /** - * @symbol ?_findLocaleFor\@I18n\@\@CAPEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_findLocaleFor\@I18n\@\@CAPEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Localization * _findLocaleFor(std::string const &); /** - * @symbol ?_generatePackKeyPrefix\@I18n\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackManifest\@\@\@Z + * @symbol ?_generatePackKeyPrefix\@I18n\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackManifest\@\@\@Z */ MCAPI static std::string _generatePackKeyPrefix(class PackManifest const &); /** - * @symbol ?_getAdditionalTranslationsBackupLocale\@I18n\@\@CAPEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?_getAdditionalTranslationsBackupLocale\@I18n\@\@CAPEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI static class Localization * _getAdditionalTranslationsBackupLocale(std::string const &, bool); /** - * @symbol ?_getLocaleCodeFor\@I18n\@\@CAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?_getLocaleCodeFor\@I18n\@\@CAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI static std::string & _getLocaleCodeFor(std::string const &); /** - * @symbol ?_getPackKeywordLocale\@I18n\@\@CAAEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getPackKeywordLocale\@I18n\@\@CAAEAVLocalization\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Localization & _getPackKeywordLocale(std::string const &); private: /** - * @symbol ?mAdditionalTranslationsBackup\@I18n\@\@0V?$vector\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mAdditionalTranslationsBackup\@I18n\@\@0V?$vector\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mAdditionalTranslationsBackup; /** - * @symbol ?mAdditionalTranslationsBackupMutex\@I18n\@\@0Vmutex\@std\@\@A + * @symbol ?mAdditionalTranslationsBackupMutex\@I18n\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mAdditionalTranslationsBackupMutex; /** - * @symbol ?mCurrentLanguage\@I18n\@\@0PEBVLocalization\@\@EB + * @symbol ?mCurrentLanguage\@I18n\@\@0PEBVLocalization\@\@EB */ MCAPI static class Localization const * mCurrentLanguage; /** - * @symbol ?mCurrentPackMetaLanguage\@I18n\@\@0PEBVLocalization\@\@EB + * @symbol ?mCurrentPackMetaLanguage\@I18n\@\@0PEBVLocalization\@\@EB */ MCAPI static class Localization const * mCurrentPackMetaLanguage; /** - * @symbol ?mEmptyLanguage\@I18n\@\@0VLocalization\@\@B + * @symbol ?mEmptyLanguage\@I18n\@\@0VLocalization\@\@B */ MCAPI static class Localization const mEmptyLanguage; /** - * @symbol ?mFormatDictionary\@I18n\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$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\@\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mFormatDictionary\@I18n\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$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\@\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> mFormatDictionary; /** - * @symbol ?mLanguageCodes\@I18n\@\@0V?$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\@\@A + * @symbol ?mLanguageCodes\@I18n\@\@0V?$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\@\@A */ MCAPI static std::vector mLanguageCodes; /** - * @symbol ?mLanguageNames\@I18n\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mLanguageNames\@I18n\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mLanguageNames; /** - * @symbol ?mLanguageSupportsHypenSplitting\@I18n\@\@0_NA + * @symbol ?mLanguageSupportsHypenSplitting\@I18n\@\@0_NA */ MCAPI static bool mLanguageSupportsHypenSplitting; /** - * @symbol ?mLanguages\@I18n\@\@0V?$vector\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mLanguages\@I18n\@\@0V?$vector\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mLanguages; /** - * @symbol ?mPackKeywordLanguages\@I18n\@\@0V?$vector\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mPackKeywordLanguages\@I18n\@\@0V?$vector\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLocalization\@\@U?$default_delete\@VLocalization\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mPackKeywordLanguages; /** - * @symbol ?mPackReservedKeys\@I18n\@\@0V?$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\@\@B + * @symbol ?mPackReservedKeys\@I18n\@\@0V?$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\@\@B */ MCAPI static std::vector const mPackReservedKeys; /** - * @symbol ?mResourcePackManager\@I18n\@\@0PEAVResourcePackManager\@\@EA + * @symbol ?mResourcePackManager\@I18n\@\@0PEAVResourcePackManager\@\@EA */ MCAPI static class ResourcePackManager * mResourcePackManager; /** - * @symbol ?mSubject\@I18n\@\@0V?$Subject\@VI18nObserver\@\@Vmutex\@std\@\@\@Core\@\@A + * @symbol ?mSubject\@I18n\@\@0V?$Subject\@VI18nObserver\@\@Vmutex\@std\@\@\@Core\@\@A */ MCAPI static class Core::Subject mSubject; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/I18nObserver.hpp b/LiteLoader/include/llapi/mc/I18nObserver.hpp index cb7d39b58e..761551d482 100644 --- a/LiteLoader/include/llapi/mc/I18nObserver.hpp +++ b/LiteLoader/include/llapi/mc/I18nObserver.hpp @@ -30,4 +30,4 @@ class I18nObserver { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp b/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp index 25a0004f57..f0f6edf03e 100644 --- a/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp +++ b/LiteLoader/include/llapi/mc/IActorMovementProxy.hpp @@ -29,16 +29,16 @@ struct IActorMovementProxy { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_IACTORMOVEMENTPROXY /** - * @symbol ?isFlying\@IActorMovementProxy\@\@UEBA_NXZ + * @symbol ?isFlying\@IActorMovementProxy\@\@UEBA_NXZ */ MCVAPI bool isFlying() const; /** - * @symbol ?setIsFlying\@IActorMovementProxy\@\@UEAAX_N\@Z + * @symbol ?setIsFlying\@IActorMovementProxy\@\@UEAAX_N\@Z */ MCVAPI void setIsFlying(bool); #endif /** - * @symbol ?getRegionAsConstBlockSource\@IActorMovementProxy\@\@QEBAAEBVIConstBlockSource\@\@XZ + * @symbol ?getRegionAsConstBlockSource\@IActorMovementProxy\@\@QEBAAEBVIConstBlockSource\@\@XZ */ MCAPI class IConstBlockSource const & getRegionAsConstBlockSource() const; diff --git a/LiteLoader/include/llapi/mc/IBlockWorldGenAPI.hpp b/LiteLoader/include/llapi/mc/IBlockWorldGenAPI.hpp index 5b85e655df..319814c930 100644 --- a/LiteLoader/include/llapi/mc/IBlockWorldGenAPI.hpp +++ b/LiteLoader/include/llapi/mc/IBlockWorldGenAPI.hpp @@ -31,13 +31,13 @@ class IBlockWorldGenAPI { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_IBLOCKWORLDGENAPI /** - * @symbol ?canGetChunk\@IBlockWorldGenAPI\@\@UEBA_NXZ + * @symbol ?canGetChunk\@IBlockWorldGenAPI\@\@UEBA_NXZ */ MCVAPI bool canGetChunk() const; /** - * @symbol ?getChunk\@IBlockWorldGenAPI\@\@UEAAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z + * @symbol ?getChunk\@IBlockWorldGenAPI\@\@UEAAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z */ MCVAPI class LevelChunk * getChunk(class ChunkPos const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ICerealDefinitionSerializer.hpp b/LiteLoader/include/llapi/mc/ICerealDefinitionSerializer.hpp index 344da5e44c..395e4e6722 100644 --- a/LiteLoader/include/llapi/mc/ICerealDefinitionSerializer.hpp +++ b/LiteLoader/include/llapi/mc/ICerealDefinitionSerializer.hpp @@ -29,9 +29,9 @@ class ICerealDefinitionSerializer { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ICEREALDEFINITIONSERIALIZER /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ICerealDefinitionSerializer(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IConnectionEventing.hpp b/LiteLoader/include/llapi/mc/IConnectionEventing.hpp index 61140992dc..4cef2e94c2 100644 --- a/LiteLoader/include/llapi/mc/IConnectionEventing.hpp +++ b/LiteLoader/include/llapi/mc/IConnectionEventing.hpp @@ -33,5 +33,11 @@ enum class ConnectionFailureReason; #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ICONNECTIONEVENTING + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IConnectionEventing(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IConstBlockSource.hpp b/LiteLoader/include/llapi/mc/IConstBlockSource.hpp new file mode 100644 index 0000000000..bd8fff9726 --- /dev/null +++ b/LiteLoader/include/llapi/mc/IConstBlockSource.hpp @@ -0,0 +1,32 @@ +/** + * @file IConstBlockSource.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class IConstBlockSource { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ICONSTBLOCKSOURCE +public: + class IConstBlockSource& operator=(class IConstBlockSource const &) = delete; + IConstBlockSource(class IConstBlockSource const &) = delete; + IConstBlockSource() = delete; +#endif + +public: + /** + * @symbol ?checkMaterial\@IConstBlockSource\@\@QEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z + */ + MCAPI bool checkMaterial(class AABB const &, enum class MaterialType) const; + +}; diff --git a/LiteLoader/include/llapi/mc/IContainerManager.hpp b/LiteLoader/include/llapi/mc/IContainerManager.hpp index f0c627f714..82ae367cbc 100644 --- a/LiteLoader/include/llapi/mc/IContainerManager.hpp +++ b/LiteLoader/include/llapi/mc/IContainerManager.hpp @@ -29,5 +29,11 @@ class IContainerManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ICONTAINERMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IContainerManager(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IContentKeyProvider.hpp b/LiteLoader/include/llapi/mc/IContentKeyProvider.hpp index e8d38dd4b9..003f208cfe 100644 --- a/LiteLoader/include/llapi/mc/IContentKeyProvider.hpp +++ b/LiteLoader/include/llapi/mc/IContentKeyProvider.hpp @@ -31,13 +31,13 @@ class IContentKeyProvider { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ICONTENTKEYPROVIDER /** - * @symbol ?getAlternateContentKey\@IContentKeyProvider\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVContentIdentity\@\@\@Z + * @symbol ?getAlternateContentKey\@IContentKeyProvider\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVContentIdentity\@\@\@Z */ MCVAPI std::string getAlternateContentKey(class ContentIdentity const &) const; /** - * @symbol ?requireEncryptedReads\@IContentKeyProvider\@\@UEBA_NXZ + * @symbol ?requireEncryptedReads\@IContentKeyProvider\@\@UEBA_NXZ */ MCVAPI bool requireEncryptedReads() const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IContentTierManager.hpp b/LiteLoader/include/llapi/mc/IContentTierManager.hpp index 280129da18..3fa3d7d60b 100644 --- a/LiteLoader/include/llapi/mc/IContentTierManager.hpp +++ b/LiteLoader/include/llapi/mc/IContentTierManager.hpp @@ -29,9 +29,9 @@ class IContentTierManager { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ICONTENTTIERMANAGER /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~IContentTierManager(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IDataInput.hpp b/LiteLoader/include/llapi/mc/IDataInput.hpp index f743ae3f87..cc7d1afd48 100644 --- a/LiteLoader/include/llapi/mc/IDataInput.hpp +++ b/LiteLoader/include/llapi/mc/IDataInput.hpp @@ -30,4 +30,4 @@ class IDataInput { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IDataOutput.hpp b/LiteLoader/include/llapi/mc/IDataOutput.hpp index 3e30199797..952a45be49 100644 --- a/LiteLoader/include/llapi/mc/IDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/IDataOutput.hpp @@ -30,4 +30,4 @@ class IDataOutput { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp b/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp index e60e1e1387..b07e6963c2 100644 --- a/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp +++ b/LiteLoader/include/llapi/mc/IDefinitionInstance.hpp @@ -23,49 +23,57 @@ class IDefinitionInstance { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_IDEFINITIONINSTANCE public: + class IDefinitionInstance& operator=(class IDefinitionInstance const &) = delete; IDefinitionInstance(class IDefinitionInstance const &) = delete; IDefinitionInstance() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_vfn_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual void __unk_vfn_0() = 0; + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1() = 0; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2() = 0; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3() = 0; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4() = 0; /** - * @vftbl 5 - * @symbol __unk_destructor_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ - virtual ~IDefinitionInstance(); + virtual void __unk_vfn_5() = 0; /** - * @vftbl 6 - * @symbol ?getRuntimeTypeId\@IDefinitionInstance\@\@UEBAGXZ + * @vftbl 6 + * @symbol ?getDefinitionTypeId\@?$DefinitionInstance\@UPushThroughDefinition\@\@\@\@UEBAGXZ + */ + virtual unsigned short getDefinitionTypeId() const = 0; + /** + * @vftbl 7 + * @symbol ?getRuntimeTypeId\@IDefinitionInstance\@\@UEBAGXZ */ virtual unsigned short getRuntimeTypeId() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IDEFINITIONINSTANCE /** - * @symbol ??4IDefinitionInstance\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI class IDefinitionInstance & operator=(class IDefinitionInstance const &); + MCVAPI ~IDefinitionInstance(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IDimension.hpp b/LiteLoader/include/llapi/mc/IDimension.hpp index 5d735fdc7e..8c829e1037 100644 --- a/LiteLoader/include/llapi/mc/IDimension.hpp +++ b/LiteLoader/include/llapi/mc/IDimension.hpp @@ -27,5 +27,11 @@ class IDimension { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IDIMENSION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IDimension(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IDimensionFactory.hpp b/LiteLoader/include/llapi/mc/IDimensionFactory.hpp new file mode 100644 index 0000000000..341d911490 --- /dev/null +++ b/LiteLoader/include/llapi/mc/IDimensionFactory.hpp @@ -0,0 +1,20 @@ +/** + * @file IDimensionFactory.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace IDimensionFactory { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp b/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp index 2f9ebe257d..80c9380680 100644 --- a/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp +++ b/LiteLoader/include/llapi/mc/IEntityRegistryOwner.hpp @@ -10,28 +10,11 @@ #undef BEFORE_EXTRA -/** - * @brief MC class IEntityRegistryOwner. - * - */ -class IEntityRegistryOwner { + +namespace IEntityRegistryOwner { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IENTITYREGISTRYOWNER -public: - class IEntityRegistryOwner& operator=(class IEntityRegistryOwner const &) = delete; - IEntityRegistryOwner(class IEntityRegistryOwner const &) = delete; - IEntityRegistryOwner() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IENTITYREGISTRYOWNER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~IEntityRegistryOwner(); -#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IEntitySystems.hpp b/LiteLoader/include/llapi/mc/IEntitySystems.hpp index 92a06b71af..602a698fc4 100644 --- a/LiteLoader/include/llapi/mc/IEntitySystems.hpp +++ b/LiteLoader/include/llapi/mc/IEntitySystems.hpp @@ -28,4 +28,4 @@ class IEntitySystems { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IFileAccess.hpp b/LiteLoader/include/llapi/mc/IFileAccess.hpp index 8ebe08c3bd..d8590ae6b9 100644 --- a/LiteLoader/include/llapi/mc/IFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/IFileAccess.hpp @@ -28,9 +28,15 @@ class IFileAccess { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IFILEACCESS /** - * @symbol ??0IFileAccess\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IFileAccess(); +#endif + /** + * @symbol ??0IFileAccess\@\@QEAA\@XZ */ MCAPI IFileAccess(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IFileChunkUploader.hpp b/LiteLoader/include/llapi/mc/IFileChunkUploader.hpp index 907cec8409..abd2ad019b 100644 --- a/LiteLoader/include/llapi/mc/IFileChunkUploader.hpp +++ b/LiteLoader/include/llapi/mc/IFileChunkUploader.hpp @@ -32,78 +32,82 @@ enum class UploadStreamResult; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IFileChunkUploader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?initFileUploader\@ServerFileChunkUploader\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFileInfo\@\@HAEBVValue\@Json\@\@V?$function\@$$A6AX_N\@Z\@3\@\@Z + * @vftbl 2 + * @symbol ?initFileUploader\@ServerFileChunkUploader\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFileInfo\@\@HAEBVValue\@Json\@\@V?$function\@$$A6AX_N\@Z\@3\@\@Z */ virtual void initFileUploader(std::string const &, struct FileInfo const &, int, class Json::Value const &, class std::function) = 0; /** - * @vftbl 3 - * @symbol ?getServerMissingChunks\@IFileChunkUploader\@\@UEBAXAEBUFileInfo\@\@V?$function\@$$A6AXV?$vector\@UFileChunkInfo\@\@V?$allocator\@UFileChunkInfo\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@Z + * @vftbl 3 + * @symbol ?getServerMissingChunks\@IFileChunkUploader\@\@UEBAXAEBUFileInfo\@\@V?$function\@$$A6AXV?$vector\@UFileChunkInfo\@\@V?$allocator\@UFileChunkInfo\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@Z */ virtual void getServerMissingChunks(struct FileInfo const &, class std::function)>) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?uploadChunk\@IFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@AEBV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@V?$function\@$$A6AX_N\@Z\@5\@\@Z + * @vftbl 5 + * @symbol ?uploadChunk\@IFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@AEBV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@V?$function\@$$A6AX_N\@Z\@5\@\@Z */ virtual void uploadChunk(struct FileInfo const &, struct FileChunkInfo const &, std::vector const &, class std::function); /** - * @vftbl 6 - * @symbol ?uploadStream\@IFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXW4UploadStreamResult\@IFileChunkUploader\@\@\@Z\@4\@\@Z + * @vftbl 6 + * @symbol ?uploadStream\@IFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXW4UploadStreamResult\@IFileChunkUploader\@\@\@Z\@4\@\@Z */ virtual void uploadStream(struct FileInfo const &, unsigned __int64, std::string const &, class std::function); /** - * @vftbl 7 - * @symbol ?canCancelUpload\@ServerFileChunkUploader\@\@UEBA_NAEBUFileInfo\@\@\@Z + * @vftbl 7 + * @symbol ?canCancelUpload\@ServerFileChunkUploader\@\@UEBA_NAEBUFileInfo\@\@\@Z */ virtual bool canCancelUpload(struct FileInfo const &) const = 0; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8() = 0; /** - * @vftbl 9 - * @symbol ?getInitErrorCode\@ServerFileChunkUploader\@\@UEBA?AW4UploadError\@\@XZ + * @vftbl 9 + * @symbol ?getInitErrorCode\@ServerFileChunkUploader\@\@UEBA?AW4UploadError\@\@XZ */ virtual enum class UploadError getInitErrorCode() const = 0; /** - * @vftbl 10 - * @symbol ?getUploadProgress\@ServerFileChunkUploader\@\@UEBAMAEBUFileInfo\@\@\@Z + * @vftbl 10 + * @symbol ?getUploadProgress\@ServerFileChunkUploader\@\@UEBAMAEBUFileInfo\@\@\@Z */ virtual float getUploadProgress(struct FileInfo const &) const = 0; /** - * @vftbl 11 - * @symbol ?getChunkInfo\@IFileChunkUploader\@\@UEBA?AUFileChunkInfo\@\@AEBUFileInfo\@\@H\@Z + * @vftbl 11 + * @symbol ?getChunkInfo\@IFileChunkUploader\@\@UEBA?AUFileChunkInfo\@\@AEBUFileInfo\@\@H\@Z */ virtual struct FileChunkInfo getChunkInfo(struct FileInfo const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_IFILECHUNKUPLOADER /** - * @symbol ?confirmChunkReceived\@IFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@\@Z + * @symbol ?confirmChunkReceived\@IFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@\@Z */ MCVAPI void confirmChunkReceived(struct FileInfo const &, struct FileChunkInfo const &); /** - * @symbol ?update\@IFileChunkUploader\@\@UEAAXXZ + * @symbol ?update\@IFileChunkUploader\@\@UEAAXXZ */ MCVAPI void update(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IFileChunkUploader(); #endif /** - * @symbol ??0IFileChunkUploader\@\@QEAA\@XZ + * @symbol ??0IFileChunkUploader\@\@QEAA\@XZ */ MCAPI IFileChunkUploader(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IFilePicker.hpp b/LiteLoader/include/llapi/mc/IFilePicker.hpp index 8a49332c03..eed7d76d10 100644 --- a/LiteLoader/include/llapi/mc/IFilePicker.hpp +++ b/LiteLoader/include/llapi/mc/IFilePicker.hpp @@ -30,4 +30,4 @@ class IFilePicker { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IFileReadAccess.hpp b/LiteLoader/include/llapi/mc/IFileReadAccess.hpp index 99dac828a1..716d163ff1 100644 --- a/LiteLoader/include/llapi/mc/IFileReadAccess.hpp +++ b/LiteLoader/include/llapi/mc/IFileReadAccess.hpp @@ -30,4 +30,4 @@ class IFileReadAccess { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IFileWriteAccess.hpp b/LiteLoader/include/llapi/mc/IFileWriteAccess.hpp index d08537ce22..c3287cabc5 100644 --- a/LiteLoader/include/llapi/mc/IFileWriteAccess.hpp +++ b/LiteLoader/include/llapi/mc/IFileWriteAccess.hpp @@ -30,4 +30,4 @@ class IFileWriteAccess { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IFoodItemComponent.hpp b/LiteLoader/include/llapi/mc/IFoodItemComponent.hpp index 735a25fb71..16078b75d2 100644 --- a/LiteLoader/include/llapi/mc/IFoodItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/IFoodItemComponent.hpp @@ -28,16 +28,16 @@ class IFoodItemComponent { public: /** - * @symbol ?CAN_ALWAYS_EAT\@IFoodItemComponent\@\@2QBDB + * @symbol ?CAN_ALWAYS_EAT\@IFoodItemComponent\@\@2QBDB */ MCAPI static char const CAN_ALWAYS_EAT[]; /** - * @symbol ?NUTRITION\@IFoodItemComponent\@\@2QBDB + * @symbol ?NUTRITION\@IFoodItemComponent\@\@2QBDB */ MCAPI static char const NUTRITION[]; /** - * @symbol ?SATURATION_MODIFIER\@IFoodItemComponent\@\@2QBDB + * @symbol ?SATURATION_MODIFIER\@IFoodItemComponent\@\@2QBDB */ MCAPI static char const SATURATION_MODIFIER[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IJsonSerializable.hpp b/LiteLoader/include/llapi/mc/IJsonSerializable.hpp index 0378dfa77e..6d956245a6 100644 --- a/LiteLoader/include/llapi/mc/IJsonSerializable.hpp +++ b/LiteLoader/include/llapi/mc/IJsonSerializable.hpp @@ -29,5 +29,11 @@ class IJsonSerializable { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IJSONSERIALIZABLE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IJsonSerializable(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ILevel.hpp b/LiteLoader/include/llapi/mc/ILevel.hpp index 2697080730..2621f38a52 100644 --- a/LiteLoader/include/llapi/mc/ILevel.hpp +++ b/LiteLoader/include/llapi/mc/ILevel.hpp @@ -33,17 +33,21 @@ class ILevel { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ILEVEL /** - * @symbol ?asLevel\@ILevel\@\@UEAAPEAVLevel\@\@XZ + * @symbol ?asLevel\@ILevel\@\@UEAAPEAVLevel\@\@XZ */ MCVAPI class Level * asLevel(); /** - * @symbol ?asMultiPlayerLevel\@ILevel\@\@UEAAPEAVMultiPlayerLevel\@\@XZ + * @symbol ?asMultiPlayerLevel\@ILevel\@\@UEAAPEAVMultiPlayerLevel\@\@XZ */ MCVAPI class MultiPlayerLevel * asMultiPlayerLevel(); /** - * @symbol ?getTradeTables\@ILevel\@\@UEAAPEAVTradeTables\@\@XZ + * @symbol ?getTradeTables\@ILevel\@\@UEAAPEAVTradeTables\@\@XZ */ MCVAPI class TradeTables * getTradeTables(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ILevel(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ILevelListCache.hpp b/LiteLoader/include/llapi/mc/ILevelListCache.hpp index a3dbc7ac35..b8932ae1a2 100644 --- a/LiteLoader/include/llapi/mc/ILevelListCache.hpp +++ b/LiteLoader/include/llapi/mc/ILevelListCache.hpp @@ -25,4 +25,4 @@ class ILevelListCache { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IMinecraftApp.hpp b/LiteLoader/include/llapi/mc/IMinecraftApp.hpp index 1e40431b2a..2379d70418 100644 --- a/LiteLoader/include/llapi/mc/IMinecraftApp.hpp +++ b/LiteLoader/include/llapi/mc/IMinecraftApp.hpp @@ -29,5 +29,11 @@ class IMinecraftApp { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IMINECRAFTAPP + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IMinecraftApp(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IMinecraftEventing.hpp b/LiteLoader/include/llapi/mc/IMinecraftEventing.hpp index f765a5aef1..ae7f1cfc6e 100644 --- a/LiteLoader/include/llapi/mc/IMinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/IMinecraftEventing.hpp @@ -30,13 +30,13 @@ class IMinecraftEventing { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_IMINECRAFTEVENTING /** - * @symbol ?updatePlayerUndergroundStatus\@IMinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z + * @symbol ?updatePlayerUndergroundStatus\@IMinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z */ MCVAPI void updatePlayerUndergroundStatus(class Player *, bool); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~IMinecraftEventing(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/INpcDialogueData.hpp b/LiteLoader/include/llapi/mc/INpcDialogueData.hpp index 28710271af..8c4edb30d6 100644 --- a/LiteLoader/include/llapi/mc/INpcDialogueData.hpp +++ b/LiteLoader/include/llapi/mc/INpcDialogueData.hpp @@ -11,33 +11,12 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure INpcDialogueData. - * - */ -struct INpcDialogueData { + +namespace INpcDialogueData { #define AFTER_EXTRA // Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_INPCDIALOGUEDATA -public: - struct INpcDialogueData& operator=(struct INpcDialogueData const &) = delete; - INpcDialogueData(struct INpcDialogueData const &) = delete; - INpcDialogueData() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INPCDIALOGUEDATA - /** - * @symbol ?getRawDialogueText\@INpcDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ - */ - MCVAPI std::string const & getRawDialogueText() const; - /** - * @symbol ?isRemoteFire\@INpcDialogueData\@\@UEAA_NXZ - */ - MCVAPI bool isRemoteFire(); -#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IPackManifestFactory.hpp b/LiteLoader/include/llapi/mc/IPackManifestFactory.hpp index 96356fa7ab..ff60ca3e2e 100644 --- a/LiteLoader/include/llapi/mc/IPackManifestFactory.hpp +++ b/LiteLoader/include/llapi/mc/IPackManifestFactory.hpp @@ -29,5 +29,11 @@ class IPackManifestFactory { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IPACKMANIFESTFACTORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IPackManifestFactory(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IPackTelemetry.hpp b/LiteLoader/include/llapi/mc/IPackTelemetry.hpp index 22bfff3559..0322cf81a4 100644 --- a/LiteLoader/include/llapi/mc/IPackTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IPackTelemetry.hpp @@ -29,5 +29,11 @@ class IPackTelemetry { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IPACKTELEMETRY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IPackTelemetry(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp b/LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp index 4a929bd003..deca7d1cb3 100644 --- a/LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp +++ b/LiteLoader/include/llapi/mc/IPacketHandlerDispatcher.hpp @@ -30,4 +30,4 @@ class IPacketHandlerDispatcher { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IPacketObserver.hpp b/LiteLoader/include/llapi/mc/IPacketObserver.hpp index 546b740894..e159e19572 100644 --- a/LiteLoader/include/llapi/mc/IPacketObserver.hpp +++ b/LiteLoader/include/llapi/mc/IPacketObserver.hpp @@ -10,28 +10,11 @@ #undef BEFORE_EXTRA -/** - * @brief MC class IPacketObserver. - * - */ -class IPacketObserver { + +namespace IPacketObserver { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_IPACKETOBSERVER -public: - class IPacketObserver& operator=(class IPacketObserver const &) = delete; - IPacketObserver(class IPacketObserver const &) = delete; - IPacketObserver() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IPACKETOBSERVER - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~IPacketObserver(); -#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/IPathBlockSource.hpp b/LiteLoader/include/llapi/mc/IPathBlockSource.hpp index 3ab1b1a681..a1de50fd80 100644 --- a/LiteLoader/include/llapi/mc/IPathBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/IPathBlockSource.hpp @@ -28,4 +28,4 @@ class IPathBlockSource { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IPreliminarySurfaceProvider.hpp b/LiteLoader/include/llapi/mc/IPreliminarySurfaceProvider.hpp index e61b56bd13..bed97ba0e3 100644 --- a/LiteLoader/include/llapi/mc/IPreliminarySurfaceProvider.hpp +++ b/LiteLoader/include/llapi/mc/IPreliminarySurfaceProvider.hpp @@ -29,5 +29,11 @@ class IPreliminarySurfaceProvider { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IPRELIMINARYSURFACEPROVIDER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IPreliminarySurfaceProvider(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IRandom.hpp b/LiteLoader/include/llapi/mc/IRandom.hpp index 57bcd60462..1cdbb15168 100644 --- a/LiteLoader/include/llapi/mc/IRandom.hpp +++ b/LiteLoader/include/llapi/mc/IRandom.hpp @@ -30,59 +30,65 @@ class IRandom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IRandom(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1() = 0; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2() = 0; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3() = 0; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4() = 0; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5() = 0; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6() = 0; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7() = 0; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8() = 0; /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ - virtual void __unk_vfn_9() = 0; + virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?forkPositional\@IRandom\@\@UEAA?AV?$unique_ptr\@VIPositionalRandomFactory\@\@U?$default_delete\@VIPositionalRandomFactory\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?forkPositional\@IRandom\@\@UEAA?AV?$unique_ptr\@VIPositionalRandomFactory\@\@U?$default_delete\@VIPositionalRandomFactory\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr forkPositional(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IRANDOM + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IRandom(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IRequestAction.hpp b/LiteLoader/include/llapi/mc/IRequestAction.hpp index 3b5aec8067..cc2142e038 100644 --- a/LiteLoader/include/llapi/mc/IRequestAction.hpp +++ b/LiteLoader/include/llapi/mc/IRequestAction.hpp @@ -32,32 +32,38 @@ enum class RequestActionType; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IRequestAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TestAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TestAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ virtual void execute(class ServerLevel &, class Dimension &) = 0; /** - * @vftbl 2 - * @symbol ?serialize\@IRequestAction\@\@UEAAXAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?serialize\@IRequestAction\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void serialize(class CompoundTag &); /** - * @vftbl 3 - * @symbol ??8IRequestAction\@\@UEBA_NAEAV0\@\@Z + * @vftbl 3 + * @symbol ??8IRequestAction\@\@UEBA_NAEAV0\@\@Z */ virtual bool operator==(class IRequestAction &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IREQUESTACTION /** - * @symbol ??0IRequestAction\@\@QEAA\@AEBW4RequestActionType\@0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IRequestAction(); +#endif + /** + * @symbol ??0IRequestAction\@\@QEAA\@AEBW4RequestActionType\@0\@\@Z */ MCAPI IRequestAction(enum class IRequestAction::RequestActionType const &); /** - * @symbol ?isValidTag\@IRequestAction\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?isValidTag\@IRequestAction\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool isValidTag(class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IResourcePackRepository.hpp b/LiteLoader/include/llapi/mc/IResourcePackRepository.hpp index 955777ba6f..db85a9b239 100644 --- a/LiteLoader/include/llapi/mc/IResourcePackRepository.hpp +++ b/LiteLoader/include/llapi/mc/IResourcePackRepository.hpp @@ -29,5 +29,11 @@ class IResourcePackRepository { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IRESOURCEPACKREPOSITORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IResourcePackRepository(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp b/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp index 9dbc8643f5..3c014b0537 100644 --- a/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp +++ b/LiteLoader/include/llapi/mc/IScreenChangedEventing.hpp @@ -29,5 +29,11 @@ class IScreenChangedEventing { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ISCREENCHANGEDEVENTING + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IScreenChangedEventing(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp b/LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp index f178eca9a9..2f20162c42 100644 --- a/LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp +++ b/LiteLoader/include/llapi/mc/ISecureStorageKeySystem.hpp @@ -29,5 +29,11 @@ class ISecureStorageKeySystem { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ISECURESTORAGEKEYSYSTEM + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ISecureStorageKeySystem(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ISystem.hpp b/LiteLoader/include/llapi/mc/ISystem.hpp index 6e5e259818..1063e926ad 100644 --- a/LiteLoader/include/llapi/mc/ISystem.hpp +++ b/LiteLoader/include/llapi/mc/ISystem.hpp @@ -31,7 +31,7 @@ struct ISystem { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ISYSTEM /** - * @symbol ?registerEvents\@ISystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z + * @symbol ?registerEvents\@ISystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z */ MCVAPI void registerEvents(class entt::basic_dispatcher> &); #endif diff --git a/LiteLoader/include/llapi/mc/ITextObject.hpp b/LiteLoader/include/llapi/mc/ITextObject.hpp index 554fd9c8a2..35c02c2ba1 100644 --- a/LiteLoader/include/llapi/mc/ITextObject.hpp +++ b/LiteLoader/include/llapi/mc/ITextObject.hpp @@ -30,20 +30,20 @@ class ITextObject { public: /** - * @symbol ?RAW_TEXT_OBJECT_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_OBJECT_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_OBJECT_KEY; /** - * @symbol ?RAW_TEXT_TEXT_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_TEXT_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_TEXT_KEY; /** - * @symbol ?RAW_TEXT_TRANSLATE_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_TRANSLATE_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_TRANSLATE_KEY; /** - * @symbol ?RAW_TEXT_WITH_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_WITH_KEY\@ITextObject\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_WITH_KEY; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ITickingArea.hpp b/LiteLoader/include/llapi/mc/ITickingArea.hpp index 3a0566e52a..e14ba38153 100644 --- a/LiteLoader/include/llapi/mc/ITickingArea.hpp +++ b/LiteLoader/include/llapi/mc/ITickingArea.hpp @@ -29,9 +29,15 @@ class ITickingArea { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITICKINGAREA /** - * @symbol ?serialize\@ITickingArea\@\@QEBA?AVCompoundTag\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ITickingArea(); +#endif + /** + * @symbol ?serialize\@ITickingArea\@\@QEBA?AVCompoundTag\@\@XZ */ MCAPI class CompoundTag serialize() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ITickingAreaView.hpp b/LiteLoader/include/llapi/mc/ITickingAreaView.hpp index f223a1099c..757e1a4214 100644 --- a/LiteLoader/include/llapi/mc/ITickingAreaView.hpp +++ b/LiteLoader/include/llapi/mc/ITickingAreaView.hpp @@ -29,5 +29,11 @@ class ITickingAreaView { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITICKINGAREAVIEW + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ITickingAreaView(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ITreeCanopyWrapper.hpp b/LiteLoader/include/llapi/mc/ITreeCanopyWrapper.hpp index e701b3ffc2..f597f88a97 100644 --- a/LiteLoader/include/llapi/mc/ITreeCanopyWrapper.hpp +++ b/LiteLoader/include/llapi/mc/ITreeCanopyWrapper.hpp @@ -28,8 +28,8 @@ class ITreeCanopyWrapper { public: /** - * @symbol ??1ITreeCanopyWrapper\@\@QEAA\@XZ + * @symbol ??1ITreeCanopyWrapper\@\@QEAA\@XZ */ MCAPI ~ITreeCanopyWrapper(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ITreeFeature.hpp b/LiteLoader/include/llapi/mc/ITreeFeature.hpp index 608944d00c..eb8f997b53 100644 --- a/LiteLoader/include/llapi/mc/ITreeFeature.hpp +++ b/LiteLoader/include/llapi/mc/ITreeFeature.hpp @@ -31,17 +31,17 @@ class ITreeFeature { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITREEFEATURE /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ITreeFeature(); #endif //protected: /** - * @symbol ?_place\@ITreeFeature\@\@IEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @symbol ?_place\@ITreeFeature\@\@IEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ MCAPI class std::optional _place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IUIEventTelemetry.hpp b/LiteLoader/include/llapi/mc/IUIEventTelemetry.hpp index 34ec83f9d5..d641f0e592 100644 --- a/LiteLoader/include/llapi/mc/IUIEventTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IUIEventTelemetry.hpp @@ -30,4 +30,4 @@ class IUIEventTelemetry { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IUnknownBlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/IUnknownBlockTypeRegistry.hpp index 4557c32470..0db9206b45 100644 --- a/LiteLoader/include/llapi/mc/IUnknownBlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/IUnknownBlockTypeRegistry.hpp @@ -31,9 +31,9 @@ class IUnknownBlockTypeRegistry { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_IUNKNOWNBLOCKTYPEREGISTRY /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~IUnknownBlockTypeRegistry(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IVillageManager.hpp b/LiteLoader/include/llapi/mc/IVillageManager.hpp index 8f53739a7a..5f928d0437 100644 --- a/LiteLoader/include/llapi/mc/IVillageManager.hpp +++ b/LiteLoader/include/llapi/mc/IVillageManager.hpp @@ -24,5 +24,11 @@ class IVillageManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IVILLAGEMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IVillageManager(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp b/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp index 7135f2e1f8..de5976162e 100644 --- a/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp +++ b/LiteLoader/include/llapi/mc/IWebviewTelemetry.hpp @@ -30,58 +30,58 @@ class IWebviewTelemetry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IWebviewTelemetry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?onDownloadBegin\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @vftbl 6 + * @symbol ?onDownloadBegin\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ virtual void onDownloadBegin(struct WebviewDownloadInfo const &); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?onDownloadComplete\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @vftbl 8 + * @symbol ?onDownloadComplete\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ virtual void onDownloadComplete(struct WebviewDownloadInfo const &); /** - * @vftbl 9 - * @symbol ?onDownloadCanceled\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @vftbl 9 + * @symbol ?onDownloadCanceled\@IWebviewTelemetry\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ virtual void onDownloadCanceled(struct WebviewDownloadInfo const &); /** - * @symbol ??0IWebviewTelemetry\@\@QEAA\@AEBVIMinecraftEventing\@\@\@Z + * @symbol ??0IWebviewTelemetry\@\@QEAA\@AEBVIMinecraftEventing\@\@\@Z */ MCAPI IWebviewTelemetry(class IMinecraftEventing const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IWorldTemplateManager.hpp b/LiteLoader/include/llapi/mc/IWorldTemplateManager.hpp index 91acc35953..ee9f85c0ba 100644 --- a/LiteLoader/include/llapi/mc/IWorldTemplateManager.hpp +++ b/LiteLoader/include/llapi/mc/IWorldTemplateManager.hpp @@ -29,5 +29,11 @@ class IWorldTemplateManager { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IWORLDTEMPLATEMANAGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IWorldTemplateManager(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IceBlock.hpp b/LiteLoader/include/llapi/mc/IceBlock.hpp index bfcd66337a..2760cc4e52 100644 --- a/LiteLoader/include/llapi/mc/IceBlock.hpp +++ b/LiteLoader/include/llapi/mc/IceBlock.hpp @@ -31,222 +31,227 @@ class IceBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@IceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@IceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@IceBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@IceBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@IceBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@IceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@IceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@IceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@IceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0IceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0IceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI IceBlock(std::string const &, int, bool); /** - * @symbol ?melt\@IceBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?melt\@IceBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void melt(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IceBombItem.hpp b/LiteLoader/include/llapi/mc/IceBombItem.hpp index 9eda0fae44..cb11265df5 100644 --- a/LiteLoader/include/llapi/mc/IceBombItem.hpp +++ b/LiteLoader/include/llapi/mc/IceBombItem.hpp @@ -32,107 +32,107 @@ class IceBombItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IceBombItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@IceBombItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@IceBombItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@IceBombItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@IceBombItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@IceBombItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@IceBombItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 103 - * @symbol ?getCooldownType\@IceBombItem\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 103 + * @symbol ?getCooldownType\@IceBombItem\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getCooldownType() const; /** - * @vftbl 104 - * @symbol ?getCooldownTime\@IceBombItem\@\@UEBAHXZ + * @vftbl 104 + * @symbol ?getCooldownTime\@IceBombItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; /** - * @symbol ??0IceBombItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0IceBombItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI IceBombItem(std::string const &, int); /** - * @symbol ?ICE_BOMB_COOLDOWN\@IceBombItem\@\@2VHashedString\@\@B + * @symbol ?ICE_BOMB_COOLDOWN\@IceBombItem\@\@2VHashedString\@\@B */ MCAPI static class HashedString const ICE_BOMB_COOLDOWN; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IcePatchFeature.hpp b/LiteLoader/include/llapi/mc/IcePatchFeature.hpp index 8321579cd8..41ca6109e6 100644 --- a/LiteLoader/include/llapi/mc/IcePatchFeature.hpp +++ b/LiteLoader/include/llapi/mc/IcePatchFeature.hpp @@ -31,18 +31,18 @@ class IcePatchFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IcePatchFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@IcePatchFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@IcePatchFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0IcePatchFeature\@\@QEAA\@H\@Z + * @symbol ??0IcePatchFeature\@\@QEAA\@H\@Z */ MCAPI IcePatchFeature(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IceSpikeFeature.hpp b/LiteLoader/include/llapi/mc/IceSpikeFeature.hpp index 094d577fc7..405f887205 100644 --- a/LiteLoader/include/llapi/mc/IceSpikeFeature.hpp +++ b/LiteLoader/include/llapi/mc/IceSpikeFeature.hpp @@ -31,22 +31,22 @@ class IceSpikeFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IceSpikeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@IceSpikeFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@IceSpikeFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_isValidPlaceBlock\@IceSpikeFeature\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_isValidPlaceBlock\@IceSpikeFeature\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isValidPlaceBlock(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IcebergFeature.hpp b/LiteLoader/include/llapi/mc/IcebergFeature.hpp index f80591ced5..8b96988984 100644 --- a/LiteLoader/include/llapi/mc/IcebergFeature.hpp +++ b/LiteLoader/include/llapi/mc/IcebergFeature.hpp @@ -31,42 +31,42 @@ class IcebergFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IcebergFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@IcebergFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@IcebergFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_isIcebergBlock\@IcebergFeature\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_isIcebergBlock\@IcebergFeature\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isIcebergBlock(class Block const &) const; /** - * @symbol ?carve\@IcebergFeature\@\@AEBAXHHAEBVBlockPos\@\@AEAVBlockSource\@\@_NM0HH\@Z + * @symbol ?carve\@IcebergFeature\@\@AEBAXHHAEBVBlockPos\@\@AEAVBlockSource\@\@_NM0HH\@Z */ MCAPI void carve(int, int, class BlockPos const &, class BlockSource &, bool, float, class BlockPos const &, int, int) const; /** - * @symbol ?generateIcebergBlock\@IcebergFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHHHHH_N3MHAEBVBlock\@\@\@Z + * @symbol ?generateIcebergBlock\@IcebergFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHHHHH_N3MHAEBVBlock\@\@\@Z */ MCAPI void generateIcebergBlock(class BlockSource &, class Random &, class BlockPos const &, int, int, int, int, int, int, bool, bool, float, int, class Block const &) const; /** - * @symbol ?heightDependentRadiusRound\@IcebergFeature\@\@AEBAHAEAVRandom\@\@HHH\@Z + * @symbol ?heightDependentRadiusRound\@IcebergFeature\@\@AEBAHAEAVRandom\@\@HHH\@Z */ MCAPI int heightDependentRadiusRound(class Random &, int, int, int) const; /** - * @symbol ?setIcebergBlock\@IcebergFeature\@\@AEBAXAEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@HH_N3AEBVBlock\@\@\@Z + * @symbol ?setIcebergBlock\@IcebergFeature\@\@AEBAXAEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@HH_N3AEBVBlock\@\@\@Z */ MCAPI void setIcebergBlock(class BlockPos const &, class BlockSource &, class Random &, int, int, bool, bool, class Block const &) const; /** - * @symbol ?signedDistanceEllipse\@IcebergFeature\@\@AEBAMHHAEBVBlockPos\@\@HHM\@Z + * @symbol ?signedDistanceEllipse\@IcebergFeature\@\@AEBAMHHAEBVBlockPos\@\@HHM\@Z */ MCAPI float signedDistanceEllipse(int, int, class BlockPos const &, int, int, float) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IconItemComponent.hpp b/LiteLoader/include/llapi/mc/IconItemComponent.hpp index 8b8e56f144..3ac49d0d68 100644 --- a/LiteLoader/include/llapi/mc/IconItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/IconItemComponent.hpp @@ -30,55 +30,55 @@ class IconItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IconItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VIconItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VIconItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VIconItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VIconItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ??0IconItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z + * @symbol ??0IconItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z */ MCAPI IconItemComponent(class ComponentItem *); /** - * @symbol ?setOwnerIcon\@IconItemComponent\@\@QEAAXXZ + * @symbol ?setOwnerIcon\@IconItemComponent\@\@QEAAXXZ */ MCAPI void setOwnerIcon(); /** - * @symbol ?bindType\@IconItemComponent\@\@SAXXZ + * @symbol ?bindType\@IconItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@IconItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@IconItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IdentifierDescription.hpp b/LiteLoader/include/llapi/mc/IdentifierDescription.hpp index ee23c61610..a0b00966f7 100644 --- a/LiteLoader/include/llapi/mc/IdentifierDescription.hpp +++ b/LiteLoader/include/llapi/mc/IdentifierDescription.hpp @@ -30,14 +30,20 @@ class IdentifierDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IdentifierDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getJsonName\@IdentifierDescription\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?getJsonName\@IdentifierDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_IDENTIFIERDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~IdentifierDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp index a30a996267..fee8c80851 100644 --- a/LiteLoader/include/llapi/mc/IdentityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDefinition.hpp @@ -36,96 +36,96 @@ enum class Type : char public: /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0IdentityDefinition\@\@QEAA\@AEBV0\@\@Z */ MCAPI IdentityDefinition(class IdentityDefinition const &); /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z */ - MCAPI IdentityDefinition(struct ScoreboardId const &, std::string const &); + MCAPI IdentityDefinition(struct ScoreboardId const &, struct ActorUniqueID const &); /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI IdentityDefinition(struct ScoreboardId const &, struct PlayerScoreboardId const &); + MCAPI IdentityDefinition(struct ScoreboardId const &, std::string const &); /** - * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0IdentityDefinition\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI IdentityDefinition(struct ScoreboardId const &, struct ActorUniqueID const &); + MCAPI IdentityDefinition(class IdentityDefinition &&); /** - * @symbol ??0IdentityDefinition\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0IdentityDefinition\@\@QEAA\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ - MCAPI IdentityDefinition(class IdentityDefinition &&); + MCAPI IdentityDefinition(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** - * @symbol ?getEntityId\@IdentityDefinition\@\@QEBAAEBUActorUniqueID\@\@XZ + * @symbol ?getEntityId\@IdentityDefinition\@\@QEBAAEBUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID const & getEntityId() const; /** - * @symbol ?getFakePlayerName\@IdentityDefinition\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFakePlayerName\@IdentityDefinition\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFakePlayerName() const; /** - * @symbol ?getIdentityType\@IdentityDefinition\@\@QEBA?AW4Type\@1\@XZ + * @symbol ?getIdentityType\@IdentityDefinition\@\@QEBA?AW4Type\@1\@XZ */ MCAPI enum class IdentityDefinition::Type getIdentityType() const; /** - * @symbol ?getName\@IdentityDefinition\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@3\@\@Z + * @symbol ?getName\@IdentityDefinition\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@3\@\@Z */ MCAPI std::string const & getName(class std::function const &) const; /** - * @symbol ?getPlayerId\@IdentityDefinition\@\@QEBAAEBUPlayerScoreboardId\@\@XZ + * @symbol ?getPlayerId\@IdentityDefinition\@\@QEBAAEBUPlayerScoreboardId\@\@XZ */ MCAPI struct PlayerScoreboardId const & getPlayerId() const; /** - * @symbol ?getScoreboardId\@IdentityDefinition\@\@QEBAAEBUScoreboardId\@\@XZ + * @symbol ?getScoreboardId\@IdentityDefinition\@\@QEBAAEBUScoreboardId\@\@XZ */ MCAPI struct ScoreboardId const & getScoreboardId() const; /** - * @symbol ?isEntityType\@IdentityDefinition\@\@QEBA_NXZ + * @symbol ?isEntityType\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isEntityType() const; /** - * @symbol ?isFakeType\@IdentityDefinition\@\@QEBA_NXZ + * @symbol ?isFakeType\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isFakeType() const; /** - * @symbol ?isHiddenFakePlayerType\@IdentityDefinition\@\@QEBA_NXZ + * @symbol ?isHiddenFakePlayerType\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isHiddenFakePlayerType() const; /** - * @symbol ?isPlayerType\@IdentityDefinition\@\@QEBA_NXZ + * @symbol ?isPlayerType\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isPlayerType() const; /** - * @symbol ?isValid\@IdentityDefinition\@\@QEBA_NXZ + * @symbol ?isValid\@IdentityDefinition\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??BIdentityDefinition\@\@QEBA_NXZ + * @symbol ??BIdentityDefinition\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ??4IdentityDefinition\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4IdentityDefinition\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class IdentityDefinition & operator=(class IdentityDefinition const &); /** - * @symbol ??4IdentityDefinition\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4IdentityDefinition\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class IdentityDefinition & operator=(class IdentityDefinition &&); /** - * @symbol ??1IdentityDefinition\@\@QEAA\@XZ + * @symbol ??1IdentityDefinition\@\@QEAA\@XZ */ MCAPI ~IdentityDefinition(); /** - * @symbol ?Invalid\@IdentityDefinition\@\@2V1\@B + * @symbol ?Invalid\@IdentityDefinition\@\@2V1\@B */ MCAPI static class IdentityDefinition const Invalid; /** - * @symbol ?convertFakeToReal\@IdentityDefinition\@\@SA_NAEAV1\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ?convertFakeToReal\@IdentityDefinition\@\@SA_NAEAV1\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI static bool convertFakeToReal(class IdentityDefinition &, struct PlayerScoreboardId const &); /** - * @symbol ?isHiddenFakePlayerNameString\@IdentityDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isHiddenFakePlayerNameString\@IdentityDefinition\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isHiddenFakePlayerNameString(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IdentityDictionary.hpp b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp index 146901b574..95b0ae1ecd 100644 --- a/LiteLoader/include/llapi/mc/IdentityDictionary.hpp +++ b/LiteLoader/include/llapi/mc/IdentityDictionary.hpp @@ -29,52 +29,52 @@ class IdentityDictionary { public: /** - * @symbol ??0IdentityDictionary\@\@QEAA\@XZ + * @symbol ??0IdentityDictionary\@\@QEAA\@XZ */ MCAPI IdentityDictionary(); /** - * @symbol ?clearIdentity\@IdentityDictionary\@\@QEAA_NAEBUScoreboardId\@\@\@Z + * @symbol ?clearIdentity\@IdentityDictionary\@\@QEAA_NAEBUScoreboardId\@\@\@Z */ MCAPI bool clearIdentity(struct ScoreboardId const &); /** - * @symbol ?convertFakeToReal\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ?convertFakeToReal\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI struct ScoreboardId const & convertFakeToReal(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** - * @symbol ?getAllScoreboardIds\@IdentityDictionary\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAllScoreboardIds\@IdentityDictionary\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getAllScoreboardIds() const; /** - * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI struct ScoreboardId const & getScoreboardId(struct ActorUniqueID const &) const; + MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const; /** - * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(struct PlayerScoreboardId const &) const; /** - * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getScoreboardId\@IdentityDictionary\@\@QEBAAEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z */ - MCAPI struct ScoreboardId const & getScoreboardId(std::string const &) const; + MCAPI struct ScoreboardId const & getScoreboardId(struct ActorUniqueID const &) const; /** - * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUActorUniqueID\@\@\@Z + * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); + MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, std::string const &); /** - * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** - * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?registerIdentity\@IdentityDictionary\@\@QEAAAEBUScoreboardId\@\@AEBU2\@AEBUActorUniqueID\@\@\@Z */ - MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, std::string const &); + MCAPI struct ScoreboardId const & registerIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); /** - * @symbol ?shouldConvertFakePlayer\@IdentityDictionary\@\@QEAA_NAEBUPlayerScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?shouldConvertFakePlayer\@IdentityDictionary\@\@QEAA_NAEBUPlayerScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool shouldConvertFakePlayer(struct PlayerScoreboardId const &, std::string const &); /** - * @symbol ??1IdentityDictionary\@\@QEAA\@XZ + * @symbol ??1IdentityDictionary\@\@QEAA\@XZ */ MCAPI ~IdentityDictionary(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IdleState.hpp b/LiteLoader/include/llapi/mc/IdleState.hpp index 142e73a774..9d4370e443 100644 --- a/LiteLoader/include/llapi/mc/IdleState.hpp +++ b/LiteLoader/include/llapi/mc/IdleState.hpp @@ -31,28 +31,28 @@ class IdleState : public PetSleepWithOwnerState { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IdleState(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@IdleState\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@IdleState\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol ?start\@IdleState\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?start\@IdleState\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 3 - * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ */ virtual void stop(); /** - * @symbol ?create\@IdleState\@\@SA?AV?$unique_ptr\@VIdleState\@\@U?$default_delete\@VIdleState\@\@\@std\@\@\@std\@\@AEAVPetSleepWithOwnerGoal\@\@\@Z + * @symbol ?create\@IdleState\@\@SA?AV?$unique_ptr\@VIdleState\@\@U?$default_delete\@VIdleState\@\@\@std\@\@\@std\@\@AEAVPetSleepWithOwnerGoal\@\@\@Z */ MCAPI static std::unique_ptr create(class PetSleepWithOwnerGoal &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Igloo.hpp b/LiteLoader/include/llapi/mc/Igloo.hpp index fb97d15283..981e7cae73 100644 --- a/LiteLoader/include/llapi/mc/Igloo.hpp +++ b/LiteLoader/include/llapi/mc/Igloo.hpp @@ -31,27 +31,27 @@ class Igloo : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Igloo(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@Igloo\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@Igloo\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@Igloo\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@Igloo\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@Igloo\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@Igloo\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ??0Igloo\@\@QEAA\@FHH\@Z + * @symbol ??0Igloo\@\@QEAA\@FHH\@Z */ MCAPI Igloo(short, int, int); @@ -59,20 +59,20 @@ class Igloo : public StructurePiece { private: /** - * @symbol ?STRUCTURE_LOCATION_IGLOO_NO_TRAPDOOR\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_LOCATION_IGLOO_NO_TRAPDOOR\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_LOCATION_IGLOO_NO_TRAPDOOR; /** - * @symbol ?STRUCTURE_LOCATION_IGLOO_TRAPDOOR\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_LOCATION_IGLOO_TRAPDOOR\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_LOCATION_IGLOO_TRAPDOOR; /** - * @symbol ?STRUCTURE_LOCATION_LABORATORY\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_LOCATION_LABORATORY\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_LOCATION_LABORATORY; /** - * @symbol ?STRUCTURE_LOCATION_LADDER\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_LOCATION_LADDER\@Igloo\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_LOCATION_LADDER; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp b/LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp index dc70fec9bf..0891fc7022 100644 --- a/LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/IgniteSubcomponent.hpp @@ -29,43 +29,43 @@ class IgniteSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IgniteSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@IgniteSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@IgniteSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@IgniteSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@IgniteSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_IGNITESUBCOMPONENT /** - * @symbol ?readfromJSON\@IgniteSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?readfromJSON\@IgniteSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCVAPI void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @symbol ?writetoJSON\@IgniteSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?writetoJSON\@IgniteSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ MCVAPI void writetoJSON(class Json::Value &) const; #endif /** - * @symbol ??0IgniteSubcomponent\@\@QEAA\@XZ + * @symbol ??0IgniteSubcomponent\@\@QEAA\@XZ */ MCAPI IgniteSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IllagerBeast.hpp b/LiteLoader/include/llapi/mc/IllagerBeast.hpp index 9c9f056c71..1f18b93a14 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeast.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeast.hpp @@ -32,148 +32,143 @@ class IllagerBeast : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~IllagerBeast(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol ?blockedByShield\@IllagerBeast\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z + * @vftbl 42 + * @symbol ?blockedByShield\@IllagerBeast\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@IllagerBeast\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@IllagerBeast\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0IllagerBeast\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0IllagerBeast\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI IllagerBeast(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp b/LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp index 1fd71dcc96..da6ecceec1 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeastBlockedComponent.hpp @@ -30,12 +30,12 @@ class IllagerBeastBlockedComponent { public: /** - * @symbol ?initFromDefinition\@IllagerBeastBlockedComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@IllagerBeastBlockedComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?onBlocked\@IllagerBeastBlockedComponent\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@0\@Z + * @symbol ?onBlocked\@IllagerBeastBlockedComponent\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@0\@Z */ MCAPI void onBlocked(class Actor &, class ActorDamageSource const &, class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp b/LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp index ef7232d33b..da32f8a5b4 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeastBlockedDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class IllagerBeastBlockedDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@IllagerBeastBlockedDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@IllagerBeastBlockedDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~IllagerBeastBlockedDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@IllagerBeastBlockedDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@IllagerBeastBlockedDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ILLAGERBEASTBLOCKEDDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@IllagerBeastBlockedDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~IllagerBeastBlockedDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IllagerBeastPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/IllagerBeastPostAIStepSystem.hpp index fe163077fa..0b9a364bdd 100644 --- a/LiteLoader/include/llapi/mc/IllagerBeastPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/IllagerBeastPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class IllagerBeastPostAIStepSystem { public: /** - * @symbol ?createSystem\@IllagerBeastPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@IllagerBeastPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doIllagerBeastPostAIStepSystem\@IllagerBeastPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUSubBBsComponent\@\@\@Z + * @symbol ?_doIllagerBeastPostAIStepSystem\@IllagerBeastPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUSubBBsComponent\@\@\@Z */ MCAPI static void _doIllagerBeastPostAIStepSystem(class StrictEntityContext const &, struct StateVectorComponent const &, struct SubBBsComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ImguiProfiler.hpp b/LiteLoader/include/llapi/mc/ImguiProfiler.hpp index 11146754a6..ddc331a80b 100644 --- a/LiteLoader/include/llapi/mc/ImguiProfiler.hpp +++ b/LiteLoader/include/llapi/mc/ImguiProfiler.hpp @@ -10,32 +10,39 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ImguiProfiler. - * - */ -struct ImguiProfiler { + +class ImguiProfiler { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_IMGUIPROFILER public: - struct ImguiProfiler& operator=(struct ImguiProfiler const &) = delete; - ImguiProfiler(struct ImguiProfiler const &) = delete; + class ImguiProfiler& operator=(class ImguiProfiler const &) = delete; + ImguiProfiler(class ImguiProfiler const &) = delete; ImguiProfiler() = delete; #endif public: /** - * @symbol ?getTimeAccumulator\@ImguiProfiler\@\@QEAA?AVTimeAccumulator\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @symbol ?getTimeAccumulator\@ImguiProfiler\@\@QEAA?AVTimeAccumulator\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCAPI class TimeAccumulator getTimeAccumulator(std::string const &, std::string const &, bool); /** - * @symbol ?reset\@ImguiProfiler\@\@QEAAXXZ + * @symbol ?reset\@ImguiProfiler\@\@QEAAXXZ */ MCAPI void reset(); //private: -}; \ No newline at end of file +private: + /** + * @symbol ?sPendingRecords\@ImguiProfiler\@\@0V?$vector\@URecord\@ImguiProfiler\@\@V?$allocator\@URecord\@ImguiProfiler\@\@\@std\@\@\@std\@\@A + */ + MCAPI static std::vector sPendingRecords; + /** + * @symbol ?sRecordMutex\@ImguiProfiler\@\@0Vmutex\@std\@\@A + */ + MCAPI static class std::mutex sRecordMutex; + +}; diff --git a/LiteLoader/include/llapi/mc/ImitateMobSoundsComponent.hpp b/LiteLoader/include/llapi/mc/ImitateMobSoundsComponent.hpp index daf23f9451..35c830f073 100644 --- a/LiteLoader/include/llapi/mc/ImitateMobSoundsComponent.hpp +++ b/LiteLoader/include/llapi/mc/ImitateMobSoundsComponent.hpp @@ -30,11 +30,11 @@ class ImitateMobSoundsComponent { public: /** - * @symbol ?getRandomImitatedSound\@ImitateMobSoundsComponent\@\@SA?AW4LevelSoundEvent\@\@AEBVRandomize\@\@\@Z + * @symbol ?getRandomImitatedSound\@ImitateMobSoundsComponent\@\@SA?AW4LevelSoundEvent\@\@AEBVRandomize\@\@\@Z */ MCAPI static enum class LevelSoundEvent getRandomImitatedSound(class Randomize const &); /** - * @symbol ?imitateNearbyMobs\@ImitateMobSoundsComponent\@\@SA_NAEAVActor\@\@AEBVRandomize\@\@\@Z + * @symbol ?imitateNearbyMobs\@ImitateMobSoundsComponent\@\@SA_NAEAVActor\@\@AEBVRandomize\@\@\@Z */ MCAPI static bool imitateNearbyMobs(class Actor &, class Randomize const &); @@ -42,8 +42,8 @@ class ImitateMobSoundsComponent { private: /** - * @symbol ?imitateMobMap\@ImitateMobSoundsComponent\@\@0V?$unordered_map\@W4ActorType\@\@W4LevelSoundEvent\@\@U?$hash\@W4ActorType\@\@\@std\@\@U?$equal_to\@W4ActorType\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4ActorType\@\@W4LevelSoundEvent\@\@\@std\@\@\@4\@\@std\@\@B + * @symbol ?imitateMobMap\@ImitateMobSoundsComponent\@\@0V?$unordered_map\@W4ActorType\@\@W4LevelSoundEvent\@\@U?$hash\@W4ActorType\@\@\@std\@\@U?$equal_to\@W4ActorType\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4ActorType\@\@W4LevelSoundEvent\@\@\@std\@\@\@4\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const imitateMobMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ImmobileSystem.hpp b/LiteLoader/include/llapi/mc/ImmobileSystem.hpp index e5a6ee76e1..a4eb4aa301 100644 --- a/LiteLoader/include/llapi/mc/ImmobileSystem.hpp +++ b/LiteLoader/include/llapi/mc/ImmobileSystem.hpp @@ -25,16 +25,16 @@ class ImmobileSystem { public: /** - * @symbol ?createSystem\@ImmobileSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ImmobileSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?doImmobileSystem\@ImmobileSystem\@\@CAXAEBVStrictEntityContext\@\@AEAULocalMoveVelocityComponent\@\@AEAUMobRotationComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + * @symbol ?doImmobileSystem\@ImmobileSystem\@\@CAXAEBVStrictEntityContext\@\@AEAULocalMoveVelocityComponent\@\@AEAUMobRotationComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z */ MCAPI static void doImmobileSystem(class StrictEntityContext const &, struct LocalMoveVelocityComponent &, struct MobRotationComponent &, struct StateVectorComponent &, class EntityModifierT>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp index 1bd5929568..188a1c7083 100644 --- a/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp +++ b/LiteLoader/include/llapi/mc/ImmutableWorldCommand.hpp @@ -31,18 +31,18 @@ class ImmutableWorldCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ImmutableWorldCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ImmutableWorldCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ImmutableWorldCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ImmutableWorldCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ImmutableWorldCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp b/LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp index e1341cdae0..5855d2a68f 100644 --- a/LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ImpactDamageSubcomponent.hpp @@ -30,33 +30,33 @@ class ImpactDamageSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ImpactDamageSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@ImpactDamageSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@ImpactDamageSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@ImpactDamageSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@ImpactDamageSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@ImpactDamageSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@ImpactDamageSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@ImpactDamageSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@ImpactDamageSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0ImpactDamageSubcomponent\@\@QEAA\@XZ + * @symbol ??0ImpactDamageSubcomponent\@\@QEAA\@XZ */ MCAPI ImpactDamageSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp b/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp index 9a125aa2cb..d364268f59 100644 --- a/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp +++ b/LiteLoader/include/llapi/mc/ImportStructureMetaData.hpp @@ -10,34 +10,31 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ImportStructureMetaData. - * - */ -struct ImportStructureMetaData { + +class ImportStructureMetaData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_IMPORTSTRUCTUREMETADATA public: - struct ImportStructureMetaData& operator=(struct ImportStructureMetaData const &) = delete; - ImportStructureMetaData(struct ImportStructureMetaData const &) = delete; + class ImportStructureMetaData& operator=(class ImportStructureMetaData const &) = delete; + ImportStructureMetaData(class ImportStructureMetaData const &) = delete; ImportStructureMetaData() = delete; #endif public: /** - * @symbol ?getStructure\@ImportStructureMetaData\@\@QEAAPEBVStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getStructure\@ImportStructureMetaData\@\@QEAAPEBVStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructureTemplate const * getStructure(std::string const &); /** - * @symbol ?isSpecificStructureDirty\@ImportStructureMetaData\@\@QEAA?B_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isSpecificStructureDirty\@ImportStructureMetaData\@\@QEAA?B_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool const isSpecificStructureDirty(std::string const &); /** - * @symbol ?setSpecificStructureDirty\@ImportStructureMetaData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?setSpecificStructureDirty\@ImportStructureMetaData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void setSpecificStructureDirty(std::string const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ImprovedNoise.hpp b/LiteLoader/include/llapi/mc/ImprovedNoise.hpp index 307c1305ba..6eb7daabcd 100644 --- a/LiteLoader/include/llapi/mc/ImprovedNoise.hpp +++ b/LiteLoader/include/llapi/mc/ImprovedNoise.hpp @@ -30,28 +30,28 @@ class ImprovedNoise { public: /** - * @symbol ??0ImprovedNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z + * @symbol ??0ImprovedNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z */ MCAPI ImprovedNoise(class IRandom &, struct YBlendingBugSettings); /** - * @symbol ?_getValue\@ImprovedNoise\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?_getValue\@ImprovedNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float _getValue(class Vec3 const &) const; /** - * @symbol ?_readArea\@ImprovedNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1M\@Z + * @symbol ?_readArea\@ImprovedNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1M\@Z */ MCAPI void _readArea(float *, class Vec3 const &, int, int, int, class Vec3 const &, float) const; //private: /** - * @symbol ?_blendCubeCorners\@ImprovedNoise\@\@AEBAXAEBVVec3\@\@HHHMAEAM111\@Z + * @symbol ?_blendCubeCorners\@ImprovedNoise\@\@AEBAXAEBVVec3\@\@HHHMAEAM111\@Z */ MCAPI void _blendCubeCorners(class Vec3 const &, int, int, int, float, float &, float &, float &, float &) const; /** - * @symbol ?_init\@ImprovedNoise\@\@AEAAXAEBVVec3\@\@AEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z + * @symbol ?_init\@ImprovedNoise\@\@AEAAXAEBVVec3\@\@AEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z */ MCAPI void _init(class Vec3 const &, class IRandom &, struct YBlendingBugSettings); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp b/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp index e43e08ff9e..183fcc4294 100644 --- a/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/InLavaSensingSystem.hpp @@ -28,12 +28,12 @@ class InLavaSensingSystem { public: /** - * @symbol ?createSystem\@InLavaSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@InLavaSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?doInLavaSensing\@InLavaSensingSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@\@Z + * @symbol ?doInLavaSensing\@InLavaSensingSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInLavaFlag\@\@\@\@\@\@\@Z */ MCAPI static void doInLavaSensing(class StrictEntityContext const &, struct UpdateWaterStateRequestComponent const &, class EntityModifierT>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InMemoryEnv.hpp b/LiteLoader/include/llapi/mc/InMemoryEnv.hpp index 76ec169c00..6a87d309d7 100644 --- a/LiteLoader/include/llapi/mc/InMemoryEnv.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryEnv.hpp @@ -31,121 +31,121 @@ class InMemoryEnv { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InMemoryEnv(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?NewSequentialFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z + * @vftbl 1 + * @symbol ?NewSequentialFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z */ virtual class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @vftbl 2 - * @symbol ?NewRandomAccessFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z + * @vftbl 2 + * @symbol ?NewRandomAccessFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z */ virtual class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @vftbl 3 - * @symbol ?NewWritableFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @vftbl 3 + * @symbol ?NewWritableFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ virtual class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 4 - * @symbol ?NewAppendableFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @vftbl 4 + * @symbol ?NewAppendableFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ virtual class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 5 - * @symbol ?FileExists\@InMemoryEnv\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?FileExists\@InMemoryEnv\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool FileExists(std::string const &); /** - * @vftbl 6 - * @symbol ?GetChildren\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @vftbl 6 + * @symbol ?GetChildren\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ virtual class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @vftbl 7 - * @symbol ?DeleteFileA\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?DeleteFileA\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteFileA(std::string const &); /** - * @vftbl 8 - * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status CreateDir(std::string const &); /** - * @vftbl 9 - * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteDir(std::string const &); /** - * @vftbl 10 - * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @vftbl 10 + * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ virtual class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @vftbl 11 - * @symbol ?RenameFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 11 + * @symbol ?RenameFile\@InMemoryEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @vftbl 12 - * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z + * @vftbl 12 + * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z */ virtual class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @vftbl 13 - * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z + * @vftbl 13 + * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z */ virtual class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @vftbl 14 - * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 14 + * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void Schedule(void ( *)(void *), void *); /** - * @vftbl 15 - * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 15 + * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void StartThread(void ( *)(void *), void *); /** - * @vftbl 16 - * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status GetTestDirectory(std::string *); /** - * @vftbl 17 - * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z + * @vftbl 17 + * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z */ virtual class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @vftbl 18 - * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ + * @vftbl 18 + * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ */ virtual unsigned __int64 NowMicros(); /** - * @vftbl 19 - * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z + * @vftbl 19 + * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); /** - * @vftbl 20 - * @symbol ?flushToPermanentStorage\@InMemoryEnv\@\@UEAAXXZ + * @vftbl 20 + * @symbol ?flushToPermanentStorage\@InMemoryEnv\@\@UEAAXXZ */ virtual void flushToPermanentStorage(); /** - * @symbol ??0InMemoryEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@AEBVPath\@Core\@\@\@Z + * @symbol ??0InMemoryEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@AEBVPath\@Core\@\@\@Z */ MCAPI InMemoryEnv(class leveldb::Env *, class Core::Path const &); //private: /** - * @symbol ?_flushWithTransaction\@InMemoryEnv\@\@AEAAXXZ + * @symbol ?_flushWithTransaction\@InMemoryEnv\@\@AEAAXXZ */ MCAPI void _flushWithTransaction(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InMemoryFile.hpp b/LiteLoader/include/llapi/mc/InMemoryFile.hpp index 40d6accebe..71aaca95db 100644 --- a/LiteLoader/include/llapi/mc/InMemoryFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryFile.hpp @@ -31,52 +31,52 @@ class InMemoryFile { public: /** - * @symbol ??0InMemoryFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z + * @symbol ??0InMemoryFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ MCAPI InMemoryFile(class Core::Path const &); /** - * @symbol ?append\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z + * @symbol ?append\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z */ MCAPI class leveldb::Status append(class leveldb::Slice const &); /** - * @symbol ?close\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@W4InMemoryAccessMode\@\@\@Z + * @symbol ?close\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@W4InMemoryAccessMode\@\@\@Z */ MCAPI class leveldb::Status close(enum class InMemoryAccessMode); /** - * @symbol ?flushToDisk\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@PEAVEnv\@3\@\@Z + * @symbol ?flushToDisk\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@PEAVEnv\@3\@\@Z */ MCAPI class leveldb::Status flushToDisk(class leveldb::Env *); /** - * @symbol ?getFilename\@InMemoryFile\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getFilename\@InMemoryFile\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getFilename() const; /** - * @symbol ?isMarkedDirty\@InMemoryFile\@\@QEBA_NXZ + * @symbol ?isMarkedDirty\@InMemoryFile\@\@QEBA_NXZ */ MCAPI bool isMarkedDirty() const; /** - * @symbol ?isSafeToDelete\@InMemoryFile\@\@QEBA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isSafeToDelete\@InMemoryFile\@\@QEBA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isSafeToDelete(std::string &) const; /** - * @symbol ?markForDelete\@InMemoryFile\@\@QEAAXXZ + * @symbol ?markForDelete\@InMemoryFile\@\@QEAAXXZ */ MCAPI void markForDelete(); /** - * @symbol ?open\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@W4InMemoryAccessMode\@\@\@Z + * @symbol ?open\@InMemoryFile\@\@QEAA?AVStatus\@leveldb\@\@W4InMemoryAccessMode\@\@\@Z */ MCAPI class leveldb::Status open(enum class InMemoryAccessMode); /** - * @symbol ?read\@InMemoryFile\@\@QEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEADAEA_K\@Z + * @symbol ?read\@InMemoryFile\@\@QEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEADAEA_K\@Z */ MCAPI class leveldb::Status read(unsigned __int64, unsigned __int64, class leveldb::Slice *, char *, unsigned __int64 &) const; /** - * @symbol ?rename\@InMemoryFile\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?rename\@InMemoryFile\@\@QEAAXAEBVPath\@Core\@\@\@Z */ MCAPI void rename(class Core::Path const &); /** - * @symbol ??1InMemoryFile\@\@QEAA\@XZ + * @symbol ??1InMemoryFile\@\@QEAA\@XZ */ MCAPI ~InMemoryFile(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp b/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp index e8d7cbbddc..9d1912f2cc 100644 --- a/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryFileStorage.hpp @@ -31,32 +31,32 @@ class InMemoryFileStorage { public: /** - * @symbol ??0InMemoryFileStorage\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z + * @symbol ??0InMemoryFileStorage\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z */ MCAPI InMemoryFileStorage(class leveldb::Env *); /** - * @symbol ?createFile\@InMemoryFileStorage\@\@QEAA?AV?$shared_ptr\@VInMemoryFile\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?createFile\@InMemoryFileStorage\@\@QEAA?AV?$shared_ptr\@VInMemoryFile\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCAPI class std::shared_ptr createFile(class Core::Path const &); /** - * @symbol ?deleteFile\@InMemoryFileStorage\@\@QEAA_NAEBVPath\@Core\@\@\@Z + * @symbol ?deleteFile\@InMemoryFileStorage\@\@QEAA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool deleteFile(class Core::Path const &); /** - * @symbol ?findFile\@InMemoryFileStorage\@\@QEAA_NAEBVPath\@Core\@\@AEAV?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z + * @symbol ?findFile\@InMemoryFileStorage\@\@QEAA_NAEBVPath\@Core\@\@AEAV?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z */ MCAPI bool findFile(class Core::Path const &, class std::shared_ptr &); /** - * @symbol ?flushToDisk\@InMemoryFileStorage\@\@QEAAXXZ + * @symbol ?flushToDisk\@InMemoryFileStorage\@\@QEAAXXZ */ MCAPI void flushToDisk(); /** - * @symbol ?populateFileList\@InMemoryFileStorage\@\@QEAAXAEAV?$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 ?populateFileList\@InMemoryFileStorage\@\@QEAAXAEAV?$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 void populateFileList(std::vector &); /** - * @symbol ??1InMemoryFileStorage\@\@QEAA\@XZ + * @symbol ??1InMemoryFileStorage\@\@QEAA\@XZ */ MCAPI ~InMemoryFileStorage(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp b/LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp index 9146d1d660..474fa975b0 100644 --- a/LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryRandomAccessFile.hpp @@ -30,18 +30,18 @@ class InMemoryRandomAccessFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InMemoryRandomAccessFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Read\@InMemoryRandomAccessFile\@\@UEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEAD\@Z + * @vftbl 1 + * @symbol ?Read\@InMemoryRandomAccessFile\@\@UEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEAD\@Z */ virtual class leveldb::Status Read(unsigned __int64, unsigned __int64, class leveldb::Slice *, char *) const; /** - * @symbol ??0InMemoryRandomAccessFile\@\@QEAA\@V?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z + * @symbol ??0InMemoryRandomAccessFile\@\@QEAA\@V?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z */ MCAPI InMemoryRandomAccessFile(class std::shared_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp b/LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp index 3bf68431a9..b27f42d2f5 100644 --- a/LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemorySequentialFile.hpp @@ -30,23 +30,23 @@ class InMemorySequentialFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InMemorySequentialFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Read\@InMemorySequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_KPEAVSlice\@3\@PEAD\@Z + * @vftbl 1 + * @symbol ?Read\@InMemorySequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_KPEAVSlice\@3\@PEAD\@Z */ virtual class leveldb::Status Read(unsigned __int64, class leveldb::Slice *, char *); /** - * @vftbl 2 - * @symbol ?Skip\@InMemorySequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_K\@Z + * @vftbl 2 + * @symbol ?Skip\@InMemorySequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_K\@Z */ virtual class leveldb::Status Skip(unsigned __int64); /** - * @symbol ??0InMemorySequentialFile\@\@QEAA\@V?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z + * @symbol ??0InMemorySequentialFile\@\@QEAA\@V?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z */ MCAPI InMemorySequentialFile(class std::shared_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp b/LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp index 2da8ba8516..eb283f852f 100644 --- a/LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/InMemoryWritableFile.hpp @@ -30,33 +30,33 @@ class InMemoryWritableFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InMemoryWritableFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Append\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z + * @vftbl 1 + * @symbol ?Append\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z */ virtual class leveldb::Status Append(class leveldb::Slice const &); /** - * @vftbl 2 - * @symbol ?Close\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 2 + * @symbol ?Close\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Close(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INMEMORYWRITABLEFILE /** - * @symbol ?Flush\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @symbol ?Flush\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ MCVAPI class leveldb::Status Flush(); /** - * @symbol ?Sync\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @symbol ?Sync\@InMemoryWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ MCVAPI class leveldb::Status Sync(); #endif /** - * @symbol ??0InMemoryWritableFile\@\@QEAA\@V?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z + * @symbol ??0InMemoryWritableFile\@\@QEAA\@V?$shared_ptr\@VInMemoryFile\@\@\@std\@\@\@Z */ MCAPI InMemoryWritableFile(class std::shared_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InPackagePackSource.hpp b/LiteLoader/include/llapi/mc/InPackagePackSource.hpp index 375e0f2f17..cb3fa45136 100644 --- a/LiteLoader/include/llapi/mc/InPackagePackSource.hpp +++ b/LiteLoader/include/llapi/mc/InPackagePackSource.hpp @@ -31,48 +31,48 @@ class InPackagePackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InPackagePackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getPackOrigin\@InPackagePackSource\@\@UEBA?AW4PackOrigin\@\@XZ + * @vftbl 3 + * @symbol ?getPackOrigin\@InPackagePackSource\@\@UEBA?AW4PackOrigin\@\@XZ */ virtual enum class PackOrigin getPackOrigin() const; /** - * @vftbl 4 - * @symbol ?getPackType\@InPackagePackSource\@\@UEBA?AW4PackType\@\@XZ + * @vftbl 4 + * @symbol ?getPackType\@InPackagePackSource\@\@UEBA?AW4PackType\@\@XZ */ virtual enum class PackType getPackType() const; /** - * @vftbl 5 - * @symbol ?load\@InPackagePackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 5 + * @symbol ?load\@InPackagePackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual class PackSourceReport load(class IPackManifestFactory &, class gsl::not_null> const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INPACKAGEPACKSOURCE /** - * @symbol ?forEachPack\@InPackagePackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPack\@InPackagePackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPack(class std::function); /** - * @symbol ?forEachPackConst\@InPackagePackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPackConst\@InPackagePackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPackConst(class std::function) const; #endif /** - * @symbol ??0InPackagePackSource\@\@QEAA\@AEBV?$shared_ptr\@VIInPackagePacks\@\@\@std\@\@W4PackType\@\@\@Z + * @symbol ??0InPackagePackSource\@\@QEAA\@AEBV?$shared_ptr\@VIInPackagePacks\@\@\@std\@\@W4PackType\@\@\@Z */ MCAPI InPackagePackSource(class std::shared_ptr const &, enum class PackType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp b/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp index 9bb426abe5..26ac841658 100644 --- a/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/InWaterSensingSystem.hpp @@ -28,16 +28,16 @@ class InWaterSensingSystem { public: /** - * @symbol ?createSystem\@InWaterSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@InWaterSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?doInWaterSensing\@InWaterSensingSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@AEAUFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasEnteredWaterFlag\@\@\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@UVehicleComponent\@\@\@\@\@\@\@Z + * @symbol ?doInWaterSensing\@InWaterSensingSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUUpdateWaterStateRequestComponent\@\@AEAUFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@UVehicleComponent\@\@\@\@\@\@\@Z */ - MCAPI static void doInWaterSensing(class StrictEntityContext &, struct UpdateWaterStateRequestComponent const &, struct FallDistanceComponent &, class Optional const>, class Optional, class Optional const>, class EntityModifierT, class FlagComponent>, class ViewT, struct VehicleComponent>>); + MCAPI static void doInWaterSensing(class StrictEntityContext &, struct UpdateWaterStateRequestComponent const &, struct FallDistanceComponent &, class Optional const>, class Optional, class Optional const>, class EntityModifierT>, class ViewT, struct VehicleComponent>>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IndexSet.hpp b/LiteLoader/include/llapi/mc/IndexSet.hpp index d8322f96f0..5e5e96d153 100644 --- a/LiteLoader/include/llapi/mc/IndexSet.hpp +++ b/LiteLoader/include/llapi/mc/IndexSet.hpp @@ -28,40 +28,40 @@ class IndexSet { public: /** - * @symbol ??0IndexSet\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0IndexSet\@\@QEAA\@XZ */ - MCAPI IndexSet(class IndexSet const &); + MCAPI IndexSet(); /** - * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0IndexSet\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI IndexSet(class IndexSet &&); /** - * @symbol ??0IndexSet\@\@QEAA\@XZ + * @symbol ??0IndexSet\@\@QEAA\@AEBV0\@\@Z */ - MCAPI IndexSet(); + MCAPI IndexSet(class IndexSet const &); /** - * @symbol ?contains\@IndexSet\@\@QEBA_N_K\@Z + * @symbol ?contains\@IndexSet\@\@QEBA_N_K\@Z */ MCAPI bool contains(unsigned __int64) const; /** - * @symbol ?getPacked\@IndexSet\@\@QEBAAEBV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@XZ + * @symbol ?getPacked\@IndexSet\@\@QEBAAEBV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getPacked() const; /** - * @symbol ?insert\@IndexSet\@\@QEAAX_K\@Z + * @symbol ?insert\@IndexSet\@\@QEAAX_K\@Z */ MCAPI void insert(unsigned __int64); /** - * @symbol ??8IndexSet\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8IndexSet\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class IndexSet const &) const; /** - * @symbol ?remove\@IndexSet\@\@QEAAX_K\@Z + * @symbol ?remove\@IndexSet\@\@QEAAX_K\@Z */ MCAPI void remove(unsigned __int64); /** - * @symbol ??1IndexSet\@\@QEAA\@XZ + * @symbol ??1IndexSet\@\@QEAA\@XZ */ MCAPI ~IndexSet(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InfestedBlock.hpp b/LiteLoader/include/llapi/mc/InfestedBlock.hpp index c9587adb16..ff8bb26ab5 100644 --- a/LiteLoader/include/llapi/mc/InfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedBlock.hpp @@ -31,212 +31,217 @@ class InfestedBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InfestedBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@InfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @symbol ?spawnResources\@InfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ virtual void spawnResources(class BlockSource &, class BlockPos const &, class Block const &, class Randomize &, struct ResourceDropsContext const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@InfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @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 189 - * @symbol ?getSilkTouchItemInstance\@InfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @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\@\@HAEBVMaterial\@\@\@Z */ MCAPI InfestedBlock(std::string const &, int, class Material const &); /** - * @symbol ?spawnSilverfish\@InfestedBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?spawnSilverfish\@InfestedBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void spawnSilverfish(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp index 37300fb2f7..76c41087c2 100644 --- a/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/InfestedDeepslateBlock.hpp @@ -31,198 +31,203 @@ class InfestedDeepslateBlock : public RotatedPillarInfestedBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InfestedDeepslateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 160 - * @symbol ?tryGetUninfested\@InfestedDeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 160 + * @symbol ?tryGetUninfested\@InfestedDeepslateBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0InfestedDeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0InfestedDeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI InfestedDeepslateBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp index 84c7d6e780..b15240a4fe 100644 --- a/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/InitialTickFilterSystem.hpp @@ -28,28 +28,28 @@ class InitialTickFilterSystem { public: /** - * @symbol ?blockFilterTickEntity\@InitialTickFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?blockFilterTickEntity\@InitialTickFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void blockFilterTickEntity(class StrictEntityContext const &, struct StateVectorComponent const &, class EntityModifierT> &, class IConstBlockSource const &); /** - * @symbol ?createBlockFilterSystem\@InitialTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createBlockFilterSystem\@InitialTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createBlockFilterSystem(); /** - * @symbol ?createTickingAreaFilterSystem\@InitialTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createTickingAreaFilterSystem\@InitialTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createTickingAreaFilterSystem(); /** - * @symbol ?tickingAreaFilterTickEntity\@InitialTickFilterSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVTickWorldComponent\@\@AEBUCurrentTickComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z + * @symbol ?tickingAreaFilterTickEntity\@InitialTickFilterSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVTickWorldComponent\@\@AEBUCurrentTickComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z */ MCAPI static void tickingAreaFilterTickEntity(class StrictEntityContext &, class TickWorldComponent &, struct CurrentTickComponent const &, class EntityModifierT> &); //private: /** - * @symbol ?_blockFilterTickView\@InitialTickFilterSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UGlobalActorFlag\@\@\@\@USideBySideSimulatorComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z + * @symbol ?_blockFilterTickView\@InitialTickFilterSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@$$CBUStateVectorComponent\@\@U?$Exclude\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UGlobalActorFlag\@\@\@\@USideBySideSimulatorComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@\@Z */ MCAPI static void _blockFilterTickView(class ViewT>, struct StateVectorComponent const, struct Exclude, class FlagComponent, struct SideBySideSimulatorComponent>>, class ViewT, class OptionalGlobalT, class EntityModifierT>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp b/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp index c03040dd5d..3fe967b89d 100644 --- a/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp +++ b/LiteLoader/include/llapi/mc/InsideBlockEventMap.hpp @@ -23,62 +23,65 @@ class InsideBlockEventMap { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INSIDEBLOCKEVENTMAP public: - class InsideBlockEventMap& operator=(class InsideBlockEventMap const &) = delete; InsideBlockEventMap() = delete; #endif public: /** - * @symbol ??0InsideBlockEventMap\@\@QEAA\@AEBVBlock\@\@_N11AEBVActorDefinitionTrigger\@\@2\@Z + * @symbol ??0InsideBlockEventMap\@\@QEAA\@AEBVBlock\@\@_N11AEBVActorDefinitionTrigger\@\@2\@Z */ MCAPI InsideBlockEventMap(class Block const &, bool, bool, bool, class ActorDefinitionTrigger const &, class ActorDefinitionTrigger const &); /** - * @symbol ??0InsideBlockEventMap\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0InsideBlockEventMap\@\@QEAA\@AEBV0\@\@Z */ MCAPI InsideBlockEventMap(class InsideBlockEventMap const &); /** - * @symbol ?getBlock\@InsideBlockEventMap\@\@QEBA?AV?$not_null\@PEBVBlock\@\@\@gsl\@\@XZ + * @symbol ?getBlock\@InsideBlockEventMap\@\@QEBA?AV?$not_null\@PEBVBlock\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null getBlock() const; /** - * @symbol ?getEnteredEvent\@InsideBlockEventMap\@\@QEBAAEBVActorDefinitionTrigger\@\@XZ + * @symbol ?getEnteredEvent\@InsideBlockEventMap\@\@QEBAAEBVActorDefinitionTrigger\@\@XZ */ MCAPI class ActorDefinitionTrigger const & getEnteredEvent() const; /** - * @symbol ?getExitedEvent\@InsideBlockEventMap\@\@QEBAAEBVActorDefinitionTrigger\@\@XZ + * @symbol ?getExitedEvent\@InsideBlockEventMap\@\@QEBAAEBVActorDefinitionTrigger\@\@XZ */ MCAPI class ActorDefinitionTrigger const & getExitedEvent() const; /** - * @symbol ?isActorCurrentlyInside\@InsideBlockEventMap\@\@QEBA_NXZ + * @symbol ?isActorCurrentlyInside\@InsideBlockEventMap\@\@QEBA_NXZ */ MCAPI bool isActorCurrentlyInside() const; /** - * @symbol ?isIgnoringStates\@InsideBlockEventMap\@\@QEBA_NXZ + * @symbol ?isIgnoringStates\@InsideBlockEventMap\@\@QEBA_NXZ */ MCAPI bool isIgnoringStates() const; /** - * @symbol ?isWatchingIfActorEnters\@InsideBlockEventMap\@\@QEBA_NXZ + * @symbol ?isWatchingIfActorEnters\@InsideBlockEventMap\@\@QEBA_NXZ */ MCAPI bool isWatchingIfActorEnters() const; /** - * @symbol ?isWatchingIfActorExits\@InsideBlockEventMap\@\@QEBA_NXZ + * @symbol ?isWatchingIfActorExits\@InsideBlockEventMap\@\@QEBA_NXZ */ MCAPI bool isWatchingIfActorExits() const; /** - * @symbol ?setCurrentlyInside\@InsideBlockEventMap\@\@QEAAX_N\@Z + * @symbol ??4InsideBlockEventMap\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class InsideBlockEventMap & operator=(class InsideBlockEventMap const &); + /** + * @symbol ?setCurrentlyInside\@InsideBlockEventMap\@\@QEAAX_N\@Z */ MCAPI void setCurrentlyInside(bool); /** - * @symbol ?setWasInside\@InsideBlockEventMap\@\@QEAAX_N\@Z + * @symbol ?setWasInside\@InsideBlockEventMap\@\@QEAAX_N\@Z */ MCAPI void setWasInside(bool); /** - * @symbol ?wasActorInsideLastTick\@InsideBlockEventMap\@\@QEBA_NXZ + * @symbol ?wasActorInsideLastTick\@InsideBlockEventMap\@\@QEBA_NXZ */ MCAPI bool wasActorInsideLastTick() const; /** - * @symbol ??1InsideBlockEventMap\@\@QEAA\@XZ + * @symbol ??1InsideBlockEventMap\@\@QEAA\@XZ */ MCAPI ~InsideBlockEventMap(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideBlockNotifierComponent.hpp b/LiteLoader/include/llapi/mc/InsideBlockNotifierComponent.hpp index f29c54d206..945821eb9e 100644 --- a/LiteLoader/include/llapi/mc/InsideBlockNotifierComponent.hpp +++ b/LiteLoader/include/llapi/mc/InsideBlockNotifierComponent.hpp @@ -30,20 +30,20 @@ class InsideBlockNotifierComponent { public: /** - * @symbol ?getBlockList\@InsideBlockNotifierComponent\@\@QEBAAEBV?$vector\@VInsideBlockEventMap\@\@V?$allocator\@VInsideBlockEventMap\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getBlockList\@InsideBlockNotifierComponent\@\@QEBAAEBV?$vector\@VInsideBlockEventMap\@\@V?$allocator\@VInsideBlockEventMap\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getBlockList() const; /** - * @symbol ?isTrackedBlock\@InsideBlockNotifierComponent\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?isTrackedBlock\@InsideBlockNotifierComponent\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool isTrackedBlock(class Block const &) const; /** - * @symbol ?resetBlocksInsideState\@InsideBlockNotifierComponent\@\@QEAAXXZ + * @symbol ?resetBlocksInsideState\@InsideBlockNotifierComponent\@\@QEAAXXZ */ MCAPI void resetBlocksInsideState(); /** - * @symbol ?setInsideBlock\@InsideBlockNotifierComponent\@\@QEAAXAEBVBlock\@\@_N\@Z + * @symbol ?setInsideBlock\@InsideBlockNotifierComponent\@\@QEAAXAEBVBlock\@\@_N\@Z */ MCAPI void setInsideBlock(class Block const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideBlockNotifierDefinition.hpp b/LiteLoader/include/llapi/mc/InsideBlockNotifierDefinition.hpp index e205095f5b..36bde87b89 100644 --- a/LiteLoader/include/llapi/mc/InsideBlockNotifierDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InsideBlockNotifierDefinition.hpp @@ -31,12 +31,12 @@ class InsideBlockNotifierDefinition { public: /** - * @symbol ?initialize\@InsideBlockNotifierDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVInsideBlockNotifierComponent\@\@\@Z + * @symbol ?initialize\@InsideBlockNotifierDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVInsideBlockNotifierComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class InsideBlockNotifierComponent &) const; /** - * @symbol ?buildSchema\@InsideBlockNotifierDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInsideBlockNotifierDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@InsideBlockNotifierDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInsideBlockNotifierDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideBlockNotifierSystem.hpp b/LiteLoader/include/llapi/mc/InsideBlockNotifierSystem.hpp index 20aca3df1a..66fafa8237 100644 --- a/LiteLoader/include/llapi/mc/InsideBlockNotifierSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideBlockNotifierSystem.hpp @@ -30,19 +30,19 @@ class InsideBlockNotifierSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InsideBlockNotifierSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@InsideBlockNotifierSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@InsideBlockNotifierSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp b/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp index 4e7f9b0355..d9137c3473 100644 --- a/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/InsideBubbleColumnBlockComponent.hpp @@ -28,11 +28,11 @@ struct InsideBubbleColumnBlockComponent { public: /** - * @symbol ??4InsideBubbleColumnBlockComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4InsideBubbleColumnBlockComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct InsideBubbleColumnBlockComponent & operator=(struct InsideBubbleColumnBlockComponent &&); /** - * @symbol ??1InsideBubbleColumnBlockComponent\@\@QEAA\@XZ + * @symbol ??1InsideBubbleColumnBlockComponent\@\@QEAA\@XZ */ MCAPI ~InsideBubbleColumnBlockComponent(); diff --git a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp index 4ac0493fb5..e4a351a40f 100644 --- a/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideBubbleColumnSystem.hpp @@ -28,16 +28,16 @@ class InsideBubbleColumnSystem { public: /** - * @symbol ?createBoatInsideBubbleColumnSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createBoatInsideBubbleColumnSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createBoatInsideBubbleColumnSystem(); /** - * @symbol ?createBubbleColumnMovementSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createBubbleColumnMovementSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createBubbleColumnMovementSystem(); /** - * @symbol ?createSpawnBubbleColumnParticlesSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSpawnBubbleColumnParticlesSystem\@InsideBubbleColumnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSpawnBubbleColumnParticlesSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp index 55fb9e89ff..9ca5f9524a 100644 --- a/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideCactusBlockSystem.hpp @@ -28,8 +28,8 @@ class InsideCactusBlockSystem { public: /** - * @symbol ?createSystem\@InsideCactusBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@InsideCactusBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystem.hpp index f5ba7691b0..c51256f5ba 100644 --- a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystem.hpp @@ -28,8 +28,8 @@ class InsideEndPortalBlockSystem { public: /** - * @symbol ?createSystem\@InsideEndPortalBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@InsideEndPortalBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp index d8c98afdfe..43f0831464 100644 --- a/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideEndPortalBlockSystemImpl.hpp @@ -28,8 +28,8 @@ class InsideEndPortalBlockSystemImpl { public: /** - * @symbol ?_tickInsideEndPortalBlockSystem\@InsideEndPortalBlockSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_tickInsideEndPortalBlockSystem\@InsideEndPortalBlockSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tickInsideEndPortalBlockSystem(class StrictEntityContext &, struct InsideBlockWithPosAndBlockComponent const &, class ActorOwnerComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideGenericBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideGenericBlockSystem.hpp index 7565b72844..99df19a8e2 100644 --- a/LiteLoader/include/llapi/mc/InsideGenericBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideGenericBlockSystem.hpp @@ -28,8 +28,8 @@ class InsideGenericBlockSystem { public: /** - * @symbol ?createSystem\@InsideGenericBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@InsideGenericBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp index 1dd3c8d486..c644ec45dd 100644 --- a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystem.hpp @@ -28,12 +28,12 @@ class InsideHoneyBlockSystem { public: /** - * @symbol ?createEventsSystem\@InsideHoneyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createEventsSystem\@InsideHoneyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createEventsSystem(); /** - * @symbol ?createMovementSystem\@InsideHoneyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createMovementSystem\@InsideHoneyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createMovementSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp index 9088e2018b..bf8a401bf9 100644 --- a/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideHoneyBlockSystemImpl.hpp @@ -28,12 +28,12 @@ class InsideHoneyBlockSystemImpl { public: /** - * @symbol ?isSlidingDown\@InsideHoneyBlockSystemImpl\@\@SA_NAEBVBlockPos\@\@AEBVVec3\@\@1AEBVVec2\@\@\@Z + * @symbol ?isSlidingDown\@InsideHoneyBlockSystemImpl\@\@SA_NAEBVBlockPos\@\@AEBVVec3\@\@1AEBVVec2\@\@\@Z */ MCAPI static bool isSlidingDown(class BlockPos const &, class Vec3 const &, class Vec3 const &, class Vec2 const &); /** - * @symbol ?movementSystem\@InsideHoneyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UHoneyBlockFlag\@\@\@\@AEBUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@\@Z + * @symbol ?movementSystem\@InsideHoneyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosAndBlockComponent\@UHoneyBlockFlag\@\@\@\@AEBUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@\@Z */ MCAPI static void movementSystem(class StrictEntityContext const &, struct InsideBlockWithPosAndBlockComponent const &, struct AABBShapeComponent const &, struct StateVectorComponent &, struct FallDistanceComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp index 167a45659d..9988a3389a 100644 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystem.hpp @@ -28,20 +28,20 @@ class InsidePowderSnowBlockSystem { public: /** - * @symbol ?createClientSideSpawnParticleSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientSideSpawnParticleSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientSideSpawnParticleSystem(); /** - * @symbol ?createMovementSlowdownSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createMovementSlowdownSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createMovementSlowdownSystem(); /** - * @symbol ?createServerSideClearFireSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerSideClearFireSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createServerSideClearFireSystem(); /** - * @symbol ?createServerSideFreezingSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerSideFreezingSystem\@InsidePowderSnowBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static 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 1d65fd1d58..4a6f90fe1e 100644 --- a/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsidePowderSnowBlockSystemImpl.hpp @@ -28,8 +28,8 @@ class InsidePowderSnowBlockSystemImpl { public: /** - * @symbol ?SLOWDOWN_MODIFIER\@InsidePowderSnowBlockSystemImpl\@\@2VVec3\@\@B + * @symbol ?SLOWDOWN_MODIFIER\@InsidePowderSnowBlockSystemImpl\@\@2VVec3\@\@B */ MCAPI static class Vec3 const SLOWDOWN_MODIFIER; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp index f587066da5..433ca7a54b 100644 --- a/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideSweetBerryBushBlockSystem.hpp @@ -28,8 +28,8 @@ class InsideSweetBerryBushBlockSystem { public: /** - * @symbol ?createSystem\@InsideSweetBerryBushBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@InsideSweetBerryBushBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp index 85e0de332d..954ee09006 100644 --- a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystem.hpp @@ -28,12 +28,12 @@ class InsideWaterlilyBlockSystem { public: /** - * @symbol ?createDestroyWaterlilySystem\@InsideWaterlilyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createDestroyWaterlilySystem\@InsideWaterlilyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createDestroyWaterlilySystem(); /** - * @symbol ?createMovementSystem\@InsideWaterlilyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createMovementSystem\@InsideWaterlilyBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createMovementSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp index ea8c6af26c..894d8303ad 100644 --- a/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/InsideWaterlilyBlockSystemImpl.hpp @@ -28,8 +28,8 @@ class InsideWaterlilyBlockSystemImpl { public: /** - * @symbol ?_tickMovementSystem\@InsideWaterlilyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_tickMovementSystem\@InsideWaterlilyBlockSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBU?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _tickMovementSystem(class StrictEntityContext const &, struct InsideBlockWithPosComponent const &, struct StateVectorComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp b/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp index 1ab2fb775f..e546fe7c1c 100644 --- a/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsideWebBlockSystem.hpp @@ -28,16 +28,16 @@ class InsideWebBlockSystem { public: /** - * @symbol ?SLOWDOWN_MULTIPLIER\@InsideWebBlockSystem\@\@2VVec3\@\@B + * @symbol ?SLOWDOWN_MULTIPLIER\@InsideWebBlockSystem\@\@2VVec3\@\@B */ MCAPI static class Vec3 const SLOWDOWN_MULTIPLIER; /** - * @symbol ?_applySlowdown\@InsideWebBlockSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z + * @symbol ?_applySlowdown\@InsideWebBlockSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUBlockMovementSlowdownMultiplierComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UBlockMovementSlowdownAppliedComponent\@\@\@\@\@Z */ MCAPI static void _applySlowdown(class StrictEntityContext &, struct BlockMovementSlowdownMultiplierComponent &, class EntityModifierT); /** - * @symbol ?createSlowdownSystem\@InsideWebBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSlowdownSystem\@InsideWebBlockSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSlowdownSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsomniaComponent.hpp b/LiteLoader/include/llapi/mc/InsomniaComponent.hpp index 8ae41cb5a7..a09a2b534d 100644 --- a/LiteLoader/include/llapi/mc/InsomniaComponent.hpp +++ b/LiteLoader/include/llapi/mc/InsomniaComponent.hpp @@ -30,28 +30,28 @@ class InsomniaComponent { public: /** - * @symbol ?addAdditionalSaveData\@InsomniaComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@InsomniaComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getInsomniaTimerTicks\@InsomniaComponent\@\@QEBAHXZ + * @symbol ?getInsomniaTimerTicks\@InsomniaComponent\@\@QEBAHXZ */ MCAPI int getInsomniaTimerTicks() const; /** - * @symbol ?getTicksUntilInsomnia\@InsomniaComponent\@\@QEBAHXZ + * @symbol ?getTicksUntilInsomnia\@InsomniaComponent\@\@QEBAHXZ */ MCAPI int getTicksUntilInsomnia() const; /** - * @symbol ?incrementTimeSinceRest\@InsomniaComponent\@\@QEAAHXZ + * @symbol ?incrementTimeSinceRest\@InsomniaComponent\@\@QEAAHXZ */ MCAPI int incrementTimeSinceRest(); /** - * @symbol ?readAdditionalSaveData\@InsomniaComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@InsomniaComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?restartTimer\@InsomniaComponent\@\@QEAAXXZ + * @symbol ?restartTimer\@InsomniaComponent\@\@QEAAXXZ */ MCAPI void restartTimer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsomniaDefinition.hpp b/LiteLoader/include/llapi/mc/InsomniaDefinition.hpp index 19911ac97f..6a6552ec26 100644 --- a/LiteLoader/include/llapi/mc/InsomniaDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InsomniaDefinition.hpp @@ -31,12 +31,12 @@ class InsomniaDefinition { public: /** - * @symbol ?initialize\@InsomniaDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVInsomniaComponent\@\@\@Z + * @symbol ?initialize\@InsomniaDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVInsomniaComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class InsomniaComponent &) const; /** - * @symbol ?buildSchema\@InsomniaDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInsomniaDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@InsomniaDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInsomniaDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InsomniaSystem.hpp b/LiteLoader/include/llapi/mc/InsomniaSystem.hpp index 105287ec30..361178afed 100644 --- a/LiteLoader/include/llapi/mc/InsomniaSystem.hpp +++ b/LiteLoader/include/llapi/mc/InsomniaSystem.hpp @@ -30,19 +30,19 @@ class InsomniaSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InsomniaSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@InsomniaSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@InsomniaSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp b/LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp index 3297259b67..48ea3dfb85 100644 --- a/LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp +++ b/LiteLoader/include/llapi/mc/InspectBookshelfGoal.hpp @@ -31,58 +31,58 @@ class InspectBookshelfGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InspectBookshelfGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@InspectBookshelfGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@InspectBookshelfGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 6 - * @symbol ?tick\@InspectBookshelfGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@InspectBookshelfGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@InspectBookshelfGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@InspectBookshelfGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@InspectBookshelfGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@InspectBookshelfGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 13 - * @symbol ?_canReach\@InspectBookshelfGoal\@\@MEAA_NAEBVBlockPos\@\@\@Z + * @vftbl 13 + * @symbol ?_canReach\@InspectBookshelfGoal\@\@MEAA_NAEBVBlockPos\@\@\@Z */ virtual bool _canReach(class BlockPos const &); /** - * @vftbl 17 - * @symbol ?findTargetBlock\@InspectBookshelfGoal\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?findTargetBlock\@InspectBookshelfGoal\@\@UEAA_NXZ */ virtual bool findTargetBlock(); /** - * @symbol ??0InspectBookshelfGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z + * @symbol ??0InspectBookshelfGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z */ MCAPI InspectBookshelfGoal(class Mob &, float, int, int, int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InstantDespawnComponent.hpp b/LiteLoader/include/llapi/mc/InstantDespawnComponent.hpp index a2bb13a1d6..1d19143265 100644 --- a/LiteLoader/include/llapi/mc/InstantDespawnComponent.hpp +++ b/LiteLoader/include/llapi/mc/InstantDespawnComponent.hpp @@ -30,12 +30,12 @@ class InstantDespawnComponent { public: /** - * @symbol ?onDespawn\@InstantDespawnComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?onDespawn\@InstantDespawnComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void onDespawn(class Actor &); /** - * @symbol ?tick\@InstantDespawnComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?tick\@InstantDespawnComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void tick(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp b/LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp index fd9999a87b..3effe5eef4 100644 --- a/LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InstantDespawnDefinition.hpp @@ -31,8 +31,8 @@ class InstantDespawnDefinition { public: /** - * @symbol ?buildSchema\@InstantDespawnDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInstantDespawnDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@InstantDespawnDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInstantDespawnDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp b/LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp index cac61809d4..5e29e14477 100644 --- a/LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp +++ b/LiteLoader/include/llapi/mc/InstantDespawnSystem.hpp @@ -30,31 +30,31 @@ class InstantDespawnSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InstantDespawnSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@InstantDespawnSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@InstantDespawnSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?createInstantDespawningPlayerCleanupSystem\@InstantDespawnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createInstantDespawningPlayerCleanupSystem\@InstantDespawnSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createInstantDespawningPlayerCleanupSystem(); //private: /** - * @symbol ?_tickComponent\@InstantDespawnSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVInstantDespawnComponent\@\@\@Z + * @symbol ?_tickComponent\@InstantDespawnSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVInstantDespawnComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class InstantDespawnComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp b/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp index b4a8fc4fec..9d24a9cb89 100644 --- a/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/InstantaneousAttributeBuff.hpp @@ -31,27 +31,33 @@ class InstantaneousAttributeBuff : public AttributeBuff { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InstantaneousAttributeBuff(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isInstantaneous\@InstantaneousAttributeBuff\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isInstantaneous\@InstantaneousAttributeBuff\@\@UEBA_NXZ */ virtual bool isInstantaneous() const; /** - * @vftbl 2 - * @symbol ?isSerializable\@InstantaneousAttributeBuff\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isSerializable\@InstantaneousAttributeBuff\@\@UEBA_NXZ */ virtual bool isSerializable() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INSTANTANEOUSATTRIBUTEBUFF /** - * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MW4AttributeBuffType\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~InstantaneousAttributeBuff(); +#endif + /** + * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MW4AttributeBuffType\@\@\@Z */ MCAPI InstantaneousAttributeBuff(float, enum class AttributeBuffType); /** - * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MAEBVActorDamageSource\@\@\@Z + * @symbol ??0InstantaneousAttributeBuff\@\@QEAA\@MAEBVActorDamageSource\@\@\@Z */ MCAPI InstantaneousAttributeBuff(float, class ActorDamageSource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp b/LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp index 38cdc29dc6..133948f432 100644 --- a/LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp +++ b/LiteLoader/include/llapi/mc/InstantaneousMobEffect.hpp @@ -31,23 +31,23 @@ class InstantaneousMobEffect : public MobEffect { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InstantaneousMobEffect(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?isInstantaneous\@InstantaneousMobEffect\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isInstantaneous\@InstantaneousMobEffect\@\@UEBA_NXZ */ virtual bool isInstantaneous() const; /** - * @vftbl 7 - * @symbol ?isDurationEffectTick\@InstantaneousMobEffect\@\@UEBA_NHH\@Z + * @vftbl 7 + * @symbol ?isDurationEffectTick\@InstantaneousMobEffect\@\@UEBA_NHH\@Z */ virtual bool isDurationEffectTick(int, int) const; /** - * @symbol ??0InstantaneousMobEffect\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z + * @symbol ??0InstantaneousMobEffect\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH\@Z */ MCAPI InstantaneousMobEffect(unsigned int, std::string const &, std::string const &, bool, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Int64Tag.hpp b/LiteLoader/include/llapi/mc/Int64Tag.hpp index fda2895a6a..0dbc4c1645 100644 --- a/LiteLoader/include/llapi/mc/Int64Tag.hpp +++ b/LiteLoader/include/llapi/mc/Int64Tag.hpp @@ -39,52 +39,52 @@ int64_t val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Int64Tag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@Int64Tag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@Int64Tag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@Int64Tag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@Int64Tag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@Int64Tag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@Int64Tag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@Int64Tag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@Int64Tag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@Int64Tag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@Int64Tag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@Int64Tag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@Int64Tag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@Int64Tag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; /** - * @symbol ??0Int64Tag\@\@QEAA\@_J\@Z + * @symbol ??0Int64Tag\@\@QEAA\@_J\@Z */ MCAPI Int64Tag(__int64); /** - * @symbol ??0Int64Tag\@\@QEAA\@XZ + * @symbol ??0Int64Tag\@\@QEAA\@XZ */ MCAPI Int64Tag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IntArrayTag.hpp b/LiteLoader/include/llapi/mc/IntArrayTag.hpp index 5ad1bc57f7..94e0fed77e 100644 --- a/LiteLoader/include/llapi/mc/IntArrayTag.hpp +++ b/LiteLoader/include/llapi/mc/IntArrayTag.hpp @@ -41,48 +41,48 @@ class IntArrayTag : public Tag { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IntArrayTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@IntArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@IntArrayTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@IntArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@IntArrayTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@IntArrayTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@IntArrayTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@IntArrayTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@IntArrayTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@IntArrayTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@IntArrayTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@IntArrayTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@IntArrayTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@IntArrayTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@IntArrayTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; /** - * @symbol ??0IntArrayTag\@\@QEAA\@XZ + * @symbol ??0IntArrayTag\@\@QEAA\@XZ */ MCAPI IntArrayTag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IntComponent.hpp b/LiteLoader/include/llapi/mc/IntComponent.hpp index 5240c6620f..c47a76f6ea 100644 --- a/LiteLoader/include/llapi/mc/IntComponent.hpp +++ b/LiteLoader/include/llapi/mc/IntComponent.hpp @@ -25,7 +25,7 @@ struct IntComponent { public: /** - * @symbol ?getDiff\@IntComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z + * @symbol ?getDiff\@IntComponent\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z */ MCAPI static class std::optional getDiff(struct IntComponent const &, struct IntComponent const &); diff --git a/LiteLoader/include/llapi/mc/IntRange.hpp b/LiteLoader/include/llapi/mc/IntRange.hpp index ad4d50318f..7c109557bb 100644 --- a/LiteLoader/include/llapi/mc/IntRange.hpp +++ b/LiteLoader/include/llapi/mc/IntRange.hpp @@ -31,31 +31,31 @@ struct IntRange { public: /** - * @symbol ??0IntRange\@\@QEAA\@H\@Z + * @symbol ??0IntRange\@\@QEAA\@HH\@Z */ - MCAPI IntRange(int); + MCAPI IntRange(int, int); /** - * @symbol ??0IntRange\@\@QEAA\@HH\@Z + * @symbol ??0IntRange\@\@QEAA\@H\@Z */ - MCAPI IntRange(int, int); + MCAPI IntRange(int); /** - * @symbol ?getValue\@IntRange\@\@QEBAHAEAVRandom\@\@\@Z + * @symbol ?getValue\@IntRange\@\@QEBAHAEAVRandom\@\@\@Z */ MCAPI int getValue(class Random &) const; /** - * @symbol ?getValueInclusive\@IntRange\@\@QEBAHAEAVRandom\@\@\@Z + * @symbol ?getValueInclusive\@IntRange\@\@QEBAHAEAVRandom\@\@\@Z */ MCAPI int getValueInclusive(class Random &) const; /** - * @symbol ?isInRangeInclusive\@IntRange\@\@QEBA_NH\@Z + * @symbol ?isInRangeInclusive\@IntRange\@\@QEBA_NH\@Z */ MCAPI bool isInRangeInclusive(int) const; /** - * @symbol ?parseJson\@IntRange\@\@QEAA_NVValue\@Json\@\@HH\@Z + * @symbol ?parseJson\@IntRange\@\@QEAA_NVValue\@Json\@\@HH\@Z */ MCAPI bool parseJson(class Json::Value, int, int); /** - * @symbol ?ZERO\@IntRange\@\@2U1\@B + * @symbol ?ZERO\@IntRange\@\@2U1\@B */ MCAPI static struct IntRange const ZERO; diff --git a/LiteLoader/include/llapi/mc/IntTag.hpp b/LiteLoader/include/llapi/mc/IntTag.hpp index 1c68dfc290..af93e61513 100644 --- a/LiteLoader/include/llapi/mc/IntTag.hpp +++ b/LiteLoader/include/llapi/mc/IntTag.hpp @@ -39,52 +39,58 @@ int val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IntTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@IntTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@IntTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@IntTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@IntTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@IntTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@IntTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@IntTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@IntTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@IntTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@IntTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@IntTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@IntTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@IntTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@IntTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INTTAG /** - * @symbol ??0IntTag\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI IntTag(); + MCVAPI ~IntTag(); +#endif /** - * @symbol ??0IntTag\@\@QEAA\@H\@Z + * @symbol ??0IntTag\@\@QEAA\@H\@Z */ MCAPI IntTag(int); + /** + * @symbol ??0IntTag\@\@QEAA\@XZ + */ + MCAPI IntTag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InteractActionDefinition.hpp b/LiteLoader/include/llapi/mc/InteractActionDefinition.hpp index bb38a686dc..0598a44ff3 100644 --- a/LiteLoader/include/llapi/mc/InteractActionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InteractActionDefinition.hpp @@ -32,14 +32,14 @@ class InteractActionDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InteractActionDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@InteractActionDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@InteractActionDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InteractActionNode.hpp b/LiteLoader/include/llapi/mc/InteractActionNode.hpp index 98e571195d..4a39b73bda 100644 --- a/LiteLoader/include/llapi/mc/InteractActionNode.hpp +++ b/LiteLoader/include/llapi/mc/InteractActionNode.hpp @@ -29,23 +29,23 @@ class InteractActionNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InteractActionNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@InteractActionNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@InteractActionNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@InteractActionNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@InteractActionNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0InteractActionNode\@\@QEAA\@XZ + * @symbol ??0InteractActionNode\@\@QEAA\@XZ */ MCAPI InteractActionNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InteractComponent.hpp b/LiteLoader/include/llapi/mc/InteractComponent.hpp index 777bfe5798..e1bfaaed94 100644 --- a/LiteLoader/include/llapi/mc/InteractComponent.hpp +++ b/LiteLoader/include/llapi/mc/InteractComponent.hpp @@ -30,28 +30,28 @@ class InteractComponent { public: /** - * @symbol ?getCooldownCounter\@InteractComponent\@\@QEBAFXZ + * @symbol ?getCooldownCounter\@InteractComponent\@\@QEBAFXZ */ MCAPI short getCooldownCounter() const; /** - * @symbol ?getInteraction\@InteractComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@InteractComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?setCooldownCounter\@InteractComponent\@\@QEAAXF\@Z + * @symbol ?setCooldownCounter\@InteractComponent\@\@QEAAXF\@Z */ MCAPI void setCooldownCounter(short); //private: /** - * @symbol ?_runInteraction\@InteractComponent\@\@AEAA_NAEAVActor\@\@AEBUInteraction\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?_runInteraction\@InteractComponent\@\@AEAA_NAEAVActor\@\@AEBUInteraction\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool _runInteraction(class Actor &, struct Interaction const &, class Player &, class ActorInteraction &); /** - * @symbol ?_tryEquipitem\@InteractComponent\@\@CAXAEAVActor\@\@AEAVPlayer\@\@AEAVItemStack\@\@AEBV4\@HAEA_N4\@Z + * @symbol ?_tryEquipitem\@InteractComponent\@\@CAXAEAVActor\@\@AEAVPlayer\@\@AEAVItemStack\@\@AEBV4\@HAEA_N4\@Z */ MCAPI static void _tryEquipitem(class Actor &, class Player &, class ItemStack &, class ItemStack const &, int, bool &, bool &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InteractDefinition.hpp b/LiteLoader/include/llapi/mc/InteractDefinition.hpp index 04e3e8c582..034374161f 100644 --- a/LiteLoader/include/llapi/mc/InteractDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InteractDefinition.hpp @@ -31,16 +31,16 @@ class InteractDefinition { public: /** - * @symbol ?addInteraction\@InteractDefinition\@\@QEAAXAEBUInteraction\@\@\@Z + * @symbol ?addInteraction\@InteractDefinition\@\@QEAAXAEBUInteraction\@\@\@Z */ MCAPI void addInteraction(struct Interaction const &); /** - * @symbol ?initialize\@InteractDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVInteractComponent\@\@\@Z + * @symbol ?initialize\@InteractDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVInteractComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class InteractComponent &) const; /** - * @symbol ?buildSchema\@InteractDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInteractDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@InteractDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VInteractDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InteractPacket.hpp b/LiteLoader/include/llapi/mc/InteractPacket.hpp index 968aa12dbe..ae9bf7c8a7 100644 --- a/LiteLoader/include/llapi/mc/InteractPacket.hpp +++ b/LiteLoader/include/llapi/mc/InteractPacket.hpp @@ -30,37 +30,43 @@ class InteractPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InteractPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@InteractPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@InteractPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@InteractPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@InteractPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@InteractPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@InteractPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@InteractPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@InteractPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INTERACTPACKET /** - * @symbol ??0InteractPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI InteractPacket(); + MCVAPI ~InteractPacket(); +#endif /** - * @symbol ??0InteractPacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@AEBVVec3\@\@\@Z + * @symbol ??0InteractPacket\@\@QEAA\@W4Action\@0\@VActorRuntimeID\@\@AEBVVec3\@\@\@Z */ MCAPI InteractPacket(enum class InteractPacket::Action, class ActorRuntimeID, class Vec3 const &); + /** + * @symbol ??0InteractPacket\@\@QEAA\@XZ + */ + MCAPI InteractPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InteractSystem.hpp b/LiteLoader/include/llapi/mc/InteractSystem.hpp index 5d90afa7a6..8c66040dfd 100644 --- a/LiteLoader/include/llapi/mc/InteractSystem.hpp +++ b/LiteLoader/include/llapi/mc/InteractSystem.hpp @@ -30,19 +30,19 @@ class InteractSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InteractSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@InteractSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@InteractSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Interaction.hpp b/LiteLoader/include/llapi/mc/Interaction.hpp index dbd738d0b3..d116cf33f9 100644 --- a/LiteLoader/include/llapi/mc/Interaction.hpp +++ b/LiteLoader/include/llapi/mc/Interaction.hpp @@ -28,47 +28,47 @@ struct Interaction { public: /** - * @symbol ??0Interaction\@\@QEAA\@XZ + * @symbol ??0Interaction\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI Interaction(); + MCAPI Interaction(struct Interaction &&); /** - * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0Interaction\@\@QEAA\@AEBU0\@\@Z */ MCAPI Interaction(struct Interaction const &); /** - * @symbol ??0Interaction\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0Interaction\@\@QEAA\@XZ */ - MCAPI Interaction(struct Interaction &&); + MCAPI Interaction(); /** - * @symbol ?addActorDefinitionIdentifierByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addActorDefinitionIdentifierByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addActorDefinitionIdentifierByName(std::string const &); /** - * @symbol ?addLevelSoundEventByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addLevelSoundEventByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addLevelSoundEventByName(std::string const &); /** - * @symbol ?addVibrationByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addVibrationByName\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addVibrationByName(std::string const &); /** - * @symbol ?setCooldown\@Interaction\@\@QEAAXAEBM\@Z + * @symbol ?setCooldown\@Interaction\@\@QEAAXAEBM\@Z */ MCAPI void setCooldown(float const &); /** - * @symbol ?setCooldownAfterBeingAttacked\@Interaction\@\@QEAAXAEBM\@Z + * @symbol ?setCooldownAfterBeingAttacked\@Interaction\@\@QEAAXAEBM\@Z */ MCAPI void setCooldownAfterBeingAttacked(float const &); /** - * @symbol ?setParticleType\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setParticleType\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setParticleType(std::string const &); /** - * @symbol ?setTransformItem\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setTransformItem\@Interaction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setTransformItem(std::string const &); /** - * @symbol ??1Interaction\@\@QEAA\@XZ + * @symbol ??1Interaction\@\@QEAA\@XZ */ MCAPI ~Interaction(); diff --git a/LiteLoader/include/llapi/mc/InternalComponentRegistry.hpp b/LiteLoader/include/llapi/mc/InternalComponentRegistry.hpp index cd266b2fcd..fbb31e0291 100644 --- a/LiteLoader/include/llapi/mc/InternalComponentRegistry.hpp +++ b/LiteLoader/include/llapi/mc/InternalComponentRegistry.hpp @@ -30,42 +30,42 @@ class InternalComponentRegistry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InternalComponentRegistry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?registerComponents\@InternalComponentRegistry\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?registerComponents\@InternalComponentRegistry\@\@UEAAXXZ */ virtual void registerComponents(); /** - * @symbol ?addComponentSaveData\@InternalComponentRegistry\@\@QEAAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?addComponentSaveData\@InternalComponentRegistry\@\@QEAAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z */ MCAPI void addComponentSaveData(class Actor const &, class CompoundTag &); /** - * @symbol ?initializeComponents\@InternalComponentRegistry\@\@QEBAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?initializeComponents\@InternalComponentRegistry\@\@QEBAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void initializeComponents(class Actor &, class CompoundTag const &, class DataLoadHelper &) const; /** - * @symbol ?INTERNAL_COMPONENTS\@InternalComponentRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?INTERNAL_COMPONENTS\@InternalComponentRegistry\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const INTERNAL_COMPONENTS; //protected: /** - * @symbol ?_initializeComponents\@InternalComponentRegistry\@\@IEBAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?_initializeComponents\@InternalComponentRegistry\@\@IEBAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void _initializeComponents(class Actor &, class CompoundTag const &, class DataLoadHelper &) const; /** - * @symbol ?_getComponentScope\@InternalComponentRegistry\@\@KAPEBVCompoundTag\@\@AEBV2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getComponentScope\@InternalComponentRegistry\@\@KAPEBVCompoundTag\@\@AEBV2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class CompoundTag const * _getComponentScope(class CompoundTag const &, std::string const &); /** - * @symbol ?_getOrCreateComponentScope\@InternalComponentRegistry\@\@KAAEAVCompoundTag\@\@AEAV2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getOrCreateComponentScope\@InternalComponentRegistry\@\@KAAEAVCompoundTag\@\@AEAV2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class CompoundTag & _getOrCreateComponentScope(class CompoundTag &, std::string const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InternalHelpers.hpp b/LiteLoader/include/llapi/mc/InternalHelpers.hpp index 8064f1b0c4..bc16827b17 100644 --- a/LiteLoader/include/llapi/mc/InternalHelpers.hpp +++ b/LiteLoader/include/llapi/mc/InternalHelpers.hpp @@ -22,11 +22,11 @@ namespace InternalHelpers { #undef AFTER_EXTRA /** - * @symbol ?lastRenderTime\@InternalHelpers\@\@3V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@A + * @symbol ?lastRenderTime\@InternalHelpers\@\@3V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@A */ MCAPI extern class std::chrono::time_point>> lastRenderTime; /** - * @symbol ?toString\@InternalHelpers\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MovePredictionType\@\@\@Z + * @symbol ?toString\@InternalHelpers\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MovePredictionType\@\@\@Z */ MCAPI std::string toString(enum class MovePredictionType); diff --git a/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp b/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp index 07253612f8..20a6e2068a 100644 --- a/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/InternalItemDescriptor.hpp @@ -12,71 +12,68 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure InternalItemDescriptor. - * - */ -struct InternalItemDescriptor { + +class InternalItemDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INTERNALITEMDESCRIPTOR public: - struct InternalItemDescriptor& operator=(struct InternalItemDescriptor const &) = delete; - InternalItemDescriptor(struct InternalItemDescriptor const &) = delete; + class InternalItemDescriptor& operator=(class InternalItemDescriptor const &) = delete; + InternalItemDescriptor(class InternalItemDescriptor const &) = delete; InternalItemDescriptor() = delete; #endif public: /** - * @vftbl 0 - * @symbol ?clone\@InternalItemDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ + * @vftbl 0 + * @symbol ?clone\@InternalItemDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 2 - * @symbol ?sameItem\@InternalItemDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z + * @vftbl 2 + * @symbol ?sameItem\@InternalItemDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z */ virtual bool sameItem(struct ItemDescriptor::ItemEntry const &, bool) const; /** - * @vftbl 3 - * @symbol ?getFullName\@InternalItemDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getFullName\@InternalItemDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getFullName() const; /** - * @vftbl 4 - * @symbol ?getItem\@InternalItemDescriptor\@\@UEBA?AUItemEntry\@ItemDescriptor\@\@XZ + * @vftbl 4 + * @symbol ?getItem\@InternalItemDescriptor\@\@UEBA?AUItemEntry\@ItemDescriptor\@\@XZ */ virtual struct ItemDescriptor::ItemEntry getItem() const; /** - * @vftbl 6 - * @symbol ?toMap\@InternalItemDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?toMap\@InternalItemDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::map, class std::allocator>> toMap() const; /** - * @vftbl 7 - * @symbol ?save\@InternalItemDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ + * @vftbl 7 + * @symbol ?save\@InternalItemDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ */ virtual class std::optional save() const; /** - * @vftbl 9 - * @symbol ?serialize\@InternalItemDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 9 + * @symbol ?serialize\@InternalItemDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void serialize(class BinaryStream &) const; /** - * @vftbl 10 - * @symbol ?getType\@InternalItemDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ + * @vftbl 10 + * @symbol ?getType\@InternalItemDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ */ virtual enum class ItemDescriptor::InternalType getType() const; /** - * @vftbl 12 - * @symbol ?getHash\@InternalItemDescriptor\@\@UEBA_KXZ + * @vftbl 12 + * @symbol ?getHash\@InternalItemDescriptor\@\@UEBA_KXZ */ virtual unsigned __int64 getHash() const; /** - * @symbol ?deserialize\@InternalItemDescriptor\@\@SA?AV?$unique_ptr\@UInternalItemDescriptor\@\@U?$default_delete\@UInternalItemDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@InternalItemDescriptor\@\@SA?AV?$unique_ptr\@UInternalItemDescriptor\@\@U?$default_delete\@UInternalItemDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp b/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp index 5c76ac1576..1c31d9ebc5 100644 --- a/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/InternalSystemInfo.hpp @@ -28,11 +28,11 @@ struct InternalSystemInfo { public: /** - * @symbol ??0InternalSystemInfo\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0InternalSystemInfo\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI InternalSystemInfo(struct InternalSystemInfo &&); /** - * @symbol ??1InternalSystemInfo\@\@QEAA\@XZ + * @symbol ??1InternalSystemInfo\@\@QEAA\@XZ */ MCAPI ~InternalSystemInfo(); diff --git a/LiteLoader/include/llapi/mc/InternalTaskGroup.hpp b/LiteLoader/include/llapi/mc/InternalTaskGroup.hpp index 7360ecf9be..b7cc461ea3 100644 --- a/LiteLoader/include/llapi/mc/InternalTaskGroup.hpp +++ b/LiteLoader/include/llapi/mc/InternalTaskGroup.hpp @@ -30,60 +30,60 @@ class InternalTaskGroup { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InternalTaskGroup(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?getState\@InternalTaskGroup\@\@UEBA?AW4TaskGroupState\@\@XZ + * @vftbl 5 + * @symbol ?getState\@InternalTaskGroup\@\@UEBA?AW4TaskGroupState\@\@XZ */ virtual enum class TaskGroupState getState() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INTERNALTASKGROUP /** - * @symbol ?processCoroutines\@InternalTaskGroup\@\@UEAAXXZ + * @symbol ?processCoroutines\@InternalTaskGroup\@\@UEAAXXZ */ MCVAPI void processCoroutines(); /** - * @symbol ?queue\@InternalTaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?queue\@InternalTaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z */ MCVAPI class std::shared_ptr> queue(struct TaskStartInfoEx const &, class std::function &&, class std::function &&); /** - * @symbol ?queueSync\@InternalTaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z + * @symbol ?queueSync\@InternalTaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z */ MCVAPI class std::shared_ptr> queueSync(struct TaskStartInfoEx const &, class std::function &&); /** - * @symbol ?requeueTask\@InternalTaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z + * @symbol ?requeueTask\@InternalTaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z */ MCVAPI void requeueTask(class std::shared_ptr, bool); /** - * @symbol ?taskComplete\@InternalTaskGroup\@\@UEAAXV?$not_null\@PEAVBackgroundTaskBase\@\@\@gsl\@\@\@Z + * @symbol ?taskComplete\@InternalTaskGroup\@\@UEAAXV?$not_null\@PEAVBackgroundTaskBase\@\@\@gsl\@\@\@Z */ MCVAPI void taskComplete(class gsl::not_null); /** - * @symbol ?taskRegister\@InternalTaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z + * @symbol ?taskRegister\@InternalTaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ MCVAPI void taskRegister(class std::shared_ptr); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp b/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp index 9a58e6dee1..ff8c44abf2 100644 --- a/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp +++ b/LiteLoader/include/llapi/mc/InterpolatedRidingPositionCalculationHelper.hpp @@ -10,42 +10,39 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure InterpolatedRidingPositionCalculationHelper. - * - */ -struct InterpolatedRidingPositionCalculationHelper { + +class InterpolatedRidingPositionCalculationHelper { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INTERPOLATEDRIDINGPOSITIONCALCULATIONHELPER public: - struct InterpolatedRidingPositionCalculationHelper& operator=(struct InterpolatedRidingPositionCalculationHelper const &) = delete; - InterpolatedRidingPositionCalculationHelper(struct InterpolatedRidingPositionCalculationHelper const &) = delete; + class InterpolatedRidingPositionCalculationHelper& operator=(class InterpolatedRidingPositionCalculationHelper const &) = delete; + InterpolatedRidingPositionCalculationHelper(class InterpolatedRidingPositionCalculationHelper const &) = delete; InterpolatedRidingPositionCalculationHelper() = delete; #endif public: /** - * @symbol ?getCamelInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBUSynchedActorDataComponent\@\@\@Z + * @symbol ?getCamelInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@_N\@Z */ - MCAPI static class Vec3 getCamelInterpolatedRidingOffset(struct SynchedActorDataComponent const &); + MCAPI static class Vec3 getCamelInterpolatedRidingOffset(bool); /** - * @symbol ?getCamelInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@_N\@Z + * @symbol ?getCamelInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBUSynchedActorDataComponent\@\@\@Z */ - MCAPI static class Vec3 getCamelInterpolatedRidingOffset(bool); + MCAPI static class Vec3 getCamelInterpolatedRidingOffset(struct SynchedActorDataComponent const &); /** - * @symbol ?getHorseInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z + * @symbol ?getHorseInterpolatedRidingOffset\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z */ MCAPI static class Vec3 getHorseInterpolatedRidingOffset(class StrictEntityContext const &, class ViewT>, struct StandAnimationComponent const>, class ViewT, float); /** - * @symbol ?getInterpolatedBodyRot\@InterpolatedRidingPositionCalculationHelper\@\@SAMAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z + * @symbol ?getInterpolatedBodyRot\@InterpolatedRidingPositionCalculationHelper\@\@SAMAEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUMobBodyRotationComponent\@\@\@\@M\@Z */ MCAPI static float getInterpolatedBodyRot(class StrictEntityContext const &, class ViewT, class ViewT>, struct MobBodyRotationComponent const>, float); /** - * @symbol ?getInterpolatedPosition\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z + * @symbol ?getInterpolatedPosition\@InterpolatedRidingPositionCalculationHelper\@\@SA?AVVec3\@\@AEBVStrictEntityContext\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorRotationComponent\@\@$$CBURenderRotationComponent\@\@$$CBUStateVectorComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@M\@Z */ MCAPI static class Vec3 getInterpolatedPosition(class StrictEntityContext const &, class ViewT, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Inventory.hpp b/LiteLoader/include/llapi/mc/Inventory.hpp index 16afefe154..a2386aedb4 100644 --- a/LiteLoader/include/llapi/mc/Inventory.hpp +++ b/LiteLoader/include/llapi/mc/Inventory.hpp @@ -31,104 +31,104 @@ class Inventory : public FillingContainer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Inventory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?init\@Inventory\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?init\@Inventory\@\@UEAAXXZ */ virtual void init(); /** - * @vftbl 9 - * @symbol ?setItem\@Inventory\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 9 + * @symbol ?setItem\@Inventory\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 10 - * @symbol ?setItemWithForceBalance\@Inventory\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 10 + * @symbol ?setItemWithForceBalance\@Inventory\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setItemWithForceBalance(int, class ItemStack const &, bool); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 20 + * @symbol ?getEmptySlotsCount\@Inventory\@\@UEBAHXZ */ - virtual void __unk_vfn_22(); + virtual int getEmptySlotsCount() const; /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 33 - * @symbol ?add\@Inventory\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual bool add(class ItemStack &); + virtual void __unk_vfn_24(); /** - * @vftbl 34 - * @symbol ?canAdd\@Inventory\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 34 + * @symbol ?add\@Inventory\@\@UEAA_NAEAVItemStack\@\@\@Z */ - virtual bool canAdd(class ItemStack const &) const; + virtual bool add(class ItemStack &); /** - * @vftbl 38 - * @symbol ?getEmptySlotsCount\@Inventory\@\@UEBAHXZ + * @vftbl 35 + * @symbol ?canAdd\@Inventory\@\@UEBA_NAEBVItemStack\@\@\@Z */ - virtual int getEmptySlotsCount() const; + virtual bool canAdd(class ItemStack const &) const; /** - * @vftbl 39 - * @symbol ?getFirstEmptySlot\@Inventory\@\@UEBAHXZ + * @vftbl 39 + * @symbol ?getFirstEmptySlot\@Inventory\@\@UEBAHXZ */ virtual int getFirstEmptySlot() const; /** - * @vftbl 40 - * @symbol ?setContainerSize\@Inventory\@\@UEAAXH\@Z + * @vftbl 40 + * @symbol ?setContainerSize\@Inventory\@\@UEAAXH\@Z */ virtual void setContainerSize(int); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 43 - * @symbol __unk_vfn_43 + * @vftbl 43 + * @symbol __unk_vfn_43 */ virtual void __unk_vfn_43(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 45 + * @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 ??0Inventory\@\@QEAA\@PEAVPlayer\@\@\@Z + * @symbol ??0Inventory\@\@QEAA\@PEAVPlayer\@\@\@Z */ MCAPI Inventory(class Player *); /** - * @symbol ?dropSlot\@Inventory\@\@QEAAXH_N00\@Z + * @symbol ?dropSlot\@Inventory\@\@QEAAXH_N00\@Z */ MCAPI void dropSlot(int, bool, bool, bool); /** - * @symbol ?getComplexItems\@Inventory\@\@QEAA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getComplexItems\@Inventory\@\@QEAA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getComplexItems(); /** - * @symbol ?setupDefault\@Inventory\@\@QEAAXXZ + * @symbol ?setupDefault\@Inventory\@\@QEAAXXZ */ MCAPI void setupDefault(); /** - * @symbol ?tick\@Inventory\@\@QEAAXH\@Z + * @symbol ?tick\@Inventory\@\@QEAAXH\@Z */ MCAPI void tick(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryAction.hpp b/LiteLoader/include/llapi/mc/InventoryAction.hpp index 0abd68a84d..e49076336e 100644 --- a/LiteLoader/include/llapi/mc/InventoryAction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryAction.hpp @@ -43,22 +43,25 @@ class InventoryAction { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INVENTORYACTION public: - class InventoryAction& operator=(class InventoryAction const &) = delete; InventoryAction() = delete; #endif public: /** - * @symbol ??0InventoryAction\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0InventoryAction\@\@QEAA\@AEBV0\@\@Z */ MCAPI InventoryAction(class InventoryAction const &); /** - * @symbol ?postLoadItems\@InventoryAction\@\@QEAAXAEAVBlockPalette\@\@_N\@Z + * @symbol ??4InventoryAction\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class InventoryAction & operator=(class InventoryAction const &); + /** + * @symbol ?postLoadItems\@InventoryAction\@\@QEAAXAEAVBlockPalette\@\@_N\@Z */ MCAPI void postLoadItems(class BlockPalette &, bool); /** - * @symbol ??1InventoryAction\@\@QEAA\@XZ + * @symbol ??1InventoryAction\@\@QEAA\@XZ */ MCAPI ~InventoryAction(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryContainerModel.hpp b/LiteLoader/include/llapi/mc/InventoryContainerModel.hpp index 36f37c1615..ed620dc2c9 100644 --- a/LiteLoader/include/llapi/mc/InventoryContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContainerModel.hpp @@ -31,86 +31,86 @@ class InventoryContainerModel : public ContainerModel { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@InventoryContainerModel\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@InventoryContainerModel\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~InventoryContainerModel(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?postInit\@InventoryContainerModel\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?postInit\@InventoryContainerModel\@\@UEAAXXZ */ virtual void postInit(); /** - * @vftbl 3 - * @symbol ?releaseResources\@InventoryContainerModel\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?releaseResources\@InventoryContainerModel\@\@UEAAXXZ */ virtual void releaseResources(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getContainerWeakRef\@InventoryContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ + * @vftbl 7 + * @symbol ?getContainerWeakRef\@InventoryContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ */ virtual class ContainerWeakRef getContainerWeakRef() const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 14 - * @symbol ?isValid\@InventoryContainerModel\@\@UEAA_NXZ + * @vftbl 14 + * @symbol ?isValid\@InventoryContainerModel\@\@UEAA_NXZ */ virtual bool isValid(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?_getContainer\@InventoryContainerModel\@\@EEBAPEAVContainer\@\@XZ + * @vftbl 20 + * @symbol ?_getContainer\@InventoryContainerModel\@\@EEBAPEAVContainer\@\@XZ */ virtual class Container * _getContainer() const; /** - * @vftbl 21 - * @symbol ?_getContainerOffset\@InventoryContainerModel\@\@MEBAHXZ + * @vftbl 21 + * @symbol ?_getContainerOffset\@InventoryContainerModel\@\@MEBAHXZ */ virtual int _getContainerOffset() const; /** - * @vftbl 22 - * @symbol ?_onItemChanged\@InventoryContainerModel\@\@EEAAXHAEBVItemStack\@\@0\@Z + * @vftbl 22 + * @symbol ?_onItemChanged\@InventoryContainerModel\@\@EEAAXHAEBVItemStack\@\@0\@Z */ virtual void _onItemChanged(int, class ItemStack const &, class ItemStack const &); /** - * @symbol ??0InventoryContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@\@Z + * @symbol ??0InventoryContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@\@Z */ MCAPI InventoryContainerModel(enum class ContainerEnumName, int, class Player &); //private: /** - * @symbol ?_refreshSlot\@InventoryContainerModel\@\@AEAAXH\@Z + * @symbol ?_refreshSlot\@InventoryContainerModel\@\@AEAAXH\@Z */ MCAPI void _refreshSlot(int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryContainerValidation.hpp b/LiteLoader/include/llapi/mc/InventoryContainerValidation.hpp index 66b7c12178..9234e1f147 100644 --- a/LiteLoader/include/llapi/mc/InventoryContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContainerValidation.hpp @@ -31,60 +31,60 @@ class InventoryContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InventoryContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@InventoryContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@InventoryContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@InventoryContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@InventoryContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@InventoryContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@InventoryContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYCONTAINERVALIDATION /** - * @symbol ?canItemMoveToContainer\@InventoryContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@InventoryContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp index afe0c31814..80fb8d88e2 100644 --- a/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryContentPacket.hpp @@ -30,41 +30,47 @@ class InventoryContentPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InventoryContentPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@InventoryContentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@InventoryContentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@InventoryContentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@InventoryContentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@InventoryContentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@InventoryContentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@InventoryContentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYCONTENTPACKET /** - * @symbol ??0InventoryContentPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~InventoryContentPacket(); +#endif + /** + * @symbol ??0InventoryContentPacket\@\@QEAA\@XZ */ MCAPI InventoryContentPacket(); /** - * @symbol ??0InventoryContentPacket\@\@QEAA\@W4ContainerID\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0InventoryContentPacket\@\@QEAA\@W4ContainerID\@\@AEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ MCAPI InventoryContentPacket(enum class ContainerID, std::vector const &); /** - * @symbol ?fromPlayerInventoryId\@InventoryContentPacket\@\@SA?AV1\@W4ContainerID\@\@AEAVPlayer\@\@\@Z + * @symbol ?fromPlayerInventoryId\@InventoryContentPacket\@\@SA?AV1\@W4ContainerID\@\@AEAVPlayer\@\@\@Z */ MCAPI static class InventoryContentPacket fromPlayerInventoryId(enum class ContainerID, class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryMenu.hpp b/LiteLoader/include/llapi/mc/InventoryMenu.hpp index ff8f32f992..85fe985b91 100644 --- a/LiteLoader/include/llapi/mc/InventoryMenu.hpp +++ b/LiteLoader/include/llapi/mc/InventoryMenu.hpp @@ -31,37 +31,37 @@ class InventoryMenu { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYMENU /** - * @symbol ?_getContainer\@InventoryMenu\@\@MEBAPEAVContainer\@\@XZ + * @symbol ?_getContainer\@InventoryMenu\@\@MEBAPEAVContainer\@\@XZ */ MCVAPI class Container * _getContainer() const; /** - * @symbol ?getItemCopies\@InventoryMenu\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getItemCopies\@InventoryMenu\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector getItemCopies() const; /** - * @symbol ?getSlot\@InventoryMenu\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getSlot\@InventoryMenu\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getSlot(int) const; /** - * @symbol ?removeSlot\@InventoryMenu\@\@UEAAXHH\@Z + * @symbol ?removeSlot\@InventoryMenu\@\@UEAAXHH\@Z */ MCVAPI void removeSlot(int, int); /** - * @symbol ?serverInitItemStackIds\@InventoryMenu\@\@UEAAXXZ + * @symbol ?serverInitItemStackIds\@InventoryMenu\@\@UEAAXXZ */ MCVAPI void serverInitItemStackIds(); /** - * @symbol ?setSlot\@InventoryMenu\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @symbol ?setSlot\@InventoryMenu\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ MCVAPI void setSlot(int, class ItemStack const &, bool); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~InventoryMenu(); #endif /** - * @symbol ??0InventoryMenu\@\@QEAA\@AEAVPlayer\@\@PEAVContainer\@\@\@Z + * @symbol ??0InventoryMenu\@\@QEAA\@AEAVPlayer\@\@PEAVContainer\@\@\@Z */ MCAPI InventoryMenu(class Player &, class Container *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp index 9843e94863..cd39d8aa8f 100644 --- a/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventorySlotPacket.hpp @@ -30,37 +30,43 @@ class InventorySlotPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InventorySlotPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@InventorySlotPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@InventorySlotPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@InventorySlotPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@InventorySlotPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@InventorySlotPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@InventorySlotPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@InventorySlotPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYSLOTPACKET /** - * @symbol ??0InventorySlotPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~InventorySlotPacket(); +#endif + /** + * @symbol ??0InventorySlotPacket\@\@QEAA\@XZ */ MCAPI InventorySlotPacket(); /** - * @symbol ??0InventorySlotPacket\@\@QEAA\@W4ContainerID\@\@IAEBVItemStack\@\@\@Z + * @symbol ??0InventorySlotPacket\@\@QEAA\@W4ContainerID\@\@IAEBVItemStack\@\@\@Z */ MCAPI InventorySlotPacket(enum class ContainerID, unsigned int, class ItemStack const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventorySource.hpp b/LiteLoader/include/llapi/mc/InventorySource.hpp index 011b62b12b..3c08ada5f0 100644 --- a/LiteLoader/include/llapi/mc/InventorySource.hpp +++ b/LiteLoader/include/llapi/mc/InventorySource.hpp @@ -59,12 +59,12 @@ class InventorySource { public: /** - * @symbol ??8InventorySource\@\@QEBA_NAEBV0\@\@Z + * @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 + * @symbol ?toString\@InventorySource\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp index 41e4c6f06f..6059785417 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransaction.hpp @@ -34,88 +34,80 @@ class InventoryTransaction { public: /** - * @symbol ??0InventoryTransaction\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0InventoryTransaction\@\@QEAA\@AEBV0\@\@Z */ MCAPI InventoryTransaction(class InventoryTransaction const &); /** - * @symbol ?_logTransaction\@InventoryTransaction\@\@QEBAX_N\@Z + * @symbol ?_logTransaction\@InventoryTransaction\@\@QEBAX_N\@Z */ MCAPI void _logTransaction(bool) const; /** - * @symbol ?addAction\@InventoryTransaction\@\@QEAAXAEBVInventoryAction\@\@\@Z + * @symbol ?addAction\@InventoryTransaction\@\@QEAAXAEBVInventoryAction\@\@\@Z */ MCAPI void addAction(class InventoryAction const &); /** - * @symbol ?executeFull\@InventoryTransaction\@\@QEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + * @symbol ?executeFull\@InventoryTransaction\@\@QEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z */ MCAPI enum class InventoryTransactionError executeFull(class Player &, bool) const; /** - * @symbol ?forceBalanceTransaction\@InventoryTransaction\@\@QEAAXXZ + * @symbol ?forceBalanceTransaction\@InventoryTransaction\@\@QEAAXXZ */ MCAPI void forceBalanceTransaction(); /** - * @symbol ?getActions\@InventoryTransaction\@\@QEBAAEBV?$vector\@VInventoryAction\@\@V?$allocator\@VInventoryAction\@\@\@std\@\@\@std\@\@AEBVInventorySource\@\@\@Z + * @symbol ?getActions\@InventoryTransaction\@\@QEBAAEBV?$vector\@VInventoryAction\@\@V?$allocator\@VInventoryAction\@\@\@std\@\@\@std\@\@AEBVInventorySource\@\@\@Z */ MCAPI std::vector const & getActions(class InventorySource const &) const; /** - * @symbol ?getVerifyFunction\@InventoryTransaction\@\@QEBA?AV?$function\@$$A6A?AW4InventoryTransactionError\@\@AEAVPlayer\@\@AEBVInventoryAction\@\@_N\@Z\@std\@\@AEBVInventorySource\@\@\@Z + * @symbol ?getVerifyFunction\@InventoryTransaction\@\@QEBA?AV?$function\@$$A6A?AW4InventoryTransactionError\@\@AEAVPlayer\@\@AEBVInventoryAction\@\@_N\@Z\@std\@\@AEBVInventorySource\@\@\@Z */ MCAPI class std::function getVerifyFunction(class InventorySource const &) const; /** - * @symbol ?postLoadItems\@InventoryTransaction\@\@QEAAXAEAVBlockPalette\@\@_N\@Z + * @symbol ?postLoadItems\@InventoryTransaction\@\@QEAAXAEAVBlockPalette\@\@_N\@Z */ MCAPI void postLoadItems(class BlockPalette &, bool); /** - * @symbol ?recalculateBalance\@InventoryTransaction\@\@QEAAXXZ + * @symbol ?recalculateBalance\@InventoryTransaction\@\@QEAAXXZ */ MCAPI void recalculateBalance(); /** - * @symbol ?serialize\@InventoryTransaction\@\@QEBAXAEAVBinaryStream\@\@_N\@Z + * @symbol ?serialize\@InventoryTransaction\@\@QEBAXAEAVBinaryStream\@\@_N\@Z */ MCAPI void serialize(class BinaryStream &, bool) const; /** - * @symbol ?verifyBalance\@InventoryTransaction\@\@QEBA_NXZ + * @symbol ?verifyBalance\@InventoryTransaction\@\@QEBA_NXZ */ MCAPI bool verifyBalance() const; /** - * @symbol ?verifyFull\@InventoryTransaction\@\@QEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + * @symbol ?verifyFull\@InventoryTransaction\@\@QEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z */ MCAPI enum class InventoryTransactionError verifyFull(class Player &, bool) const; /** - * @symbol ??1InventoryTransaction\@\@QEAA\@XZ + * @symbol ??1InventoryTransaction\@\@QEAA\@XZ */ MCAPI ~InventoryTransaction(); /** - * @symbol ?checkTransactionItemsMatch\@InventoryTransaction\@\@SA_NAEBVItemStack\@\@0\@Z + * @symbol ?checkTransactionItemsMatch\@InventoryTransaction\@\@SA_NAEBVItemStack\@\@0\@Z */ MCAPI static bool checkTransactionItemsMatch(class ItemStack const &, class ItemStack const &); /** - * @symbol ?deserialize\@InventoryTransaction\@\@SA?AV1\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@InventoryTransaction\@\@SA?AV1\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static class InventoryTransaction deserialize(class ReadOnlyBinaryStream &); /** - * @symbol ?getInventoryTransactionErrorName\@InventoryTransaction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4InventoryTransactionError\@\@\@Z + * @symbol ?getInventoryTransactionErrorName\@InventoryTransaction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4InventoryTransactionError\@\@\@Z */ MCAPI static std::string const getInventoryTransactionErrorName(enum class InventoryTransactionError); //private: /** - * @symbol ?_dropCreatedItems\@InventoryTransaction\@\@AEBAXAEAVPlayer\@\@\@Z - */ - MCAPI void _dropCreatedItems(class Player &) const; - /** - * @symbol ?addItemToContent\@InventoryTransaction\@\@AEAAXAEBVItemStack\@\@H\@Z + * @symbol ?addItemToContent\@InventoryTransaction\@\@AEAAXAEBVItemStack\@\@H\@Z */ MCAPI void addItemToContent(class ItemStack const &, int); - /** - * @symbol ?_isAllowedUIOpenForNonImplementedSource\@InventoryTransaction\@\@CA_NAEBVPlayer\@\@\@Z - */ - MCAPI static bool _isAllowedUIOpenForNonImplementedSource(class Player const &); private: /** - * @symbol ?inventoryTransactionErrorMap\@InventoryTransaction\@\@0V?$BidirectionalUnorderedMap\@W4InventoryTransactionError\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?inventoryTransactionErrorMap\@InventoryTransaction\@\@0V?$BidirectionalUnorderedMap\@W4InventoryTransactionError\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const inventoryTransactionErrorMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp index 911885b20d..83e52afe96 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionItemGroup.hpp @@ -27,19 +27,22 @@ class InventoryTransactionItemGroup { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_INVENTORYTRANSACTIONITEMGROUP public: - class InventoryTransactionItemGroup& operator=(class InventoryTransactionItemGroup const &) = delete; InventoryTransactionItemGroup(class InventoryTransactionItemGroup const &) = delete; InventoryTransactionItemGroup() = delete; #endif public: /** - * @symbol ?getItemInstance\@InventoryTransactionItemGroup\@\@QEBA?AVItemStack\@\@XZ + * @symbol ?getItemInstance\@InventoryTransactionItemGroup\@\@QEBA?AVItemStack\@\@XZ */ MCAPI class ItemStack getItemInstance() const; /** - * @symbol ??1InventoryTransactionItemGroup\@\@QEAA\@XZ + * @symbol ??4InventoryTransactionItemGroup\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class InventoryTransactionItemGroup & operator=(class InventoryTransactionItemGroup const &); + /** + * @symbol ??1InventoryTransactionItemGroup\@\@QEAA\@XZ */ MCAPI ~InventoryTransactionItemGroup(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp index fe66b31e54..ec1438a96c 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionManager.hpp @@ -30,32 +30,32 @@ class InventoryTransactionManager { public: /** - * @symbol ?_createServerSideAction\@InventoryTransactionManager\@\@QEAAXAEBVItemStack\@\@0\@Z + * @symbol ?_createServerSideAction\@InventoryTransactionManager\@\@QEAAXAEBVItemStack\@\@0\@Z */ MCAPI void _createServerSideAction(class ItemStack const &, class ItemStack const &); /** - * @symbol ?_logExpectedActions\@InventoryTransactionManager\@\@QEBAXXZ + * @symbol ?_logExpectedActions\@InventoryTransactionManager\@\@QEBAXXZ */ MCAPI void _logExpectedActions() const; /** - * @symbol ?addAction\@InventoryTransactionManager\@\@QEAAXAEBVInventoryAction\@\@_N\@Z + * @symbol ?addAction\@InventoryTransactionManager\@\@QEAAXAEBVInventoryAction\@\@_N\@Z */ MCAPI void addAction(class InventoryAction const &, bool); /** - * @symbol ?addExpectedAction\@InventoryTransactionManager\@\@QEAAXAEBVInventoryAction\@\@\@Z + * @symbol ?addExpectedAction\@InventoryTransactionManager\@\@QEAAXAEBVInventoryAction\@\@\@Z */ MCAPI void addExpectedAction(class InventoryAction const &); /** - * @symbol ?checkActionExpected\@InventoryTransactionManager\@\@QEAA_NAEBVInventoryAction\@\@\@Z + * @symbol ?checkActionExpected\@InventoryTransactionManager\@\@QEAA_NAEBVInventoryAction\@\@\@Z */ MCAPI bool checkActionExpected(class InventoryAction const &); /** - * @symbol ?forceBalanceTransaction\@InventoryTransactionManager\@\@QEAAXXZ + * @symbol ?forceBalanceTransaction\@InventoryTransactionManager\@\@QEAAXXZ */ MCAPI void forceBalanceTransaction(); /** - * @symbol ??1InventoryTransactionManager\@\@QEAA\@XZ + * @symbol ??1InventoryTransactionManager\@\@QEAA\@XZ */ MCAPI ~InventoryTransactionManager(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp index 6d05be99ef..0c2ddd20d5 100644 --- a/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp +++ b/LiteLoader/include/llapi/mc/InventoryTransactionPacket.hpp @@ -36,41 +36,47 @@ class InventoryTransactionPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InventoryTransactionPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@InventoryTransactionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@InventoryTransactionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@InventoryTransactionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@InventoryTransactionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@InventoryTransactionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@InventoryTransactionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@InventoryTransactionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_INVENTORYTRANSACTIONPACKET /** - * @symbol ??0InventoryTransactionPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI InventoryTransactionPacket(); + MCVAPI ~InventoryTransactionPacket(); +#endif /** - * @symbol ??0InventoryTransactionPacket\@\@QEAA\@V?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ??0InventoryTransactionPacket\@\@QEAA\@V?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI InventoryTransactionPacket(std::unique_ptr, bool); /** - * @symbol ?postLoadItems\@InventoryTransactionPacket\@\@QEBAXAEAVBlockPalette\@\@_N\@Z + * @symbol ??0InventoryTransactionPacket\@\@QEAA\@XZ + */ + MCAPI InventoryTransactionPacket(); + /** + * @symbol ?postLoadItems\@InventoryTransactionPacket\@\@QEBAXAEAVBlockPalette\@\@_N\@Z */ MCAPI void postLoadItems(class BlockPalette &, bool) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InverterDefinition.hpp b/LiteLoader/include/llapi/mc/InverterDefinition.hpp index 5414bcd0fb..7d12ab131e 100644 --- a/LiteLoader/include/llapi/mc/InverterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/InverterDefinition.hpp @@ -32,14 +32,14 @@ class InverterDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InverterDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@InverterDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@InverterDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InverterNode.hpp b/LiteLoader/include/llapi/mc/InverterNode.hpp index 6f7a2d1d42..a30faf7c33 100644 --- a/LiteLoader/include/llapi/mc/InverterNode.hpp +++ b/LiteLoader/include/llapi/mc/InverterNode.hpp @@ -29,23 +29,23 @@ class InverterNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InverterNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@InverterNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@InverterNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@InverterNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@InverterNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0InverterNode\@\@QEAA\@XZ + * @symbol ??0InverterNode\@\@QEAA\@XZ */ MCAPI InverterNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InvestigateSuspiciousLocationGoal.hpp b/LiteLoader/include/llapi/mc/InvestigateSuspiciousLocationGoal.hpp index ab1e57b07f..3a7694bf3e 100644 --- a/LiteLoader/include/llapi/mc/InvestigateSuspiciousLocationGoal.hpp +++ b/LiteLoader/include/llapi/mc/InvestigateSuspiciousLocationGoal.hpp @@ -28,48 +28,48 @@ class InvestigateSuspiciousLocationGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InvestigateSuspiciousLocationGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@InvestigateSuspiciousLocationGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@InvestigateSuspiciousLocationGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@InvestigateSuspiciousLocationGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@InvestigateSuspiciousLocationGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@InvestigateSuspiciousLocationGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@InvestigateSuspiciousLocationGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@InvestigateSuspiciousLocationGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@InvestigateSuspiciousLocationGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@InvestigateSuspiciousLocationGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@InvestigateSuspiciousLocationGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@InvestigateSuspiciousLocationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@InvestigateSuspiciousLocationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0InvestigateSuspiciousLocationGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0InvestigateSuspiciousLocationGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI InvestigateSuspiciousLocationGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp index be4911ebcd..d5c629bf2f 100644 --- a/LiteLoader/include/llapi/mc/InvisibleBlock.hpp +++ b/LiteLoader/include/llapi/mc/InvisibleBlock.hpp @@ -31,198 +31,203 @@ class InvisibleBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~InvisibleBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@InvisibleBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0InvisibleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0InvisibleBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI InvisibleBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IronGolem.hpp b/LiteLoader/include/llapi/mc/IronGolem.hpp index 5a5c7e32ea..f05b453ca2 100644 --- a/LiteLoader/include/llapi/mc/IronGolem.hpp +++ b/LiteLoader/include/llapi/mc/IronGolem.hpp @@ -32,178 +32,173 @@ class IronGolem : public Mob { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~IronGolem(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@IronGolem\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@IronGolem\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@IronGolem\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@IronGolem\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@IronGolem\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@IronGolem\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@IronGolem\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@IronGolem\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 286 - * @symbol ?hurtEffects\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 283 + * @symbol ?hurtEffects\@IronGolem\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 291 - * @symbol ?aiStep\@IronGolem\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@IronGolem\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 307 - * @symbol ?doHurtTarget\@IronGolem\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 304 + * @symbol ?doHurtTarget\@IronGolem\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0IronGolem\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0IronGolem\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI IronGolem(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IsBabyDefinition.hpp b/LiteLoader/include/llapi/mc/IsBabyDefinition.hpp index 04d44b292d..9ce6d5e026 100644 --- a/LiteLoader/include/llapi/mc/IsBabyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsBabyDefinition.hpp @@ -31,15 +31,15 @@ struct IsBabyDefinition { public: /** - * @symbol ?initialize\@IsBabyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsBabyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsBabyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsBabyDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsBabyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsBabyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsBabyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsBabyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsChargedDefinition.hpp b/LiteLoader/include/llapi/mc/IsChargedDefinition.hpp index f7c387bc9e..cd860de4f5 100644 --- a/LiteLoader/include/llapi/mc/IsChargedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsChargedDefinition.hpp @@ -31,15 +31,15 @@ struct IsChargedDefinition { public: /** - * @symbol ?initialize\@IsChargedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsChargedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsChargedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsChargedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsChargedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsChargedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsChargedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsChargedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsChestedDefinition.hpp b/LiteLoader/include/llapi/mc/IsChestedDefinition.hpp index 2819febfca..302b1f5578 100644 --- a/LiteLoader/include/llapi/mc/IsChestedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsChestedDefinition.hpp @@ -31,15 +31,15 @@ struct IsChestedDefinition { public: /** - * @symbol ?initialize\@IsChestedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsChestedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsChestedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsChestedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsChestedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsChestedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsChestedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsChestedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDefinition.hpp b/LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDefinition.hpp index b023a078a1..14324d4556 100644 --- a/LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsHiddenWhenInvisibleDefinition.hpp @@ -31,15 +31,15 @@ struct IsHiddenWhenInvisibleDefinition { public: /** - * @symbol ?initialize\@IsHiddenWhenInvisibleDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsHiddenWhenInvisibleDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsHiddenWhenInvisibleDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsHiddenWhenInvisibleDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsHiddenWhenInvisibleDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsHiddenWhenInvisibleDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsHiddenWhenInvisibleDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsHiddenWhenInvisibleDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsHoldingSilkTouchTest.hpp b/LiteLoader/include/llapi/mc/IsHoldingSilkTouchTest.hpp index c6fdf07181..2cf804d9d0 100644 --- a/LiteLoader/include/llapi/mc/IsHoldingSilkTouchTest.hpp +++ b/LiteLoader/include/llapi/mc/IsHoldingSilkTouchTest.hpp @@ -16,7 +16,7 @@ * @brief MC class IsHoldingSilkTouchTest. * */ -class IsHoldingSilkTouchTest : public FilterTest { +class IsHoldingSilkTouchTest { #define AFTER_EXTRA @@ -30,19 +30,39 @@ class IsHoldingSilkTouchTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IsHoldingSilkTouchTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@IsHoldingSilkTouchTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@IsHoldingSilkTouchTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@IsHoldingSilkTouchTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@IsHoldingSilkTouchTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IsIgnitedDefinition.hpp b/LiteLoader/include/llapi/mc/IsIgnitedDefinition.hpp index 1bb6181fb1..6bccd07df1 100644 --- a/LiteLoader/include/llapi/mc/IsIgnitedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsIgnitedDefinition.hpp @@ -31,15 +31,15 @@ struct IsIgnitedDefinition { public: /** - * @symbol ?initialize\@IsIgnitedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsIgnitedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsIgnitedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsIgnitedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsIgnitedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsIgnitedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsIgnitedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsIgnitedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsIllagerCaptainDefinition.hpp b/LiteLoader/include/llapi/mc/IsIllagerCaptainDefinition.hpp index b606288e10..8dd3517025 100644 --- a/LiteLoader/include/llapi/mc/IsIllagerCaptainDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsIllagerCaptainDefinition.hpp @@ -31,15 +31,15 @@ struct IsIllagerCaptainDefinition { public: /** - * @symbol ?initialize\@IsIllagerCaptainDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsIllagerCaptainDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsIllagerCaptainDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsIllagerCaptainDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsIllagerCaptainDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsIllagerCaptainDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsIllagerCaptainDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsIllagerCaptainDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsOnFireTest.hpp b/LiteLoader/include/llapi/mc/IsOnFireTest.hpp index c3e2fdee3a..2a763e47be 100644 --- a/LiteLoader/include/llapi/mc/IsOnFireTest.hpp +++ b/LiteLoader/include/llapi/mc/IsOnFireTest.hpp @@ -13,7 +13,7 @@ #undef BEFORE_EXTRA -class IsOnFireTest : public FilterTest { +class IsOnFireTest { #define AFTER_EXTRA @@ -27,19 +27,39 @@ class IsOnFireTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IsOnFireTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@IsOnFireTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@IsOnFireTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@IsOnFireTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@IsOnFireTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IsOnHotBlockTest.hpp b/LiteLoader/include/llapi/mc/IsOnHotBlockTest.hpp index 07687e25b2..fd7a56a740 100644 --- a/LiteLoader/include/llapi/mc/IsOnHotBlockTest.hpp +++ b/LiteLoader/include/llapi/mc/IsOnHotBlockTest.hpp @@ -13,7 +13,7 @@ #undef BEFORE_EXTRA -class IsOnHotBlockTest : public FilterTest { +class IsOnHotBlockTest { #define AFTER_EXTRA @@ -27,19 +27,39 @@ class IsOnHotBlockTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IsOnHotBlockTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@IsOnHotBlockTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@IsOnHotBlockTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@IsOnHotBlockTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@IsOnHotBlockTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IsSaddledDefinition.hpp b/LiteLoader/include/llapi/mc/IsSaddledDefinition.hpp index b898d30ad1..c01581f1b3 100644 --- a/LiteLoader/include/llapi/mc/IsSaddledDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsSaddledDefinition.hpp @@ -31,15 +31,15 @@ struct IsSaddledDefinition { public: /** - * @symbol ?initialize\@IsSaddledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsSaddledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsSaddledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsSaddledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsSaddledDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsSaddledDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsSaddledDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsSaddledDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsShakingDefinition.hpp b/LiteLoader/include/llapi/mc/IsShakingDefinition.hpp index a391c09681..d3ec363bb7 100644 --- a/LiteLoader/include/llapi/mc/IsShakingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsShakingDefinition.hpp @@ -31,15 +31,15 @@ struct IsShakingDefinition { public: /** - * @symbol ?initialize\@IsShakingDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsShakingDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsShakingDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsShakingDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsShakingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsShakingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsShakingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsShakingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsShearedDefinition.hpp b/LiteLoader/include/llapi/mc/IsShearedDefinition.hpp index 1536fada87..fbaaf8ee16 100644 --- a/LiteLoader/include/llapi/mc/IsShearedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsShearedDefinition.hpp @@ -31,15 +31,15 @@ struct IsShearedDefinition { public: /** - * @symbol ?initialize\@IsShearedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsShearedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsShearedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsShearedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsShearedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsShearedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsShearedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsShearedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp b/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp index 8ba45c45e4..30e8229576 100644 --- a/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSpawnableDescription.hpp @@ -31,18 +31,18 @@ class IsSpawnableDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IsSpawnableDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getJsonName\@IsSpawnableDescription\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?getJsonName\@IsSpawnableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @symbol ?parse\@IsSpawnableDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?parse\@IsSpawnableDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void parse(class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IsStackableDefinition.hpp b/LiteLoader/include/llapi/mc/IsStackableDefinition.hpp index 419481c6f7..977f5013f0 100644 --- a/LiteLoader/include/llapi/mc/IsStackableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsStackableDefinition.hpp @@ -31,15 +31,15 @@ struct IsStackableDefinition { public: /** - * @symbol ?initialize\@IsStackableDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsStackableDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsStackableDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsStackableDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsStackableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsStackableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsStackableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsStackableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsStunnedDefinition.hpp b/LiteLoader/include/llapi/mc/IsStunnedDefinition.hpp index 8b71e344fa..ce4f6b3df6 100644 --- a/LiteLoader/include/llapi/mc/IsStunnedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsStunnedDefinition.hpp @@ -31,15 +31,15 @@ struct IsStunnedDefinition { public: /** - * @symbol ?initialize\@IsStunnedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsStunnedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsStunnedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsStunnedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsStunnedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsStunnedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsStunnedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsStunnedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp b/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp index e802ae37ca..a851f457e2 100644 --- a/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp +++ b/LiteLoader/include/llapi/mc/IsSummonableDescription.hpp @@ -31,18 +31,18 @@ class IsSummonableDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IsSummonableDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getJsonName\@IsSummonableDescription\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?getJsonName\@IsSummonableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @symbol ?parse\@IsSummonableDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?parse\@IsSummonableDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void parse(class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IsTamedDefinition.hpp b/LiteLoader/include/llapi/mc/IsTamedDefinition.hpp index 1ccaccb2b6..3c9380352a 100644 --- a/LiteLoader/include/llapi/mc/IsTamedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/IsTamedDefinition.hpp @@ -31,15 +31,15 @@ struct IsTamedDefinition { public: /** - * @symbol ?initialize\@IsTamedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@IsTamedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@IsTamedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@IsTamedDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@IsTamedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsTamedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@IsTamedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UIsTamedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/IsWaterLoggedTest.hpp b/LiteLoader/include/llapi/mc/IsWaterLoggedTest.hpp index 350b501b20..2ac66d0ecf 100644 --- a/LiteLoader/include/llapi/mc/IsWaterLoggedTest.hpp +++ b/LiteLoader/include/llapi/mc/IsWaterLoggedTest.hpp @@ -16,7 +16,7 @@ * @brief MC class IsWaterLoggedTest. * */ -class IsWaterLoggedTest : public FilterTest { +class IsWaterLoggedTest { #define AFTER_EXTRA @@ -30,19 +30,39 @@ class IsWaterLoggedTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IsWaterLoggedTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@IsWaterLoggedTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleBoolFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@IsWaterLoggedTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@IsWaterLoggedTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@IsWaterLoggedTest\@\@UEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ + */ + virtual class std::basic_string_view> getName() const; + /** + * @vftbl 5 + * @symbol ?_serializeDomain\@FilterTest\@\@MEBA?AVValue\@Json\@\@XZ + */ + virtual class Json::Value _serializeDomain() const; + /** + * @vftbl 6 + * @symbol ?_serializeValue\@SimpleBoolFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/IslandOperationNode.hpp b/LiteLoader/include/llapi/mc/IslandOperationNode.hpp index 52e5398655..4f64e50a09 100644 --- a/LiteLoader/include/llapi/mc/IslandOperationNode.hpp +++ b/LiteLoader/include/llapi/mc/IslandOperationNode.hpp @@ -30,19 +30,19 @@ class IslandOperationNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~IslandOperationNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_fillArea\@IslandOperationNode\@\@EEBAXAEAV?$WorkingData\@W4Terrain\@OperationNodeValues\@\@D\@OperationNodeDetails\@\@AEBVPos2d\@\@1\@Z + * @vftbl 3 + * @symbol ?_fillArea\@IslandOperationNode\@\@EEBAXAEAV?$WorkingData\@W4Terrain\@OperationNodeValues\@\@D\@OperationNodeDetails\@\@AEBVPos2d\@\@1\@Z */ virtual void _fillArea(class OperationNodeDetails::WorkingData &, class Pos2d const &, class Pos2d const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Item.hpp b/LiteLoader/include/llapi/mc/Item.hpp index 141ca56285..d73985d1c4 100644 --- a/LiteLoader/include/llapi/mc/Item.hpp +++ b/LiteLoader/include/llapi/mc/Item.hpp @@ -38,982 +38,990 @@ class Tier { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Item(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initServer\@Item\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?initServer\@Item\@\@UEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual bool initServer(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?tearDown\@Item\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?tearDown\@Item\@\@UEAAXXZ */ virtual void tearDown(); /** - * @vftbl 3 - * @symbol ?setDescriptionId\@Item\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?setDescriptionId\@Item\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class Item & setDescriptionId(std::string const &); /** - * @vftbl 4 - * @symbol ?getDescriptionId\@Item\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getDescriptionId\@Item\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getDescriptionId() const; /** - * @vftbl 5 - * @symbol ?getMaxUseDuration\@Item\@\@UEBAHPEBVItemInstance\@\@\@Z + * @vftbl 5 + * @symbol ?getMaxUseDuration\@Item\@\@UEBAHPEBVItemInstance\@\@\@Z */ virtual int getMaxUseDuration(class ItemInstance const *) const; /** - * @vftbl 6 - * @symbol ?getMaxUseDuration\@Item\@\@UEBAHPEBVItemStack\@\@\@Z + * @vftbl 6 + * @symbol ?getMaxUseDuration\@Item\@\@UEBAHPEBVItemStack\@\@\@Z */ virtual int getMaxUseDuration(class ItemStack const *) const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?hasTag\@Item\@\@UEBA_NAEBVHashedString\@\@\@Z + * @vftbl 8 + * @symbol ?hasTag\@Item\@\@UEBA_NAEBVHashedString\@\@\@Z */ virtual bool hasTag(class HashedString const &) const; /** - * @vftbl 9 - * @symbol ?hasTag\@Item\@\@UEBA_NAEBUItemTag\@\@\@Z + * @vftbl 9 + * @symbol ?hasTag\@Item\@\@UEBA_NAEBUItemTag\@\@\@Z */ virtual bool hasTag(struct ItemTag const &) const; /** - * @vftbl 10 - * @symbol ?executeEvent\@Item\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z + * @vftbl 10 + * @symbol ?executeEvent\@Item\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(class ItemStackBase &, std::string const &, class RenderParams &) const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?isArmor\@Item\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?isArmor\@Item\@\@UEBA_NXZ */ virtual bool isArmor() const; /** - * @vftbl 13 - * @symbol ?isBlockPlanterItem\@Item\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?isBlockPlanterItem\@Item\@\@UEBA_NXZ */ virtual bool isBlockPlanterItem() const; /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol ?isCamera\@Item\@\@UEBA_NXZ + * @vftbl 15 + * @symbol ?isCamera\@Item\@\@UEBA_NXZ */ virtual bool isCamera() const; /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol ?isDamageable\@Item\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?isDamageable\@Item\@\@UEBA_NXZ */ virtual bool isDamageable() const; /** - * @vftbl 18 - * @symbol ?isDyeable\@Item\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isDyeable\@Item\@\@UEBA_NXZ */ virtual bool isDyeable() const; /** - * @vftbl 19 - * @symbol ?isDye\@Item\@\@UEBA_NXZ + * @vftbl 19 + * @symbol ?isDye\@Item\@\@UEBA_NXZ */ virtual bool isDye() const; /** - * @vftbl 20 - * @symbol ?getItemColor\@Item\@\@UEBA?AW4ItemColor\@\@XZ + * @vftbl 20 + * @symbol ?getItemColor\@Item\@\@UEBA?AW4ItemColor\@\@XZ */ virtual enum class ItemColor getItemColor() const; /** - * @vftbl 21 - * @symbol ?isFertilizer\@Item\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isFertilizer\@Item\@\@UEBA_NXZ */ virtual bool isFertilizer() const; /** - * @vftbl 22 - * @symbol ?isFood\@Item\@\@UEBA_NXZ + * @vftbl 22 + * @symbol ?isFood\@Item\@\@UEBA_NXZ */ virtual bool isFood() const; /** - * @vftbl 23 - * @symbol ?isThrowable\@Item\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@Item\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 24 - * @symbol ?isUseable\@Item\@\@UEBA_NXZ + * @vftbl 24 + * @symbol ?isUseable\@Item\@\@UEBA_NXZ */ virtual bool isUseable() const; /** - * @vftbl 25 - * @symbol ?getComponent\@Item\@\@UEBAPEAVItemComponent\@\@AEBVHashedString\@\@\@Z + * @vftbl 25 + * @symbol ?getComponent\@Item\@\@UEBAPEAVItemComponent\@\@AEBVHashedString\@\@\@Z */ virtual class ItemComponent * getComponent(class HashedString const &) const; /** - * @vftbl 26 - * @symbol ?getCamera\@Item\@\@UEBAPEAVICameraItemComponent\@\@XZ + * @vftbl 26 + * @symbol ?getCamera\@Item\@\@UEBAPEAVICameraItemComponent\@\@XZ */ virtual class ICameraItemComponent * getCamera() const; /** - * @vftbl 27 - * @symbol ?getFood\@Item\@\@UEBAPEAVIFoodItemComponent\@\@XZ + * @vftbl 27 + * @symbol ?getFood\@Item\@\@UEBAPEAVIFoodItemComponent\@\@XZ */ virtual class IFoodItemComponent * getFood() const; /** - * @vftbl 28 - * @symbol ?setMaxStackSize\@Item\@\@UEAAAEAV1\@E\@Z + * @vftbl 28 + * @symbol ?setMaxStackSize\@Item\@\@UEAAAEAV1\@E\@Z */ virtual class Item & setMaxStackSize(unsigned char); /** - * @vftbl 29 - * @symbol ?setStackedByData\@Item\@\@UEAAAEAV1\@_N\@Z + * @vftbl 29 + * @symbol ?setStackedByData\@Item\@\@UEAAAEAV1\@_N\@Z */ virtual class Item & setStackedByData(bool); /** - * @vftbl 30 - * @symbol ?setMaxDamage\@Item\@\@UEAAAEAV1\@H\@Z + * @vftbl 30 + * @symbol ?setMaxDamage\@Item\@\@UEAAAEAV1\@H\@Z */ virtual class Item & setMaxDamage(int); /** - * @vftbl 31 - * @symbol ?setHandEquipped\@Item\@\@UEAAAEAV1\@XZ + * @vftbl 31 + * @symbol ?setHandEquipped\@Item\@\@UEAAAEAV1\@XZ */ virtual class Item & setHandEquipped(); /** - * @vftbl 32 - * @symbol ?setUseAnimation\@Item\@\@UEAAAEAV1\@W4UseAnimation\@\@\@Z + * @vftbl 32 + * @symbol ?setUseAnimation\@Item\@\@UEAAAEAV1\@W4UseAnimation\@\@\@Z */ virtual class Item & setUseAnimation(enum class UseAnimation); /** - * @vftbl 33 - * @symbol ?setMaxUseDuration\@Item\@\@UEAAAEAV1\@H\@Z + * @vftbl 33 + * @symbol ?setMaxUseDuration\@Item\@\@UEAAAEAV1\@H\@Z */ virtual class Item & setMaxUseDuration(int); /** - * @vftbl 34 - * @symbol ?setRequiresWorldBuilder\@Item\@\@UEAAAEAV1\@_N\@Z + * @vftbl 34 + * @symbol ?setRequiresWorldBuilder\@Item\@\@UEAAAEAV1\@_N\@Z */ virtual class Item & setRequiresWorldBuilder(bool); /** - * @vftbl 35 - * @symbol ?setExplodable\@Item\@\@UEAAAEAV1\@_N\@Z + * @vftbl 35 + * @symbol ?setExplodable\@Item\@\@UEAAAEAV1\@_N\@Z */ virtual class Item & setExplodable(bool); /** - * @vftbl 36 - * @symbol ?setFireResistant\@Item\@\@UEAAAEAV1\@_N\@Z + * @vftbl 36 + * @symbol ?setFireResistant\@Item\@\@UEAAAEAV1\@_N\@Z */ virtual class Item & setFireResistant(bool); /** - * @vftbl 37 - * @symbol ?setIsGlint\@Item\@\@UEAAAEAV1\@_N\@Z + * @vftbl 37 + * @symbol ?setIsGlint\@Item\@\@UEAAAEAV1\@_N\@Z */ virtual class Item & setIsGlint(bool); /** - * @vftbl 38 - * @symbol ?setShouldDespawn\@Item\@\@UEAAAEAV1\@_N\@Z + * @vftbl 38 + * @symbol ?setShouldDespawn\@Item\@\@UEAAAEAV1\@_N\@Z */ virtual class Item & setShouldDespawn(bool); /** - * @vftbl 39 - * @symbol ?buildNetworkTag\@Item\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 39 + * @symbol ?buildNetworkTag\@Item\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 40 - * @symbol ?initializeFromNetwork\@Item\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 40 + * @symbol ?initializeFromNetwork\@Item\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @vftbl 41 - * @symbol ?validateFromNetwork\@Item\@\@UEAA?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 + * @vftbl 41 + * @symbol ?validateFromNetwork\@Item\@\@UEAA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ virtual std::vector validateFromNetwork(class CompoundTag const &); /** - * @vftbl 42 - * @symbol ?getBlockShape\@Item\@\@UEBA?AW4BlockShape\@\@XZ + * @vftbl 42 + * @symbol ?getBlockShape\@Item\@\@UEBA?AW4BlockShape\@\@XZ */ virtual enum class BlockShape getBlockShape() const; /** - * @vftbl 43 - * @symbol ?canBeDepleted\@Item\@\@UEBA_NXZ + * @vftbl 43 + * @symbol ?canBeDepleted\@Item\@\@UEBA_NXZ */ virtual bool canBeDepleted() const; /** - * @vftbl 44 - * @symbol ?canDestroySpecial\@Item\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 44 + * @symbol ?canDestroySpecial\@Item\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroySpecial(class Block const &) const; /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@Item\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@Item\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 46 - * @symbol ?isStackedByData\@Item\@\@UEBA_NXZ + * @vftbl 46 + * @symbol ?isStackedByData\@Item\@\@UEBA_NXZ */ virtual bool isStackedByData() const; /** - * @vftbl 47 - * @symbol ?getMaxDamage\@Item\@\@UEBAFXZ + * @vftbl 47 + * @symbol ?getMaxDamage\@Item\@\@UEBAFXZ */ virtual short getMaxDamage() const; /** - * @vftbl 48 - * @symbol ?getAttackDamage\@Item\@\@UEBAHXZ + * @vftbl 48 + * @symbol ?getAttackDamage\@Item\@\@UEBAHXZ */ virtual int getAttackDamage() const; /** - * @vftbl 49 - * @symbol ?isHandEquipped\@Item\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@Item\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 50 - * @symbol ?isGlint\@Item\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@Item\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 52 - * @symbol ?getPatternIndex\@Item\@\@UEBAHXZ + * @vftbl 52 + * @symbol ?getPatternIndex\@Item\@\@UEBAHXZ */ virtual int getPatternIndex() const; /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 54 - * @symbol ?isWearableThroughLootTable\@Item\@\@UEBA_NPEBVCompoundTag\@\@\@Z + * @vftbl 54 + * @symbol ?isWearableThroughLootTable\@Item\@\@UEBA_NPEBVCompoundTag\@\@\@Z */ virtual bool isWearableThroughLootTable(class CompoundTag const *) const; /** - * @vftbl 55 - * @symbol ?canDestroyInCreative\@Item\@\@UEBA_NXZ + * @vftbl 55 + * @symbol ?canDestroyInCreative\@Item\@\@UEBA_NXZ */ virtual bool canDestroyInCreative() const; /** - * @vftbl 56 - * @symbol ?isDestructive\@Item\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@Item\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@Item\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@Item\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 58 - * @symbol ?shouldInteractionWithBlockBypassLiquid\@Item\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?shouldInteractionWithBlockBypassLiquid\@Item\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool shouldInteractionWithBlockBypassLiquid(class Block const &) const; /** - * @vftbl 59 - * @symbol ?requiresInteract\@Item\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@Item\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@Item\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@Item\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@Item\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@Item\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@Item\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@Item\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 64 - * @symbol ?getArmorValue\@Item\@\@UEBAHXZ + * @vftbl 64 + * @symbol ?getArmorValue\@Item\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 65 - * @symbol ?getToughnessValue\@Item\@\@UEBAHXZ + * @vftbl 65 + * @symbol ?getToughnessValue\@Item\@\@UEBAHXZ */ virtual int getToughnessValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@Item\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@Item\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 68 - * @symbol ?getDamageChance\@Item\@\@UEBAHH\@Z + * @vftbl 68 + * @symbol ?getDamageChance\@Item\@\@UEBAHH\@Z */ virtual int getDamageChance(int) const; /** - * @vftbl 69 - * @symbol ?getViewDamping\@Item\@\@UEBAMXZ + * @vftbl 69 + * @symbol ?getViewDamping\@Item\@\@UEBAMXZ */ virtual float getViewDamping() const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 73 - * @symbol ?getColor\@Item\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z + * @vftbl 73 + * @symbol ?getColor\@Item\@\@UEBA?AVColor\@mce\@\@PEBVCompoundTag\@\@AEBVItemDescriptor\@\@\@Z */ virtual class mce::Color getColor(class CompoundTag const *, class ItemDescriptor const &) const; /** - * @vftbl 74 - * @symbol ?hasCustomColor\@Item\@\@UEBA_NPEBVCompoundTag\@\@\@Z + * @vftbl 74 + * @symbol ?hasCustomColor\@Item\@\@UEBA_NPEBVCompoundTag\@\@\@Z */ virtual bool hasCustomColor(class CompoundTag const *) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?clearColor\@Item\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 76 + * @symbol ?clearColor\@Item\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void clearColor(class ItemStackBase &) const; /** - * @vftbl 77 - * @symbol ?clearColor\@Item\@\@UEBAXPEAVCompoundTag\@\@\@Z + * @vftbl 77 + * @symbol ?clearColor\@Item\@\@UEBAXPEAVCompoundTag\@\@\@Z */ virtual void clearColor(class CompoundTag *) const; /** - * @vftbl 78 - * @symbol ?setColor\@Item\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z + * @vftbl 78 + * @symbol ?setColor\@Item\@\@UEBAXAEAVItemStackBase\@\@AEBVColor\@mce\@\@\@Z */ virtual void setColor(class ItemStackBase &, class mce::Color const &) const; /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 81 - * @symbol ?getActorIdentifier\@Item\@\@UEBA?AUActorDefinitionIdentifier\@\@AEBVItemStack\@\@\@Z + * @vftbl 81 + * @symbol ?getActorIdentifier\@Item\@\@UEBA?AUActorDefinitionIdentifier\@\@AEBVItemStack\@\@\@Z */ virtual struct ActorDefinitionIdentifier getActorIdentifier(class ItemStack const &) const; /** - * @vftbl 82 - * @symbol ?buildIdAux\@Item\@\@UEBAHFPEBVCompoundTag\@\@\@Z + * @vftbl 82 + * @symbol ?buildIdAux\@Item\@\@UEBAHFPEBVCompoundTag\@\@\@Z */ virtual int buildIdAux(short, class CompoundTag const *) const; /** - * @vftbl 83 - * @symbol ?canUseOnSimTick\@Item\@\@UEBA_NXZ + * @vftbl 83 + * @symbol ?canUseOnSimTick\@Item\@\@UEBA_NXZ */ virtual bool canUseOnSimTick() const; /** - * @vftbl 84 - * @symbol ?use\@Item\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@Item\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@Item\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@Item\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@Item\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@Item\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@Item\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@Item\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@Item\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@Item\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@Item\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@Item\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 90 - * @symbol ?hitActor\@Item\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 90 + * @symbol ?hitActor\@Item\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hitActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 91 - * @symbol ?hitBlock\@Item\@\@UEBAXAEAVItemStack\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVMob\@\@\@Z + * @vftbl 91 + * @symbol ?hitBlock\@Item\@\@UEBAXAEAVItemStack\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVMob\@\@\@Z */ virtual void hitBlock(class ItemStack &, class Block const &, class BlockPos const &, class Mob &) const; /** - * @vftbl 92 - * @symbol ?mineBlock\@Item\@\@UEBA_NAEAVItemInstance\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 92 + * @symbol ?mineBlock\@Item\@\@UEBA_NAEAVItemInstance\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemInstance &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@Item\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@Item\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 94 - * @symbol ?buildDescriptionName\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 94 + * @symbol ?buildDescriptionName\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 96 - * @symbol ?buildEffectDescriptionName\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 96 + * @symbol ?buildEffectDescriptionName\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 97 - * @symbol ?buildCategoryDescriptionName\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 97 + * @symbol ?buildCategoryDescriptionName\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string buildCategoryDescriptionName() const; /** - * @vftbl 98 - * @symbol ?readUserData\@Item\@\@UEBAXAEAVItemStackBase\@\@AEAVIDataInput\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 98 + * @symbol ?readUserData\@Item\@\@UEBAXAEAVItemStackBase\@\@AEAVIDataInput\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual void readUserData(class ItemStackBase &, class IDataInput &, class ReadOnlyBinaryStream &) const; /** - * @vftbl 99 - * @symbol ?writeUserData\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVIDataOutput\@\@\@Z + * @vftbl 99 + * @symbol ?writeUserData\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVIDataOutput\@\@\@Z */ virtual void writeUserData(class ItemStackBase const &, class IDataOutput &) const; /** - * @vftbl 100 - * @symbol ?getMaxStackSize\@Item\@\@UEBAEAEBVItemDescriptor\@\@\@Z + * @vftbl 100 + * @symbol ?getMaxStackSize\@Item\@\@UEBAEAEBVItemDescriptor\@\@\@Z */ virtual unsigned char getMaxStackSize(class ItemDescriptor const &) const; /** - * @vftbl 101 - * @symbol ?inventoryTick\@Item\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z + * @vftbl 101 + * @symbol ?inventoryTick\@Item\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z */ virtual bool inventoryTick(class ItemStack &, class Level &, class Actor &, int, bool) const; /** - * @vftbl 102 - * @symbol ?refreshedInContainer\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@\@Z + * @vftbl 102 + * @symbol ?refreshedInContainer\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@\@Z */ virtual void refreshedInContainer(class ItemStackBase const &, class Level &) const; /** - * @vftbl 103 - * @symbol ?getCooldownType\@Item\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 103 + * @symbol ?getCooldownType\@Item\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getCooldownType() const; /** - * @vftbl 104 - * @symbol ?getCooldownTime\@Item\@\@UEBAHXZ + * @vftbl 104 + * @symbol ?getCooldownTime\@Item\@\@UEBAHXZ */ virtual int getCooldownTime() const; /** - * @vftbl 105 - * @symbol ?fixupCommon\@Item\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 105 + * @symbol ?fixupCommon\@Item\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; /** - * @vftbl 106 - * @symbol ?fixupCommon\@Item\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z + * @vftbl 106 + * @symbol ?fixupCommon\@Item\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &, class Level &) const; /** - * @vftbl 107 - * @symbol ?getDamageValue\@Item\@\@UEBAFPEBVCompoundTag\@\@\@Z + * @vftbl 107 + * @symbol ?getDamageValue\@Item\@\@UEBAFPEBVCompoundTag\@\@\@Z */ virtual short getDamageValue(class CompoundTag const *) const; /** - * @vftbl 108 - * @symbol ?setDamageValue\@Item\@\@UEBAXAEAVItemStackBase\@\@F\@Z + * @vftbl 108 + * @symbol ?setDamageValue\@Item\@\@UEBAXAEAVItemStackBase\@\@F\@Z */ virtual void setDamageValue(class ItemStackBase &, short) const; /** - * @vftbl 109 - * @symbol ?getInHandUpdateType\@Item\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemInstance\@\@1_N2\@Z + * @vftbl 109 + * @symbol ?getInHandUpdateType\@Item\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemInstance\@\@1_N2\@Z */ virtual enum class InHandUpdateType getInHandUpdateType(class Player const &, class ItemInstance const &, class ItemInstance const &, bool, bool) const; /** - * @vftbl 110 - * @symbol ?getInHandUpdateType\@Item\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemStack\@\@1_N2\@Z + * @vftbl 110 + * @symbol ?getInHandUpdateType\@Item\@\@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 111 - * @symbol ?validFishInteraction\@Item\@\@UEBA_NH\@Z + * @vftbl 111 + * @symbol ?validFishInteraction\@Item\@\@UEBA_NH\@Z */ virtual bool validFishInteraction(int) const; /** - * @vftbl 112 - * @symbol ?enchantProjectile\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?enchantProjectile\@Item\@\@UEBAXAEBVItemStackBase\@\@AEAVActor\@\@\@Z */ virtual void enchantProjectile(class ItemStackBase const &, class Actor &) const; /** - * @vftbl 113 - * @symbol ?getEquipLocation\@Item\@\@UEBA?AW4ActorLocation\@\@XZ + * @vftbl 113 + * @symbol ?getEquipLocation\@Item\@\@UEBA?AW4ActorLocation\@\@XZ */ virtual enum class ActorLocation getEquipLocation() const; /** - * @vftbl 114 - * @symbol ?getEquipSound\@Item\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 114 + * @symbol ?getEquipSound\@Item\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getEquipSound() const; /** - * @vftbl 115 - * @symbol ?isSameItem\@Item\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + * @vftbl 115 + * @symbol ?isSameItem\@Item\@\@UEBA_NAEBVItemStackBase\@\@0\@Z */ virtual bool isSameItem(class ItemStackBase const &, class ItemStackBase const &) const; /** - * @vftbl 116 - * @symbol ?initClient\@Item\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 116 + * @symbol ?initClient\@Item\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void initClient(class Json::Value &, class SemVersion const &); /** - * @vftbl 117 - * @symbol ?setIconInfo\@Item\@\@UEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@Item\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@Item\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 119 - * @symbol ?getInteractText\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z + * @vftbl 119 + * @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 - * @symbol ?getAnimationFrameFor\@Item\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@Item\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 121 - * @symbol ?isEmissive\@Item\@\@UEBA_NH\@Z + * @vftbl 121 + * @symbol ?isEmissive\@Item\@\@UEBA_NH\@Z */ virtual bool isEmissive(int) const; /** - * @vftbl 122 - * @symbol ?getLightEmission\@Item\@\@UEBA?AUBrightness\@\@H\@Z + * @vftbl 122 + * @symbol ?getLightEmission\@Item\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @vftbl 123 - * @symbol ?getIconYOffset\@Item\@\@UEBAHXZ + * @vftbl 123 + * @symbol ?getIconYOffset\@Item\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 124 - * @symbol ?canBeCharged\@Item\@\@UEBA_NXZ + * @vftbl 124 + * @symbol ?canBeCharged\@Item\@\@UEBA_NXZ */ virtual bool canBeCharged() const; /** - * @vftbl 125 - * @symbol ?playSoundIncrementally\@Item\@\@UEBAXAEBVItemInstance\@\@AEAVMob\@\@\@Z + * @vftbl 125 + * @symbol ?playSoundIncrementally\@Item\@\@UEBAXAEBVItemInstance\@\@AEAVMob\@\@\@Z */ virtual void playSoundIncrementally(class ItemInstance const &, class Mob &) const; /** - * @vftbl 126 - * @symbol ?playSoundIncrementally\@Item\@\@UEBAXAEBVItemStack\@\@AEAVMob\@\@\@Z + * @vftbl 126 + * @symbol ?playSoundIncrementally\@Item\@\@UEBAXAEBVItemStack\@\@AEAVMob\@\@\@Z */ virtual void playSoundIncrementally(class ItemStack const &, class Mob &) const; /** - * @vftbl 127 - * @symbol ?getFurnaceBurnIntervalMultipler\@Item\@\@UEBAMAEBVItemStackBase\@\@\@Z + * @vftbl 127 + * @symbol ?getFurnaceBurnIntervalMultipler\@Item\@\@UEBAMAEBVItemStackBase\@\@\@Z */ virtual float getFurnaceBurnIntervalMultipler(class ItemStackBase const &) const; /** - * @vftbl 128 - * @symbol ?getFurnaceXPmultiplier\@Item\@\@UEBAMAEBVItemStackBase\@\@\@Z + * @vftbl 128 + * @symbol ?getFurnaceXPmultiplier\@Item\@\@UEBAMAEBVItemStackBase\@\@\@Z */ virtual float getFurnaceXPmultiplier(class ItemStackBase const &) const; /** - * @vftbl 129 - * @symbol ?getAuxValuesDescription\@Item\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 129 + * @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 - * @symbol ?_checkUseOnPermissions\@Item\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z + * @vftbl 130 + * @symbol ?_checkUseOnPermissions\@Item\@\@EEBA_NAEAVActor\@\@AEAVItemStackBase\@\@AEBEAEBVBlockPos\@\@\@Z */ virtual bool _checkUseOnPermissions(class Actor &, class ItemStackBase &, unsigned char const &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@Item\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@Item\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@Item\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@Item\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEM /** - * @symbol ?getBaseColor\@Item\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z + * @symbol ?getBaseColor\@Item\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z */ MCVAPI class mce::Color getBaseColor(class ItemStack const &) const; /** - * @symbol ?getSecondaryColor\@Item\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z + * @symbol ?getSecondaryColor\@Item\@\@UEBA?AVColor\@mce\@\@AEBVItemStack\@\@\@Z */ MCVAPI class mce::Color getSecondaryColor(class ItemStack const &) const; /** - * @symbol ?hasCustomColor\@Item\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?hasCustomColor\@Item\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool hasCustomColor(class ItemStackBase const &) const; /** - * @symbol ?isActorPlacerItem\@Item\@\@UEBA_NXZ + * @symbol ?isActorPlacerItem\@Item\@\@UEBA_NXZ */ MCVAPI bool isActorPlacerItem() const; /** - * @symbol ?isBucket\@Item\@\@UEBA_NXZ + * @symbol ?isBucket\@Item\@\@UEBA_NXZ */ MCVAPI bool isBucket() const; /** - * @symbol ?isCandle\@Item\@\@UEBA_NXZ + * @symbol ?isCandle\@Item\@\@UEBA_NXZ */ MCVAPI bool isCandle() const; /** - * @symbol ?isComplex\@Item\@\@UEBA_NXZ + * @symbol ?isComplex\@Item\@\@UEBA_NXZ */ MCVAPI bool isComplex() const; /** - * @symbol ?isComponentBased\@Item\@\@UEBA_NXZ + * @symbol ?isComponentBased\@Item\@\@UEBA_NXZ */ MCVAPI bool isComponentBased() const; /** - * @symbol ?isMultiColorTinted\@Item\@\@UEBA_NAEBVItemStack\@\@\@Z + * @symbol ?isMultiColorTinted\@Item\@\@UEBA_NAEBVItemStack\@\@\@Z */ MCVAPI bool isMultiColorTinted(class ItemStack const &) const; /** - * @symbol ?isMusicDisk\@Item\@\@UEBA_NXZ + * @symbol ?isMusicDisk\@Item\@\@UEBA_NXZ */ MCVAPI bool isMusicDisk() const; /** - * @symbol ?isPattern\@Item\@\@UEBA_NXZ + * @symbol ?isPattern\@Item\@\@UEBA_NXZ */ MCVAPI bool isPattern() const; /** - * @symbol ?showsDurabilityInCreative\@Item\@\@UEBA_NXZ + * @symbol ?showsDurabilityInCreative\@Item\@\@UEBA_NXZ */ MCVAPI bool showsDurabilityInCreative() const; /** - * @symbol ?uniqueAuxValues\@Item\@\@UEBA_NXZ + * @symbol ?uniqueAuxValues\@Item\@\@UEBA_NXZ */ MCVAPI bool uniqueAuxValues() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Item(); #endif /** - * @symbol ??0Item\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0Item\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI Item(std::string const &, short); /** - * @symbol ?addOnResetBAIcallback\@Item\@\@QEAAXAEBV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?addOnResetBAIcallback\@Item\@\@QEAAXAEBV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void addOnResetBAIcallback(class std::function const &); /** - * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBUItemTag\@\@\@Z + * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBUItemTag\@\@\@Z */ MCAPI class Item & addTag(struct ItemTag const &); /** - * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z + * @symbol ?addTag\@Item\@\@QEAAAEAV1\@AEBVHashedString\@\@\@Z */ MCAPI class Item & addTag(class HashedString const &); /** - * @symbol ?addTags\@Item\@\@QEAAAEAV1\@V?$initializer_list\@V?$reference_wrapper\@$$CBUItemTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addTags\@Item\@\@QEAAAEAV1\@V?$initializer_list\@V?$reference_wrapper\@$$CBUItemTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI class Item & addTags(class std::initializer_list>); /** - * @symbol ?allowOffhand\@Item\@\@QEBA_NXZ + * @symbol ?allowOffhand\@Item\@\@QEBA_NXZ */ MCAPI bool allowOffhand() const; /** - * @symbol ?buildDescriptor\@Item\@\@QEBA?AVItemDescriptor\@\@FPEBVCompoundTag\@\@\@Z + * @symbol ?buildDescriptor\@Item\@\@QEBA?AVItemDescriptor\@\@FPEBVCompoundTag\@\@\@Z */ MCAPI class ItemDescriptor buildDescriptor(short, class CompoundTag const *) const; /** - * @symbol ?calculatePlacePos\@Item\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @symbol ?calculatePlacePos\@Item\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ MCAPI bool calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @symbol ?destroySpeedBonus\@Item\@\@QEBAMAEBVItemStackBase\@\@\@Z + * @symbol ?destroySpeedBonus\@Item\@\@QEBAMAEBVItemStackBase\@\@\@Z */ MCAPI float destroySpeedBonus(class ItemStackBase const &) const; /** - * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z + * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z */ - MCAPI void fixupOnLoad(class ItemStackBase &) const; + MCAPI void fixupOnLoad(class ItemStackBase &, class Level &) const; /** - * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z + * @symbol ?fixupOnLoad\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z */ - MCAPI void fixupOnLoad(class ItemStackBase &, class Level &) const; + MCAPI void fixupOnLoad(class ItemStackBase &) const; /** - * @symbol ?getCommandNames\@Item\@\@QEBA?AV?$vector\@UCommandName\@\@V?$allocator\@UCommandName\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getCommandNames\@Item\@\@QEBA?AV?$vector\@UCommandName\@\@V?$allocator\@UCommandName\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getCommandNames() const; /** - * @symbol ?getCreativeCategory\@Item\@\@QEBA?AW4CreativeItemCategory\@\@XZ + * @symbol ?getCreativeCategory\@Item\@\@QEBA?AW4CreativeItemCategory\@\@XZ */ MCAPI enum class CreativeItemCategory getCreativeCategory() const; /** - * @symbol ?getCreativeGroup\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCreativeGroup\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getCreativeGroup() const; /** - * @symbol ?getFrameCount\@Item\@\@QEBAHXZ + * @symbol ?getFrameCount\@Item\@\@QEBAHXZ */ MCAPI int getFrameCount() const; /** - * @symbol ?getFullItemName\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFullItemName\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFullItemName() const; /** - * @symbol ?getFullNameHash\@Item\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getFullNameHash\@Item\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getFullNameHash() const; /** - * @symbol ?getId\@Item\@\@QEBAFXZ + * @symbol ?getId\@Item\@\@QEBAFXZ */ MCAPI short getId() const; /** - * @symbol ?getLegacyBlock\@Item\@\@QEBAAEBV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ + * @symbol ?getLegacyBlock\@Item\@\@QEBAAEBV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ */ MCAPI class WeakPtr const & getLegacyBlock() const; /** - * @symbol ?getNamespace\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getNamespace\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getNamespace() const; /** - * @symbol ?getRawNameHash\@Item\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getRawNameHash\@Item\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getRawNameHash() const; /** - * @symbol ?getRawNameId\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRawNameId\@Item\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getRawNameId() const; /** - * @symbol ?getRequiredBaseGameVersion\@Item\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getRequiredBaseGameVersion\@Item\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getRequiredBaseGameVersion() const; /** - * @symbol ?getSerializedName\@Item\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSerializedName\@Item\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSerializedName() const; /** - * @symbol ?getUseAnimation\@Item\@\@QEBA?AW4UseAnimation\@\@XZ + * @symbol ?getUseAnimation\@Item\@\@QEBA?AW4UseAnimation\@\@XZ */ MCAPI enum class UseAnimation getUseAnimation() const; /** - * @symbol ?hasDamageValue\@Item\@\@QEBA_NPEBVCompoundTag\@\@\@Z + * @symbol ?hasDamageValue\@Item\@\@QEBA_NPEBVCompoundTag\@\@\@Z */ MCAPI bool hasDamageValue(class CompoundTag const *) const; /** - * @symbol ?hasTag\@Item\@\@QEBA_NAEB_K\@Z + * @symbol ?hasTag\@Item\@\@QEBA_NAEB_K\@Z */ MCAPI bool hasTag(unsigned __int64 const &) const; /** - * @symbol ?isElytra\@Item\@\@QEBA_NXZ + * @symbol ?isCommandOnly\@Item\@\@QEBA_NAEBVBaseGameVersion\@\@\@Z + */ + MCAPI bool isCommandOnly(class BaseGameVersion const &) const; + /** + * @symbol ?isElytra\@Item\@\@QEBA_NXZ */ MCAPI bool isElytra() const; /** - * @symbol ?isExplodable\@Item\@\@QEBA_NXZ + * @symbol ?isExplodable\@Item\@\@QEBA_NXZ */ MCAPI bool isExplodable() const; /** - * @symbol ?isFireResistant\@Item\@\@QEBA_NXZ + * @symbol ?isFireResistant\@Item\@\@QEBA_NXZ */ MCAPI bool isFireResistant() const; /** - * @symbol ?isNameTag\@Item\@\@QEBA_NXZ + * @symbol ?isNameTag\@Item\@\@QEBA_NXZ */ MCAPI bool isNameTag() const; /** - * @symbol ?isSeed\@Item\@\@QEBA_NXZ + * @symbol ?isSeed\@Item\@\@QEBA_NXZ */ MCAPI bool isSeed() const; /** - * @symbol ??8Item\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8Item\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class Item const &) const; /** - * @symbol ?removeDamageValue\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z + * @symbol ?removeDamageValue\@Item\@\@QEBAXAEAVItemStackBase\@\@\@Z */ MCAPI void removeDamageValue(class ItemStackBase &) const; /** - * @symbol ?setAllowOffhand\@Item\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setAllowOffhand\@Item\@\@QEAAAEAV1\@_N\@Z */ MCAPI class Item & setAllowOffhand(bool); /** - * @symbol ?setCategory\@Item\@\@QEAAAEAV1\@W4CreativeItemCategory\@\@\@Z + * @symbol ?setCategory\@Item\@\@QEAAAEAV1\@W4CreativeItemCategory\@\@\@Z */ MCAPI class Item & setCategory(enum class CreativeItemCategory); /** - * @symbol ?setCreativeGroup\@Item\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCreativeGroup\@Item\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class Item & setCreativeGroup(std::string const &); /** - * @symbol ?setFurnaceBurnIntervalMultiplier\@Item\@\@QEAAAEAV1\@M\@Z + * @symbol ?setFurnaceBurnIntervalMultiplier\@Item\@\@QEAAAEAV1\@M\@Z */ MCAPI class Item & setFurnaceBurnIntervalMultiplier(float); /** - * @symbol ?setFurnaceXPmultiplier\@Item\@\@QEAAAEAV1\@M\@Z + * @symbol ?setFurnaceXPmultiplier\@Item\@\@QEAAAEAV1\@M\@Z */ MCAPI class Item & setFurnaceXPmultiplier(float); /** - * @symbol ?setIsMirroredArt\@Item\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setIsMirroredArt\@Item\@\@QEAAAEAV1\@_N\@Z */ MCAPI class Item & setIsMirroredArt(bool); /** - * @symbol ?setMinRequiredBaseGameVersion\@Item\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?setMinRequiredBaseGameVersion\@Item\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z */ MCAPI class Item & setMinRequiredBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?shouldDespawn\@Item\@\@QEBA_NXZ + * @symbol ?shouldDespawn\@Item\@\@QEBA_NXZ */ MCAPI bool shouldDespawn() const; /** - * @symbol ?updateCustomBlockEntityTag\@Item\@\@QEBA_NAEAVBlockSource\@\@AEAVItemStackBase\@\@AEBVBlockPos\@\@\@Z + * @symbol ?updateCustomBlockEntityTag\@Item\@\@QEBA_NAEAVBlockSource\@\@AEAVItemStackBase\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool updateCustomBlockEntityTag(class BlockSource &, class ItemStackBase &, class BlockPos const &) const; /** - * @symbol ?useOn\@Item\@\@QEBA_NAEAVItemStack\@\@AEAVActor\@\@HHHEAEBVVec3\@\@\@Z + * @symbol ?useOn\@Item\@\@QEBA_NAEAVItemStack\@\@AEAVActor\@\@HHHEAEBVVec3\@\@\@Z */ MCAPI bool useOn(class ItemStack &, class Actor &, int, int, int, unsigned char, class Vec3 const &) const; /** - * @symbol ?ICON_DESCRIPTION_PREFIX\@Item\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ICON_DESCRIPTION_PREFIX\@Item\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ICON_DESCRIPTION_PREFIX; /** - * @symbol ?TAG_DAMAGE\@Item\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_DAMAGE\@Item\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_DAMAGE; /** - * @symbol ?addCreativeItem\@Item\@\@SAXVItemRegistryRef\@\@AEBVBlock\@\@\@Z + * @symbol ?addCreativeItem\@Item\@\@SAXVItemRegistryRef\@\@AEBVBlock\@\@\@Z */ MCAPI static void addCreativeItem(class ItemRegistryRef, class Block const &); /** - * @symbol ?addCreativeItem\@Item\@\@SAXVItemRegistryRef\@\@AEBVItemInstance\@\@\@Z + * @symbol ?addCreativeItem\@Item\@\@SAXVItemRegistryRef\@\@AEBVItemStack\@\@\@Z */ - MCAPI static void addCreativeItem(class ItemRegistryRef, class ItemInstance const &); + MCAPI static void addCreativeItem(class ItemRegistryRef, class ItemStack const &); /** - * @symbol ?addCreativeItem\@Item\@\@SAXVItemRegistryRef\@\@AEBVItemStack\@\@\@Z + * @symbol ?addCreativeItem\@Item\@\@SAXVItemRegistryRef\@\@AEBVItemInstance\@\@\@Z */ - MCAPI static void addCreativeItem(class ItemRegistryRef, class ItemStack const &); + MCAPI static void addCreativeItem(class ItemRegistryRef, class ItemInstance const &); /** - * @symbol ?addLooseCreativeItems\@Item\@\@SAX_NAEBVBaseGameVersion\@\@VItemRegistryRef\@\@\@Z + * @symbol ?addLooseCreativeItems\@Item\@\@SAX_NAEBVBaseGameVersion\@\@VItemRegistryRef\@\@\@Z */ MCAPI static void addLooseCreativeItems(bool, class BaseGameVersion const &, class ItemRegistryRef); /** - * @symbol ?endCreativeItemDefinitions\@Item\@\@SAX_N\@Z + * @symbol ?endCreativeItemDefinitions\@Item\@\@SAX_N\@Z */ MCAPI static void endCreativeItemDefinitions(bool); /** - * @symbol ?isElytra\@Item\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isElytra\@Item\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isElytra(class ItemDescriptor const &); /** - * @symbol ?isElytraBroken\@Item\@\@SA_NH\@Z + * @symbol ?isElytraBroken\@Item\@\@SA_NH\@Z */ MCAPI static bool isElytraBroken(int); /** - * @symbol ?isFlyEnabled\@Item\@\@SA_NAEBVItemInstance\@\@\@Z + * @symbol ?isFlyEnabled\@Item\@\@SA_NAEBVItemInstance\@\@\@Z */ MCAPI static bool isFlyEnabled(class ItemInstance const &); /** - * @symbol ?isSameTypeAndItem\@Item\@\@SA_NAEBVItemStackBase\@\@0\@Z + * @symbol ?isSameTypeAndItem\@Item\@\@SA_NAEBVItemStackBase\@\@0\@Z */ MCAPI static bool isSameTypeAndItem(class ItemStackBase const &, class ItemStackBase const &); /** - * @symbol ?mActiveCreativeGroupInfo\@Item\@\@2PEAVCreativeGroupInfo\@\@EA + * @symbol ?mActiveCreativeGroupInfo\@Item\@\@2PEAVCreativeGroupInfo\@\@EA */ MCAPI static class CreativeGroupInfo * mActiveCreativeGroupInfo; /** - * @symbol ?mActiveCreativeItemCategory\@Item\@\@2PEAVCreativeItemGroupCategory\@\@EA + * @symbol ?mActiveCreativeItemCategory\@Item\@\@2PEAVCreativeItemGroupCategory\@\@EA */ MCAPI static class CreativeItemGroupCategory * mActiveCreativeItemCategory; /** - * @symbol ?mActiveCreativeItemRegistry\@Item\@\@2PEAVCreativeItemRegistry\@\@EA + * @symbol ?mActiveCreativeItemRegistry\@Item\@\@2PEAVCreativeItemRegistry\@\@EA */ MCAPI static class CreativeItemRegistry * mActiveCreativeItemRegistry; /** - * @symbol ?mGenerateDenyParticleEffect\@Item\@\@2_NB + * @symbol ?mGenerateDenyParticleEffect\@Item\@\@2_NB */ MCAPI static bool const mGenerateDenyParticleEffect; /** - * @symbol ?startCreativeItemDefinitions\@Item\@\@SAX_NPEAVCreativeItemRegistry\@\@\@Z + * @symbol ?startCreativeItemDefinitions\@Item\@\@SAX_NPEAVCreativeItemRegistry\@\@\@Z */ MCAPI static void startCreativeItemDefinitions(bool, class CreativeItemRegistry *); /** - * @symbol ?toBlockId\@Item\@\@SA?AUNewBlockID\@\@F\@Z + * @symbol ?toBlockId\@Item\@\@SA?AUNewBlockID\@\@F\@Z */ MCAPI static struct NewBlockID toBlockId(short); //protected: /** - * @symbol ?_helpChangeInventoryItemInPlace\@Item\@\@IEBAXAEAVActor\@\@AEAVItemStack\@\@1W4ItemAcquisitionMethod\@\@\@Z + * @symbol ?_helpChangeInventoryItemInPlace\@Item\@\@IEBAXAEAVActor\@\@AEAVItemStack\@\@1W4ItemAcquisitionMethod\@\@\@Z */ MCAPI void _helpChangeInventoryItemInPlace(class Actor &, class ItemStack &, class ItemStack &, enum class ItemAcquisitionMethod) const; //private: /** - * @symbol ?_addLooseCreativeItemsClient\@Item\@\@CAXXZ + * @symbol ?_addLooseCreativeItemsClient\@Item\@\@CAXXZ */ MCAPI static void _addLooseCreativeItemsClient(); /** - * @symbol ?_addLooseCreativeItemsServer\@Item\@\@CAXAEBVBaseGameVersion\@\@VItemRegistryRef\@\@\@Z + * @symbol ?_addLooseCreativeItemsServer\@Item\@\@CAXAEBVBaseGameVersion\@\@VItemRegistryRef\@\@\@Z */ MCAPI static void _addLooseCreativeItemsServer(class BaseGameVersion const &, class ItemRegistryRef); @@ -1021,8 +1029,8 @@ class Tier { private: /** - * @symbol ?mServerItemsUsedInCreativeItems\@Item\@\@0V?$unique_ptr\@V?$set\@FU?$less\@F\@std\@\@V?$allocator\@F\@2\@\@std\@\@U?$default_delete\@V?$set\@FU?$less\@F\@std\@\@V?$allocator\@F\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mServerItemsUsedInCreativeItems\@Item\@\@0V?$unique_ptr\@V?$set\@FU?$less\@F\@std\@\@V?$allocator\@F\@2\@\@std\@\@U?$default_delete\@V?$set\@FU?$less\@F\@std\@\@V?$allocator\@F\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::unique_ptr, class std::allocator>> mServerItemsUsedInCreativeItems; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp b/LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp index 35b94501e6..9bb5ada69b 100644 --- a/LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp +++ b/LiteLoader/include/llapi/mc/ItemAcquisitionMethodMap.hpp @@ -34,8 +34,8 @@ class ItemAcquisitionMethodMap { private: /** - * @symbol ?mMap\@ItemAcquisitionMethodMap\@\@0V?$BidirectionalUnorderedMap\@W4ItemAcquisitionMethod\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?mMap\@ItemAcquisitionMethodMap\@\@0V?$BidirectionalUnorderedMap\@W4ItemAcquisitionMethod\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const mMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemActor.hpp b/LiteLoader/include/llapi/mc/ItemActor.hpp index be873d469b..4fa8b0ad0a 100644 --- a/LiteLoader/include/llapi/mc/ItemActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemActor.hpp @@ -35,229 +35,224 @@ class ItemActor : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ItemActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ItemActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ItemActor(); + virtual void __unk_vfn_16(); /** - * @vftbl 21 - * @symbol ?isRuntimePredictedMovementEnabled\@ItemActor\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isRuntimePredictedMovementEnabled\@ItemActor\@\@UEBA_NXZ */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 40 - * @symbol ?isFireImmune\@ItemActor\@\@UEBA_NXZ + * @vftbl 40 + * @symbol ?isFireImmune\@ItemActor\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 48 - * @symbol ?tryCreateAddActorPacket\@ItemActor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ + * @vftbl 48 + * @symbol ?tryCreateAddActorPacket\@ItemActor\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 49 - * @symbol ?normalTick\@ItemActor\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 90 - * @symbol ?playerTouch\@ItemActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 89 + * @symbol ?playerTouch\@ItemActor\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@ItemActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@ItemActor\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@ItemActor\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@ItemActor\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@ItemActor\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@ItemActor\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 174 - * @symbol ?getLiquidAABB\@ItemActor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z + * @vftbl 173 + * @symbol ?getLiquidAABB\@ItemActor\@\@UEBA?AVAABB\@\@W4MaterialType\@\@\@Z */ virtual class AABB getLiquidAABB(enum class MaterialType) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 196 - * @symbol ?canSynchronizeNewEntity\@ItemActor\@\@UEBA_NXZ + * @vftbl 195 + * @symbol ?canSynchronizeNewEntity\@ItemActor\@\@UEBA_NXZ */ virtual bool canSynchronizeNewEntity() const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@ItemActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@ItemActor\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ItemActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ItemActor\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ItemActor\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ItemActor\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMACTOR /** - * @symbol ?canMakeStepSound\@ItemActor\@\@UEBA_NXZ + * @symbol ?canMakeStepSound\@ItemActor\@\@UEBA_NXZ */ MCVAPI bool canMakeStepSound() const; #endif /** - * @symbol ??0ItemActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ItemActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ItemActor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@ItemActor\@\@QEAAXXZ + * @symbol ?postNormalTick\@ItemActor\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?setSourceEntity\@ItemActor\@\@QEAAXPEBVActor\@\@\@Z + * @symbol ?setSourceEntity\@ItemActor\@\@QEAAXPEBVActor\@\@\@Z */ MCAPI void setSourceEntity(class Actor const *); /** - * @symbol ?getLiquidAABB\@ItemActor\@\@SA?AVAABB\@\@AEBUAABBShapeComponent\@\@\@Z + * @symbol ?getLiquidAABB\@ItemActor\@\@SA?AVAABB\@\@AEBUAABBShapeComponent\@\@\@Z */ MCAPI static class AABB getLiquidAABB(struct AABBShapeComponent const &); /** - * @symbol ?tryGetFromEntity\@ItemActor\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@ItemActor\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class ItemActor * tryGetFromEntity(class EntityContext &, bool); //private: /** - * @symbol ?_addComponents\@ItemActor\@\@AEAAXXZ + * @symbol ?_addComponents\@ItemActor\@\@AEAAXXZ */ MCAPI void _addComponents(); /** - * @symbol ?_dropContents\@ItemActor\@\@AEAAXXZ + * @symbol ?_dropContents\@ItemActor\@\@AEAAXXZ */ MCAPI void _dropContents(); /** - * @symbol ?_merge\@ItemActor\@\@AEAA_NPEAV1\@\@Z + * @symbol ?_merge\@ItemActor\@\@AEAA_NPEAV1\@\@Z */ MCAPI bool _merge(class ItemActor *); /** - * @symbol ?_validateItem\@ItemActor\@\@AEAAXXZ + * @symbol ?_validateItem\@ItemActor\@\@AEAAXXZ */ MCAPI void _validateItem(); private: /** - * @symbol ?LIFETIME\@ItemActor\@\@0HB + * @symbol ?LIFETIME\@ItemActor\@\@0HB */ MCAPI static int const LIFETIME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemActorPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/ItemActorPostNormalTickSystem.hpp deleted file mode 100644 index c124b4f34f..0000000000 --- a/LiteLoader/include/llapi/mc/ItemActorPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ItemActorPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ItemActorPostNormalTickSystem. - * - */ -class ItemActorPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMACTORPOSTNORMALTICKSYSTEM -public: - class ItemActorPostNormalTickSystem& operator=(class ItemActorPostNormalTickSystem const &) = delete; - ItemActorPostNormalTickSystem(class ItemActorPostNormalTickSystem const &) = delete; - ItemActorPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@ItemActorPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doItemActorPostNormalTickSystem\@ItemActorPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doItemActorPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp index a8d83f9169..ac392f8ffe 100644 --- a/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemChargeEvent.hpp @@ -27,15 +27,15 @@ struct ItemChargeEvent { public: /** - * @symbol ??0ItemChargeEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemChargeEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemChargeEvent(struct ItemChargeEvent const &); /** - * @symbol ??0ItemChargeEvent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ItemChargeEvent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ItemChargeEvent(struct ItemChargeEvent &&); /** - * @symbol ??1ItemChargeEvent\@\@QEAA\@XZ + * @symbol ??1ItemChargeEvent\@\@QEAA\@XZ */ MCAPI ~ItemChargeEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemColorUtil.hpp b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp index 812eff5059..bfb82d3953 100644 --- a/LiteLoader/include/llapi/mc/ItemColorUtil.hpp +++ b/LiteLoader/include/llapi/mc/ItemColorUtil.hpp @@ -22,19 +22,19 @@ namespace ItemColorUtil { #undef AFTER_EXTRA /** - * @symbol ?fromBlockColor\@ItemColorUtil\@\@YA?AW4ItemColor\@\@W4BlockColor\@\@\@Z + * @symbol ?fromBlockColor\@ItemColorUtil\@\@YA?AW4ItemColor\@\@W4BlockColor\@\@\@Z */ MCAPI enum class ItemColor fromBlockColor(enum class BlockColor); /** - * @symbol ?fromInt\@ItemColorUtil\@\@YA?AW4ItemColor\@\@H\@Z + * @symbol ?fromInt\@ItemColorUtil\@\@YA?AW4ItemColor\@\@H\@Z */ MCAPI enum class ItemColor fromInt(int); /** - * @symbol ?getName\@ItemColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemColor\@\@\@Z + * @symbol ?getName\@ItemColorUtil\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemColor\@\@\@Z */ MCAPI std::string const & getName(enum class ItemColor); /** - * @symbol ?getRGBColor\@ItemColorUtil\@\@YAHW4ItemColor\@\@\@Z + * @symbol ?getRGBColor\@ItemColorUtil\@\@YAHW4ItemColor\@\@\@Z */ MCAPI int getRGBColor(enum class ItemColor); diff --git a/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp index 2aad97911b..4f91d2cb47 100644 --- a/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemCompleteChargeEvent.hpp @@ -25,7 +25,7 @@ struct ItemCompleteChargeEvent { public: /** - * @symbol ??1ItemCompleteChargeEvent\@\@QEAA\@XZ + * @symbol ??1ItemCompleteChargeEvent\@\@QEAA\@XZ */ MCAPI ~ItemCompleteChargeEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemComponent.hpp b/LiteLoader/include/llapi/mc/ItemComponent.hpp index 84c43f5f72..5c8061ef41 100644 --- a/LiteLoader/include/llapi/mc/ItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ItemComponent.hpp @@ -30,64 +30,68 @@ class ItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?writeSettings\@ItemComponent\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?writeSettings\@ItemComponent\@\@UEAAXXZ */ virtual void writeSettings(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 ?checkComponentDataForContentErrors\@ItemComponent\@\@UEBA_NXZ + * @symbol ?checkComponentDataForContentErrors\@ItemComponent\@\@UEBA_NXZ */ MCVAPI bool checkComponentDataForContentErrors() const; /** - * @symbol ?initializeFromNetwork\@ItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @symbol ?initializeFromNetwork\@ItemComponent\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ MCVAPI bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?isNetworkComponent\@ItemComponent\@\@UEBA_NXZ + * @symbol ?isNetworkComponent\@ItemComponent\@\@UEBA_NXZ */ MCVAPI bool isNetworkComponent() const; /** - * @symbol ?useOn\@ItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?useOn\@ItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ MCVAPI bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemComponent(); #endif /** - * @symbol ??0ItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z + * @symbol ??0ItemComponent\@\@QEAA\@PEAVComponentItem\@\@\@Z */ MCAPI ItemComponent(class ComponentItem *); /** - * @symbol ?bindItemComponentType\@ItemComponent\@\@SAXXZ + * @symbol ?bindItemComponentType\@ItemComponent\@\@SAXXZ */ MCAPI static void bindItemComponentType(); /** - * @symbol ?registerVersionUpgrades\@ItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@ItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp index 2166f03f9f..6ace18b909 100644 --- a/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemComponentPacket.hpp @@ -30,42 +30,48 @@ class ItemComponentPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemComponentPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ItemComponentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ItemComponentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ItemComponentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ItemComponentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ItemComponentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ItemComponentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol ?readExtended\@ItemComponentPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@ItemComponentPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ItemComponentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMCOMPONENTPACKET /** - * @symbol ??0ItemComponentPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ItemComponentPacket(); + MCVAPI ~ItemComponentPacket(); +#endif /** - * @symbol ??0ItemComponentPacket\@\@QEAA\@VItemRegistryRef\@\@\@Z + * @symbol ??0ItemComponentPacket\@\@QEAA\@VItemRegistryRef\@\@\@Z */ MCAPI ItemComponentPacket(class ItemRegistryRef); + /** + * @symbol ??0ItemComponentPacket\@\@QEAA\@XZ + */ + MCAPI ItemComponentPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemContext.hpp b/LiteLoader/include/llapi/mc/ItemContext.hpp index 8e0f662e2d..014568744a 100644 --- a/LiteLoader/include/llapi/mc/ItemContext.hpp +++ b/LiteLoader/include/llapi/mc/ItemContext.hpp @@ -25,72 +25,112 @@ class ItemContext { public: /** - * @symbol ??0ItemContext\@\@QEAA\@AEBVWeakEntityRef\@\@H\@Z + * @symbol ??0ItemContext\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + */ + MCAPI ItemContext(class BlockSource &, class BlockPos const &, int); + /** + * @symbol ??0ItemContext\@\@QEAA\@AEBVWeakEntityRef\@\@H\@Z */ MCAPI ItemContext(class WeakEntityRef const &, int); /** - * @symbol ??0ItemContext\@\@QEAA\@AEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?clone\@ItemContext\@\@QEBA?AVItemStack\@\@XZ */ - MCAPI ItemContext(class BlockSource &, class BlockPos const &, int); + MCAPI class ItemStack clone() const; /** - * @symbol ?getAmount\@ItemContext\@\@QEBAHXZ + * @symbol ?getAmount\@ItemContext\@\@QEBAHXZ */ MCAPI int getAmount() const; /** - * @symbol ?getData\@ItemContext\@\@QEBAHXZ + * @symbol ?getData\@ItemContext\@\@QEBAHXZ */ MCAPI int getData() const; /** - * @symbol ?getId\@ItemContext\@\@QEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@XZ + * @symbol ?getId\@ItemContext\@\@QEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@XZ */ MCAPI class std::optional getId() const; /** - * @symbol ?getItem\@ItemContext\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getItem\@ItemContext\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getItem() const; /** - * @symbol ?getLore\@ItemContext\@\@QEBA?AV?$optional\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@XZ + * @symbol ?getKeepOnDeath\@ItemContext\@\@QEBA_NXZ + */ + MCAPI bool getKeepOnDeath() const; + /** + * @symbol ?getLockMode\@ItemContext\@\@QEBA?AW4ItemLockMode\@\@XZ + */ + MCAPI enum class ItemLockMode getLockMode() const; + /** + * @symbol ?getLore\@ItemContext\@\@QEBA?AV?$optional\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@XZ */ MCAPI class std::optional> getLore() const; /** - * @symbol ?getNameTag\@ItemContext\@\@QEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@XZ + * @symbol ?getMaxAmount\@ItemContext\@\@QEBAHXZ + */ + MCAPI int getMaxAmount() const; + /** + * @symbol ?getNameTag\@ItemContext\@\@QEBA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@XZ */ MCAPI class std::optional getNameTag() const; /** - * @symbol ?isValid\@ItemContext\@\@QEBA_NXZ + * @symbol ?isStackable\@ItemContext\@\@QEBA_NXZ + */ + MCAPI bool isStackable() const; + /** + * @symbol ?isStackableWith\@ItemContext\@\@QEBA_NAEBVItemStackBase\@\@\@Z + */ + MCAPI bool isStackableWith(class ItemStackBase const &) const; + /** + * @symbol ?isValid\@ItemContext\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?setAmount\@ItemContext\@\@QEAAXH\@Z + * @symbol ?setAmount\@ItemContext\@\@QEAAXH\@Z */ MCAPI void setAmount(int); /** - * @symbol ?setData\@ItemContext\@\@QEAAXH\@Z + * @symbol ?setCanDestroy\@ItemContext\@\@QEAA_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 bool setCanDestroy(std::vector const &); + /** + * @symbol ?setCanPlaceOn\@ItemContext\@\@QEAA_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 bool setCanPlaceOn(std::vector const &); + /** + * @symbol ?setData\@ItemContext\@\@QEAAXH\@Z */ MCAPI void setData(int); /** - * @symbol ?setItem\@ItemContext\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setItem\@ItemContext\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setItem(class ItemStack const &); /** - * @symbol ?setLore\@ItemContext\@\@QEAAXAEBV?$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 ?setKeepOnDeath\@ItemContext\@\@QEAAX_N\@Z + */ + MCAPI void setKeepOnDeath(bool); + /** + * @symbol ?setLockMode\@ItemContext\@\@QEAAXW4ItemLockMode\@\@\@Z + */ + MCAPI void setLockMode(enum class ItemLockMode); + /** + * @symbol ?setLore\@ItemContext\@\@QEAAXAEBV?$optional\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@Z */ - MCAPI void setLore(std::vector const &); + MCAPI void setLore(class std::optional> const &); /** - * @symbol ?setNameTag\@ItemContext\@\@QEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z + * @symbol ?setNameTag\@ItemContext\@\@QEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z */ MCAPI void setNameTag(class std::optional); /** - * @symbol ??1ItemContext\@\@QEAA\@XZ + * @symbol ??1ItemContext\@\@QEAA\@XZ */ MCAPI ~ItemContext(); //private: /** - * @symbol ?_tryGetContainerFromEntity\@ItemContext\@\@AEBAPEAVContainer\@\@XZ + * @symbol ?_tryGetContainerFromEntity\@ItemContext\@\@AEBAPEAVContainer\@\@XZ */ MCAPI class Container * _tryGetContainerFromEntity() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemControlDefinition.hpp b/LiteLoader/include/llapi/mc/ItemControlDefinition.hpp index ef0f06c93d..9a267001a6 100644 --- a/LiteLoader/include/llapi/mc/ItemControlDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ItemControlDefinition.hpp @@ -31,11 +31,11 @@ struct ItemControlDefinition { public: /** - * @symbol ?addItemByName\@ItemControlDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addItemByName\@ItemControlDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addItemByName(std::string const &); /** - * @symbol ?buildSchema\@ItemControlDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UItemControlDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ItemControlDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UItemControlDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/ItemData.hpp b/LiteLoader/include/llapi/mc/ItemData.hpp index 52dc997a83..97ed6f686d 100644 --- a/LiteLoader/include/llapi/mc/ItemData.hpp +++ b/LiteLoader/include/llapi/mc/ItemData.hpp @@ -25,7 +25,7 @@ struct ItemData { public: /** - * @symbol ??1ItemData\@\@QEAA\@XZ + * @symbol ??1ItemData\@\@QEAA\@XZ */ MCAPI ~ItemData(); diff --git a/LiteLoader/include/llapi/mc/ItemDefinitionEventTriggeredEvent.hpp b/LiteLoader/include/llapi/mc/ItemDefinitionEventTriggeredEvent.hpp index b712c7a004..fddfc2b8a9 100644 --- a/LiteLoader/include/llapi/mc/ItemDefinitionEventTriggeredEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemDefinitionEventTriggeredEvent.hpp @@ -27,11 +27,11 @@ struct ItemDefinitionEventTriggeredEvent { public: /** - * @symbol ??0ItemDefinitionEventTriggeredEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemDefinitionEventTriggeredEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemDefinitionEventTriggeredEvent(struct ItemDefinitionEventTriggeredEvent const &); /** - * @symbol ??1ItemDefinitionEventTriggeredEvent\@\@QEAA\@XZ + * @symbol ??1ItemDefinitionEventTriggeredEvent\@\@QEAA\@XZ */ MCAPI ~ItemDefinitionEventTriggeredEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp index 2361b637ec..98edcb58ab 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptor.hpp @@ -31,159 +31,165 @@ class ItemDescriptor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemDescriptor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?serialize\@ItemDescriptor\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 1 + * @symbol ?serialize\@ItemDescriptor\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void serialize(class Json::Value &) const; /** - * @vftbl 2 - * @symbol ?serialize\@ItemDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 2 + * @symbol ?serialize\@ItemDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void serialize(class BinaryStream &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMDESCRIPTOR /** - * @symbol ??0ItemDescriptor\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ItemDescriptor(); + MCVAPI ~ItemDescriptor(); +#endif /** - * @symbol ??0ItemDescriptor\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@H\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@H\@Z */ - MCAPI ItemDescriptor(class gsl::basic_string_span, int); + MCAPI ItemDescriptor(class std::basic_string_view>, int); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@XZ */ - MCAPI ItemDescriptor(class Json::Value const &, class SemVersion const &); + MCAPI ItemDescriptor(); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ItemDescriptor(class Item const &, int); + MCAPI ItemDescriptor(class ItemDescriptor const &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI ItemDescriptor(class BlockLegacy const &); + MCAPI ItemDescriptor(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z */ - MCAPI ItemDescriptor(class Block const &); + MCAPI ItemDescriptor(struct ItemTag const &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlockLegacy\@\@\@Z */ - MCAPI ItemDescriptor(class ItemDescriptor const &); + MCAPI ItemDescriptor(class BlockLegacy const &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEBUItemTag\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ - MCAPI ItemDescriptor(struct ItemTag const &); + MCAPI ItemDescriptor(class Json::Value const &, class SemVersion const &); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVItem\@\@H\@Z */ - MCAPI ItemDescriptor(class ReadOnlyBinaryStream &); + MCAPI ItemDescriptor(class Item const &, int); /** - * @symbol ??0ItemDescriptor\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ItemDescriptor(class ItemDescriptor &&); /** - * @symbol ?forEachItemUntil\@ItemDescriptor\@\@QEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z + * @symbol ??0ItemDescriptor\@\@QEAA\@AEBVBlock\@\@\@Z + */ + MCAPI ItemDescriptor(class Block const &); + /** + * @symbol ?forEachItemUntil\@ItemDescriptor\@\@QEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z */ MCAPI bool forEachItemUntil(class std::function) const; /** - * @symbol ?getAuxValue\@ItemDescriptor\@\@QEBAFXZ + * @symbol ?getAuxValue\@ItemDescriptor\@\@QEBAFXZ */ MCAPI short getAuxValue() const; /** - * @symbol ?getBlock\@ItemDescriptor\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getBlock\@ItemDescriptor\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getBlock() const; /** - * @symbol ?getFullName\@ItemDescriptor\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFullName\@ItemDescriptor\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getFullName() const; /** - * @symbol ?getHash\@ItemDescriptor\@\@QEBA_KXZ + * @symbol ?getHash\@ItemDescriptor\@\@QEBA_KXZ */ MCAPI unsigned __int64 getHash() const; /** - * @symbol ?getId\@ItemDescriptor\@\@QEBAFXZ + * @symbol ?getId\@ItemDescriptor\@\@QEBAFXZ */ MCAPI short getId() const; /** - * @symbol ?getIdAux\@ItemDescriptor\@\@QEBAHXZ + * @symbol ?getIdAux\@ItemDescriptor\@\@QEBAHXZ */ MCAPI int getIdAux() const; /** - * @symbol ?getItem\@ItemDescriptor\@\@QEBAPEBVItem\@\@XZ + * @symbol ?getItem\@ItemDescriptor\@\@QEBAPEBVItem\@\@XZ */ MCAPI class Item const * getItem() const; /** - * @symbol ?getLegacyBlock\@ItemDescriptor\@\@QEBAAEBV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ + * @symbol ?getLegacyBlock\@ItemDescriptor\@\@QEBAAEBV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ */ MCAPI class WeakPtr const & getLegacyBlock() const; /** - * @symbol ?getRawNameId\@ItemDescriptor\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRawNameId\@ItemDescriptor\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getRawNameId() const; /** - * @symbol ?getSerializedNameAndAux\@ItemDescriptor\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSerializedNameAndAux\@ItemDescriptor\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSerializedNameAndAux() const; /** - * @symbol ?isDefinedAsItemName\@ItemDescriptor\@\@QEBA_NXZ + * @symbol ?isDefinedAsItemName\@ItemDescriptor\@\@QEBA_NXZ */ MCAPI bool isDefinedAsItemName() const; /** - * @symbol ?isNull\@ItemDescriptor\@\@QEBA_NXZ + * @symbol ?isNull\@ItemDescriptor\@\@QEBA_NXZ */ MCAPI bool isNull() const; /** - * @symbol ?isValid\@ItemDescriptor\@\@QEBA_N_N\@Z + * @symbol ?isValid\@ItemDescriptor\@\@QEBA_N_N\@Z */ MCAPI bool isValid(bool) const; /** - * @symbol ??4ItemDescriptor\@\@QEAAXAEBV0\@\@Z + * @symbol ??4ItemDescriptor\@\@QEAAX$$QEAV0\@\@Z */ - MCAPI void operator=(class ItemDescriptor const &); + MCAPI void operator=(class ItemDescriptor &&); /** - * @symbol ??4ItemDescriptor\@\@QEAAX$$QEAV0\@\@Z + * @symbol ??4ItemDescriptor\@\@QEAAXAEBV0\@\@Z */ - MCAPI void operator=(class ItemDescriptor &&); + MCAPI void operator=(class ItemDescriptor const &); /** - * @symbol ??8ItemDescriptor\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8ItemDescriptor\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class ItemDescriptor const &) const; /** - * @symbol ?sameItem\@ItemDescriptor\@\@QEBA_NAEBV1\@_N\@Z + * @symbol ?sameItem\@ItemDescriptor\@\@QEBA_NAEBV1\@_N\@Z */ MCAPI bool sameItem(class ItemDescriptor const &, bool) const; /** - * @symbol ?sameItem\@ItemDescriptor\@\@QEBA_NAEBVItemStack\@\@_N\@Z + * @symbol ?sameItem\@ItemDescriptor\@\@QEBA_NAEBVItemStack\@\@_N\@Z */ MCAPI bool sameItem(class ItemStack const &, bool) const; /** - * @symbol ?save\@ItemDescriptor\@\@QEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ + * @symbol ?save\@ItemDescriptor\@\@QEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ */ MCAPI class std::optional save() const; /** - * @symbol ?bindType\@ItemDescriptor\@\@SAXXZ + * @symbol ?bindType\@ItemDescriptor\@\@SAXXZ */ MCAPI static void bindType(); //private: /** - * @symbol ?_resolve\@ItemDescriptor\@\@AEBAXXZ + * @symbol ?_resolve\@ItemDescriptor\@\@AEBAXXZ */ MCAPI void _resolve() const; /** - * @symbol ?fromMap\@ItemDescriptor\@\@CAXAEAV1\@AEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBVBedrockLoadContext\@\@\@Z + * @symbol ?fromMap\@ItemDescriptor\@\@CAXAEAV1\@AEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBVBedrockLoadContext\@\@\@Z */ MCAPI static void fromMap(class ItemDescriptor &, class std::map, class std::allocator>> const &, class BedrockLoadContext const &); /** - * @symbol ?toMap\@ItemDescriptor\@\@CA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBV1\@\@Z + * @symbol ?toMap\@ItemDescriptor\@\@CA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBV1\@\@Z */ MCAPI static class std::map, class std::allocator>> toMap(class ItemDescriptor const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp index 4627b2a586..910dfe9f25 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptorCount.hpp @@ -34,54 +34,60 @@ class ItemDescriptorCount : public ItemDescriptor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemDescriptorCount(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?serialize\@ItemDescriptorCount\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 2 + * @symbol ?serialize\@ItemDescriptorCount\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void serialize(class BinaryStream &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMDESCRIPTORCOUNT /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ItemDescriptorCount(); + MCVAPI ~ItemDescriptorCount(); +#endif /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@HG\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z */ - MCAPI ItemDescriptorCount(class gsl::basic_string_span, int, unsigned short); + MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItemDescriptor\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z */ - MCAPI ItemDescriptorCount(class ItemDescriptor const &, unsigned short); + MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItem\@\@HG\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI ItemDescriptorCount(class Item const &, int, unsigned short); + MCAPI ItemDescriptorCount(class Block const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HG\@Z */ - MCAPI ItemDescriptorCount(class BlockLegacy const &, unsigned short); + MCAPI ItemDescriptorCount(class std::basic_string_view>, int, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVBlock\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItem\@\@HG\@Z */ - MCAPI ItemDescriptorCount(class Block const &, unsigned short); + MCAPI ItemDescriptorCount(class Item const &, int, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBUItemTag\@\@G\@Z */ MCAPI ItemDescriptorCount(struct ItemTag const &, unsigned short); /** - * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ??0ItemDescriptorCount\@\@QEAA\@XZ */ - MCAPI ItemDescriptorCount(class ReadOnlyBinaryStream &); + MCAPI ItemDescriptorCount(); + /** + * @symbol ??0ItemDescriptorCount\@\@QEAA\@AEBVItemDescriptor\@\@G\@Z + */ + MCAPI ItemDescriptorCount(class ItemDescriptor const &, unsigned short); /** - * @symbol ?getStackSize\@ItemDescriptorCount\@\@QEBAFXZ + * @symbol ?getStackSize\@ItemDescriptorCount\@\@QEBAFXZ */ MCAPI short getStackSize() const; /** - * @symbol ?setStackSize\@ItemDescriptorCount\@\@QEAAXF\@Z + * @symbol ?setStackSize\@ItemDescriptorCount\@\@QEAAXF\@Z */ MCAPI void setStackSize(short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemDescriptorSerializer.hpp b/LiteLoader/include/llapi/mc/ItemDescriptorSerializer.hpp index ed7180b471..a97d974a7b 100644 --- a/LiteLoader/include/llapi/mc/ItemDescriptorSerializer.hpp +++ b/LiteLoader/include/llapi/mc/ItemDescriptorSerializer.hpp @@ -20,7 +20,7 @@ namespace ItemDescriptorSerializer { #undef AFTER_EXTRA /** - * @symbol ?fromString\@ItemDescriptorSerializer\@\@YAXAEAVItemDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@ItemDescriptorSerializer\@\@YAXAEAVItemDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void fromString(class ItemDescriptor &, std::string const &); diff --git a/LiteLoader/include/llapi/mc/ItemEnchantOption.hpp b/LiteLoader/include/llapi/mc/ItemEnchantOption.hpp index 493174e3dc..9a32550947 100644 --- a/LiteLoader/include/llapi/mc/ItemEnchantOption.hpp +++ b/LiteLoader/include/llapi/mc/ItemEnchantOption.hpp @@ -21,19 +21,22 @@ class ItemEnchantOption { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMENCHANTOPTION public: - class ItemEnchantOption& operator=(class ItemEnchantOption const &) = delete; ItemEnchantOption(class ItemEnchantOption const &) = delete; ItemEnchantOption() = delete; #endif public: /** - * @symbol ??0ItemEnchantOption\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ItemEnchantOption\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ItemEnchantOption(class ItemEnchantOption &&); /** - * @symbol ??1ItemEnchantOption\@\@QEAA\@XZ + * @symbol ??4ItemEnchantOption\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class ItemEnchantOption & operator=(class ItemEnchantOption const &); + /** + * @symbol ??1ItemEnchantOption\@\@QEAA\@XZ */ MCAPI ~ItemEnchantOption(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemEnchants.hpp b/LiteLoader/include/llapi/mc/ItemEnchants.hpp index 7a002526ac..fcaf7c1f4d 100644 --- a/LiteLoader/include/llapi/mc/ItemEnchants.hpp +++ b/LiteLoader/include/llapi/mc/ItemEnchants.hpp @@ -31,80 +31,76 @@ class ItemEnchants { public: /** - * @symbol ??0ItemEnchants\@\@QEAA\@HAEBVListTag\@\@\@Z + * @symbol ??0ItemEnchants\@\@QEAA\@H\@Z */ - MCAPI ItemEnchants(int, class ListTag const &); + MCAPI ItemEnchants(int); /** - * @symbol ??0ItemEnchants\@\@QEAA\@H\@Z + * @symbol ??0ItemEnchants\@\@QEAA\@HAEBVListTag\@\@\@Z */ - MCAPI ItemEnchants(int); + MCAPI ItemEnchants(int, class ListTag const &); /** - * @symbol ?addEnchant\@ItemEnchants\@\@QEAA_NVEnchantmentInstance\@\@_N\@Z + * @symbol ?addEnchant\@ItemEnchants\@\@QEAA_NVEnchantmentInstance\@\@_N\@Z */ MCAPI bool addEnchant(class EnchantmentInstance, bool); /** - * @symbol ?addEnchants\@ItemEnchants\@\@QEAAHAEBV1\@_N\@Z + * @symbol ?addEnchants\@ItemEnchants\@\@QEAAHAEBV1\@_N\@Z */ MCAPI int addEnchants(class ItemEnchants const &, bool); /** - * @symbol ?canEnchant\@ItemEnchants\@\@QEAA?AUEnchantResult\@\@VEnchantmentInstance\@\@_N\@Z + * @symbol ?canEnchant\@ItemEnchants\@\@QEAA?AUEnchantResult\@\@VEnchantmentInstance\@\@_N\@Z */ MCAPI struct EnchantResult canEnchant(class EnchantmentInstance, bool); /** - * @symbol ?getAllEnchants\@ItemEnchants\@\@QEBA?AV?$vector\@VEnchantmentInstance\@\@V?$allocator\@VEnchantmentInstance\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAllEnchants\@ItemEnchants\@\@QEBA?AV?$vector\@VEnchantmentInstance\@\@V?$allocator\@VEnchantmentInstance\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getAllEnchants() const; /** - * @symbol ?getEnchantNames\@ItemEnchants\@\@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 + * @symbol ?getEnchantNames\@ItemEnchants\@\@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 getEnchantNames() const; /** - * @symbol ?getEnchantment\@ItemEnchants\@\@QEAA?AVEnchantmentInstance\@\@W4Type\@Enchant\@\@\@Z + * @symbol ?getEnchantment\@ItemEnchants\@\@QEAA?AVEnchantmentInstance\@\@W4Type\@Enchant\@\@\@Z */ MCAPI class EnchantmentInstance getEnchantment(enum class Enchant::Type); /** - * @symbol ?getEnchants\@ItemEnchants\@\@QEBAAEBV?$vector\@VEnchantmentInstance\@\@V?$allocator\@VEnchantmentInstance\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?getEnchants\@ItemEnchants\@\@QEBAAEBV?$vector\@VEnchantmentInstance\@\@V?$allocator\@VEnchantmentInstance\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI std::vector const & getEnchants(int) const; /** - * @symbol ?getSlot\@ItemEnchants\@\@QEBAHXZ + * @symbol ?getSlot\@ItemEnchants\@\@QEBAHXZ */ MCAPI int getSlot() const; /** - * @symbol ?getTotalValue\@ItemEnchants\@\@QEBAH_N\@Z + * @symbol ?getTotalValue\@ItemEnchants\@\@QEBAH_N\@Z */ MCAPI int getTotalValue(bool) const; /** - * @symbol ?hasEnchant\@ItemEnchants\@\@QEBAHW4Type\@Enchant\@\@\@Z + * @symbol ?hasEnchant\@ItemEnchants\@\@QEBAHW4Type\@Enchant\@\@\@Z */ MCAPI int hasEnchant(enum class Enchant::Type) const; /** - * @symbol ?isEmpty\@ItemEnchants\@\@QEBA_NXZ + * @symbol ?isEmpty\@ItemEnchants\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?read\@ItemEnchants\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemEnchants\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI void read(class ReadOnlyBinaryStream &); /** - * @symbol ?removeEnchantment\@ItemEnchants\@\@QEAAXW4Type\@Enchant\@\@\@Z + * @symbol ?removeEnchantment\@ItemEnchants\@\@QEAAXW4Type\@Enchant\@\@\@Z */ MCAPI void removeEnchantment(enum class Enchant::Type); /** - * @symbol ??1ItemEnchants\@\@QEAA\@XZ + * @symbol ??1ItemEnchants\@\@QEAA\@XZ */ MCAPI ~ItemEnchants(); //private: /** - * @symbol ?_fromList\@ItemEnchants\@\@AEAAXAEBVListTag\@\@\@Z - */ - MCAPI void _fromList(class ListTag const &); - /** - * @symbol ?_toList\@ItemEnchants\@\@AEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_toList\@ItemEnchants\@\@AEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr _toList() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp index 679bdd3d89..030636d595 100644 --- a/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventCoordinator.hpp @@ -29,28 +29,28 @@ class ItemEventCoordinator { public: /** - * @symbol ??0ItemEventCoordinator\@\@QEAA\@XZ + * @symbol ??0ItemEventCoordinator\@\@QEAA\@XZ */ MCAPI ItemEventCoordinator(); /** - * @symbol ?getItemGameplayHandler\@ItemEventCoordinator\@\@QEAAAEAVItemGameplayHandler\@\@XZ + * @symbol ?getItemGameplayHandler\@ItemEventCoordinator\@\@QEAAAEAVItemGameplayHandler\@\@XZ */ MCAPI class ItemGameplayHandler & getItemGameplayHandler(); /** - * @symbol ?onItemModifiedActor\@ItemEventCoordinator\@\@QEAAXAEBVItemStackBase\@\@AEBVActor\@\@\@Z + * @symbol ?onItemModifiedActor\@ItemEventCoordinator\@\@QEAAXAEBVItemStackBase\@\@AEBVActor\@\@\@Z */ MCAPI void onItemModifiedActor(class ItemStackBase const &, class Actor const &); /** - * @symbol ?onItemSpawnedActor\@ItemEventCoordinator\@\@QEAAXAEBVItemStackBase\@\@AEBVActor\@\@\@Z + * @symbol ?onItemSpawnedActor\@ItemEventCoordinator\@\@QEAAXAEBVItemStackBase\@\@AEBVActor\@\@\@Z */ MCAPI void onItemSpawnedActor(class ItemStackBase const &, class Actor const &); /** - * @symbol ?registerItemGameplayHandler\@ItemEventCoordinator\@\@QEAAXV?$unique_ptr\@VItemGameplayHandler\@\@U?$default_delete\@VItemGameplayHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerItemGameplayHandler\@ItemEventCoordinator\@\@QEAAXV?$unique_ptr\@VItemGameplayHandler\@\@U?$default_delete\@VItemGameplayHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerItemGameplayHandler(std::unique_ptr); /** - * @symbol ?sendEvent\@ItemEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@ItemEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemEventListener.hpp b/LiteLoader/include/llapi/mc/ItemEventListener.hpp index 6c110b7536..88fb73c929 100644 --- a/LiteLoader/include/llapi/mc/ItemEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventListener.hpp @@ -29,69 +29,69 @@ class ItemEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMEVENTLISTENER /** - * @symbol ?onEvent\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBUItemNotificationEvent\@\@\@Z + * @symbol ?onEvent\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBUItemNotificationEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct ItemNotificationEvent const &); /** - * @symbol ?onInventoryItemClosed\@ItemEventListener\@\@UEAA?AW4EventResult\@\@XZ + * @symbol ?onInventoryItemClosed\@ItemEventListener\@\@UEAA?AW4EventResult\@\@XZ */ MCVAPI enum class EventResult onInventoryItemClosed(); /** - * @symbol ?onInventoryItemCraftedAutomaticallyByRecipe\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?onInventoryItemCraftedAutomaticallyByRecipe\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@\@Z */ MCVAPI enum class EventResult onInventoryItemCraftedAutomaticallyByRecipe(class ItemStackBase const &); /** - * @symbol ?onInventoryItemOpened\@ItemEventListener\@\@UEAA?AW4EventResult\@\@_N\@Z + * @symbol ?onInventoryItemOpened\@ItemEventListener\@\@UEAA?AW4EventResult\@\@_N\@Z */ MCVAPI enum class EventResult onInventoryItemOpened(bool); /** - * @symbol ?onInventoryLayoutSelected\@ItemEventListener\@\@UEAA?AW4EventResult\@\@HH\@Z + * @symbol ?onInventoryLayoutSelected\@ItemEventListener\@\@UEAA?AW4EventResult\@\@HH\@Z */ MCVAPI enum class EventResult onInventoryLayoutSelected(int, int); /** - * @symbol ?onItemDefinitionEventTriggered\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onItemDefinitionEventTriggered\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI enum class EventResult onItemDefinitionEventTriggered(class ItemStackBase const &, std::string const &); /** - * @symbol ?onItemModifiedActor\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBVActor\@\@\@Z + * @symbol ?onItemModifiedActor\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBVActor\@\@\@Z */ MCVAPI enum class EventResult onItemModifiedActor(class ItemStackBase const &, class Actor const &); /** - * @symbol ?onItemSelected\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?onItemSelected\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@\@Z */ MCVAPI enum class EventResult onItemSelected(class ItemStackBase const &); /** - * @symbol ?onItemSelectedSlot\@ItemEventListener\@\@UEAA?AW4EventResult\@\@H\@Z + * @symbol ?onItemSelectedSlot\@ItemEventListener\@\@UEAA?AW4EventResult\@\@H\@Z */ MCVAPI enum class EventResult onItemSelectedSlot(int); /** - * @symbol ?onItemSmelted\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@1\@Z + * @symbol ?onItemSmelted\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@1\@Z */ MCVAPI enum class EventResult onItemSmelted(class Player &, class ItemDescriptor const &, class ItemDescriptor const &); /** - * @symbol ?onItemSpawnedActor\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBVActor\@\@\@Z + * @symbol ?onItemSpawnedActor\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBVActor\@\@\@Z */ MCVAPI enum class EventResult onItemSpawnedActor(class ItemStackBase const &, class Actor const &); /** - * @symbol ?onItemSpawningActor\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVActor\@\@\@Z + * @symbol ?onItemSpawningActor\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVActor\@\@\@Z */ MCVAPI enum class EventResult onItemSpawningActor(class Actor const &); /** - * @symbol ?onItemTransferredFromContainer\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onItemTransferredFromContainer\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI enum class EventResult onItemTransferredFromContainer(class ItemStackBase const &, std::string const &); /** - * @symbol ?onItemTransferredToContainer\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onItemTransferredToContainer\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI enum class EventResult onItemTransferredToContainer(class ItemStackBase const &, std::string const &); /** - * @symbol ?onPreviewItemPopulatedInContainer\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onPreviewItemPopulatedInContainer\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI enum class EventResult onPreviewItemPopulatedInContainer(class ItemStackBase const &, std::string const &); /** - * @symbol ?onRecipeSelected\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?onRecipeSelected\@ItemEventListener\@\@UEAA?AW4EventResult\@\@AEBVItemStackBase\@\@\@Z */ MCVAPI enum class EventResult onRecipeSelected(class ItemStackBase const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemEventResponse.hpp b/LiteLoader/include/llapi/mc/ItemEventResponse.hpp index 1372649032..84d19505ca 100644 --- a/LiteLoader/include/llapi/mc/ItemEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventResponse.hpp @@ -22,7 +22,7 @@ namespace ItemEventResponse { #undef AFTER_EXTRA /** - * @symbol ?EVENT_RESPONSE_VERSION_1_16_100\@ItemEventResponse\@\@3VSemVersion\@\@B + * @symbol ?EVENT_RESPONSE_VERSION_1_16_100\@ItemEventResponse\@\@3VSemVersion\@\@B */ MCAPI extern class SemVersion const EVENT_RESPONSE_VERSION_1_16_100; diff --git a/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp b/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp index c80012278f..f7acbbc5c4 100644 --- a/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp +++ b/LiteLoader/include/llapi/mc/ItemEventResponseFactory.hpp @@ -30,19 +30,25 @@ class ItemEventResponseFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemEventResponseFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeFactory\@ItemEventResponseFactory\@\@UEAAXAEBVExperiments\@\@\@Z + * @vftbl 1 + * @symbol ?initializeFactory\@ItemEventResponseFactory\@\@UEAAXAEBVExperiments\@\@\@Z */ virtual void initializeFactory(class Experiments const &); /** - * @vftbl 2 - * @symbol ?initSchema\@ItemEventResponseFactory\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?initSchema\@ItemEventResponseFactory\@\@UEAAXXZ */ virtual void initSchema(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMEVENTRESPONSEFACTORY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemEventResponseFactory(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp index 09c682c9b4..f1c2e3edf4 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlock.hpp @@ -31,353 +31,358 @@ class ItemFrameBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemFrameBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@ItemFrameBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@ItemFrameBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ItemFrameBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ItemFrameBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 98 - * @symbol ?getIgnoresDestroyPermissions\@ItemFrameBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 98 + * @symbol ?getIgnoresDestroyPermissions\@ItemFrameBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool getIgnoresDestroyPermissions(class Actor &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ItemFrameBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ItemFrameBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 109 - * @symbol ?attack\@ItemFrameBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@ItemFrameBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@ItemFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@ItemFrameBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@ItemFrameBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ItemFrameBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@ItemFrameBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@ItemFrameBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 194 + * @symbol ?getEntityResourceItem\@ItemFrameBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 194 - * @symbol ?getSpawnedItemName\@ItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ + * @vftbl 195 + * @symbol ?getSpawnedItemName\@ItemFrameBlock\@\@UEBA?AVHashedString\@\@XZ */ virtual class HashedString getSpawnedItemName() const; /** - * @vftbl 195 - * @symbol __unk_vfn_195 - */ - virtual void __unk_vfn_195(); - /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @vftbl 198 - * @symbol __unk_vfn_198 + * @vftbl 198 + * @symbol __unk_vfn_198 */ virtual void __unk_vfn_198(); /** - * @vftbl 199 - * @symbol __unk_vfn_199 + * @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 + * @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_ITEMFRAMEBLOCK /** - * @symbol ?hasComparatorSignal\@ItemFrameBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@ItemFrameBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@ItemFrameBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@ItemFrameBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; /** - * @symbol ?waterSpreadCausesSpawn\@ItemFrameBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@ItemFrameBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0ItemFrameBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ItemFrameBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ItemFrameBlock(std::string const &, int); //private: /** - * @symbol ?_checkAchievements\@ItemFrameBlock\@\@AEBAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_checkAchievements\@ItemFrameBlock\@\@AEBAXAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _checkAchievements(class Player &, class BlockPos const &) const; /** - * @symbol ?getShape\@ItemFrameBlock\@\@AEBAXHAEAVAABB\@\@_N\@Z + * @symbol ?getShape\@ItemFrameBlock\@\@AEBAXHAEAVAABB\@\@_N\@Z */ MCAPI void getShape(int, class AABB &, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp index 80e84ba96c..d27868cbbd 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameBlockActor.hpp @@ -31,141 +31,147 @@ class ItemFrameBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemFrameBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ItemFrameBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ItemFrameBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@ItemFrameBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@ItemFrameBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@ItemFrameBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@ItemFrameBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@ItemFrameBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@ItemFrameBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@ItemFrameBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@ItemFrameBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getShadowRadius\@ItemFrameBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z + * @vftbl 19 + * @symbol ?getShadowRadius\@ItemFrameBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@ItemFrameBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@ItemFrameBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@ItemFrameBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMFRAMEBLOCKACTOR /** - * @symbol ??0ItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ItemFrameBlockActor(class BlockPos, enum class BlockActorType, std::string const &); + MCVAPI ~ItemFrameBlockActor(); +#endif /** - * @symbol ??0ItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@\@Z + * @symbol ??0ItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@\@Z */ MCAPI ItemFrameBlockActor(class BlockPos); /** - * @symbol ?actuallyDropItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z + * @symbol ??0ItemFrameBlockActor\@\@QEAA\@VBlockPos\@\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI ItemFrameBlockActor(class BlockPos, enum class BlockActorType, std::string const &); + /** + * @symbol ?actuallyDropItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z */ MCAPI void actuallyDropItem(class BlockSource &, bool); /** - * @symbol ?dropFramedItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z + * @symbol ?dropFramedItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@_N\@Z */ MCAPI void dropFramedItem(class BlockSource &, bool); /** - * @symbol ?getFramedItem\@ItemFrameBlockActor\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getFramedItem\@ItemFrameBlockActor\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getFramedItem() const; /** - * @symbol ?getRotation\@ItemFrameBlockActor\@\@QEAAMXZ + * @symbol ?getRotation\@ItemFrameBlockActor\@\@QEAAMXZ */ MCAPI float getRotation(); /** - * @symbol ?rotateFramedItem\@ItemFrameBlockActor\@\@QEAAXXZ + * @symbol ?rotateFramedItem\@ItemFrameBlockActor\@\@QEAAXXZ */ MCAPI void rotateFramedItem(); /** - * @symbol ?setItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVItemInstance\@\@\@Z + * @symbol ?setItem\@ItemFrameBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVItemInstance\@\@\@Z */ MCAPI void setItem(class BlockSource &, class ItemInstance const &); /** - * @symbol ?updateNameTag\@ItemFrameBlockActor\@\@QEAAXXZ + * @symbol ?updateNameTag\@ItemFrameBlockActor\@\@QEAAXXZ */ MCAPI void updateNameTag(); /** - * @symbol ?ROTATION_DEGREES\@ItemFrameBlockActor\@\@2MB + * @symbol ?ROTATION_DEGREES\@ItemFrameBlockActor\@\@2MB */ MCAPI static float const ROTATION_DEGREES; //private: /** - * @symbol ?_checkMapRemoval\@ItemFrameBlockActor\@\@AEAAXAEAVBlockSource\@\@AEAVItemInstance\@\@\@Z + * @symbol ?_checkMapRemoval\@ItemFrameBlockActor\@\@AEAAXAEAVBlockSource\@\@AEAVItemInstance\@\@\@Z */ MCAPI void _checkMapRemoval(class BlockSource &, class ItemInstance &); /** - * @symbol ?_updateBit\@ItemFrameBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBV?$ItemStateVariant\@_N\@\@AEBVHashedString\@\@\@Z + * @symbol ?_updateBit\@ItemFrameBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBV?$ItemStateVariant\@_N\@\@AEBVHashedString\@\@\@Z */ MCAPI void _updateBit(class BlockSource &, class ItemStateVariant const &, class HashedString const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp index b6e3dc1329..dd924e39b3 100644 --- a/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemFrameDropItemPacket.hpp @@ -30,33 +30,39 @@ class ItemFrameDropItemPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemFrameDropItemPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ItemFrameDropItemPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ItemFrameDropItemPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ItemFrameDropItemPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ItemFrameDropItemPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ItemFrameDropItemPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ItemFrameDropItemPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ItemFrameDropItemPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMFRAMEDROPITEMPACKET /** - * @symbol ??0ItemFrameDropItemPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemFrameDropItemPacket(); +#endif + /** + * @symbol ??0ItemFrameDropItemPacket\@\@QEAA\@XZ */ MCAPI ItemFrameDropItemPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemGroup.hpp b/LiteLoader/include/llapi/mc/ItemGroup.hpp index d480f0d3a7..052e5b1727 100644 --- a/LiteLoader/include/llapi/mc/ItemGroup.hpp +++ b/LiteLoader/include/llapi/mc/ItemGroup.hpp @@ -30,20 +30,16 @@ class ItemGroup { public: /** - * @symbol ??0ItemGroup\@\@QEAA\@AEBVItemInstance\@\@\@Z + * @symbol ??0ItemGroup\@\@QEAA\@AEBVItemInstance\@\@\@Z */ MCAPI ItemGroup(class ItemInstance const &); /** - * @symbol ?isEmpty\@ItemGroup\@\@QEBA_NXZ + * @symbol ?isEmpty\@ItemGroup\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ??4ItemGroup\@\@QEAAAEAV0\@$$QEAV0\@\@Z - */ - MCAPI class ItemGroup & operator=(class ItemGroup &&); - /** - * @symbol ??1ItemGroup\@\@QEAA\@XZ + * @symbol ??1ItemGroup\@\@QEAA\@XZ */ MCAPI ~ItemGroup(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp b/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp index 16c346ceef..b235a8970c 100644 --- a/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp +++ b/LiteLoader/include/llapi/mc/ItemInUseComponent.hpp @@ -28,11 +28,11 @@ struct ItemInUseComponent { public: /** - * @symbol ??4ItemInUseComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ItemInUseComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ItemInUseComponent & operator=(struct ItemInUseComponent &&); /** - * @symbol ??1ItemInUseComponent\@\@QEAA\@XZ + * @symbol ??1ItemInUseComponent\@\@QEAA\@XZ */ MCAPI ~ItemInUseComponent(); diff --git a/LiteLoader/include/llapi/mc/ItemInstance.hpp b/LiteLoader/include/llapi/mc/ItemInstance.hpp index 27e0147740..1926048748 100644 --- a/LiteLoader/include/llapi/mc/ItemInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemInstance.hpp @@ -24,68 +24,74 @@ class ItemInstance : public ItemStackBase { #undef AFTER_EXTRA public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemInstance(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?reinit\@ItemInstance\@\@UEAAXAEBVItem\@\@HH\@Z + * @vftbl 1 + * @symbol ?reinit\@ItemInstance\@\@UEAAXAEBVItem\@\@HH\@Z */ virtual void reinit(class Item const &, int, int); /** - * @vftbl 2 - * @symbol ?reinit\@ItemInstance\@\@UEAAXAEBVBlockLegacy\@\@H\@Z + * @vftbl 2 + * @symbol ?reinit\@ItemInstance\@\@UEAAXAEBVBlockLegacy\@\@H\@Z */ virtual void reinit(class BlockLegacy const &, int); /** - * @vftbl 3 - * @symbol ?reinit\@ItemInstance\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@HH\@Z + * @vftbl 3 + * @symbol ?reinit\@ItemInstance\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HH\@Z */ - virtual void reinit(class gsl::basic_string_span, int, int); + virtual void reinit(class std::basic_string_view>, int, int); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMINSTANCE /** - * @symbol ??0ItemInstance\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemInstance(); +#endif + /** + * @symbol ??0ItemInstance\@\@QEAA\@XZ */ MCAPI ItemInstance(); /** - * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemInstance\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z */ - MCAPI ItemInstance(class gsl::basic_string_span, int, int, class CompoundTag const *); + MCAPI ItemInstance(class std::basic_string_view>, int, int, class CompoundTag const *); /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ - MCAPI ItemInstance(class Item const &, int, int, class CompoundTag const *); + MCAPI ItemInstance(class Block const &, int, class CompoundTag const *); /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z + * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z */ MCAPI ItemInstance(class BlockLegacy const &, int); /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemInstance\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ - MCAPI ItemInstance(class Block const &, int, class CompoundTag const *); + MCAPI ItemInstance(class Item const &, int, int, class CompoundTag const *); /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemInstance\@\@QEAA\@AEBV0\@\@Z */ MCAPI ItemInstance(class ItemInstance const &); /** - * @symbol ??0ItemInstance\@\@QEAA\@AEBVItemStackBase\@\@\@Z + * @symbol ??0ItemInstance\@\@QEAA\@AEBVItemStackBase\@\@\@Z */ MCAPI ItemInstance(class ItemStackBase const &); /** - * @symbol ?clone\@ItemInstance\@\@QEBA?AV1\@XZ + * @symbol ?clone\@ItemInstance\@\@QEBA?AV1\@XZ */ MCAPI class ItemInstance clone() const; /** - * @symbol ??4ItemInstance\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ItemInstance\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ItemInstance & operator=(class ItemInstance const &); /** - * @symbol ?EMPTY_ITEM\@ItemInstance\@\@2V1\@B + * @symbol ?EMPTY_ITEM\@ItemInstance\@\@2V1\@B */ MCAPI static class ItemInstance const EMPTY_ITEM; /** - * @symbol ?fromTag\@ItemInstance\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z + * @symbol ?fromTag\@ItemInstance\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z */ MCAPI static class ItemInstance fromTag(class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemLockHelper.hpp b/LiteLoader/include/llapi/mc/ItemLockHelper.hpp index a49f407fd4..58fcb667f9 100644 --- a/LiteLoader/include/llapi/mc/ItemLockHelper.hpp +++ b/LiteLoader/include/llapi/mc/ItemLockHelper.hpp @@ -31,44 +31,52 @@ class ItemLockHelper { public: /** - * @symbol ?addItemLockMode\@ItemLockHelper\@\@SA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?addItemLockMode\@ItemLockHelper\@\@SA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static bool addItemLockMode(class ItemStackBase &, class Json::Value const &); /** - * @symbol ?addKeepOnDeath\@ItemLockHelper\@\@SA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?addKeepOnDeath\@ItemLockHelper\@\@SA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static bool addKeepOnDeath(class ItemStackBase &, class Json::Value const &); /** - * @symbol ?canMoveItemSlots\@ItemLockHelper\@\@SA_NAEBVActor\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?canMoveItemSlots\@ItemLockHelper\@\@SA_NAEBVActor\@\@AEBVItemStackBase\@\@\@Z */ MCAPI static bool canMoveItemSlots(class Actor const &, class ItemStackBase const &); /** - * @symbol ?getItemLockMode\@ItemLockHelper\@\@SA?AW4ItemLockMode\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?getItemLockMode\@ItemLockHelper\@\@SA?AW4ItemLockMode\@\@AEBVItemStackBase\@\@\@Z */ MCAPI static enum class ItemLockMode getItemLockMode(class ItemStackBase const &); /** - * @symbol ?isItemLocked\@ItemLockHelper\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isItemLocked\@ItemLockHelper\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool isItemLocked(class ItemStackBase const &); /** - * @symbol ?isItemLockedInSlot\@ItemLockHelper\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isItemLockedInSlot\@ItemLockHelper\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool isItemLockedInSlot(class ItemStackBase const &); /** - * @symbol ?shouldKeepOnDeath\@ItemLockHelper\@\@SA_NAEBVActor\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?setItemLockMode\@ItemLockHelper\@\@SAXAEAVItemStackBase\@\@W4ItemLockMode\@\@\@Z */ - MCAPI static bool shouldKeepOnDeath(class Actor const &, class ItemStackBase const &); + MCAPI static void setItemLockMode(class ItemStackBase &, enum class ItemLockMode); + /** + * @symbol ?setKeepOnDeath\@ItemLockHelper\@\@SAXAEAVItemStackBase\@\@_N\@Z + */ + MCAPI static void setKeepOnDeath(class ItemStackBase &, bool); /** - * @symbol ?shouldKeepOnDeath\@ItemLockHelper\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?shouldKeepOnDeath\@ItemLockHelper\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool shouldKeepOnDeath(class ItemStackBase const &); + /** + * @symbol ?shouldKeepOnDeath\@ItemLockHelper\@\@SA_NAEBVActor\@\@AEBVItemStackBase\@\@\@Z + */ + MCAPI static bool shouldKeepOnDeath(class Actor const &, class ItemStackBase const &); //private: /** - * @symbol ?_parseItemLockMode\@ItemLockHelper\@\@CA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_parseItemLockMode\@ItemLockHelper\@\@CA_NAEAVItemStackBase\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static bool _parseItemLockMode(class ItemStackBase &, class Json::Value const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemNotificationEvent.hpp b/LiteLoader/include/llapi/mc/ItemNotificationEvent.hpp index dd526af60c..40778fce38 100644 --- a/LiteLoader/include/llapi/mc/ItemNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemNotificationEvent.hpp @@ -28,7 +28,7 @@ struct ItemNotificationEvent { public: /** - * @symbol ??1ItemNotificationEvent\@\@QEAA\@XZ + * @symbol ??1ItemNotificationEvent\@\@QEAA\@XZ */ MCAPI ~ItemNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemReactionComponent.hpp b/LiteLoader/include/llapi/mc/ItemReactionComponent.hpp index 3fa57fd6b8..33842a99d4 100644 --- a/LiteLoader/include/llapi/mc/ItemReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/ItemReactionComponent.hpp @@ -30,24 +30,24 @@ class ItemReactionComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemReactionComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_onEnd\@ItemReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @vftbl 3 + * @symbol ?_onEnd\@ItemReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ virtual void _onEnd(class LabTableReaction &, class BlockSource &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemRegistry.hpp b/LiteLoader/include/llapi/mc/ItemRegistry.hpp index 1e923ec55f..94f61d2ad8 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistry.hpp @@ -32,6 +32,12 @@ struct ItemAlias { ItemAlias(ItemAlias const&&) = delete; }; +struct ComplexAlias { + ComplexAlias() = delete; + ComplexAlias(ComplexAlias const&) = delete; + ComplexAlias(ComplexAlias const&&) = delete; +}; + #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMREGISTRY public: @@ -41,216 +47,220 @@ struct ItemAlias { public: /** - * @symbol ??0ItemRegistry\@\@QEAA\@XZ + * @symbol ??0ItemRegistry\@\@QEAA\@XZ */ MCAPI ItemRegistry(); /** - * @symbol ?allowTagUpdate\@ItemRegistry\@\@QEAA?AVTagUpdateToken\@\@XZ + * @symbol ?allowTagUpdate\@ItemRegistry\@\@QEAA?AVTagUpdateToken\@\@XZ */ MCAPI class TagUpdateToken allowTagUpdate(); /** - * @symbol ??1ItemRegistry\@\@QEAA\@XZ + * @symbol ??1ItemRegistry\@\@QEAA\@XZ */ MCAPI ~ItemRegistry(); /** - * @symbol ?MINECRAFT_NAMESPACE\@ItemRegistry\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?MINECRAFT_NAMESPACE\@ItemRegistry\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const MINECRAFT_NAMESPACE; + MCAPI static class std::basic_string_view> const MINECRAFT_NAMESPACE; //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\@\@\@Z\@std\@\@_NW4ItemVersion\@\@\@Z */ MCAPI void _loadItemData(class ResourcePackManager &, class std::function &, class Json::Value &, class SemVersion const &)>, bool, 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\@\@\@Z\@std\@\@1W4ItemVersion\@\@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); /** - * @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\@\@\@Z\@3\@1W4ItemVersion\@\@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); /** - * @symbol ?addItemToTagMap\@ItemRegistry\@\@AEAAXAEBVItem\@\@\@Z + * @symbol ?addItemToTagMap\@ItemRegistry\@\@AEAAXAEBVItem\@\@\@Z */ MCAPI void addItemToTagMap(class Item const &); /** - * @symbol ?alterAvailableCreativeItems\@ItemRegistry\@\@AEAAXPEAVActorInfoRegistry\@\@AEAVLevelData\@\@\@Z + * @symbol ?alterAvailableCreativeItems\@ItemRegistry\@\@AEAAXPEAVActorInfoRegistry\@\@AEAVLevelData\@\@\@Z */ MCAPI void alterAvailableCreativeItems(class ActorInfoRegistry *, class LevelData &); /** - * @symbol ?canAddTags\@ItemRegistry\@\@AEBA_NXZ + * @symbol ?canAddTags\@ItemRegistry\@\@AEBA_NXZ */ MCAPI bool canAddTags() const; /** - * @symbol ?clearDeadItemRegistry\@ItemRegistry\@\@AEAAXXZ + * @symbol ?clearDeadItemRegistry\@ItemRegistry\@\@AEAAXXZ */ MCAPI void clearDeadItemRegistry(); /** - * @symbol ?digestServerItemComponents\@ItemRegistry\@\@AEAAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?digestServerItemComponents\@ItemRegistry\@\@AEAAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void digestServerItemComponents(std::vector> const &); /** - * @symbol ?finishedRegistration\@ItemRegistry\@\@AEAAXXZ + * @symbol ?finishedRegistration\@ItemRegistry\@\@AEAAXXZ */ MCAPI void finishedRegistration(); /** - * @symbol ?getItem\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?getComplexAliasSplitNames\@ItemRegistry\@\@AEBAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z */ - MCAPI class WeakPtr getItem(class HashedString const &); + MCAPI std::vector const & getComplexAliasSplitNames(class HashedString const &) const; /** - * @symbol ?getItem\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z + * @symbol ?getItem\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z */ MCAPI class WeakPtr getItem(short); /** - * @symbol ?getItemCount\@ItemRegistry\@\@AEAAHXZ + * @symbol ?getItem\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class WeakPtr getItem(class HashedString const &); + /** + * @symbol ?getItemCount\@ItemRegistry\@\@AEAAHXZ */ MCAPI int getItemCount(); /** - * @symbol ?getItemResponseFactory\@ItemRegistry\@\@AEAAPEAVItemEventResponseFactory\@\@XZ + * @symbol ?getItemResponseFactory\@ItemRegistry\@\@AEAAPEAVItemEventResponseFactory\@\@XZ */ MCAPI class ItemEventResponseFactory * getItemResponseFactory(); /** - * @symbol ?getNameFromAlias\@ItemRegistry\@\@AEBA?AU?$pair\@VHashedString\@\@H\@std\@\@AEBVHashedString\@\@H\@Z + * @symbol ?getNameFromAlias\@ItemRegistry\@\@AEBA?AU?$pair\@VHashedString\@\@H\@std\@\@AEBVHashedString\@\@H\@Z */ MCAPI struct std::pair getNameFromAlias(class HashedString const &, int) const; /** - * @symbol ?getNameFromLegacyID\@ItemRegistry\@\@AEAA?AVHashedString\@\@F\@Z + * @symbol ?getNameFromLegacyID\@ItemRegistry\@\@AEAA?AVHashedString\@\@F\@Z */ MCAPI class HashedString getNameFromLegacyID(short); /** - * @symbol ?getNameToItemMap\@ItemRegistry\@\@AEAAAEBV?$unordered_map\@VHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getNameToItemMap\@ItemRegistry\@\@AEAAAEBV?$unordered_map\@VHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getNameToItemMap(); /** - * @symbol ?getRef\@ItemRegistry\@\@AEAA?AVItemRegistryRef\@\@XZ + * @symbol ?getRef\@ItemRegistry\@\@AEAA?AVItemRegistryRef\@\@XZ */ MCAPI class ItemRegistryRef getRef(); /** - * @symbol ?getWorldBaseGameVersion\@ItemRegistry\@\@AEBA?AVBaseGameVersion\@\@XZ + * @symbol ?getWorldBaseGameVersion\@ItemRegistry\@\@AEBA?AVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion getWorldBaseGameVersion() const; /** - * @symbol ?init\@ItemRegistry\@\@AEAAXAEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@\@Z + * @symbol ?init\@ItemRegistry\@\@AEAAXAEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@\@Z */ MCAPI void init(class Experiments const &, class BaseGameVersion const &, class ResourcePackManager *); /** - * @symbol ?initCreativeItemsServer\@ItemRegistry\@\@AEAAXPEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@_NAEBVExperiments\@\@V?$function\@$$A6AXVItemRegistryRef\@\@PEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@PEAVCreativeItemRegistry\@\@_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z\@std\@\@\@Z + * @symbol ?initCreativeItemsServer\@ItemRegistry\@\@AEAAXPEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@_NAEBVExperiments\@\@V?$function\@$$A6AXVItemRegistryRef\@\@PEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@PEAVCreativeItemRegistry\@\@_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z\@std\@\@\@Z */ MCAPI void initCreativeItemsServer(class ActorInfoRegistry *, class BlockDefinitionGroup *, bool, class Experiments const &, class std::function); /** - * @symbol ?initServerData\@ItemRegistry\@\@AEAAXAEAVResourcePackManager\@\@AEBVExperiments\@\@W4ItemVersion\@\@\@Z + * @symbol ?initServerData\@ItemRegistry\@\@AEAAXAEAVResourcePackManager\@\@AEBVExperiments\@\@W4ItemVersion\@\@\@Z */ MCAPI void initServerData(class ResourcePackManager &, class Experiments const &, enum class ItemVersion); /** - * @symbol ?isComponentBasedItemSchema\@ItemRegistry\@\@AEAA_NAEBVSemVersion\@\@\@Z + * @symbol ?isComplexAlias\@ItemRegistry\@\@AEBA_NAEBVHashedString\@\@\@Z + */ + MCAPI bool isComplexAlias(class HashedString const &) const; + /** + * @symbol ?isComponentBasedItemSchema\@ItemRegistry\@\@AEAA_NAEBVSemVersion\@\@\@Z */ MCAPI bool isComponentBasedItemSchema(class SemVersion const &); /** - * @symbol ?isCreativeItem\@ItemRegistry\@\@AEAA_NAEBVItemInstance\@\@\@Z + * @symbol ?isCreativeItem\@ItemRegistry\@\@AEAA_NAEBVItemInstance\@\@\@Z */ MCAPI bool isCreativeItem(class ItemInstance const &); /** - * @symbol ?isServerInitializingCreativeItems\@ItemRegistry\@\@AEBA_NXZ + * @symbol ?isServerInitializingCreativeItems\@ItemRegistry\@\@AEBA_NXZ */ MCAPI bool isServerInitializingCreativeItems() const; /** - * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?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\@ItemRegistry\@\@AEBA?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\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByName(class HashedString const &) const; /** - * @symbol ?lookupByNameNoAlias\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class WeakPtr lookupByNameNoAlias(class HashedString const &) const; + MCAPI class WeakPtr lookupByName(int &, class std::basic_string_view>) const; /** - * @symbol ?lookupByNameNoAlias\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?lookupByNameNoAlias\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoAlias(class std::basic_string_view>) const; /** - * @symbol ?lookupByNameNoParsing\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHAEBVHashedString\@\@\@Z + * @symbol ?lookupByNameNoAlias\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + */ + MCAPI class WeakPtr lookupByNameNoAlias(class HashedString const &) const; + /** + * @symbol ?lookupByNameNoParsing\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHAEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoParsing(int &, class HashedString const &) const; /** - * @symbol ?lookupByTag\@ItemRegistry\@\@AEBAAEBV?$unordered_set\@PEBVItem\@\@U?$hash\@PEBVItem\@\@\@std\@\@U?$equal_to\@PEBVItem\@\@\@3\@V?$allocator\@PEBVItem\@\@\@3\@\@std\@\@AEBUItemTag\@\@\@Z + * @symbol ?lookupByTag\@ItemRegistry\@\@AEBAAEBV?$unordered_set\@PEBVItem\@\@U?$hash\@PEBVItem\@\@\@std\@\@U?$equal_to\@PEBVItem\@\@\@3\@V?$allocator\@PEBVItem\@\@\@3\@\@std\@\@AEBUItemTag\@\@\@Z */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & lookupByTag(struct ItemTag const &) const; /** - * @symbol ?lookupByVanillaName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByVanillaName\@ItemRegistry\@\@AEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByVanillaName(class HashedString const &) const; /** - * @symbol ?registerAlias\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z + * @symbol ?registerAlias\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z */ MCAPI void registerAlias(class HashedString const &, class HashedString const &, class BaseGameVersion const &); /** - * @symbol ?registerComplexAlias\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@V?$function\@$$A6A?AVHashedString\@\@F\@Z\@std\@\@\@Z + * @symbol ?registerComplexAlias\@ItemRegistry\@\@AEAA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@AEBUComplexAlias\@1\@\@Z */ - MCAPI class WeakPtr registerComplexAlias(class HashedString const &, class std::function); + MCAPI class WeakPtr registerComplexAlias(class HashedString const &, struct ItemRegistry::ComplexAlias const &); /** - * @symbol ?registerExtraItemInitCallback\@ItemRegistry\@\@AEAAXV?$function\@$$A6AXVItemRegistryRef\@\@\@Z\@std\@\@\@Z + * @symbol ?registerExtraItemInitCallback\@ItemRegistry\@\@AEAAXV?$function\@$$A6AXVItemRegistryRef\@\@\@Z\@std\@\@\@Z */ MCAPI void registerExtraItemInitCallback(class std::function); /** - * @symbol ?registerItem\@ItemRegistry\@\@AEAAXV?$SharedPtr\@VItem\@\@\@\@\@Z + * @symbol ?registerItem\@ItemRegistry\@\@AEAAXV?$SharedPtr\@VItem\@\@\@\@\@Z */ MCAPI void registerItem(class SharedPtr); /** - * @symbol ?registerLegacyID\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@F\@Z + * @symbol ?registerLegacyID\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@F\@Z */ MCAPI void registerLegacyID(class HashedString const &, short); /** - * @symbol ?registerLegacyMapping\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z + * @symbol ?registerLegacyMapping\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z */ MCAPI void registerLegacyMapping(class HashedString const &, class HashedString const &, class BaseGameVersion const &); /** - * @symbol ?remapToFullLegacyNameByHash\@ItemRegistry\@\@AEAA_K_K\@Z + * @symbol ?remapToFullLegacyNameByHash\@ItemRegistry\@\@AEAA_K_K\@Z */ MCAPI unsigned __int64 remapToFullLegacyNameByHash(unsigned __int64); /** - * @symbol ?remapToLegacyNameByHash\@ItemRegistry\@\@AEAA_K_K\@Z + * @symbol ?remapToLegacyNameByHash\@ItemRegistry\@\@AEAA_K_K\@Z */ MCAPI unsigned __int64 remapToLegacyNameByHash(unsigned __int64); /** - * @symbol ?setCheckForItemWorldCompatibility\@ItemRegistry\@\@AEAAX_N\@Z + * @symbol ?setCheckForItemWorldCompatibility\@ItemRegistry\@\@AEAAX_N\@Z */ MCAPI void setCheckForItemWorldCompatibility(bool); /** - * @symbol ?setOwningThreadId\@ItemRegistry\@\@AEAAXVid\@thread\@std\@\@\@Z + * @symbol ?setOwningThreadId\@ItemRegistry\@\@AEAAXVid\@thread\@std\@\@\@Z */ MCAPI void setOwningThreadId(class std::thread::id); /** - * @symbol ?setServerInitializingCreativeItems\@ItemRegistry\@\@AEAAX_N\@Z + * @symbol ?setServerInitializingCreativeItems\@ItemRegistry\@\@AEAAX_N\@Z */ MCAPI void setServerInitializingCreativeItems(bool); /** - * @symbol ?setWorldBaseGameVersion\@ItemRegistry\@\@AEAAXAEBVBaseGameVersion\@\@\@Z - */ - MCAPI void setWorldBaseGameVersion(class BaseGameVersion const &); - /** - * @symbol ?shouldCheckForItemWorldCompatibility\@ItemRegistry\@\@AEAA_NXZ + * @symbol ?shouldCheckForItemWorldCompatibility\@ItemRegistry\@\@AEAA_NXZ */ MCAPI bool shouldCheckForItemWorldCompatibility(); /** - * @symbol ?shutdown\@ItemRegistry\@\@AEAAXXZ + * @symbol ?shutdown\@ItemRegistry\@\@AEAAXXZ */ MCAPI void shutdown(); /** - * @symbol ?unregisterItem\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@\@Z + * @symbol ?unregisterItem\@ItemRegistry\@\@AEAAXAEBVHashedString\@\@\@Z */ MCAPI void unregisterItem(class HashedString const &); /** - * @symbol ?validateServerItemComponents\@ItemRegistry\@\@AEAA?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\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?validateServerItemComponents\@ItemRegistry\@\@AEAA?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\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI std::vector validateServerItemComponents(std::vector> const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemRegistryManager.hpp b/LiteLoader/include/llapi/mc/ItemRegistryManager.hpp index b5a59ac3eb..54f8547224 100644 --- a/LiteLoader/include/llapi/mc/ItemRegistryManager.hpp +++ b/LiteLoader/include/llapi/mc/ItemRegistryManager.hpp @@ -29,15 +29,15 @@ class ItemRegistryManager { public: /** - * @symbol ?getItemRegistry\@ItemRegistryManager\@\@SA?AVItemRegistryRef\@\@XZ + * @symbol ?getItemRegistry\@ItemRegistryManager\@\@SA?AVItemRegistryRef\@\@XZ */ MCAPI static class ItemRegistryRef getItemRegistry(); /** - * @symbol ?resetItemRegistry\@ItemRegistryManager\@\@SAXXZ + * @symbol ?resetItemRegistry\@ItemRegistryManager\@\@SAXXZ */ MCAPI static void resetItemRegistry(); /** - * @symbol ?setItemRegistry\@ItemRegistryManager\@\@SAXVItemRegistryRef\@\@\@Z + * @symbol ?setItemRegistry\@ItemRegistryManager\@\@SAXVItemRegistryRef\@\@\@Z */ MCAPI static void setItemRegistry(class ItemRegistryRef); @@ -45,8 +45,8 @@ class ItemRegistryManager { private: /** - * @symbol ?mThreadLocalRegistry\@ItemRegistryManager\@\@0V?$ThreadLocalObject\@V?$weak_ptr\@VItemRegistry\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VItemRegistry\@\@\@std\@\@\@2\@\@Threading\@Bedrock\@\@A + * @symbol ?mThreadLocalRegistry\@ItemRegistryManager\@\@0V?$ThreadLocalObject\@V?$weak_ptr\@VItemRegistry\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VItemRegistry\@\@\@std\@\@\@2\@\@Threading\@Bedrock\@\@A */ MCAPI static class Bedrock::Threading::ThreadLocalObject, class std::allocator>> mThreadLocalRegistry; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp b/LiteLoader/include/llapi/mc/ItemRegistryRef.hpp index 84dd6afba8..4fb19aa06f 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 "ItemRegistry.hpp" #define BEFORE_EXTRA @@ -28,200 +29,204 @@ class ItemRegistryRef { public: /** - * @symbol ??0ItemRegistryRef\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemRegistryRef\@\@QEAA\@AEBV0\@\@Z */ MCAPI ItemRegistryRef(class ItemRegistryRef const &); /** - * @symbol ?addItemToTagMap\@ItemRegistryRef\@\@QEBAXAEBVItem\@\@\@Z + * @symbol ?addItemToTagMap\@ItemRegistryRef\@\@QEBAXAEBVItem\@\@\@Z */ MCAPI void addItemToTagMap(class Item const &) const; /** - * @symbol ?allowTagUpdate\@ItemRegistryRef\@\@QEBA?AVTagUpdateToken\@\@XZ + * @symbol ?allowTagUpdate\@ItemRegistryRef\@\@QEBA?AVTagUpdateToken\@\@XZ */ MCAPI class TagUpdateToken allowTagUpdate() const; /** - * @symbol ?alterAvailableCreativeItems\@ItemRegistryRef\@\@QEBAXPEAVActorInfoRegistry\@\@AEAVLevelData\@\@\@Z + * @symbol ?alterAvailableCreativeItems\@ItemRegistryRef\@\@QEBAXPEAVActorInfoRegistry\@\@AEAVLevelData\@\@\@Z */ MCAPI void alterAvailableCreativeItems(class ActorInfoRegistry *, class LevelData &) const; /** - * @symbol ?canAddTags\@ItemRegistryRef\@\@QEBA_NXZ + * @symbol ?canAddTags\@ItemRegistryRef\@\@QEBA_NXZ */ MCAPI bool canAddTags() const; /** - * @symbol ?clearDeadItemRegistry\@ItemRegistryRef\@\@QEBAXXZ + * @symbol ?clearDeadItemRegistry\@ItemRegistryRef\@\@QEBAXXZ */ MCAPI void clearDeadItemRegistry() const; /** - * @symbol ?digestServerItemComponents\@ItemRegistryRef\@\@QEBAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?digestServerItemComponents\@ItemRegistryRef\@\@QEBAXAEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void digestServerItemComponents(std::vector> const &) const; /** - * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z + * @symbol ?getComplexAliasSplitNames\@ItemRegistryRef\@\@QEBAAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@AEBVHashedString\@\@\@Z + */ + MCAPI std::vector const & getComplexAliasSplitNames(class HashedString const &) const; + /** + * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@F\@Z */ MCAPI class WeakPtr getItem(short) const; /** - * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?getItem\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr getItem(class HashedString const &) const; /** - * @symbol ?getItemCount\@ItemRegistryRef\@\@QEBAHXZ + * @symbol ?getItemCount\@ItemRegistryRef\@\@QEBAHXZ */ MCAPI int getItemCount() const; /** - * @symbol ?getItemResponseFactory\@ItemRegistryRef\@\@QEBAPEAVItemEventResponseFactory\@\@XZ + * @symbol ?getItemResponseFactory\@ItemRegistryRef\@\@QEBAPEAVItemEventResponseFactory\@\@XZ */ MCAPI class ItemEventResponseFactory * getItemResponseFactory() const; /** - * @symbol ?getNameFromLegacyID\@ItemRegistryRef\@\@QEBA?AVHashedString\@\@F\@Z + * @symbol ?getNameFromLegacyID\@ItemRegistryRef\@\@QEBA?AVHashedString\@\@F\@Z */ MCAPI class HashedString getNameFromLegacyID(short) const; /** - * @symbol ?getNameToItemMap\@ItemRegistryRef\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getNameToItemMap\@ItemRegistryRef\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@4\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$WeakPtr\@VItem\@\@\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getNameToItemMap() const; /** - * @symbol ?getWorldBaseGameVersion\@ItemRegistryRef\@\@QEBA?AVBaseGameVersion\@\@XZ + * @symbol ?getWorldBaseGameVersion\@ItemRegistryRef\@\@QEBA?AVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion getWorldBaseGameVersion() const; /** - * @symbol ?init\@ItemRegistryRef\@\@QEBAXAEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@\@Z + * @symbol ?init\@ItemRegistryRef\@\@QEBAXAEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@\@Z */ MCAPI void init(class Experiments const &, class BaseGameVersion const &, class ResourcePackManager *) const; /** - * @symbol ?initCreativeItemsServer\@ItemRegistryRef\@\@QEBAXPEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@_NAEBVExperiments\@\@V?$function\@$$A6AXVItemRegistryRef\@\@PEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@PEAVCreativeItemRegistry\@\@_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z\@std\@\@\@Z + * @symbol ?initCreativeItemsServer\@ItemRegistryRef\@\@QEBAXPEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@_NAEBVExperiments\@\@V?$function\@$$A6AXVItemRegistryRef\@\@PEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@PEAVCreativeItemRegistry\@\@_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z\@std\@\@\@Z */ MCAPI void initCreativeItemsServer(class ActorInfoRegistry *, class BlockDefinitionGroup *, bool, class Experiments const &, class std::function) const; /** - * @symbol ?isComponentBasedItemSchema\@ItemRegistryRef\@\@QEBA_NAEBVSemVersion\@\@\@Z + * @symbol ?isComplexAlias\@ItemRegistryRef\@\@QEBA_NAEBVHashedString\@\@\@Z + */ + MCAPI bool isComplexAlias(class HashedString const &) const; + /** + * @symbol ?isComponentBasedItemSchema\@ItemRegistryRef\@\@QEBA_NAEBVSemVersion\@\@\@Z */ MCAPI bool isComponentBasedItemSchema(class SemVersion const &) const; /** - * @symbol ?isCreativeItem\@ItemRegistryRef\@\@QEBA_NAEBVItemInstance\@\@\@Z + * @symbol ?isCreativeItem\@ItemRegistryRef\@\@QEBA_NAEBVItemInstance\@\@\@Z */ MCAPI bool isCreativeItem(class ItemInstance const &) const; /** - * @symbol ?isServerInitializingCreativeItems\@ItemRegistryRef\@\@QEBA_NXZ + * @symbol ?isServerInitializingCreativeItems\@ItemRegistryRef\@\@QEBA_NXZ */ MCAPI bool isServerInitializingCreativeItems() const; /** - * @symbol ?lockItemWorldCompatibilityMutex\@ItemRegistryRef\@\@QEBA?AVLockGuard\@1\@XZ + * @symbol ?lockItemWorldCompatibilityMutex\@ItemRegistryRef\@\@QEBA?AVLockGuard\@1\@XZ */ MCAPI class ItemRegistryRef::LockGuard lockItemWorldCompatibilityMutex() const; /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByName(int &, class std::basic_string_view>) const; /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class WeakPtr lookupByName(class HashedString const &) const; + MCAPI class WeakPtr lookupByName(int &, int &, class std::basic_string_view>) const; /** - * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAH0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?lookupByName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ - MCAPI class WeakPtr lookupByName(int &, int &, class std::basic_string_view>) const; + MCAPI class WeakPtr lookupByName(class HashedString const &) const; /** - * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoAlias(class HashedString const &) const; /** - * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?lookupByNameNoAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoAlias(class std::basic_string_view>) const; /** - * @symbol ?lookupByNameNoParsing\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHAEBVHashedString\@\@\@Z + * @symbol ?lookupByNameNoParsing\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEAHAEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByNameNoParsing(int &, class HashedString const &) const; /** - * @symbol ?lookupByTag\@ItemRegistryRef\@\@QEBA?AV?$unordered_set\@PEBVItem\@\@U?$hash\@PEBVItem\@\@\@std\@\@U?$equal_to\@PEBVItem\@\@\@3\@V?$allocator\@PEBVItem\@\@\@3\@\@std\@\@AEBUItemTag\@\@\@Z + * @symbol ?lookupByTag\@ItemRegistryRef\@\@QEBA?AV?$unordered_set\@PEBVItem\@\@U?$hash\@PEBVItem\@\@\@std\@\@U?$equal_to\@PEBVItem\@\@\@3\@V?$allocator\@PEBVItem\@\@\@3\@\@std\@\@AEBUItemTag\@\@\@Z */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> lookupByTag(struct ItemTag const &) const; /** - * @symbol ?lookupByVanillaName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z + * @symbol ?lookupByVanillaName\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@\@Z */ MCAPI class WeakPtr lookupByVanillaName(class HashedString const &) const; /** - * @symbol ?registerAlias\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z + * @symbol ?registerAlias\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z */ MCAPI void registerAlias(class HashedString const &, class HashedString const &, class BaseGameVersion const &) const; /** - * @symbol ?registerComplexAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@V?$function\@$$A6A?AVHashedString\@\@F\@Z\@std\@\@\@Z + * @symbol ?registerComplexAlias\@ItemRegistryRef\@\@QEBA?AV?$WeakPtr\@VItem\@\@\@\@AEBVHashedString\@\@AEBUComplexAlias\@ItemRegistry\@\@\@Z */ - MCAPI class WeakPtr registerComplexAlias(class HashedString const &, class std::function) const; + MCAPI class WeakPtr registerComplexAlias(class HashedString const &, struct ItemRegistry::ComplexAlias const &) const; /** - * @symbol ?registerExtraItemInitCallback\@ItemRegistryRef\@\@QEBAXV?$function\@$$A6AXVItemRegistryRef\@\@\@Z\@std\@\@\@Z + * @symbol ?registerExtraItemInitCallback\@ItemRegistryRef\@\@QEBAXV?$function\@$$A6AXVItemRegistryRef\@\@\@Z\@std\@\@\@Z */ MCAPI void registerExtraItemInitCallback(class std::function) const; /** - * @symbol ?registerLegacyID\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@F\@Z + * @symbol ?registerLegacyID\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@F\@Z */ MCAPI void registerLegacyID(class HashedString const &, short) const; /** - * @symbol ?registerLegacyMapping\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z + * @symbol ?registerLegacyMapping\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@0AEBVBaseGameVersion\@\@\@Z */ MCAPI void registerLegacyMapping(class HashedString const &, class HashedString const &, class BaseGameVersion const &) const; /** - * @symbol ?remapToFullLegacyNameByHash\@ItemRegistryRef\@\@QEBA_K_K\@Z + * @symbol ?remapToFullLegacyNameByHash\@ItemRegistryRef\@\@QEBA_K_K\@Z */ MCAPI unsigned __int64 remapToFullLegacyNameByHash(unsigned __int64) const; /** - * @symbol ?remapToLegacyNameByHash\@ItemRegistryRef\@\@QEBA_K_K\@Z + * @symbol ?remapToLegacyNameByHash\@ItemRegistryRef\@\@QEBA_K_K\@Z */ MCAPI unsigned __int64 remapToLegacyNameByHash(unsigned __int64) const; /** - * @symbol ?setCheckForItemWorldCompatibility\@ItemRegistryRef\@\@QEBAX_N\@Z + * @symbol ?setCheckForItemWorldCompatibility\@ItemRegistryRef\@\@QEBAX_N\@Z */ MCAPI void setCheckForItemWorldCompatibility(bool) const; /** - * @symbol ?setOwningThreadId\@ItemRegistryRef\@\@QEBAXVid\@thread\@std\@\@\@Z + * @symbol ?setOwningThreadId\@ItemRegistryRef\@\@QEBAXVid\@thread\@std\@\@\@Z */ MCAPI void setOwningThreadId(class std::thread::id) const; /** - * @symbol ?setServerInitializingCreativeItems\@ItemRegistryRef\@\@QEBAX_N\@Z + * @symbol ?setServerInitializingCreativeItems\@ItemRegistryRef\@\@QEBAX_N\@Z */ MCAPI void setServerInitializingCreativeItems(bool) const; /** - * @symbol ?setWorldBaseGameVersion\@ItemRegistryRef\@\@QEBAXAEBVBaseGameVersion\@\@\@Z - */ - MCAPI void setWorldBaseGameVersion(class BaseGameVersion const &) const; - /** - * @symbol ?shouldCheckForItemWorldCompatibility\@ItemRegistryRef\@\@QEBA_NXZ + * @symbol ?shouldCheckForItemWorldCompatibility\@ItemRegistryRef\@\@QEBA_NXZ */ MCAPI bool shouldCheckForItemWorldCompatibility() const; /** - * @symbol ?shutdown\@ItemRegistryRef\@\@QEBAXXZ + * @symbol ?shutdown\@ItemRegistryRef\@\@QEBAXXZ */ MCAPI void shutdown() const; /** - * @symbol ?unregisterItem\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@\@Z + * @symbol ?unregisterItem\@ItemRegistryRef\@\@QEBAXAEBVHashedString\@\@\@Z */ MCAPI void unregisterItem(class HashedString const &) const; /** - * @symbol ?validateServerItemComponents\@ItemRegistryRef\@\@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\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?validateServerItemComponents\@ItemRegistryRef\@\@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\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VCompoundTag\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI std::vector validateServerItemComponents(std::vector> const &) const; /** - * @symbol ??1ItemRegistryRef\@\@QEAA\@XZ + * @symbol ??1ItemRegistryRef\@\@QEAA\@XZ */ MCAPI ~ItemRegistryRef(); /** - * @symbol ?isUsingCombinedItemRegistry\@ItemRegistryRef\@\@SA_NXZ + * @symbol ?isUsingCombinedItemRegistry\@ItemRegistryRef\@\@SA_NXZ */ MCAPI static bool isUsingCombinedItemRegistry(); /** - * @symbol ?setUseCombinedItemRegistryToggle\@ItemRegistryRef\@\@SAX_N\@Z + * @symbol ?setUseCombinedItemRegistryToggle\@ItemRegistryRef\@\@SAX_N\@Z */ MCAPI static void setUseCombinedItemRegistryToggle(bool); //private: /** - * @symbol ?_lockRegistry\@ItemRegistryRef\@\@AEBA?AV?$shared_ptr\@VItemRegistry\@\@\@std\@\@XZ + * @symbol ?_lockRegistry\@ItemRegistryRef\@\@AEBA?AV?$shared_ptr\@VItemRegistry\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr _lockRegistry() const; private: /** - * @symbol ?mCombinedItemRegistryInstance\@ItemRegistryRef\@\@0V?$shared_ptr\@VItemRegistry\@\@\@std\@\@A + * @symbol ?mCombinedItemRegistryInstance\@ItemRegistryRef\@\@0V?$shared_ptr\@VItemRegistry\@\@\@std\@\@A */ MCAPI static class std::shared_ptr mCombinedItemRegistryInstance; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp index 29ea96128e..728fe4acb6 100644 --- a/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemReleaseChargeEvent.hpp @@ -25,7 +25,7 @@ struct ItemReleaseChargeEvent { public: /** - * @symbol ??1ItemReleaseChargeEvent\@\@QEAA\@XZ + * @symbol ??1ItemReleaseChargeEvent\@\@QEAA\@XZ */ MCAPI ~ItemReleaseChargeEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp index 1b6dc0bcbc..bd6d27f56a 100644 --- a/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemReleaseInventoryTransaction.hpp @@ -30,34 +30,34 @@ class ItemReleaseInventoryTransaction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemReleaseInventoryTransaction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?read\@ItemReleaseInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 1 + * @symbol ?read\@ItemReleaseInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ virtual void read(class ReadOnlyBinaryStream &); /** - * @vftbl 2 - * @symbol ?write\@ItemReleaseInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ItemReleaseInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 3 - * @symbol ?postLoadItems\@ItemReleaseInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @vftbl 3 + * @symbol ?postLoadItems\@ItemReleaseInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ virtual void postLoadItems(class BlockPalette &, bool); /** - * @vftbl 4 - * @symbol ?handle\@ItemReleaseInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + * @vftbl 4 + * @symbol ?handle\@ItemReleaseInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z */ virtual enum class InventoryTransactionError handle(class Player &, bool) const; /** - * @vftbl 5 - * @symbol ?onTransactionError\@ItemReleaseInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z + * @vftbl 5 + * @symbol ?onTransactionError\@ItemReleaseInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z */ virtual void onTransactionError(class Player &, enum class InventoryTransactionError) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStack.hpp b/LiteLoader/include/llapi/mc/ItemStack.hpp index 8b5e8c34a6..f2488a4232 100644 --- a/LiteLoader/include/llapi/mc/ItemStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStack.hpp @@ -65,175 +65,181 @@ class ItemStack : public ItemStackBase { #undef AFTER_EXTRA public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStack(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?reinit\@ItemStack\@\@UEAAXAEBVItem\@\@HH\@Z + * @vftbl 1 + * @symbol ?reinit\@ItemStack\@\@UEAAXAEBVItem\@\@HH\@Z */ virtual void reinit(class Item const &, int, int); /** - * @vftbl 2 - * @symbol ?reinit\@ItemStack\@\@UEAAXAEBVBlockLegacy\@\@H\@Z + * @vftbl 2 + * @symbol ?reinit\@ItemStack\@\@UEAAXAEBVBlockLegacy\@\@H\@Z */ virtual void reinit(class BlockLegacy const &, int); /** - * @vftbl 3 - * @symbol ?reinit\@ItemStack\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@HH\@Z + * @vftbl 3 + * @symbol ?reinit\@ItemStack\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HH\@Z */ - virtual void reinit(class gsl::basic_string_span, int, int); + virtual void reinit(class std::basic_string_view>, int, int); /** - * @vftbl 4 - * @symbol ?setNull\@ItemStack\@\@UEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?setNull\@ItemStack\@\@UEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z */ virtual void setNull(class std::optional); /** - * @vftbl 5 - * @symbol ?toString\@ItemStack\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?toString\@ItemStack\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 6 - * @symbol ?toDebugString\@ItemStack\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?toDebugString\@ItemStack\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toDebugString() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACK /** - * @symbol ??0ItemStack\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ItemStack(); + MCVAPI ~ItemStack(); +#endif /** - * @symbol ??0ItemStack\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z */ - MCAPI ItemStack(class gsl::basic_string_span, int, int, class CompoundTag const *); + MCAPI ItemStack(class ItemInstance const &); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBVRecipeIngredient\@\@\@Z */ MCAPI ItemStack(class RecipeIngredient const &); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVItemInstance\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@XZ */ - MCAPI ItemStack(class ItemInstance const &); + MCAPI ItemStack(); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z */ - MCAPI ItemStack(class Item const &, int, int, class CompoundTag const *); + MCAPI ItemStack(class std::basic_string_view>, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ - MCAPI ItemStack(class BlockLegacy const &, int); + MCAPI ItemStack(class Item const &, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ MCAPI ItemStack(class Block const &, int, class CompoundTag const *); /** - * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ItemStack\@\@QEAA\@AEBVBlockLegacy\@\@H\@Z + */ + MCAPI ItemStack(class BlockLegacy const &, int); + /** + * @symbol ??0ItemStack\@\@QEAA\@AEBV0\@\@Z */ MCAPI ItemStack(class ItemStack const &); /** - * @symbol ?_assignNetIdVariant\@ItemStack\@\@QEBAXAEBV1\@\@Z + * @symbol ?_assignNetIdVariant\@ItemStack\@\@QEBAXAEBV1\@\@Z */ MCAPI void _assignNetIdVariant(class ItemStack const &) const; /** - * @symbol ?clientInitLegacyRequestId\@ItemStack\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z + * @symbol ?clientInitLegacyRequestId\@ItemStack\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z */ MCAPI void clientInitLegacyRequestId(class TypedClientNetId const &); /** - * @symbol ?clone\@ItemStack\@\@QEBA?AV1\@XZ + * @symbol ?clone\@ItemStack\@\@QEBA?AV1\@XZ */ MCAPI class ItemStack clone() const; /** - * @symbol ?getDestroySpeed\@ItemStack\@\@QEBAMAEBVBlock\@\@\@Z + * @symbol ?getDestroySpeed\@ItemStack\@\@QEBAMAEBVBlock\@\@\@Z */ MCAPI float getDestroySpeed(class Block const &) const; /** - * @symbol ?getItemStackNetIdVariant\@ItemStack\@\@QEBAAEBUItemStackNetIdVariant\@\@XZ + * @symbol ?getItemStackNetIdVariant\@ItemStack\@\@QEBAAEBUItemStackNetIdVariant\@\@XZ */ MCAPI struct ItemStackNetIdVariant const & getItemStackNetIdVariant() const; /** - * @symbol ?getMaxUseDuration\@ItemStack\@\@QEBAHXZ + * @symbol ?getMaxUseDuration\@ItemStack\@\@QEBAHXZ */ MCAPI int getMaxUseDuration() const; /** - * @symbol ?getStrippedNetworkItem\@ItemStack\@\@QEBA?AV1\@XZ + * @symbol ?getStrippedNetworkItem\@ItemStack\@\@QEBA?AV1\@XZ */ MCAPI class ItemStack getStrippedNetworkItem() const; /** - * @symbol ?hasItemStackNetId\@ItemStack\@\@QEBA_NXZ + * @symbol ?hasItemStackNetId\@ItemStack\@\@QEBA_NXZ */ MCAPI bool hasItemStackNetId() const; /** - * @symbol ?inventoryTick\@ItemStack\@\@QEAA_NAEAVLevel\@\@AEAVActor\@\@H_N\@Z + * @symbol ?inventoryTick\@ItemStack\@\@QEAA_NAEAVLevel\@\@AEAVActor\@\@H_N\@Z */ MCAPI bool inventoryTick(class Level &, class Actor &, int, bool); /** - * @symbol ?matchesAndNetIdVariantMatches\@ItemStack\@\@QEBA_NAEBV1\@\@Z + * @symbol ?matchesAndNetIdVariantMatches\@ItemStack\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool matchesAndNetIdVariantMatches(class ItemStack const &) const; /** - * @symbol ?matchesNetIdVariant\@ItemStack\@\@QEBA_NAEBV1\@\@Z + * @symbol ?matchesNetIdVariant\@ItemStack\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool matchesNetIdVariant(class ItemStack const &) const; /** - * @symbol ?mineBlock\@ItemStack\@\@QEAAXAEBVBlock\@\@HHHPEAVMob\@\@\@Z + * @symbol ?mineBlock\@ItemStack\@\@QEAAXAEBVBlock\@\@HHHPEAVMob\@\@\@Z */ MCAPI void mineBlock(class Block const &, int, int, int, class Mob *); /** - * @symbol ??4ItemStack\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ItemStack\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ItemStack & operator=(class ItemStack const &); /** - * @symbol ?playSoundIncrementally\@ItemStack\@\@QEBAXAEAVMob\@\@\@Z + * @symbol ?playSoundIncrementally\@ItemStack\@\@QEBAXAEAVMob\@\@\@Z */ MCAPI void playSoundIncrementally(class Mob &) const; /** - * @symbol ?releaseUsing\@ItemStack\@\@QEAAXPEAVPlayer\@\@H\@Z + * @symbol ?releaseUsing\@ItemStack\@\@QEAAXPEAVPlayer\@\@H\@Z */ MCAPI void releaseUsing(class Player *, int); /** - * @symbol ?sameItemAndAuxAndBlockData\@ItemStack\@\@QEBA_NAEBV1\@\@Z + * @symbol ?sameItemAndAuxAndBlockData\@ItemStack\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool sameItemAndAuxAndBlockData(class ItemStack const &) const; /** - * @symbol ?serverInitNetId\@ItemStack\@\@QEAAXXZ + * @symbol ?serverInitNetId\@ItemStack\@\@QEAAXXZ */ MCAPI void serverInitNetId(); /** - * @symbol ?tryGetItemStackNetId\@ItemStack\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ + * @symbol ?tryGetItemStackNetId\@ItemStack\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ */ MCAPI class TypedServerNetId const * tryGetItemStackNetId() const; /** - * @symbol ?use\@ItemStack\@\@QEAAAEAV1\@AEAVPlayer\@\@\@Z + * @symbol ?use\@ItemStack\@\@QEAAAEAV1\@AEAVPlayer\@\@\@Z */ MCAPI class ItemStack & use(class Player &); /** - * @symbol ?useAsFuel\@ItemStack\@\@QEAAXXZ + * @symbol ?useAsFuel\@ItemStack\@\@QEAAXXZ */ MCAPI void useAsFuel(); /** - * @symbol ?useOn\@ItemStack\@\@QEAA_NAEAVActor\@\@HHHEAEBVVec3\@\@\@Z + * @symbol ?useOn\@ItemStack\@\@QEAA_NAEAVActor\@\@HHHEAEBVVec3\@\@\@Z */ MCAPI bool useOn(class Actor &, int, int, int, unsigned char, class Vec3 const &); /** - * @symbol ?useTimeDepleted\@ItemStack\@\@QEAA?AW4ItemUseMethod\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @symbol ?useTimeDepleted\@ItemStack\@\@QEAA?AW4ItemUseMethod\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ MCAPI enum class ItemUseMethod useTimeDepleted(class Level *, class Player *); /** - * @symbol ?EMPTY_ITEM\@ItemStack\@\@2V1\@B + * @symbol ?EMPTY_ITEM\@ItemStack\@\@2V1\@B */ MCAPI static class ItemStack const EMPTY_ITEM; /** - * @symbol ?fromDescriptor\@ItemStack\@\@SA?AV1\@AEBVNetworkItemStackDescriptor\@\@AEAVBlockPalette\@\@_N\@Z + * @symbol ?fromDescriptor\@ItemStack\@\@SA?AV1\@AEBVNetworkItemStackDescriptor\@\@AEAVBlockPalette\@\@_N\@Z */ MCAPI static class ItemStack fromDescriptor(class NetworkItemStackDescriptor const &, class BlockPalette &, bool); /** - * @symbol ?fromTag\@ItemStack\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z + * @symbol ?fromTag\@ItemStack\@\@SA?AV1\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ - MCAPI static class ItemStack fromTag(class CompoundTag const &); + MCAPI static class ItemStack fromTag(class CompoundTag const &, class Level &); /** - * @symbol ?fromTag\@ItemStack\@\@SA?AV1\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?fromTag\@ItemStack\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z */ - MCAPI static class ItemStack fromTag(class CompoundTag const &, class Level &); + MCAPI static class ItemStack fromTag(class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackBase.hpp b/LiteLoader/include/llapi/mc/ItemStackBase.hpp index 0c0f387105..bf6e008f5a 100644 --- a/LiteLoader/include/llapi/mc/ItemStackBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackBase.hpp @@ -26,684 +26,710 @@ class ItemStackBase { char filler[128]; public: -LIAPI int getCount() const; + LIAPI int getCount() const; + + inline int getCountNoCheck() const { + return dAccess(this); + } #undef AFTER_EXTRA public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?reinit\@ItemStackBase\@\@UEAAXAEBVItem\@\@HH\@Z + * @vftbl 1 + * @symbol ?reinit\@ItemStackBase\@\@UEAAXAEBVItem\@\@HH\@Z */ virtual void reinit(class Item const &, int, int); /** - * @vftbl 2 - * @symbol ?reinit\@ItemStackBase\@\@UEAAXAEBVBlockLegacy\@\@H\@Z + * @vftbl 2 + * @symbol ?reinit\@ItemStackBase\@\@UEAAXAEBVBlockLegacy\@\@H\@Z */ virtual void reinit(class BlockLegacy const &, int); /** - * @vftbl 3 - * @symbol ?reinit\@ItemStackBase\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@HH\@Z + * @vftbl 3 + * @symbol ?reinit\@ItemStackBase\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HH\@Z */ - virtual void reinit(class gsl::basic_string_span, int, int); + virtual void reinit(class std::basic_string_view>, int, int); /** - * @vftbl 4 - * @symbol ?setNull\@ItemStackBase\@\@UEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?setNull\@ItemStackBase\@\@UEAAXV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z */ virtual void setNull(class std::optional); /** - * @vftbl 5 - * @symbol ?toString\@ItemStackBase\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?toString\@ItemStackBase\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 6 - * @symbol ?toDebugString\@ItemStackBase\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?toDebugString\@ItemStackBase\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toDebugString() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKBASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemStackBase(); +#endif /** - * @symbol ?add\@ItemStackBase\@\@QEAAXH\@Z + * @symbol ?add\@ItemStackBase\@\@QEAAXH\@Z */ MCAPI void add(int); /** - * @symbol ?addComponents\@ItemStackBase\@\@QEAA_NAEBVValue\@Json\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addComponents\@ItemStackBase\@\@QEAA_NAEBVValue\@Json\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool addComponents(class Json::Value const &, std::string &); /** - * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@\@Z + * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVContainerComponent\@\@\@Z */ - MCAPI void addCustomUserData(class BlockActor &, class BlockSource &); + MCAPI void addCustomUserData(class ContainerComponent &); /** - * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVContainerComponent\@\@\@Z + * @symbol ?addCustomUserData\@ItemStackBase\@\@QEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@\@Z */ - MCAPI void addCustomUserData(class ContainerComponent &); + MCAPI void addCustomUserData(class BlockActor &, class BlockSource &); /** - * @symbol ?canBeCharged\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?canBeCharged\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool canBeCharged() const; /** - * @symbol ?canDestroy\@ItemStackBase\@\@QEBA_NPEBVBlock\@\@\@Z + * @symbol ?canDestroy\@ItemStackBase\@\@QEBA_NPEBVBlock\@\@\@Z */ MCAPI bool canDestroy(class Block const *) const; /** - * @symbol ?canDestroySpecial\@ItemStackBase\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?canDestroySpecial\@ItemStackBase\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool canDestroySpecial(class Block const &) const; /** - * @symbol ?canPlaceOn\@ItemStackBase\@\@QEBA_NPEBVBlock\@\@\@Z + * @symbol ?canPlaceOn\@ItemStackBase\@\@QEBA_NPEBVBlock\@\@\@Z */ MCAPI bool canPlaceOn(class Block const *) const; /** - * @symbol ?clearChargedItem\@ItemStackBase\@\@QEAAXXZ + * @symbol ?clearChargedItem\@ItemStackBase\@\@QEAAXXZ */ MCAPI void clearChargedItem(); /** - * @symbol ?componentsMatch\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?clearCustomLore\@ItemStackBase\@\@QEAAXXZ + */ + MCAPI void clearCustomLore(); + /** + * @symbol ?componentsMatch\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool componentsMatch(class ItemStackBase const &) const; /** - * @symbol ?constructItemEnchantsFromUserData\@ItemStackBase\@\@QEBA?AVItemEnchants\@\@XZ + * @symbol ?constructItemEnchantsFromUserData\@ItemStackBase\@\@QEBA?AVItemEnchants\@\@XZ */ MCAPI class ItemEnchants constructItemEnchantsFromUserData() const; /** - * @symbol ?deserializeComponents\@ItemStackBase\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeComponents\@ItemStackBase\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeComponents(class IDataInput &); /** - * @symbol ?executeEvent\@ItemStackBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z + * @symbol ?executeEvent\@ItemStackBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ MCAPI void executeEvent(std::string const &, class RenderParams &); /** - * @symbol ?getArmorSlot\@ItemStackBase\@\@QEBA?AW4ArmorSlot\@\@XZ + * @symbol ?getArmorSlot\@ItemStackBase\@\@QEBA?AW4ArmorSlot\@\@XZ */ MCAPI enum class ArmorSlot getArmorSlot() const; /** - * @symbol ?getAttackDamage\@ItemStackBase\@\@QEBAHXZ + * @symbol ?getAttackDamage\@ItemStackBase\@\@QEBAHXZ */ MCAPI int getAttackDamage() const; /** - * @symbol ?getAuxValue\@ItemStackBase\@\@QEBAFXZ + * @symbol ?getAuxValue\@ItemStackBase\@\@QEBAFXZ */ MCAPI short getAuxValue() const; /** - * @symbol ?getBaseRepairCost\@ItemStackBase\@\@QEBAHXZ + * @symbol ?getBaseRepairCost\@ItemStackBase\@\@QEBAHXZ */ MCAPI int getBaseRepairCost() const; /** - * @symbol ?getBlock\@ItemStackBase\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getBlock\@ItemStackBase\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getBlock() const; /** - * @symbol ?getBlockingTick\@ItemStackBase\@\@QEBAAEBUTick\@\@XZ + * @symbol ?getBlockingTick\@ItemStackBase\@\@QEBAAEBUTick\@\@XZ */ MCAPI struct Tick const & getBlockingTick() const; /** - * @symbol ?getCategoryName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCategoryName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getCategoryName() const; /** - * @symbol ?getChargedItem\@ItemStackBase\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getChargedItem\@ItemStackBase\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getChargedItem() const; /** - * @symbol ?getColor\@ItemStackBase\@\@QEBA?AVColor\@mce\@\@XZ + * @symbol ?getColor\@ItemStackBase\@\@QEBA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getColor() const; /** - * @symbol ?getComponent\@ItemStackBase\@\@QEBAPEBVItemComponent\@\@AEBVHashedString\@\@\@Z + * @symbol ?getComponent\@ItemStackBase\@\@QEBAPEBVItemComponent\@\@AEBVHashedString\@\@\@Z */ MCAPI class ItemComponent const * getComponent(class HashedString const &) const; /** - * @symbol ?getComponentItem\@ItemStackBase\@\@QEBAPEBVComponentItem\@\@XZ + * @symbol ?getComponentItem\@ItemStackBase\@\@QEBAPEBVComponentItem\@\@XZ */ MCAPI class ComponentItem const * getComponentItem() const; /** - * @symbol ?getCustomLore\@ItemStackBase\@\@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 + * @symbol ?getCustomLore\@ItemStackBase\@\@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 getCustomLore() const; /** - * @symbol ?getCustomName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCustomName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getCustomName() const; /** - * @symbol ?getDamageValue\@ItemStackBase\@\@QEBAFXZ + * @symbol ?getDamageValue\@ItemStackBase\@\@QEBAFXZ */ MCAPI short getDamageValue() const; /** - * @symbol ?getDescriptionId\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescriptionId() const; /** - * @symbol ?getDescriptor\@ItemStackBase\@\@QEBA?AVItemDescriptor\@\@XZ + * @symbol ?getDescriptor\@ItemStackBase\@\@QEBA?AVItemDescriptor\@\@XZ */ MCAPI class ItemDescriptor getDescriptor() const; /** - * @symbol ?getEffectName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEffectName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getEffectName() const; /** - * @symbol ?getEnchantSlot\@ItemStackBase\@\@QEBAHXZ + * @symbol ?getEnchantSlot\@ItemStackBase\@\@QEBAHXZ */ MCAPI int getEnchantSlot() const; /** - * @symbol ?getEnchantValue\@ItemStackBase\@\@QEBAHXZ + * @symbol ?getEnchantValue\@ItemStackBase\@\@QEBAHXZ */ MCAPI int getEnchantValue() const; /** - * @symbol ?getFullNameHash\@ItemStackBase\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getFullNameHash\@ItemStackBase\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getFullNameHash() const; /** - * @symbol ?getHoverName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getHoverName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getHoverName() const; /** - * @symbol ?getId\@ItemStackBase\@\@QEBAFXZ + * @symbol ?getId\@ItemStackBase\@\@QEBAFXZ */ MCAPI short getId() const; /** - * @symbol ?getIdAux\@ItemStackBase\@\@QEBAHXZ + * @symbol ?getIdAux\@ItemStackBase\@\@QEBAHXZ */ MCAPI int getIdAux() const; /** - * @symbol ?getItem\@ItemStackBase\@\@QEBAPEBVItem\@\@XZ + * @symbol ?getItem\@ItemStackBase\@\@QEBAPEBVItem\@\@XZ */ MCAPI class Item const * getItem() const; /** - * @symbol ?getLegacyBlock\@ItemStackBase\@\@QEBAAEBV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ + * @symbol ?getLegacyBlock\@ItemStackBase\@\@QEBAAEBV?$WeakPtr\@VBlockLegacy\@\@\@\@XZ */ MCAPI class WeakPtr const & getLegacyBlock() const; /** - * @symbol ?getMaxDamage\@ItemStackBase\@\@QEBAFXZ + * @symbol ?getMaxDamage\@ItemStackBase\@\@QEBAFXZ */ MCAPI short getMaxDamage() const; /** - * @symbol ?getMaxStackSize\@ItemStackBase\@\@QEBAEXZ + * @symbol ?getMaxStackSize\@ItemStackBase\@\@QEBAEXZ */ MCAPI unsigned char getMaxStackSize() const; /** - * @symbol ?getName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName() const; /** - * @symbol ?getNetworkUserData\@ItemStackBase\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getNetworkUserData\@ItemStackBase\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getNetworkUserData() const; /** - * @symbol ?getRawNameHash\@ItemStackBase\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getRawNameHash\@ItemStackBase\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getRawNameHash() const; /** - * @symbol ?getRawNameId\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRawNameId\@ItemStackBase\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getRawNameId() const; /** - * @symbol ?getRequiredBaseGameVersion\@ItemStackBase\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getRequiredBaseGameVersion\@ItemStackBase\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getRequiredBaseGameVersion() const; /** - * @symbol ?getUseAnimation\@ItemStackBase\@\@QEBA?AW4UseAnimation\@\@XZ + * @symbol ?getUseAnimation\@ItemStackBase\@\@QEBA?AW4UseAnimation\@\@XZ */ MCAPI enum class UseAnimation getUseAnimation() const; /** - * @symbol ?getUserData\@ItemStackBase\@\@QEAAPEAVCompoundTag\@\@XZ + * @symbol ?getUserData\@ItemStackBase\@\@QEAAPEAVCompoundTag\@\@XZ */ MCAPI class CompoundTag * getUserData(); /** - * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ + * @symbol ?getUserData\@ItemStackBase\@\@QEBAPEBVCompoundTag\@\@XZ */ MCAPI class CompoundTag const * getUserData() const; /** - * @symbol ?getWasPickedUp\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?getWasPickedUp\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool getWasPickedUp() const; /** - * @symbol ?hasChargedItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?hasChargedItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool hasChargedItem() const; /** - * @symbol ?hasCompoundTextUserData\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?hasCompoundTextUserData\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool hasCompoundTextUserData() const; /** - * @symbol ?hasContainerData\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?hasContainerData\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool hasContainerData() const; /** - * @symbol ?hasCustomHoverName\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?hasCustomHoverName\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool hasCustomHoverName() const; /** - * @symbol ?hasDamageValue\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?hasDamageValue\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool hasDamageValue() const; /** - * @symbol ?hasSameAuxValue\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?hasSameAuxValue\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool hasSameAuxValue(class ItemStackBase const &) const; /** - * @symbol ?hasSameUserData\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?hasSameUserData\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool hasSameUserData(class ItemStackBase const &) const; /** - * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z + * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEB_K\@Z */ - MCAPI bool hasTag(struct ItemTag const &) const; + MCAPI bool hasTag(unsigned __int64 const &) const; /** - * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEB_K\@Z + * @symbol ?hasTag\@ItemStackBase\@\@QEBA_NAEBUItemTag\@\@\@Z */ - MCAPI bool hasTag(unsigned __int64 const &) const; + MCAPI bool hasTag(struct ItemTag const &) const; /** - * @symbol ?hasUserData\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?hasUserData\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool hasUserData() const; /** - * @symbol ?hurtAndBreak\@ItemStackBase\@\@QEAA_NHPEAVActor\@\@\@Z + * @symbol ?hurtAndBreak\@ItemStackBase\@\@QEAA_NHPEAVActor\@\@\@Z */ MCAPI bool hurtAndBreak(int, class Actor *); /** - * @symbol ?initParams\@ItemStackBase\@\@QEAAXAEAVRenderParams\@\@PEAVActor\@\@\@Z + * @symbol ?initParams\@ItemStackBase\@\@QEAAXAEAVRenderParams\@\@PEAVActor\@\@\@Z */ MCAPI void initParams(class RenderParams &, class Actor *); /** - * @symbol ?isArmorItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isArmorItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isArmorItem() const; /** - * @symbol ?isBlock\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isBlock\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isBlock() const; /** - * @symbol ?isBlockInstance\@ItemStackBase\@\@QEBA_NAEBVHashedString\@\@\@Z + * @symbol ?isBlockInstance\@ItemStackBase\@\@QEBA_NAEBVHashedString\@\@\@Z */ MCAPI bool isBlockInstance(class HashedString const &) const; /** - * @symbol ?isDamageableItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isDamageableItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isDamageableItem() const; /** - * @symbol ?isDamaged\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isDamaged\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isDamaged() const; /** - * @symbol ?isEnchanted\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isEnchanted\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isEnchanted() const; /** - * @symbol ?isEnchantingBook\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isEnchantingBook\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isEnchantingBook() const; /** - * @symbol ?isExplodable\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isExplodable\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isExplodable() const; /** - * @symbol ?isFireResistant\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isFireResistant\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isFireResistant() const; /** - * @symbol ?isFullStack\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isFullStack\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isFullStack() const; /** - * @symbol ?isGlint\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isGlint\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isGlint() const; /** - * @symbol ?isHorseArmorItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isHorseArmorItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isHorseArmorItem() const; /** - * @symbol ?isInstance\@ItemStackBase\@\@QEBA_NAEBVHashedString\@\@_N\@Z + * @symbol ?isInstance\@ItemStackBase\@\@QEBA_NAEBVHashedString\@\@_N\@Z */ MCAPI bool isInstance(class HashedString const &, bool) const; /** - * @symbol ?isLiquidClipItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isLiquidClipItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isLiquidClipItem() const; /** - * @symbol ?isMusicDiscItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isMusicDiscItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isMusicDiscItem() const; /** - * @symbol ?isNull\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isNull\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isNull() const; /** - * @symbol ?isOffhandItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isOffhandItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isOffhandItem() const; /** - * @symbol ?isOneOfBlockInstances\@ItemStackBase\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z + * @symbol ?isOneOfBlockInstances\@ItemStackBase\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@\@Z */ MCAPI bool isOneOfBlockInstances(class std::initializer_list) const; /** - * @symbol ?isOneOfInstances\@ItemStackBase\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@_N\@Z + * @symbol ?isOneOfInstances\@ItemStackBase\@\@QEBA_NV?$initializer_list\@$$CBVHashedString\@\@\@std\@\@_N\@Z */ MCAPI bool isOneOfInstances(class std::initializer_list, bool) const; /** - * @symbol ?isPattern\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isPattern\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isPattern() const; /** - * @symbol ?isPotionItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isPotionItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isPotionItem() const; /** - * @symbol ?isStackable\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?isStackable\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool isStackable(class ItemStackBase const &) const; /** - * @symbol ?isStackable\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isStackable\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isStackable() const; /** - * @symbol ?isStackedByData\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isStackedByData\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isStackedByData() const; /** - * @symbol ?isValidAuxValue\@ItemStackBase\@\@QEBA_NH\@Z + * @symbol ?isValidAuxValue\@ItemStackBase\@\@QEBA_NH\@Z */ MCAPI bool isValidAuxValue(int) const; /** - * @symbol ?isWearableItem\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?isWearableItem\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool isWearableItem() const; /** - * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@\@Z */ - MCAPI void load(class CompoundTag const &, class Level &); + MCAPI void load(class CompoundTag const &); /** - * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?load\@ItemStackBase\@\@QEAAXAEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ - MCAPI void load(class CompoundTag const &); + MCAPI void load(class CompoundTag const &, class Level &); /** - * @symbol ?matches\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?matches\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool matches(class ItemStackBase const &) const; /** - * @symbol ?matchesEitherWearableCase\@ItemStackBase\@\@QEBA_NPEBVCompoundTag\@\@\@Z + * @symbol ?matchesEitherWearableCase\@ItemStackBase\@\@QEBA_NPEBVCompoundTag\@\@\@Z */ MCAPI bool matchesEitherWearableCase(class CompoundTag const *) const; /** - * @symbol ?matchesItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?matchesItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool matchesItem(class ItemStackBase const &) const; /** - * @symbol ??BItemStackBase\@\@QEBA_NXZ + * @symbol ??BItemStackBase\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ??9ItemStackBase\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9ItemStackBase\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class ItemStackBase const &) const; /** - * @symbol ??8ItemStackBase\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8ItemStackBase\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class ItemStackBase const &) const; /** - * @symbol ?refreshedInContainer\@ItemStackBase\@\@QEBAXAEAVLevel\@\@\@Z + * @symbol ?refreshedInContainer\@ItemStackBase\@\@QEBAXAEAVLevel\@\@\@Z */ MCAPI void refreshedInContainer(class Level &) const; /** - * @symbol ?remove\@ItemStackBase\@\@QEAAXH\@Z + * @symbol ?remove\@ItemStackBase\@\@QEAAXH\@Z */ MCAPI void remove(int); /** - * @symbol ?removeDamageValue\@ItemStackBase\@\@QEAAXXZ + * @symbol ?removeDamageValue\@ItemStackBase\@\@QEAAXXZ */ MCAPI void removeDamageValue(); /** - * @symbol ?removeEnchants\@ItemStackBase\@\@QEAAXXZ + * @symbol ?removeEnchants\@ItemStackBase\@\@QEAAXXZ */ MCAPI void removeEnchants(); /** - * @symbol ?resetHoverName\@ItemStackBase\@\@QEAAXXZ + * @symbol ?resetHoverName\@ItemStackBase\@\@QEAAXXZ */ MCAPI void resetHoverName(); /** - * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z + * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ - MCAPI bool sameItem(int, int) const; + MCAPI bool sameItem(class ItemStackBase const &) const; /** - * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?sameItem\@ItemStackBase\@\@QEBA_NHH\@Z */ - MCAPI bool sameItem(class ItemStackBase const &) const; + MCAPI bool sameItem(int, int) const; /** - * @symbol ?sameItemAndAux\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z + * @symbol ?sameItemAndAux\@ItemStackBase\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool sameItemAndAux(class ItemStackBase const &) const; /** - * @symbol ?save\@ItemStackBase\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@ItemStackBase\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ?saveEnchantsToUserData\@ItemStackBase\@\@QEAAXAEBVItemEnchants\@\@\@Z + * @symbol ?saveEnchantsToUserData\@ItemStackBase\@\@QEAAXAEBVItemEnchants\@\@\@Z */ MCAPI void saveEnchantsToUserData(class ItemEnchants const &); /** - * @symbol ?sendEventTriggered\@ItemStackBase\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRenderParams\@\@\@Z + * @symbol ?sendEventTriggered\@ItemStackBase\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRenderParams\@\@\@Z */ MCAPI bool sendEventTriggered(std::string const &, class RenderParams const &); /** - * @symbol ?serializeComponents\@ItemStackBase\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeComponents\@ItemStackBase\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeComponents(class IDataOutput &) const; /** - * @symbol ?set\@ItemStackBase\@\@QEAAXH\@Z + * @symbol ?set\@ItemStackBase\@\@QEAAXH\@Z */ MCAPI void set(int); /** - * @symbol ?setAuxValue\@ItemStackBase\@\@QEAAXF\@Z + * @symbol ?setAuxValue\@ItemStackBase\@\@QEAAXF\@Z */ MCAPI void setAuxValue(short); /** - * @symbol ?setBlock\@ItemStackBase\@\@QEAAXPEBVBlock\@\@\@Z + * @symbol ?setBlock\@ItemStackBase\@\@QEAAXPEBVBlock\@\@\@Z */ MCAPI void setBlock(class Block const *); /** - * @symbol ?setBlockingTick\@ItemStackBase\@\@QEAAXUTick\@\@\@Z + * @symbol ?setBlockingTick\@ItemStackBase\@\@QEAAXUTick\@\@\@Z */ MCAPI void setBlockingTick(struct Tick); /** - * @symbol ?setChargedItem\@ItemStackBase\@\@QEAAXAEBVItemInstance\@\@_N\@Z + * @symbol ?setCanDestroy\@ItemStackBase\@\@QEAA_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 bool setCanDestroy(std::vector const &); + /** + * @symbol ?setCanPlaceOn\@ItemStackBase\@\@QEAA_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 bool setCanPlaceOn(std::vector const &); + /** + * @symbol ?setChargedItem\@ItemStackBase\@\@QEAAXAEBVItemInstance\@\@_N\@Z */ MCAPI void setChargedItem(class ItemInstance const &, bool); /** - * @symbol ?setCustomLore\@ItemStackBase\@\@QEAAXAEBV?$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 ?setCustomLore\@ItemStackBase\@\@QEAAXAEBV?$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 void setCustomLore(std::vector const &); /** - * @symbol ?setCustomName\@ItemStackBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCustomName\@ItemStackBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCustomName(std::string const &); /** - * @symbol ?setDamageValue\@ItemStackBase\@\@QEAAXF\@Z + * @symbol ?setDamageValue\@ItemStackBase\@\@QEAAXF\@Z */ MCAPI void setDamageValue(short); /** - * @symbol ?setJustBrewed\@ItemStackBase\@\@QEAAX_N\@Z + * @symbol ?setJustBrewed\@ItemStackBase\@\@QEAAX_N\@Z */ MCAPI void setJustBrewed(bool); /** - * @symbol ?setPickupTime\@ItemStackBase\@\@QEAAXXZ + * @symbol ?setPickupTime\@ItemStackBase\@\@QEAAXXZ */ MCAPI void setPickupTime(); /** - * @symbol ?setRepairCost\@ItemStackBase\@\@QEAAXH\@Z + * @symbol ?setRepairCost\@ItemStackBase\@\@QEAAXH\@Z */ MCAPI void setRepairCost(int); /** - * @symbol ?setShowPickUp\@ItemStackBase\@\@QEAAX_N\@Z + * @symbol ?setShowPickUp\@ItemStackBase\@\@QEAAX_N\@Z */ MCAPI void setShowPickUp(bool); /** - * @symbol ?setStackSize\@ItemStackBase\@\@QEAAXE\@Z + * @symbol ?setStackSize\@ItemStackBase\@\@QEAAXE\@Z */ MCAPI void setStackSize(unsigned char); /** - * @symbol ?setUserData\@ItemStackBase\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setUserData\@ItemStackBase\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setUserData(std::unique_ptr); /** - * @symbol ?setWasPickedUp\@ItemStackBase\@\@QEAAX_N\@Z + * @symbol ?setWasPickedUp\@ItemStackBase\@\@QEAAX_N\@Z */ MCAPI void setWasPickedUp(bool); /** - * @symbol ?shouldInteractionWithBlockBypassLiquid\@ItemStackBase\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?shouldInteractionWithBlockBypassLiquid\@ItemStackBase\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool shouldInteractionWithBlockBypassLiquid(class Block const &) const; /** - * @symbol ?shouldVanish\@ItemStackBase\@\@QEBA_NXZ + * @symbol ?shouldVanish\@ItemStackBase\@\@QEBA_NXZ */ MCAPI bool shouldVanish() const; /** - * @symbol ?startCoolDown\@ItemStackBase\@\@QEBAXPEAVPlayer\@\@\@Z + * @symbol ?startCoolDown\@ItemStackBase\@\@QEBAXPEAVPlayer\@\@\@Z */ MCAPI void startCoolDown(class Player *) const; /** - * @symbol ?updateComponent\@ItemStackBase\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @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 ?TAG_CAN_DESTROY\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_CAN_DESTROY\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_CAN_DESTROY; /** - * @symbol ?TAG_CAN_PLACE_ON\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_CAN_PLACE_ON\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_CAN_PLACE_ON; /** - * @symbol ?TAG_DISPLAY\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_DISPLAY\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_DISPLAY; /** - * @symbol ?TAG_DISPLAY_NAME\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_DISPLAY_NAME\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_DISPLAY_NAME; /** - * @symbol ?TAG_ENCHANTS\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_ENCHANTS\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_ENCHANTS; /** - * @symbol ?TAG_LORE\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_LORE\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_LORE; /** - * @symbol ?TAG_REPAIR_COST\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_REPAIR_COST\@ItemStackBase\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_REPAIR_COST; //protected: /** - * @symbol ??0ItemStackBase\@\@IEAA\@XZ + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z */ - MCAPI ItemStackBase(); + MCAPI ItemStackBase(class Item const &, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStackBase\@\@IEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@AEBV0\@\@Z */ - MCAPI ItemStackBase(class gsl::basic_string_span, int, int, class CompoundTag const *); + MCAPI ItemStackBase(class ItemStackBase const &); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVRecipeIngredient\@\@\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlockLegacy\@\@H\@Z */ - MCAPI ItemStackBase(class RecipeIngredient const &); + MCAPI ItemStackBase(class BlockLegacy const &, int); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVItem\@\@HHPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z */ - MCAPI ItemStackBase(class Item const &, int, int, class CompoundTag const *); + MCAPI ItemStackBase(class Block const &, int, class CompoundTag const *); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlockLegacy\@\@H\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHPEBVCompoundTag\@\@\@Z */ - MCAPI ItemStackBase(class BlockLegacy const &, int); + MCAPI ItemStackBase(class std::basic_string_view>, int, int, class CompoundTag const *); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBVBlock\@\@HPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@AEBVRecipeIngredient\@\@\@Z */ - MCAPI ItemStackBase(class Block const &, int, class CompoundTag const *); + MCAPI ItemStackBase(class RecipeIngredient const &); /** - * @symbol ??0ItemStackBase\@\@IEAA\@AEBV0\@\@Z + * @symbol ??0ItemStackBase\@\@IEAA\@XZ */ - MCAPI ItemStackBase(class ItemStackBase const &); + MCAPI ItemStackBase(); /** - * @symbol ?_getHoverFormattingPrefix\@ItemStackBase\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_getHoverFormattingPrefix\@ItemStackBase\@\@IEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string _getHoverFormattingPrefix() const; /** - * @symbol ?_setItem\@ItemStackBase\@\@IEAA_NH_N\@Z + * @symbol ?_setItem\@ItemStackBase\@\@IEAA_NH_N\@Z */ MCAPI bool _setItem(int, bool); /** - * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVBlockLegacy\@\@H\@Z + * @symbol ?init\@ItemStackBase\@\@IEAAXHHH_N\@Z */ - MCAPI void init(class BlockLegacy const &, int); + MCAPI void init(int, int, int, bool); /** - * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVItem\@\@HHPEBVCompoundTag\@\@_N\@Z + * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVBlockLegacy\@\@H\@Z */ - MCAPI void init(class Item const &, int, int, class CompoundTag const *, bool); + MCAPI void init(class BlockLegacy const &, int); /** - * @symbol ?init\@ItemStackBase\@\@IEAAXHHH_N\@Z + * @symbol ?init\@ItemStackBase\@\@IEAAXAEBVItem\@\@HHPEBVCompoundTag\@\@_N\@Z */ - MCAPI void init(int, int, int, bool); + MCAPI void init(class Item const &, int, int, class CompoundTag const *, bool); /** - * @symbol ??4ItemStackBase\@\@IEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ItemStackBase\@\@IEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ItemStackBase & operator=(class ItemStackBase const &); //private: /** - * @symbol ?_addCustomUserDataCommon\@ItemStackBase\@\@AEAAX$$QEAV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_addCustomUserDataCommon\@ItemStackBase\@\@AEAAX$$QEAV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _addCustomUserDataCommon(std::unique_ptr &&); /** - * @symbol ?_checkForItemWorldCompatibility\@ItemStackBase\@\@AEAAXXZ + * @symbol ?_checkForItemWorldCompatibility\@ItemStackBase\@\@AEAAXXZ */ MCAPI void _checkForItemWorldCompatibility(); /** - * @symbol ?_cloneComponents\@ItemStackBase\@\@AEAAXAEBV1\@\@Z + * @symbol ?_cloneComponents\@ItemStackBase\@\@AEAAXAEBV1\@\@Z */ MCAPI void _cloneComponents(class ItemStackBase const &); /** - * @symbol ?_isInstance\@ItemStackBase\@\@AEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?_isInstance\@ItemStackBase\@\@AEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool _isInstance(class gsl::basic_string_span) const; + MCAPI bool _isInstance(class std::basic_string_view>) const; /** - * @symbol ?_loadComponents\@ItemStackBase\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_loadItem\@ItemStackBase\@\@AEAAXAEBVCompoundTag\@\@\@Z */ - MCAPI void _loadComponents(class CompoundTag const &); + MCAPI void _loadItem(class CompoundTag const &); /** - * @symbol ?_loadItem\@ItemStackBase\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_setBlockList\@ItemStackBase\@\@AEAA_NAEAV?$vector\@PEBVBlockLegacy\@\@V?$allocator\@PEBVBlockLegacy\@\@\@std\@\@\@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 */ - MCAPI void _loadItem(class CompoundTag const &); + MCAPI bool _setBlockList(std::vector &, std::vector const &); /** - * @symbol ?_setChargedItem\@ItemStackBase\@\@AEAAXAEBVItemInstance\@\@\@Z + * @symbol ?_setChargedItem\@ItemStackBase\@\@AEAAXAEBVItemInstance\@\@\@Z */ MCAPI void _setChargedItem(class ItemInstance const &); /** - * @symbol ?_updateCompareHashes\@ItemStackBase\@\@AEAAXXZ + * @symbol ?_updateCompareHashes\@ItemStackBase\@\@AEAAXXZ */ MCAPI void _updateCompareHashes(); + /** + * @symbol ?_loadBlocksForCanPlaceOnCanDestroy\@ItemStackBase\@\@CA_NAEAV?$vector\@PEBVBlockLegacy\@\@V?$allocator\@PEBVBlockLegacy\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI static bool _loadBlocksForCanPlaceOnCanDestroy(std::vector &, std::string const &); protected: /** - * @symbol ?TAG_CHARGED_ITEM\@ItemStackBase\@\@1V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_CHARGED_ITEM\@ItemStackBase\@\@1V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_CHARGED_ITEM; /** - * @symbol ?TAG_STORE_CAN_DESTROY\@ItemStackBase\@\@1V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_STORE_CAN_DESTROY\@ItemStackBase\@\@1V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_STORE_CAN_DESTROY; /** - * @symbol ?TAG_STORE_CAN_PLACE_ON\@ItemStackBase\@\@1V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_STORE_CAN_PLACE_ON\@ItemStackBase\@\@1V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_STORE_CAN_PLACE_ON; private: /** - * @symbol ?MAX_STACK_SIZE\@ItemStackBase\@\@0HB + * @symbol ?MAX_STACK_SIZE\@ItemStackBase\@\@0HB */ MCAPI static int const MAX_STACK_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp b/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp index 9999e5dd60..7464a423eb 100644 --- a/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackBaseComponentsHelper.hpp @@ -29,12 +29,12 @@ class ItemStackBaseComponentsHelper { public: /** - * @symbol ?isValidComponent\@ItemStackBaseComponentsHelper\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isValidComponent\@ItemStackBaseComponentsHelper\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isValidComponent(std::string const &); /** - * @symbol ?updateComponent\@ItemStackBaseComponentsHelper\@\@SA_NAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?updateComponent\@ItemStackBaseComponentsHelper\@\@SA_NAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static bool updateComponent(class ItemStackBase &, std::string const &, class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp index 945202c8f0..9869e61d19 100644 --- a/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackDescriptor.hpp @@ -32,21 +32,27 @@ class ItemStackDescriptor : public ItemDescriptorCount { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackDescriptor(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKDESCRIPTOR /** - * @symbol ??0ItemStackDescriptor\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ItemStackDescriptor(); + MCVAPI ~ItemStackDescriptor(); +#endif /** - * @symbol ??0ItemStackDescriptor\@\@QEAA\@AEBVItem\@\@HGPEBVCompoundTag\@\@\@Z + * @symbol ??0ItemStackDescriptor\@\@QEAA\@AEBVItem\@\@HGPEBVCompoundTag\@\@\@Z */ MCAPI ItemStackDescriptor(class Item const &, int, unsigned short, class CompoundTag const *); /** - * @symbol ??4ItemStackDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??0ItemStackDescriptor\@\@QEAA\@XZ + */ + MCAPI ItemStackDescriptor(); + /** + * @symbol ??4ItemStackDescriptor\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ItemStackDescriptor & operator=(class ItemStackDescriptor &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp index 941d6bdc4d..dd9a6a65d8 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetIdVariant.hpp @@ -35,71 +35,71 @@ struct ItemStackNetIdVariant { #undef AFTER_EXTRA public: /** - * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@XZ */ - MCAPI ItemStackNetIdVariant(struct ItemStackNetIdVariant &&); + MCAPI ItemStackNetIdVariant(); /** - * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI ItemStackNetIdVariant(struct ItemStackNetIdVariant const &); + MCAPI ItemStackNetIdVariant(struct ItemStackNetIdVariant &&); /** - * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@XZ + * @symbol ??0ItemStackNetIdVariant\@\@QEAA\@AEBU0\@\@Z */ - MCAPI ItemStackNetIdVariant(); + MCAPI ItemStackNetIdVariant(struct ItemStackNetIdVariant const &); /** - * @symbol ?deserialize\@ItemStackNetIdVariant\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@ItemStackNetIdVariant\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI void deserialize(class ReadOnlyBinaryStream &); /** - * @symbol ?hasServerNetId\@ItemStackNetIdVariant\@\@QEBA_NXZ + * @symbol ?hasServerNetId\@ItemStackNetIdVariant\@\@QEBA_NXZ */ MCAPI bool hasServerNetId() const; /** - * @symbol ?isValid\@ItemStackNetIdVariant\@\@QEBA_NXZ + * @symbol ?isValid\@ItemStackNetIdVariant\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z - */ - MCAPI struct ItemStackNetIdVariant & operator=(class TypedServerNetId const &); - /** - * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z + * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@\@Z */ MCAPI struct ItemStackNetIdVariant & operator=(class TypedClientNetId const &); /** - * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ItemStackNetIdVariant & operator=(struct ItemStackNetIdVariant &&); /** - * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ItemStackNetIdVariant & operator=(struct ItemStackNetIdVariant const &); /** - * @symbol ??8ItemStackNetIdVariant\@\@QEBA_NAEBU0\@\@Z + * @symbol ??4ItemStackNetIdVariant\@\@QEAAAEAU0\@AEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z + */ + MCAPI struct ItemStackNetIdVariant & operator=(class TypedServerNetId const &); + /** + * @symbol ??8ItemStackNetIdVariant\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct ItemStackNetIdVariant const &) const; /** - * @symbol ?serialize\@ItemStackNetIdVariant\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?serialize\@ItemStackNetIdVariant\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void serialize(class BinaryStream &) const; /** - * @symbol ?toString\@ItemStackNetIdVariant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@ItemStackNetIdVariant\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; /** - * @symbol ?tryGetLegacyRequestId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@XZ + * @symbol ?tryGetLegacyRequestId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@XZ */ MCAPI class TypedClientNetId const * tryGetLegacyRequestId() const; /** - * @symbol ?tryGetRequestId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ + * @symbol ?tryGetRequestId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ */ MCAPI class TypedClientNetId const * tryGetRequestId() const; /** - * @symbol ?tryGetServerNetId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ + * @symbol ?tryGetServerNetId\@ItemStackNetIdVariant\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ */ MCAPI class TypedServerNetId const * tryGetServerNetId() const; /** - * @symbol ??1ItemStackNetIdVariant\@\@QEAA\@XZ + * @symbol ??1ItemStackNetIdVariant\@\@QEAA\@XZ */ MCAPI ~ItemStackNetIdVariant(); diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp index c18cdc28b9..014fbb3ebf 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerBase.hpp @@ -30,95 +30,101 @@ class ItemStackNetManagerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackNetManagerBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isEnabled\@ItemStackNetManagerBase\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isEnabled\@ItemStackNetManagerBase\@\@UEBA_NXZ */ virtual bool isEnabled() const; /** - * @vftbl 2 - * @symbol ?getRequestId\@ItemStackNetManagerServer\@\@UEBA?AV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ + * @vftbl 2 + * @symbol ?getRequestId\@ItemStackNetManagerServer\@\@UEBA?AV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ */ virtual class TypedClientNetId getRequestId() const = 0; /** - * @vftbl 3 - * @symbol ?retainSetItemStackNetIdVariant\@ItemStackNetManagerBase\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?retainSetItemStackNetIdVariant\@ItemStackNetManagerBase\@\@UEBA_NXZ */ virtual bool retainSetItemStackNetIdVariant() const; /** - * @vftbl 4 - * @symbol ?allowInventoryTransactionManager\@ItemStackNetManagerServer\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?allowInventoryTransactionManager\@ItemStackNetManagerServer\@\@UEBA_NXZ */ virtual bool allowInventoryTransactionManager() const = 0; /** - * @vftbl 5 - * @symbol ?_tryBeginClientLegacyTransactionRequest\@ItemStackNetManagerBase\@\@MEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@XZ + * @vftbl 5 + * @symbol ?_tryBeginClientLegacyTransactionRequest\@ItemStackNetManagerBase\@\@MEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@XZ */ virtual class gsl::final_action> _tryBeginClientLegacyTransactionRequest(); /** - * @vftbl 6 - * @symbol ?onContainerScreenOpen\@ItemStackNetManagerBase\@\@UEAAXAEBVContainerScreenContext\@\@\@Z + * @vftbl 6 + * @symbol ?onContainerScreenOpen\@ItemStackNetManagerBase\@\@UEAAXAEBVContainerScreenContext\@\@\@Z */ virtual void onContainerScreenOpen(class ContainerScreenContext const &); /** - * @vftbl 7 - * @symbol ?onContainerScreenClose\@ItemStackNetManagerBase\@\@UEAAXXZ + * @vftbl 7 + * @symbol ?onContainerScreenClose\@ItemStackNetManagerBase\@\@UEAAXXZ */ virtual void onContainerScreenClose(); /** - * @vftbl 8 - * @symbol ?initOpenContainer\@ItemStackNetManagerBase\@\@UEAAPEAVSparseContainer\@\@AEAVBlockSource\@\@W4ContainerEnumName\@\@AEBVContainerWeakRef\@\@\@Z + * @vftbl 8 + * @symbol ?initOpenContainer\@ItemStackNetManagerBase\@\@UEAAPEAVSparseContainer\@\@AEAVBlockSource\@\@W4ContainerEnumName\@\@AEBVContainerWeakRef\@\@\@Z */ virtual class SparseContainer * initOpenContainer(class BlockSource &, enum class ContainerEnumName, class ContainerWeakRef const &); /** - * @vftbl 9 - * @symbol ?_addLegacyTransactionRequestSetItemSlot\@ItemStackNetManagerBase\@\@MEAAXAEAVItemStackNetManagerScreen\@\@W4ContainerType\@\@H\@Z + * @vftbl 9 + * @symbol ?_addLegacyTransactionRequestSetItemSlot\@ItemStackNetManagerBase\@\@MEAAXAEAVItemStackNetManagerScreen\@\@W4ContainerType\@\@H\@Z */ virtual void _addLegacyTransactionRequestSetItemSlot(class ItemStackNetManagerScreen &, enum class ContainerType, int); /** - * @vftbl 10 - * @symbol ?_initScreen\@ItemStackNetManagerBase\@\@MEAAXAEAVItemStackNetManagerScreen\@\@\@Z + * @vftbl 10 + * @symbol ?_initScreen\@ItemStackNetManagerBase\@\@MEAAXAEAVItemStackNetManagerScreen\@\@\@Z */ virtual void _initScreen(class ItemStackNetManagerScreen &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKNETMANAGERBASE /** - * @symbol ??0ItemStackNetManagerBase\@\@QEAA\@AEAVPlayer\@\@_N1\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemStackNetManagerBase(); +#endif + /** + * @symbol ??0ItemStackNetManagerBase\@\@QEAA\@AEAVPlayer\@\@_N1\@Z */ MCAPI ItemStackNetManagerBase(class Player &, bool, bool); /** - * @symbol ?_getScreenStack\@ItemStackNetManagerBase\@\@QEAAAEAVItemStackNetManagerScreenStack\@\@XZ + * @symbol ?_getScreenStack\@ItemStackNetManagerBase\@\@QEAAAEAVItemStackNetManagerScreenStack\@\@XZ */ MCAPI class ItemStackNetManagerScreenStack & _getScreenStack(); /** - * @symbol ?getScreenContext\@ItemStackNetManagerBase\@\@QEBAAEBVContainerScreenContext\@\@XZ + * @symbol ?getScreenContext\@ItemStackNetManagerBase\@\@QEBAAEBVContainerScreenContext\@\@XZ */ MCAPI class ContainerScreenContext const & getScreenContext() const; /** - * @symbol ?isClientSide\@ItemStackNetManagerBase\@\@QEBA_NXZ + * @symbol ?isClientSide\@ItemStackNetManagerBase\@\@QEBA_NXZ */ MCAPI bool isClientSide() const; /** - * @symbol ?isScreenOpen\@ItemStackNetManagerBase\@\@QEBA_NXZ + * @symbol ?isScreenOpen\@ItemStackNetManagerBase\@\@QEBA_NXZ */ MCAPI bool isScreenOpen() const; /** - * @symbol ?_tryBeginClientLegacyTransactionRequest\@ItemStackNetManagerBase\@\@SA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@PEAVPlayer\@\@\@Z + * @symbol ?_tryBeginClientLegacyTransactionRequest\@ItemStackNetManagerBase\@\@SA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@PEAVPlayer\@\@\@Z */ MCAPI static class gsl::final_action> _tryBeginClientLegacyTransactionRequest(class Player *); /** - * @symbol ?setPlayerContainer\@ItemStackNetManagerBase\@\@SA_NAEAVPlayer\@\@W4ContainerType\@\@HAEBVItemStack\@\@AEAV4\@AEBV?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?setPlayerContainer\@ItemStackNetManagerBase\@\@SA_NAEAVPlayer\@\@W4ContainerType\@\@HAEBVItemStack\@\@AEAV4\@AEBV?$function\@$$A6AXAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI static bool setPlayerContainer(class Player &, enum class ContainerType, int, class ItemStack const &, class ItemStack &, class std::function const &); //protected: /** - * @symbol ?_isRequestActionAllowed\@ItemStackNetManagerBase\@\@IEAA_NAEBVItemStackRequestAction\@\@\@Z + * @symbol ?_isRequestActionAllowed\@ItemStackNetManagerBase\@\@IEAA_NAEBVItemStackRequestAction\@\@\@Z */ MCAPI bool _isRequestActionAllowed(class ItemStackRequestAction const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp index 2afc08a2bf..80d67b4878 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreen.hpp @@ -30,16 +30,16 @@ class ItemStackNetManagerScreen { public: /** - * @symbol ??0ItemStackNetManagerScreen\@\@QEAA\@AEAVEntityRegistry\@\@\@Z + * @symbol ??0ItemStackNetManagerScreen\@\@QEAA\@AEAVEntityRegistry\@\@\@Z */ MCAPI ItemStackNetManagerScreen(class EntityRegistry &); /** - * @symbol ?getEntity\@ItemStackNetManagerScreen\@\@QEAAAEAVEntityContext\@\@XZ + * @symbol ?getEntity\@ItemStackNetManagerScreen\@\@QEAAAEAVEntityContext\@\@XZ */ MCAPI class EntityContext & getEntity(); /** - * @symbol ?getEntity\@ItemStackNetManagerScreen\@\@QEBAAEBVEntityContext\@\@XZ + * @symbol ?getEntity\@ItemStackNetManagerScreen\@\@QEBAAEBVEntityContext\@\@XZ */ MCAPI class EntityContext const & getEntity() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp index 4166721628..8e72c1ebad 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerScreenStack.hpp @@ -30,36 +30,36 @@ class ItemStackNetManagerScreenStack { public: /** - * @symbol ?foreachScreen\@ItemStackNetManagerScreenStack\@\@QEAAXV?$function\@$$A6A_NAEAVItemStackNetManagerScreen\@\@\@Z\@std\@\@\@Z + * @symbol ?foreachScreen\@ItemStackNetManagerScreenStack\@\@QEAAXV?$function\@$$A6A_NAEAVItemStackNetManagerScreen\@\@\@Z\@std\@\@\@Z */ MCAPI void foreachScreen(class std::function); /** - * @symbol ?getScreenForRequest\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@AEBVItemStackRequestData\@\@\@Z + * @symbol ?getScreenForRequest\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@AEBVItemStackRequestData\@\@\@Z */ MCAPI class ItemStackNetManagerScreen * getScreenForRequest(class ItemStackRequestData const &); /** - * @symbol ?pop\@ItemStackNetManagerScreenStack\@\@QEAA_NXZ + * @symbol ?pop\@ItemStackNetManagerScreenStack\@\@QEAA_NXZ */ MCAPI bool pop(); /** - * @symbol ?push\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@V?$unique_ptr\@VItemStackNetManagerScreen\@\@U?$default_delete\@VItemStackNetManagerScreen\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?push\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@V?$unique_ptr\@VItemStackNetManagerScreen\@\@U?$default_delete\@VItemStackNetManagerScreen\@\@\@std\@\@\@std\@\@\@Z */ MCAPI class ItemStackNetManagerScreen * push(std::unique_ptr); /** - * @symbol ?size\@ItemStackNetManagerScreenStack\@\@QEBA_KXZ + * @symbol ?size\@ItemStackNetManagerScreenStack\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; /** - * @symbol ?top\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@XZ + * @symbol ?top\@ItemStackNetManagerScreenStack\@\@QEAAPEAVItemStackNetManagerScreen\@\@XZ */ MCAPI class ItemStackNetManagerScreen * top(); /** - * @symbol ?top\@ItemStackNetManagerScreenStack\@\@QEBAPEBVItemStackNetManagerScreen\@\@XZ + * @symbol ?top\@ItemStackNetManagerScreenStack\@\@QEBAPEBVItemStackNetManagerScreen\@\@XZ */ MCAPI class ItemStackNetManagerScreen const * top() const; /** - * @symbol ??1ItemStackNetManagerScreenStack\@\@QEAA\@XZ + * @symbol ??1ItemStackNetManagerScreenStack\@\@QEAA\@XZ */ MCAPI ~ItemStackNetManagerScreenStack(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp b/LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp index 632e765971..3ae5319c9f 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetManagerServer.hpp @@ -32,102 +32,102 @@ class ItemStackNetManagerServer : public ItemStackNetManagerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackNetManagerServer(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getRequestId\@ItemStackNetManagerServer\@\@UEBA?AV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ + * @vftbl 2 + * @symbol ?getRequestId\@ItemStackNetManagerServer\@\@UEBA?AV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ */ virtual class TypedClientNetId getRequestId() const; /** - * @vftbl 3 - * @symbol ?retainSetItemStackNetIdVariant\@ItemStackNetManagerServer\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?retainSetItemStackNetIdVariant\@ItemStackNetManagerServer\@\@UEBA_NXZ */ virtual bool retainSetItemStackNetIdVariant() const; /** - * @vftbl 4 - * @symbol ?allowInventoryTransactionManager\@ItemStackNetManagerServer\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?allowInventoryTransactionManager\@ItemStackNetManagerServer\@\@UEBA_NXZ */ virtual bool allowInventoryTransactionManager() const; /** - * @vftbl 6 - * @symbol ?onContainerScreenOpen\@ItemStackNetManagerServer\@\@UEAAXAEBVContainerScreenContext\@\@\@Z + * @vftbl 6 + * @symbol ?onContainerScreenOpen\@ItemStackNetManagerServer\@\@UEAAXAEBVContainerScreenContext\@\@\@Z */ virtual void onContainerScreenOpen(class ContainerScreenContext const &); /** - * @vftbl 10 - * @symbol ?_initScreen\@ItemStackNetManagerServer\@\@EEAAXAEAVItemStackNetManagerScreen\@\@\@Z + * @vftbl 10 + * @symbol ?_initScreen\@ItemStackNetManagerServer\@\@EEAAXAEAVItemStackNetManagerScreen\@\@\@Z */ virtual void _initScreen(class ItemStackNetManagerScreen &); /** - * @symbol ??0ItemStackNetManagerServer\@\@QEAA\@AEAVServerPlayer\@\@_N\@Z + * @symbol ??0ItemStackNetManagerServer\@\@QEAA\@AEAVServerPlayer\@\@_N\@Z */ MCAPI ItemStackNetManagerServer(class ServerPlayer &, bool); /** - * @symbol ?_handleLegacyTransactionRequest\@ItemStackNetManagerServer\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@AEBV?$vector\@U?$pair\@W4ContainerEnumName\@\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4ContainerEnumName\@\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_handleLegacyTransactionRequest\@ItemStackNetManagerServer\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@AEBV?$vector\@U?$pair\@W4ContainerEnumName\@\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4ContainerEnumName\@\@V?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void _handleLegacyTransactionRequest(class TypedClientNetId const &, std::vector>>> const &); /** - * @symbol ?_retainSetItemStackNetIdVariantScope\@ItemStackNetManagerServer\@\@QEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@XZ + * @symbol ?_retainSetItemStackNetIdVariantScope\@ItemStackNetManagerServer\@\@QEAA?AV?$final_action\@V?$function\@$$A6AXXZ\@std\@\@\@gsl\@\@XZ */ MCAPI class gsl::final_action> _retainSetItemStackNetIdVariantScope(); /** - * @symbol ?handleRequest\@ItemStackNetManagerServer\@\@QEAAXV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@Bedrock\@\@\@Z + * @symbol ?handleRequest\@ItemStackNetManagerServer\@\@QEAAXV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@Bedrock\@\@\@Z */ MCAPI void handleRequest(std::unique_ptr, class Bedrock::NonOwnerPointer); /** - * @symbol ?handleRequestBatch\@ItemStackNetManagerServer\@\@QEAAXAEBVItemStackRequestBatch\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@Bedrock\@\@\@Z + * @symbol ?handleRequestBatch\@ItemStackNetManagerServer\@\@QEAAXAEBVItemStackRequestBatch\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@Bedrock\@\@\@Z */ MCAPI void handleRequestBatch(class ItemStackRequestBatch const &, class Bedrock::NonOwnerPointer); /** - * @symbol ?itemMatches\@ItemStackNetManagerServer\@\@QEAA_NAEBUItemStackRequestSlotInfo\@\@AEBVItemStack\@\@\@Z + * @symbol ?itemMatches\@ItemStackNetManagerServer\@\@QEAA_NAEBUItemStackRequestSlotInfo\@\@AEBVItemStack\@\@\@Z */ MCAPI bool itemMatches(struct ItemStackRequestSlotInfo const &, class ItemStack const &); /** - * @symbol ?normalTick\@ItemStackNetManagerServer\@\@QEAAXXZ + * @symbol ?normalTick\@ItemStackNetManagerServer\@\@QEAAXXZ */ MCAPI void normalTick(); /** - * @symbol ?startCrafting\@ItemStackNetManagerServer\@\@QEAAX_NAEBVBlockPos\@\@\@Z + * @symbol ?startCrafting\@ItemStackNetManagerServer\@\@QEAAX_NAEBVBlockPos\@\@\@Z */ MCAPI void startCrafting(bool, class BlockPos const &); /** - * @symbol ?tryCloseContainerScreen\@ItemStackNetManagerServer\@\@QEAA?AVCallbackToken\@\@V?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?tryCloseContainerScreen\@ItemStackNetManagerServer\@\@QEAA?AVCallbackToken\@\@V?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI class CallbackToken tryCloseContainerScreen(class std::function); //private: /** - * @symbol ?_filterStrings\@ItemStackNetManagerServer\@\@AEAAXV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@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\@\@\@Z + * @symbol ?_filterStrings\@ItemStackNetManagerServer\@\@AEAAXV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@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\@\@\@Z */ MCAPI void _filterStrings(class TypedClientNetId, std::vector const &, enum class TextProcessingEventOrigin const &); /** - * @symbol ?_handleRequestData\@ItemStackNetManagerServer\@\@AEAAXAEAV?$vector\@UItemStackResponseInfo\@\@V?$allocator\@UItemStackResponseInfo\@\@\@std\@\@\@std\@\@PEBVItemStackRequestData\@\@\@Z + * @symbol ?_handleRequestData\@ItemStackNetManagerServer\@\@AEAAXAEAV?$vector\@UItemStackResponseInfo\@\@V?$allocator\@UItemStackResponseInfo\@\@\@std\@\@\@std\@\@PEBVItemStackRequestData\@\@\@Z */ MCAPI void _handleRequestData(std::vector &, class ItemStackRequestData const *); /** - * @symbol ?_processQueue\@ItemStackNetManagerServer\@\@AEAAXXZ + * @symbol ?_processQueue\@ItemStackNetManagerServer\@\@AEAAXXZ */ MCAPI void _processQueue(); /** - * @symbol ?_queueRequest\@ItemStackNetManagerServer\@\@AEAAXV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_queueRequest\@ItemStackNetManagerServer\@\@AEAAXV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _queueRequest(std::unique_ptr); /** - * @symbol ?_queueRequests\@ItemStackNetManagerServer\@\@AEAAXAEBVItemStackRequestBatch\@\@\@Z + * @symbol ?_queueRequests\@ItemStackNetManagerServer\@\@AEAAXAEBVItemStackRequestBatch\@\@\@Z */ MCAPI void _queueRequests(class ItemStackRequestBatch const &); /** - * @symbol ?_setTextFilterState\@ItemStackNetManagerServer\@\@AEAAXW4TextFilterState\@1\@\@Z + * @symbol ?_setTextFilterState\@ItemStackNetManagerServer\@\@AEAAXW4TextFilterState\@1\@\@Z */ MCAPI void _setTextFilterState(enum class ItemStackNetManagerServer::TextFilterState); /** - * @symbol ?_tryFilterText\@ItemStackNetManagerServer\@\@AEAA_NPEBVItemStackRequestData\@\@\@Z + * @symbol ?_tryFilterText\@ItemStackNetManagerServer\@\@AEAA_NPEBVItemStackRequestData\@\@\@Z */ MCAPI bool _tryFilterText(class ItemStackRequestData const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackNetResultMap.hpp b/LiteLoader/include/llapi/mc/ItemStackNetResultMap.hpp index ce99c1af8e..90a1164be4 100644 --- a/LiteLoader/include/llapi/mc/ItemStackNetResultMap.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackNetResultMap.hpp @@ -34,7 +34,7 @@ class ItemStackNetResultMap { public: /** - * @symbol ?getItemStackNetResultName\@ItemStackNetResultMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemStackNetResult\@\@\@Z + * @symbol ?getItemStackNetResultName\@ItemStackNetResultMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemStackNetResult\@\@\@Z */ MCAPI static std::string const & getItemStackNetResultName(enum class ItemStackNetResult); @@ -42,8 +42,8 @@ class ItemStackNetResultMap { private: /** - * @symbol ?mMap\@ItemStackNetResultMap\@\@0V?$BidirectionalUnorderedMap\@W4ItemStackNetResult\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?mMap\@ItemStackNetResultMap\@\@0V?$BidirectionalUnorderedMap\@W4ItemStackNetResult\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const mMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp index 7edca68615..6ba63769e4 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestAction.hpp @@ -36,43 +36,49 @@ class ItemStackRequestAction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getCraftAction\@ItemStackRequestAction\@\@UEBAPEBVItemStackRequestActionCraftBase\@\@XZ + * @vftbl 1 + * @symbol ?getCraftAction\@ItemStackRequestAction\@\@UEBAPEBVItemStackRequestActionCraftBase\@\@XZ */ virtual class ItemStackRequestActionCraftBase const * getCraftAction() const; /** - * @vftbl 2 - * @symbol ?getFilteredStringIndex\@ItemStackRequestAction\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getFilteredStringIndex\@ItemStackRequestAction\@\@UEBAHXZ */ virtual int getFilteredStringIndex() const; /** - * @vftbl 3 - * @symbol ?postLoadItems_DEPRECATEDASKTYLAING\@ItemStackRequestAction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @vftbl 3 + * @symbol ?postLoadItems_DEPRECATEDASKTYLAING\@ItemStackRequestAction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ virtual void postLoadItems_DEPRECATEDASKTYLAING(class BlockPalette &, bool); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTION /** - * @symbol ??0ItemStackRequestAction\@\@QEAA\@W4ItemStackRequestActionType\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemStackRequestAction(); +#endif + /** + * @symbol ??0ItemStackRequestAction\@\@QEAA\@W4ItemStackRequestActionType\@\@\@Z */ MCAPI ItemStackRequestAction(enum class ItemStackRequestActionType); /** - * @symbol ?getActionType\@ItemStackRequestAction\@\@QEBA?AW4ItemStackRequestActionType\@\@XZ + * @symbol ?getActionType\@ItemStackRequestAction\@\@QEBA?AW4ItemStackRequestActionType\@\@XZ */ MCAPI enum class ItemStackRequestActionType getActionType() const; /** - * @symbol ?write\@ItemStackRequestAction\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @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 + * @symbol ?getActionTypeName\@ItemStackRequestAction\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemStackRequestActionType\@\@\@Z */ MCAPI static std::string const getActionTypeName(enum class ItemStackRequestActionType); /** - * @symbol ?read\@ItemStackRequestAction\@\@SA?AV?$unique_ptr\@VItemStackRequestAction\@\@U?$default_delete\@VItemStackRequestAction\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemStackRequestAction\@\@SA?AV?$unique_ptr\@VItemStackRequestAction\@\@U?$default_delete\@VItemStackRequestAction\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static std::unique_ptr read(class ReadOnlyBinaryStream &); @@ -80,8 +86,8 @@ class ItemStackRequestAction { private: /** - * @symbol ?actionTypeMap\@ItemStackRequestAction\@\@0V?$BidirectionalUnorderedMap\@W4ItemStackRequestActionType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?actionTypeMap\@ItemStackRequestAction\@\@0V?$BidirectionalUnorderedMap\@W4ItemStackRequestActionType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const actionTypeMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp index 5d6bb10380..8c9c63479e 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionBeaconPayment.hpp @@ -29,46 +29,46 @@ class ItemStackRequestActionBeaconPayment { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionBeaconPayment(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionBeaconPayment\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionBeaconPayment\@\@MEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionBeaconPayment\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionBeaconPayment\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionBeaconPayment\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionBeaconPayment\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionBeaconPayment(); /** - * @symbol ?getPrimaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ + * @symbol ?getPrimaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ */ MCAPI int getPrimaryEffectId() const; /** - * @symbol ?getSecondaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ + * @symbol ?getSecondaryEffectId\@ItemStackRequestActionBeaconPayment\@\@QEBAHXZ */ MCAPI int getSecondaryEffectId() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp index f91e4b7e52..648083149f 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionConsume.hpp @@ -30,28 +30,28 @@ class ItemStackRequestActionConsume : public ItemStackRequestActionTransferBase public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionConsume(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionConsume\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionConsume\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionConsume(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp index f298b696f5..b5a1a8fc6b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftBase.hpp @@ -31,17 +31,17 @@ class ItemStackRequestActionCraftBase { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONCRAFTBASE /** - * @symbol ?getCraftAction\@ItemStackRequestActionCraftBase\@\@UEBAPEBV1\@XZ + * @symbol ?getCraftAction\@ItemStackRequestActionCraftBase\@\@UEBAPEBV1\@XZ */ MCVAPI class ItemStackRequestActionCraftBase const * getCraftAction() const; /** - * @symbol ?postLoadItems_DEPRECATEDASKTYLAING\@ItemStackRequestActionCraftBase\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @symbol ?postLoadItems_DEPRECATEDASKTYLAING\@ItemStackRequestActionCraftBase\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ MCVAPI void postLoadItems_DEPRECATEDASKTYLAING(class BlockPalette &, bool); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ItemStackRequestActionCraftBase(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp index 06c6bc1c2a..0be0e476db 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftGrindstone.hpp @@ -29,47 +29,47 @@ class ItemStackRequestActionCraftGrindstone { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionCraftGrindstone(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionCraftGrindstone\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionCraftGrindstone\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftGrindstone\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionCraftGrindstone\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?getRecipeNetId\@ItemStackRequestActionCraftGrindstone\@\@UEBAAEBUItemStackNetIdVariant\@\@XZ + * @vftbl 6 + * @symbol ?getRecipeNetId\@ItemStackRequestActionCraftGrindstone\@\@UEBAAEBUItemStackNetIdVariant\@\@XZ */ virtual struct ItemStackNetIdVariant const & getRecipeNetId() const; /** - * @symbol ??0ItemStackRequestActionCraftGrindstone\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCraftGrindstone\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftGrindstone(); /** - * @symbol ?getRepairCost\@ItemStackRequestActionCraftGrindstone\@\@QEBAHXZ + * @symbol ?getRepairCost\@ItemStackRequestActionCraftGrindstone\@\@QEBAHXZ */ MCAPI int getRepairCost() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp index 65d740f203..9aca49a46c 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftHandler.hpp @@ -30,76 +30,76 @@ class ItemStackRequestActionCraftHandler { public: /** - * @symbol ??0ItemStackRequestActionCraftHandler\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@AEAVPlayer\@\@\@Z + * @symbol ??0ItemStackRequestActionCraftHandler\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@AEAVPlayer\@\@\@Z */ MCAPI ItemStackRequestActionCraftHandler(class ItemStackRequestActionHandler &, class Player &); /** - * @symbol ?_getOrInitSparseContainer\@ItemStackRequestActionCraftHandler\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z + * @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 + * @symbol ?_initCraftResults\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@E\@Z */ MCAPI enum class ItemStackNetResult _initCraftResults(std::vector const &, unsigned char); /** - * @symbol ?_initSingleCraftResult\@ItemStackRequestActionCraftHandler\@\@QEAAPEAVItemInstance\@\@AEBV2\@\@Z + * @symbol ?_initSingleCraftResult\@ItemStackRequestActionCraftHandler\@\@QEAAPEAVItemInstance\@\@AEBV2\@\@Z */ MCAPI class ItemInstance * _initSingleCraftResult(class ItemInstance const &); /** - * @symbol ?_validateRequestSlot\@ItemStackRequestActionCraftHandler\@\@QEAA?AUItemStackRequestHandlerSlotInfo\@\@AEBUItemStackRequestSlotInfo\@\@\@Z + * @symbol ?_validateRequestSlot\@ItemStackRequestActionCraftHandler\@\@QEAA?AUItemStackRequestHandlerSlotInfo\@\@AEBUItemStackRequestSlotInfo\@\@\@Z */ MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo const &); /** - * @symbol ?endRequest\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z + * @symbol ?endRequest\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@W42\@\@Z */ MCAPI enum class ItemStackNetResult endRequest(enum class ItemStackNetResult); /** - * @symbol ?endRequestBatch\@ItemStackRequestActionCraftHandler\@\@QEAAXXZ + * @symbol ?endRequestBatch\@ItemStackRequestActionCraftHandler\@\@QEAAXXZ */ MCAPI void endRequestBatch(); /** - * @symbol ?handleConsume\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionConsume\@\@\@Z + * @symbol ?handleConsume\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionConsume\@\@\@Z */ MCAPI enum class ItemStackNetResult handleConsume(class ItemStackRequestActionConsume const &); /** - * @symbol ?handleCraftAction\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @symbol ?handleCraftAction\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ MCAPI enum class ItemStackNetResult handleCraftAction(class ItemStackRequestActionCraftBase const &); /** - * @symbol ?handleCraftResults\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@\@Z + * @symbol ?handleCraftResults\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@\@Z */ MCAPI enum class ItemStackNetResult handleCraftResults(class ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING const &); /** - * @symbol ?handleCreate\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCreate\@\@\@Z + * @symbol ?handleCreate\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionCreate\@\@\@Z */ MCAPI enum class ItemStackNetResult handleCreate(class ItemStackRequestActionCreate const &); /** - * @symbol ?isCraftRequest\@ItemStackRequestActionCraftHandler\@\@QEBA_NXZ + * @symbol ?isCraftRequest\@ItemStackRequestActionCraftHandler\@\@QEBA_NXZ */ MCAPI bool isCraftRequest() const; /** - * @symbol ?onContainerScreenOpen\@ItemStackRequestActionCraftHandler\@\@QEAAXAEBVContainerScreenContext\@\@\@Z + * @symbol ?onContainerScreenOpen\@ItemStackRequestActionCraftHandler\@\@QEAAXAEBVContainerScreenContext\@\@\@Z */ MCAPI void onContainerScreenOpen(class ContainerScreenContext const &); /** - * @symbol ?postRequest\@ItemStackRequestActionCraftHandler\@\@QEAAX_N\@Z + * @symbol ?postRequest\@ItemStackRequestActionCraftHandler\@\@QEAAX_N\@Z */ MCAPI void postRequest(bool); /** - * @symbol ?preHandleAction\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@W4ItemStackRequestActionType\@\@\@Z + * @symbol ?preHandleAction\@ItemStackRequestActionCraftHandler\@\@QEAA?AW4ItemStackNetResult\@\@W4ItemStackRequestActionType\@\@\@Z */ MCAPI enum class ItemStackNetResult preHandleAction(enum class ItemStackRequestActionType); //private: /** - * @symbol ?_createCraftInputs\@ItemStackRequestActionCraftHandler\@\@AEAA?AV?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z + * @symbol ?_createCraftInputs\@ItemStackRequestActionCraftHandler\@\@AEAA?AV?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@AEBVItemStackRequestActionCraftBase\@\@\@Z */ MCAPI std::unique_ptr _createCraftInputs(class ItemStackRequestActionCraftBase const &); /** - * @symbol ?_setCreatedItemOutputSlot\@ItemStackRequestActionCraftHandler\@\@AEAA?AW4ItemStackNetResult\@\@E\@Z + * @symbol ?_setCreatedItemOutputSlot\@ItemStackRequestActionCraftHandler\@\@AEAA?AW4ItemStackNetResult\@\@E\@Z */ MCAPI enum class ItemStackNetResult _setCreatedItemOutputSlot(unsigned char); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp index 48a4aba228..f30fa4c701 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftLoom.hpp @@ -29,42 +29,42 @@ class ItemStackRequestActionCraftLoom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionCraftLoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionCraftLoom\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionCraftLoom\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftLoom\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionCraftLoom\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionCraftLoom\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCraftLoom\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftLoom(); /** - * @symbol ?getPatternNameId\@ItemStackRequestActionCraftLoom\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPatternNameId\@ItemStackRequestActionCraftLoom\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getPatternNameId() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp index 427acf55a6..9561b7c871 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING.hpp @@ -29,38 +29,38 @@ class ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_write\@ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?_write\@ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@MEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftNonImplemented_DEPRECATEDASKTYLAING(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp index 1e16611403..077f80e7e8 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeAuto.hpp @@ -29,46 +29,46 @@ class ItemStackRequestActionCraftRecipeAuto { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionCraftRecipeAuto(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionCraftRecipeAuto\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionCraftRecipeAuto\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftRecipeAuto\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionCraftRecipeAuto\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionCraftRecipeAuto\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCraftRecipeAuto\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftRecipeAuto(); /** - * @symbol ?getIngredients\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAPEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getIngredients\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAPEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const * getIngredients() const; /** - * @symbol ?getNumCrafts\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAEXZ + * @symbol ?getNumCrafts\@ItemStackRequestActionCraftRecipeAuto\@\@QEBAEXZ */ MCAPI unsigned char getNumCrafts() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp index da81b43463..4567fbfb8e 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftRecipeOptional.hpp @@ -29,42 +29,42 @@ class ItemStackRequestActionCraftRecipeOptional { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionCraftRecipeOptional(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?getFilteredStringIndex\@ItemStackRequestActionCraftRecipeOptional\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getFilteredStringIndex\@ItemStackRequestActionCraftRecipeOptional\@\@UEBAHXZ */ virtual int getFilteredStringIndex() const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionCraftRecipeOptional\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionCraftRecipeOptional\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCraftRecipeOptional\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionCraftRecipeOptional\@\@UEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionCraftRecipeOptional\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCraftRecipeOptional\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftRecipeOptional(); /** - * @symbol ?getRecipeNetId\@ItemStackRequestActionCraftRecipeOptional\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ + * @symbol ?getRecipeNetId\@ItemStackRequestActionCraftRecipeOptional\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ */ MCAPI class TypedServerNetId const & getRecipeNetId() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp index 64df8ee488..c1a6b6ff1b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING.hpp @@ -30,29 +30,29 @@ class ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONCRAFTRESULTS_DEPRECATEDASKTYLAING /** - * @symbol ?_read\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?_read\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ MCVAPI bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ?_write\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?_write\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@MEBAXAEAVBinaryStream\@\@\@Z */ MCVAPI void _write(class BinaryStream &) const; /** - * @symbol ?postLoadItems_DEPRECATEDASKTYLAING\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @symbol ?postLoadItems_DEPRECATEDASKTYLAING\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ MCVAPI void postLoadItems_DEPRECATEDASKTYLAING(class BlockPalette &, bool); #endif /** - * @symbol ??0ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING(); /** - * @symbol ?getNumCrafts\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEBAEXZ + * @symbol ?getNumCrafts\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEBAEXZ */ MCAPI unsigned char getNumCrafts() const; /** - * @symbol ?getResults\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getResults\@ItemStackRequestActionCraftResults_DEPRECATEDASKTYLAING\@\@QEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getResults() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp index a86c51e2bd..ad7fb2462b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionCreate.hpp @@ -29,42 +29,42 @@ class ItemStackRequestActionCreate { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionCreate(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionCreate\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionCreate\@\@MEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionCreate\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionCreate\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionCreate\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionCreate\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionCreate(); /** - * @symbol ?getResultsIndex\@ItemStackRequestActionCreate\@\@QEBAEXZ + * @symbol ?getResultsIndex\@ItemStackRequestActionCreate\@\@QEBAEXZ */ MCAPI unsigned char getResultsIndex() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp index 6c974da137..934e51a0aa 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDestroy.hpp @@ -30,28 +30,28 @@ class ItemStackRequestActionDestroy : public ItemStackRequestActionTransferBase public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionDestroy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionDestroy\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionDestroy\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionDestroy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp index 04308e41e3..c9b149c876 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionDrop.hpp @@ -29,42 +29,42 @@ class ItemStackRequestActionDrop { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionDrop(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionDrop\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionDrop\@\@MEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionDrop\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionDrop\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionDrop\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionDrop\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionDrop(); /** - * @symbol ?getRandomly\@ItemStackRequestActionDrop\@\@QEBA_NXZ + * @symbol ?getRandomly\@ItemStackRequestActionDrop\@\@QEBA_NXZ */ MCAPI bool getRandomly() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp index 6e2eab68d2..dce2873f79 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionHandler.hpp @@ -42,116 +42,120 @@ struct ScreenData { public: /** - * @symbol ??0ItemStackRequestActionHandler\@\@QEAA\@AEAVItemStackNetManagerServer\@\@AEAVPlayer\@\@\@Z + * @symbol ??0ItemStackRequestActionHandler\@\@QEAA\@AEAVItemStackNetManagerServer\@\@AEAVPlayer\@\@\@Z */ MCAPI ItemStackRequestActionHandler(class ItemStackNetManagerServer &, class Player &); /** - * @symbol ?_addResponseSlotInfo\@ItemStackRequestActionHandler\@\@QEAAXAEBUItemStackRequestHandlerSlotInfo\@\@AEBVItemStack\@\@\@Z + * @symbol ?_addResponseSlotInfo\@ItemStackRequestActionHandler\@\@QEAAXAEBUItemStackRequestHandlerSlotInfo\@\@AEBVItemStack\@\@\@Z */ MCAPI void _addResponseSlotInfo(struct ItemStackRequestHandlerSlotInfo const &, class ItemStack const &); /** - * @symbol ?_cacheLegacySlotIdAssignment\@ItemStackRequestActionHandler\@\@QEAAXW4ContainerEnumName\@\@EAEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@AEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z + * @symbol ?_cacheLegacySlotIdAssignment\@ItemStackRequestActionHandler\@\@QEAAXW4ContainerEnumName\@\@EAEBV?$TypedClientNetId\@UItemStackLegacyRequestIdTag\@\@H$0A\@\@\@AEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z */ MCAPI void _cacheLegacySlotIdAssignment(enum class ContainerEnumName, unsigned char, class TypedClientNetId const &, class TypedServerNetId const &); /** - * @symbol ?_cacheSlotIdAssigment\@ItemStackRequestActionHandler\@\@QEAAXAEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@EEAEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z + * @symbol ?_cacheSlotIdAssigment\@ItemStackRequestActionHandler\@\@QEAAXAEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@EEAEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@\@Z */ MCAPI void _cacheSlotIdAssigment(class TypedRuntimeId const &, unsigned char, unsigned char, class TypedServerNetId const &); /** - * @symbol ?_getOrInitSparseContainer\@ItemStackRequestActionHandler\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z + * @symbol ?_getOrInitSparseContainer\@ItemStackRequestActionHandler\@\@QEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z */ MCAPI class std::shared_ptr _getOrInitSparseContainer(enum class ContainerEnumName); /** - * @symbol ?_handleRemove\@ItemStackRequestActionHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTransferBase\@\@AEAVItemStack\@\@W4RemoveType\@1\@\@Z + * @symbol ?_handleRemove\@ItemStackRequestActionHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTransferBase\@\@AEAVItemStack\@\@W4RemoveType\@1\@\@Z */ MCAPI enum class ItemStackNetResult _handleRemove(class ItemStackRequestActionTransferBase const &, class ItemStack &, enum class ItemStackRequestActionHandler::RemoveType); /** - * @symbol ?_initScreen\@ItemStackRequestActionHandler\@\@QEAAXAEAVItemStackNetManagerScreen\@\@\@Z + * @symbol ?_initScreen\@ItemStackRequestActionHandler\@\@QEAAXAEAVItemStackNetManagerScreen\@\@\@Z */ MCAPI void _initScreen(class ItemStackNetManagerScreen &); /** - * @symbol ?_validateRequestSlot\@ItemStackRequestActionHandler\@\@QEAA?AUItemStackRequestHandlerSlotInfo\@\@AEBUItemStackRequestSlotInfo\@\@_N1\@Z + * @symbol ?_validateRequestSlot\@ItemStackRequestActionHandler\@\@QEAA?AUItemStackRequestHandlerSlotInfo\@\@AEBUItemStackRequestSlotInfo\@\@_N1\@Z */ MCAPI struct ItemStackRequestHandlerSlotInfo _validateRequestSlot(struct ItemStackRequestSlotInfo const &, bool, bool); /** - * @symbol ?addFilteredStrings\@ItemStackRequestActionHandler\@\@QEAAXV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@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 + * @symbol ?addFilteredStrings\@ItemStackRequestActionHandler\@\@QEAAXV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@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 void addFilteredStrings(class TypedClientNetId, std::vector); /** - * @symbol ?beginRequest\@ItemStackRequestActionHandler\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@AEAVItemStackNetManagerScreen\@\@\@Z + * @symbol ?beginRequest\@ItemStackRequestActionHandler\@\@QEAAXAEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@AEAVItemStackNetManagerScreen\@\@\@Z */ MCAPI void beginRequest(class TypedClientNetId const &, class ItemStackNetManagerScreen &); /** - * @symbol ?endRequest\@ItemStackRequestActionHandler\@\@QEAA?AV?$tuple\@W4ItemStackNetResult\@\@V?$vector\@UItemStackResponseContainerInfo\@\@V?$allocator\@UItemStackResponseContainerInfo\@\@\@std\@\@\@std\@\@\@std\@\@W4ItemStackNetResult\@\@\@Z + * @symbol ?endRequest\@ItemStackRequestActionHandler\@\@QEAA?AV?$tuple\@W4ItemStackNetResult\@\@V?$vector\@UItemStackResponseContainerInfo\@\@V?$allocator\@UItemStackResponseContainerInfo\@\@\@std\@\@\@std\@\@\@std\@\@W4ItemStackNetResult\@\@\@Z */ MCAPI class std::tuple> endRequest(enum class ItemStackNetResult); /** - * @symbol ?endRequestBatch\@ItemStackRequestActionHandler\@\@QEAAXXZ + * @symbol ?endRequestBatch\@ItemStackRequestActionHandler\@\@QEAAXXZ */ MCAPI void endRequestBatch(); /** - * @symbol ?getFilteredStrings\@ItemStackRequestActionHandler\@\@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\@\@V?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@\@Z + * @symbol ?getFilteredStrings\@ItemStackRequestActionHandler\@\@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\@\@V?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@\@Z */ MCAPI std::vector const & getFilteredStrings(class TypedClientNetId) const; /** - * @symbol ?getRequestId\@ItemStackRequestActionHandler\@\@QEBAAEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ + * @symbol ?getRequestId\@ItemStackRequestActionHandler\@\@QEBAAEBV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@XZ */ MCAPI class TypedClientNetId const & getRequestId() const; /** - * @symbol ?getScreenContext\@ItemStackRequestActionHandler\@\@QEBAAEBVContainerScreenContext\@\@XZ + * @symbol ?getScreenContext\@ItemStackRequestActionHandler\@\@QEBAAEBVContainerScreenContext\@\@XZ */ MCAPI class ContainerScreenContext const & getScreenContext() const; /** - * @symbol ?handleRequestAction\@ItemStackRequestActionHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z + * @symbol ?handleRequestAction\@ItemStackRequestActionHandler\@\@QEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z */ MCAPI enum class ItemStackNetResult handleRequestAction(class ItemStackRequestAction const &); /** - * @symbol ?hasFilteredStrings\@ItemStackRequestActionHandler\@\@QEBA_NV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@\@Z + * @symbol ?hasFilteredStrings\@ItemStackRequestActionHandler\@\@QEBA_NV?$TypedClientNetId\@UItemStackRequestIdTag\@\@H$0A\@\@\@\@Z */ MCAPI bool hasFilteredStrings(class TypedClientNetId) const; /** - * @symbol ?isValidationCraftingImplemented\@ItemStackRequestActionHandler\@\@QEAA_NXZ + * @symbol ?isValidationCraftingImplemented\@ItemStackRequestActionHandler\@\@QEAA_NXZ */ MCAPI bool isValidationCraftingImplemented(); /** - * @symbol ?normalTick\@ItemStackRequestActionHandler\@\@QEAAXXZ + * @symbol ?normalTick\@ItemStackRequestActionHandler\@\@QEAAXXZ */ MCAPI void normalTick(); /** - * @symbol ?tryCraft\@ItemStackRequestActionHandler\@\@QEAA?AV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@3\@\@Z + * @symbol ?tryCraft\@ItemStackRequestActionHandler\@\@QEAA?AV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@3\@\@Z */ MCAPI std::vector tryCraft(std::unique_ptr); /** - * @symbol ??1ItemStackRequestActionHandler\@\@QEAA\@XZ + * @symbol ??1ItemStackRequestActionHandler\@\@QEAA\@XZ */ MCAPI ~ItemStackRequestActionHandler(); //private: /** - * @symbol ?_handleDestroy\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionDestroy\@\@\@Z + * @symbol ?_handleDestroy\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionDestroy\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleDestroy(class ItemStackRequestActionDestroy const &); /** - * @symbol ?_handlePlaceInItemContainer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionPlaceInItemContainer\@\@\@Z + * @symbol ?_handlePlaceInItemContainer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionPlaceInItemContainer\@\@\@Z */ MCAPI enum class ItemStackNetResult _handlePlaceInItemContainer(class ItemStackRequestActionPlaceInItemContainer const &); /** - * @symbol ?_handleTakeFromItemContainer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTakeFromItemContainer\@\@\@Z + * @symbol ?_handleTakeFromItemContainer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTakeFromItemContainer\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleTakeFromItemContainer(class ItemStackRequestActionTakeFromItemContainer const &); /** - * @symbol ?_handleTransfer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTransferBase\@\@_N11\@Z + * @symbol ?_handleTransfer\@ItemStackRequestActionHandler\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionTransferBase\@\@_N11\@Z */ MCAPI enum class ItemStackNetResult _handleTransfer(class ItemStackRequestActionTransferBase const &, bool, bool, bool); /** - * @symbol ?_resolveSlotIdAssignment\@ItemStackRequestActionHandler\@\@AEAA?AV?$optional\@URequestSlotIdAssignment\@ItemStackRequestActionHandler\@\@\@std\@\@AEBUItemStackRequestSlotInfo\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?_initScreenValidation\@ItemStackRequestActionHandler\@\@AEAAXXZ + */ + MCAPI void _initScreenValidation(); + /** + * @symbol ?_resolveSlotIdAssignment\@ItemStackRequestActionHandler\@\@AEAA?AV?$optional\@URequestSlotIdAssignment\@ItemStackRequestActionHandler\@\@\@std\@\@AEBUItemStackRequestSlotInfo\@\@AEBV?$TypedRuntimeId\@UContainerRuntimeIdTag\@\@I$0A\@\@\@\@Z */ MCAPI class std::optional _resolveSlotIdAssignment(struct ItemStackRequestSlotInfo const &, class TypedRuntimeId const &); /** - * @symbol ?_tryGetCurrentScreenData\@ItemStackRequestActionHandler\@\@AEBAPEAUScreenData\@1\@XZ + * @symbol ?_tryGetCurrentScreenData\@ItemStackRequestActionHandler\@\@AEBAPEAUScreenData\@1\@XZ */ MCAPI struct ItemStackRequestActionHandler::ScreenData * _tryGetCurrentScreenData() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp index 8a7863e9ae..8902552c92 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionMineBlock.hpp @@ -31,54 +31,54 @@ enum class PreValidationStatus; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionMineBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionMineBlock\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionMineBlock\@\@MEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionMineBlock\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionMineBlock\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestActionMineBlock\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionMineBlock\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionMineBlock(); /** - * @symbol ?getPreValidationStatus\@ItemStackRequestActionMineBlock\@\@QEBA?AW4PreValidationStatus\@1\@XZ + * @symbol ?getPreValidationStatus\@ItemStackRequestActionMineBlock\@\@QEBA?AW4PreValidationStatus\@1\@XZ */ MCAPI enum class ItemStackRequestActionMineBlock::PreValidationStatus getPreValidationStatus() const; /** - * @symbol ?getPredictedDurability\@ItemStackRequestActionMineBlock\@\@QEBAHXZ + * @symbol ?getPredictedDurability\@ItemStackRequestActionMineBlock\@\@QEBAHXZ */ MCAPI int getPredictedDurability() const; /** - * @symbol ?getSrc\@ItemStackRequestActionMineBlock\@\@QEBA?AUItemStackRequestSlotInfo\@\@XZ + * @symbol ?getSrc\@ItemStackRequestActionMineBlock\@\@QEBA?AUItemStackRequestSlotInfo\@\@XZ */ MCAPI struct ItemStackRequestSlotInfo getSrc() const; /** - * @symbol ?setPreValidationStatus\@ItemStackRequestActionMineBlock\@\@QEBAXW4PreValidationStatus\@1\@\@Z + * @symbol ?setPreValidationStatus\@ItemStackRequestActionMineBlock\@\@QEBAXW4PreValidationStatus\@1\@\@Z */ MCAPI void setPreValidationStatus(enum class ItemStackRequestActionMineBlock::PreValidationStatus) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp index 34d7e2bdb7..61927126e8 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlace.hpp @@ -30,28 +30,28 @@ class ItemStackRequestActionPlace : public ItemStackRequestActionTransferBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionPlace(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionPlace\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionPlace\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionPlace(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp index 18b0ff1225..9b6d037633 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionPlaceInItemContainer.hpp @@ -28,28 +28,28 @@ class ItemStackRequestActionPlaceInItemContainer : public ItemStackRequestAction public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionPlaceInItemContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionPlaceInItemContainer\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionPlaceInItemContainer\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionPlaceInItemContainer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp index c64a0191c1..26da749b07 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionSwap.hpp @@ -30,28 +30,28 @@ class ItemStackRequestActionSwap : public ItemStackRequestActionTransferBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionSwap(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionSwap\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionSwap\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionSwap(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp index a38fe88be4..d8e401cd2f 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTake.hpp @@ -30,28 +30,28 @@ class ItemStackRequestActionTake : public ItemStackRequestActionTransferBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionTake(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionTake\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionTake\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionTake(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp index 1371a9090f..6d42f5838e 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTakeFromItemContainer.hpp @@ -28,28 +28,28 @@ class ItemStackRequestActionTakeFromItemContainer : public ItemStackRequestActio public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionTakeFromItemContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @symbol ??0ItemStackRequestActionTakeFromItemContainer\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestActionTakeFromItemContainer\@\@QEAA\@XZ */ MCAPI ItemStackRequestActionTakeFromItemContainer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp index 044c110c7e..9fb0f7b1d7 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestActionTransferBase.hpp @@ -30,46 +30,52 @@ class ItemStackRequestActionTransferBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestActionTransferBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?_write\@ItemStackRequestActionTransferBase\@\@MEBAXAEAVBinaryStream\@\@\@Z */ virtual void _write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 5 + * @symbol ?_read\@ItemStackRequestActionTransferBase\@\@MEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ virtual bool _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKREQUESTACTIONTRANSFERBASE /** - * @symbol ?getAmount\@ItemStackRequestActionTransferBase\@\@QEBAEXZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemStackRequestActionTransferBase(); +#endif + /** + * @symbol ?getAmount\@ItemStackRequestActionTransferBase\@\@QEBAEXZ */ MCAPI unsigned char getAmount() const; /** - * @symbol ?getDst\@ItemStackRequestActionTransferBase\@\@QEBAAEBUItemStackRequestSlotInfo\@\@XZ + * @symbol ?getDst\@ItemStackRequestActionTransferBase\@\@QEBAAEBUItemStackRequestSlotInfo\@\@XZ */ MCAPI struct ItemStackRequestSlotInfo const & getDst() const; /** - * @symbol ?getSrc\@ItemStackRequestActionTransferBase\@\@QEBAAEBUItemStackRequestSlotInfo\@\@XZ + * @symbol ?getSrc\@ItemStackRequestActionTransferBase\@\@QEBAAEBUItemStackRequestSlotInfo\@\@XZ */ MCAPI struct ItemStackRequestSlotInfo const & getSrc() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp index 561492de29..e9af5f8b49 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestBatch.hpp @@ -30,24 +30,24 @@ class ItemStackRequestBatch { 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 + * @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 + * @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 + * @symbol ?write\@ItemStackRequestBatch\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void write(class BinaryStream &) const; /** - * @symbol ??1ItemStackRequestBatch\@\@QEAA\@XZ + * @symbol ??1ItemStackRequestBatch\@\@QEAA\@XZ */ MCAPI ~ItemStackRequestBatch(); /** - * @symbol ?read\@ItemStackRequestBatch\@\@SA?AV?$unique_ptr\@VItemStackRequestBatch\@\@U?$default_delete\@VItemStackRequestBatch\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemStackRequestBatch\@\@SA?AV?$unique_ptr\@VItemStackRequestBatch\@\@U?$default_delete\@VItemStackRequestBatch\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static std::unique_ptr read(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp index c4646a68ff..b5d27d1ad3 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestData.hpp @@ -30,40 +30,40 @@ class ItemStackRequestData { 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 + * @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 + * @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 + * @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 + * @symbol ?getStringsToFilterOrigin\@ItemStackRequestData\@\@QEBAAEBW4TextProcessingEventOrigin\@\@XZ */ MCAPI enum class TextProcessingEventOrigin const & getStringsToFilterOrigin() const; /** - * @symbol ?postLoadItems\@ItemStackRequestData\@\@QEAAXAEAVBlockPalette\@\@_N\@Z + * @symbol ?postLoadItems\@ItemStackRequestData\@\@QEAAXAEAVBlockPalette\@\@_N\@Z */ MCAPI void postLoadItems(class BlockPalette &, bool); /** - * @symbol ?tryFindAction\@ItemStackRequestData\@\@QEBAPEBVItemStackRequestAction\@\@W4ItemStackRequestActionType\@\@\@Z + * @symbol ?tryFindAction\@ItemStackRequestData\@\@QEBAPEBVItemStackRequestAction\@\@W4ItemStackRequestActionType\@\@\@Z */ MCAPI class ItemStackRequestAction const * tryFindAction(enum class ItemStackRequestActionType) const; /** - * @symbol ?write\@ItemStackRequestData\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@ItemStackRequestData\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void write(class BinaryStream &) const; /** - * @symbol ??1ItemStackRequestData\@\@QEAA\@XZ + * @symbol ??1ItemStackRequestData\@\@QEAA\@XZ */ MCAPI ~ItemStackRequestData(); /** - * @symbol ?read\@ItemStackRequestData\@\@SA?AV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@ItemStackRequestData\@\@SA?AV?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static std::unique_ptr read(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp index a90bb04503..915f96b94a 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestHandlerSlotInfo.hpp @@ -29,15 +29,15 @@ struct ItemStackRequestHandlerSlotInfo { public: /** - * @symbol ??0ItemStackRequestHandlerSlotInfo\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestHandlerSlotInfo\@\@QEAA\@XZ */ MCAPI ItemStackRequestHandlerSlotInfo(); /** - * @symbol ??BItemStackRequestHandlerSlotInfo\@\@QEBA_NXZ + * @symbol ??BItemStackRequestHandlerSlotInfo\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ??1ItemStackRequestHandlerSlotInfo\@\@QEAA\@XZ + * @symbol ??1ItemStackRequestHandlerSlotInfo\@\@QEAA\@XZ */ MCAPI ~ItemStackRequestHandlerSlotInfo(); diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp index b7b04a20f2..f066e1651b 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestPacket.hpp @@ -30,37 +30,37 @@ class ItemStackRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ItemStackRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ItemStackRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ItemStackRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ItemStackRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ItemStackRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ItemStackRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ItemStackRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ItemStackRequestPacket\@\@QEAA\@XZ + * @symbol ??0ItemStackRequestPacket\@\@QEAA\@XZ */ MCAPI ItemStackRequestPacket(); /** - * @symbol ?getRequestBatch\@ItemStackRequestPacket\@\@QEBAAEBVItemStackRequestBatch\@\@XZ + * @symbol ?getRequestBatch\@ItemStackRequestPacket\@\@QEBAAEBVItemStackRequestBatch\@\@XZ */ MCAPI class ItemStackRequestBatch const & getRequestBatch() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp index 59c550a26a..b6dce3e119 100644 --- a/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackRequestSlotInfo.hpp @@ -28,11 +28,11 @@ struct ItemStackRequestSlotInfo { public: /** - * @symbol ?matchesContainerAndSlot\@ItemStackRequestSlotInfo\@\@QEBA_NAEBU1\@\@Z + * @symbol ?matchesContainerAndSlot\@ItemStackRequestSlotInfo\@\@QEBA_NAEBU1\@\@Z */ MCAPI bool matchesContainerAndSlot(struct ItemStackRequestSlotInfo const &) const; /** - * @symbol ??1ItemStackRequestSlotInfo\@\@QEAA\@XZ + * @symbol ??1ItemStackRequestSlotInfo\@\@QEAA\@XZ */ MCAPI ~ItemStackRequestSlotInfo(); diff --git a/LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp index 43d484ea55..d0951e7045 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponseContainerInfo.hpp @@ -28,11 +28,11 @@ struct ItemStackResponseContainerInfo { public: /** - * @symbol ??0ItemStackResponseContainerInfo\@\@QEAA\@W4ContainerEnumName\@\@\@Z + * @symbol ??0ItemStackResponseContainerInfo\@\@QEAA\@W4ContainerEnumName\@\@\@Z */ MCAPI ItemStackResponseContainerInfo(enum class ContainerEnumName); /** - * @symbol ??1ItemStackResponseContainerInfo\@\@QEAA\@XZ + * @symbol ??1ItemStackResponseContainerInfo\@\@QEAA\@XZ */ MCAPI ~ItemStackResponseContainerInfo(); diff --git a/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp index a6fe229205..84cfb00dee 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponseInfo.hpp @@ -27,11 +27,11 @@ struct ItemStackResponseInfo { public: /** - * @symbol ??0ItemStackResponseInfo\@\@QEAA\@XZ + * @symbol ??0ItemStackResponseInfo\@\@QEAA\@XZ */ MCAPI ItemStackResponseInfo(); /** - * @symbol ??1ItemStackResponseInfo\@\@QEAA\@XZ + * @symbol ??1ItemStackResponseInfo\@\@QEAA\@XZ */ MCAPI ~ItemStackResponseInfo(); diff --git a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp index b124ffed7d..a5dcb06188 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponsePacket.hpp @@ -30,41 +30,47 @@ class ItemStackResponsePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemStackResponsePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ItemStackResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ItemStackResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ItemStackResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ItemStackResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ItemStackResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ItemStackResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ItemStackResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTACKRESPONSEPACKET /** - * @symbol ??0ItemStackResponsePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemStackResponsePacket(); +#endif + /** + * @symbol ??0ItemStackResponsePacket\@\@QEAA\@XZ */ MCAPI ItemStackResponsePacket(); /** - * @symbol ??0ItemStackResponsePacket\@\@QEAA\@$$QEAV?$vector\@UItemStackResponseInfo\@\@V?$allocator\@UItemStackResponseInfo\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0ItemStackResponsePacket\@\@QEAA\@$$QEAV?$vector\@UItemStackResponseInfo\@\@V?$allocator\@UItemStackResponseInfo\@\@\@std\@\@\@std\@\@\@Z */ MCAPI ItemStackResponsePacket(std::vector &&); /** - * @symbol ?getResponses\@ItemStackResponsePacket\@\@QEBAAEBV?$vector\@UItemStackResponseInfo\@\@V?$allocator\@UItemStackResponseInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getResponses\@ItemStackResponsePacket\@\@QEBAAEBV?$vector\@UItemStackResponseInfo\@\@V?$allocator\@UItemStackResponseInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getResponses() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStackResponseSlotInfo.hpp b/LiteLoader/include/llapi/mc/ItemStackResponseSlotInfo.hpp index 48700747aa..59c632873f 100644 --- a/LiteLoader/include/llapi/mc/ItemStackResponseSlotInfo.hpp +++ b/LiteLoader/include/llapi/mc/ItemStackResponseSlotInfo.hpp @@ -28,11 +28,11 @@ struct ItemStackResponseSlotInfo { public: /** - * @symbol ??0ItemStackResponseSlotInfo\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ItemStackResponseSlotInfo\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ItemStackResponseSlotInfo(struct ItemStackResponseSlotInfo &&); /** - * @symbol ??1ItemStackResponseSlotInfo\@\@QEAA\@XZ + * @symbol ??1ItemStackResponseSlotInfo\@\@QEAA\@XZ */ MCAPI ~ItemStackResponseSlotInfo(); diff --git a/LiteLoader/include/llapi/mc/ItemStartUseOnEvent.hpp b/LiteLoader/include/llapi/mc/ItemStartUseOnEvent.hpp index e64e61fd19..ec746ae6f7 100644 --- a/LiteLoader/include/llapi/mc/ItemStartUseOnEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemStartUseOnEvent.hpp @@ -27,11 +27,11 @@ struct ItemStartUseOnEvent { public: /** - * @symbol ??0ItemStartUseOnEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemStartUseOnEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemStartUseOnEvent(struct ItemStartUseOnEvent const &); /** - * @symbol ??1ItemStartUseOnEvent\@\@QEAA\@XZ + * @symbol ??1ItemStartUseOnEvent\@\@QEAA\@XZ */ MCAPI ~ItemStartUseOnEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemState.hpp b/LiteLoader/include/llapi/mc/ItemState.hpp index fcc6b69a75..fc6a411d2b 100644 --- a/LiteLoader/include/llapi/mc/ItemState.hpp +++ b/LiteLoader/include/llapi/mc/ItemState.hpp @@ -29,5 +29,15 @@ class ItemState { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMSTATE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemState(); +#endif + /** + * @symbol ?forEachState\@ItemState\@\@SAXV?$function\@$$A6A_NAEBVItemState\@\@\@Z\@std\@\@\@Z + */ + MCAPI static void forEachState(class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStateInstance.hpp b/LiteLoader/include/llapi/mc/ItemStateInstance.hpp index aa22aeebbb..1c320c0f7d 100644 --- a/LiteLoader/include/llapi/mc/ItemStateInstance.hpp +++ b/LiteLoader/include/llapi/mc/ItemStateInstance.hpp @@ -30,12 +30,12 @@ class ItemStateInstance { public: /** - * @symbol ?initState\@ItemStateInstance\@\@QEAAXAEAIIIAEBVItemState\@\@\@Z + * @symbol ?initState\@ItemStateInstance\@\@QEAAXAEAIIIAEBVItemState\@\@\@Z */ MCAPI void initState(unsigned int &, unsigned int, unsigned int, class ItemState const &); /** - * @symbol ?isValidData\@ItemStateInstance\@\@QEBA_NI\@Z + * @symbol ?isValidData\@ItemStateInstance\@\@QEBA_NI\@Z */ MCAPI bool isValidData(unsigned int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp b/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp index cc01b171c6..48cdf751f2 100644 --- a/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemStopChargeEvent.hpp @@ -25,7 +25,7 @@ struct ItemStopChargeEvent { public: /** - * @symbol ??1ItemStopChargeEvent\@\@QEAA\@XZ + * @symbol ??1ItemStopChargeEvent\@\@QEAA\@XZ */ MCAPI ~ItemStopChargeEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemStopUseOnEvent.hpp b/LiteLoader/include/llapi/mc/ItemStopUseOnEvent.hpp index 43ec06ba80..7913e1c031 100644 --- a/LiteLoader/include/llapi/mc/ItemStopUseOnEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemStopUseOnEvent.hpp @@ -27,11 +27,11 @@ struct ItemStopUseOnEvent { public: /** - * @symbol ??0ItemStopUseOnEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemStopUseOnEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemStopUseOnEvent(struct ItemStopUseOnEvent const &); /** - * @symbol ??1ItemStopUseOnEvent\@\@QEAA\@XZ + * @symbol ??1ItemStopUseOnEvent\@\@QEAA\@XZ */ MCAPI ~ItemStopUseOnEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemTag.hpp b/LiteLoader/include/llapi/mc/ItemTag.hpp index a1aa7df78e..a05a1ce837 100644 --- a/LiteLoader/include/llapi/mc/ItemTag.hpp +++ b/LiteLoader/include/llapi/mc/ItemTag.hpp @@ -28,7 +28,7 @@ struct ItemTag { public: /** - * @symbol ??1ItemTag\@\@QEAA\@XZ + * @symbol ??1ItemTag\@\@QEAA\@XZ */ MCAPI ~ItemTag(); diff --git a/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp b/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp index b44fa30ac3..671000495a 100644 --- a/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/ItemTagDescriptor.hpp @@ -12,91 +12,88 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure ItemTagDescriptor. - * - */ -struct ItemTagDescriptor { + +class ItemTagDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMTAGDESCRIPTOR public: - struct ItemTagDescriptor& operator=(struct ItemTagDescriptor const &) = delete; - ItemTagDescriptor(struct ItemTagDescriptor const &) = delete; + class ItemTagDescriptor& operator=(class ItemTagDescriptor const &) = delete; + ItemTagDescriptor(class ItemTagDescriptor const &) = delete; ItemTagDescriptor() = delete; #endif public: /** - * @vftbl 0 - * @symbol ?clone\@ItemTagDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ + * @vftbl 0 + * @symbol ?clone\@ItemTagDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 1 - * @symbol ?sameItems\@ItemTagDescriptor\@\@UEBA_NAEBUBaseDescriptor\@ItemDescriptor\@\@_N\@Z + * @vftbl 1 + * @symbol ?sameItems\@ItemTagDescriptor\@\@UEBA_NAEBUBaseDescriptor\@ItemDescriptor\@\@_N\@Z */ virtual bool sameItems(struct ItemDescriptor::BaseDescriptor const &, bool) const; /** - * @vftbl 2 - * @symbol ?sameItem\@ItemTagDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z + * @vftbl 2 + * @symbol ?sameItem\@ItemTagDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z */ virtual bool sameItem(struct ItemDescriptor::ItemEntry const &, bool) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getItem\@ItemTagDescriptor\@\@UEBA?AUItemEntry\@ItemDescriptor\@\@XZ + * @vftbl 4 + * @symbol ?getItem\@ItemTagDescriptor\@\@UEBA?AUItemEntry\@ItemDescriptor\@\@XZ */ virtual struct ItemDescriptor::ItemEntry getItem() const; /** - * @vftbl 5 - * @symbol ?forEachItemUntil\@ItemTagDescriptor\@\@UEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z + * @vftbl 5 + * @symbol ?forEachItemUntil\@ItemTagDescriptor\@\@UEBA_NV?$function\@$$A6A_NAEBVItem\@\@F\@Z\@std\@\@\@Z */ virtual bool forEachItemUntil(class std::function) const; /** - * @vftbl 6 - * @symbol ?toMap\@ItemTagDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?toMap\@ItemTagDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::map, class std::allocator>> toMap() const; /** - * @vftbl 7 - * @symbol ?save\@ItemTagDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ + * @vftbl 7 + * @symbol ?save\@ItemTagDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ */ virtual class std::optional save() const; /** - * @vftbl 8 - * @symbol ?serialize\@ItemTagDescriptor\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 8 + * @symbol ?serialize\@ItemTagDescriptor\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void serialize(class Json::Value &) const; /** - * @vftbl 9 - * @symbol ?serialize\@ItemTagDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 9 + * @symbol ?serialize\@ItemTagDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void serialize(class BinaryStream &) const; /** - * @vftbl 10 - * @symbol ?getType\@ItemTagDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ + * @vftbl 10 + * @symbol ?getType\@ItemTagDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ */ virtual enum class ItemDescriptor::InternalType getType() const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?getHash\@ItemTagDescriptor\@\@UEBA_KXZ + * @vftbl 12 + * @symbol ?getHash\@ItemTagDescriptor\@\@UEBA_KXZ */ virtual unsigned __int64 getHash() const; /** - * @symbol ?deserialize\@ItemTagDescriptor\@\@SA?AV?$unique_ptr\@UItemTagDescriptor\@\@U?$default_delete\@UItemTagDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?deserialize\@ItemTagDescriptor\@\@SA?AV?$unique_ptr\@UItemTagDescriptor\@\@U?$default_delete\@UItemTagDescriptor\@\@\@std\@\@\@std\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp index 9f1c952a24..f36a83a831 100644 --- a/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp +++ b/LiteLoader/include/llapi/mc/ItemTransactionLogger.hpp @@ -22,27 +22,27 @@ namespace ItemTransactionLogger { #undef AFTER_EXTRA /** - * @symbol ?initializeLogger\@ItemTransactionLogger\@\@YAX_N\@Z + * @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 + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryAction\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void log(class InventoryAction const &, std::string const &); /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryTransactionPacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVInventoryTransactionPacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void log(class InventoryTransactionPacket const &, std::string const &); /** - * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStack\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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\@\@YAXAEBVItemStackResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void log(std::string const &); + /** + * @symbol ?log\@ItemTransactionLogger\@\@YAXAEBVItemStackResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void log(class ItemStackResponsePacket const &, std::string const &); diff --git a/LiteLoader/include/llapi/mc/ItemUseEvent.hpp b/LiteLoader/include/llapi/mc/ItemUseEvent.hpp index 7a056ff283..aee2ef4b58 100644 --- a/LiteLoader/include/llapi/mc/ItemUseEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseEvent.hpp @@ -27,11 +27,11 @@ struct ItemUseEvent { public: /** - * @symbol ??0ItemUseEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemUseEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemUseEvent(struct ItemUseEvent const &); /** - * @symbol ??1ItemUseEvent\@\@QEAA\@XZ + * @symbol ??1ItemUseEvent\@\@QEAA\@XZ */ MCAPI ~ItemUseEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp index 7dd6856d65..5702d48b9d 100644 --- a/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseInventoryTransaction.hpp @@ -30,53 +30,59 @@ enum class ActionType; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemUseInventoryTransaction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?read\@ItemUseInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 1 + * @symbol ?read\@ItemUseInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ virtual void read(class ReadOnlyBinaryStream &); /** - * @vftbl 2 - * @symbol ?write\@ItemUseInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ItemUseInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 3 - * @symbol ?postLoadItems\@ItemUseInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @vftbl 3 + * @symbol ?postLoadItems\@ItemUseInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ virtual void postLoadItems(class BlockPalette &, bool); /** - * @vftbl 4 - * @symbol ?handle\@ItemUseInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + * @vftbl 4 + * @symbol ?handle\@ItemUseInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z */ virtual enum class InventoryTransactionError handle(class Player &, bool) const; /** - * @vftbl 5 - * @symbol ?onTransactionError\@ItemUseInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z + * @vftbl 5 + * @symbol ?onTransactionError\@ItemUseInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z */ virtual void onTransactionError(class Player &, enum class InventoryTransactionError) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ITEMUSEINVENTORYTRANSACTION /** - * @symbol ??0ItemUseInventoryTransaction\@\@QEAA\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ItemUseInventoryTransaction(); +#endif + /** + * @symbol ??0ItemUseInventoryTransaction\@\@QEAA\@AEBV0\@\@Z */ MCAPI ItemUseInventoryTransaction(class ItemUseInventoryTransaction const &); /** - * @symbol ??4ItemUseInventoryTransaction\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ItemUseInventoryTransaction\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ItemUseInventoryTransaction & operator=(class ItemUseInventoryTransaction const &); /** - * @symbol ?resendBlocksAroundArea\@ItemUseInventoryTransaction\@\@QEBAXAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?resendBlocksAroundArea\@ItemUseInventoryTransaction\@\@QEBAXAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ MCAPI void resendBlocksAroundArea(class Player &, class BlockPos const &, unsigned char) const; /** - * @symbol ?resendPlayerState\@ItemUseInventoryTransaction\@\@QEBAXAEAVPlayer\@\@\@Z + * @symbol ?resendPlayerState\@ItemUseInventoryTransaction\@\@QEBAXAEAVPlayer\@\@\@Z */ MCAPI void resendPlayerState(class Player &) const; /** - * @symbol ?setSelectedItem\@ItemUseInventoryTransaction\@\@QEAAAEAV1\@AEBVItemStack\@\@\@Z + * @symbol ?setSelectedItem\@ItemUseInventoryTransaction\@\@QEAAAEAV1\@AEBVItemStack\@\@\@Z */ MCAPI class ItemUseInventoryTransaction & setSelectedItem(class ItemStack const &); @@ -84,8 +90,8 @@ enum class ActionType; private: /** - * @symbol ?actionTypeMap\@ItemUseInventoryTransaction\@\@0V?$BidirectionalUnorderedMap\@W4ActionType\@ItemUseInventoryTransaction\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?actionTypeMap\@ItemUseInventoryTransaction\@\@0V?$BidirectionalUnorderedMap\@W4ActionType\@ItemUseInventoryTransaction\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const actionTypeMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp b/LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp index bc903e577d..7e11f35ae8 100644 --- a/LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseMethodMap.hpp @@ -30,7 +30,7 @@ class ItemUseMethodMap { public: /** - * @symbol ?getItemUseMethodName\@ItemUseMethodMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemUseMethod\@\@\@Z + * @symbol ?getItemUseMethodName\@ItemUseMethodMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemUseMethod\@\@\@Z */ MCAPI static std::string const & getItemUseMethodName(enum class ItemUseMethod); @@ -38,8 +38,8 @@ class ItemUseMethodMap { private: /** - * @symbol ?mMap\@ItemUseMethodMap\@\@0V?$BidirectionalUnorderedMap\@W4ItemUseMethod\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?mMap\@ItemUseMethodMap\@\@0V?$BidirectionalUnorderedMap\@W4ItemUseMethod\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const mMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp index 8ec7f92474..dea3dcf912 100644 --- a/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseOnActorInventoryTransaction.hpp @@ -30,38 +30,38 @@ class ItemUseOnActorInventoryTransaction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ItemUseOnActorInventoryTransaction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?read\@ItemUseOnActorInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 1 + * @symbol ?read\@ItemUseOnActorInventoryTransaction\@\@UEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ virtual void read(class ReadOnlyBinaryStream &); /** - * @vftbl 2 - * @symbol ?write\@ItemUseOnActorInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ItemUseOnActorInventoryTransaction\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 3 - * @symbol ?postLoadItems\@ItemUseOnActorInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z + * @vftbl 3 + * @symbol ?postLoadItems\@ItemUseOnActorInventoryTransaction\@\@UEAAXAEAVBlockPalette\@\@_N\@Z */ virtual void postLoadItems(class BlockPalette &, bool); /** - * @vftbl 4 - * @symbol ?handle\@ItemUseOnActorInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z + * @vftbl 4 + * @symbol ?handle\@ItemUseOnActorInventoryTransaction\@\@UEBA?AW4InventoryTransactionError\@\@AEAVPlayer\@\@_N\@Z */ virtual enum class InventoryTransactionError handle(class Player &, bool) const; /** - * @vftbl 5 - * @symbol ?onTransactionError\@ItemUseOnActorInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z + * @vftbl 5 + * @symbol ?onTransactionError\@ItemUseOnActorInventoryTransaction\@\@UEBAXAEAVPlayer\@\@W4InventoryTransactionError\@\@\@Z */ virtual void onTransactionError(class Player &, enum class InventoryTransactionError) const; /** - * @symbol ?setSelectedItem\@ItemUseOnActorInventoryTransaction\@\@QEAAAEAV1\@AEBVItemStack\@\@\@Z + * @symbol ?setSelectedItem\@ItemUseOnActorInventoryTransaction\@\@QEAAAEAV1\@AEBVItemStack\@\@\@Z */ MCAPI class ItemUseOnActorInventoryTransaction & setSelectedItem(class ItemStack const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp b/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp index 85a0977ec9..d983c93281 100644 --- a/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseOnEvent.hpp @@ -27,11 +27,11 @@ struct ItemUseOnEvent { public: /** - * @symbol ??0ItemUseOnEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ItemUseOnEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ItemUseOnEvent(struct ItemUseOnEvent const &); /** - * @symbol ??1ItemUseOnEvent\@\@QEAA\@XZ + * @symbol ??1ItemUseOnEvent\@\@QEAA\@XZ */ MCAPI ~ItemUseOnEvent(); diff --git a/LiteLoader/include/llapi/mc/ItemUseSlowdownSystem.hpp b/LiteLoader/include/llapi/mc/ItemUseSlowdownSystem.hpp index 1753d262b0..dd4d52304b 100644 --- a/LiteLoader/include/llapi/mc/ItemUseSlowdownSystem.hpp +++ b/LiteLoader/include/llapi/mc/ItemUseSlowdownSystem.hpp @@ -10,50 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class ItemUseSlowdownSystem. - * - */ -class ItemUseSlowdownSystem { + +namespace ItemUseSlowdownSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ITEMUSESLOWDOWNSYSTEM -public: - class ItemUseSlowdownSystem& operator=(class ItemUseSlowdownSystem const &) = delete; - ItemUseSlowdownSystem(class ItemUseSlowdownSystem const &) = delete; - ItemUseSlowdownSystem() = delete; -#endif - -public: - /** - * @symbol ?createItemUseSlowdownRequestSystem\@ItemUseSlowdownSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createItemUseSlowdownRequestSystem(); - /** - * @symbol ?createItemUseSlowdownSystem\@ItemUseSlowdownSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createItemUseSlowdownSystem(); /** - * @symbol ?createResetSprintTriggerTimeSystem\@ItemUseSlowdownSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ItemUseSlowdownSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createResetSprintTriggerTimeSystem(); - -//private: - /** - * @symbol ?doItemUseSlowdownRequestSystem\@ItemUseSlowdownSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUSlowdownByItemInUseRequestComponent\@\@AEAUMoveInputComponent\@\@\@Z - */ - MCAPI static void doItemUseSlowdownRequestSystem(class StrictEntityContext const &, struct SlowdownByItemInUseRequestComponent const &, struct MoveInputComponent &); - /** - * @symbol ?doItemUseSlowdownSystem\@ItemUseSlowdownSystem\@\@CAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBUItemInUseComponent\@\@\@\@AEAUMoveInputComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USlowdownByItemInUseRequestComponent\@\@\@\@\@Z - */ - MCAPI static void doItemUseSlowdownSystem(class StrictEntityContext const &, class Optional, struct MoveInputComponent &, class EntityModifierT); - /** - * @symbol ?doResetSprintTriggerTimeSystem\@ItemUseSlowdownSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUVanillaClientGameplayComponent\@\@\@Z - */ - MCAPI static void doResetSprintTriggerTimeSystem(class StrictEntityContext const &, struct VanillaClientGameplayComponent &); - -private: + MCAPI struct TickingSystemWithInfo createSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/JigsawBlock.hpp b/LiteLoader/include/llapi/mc/JigsawBlock.hpp index 65a83fee79..e071c1f471 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlock.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlock.hpp @@ -31,238 +31,243 @@ class JigsawBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JigsawBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@JigsawBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@JigsawBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 148 - * @symbol ?getRenderBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 148 + * @symbol ?getRenderBlock\@JigsawBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getRenderBlock() const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@JigsawBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@JigsawBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 - * @symbol ?getFaceFlip\@JigsawBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + * @vftbl 150 + * @symbol ?getFaceFlip\@JigsawBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@JigsawBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@JigsawBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@JigsawBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@JigsawBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JIGSAWBLOCK /** - * @symbol ?isInteractiveBlock\@JigsawBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@JigsawBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0JigsawBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0JigsawBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI JigsawBlock(std::string const &, int); /** - * @symbol ?canAttach\@JigsawBlock\@\@SA_NAEBVJigsawBlockInfo\@\@0\@Z + * @symbol ?canAttach\@JigsawBlock\@\@SA_NAEBVJigsawBlockInfo\@\@0\@Z */ MCAPI static bool canAttach(class JigsawBlockInfo const &, class JigsawBlockInfo const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp index 750dc70d04..21019b131a 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlockActor.hpp @@ -31,73 +31,73 @@ class JigsawBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JigsawBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@JigsawBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@JigsawBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@JigsawBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@JigsawBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@JigsawBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@JigsawBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@JigsawBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0JigsawBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0JigsawBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI JigsawBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp b/LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp index 582fde8c3c..82d6ee5d7a 100644 --- a/LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp +++ b/LiteLoader/include/llapi/mc/JigsawBlockInfo.hpp @@ -30,12 +30,12 @@ class JigsawBlockInfo { public: /** - * @symbol ??0JigsawBlockInfo\@\@QEAA\@AEBVBlockPos\@\@PEBVBlock\@\@1VJigsawEditorData\@\@\@Z + * @symbol ??0JigsawBlockInfo\@\@QEAA\@AEBVBlockPos\@\@PEBVBlock\@\@1VJigsawEditorData\@\@\@Z */ MCAPI JigsawBlockInfo(class BlockPos const &, class Block const *, class Block const *, class JigsawEditorData); /** - * @symbol ??4JigsawBlockInfo\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4JigsawBlockInfo\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class JigsawBlockInfo & operator=(class JigsawBlockInfo &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawEditorData.hpp b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp index f7d2cbe37f..e3069cb479 100644 --- a/LiteLoader/include/llapi/mc/JigsawEditorData.hpp +++ b/LiteLoader/include/llapi/mc/JigsawEditorData.hpp @@ -29,67 +29,67 @@ class JigsawEditorData { public: /** - * @symbol ??0JigsawEditorData\@\@QEAA\@XZ + * @symbol ??0JigsawEditorData\@\@QEAA\@XZ */ MCAPI JigsawEditorData(); /** - * @symbol ??0JigsawEditorData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4JigsawJointType\@\@\@Z + * @symbol ??0JigsawEditorData\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI JigsawEditorData(std::string const &, std::string const &, std::string const &, std::string const &, enum class JigsawJointType); + MCAPI JigsawEditorData(class JigsawEditorData &&); /** - * @symbol ??0JigsawEditorData\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0JigsawEditorData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4JigsawJointType\@\@\@Z */ - MCAPI JigsawEditorData(class JigsawEditorData &&); + MCAPI JigsawEditorData(std::string const &, std::string const &, std::string const &, std::string const &, enum class JigsawJointType); /** - * @symbol ?getFinalBlock\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFinalBlock\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFinalBlock() const; /** - * @symbol ?getJointType\@JigsawEditorData\@\@QEBAAEBW4JigsawJointType\@\@XZ + * @symbol ?getJointType\@JigsawEditorData\@\@QEBAAEBW4JigsawJointType\@\@XZ */ MCAPI enum class JigsawJointType const & getJointType() const; /** - * @symbol ?getName\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getTarget\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getTarget\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getTarget() const; /** - * @symbol ?getTargetPool\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getTargetPool\@JigsawEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getTargetPool() const; /** - * @symbol ?load\@JigsawEditorData\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@JigsawEditorData\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?save\@JigsawEditorData\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@JigsawEditorData\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; /** - * @symbol ?setFinalBlock\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setFinalBlock\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setFinalBlock(std::string const &); /** - * @symbol ?setJointType\@JigsawEditorData\@\@QEAAXAEBW4JigsawJointType\@\@\@Z + * @symbol ?setJointType\@JigsawEditorData\@\@QEAAXAEBW4JigsawJointType\@\@\@Z */ MCAPI void setJointType(enum class JigsawJointType const &); /** - * @symbol ?setName\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setName\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setName(std::string const &); /** - * @symbol ?setTarget\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setTarget\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setTarget(std::string const &); /** - * @symbol ?setTargetPool\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setTargetPool\@JigsawEditorData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setTargetPool(std::string const &); /** - * @symbol ??1JigsawEditorData\@\@QEAA\@XZ + * @symbol ??1JigsawEditorData\@\@QEAA\@XZ */ MCAPI ~JigsawEditorData(); @@ -97,8 +97,8 @@ class JigsawEditorData { private: /** - * @symbol ?JOINT_TYPE_TO_NAME\@JigsawEditorData\@\@0V?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?JOINT_TYPE_TO_NAME\@JigsawEditorData\@\@0V?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const JOINT_TYPE_TO_NAME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawJunction.hpp b/LiteLoader/include/llapi/mc/JigsawJunction.hpp index 3adcc1b87d..432437183e 100644 --- a/LiteLoader/include/llapi/mc/JigsawJunction.hpp +++ b/LiteLoader/include/llapi/mc/JigsawJunction.hpp @@ -28,11 +28,11 @@ struct JigsawJunction { public: /** - * @symbol ??0JigsawJunction\@\@QEAA\@HHHHW4Projection\@\@0\@Z + * @symbol ??0JigsawJunction\@\@QEAA\@HHHHW4Projection\@\@0\@Z */ MCAPI JigsawJunction(int, int, int, int, enum class Projection, enum class Projection); /** - * @symbol ?getDeltaTargetY\@JigsawJunction\@\@QEBAHXZ + * @symbol ?getDeltaTargetY\@JigsawJunction\@\@QEBAHXZ */ MCAPI int getDeltaTargetY() const; diff --git a/LiteLoader/include/llapi/mc/JigsawPlacement.hpp b/LiteLoader/include/llapi/mc/JigsawPlacement.hpp index 509879abd2..c040f2051d 100644 --- a/LiteLoader/include/llapi/mc/JigsawPlacement.hpp +++ b/LiteLoader/include/llapi/mc/JigsawPlacement.hpp @@ -30,36 +30,36 @@ class JigsawPlacement { public: /** - * @symbol ??0JigsawPlacement\@\@QEAA\@_K0AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VPoolElementStructurePiece\@\@U?$default_delete\@VPoolElementStructurePiece\@\@\@std\@\@\@std\@\@AEBVStructurePoolElement\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z\@2\@AEAVRandom\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@\@Z + * @symbol ??0JigsawPlacement\@\@QEAA\@_K0AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VPoolElementStructurePiece\@\@U?$default_delete\@VPoolElementStructurePiece\@\@\@std\@\@\@std\@\@AEBVStructurePoolElement\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z\@2\@AEAVRandom\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@\@Z */ MCAPI JigsawPlacement(unsigned __int64, unsigned __int64, std::vector> &, class std::function (class StructurePoolElement const &, class BlockPos const &, enum class Rotation const &, int, struct JigsawJunction &, class BoundingBox const &, class BlockPos const &)>, class Random &, class JigsawStructureRegistry const &, class Dimension &); /** - * @symbol ?addPieces\@JigsawPlacement\@\@QEAAXAEBVStructurePoolElement\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?addPieces\@JigsawPlacement\@\@QEAAXAEBVStructurePoolElement\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI void addPieces(class StructurePoolElement const &, class BlockPos const &, enum class Rotation const &, class std::basic_string_view>); /** - * @symbol ??1JigsawPlacement\@\@QEAA\@XZ + * @symbol ??1JigsawPlacement\@\@QEAA\@XZ */ MCAPI ~JigsawPlacement(); //private: /** - * @symbol ?_addPiece\@JigsawPlacement\@\@AEAAXAEBVPoolElementStructurePiece\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@1_K\@Z + * @symbol ?_addPiece\@JigsawPlacement\@\@AEAAXAEBVPoolElementStructurePiece\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@1_K\@Z */ MCAPI void _addPiece(class PoolElementStructurePiece const &, class BlockPos const &, enum class Rotation const &, class BlockPos const &, unsigned __int64); /** - * @symbol ?_findLocalAnchorOffset\@JigsawPlacement\@\@AEBA?AVBlockPos\@\@AEBVStructurePoolElement\@\@AEBV2\@AEBW4Rotation\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?_findLocalAnchorOffset\@JigsawPlacement\@\@AEBA?AVBlockPos\@\@AEBVStructurePoolElement\@\@AEBV2\@AEBW4Rotation\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI class BlockPos _findLocalAnchorOffset(class StructurePoolElement const &, class BlockPos const &, enum class Rotation const &, class std::basic_string_view>) const; /** - * @symbol ?_setTerrainAdjustment\@JigsawPlacement\@\@AEBA?AV?$shared_ptr\@_N\@std\@\@W4AdjustmentEffect\@\@AEBVBoundingBox\@\@AEBUJigsawJunction\@\@\@Z + * @symbol ?_setTerrainAdjustment\@JigsawPlacement\@\@AEBA?AV?$shared_ptr\@_N\@std\@\@W4AdjustmentEffect\@\@AEBVBoundingBox\@\@AEBUJigsawJunction\@\@\@Z */ MCAPI class std::shared_ptr _setTerrainAdjustment(enum class AdjustmentEffect, class BoundingBox const &, struct JigsawJunction const &) const; /** - * @symbol ?_tryPlacingPiece\@JigsawPlacement\@\@AEAA_NAEBVPoolElementStructurePiece\@\@AEBVBoundingBox\@\@AEBVJigsawBlockInfo\@\@AEBVBlockPos\@\@PEBVStructureTemplatePool\@\@3_K\@Z + * @symbol ?_tryPlacingPiece\@JigsawPlacement\@\@AEAA_NAEBVPoolElementStructurePiece\@\@AEBVBoundingBox\@\@AEBVJigsawBlockInfo\@\@AEBVBlockPos\@\@PEBVStructureTemplatePool\@\@3_K\@Z */ MCAPI bool _tryPlacingPiece(class PoolElementStructurePiece const &, class BoundingBox const &, class JigsawBlockInfo const &, class BlockPos const &, class StructureTemplatePool const *, class BlockPos const &, unsigned __int64); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp index 1f4f7b7ad3..dc6a452362 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureActorRulesRegistry.hpp @@ -25,25 +25,28 @@ class JigsawStructureActorRulesRegistry { public: class JigsawStructureActorRulesRegistry& operator=(class JigsawStructureActorRulesRegistry const &) = delete; JigsawStructureActorRulesRegistry(class JigsawStructureActorRulesRegistry const &) = delete; - JigsawStructureActorRulesRegistry() = delete; #endif public: /** - * @symbol ?clear\@JigsawStructureActorRulesRegistry\@\@QEAAXXZ + * @symbol ??0JigsawStructureActorRulesRegistry\@\@QEAA\@XZ + */ + MCAPI JigsawStructureActorRulesRegistry(); + /** + * @symbol ?clear\@JigsawStructureActorRulesRegistry\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?lookupByName\@JigsawStructureActorRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?lookupByName\@JigsawStructureActorRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector> const * lookupByName(std::string) const; /** - * @symbol ?registerActorRules\@JigsawStructureActorRulesRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@V?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$default_delete\@V?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?registerActorRules\@JigsawStructureActorRulesRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@V?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$default_delete\@V?$vector\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolActorRule\@\@U?$default_delete\@VStructurePoolActorRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI void registerActorRules(std::string, std::unique_ptr>>> &&); /** - * @symbol ??1JigsawStructureActorRulesRegistry\@\@QEAA\@XZ + * @symbol ??1JigsawStructureActorRulesRegistry\@\@QEAA\@XZ */ MCAPI ~JigsawStructureActorRulesRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp index 25e150228c..af376fadb1 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockInfo.hpp @@ -30,16 +30,16 @@ class JigsawStructureBlockInfo { public: /** - * @symbol ??0JigsawStructureBlockInfo\@\@QEAA\@AEBVBlockPos\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVBlock\@\@\@Z + * @symbol ??0JigsawStructureBlockInfo\@\@QEAA\@AEBVBlockPos\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVBlock\@\@\@Z */ MCAPI JigsawStructureBlockInfo(class BlockPos const &, std::unique_ptr, class Block const &); /** - * @symbol ??0JigsawStructureBlockInfo\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0JigsawStructureBlockInfo\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI JigsawStructureBlockInfo(class JigsawStructureBlockInfo &&); /** - * @symbol ?getNonEmptyTag\@JigsawStructureBlockInfo\@\@QEAAPEAVCompoundTag\@\@XZ + * @symbol ?getNonEmptyTag\@JigsawStructureBlockInfo\@\@QEAAPEAVCompoundTag\@\@XZ */ MCAPI class CompoundTag * getNonEmptyTag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp index efe4381100..0cfb56ee58 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockRulesRegistry.hpp @@ -25,25 +25,28 @@ class JigsawStructureBlockRulesRegistry { public: class JigsawStructureBlockRulesRegistry& operator=(class JigsawStructureBlockRulesRegistry const &) = delete; JigsawStructureBlockRulesRegistry(class JigsawStructureBlockRulesRegistry const &) = delete; - JigsawStructureBlockRulesRegistry() = delete; #endif public: /** - * @symbol ?clear\@JigsawStructureBlockRulesRegistry\@\@QEAAXXZ + * @symbol ??0JigsawStructureBlockRulesRegistry\@\@QEAA\@XZ + */ + MCAPI JigsawStructureBlockRulesRegistry(); + /** + * @symbol ?clear\@JigsawStructureBlockRulesRegistry\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?lookupByName\@JigsawStructureBlockRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?lookupByName\@JigsawStructureBlockRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector> const * lookupByName(std::string) const; /** - * @symbol ?registerBlockRules\@JigsawStructureBlockRulesRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$default_delete\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?registerBlockRules\@JigsawStructureBlockRulesRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$default_delete\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI void registerBlockRules(std::string, std::unique_ptr>>> &&); /** - * @symbol ??1JigsawStructureBlockRulesRegistry\@\@QEAA\@XZ + * @symbol ??1JigsawStructureBlockRulesRegistry\@\@QEAA\@XZ */ MCAPI ~JigsawStructureBlockRulesRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp index fcc602cb6a..8296fca0f1 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureBlockTagRulesRegistry.hpp @@ -25,25 +25,28 @@ class JigsawStructureBlockTagRulesRegistry { public: class JigsawStructureBlockTagRulesRegistry& operator=(class JigsawStructureBlockTagRulesRegistry const &) = delete; JigsawStructureBlockTagRulesRegistry(class JigsawStructureBlockTagRulesRegistry const &) = delete; - JigsawStructureBlockTagRulesRegistry() = delete; #endif public: /** - * @symbol ?clear\@JigsawStructureBlockTagRulesRegistry\@\@QEAAXXZ + * @symbol ??0JigsawStructureBlockTagRulesRegistry\@\@QEAA\@XZ + */ + MCAPI JigsawStructureBlockTagRulesRegistry(); + /** + * @symbol ?clear\@JigsawStructureBlockTagRulesRegistry\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?lookupByName\@JigsawStructureBlockTagRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?lookupByName\@JigsawStructureBlockTagRulesRegistry\@\@QEBAPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector> const * lookupByName(std::string) const; /** - * @symbol ?registerBlockTagRules\@JigsawStructureBlockTagRulesRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$default_delete\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?registerBlockTagRules\@JigsawStructureBlockTagRulesRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@U?$default_delete\@V?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI void registerBlockTagRules(std::string, std::unique_ptr>>> &&); /** - * @symbol ??1JigsawStructureBlockTagRulesRegistry\@\@QEAA\@XZ + * @symbol ??1JigsawStructureBlockTagRulesRegistry\@\@QEAA\@XZ */ MCAPI ~JigsawStructureBlockTagRulesRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp index 508c6875db..8630b28a6f 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureElementRegistry.hpp @@ -25,25 +25,28 @@ class JigsawStructureElementRegistry { public: class JigsawStructureElementRegistry& operator=(class JigsawStructureElementRegistry const &) = delete; JigsawStructureElementRegistry(class JigsawStructureElementRegistry const &) = delete; - JigsawStructureElementRegistry() = delete; #endif public: /** - * @symbol ?clear\@JigsawStructureElementRegistry\@\@QEAAXXZ + * @symbol ??0JigsawStructureElementRegistry\@\@QEAA\@XZ + */ + MCAPI JigsawStructureElementRegistry(); + /** + * @symbol ?clear\@JigsawStructureElementRegistry\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?lookupByName\@JigsawStructureElementRegistry\@\@QEBAPEBVStructurePoolElement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookupByName\@JigsawStructureElementRegistry\@\@QEBAPEBVStructurePoolElement\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructurePoolElement const * lookupByName(std::string) const; /** - * @symbol ?registerStructureElement\@JigsawStructureElementRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@VStructurePoolElement\@\@U?$default_delete\@VStructurePoolElement\@\@\@std\@\@\@3\@\@Z + * @symbol ?registerStructureElement\@JigsawStructureElementRegistry\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$unique_ptr\@VStructurePoolElement\@\@U?$default_delete\@VStructurePoolElement\@\@\@std\@\@\@3\@\@Z */ MCAPI void registerStructureElement(std::string, std::unique_ptr &&); /** - * @symbol ??1JigsawStructureElementRegistry\@\@QEAA\@XZ + * @symbol ??1JigsawStructureElementRegistry\@\@QEAA\@XZ */ MCAPI ~JigsawStructureElementRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp b/LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp index b6d896be2b..5cf4c26108 100644 --- a/LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp +++ b/LiteLoader/include/llapi/mc/JigsawStructureRegistry.hpp @@ -29,36 +29,36 @@ class JigsawStructureRegistry { public: /** - * @symbol ??0JigsawStructureRegistry\@\@QEAA\@XZ + * @symbol ??0JigsawStructureRegistry\@\@QEAA\@XZ */ MCAPI JigsawStructureRegistry(); /** - * @symbol ?getJigsawStructureActorRulesRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureActorRulesRegistry\@\@XZ + * @symbol ?getJigsawStructureActorRulesRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureActorRulesRegistry\@\@XZ */ MCAPI class JigsawStructureActorRulesRegistry & getJigsawStructureActorRulesRegistry(); /** - * @symbol ?getJigsawStructureBlockRulesRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureBlockRulesRegistry\@\@XZ + * @symbol ?getJigsawStructureBlockRulesRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureBlockRulesRegistry\@\@XZ */ MCAPI class JigsawStructureBlockRulesRegistry & getJigsawStructureBlockRulesRegistry(); /** - * @symbol ?getJigsawStructureBlockTagRulesRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureBlockTagRulesRegistry\@\@XZ + * @symbol ?getJigsawStructureBlockTagRulesRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureBlockTagRulesRegistry\@\@XZ */ MCAPI class JigsawStructureBlockTagRulesRegistry & getJigsawStructureBlockTagRulesRegistry(); /** - * @symbol ?getJigsawStructureElementRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureElementRegistry\@\@XZ + * @symbol ?getJigsawStructureElementRegistry\@JigsawStructureRegistry\@\@QEAAAEAVJigsawStructureElementRegistry\@\@XZ */ MCAPI class JigsawStructureElementRegistry & getJigsawStructureElementRegistry(); /** - * @symbol ?lookupByName\@JigsawStructureRegistry\@\@QEBAPEBVStructureTemplatePool\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookupByName\@JigsawStructureRegistry\@\@QEBAPEBVStructureTemplatePool\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructureTemplatePool const * lookupByName(std::string) const; /** - * @symbol ?registerPool\@JigsawStructureRegistry\@\@QEAAX$$QEAV?$unique_ptr\@VStructureTemplatePool\@\@U?$default_delete\@VStructureTemplatePool\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerPool\@JigsawStructureRegistry\@\@QEAAX$$QEAV?$unique_ptr\@VStructureTemplatePool\@\@U?$default_delete\@VStructureTemplatePool\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerPool(std::unique_ptr &&); /** - * @symbol ??1JigsawStructureRegistry\@\@QEAA\@XZ + * @symbol ??1JigsawStructureRegistry\@\@QEAA\@XZ */ MCAPI ~JigsawStructureRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JournaledFile.hpp b/LiteLoader/include/llapi/mc/JournaledFile.hpp index 13e87bac02..0d0794119b 100644 --- a/LiteLoader/include/llapi/mc/JournaledFile.hpp +++ b/LiteLoader/include/llapi/mc/JournaledFile.hpp @@ -31,48 +31,48 @@ class JournaledFile { public: /** - * @symbol ??0JournaledFile\@\@QEAA\@$$QEAV?$function\@$$A6A?AVResult\@Core\@\@VPath\@2\@\@Z\@std\@\@\@Z + * @symbol ??0JournaledFile\@\@QEAA\@$$QEAV?$function\@$$A6A?AVResult\@Core\@\@VPath\@2\@\@Z\@std\@\@\@Z */ MCAPI JournaledFile(class std::function &&); /** - * @symbol ?open\@JournaledFile\@\@QEAA?AVResult\@Core\@\@VPath\@3\@VFileOpenMode\@3\@W4FileBufferingMode\@3\@\@Z + * @symbol ?open\@JournaledFile\@\@QEAA?AVResult\@Core\@\@VPath\@3\@VFileOpenMode\@3\@W4FileBufferingMode\@3\@\@Z */ MCAPI class Core::Result open(class Core::Path, class Core::FileOpenMode, enum class Core::FileBufferingMode); /** - * @symbol ?write\@JournaledFile\@\@QEAA?AVResult\@Core\@\@PEBX_K\@Z + * @symbol ?write\@JournaledFile\@\@QEAA?AVResult\@Core\@\@PEBX_K\@Z */ MCAPI class Core::Result write(void const *, unsigned __int64); /** - * @symbol ??1JournaledFile\@\@QEAA\@XZ + * @symbol ??1JournaledFile\@\@QEAA\@XZ */ MCAPI ~JournaledFile(); /** - * @symbol ?findBackupPath\@JournaledFile\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@VPath\@3\@\@Z + * @symbol ?findBackupPath\@JournaledFile\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@VPath\@3\@\@Z */ MCAPI static class Core::PathBuffer findBackupPath(class Core::Path); /** - * @symbol ?findReadPath\@JournaledFile\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@VPath\@3\@\@Z + * @symbol ?findReadPath\@JournaledFile\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@VPath\@3\@\@Z */ MCAPI static class Core::PathBuffer findReadPath(class Core::Path); /** - * @symbol ?isOldFile\@JournaledFile\@\@SA_NVPath\@Core\@\@\@Z + * @symbol ?isOldFile\@JournaledFile\@\@SA_NVPath\@Core\@\@\@Z */ MCAPI static bool isOldFile(class Core::Path); /** - * @symbol ?populateImportantFiles\@JournaledFile\@\@SAXVPath\@Core\@\@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 ?populateImportantFiles\@JournaledFile\@\@SAXVPath\@Core\@\@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 populateImportantFiles(class Core::Path, std::vector &); /** - * @symbol ?replaceHeadFileWithBackup\@JournaledFile\@\@SA?AVResult\@Core\@\@VPath\@3\@\@Z + * @symbol ?replaceHeadFileWithBackup\@JournaledFile\@\@SA?AVResult\@Core\@\@VPath\@3\@\@Z */ MCAPI static class Core::Result replaceHeadFileWithBackup(class Core::Path); //private: /** - * @symbol ?_flushFiles\@JournaledFile\@\@AEAAXXZ + * @symbol ?_flushFiles\@JournaledFile\@\@AEAAXXZ */ MCAPI void _flushFiles(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Json.hpp b/LiteLoader/include/llapi/mc/Json.hpp index b16bbdae7b..ff135b399f 100644 --- a/LiteLoader/include/llapi/mc/Json.hpp +++ b/LiteLoader/include/llapi/mc/Json.hpp @@ -473,20 +473,20 @@ class StyledWriter : public Writer { }; #undef AFTER_EXTRA /** - * @symbol ?valueToQuotedString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z + * @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\@\@N\@Z + * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@N\@Z */ MCAPI std::string valueToString(double); /** - * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z + * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z */ - MCAPI std::string valueToString(__int64); + MCAPI std::string valueToString(unsigned __int64); /** - * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z + * @symbol ?valueToString\@Json\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z */ - MCAPI std::string valueToString(unsigned __int64); + MCAPI std::string valueToString(__int64); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/JsonHelpers.hpp b/LiteLoader/include/llapi/mc/JsonHelpers.hpp index 234b456049..2fa3829a3c 100644 --- a/LiteLoader/include/llapi/mc/JsonHelpers.hpp +++ b/LiteLoader/include/llapi/mc/JsonHelpers.hpp @@ -23,27 +23,27 @@ namespace JsonHelpers { #undef AFTER_EXTRA /** - * @symbol ?addObjectArrayField\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VValue\@Json\@\@V?$allocator\@VValue\@Json\@\@\@std\@\@\@5\@\@Z + * @symbol ?addObjectArrayField\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VValue\@Json\@\@V?$allocator\@VValue\@Json\@\@\@std\@\@\@5\@\@Z */ MCAPI void addObjectArrayField(class Json::Value &, std::string const &, std::vector const &); /** - * @symbol ?addObjectField\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?addObjectField\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI void addObjectField(class Json::Value &, std::string const &, class Json::Value const &); /** - * @symbol ?addStringField\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ?addStringField\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI void addStringField(class Json::Value &, std::string const &, std::string const &); /** - * @symbol ?addUint32Field\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBI\@Z + * @symbol ?addUint32Field\@JsonHelpers\@\@YAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBI\@Z */ MCAPI void addUint32Field(class Json::Value &, std::string const &, unsigned int const &); /** - * @symbol ?parseJson\@JsonHelpers\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@\@Z + * @symbol ?parseJson\@JsonHelpers\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@\@Z */ MCAPI bool parseJson(std::string const &, class Json::Value &); /** - * @symbol ?serialize\@JsonHelpers\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?serialize\@JsonHelpers\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI std::string serialize(class Json::Value const &); diff --git a/LiteLoader/include/llapi/mc/JsonLoader.hpp b/LiteLoader/include/llapi/mc/JsonLoader.hpp index 23d007760a..5b98ad45e5 100644 --- a/LiteLoader/include/llapi/mc/JsonLoader.hpp +++ b/LiteLoader/include/llapi/mc/JsonLoader.hpp @@ -29,5 +29,11 @@ class JsonLoader { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_JSONLOADER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~JsonLoader(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JsonPackUtils.hpp b/LiteLoader/include/llapi/mc/JsonPackUtils.hpp index 48ad18ecf8..5026a84241 100644 --- a/LiteLoader/include/llapi/mc/JsonPackUtils.hpp +++ b/LiteLoader/include/llapi/mc/JsonPackUtils.hpp @@ -23,35 +23,35 @@ namespace JsonPackUtils { #undef AFTER_EXTRA /** - * @symbol ?readBoolAndReport\@JsonPackUtils\@\@YA_NAEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@AEAVPackReport\@\@_N4\@Z + * @symbol ?readBoolAndReport\@JsonPackUtils\@\@YA_NAEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@AEAVPackReport\@\@_N4\@Z */ MCAPI bool readBoolAndReport(class Json::Value const &, std::string const &, std::vector &, class PackReport &, bool, bool); /** - * @symbol ?readIntAndReport\@JsonPackUtils\@\@YAHAEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@AEAVPackReport\@\@_NH\@Z + * @symbol ?readIntAndReport\@JsonPackUtils\@\@YAHAEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@AEAVPackReport\@\@_NH\@Z */ MCAPI int readIntAndReport(class Json::Value const &, std::string const &, std::vector &, class PackReport &, bool, int); /** - * @symbol ?readRequiredValue\@JsonPackUtils\@\@YA?AU?$pair\@$$CBVValue\@Json\@\@W4PackParseErrorType\@\@\@std\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4ValueType\@5\@\@Z + * @symbol ?readRequiredValue\@JsonPackUtils\@\@YA?AU?$pair\@$$CBVValue\@Json\@\@W4PackParseErrorType\@\@\@std\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4ValueType\@5\@\@Z */ MCAPI struct std::pair readRequiredValue(class Json::Value const &, std::string const &, enum class Json::ValueType); /** - * @symbol ?readStringAndReport\@JsonPackUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@AEBV23\@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\@\@3\@AEAVPackReport\@\@_N\@Z + * @symbol ?readStringAndReport\@JsonPackUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@AEBV23\@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\@\@3\@AEAVPackReport\@\@_N\@Z */ MCAPI std::string readStringAndReport(class Json::Value const &, std::string const &, std::vector &, class PackReport &, bool); /** - * @symbol ?readStringArrayAndReport\@JsonPackUtils\@\@YA?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\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV23\@AEAVPackReport\@\@_N\@Z + * @symbol ?readStringArrayAndReport\@JsonPackUtils\@\@YA?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\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV23\@AEAVPackReport\@\@_N\@Z */ MCAPI std::vector readStringArrayAndReport(class Json::Value const &, std::string const &, std::vector &, class PackReport &, bool); /** - * @symbol ?readValue\@JsonPackUtils\@\@YA?AU?$pair\@PEBVValue\@Json\@\@W4PackParseErrorType\@\@\@std\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?readValue\@JsonPackUtils\@\@YA?AU?$pair\@PEBVValue\@Json\@\@W4PackParseErrorType\@\@\@std\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI struct std::pair readValue(class Json::Value const &, std::string const &); /** - * @symbol ?readValueAndReportErrors\@JsonPackUtils\@\@YA?AU?$pair\@$$CBVValue\@Json\@\@W4PackParseErrorType\@\@\@std\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4ValueType\@5\@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\@\@3\@AEAVPackReport\@\@_N\@Z + * @symbol ?readValueAndReportErrors\@JsonPackUtils\@\@YA?AU?$pair\@$$CBVValue\@Json\@\@W4PackParseErrorType\@\@\@std\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4ValueType\@5\@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\@\@3\@AEAVPackReport\@\@_N\@Z */ MCAPI struct std::pair readValueAndReportErrors(class Json::Value const &, std::string const &, enum class Json::ValueType, std::vector &, class PackReport &, bool); /** - * @symbol ?stringizePath\@JsonPackUtils\@\@YA?AV?$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 + * @symbol ?stringizePath\@JsonPackUtils\@\@YA?AV?$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 */ MCAPI std::string stringizePath(std::vector const &); diff --git a/LiteLoader/include/llapi/mc/JsonSaver.hpp b/LiteLoader/include/llapi/mc/JsonSaver.hpp index 4557aea41d..f97100bd09 100644 --- a/LiteLoader/include/llapi/mc/JsonSaver.hpp +++ b/LiteLoader/include/llapi/mc/JsonSaver.hpp @@ -29,9 +29,15 @@ class JsonSaver { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_JSONSAVER /** - * @symbol ?toString\@JsonSaver\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~JsonSaver(); +#endif + /** + * @symbol ?toString\@JsonSaver\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JsonUtil.hpp b/LiteLoader/include/llapi/mc/JsonUtil.hpp index fc69eb09c5..6177577d48 100644 --- a/LiteLoader/include/llapi/mc/JsonUtil.hpp +++ b/LiteLoader/include/llapi/mc/JsonUtil.hpp @@ -49,59 +49,59 @@ class JsonParseState { #undef AFTER_EXTRA /** - * @symbol ?LogMissingChildSchemaOption\@JsonUtil\@\@YAXW4LogArea\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@22\@Z + * @symbol ?LogMissingChildSchemaOption\@JsonUtil\@\@YAXW4LogArea\@\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@22\@Z */ MCAPI void LogMissingChildSchemaOption(enum class LogArea, class Json::Value const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ?LogUnknownChildSchemaOption\@JsonUtil\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LogArea\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?LogUnknownChildSchemaOption\@JsonUtil\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LogArea\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void LogUnknownChildSchemaOption(std::string const &, enum class LogArea, class Json::Value const &); /** - * @symbol ?eraseSchema\@JsonUtil\@\@YAXAEBVHashedString\@\@AEBVSemVersion\@\@\@Z + * @symbol ?eraseSchema\@JsonUtil\@\@YAXAEBVHashedString\@\@AEBVSemVersion\@\@\@Z */ MCAPI void eraseSchema(class HashedString const &, class SemVersion const &); /** - * @symbol ?getMemberByCaseInsensitiveName\@JsonUtil\@\@YAAEAVValue\@Json\@\@AEAV23\@AEBV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getMemberByCaseInsensitiveName\@JsonUtil\@\@YAAEAVValue\@Json\@\@AEAV23\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class Json::Value & getMemberByCaseInsensitiveName(class Json::Value &, class gsl::basic_string_span const &); + MCAPI class Json::Value & getMemberByCaseInsensitiveName(class Json::Value &, class std::basic_string_view> const &); /** - * @symbol ?getMemberByCaseInsensitiveNameConst\@JsonUtil\@\@YAAEBVValue\@Json\@\@AEBV23\@AEBV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getMemberByCaseInsensitiveNameConst\@JsonUtil\@\@YAAEBVValue\@Json\@\@AEBV23\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI class Json::Value const & getMemberByCaseInsensitiveNameConst(class Json::Value const &, class gsl::basic_string_span const &); + MCAPI class Json::Value const & getMemberByCaseInsensitiveNameConst(class Json::Value const &, class std::basic_string_view> const &); /** - * @symbol ?getSchemaMap\@JsonUtil\@\@YAAEAV?$map\@VHashedString\@\@V?$map\@VSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@U?$less\@VSemVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBVSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$map\@VSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@U?$less\@VSemVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBVSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @symbol ?getSchemaMap\@JsonUtil\@\@YAAEAV?$map\@VHashedString\@\@V?$map\@VSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@U?$less\@VSemVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBVSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$map\@VSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@U?$less\@VSemVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBVSemVersion\@\@V?$shared_ptr\@VJsonSchemaNodeBase\@JsonUtil\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ MCAPI class std::map, struct std::less, class std::allocator>>>, struct std::less, class std::allocator, struct std::less, class std::allocator>>>>>> & getSchemaMap(); /** - * @symbol ?getSchemaMapLock\@JsonUtil\@\@YAAEAVmutex\@std\@\@XZ + * @symbol ?getSchemaMapLock\@JsonUtil\@\@YAAEAVmutex\@std\@\@XZ */ MCAPI class std::mutex & getSchemaMapLock(); /** - * @symbol ?parseBannerBlockType\@JsonUtil\@\@YA_NAEAW4BannerBlockType\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?parseBannerBlockType\@JsonUtil\@\@YA_NAEAW4BannerBlockType\@\@AEBVValue\@Json\@\@\@Z */ MCAPI bool parseBannerBlockType(enum class BannerBlockType &, class Json::Value const &); /** - * @symbol ?parseItem\@JsonUtil\@\@YA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z + * @symbol ?parseItem\@JsonUtil\@\@YA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAHV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ MCAPI bool parseItem(std::string &, std::string &, int &, class std::basic_string_view>); /** - * @symbol ?parseItemColor\@JsonUtil\@\@YA_NAEAW4ItemColor\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?parseItemColor\@JsonUtil\@\@YA_NAEAW4ItemColor\@\@AEBVValue\@Json\@\@\@Z */ MCAPI bool parseItemColor(enum class ItemColor &, class Json::Value const &); /** - * @symbol ?parseRange\@JsonUtil\@\@YA_NAEBVValue\@Json\@\@AEAH1\@Z + * @symbol ?parseRange\@JsonUtil\@\@YA_NAEBVValue\@Json\@\@AEAH1\@Z */ MCAPI bool parseRange(class Json::Value const &, int &, int &); /** - * @symbol ?parseVec3\@JsonUtil\@\@YA_NAEAVVec3\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?parseVec3\@JsonUtil\@\@YA_NAEAVVec3\@\@AEBVValue\@Json\@\@\@Z */ MCAPI bool parseVec3(class Vec3 &, class Json::Value const &); /** - * @symbol ?printJsonSchema_childNode\@JsonUtil\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBVHashedString\@\@1_N_K411\@Z + * @symbol ?printJsonSchema_childNode\@JsonUtil\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBVHashedString\@\@1_N_K411\@Z */ MCAPI void printJsonSchema_childNode(std::string &, std::string const &, class HashedString const &, std::string const &, bool, unsigned __int64, unsigned __int64, std::string const &, std::string const &); /** - * @symbol ?setDefaultPrettyName\@JsonUtil\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVHashedString\@\@\@Z + * @symbol ?setDefaultPrettyName\@JsonUtil\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVHashedString\@\@\@Z */ MCAPI void setDefaultPrettyName(std::string &, class HashedString const &); diff --git a/LiteLoader/include/llapi/mc/JsonValidator.hpp b/LiteLoader/include/llapi/mc/JsonValidator.hpp index e81aaabc73..4e6c4839f8 100644 --- a/LiteLoader/include/llapi/mc/JsonValidator.hpp +++ b/LiteLoader/include/llapi/mc/JsonValidator.hpp @@ -38,8 +38,8 @@ class Property { public: /** - * @symbol ?validate\@JsonValidator\@\@SA_NAEBVProperty\@1\@AEBVValue\@Json\@\@PEAV?$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 ?validate\@JsonValidator\@\@SA_NAEBVProperty\@1\@AEBVValue\@Json\@\@PEAV?$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 bool validate(class JsonValidator::Property const &, class Json::Value const &, std::vector *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp index 5d7dbd82ad..f0f7d3ce2b 100644 --- a/LiteLoader/include/llapi/mc/JukeboxBlock.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlock.hpp @@ -31,246 +31,251 @@ class JukeboxBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JukeboxBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@JukeboxBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@JukeboxBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@JukeboxBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@JukeboxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@JukeboxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@JukeboxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@JukeboxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@JukeboxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUKEBOXBLOCK /** - * @symbol ?hasComparatorSignal\@JukeboxBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@JukeboxBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; #endif /** - * @symbol ??0JukeboxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0JukeboxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI JukeboxBlock(std::string const &, int); //private: /** - * @symbol ?_dropRecording\@JukeboxBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_dropRecording\@JukeboxBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _dropRecording(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_installCircuit\@JukeboxBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_installCircuit\@JukeboxBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _installCircuit(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp b/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp index 213e9b7e1a..867c7c6867 100644 --- a/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/JukeboxBlockActor.hpp @@ -31,105 +31,105 @@ class JukeboxBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUKEBOXBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@JukeboxBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@JukeboxBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@JukeboxBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@JukeboxBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?canPullOutItem\@JukeboxBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPullOutItem\@JukeboxBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPullOutItem(int, int, class ItemStack const &) const; /** - * @symbol ?canPushInItem\@JukeboxBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@JukeboxBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?getContainer\@JukeboxBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@JukeboxBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@JukeboxBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@JukeboxBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@JukeboxBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@JukeboxBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@JukeboxBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@JukeboxBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@JukeboxBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@JukeboxBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?load\@JukeboxBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@JukeboxBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onChanged\@JukeboxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onChanged\@JukeboxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onChanged(class BlockSource &); /** - * @symbol ?save\@JukeboxBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@JukeboxBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@JukeboxBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@JukeboxBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@JukeboxBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@JukeboxBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@JukeboxBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@JukeboxBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@JukeboxBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@JukeboxBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); /** - * @symbol ?tick\@JukeboxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@JukeboxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0JukeboxBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0JukeboxBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI JukeboxBlockActor(class BlockPos const &); /** - * @symbol ?getRecord\@JukeboxBlockActor\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getRecord\@JukeboxBlockActor\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getRecord() const; /** - * @symbol ?isRecordPlaying\@JukeboxBlockActor\@\@QEBA_NXZ + * @symbol ?isRecordPlaying\@JukeboxBlockActor\@\@QEBA_NXZ */ MCAPI bool isRecordPlaying() const; /** - * @symbol ?setRecord\@JukeboxBlockActor\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setRecord\@JukeboxBlockActor\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setRecord(class ItemStack const &); /** - * @symbol ?stopPlayingRecord\@JukeboxBlockActor\@\@QEBAXAEAVBlockSource\@\@\@Z + * @symbol ?stopPlayingRecord\@JukeboxBlockActor\@\@QEBAXAEAVBlockSource\@\@\@Z */ MCAPI void stopPlayingRecord(class BlockSource &) const; //private: /** - * @symbol ?_onChanged\@JukeboxBlockActor\@\@AEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@\@Z + * @symbol ?_onChanged\@JukeboxBlockActor\@\@AEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@\@Z */ MCAPI void _onChanged(class BlockSource &, enum class LevelSoundEvent); /** - * @symbol ?_spawnMusicParticles\@JukeboxBlockActor\@\@AEAAXAEAVLevel\@\@M\@Z + * @symbol ?_spawnMusicParticles\@JukeboxBlockActor\@\@AEAAXAEAVLevel\@\@M\@Z */ MCAPI void _spawnMusicParticles(class Level &, float); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpControl.hpp b/LiteLoader/include/llapi/mc/JumpControl.hpp index f6c564d9cc..49780dee8b 100644 --- a/LiteLoader/include/llapi/mc/JumpControl.hpp +++ b/LiteLoader/include/llapi/mc/JumpControl.hpp @@ -29,60 +29,64 @@ class JumpControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JumpControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?clone\@JumpControl\@\@UEBA?AV?$unique_ptr\@VJumpControl\@\@U?$default_delete\@VJumpControl\@\@\@std\@\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?clone\@JumpControl\@\@UEBA?AV?$unique_ptr\@VJumpControl\@\@U?$default_delete\@VJumpControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 3 - * @symbol ?tick\@JumpControl\@\@MEAAXAEAVJumpControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@JumpControl\@\@MEAAXAEAVJumpControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class JumpControlComponent &, class Mob &); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?getJumpPower\@JumpControl\@\@MEBAMAEBVJumpControlComponent\@\@\@Z + * @vftbl 5 + * @symbol ?getJumpPower\@JumpControl\@\@MEBAMAEBVJumpControlComponent\@\@\@Z */ virtual float getJumpPower(class JumpControlComponent const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUMPCONTROL /** - * @symbol ?getJumpDelay\@JumpControl\@\@MEBAHAEBVJumpControlComponent\@\@\@Z + * @symbol ?getJumpDelay\@JumpControl\@\@MEBAHAEBVJumpControlComponent\@\@\@Z */ MCVAPI int getJumpDelay(class JumpControlComponent const &) const; /** - * @symbol ?getJumpType\@JumpControl\@\@MEBA?AW4JumpType\@\@AEBVJumpControlComponent\@\@\@Z + * @symbol ?getJumpType\@JumpControl\@\@MEBA?AW4JumpType\@\@AEBVJumpControlComponent\@\@\@Z */ MCVAPI enum class JumpType getJumpType(class JumpControlComponent const &) const; /** - * @symbol ?initializeInternal\@JumpControl\@\@UEAAXAEAVMob\@\@PEAUJumpControlDescription\@\@\@Z + * @symbol ?initializeInternal\@JumpControl\@\@UEAAXAEAVMob\@\@PEAUJumpControlDescription\@\@\@Z */ MCVAPI void initializeInternal(class Mob &, struct JumpControlDescription *); /** - * @symbol ?resetSpeedModifier\@JumpControl\@\@MEAAXAEBVJumpControlComponent\@\@AEAVMob\@\@\@Z + * @symbol ?resetSpeedModifier\@JumpControl\@\@MEAAXAEBVJumpControlComponent\@\@AEAVMob\@\@\@Z */ MCVAPI void resetSpeedModifier(class JumpControlComponent const &, class Mob &); /** - * @symbol ?setJumpType\@JumpControl\@\@MEAAXAEAVJumpControlComponent\@\@W4JumpType\@\@\@Z + * @symbol ?setJumpType\@JumpControl\@\@MEAAXAEAVJumpControlComponent\@\@W4JumpType\@\@\@Z */ MCVAPI void setJumpType(class JumpControlComponent &, enum class JumpType); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~JumpControl(); #endif /** - * @symbol ??0JumpControl\@\@QEAA\@XZ + * @symbol ??0JumpControl\@\@QEAA\@XZ */ MCAPI JumpControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpControlComponent.hpp b/LiteLoader/include/llapi/mc/JumpControlComponent.hpp index ffce9e0738..c680d1d10e 100644 --- a/LiteLoader/include/llapi/mc/JumpControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlComponent.hpp @@ -23,92 +23,92 @@ class JumpControlComponent { #undef AFTER_EXTRA public: /** - * @symbol ??0JumpControlComponent\@\@QEAA\@XZ + * @symbol ??0JumpControlComponent\@\@QEAA\@AEBV0\@\@Z */ - MCAPI JumpControlComponent(); + MCAPI JumpControlComponent(class JumpControlComponent const &); /** - * @symbol ??0JumpControlComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0JumpControlComponent\@\@QEAA\@XZ */ - MCAPI JumpControlComponent(class JumpControlComponent const &); + MCAPI JumpControlComponent(); /** - * @symbol ?getAnimationDuration\@JumpControlComponent\@\@QEBAHXZ + * @symbol ?getAnimationDuration\@JumpControlComponent\@\@QEBAHXZ */ MCAPI int getAnimationDuration() const; /** - * @symbol ?getDistanceScale\@JumpControlComponent\@\@QEBAMXZ + * @symbol ?getDistanceScale\@JumpControlComponent\@\@QEBAMXZ */ MCAPI float getDistanceScale() const; /** - * @symbol ?getJumpDelay\@JumpControlComponent\@\@QEBAHXZ + * @symbol ?getJumpDelay\@JumpControlComponent\@\@QEBAHXZ */ MCAPI int getJumpDelay() const; /** - * @symbol ?getJumpPower\@JumpControlComponent\@\@QEBAMXZ + * @symbol ?getJumpPower\@JumpControlComponent\@\@QEBAMXZ */ MCAPI float getJumpPower() const; /** - * @symbol ?getJumping\@JumpControlComponent\@\@QEBA_NXZ + * @symbol ?getJumping\@JumpControlComponent\@\@QEBA_NXZ */ MCAPI bool getJumping() const; /** - * @symbol ?getSwimming\@JumpControlComponent\@\@QEBA_NXZ + * @symbol ?getSwimming\@JumpControlComponent\@\@QEBA_NXZ */ MCAPI bool getSwimming() const; /** - * @symbol ?initMultiTypeJumpComponent\@JumpControlComponent\@\@QEAAXAEAVMob\@\@AEAVActorDefinitionDescriptor\@\@\@Z + * @symbol ?initMultiTypeJumpComponent\@JumpControlComponent\@\@QEAAXAEAVMob\@\@AEAVActorDefinitionDescriptor\@\@\@Z */ MCAPI void initMultiTypeJumpComponent(class Mob &, class ActorDefinitionDescriptor &); /** - * @symbol ?initializeFromDefinition\@JumpControlComponent\@\@QEAAXAEAVMob\@\@PEAUJumpControlDescription\@\@\@Z + * @symbol ?initializeFromDefinition\@JumpControlComponent\@\@QEAAXAEAVMob\@\@PEAUJumpControlDescription\@\@\@Z */ MCAPI void initializeFromDefinition(class Mob &, struct JumpControlDescription *); /** - * @symbol ??4JumpControlComponent\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4JumpControlComponent\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class JumpControlComponent & operator=(class JumpControlComponent const &); /** - * @symbol ??8JumpControlComponent\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8JumpControlComponent\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class JumpControlComponent const &) const; /** - * @symbol ?resetSpeedModifier\@JumpControlComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?resetSpeedModifier\@JumpControlComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void resetSpeedModifier(class Mob &); /** - * @symbol ?setInternalType\@JumpControlComponent\@\@QEAAXV?$unique_ptr\@VJumpControl\@\@U?$default_delete\@VJumpControl\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setInternalType\@JumpControlComponent\@\@QEAAXV?$unique_ptr\@VJumpControl\@\@U?$default_delete\@VJumpControl\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setInternalType(std::unique_ptr); /** - * @symbol ?setJumpType\@JumpControlComponent\@\@QEAAXW4JumpType\@\@\@Z + * @symbol ?setJumpType\@JumpControlComponent\@\@QEAAXW4JumpType\@\@\@Z */ MCAPI void setJumpType(enum class JumpType); /** - * @symbol ?setJumping\@JumpControlComponent\@\@QEAAX_N\@Z + * @symbol ?setJumping\@JumpControlComponent\@\@QEAAX_N\@Z */ MCAPI void setJumping(bool); /** - * @symbol ?setSwimming\@JumpControlComponent\@\@QEAAX_N\@Z + * @symbol ?setSwimming\@JumpControlComponent\@\@QEAAX_N\@Z */ MCAPI void setSwimming(bool); /** - * @symbol ?update\@JumpControlComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?update\@JumpControlComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void update(class Mob &); /** - * @symbol ??1JumpControlComponent\@\@QEAA\@XZ + * @symbol ??1JumpControlComponent\@\@QEAA\@XZ */ MCAPI ~JumpControlComponent(); //private: /** - * @symbol ?_getDelayInternal\@JumpControlComponent\@\@AEBAMXZ + * @symbol ?_getDelayInternal\@JumpControlComponent\@\@AEBAMXZ */ MCAPI float _getDelayInternal() const; /** - * @symbol ?_getHeightInternal\@JumpControlComponent\@\@AEBAMXZ + * @symbol ?_getHeightInternal\@JumpControlComponent\@\@AEBAMXZ */ MCAPI float _getHeightInternal() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpControlDescription.hpp b/LiteLoader/include/llapi/mc/JumpControlDescription.hpp index 5edcbdbfd7..b6fb761bbf 100644 --- a/LiteLoader/include/llapi/mc/JumpControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ struct JumpControlDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@JumpControlDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@JumpControlDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~JumpControlDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@JumpControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@JumpControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_JUMPCONTROLDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@JumpControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~JumpControlDescription(); +#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/JumpControlSystem.hpp b/LiteLoader/include/llapi/mc/JumpControlSystem.hpp index 62072ef825..cd67b79ac9 100644 --- a/LiteLoader/include/llapi/mc/JumpControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpControlSystem.hpp @@ -30,19 +30,19 @@ class JumpControlSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JumpControlSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@JumpControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@JumpControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpEndSystem.hpp b/LiteLoader/include/llapi/mc/JumpEndSystem.hpp index 23c516e30f..d69f987a89 100644 --- a/LiteLoader/include/llapi/mc/JumpEndSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpEndSystem.hpp @@ -25,12 +25,12 @@ class JumpEndSystem { public: /** - * @symbol ?create\@JumpEndSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@JumpEndSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ 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?$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 */ 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>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpInfo.hpp b/LiteLoader/include/llapi/mc/JumpInfo.hpp index 5f980cfff3..dfc88c53ca 100644 --- a/LiteLoader/include/llapi/mc/JumpInfo.hpp +++ b/LiteLoader/include/llapi/mc/JumpInfo.hpp @@ -30,28 +30,28 @@ class JumpInfo { public: /** - * @symbol ??0JumpInfo\@\@QEAA\@MMHH\@Z + * @symbol ??0JumpInfo\@\@QEAA\@MMHH\@Z */ MCAPI JumpInfo(float, float, int, int); /** - * @symbol ?getAnimDuration\@JumpInfo\@\@QEBAHXZ + * @symbol ?getAnimDuration\@JumpInfo\@\@QEBAHXZ */ MCAPI int getAnimDuration() const; /** - * @symbol ?getDistanceScale\@JumpInfo\@\@QEBAMXZ + * @symbol ?getDistanceScale\@JumpInfo\@\@QEBAMXZ */ MCAPI float getDistanceScale() const; /** - * @symbol ?getHeight\@JumpInfo\@\@QEBAMXZ + * @symbol ?getHeight\@JumpInfo\@\@QEBAMXZ */ MCAPI float getHeight() const; /** - * @symbol ?getJumpDelay\@JumpInfo\@\@QEBAHXZ + * @symbol ?getJumpDelay\@JumpInfo\@\@QEBAHXZ */ MCAPI int getJumpDelay() const; /** - * @symbol ??9JumpInfo\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9JumpInfo\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class JumpInfo const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpInputSystem.hpp b/LiteLoader/include/llapi/mc/JumpInputSystem.hpp index 9249eb7e4a..fbf1e73775 100644 --- a/LiteLoader/include/llapi/mc/JumpInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/JumpInputSystem.hpp @@ -28,8 +28,8 @@ class JumpInputSystem { public: /** - * @symbol ?createJumpInputSystem\@JumpInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createJumpInputSystem\@JumpInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createJumpInputSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JumpPreventionUtility.hpp b/LiteLoader/include/llapi/mc/JumpPreventionUtility.hpp index 7a582f932d..68ec32873b 100644 --- a/LiteLoader/include/llapi/mc/JumpPreventionUtility.hpp +++ b/LiteLoader/include/llapi/mc/JumpPreventionUtility.hpp @@ -20,11 +20,11 @@ namespace JumpPreventionUtility { #undef AFTER_EXTRA /** - * @symbol ?getJumpMultiplier\@JumpPreventionUtility\@\@YAM_N\@Z + * @symbol ?getJumpMultiplier\@JumpPreventionUtility\@\@YAM_N\@Z */ MCAPI float getJumpMultiplier(bool); /** - * @symbol ?getJumpPrevention\@JumpPreventionUtility\@\@YA?AUJumpPreventionResult\@\@_NAEBVAABB\@\@VBlockPos\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?getJumpPrevention\@JumpPreventionUtility\@\@YA?AUJumpPreventionResult\@\@_NAEBVAABB\@\@VBlockPos\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI struct JumpPreventionResult getJumpPrevention(bool, class AABB const &, class BlockPos, class IConstBlockSource const &); diff --git a/LiteLoader/include/llapi/mc/JumpToBlockGoal.hpp b/LiteLoader/include/llapi/mc/JumpToBlockGoal.hpp index a0b3390b70..f267f16e15 100644 --- a/LiteLoader/include/llapi/mc/JumpToBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/JumpToBlockGoal.hpp @@ -30,80 +30,80 @@ class JumpToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JumpToBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@JumpToBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@JumpToBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@JumpToBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@JumpToBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@JumpToBlockGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@JumpToBlockGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@JumpToBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@JumpToBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@JumpToBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@JumpToBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@JumpToBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@JumpToBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@JumpToBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@JumpToBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0JumpToBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0JumpToBlockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI JumpToBlockGoal(class Mob &); /** - * @symbol ?resetCooldown\@JumpToBlockGoal\@\@QEAAXXZ + * @symbol ?resetCooldown\@JumpToBlockGoal\@\@QEAAXXZ */ MCAPI void resetCooldown(); //private: /** - * @symbol ?_calculateJumpCurve\@JumpToBlockGoal\@\@AEAA_NMAEBVBlockPos\@\@AEAUWeightedJumpToBlockPos\@1\@\@Z + * @symbol ?_calculateJumpCurve\@JumpToBlockGoal\@\@AEAA_NMAEBVBlockPos\@\@AEAUWeightedJumpToBlockPos\@1\@\@Z */ MCAPI bool _calculateJumpCurve(float, class BlockPos const &, struct JumpToBlockGoal::WeightedJumpToBlockPos &); /** - * @symbol ?_clearGoalState\@JumpToBlockGoal\@\@AEAAXXZ + * @symbol ?_clearGoalState\@JumpToBlockGoal\@\@AEAAXXZ */ MCAPI void _clearGoalState(); /** - * @symbol ?_findCandidateBlocks\@JumpToBlockGoal\@\@AEAA_NAEAVNavigationComponent\@\@\@Z + * @symbol ?_findCandidateBlocks\@JumpToBlockGoal\@\@AEAA_NAEAVNavigationComponent\@\@\@Z */ MCAPI bool _findCandidateBlocks(class NavigationComponent &); /** - * @symbol ?_findJumpableBlocks\@JumpToBlockGoal\@\@AEAA_N_N\@Z + * @symbol ?_findJumpableBlocks\@JumpToBlockGoal\@\@AEAA_N_N\@Z */ MCAPI bool _findJumpableBlocks(bool); /** - * @symbol ?_findTargetBlock\@JumpToBlockGoal\@\@AEAA_NXZ + * @symbol ?_findTargetBlock\@JumpToBlockGoal\@\@AEAA_NXZ */ MCAPI bool _findTargetBlock(); /** - * @symbol ?_validTransition\@JumpToBlockGoal\@\@AEBA_NAEBVVec3\@\@0\@Z + * @symbol ?_validTransition\@JumpToBlockGoal\@\@AEBA_NAEBVVec3\@\@0\@Z */ MCAPI bool _validTransition(class Vec3 const &, class Vec3 const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp b/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp index 5a9b0bed58..fa7a0533d6 100644 --- a/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp +++ b/LiteLoader/include/llapi/mc/JunglePyramidPiece.hpp @@ -31,23 +31,23 @@ class JunglePyramidPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~JunglePyramidPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@JunglePyramidPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@JunglePyramidPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@JunglePyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@JunglePyramidPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ??0JunglePyramidPiece\@\@QEAA\@FHH\@Z + * @symbol ??0JunglePyramidPiece\@\@QEAA\@FHH\@Z */ MCAPI JunglePyramidPiece(short, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KelpBlock.hpp b/LiteLoader/include/llapi/mc/KelpBlock.hpp index 39b69d77e5..6b93b9ac3e 100644 --- a/LiteLoader/include/llapi/mc/KelpBlock.hpp +++ b/LiteLoader/include/llapi/mc/KelpBlock.hpp @@ -31,289 +31,294 @@ class KelpBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KelpBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@KelpBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@KelpBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@KelpBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@KelpBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@KelpBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@KelpBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@KelpBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@KelpBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@KelpBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@KelpBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@KelpBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_KELPBLOCK /** - * @symbol ?canBeSilkTouched\@KelpBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@KelpBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@KelpBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@KelpBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0KelpBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0KelpBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI KelpBlock(std::string const &, int); /** - * @symbol ?shouldGrow\@KelpBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?shouldGrow\@KelpBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool shouldGrow(class BlockSource &, class BlockPos const &) const; //private: /** - * @symbol ?_getAge\@KelpBlock\@\@AEBAHAEBVBlock\@\@\@Z + * @symbol ?_getAge\@KelpBlock\@\@AEBAHAEBVBlock\@\@\@Z */ MCAPI int _getAge(class Block const &) const; /** - * @symbol ?_tryGrow\@KelpBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_tryGrow\@KelpBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void _tryGrow(class BlockSource &, class BlockPos const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KelpFeature.hpp b/LiteLoader/include/llapi/mc/KelpFeature.hpp index a5232c604e..31c150005a 100644 --- a/LiteLoader/include/llapi/mc/KelpFeature.hpp +++ b/LiteLoader/include/llapi/mc/KelpFeature.hpp @@ -31,14 +31,14 @@ class KelpFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KelpFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@KelpFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@KelpFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp b/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp index 92d4e3d9bc..3384ed05a1 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameLerpMode.hpp @@ -29,16 +29,16 @@ class KeyFrameLerpMode { public: /** - * @symbol ?getPrecomputedCubicCoeffs\@KeyFrameLerpMode\@\@QEBAAEBU?$mat\@$03$03M$0A\@\@glm\@\@XZ + * @symbol ?getPrecomputedCubicCoeffs\@KeyFrameLerpMode\@\@QEBAAEBU?$mat\@$03$03M$0A\@\@glm\@\@XZ */ MCAPI struct glm::mat<4, 4, float, 0> const & getPrecomputedCubicCoeffs() const; /** - * @symbol ??4KeyFrameLerpMode\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4KeyFrameLerpMode\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class KeyFrameLerpMode & operator=(class KeyFrameLerpMode const &); /** - * @symbol ?setLerpStyle\@KeyFrameLerpMode\@\@QEAAXW4KeyFrameLerpStyle\@\@\@Z + * @symbol ?setLerpStyle\@KeyFrameLerpMode\@\@QEAAXW4KeyFrameLerpStyle\@\@\@Z */ MCAPI void setLerpStyle(enum class KeyFrameLerpStyle); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp index 6e16e02eae..5642524747 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransform.hpp @@ -30,48 +30,48 @@ class KeyFrameTransform { public: /** - * @symbol ??0KeyFrameTransform\@\@QEAA\@M\@Z + * @symbol ??0KeyFrameTransform\@\@QEAA\@M\@Z */ MCAPI KeyFrameTransform(float); /** - * @symbol ?getLerpMode\@KeyFrameTransform\@\@QEAAAEAVKeyFrameLerpMode\@\@XZ + * @symbol ?getLerpMode\@KeyFrameTransform\@\@QEAAAEAVKeyFrameLerpMode\@\@XZ */ MCAPI class KeyFrameLerpMode & getLerpMode(); /** - * @symbol ??4KeyFrameTransform\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4KeyFrameTransform\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class KeyFrameTransform & operator=(class KeyFrameTransform &&); /** - * @symbol ?optimizeAndGetDataValues\@KeyFrameTransform\@\@QEAA_NAEAVVec3\@\@0\@Z + * @symbol ?optimizeAndGetDataValues\@KeyFrameTransform\@\@QEAA_NAEAVVec3\@\@0\@Z */ MCAPI bool optimizeAndGetDataValues(class Vec3 &, class Vec3 &); /** - * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ - MCAPI void set(class ExpressionNode const &); + MCAPI void set(class ExpressionNode const &, int); /** - * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@AEBVVec3\@\@\@Z + * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@\@Z */ - MCAPI void set(class ExpressionNode const &, class Vec3 const &); + MCAPI void set(class ExpressionNode const &); /** - * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z + * @symbol ?set\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@AEBVVec3\@\@\@Z */ - MCAPI void set(class ExpressionNode const &, int); + MCAPI void set(class ExpressionNode const &, class Vec3 const &); /** - * @symbol ?setPost\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z + * @symbol ?setPost\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ MCAPI void setPost(class ExpressionNode const &, int); /** - * @symbol ?setPre\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z + * @symbol ?setPre\@KeyFrameTransform\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ MCAPI void setPre(class ExpressionNode const &, int); /** - * @symbol ??1KeyFrameTransform\@\@QEAA\@XZ + * @symbol ??1KeyFrameTransform\@\@QEAA\@XZ */ MCAPI ~KeyFrameTransform(); /** - * @symbol ?computeCubicPolynomial\@KeyFrameTransform\@\@SAXPEAV1\@AEAV1\@10\@Z + * @symbol ?computeCubicPolynomial\@KeyFrameTransform\@\@SAXPEAV1\@AEAV1\@10\@Z */ MCAPI static void computeCubicPolynomial(class KeyFrameTransform *, class KeyFrameTransform &, class KeyFrameTransform &, class KeyFrameTransform *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp b/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp index a337727c62..2b18a998f4 100644 --- a/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp +++ b/LiteLoader/include/llapi/mc/KeyFrameTransformData.hpp @@ -29,16 +29,16 @@ class KeyFrameTransformData { public: /** - * @symbol ??0KeyFrameTransformData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0KeyFrameTransformData\@\@QEAA\@AEBV0\@\@Z */ MCAPI KeyFrameTransformData(class KeyFrameTransformData const &); /** - * @symbol ?addChannelTransform\@KeyFrameTransformData\@\@QEAAXAEBVExpressionNode\@\@H\@Z + * @symbol ?addChannelTransform\@KeyFrameTransformData\@\@QEAAXAEBVExpressionNode\@\@H\@Z */ MCAPI void addChannelTransform(class ExpressionNode const &, int); /** - * @symbol ??8KeyFrameTransformData\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8KeyFrameTransformData\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class KeyFrameTransformData const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KeyManager.hpp b/LiteLoader/include/llapi/mc/KeyManager.hpp index 6427f96084..29985ee0b9 100644 --- a/LiteLoader/include/llapi/mc/KeyManager.hpp +++ b/LiteLoader/include/llapi/mc/KeyManager.hpp @@ -31,26 +31,32 @@ class KeyManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KeyManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValid\@KeyManager\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isValid\@KeyManager\@\@UEBA_NXZ */ virtual bool isValid() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_KEYMANAGER /** - * @symbol ??0KeyManager\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4System\@Asymmetric\@Crypto\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~KeyManager(); +#endif + /** + * @symbol ??0KeyManager\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4System\@Asymmetric\@Crypto\@\@\@Z */ MCAPI KeyManager(std::string const &, enum class Crypto::Asymmetric::System); /** - * @symbol ?getPublicKey\@KeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPublicKey\@KeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPublicKey() const; /** - * @symbol ?verify\@KeyManager\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4HashType\@Hash\@Crypto\@\@\@Z + * @symbol ?verify\@KeyManager\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4HashType\@Hash\@Crypto\@\@\@Z */ MCAPI bool verify(std::string const &, std::string const &, enum class Crypto::Hash::HashType) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KeyOrNameResult.hpp b/LiteLoader/include/llapi/mc/KeyOrNameResult.hpp index 187eda374a..78e3e75719 100644 --- a/LiteLoader/include/llapi/mc/KeyOrNameResult.hpp +++ b/LiteLoader/include/llapi/mc/KeyOrNameResult.hpp @@ -28,7 +28,7 @@ struct KeyOrNameResult { public: /** - * @symbol ??1KeyOrNameResult\@\@QEAA\@XZ + * @symbol ??1KeyOrNameResult\@\@QEAA\@XZ */ MCAPI ~KeyOrNameResult(); diff --git a/LiteLoader/include/llapi/mc/KickCommand.hpp b/LiteLoader/include/llapi/mc/KickCommand.hpp index c3a792ee71..9ce099f691 100644 --- a/LiteLoader/include/llapi/mc/KickCommand.hpp +++ b/LiteLoader/include/llapi/mc/KickCommand.hpp @@ -31,42 +31,42 @@ class KickCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KickCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@KickCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@KickCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@KickCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@KickCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_canKickPlayerOrGenerateFailureOutput\@KickCommand\@\@AEBA_NAEBVPlayer\@\@AEAVCommandOutput\@\@PEAVLevel\@\@\@Z + * @symbol ?_canKickPlayerOrGenerateFailureOutput\@KickCommand\@\@AEBA_NAEBVPlayer\@\@AEAVCommandOutput\@\@PEAVLevel\@\@\@Z */ MCAPI bool _canKickPlayerOrGenerateFailureOutput(class Player const &, class CommandOutput &, class Level *) const; /** - * @symbol ?_findTarget\@KickCommand\@\@AEBAPEBVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@33\@Z + * @symbol ?_findTarget\@KickCommand\@\@AEBAPEBVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@33\@Z */ MCAPI class Player const * _findTarget(class CommandOrigin const &, class CommandOutput &, class Level &, std::string const &, std::string const &, std::string const &) const; /** - * @symbol ?_generateSuccessOutput\@KickCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ?_generateSuccessOutput\@KickCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI void _generateSuccessOutput(class CommandOutput &, std::string const &, std::string const &) const; /** - * @symbol ?_kickPlayer\@KickCommand\@\@AEBAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_kickPlayer\@KickCommand\@\@AEBAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _kickPlayer(class Player const &, std::string const &) const; /** - * @symbol ?_loopPlayers\@KickCommand\@\@AEBAPEBVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3V?$function\@$$A6A_NPEBVPlayer\@\@\@Z\@7\@\@Z + * @symbol ?_loopPlayers\@KickCommand\@\@AEBAPEBVPlayer\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3V?$function\@$$A6A_NPEBVPlayer\@\@\@Z\@7\@\@Z */ MCAPI class Player const * _loopPlayers(class CommandOrigin const &, class CommandOutput &, class Level &, std::string const &, std::string const &, class std::function) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KillCommand.hpp b/LiteLoader/include/llapi/mc/KillCommand.hpp index 4f8969905a..266a477043 100644 --- a/LiteLoader/include/llapi/mc/KillCommand.hpp +++ b/LiteLoader/include/llapi/mc/KillCommand.hpp @@ -31,18 +31,18 @@ class KillCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KillCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@KillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@KillCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@KillCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@KillCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KnockBackEvent.hpp b/LiteLoader/include/llapi/mc/KnockBackEvent.hpp index ad95dd8987..79ab83d2b5 100644 --- a/LiteLoader/include/llapi/mc/KnockBackEvent.hpp +++ b/LiteLoader/include/llapi/mc/KnockBackEvent.hpp @@ -25,7 +25,7 @@ struct KnockBackEvent { public: /** - * @symbol ??1KnockBackEvent\@\@QEAA\@XZ + * @symbol ??1KnockBackEvent\@\@QEAA\@XZ */ MCAPI ~KnockBackEvent(); diff --git a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp index 74fab21c83..74d03ed84b 100644 --- a/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackArmorUpdater.hpp @@ -30,144 +30,139 @@ class KnockbackArmorUpdater { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KnockbackArmorUpdater(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z + * @vftbl 1 + * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorRemoveEffectEvent const &); /** - * @vftbl 2 - * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z + * @vftbl 2 + * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorNotificationEvent const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @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 ?onEvent\@KnockbackArmorUpdater\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z + * @vftbl 26 + * @symbol ?onEvent\@KnockbackArmorUpdater\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp b/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp index a2dd9d76af..5daf072c94 100644 --- a/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackResistanceItemComponent.hpp @@ -30,51 +30,51 @@ class KnockbackResistanceItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KnockbackResistanceItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VKnockbackResistanceItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VKnockbackResistanceItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VKnockbackResistanceItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getProtectionValue\@KnockbackResistanceItemComponent\@\@QEBAMXZ + * @symbol ?getProtectionValue\@KnockbackResistanceItemComponent\@\@QEBAMXZ */ MCAPI float getProtectionValue() const; /** - * @symbol ?bindType\@KnockbackResistanceItemComponent\@\@SAXXZ + * @symbol ?bindType\@KnockbackResistanceItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@KnockbackResistanceItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@KnockbackResistanceItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp b/LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp index 8d60950098..7b5a467779 100644 --- a/LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackRoarGoal.hpp @@ -30,48 +30,48 @@ class KnockbackRoarGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~KnockbackRoarGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@KnockbackRoarGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@KnockbackRoarGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@KnockbackRoarGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@KnockbackRoarGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@KnockbackRoarGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@KnockbackRoarGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@KnockbackRoarGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@KnockbackRoarGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@KnockbackRoarGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@KnockbackRoarGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@KnockbackRoarGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@KnockbackRoarGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0KnockbackRoarGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0KnockbackRoarGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI KnockbackRoarGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/KnockbackRules.hpp b/LiteLoader/include/llapi/mc/KnockbackRules.hpp index e1efac81e7..8ea58c60f2 100644 --- a/LiteLoader/include/llapi/mc/KnockbackRules.hpp +++ b/LiteLoader/include/llapi/mc/KnockbackRules.hpp @@ -22,27 +22,27 @@ namespace KnockbackRules { #undef AFTER_EXTRA /** - * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec2\@\@MM\@Z + * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec2\@\@MM\@Z */ MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec2 const &, float, float); /** - * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec3\@\@MM\@Z + * @symbol ?doKnockbackAttack\@KnockbackRules\@\@YAXAEAVMob\@\@0AEBVVec3\@\@MM\@Z */ MCAPI void doKnockbackAttack(class Mob &, class Mob &, class Vec3 const &, float, float); /** - * @symbol ?getScaledKnockbackForce\@KnockbackRules\@\@YAMAEBVActor\@\@M\@Z + * @symbol ?getScaledKnockbackForce\@KnockbackRules\@\@YAMAEBVActor\@\@M\@Z */ MCAPI float getScaledKnockbackForce(class Actor const &, float); /** - * @symbol ?isKnockbackResistant\@KnockbackRules\@\@YA_NAEBVActor\@\@\@Z + * @symbol ?isKnockbackResistant\@KnockbackRules\@\@YA_NAEBVActor\@\@\@Z */ MCAPI bool isKnockbackResistant(class Actor const &); /** - * @symbol ?shouldApplyKnockback\@KnockbackRules\@\@YA_NAEBVMob\@\@\@Z + * @symbol ?shouldApplyKnockback\@KnockbackRules\@\@YA_NAEBVMob\@\@\@Z */ MCAPI bool shouldApplyKnockback(class Mob const &); /** - * @symbol ?useLegacyKnockback\@KnockbackRules\@\@YA_NAEBVLevel\@\@\@Z + * @symbol ?useLegacyKnockback\@KnockbackRules\@\@YA_NAEBVLevel\@\@\@Z */ MCAPI bool useLegacyKnockback(class Level const &); diff --git a/LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp index bbe2ca1698..880eab6767 100644 --- a/LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LabTableContainerManagerModel.hpp @@ -31,52 +31,52 @@ class LabTableContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LabTableContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@LabTableContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@LabTableContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@LabTableContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@LabTableContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@LabTableContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@LabTableContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@LabTableContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@LabTableContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@LabTableContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@LabTableContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@LabTableContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@LabTableContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@LabTableContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@LabTableContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0LabTableContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0LabTableContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI LabTableContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?INPUT_SLOTS\@LabTableContainerManagerModel\@\@2HB + * @symbol ?INPUT_SLOTS\@LabTableContainerManagerModel\@\@2HB */ MCAPI static int const INPUT_SLOTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LabTableContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/LabTableContainerScreenValidator.hpp index 159694a89e..f7fd0a0016 100644 --- a/LiteLoader/include/llapi/mc/LabTableContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/LabTableContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class LabTableContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LabTableContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0LabTableContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0LabTableContainerScreenValidator\@\@QEAA\@XZ */ MCAPI LabTableContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LabTableInputValidation.hpp b/LiteLoader/include/llapi/mc/LabTableInputValidation.hpp index 5cecbb6230..101675f071 100644 --- a/LiteLoader/include/llapi/mc/LabTableInputValidation.hpp +++ b/LiteLoader/include/llapi/mc/LabTableInputValidation.hpp @@ -31,60 +31,60 @@ class LabTableInputValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LabTableInputValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@LabTableInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@LabTableInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@LabTableInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@LabTableInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LABTABLEINPUTVALIDATION /** - * @symbol ?canDestroy\@LabTableInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @symbol ?canDestroy\@LabTableInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ MCVAPI bool canDestroy(class ContainerScreenContext const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LabTablePacket.hpp b/LiteLoader/include/llapi/mc/LabTablePacket.hpp index a5ba74ce80..37f07c67a8 100644 --- a/LiteLoader/include/llapi/mc/LabTablePacket.hpp +++ b/LiteLoader/include/llapi/mc/LabTablePacket.hpp @@ -30,41 +30,47 @@ class LabTablePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LabTablePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LabTablePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LabTablePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LabTablePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LabTablePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LabTablePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LabTablePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LabTablePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LabTablePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LABTABLEPACKET /** - * @symbol ??0LabTablePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI LabTablePacket(); + MCVAPI ~LabTablePacket(); +#endif /** - * @symbol ??0LabTablePacket\@\@QEAA\@W4Type\@0\@AEBVBlockPos\@\@\@Z + * @symbol ??0LabTablePacket\@\@QEAA\@XZ */ - MCAPI LabTablePacket(enum class LabTablePacket::Type, class BlockPos const &); + MCAPI LabTablePacket(); /** - * @symbol ??0LabTablePacket\@\@QEAA\@AEBVBlockPos\@\@W4LabTableReactionType\@\@\@Z + * @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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LabTableReaction.hpp b/LiteLoader/include/llapi/mc/LabTableReaction.hpp index 322049af3c..bebd0bc7ca 100644 --- a/LiteLoader/include/llapi/mc/LabTableReaction.hpp +++ b/LiteLoader/include/llapi/mc/LabTableReaction.hpp @@ -30,28 +30,28 @@ class LabTableReaction { public: /** - * @symbol ?addComponent\@LabTableReaction\@\@QEAAXV?$unique_ptr\@VLabTableReactionComponent\@\@U?$default_delete\@VLabTableReactionComponent\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addComponent\@LabTableReaction\@\@QEAAXV?$unique_ptr\@VLabTableReactionComponent\@\@U?$default_delete\@VLabTableReactionComponent\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void addComponent(std::unique_ptr); /** - * @symbol ?addResultItem\@LabTableReaction\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?addResultItem\@LabTableReaction\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void addResultItem(class ItemStack const &); /** - * @symbol ?getReactionId\@LabTableReaction\@\@QEAAHXZ + * @symbol ?getReactionId\@LabTableReaction\@\@QEAAHXZ */ MCAPI int getReactionId(); /** - * @symbol ?getType\@LabTableReaction\@\@QEAA?AW4LabTableReactionType\@\@XZ + * @symbol ?getType\@LabTableReaction\@\@QEAA?AW4LabTableReactionType\@\@XZ */ MCAPI enum class LabTableReactionType getType(); /** - * @symbol ?tick\@LabTableReaction\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?tick\@LabTableReaction\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool tick(class BlockSource &); /** - * @symbol ?createReaction\@LabTableReaction\@\@SA?AV?$unique_ptr\@VLabTableReaction\@\@U?$default_delete\@VLabTableReaction\@\@\@std\@\@\@std\@\@W4LabTableReactionType\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?createReaction\@LabTableReaction\@\@SA?AV?$unique_ptr\@VLabTableReaction\@\@U?$default_delete\@VLabTableReaction\@\@\@std\@\@\@std\@\@W4LabTableReactionType\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI static std::unique_ptr createReaction(enum class LabTableReactionType, class BlockPos const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp b/LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp index 54a1cc6099..6ab6f22e3f 100644 --- a/LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/LabTableReactionComponent.hpp @@ -31,17 +31,21 @@ class LabTableReactionComponent { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LABTABLEREACTIONCOMPONENT /** - * @symbol ?_onEnd\@LabTableReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onEnd\@LabTableReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onEnd(class LabTableReaction &, class BlockSource &); /** - * @symbol ?_onStart\@LabTableReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onStart\@LabTableReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onStart(class LabTableReaction &, class BlockSource &); /** - * @symbol ?_onTick\@LabTableReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onTick\@LabTableReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onTick(class LabTableReaction &, class BlockSource &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LabTableReactionComponent(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LadderBlock.hpp b/LiteLoader/include/llapi/mc/LadderBlock.hpp index af9fcc8022..8eaa966fbb 100644 --- a/LiteLoader/include/llapi/mc/LadderBlock.hpp +++ b/LiteLoader/include/llapi/mc/LadderBlock.hpp @@ -31,258 +31,263 @@ class LadderBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LadderBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@LadderBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@LadderBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 57 - * @symbol ?sanitizeFillBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 57 + * @symbol ?sanitizeFillBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LadderBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@LadderBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LadderBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@LadderBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@LadderBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@LadderBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LADDERBLOCK /** - * @symbol ?canBeSilkTouched\@LadderBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@LadderBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@LadderBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@LadderBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0LadderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LadderBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LadderBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LadderResetFallDamageSystem.hpp b/LiteLoader/include/llapi/mc/LadderResetFallDamageSystem.hpp index d1bf6b1fcc..9c01b6add6 100644 --- a/LiteLoader/include/llapi/mc/LadderResetFallDamageSystem.hpp +++ b/LiteLoader/include/llapi/mc/LadderResetFallDamageSystem.hpp @@ -28,12 +28,8 @@ class LadderResetFallDamageSystem { public: /** - * @symbol ?createLadderResetFallDamageSystem\@LadderResetFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createLadderResetFallDamageSystem\@LadderResetFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLadderResetFallDamageSystem(); - /** - * @symbol ?createSideBySideLadderResetFallDamageSystem\@LadderResetFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideLadderResetFallDamageSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LakeFeature.hpp b/LiteLoader/include/llapi/mc/LakeFeature.hpp index 424d8b985c..76e423880c 100644 --- a/LiteLoader/include/llapi/mc/LakeFeature.hpp +++ b/LiteLoader/include/llapi/mc/LakeFeature.hpp @@ -31,26 +31,32 @@ class LakeFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LakeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LakeFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LakeFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LAKEFEATURE /** - * @symbol ??0LakeFeature\@\@QEAA\@AEBVBlock\@\@V?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LakeFeature(); +#endif + /** + * @symbol ??0LakeFeature\@\@QEAA\@AEBVBlock\@\@V?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@\@Z */ MCAPI LakeFeature(class Block const &, class std::optional); //private: /** - * @symbol ?_check\@LakeFeature\@\@AEBA_NAEBVBlockPos\@\@V?$span\@_N$0IAA\@\@gsl\@\@\@Z + * @symbol ?_check\@LakeFeature\@\@AEBA_NAEBVBlockPos\@\@V?$span\@_N$0IAA\@\@gsl\@\@\@Z */ MCAPI bool _check(class BlockPos const &, class gsl::span) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LanternBlock.hpp b/LiteLoader/include/llapi/mc/LanternBlock.hpp index 14b2f5abb3..1136e0ec79 100644 --- a/LiteLoader/include/llapi/mc/LanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LanternBlock.hpp @@ -31,267 +31,272 @@ class LanternBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LanternBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@LanternBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?movedByPiston\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 76 + * @symbol ?movedByPiston\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@LanternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LanternBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LanternBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@LanternBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@LanternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@LanternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@LanternBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@LanternBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@LanternBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LANTERNBLOCK /** - * @symbol ?canBeSilkTouched\@LanternBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@LanternBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0LanternBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LanternBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LanternBlock(std::string const &, int); //private: /** - * @symbol ?_couldHang\@LanternBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_couldHang\@LanternBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _couldHang(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LargeDripstoneFeature.hpp b/LiteLoader/include/llapi/mc/LargeDripstoneFeature.hpp index 3e52fa38cd..b6825509c6 100644 --- a/LiteLoader/include/llapi/mc/LargeDripstoneFeature.hpp +++ b/LiteLoader/include/llapi/mc/LargeDripstoneFeature.hpp @@ -30,14 +30,14 @@ class LargeDripstoneFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LargeDripstoneFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@LargeDripstoneFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@LargeDripstoneFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LargeFireball.hpp b/LiteLoader/include/llapi/mc/LargeFireball.hpp index a3cb16a0d4..f5330fa8f3 100644 --- a/LiteLoader/include/llapi/mc/LargeFireball.hpp +++ b/LiteLoader/include/llapi/mc/LargeFireball.hpp @@ -32,123 +32,123 @@ class LargeFireball : public Fireball { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~LargeFireball(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_275(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 277 + * @symbol __unk_vfn_277 */ virtual void __unk_vfn_277(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 - */ - virtual void __unk_vfn_279(); - /** - * @symbol ??0LargeFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0LargeFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI LargeFireball(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp new file mode 100644 index 0000000000..e00c0d03b0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LavaMoveFinalizeSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file LavaMoveFinalizeSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LavaMoveFinalizeSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LAVAMOVEFINALIZESYSTEM +public: + class LavaMoveFinalizeSystem& operator=(class LavaMoveFinalizeSystem const &) = delete; + LavaMoveFinalizeSystem(class LavaMoveFinalizeSystem const &) = delete; + LavaMoveFinalizeSystem() = delete; +#endif + +public: + /** + * @symbol ?createLavaMoveFinalizeSideBySideSystem\@LavaMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createLavaMoveFinalizeSideBySideSystem(); + /** + * @symbol ?createLavaMoveFinalizeSystem\@LavaMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createLavaMoveFinalizeSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp b/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp new file mode 100644 index 0000000000..6d37393988 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LavaMoveSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file LavaMoveSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LavaMoveSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LAVAMOVESYSTEM +public: + class LavaMoveSystem& operator=(class LavaMoveSystem const &) = delete; + LavaMoveSystem(class LavaMoveSystem const &) = delete; + LavaMoveSystem() = delete; +#endif + +public: + /** + * @symbol ?createLavaMoveSideBySideSystem\@LavaMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createLavaMoveSideBySideSystem(); + /** + * @symbol ?createLavaMoveSystem\@LavaMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createLavaMoveSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/LavaResetFallDistanceSystem.hpp b/LiteLoader/include/llapi/mc/LavaResetFallDistanceSystem.hpp index 431772ee8b..3cc8e4bd7b 100644 --- a/LiteLoader/include/llapi/mc/LavaResetFallDistanceSystem.hpp +++ b/LiteLoader/include/llapi/mc/LavaResetFallDistanceSystem.hpp @@ -10,26 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class LavaResetFallDistanceSystem. - * - */ -class LavaResetFallDistanceSystem { + +namespace LavaResetFallDistanceSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LAVARESETFALLDISTANCESYSTEM -public: - class LavaResetFallDistanceSystem& operator=(class LavaResetFallDistanceSystem const &) = delete; - LavaResetFallDistanceSystem(class LavaResetFallDistanceSystem const &) = delete; - LavaResetFallDistanceSystem() = delete; -#endif - -public: /** - * @symbol ?createLavaResetFallDistanceSystem\@LavaResetFallDistanceSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@LavaResetFallDistanceSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createLavaResetFallDistanceSystem(); + MCAPI struct TickingSystemWithInfo createSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LavaSlime.hpp b/LiteLoader/include/llapi/mc/LavaSlime.hpp index eeb3849cb5..385e9a92c6 100644 --- a/LiteLoader/include/llapi/mc/LavaSlime.hpp +++ b/LiteLoader/include/llapi/mc/LavaSlime.hpp @@ -32,193 +32,188 @@ class LavaSlime : public Slime { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@LavaSlime\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@LavaSlime\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~LavaSlime(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 74 - * @symbol ?isInLava\@LavaSlime\@\@UEBA_NAEBVIConstBlockSource\@\@\@Z + * @vftbl 73 + * @symbol ?isInLava\@LavaSlime\@\@UEBA_NAEBVIConstBlockSource\@\@\@Z */ virtual bool isInLava(class IConstBlockSource const &) const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 88 - * @symbol ?getBrightness\@LavaSlime\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?getBrightness\@LavaSlime\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 105 - * @symbol ?isOnFire\@LavaSlime\@\@MEBA_NXZ + * @vftbl 104 + * @symbol ?isOnFire\@LavaSlime\@\@MEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@LavaSlime\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@LavaSlime\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@LavaSlime\@\@UEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@LavaSlime\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 347 - * @symbol ?jumpFromGround\@LavaSlime\@\@MEAAXXZ + * @vftbl 344 + * @symbol ?jumpFromGround\@LavaSlime\@\@MEAAXAEBVIConstBlockSource\@\@\@Z */ - virtual void jumpFromGround(); + virtual void jumpFromGround(class IConstBlockSource const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@LavaSlime\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@LavaSlime\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @vftbl 360 - * @symbol ?doPlayLandSound\@LavaSlime\@\@MEAA_NXZ + * @vftbl 357 + * @symbol ?doPlayLandSound\@LavaSlime\@\@MEAA_NXZ */ virtual bool doPlayLandSound(); /** - * @vftbl 363 - * @symbol ?decreaseSquish\@LavaSlime\@\@MEAAXXZ + * @vftbl 360 + * @symbol ?decreaseSquish\@LavaSlime\@\@MEAAXXZ */ virtual void decreaseSquish(); /** - * @vftbl 364 - * @symbol ?createChild\@LavaSlime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z + * @vftbl 361 + * @symbol ?createChild\@LavaSlime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z */ virtual class OwnerPtrT createChild(int); /** - * @symbol ??0LavaSlime\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0LavaSlime\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI LavaSlime(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp b/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp new file mode 100644 index 0000000000..e4cfa63712 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LavaTravelSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file LavaTravelSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LavaTravelSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LAVATRAVELSYSTEM +public: + class LavaTravelSystem& operator=(class LavaTravelSystem const &) = delete; + LavaTravelSystem(class LavaTravelSystem const &) = delete; + LavaTravelSystem() = delete; +#endif + +public: + /** + * @symbol ?createLavaTravelSystem\@LavaTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createLavaTravelSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/LayDownGoal.hpp b/LiteLoader/include/llapi/mc/LayDownGoal.hpp index 9b5df644e9..e3f6cf3e38 100644 --- a/LiteLoader/include/llapi/mc/LayDownGoal.hpp +++ b/LiteLoader/include/llapi/mc/LayDownGoal.hpp @@ -30,48 +30,48 @@ class LayDownGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LayDownGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@LayDownGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@LayDownGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@LayDownGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@LayDownGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@LayDownGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@LayDownGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@LayDownGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@LayDownGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@LayDownGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@LayDownGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@LayDownGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@LayDownGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0LayDownGoal\@\@QEAA\@AEAVMob\@\@HH\@Z + * @symbol ??0LayDownGoal\@\@QEAA\@AEAVMob\@\@HH\@Z */ MCAPI LayDownGoal(class Mob &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LayEggGoal.hpp b/LiteLoader/include/llapi/mc/LayEggGoal.hpp index d02113635e..50dcf22810 100644 --- a/LiteLoader/include/llapi/mc/LayEggGoal.hpp +++ b/LiteLoader/include/llapi/mc/LayEggGoal.hpp @@ -31,80 +31,80 @@ class LayEggGoal : public BaseMoveToGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LayEggGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@LayEggGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@LayEggGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@LayEggGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@LayEggGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@LayEggGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@LayEggGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 6 - * @symbol ?tick\@LayEggGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@LayEggGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@LayEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@LayEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@LayEggGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@LayEggGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@LayEggGoal\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@LayEggGoal\@\@MEAAXXZ */ virtual void _moveToBlock(); /** - * @vftbl 17 - * @symbol ?findTargetBlock\@LayEggGoal\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?findTargetBlock\@LayEggGoal\@\@UEAA_NXZ */ virtual bool findTargetBlock(); /** - * @symbol ??0LayEggGoal\@\@QEAA\@AEAVMob\@\@MHHMAEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@AEBV?$vector\@W4MaterialType\@\@V?$allocator\@W4MaterialType\@\@\@std\@\@\@3\@_N3MAEBVItemDescriptor\@\@AEBVActorDefinitionTrigger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ??0LayEggGoal\@\@QEAA\@AEAVMob\@\@MHHMAEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@AEBV?$vector\@W4MaterialType\@\@V?$allocator\@W4MaterialType\@\@\@std\@\@\@3\@_N3MAEBVItemDescriptor\@\@AEBVActorDefinitionTrigger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI LayEggGoal(class Mob &, float, int, int, float, std::vector const &, std::vector const &, bool, bool, float, class ItemDescriptor const &, class ActorDefinitionTrigger const &, std::string const &); //protected: /** - * @symbol ?_isTargetBlock\@LayEggGoal\@\@IEBA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?_isTargetBlock\@LayEggGoal\@\@IEBA_NAEBVBlockLegacy\@\@\@Z */ MCAPI bool _isTargetBlock(class BlockLegacy const &) const; /** - * @symbol ?_layEgg\@LayEggGoal\@\@IEAAXAEBVBlockPos\@\@\@Z + * @symbol ?_layEgg\@LayEggGoal\@\@IEAAXAEBVBlockPos\@\@\@Z */ MCAPI void _layEgg(class BlockPos const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp index ce1f22b129..98020f9d5c 100644 --- a/LiteLoader/include/llapi/mc/LayeredAbilities.hpp +++ b/LiteLoader/include/llapi/mc/LayeredAbilities.hpp @@ -23,108 +23,108 @@ class LayeredAbilities { #undef AFTER_EXTRA public: /** - * @symbol ??0LayeredAbilities\@\@QEAA\@XZ + * @symbol ??0LayeredAbilities\@\@QEAA\@XZ */ MCAPI LayeredAbilities(); /** - * @symbol ??0LayeredAbilities\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0LayeredAbilities\@\@QEAA\@AEBV0\@\@Z */ MCAPI LayeredAbilities(class LayeredAbilities const &); /** - * @symbol ?addSaveData\@LayeredAbilities\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addSaveData\@LayeredAbilities\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addSaveData(class CompoundTag &) const; /** - * @symbol ?forEachAbility\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@PEBD\@Z\@std\@\@W4Options\@Ability\@\@\@Z + * @symbol ?forEachAbility\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@PEBD\@Z\@std\@\@W4Options\@Ability\@\@\@Z */ MCAPI void forEachAbility(class std::function const &, enum class Ability::Options) const; /** - * @symbol ?forEachAbility\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z + * @symbol ?forEachAbility\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@W4Options\@Ability\@\@\@Z */ MCAPI void forEachAbility(class std::function const &, enum class Ability::Options) const; /** - * @symbol ?forEachLayer\@LayeredAbilities\@\@QEAAXAEBV?$function\@$$A6AXW4AbilitiesLayer\@\@AEAVAbilities\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachLayer\@LayeredAbilities\@\@QEAAXAEBV?$function\@$$A6AXW4AbilitiesLayer\@\@AEAVAbilities\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachLayer(class std::function const &); /** - * @symbol ?forEachLayer\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXW4AbilitiesLayer\@\@AEBVAbilities\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachLayer\@LayeredAbilities\@\@QEBAXAEBV?$function\@$$A6AXW4AbilitiesLayer\@\@AEBVAbilities\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachLayer(class std::function const &) const; /** - * @symbol ?getAbility\@LayeredAbilities\@\@QEAAAEAVAbility\@\@W4AbilitiesLayer\@\@W4AbilitiesIndex\@\@\@Z + * @symbol ?getAbility\@LayeredAbilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z */ - MCAPI class Ability & getAbility(enum class AbilitiesLayer, enum class AbilitiesIndex); + MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const; /** - * @symbol ?getAbility\@LayeredAbilities\@\@QEBAAEBVAbility\@\@W4AbilitiesIndex\@\@\@Z + * @symbol ?getAbility\@LayeredAbilities\@\@QEAAAEAVAbility\@\@W4AbilitiesLayer\@\@W4AbilitiesIndex\@\@\@Z */ - MCAPI class Ability const & getAbility(enum class AbilitiesIndex) const; + MCAPI class Ability & getAbility(enum class AbilitiesLayer, enum class AbilitiesIndex); /** - * @symbol ?getBool\@LayeredAbilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z + * @symbol ?getBool\@LayeredAbilities\@\@QEBA_NW4AbilitiesIndex\@\@\@Z */ MCAPI bool getBool(enum class AbilitiesIndex) const; /** - * @symbol ?getCommandPermissions\@LayeredAbilities\@\@QEBA?AW4CommandPermissionLevel\@\@XZ + * @symbol ?getCommandPermissions\@LayeredAbilities\@\@QEBA?AW4CommandPermissionLevel\@\@XZ */ MCAPI enum class CommandPermissionLevel getCommandPermissions() const; /** - * @symbol ?getFloat\@LayeredAbilities\@\@QEBAMW4AbilitiesIndex\@\@\@Z + * @symbol ?getFloat\@LayeredAbilities\@\@QEBAMW4AbilitiesIndex\@\@\@Z */ MCAPI float getFloat(enum class AbilitiesIndex) const; /** - * @symbol ?getLayer\@LayeredAbilities\@\@QEAAAEAVAbilities\@\@W4AbilitiesLayer\@\@\@Z + * @symbol ?getLayer\@LayeredAbilities\@\@QEAAAEAVAbilities\@\@W4AbilitiesLayer\@\@\@Z */ MCAPI class Abilities & getLayer(enum class AbilitiesLayer); /** - * @symbol ?getPermissionsHandler\@LayeredAbilities\@\@QEAAAEAVPermissionsHandler\@\@XZ + * @symbol ?getPermissionsHandler\@LayeredAbilities\@\@QEAAAEAVPermissionsHandler\@\@XZ */ MCAPI class PermissionsHandler & getPermissionsHandler(); /** - * @symbol ?getPlayerPermissions\@LayeredAbilities\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ + * @symbol ?getPlayerPermissions\@LayeredAbilities\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel getPlayerPermissions() const; /** - * @symbol ?loadSaveData\@LayeredAbilities\@\@QEAA_NAEBVCompoundTag\@\@\@Z + * @symbol ?loadSaveData\@LayeredAbilities\@\@QEAA_NAEBVCompoundTag\@\@\@Z */ MCAPI bool loadSaveData(class CompoundTag const &); /** - * @symbol ??4LayeredAbilities\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4LayeredAbilities\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class LayeredAbilities & operator=(class LayeredAbilities const &); /** - * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z + * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z */ - MCAPI void setAbility(enum class AbilitiesIndex, float); + MCAPI void setAbility(enum class AbilitiesIndex, bool); /** - * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@_N\@Z + * @symbol ?setAbility\@LayeredAbilities\@\@QEAAXW4AbilitiesIndex\@\@M\@Z */ - MCAPI void setAbility(enum class AbilitiesIndex, bool); + MCAPI void setAbility(enum class AbilitiesIndex, float); /** - * @symbol ?setCommandPermissions\@LayeredAbilities\@\@QEAAXW4CommandPermissionLevel\@\@\@Z + * @symbol ?setCommandPermissions\@LayeredAbilities\@\@QEAAXW4CommandPermissionLevel\@\@\@Z */ MCAPI void setCommandPermissions(enum class CommandPermissionLevel); /** - * @symbol ?setPermissions\@LayeredAbilities\@\@QEAAXAEBVPermissionsHandler\@\@\@Z + * @symbol ?setPermissions\@LayeredAbilities\@\@QEAAXAEBVPermissionsHandler\@\@\@Z */ MCAPI void setPermissions(class PermissionsHandler const &); /** - * @symbol ?setPlayerPermissions\@LayeredAbilities\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z + * @symbol ?setPlayerPermissions\@LayeredAbilities\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z */ MCAPI void setPlayerPermissions(enum class PlayerPermissionLevel); /** - * @symbol ?DIFF_LAYER_AT\@LayeredAbilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_LAYER_AT\@LayeredAbilities\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_LAYER_AT; /** - * @symbol ?getDiff\@LayeredAbilities\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z + * @symbol ?getDiff\@LayeredAbilities\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z */ MCAPI static class std::optional getDiff(class LayeredAbilities const &, class LayeredAbilities const &); //private: /** - * @symbol ?_handlePlayerPermissionsChange\@LayeredAbilities\@\@AEAAXW4PlayerPermissionLevel\@\@0\@Z + * @symbol ?_handlePlayerPermissionsChange\@LayeredAbilities\@\@AEAAXW4PlayerPermissionLevel\@\@0\@Z */ MCAPI void _handlePlayerPermissionsChange(enum class PlayerPermissionLevel, enum class PlayerPermissionLevel); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeadItem.hpp b/LiteLoader/include/llapi/mc/LeadItem.hpp index 6cd4f491af..13d6d4cc50 100644 --- a/LiteLoader/include/llapi/mc/LeadItem.hpp +++ b/LiteLoader/include/llapi/mc/LeadItem.hpp @@ -32,91 +32,91 @@ class LeadItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LeadItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@LeadItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@LeadItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0LeadItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LeadItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LeadItem(std::string const &, int); /** - * @symbol ?bindPlayerMobs\@LeadItem\@\@SA_NAEAVActor\@\@HHHPEAVItemInstance\@\@\@Z + * @symbol ?bindPlayerMobs\@LeadItem\@\@SA_NAEAVActor\@\@HHHPEAVItemInstance\@\@\@Z */ MCAPI static bool bindPlayerMobs(class Actor &, int, int, int, class ItemInstance *); /** - * @symbol ?canBindPlayerMobs\@LeadItem\@\@SA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canBindPlayerMobs\@LeadItem\@\@SA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool canBindPlayerMobs(class Actor const &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeafBlock.hpp b/LiteLoader/include/llapi/mc/LeafBlock.hpp index 5f08990380..1d2f9a5d05 100644 --- a/LiteLoader/include/llapi/mc/LeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeafBlock.hpp @@ -31,293 +31,304 @@ class LeafBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LeafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@LeafBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@LeafBlock\@\@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 + * @vftbl 24 + * @symbol ?canProvideMultifaceSupport\@LeafBlock\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool canProvideMultifaceSupport(class Block const &, unsigned char) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LeafBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@LeafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@LeafBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@LeafBlock\@\@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 102 + * @symbol ?spawnResources\@LeafBlock\@\@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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LeafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LeafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 136 - * @symbol ?getColor\@LeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@LeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 139 - * @symbol ?isSeasonTinted\@LeafBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 139 + * @symbol ?isSeasonTinted\@LeafBlock\@\@UEBA_NAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isSeasonTinted(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@LeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@LeafBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@LeafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 180 - * @symbol ?getRenderLayer\@LeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 181 + * @symbol ?getRenderLayer\@LeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@LeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @symbol ?getMapColor\@LeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@LeafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@LeafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@LeafBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@LeafBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?getExtraResourceItem\@LeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getExtraResourceItem\@LeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getExtraResourceItem(class Block const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEAFBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LeafBlock(); +#endif /** - * @symbol ??0LeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0LeafBlock\@\@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); /** - * @symbol ?getSeasonsColor\@LeafBlock\@\@QEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?getSeasonsColor\@LeafBlock\@\@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\@LeafBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI static void runDecay(class BlockSource &, class BlockPos const &, int); //protected: /** - * @symbol ?_getSapling\@LeafBlock\@\@IEBAAEBVBlock\@\@XZ + * @symbol ?_getSapling\@LeafBlock\@\@IEBAAEBVBlock\@\@XZ */ MCAPI class Block const & _getSapling() const; /** - * @symbol ?_isTransparent\@LeafBlock\@\@KA_NAEBVBlock\@\@AEBW4BlockProperty\@\@\@Z + * @symbol ?_isTransparent\@LeafBlock\@\@KA_NAEBVBlock\@\@AEBW4BlockProperty\@\@\@Z */ MCAPI static bool _isTransparent(class Block const &, enum class BlockProperty const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeafBlockItem.hpp b/LiteLoader/include/llapi/mc/LeafBlockItem.hpp index 14c695031b..a3eef32a28 100644 --- a/LiteLoader/include/llapi/mc/LeafBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/LeafBlockItem.hpp @@ -32,94 +32,94 @@ class LeafBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LeafBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@LeafBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@LeafBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ 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 + * @vftbl 95 + * @symbol ?buildDescriptionId\@LeafBlockItem\@\@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 + * @vftbl 105 + * @symbol ?fixupCommon\@LeafBlockItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; /** - * @vftbl 106 - * @symbol ?fixupCommon\@LeafBlockItem\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z + * @vftbl 106 + * @symbol ?fixupCommon\@LeafBlockItem\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &, class Level &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp b/LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp index 7c80895c75..2029c3a8ba 100644 --- a/LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/LeapAtTargetGoal.hpp @@ -30,48 +30,48 @@ class LeapAtTargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LeapAtTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@LeapAtTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@LeapAtTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@LeapAtTargetGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@LeapAtTargetGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@LeapAtTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@LeapAtTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@LeapAtTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@LeapAtTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0LeapAtTargetGoal\@\@QEAA\@AEAVMob\@\@M_N1\@Z + * @symbol ??0LeapAtTargetGoal\@\@QEAA\@AEAVMob\@\@M_N1\@Z */ MCAPI LeapAtTargetGoal(class Mob &, float, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp index e79b91fcea..3c53e3f2c7 100644 --- a/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp +++ b/LiteLoader/include/llapi/mc/LeashFenceKnotActor.hpp @@ -32,192 +32,192 @@ class LeashFenceKnotActor : public HangingActor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@LeashFenceKnotActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@LeashFenceKnotActor\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~LeashFenceKnotActor(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@LeashFenceKnotActor\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 44 - * @symbol ?teleportTo\@LeashFenceKnotActor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@LeashFenceKnotActor\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@LeashFenceKnotActor\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@LeashFenceKnotActor\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@LeashFenceKnotActor\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@LeashFenceKnotActor\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 231 - * @symbol ?getInteraction\@LeashFenceKnotActor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z + * @vftbl 230 + * @symbol ?getInteraction\@LeashFenceKnotActor\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@LeashFenceKnotActor\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@LeashFenceKnotActor\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@LeashFenceKnotActor\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@LeashFenceKnotActor\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@LeashFenceKnotActor\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@LeashFenceKnotActor\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?setDir\@LeashFenceKnotActor\@\@UEAAXH\@Z + * @vftbl 276 + * @symbol ?setDir\@LeashFenceKnotActor\@\@UEAAXH\@Z */ virtual void setDir(int); /** - * @vftbl 279 - * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ + * @vftbl 277 + * @symbol ?getWidth\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getWidth() const; /** - * @vftbl 280 - * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ + * @vftbl 278 + * @symbol ?getHeight\@LeashFenceKnotActor\@\@UEBAHXZ */ virtual int getHeight() const; /** - * @vftbl 281 - * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ + * @vftbl 279 + * @symbol ?dropItem\@LeashFenceKnotActor\@\@UEAAXXZ */ virtual void dropItem(); /** - * @vftbl 283 - * @symbol ?wouldSurvive\@LeashFenceKnotActor\@\@UEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 281 + * @symbol ?wouldSurvive\@LeashFenceKnotActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool wouldSurvive(class BlockSource &); /** - * @symbol ??0LeashFenceKnotActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0LeashFenceKnotActor\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI LeashFenceKnotActor(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?numberofAnimalsAttached\@LeashFenceKnotActor\@\@QEAAHXZ + * @symbol ?numberofAnimalsAttached\@LeashFenceKnotActor\@\@QEAAHXZ */ MCAPI int numberofAnimalsAttached(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeashableComponent.hpp b/LiteLoader/include/llapi/mc/LeashableComponent.hpp index b055e12871..f644d92a50 100644 --- a/LiteLoader/include/llapi/mc/LeashableComponent.hpp +++ b/LiteLoader/include/llapi/mc/LeashableComponent.hpp @@ -30,16 +30,16 @@ class LeashableComponent { public: /** - * @symbol ?getInteraction\@LeashableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@LeashableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?leash\@LeashableComponent\@\@QEAAXAEAVActor\@\@0\@Z + * @symbol ?leash\@LeashableComponent\@\@QEAAXAEAVActor\@\@0\@Z */ MCAPI void leash(class Actor &, class Actor &); /** - * @symbol ?unleash\@LeashableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?unleash\@LeashableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void unleash(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeashableDefinition.hpp b/LiteLoader/include/llapi/mc/LeashableDefinition.hpp index c20dbbb05b..22e157be19 100644 --- a/LiteLoader/include/llapi/mc/LeashableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LeashableDefinition.hpp @@ -30,12 +30,12 @@ class LeashableDefinition { public: /** - * @symbol ??0LeashableDefinition\@\@QEAA\@XZ + * @symbol ??0LeashableDefinition\@\@QEAA\@XZ */ MCAPI LeashableDefinition(); /** - * @symbol ?buildSchema\@LeashableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VLeashableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@LeashableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VLeashableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LeashableSystem.hpp b/LiteLoader/include/llapi/mc/LeashableSystem.hpp index 8340f1f7a0..9de6e1244c 100644 --- a/LiteLoader/include/llapi/mc/LeashableSystem.hpp +++ b/LiteLoader/include/llapi/mc/LeashableSystem.hpp @@ -30,19 +30,19 @@ class LeashableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LeashableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@LeashableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@LeashableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LecternBlock.hpp b/LiteLoader/include/llapi/mc/LecternBlock.hpp index f1d4bd77ce..b3ffc7f8d9 100644 --- a/LiteLoader/include/llapi/mc/LecternBlock.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlock.hpp @@ -31,285 +31,290 @@ class LecternBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LecternBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@LecternBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@LecternBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@LecternBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@LecternBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LecternBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@LecternBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@LecternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@LecternBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@LecternBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LecternBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LecternBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 109 - * @symbol ?attack\@LecternBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@LecternBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@LecternBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@LecternBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@LecternBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@LecternBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@LecternBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@LecternBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNBLOCK /** - * @symbol ?hasComparatorSignal\@LecternBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@LecternBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@LecternBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@LecternBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0LecternBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LecternBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LecternBlock(std::string const &, int); /** - * @symbol ?emitRedstonePulse\@LecternBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?emitRedstonePulse\@LecternBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void emitRedstonePulse(class BlockSource &, class BlockPos const &) const; //private: /** - * @symbol ?_dropBook\@LecternBlock\@\@AEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_dropBook\@LecternBlock\@\@AEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _dropBook(class Player &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LecternBlockActor.hpp b/LiteLoader/include/llapi/mc/LecternBlockActor.hpp index eb345ceb9c..8c11947abd 100644 --- a/LiteLoader/include/llapi/mc/LecternBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/LecternBlockActor.hpp @@ -31,93 +31,93 @@ class LecternBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNBLOCKACTOR /** - * @symbol ?_getUpdatePacket\@LecternBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@LecternBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@LecternBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@LecternBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?getContainer\@LecternBlockActor\@\@UEAAPEAVContainer\@\@XZ + * @symbol ?getContainer\@LecternBlockActor\@\@UEAAPEAVContainer\@\@XZ */ MCVAPI class Container * getContainer(); /** - * @symbol ?getContainer\@LecternBlockActor\@\@UEBAPEBVContainer\@\@XZ + * @symbol ?getContainer\@LecternBlockActor\@\@UEBAPEBVContainer\@\@XZ */ MCVAPI class Container const * getContainer() const; /** - * @symbol ?getContainerSize\@LecternBlockActor\@\@UEBAHXZ + * @symbol ?getContainerSize\@LecternBlockActor\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@LecternBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@LecternBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@LecternBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@LecternBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?load\@LecternBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@LecternBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onChanged\@LecternBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onChanged\@LecternBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onChanged(class BlockSource &); /** - * @symbol ?save\@LecternBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@LecternBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?serverInitItemStackIds\@LecternBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@LecternBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@LecternBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@LecternBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@LecternBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@LecternBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@LecternBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@LecternBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); #endif /** - * @symbol ??0LecternBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0LecternBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI LecternBlockActor(class BlockPos const &); /** - * @symbol ?dropBook\@LecternBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?dropBook\@LecternBlockActor\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void dropBook(class BlockSource &); /** - * @symbol ?getPage\@LecternBlockActor\@\@QEBAHXZ + * @symbol ?getPage\@LecternBlockActor\@\@QEBAHXZ */ MCAPI int getPage() const; /** - * @symbol ?getTotalPages\@LecternBlockActor\@\@QEBAHXZ + * @symbol ?getTotalPages\@LecternBlockActor\@\@QEBAHXZ */ MCAPI int getTotalPages() const; /** - * @symbol ?hasBook\@LecternBlockActor\@\@QEBA_NXZ + * @symbol ?hasBook\@LecternBlockActor\@\@QEBA_NXZ */ MCAPI bool hasBook() const; /** - * @symbol ?setItemFromBlock\@LecternBlockActor\@\@QEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItemFromBlock\@LecternBlockActor\@\@QEAAXHAEBVItemStack\@\@\@Z */ MCAPI void setItemFromBlock(int, class ItemStack const &); /** - * @symbol ?setPageOnServer\@LecternBlockActor\@\@QEAAXHAEAVBlockSource\@\@\@Z + * @symbol ?setPageOnServer\@LecternBlockActor\@\@QEAAXHAEAVBlockSource\@\@\@Z */ MCAPI void setPageOnServer(int, class BlockSource &); /** - * @symbol ?setTotalPages\@LecternBlockActor\@\@QEAAXH\@Z + * @symbol ?setTotalPages\@LecternBlockActor\@\@QEAAXH\@Z */ MCAPI void setTotalPages(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp index 53d64e028d..59c0a01943 100644 --- a/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/LecternUpdatePacket.hpp @@ -30,33 +30,39 @@ class LecternUpdatePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LecternUpdatePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LecternUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LecternUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LecternUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LecternUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LecternUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LecternUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LecternUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LECTERNUPDATEPACKET /** - * @symbol ??0LecternUpdatePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LecternUpdatePacket(); +#endif + /** + * @symbol ??0LecternUpdatePacket\@\@QEAA\@XZ */ MCAPI LecternUpdatePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyActorArmorChangedListener.hpp b/LiteLoader/include/llapi/mc/LegacyActorArmorChangedListener.hpp index 9f6b9afb85..6668dca784 100644 --- a/LiteLoader/include/llapi/mc/LegacyActorArmorChangedListener.hpp +++ b/LiteLoader/include/llapi/mc/LegacyActorArmorChangedListener.hpp @@ -28,17 +28,17 @@ class LegacyActorArmorChangedListener { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@LegacyActorArmorChangedListener\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@LegacyActorArmorChangedListener\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); /** - * @symbol ?containerContentChanged\@LegacyActorArmorChangedListener\@\@SAXAEAVActor\@\@\@Z + * @symbol ?containerContentChanged\@LegacyActorArmorChangedListener\@\@QEAAXAEAVActor\@\@\@Z */ - MCAPI static void containerContentChanged(class Actor &); + MCAPI void containerContentChanged(class Actor &); /** - * @symbol ?initializeEntity\@LegacyActorArmorChangedListener\@\@SAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeEntity\@LegacyActorArmorChangedListener\@\@SAXAEAVEntityContext\@\@\@Z */ MCAPI static void initializeEntity(class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp b/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp index 74fbca06bf..45acdf2835 100644 --- a/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp +++ b/LiteLoader/include/llapi/mc/LegacyActorExtractApplySystem.hpp @@ -28,12 +28,12 @@ class LegacyActorExtractApplySystem { public: /** - * @symbol ?createApplySystem\@LegacyActorExtractApplySystem\@\@SA?AUTickingSystemWithInfo\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@_N\@Z + * @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 + * @symbol ?createExtractSystem\@LegacyActorExtractApplySystem\@\@SA?AUTickingSystemWithInfo\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@_N\@Z */ MCAPI static struct TickingSystemWithInfo createExtractSystem(std::vector const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyBlendedNoise.hpp b/LiteLoader/include/llapi/mc/LegacyBlendedNoise.hpp index 720eb2e5c4..72746a8086 100644 --- a/LiteLoader/include/llapi/mc/LegacyBlendedNoise.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBlendedNoise.hpp @@ -30,12 +30,12 @@ class LegacyBlendedNoise { public: /** - * @symbol ??1LegacyBlendedNoise\@\@QEAA\@XZ + * @symbol ??1LegacyBlendedNoise\@\@QEAA\@XZ */ MCAPI ~LegacyBlendedNoise(); /** - * @symbol ?make\@LegacyBlendedNoise\@\@SA?AV1\@AEAVIRandom\@\@\@Z + * @symbol ?make\@LegacyBlendedNoise\@\@SA?AV1\@AEAVIRandom\@\@\@Z */ MCAPI static class LegacyBlendedNoise make(class IRandom &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyBlockIdMappingUtils.hpp b/LiteLoader/include/llapi/mc/LegacyBlockIdMappingUtils.hpp index cdc755bc0c..ae650961ea 100644 --- a/LiteLoader/include/llapi/mc/LegacyBlockIdMappingUtils.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBlockIdMappingUtils.hpp @@ -20,19 +20,19 @@ namespace LegacyBlockIdMappingUtils { #undef AFTER_EXTRA /** - * @symbol ?addLegacyBlockIdMapping\@LegacyBlockIdMappingUtils\@\@YAXAEBVBlockLegacy\@\@_K\@Z + * @symbol ?addLegacyBlockIdMapping\@LegacyBlockIdMappingUtils\@\@YAXAEBVBlockLegacy\@\@_K\@Z */ MCAPI void addLegacyBlockIdMapping(class BlockLegacy const &, unsigned __int64); /** - * @symbol ?addLegacyBlockIdMappings\@LegacyBlockIdMappingUtils\@\@YAXXZ + * @symbol ?addLegacyBlockIdMappings\@LegacyBlockIdMappingUtils\@\@YAXXZ */ MCAPI void addLegacyBlockIdMappings(); /** - * @symbol ?mBlockIdToVanillaBlockTypesMap\@LegacyBlockIdMappingUtils\@\@3V?$unordered_map\@IV?$WeakPtr\@VBlockLegacy\@\@\@\@U?$hash\@I\@std\@\@U?$equal_to\@I\@3\@V?$allocator\@U?$pair\@$$CBIV?$WeakPtr\@VBlockLegacy\@\@\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mBlockIdToVanillaBlockTypesMap\@LegacyBlockIdMappingUtils\@\@3V?$unordered_map\@IV?$WeakPtr\@VBlockLegacy\@\@\@\@U?$hash\@I\@std\@\@U?$equal_to\@I\@3\@V?$allocator\@U?$pair\@$$CBIV?$WeakPtr\@VBlockLegacy\@\@\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI extern class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> mBlockIdToVanillaBlockTypesMap; /** - * @symbol ?mBlockNameToBlockIdMap\@LegacyBlockIdMappingUtils\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@std\@\@A + * @symbol ?mBlockNameToBlockIdMap\@LegacyBlockIdMappingUtils\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@std\@\@A */ MCAPI extern class std::unordered_map, struct std::equal_to, class std::allocator>> mBlockNameToBlockIdMap; diff --git a/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp b/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp index 5f3aeef503..d206911976 100644 --- a/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBlockPlacementProcessor.hpp @@ -30,24 +30,24 @@ class LegacyBlockPlacementProcessor { public: /** - * @symbol ??0LegacyBlockPlacementProcessor\@\@QEAA\@AEBVLegacyStructureSettings\@\@\@Z + * @symbol ??0LegacyBlockPlacementProcessor\@\@QEAA\@AEBVLegacyStructureSettings\@\@\@Z */ MCAPI LegacyBlockPlacementProcessor(class LegacyStructureSettings const &); /** - * @symbol ?applyBlockRules\@LegacyBlockPlacementProcessor\@\@QEAAPEBVBlock\@\@AEAVBlockSource\@\@AEAVBlockPos\@\@PEBV2\@AEBV4\@\@Z + * @symbol ?applyBlockRules\@LegacyBlockPlacementProcessor\@\@QEAAPEBVBlock\@\@AEAVBlockSource\@\@AEAVBlockPos\@\@PEBV2\@AEBV4\@\@Z */ MCAPI class Block const * applyBlockRules(class BlockSource &, class BlockPos &, class Block const *, class BlockPos const &); /** - * @symbol ?applyGravity\@LegacyBlockPlacementProcessor\@\@QEBAAEAVBlockPos\@\@AEAVBlockSource\@\@HAEAV2\@\@Z + * @symbol ?applyGravity\@LegacyBlockPlacementProcessor\@\@QEBAAEAVBlockPos\@\@AEAVBlockSource\@\@HAEAV2\@\@Z */ MCAPI class BlockPos & applyGravity(class BlockSource &, int, class BlockPos &) const; /** - * @symbol ?canPlace\@LegacyBlockPlacementProcessor\@\@QEAA_NXZ + * @symbol ?canPlace\@LegacyBlockPlacementProcessor\@\@QEAA_NXZ */ MCAPI bool canPlace(); /** - * @symbol ??1LegacyBlockPlacementProcessor\@\@QEAA\@XZ + * @symbol ??1LegacyBlockPlacementProcessor\@\@QEAA\@XZ */ MCAPI ~LegacyBlockPlacementProcessor(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyBodyControl.hpp b/LiteLoader/include/llapi/mc/LegacyBodyControl.hpp index bd1cc1d50e..426ea11357 100644 --- a/LiteLoader/include/llapi/mc/LegacyBodyControl.hpp +++ b/LiteLoader/include/llapi/mc/LegacyBodyControl.hpp @@ -29,18 +29,18 @@ class LegacyBodyControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyBodyControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?clientTick\@LegacyBodyControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?clientTick\@LegacyBodyControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void clientTick(class Mob &); /** - * @symbol ??0LegacyBodyControl\@\@QEAA\@XZ + * @symbol ??0LegacyBodyControl\@\@QEAA\@XZ */ MCAPI LegacyBodyControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp b/LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp index 9b3ebe9144..1e9cb747e2 100644 --- a/LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp +++ b/LiteLoader/include/llapi/mc/LegacyChunkStorage.hpp @@ -31,52 +31,52 @@ class LegacyChunkStorage : public ChunkSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyChunkStorage(); + virtual void __unk_vfn_0(); /** - * @vftbl 11 - * @symbol ?loadChunk\@LegacyChunkStorage\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @vftbl 11 + * @symbol ?loadChunk\@LegacyChunkStorage\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ virtual void loadChunk(class LevelChunk &, bool); /** - * @vftbl 13 - * @symbol ?saveLiveChunk\@LegacyChunkStorage\@\@UEAA_NAEAVLevelChunk\@\@\@Z + * @vftbl 13 + * @symbol ?saveLiveChunk\@LegacyChunkStorage\@\@UEAA_NAEAVLevelChunk\@\@\@Z */ virtual bool saveLiveChunk(class LevelChunk &); /** - * @vftbl 18 - * @symbol ?acquireDiscarded\@LegacyChunkStorage\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z + * @vftbl 18 + * @symbol ?acquireDiscarded\@LegacyChunkStorage\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z */ virtual void acquireDiscarded(class std::unique_ptr); /** - * @symbol ??0LegacyChunkStorage\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@W4StorageVersion\@\@AEAVBiome\@\@\@Z + * @symbol ??0LegacyChunkStorage\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@W4StorageVersion\@\@AEAVBiome\@\@\@Z */ MCAPI LegacyChunkStorage(std::unique_ptr, class LevelStorage &, enum class StorageVersion, class Biome &); //private: /** - * @symbol ?_isImported\@LegacyChunkStorage\@\@AEAA_NAEBVChunkPos\@\@\@Z + * @symbol ?_isImported\@LegacyChunkStorage\@\@AEAA_NAEBVChunkPos\@\@\@Z */ MCAPI bool _isImported(class ChunkPos const &); /** - * @symbol ?_loadChunk\@LegacyChunkStorage\@\@AEAA_NAEAVLevelChunk\@\@\@Z + * @symbol ?_loadChunk\@LegacyChunkStorage\@\@AEAA_NAEAVLevelChunk\@\@\@Z */ MCAPI bool _loadChunk(class LevelChunk &); /** - * @symbol ?_loadEntities\@LegacyChunkStorage\@\@AEAAXXZ + * @symbol ?_loadEntities\@LegacyChunkStorage\@\@AEAAXXZ */ MCAPI void _loadEntities(); /** - * @symbol ?_markChunkAsImported\@LegacyChunkStorage\@\@AEAAXAEBVChunkPos\@\@\@Z + * @symbol ?_markChunkAsImported\@LegacyChunkStorage\@\@AEAAXAEBVChunkPos\@\@\@Z */ MCAPI void _markChunkAsImported(class ChunkPos const &); /** - * @symbol ?_openRegionFile\@LegacyChunkStorage\@\@AEAA_NXZ + * @symbol ?_openRegionFile\@LegacyChunkStorage\@\@AEAA_NXZ */ MCAPI bool _openRegionFile(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp b/LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp index 8a43bd5a3b..6bbec1db16 100644 --- a/LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyEmeraldOreFeature.hpp @@ -31,14 +31,14 @@ class LegacyEmeraldOreFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyEmeraldOreFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacyEmeraldOreFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacyEmeraldOreFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp b/LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp index b269d2dd5b..f4db51ebfd 100644 --- a/LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyFlowerFeature.hpp @@ -31,18 +31,18 @@ class LegacyFlowerFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyFlowerFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacyFlowerFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacyFlowerFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacyFlowerFeature\@\@QEAA\@W4FlowerPlacementType\@\@\@Z + * @symbol ??0LegacyFlowerFeature\@\@QEAA\@W4FlowerPlacementType\@\@\@Z */ MCAPI LegacyFlowerFeature(enum class FlowerPlacementType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp b/LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp index a6cc3bcf5a..b4c6f67375 100644 --- a/LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyForestFoliageFeature.hpp @@ -31,18 +31,18 @@ class LegacyForestFoliageFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyForestFoliageFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacyForestFoliageFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacyForestFoliageFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacyForestFoliageFeature\@\@QEAA\@W4Type\@0\@AEAVFeatureRegistry\@\@\@Z + * @symbol ??0LegacyForestFoliageFeature\@\@QEAA\@W4Type\@0\@AEAVFeatureRegistry\@\@\@Z */ MCAPI LegacyForestFoliageFeature(enum class LegacyForestFoliageFeature::Type, class FeatureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp b/LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp index ad6cb4779d..223c4cac87 100644 --- a/LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyForestRockFeature.hpp @@ -31,18 +31,18 @@ class LegacyForestRockFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyForestRockFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacyForestRockFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacyForestRockFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacyForestRockFeature\@\@QEAA\@AEBVFeatureRegistry\@\@\@Z + * @symbol ??0LegacyForestRockFeature\@\@QEAA\@AEBVFeatureRegistry\@\@\@Z */ MCAPI LegacyForestRockFeature(class FeatureRegistry const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyIceFeature.hpp b/LiteLoader/include/llapi/mc/LegacyIceFeature.hpp index 542e8e2c95..c3a9e6b2cb 100644 --- a/LiteLoader/include/llapi/mc/LegacyIceFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyIceFeature.hpp @@ -31,18 +31,18 @@ class LegacyIceFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyIceFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacyIceFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacyIceFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacyIceFeature\@\@QEAA\@AEBVFeatureRegistry\@\@\@Z + * @symbol ??0LegacyIceFeature\@\@QEAA\@AEBVFeatureRegistry\@\@\@Z */ MCAPI LegacyIceFeature(class FeatureRegistry const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp b/LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp index abebfc0ab6..7f21382beb 100644 --- a/LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp +++ b/LiteLoader/include/llapi/mc/LegacyJigsawPlacement.hpp @@ -30,32 +30,32 @@ class LegacyJigsawPlacement { public: /** - * @symbol ??0LegacyJigsawPlacement\@\@QEAA\@HV?$function\@$$A6A?AV?$unique_ptr\@VPoolElementStructurePiece\@\@U?$default_delete\@VPoolElementStructurePiece\@\@\@std\@\@\@std\@\@AEBVStructurePoolElement\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z\@std\@\@\@Z + * @symbol ??0LegacyJigsawPlacement\@\@QEAA\@HV?$function\@$$A6A?AV?$unique_ptr\@VPoolElementStructurePiece\@\@U?$default_delete\@VPoolElementStructurePiece\@\@\@std\@\@\@std\@\@AEBVStructurePoolElement\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z\@std\@\@\@Z */ MCAPI LegacyJigsawPlacement(int, class std::function (class StructurePoolElement const &, class BlockPos const &, enum class Rotation const &, int, struct JigsawJunction &, class BoundingBox const &, class BlockPos const &)>); /** - * @symbol ?addPieces\@LegacyJigsawPlacement\@\@QEAAXAEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVStructurePoolElement\@\@AEAVRandom\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@\@Z + * @symbol ?addPieces\@LegacyJigsawPlacement\@\@QEAAXAEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVStructurePoolElement\@\@AEAVRandom\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@\@Z */ MCAPI void addPieces(std::vector> &, class StructurePoolElement const &, class Random &, class BlockPos const &, enum class Rotation const &, class JigsawStructureRegistry const &, class Dimension &); /** - * @symbol ??1LegacyJigsawPlacement\@\@QEAA\@XZ + * @symbol ??1LegacyJigsawPlacement\@\@QEAA\@XZ */ MCAPI ~LegacyJigsawPlacement(); //private: /** - * @symbol ?_addPiece\@LegacyJigsawPlacement\@\@AEAAXAEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVPoolElementStructurePiece\@\@AEAVRandom\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@AEAVBlockVolume\@\@3\@Z + * @symbol ?_addPiece\@LegacyJigsawPlacement\@\@AEAAXAEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVPoolElementStructurePiece\@\@AEAVRandom\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@AEAVBlockVolume\@\@3\@Z */ MCAPI void _addPiece(std::vector> &, class PoolElementStructurePiece const &, class Random &, class BlockPos const &, enum class Rotation const &, class JigsawStructureRegistry const &, class Dimension &, class BlockVolume &, class BlockPos const &); /** - * @symbol ?_tryPlacingPiece\@LegacyJigsawPlacement\@\@AEAA_NAEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVPoolElementStructurePiece\@\@AEAVRandom\@\@AEBVJigsawBlockInfo\@\@AEBVBoundingBox\@\@AEAV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@3\@AEBVBlockPos\@\@PEBVStructureTemplatePool\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@AEAVBlockVolume\@\@6\@Z + * @symbol ?_tryPlacingPiece\@LegacyJigsawPlacement\@\@AEAA_NAEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVPoolElementStructurePiece\@\@AEAVRandom\@\@AEBVJigsawBlockInfo\@\@AEBVBoundingBox\@\@AEAV?$vector\@VBoundingBox\@\@V?$allocator\@VBoundingBox\@\@\@std\@\@\@3\@AEBVBlockPos\@\@PEBVStructureTemplatePool\@\@AEBVJigsawStructureRegistry\@\@AEAVDimension\@\@AEAVBlockVolume\@\@6\@Z */ MCAPI bool _tryPlacingPiece(std::vector> &, class PoolElementStructurePiece const &, class Random &, class JigsawBlockInfo const &, class BoundingBox const &, std::vector &, class BlockPos const &, class StructureTemplatePool const *, class JigsawStructureRegistry const &, class Dimension &, class BlockVolume &, class BlockPos const &); /** - * @symbol ?_setTerrainAdjustment\@LegacyJigsawPlacement\@\@CA?AV?$shared_ptr\@_N\@std\@\@W4AdjustmentEffect\@\@AEBVBoundingBox\@\@AEBUJigsawJunction\@\@AEAVDimension\@\@\@Z + * @symbol ?_setTerrainAdjustment\@LegacyJigsawPlacement\@\@CA?AV?$shared_ptr\@_N\@std\@\@W4AdjustmentEffect\@\@AEBVBoundingBox\@\@AEBUJigsawJunction\@\@AEAVDimension\@\@\@Z */ MCAPI static class std::shared_ptr _setTerrainAdjustment(enum class AdjustmentEffect, class BoundingBox const &, struct JigsawJunction const &, class Dimension &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp b/LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp index 91116a2c0e..d66c81f872 100644 --- a/LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp +++ b/LiteLoader/include/llapi/mc/LegacyPackIdVersion.hpp @@ -30,15 +30,15 @@ struct LegacyPackIdVersion { public: /** - * @symbol ??0LegacyPackIdVersion\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ??0LegacyPackIdVersion\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI LegacyPackIdVersion(std::string const &, std::string const &); /** - * @symbol ?getUpgradedPackId\@LegacyPackIdVersion\@\@QEBA?AUPackIdVersion\@\@XZ + * @symbol ?getUpgradedPackId\@LegacyPackIdVersion\@\@QEBA?AUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion getUpgradedPackId() const; /** - * @symbol ??1LegacyPackIdVersion\@\@QEAA\@XZ + * @symbol ??1LegacyPackIdVersion\@\@QEAA\@XZ */ MCAPI ~LegacyPackIdVersion(); diff --git a/LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp b/LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp index bab0580705..1672829f78 100644 --- a/LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacySmallMushroomsFeature.hpp @@ -31,18 +31,18 @@ class LegacySmallMushroomsFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacySmallMushroomsFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacySmallMushroomsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacySmallMushroomsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacySmallMushroomsFeature\@\@QEAA\@AEBVFeatureRegistry\@\@\@Z + * @symbol ??0LegacySmallMushroomsFeature\@\@QEAA\@AEBVFeatureRegistry\@\@\@Z */ MCAPI LegacySmallMushroomsFeature(class FeatureRegistry const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp b/LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp index b91c065f70..01e3b9de9e 100644 --- a/LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacySpringsFeature.hpp @@ -31,18 +31,18 @@ class LegacySpringsFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacySpringsFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacySpringsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacySpringsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacySpringsFeature\@\@QEAA\@AEBVFeatureRegistry\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ??0LegacySpringsFeature\@\@QEAA\@AEBVFeatureRegistry\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI LegacySpringsFeature(class FeatureRegistry const &, class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp b/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp index e7088633f3..16dc815592 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureActorInfo.hpp @@ -28,8 +28,8 @@ class LegacyStructureActorInfo { public: /** - * @symbol ??0LegacyStructureActorInfo\@\@QEAA\@AEBVVec3\@\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z + * @symbol ??0LegacyStructureActorInfo\@\@QEAA\@AEBVVec3\@\@AEBVBlockPos\@\@VCompoundTag\@\@\@Z */ MCAPI LegacyStructureActorInfo(class Vec3 const &, class BlockPos const &, class CompoundTag); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp b/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp index a2574fc32c..7cb85ed7ad 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureBlockInfo.hpp @@ -28,8 +28,8 @@ class LegacyStructureBlockInfo { public: /** - * @symbol ??0LegacyStructureBlockInfo\@\@QEAA\@AEBVBlockPos\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVBlock\@\@2\@Z + * @symbol ??0LegacyStructureBlockInfo\@\@QEAA\@AEBVBlockPos\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVBlock\@\@2\@Z */ MCAPI LegacyStructureBlockInfo(class BlockPos const &, std::unique_ptr, class Block const &, class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp b/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp index 4a35899cdb..d30d22d679 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureBlockPalette.hpp @@ -29,24 +29,24 @@ class LegacyStructureBlockPalette { public: /** - * @symbol ??0LegacyStructureBlockPalette\@\@QEAA\@XZ + * @symbol ??0LegacyStructureBlockPalette\@\@QEAA\@XZ */ MCAPI LegacyStructureBlockPalette(); /** - * @symbol ?addMapping\@LegacyStructureBlockPalette\@\@QEAAXHAEBVBlock\@\@\@Z + * @symbol ?addMapping\@LegacyStructureBlockPalette\@\@QEAAXHAEBVBlock\@\@\@Z */ MCAPI void addMapping(int, class Block const &); /** - * @symbol ?clearMap\@LegacyStructureBlockPalette\@\@QEAAXXZ + * @symbol ?clearMap\@LegacyStructureBlockPalette\@\@QEAAXXZ */ MCAPI void clearMap(); /** - * @symbol ?getBlock\@LegacyStructureBlockPalette\@\@QEAAAEBVBlock\@\@H\@Z + * @symbol ?getBlock\@LegacyStructureBlockPalette\@\@QEAAAEBVBlock\@\@H\@Z */ MCAPI class Block const & getBlock(int); /** - * @symbol ??1LegacyStructureBlockPalette\@\@QEAA\@XZ + * @symbol ??1LegacyStructureBlockPalette\@\@QEAA\@XZ */ MCAPI ~LegacyStructureBlockPalette(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp index bf7c54ecf6..42ea15bef1 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureSettings.hpp @@ -29,116 +29,116 @@ class LegacyStructureSettings { public: /** - * @symbol ??0LegacyStructureSettings\@\@QEAA\@XZ + * @symbol ??0LegacyStructureSettings\@\@QEAA\@XZ */ MCAPI LegacyStructureSettings(); /** - * @symbol ??0LegacyStructureSettings\@\@QEAA\@W4Mirror\@\@W4Rotation\@\@PEBVBlock\@\@AEBVBoundingBox\@\@\@Z + * @symbol ??0LegacyStructureSettings\@\@QEAA\@W4Mirror\@\@W4Rotation\@\@PEBVBlock\@\@AEBVBoundingBox\@\@\@Z */ MCAPI LegacyStructureSettings(enum class Mirror, enum class Rotation, class Block const *, class BoundingBox const &); /** - * @symbol ?addSwapAuxValue\@LegacyStructureSettings\@\@QEAAXHH\@Z + * @symbol ?addSwapAuxValue\@LegacyStructureSettings\@\@QEAAXHH\@Z */ MCAPI void addSwapAuxValue(int, int); /** - * @symbol ?getBoundingBox\@LegacyStructureSettings\@\@QEAAAEBVBoundingBox\@\@XZ + * @symbol ?getBoundingBox\@LegacyStructureSettings\@\@QEAAAEBVBoundingBox\@\@XZ */ MCAPI class BoundingBox const & getBoundingBox(); /** - * @symbol ?getIgnoreBlock\@LegacyStructureSettings\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getIgnoreBlock\@LegacyStructureSettings\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getIgnoreBlock() const; /** - * @symbol ?getMirror\@LegacyStructureSettings\@\@QEBAAEBW4Mirror\@\@XZ + * @symbol ?getMirror\@LegacyStructureSettings\@\@QEBAAEBW4Mirror\@\@XZ */ MCAPI enum class Mirror const & getMirror() const; /** - * @symbol ?getRefPos\@LegacyStructureSettings\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getRefPos\@LegacyStructureSettings\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getRefPos() const; /** - * @symbol ?getRotation\@LegacyStructureSettings\@\@QEBAAEBW4Rotation\@\@XZ + * @symbol ?getRotation\@LegacyStructureSettings\@\@QEBAAEBW4Rotation\@\@XZ */ MCAPI enum class Rotation const & getRotation() const; /** - * @symbol ?getSwappedBlock\@LegacyStructureSettings\@\@QEBAAEBVBlock\@\@AEBVBlockPalette\@\@AEBV2\@\@Z + * @symbol ?getSwappedBlock\@LegacyStructureSettings\@\@QEBAAEBVBlock\@\@AEBVBlockPalette\@\@AEBV2\@\@Z */ MCAPI class Block const & getSwappedBlock(class BlockPalette const &, class Block const &) const; /** - * @symbol ?isIgnoreJigsawBlocks\@LegacyStructureSettings\@\@QEBA_NXZ + * @symbol ?isIgnoreJigsawBlocks\@LegacyStructureSettings\@\@QEBA_NXZ */ MCAPI bool isIgnoreJigsawBlocks() const; /** - * @symbol ?isIgnoreStructureBlocks\@LegacyStructureSettings\@\@QEBA_NXZ + * @symbol ?isIgnoreStructureBlocks\@LegacyStructureSettings\@\@QEBA_NXZ */ MCAPI bool isIgnoreStructureBlocks() const; /** - * @symbol ?isPlacingWaterBelowSeaLevel\@LegacyStructureSettings\@\@QEBA_NXZ + * @symbol ?isPlacingWaterBelowSeaLevel\@LegacyStructureSettings\@\@QEBA_NXZ */ MCAPI bool isPlacingWaterBelowSeaLevel() const; /** - * @symbol ?placeWaterBelowSeaLevel\@LegacyStructureSettings\@\@QEAAX_N\@Z + * @symbol ?placeWaterBelowSeaLevel\@LegacyStructureSettings\@\@QEAAX_N\@Z */ MCAPI void placeWaterBelowSeaLevel(bool); /** - * @symbol ?setBlockRules\@LegacyStructureSettings\@\@QEAAXPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setBlockRules\@LegacyStructureSettings\@\@QEAAXPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockRule\@\@U?$default_delete\@VStructurePoolBlockRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void setBlockRules(std::vector> const *); /** - * @symbol ?setBlockTagRules\@LegacyStructureSettings\@\@QEAAXPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setBlockTagRules\@LegacyStructureSettings\@\@QEAAXPEBV?$vector\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePoolBlockTagRule\@\@U?$default_delete\@VStructurePoolBlockTagRule\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void setBlockTagRules(std::vector> const *); /** - * @symbol ?setBoundingBox\@LegacyStructureSettings\@\@QEAAXAEBVBoundingBox\@\@\@Z + * @symbol ?setBoundingBox\@LegacyStructureSettings\@\@QEAAXAEBVBoundingBox\@\@\@Z */ MCAPI void setBoundingBox(class BoundingBox const &); /** - * @symbol ?setIgnoreBlock\@LegacyStructureSettings\@\@QEAAXPEBVBlock\@\@\@Z + * @symbol ?setIgnoreBlock\@LegacyStructureSettings\@\@QEAAXPEBVBlock\@\@\@Z */ MCAPI void setIgnoreBlock(class Block const *); /** - * @symbol ?setIntegrity\@LegacyStructureSettings\@\@QEAAXM\@Z + * @symbol ?setIntegrity\@LegacyStructureSettings\@\@QEAAXM\@Z */ MCAPI void setIntegrity(float); /** - * @symbol ?setMirror\@LegacyStructureSettings\@\@QEAAXW4Mirror\@\@\@Z + * @symbol ?setMirror\@LegacyStructureSettings\@\@QEAAXW4Mirror\@\@\@Z */ MCAPI void setMirror(enum class Mirror); /** - * @symbol ?setProjection\@LegacyStructureSettings\@\@QEAAXW4Projection\@\@\@Z + * @symbol ?setProjection\@LegacyStructureSettings\@\@QEAAXW4Projection\@\@\@Z */ MCAPI void setProjection(enum class Projection); /** - * @symbol ?setRefPos\@LegacyStructureSettings\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setRefPos\@LegacyStructureSettings\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setRefPos(class BlockPos const &); /** - * @symbol ?setRotation\@LegacyStructureSettings\@\@QEAAXW4Rotation\@\@\@Z + * @symbol ?setRotation\@LegacyStructureSettings\@\@QEAAXW4Rotation\@\@\@Z */ MCAPI void setRotation(enum class Rotation); /** - * @symbol ?setSeed\@LegacyStructureSettings\@\@QEAAXI\@Z + * @symbol ?setSeed\@LegacyStructureSettings\@\@QEAAXI\@Z */ MCAPI void setSeed(unsigned int); /** - * @symbol ?updateBoundingBoxFromChunkPos\@LegacyStructureSettings\@\@QEAAXXZ + * @symbol ?updateBoundingBoxFromChunkPos\@LegacyStructureSettings\@\@QEAAXXZ */ MCAPI void updateBoundingBoxFromChunkPos(); /** - * @symbol ??1LegacyStructureSettings\@\@QEAA\@XZ + * @symbol ??1LegacyStructureSettings\@\@QEAA\@XZ */ MCAPI ~LegacyStructureSettings(); /** - * @symbol ?INTEGRITY_MAX\@LegacyStructureSettings\@\@2MB + * @symbol ?INTEGRITY_MAX\@LegacyStructureSettings\@\@2MB */ MCAPI static float const INTEGRITY_MAX; /** - * @symbol ?INTEGRITY_MIN\@LegacyStructureSettings\@\@2MB + * @symbol ?INTEGRITY_MIN\@LegacyStructureSettings\@\@2MB */ MCAPI static float const INTEGRITY_MIN; /** - * @symbol ?MAX_STRUCTURE_SIZE\@LegacyStructureSettings\@\@2HB + * @symbol ?MAX_STRUCTURE_SIZE\@LegacyStructureSettings\@\@2HB */ MCAPI static int const MAX_STRUCTURE_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp b/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp index ebf897cf0f..e81069ef2d 100644 --- a/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp +++ b/LiteLoader/include/llapi/mc/LegacyStructureTemplate.hpp @@ -29,142 +29,142 @@ class LegacyStructureTemplate { public: /** - * @vftbl 0 - * @symbol ?getMarkers\@LegacyStructureTemplate\@\@UEBA?AV?$unordered_map\@VBlockPos\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@\@Z + * @vftbl 0 + * @symbol ?getMarkers\@LegacyStructureTemplate\@\@UEBA?AV?$unordered_map\@VBlockPos\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@\@Z */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> getMarkers(class BlockPos const &, class LegacyStructureSettings &) const; /** - * @vftbl 1 - * @symbol ?placeInWorld\@LegacyStructureTemplate\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@AEAVRandom\@\@\@Z + * @vftbl 1 + * @symbol ?placeInWorld\@LegacyStructureTemplate\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@AEAVRandom\@\@\@Z */ virtual void placeInWorld(class BlockSource &, class BlockPos const &, class LegacyStructureSettings &, class Random &) const; /** - * @symbol ??0LegacyStructureTemplate\@\@QEAA\@XZ + * @symbol ??0LegacyStructureTemplate\@\@QEAA\@XZ */ MCAPI LegacyStructureTemplate(); /** - * @symbol ?calculateConnectedPosition\@LegacyStructureTemplate\@\@QEBA?AVBlockPos\@\@AEBVLegacyStructureSettings\@\@AEBV2\@01\@Z + * @symbol ?calculateConnectedPosition\@LegacyStructureTemplate\@\@QEBA?AVBlockPos\@\@AEBVLegacyStructureSettings\@\@AEBV2\@01\@Z */ MCAPI class BlockPos calculateConnectedPosition(class LegacyStructureSettings const &, class BlockPos const &, class LegacyStructureSettings const &, class BlockPos const &) const; /** - * @symbol ?getJigsawMarkers\@LegacyStructureTemplate\@\@QEBA?AV?$vector\@VJigsawStructureBlockInfo\@\@V?$allocator\@VJigsawStructureBlockInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getJigsawMarkers\@LegacyStructureTemplate\@\@QEBA?AV?$vector\@VJigsawStructureBlockInfo\@\@V?$allocator\@VJigsawStructureBlockInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getJigsawMarkers() const; /** - * @symbol ?getSize\@LegacyStructureTemplate\@\@QEBA?AVBlockPos\@\@W4Rotation\@\@\@Z + * @symbol ?getSize\@LegacyStructureTemplate\@\@QEBA?AVBlockPos\@\@W4Rotation\@\@\@Z */ MCAPI class BlockPos getSize(enum class Rotation) const; /** - * @symbol ?load\@LegacyStructureTemplate\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?load\@LegacyStructureTemplate\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void load(class CompoundTag const &); /** - * @symbol ?placeInWorldChunk\@LegacyStructureTemplate\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@AEAVRandom\@\@\@Z + * @symbol ?placeInWorldChunk\@LegacyStructureTemplate\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVLegacyStructureSettings\@\@AEAVRandom\@\@\@Z */ MCAPI void placeInWorldChunk(class BlockSource &, class BlockPos const &, class LegacyStructureSettings &, class Random &); /** - * @symbol ?AUTHOR_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AUTHOR_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const AUTHOR_TAG; /** - * @symbol ?BLOCKS_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCKS_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BLOCKS_TAG; /** - * @symbol ?BLOCK_TAG_NBT\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_TAG_NBT\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BLOCK_TAG_NBT; /** - * @symbol ?BLOCK_TAG_POS\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_TAG_POS\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BLOCK_TAG_POS; /** - * @symbol ?BLOCK_TAG_STATE\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_TAG_STATE\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BLOCK_TAG_STATE; /** - * @symbol ?CHUNK_SIZE\@LegacyStructureTemplate\@\@2HB + * @symbol ?CHUNK_SIZE\@LegacyStructureTemplate\@\@2HB */ MCAPI static int const CHUNK_SIZE; /** - * @symbol ?ENTITIES_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ENTITIES_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ENTITIES_TAG; /** - * @symbol ?ENTITY_TAG_BLOCKPOS\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ENTITY_TAG_BLOCKPOS\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ENTITY_TAG_BLOCKPOS; /** - * @symbol ?ENTITY_TAG_NBT\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ENTITY_TAG_NBT\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ENTITY_TAG_NBT; /** - * @symbol ?ENTITY_TAG_POS\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ENTITY_TAG_POS\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ENTITY_TAG_POS; /** - * @symbol ?MINECRAFT_PREFIX\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MINECRAFT_PREFIX\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MINECRAFT_PREFIX; /** - * @symbol ?PALETTE_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PALETTE_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PALETTE_TAG; /** - * @symbol ?SIZE_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SIZE_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SIZE_TAG; /** - * @symbol ?STRUCTURE_VERSION\@LegacyStructureTemplate\@\@2HB + * @symbol ?STRUCTURE_VERSION\@LegacyStructureTemplate\@\@2HB */ MCAPI static int const STRUCTURE_VERSION; /** - * @symbol ?VERSION_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?VERSION_TAG\@LegacyStructureTemplate\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const VERSION_TAG; /** - * @symbol ?_mapPropertyToExtraBlock\@LegacyStructureTemplate\@\@SAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?_mapPropertyToExtraBlock\@LegacyStructureTemplate\@\@SAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI static class Block const * _mapPropertyToExtraBlock(std::string const &, std::string const &); /** - * @symbol ?_mapToBlock\@LegacyStructureTemplate\@\@SAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_mapToBlock\@LegacyStructureTemplate\@\@SAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Block const * _mapToBlock(std::string const &); /** - * @symbol ?_mapToData\@LegacyStructureTemplate\@\@SAAEBVBlock\@\@AEBV2\@AEBVLegacyStructureSettings\@\@\@Z + * @symbol ?_mapToData\@LegacyStructureTemplate\@\@SAAEBVBlock\@\@AEBV2\@AEBVLegacyStructureSettings\@\@\@Z */ MCAPI static class Block const & _mapToData(class Block const &, class LegacyStructureSettings const &); /** - * @symbol ?_mapToProperty\@LegacyStructureTemplate\@\@SAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBV2\@\@Z + * @symbol ?_mapToProperty\@LegacyStructureTemplate\@\@SAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBV2\@\@Z */ MCAPI static class Block const * _mapToProperty(std::string const &, std::string const &, class Block const &); /** - * @symbol ?defaultSettings\@LegacyStructureTemplate\@\@2VLegacyStructureSettings\@\@B + * @symbol ?defaultSettings\@LegacyStructureTemplate\@\@2VLegacyStructureSettings\@\@B */ MCAPI static class LegacyStructureSettings const defaultSettings; /** - * @symbol ?getZeroPositionWithTransform\@LegacyStructureTemplate\@\@SA?AVBlockPos\@\@AEBV2\@W4Mirror\@\@W4Rotation\@\@HH\@Z + * @symbol ?getZeroPositionWithTransform\@LegacyStructureTemplate\@\@SA?AVBlockPos\@\@AEBV2\@W4Mirror\@\@W4Rotation\@\@HH\@Z */ MCAPI static class BlockPos getZeroPositionWithTransform(class BlockPos const &, enum class Mirror, enum class Rotation, int, int); /** - * @symbol ?transform\@LegacyStructureTemplate\@\@SA?AVBlockPos\@\@V2\@W4Mirror\@\@W4Rotation\@\@\@Z + * @symbol ?transform\@LegacyStructureTemplate\@\@SA?AVBlockPos\@\@V2\@W4Mirror\@\@W4Rotation\@\@\@Z */ MCAPI static class BlockPos transform(class BlockPos, enum class Mirror, enum class Rotation); //private: /** - * @symbol ?_mapPropertiesToTags\@LegacyStructureTemplate\@\@CAXAEAVCompoundTag\@\@AEBV2\@\@Z + * @symbol ?_mapPropertiesToTags\@LegacyStructureTemplate\@\@CAXAEAVCompoundTag\@\@AEBV2\@\@Z */ MCAPI static void _mapPropertiesToTags(class CompoundTag &, class CompoundTag const &); /** - * @symbol ?_mapPropertyToTag\@LegacyStructureTemplate\@\@CAXAEAVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ?_mapPropertyToTag\@LegacyStructureTemplate\@\@CAXAEAVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI static void _mapPropertyToTag(class CompoundTag &, std::string const &, std::string const &); /** - * @symbol ?_mapTag\@LegacyStructureTemplate\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V23\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?_mapTag\@LegacyStructureTemplate\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V23\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr _mapTag(std::unique_ptr, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp b/LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp index cb0b96989d..32e45bf594 100644 --- a/LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacySwampFoliageFeature.hpp @@ -31,18 +31,18 @@ class LegacySwampFoliageFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacySwampFoliageFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@LegacySwampFoliageFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@LegacySwampFoliageFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0LegacySwampFoliageFeature\@\@QEAA\@AEAVFeatureRegistry\@\@\@Z + * @symbol ??0LegacySwampFoliageFeature\@\@QEAA\@AEAVFeatureRegistry\@\@\@Z */ MCAPI LegacySwampFoliageFeature(class FeatureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp b/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp index 568d33b714..77b785a8b4 100644 --- a/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTradeableComponent.hpp @@ -29,144 +29,144 @@ class LegacyTradeableComponent { public: /** - * @symbol ?DecrementMerchantTimer\@LegacyTradeableComponent\@\@QEAAXXZ + * @symbol ?DecrementMerchantTimer\@LegacyTradeableComponent\@\@QEAAXXZ */ MCAPI void DecrementMerchantTimer(); /** - * @symbol ?IncrementTradeTier\@LegacyTradeableComponent\@\@QEAAXXZ + * @symbol ?IncrementTradeTier\@LegacyTradeableComponent\@\@QEAAXXZ */ MCAPI void IncrementTradeTier(); /** - * @symbol ??0LegacyTradeableComponent\@\@QEAA\@XZ + * @symbol ??0LegacyTradeableComponent\@\@QEAA\@XZ */ MCAPI LegacyTradeableComponent(); /** - * @symbol ?addAdditionalSaveData\@LegacyTradeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@LegacyTradeableComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?createDataPacket\@LegacyTradeableComponent\@\@QEAA?AVUpdateTradePacket\@\@AEAVActor\@\@W4ContainerID\@\@\@Z + * @symbol ?createDataPacket\@LegacyTradeableComponent\@\@QEAA?AVUpdateTradePacket\@\@AEAVActor\@\@W4ContainerID\@\@\@Z */ MCAPI class UpdateTradePacket createDataPacket(class Actor &, enum class ContainerID); /** - * @symbol ?getAddRecipeOnUpdate\@LegacyTradeableComponent\@\@QEBA_NXZ + * @symbol ?getAddRecipeOnUpdate\@LegacyTradeableComponent\@\@QEBA_NXZ */ MCAPI bool getAddRecipeOnUpdate() const; /** - * @symbol ?getDisplayName\@LegacyTradeableComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDisplayName\@LegacyTradeableComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDisplayName() const; /** - * @symbol ?getInteraction\@LegacyTradeableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@LegacyTradeableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?getLastPlayerTradeName\@LegacyTradeableComponent\@\@QEBAPEBVPlayer\@\@XZ + * @symbol ?getLastPlayerTradeName\@LegacyTradeableComponent\@\@QEBAPEBVPlayer\@\@XZ */ MCAPI class Player const * getLastPlayerTradeName() const; /** - * @symbol ?getOffers\@LegacyTradeableComponent\@\@QEAAPEAVMerchantRecipeList\@\@AEAVActor\@\@\@Z + * @symbol ?getOffers\@LegacyTradeableComponent\@\@QEAAPEAVMerchantRecipeList\@\@AEAVActor\@\@\@Z */ MCAPI class MerchantRecipeList * getOffers(class Actor &); /** - * @symbol ?getResetLockedOnFirstTrade\@LegacyTradeableComponent\@\@QEBA_NXZ + * @symbol ?getResetLockedOnFirstTrade\@LegacyTradeableComponent\@\@QEBA_NXZ */ MCAPI bool getResetLockedOnFirstTrade() const; /** - * @symbol ?getRiches\@LegacyTradeableComponent\@\@QEBAHXZ + * @symbol ?getRiches\@LegacyTradeableComponent\@\@QEBAHXZ */ MCAPI int getRiches() const; /** - * @symbol ?getTradeTier\@LegacyTradeableComponent\@\@QEBAHXZ + * @symbol ?getTradeTier\@LegacyTradeableComponent\@\@QEBAHXZ */ MCAPI int getTradeTier() const; /** - * @symbol ?getUpdateMerchantTimer\@LegacyTradeableComponent\@\@QEBAHXZ + * @symbol ?getUpdateMerchantTimer\@LegacyTradeableComponent\@\@QEBAHXZ */ MCAPI int getUpdateMerchantTimer() const; /** - * @symbol ?loadDisplayName\@LegacyTradeableComponent\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @symbol ?loadDisplayName\@LegacyTradeableComponent\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ MCAPI std::string const & loadDisplayName(class Actor &); /** - * @symbol ?loadOffersFromTag\@LegacyTradeableComponent\@\@QEAAXPEBVCompoundTag\@\@\@Z + * @symbol ?loadOffersFromTag\@LegacyTradeableComponent\@\@QEAAXPEBVCompoundTag\@\@\@Z */ MCAPI void loadOffersFromTag(class CompoundTag const *); /** - * @symbol ?notifyTrade\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@H\@Z + * @symbol ?notifyTrade\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@H\@Z */ MCAPI void notifyTrade(class Actor &, int); /** - * @symbol ??4LegacyTradeableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4LegacyTradeableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class LegacyTradeableComponent & operator=(class LegacyTradeableComponent &&); /** - * @symbol ?readAdditionalSaveData\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?reloadComponent\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?reloadComponent\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void reloadComponent(class Actor &); /** - * @symbol ?restockAllRecipes\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?restockAllRecipes\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void restockAllRecipes(class Actor &); /** - * @symbol ?setAddRecipeOnUpdate\@LegacyTradeableComponent\@\@QEAAX_N\@Z + * @symbol ?setAddRecipeOnUpdate\@LegacyTradeableComponent\@\@QEAAX_N\@Z */ MCAPI void setAddRecipeOnUpdate(bool); /** - * @symbol ?setOffers\@LegacyTradeableComponent\@\@QEAAXAEAVMerchantRecipeList\@\@\@Z + * @symbol ?setOffers\@LegacyTradeableComponent\@\@QEAAXAEAVMerchantRecipeList\@\@\@Z */ MCAPI void setOffers(class MerchantRecipeList &); /** - * @symbol ?setResetLockedOnFirstTrade\@LegacyTradeableComponent\@\@QEAAX_N\@Z + * @symbol ?setResetLockedOnFirstTrade\@LegacyTradeableComponent\@\@QEAAX_N\@Z */ MCAPI void setResetLockedOnFirstTrade(bool); /** - * @symbol ?setRiches\@LegacyTradeableComponent\@\@QEAAXH\@Z + * @symbol ?setRiches\@LegacyTradeableComponent\@\@QEAAXH\@Z */ MCAPI void setRiches(int); /** - * @symbol ?setTradeTier\@LegacyTradeableComponent\@\@QEAAXH\@Z + * @symbol ?setTradeTier\@LegacyTradeableComponent\@\@QEAAXH\@Z */ MCAPI void setTradeTier(int); /** - * @symbol ?shouldConvertTrades\@LegacyTradeableComponent\@\@QEBA_NAEAVActor\@\@\@Z + * @symbol ?shouldConvertTrades\@LegacyTradeableComponent\@\@QEBA_NAEAVActor\@\@\@Z */ MCAPI bool shouldConvertTrades(class Actor &) const; /** - * @symbol ?shouldPersistTrades\@LegacyTradeableComponent\@\@QEBA_NAEAVActor\@\@\@Z + * @symbol ?shouldPersistTrades\@LegacyTradeableComponent\@\@QEBA_NAEAVActor\@\@\@Z */ MCAPI bool shouldPersistTrades(class Actor &) const; /** - * @symbol ?updateTradeTier\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?updateTradeTier\@LegacyTradeableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void updateTradeTier(class Actor &); /** - * @symbol ??1LegacyTradeableComponent\@\@QEAA\@XZ + * @symbol ??1LegacyTradeableComponent\@\@QEAA\@XZ */ MCAPI ~LegacyTradeableComponent(); /** - * @symbol ?isUseNewTradeScreen\@LegacyTradeableComponent\@\@SA_NAEBVActor\@\@\@Z + * @symbol ?isUseNewTradeScreen\@LegacyTradeableComponent\@\@SA_NAEBVActor\@\@\@Z */ MCAPI static bool isUseNewTradeScreen(class Actor const &); //private: /** - * @symbol ?_getTradeTable\@LegacyTradeableComponent\@\@AEAAPEAUTradeTable\@\@AEAVActor\@\@\@Z + * @symbol ?_getTradeTable\@LegacyTradeableComponent\@\@AEAAPEAUTradeTable\@\@AEAVActor\@\@\@Z */ MCAPI struct TradeTable * _getTradeTable(class Actor &); /** - * @symbol ?_rearrangeTradeList\@LegacyTradeableComponent\@\@AEAAXAEAVActor\@\@AEAV?$vector\@UTrade\@\@V?$allocator\@UTrade\@\@\@std\@\@\@std\@\@_K\@Z + * @symbol ?_rearrangeTradeList\@LegacyTradeableComponent\@\@AEAAXAEAVActor\@\@AEAV?$vector\@UTrade\@\@V?$allocator\@UTrade\@\@\@std\@\@\@std\@\@_K\@Z */ MCAPI void _rearrangeTradeList(class Actor &, std::vector &, unsigned __int64); /** - * @symbol ?_refreshTrades\@LegacyTradeableComponent\@\@AEAA_NAEAVActor\@\@\@Z + * @symbol ?_refreshTrades\@LegacyTradeableComponent\@\@AEAA_NAEAVActor\@\@\@Z */ MCAPI bool _refreshTrades(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyTradeableDefinition.hpp b/LiteLoader/include/llapi/mc/LegacyTradeableDefinition.hpp index fff9f16a9e..fc056dad60 100644 --- a/LiteLoader/include/llapi/mc/LegacyTradeableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTradeableDefinition.hpp @@ -30,16 +30,16 @@ class LegacyTradeableDefinition { public: /** - * @symbol ??0LegacyTradeableDefinition\@\@QEAA\@XZ + * @symbol ??0LegacyTradeableDefinition\@\@QEAA\@XZ */ MCAPI LegacyTradeableDefinition(); /** - * @symbol ?initialize\@LegacyTradeableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVLegacyTradeableComponent\@\@\@Z + * @symbol ?initialize\@LegacyTradeableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVLegacyTradeableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class LegacyTradeableComponent &) const; /** - * @symbol ?buildSchema\@LegacyTradeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VLegacyTradeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@LegacyTradeableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VLegacyTradeableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp b/LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp index 075a832da3..157676f967 100644 --- a/LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTreeFeature.hpp @@ -30,18 +30,18 @@ class LegacyTreeFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LegacyTreeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@LegacyTreeFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@LegacyTreeFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0LegacyTreeFeature\@\@QEAA\@W4Type\@0\@AEAVFeatureRegistry\@\@\@Z + * @symbol ??0LegacyTreeFeature\@\@QEAA\@W4Type\@0\@AEAVFeatureRegistry\@\@\@Z */ MCAPI LegacyTreeFeature(enum class LegacyTreeFeature::Type, class FeatureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp b/LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp index 71f11bd7a9..a413b1f9fe 100644 --- a/LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp +++ b/LiteLoader/include/llapi/mc/LegacyTreeFeatureHelpers.hpp @@ -22,11 +22,11 @@ namespace LegacyTreeFeatureHelpers { #undef AFTER_EXTRA /** - * @symbol ?_placeTrees\@LegacyTreeFeatureHelpers\@\@YAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@V?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$function\@$$A6A?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAVRandom\@\@\@Z\@std\@\@\@Z + * @symbol ?_placeTrees\@LegacyTreeFeatureHelpers\@\@YAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@V?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBV?$function\@$$A6A?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEAVRandom\@\@\@Z\@std\@\@\@Z */ MCAPI void _placeTrees(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, class WeakRefT, class std::function (class Random &)> const &); /** - * @symbol ?_setupForestCount\@LegacyTreeFeatureHelpers\@\@YAXMAEAHAEAVRandom\@\@\@Z + * @symbol ?_setupForestCount\@LegacyTreeFeatureHelpers\@\@YAXMAEAHAEAVRandom\@\@\@Z */ MCAPI void _setupForestCount(float, int &, class Random &); diff --git a/LiteLoader/include/llapi/mc/LessonCommand.hpp b/LiteLoader/include/llapi/mc/LessonCommand.hpp index a33109c7a1..e2d3e1cfd5 100644 --- a/LiteLoader/include/llapi/mc/LessonCommand.hpp +++ b/LiteLoader/include/llapi/mc/LessonCommand.hpp @@ -29,18 +29,18 @@ class LessonCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LessonCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@LessonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@LessonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@LessonCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@LessonCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp index 12268f5694..0a0ab2bdae 100644 --- a/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp +++ b/LiteLoader/include/llapi/mc/LessonProgressPacket.hpp @@ -28,37 +28,43 @@ class LessonProgressPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LessonProgressPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LessonProgressPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LessonProgressPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LessonProgressPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LessonProgressPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LessonProgressPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LessonProgressPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LessonProgressPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LESSONPROGRESSPACKET /** - * @symbol ??0LessonProgressPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI LessonProgressPacket(); + MCVAPI ~LessonProgressPacket(); +#endif /** - * @symbol ??0LessonProgressPacket\@\@QEAA\@W4LessonAction\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0LessonProgressPacket\@\@QEAA\@W4LessonAction\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI LessonProgressPacket(enum class LessonAction, int, std::string const &); + /** + * @symbol ??0LessonProgressPacket\@\@QEAA\@XZ + */ + MCAPI LessonProgressPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Level.hpp b/LiteLoader/include/llapi/mc/Level.hpp index 265075191f..0c7691e521 100644 --- a/LiteLoader/include/llapi/mc/Level.hpp +++ b/LiteLoader/include/llapi/mc/Level.hpp @@ -7,7 +7,6 @@ #include "llapi/Global.h" #include "Bedrock.hpp" #include "PlayerCapabilities.hpp" -#include "DimensionDefinitionGroup.hpp" #define BEFORE_EXTRA // Add include headers & pre-declares @@ -15,6 +14,7 @@ #include "BlockInstance.hpp" #include "Tick.hpp" #include "ILevel.hpp" +#include "DimensionDefinitionGroup.hpp" #include "Social.hpp" class Actor; class ActorDamageSource; @@ -269,1705 +269,1725 @@ class Level { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVEL /** - * @symbol ?_checkUserStorage\@Level\@\@UEAAXXZ + * @symbol ?_checkUserStorage\@Level\@\@UEAAXXZ */ MCVAPI void _checkUserStorage(); /** - * @symbol ?_clientHandleAddOwnedEntity\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@VEntityNetId\@\@\@Z + * @symbol ?_clientHandleAddOwnedEntity\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@VEntityNetId\@\@\@Z */ MCVAPI class StackRefResultT _clientHandleAddOwnedEntity(class EntityNetId); /** - * @symbol ?_clientHandleAddWeakRefEntity\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@VEntityNetId\@\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?_clientHandleAddWeakRefEntity\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRefTraits\@\@\@\@VEntityNetId\@\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI class StackRefResultT _clientHandleAddWeakRefEntity(class EntityNetId, class WeakRefT); /** - * @symbol ?_clientHandleRemoveOwnedEntity\@Level\@\@UEAAXVEntityNetId\@\@\@Z + * @symbol ?_clientHandleRemoveOwnedEntity\@Level\@\@UEAAXVEntityNetId\@\@\@Z */ MCVAPI void _clientHandleRemoveOwnedEntity(class EntityNetId); /** - * @symbol ?_clientHandleRemoveWeakRefEntity\@Level\@\@UEAAXVEntityNetId\@\@\@Z + * @symbol ?_clientHandleRemoveWeakRefEntity\@Level\@\@UEAAXVEntityNetId\@\@\@Z */ MCVAPI void _clientHandleRemoveWeakRefEntity(class EntityNetId); /** - * @symbol ?_destroyEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @symbol ?_destroyEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ MCVAPI void _destroyEffect(class BlockPos const &, class Block const &, int); /** - * @symbol ?_localPlayerChangedDimension\@Level\@\@MEAAXXZ + * @symbol ?_localPlayerChangedDimension\@Level\@\@MEAAXXZ */ MCVAPI void _localPlayerChangedDimension(); /** - * @symbol ?_onPlayerDimensionChange\@Level\@\@MEAAXXZ + * @symbol ?_onPlayerDimensionChange\@Level\@\@MEAAXXZ */ MCVAPI void _onPlayerDimensionChange(); /** - * @symbol ?addAutonomousEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?_subTick\@Level\@\@MEAAXXZ + */ + MCVAPI void _subTick(); + /** + * @symbol ?addAutonomousEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI class Actor * addAutonomousEntity(class BlockSource &, class OwnerPtrT); /** - * @symbol ?addBlockSourceForValidityTracking\@Level\@\@UEAAXPEAVBlockSource\@\@\@Z + * @symbol ?addBlockSourceForValidityTracking\@Level\@\@UEAAXPEAVBlockSource\@\@\@Z */ MCVAPI void addBlockSourceForValidityTracking(class BlockSource *); /** - * @symbol ?addBossEventListener\@Level\@\@UEAAXPEAVBossEventListener\@\@\@Z + * @symbol ?addBossEventListener\@Level\@\@UEAAXPEAVBossEventListener\@\@\@Z */ MCVAPI void addBossEventListener(class BossEventListener *); /** - * @symbol ?addBreakingItemParticleEffect\@Level\@\@UEAAXAEBVVec3\@\@W4ParticleType\@\@AEBUResolvedItemIconInfo\@\@\@Z + * @symbol ?addBreakingItemParticleEffect\@Level\@\@UEAAXAEBVVec3\@\@W4ParticleType\@\@AEBUResolvedItemIconInfo\@\@\@Z */ MCVAPI void addBreakingItemParticleEffect(class Vec3 const &, enum class ParticleType, struct ResolvedItemIconInfo const &); /** - * @symbol ?addChunkViewTracker\@Level\@\@UEAAXV?$weak_ptr\@VChunkViewSource\@\@\@std\@\@\@Z + * @symbol ?addChunkViewTracker\@Level\@\@UEAAXV?$weak_ptr\@VChunkViewSource\@\@\@std\@\@\@Z */ MCVAPI void addChunkViewTracker(class std::weak_ptr); /** - * @symbol ?addDisplayEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addDisplayEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI class Actor * addDisplayEntity(class BlockSource &, class OwnerPtrT); /** - * @symbol ?addEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI class Actor * addEntity(class BlockSource &, class OwnerPtrT); /** - * @symbol ?addGlobalEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addGlobalEntity\@Level\@\@UEAAPEAVActor\@\@AEAVBlockSource\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI class Actor * addGlobalEntity(class BlockSource &, class OwnerPtrT); /** - * @symbol ?addListener\@Level\@\@UEAAXAEAVLevelListener\@\@\@Z + * @symbol ?addListener\@Level\@\@UEAAXAEAVLevelListener\@\@\@Z */ MCVAPI void addListener(class LevelListener &); /** - * @symbol ?addParticle\@Level\@\@UEAAPEAVParticle\@\@W4ParticleType\@\@AEBVVec3\@\@1HPEBVCompoundTag\@\@_N\@Z + * @symbol ?addParticle\@Level\@\@UEAAPEAVParticle\@\@W4ParticleType\@\@AEBVVec3\@\@1HPEBVCompoundTag\@\@_N\@Z */ MCVAPI class Particle * addParticle(enum class ParticleType, class Vec3 const &, class Vec3 const &, int, class CompoundTag const *, bool); /** - * @symbol ?addParticleEffect\@Level\@\@UEAAXAEBVHashedString\@\@AEBVVec3\@\@AEBVMolangVariableMap\@\@\@Z + * @symbol ?addParticleEffect\@Level\@\@UEAAXAEBVHashedString\@\@AEBVVec3\@\@AEBVMolangVariableMap\@\@\@Z */ MCVAPI void addParticleEffect(class HashedString const &, class Vec3 const &, class MolangVariableMap const &); /** - * @symbol ?addTerrainParticleEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z + * @symbol ?addTerrainParticleEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z */ MCVAPI void addTerrainParticleEffect(class BlockPos const &, class Block const &, class Vec3 const &, float, float, float); /** - * @symbol ?addTerrainSlideEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z + * @symbol ?addTerrainSlideEffect\@Level\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z */ MCVAPI void addTerrainSlideEffect(class BlockPos const &, class Block const &, class Vec3 const &, float, float, float); /** - * @symbol ?addTickingAreaList\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$shared_ptr\@VTickingAreaList\@\@\@std\@\@\@Z + * @symbol ?addTickingAreaList\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$shared_ptr\@VTickingAreaList\@\@\@std\@\@\@Z */ MCVAPI void addTickingAreaList(class AutomaticID, class std::shared_ptr const &); /** - * @symbol ?addUser\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?addUser\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI void addUser(class OwnerPtrT); /** - * @symbol ?animateTick\@Level\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?animateTick\@Level\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void animateTick(class Actor &); /** - * @symbol ?applyLiquidPhysicsToActor\@Level\@\@UEAA_NPEAVActor\@\@W4MaterialType\@\@\@Z + * @symbol ?applyLiquidPhysicsToActor\@Level\@\@UEAA_NPEAVActor\@\@W4MaterialType\@\@\@Z */ MCVAPI bool applyLiquidPhysicsToActor(class Actor *, enum class MaterialType); /** - * @symbol ?areBossEventListenersReady\@Level\@\@UEAA_NXZ + * @symbol ?areBossEventListenersReady\@Level\@\@UEAA_NXZ */ MCVAPI bool areBossEventListenersReady(); /** - * @symbol ?asLevel\@Level\@\@UEAAPEAV1\@XZ + * @symbol ?asLevel\@Level\@\@UEAAPEAV1\@XZ */ MCVAPI class Level * asLevel(); /** - * @symbol ?broadcastActorEvent\@Level\@\@UEAAXAEAVActor\@\@W4ActorEvent\@\@H\@Z + * @symbol ?broadcastActorEvent\@Level\@\@UEAAXAEAVActor\@\@W4ActorEvent\@\@H\@Z */ MCVAPI void broadcastActorEvent(class Actor &, enum class ActorEvent, int); /** - * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@\@Z + * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@AEBUActorUniqueID\@\@AEBVBossEventPacket\@\@\@Z */ - MCVAPI void broadcastBossEvent(enum class BossEventUpdateType); + MCVAPI void broadcastBossEvent(enum class BossEventUpdateType, struct ActorUniqueID const &, class BossEventPacket const &); /** - * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@AEBUActorUniqueID\@\@AEBVBossEventPacket\@\@\@Z + * @symbol ?broadcastBossEvent\@Level\@\@UEAAXW4BossEventUpdateType\@\@\@Z */ - MCVAPI void broadcastBossEvent(enum class BossEventUpdateType, struct ActorUniqueID const &, class BossEventPacket const &); + MCVAPI void broadcastBossEvent(enum class BossEventUpdateType); /** - * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@PEBVUserEntityIdentifierComponent\@\@\@Z + * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@PEBVUserEntityIdentifierComponent\@\@\@Z */ MCVAPI void broadcastLevelEvent(enum class LevelEvent, class CompoundTag const &, class UserEntityIdentifierComponent const *); /** - * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@HPEBVUserEntityIdentifierComponent\@\@\@Z + * @symbol ?broadcastLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@HPEBVUserEntityIdentifierComponent\@\@\@Z */ MCVAPI void broadcastLevelEvent(enum class LevelEvent, class Vec3 const &, int, class UserEntityIdentifierComponent const *); /** - * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z + * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@AEBVBlock\@\@\@Z */ MCVAPI void broadcastLocalEvent(class BlockSource &, enum class LevelEvent, class Vec3 const &, class Block const &); /** - * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z + * @symbol ?broadcastLocalEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z */ MCVAPI void broadcastLocalEvent(class BlockSource &, enum class LevelEvent, class Vec3 const &, int); /** - * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ MCVAPI void broadcastSoundEvent(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z */ - MCVAPI void broadcastSoundEvent(class Dimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void broadcastSoundEvent(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z + * @symbol ?broadcastSoundEvent\@Level\@\@UEAAXAEAVDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ - MCVAPI void broadcastSoundEvent(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); + 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 + * @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 ?consolidateLevelChunkMetaData\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void consolidateLevelChunkMetaData(class LevelChunk &); /** - * @symbol ?copyAndLockMap\@Level\@\@UEAA_NUActorUniqueID\@\@0\@Z + * @symbol ?copyAndLockMap\@Level\@\@UEAA_NUActorUniqueID\@\@0\@Z */ MCVAPI bool copyAndLockMap(struct ActorUniqueID, struct ActorUniqueID); /** - * @symbol ?countUsersWithMatchingNetworkId\@Level\@\@UEBAHAEBVNetworkIdentifier\@\@\@Z + * @symbol ?countUsersWithMatchingNetworkId\@Level\@\@UEBAHAEBVNetworkIdentifier\@\@\@Z */ MCVAPI int countUsersWithMatchingNetworkId(class NetworkIdentifier const &) const; /** - * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z + * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z */ MCVAPI class MapItemSavedData & createMapSavedData(struct ActorUniqueID const &, class BlockPos const &, class AutomaticID, int); /** - * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z + * @symbol ?createMapSavedData\@Level\@\@UEAAAEAVMapItemSavedData\@\@AEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@H\@Z */ MCVAPI class MapItemSavedData & createMapSavedData(std::vector const &, class BlockPos const &, class AutomaticID, int); /** - * @symbol ?createPhotoStorage\@Level\@\@UEAAXXZ + * @symbol ?createPhotoStorage\@Level\@\@UEAAXXZ */ MCVAPI void createPhotoStorage(); /** - * @symbol ?decrementTagCache\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?decrementTagCache\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z */ MCVAPI void decrementTagCache(std::string const &, class TagRegistry, struct IDType> &); /** - * @symbol ?denyEffect\@Level\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?denyEffect\@Level\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCVAPI void denyEffect(class BlockSource &, class Vec3 const &); /** - * @symbol ?destroyBlock\@Level\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?destroyBlock\@Level\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCVAPI bool destroyBlock(class BlockSource &, class BlockPos const &, bool); /** - * @symbol ?digestServerBlockProperties\@Level\@\@UEAAXAEBVStartGamePacket\@\@I\@Z + * @symbol ?digestServerBlockProperties\@Level\@\@UEAAXAEBVStartGamePacket\@\@I\@Z */ MCVAPI void digestServerBlockProperties(class StartGamePacket const &, unsigned int); /** - * @symbol ?digestServerItemComponents\@Level\@\@UEAAXAEBVItemComponentPacket\@\@\@Z + * @symbol ?digestServerItemComponents\@Level\@\@UEAAXAEBVItemComponentPacket\@\@\@Z */ MCVAPI void digestServerItemComponents(class ItemComponentPacket const &); /** - * @symbol ?directTickEntities\@Level\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?directTickEntities\@Level\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void directTickEntities(class BlockSource &); /** - * @symbol ?entityChangeDimension\@Level\@\@UEAAXAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$optional\@VVec3\@\@\@std\@\@\@Z + * @symbol ?entityChangeDimension\@Level\@\@UEAAXAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$optional\@VVec3\@\@\@std\@\@\@Z */ MCVAPI void entityChangeDimension(class Actor &, class AutomaticID, class std::optional); /** - * @symbol ?expandMapByID\@Level\@\@UEAA?AUActorUniqueID\@\@U2\@_N\@Z + * @symbol ?expandMapByID\@Level\@\@UEAA?AUActorUniqueID\@\@U2\@_N\@Z */ MCVAPI struct ActorUniqueID expandMapByID(struct ActorUniqueID, bool); /** - * @symbol ?explode\@Level\@\@UEAAXAEAVExplosion\@\@\@Z + * @symbol ?explode\@Level\@\@UEAAXAEAVExplosion\@\@\@Z */ MCVAPI void explode(class Explosion &); /** - * @symbol ?explode\@Level\@\@UEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVVec3\@\@M_N3M3\@Z + * @symbol ?explode\@Level\@\@UEAAXAEAVBlockSource\@\@PEAVActor\@\@AEBVVec3\@\@M_N3M3\@Z */ MCVAPI void explode(class BlockSource &, class Actor *, class Vec3 const &, float, bool, bool, float, bool); /** - * @symbol ?extinguishFire\@Level\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?extinguishFire\@Level\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCVAPI bool extinguishFire(class BlockSource &, class BlockPos const &, unsigned char); /** - * @symbol ?fetchEntity\@Level\@\@UEBAPEAVActor\@\@UActorUniqueID\@\@_N\@Z + * @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\@\@HHHAEAVNavigationComponent\@\@\@Z + * @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 + * @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_NAEBVWeakEntityRef\@\@\@Z\@std\@\@\@Z + * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVWeakEntityRef\@\@\@Z\@std\@\@\@Z */ MCVAPI class Player * findPlayer(class std::function) const; /** - * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?findPlayer\@Level\@\@UEBAPEAVPlayer\@\@V?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ MCVAPI class Player * findPlayer(class std::function) const; /** - * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ + * @symbol ?flushRunTimeLighting\@Level\@\@UEAAXXZ */ MCVAPI void flushRunTimeLighting(); /** - * @symbol ?forEachDimension\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVDimension\@\@\@Z\@std\@\@\@Z + * @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 + * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z */ - MCVAPI void forEachDimension(class std::function); + MCVAPI void forEachPlayer(class std::function) const; /** - * @symbol ?forEachPlayer\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPlayer\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVPlayer\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPlayer(class std::function); /** - * @symbol ?forEachPlayer\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVPlayer\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachUser\@Level\@\@UEBAXV?$function\@$$A6A_NAEBVEntityContext\@\@\@Z\@std\@\@\@Z */ - MCVAPI void forEachPlayer(class std::function) const; + MCVAPI void forEachUser(class std::function) const; /** - * @symbol ?forEachUser\@Level\@\@UEBAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachUser\@Level\@\@UEAAXV?$function\@$$A6A_NAEAVEntityContext\@\@\@Z\@std\@\@\@Z */ - MCVAPI void forEachUser(class std::function) const; + MCVAPI void forEachUser(class std::function); /** - * @symbol ?forceFlushRemovedPlayers\@Level\@\@UEAAXXZ + * @symbol ?forceFlushRemovedPlayers\@Level\@\@UEAAXXZ */ MCVAPI void forceFlushRemovedPlayers(); /** - * @symbol ?forceRemoveEntity\@Level\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?forceRemoveEntity\@Level\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void forceRemoveEntity(class Actor &); /** - * @symbol ?forceRemoveEntityfromWorld\@Level\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?forceRemoveEntityfromWorld\@Level\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void forceRemoveEntityfromWorld(class Actor &); /** - * @symbol ?getActivePlayerCount\@Level\@\@UEBAHXZ + * @symbol ?getActivePlayerCount\@Level\@\@UEBAHXZ */ MCVAPI int getActivePlayerCount() const; /** - * @symbol ?getActiveUsers\@Level\@\@UEBAAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getActiveUsers\@Level\@\@UEBAAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector const & getActiveUsers() const; /** - * @symbol ?getActiveUsersCount\@Level\@\@UEBAHXZ + * @symbol ?getActiveUsersCount\@Level\@\@UEBAHXZ */ MCVAPI int getActiveUsersCount() const; /** - * @symbol ?getActorAnimationControllerGroup\@Level\@\@UEBAPEAVActorAnimationControllerGroup\@\@XZ + * @symbol ?getActorAnimationControllerGroup\@Level\@\@UEBAPEAVActorAnimationControllerGroup\@\@XZ */ MCVAPI class ActorAnimationControllerGroup * getActorAnimationControllerGroup() const; /** - * @symbol ?getActorAnimationGroup\@Level\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VActorAnimationGroup\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getActorAnimationGroup\@Level\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VActorAnimationGroup\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getActorAnimationGroup() const; /** - * @symbol ?getActorEventCoordinator\@Level\@\@UEAAAEAVActorEventCoordinator\@\@XZ + * @symbol ?getActorEventCoordinator\@Level\@\@UEAAAEAVActorEventCoordinator\@\@XZ */ MCVAPI class ActorEventCoordinator & getActorEventCoordinator(); /** - * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ + * @symbol ?getActorFactory\@Level\@\@UEAAAEAVActorFactory\@\@XZ */ - MCVAPI class ActorFactory const & getActorFactory() const; + MCVAPI class ActorFactory & getActorFactory(); /** - * @symbol ?getActorFactory\@Level\@\@UEAAAEAVActorFactory\@\@XZ + * @symbol ?getActorFactory\@Level\@\@UEBAAEBVActorFactory\@\@XZ */ - MCVAPI class ActorFactory & getActorFactory(); + MCVAPI class ActorFactory const & getActorFactory() const; /** - * @symbol ?getActorInfoRegistry\@Level\@\@UEAAPEAVActorInfoRegistry\@\@XZ + * @symbol ?getActorInfoRegistry\@Level\@\@UEAAPEAVActorInfoRegistry\@\@XZ */ MCVAPI class ActorInfoRegistry * getActorInfoRegistry(); /** - * @symbol ?getActorPropertyGroup\@Level\@\@UEBAAEAVPropertyGroupManager\@\@XZ + * @symbol ?getActorPropertyGroup\@Level\@\@UEBAAEAVPropertyGroupManager\@\@XZ */ MCVAPI class PropertyGroupManager & getActorPropertyGroup() const; /** - * @symbol ?getAdventureSettings\@Level\@\@UEAAAEAUAdventureSettings\@\@XZ + * @symbol ?getAdventureSettings\@Level\@\@UEAAAEAUAdventureSettings\@\@XZ */ MCVAPI struct AdventureSettings & getAdventureSettings(); /** - * @symbol ?getBehaviorFactory\@Level\@\@UEBAAEAVBehaviorFactory\@\@XZ + * @symbol ?getBehaviorFactory\@Level\@\@UEBAAEAVBehaviorFactory\@\@XZ */ MCVAPI class BehaviorFactory & getBehaviorFactory() const; /** - * @symbol ?getBehaviorTreeGroup\@Level\@\@UEBAAEAVBehaviorTreeGroup\@\@XZ + * @symbol ?getBehaviorTreeGroup\@Level\@\@UEBAAEAVBehaviorTreeGroup\@\@XZ */ MCVAPI class BehaviorTreeGroup & getBehaviorTreeGroup() const; /** - * @symbol ?getBiomeComponentFactory\@Level\@\@UEAAAEAVBiomeComponentFactory\@\@XZ + * @symbol ?getBiomeComponentFactory\@Level\@\@UEBAAEBVBiomeComponentFactory\@\@XZ */ - MCVAPI class BiomeComponentFactory & getBiomeComponentFactory(); + MCVAPI class BiomeComponentFactory const & getBiomeComponentFactory() const; /** - * @symbol ?getBiomeComponentFactory\@Level\@\@UEBAAEBVBiomeComponentFactory\@\@XZ + * @symbol ?getBiomeComponentFactory\@Level\@\@UEAAAEAVBiomeComponentFactory\@\@XZ */ - MCVAPI class BiomeComponentFactory const & getBiomeComponentFactory() const; + MCVAPI class BiomeComponentFactory & getBiomeComponentFactory(); /** - * @symbol ?getBiomeRegistry\@Level\@\@UEBAAEBVBiomeRegistry\@\@XZ + * @symbol ?getBiomeRegistry\@Level\@\@UEBAAEBVBiomeRegistry\@\@XZ */ MCVAPI class BiomeRegistry const & getBiomeRegistry() const; /** - * @symbol ?getBiomeRegistry\@Level\@\@UEAAAEAVBiomeRegistry\@\@XZ + * @symbol ?getBiomeRegistry\@Level\@\@UEAAAEAVBiomeRegistry\@\@XZ */ MCVAPI class BiomeRegistry & getBiomeRegistry(); /** - * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ + * @symbol ?getBlockComponentFactory\@Level\@\@UEAAAEAVBlockComponentFactory\@\@XZ */ MCVAPI class BlockComponentFactory & getBlockComponentFactory(); /** - * @symbol ?getBlockComponentFactory\@Level\@\@UEBAAEBVBlockComponentFactory\@\@XZ + * @symbol ?getBlockComponentFactory\@Level\@\@UEBAAEBVBlockComponentFactory\@\@XZ */ MCVAPI class BlockComponentFactory const & getBlockComponentFactory() const; /** - * @symbol ?getBlockDefinitions\@Level\@\@UEBAPEAVBlockDefinitionGroup\@\@XZ + * @symbol ?getBlockDefinitions\@Level\@\@UEBAPEAVBlockDefinitionGroup\@\@XZ */ MCVAPI class BlockDefinitionGroup * getBlockDefinitions() const; /** - * @symbol ?getBlockEventCoordinator\@Level\@\@UEAAAEAVBlockEventCoordinator\@\@XZ + * @symbol ?getBlockEventCoordinator\@Level\@\@UEAAAEAVBlockEventCoordinator\@\@XZ */ MCVAPI class BlockEventCoordinator & getBlockEventCoordinator(); /** - * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ + * @symbol ?getBlockPalette\@Level\@\@UEBAAEBVBlockPalette\@\@XZ */ MCVAPI class BlockPalette const & getBlockPalette() const; /** - * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ + * @symbol ?getBlockPalette\@Level\@\@UEAAAEAVBlockPalette\@\@XZ */ MCVAPI class BlockPalette & getBlockPalette(); /** - * @symbol ?getBlockReducer\@Level\@\@UEBAPEAVBlockReducer\@\@XZ + * @symbol ?getBlockReducer\@Level\@\@UEBAPEAVBlockReducer\@\@XZ */ MCVAPI class BlockReducer * getBlockReducer() const; /** - * @symbol ?getBlockRegistry\@Level\@\@UEBA?AV?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@XZ + * @symbol ?getBlockRegistry\@Level\@\@UEBA?AV?$weak_ptr\@VBlockTypeRegistry\@\@\@std\@\@XZ */ MCVAPI class std::weak_ptr getBlockRegistry() const; /** - * @symbol ?getCameraPresets\@Level\@\@UEAAAEAVCameraPresets\@\@XZ + * @symbol ?getCameraPresets\@Level\@\@UEAAAEAVCameraPresets\@\@XZ */ MCVAPI class CameraPresets & getCameraPresets(); /** - * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ + * @symbol ?getCameraPresets\@Level\@\@UEBAAEBVCameraPresets\@\@XZ */ MCVAPI class CameraPresets const & getCameraPresets() const; /** - * @symbol ?getChunkTickRange\@Level\@\@UEBAIXZ + * @symbol ?getChunkTickRange\@Level\@\@UEBAIXZ */ MCVAPI unsigned int getChunkTickRange() const; /** - * @symbol ?getClientPlayerEventCoordinator\@Level\@\@UEAAAEAVClientPlayerEventCoordinator\@\@XZ + * @symbol ?getClientPlayerEventCoordinator\@Level\@\@UEAAAEAVClientPlayerEventCoordinator\@\@XZ */ MCVAPI class ClientPlayerEventCoordinator & getClientPlayerEventCoordinator(); /** - * @symbol ?getClientResourcePackManager\@Level\@\@UEBAPEAVResourcePackManager\@\@XZ + * @symbol ?getClientResourcePackManager\@Level\@\@UEBAPEAVResourcePackManager\@\@XZ */ MCVAPI class ResourcePackManager * getClientResourcePackManager() const; /** - * @symbol ?getClientTickingOffsets\@Level\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getClientTickingOffsets\@Level\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector const & getClientTickingOffsets() const; /** - * @symbol ?getCurrentServerTick\@Level\@\@UEBA?BUTick\@\@XZ + * @symbol ?getCurrentServerTick\@Level\@\@UEBA?BUTick\@\@XZ */ MCVAPI struct Tick const getCurrentServerTick() const; /** - * @symbol ?getCurrentTick\@Level\@\@UEBAAEBUTick\@\@XZ + * @symbol ?getCurrentTick\@Level\@\@UEBAAEBUTick\@\@XZ */ MCVAPI struct Tick const & getCurrentTick() const; /** - * @symbol ?getDefaultAbilities\@Level\@\@UEAAAEAVAbilities\@\@XZ + * @symbol ?getDefaultAbilities\@Level\@\@UEAAAEAVAbilities\@\@XZ */ MCVAPI class Abilities & getDefaultAbilities(); /** - * @symbol ?getDefaultGameType\@Level\@\@UEBA?AW4GameType\@\@XZ + * @symbol ?getDefaultGameType\@Level\@\@UEBA?AW4GameType\@\@XZ */ MCVAPI enum class GameType getDefaultGameType() const; /** - * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ + * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ */ - MCVAPI class PermissionsHandler & getDefaultPermissions(); + MCVAPI class PermissionsHandler const & getDefaultPermissions() const; /** - * @symbol ?getDefaultPermissions\@Level\@\@UEBAAEBVPermissionsHandler\@\@XZ + * @symbol ?getDefaultPermissions\@Level\@\@UEAAAEAVPermissionsHandler\@\@XZ */ - MCVAPI class PermissionsHandler const & getDefaultPermissions() const; + MCVAPI class PermissionsHandler & getDefaultPermissions(); /** - * @symbol ?getDefaultSpawn\@Level\@\@UEBAAEBVBlockPos\@\@XZ + * @symbol ?getDefaultSpawn\@Level\@\@UEBAAEBVBlockPos\@\@XZ */ MCVAPI class BlockPos const & getDefaultSpawn() const; /** - * @symbol ?getDifficulty\@Level\@\@UEBA?AW4Difficulty\@\@XZ + * @symbol ?getDifficulty\@Level\@\@UEBA?AW4Difficulty\@\@XZ */ MCVAPI enum class Difficulty getDifficulty() const; /** - * @symbol ?getDimension\@Level\@\@UEBA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getDimension\@Level\@\@UEBA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI class WeakRefT> getDimension(class AutomaticID) const; /** - * @symbol ?getDimensionConversionData\@Level\@\@UEBA?AVDimensionConversionData\@\@XZ + * @symbol ?getDimensionConversionData\@Level\@\@UEBA?AVDimensionConversionData\@\@XZ */ MCVAPI class DimensionConversionData getDimensionConversionData() const; /** - * @symbol ?getDimensionDefinitionGroup\@Level\@\@UEBA?BV?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@XZ + * @symbol ?getDimensionDefinition\@Level\@\@UEBA?AV?$optional\@UDimensionDefinition\@DimensionDefinitionGroup\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCVAPI class std::optional getDimensionDefinition(std::string const &) const; + /** + * @symbol ?getDimensionDefinitionGroup\@Level\@\@UEBA?BV?$optional\@VDimensionDefinitionGroup\@\@\@std\@\@XZ */ MCVAPI class std::optional const getDimensionDefinitionGroup() const; /** - * @symbol ?getDimensionFactory\@Level\@\@UEBAAEBV?$OwnerPtrFactory\@VDimension\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ + * @symbol ?getDimensionFactory\@Level\@\@UEAAAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ */ - MCVAPI class OwnerPtrFactory const & getDimensionFactory() const; + MCVAPI class OwnerPtrFactory & getDimensionFactory(); /** - * @symbol ?getDimensionFactory\@Level\@\@UEAAAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ + * @symbol ?getDimensionFactory\@Level\@\@UEBAAEBV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@XZ */ - MCVAPI class OwnerPtrFactory & getDimensionFactory(); + MCVAPI class OwnerPtrFactory const & getDimensionFactory() const; /** - * @symbol ?getDisablePlayerInteractions\@Level\@\@UEBA_NXZ + * @symbol ?getDisablePlayerInteractions\@Level\@\@UEBA_NXZ */ MCVAPI bool getDisablePlayerInteractions() const; /** - * @symbol ?getEducationLevelSettings\@Level\@\@UEBAAEBV?$optional\@UEducationLevelSettings\@\@\@std\@\@XZ + * @symbol ?getEducationLevelSettings\@Level\@\@UEBAAEBV?$optional\@UEducationLevelSettings\@\@\@std\@\@XZ */ MCVAPI class std::optional const & getEducationLevelSettings() const; /** - * @symbol ?getEntities\@Level\@\@UEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getEntities\@Level\@\@UEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector> const & getEntities() const; /** - * @symbol ?getEntityDefinitions\@Level\@\@UEBAPEAVActorDefinitionGroup\@\@XZ + * @symbol ?getEntityDefinitions\@Level\@\@UEBAPEAVActorDefinitionGroup\@\@XZ */ MCVAPI class ActorDefinitionGroup * getEntityDefinitions() const; /** - * @symbol ?getEntityRegistry\@Level\@\@UEBA?AV?$StackRefResultT\@UEntityRegistryConstRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@Level\@\@UEBA?AV?$StackRefResultT\@UEntityRegistryConstRefTraits\@\@\@\@XZ */ MCVAPI class StackRefResultT getEntityRegistry() const; /** - * @symbol ?getEntityRegistry\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@Level\@\@UEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ MCVAPI class StackRefResultT getEntityRegistry(); /** - * @symbol ?getEntitySystems\@Level\@\@UEAAAEAVEntitySystems\@\@XZ + * @symbol ?getEntitySystems\@Level\@\@UEAAAEAVEntitySystems\@\@XZ */ MCVAPI class EntitySystems & getEntitySystems(); /** - * @symbol ?getEventing\@Level\@\@UEAAAEAVIMinecraftEventing\@\@XZ + * @symbol ?getEventing\@Level\@\@UEAAAEAVIMinecraftEventing\@\@XZ */ MCVAPI class IMinecraftEventing & getEventing(); /** - * @symbol ?getFeatureRegistry\@Level\@\@UEAAAEAVFeatureRegistry\@\@XZ + * @symbol ?getFeatureRegistry\@Level\@\@UEAAAEAVFeatureRegistry\@\@XZ */ MCVAPI class FeatureRegistry & getFeatureRegistry(); /** - * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ + * @symbol ?getFeatureRegistry\@Level\@\@UEBAAEBVFeatureRegistry\@\@XZ */ MCVAPI class FeatureRegistry const & getFeatureRegistry() const; /** - * @symbol ?getFeatureTypeFactory\@Level\@\@UEAAAEAVFeatureTypeFactory\@\@XZ + * @symbol ?getFeatureTypeFactory\@Level\@\@UEAAAEAVFeatureTypeFactory\@\@XZ */ MCVAPI class FeatureTypeFactory & getFeatureTypeFactory(); /** - * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ + * @symbol ?getFeatureTypeFactory\@Level\@\@UEBAAEBVFeatureTypeFactory\@\@XZ */ MCVAPI class FeatureTypeFactory const & getFeatureTypeFactory() const; /** - * @symbol ?getGameRules\@Level\@\@UEAAAEAVGameRules\@\@XZ + * @symbol ?getGameRules\@Level\@\@UEBAAEBVGameRules\@\@XZ */ - MCVAPI class GameRules & getGameRules(); + MCVAPI class GameRules const & getGameRules() const; /** - * @symbol ?getGameRules\@Level\@\@UEBAAEBVGameRules\@\@XZ + * @symbol ?getGameRules\@Level\@\@UEAAAEAVGameRules\@\@XZ */ - MCVAPI class GameRules const & getGameRules() const; + MCVAPI class GameRules & getGameRules(); /** - * @symbol ?getHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ + * @symbol ?getHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ */ MCVAPI class HitResult & getHitResult(); /** - * @symbol ?getIOTasksGroup\@Level\@\@UEAAAEAVTaskGroup\@\@XZ + * @symbol ?getIOTasksGroup\@Level\@\@UEAAAEAVTaskGroup\@\@XZ */ MCVAPI class TaskGroup & getIOTasksGroup(); /** - * @symbol ?getImmersiveReaderString\@Level\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getImmersiveReaderString\@Level\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string const & getImmersiveReaderString() const; /** - * @symbol ?getInternalComponentRegistry\@Level\@\@UEBAAEAVInternalComponentRegistry\@\@XZ + * @symbol ?getInternalComponentRegistry\@Level\@\@UEBAAEAVInternalComponentRegistry\@\@XZ */ MCVAPI class InternalComponentRegistry & getInternalComponentRegistry() const; /** - * @symbol ?getItemEventCoordinator\@Level\@\@UEAAAEAVItemEventCoordinator\@\@XZ + * @symbol ?getItemEventCoordinator\@Level\@\@UEAAAEAVItemEventCoordinator\@\@XZ */ MCVAPI class ItemEventCoordinator & getItemEventCoordinator(); /** - * @symbol ?getItemRegistry\@Level\@\@UEBA?AVItemRegistryRef\@\@XZ + * @symbol ?getItemRegistry\@Level\@\@UEBA?AVItemRegistryRef\@\@XZ */ MCVAPI class ItemRegistryRef getItemRegistry() const; /** - * @symbol ?getJigsawStructureRegistry\@Level\@\@UEAAAEAVJigsawStructureRegistry\@\@XZ + * @symbol ?getJigsawStructureRegistry\@Level\@\@UEBAAEBVJigsawStructureRegistry\@\@XZ */ - MCVAPI class JigsawStructureRegistry & getJigsawStructureRegistry(); + MCVAPI class JigsawStructureRegistry const & getJigsawStructureRegistry() const; /** - * @symbol ?getJigsawStructureRegistry\@Level\@\@UEBAAEBVJigsawStructureRegistry\@\@XZ + * @symbol ?getJigsawStructureRegistry\@Level\@\@UEAAAEAVJigsawStructureRegistry\@\@XZ */ - MCVAPI class JigsawStructureRegistry const & getJigsawStructureRegistry() const; + MCVAPI class JigsawStructureRegistry & getJigsawStructureRegistry(); /** - * @symbol ?getLANBroadcast\@Level\@\@UEBA_NXZ + * @symbol ?getLANBroadcast\@Level\@\@UEBA_NXZ */ MCVAPI bool getLANBroadcast() const; /** - * @symbol ?getLANBroadcastIntent\@Level\@\@UEBA_NXZ + * @symbol ?getLANBroadcastIntent\@Level\@\@UEBA_NXZ */ MCVAPI bool getLANBroadcastIntent() const; /** - * @symbol ?getLastOrDefaultSpawnDimensionId\@Level\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@V2\@\@Z + * @symbol ?getLastOrDefaultSpawnDimensionId\@Level\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@V2\@\@Z */ MCVAPI class AutomaticID getLastOrDefaultSpawnDimensionId(class AutomaticID) const; /** - * @symbol ?getLevelChunkMetaDataDictionary\@Level\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + * @symbol ?getLevelChunkMetaDataDictionary\@Level\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ */ MCVAPI class std::shared_ptr getLevelChunkMetaDataDictionary() const; /** - * @symbol ?getLevelData\@Level\@\@UEAAAEAVLevelData\@\@XZ + * @symbol ?getLevelData\@Level\@\@UEBAAEBVLevelData\@\@XZ */ - MCVAPI class LevelData & getLevelData(); + MCVAPI class LevelData const & getLevelData() const; /** - * @symbol ?getLevelData\@Level\@\@UEBAAEBVLevelData\@\@XZ + * @symbol ?getLevelData\@Level\@\@UEAAAEAVLevelData\@\@XZ */ - MCVAPI class LevelData const & getLevelData() const; + MCVAPI class LevelData & getLevelData(); /** - * @symbol ?getLevelEntity\@Level\@\@UEAA?AV?$WeakRefT\@UEntityRefTraits\@\@\@\@XZ + * @symbol ?getLevelEntity\@Level\@\@UEAA?AV?$WeakRefT\@UEntityRefTraits\@\@\@\@XZ */ MCVAPI class WeakRefT getLevelEntity(); /** - * @symbol ?getLevelEventCoordinator\@Level\@\@UEAAAEAVLevelEventCoordinator\@\@XZ + * @symbol ?getLevelEventCoordinator\@Level\@\@UEAAAEAVLevelEventCoordinator\@\@XZ */ MCVAPI class LevelEventCoordinator & getLevelEventCoordinator(); /** - * @symbol ?getLevelId\@Level\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @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 + * @symbol ?getLevelStorage\@Level\@\@UEAAAEAVLevelStorage\@\@XZ */ - MCVAPI class LevelStorage const & getLevelStorage() const; + MCVAPI class LevelStorage & getLevelStorage(); /** - * @symbol ?getLevelStorage\@Level\@\@UEAAAEAVLevelStorage\@\@XZ + * @symbol ?getLevelStorage\@Level\@\@UEBAAEBVLevelStorage\@\@XZ */ - MCVAPI class LevelStorage & getLevelStorage(); + MCVAPI class LevelStorage const & getLevelStorage() const; /** - * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEAAAEAV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ + * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEAAAEAV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ */ MCVAPI class Factory & getLightTextureImageBuilderFactory(); /** - * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEBAAEBV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ + * @symbol ?getLightTextureImageBuilderFactory\@Level\@\@UEBAAEBV?$Factory\@VBaseLightTextureImageBuilder\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@XZ */ MCVAPI class Factory const & getLightTextureImageBuilderFactory() const; /** - * @symbol ?getLiquidHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ + * @symbol ?getLiquidHitResult\@Level\@\@UEAAAEAVHitResult\@\@XZ */ MCVAPI class HitResult & getLiquidHitResult(); /** - * @symbol ?getLootTables\@Level\@\@UEAAAEAVLootTables\@\@XZ + * @symbol ?getLootTables\@Level\@\@UEAAAEAVLootTables\@\@XZ */ MCVAPI class LootTables & getLootTables(); /** - * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@AEBVCompoundTag\@\@\@Z */ MCVAPI class MapItemSavedData * getMapSavedData(class CompoundTag const &); /** - * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@PEBVCompoundTag\@\@\@Z */ MCVAPI class MapItemSavedData * getMapSavedData(class CompoundTag const *); /** - * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z + * @symbol ?getMapSavedData\@Level\@\@UEAAPEAVMapItemSavedData\@\@UActorUniqueID\@\@\@Z */ MCVAPI class MapItemSavedData * getMapSavedData(struct ActorUniqueID); /** - * @symbol ?getMob\@Level\@\@UEBAPEAVMob\@\@UActorUniqueID\@\@\@Z + * @symbol ?getMob\@Level\@\@UEBAPEAVMob\@\@UActorUniqueID\@\@\@Z */ MCVAPI class Mob * getMob(struct ActorUniqueID) const; /** - * @symbol ?getMultiplayerGameIntent\@Level\@\@UEBA_NXZ + * @symbol ?getMultiplayerGameIntent\@Level\@\@UEBA_NXZ */ MCVAPI bool getMultiplayerGameIntent() const; /** - * @symbol ?getNetEventCallback\@Level\@\@UEBA?AV?$NonOwnerPointer\@VNetEventCallback\@\@\@Bedrock\@\@XZ + * @symbol ?getNetEventCallback\@Level\@\@UEBA?AV?$NonOwnerPointer\@VNetEventCallback\@\@\@Bedrock\@\@XZ */ MCVAPI class Bedrock::NonOwnerPointer getNetEventCallback() const; /** - * @symbol ?getNetherScale\@Level\@\@UEBAHXZ + * @symbol ?getNetherScale\@Level\@\@UEBAHXZ */ MCVAPI int getNetherScale() const; /** - * @symbol ?getNewPlayerId\@Level\@\@UEBAHXZ + * @symbol ?getNewPlayerId\@Level\@\@UEBAHXZ */ MCVAPI int getNewPlayerId() const; /** - * @symbol ?getNewUniqueID\@Level\@\@UEAA?AUActorUniqueID\@\@XZ + * @symbol ?getNewUniqueID\@Level\@\@UEAA?AUActorUniqueID\@\@XZ */ MCVAPI struct ActorUniqueID getNewUniqueID(); /** - * @symbol ?getNextRuntimeID\@Level\@\@UEAA?AVActorRuntimeID\@\@XZ + * @symbol ?getNextRuntimeID\@Level\@\@UEAA?AVActorRuntimeID\@\@XZ */ MCVAPI class ActorRuntimeID getNextRuntimeID(); /** - * @symbol ?getNumRemotePlayers\@Level\@\@UEAAHXZ + * @symbol ?getNumRemotePlayers\@Level\@\@UEAAHXZ */ MCVAPI int getNumRemotePlayers(); /** - * @symbol ?getOrCreateDimension\@Level\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getOrCreateDimension\@Level\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI class WeakRefT> getOrCreateDimension(class AutomaticID); /** - * @symbol ?getPacketSender\@Level\@\@UEBAPEAVPacketSender\@\@XZ + * @symbol ?getPacketSender\@Level\@\@UEBAPEAVPacketSender\@\@XZ */ MCVAPI class PacketSender * getPacketSender() const; /** - * @symbol ?getPauseManager\@Level\@\@UEAA?AV?$StackRefResultT\@U?$SharePtrRefTraits\@VPauseManager\@\@\@\@\@\@XZ + * @symbol ?getPauseManager\@Level\@\@UEBA?AV?$StackRefResultT\@U?$SharePtrRefTraits\@$$CBVPauseManager\@\@\@\@\@\@XZ */ - MCVAPI class StackRefResultT> getPauseManager(); + MCVAPI class StackRefResultT> getPauseManager() const; /** - * @symbol ?getPauseManager\@Level\@\@UEBA?AV?$StackRefResultT\@U?$SharePtrRefTraits\@$$CBVPauseManager\@\@\@\@\@\@XZ + * @symbol ?getPauseManager\@Level\@\@UEAA?AV?$StackRefResultT\@U?$SharePtrRefTraits\@VPauseManager\@\@\@\@\@\@XZ */ - MCVAPI class StackRefResultT> getPauseManager() const; + MCVAPI class StackRefResultT> getPauseManager(); /** - * @symbol ?getPhotoStorage\@Level\@\@UEAAAEAVPhotoStorage\@\@XZ + * @symbol ?getPhotoStorage\@Level\@\@UEAAAEAVPhotoStorage\@\@XZ */ MCVAPI class PhotoStorage & getPhotoStorage(); /** - * @symbol ?getPlatformBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getPlatformBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCVAPI enum class Social::GamePublishSetting getPlatformBroadcastIntent() const; /** - * @symbol ?getPlatformBroadcastMode\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getPlatformBroadcastMode\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCVAPI enum class Social::GamePublishSetting getPlatformBroadcastMode() const; /** - * @symbol ?getPlatformPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPlatformPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlatformPlayer(std::string const &) const; /** - * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBVUUID\@mce\@\@\@Z */ - MCVAPI class Player * getPlayer(std::string const &) const; + MCVAPI class Player * getPlayer(class mce::UUID const &) const; /** - * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCVAPI class Player * getPlayer(class mce::UUID const &) const; + MCVAPI class Player * getPlayer(std::string const &) const; /** - * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@UActorUniqueID\@\@\@Z + * @symbol ?getPlayer\@Level\@\@UEBAPEAVPlayer\@\@UActorUniqueID\@\@\@Z */ MCVAPI class Player * getPlayer(struct ActorUniqueID) const; /** - * @symbol ?getPlayerAbilities\@Level\@\@UEAAPEAVLayeredAbilities\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?getPlayerAbilities\@Level\@\@UEAAPEAVLayeredAbilities\@\@AEBUActorUniqueID\@\@\@Z */ MCVAPI class LayeredAbilities * getPlayerAbilities(struct ActorUniqueID const &); /** - * @symbol ?getPlayerByXuid\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPlayerByXuid\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlayerByXuid(std::string const &) const; /** - * @symbol ?getPlayerColor\@Level\@\@UEBA?AVColor\@mce\@\@AEBVPlayer\@\@\@Z + * @symbol ?getPlayerColor\@Level\@\@UEBA?AVColor\@mce\@\@AEBVPlayer\@\@\@Z */ MCVAPI class mce::Color getPlayerColor(class Player const &) const; /** - * @symbol ?getPlayerFromServerId\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPlayerFromServerId\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlayerFromServerId(std::string const &) const; /** - * @symbol ?getPlayerFromUnknownIdentifier\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPlayerFromUnknownIdentifier\@Level\@\@UEBAPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class Player * getPlayerFromUnknownIdentifier(std::string const &) const; /** - * @symbol ?getPlayerList\@Level\@\@UEAAAEAV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ + * @symbol ?getPlayerList\@Level\@\@UEAAAEAV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ */ MCVAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getPlayerList(); /** - * @symbol ?getPlayerList\@Level\@\@UEBAAEBV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ + * @symbol ?getPlayerList\@Level\@\@UEBAAEBV?$unordered_map\@VUUID\@mce\@\@VPlayerListEntry\@\@U?$hash\@VUUID\@mce\@\@\@std\@\@U?$equal_to\@VUUID\@mce\@\@\@5\@V?$allocator\@U?$pair\@$$CBVUUID\@mce\@\@VPlayerListEntry\@\@\@std\@\@\@5\@\@std\@\@XZ */ MCVAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getPlayerList() const; /** - * @symbol ?getPlayerMovementSettings\@Level\@\@UEBAAEBUPlayerMovementSettings\@\@XZ + * @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 + * @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 + * @symbol ?getPlayerPlatformOnlineId\@Level\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ MCVAPI std::string const & getPlayerPlatformOnlineId(class mce::UUID const &) const; /** - * @symbol ?getPlayerXUID\@Level\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?getPlayerXUID\@Level\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ MCVAPI std::string const & getPlayerXUID(class mce::UUID const &) const; /** - * @symbol ?getPortalForcer\@Level\@\@UEAAAEAVPortalForcer\@\@XZ + * @symbol ?getPortalForcer\@Level\@\@UEAAAEAVPortalForcer\@\@XZ */ MCVAPI class PortalForcer & getPortalForcer(); /** - * @symbol ?getPositionTrackerDBClient\@Level\@\@UEBAPEAVPositionTrackingDBClient\@PositionTrackingDB\@\@XZ + * @symbol ?getPositionTrackerDBClient\@Level\@\@UEBAPEAVPositionTrackingDBClient\@PositionTrackingDB\@\@XZ */ MCVAPI class PositionTrackingDB::PositionTrackingDBClient * getPositionTrackerDBClient() const; /** - * @symbol ?getPositionTrackerDBServer\@Level\@\@UEBAPEAVPositionTrackingDBServer\@PositionTrackingDB\@\@XZ + * @symbol ?getPositionTrackerDBServer\@Level\@\@UEBAPEAVPositionTrackingDBServer\@PositionTrackingDB\@\@XZ */ MCVAPI class PositionTrackingDB::PositionTrackingDBServer * getPositionTrackerDBServer() const; /** - * @symbol ?getPrimaryLocalPlayer\@Level\@\@UEBAPEAVPlayer\@\@XZ + * @symbol ?getPrimaryLocalPlayer\@Level\@\@UEBAPEAVPlayer\@\@XZ */ MCVAPI class Player * getPrimaryLocalPlayer() const; /** - * @symbol ?getProjectileFactory\@Level\@\@UEBAAEAVProjectileFactory\@\@XZ + * @symbol ?getProjectileFactory\@Level\@\@UEBAAEAVProjectileFactory\@\@XZ */ MCVAPI class ProjectileFactory & getProjectileFactory() const; /** - * @symbol ?getRandom\@Level\@\@UEBAAEAVRandom\@\@XZ + * @symbol ?getRandom\@Level\@\@UEBAAEAVRandom\@\@XZ */ MCVAPI class Random & getRandom() const; /** - * @symbol ?getRandomPlayer\@Level\@\@UEAAPEAVPlayer\@\@XZ + * @symbol ?getRandomPlayer\@Level\@\@UEAAPEAVPlayer\@\@XZ */ MCVAPI class Player * getRandomPlayer(); /** - * @symbol ?getRecipes\@Level\@\@UEBAAEAVRecipes\@\@XZ + * @symbol ?getRecipes\@Level\@\@UEBAAEAVRecipes\@\@XZ */ MCVAPI class Recipes & getRecipes() const; /** - * @symbol ?getRegisteredBorderBlock\@Level\@\@UEBAAEBVBlockLegacy\@\@XZ + * @symbol ?getRegisteredBorderBlock\@Level\@\@UEBAAEBVBlockLegacy\@\@XZ */ MCVAPI class BlockLegacy const & getRegisteredBorderBlock() const; /** - * @symbol ?getRemotePlayerEventCoordinator\@Level\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ + * @symbol ?getRemotePlayerEventCoordinator\@Level\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ MCVAPI class PlayerEventCoordinator & getRemotePlayerEventCoordinator(); /** - * @symbol ?getRuntimeActorList\@Level\@\@UEBA?AV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getRuntimeActorList\@Level\@\@UEBA?AV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector getRuntimeActorList() const; /** - * @symbol ?getRuntimeEntity\@Level\@\@UEBAPEAVActor\@\@VActorRuntimeID\@\@_N\@Z + * @symbol ?getRuntimeEntity\@Level\@\@UEBAPEAVActor\@\@VActorRuntimeID\@\@_N\@Z */ MCVAPI class Actor * getRuntimeEntity(class ActorRuntimeID, bool) const; /** - * @symbol ?getRuntimePlayer\@Level\@\@UEBAPEAVPlayer\@\@VActorRuntimeID\@\@\@Z + * @symbol ?getRuntimePlayer\@Level\@\@UEBAPEAVPlayer\@\@VActorRuntimeID\@\@\@Z */ MCVAPI class Player * getRuntimePlayer(class ActorRuntimeID) const; /** - * @symbol ?getSavedData\@Level\@\@UEBAAEAVSavedDataStorage\@\@XZ + * @symbol ?getSavedData\@Level\@\@UEBAAEAVSavedDataStorage\@\@XZ */ MCVAPI class SavedDataStorage & getSavedData() const; /** - * @symbol ?getScoreboard\@Level\@\@UEAAAEAVScoreboard\@\@XZ + * @symbol ?getScoreboard\@Level\@\@UEAAAEAVScoreboard\@\@XZ */ MCVAPI class Scoreboard & getScoreboard(); /** - * @symbol ?getScreenshotsFolder\@Level\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getScreenshotsFolder\@Level\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer getScreenshotsFolder() const; /** - * @symbol ?getScriptingEventCoordinator\@Level\@\@UEAAAEAVScriptingEventCoordinator\@\@XZ + * @symbol ?getScriptingEventCoordinator\@Level\@\@UEAAAEAVScriptingEventCoordinator\@\@XZ */ MCVAPI class ScriptingEventCoordinator & getScriptingEventCoordinator(); /** - * @symbol ?getSeed\@Level\@\@UEAAIXZ + * @symbol ?getSeed\@Level\@\@UEAAIXZ */ MCVAPI unsigned int getSeed(); /** - * @symbol ?getServerNetworkEventCoordinator\@Level\@\@UEAAAEAVServerNetworkEventCoordinator\@\@XZ + * @symbol ?getServerNetworkEventCoordinator\@Level\@\@UEAAAEAVServerNetworkEventCoordinator\@\@XZ */ MCVAPI class ServerNetworkEventCoordinator & getServerNetworkEventCoordinator(); /** - * @symbol ?getServerPlayerEventCoordinator\@Level\@\@UEAAAEAVServerPlayerEventCoordinator\@\@XZ + * @symbol ?getServerPlayerEventCoordinator\@Level\@\@UEAAAEAVServerPlayerEventCoordinator\@\@XZ */ MCVAPI class ServerPlayerEventCoordinator & getServerPlayerEventCoordinator(); /** - * @symbol ?getServerResourcePackManager\@Level\@\@UEBAPEAVResourcePackManager\@\@XZ + * @symbol ?getServerResourcePackManager\@Level\@\@UEBAPEAVResourcePackManager\@\@XZ */ MCVAPI class ResourcePackManager * getServerResourcePackManager() const; /** - * @symbol ?getSharedSpawnPos\@Level\@\@UEBAAEBVBlockPos\@\@XZ + * @symbol ?getSharedSpawnPos\@Level\@\@UEBAAEBVBlockPos\@\@XZ */ MCVAPI class BlockPos const & getSharedSpawnPos() const; /** - * @symbol ?getSimPaused\@Level\@\@UEAA_NXZ + * @symbol ?getSimPaused\@Level\@\@UEAA_NXZ */ MCVAPI bool getSimPaused(); /** - * @symbol ?getSleepStatus\@Level\@\@UEBA?AUSleepStatus\@ILevel\@\@XZ + * @symbol ?getSleepStatus\@Level\@\@UEBA?AUSleepStatus\@ILevel\@\@XZ */ MCVAPI struct ILevel::SleepStatus getSleepStatus() const; /** - * @symbol ?getSoundPlayer\@Level\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getSoundPlayer\@Level\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null> getSoundPlayer() const; /** - * @symbol ?getSpawnGroupRegistry\@Level\@\@UEBAPEBVSpawnGroupRegistry\@\@XZ - */ - MCVAPI class SpawnGroupRegistry const * getSpawnGroupRegistry() const; - /** - * @symbol ?getSpawnRules\@Level\@\@UEBAPEBVActorSpawnRuleGroup\@\@XZ - */ - MCVAPI class ActorSpawnRuleGroup const * getSpawnRules() const; - /** - * @symbol ?getSpawnRulesMutable\@Level\@\@UEBAPEAVActorSpawnRuleGroup\@\@XZ - */ - MCVAPI class ActorSpawnRuleGroup * getSpawnRulesMutable() const; - /** - * @symbol ?getSpawnSettings\@Level\@\@UEBAAEBUSpawnSettings\@\@XZ - */ - MCVAPI struct SpawnSettings const & getSpawnSettings() const; - /** - * @symbol ?getSpawnableTickedMobCountPrevious\@Level\@\@UEBAIXZ + * @symbol ?getSpawnableTickedMobCountPrevious\@Level\@\@UEBAIXZ */ MCVAPI unsigned int getSpawnableTickedMobCountPrevious() const; /** - * @symbol ?getSpawner\@Level\@\@UEBAAEAVSpawner\@\@XZ + * @symbol ?getSpawner\@Level\@\@UEBAAEAVSpawner\@\@XZ */ MCVAPI class Spawner & getSpawner() const; /** - * @symbol ?getSpecialMultiplier\@Level\@\@UEBAMV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getSpecialMultiplier\@Level\@\@UEBAMV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI float getSpecialMultiplier(class AutomaticID) const; /** - * @symbol ?getStructureManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getStructureManager\@Level\@\@UEBA?BV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ */ - MCVAPI class gsl::not_null> getStructureManager(); + MCVAPI class gsl::not_null> const getStructureManager() const; /** - * @symbol ?getStructureManager\@Level\@\@UEBA?BV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getStructureManager\@Level\@\@UEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ */ - MCVAPI class gsl::not_null> const getStructureManager() const; + MCVAPI class gsl::not_null> getStructureManager(); /** - * @symbol ?getSubChunkRequestManager\@Level\@\@UEAAPEAVSubChunkRequestManager\@\@XZ + * @symbol ?getSubChunkRequestManager\@Level\@\@UEAAPEAVSubChunkRequestManager\@\@XZ */ MCVAPI class SubChunkRequestManager * getSubChunkRequestManager(); /** - * @symbol ?getSurfaceBuilderRegistry\@Level\@\@UEBAAEBVSurfaceBuilderRegistry\@\@XZ + * @symbol ?getSurfaceBuilderRegistry\@Level\@\@UEAAAEAVSurfaceBuilderRegistry\@\@XZ */ - MCVAPI class SurfaceBuilderRegistry const & getSurfaceBuilderRegistry() const; + MCVAPI class SurfaceBuilderRegistry & getSurfaceBuilderRegistry(); /** - * @symbol ?getSurfaceBuilderRegistry\@Level\@\@UEAAAEAVSurfaceBuilderRegistry\@\@XZ + * @symbol ?getSurfaceBuilderRegistry\@Level\@\@UEBAAEBVSurfaceBuilderRegistry\@\@XZ */ - MCVAPI class SurfaceBuilderRegistry & getSurfaceBuilderRegistry(); + MCVAPI class SurfaceBuilderRegistry const & getSurfaceBuilderRegistry() const; /** - * @symbol ?getSyncTasksGroup\@Level\@\@UEAAAEAVTaskGroup\@\@XZ + * @symbol ?getSyncTasksGroup\@Level\@\@UEAAAEAVTaskGroup\@\@XZ */ MCVAPI class TaskGroup & getSyncTasksGroup(); /** - * @symbol ?getTagRegistry\@Level\@\@UEAAAEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@XZ + * @symbol ?getTagRegistry\@Level\@\@UEAAAEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@XZ */ MCVAPI class TagRegistry, struct IDType> & getTagRegistry(); /** - * @symbol ?getTearingDown\@Level\@\@UEBA_NXZ + * @symbol ?getTearingDown\@Level\@\@UEBA_NXZ */ MCVAPI bool getTearingDown() const; /** - * @symbol ?getThreadRandom\@Level\@\@UEBAAEAVRandom\@\@XZ + * @symbol ?getThreadRandom\@Level\@\@UEBAAEAVRandom\@\@XZ */ MCVAPI class Random & getThreadRandom() const; /** - * @symbol ?getTickingArea\@Level\@\@UEBAPEAVITickingArea\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?getTickingArea\@Level\@\@UEBAPEAVITickingArea\@\@AEBVUUID\@mce\@\@\@Z */ MCVAPI class ITickingArea * getTickingArea(class mce::UUID const &) const; /** - * @symbol ?getTickingAreasMgr\@Level\@\@UEAAAEAVTickingAreasManager\@\@XZ + * @symbol ?getTickingAreasMgr\@Level\@\@UEAAAEAVTickingAreasManager\@\@XZ */ MCVAPI class TickingAreasManager & getTickingAreasMgr(); /** - * @symbol ?getTickingOffsets\@Level\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getTickingOffsets\@Level\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector const & getTickingOffsets() const; /** - * @symbol ?getTime\@Level\@\@UEBAHXZ + * @symbol ?getTime\@Level\@\@UEBAHXZ */ MCVAPI int getTime() const; /** - * @symbol ?getTradeTables\@Level\@\@UEAAPEAVTradeTables\@\@XZ + * @symbol ?getTradeTables\@Level\@\@UEAAPEAVTradeTables\@\@XZ */ MCVAPI class TradeTables * getTradeTables(); /** - * @symbol ?getUnknownBlockTypeRegistry\@Level\@\@UEAAAEAVIUnknownBlockTypeRegistry\@\@XZ + * @symbol ?getUnknownBlockTypeRegistry\@Level\@\@UEAA?AV?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@XZ */ - MCVAPI class IUnknownBlockTypeRegistry & getUnknownBlockTypeRegistry(); + MCVAPI class Bedrock::NonOwnerPointer getUnknownBlockTypeRegistry(); /** - * @symbol ?getUserCount\@Level\@\@UEBAHXZ + * @symbol ?getUserCount\@Level\@\@UEBAHXZ */ MCVAPI int getUserCount() const; /** - * @symbol ?getUsers\@Level\@\@UEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ - */ - MCVAPI std::vector> const & getUsers() const; - /** - * @symbol ?getUsers\@Level\@\@UEAAAEAV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getUsers\@Level\@\@UEAAAEAV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector> & getUsers(); /** - * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ + * @symbol ?getUsers\@Level\@\@UEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@XZ */ - MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const; + MCVAPI std::vector> const & getUsers() const; /** - * @symbol ?getWorldRegistriesProvider\@Level\@\@UEAAAEAVIWorldRegistriesProvider\@\@XZ + * @symbol ?getWorldRegistriesProvider\@Level\@\@UEAAAEAVIWorldRegistriesProvider\@\@XZ */ MCVAPI class IWorldRegistriesProvider & getWorldRegistriesProvider(); /** - * @symbol ?getXBLBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getWorldRegistriesProvider\@Level\@\@UEBAAEBVIWorldRegistriesProvider\@\@XZ + */ + MCVAPI class IWorldRegistriesProvider const & getWorldRegistriesProvider() const; + /** + * @symbol ?getXBLBroadcastIntent\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCVAPI enum class Social::GamePublishSetting getXBLBroadcastIntent() const; /** - * @symbol ?getXBLBroadcastMode\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getXBLBroadcastMode\@Level\@\@UEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCVAPI enum class Social::GamePublishSetting getXBLBroadcastMode() const; /** - * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z */ - MCVAPI void handleLevelEvent(enum class LevelEvent, class CompoundTag const &); + MCVAPI void handleLevelEvent(enum class LevelEvent, class Vec3 const &, int); /** - * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z + * @symbol ?handleLevelEvent\@Level\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@\@Z */ - MCVAPI void handleLevelEvent(enum class LevelEvent, class Vec3 const &, int); + 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 + * @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 ?handleSoundEvent\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ MCVAPI void handleSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?handleStopAllSounds\@Level\@\@UEAAXXZ + * @symbol ?handleStopAllSounds\@Level\@\@UEAAXXZ */ MCVAPI void handleStopAllSounds(); /** - * @symbol ?handleStopSoundEvent\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?handleStopSoundEvent\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void handleStopSoundEvent(std::string const &); /** - * @symbol ?hasCommandsEnabled\@Level\@\@UEBA_NXZ + * @symbol ?hasCommandsEnabled\@Level\@\@UEBA_NXZ */ MCVAPI bool hasCommandsEnabled() const; /** - * @symbol ?hasLevelStorage\@Level\@\@UEBA_NXZ + * @symbol ?hasLevelStorage\@Level\@\@UEBA_NXZ */ MCVAPI bool hasLevelStorage() const; /** - * @symbol ?hasPlatformBroadcast\@Level\@\@UEBA_NXZ + * @symbol ?hasPlatformBroadcast\@Level\@\@UEBA_NXZ */ MCVAPI bool hasPlatformBroadcast() const; /** - * @symbol ?hasPlatformBroadcastIntent\@Level\@\@UEBA_NXZ + * @symbol ?hasPlatformBroadcastIntent\@Level\@\@UEBA_NXZ */ MCVAPI bool hasPlatformBroadcastIntent() const; /** - * @symbol ?hasStartWithMapEnabled\@Level\@\@UEBA_NXZ + * @symbol ?hasStartWithMapEnabled\@Level\@\@UEBA_NXZ */ MCVAPI bool hasStartWithMapEnabled() const; /** - * @symbol ?hasXBLBroadcast\@Level\@\@UEBA_NXZ + * @symbol ?hasXBLBroadcast\@Level\@\@UEBA_NXZ */ MCVAPI bool hasXBLBroadcast() const; /** - * @symbol ?hasXBLBroadcastIntent\@Level\@\@UEBA_NXZ + * @symbol ?hasXBLBroadcastIntent\@Level\@\@UEBA_NXZ */ MCVAPI bool hasXBLBroadcastIntent() const; /** - * @symbol ?incrementSpawnableTickedMob\@Level\@\@UEAAXXZ + * @symbol ?incrementSpawnableTickedMob\@Level\@\@UEAAXXZ */ MCVAPI void incrementSpawnableTickedMob(); /** - * @symbol ?incrementTagCache\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?incrementTagCache\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z */ MCVAPI void incrementTagCache(std::string const &, class TagRegistry, struct IDType> &); /** - * @symbol ?initialize\@Level\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelSettings\@\@PEAVLevelData\@\@AEBVExperiments\@\@PEBV23\@\@Z + * @symbol ?initialize\@Level\@\@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 ?initializeBlockDefinitionGroup\@Level\@\@UEAAXXZ + * @symbol ?initializeBlockDefinitionGroup\@Level\@\@UEAAXXZ */ MCVAPI void initializeBlockDefinitionGroup(); /** - * @symbol ?initializeLevelChunkMetaData\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?initializeLevelChunkMetaData\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void initializeLevelChunkMetaData(class LevelChunk &); /** - * @symbol ?isClientSide\@Level\@\@UEBA_NXZ + * @symbol ?isClientSide\@Level\@\@UEBA_NXZ */ MCVAPI bool isClientSide() const; /** - * @symbol ?isClientSideGenerationEnabled\@Level\@\@UEAA_NXZ + * @symbol ?isClientSideGenerationEnabled\@Level\@\@UEAA_NXZ */ MCVAPI bool isClientSideGenerationEnabled(); /** - * @symbol ?isEditorWorld\@Level\@\@UEBA_NXZ + * @symbol ?isEditorWorld\@Level\@\@UEBA_NXZ */ MCVAPI bool isEditorWorld() const; /** - * @symbol ?isEdu\@Level\@\@UEBA_NXZ + * @symbol ?isEdu\@Level\@\@UEBA_NXZ */ MCVAPI bool isEdu() const; /** - * @symbol ?isExporting\@Level\@\@UEBA_NXZ + * @symbol ?isExporting\@Level\@\@UEBA_NXZ */ MCVAPI bool isExporting() const; /** - * @symbol ?isLeaveGameDone\@Level\@\@UEAA_NXZ + * @symbol ?isLeaveGameDone\@Level\@\@UEAA_NXZ */ MCVAPI bool isLeaveGameDone(); /** - * @symbol ?isMultiplayerGame\@Level\@\@UEBA_NXZ + * @symbol ?isMultiplayerGame\@Level\@\@UEBA_NXZ */ MCVAPI bool isMultiplayerGame() const; /** - * @symbol ?isPlayerSuspended\@Level\@\@UEBA_NAEAVPlayer\@\@\@Z + * @symbol ?isPlayerSuspended\@Level\@\@UEBA_NAEAVPlayer\@\@\@Z */ MCVAPI bool isPlayerSuspended(class Player &) const; /** - * @symbol ?levelCleanupQueueEntityRemoval\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?levelCleanupQueueEntityRemoval\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI void levelCleanupQueueEntityRemoval(class OwnerPtrT); /** - * @symbol ?loadBlockDefinitionGroup\@Level\@\@UEAAXAEBVExperiments\@\@\@Z + * @symbol ?loadBlockDefinitionGroup\@Level\@\@UEAAXAEBVExperiments\@\@\@Z */ MCVAPI void loadBlockDefinitionGroup(class Experiments const &); /** - * @symbol ?loadFunctionManager\@Level\@\@UEAAXXZ + * @symbol ?loadFunctionManager\@Level\@\@UEAAXXZ */ MCVAPI void loadFunctionManager(); /** - * @symbol ?notifySubChunkRequestManager\@Level\@\@UEAAXAEBVSubChunkPacket\@\@\@Z + * @symbol ?notifySubChunkRequestManager\@Level\@\@UEAAXAEBVSubChunkPacket\@\@\@Z */ MCVAPI void notifySubChunkRequestManager(class SubChunkPacket const &); /** - * @symbol ?onChunkDiscarded\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkDiscarded\@Level\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkDiscarded(class LevelChunk &); /** - * @symbol ?onChunkLoaded\@Level\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@Level\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkLoaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?onChunkReload\@Level\@\@UEAAXAEBUBounds\@\@\@Z + * @symbol ?onChunkReload\@Level\@\@UEAAXAEBUBounds\@\@\@Z */ MCVAPI void onChunkReload(struct Bounds const &); /** - * @symbol ?onChunkReloaded\@Level\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkReloaded\@Level\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkReloaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?onPlayerDeath\@Level\@\@UEAAXAEAVPlayer\@\@AEBVActorDamageSource\@\@\@Z + * @symbol ?onPlayerDeath\@Level\@\@UEAAXAEAVPlayer\@\@AEBVActorDamageSource\@\@\@Z */ MCVAPI void onPlayerDeath(class Player &, class ActorDamageSource const &); /** - * @symbol ?onSourceCreated\@Level\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onSourceCreated\@Level\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onSourceCreated(class BlockSource &); /** - * @symbol ?onSourceDestroyed\@Level\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onSourceDestroyed\@Level\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onSourceDestroyed(class BlockSource &); /** - * @symbol ?onSubChunkLoaded\@Level\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@F_N\@Z + * @symbol ?onSubChunkLoaded\@Level\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@F_N\@Z */ MCVAPI void onSubChunkLoaded(class ChunkSource &, class LevelChunk &, short, bool); /** - * @symbol ?pauseAndFlushTaskGroups\@Level\@\@UEAAXXZ + * @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\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z */ - MCVAPI void playSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); /** - * @symbol ?playSound\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSound\@Level\@\@UEAAXAEBVIConstBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ - MCVAPI void playSound(class AutomaticID, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSound(class IConstBlockSource const &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + * @symbol ?playSound\@Level\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ - MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); + MCVAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSound\@Level\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ - MCVAPI void playSynchronizedSound(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + MCVAPI void playSound(class AutomaticID, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z + * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4\@Z */ MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z + * @symbol ?playSynchronizedSound\@Level\@\@UEAAXAEAVBlockSource\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@AEBVBlock\@\@AEBUActorDefinitionIdentifier\@\@_N5\@Z */ MCVAPI void playSynchronizedSound(class BlockSource &, enum class LevelSoundEvent, class Vec3 const &, class Block const &, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?potionSplash\@Level\@\@UEAAXAEBVVec3\@\@AEBVColor\@mce\@\@_N\@Z + * @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 ?potionSplash\@Level\@\@UEAAXAEBVVec3\@\@AEBVColor\@mce\@\@_N\@Z */ MCVAPI void potionSplash(class Vec3 const &, class mce::Color const &, bool); /** - * @symbol ?pruneChunkViewTrackers\@Level\@\@UEAAXXZ + * @symbol ?pruneChunkViewTrackers\@Level\@\@UEAAXXZ */ MCVAPI void pruneChunkViewTrackers(); /** - * @symbol ?queueEntityDestruction\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ?queueEntityDestruction\@Level\@\@UEAAXV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@Z */ MCVAPI void queueEntityDestruction(class OwnerPtrT); /** - * @symbol ?registerEventCoordinators\@Level\@\@UEAAXXZ + * @symbol ?registerEventCoordinators\@Level\@\@UEAAXXZ */ MCVAPI void registerEventCoordinators(); /** - * @symbol ?registerTemporaryPointer\@Level\@\@UEAAXAEAV_TickPtr\@\@\@Z + * @symbol ?registerTemporaryPointer\@Level\@\@UEAAXAEAV_TickPtr\@\@\@Z */ MCVAPI void registerTemporaryPointer(class _TickPtr &); /** - * @symbol ?removeActorAndTakeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + * @symbol ?removeActorAndTakeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z */ MCVAPI class OwnerPtrT removeActorAndTakeEntity(class WeakEntityRef); /** - * @symbol ?removeActorFromWorldAndTakeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + * @symbol ?removeActorFromWorldAndTakeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z */ MCVAPI class OwnerPtrT removeActorFromWorldAndTakeEntity(class WeakEntityRef); /** - * @symbol ?removeBlockSourceFromValidityTracking\@Level\@\@UEAAXPEAVBlockSource\@\@\@Z + * @symbol ?removeBlockSourceFromValidityTracking\@Level\@\@UEAAXPEAVBlockSource\@\@\@Z */ MCVAPI void removeBlockSourceFromValidityTracking(class BlockSource *); /** - * @symbol ?removeBossEventListener\@Level\@\@UEAAXPEAVBossEventListener\@\@\@Z + * @symbol ?removeBossEventListener\@Level\@\@UEAAXPEAVBossEventListener\@\@\@Z */ MCVAPI void removeBossEventListener(class BossEventListener *); /** - * @symbol ?removeDisplayEntity\@Level\@\@UEAAXVWeakEntityRef\@\@\@Z + * @symbol ?removeDisplayEntity\@Level\@\@UEAAXVWeakEntityRef\@\@\@Z */ MCVAPI void removeDisplayEntity(class WeakEntityRef); /** - * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEAVActor\@\@\@Z + * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z */ - MCVAPI class OwnerPtrT removeEntity(class Actor &); + MCVAPI class OwnerPtrT removeEntity(class WeakEntityRef); /** - * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@\@Z + * @symbol ?removeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEAVActor\@\@\@Z */ - MCVAPI class OwnerPtrT removeEntity(class WeakEntityRef); + MCVAPI class OwnerPtrT removeEntity(class Actor &); /** - * @symbol ?removeListener\@Level\@\@UEAAXAEAVLevelListener\@\@\@Z + * @symbol ?removeListener\@Level\@\@UEAAXAEAVLevelListener\@\@\@Z */ MCVAPI void removeListener(class LevelListener &); /** - * @symbol ?requestMapInfo\@Level\@\@UEAAXUActorUniqueID\@\@_N\@Z + * @symbol ?requestMapInfo\@Level\@\@UEAAXUActorUniqueID\@\@_N\@Z */ MCVAPI void requestMapInfo(struct ActorUniqueID, bool); /** - * @symbol ?requestPlayerChangeDimension\@Level\@\@UEAAXAEAVPlayer\@\@V?$unique_ptr\@VChangeDimensionRequest\@\@U?$default_delete\@VChangeDimensionRequest\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?requestPlayerChangeDimension\@Level\@\@UEAAXAEAVPlayer\@\@V?$unique_ptr\@VChangeDimensionRequest\@\@U?$default_delete\@VChangeDimensionRequest\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void requestPlayerChangeDimension(class Player &, std::unique_ptr); /** - * @symbol ?requestTimedStorageDeferment\@Level\@\@UEAA?AV?$shared_ptr\@PEAX\@std\@\@XZ + * @symbol ?requestTimedStorageDeferment\@Level\@\@UEAA?AV?$shared_ptr\@PEAX\@std\@\@XZ */ MCVAPI class std::shared_ptr requestTimedStorageDeferment(); /** - * @symbol ?resumePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?resumePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void resumePlayer(class Player &); /** - * @symbol ?runCommand\@Level\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z + * @symbol ?runCommand\@Level\@\@UEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@W4CurrentCmdVersion\@\@\@Z */ - MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem); + MCVAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CommandOriginSystem, enum class CurrentCmdVersion); /** - * @symbol ?runCommand\@Level\@\@UEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@W4CurrentCmdVersion\@\@\@Z + * @symbol ?runCommand\@Level\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z */ - MCVAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CommandOriginSystem, enum class CurrentCmdVersion); + MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem); /** - * @symbol ?save\@Level\@\@UEAAXXZ + * @symbol ?save\@Level\@\@UEAAXXZ */ MCVAPI void save(); /** - * @symbol ?saveAdditionalData\@Level\@\@UEAAXXZ + * @symbol ?saveAdditionalData\@Level\@\@UEAAXXZ */ MCVAPI void saveAdditionalData(); /** - * @symbol ?saveBiomeData\@Level\@\@UEAAXXZ + * @symbol ?saveBiomeData\@Level\@\@UEAAXXZ */ MCVAPI void saveBiomeData(); /** - * @symbol ?saveDirtyChunks\@Level\@\@UEAAXXZ + * @symbol ?saveDirtyChunks\@Level\@\@UEAAXXZ */ MCVAPI void saveDirtyChunks(); /** - * @symbol ?saveDynamicProperties\@Level\@\@UEAAXXZ + * @symbol ?saveDynamicProperties\@Level\@\@UEAAXXZ */ MCVAPI void saveDynamicProperties(); /** - * @symbol ?saveEducationLevelSettings\@Level\@\@UEAAXXZ + * @symbol ?saveEducationLevelSettings\@Level\@\@UEAAXXZ */ MCVAPI void saveEducationLevelSettings(); /** - * @symbol ?saveGameData\@Level\@\@UEAAXXZ + * @symbol ?saveGameData\@Level\@\@UEAAXXZ */ MCVAPI void saveGameData(); /** - * @symbol ?saveLevelData\@Level\@\@UEAAXXZ + * @symbol ?saveLevelData\@Level\@\@UEAAXXZ */ MCVAPI void saveLevelData(); /** - * @symbol ?savePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?savePlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void savePlayer(class Player &); /** - * @symbol ?savePlayers\@Level\@\@UEAAXXZ + * @symbol ?savePlayers\@Level\@\@UEAAXXZ */ MCVAPI void savePlayers(); /** - * @symbol ?saveVillages\@Level\@\@UEAAXXZ + * @symbol ?saveVillages\@Level\@\@UEAAXXZ */ MCVAPI void saveVillages(); /** - * @symbol ?sendAllPlayerAbilities\@Level\@\@UEAAXAEBVPlayer\@\@\@Z + * @symbol ?sendAllPlayerAbilities\@Level\@\@UEAAXAEBVPlayer\@\@\@Z */ MCVAPI void sendAllPlayerAbilities(class Player const &); /** - * @symbol ?sendServerLegacyParticle\@Level\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z + * @symbol ?sendServerLegacyParticle\@Level\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z */ MCVAPI void sendServerLegacyParticle(enum class ParticleType, class Vec3 const &, class Vec3 const &, int); /** - * @symbol ?setActorEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VActorEventCoordinator\@\@U?$default_delete\@VActorEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setActorEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VActorEventCoordinator\@\@U?$default_delete\@VActorEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setActorEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setBlockEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VBlockEventCoordinator\@\@U?$default_delete\@VBlockEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setBlockEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VBlockEventCoordinator\@\@U?$default_delete\@VBlockEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setBlockEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setClientPlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VClientPlayerEventCoordinator\@\@U?$default_delete\@VClientPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setClientPlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VClientPlayerEventCoordinator\@\@U?$default_delete\@VClientPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setClientPlayerEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setCommandsEnabled\@Level\@\@UEAAX_N\@Z + * @symbol ?setCommandsEnabled\@Level\@\@UEAAX_N\@Z */ MCVAPI void setCommandsEnabled(bool); /** - * @symbol ?setDefaultGameType\@Level\@\@UEAAXW4GameType\@\@\@Z + * @symbol ?setDefaultGameType\@Level\@\@UEAAXW4GameType\@\@\@Z */ MCVAPI void setDefaultGameType(enum class GameType); /** - * @symbol ?setDefaultSpawn\@Level\@\@UEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setDefaultSpawn\@Level\@\@UEAAXAEBVBlockPos\@\@\@Z */ MCVAPI void setDefaultSpawn(class BlockPos const &); /** - * @symbol ?setDifficulty\@Level\@\@UEAAXW4Difficulty\@\@\@Z + * @symbol ?setDifficulty\@Level\@\@UEAAXW4Difficulty\@\@\@Z */ MCVAPI void setDifficulty(enum class Difficulty); /** - * @symbol ?setDisablePlayerInteractions\@Level\@\@UEAAX_N\@Z + * @symbol ?setDisablePlayerInteractions\@Level\@\@UEAAX_N\@Z */ MCVAPI void setDisablePlayerInteractions(bool); /** - * @symbol ?setEducationLevelSettings\@Level\@\@UEAAXUEducationLevelSettings\@\@\@Z + * @symbol ?setEducationLevelSettings\@Level\@\@UEAAXUEducationLevelSettings\@\@\@Z */ MCVAPI void setEducationLevelSettings(struct EducationLevelSettings); /** - * @symbol ?setFinishedInitializing\@Level\@\@UEAAXXZ + * @symbol ?setFinishedInitializing\@Level\@\@UEAAXXZ */ MCVAPI void setFinishedInitializing(); /** - * @symbol ?setHasLockedBehaviorPack\@Level\@\@UEAAX_N\@Z + * @symbol ?setHasLockedBehaviorPack\@Level\@\@UEAAX_N\@Z */ MCVAPI void setHasLockedBehaviorPack(bool); /** - * @symbol ?setHasLockedResourcePack\@Level\@\@UEAAX_N\@Z + * @symbol ?setHasLockedResourcePack\@Level\@\@UEAAX_N\@Z */ MCVAPI void setHasLockedResourcePack(bool); /** - * @symbol ?setImmersiveReaderString\@Level\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setImmersiveReaderString\@Level\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void setImmersiveReaderString(std::string); /** - * @symbol ?setIsExporting\@Level\@\@UEAAX_N\@Z + * @symbol ?setIsExporting\@Level\@\@UEAAX_N\@Z */ MCVAPI void setIsExporting(bool); /** - * @symbol ?setItemEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VItemEventCoordinator\@\@U?$default_delete\@VItemEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setItemEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VItemEventCoordinator\@\@U?$default_delete\@VItemEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setItemEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setLANBroadcast\@Level\@\@UEAAX_N\@Z + * @symbol ?setLANBroadcast\@Level\@\@UEAAX_N\@Z */ MCVAPI void setLANBroadcast(bool); /** - * @symbol ?setLANBroadcastIntent\@Level\@\@UEAAX_N\@Z + * @symbol ?setLANBroadcastIntent\@Level\@\@UEAAX_N\@Z */ MCVAPI void setLANBroadcastIntent(bool); /** - * @symbol ?setLevelId\@Level\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setLevelId\@Level\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void setLevelId(std::string); /** - * @symbol ?setMsaGamertagsOnly\@Level\@\@UEAAX_N\@Z + * @symbol ?setMsaGamertagsOnly\@Level\@\@UEAAX_N\@Z */ MCVAPI void setMsaGamertagsOnly(bool); /** - * @symbol ?setMultiplayerGame\@Level\@\@UEAAX_N\@Z + * @symbol ?setMultiplayerGame\@Level\@\@UEAAX_N\@Z */ MCVAPI void setMultiplayerGame(bool); /** - * @symbol ?setMultiplayerGameIntent\@Level\@\@UEAAX_N\@Z + * @symbol ?setMultiplayerGameIntent\@Level\@\@UEAAX_N\@Z */ MCVAPI void setMultiplayerGameIntent(bool); /** - * @symbol ?setNetEventCallback\@Level\@\@UEAAXV?$NonOwnerPointer\@VNetEventCallback\@\@\@Bedrock\@\@\@Z + * @symbol ?setNetEventCallback\@Level\@\@UEAAXV?$NonOwnerPointer\@VNetEventCallback\@\@\@Bedrock\@\@\@Z */ MCVAPI void setNetEventCallback(class Bedrock::NonOwnerPointer); /** - * @symbol ?setPacketSender\@Level\@\@UEAAXPEAVPacketSender\@\@\@Z + * @symbol ?setPacketSender\@Level\@\@UEAAXPEAVPacketSender\@\@\@Z */ MCVAPI void setPacketSender(class PacketSender *); /** - * @symbol ?setPlatformBroadcastIntent\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setPlatformBroadcastIntent\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCVAPI void setPlatformBroadcastIntent(enum class Social::GamePublishSetting); /** - * @symbol ?setPlatformBroadcastMode\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setPlatformBroadcastMode\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCVAPI void setPlatformBroadcastMode(enum class Social::GamePublishSetting); /** - * @symbol ?setPlayerAbilities\@Level\@\@UEAAXAEBUActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z + * @symbol ?setPlayerAbilities\@Level\@\@UEAAXAEBUActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z */ MCVAPI void setPlayerAbilities(struct ActorUniqueID const &, class LayeredAbilities const &); /** - * @symbol ?setPlayerMovementSettings\@Level\@\@UEAAXAEBUPlayerMovementSettings\@\@\@Z + * @symbol ?setPlayerMovementSettings\@Level\@\@UEAAXAEBUPlayerMovementSettings\@\@\@Z */ MCVAPI void setPlayerMovementSettings(struct PlayerMovementSettings const &); /** - * @symbol ?setRemotePlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VPlayerEventCoordinator\@\@U?$default_delete\@VPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setRemotePlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VPlayerEventCoordinator\@\@U?$default_delete\@VPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setRemotePlayerEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setScriptingEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VScriptingEventCoordinator\@\@U?$default_delete\@VScriptingEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setScriptingEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VScriptingEventCoordinator\@\@U?$default_delete\@VScriptingEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setScriptingEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setServerNetworkEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VServerNetworkEventCoordinator\@\@U?$default_delete\@VServerNetworkEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setServerNetworkEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VServerNetworkEventCoordinator\@\@U?$default_delete\@VServerNetworkEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setServerNetworkEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setServerPlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VServerPlayerEventCoordinator\@\@U?$default_delete\@VServerPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setServerPlayerEventCoordinator\@Level\@\@UEAAX$$QEAV?$unique_ptr\@VServerPlayerEventCoordinator\@\@U?$default_delete\@VServerPlayerEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void setServerPlayerEventCoordinator(std::unique_ptr &&); /** - * @symbol ?setSimPaused\@Level\@\@UEAAX_N\@Z + * @symbol ?setSimPaused\@Level\@\@UEAAX_N\@Z */ MCVAPI void setSimPaused(bool); /** - * @symbol ?setSleepStatus\@Level\@\@UEAAXAEBUSleepStatus\@ILevel\@\@\@Z + * @symbol ?setSleepStatus\@Level\@\@UEAAXAEBUSleepStatus\@ILevel\@\@\@Z */ MCVAPI void setSleepStatus(struct ILevel::SleepStatus const &); /** - * @symbol ?setSpawnSettings\@Level\@\@UEAAXAEBUSpawnSettings\@\@\@Z - */ - MCVAPI void setSpawnSettings(struct SpawnSettings const &); - /** - * @symbol ?setTime\@Level\@\@UEAAXH\@Z + * @symbol ?setTime\@Level\@\@UEAAXH\@Z */ MCVAPI void setTime(int); /** - * @symbol ?setWorldTemplateOptionsUnlocked\@Level\@\@UEAAXXZ + * @symbol ?setWorldTemplateOptionsUnlocked\@Level\@\@UEAAXXZ */ MCVAPI void setWorldTemplateOptionsUnlocked(); /** - * @symbol ?setXBLBroadcastIntent\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setXBLBroadcastIntent\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCVAPI void setXBLBroadcastIntent(enum class Social::GamePublishSetting); /** - * @symbol ?setXBLBroadcastMode\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setXBLBroadcastMode\@Level\@\@UEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCVAPI void setXBLBroadcastMode(enum class Social::GamePublishSetting); /** - * @symbol ?spawnParticleEffect\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@PEAVDimension\@\@\@Z + * @symbol ?spawnParticleEffect\@Level\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@PEAVDimension\@\@\@Z */ MCVAPI void spawnParticleEffect(std::string const &, class Vec3 const &, class Dimension *); /** - * @symbol ?startLeaveGame\@Level\@\@UEAAXXZ + * @symbol ?startLeaveGame\@Level\@\@UEAAXXZ */ MCVAPI void startLeaveGame(); /** - * @symbol ?suspendAndSave\@Level\@\@UEAAXXZ + * @symbol ?suspendAndSave\@Level\@\@UEAAXXZ */ MCVAPI void suspendAndSave(); /** - * @symbol ?suspendPlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?suspendPlayer\@Level\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void suspendPlayer(class Player &); /** - * @symbol ?takeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?takeEntity\@Level\@\@UEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@VWeakEntityRef\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI class OwnerPtrT takeEntity(class WeakEntityRef, class LevelChunk &); /** - * @symbol ?takePicture\@Level\@\@UEAAXAEAVImageBuffer\@cg\@\@PEAVActor\@\@1AEAUScreenshotOptions\@\@\@Z + * @symbol ?takePicture\@Level\@\@UEAAXAEAVImageBuffer\@cg\@\@PEAVActor\@\@1AEAUScreenshotOptions\@\@\@Z */ MCVAPI void takePicture(class cg::ImageBuffer &, class Actor *, class Actor *, struct ScreenshotOptions &); /** - * @symbol ?tick\@Level\@\@UEAAXXZ + * @symbol ?tick\@Level\@\@UEAAXXZ */ MCVAPI void tick(); /** - * @symbol ?tickEntities\@Level\@\@UEAAXXZ + * @symbol ?tickEntities\@Level\@\@UEAAXXZ */ MCVAPI void tickEntities(); /** - * @symbol ?tickEntitySystems\@Level\@\@UEAAXXZ + * @symbol ?tickEntitySystems\@Level\@\@UEAAXXZ */ MCVAPI void tickEntitySystems(); /** - * @symbol ?unregisterTemporaryPointer\@Level\@\@UEAAXAEAV_TickPtr\@\@\@Z + * @symbol ?unregisterTemporaryPointer\@Level\@\@UEAAXAEAV_TickPtr\@\@\@Z */ MCVAPI void unregisterTemporaryPointer(class _TickPtr &); /** - * @symbol ?updateSleepingPlayerList\@Level\@\@UEAAXXZ + * @symbol ?updateSleepingPlayerList\@Level\@\@UEAAXXZ */ MCVAPI void updateSleepingPlayerList(); /** - * @symbol ?updateWeather\@Level\@\@UEAAXMHMH\@Z + * @symbol ?updateWeather\@Level\@\@UEAAXMHMH\@Z */ MCVAPI void updateWeather(float, int, float, int); /** - * @symbol ?upgradeStorageVersion\@Level\@\@UEAAXW4StorageVersion\@\@\@Z + * @symbol ?upgradeStorageVersion\@Level\@\@UEAAXW4StorageVersion\@\@\@Z */ MCVAPI void upgradeStorageVersion(enum class StorageVersion); /** - * @symbol ?useMsaGamertagsOnly\@Level\@\@UEBA_NXZ + * @symbol ?use3DBiomeMaps\@Level\@\@UEBA_NXZ + */ + MCVAPI bool use3DBiomeMaps() const; + /** + * @symbol ?useMsaGamertagsOnly\@Level\@\@UEBA_NXZ */ MCVAPI bool useMsaGamertagsOnly() const; /** - * @symbol ?waitAsyncSuspendWork\@Level\@\@UEAAXXZ + * @symbol ?waitAsyncSuspendWork\@Level\@\@UEAAXXZ */ MCVAPI void waitAsyncSuspendWork(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~Level(); #endif /** - * @symbol ??0Level\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@4\@AEAVIMinecraftEventing\@\@_NW4SubClientId\@\@AEAVScheduler\@\@V?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@2\@AEAVResourcePackManager\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIEntityRegistryOwner\@\@\@Bedrock\@\@\@2\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VBlockComponentFactory\@\@U?$default_delete\@VBlockComponentFactory\@\@\@std\@\@\@4\@V?$unique_ptr\@VBlockDefinitionGroup\@\@U?$default_delete\@VBlockDefinitionGroup\@\@\@std\@\@\@4\@VItemRegistryRef\@\@V?$weak_ptr\@VBlockTypeRegistry\@\@\@4\@4V?$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\@4V?$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, class std::optional); /** - * @symbol ?canChangeDimension\@Level\@\@QEAA_NAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?canChangeDimension\@Level\@\@QEAA_NAEAVActor\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI bool canChangeDimension(class Actor &, class AutomaticID); /** - * @symbol ?getActorManager\@Level\@\@QEAAAEAVActorManager\@\@XZ + * @symbol ?getActorManager\@Level\@\@QEAAAEAVActorManager\@\@XZ */ MCAPI class ActorManager & getActorManager(); /** - * @symbol ?getAdventureSettings\@Level\@\@QEBAAEBUAdventureSettings\@\@XZ + * @symbol ?getAdventureSettings\@Level\@\@QEBAAEBUAdventureSettings\@\@XZ */ MCAPI struct AdventureSettings const & getAdventureSettings() const; /** - * @symbol ?getAutonomousActorManager\@Level\@\@QEBAAEBVAutonomousActorManager\@\@XZ + * @symbol ?getAutonomousActorManager\@Level\@\@QEBAAEBVAutonomousActorManager\@\@XZ */ MCAPI class AutonomousActorManager const & getAutonomousActorManager() const; /** - * @symbol ?getCapabilities\@Level\@\@QEBAAEBUISharedController\@PlayerCapabilities\@\@XZ + * @symbol ?getCapabilities\@Level\@\@QEBAAEBUISharedController\@PlayerCapabilities\@\@XZ */ MCAPI struct PlayerCapabilities::ISharedController const & getCapabilities() const; /** - * @symbol ?getDimensionDefinition\@Level\@\@QEBA?AV?$optional\@UDimensionDefinition\@DimensionDefinitionGroup\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getDimensionManager\@Level\@\@QEAAAEAVDimensionManager\@\@XZ */ - MCAPI class std::optional getDimensionDefinition(std::string const &) const; + MCAPI class DimensionManager & getDimensionManager(); /** - * @symbol ?getLevelSeed64\@Level\@\@QEBA?AVLevelSeed64\@\@XZ + * @symbol ?getLevelSeed64\@Level\@\@QEBA?AVLevelSeed64\@\@XZ */ MCAPI class LevelSeed64 getLevelSeed64() const; /** - * @symbol ?getNpcDialogueStorage\@Level\@\@QEAAPEAVNpcDialogueStorage\@\@XZ + * @symbol ?getNpcDialogueStorage\@Level\@\@QEAAPEAVNpcDialogueStorage\@\@XZ */ MCAPI class NpcDialogueStorage * getNpcDialogueStorage(); /** - * @symbol ?getServerLevelEventCoordinator\@Level\@\@QEAAAEAVServerLevelEventCoordinator\@\@XZ + * @symbol ?getServerLevelEventCoordinator\@Level\@\@QEAAAEAVServerLevelEventCoordinator\@\@XZ */ MCAPI class ServerLevelEventCoordinator & getServerLevelEventCoordinator(); /** - * @symbol ?getSideBySideEntity\@Level\@\@QEBA?AVStrictEntityContext\@\@XZ + * @symbol ?getServerLevelEventCoordinatorAsSharedPointer\@Level\@\@QEAA?AV?$shared_ptr\@VServerLevelEventCoordinator\@\@\@std\@\@XZ + */ + MCAPI class std::shared_ptr getServerLevelEventCoordinatorAsSharedPointer(); + /** + * @symbol ?getSideBySideEntity\@Level\@\@QEBA?AVStrictEntityContext\@\@XZ */ MCAPI class StrictEntityContext getSideBySideEntity() const; /** - * @symbol ?getTickDeltaTime\@Level\@\@QEBANXZ + * @symbol ?getTickDeltaTime\@Level\@\@QEBANXZ */ MCAPI double getTickDeltaTime() const; /** - * @symbol ?isChunkInTickRange\@Level\@\@QEAAXAEBVChunkPos\@\@AEBVDimension\@\@AEA_N\@Z + * @symbol ?isChunkInTickRange\@Level\@\@QEBA_NAEBVLevelChunk\@\@V?$optional\@H\@std\@\@\@Z */ - MCAPI void isChunkInTickRange(class ChunkPos const &, class Dimension const &, bool &); + MCAPI bool isChunkInTickRange(class LevelChunk const &, class std::optional) const; /** - * @symbol ?isChunkInTickRange\@Level\@\@QEBA_NAEBVLevelChunk\@\@V?$optional\@H\@std\@\@\@Z + * @symbol ?isChunkInTickRange\@Level\@\@QEAAXAEBVChunkPos\@\@AEBVDimension\@\@AEA_N\@Z */ - MCAPI bool isChunkInTickRange(class LevelChunk const &, class std::optional) const; + MCAPI void isChunkInTickRange(class ChunkPos const &, class Dimension const &, bool &); /** - * @symbol ?isFree\@Level\@\@QEAA?AW4NodeType\@\@AEAVNavigationComponent\@\@AEAVActor\@\@AEBVBlockPos\@\@22W4CanJumpIntoNode\@\@\@Z + * @symbol ?isFree\@Level\@\@QEAA?AW4NodeType\@\@AEAVNavigationComponent\@\@AEAVActor\@\@AEBVBlockPos\@\@22W4CanJumpIntoNode\@\@\@Z */ MCAPI enum class NodeType isFree(class NavigationComponent &, class Actor &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode); /** - * @symbol ?setClientLevelEventCoordinator\@Level\@\@QEAAX$$QEAV?$unique_ptr\@VClientLevelEventCoordinator\@\@U?$default_delete\@VClientLevelEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setClientLevelEventCoordinator\@Level\@\@QEAAX$$QEAV?$shared_ptr\@VClientLevelEventCoordinator\@\@\@std\@\@\@Z */ - MCAPI void setClientLevelEventCoordinator(std::unique_ptr &&); + MCAPI void setClientLevelEventCoordinator(class std::shared_ptr &&); /** - * @symbol ?setNpcEventCoordinator\@Level\@\@QEAAXV?$unique_ptr\@VNpcEventCoordinator\@\@U?$default_delete\@VNpcEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setNpcEventCoordinator\@Level\@\@QEAAXV?$unique_ptr\@VNpcEventCoordinator\@\@U?$default_delete\@VNpcEventCoordinator\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setNpcEventCoordinator(std::unique_ptr); /** - * @symbol ?setPerformanceTelemetryPeriodicCallback\@Level\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?setPerformanceTelemetryPeriodicCallback\@Level\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void setPerformanceTelemetryPeriodicCallback(class std::function); /** - * @symbol ?setServerLevelEventCoordinator\@Level\@\@QEAAX$$QEAV?$unique_ptr\@VServerLevelEventCoordinator\@\@U?$default_delete\@VServerLevelEventCoordinator\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setServerLevelEventCoordinator\@Level\@\@QEAAX$$QEAV?$shared_ptr\@VServerLevelEventCoordinator\@\@\@std\@\@\@Z */ - MCAPI void setServerLevelEventCoordinator(std::unique_ptr &&); + MCAPI void setServerLevelEventCoordinator(class std::shared_ptr &&); /** - * @symbol ?transferActorToOwnedEntityLimbo\@Level\@\@QEAAXAEBVPlayer\@\@AEAVActor\@\@\@Z + * @symbol ?transferActorToOwnedEntityLimbo\@Level\@\@QEAAXAEBVPlayer\@\@AEAVActor\@\@\@Z */ MCAPI void transferActorToOwnedEntityLimbo(class Player const &, class Actor &); /** - * @symbol ?use3DBiomeMaps\@Level\@\@QEBA_NXZ - */ - MCAPI bool use3DBiomeMaps() const; - /** - * @symbol ?OVERWORLD_PLAYER_COUNT_TAG\@Level\@\@2QBDB + * @symbol ?OVERWORLD_PLAYER_COUNT_TAG\@Level\@\@2QBDB */ MCAPI static char const OVERWORLD_PLAYER_COUNT_TAG[]; /** - * @symbol ?SLEEPING_PLAYER_COUNT_TAG\@Level\@\@2QBDB + * @symbol ?SLEEPING_PLAYER_COUNT_TAG\@Level\@\@2QBDB */ MCAPI static char const SLEEPING_PLAYER_COUNT_TAG[]; /** - * @symbol ?addLevelComponents\@Level\@\@SAXAEAVEntityContext\@\@AEAVIRandom\@\@_N\@Z + * @symbol ?addLevelComponents\@Level\@\@SAXAEAVEntityContext\@\@AEAVIRandom\@\@_N\@Z */ MCAPI static void addLevelComponents(class EntityContext &, class IRandom &, bool); /** - * @symbol ?addSideBySideLevelComponents\@Level\@\@SAXAEAVEntityContext\@\@_N\@Z + * @symbol ?addSideBySideLevelComponents\@Level\@\@SAXAEAVEntityContext\@\@_N\@Z */ MCAPI static void addSideBySideLevelComponents(class EntityContext &, bool); /** - * @symbol ?createRandomSeed\@Level\@\@SAIXZ + * @symbol ?createRandomSeed\@Level\@\@SAIXZ */ MCAPI static unsigned int createRandomSeed(); /** - * @symbol ?isUsableLevel\@Level\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?isUsableLevel\@Level\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool isUsableLevel(class ILevel const &); /** - * @symbol ?parseLevelSeed64\@Level\@\@SA?AVLevelSeed64\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?parseLevelSeed64\@Level\@\@SA?AVLevelSeed64\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class LevelSeed64 parseLevelSeed64(std::string const &); //private: /** - * @symbol ?_checkBlockSourceValidity\@Level\@\@AEAAXXZ + * @symbol ?_checkBlockSourceValidity\@Level\@\@AEAAXXZ */ MCAPI void _checkBlockSourceValidity(); /** - * @symbol ?_cleanupDisconnectedPlayers\@Level\@\@AEAAXXZ + * @symbol ?_cleanupDisconnectedPlayers\@Level\@\@AEAAXXZ */ MCAPI void _cleanupDisconnectedPlayers(); /** - * @symbol ?_clearOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z + * @symbol ?_clearOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z */ MCAPI void _clearOwnedEntityLimboForPlayer(class Player const &); /** - * @symbol ?_createMapSavedData\@Level\@\@AEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?_createMapSavedData\@Level\@\@AEAAAEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class MapItemSavedData & _createMapSavedData(struct ActorUniqueID const &); /** - * @symbol ?_getCrashDumpLogCategory\@Level\@\@AEAA?AW4CrashDumpLogStringID\@\@XZ + * @symbol ?_getCrashDumpLogCategory\@Level\@\@AEAA?AW4CrashDumpLogStringID\@\@XZ */ MCAPI enum class CrashDumpLogStringID _getCrashDumpLogCategory(); /** - * @symbol ?_getOwnedEntityLimboStorageKeyForPlayer\@Level\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUActorUniqueID\@\@\@Z - */ - MCAPI std::string _getOwnedEntityLimboStorageKeyForPlayer(struct ActorUniqueID const &) const; - /** - * @symbol ?_getValidatedPlayerName\@Level\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?_getValidatedPlayerName\@Level\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string _getValidatedPlayerName(std::string const &); /** - * @symbol ?_handleChangeDimensionRequests\@Level\@\@AEAAXXZ + * @symbol ?_handleChangeDimensionRequests\@Level\@\@AEAAXXZ */ MCAPI void _handleChangeDimensionRequests(); /** - * @symbol ?_initializeActorManager\@Level\@\@AEAAXXZ + * @symbol ?_initializeActorManager\@Level\@\@AEAAXXZ */ MCAPI void _initializeActorManager(); /** - * @symbol ?_loadAutonomousEntities\@Level\@\@AEAAXXZ + * @symbol ?_initializeLevelSoundManager\@Level\@\@AEAAXXZ + */ + MCAPI void _initializeLevelSoundManager(); + /** + * @symbol ?_loadAutonomousEntities\@Level\@\@AEAAXXZ */ MCAPI void _loadAutonomousEntities(); /** - * @symbol ?_loadBiomeData\@Level\@\@AEAAXXZ + * @symbol ?_loadBiomeData\@Level\@\@AEAAXXZ */ MCAPI void _loadBiomeData(); /** - * @symbol ?_loadMapData\@Level\@\@AEAAPEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?_loadMapData\@Level\@\@AEAAPEAVMapItemSavedData\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class MapItemSavedData * _loadMapData(struct ActorUniqueID const &); /** - * @symbol ?_loadOwnedEntityLimbo\@Level\@\@AEAAXXZ + * @symbol ?_loadOwnedEntityLimbo\@Level\@\@AEAAXXZ */ MCAPI void _loadOwnedEntityLimbo(); /** - * @symbol ?_onRemoveActorEntityReferences\@Level\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_onHandleLevelSoundEvent\@Level\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + */ + MCAPI void _onHandleLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + /** + * @symbol ?_onHandleLevelSoundEventWithVolumeAndPitch\@Level\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + */ + MCAPI void _onHandleLevelSoundEventWithVolumeAndPitch(std::string const &, class Vec3 const &, float, float); + /** + * @symbol ?_onHandleStopAllLevelSoundsEvent\@Level\@\@AEAAXXZ + */ + MCAPI void _onHandleStopAllLevelSoundsEvent(); + /** + * @symbol ?_onHandleStopLevelSoundEvent\@Level\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void _onHandleStopLevelSoundEvent(std::string const &); + /** + * @symbol ?_onLevelSoundEvent\@Level\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + */ + MCAPI void _onLevelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + /** + * @symbol ?_onLevelSoundEventWithVolumeAndPitch\@Level\@\@AEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + */ + MCAPI void _onLevelSoundEventWithVolumeAndPitch(enum class LevelSoundEvent, class Vec3 const &, float, float); + /** + * @symbol ?_onRemoveActorEntityReferences\@Level\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); /** - * @symbol ?_playerChangeDimension\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z + * @symbol ?_playerChangeDimension\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ MCAPI bool _playerChangeDimension(class Player &, class ChangeDimensionRequest &); /** - * @symbol ?_playerChangeDimensionPrepareRegion\@Level\@\@AEAAXAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z + * @symbol ?_playerChangeDimensionPrepareRegion\@Level\@\@AEAAXAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ MCAPI void _playerChangeDimensionPrepareRegion(class Player &, class ChangeDimensionRequest &); /** - * @symbol ?_playerChangeDimensionWaitingForChunks\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z + * @symbol ?_playerChangeDimensionWaitingForChunks\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ MCAPI bool _playerChangeDimensionWaitingForChunks(class Player &, class ChangeDimensionRequest &); /** - * @symbol ?_playerChangeDimensionWaitingForRespawn\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z + * @symbol ?_playerChangeDimensionWaitingForRespawn\@Level\@\@AEAA_NAEAVPlayer\@\@AEAVChangeDimensionRequest\@\@\@Z */ MCAPI bool _playerChangeDimensionWaitingForRespawn(class Player &, class ChangeDimensionRequest &); /** - * @symbol ?_processPlayerNetworking\@Level\@\@AEAAXXZ + * @symbol ?_processPlayerNetworking\@Level\@\@AEAAXXZ */ MCAPI void _processPlayerNetworking(); /** - * @symbol ?_removePlayerFromPlayerList\@Level\@\@AEAA?AVUUID\@mce\@\@QEBVPlayer\@\@\@Z + * @symbol ?_removePlayerFromPlayerList\@Level\@\@AEAA?AVUUID\@mce\@\@QEBVPlayer\@\@\@Z */ MCAPI class mce::UUID _removePlayerFromPlayerList(class Player const *const); /** - * @symbol ?_resumePlayer\@Level\@\@AEAAXAEBVUUID\@mce\@\@\@Z + * @symbol ?_resumePlayer\@Level\@\@AEAAXAEBVUUID\@mce\@\@\@Z */ MCAPI void _resumePlayer(class mce::UUID const &); /** - * @symbol ?_saveAutonomousEntities\@Level\@\@AEAAXXZ + * @symbol ?_saveAutonomousEntities\@Level\@\@AEAAXXZ */ MCAPI void _saveAutonomousEntities(); /** - * @symbol ?_saveOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z + * @symbol ?_saveOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z */ MCAPI void _saveOwnedEntityLimboForPlayer(class Player const &); /** - * @symbol ?_saveSomeChunks\@Level\@\@AEAAXXZ + * @symbol ?_saveSomeChunks\@Level\@\@AEAAXXZ */ MCAPI void _saveSomeChunks(); /** - * @symbol ?_suspendPlayer\@Level\@\@AEAAXAEBVUUID\@mce\@\@\@Z + * @symbol ?_suspendPlayer\@Level\@\@AEAAXAEBVUUID\@mce\@\@\@Z */ MCAPI void _suspendPlayer(class mce::UUID const &); /** - * @symbol ?_syncTime\@Level\@\@AEAAXH\@Z + * @symbol ?_syncTime\@Level\@\@AEAAXH\@Z */ MCAPI void _syncTime(int); /** - * @symbol ?processOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z + * @symbol ?processOwnedEntityLimboForPlayer\@Level\@\@AEAAXAEBVPlayer\@\@\@Z */ MCAPI void processOwnedEntityLimboForPlayer(class Player const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelAddedActorEvent.hpp b/LiteLoader/include/llapi/mc/LevelAddedActorEvent.hpp index 58d981489d..9fc98d63b2 100644 --- a/LiteLoader/include/llapi/mc/LevelAddedActorEvent.hpp +++ b/LiteLoader/include/llapi/mc/LevelAddedActorEvent.hpp @@ -25,7 +25,7 @@ struct LevelAddedActorEvent { public: /** - * @symbol ??1LevelAddedActorEvent\@\@QEAA\@XZ + * @symbol ??1LevelAddedActorEvent\@\@QEAA\@XZ */ MCAPI ~LevelAddedActorEvent(); diff --git a/LiteLoader/include/llapi/mc/LevelCache.hpp b/LiteLoader/include/llapi/mc/LevelCache.hpp index 23f84026e5..18042e941c 100644 --- a/LiteLoader/include/llapi/mc/LevelCache.hpp +++ b/LiteLoader/include/llapi/mc/LevelCache.hpp @@ -25,8 +25,8 @@ class LevelCache { public: /** - * @symbol ??1LevelCache\@\@QEAA\@XZ + * @symbol ??1LevelCache\@\@QEAA\@XZ */ MCAPI ~LevelCache(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunk.hpp b/LiteLoader/include/llapi/mc/LevelChunk.hpp index 5aea076485..51479f5d5c 100644 --- a/LiteLoader/include/llapi/mc/LevelChunk.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunk.hpp @@ -59,808 +59,808 @@ struct HardcodedSpawningArea { public: /** - * @symbol ??0LevelChunk\@\@QEAA\@AEAVDimension\@\@AEBVChunkPos\@\@_NW4SubChunkInitMode\@\@2\@Z + * @symbol ??0LevelChunk\@\@QEAA\@AEAVDimension\@\@AEBVChunkPos\@\@_NW4SubChunkInitMode\@\@2\@Z */ MCAPI LevelChunk(class Dimension &, class ChunkPos const &, bool, enum class SubChunkInitMode, bool); /** - * @symbol ?_changeTerrainDataState\@LevelChunk\@\@QEAAXW4ChunkTerrainDataState\@\@0\@Z + * @symbol ?_changeTerrainDataState\@LevelChunk\@\@QEAAXW4ChunkTerrainDataState\@\@0\@Z */ MCAPI void _changeTerrainDataState(enum class ChunkTerrainDataState, enum class ChunkTerrainDataState); /** - * @symbol ?_getTerrainDataState\@LevelChunk\@\@QEBA?AW4ChunkTerrainDataState\@\@XZ + * @symbol ?_getTerrainDataState\@LevelChunk\@\@QEBA?AW4ChunkTerrainDataState\@\@XZ */ MCAPI enum class ChunkTerrainDataState _getTerrainDataState() const; /** - * @symbol ?_onRandomTickingQueueChanged\@LevelChunk\@\@QEAAXXZ + * @symbol ?_onRandomTickingQueueChanged\@LevelChunk\@\@QEAAXXZ */ MCAPI void _onRandomTickingQueueChanged(); /** - * @symbol ?_onTickingQueueChanged\@LevelChunk\@\@QEAAXXZ + * @symbol ?_onTickingQueueChanged\@LevelChunk\@\@QEAAXXZ */ MCAPI void _onTickingQueueChanged(); /** - * @symbol ?_setGenerator\@LevelChunk\@\@QEAAXPEAVChunkSource\@\@\@Z + * @symbol ?_setGenerator\@LevelChunk\@\@QEAAXPEAVChunkSource\@\@\@Z */ MCAPI void _setGenerator(class ChunkSource *); /** - * @symbol ?_setOnChunkLoadedCalled\@LevelChunk\@\@QEAA_NXZ + * @symbol ?_setOnChunkLoadedCalled\@LevelChunk\@\@QEAA_NXZ */ MCAPI bool _setOnChunkLoadedCalled(); /** - * @symbol ?actorDataNeedsSaving\@LevelChunk\@\@QEBA_NHH\@Z + * @symbol ?actorDataNeedsSaving\@LevelChunk\@\@QEBA_NHH\@Z */ MCAPI bool actorDataNeedsSaving(int, int) const; /** - * @symbol ?addEntity\@LevelChunk\@\@QEAAXVWeakEntityRef\@\@\@Z + * @symbol ?addEntity\@LevelChunk\@\@QEAAXVWeakEntityRef\@\@\@Z */ MCAPI void addEntity(class WeakEntityRef); /** - * @symbol ?addHardcodedSpawningArea\@LevelChunk\@\@QEAAXAEBVBoundingBox\@\@W4HardcodedSpawnAreaType\@\@\@Z + * @symbol ?addHardcodedSpawningArea\@LevelChunk\@\@QEAAXAEBVBoundingBox\@\@W4HardcodedSpawnAreaType\@\@\@Z */ MCAPI void addHardcodedSpawningArea(class BoundingBox const &, enum class HardcodedSpawnAreaType); /** - * @symbol ?addSubChunkBlockEntitiesToLevelChunk\@LevelChunk\@\@QEAAXAEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?addSubChunkBlockEntitiesToLevelChunk\@LevelChunk\@\@QEAAXAEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCAPI void addSubChunkBlockEntitiesToLevelChunk(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &); /** - * @symbol ?applySeasonsPostProcess\@LevelChunk\@\@QEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?applySeasonsPostProcess\@LevelChunk\@\@QEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool applySeasonsPostProcess(class BlockSource &); /** - * @symbol ?changeState\@LevelChunk\@\@QEAAXW4ChunkState\@\@0\@Z + * @symbol ?changeState\@LevelChunk\@\@QEAAXW4ChunkState\@\@0\@Z */ MCAPI void changeState(enum class ChunkState, enum class ChunkState); /** - * @symbol ?checkSeasonsPostProcessDirty\@LevelChunk\@\@QEAA_NXZ + * @symbol ?checkSeasonsPostProcessDirty\@LevelChunk\@\@QEAA_NXZ */ MCAPI bool checkSeasonsPostProcessDirty(); /** - * @symbol ?chunkHasConvertedDataTag\@LevelChunk\@\@QEBA_NXZ + * @symbol ?chunkHasConvertedDataTag\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool chunkHasConvertedDataTag() const; /** - * @symbol ?clearDirtyTickCounters\@LevelChunk\@\@QEAAXXZ + * @symbol ?clearDirtyTickCounters\@LevelChunk\@\@QEAAXXZ */ MCAPI void clearDirtyTickCounters(); /** - * @symbol ?clearPreservedEntities\@LevelChunk\@\@QEAAXXZ + * @symbol ?clearPreservedEntities\@LevelChunk\@\@QEAAXXZ */ MCAPI void clearPreservedEntities(); /** - * @symbol ?clientSubChunkRequestGenerateLightingForSubChunk\@LevelChunk\@\@QEAAXAEAVChunkViewSource\@\@F\@Z + * @symbol ?clientSubChunkRequestGenerateLightingForSubChunk\@LevelChunk\@\@QEAAXAEAVChunkViewSource\@\@F\@Z */ MCAPI void clientSubChunkRequestGenerateLightingForSubChunk(class ChunkViewSource &, short); /** - * @symbol ?deserializeBiomes\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeBiomes\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeBiomes(class IDataInput &); /** - * @symbol ?deserializeBlockEntities\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeBlockEntities\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeBlockEntities(class IDataInput &); /** - * @symbol ?deserializeFinalization\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeFinalization\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeFinalization(class IDataInput &); /** - * @symbol ?deserializeHardcodedSpawners\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeHardcodedSpawners\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeHardcodedSpawners(class IDataInput &); /** - * @symbol ?deserializeKey\@LevelChunk\@\@QEAA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z + * @symbol ?deserializeKey\@LevelChunk\@\@QEAA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z */ - MCAPI bool deserializeKey(class gsl::basic_string_span, class gsl::basic_string_span); + MCAPI bool deserializeKey(class std::basic_string_view>, class std::basic_string_view>); /** - * @symbol ?deserializeLoadedVersion\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeLoadedVersion\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeLoadedVersion(class IDataInput &); /** - * @symbol ?deserializeMetaDataHash\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserializeMetaDataHash\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserializeMetaDataHash(class IDataInput &); /** - * @symbol ?deserializeSubChunk\@LevelChunk\@\@QEAAXEAEAVIDataInput\@\@V?$optional\@C\@std\@\@V?$optional\@PEAUDeserializationChanges\@\@\@4\@\@Z + * @symbol ?deserializeSubChunk\@LevelChunk\@\@QEAAXEAEAVIDataInput\@\@V?$optional\@C\@std\@\@V?$optional\@PEAUDeserializationChanges\@\@\@4\@\@Z */ MCAPI void deserializeSubChunk(unsigned char, class IDataInput &, class std::optional, class std::optional); /** - * @symbol ?deserializeSubChunkBlockEntities\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@AEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?deserializeSubChunkBlockEntities\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@AEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCAPI void deserializeSubChunkBlockEntities(class IDataInput &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &); /** - * @symbol ?enableBlockEntityAccessForThisThread\@LevelChunk\@\@QEBA?AVLevelChunkBlockActorAccessToken\@\@XZ + * @symbol ?enableBlockEntityAccessForThisThread\@LevelChunk\@\@QEBA?AVLevelChunkBlockActorAccessToken\@\@XZ */ MCAPI class LevelChunkBlockActorAccessToken enableBlockEntityAccessForThisThread() const; /** - * @symbol ?fetchBiomes\@LevelChunk\@\@QEBAXAEAV?$vector\@PEBVBiome\@\@V?$allocator\@PEBVBiome\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?fetchBiomes\@LevelChunk\@\@QEBAXAEAV?$vector\@PEBVBiome\@\@V?$allocator\@PEBVBiome\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void fetchBiomes(std::vector &) const; /** - * @symbol ?fetchBlocks\@LevelChunk\@\@QEBAXAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z + * @symbol ?fetchBlocks\@LevelChunk\@\@QEBAXAEBVBlockPos\@\@AEAVBlockVolume\@\@\@Z */ MCAPI void fetchBlocks(class BlockPos const &, class BlockVolume &) const; /** - * @symbol ?fillBiomes\@LevelChunk\@\@QEAAXAEBUBiomeChunkData\@\@\@Z + * @symbol ?fillBiomes\@LevelChunk\@\@QEAAXAEBUBiomeChunkData\@\@\@Z */ MCAPI void fillBiomes(struct BiomeChunkData const &); /** - * @symbol ?finalizeDeserialization\@LevelChunk\@\@QEAAXXZ + * @symbol ?finalizeDeserialization\@LevelChunk\@\@QEAAXXZ */ MCAPI void finalizeDeserialization(); /** - * @symbol ?finalizePostProcessing\@LevelChunk\@\@QEAAXXZ + * @symbol ?finalizePostProcessing\@LevelChunk\@\@QEAAXXZ */ MCAPI void finalizePostProcessing(); /** - * @symbol ?finalizeSubChunkDeserialization\@LevelChunk\@\@QEAAXAEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@V?$buffer_span_mut\@USubChunk\@\@\@\@\@Z + * @symbol ?finalizeSubChunkDeserialization\@LevelChunk\@\@QEAAXAEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@V?$buffer_span_mut\@USubChunk\@\@\@\@\@Z */ MCAPI void finalizeSubChunkDeserialization(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, class buffer_span_mut); /** - * @symbol ?findExposedLightningRod\@LevelChunk\@\@QEAA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?findExposedLightningRod\@LevelChunk\@\@QEAA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI class std::optional findExposedLightningRod(class BlockPos const &, class BlockSource &); /** - * @symbol ?findLightningTarget\@LevelChunk\@\@QEAA?AVVec3\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?findLightningTarget\@LevelChunk\@\@QEAA?AVVec3\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI class Vec3 findLightningTarget(class BlockPos const &, class BlockSource &); /** - * @symbol ?generateOriginalLighting\@LevelChunk\@\@QEAA_NAEAVChunkViewSource\@\@_N\@Z + * @symbol ?generateOriginalLighting\@LevelChunk\@\@QEAA_NAEAVChunkViewSource\@\@_N\@Z */ MCAPI bool generateOriginalLighting(class ChunkViewSource &, bool); /** - * @symbol ?getAboveTopSolidBlock\@LevelChunk\@\@QEAA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@_N11\@Z + * @symbol ?getAboveTopSolidBlock\@LevelChunk\@\@QEAA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@_N11\@Z */ MCAPI class ChunkLocalHeight getAboveTopSolidBlock(class ChunkBlockPos const &, bool, bool, bool); /** - * @symbol ?getActors\@LevelChunk\@\@QEBAXAEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getActors\@LevelChunk\@\@QEBAXAEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@AEAV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void getActors(struct ActorDefinitionIdentifier const &, class AABB const &, std::vector &) const; /** - * @symbol ?getBiome\@LevelChunk\@\@QEBAAEAVBiome\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getBiome\@LevelChunk\@\@QEBAAEAVBiome\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class Biome & getBiome(class ChunkBlockPos const &) const; /** - * @symbol ?getBlock\@LevelChunk\@\@QEBAAEBVBlock\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getBlock\@LevelChunk\@\@QEBAAEBVBlock\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class Block const & getBlock(class ChunkBlockPos const &) const; /** - * @symbol ?getBlockEntities\@LevelChunk\@\@QEBAAEBV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @symbol ?getBlockEntities\@LevelChunk\@\@QEBAAEBV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getBlockEntities() const; /** - * @symbol ?getBlockEntity\@LevelChunk\@\@QEAAPEAVBlockActor\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getBlockEntity\@LevelChunk\@\@QEAAPEAVBlockActor\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class BlockActor * getBlockEntity(class ChunkBlockPos const &); /** - * @symbol ?getBorder\@LevelChunk\@\@QEBA_NAEBVChunkBlockPos\@\@\@Z + * @symbol ?getBorder\@LevelChunk\@\@QEBA_NAEBVChunkBlockPos\@\@\@Z */ MCAPI bool getBorder(class ChunkBlockPos const &) const; /** - * @symbol ?getBrightness\@LevelChunk\@\@QEBA?AUBrightnessPair\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getBrightness\@LevelChunk\@\@QEBA?AUBrightnessPair\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI struct BrightnessPair getBrightness(class ChunkBlockPos const &) const; /** - * @symbol ?getCachedTemperatureNoise\@LevelChunk\@\@QEAACAEBVChunkBlockPos\@\@\@Z + * @symbol ?getCachedTemperatureNoise\@LevelChunk\@\@QEAACAEBVChunkBlockPos\@\@\@Z */ MCAPI signed char getCachedTemperatureNoise(class ChunkBlockPos const &); /** - * @symbol ?getChunkEntities\@LevelChunk\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getChunkEntities\@LevelChunk\@\@QEAAAEAV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getChunkEntities(); /** - * @symbol ?getDimension\@LevelChunk\@\@QEBAAEAVDimension\@\@XZ + * @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 + * @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(enum class ActorType, class AABB const &, std::vector &, bool) const; + MCAPI void getEntities(class gsl::span, -1>, 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 + * @symbol ?getEntities\@LevelChunk\@\@QEBAXW4ActorType\@\@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; + MCAPI void getEntities(enum class ActorType, class AABB const &, std::vector &, bool) const; /** - * @symbol ?getEntity\@LevelChunk\@\@QEBAPEAVActor\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?getEntity\@LevelChunk\@\@QEBAPEAVActor\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class Actor * getEntity(struct ActorUniqueID const &) const; /** - * @symbol ?getExtraBlock\@LevelChunk\@\@QEBAAEBVBlock\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getExtraBlock\@LevelChunk\@\@QEBAAEBVBlock\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class Block const & getExtraBlock(class ChunkBlockPos const &) const; /** - * @symbol ?getFinalized\@LevelChunk\@\@QEBA?AW4Finalization\@1\@XZ + * @symbol ?getFinalized\@LevelChunk\@\@QEBA?AW4Finalization\@1\@XZ */ MCAPI enum class LevelChunk::Finalization getFinalized() const; /** - * @symbol ?getGameEventListenerRegistry\@LevelChunk\@\@QEBAAEAVGameEventListenerRegistry\@\@XZ + * @symbol ?getGameEventListenerRegistry\@LevelChunk\@\@QEBAAEAVGameEventListenerRegistry\@\@XZ */ MCAPI class GameEventListenerRegistry & getGameEventListenerRegistry() const; /** - * @symbol ?getGenerator\@LevelChunk\@\@QEBAPEAVChunkSource\@\@XZ + * @symbol ?getGenerator\@LevelChunk\@\@QEBAPEAVChunkSource\@\@XZ */ MCAPI class ChunkSource * getGenerator() const; /** - * @symbol ?getGrassColor\@LevelChunk\@\@QEAAHAEBVChunkBlockPos\@\@\@Z + * @symbol ?getGrassColor\@LevelChunk\@\@QEAAHAEBVChunkBlockPos\@\@\@Z */ MCAPI int getGrassColor(class ChunkBlockPos const &); /** - * @symbol ?getHeightRange\@LevelChunk\@\@QEBAAEBVDimensionHeightRange\@\@XZ + * @symbol ?getHeightRange\@LevelChunk\@\@QEBAAEBVDimensionHeightRange\@\@XZ */ MCAPI class DimensionHeightRange const & getHeightRange() const; /** - * @symbol ?getHeightmap\@LevelChunk\@\@QEBAFAEBVChunkBlockPos\@\@\@Z + * @symbol ?getHeightmap\@LevelChunk\@\@QEBAFAEBVChunkBlockPos\@\@\@Z */ MCAPI short getHeightmap(class ChunkBlockPos const &) const; /** - * @symbol ?getHighestNonAirSubChunkIndex\@LevelChunk\@\@QEBAFXZ + * @symbol ?getHighestNonAirSubChunkIndex\@LevelChunk\@\@QEBAFXZ */ MCAPI short getHighestNonAirSubChunkIndex() const; /** - * @symbol ?getInterpolant\@LevelChunk\@\@QEBAM_K0\@Z + * @symbol ?getInterpolant\@LevelChunk\@\@QEBAM_K0\@Z */ MCAPI float getInterpolant(unsigned __int64, unsigned __int64) const; /** - * @symbol ?getLastTick\@LevelChunk\@\@QEBAAEBUTick\@\@XZ + * @symbol ?getLastTick\@LevelChunk\@\@QEBAAEBUTick\@\@XZ */ MCAPI struct Tick const & getLastTick() const; /** - * @symbol ?getLevel\@LevelChunk\@\@QEBAAEAVLevel\@\@XZ + * @symbol ?getLevel\@LevelChunk\@\@QEBAAEAVLevel\@\@XZ */ MCAPI class Level & getLevel() const; /** - * @symbol ?getLoadedFormat\@LevelChunk\@\@QEBA?AV?$optional\@W4LevelChunkFormat\@\@\@std\@\@XZ + * @symbol ?getLoadedFormat\@LevelChunk\@\@QEBA?AV?$optional\@W4LevelChunkFormat\@\@\@std\@\@XZ */ MCAPI class std::optional getLoadedFormat() const; /** - * @symbol ?getMax\@LevelChunk\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getMax\@LevelChunk\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getMax() const; /** - * @symbol ?getMaxAllocatedY\@LevelChunk\@\@QEBAFXZ + * @symbol ?getMaxAllocatedY\@LevelChunk\@\@QEBAFXZ */ MCAPI short getMaxAllocatedY() const; /** - * @symbol ?getMaxSubChunkCnt\@LevelChunk\@\@QEBA_KXZ + * @symbol ?getMaxSubChunkCnt\@LevelChunk\@\@QEBA_KXZ */ MCAPI unsigned __int64 getMaxSubChunkCnt() const; /** - * @symbol ?getMaxY\@LevelChunk\@\@QEBAFXZ + * @symbol ?getMaxY\@LevelChunk\@\@QEBAFXZ */ MCAPI short getMaxY() const; /** - * @symbol ?getMetaData\@LevelChunk\@\@QEBA?AV?$shared_ptr\@$$CBVLevelChunkMetaData\@\@\@std\@\@XZ + * @symbol ?getMetaData\@LevelChunk\@\@QEBA?AV?$shared_ptr\@$$CBVLevelChunkMetaData\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getMetaData() const; /** - * @symbol ?getMetaDataCopy\@LevelChunk\@\@QEBA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@XZ + * @symbol ?getMetaDataCopy\@LevelChunk\@\@QEBA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getMetaDataCopy() const; /** - * @symbol ?getMin\@LevelChunk\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getMin\@LevelChunk\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getMin() const; /** - * @symbol ?getMinY\@LevelChunk\@\@QEBAFXZ + * @symbol ?getMinY\@LevelChunk\@\@QEBAFXZ */ MCAPI short getMinY() const; /** - * @symbol ?getNonAirMaxHeight\@LevelChunk\@\@QEBAFXZ + * @symbol ?getNonAirMaxHeight\@LevelChunk\@\@QEBAFXZ */ MCAPI short getNonAirMaxHeight() const; /** - * @symbol ?getPosition\@LevelChunk\@\@QEBAAEBVChunkPos\@\@XZ + * @symbol ?getPosition\@LevelChunk\@\@QEBAAEBVChunkPos\@\@XZ */ MCAPI class ChunkPos const & getPosition() const; /** - * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class ChunkLocalHeight getPreWorldGenHeightmap(class ChunkBlockPos const &) const; /** - * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ + * @symbol ?getPreWorldGenHeightmap\@LevelChunk\@\@QEBA?AVHeightmapWrapper\@\@XZ */ MCAPI class HeightmapWrapper getPreWorldGenHeightmap() const; /** - * @symbol ?getPreservedBlockEntities\@LevelChunk\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getPreservedBlockEntities\@LevelChunk\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getPreservedBlockEntities() const; /** - * @symbol ?getRandomTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ + * @symbol ?getRandomTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ */ MCAPI class BlockTickingQueue & getRandomTickQueue(); /** - * @symbol ?getRawBrightness\@LevelChunk\@\@QEBA?AUBrightness\@\@AEBVChunkBlockPos\@\@U2\@\@Z + * @symbol ?getRawBrightness\@LevelChunk\@\@QEBA?AUBrightness\@\@AEBVChunkBlockPos\@\@U2\@\@Z */ MCAPI struct Brightness getRawBrightness(class ChunkBlockPos const &, struct Brightness) const; /** - * @symbol ?getSpawningAreas\@LevelChunk\@\@QEBAAEBV?$vector\@UHardcodedSpawningArea\@LevelChunk\@\@V?$allocator\@UHardcodedSpawningArea\@LevelChunk\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSpawningAreas\@LevelChunk\@\@QEBAAEBV?$vector\@UHardcodedSpawningArea\@LevelChunk\@\@V?$allocator\@UHardcodedSpawningArea\@LevelChunk\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getSpawningAreas() const; /** - * @symbol ?getState\@LevelChunk\@\@QEBAAEBU?$atomic\@W4ChunkState\@\@\@std\@\@XZ + * @symbol ?getState\@LevelChunk\@\@QEBAAEBU?$atomic\@W4ChunkState\@\@\@std\@\@XZ */ MCAPI struct std::atomic const & getState() const; /** - * @symbol ?getSubChunk\@LevelChunk\@\@QEBAPEBUSubChunk\@\@F\@Z + * @symbol ?getSubChunk\@LevelChunk\@\@QEAAPEAUSubChunk\@\@F\@Z */ - MCAPI struct SubChunk const * getSubChunk(short) const; + MCAPI struct SubChunk * getSubChunk(short); /** - * @symbol ?getSubChunk\@LevelChunk\@\@QEAAPEAUSubChunk\@\@F\@Z + * @symbol ?getSubChunk\@LevelChunk\@\@QEBAPEBUSubChunk\@\@F\@Z */ - MCAPI struct SubChunk * getSubChunk(short); + MCAPI struct SubChunk const * getSubChunk(short) const; /** - * @symbol ?getSurfaceBiome\@LevelChunk\@\@QEBAAEBVBiome\@\@VChunkBlockPos\@\@\@Z + * @symbol ?getSurfaceBiome\@LevelChunk\@\@QEBAAEBVBiome\@\@VChunkBlockPos\@\@\@Z */ MCAPI class Biome const & getSurfaceBiome(class ChunkBlockPos) const; /** - * @symbol ?getTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ + * @symbol ?getTickQueue\@LevelChunk\@\@QEAAAEAVBlockTickingQueue\@\@XZ */ MCAPI class BlockTickingQueue & getTickQueue(); /** - * @symbol ?getTickQueue\@LevelChunk\@\@QEBAAEBVBlockTickingQueue\@\@XZ + * @symbol ?getTickQueue\@LevelChunk\@\@QEBAAEBVBlockTickingQueue\@\@XZ */ MCAPI class BlockTickingQueue const & getTickQueue() const; /** - * @symbol ?getTopRainBlockPos\@LevelChunk\@\@QEAA?BVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?getTopRainBlockPos\@LevelChunk\@\@QEAA?BVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class BlockPos const getTopRainBlockPos(class ChunkBlockPos const &); /** - * @symbol ?getTotalAllocatedHeight\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@XZ + * @symbol ?getTotalAllocatedHeight\@LevelChunk\@\@QEBA?AVChunkLocalHeight\@\@XZ */ MCAPI class ChunkLocalHeight getTotalAllocatedHeight() const; /** - * @symbol ?hasAnyBiomeStates\@LevelChunk\@\@QEBA_NXZ + * @symbol ?hasAnyBiomeStates\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool hasAnyBiomeStates() const; /** - * @symbol ?hasBlockEntitiesToSerialize\@LevelChunk\@\@QEBA_NXZ + * @symbol ?hasBlockEntitiesToSerialize\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool hasBlockEntitiesToSerialize() const; /** - * @symbol ?hasEntitiesPendingToLoad\@LevelChunk\@\@QEBA_NXZ + * @symbol ?hasEntitiesPendingToLoad\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool hasEntitiesPendingToLoad() const; /** - * @symbol ?hasEntitiesToSerialize\@LevelChunk\@\@QEBA_NXZ + * @symbol ?hasEntitiesToSerialize\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool hasEntitiesToSerialize() const; /** - * @symbol ?hasEntity\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z + * @symbol ?hasEntity\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z */ MCAPI bool hasEntity(class WeakEntityRef); /** - * @symbol ?isBlockInChunk\@LevelChunk\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?isBlockInChunk\@LevelChunk\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool isBlockInChunk(class BlockPos const &) const; /** - * @symbol ?isClientGeneratedChunk\@LevelChunk\@\@QEBA_NXZ + * @symbol ?isClientGeneratedChunk\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isClientGeneratedChunk() const; /** - * @symbol ?isEmptyClientChunk\@LevelChunk\@\@QEBA_NXZ + * @symbol ?isEmptyClientChunk\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isEmptyClientChunk() const; /** - * @symbol ?isFullyLoaded\@LevelChunk\@\@QEBA_NXZ + * @symbol ?isFullyLoaded\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isFullyLoaded() const; /** - * @symbol ?isNonActorDataDirty\@LevelChunk\@\@QEBA_NXZ + * @symbol ?isNonActorDataDirty\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isNonActorDataDirty() const; /** - * @symbol ?isReadOnly\@LevelChunk\@\@QEBA_NXZ + * @symbol ?isReadOnly\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isReadOnly() const; /** - * @symbol ?isServerGeneratedClientChunk\@LevelChunk\@\@QEBA_NXZ + * @symbol ?isServerGeneratedClientChunk\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool isServerGeneratedClientChunk() const; /** - * @symbol ?isSkyLit\@LevelChunk\@\@QEBA_NAEBVChunkBlockPos\@\@\@Z + * @symbol ?isSkyLit\@LevelChunk\@\@QEBA_NAEBVChunkBlockPos\@\@\@Z */ MCAPI bool isSkyLit(class ChunkBlockPos const &) const; /** - * @symbol ?legacyDeserializeBlockExtraData\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?legacyDeserializeBlockExtraData\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void legacyDeserializeBlockExtraData(class IDataInput &); /** - * @symbol ?legacyDeserializeTerrain\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?legacyDeserializeTerrain\@LevelChunk\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void legacyDeserializeTerrain(class IDataInput &); /** - * @symbol ?levelChunkHad3dBiomeTagOnLastDeserialize\@LevelChunk\@\@QEBA_NXZ + * @symbol ?levelChunkHad3dBiomeTagOnLastDeserialize\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool levelChunkHad3dBiomeTagOnLastDeserialize() const; /** - * @symbol ?markSaveIfNeverSaved\@LevelChunk\@\@QEAAXXZ + * @symbol ?markSaveIfNeverSaved\@LevelChunk\@\@QEAAXXZ */ MCAPI void markSaveIfNeverSaved(); /** - * @symbol ?markSaveNonActorDataIfDirty\@LevelChunk\@\@QEAAXXZ + * @symbol ?markSaveNonActorDataIfDirty\@LevelChunk\@\@QEAAXXZ */ MCAPI void markSaveNonActorDataIfDirty(); /** - * @symbol ?metaDataDirty\@LevelChunk\@\@QEBA_NXZ + * @symbol ?metaDataDirty\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool metaDataDirty() const; /** - * @symbol ?needsUpgradeFix\@LevelChunk\@\@QEBA_NXZ + * @symbol ?needsUpgradeFix\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool needsUpgradeFix() const; /** - * @symbol ?needsWallFix\@LevelChunk\@\@QEBA_NXZ + * @symbol ?needsWallFix\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool needsWallFix() const; /** - * @symbol ?nonActorDataNeedsSaving\@LevelChunk\@\@QEBA_NHH\@Z + * @symbol ?nonActorDataNeedsSaving\@LevelChunk\@\@QEBA_NHH\@Z */ MCAPI bool nonActorDataNeedsSaving(int, int) const; /** - * @symbol ?onBlockEntityChanged\@LevelChunk\@\@QEAAXXZ + * @symbol ?onBlockEntityChanged\@LevelChunk\@\@QEAAXXZ */ MCAPI void onBlockEntityChanged(); /** - * @symbol ?onDiscarded\@LevelChunk\@\@QEAAXXZ + * @symbol ?onDiscarded\@LevelChunk\@\@QEAAXXZ */ MCAPI void onDiscarded(); /** - * @symbol ??4LevelChunk\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4LevelChunk\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class LevelChunk & operator=(class LevelChunk &&); /** - * @symbol ?placeCallbacks\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@1PEAVBlockSource\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z + * @symbol ?placeCallbacks\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@1PEAVBlockSource\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z */ MCAPI void placeCallbacks(class ChunkBlockPos const &, class Block const &, class Block const &, class BlockSource *, class std::shared_ptr); /** - * @symbol ?populateHeightMapDataForSubChunkPacket\@LevelChunk\@\@QEBAXFAEAUSubChunkPacketData\@SubChunkPacket\@\@\@Z + * @symbol ?populateHeightMapDataForSubChunkPacket\@LevelChunk\@\@QEBAXFAEAUSubChunkPacketData\@SubChunkPacket\@\@\@Z */ MCAPI void populateHeightMapDataForSubChunkPacket(short, struct SubChunkPacket::SubChunkPacketData &) const; /** - * @symbol ?pruneBiomesAboveHeightmap\@LevelChunk\@\@QEAAXXZ + * @symbol ?pruneBiomesAboveHeightmap\@LevelChunk\@\@QEAAXXZ */ MCAPI void pruneBiomesAboveHeightmap(); /** - * @symbol ?recalculateSubchunkHashes\@LevelChunk\@\@QEAAX_N\@Z + * @symbol ?recalculateSubchunkHashes\@LevelChunk\@\@QEAAX_N\@Z */ MCAPI void recalculateSubchunkHashes(bool); /** - * @symbol ?recomputeHeightMap\@LevelChunk\@\@QEAAX_N\@Z + * @symbol ?recomputeHeightMap\@LevelChunk\@\@QEAAX_N\@Z */ MCAPI void recomputeHeightMap(bool); /** - * @symbol ?removeBlockEntity\@LevelChunk\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?removeBlockEntity\@LevelChunk\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::shared_ptr removeBlockEntity(class BlockPos const &); /** - * @symbol ?removeEntityFromChunk\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z + * @symbol ?removeEntityFromChunk\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z */ MCAPI bool removeEntityFromChunk(class WeakEntityRef); /** - * @symbol ?removeEntityFromWorld\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z + * @symbol ?removeEntityFromWorld\@LevelChunk\@\@QEAA_NVWeakEntityRef\@\@\@Z */ MCAPI bool removeEntityFromWorld(class WeakEntityRef); /** - * @symbol ?removeHardcodedSpawningArea\@LevelChunk\@\@QEAAXW4HardcodedSpawnAreaType\@\@\@Z + * @symbol ?removeHardcodedSpawningArea\@LevelChunk\@\@QEAAXW4HardcodedSpawnAreaType\@\@\@Z */ MCAPI void removeHardcodedSpawningArea(enum class HardcodedSpawnAreaType); /** - * @symbol ?runtimeRelightSubchunk\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@_KAEBV?$vector\@USubChunkLightUpdate\@\@V?$allocator\@USubChunkLightUpdate\@\@\@std\@\@\@std\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@4\@\@Z + * @symbol ?runtimeRelightSubchunk\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@_KAEBV?$vector\@USubChunkLightUpdate\@\@V?$allocator\@USubChunkLightUpdate\@\@\@std\@\@\@std\@\@AEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@4\@\@Z */ MCAPI void runtimeRelightSubchunk(class BlockSource &, unsigned __int64, std::vector const &, std::vector &); /** - * @symbol ?serialize2DMaps\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serialize2DMaps\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serialize2DMaps(class IDataOutput &) const; /** - * @symbol ?serialize3DMaps\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serialize3DMaps\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serialize3DMaps(class IDataOutput &) const; /** - * @symbol ?serializeBiomeStates\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeBiomeStates\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeBiomeStates(class IDataOutput &) const; /** - * @symbol ?serializeBiomes\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeBiomes\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeBiomes(class IDataOutput &) const; /** - * @symbol ?serializeBlockEntities\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeBlockEntities\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeBlockEntities(class IDataOutput &) const; /** - * @symbol ?serializeBlockEntitiesForSubChunk\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@AEBVSubChunkPos\@\@\@Z + * @symbol ?serializeBlockEntitiesForSubChunk\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@AEBVSubChunkPos\@\@\@Z */ MCAPI void serializeBlockEntitiesForSubChunk(class IDataOutput &, class SubChunkPos const &) const; /** - * @symbol ?serializeBorderBlocks\@LevelChunk\@\@QEBA_NAEAVIDataOutput\@\@\@Z + * @symbol ?serializeBorderBlocks\@LevelChunk\@\@QEBA_NAEAVIDataOutput\@\@\@Z */ MCAPI bool serializeBorderBlocks(class IDataOutput &) const; /** - * @symbol ?serializeEntities\@LevelChunk\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@3\@22\@Z + * @symbol ?serializeEntities\@LevelChunk\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@3\@22\@Z */ MCAPI void serializeEntities(std::string &, bool, class std::function, class std::function, class std::function) const; /** - * @symbol ?serializeEntityRemovals\@LevelChunk\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?serializeEntityRemovals\@LevelChunk\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI void serializeEntityRemovals(class std::function); /** - * @symbol ?serializeFinalization\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeFinalization\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeFinalization(class IDataOutput &) const; /** - * @symbol ?serializeHardcodedSpawners\@LevelChunk\@\@QEBA_NAEAVIDataOutput\@\@\@Z + * @symbol ?serializeHardcodedSpawners\@LevelChunk\@\@QEBA_NAEAVIDataOutput\@\@\@Z */ MCAPI bool serializeHardcodedSpawners(class IDataOutput &) const; /** - * @symbol ?serializeMetaDataHash\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeMetaDataHash\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeMetaDataHash(class IDataOutput &) const; /** - * @symbol ?serializeRandomTicks\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeRandomTicks\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeRandomTicks(class IDataOutput &) const; /** - * @symbol ?serializeTicks\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serializeTicks\@LevelChunk\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serializeTicks(class IDataOutput &) const; /** - * @symbol ?setAllLegacyBlockIDAndData\@LevelChunk\@\@QEAAXV?$buffer_span\@UBlockID\@\@\@\@V?$buffer_span\@UNibblePair\@\@\@\@\@Z + * @symbol ?setAllLegacyBlockIDAndData\@LevelChunk\@\@QEAAXV?$buffer_span\@UBlockID\@\@\@\@V?$buffer_span\@UNibblePair\@\@\@\@\@Z */ MCAPI void setAllLegacyBlockIDAndData(class buffer_span, class buffer_span); /** - * @symbol ?setBiome2d\@LevelChunk\@\@QEAAXAEBVBiome\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?setBiome2d\@LevelChunk\@\@QEAAXAEBVBiome\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI void setBiome2d(class Biome const &, class ChunkBlockPos const &); /** - * @symbol ?setBiomeFromVolume\@LevelChunk\@\@QEAAXAEBV?$VolumeOf\@PEBVBiome\@\@\@ClientBlockPipeline\@\@I\@Z + * @symbol ?setBiomeFromVolume\@LevelChunk\@\@QEAAXAEBV?$VolumeOf\@PEBVBiome\@\@\@ClientBlockPipeline\@\@I\@Z */ MCAPI void setBiomeFromVolume(class ClientBlockPipeline::VolumeOf const &, unsigned int); /** - * @symbol ?setBlock\@LevelChunk\@\@QEAAAEBVBlock\@\@AEBVChunkBlockPos\@\@AEBV2\@PEAVBlockSource\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z + * @symbol ?setBlock\@LevelChunk\@\@QEAAAEBVBlock\@\@AEBVChunkBlockPos\@\@AEBV2\@PEAVBlockSource\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z */ MCAPI class Block const & setBlock(class ChunkBlockPos const &, class Block const &, class BlockSource *, class std::shared_ptr); /** - * @symbol ?setBlockSimple\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?setBlockSimple\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void setBlockSimple(class ChunkBlockPos const &, class Block const &); /** - * @symbol ?setBlockVolume\@LevelChunk\@\@QEAAXAEBVBlockVolume\@\@I\@Z + * @symbol ?setBlockVolume\@LevelChunk\@\@QEAAXAEBVBlockVolume\@\@I\@Z */ MCAPI void setBlockVolume(class BlockVolume const &, unsigned int); /** - * @symbol ?setBorder\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@_N\@Z + * @symbol ?setBorder\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@_N\@Z */ MCAPI void setBorder(class ChunkBlockPos const &, bool); /** - * @symbol ?setCachedTemperatureNoise\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@C\@Z + * @symbol ?setCachedTemperatureNoise\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@C\@Z */ MCAPI void setCachedTemperatureNoise(class ChunkBlockPos const &, signed char); /** - * @symbol ?setChunkInterpolants\@LevelChunk\@\@QEAAXAEBVNeighbors\@1\@\@Z + * @symbol ?setChunkInterpolants\@LevelChunk\@\@QEAAXAEBVNeighbors\@1\@\@Z */ MCAPI void setChunkInterpolants(class LevelChunk::Neighbors const &); /** - * @symbol ?setExtraBlock\@LevelChunk\@\@QEAAAEBVBlock\@\@AEBVChunkBlockPos\@\@AEBV2\@PEAVBlockSource\@\@\@Z + * @symbol ?setExtraBlock\@LevelChunk\@\@QEAAAEBVBlock\@\@AEBVChunkBlockPos\@\@AEBV2\@PEAVBlockSource\@\@\@Z */ MCAPI class Block const & setExtraBlock(class ChunkBlockPos const &, class Block const &, class BlockSource *); /** - * @symbol ?setExtraBlockSimple\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?setExtraBlockSimple\@LevelChunk\@\@QEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void setExtraBlockSimple(class ChunkBlockPos const &, class Block const &); /** - * @symbol ?setFinalized\@LevelChunk\@\@QEAAXW4Finalization\@1\@\@Z + * @symbol ?setFinalized\@LevelChunk\@\@QEAAXW4Finalization\@1\@\@Z */ MCAPI void setFinalized(enum class LevelChunk::Finalization); /** - * @symbol ?setHadSerializedEntities\@LevelChunk\@\@QEAAXXZ + * @symbol ?setHadSerializedEntities\@LevelChunk\@\@QEAAXXZ */ MCAPI void setHadSerializedEntities(); /** - * @symbol ?setIsClientGeneratedChunk\@LevelChunk\@\@QEAAX_N\@Z + * @symbol ?setIsClientGeneratedChunk\@LevelChunk\@\@QEAAX_N\@Z */ MCAPI void setIsClientGeneratedChunk(bool); /** - * @symbol ?setMetaData\@LevelChunk\@\@QEAAXV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@\@Z + * @symbol ?setMetaData\@LevelChunk\@\@QEAAXV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@\@Z */ MCAPI void setMetaData(class std::shared_ptr); /** - * @symbol ?setPendingEntities\@LevelChunk\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setPendingEntities\@LevelChunk\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setPendingEntities(std::string); /** - * @symbol ?setPreWorldGenHeightMap\@LevelChunk\@\@QEAAXV?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setPreWorldGenHeightMap\@LevelChunk\@\@QEAAXV?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void setPreWorldGenHeightMap(std::unique_ptr>); /** - * @symbol ?setSaved\@LevelChunk\@\@QEAAXXZ + * @symbol ?setSaved\@LevelChunk\@\@QEAAXXZ */ MCAPI void setSaved(); /** - * @symbol ?setUnsaved\@LevelChunk\@\@QEAAXXZ + * @symbol ?setUnsaved\@LevelChunk\@\@QEAAXXZ */ MCAPI void setUnsaved(); /** - * @symbol ?setupRedstoneCircuit\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?setupRedstoneCircuit\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void setupRedstoneCircuit(class BlockSource &); /** - * @symbol ?shouldSaveIfNeverSaved\@LevelChunk\@\@QEBA_NXZ + * @symbol ?shouldSaveIfNeverSaved\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool shouldSaveIfNeverSaved() const; /** - * @symbol ?shouldSaveNonActorDataIfDirty\@LevelChunk\@\@QEBA_NXZ + * @symbol ?shouldSaveNonActorDataIfDirty\@LevelChunk\@\@QEBA_NXZ */ MCAPI bool shouldSaveNonActorDataIfDirty() const; /** - * @symbol ?subChunkIsSafeReference\@LevelChunk\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?subChunkIsSafeReference\@LevelChunk\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool subChunkIsSafeReference(class BlockPos const &) const; /** - * @symbol ?tick\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@AEBUTick\@\@\@Z + * @symbol ?tick\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@AEBUTick\@\@\@Z */ MCAPI void tick(class BlockSource &, struct Tick const &); /** - * @symbol ?tickBlockEntities\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tickBlockEntities\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void tickBlockEntities(class BlockSource &); /** - * @symbol ?tickBlocks\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tickBlocks\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void tickBlocks(class BlockSource &); /** - * @symbol ?toWorldPos\@LevelChunk\@\@QEBA?AVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z + * @symbol ?toWorldPos\@LevelChunk\@\@QEBA?AVBlockPos\@\@AEBVChunkBlockPos\@\@\@Z */ MCAPI class BlockPos toWorldPos(class ChunkBlockPos const &) const; /** - * @symbol ?tryChangeState\@LevelChunk\@\@QEAA_NW4ChunkState\@\@0\@Z + * @symbol ?tryChangeState\@LevelChunk\@\@QEAA_NW4ChunkState\@\@0\@Z */ MCAPI bool tryChangeState(enum class ChunkState, enum class ChunkState); /** - * @symbol ?trySpawnSkeletonTrap\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?trySpawnSkeletonTrap\@LevelChunk\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void trySpawnSkeletonTrap(class BlockSource &, class BlockPos const &); /** - * @symbol ?updateLoadedMetaDataHash\@LevelChunk\@\@QEAAXXZ + * @symbol ?updateLoadedMetaDataHash\@LevelChunk\@\@QEAAXXZ */ MCAPI void updateLoadedMetaDataHash(); /** - * @symbol ?validateAndFixBiomeStates\@LevelChunk\@\@QEAAXXZ + * @symbol ?validateAndFixBiomeStates\@LevelChunk\@\@QEAAXXZ */ MCAPI void validateAndFixBiomeStates(); /** - * @symbol ?wasTickedThisTick\@LevelChunk\@\@QEBA_NAEBUTick\@\@\@Z + * @symbol ?wasTickedThisTick\@LevelChunk\@\@QEBA_NAEBUTick\@\@\@Z */ MCAPI bool wasTickedThisTick(struct Tick const &) const; /** - * @symbol ??1LevelChunk\@\@QEAA\@XZ + * @symbol ??1LevelChunk\@\@QEAA\@XZ */ MCAPI ~LevelChunk(); /** - * @symbol ?borderBlocksAreEnabled\@LevelChunk\@\@SA_NXZ + * @symbol ?borderBlocksAreEnabled\@LevelChunk\@\@SA_NXZ */ MCAPI static bool borderBlocksAreEnabled(); /** - * @symbol ?createNew\@LevelChunk\@\@SA?AV?$unique_ptr\@VLevelChunk\@\@ULevelChunkPhase1Deleter\@\@\@std\@\@AEAVDimension\@\@VChunkPos\@\@_NW4SubChunkInitMode\@\@\@Z + * @symbol ?createNew\@LevelChunk\@\@SA?AV?$unique_ptr\@VLevelChunk\@\@ULevelChunkPhase1Deleter\@\@\@std\@\@AEAVDimension\@\@VChunkPos\@\@_NW4SubChunkInitMode\@\@\@Z */ MCAPI static class std::unique_ptr createNew(class Dimension &, class ChunkPos, bool, enum class SubChunkInitMode); /** - * @symbol ?deserialize2DData\@LevelChunk\@\@SA?AV?$tuple\@V?$array\@VChunkLocalHeight\@\@$0BAA\@\@std\@\@V?$array\@UBiomeChunkData\@\@$0BAA\@\@2\@\@std\@\@AEAVIDataInput\@\@\@Z + * @symbol ?deserialize2DData\@LevelChunk\@\@SA?AV?$tuple\@V?$array\@VChunkLocalHeight\@\@$0BAA\@\@std\@\@V?$array\@UBiomeChunkData\@\@$0BAA\@\@2\@\@std\@\@AEAVIDataInput\@\@\@Z */ MCAPI static class std::tuple, class std::array> deserialize2DData(class IDataInput &); /** - * @symbol ?deserialize3DBiomes\@LevelChunk\@\@SA?AU?$pair\@GV?$vector\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@AEAVIDataInput\@\@AEBVBiomeRegistry\@\@GPEAVBiome\@\@\@Z + * @symbol ?deserialize3DBiomes\@LevelChunk\@\@SA?AU?$pair\@GV?$vector\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@AEAVIDataInput\@\@AEBVBiomeRegistry\@\@GPEAVBiome\@\@\@Z */ MCAPI static struct std::pair>>> deserialize3DBiomes(class IDataInput &, class BiomeRegistry const &, unsigned short, class Biome *); /** - * @symbol ?deserialize3DData\@LevelChunk\@\@SA?AV?$tuple\@V?$array\@VChunkLocalHeight\@\@$0BAA\@\@std\@\@GV?$vector\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@\@2\@\@2\@\@std\@\@AEAVIDataInput\@\@AEBVBiomeRegistry\@\@GPEAVBiome\@\@\@Z + * @symbol ?deserialize3DData\@LevelChunk\@\@SA?AV?$tuple\@V?$array\@VChunkLocalHeight\@\@$0BAA\@\@std\@\@GV?$vector\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@\@2\@\@2\@\@std\@\@AEAVIDataInput\@\@AEBVBiomeRegistry\@\@GPEAVBiome\@\@\@Z */ MCAPI static class std::tuple, unsigned short, std::vector>>> deserialize3DData(class IDataInput &, class BiomeRegistry const &, unsigned short, class Biome *); /** - * @symbol ?deserializeSubChunk\@LevelChunk\@\@SAXAEAVIDataInput\@\@AEBVChunkPos\@\@V?$optional\@C\@std\@\@AEAUSubChunk\@\@AEAVBlockPalette\@\@V?$optional\@PEAUDeserializationChanges\@\@\@5\@\@Z + * @symbol ?deserializeSubChunk\@LevelChunk\@\@SAXAEAVIDataInput\@\@AEBVChunkPos\@\@V?$optional\@C\@std\@\@AEAUSubChunk\@\@AEAVBlockPalette\@\@V?$optional\@PEAUDeserializationChanges\@\@\@5\@\@Z */ MCAPI static void deserializeSubChunk(class IDataInput &, class ChunkPos const &, class std::optional, struct SubChunk &, class BlockPalette &, class std::optional); /** - * @symbol ?flushGarbageCollector\@LevelChunk\@\@SAXXZ + * @symbol ?flushGarbageCollector\@LevelChunk\@\@SAXXZ */ MCAPI static void flushGarbageCollector(); /** - * @symbol ?getTagAndSubIndexFromKey\@LevelChunk\@\@SA?AU?$pair\@W4LevelChunkTag\@\@F\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getTagAndSubIndexFromKey\@LevelChunk\@\@SA?AU?$pair\@W4LevelChunkTag\@\@F\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI static struct std::pair getTagAndSubIndexFromKey(class gsl::basic_string_span); + MCAPI static struct std::pair getTagAndSubIndexFromKey(class std::basic_string_view>); /** - * @symbol ?serializeEntities\@LevelChunk\@\@SAXAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV43\@_NV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@3\@44\@Z + * @symbol ?serializeEntities\@LevelChunk\@\@SAXAEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV43\@_NV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@3\@44\@Z */ MCAPI static void serializeEntities(std::vector const &, std::string const &, std::string &, bool, class std::function, class std::function, class std::function); //protected: /** - * @symbol ?_deserializeBlockEntities\@LevelChunk\@\@IEAAXAEAVIDataInput\@\@AEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?_deserializeBlockEntities\@LevelChunk\@\@IEAAXAEAVIDataInput\@\@AEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCAPI void _deserializeBlockEntities(class IDataInput &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &); /** - * @symbol ?_deserializeEntity\@LevelChunk\@\@IEAAXAEAVBlockSource\@\@AEAVIDataInput\@\@AEAV?$vector\@UActorLink\@\@V?$allocator\@UActorLink\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_deserializeEntity\@LevelChunk\@\@IEAAXAEAVBlockSource\@\@AEAVIDataInput\@\@AEAV?$vector\@UActorLink\@\@V?$allocator\@UActorLink\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _deserializeEntity(class BlockSource &, class IDataInput &, std::vector &); /** - * @symbol ?_fixupCorruptedBlockActors\@LevelChunk\@\@IEAAXAEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@V?$buffer_span_mut\@USubChunk\@\@\@\@\@Z + * @symbol ?_fixupCorruptedBlockActors\@LevelChunk\@\@IEAAXAEAV?$unordered_map\@VChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@U?$hash\@VChunkBlockPos\@\@\@3\@U?$equal_to\@VChunkBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkBlockPos\@\@V?$shared_ptr\@VBlockActor\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@V?$buffer_span_mut\@USubChunk\@\@\@\@\@Z */ MCAPI void _fixupCorruptedBlockActors(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, class buffer_span_mut); /** - * @symbol ?_generateOriginalLighting\@LevelChunk\@\@IEAAXAEAVChunkViewSource\@\@_N\@Z + * @symbol ?_generateOriginalLighting\@LevelChunk\@\@IEAAXAEAVChunkViewSource\@\@_N\@Z */ MCAPI void _generateOriginalLighting(class ChunkViewSource &, bool); /** - * @symbol ?_generateOriginalLightingSubChunk\@LevelChunk\@\@IEAAXAEAVBlockSource\@\@_K_N\@Z + * @symbol ?_generateOriginalLightingSubChunk\@LevelChunk\@\@IEAAXAEAVBlockSource\@\@_K_N\@Z */ MCAPI void _generateOriginalLightingSubChunk(class BlockSource &, unsigned __int64, bool); /** - * @symbol ?_lightingCallbacks\@LevelChunk\@\@IEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@1PEAVBlockSource\@\@\@Z + * @symbol ?_lightingCallbacks\@LevelChunk\@\@IEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@1PEAVBlockSource\@\@\@Z */ MCAPI void _lightingCallbacks(class ChunkBlockPos const &, class Block const &, class Block const &, class BlockSource *); /** - * @symbol ?_placeBlockEntity\@LevelChunk\@\@IEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z + * @symbol ?_placeBlockEntity\@LevelChunk\@\@IEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z */ MCAPI void _placeBlockEntity(class std::shared_ptr); /** - * @symbol ?_recalcHeight\@LevelChunk\@\@IEAA_NAEBVChunkBlockPos\@\@PEAVBlockSource\@\@\@Z + * @symbol ?_recalcHeight\@LevelChunk\@\@IEAA_NAEBVChunkBlockPos\@\@PEAVBlockSource\@\@\@Z */ MCAPI bool _recalcHeight(class ChunkBlockPos const &, class BlockSource *); /** - * @symbol ?_removeCallbacks\@LevelChunk\@\@IEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@1PEAVBlockSource\@\@\@Z + * @symbol ?_removeCallbacks\@LevelChunk\@\@IEAAXAEBVChunkBlockPos\@\@AEBVBlock\@\@1PEAVBlockSource\@\@\@Z */ MCAPI void _removeCallbacks(class ChunkBlockPos const &, class Block const &, class Block const &, class BlockSource *); /** - * @symbol ?_setAllBiomesFrom2D\@LevelChunk\@\@IEAAXAEAV?$array\@UBiomeChunkData\@\@$0BAA\@\@std\@\@\@Z + * @symbol ?_setAllBiomesFrom2D\@LevelChunk\@\@IEAAXAEAV?$array\@UBiomeChunkData\@\@$0BAA\@\@std\@\@\@Z */ MCAPI void _setAllBiomesFrom2D(class std::array &); //private: /** - * @symbol ?_addEntityToVolumes\@LevelChunk\@\@AEAAXV?$not_null\@PEAVActor\@\@\@gsl\@\@\@Z + * @symbol ?_addEntityToVolumes\@LevelChunk\@\@AEAAXV?$not_null\@PEAVActor\@\@\@gsl\@\@\@Z */ MCAPI void _addEntityToVolumes(class gsl::not_null); /** - * @symbol ?_deserializeCCsubChunks\@LevelChunk\@\@AEAAXFAEAVStringByteInput\@\@\@Z + * @symbol ?_deserializeCCsubChunks\@LevelChunk\@\@AEAAXFAEAVStringByteInput\@\@\@Z */ MCAPI void _deserializeCCsubChunks(short, class StringByteInput &); /** - * @symbol ?_deserializeSubChunk\@LevelChunk\@\@AEAA_NFAEAVStringByteInput\@\@\@Z + * @symbol ?_deserializeSubChunk\@LevelChunk\@\@AEAA_NFAEAVStringByteInput\@\@\@Z */ MCAPI bool _deserializeSubChunk(short, class StringByteInput &); /** - * @symbol ?_disableBlockEntityAccessForThisThread\@LevelChunk\@\@AEBAXXZ + * @symbol ?_disableBlockEntityAccessForThisThread\@LevelChunk\@\@AEBAXXZ */ MCAPI void _disableBlockEntityAccessForThisThread() const; /** - * @symbol ?_enableBlockEntityAccessForThisThread\@LevelChunk\@\@AEBAXXZ + * @symbol ?_enableBlockEntityAccessForThisThread\@LevelChunk\@\@AEBAXXZ */ MCAPI void _enableBlockEntityAccessForThisThread() const; /** - * @symbol ?_fixupCommandBlocksOnTickingQueue\@LevelChunk\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_fixupCommandBlocksOnTickingQueue\@LevelChunk\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _fixupCommandBlocksOnTickingQueue(class BlockSource &); /** - * @symbol ?_makeUniformBiomes\@LevelChunk\@\@AEAAXAEBVBiome\@\@\@Z + * @symbol ?_makeUniformBiomes\@LevelChunk\@\@AEAAXAEBVBiome\@\@\@Z */ MCAPI void _makeUniformBiomes(class Biome const &); /** - * @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 + * @symbol ?_replaceBiomeStorage\@LevelChunk\@\@AEAAXGV?$unique_ptr\@V?$SubChunkStorage\@VBiome\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBiome\@\@\@\@\@std\@\@\@std\@\@AEBV?$UniqueLock\@Vshared_mutex\@std\@\@\@Threading\@Bedrock\@\@\@Z */ MCAPI void _replaceBiomeStorage(unsigned short, std::unique_ptr>, class Bedrock::Threading::UniqueLock const &); /** - * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@AEBVChunkBlockPos\@\@_N\@Z + * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@GGAEBV?$UniqueLock\@Vshared_mutex\@std\@\@\@Threading\@Bedrock\@\@\@Z */ - MCAPI void _setBiome(class Biome const &, class ChunkBlockPos const &, bool); + MCAPI void _setBiome(class Biome const &, unsigned short, unsigned short, class Bedrock::Threading::UniqueLock const &); /** - * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@GGAEBV?$UniqueLock\@Vshared_mutex\@std\@\@\@Threading\@Bedrock\@\@\@Z + * @symbol ?_setBiome\@LevelChunk\@\@AEAAXAEBVBiome\@\@AEBVChunkBlockPos\@\@_N\@Z */ - MCAPI void _setBiome(class Biome const &, unsigned short, unsigned short, class Bedrock::Threading::UniqueLock const &); + MCAPI void _setBiome(class Biome const &, class ChunkBlockPos const &, bool); protected: /** - * @symbol ?UPDATE_MAP_BIT_SHIFT\@LevelChunk\@\@1HB + * @symbol ?UPDATE_MAP_BIT_SHIFT\@LevelChunk\@\@1HB */ MCAPI static int const UPDATE_MAP_BIT_SHIFT; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp b/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp index 0bd2b78a2a..d8bba644f5 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkAndSubChunkLoggingData.hpp @@ -10,30 +10,27 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure LevelChunkAndSubChunkLoggingData. - * - */ -struct LevelChunkAndSubChunkLoggingData { + +class LevelChunkAndSubChunkLoggingData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNKANDSUBCHUNKLOGGINGDATA public: - struct LevelChunkAndSubChunkLoggingData& operator=(struct LevelChunkAndSubChunkLoggingData const &) = delete; - LevelChunkAndSubChunkLoggingData(struct LevelChunkAndSubChunkLoggingData const &) = delete; + class LevelChunkAndSubChunkLoggingData& operator=(class LevelChunkAndSubChunkLoggingData const &) = delete; + LevelChunkAndSubChunkLoggingData(class LevelChunkAndSubChunkLoggingData const &) = delete; LevelChunkAndSubChunkLoggingData() = delete; #endif public: /** - * @symbol ?logLevelChunkEvent\@LevelChunkAndSubChunkLoggingData\@\@SAXAEBVChunkPos\@\@PEBD_N\@Z + * @symbol ?logLevelChunkEvent\@LevelChunkAndSubChunkLoggingData\@\@SAXAEBVChunkPos\@\@PEBD_N\@Z */ MCAPI static void logLevelChunkEvent(class ChunkPos const &, char const *, bool); /** - * @symbol ?logSubChunkEvent\@LevelChunkAndSubChunkLoggingData\@\@SAXAEBVSubChunkPos\@\@PEBD_N\@Z + * @symbol ?logSubChunkEvent\@LevelChunkAndSubChunkLoggingData\@\@SAXAEBVSubChunkPos\@\@PEBD_N\@Z */ MCAPI static void logSubChunkEvent(class SubChunkPos const &, char const *, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp b/LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp index 97cd39bb48..0252a0115b 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkBuilderData.hpp @@ -27,12 +27,12 @@ class LevelChunkBuilderData { public: /** - * @symbol ??0LevelChunkBuilderData\@\@QEAA\@XZ + * @symbol ??0LevelChunkBuilderData\@\@QEAA\@XZ */ MCAPI LevelChunkBuilderData(); /** - * @symbol ??1LevelChunkBuilderData\@\@QEAA\@XZ + * @symbol ??1LevelChunkBuilderData\@\@QEAA\@XZ */ MCAPI ~LevelChunkBuilderData(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp b/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp index 0794dbed1d..b1714c20d5 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkFinalDeleter.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure LevelChunkFinalDeleter. - * - */ -struct LevelChunkFinalDeleter { + +class LevelChunkFinalDeleter { #define AFTER_EXTRA // Add Member There @@ -23,15 +20,15 @@ struct LevelChunkFinalDeleter { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELCHUNKFINALDELETER public: - struct LevelChunkFinalDeleter& operator=(struct LevelChunkFinalDeleter const &) = delete; - LevelChunkFinalDeleter(struct LevelChunkFinalDeleter const &) = delete; + class LevelChunkFinalDeleter& operator=(class LevelChunkFinalDeleter const &) = delete; + LevelChunkFinalDeleter(class LevelChunkFinalDeleter const &) = delete; LevelChunkFinalDeleter() = delete; #endif public: /** - * @symbol ??RLevelChunkFinalDeleter\@\@QEAAXPEAVLevelChunk\@\@\@Z + * @symbol ??RLevelChunkFinalDeleter\@\@QEAAXPEAVLevelChunk\@\@\@Z */ MCAPI void operator()(class LevelChunk *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp b/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp index 286ad9ebec..e3ae73ef5e 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkGarbageCollector.hpp @@ -30,28 +30,28 @@ class LevelChunkGarbageCollector { public: /** - * @symbol ??0LevelChunkGarbageCollector\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0LevelChunkGarbageCollector\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI LevelChunkGarbageCollector(class Dimension &); /** - * @symbol ?acquireDiscardedChunk\@LevelChunkGarbageCollector\@\@QEAAXV?$unique_ptr\@VLevelChunk\@\@U?$default_delete\@VLevelChunk\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?acquireDiscardedChunk\@LevelChunkGarbageCollector\@\@QEAAXV?$unique_ptr\@VLevelChunk\@\@U?$default_delete\@VLevelChunk\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void acquireDiscardedChunk(std::unique_ptr); /** - * @symbol ?getPendingDeletesCount\@LevelChunkGarbageCollector\@\@QEBA_KXZ + * @symbol ?getPendingDeletesCount\@LevelChunkGarbageCollector\@\@QEBA_KXZ */ MCAPI unsigned __int64 getPendingDeletesCount() const; /** - * @symbol ??1LevelChunkGarbageCollector\@\@QEAA\@XZ + * @symbol ??1LevelChunkGarbageCollector\@\@QEAA\@XZ */ MCAPI ~LevelChunkGarbageCollector(); //protected: /** - * @symbol ?flush\@LevelChunkGarbageCollector\@\@IEAAXXZ + * @symbol ?flush\@LevelChunkGarbageCollector\@\@IEAAXXZ */ MCAPI void flush(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp b/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp index ff728ff574..aef0bf7153 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkMetaData.hpp @@ -27,36 +27,36 @@ class LevelChunkMetaData { public: /** - * @symbol ??0LevelChunkMetaData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0LevelChunkMetaData\@\@QEAA\@AEBV0\@\@Z */ MCAPI LevelChunkMetaData(class LevelChunkMetaData const &); /** - * @symbol ??0LevelChunkMetaData\@\@QEAA\@AEAVIDataInput\@\@\@Z + * @symbol ??0LevelChunkMetaData\@\@QEAA\@AEAVIDataInput\@\@\@Z */ MCAPI LevelChunkMetaData(class IDataInput &); /** - * @symbol ?getCurrentHash\@LevelChunkMetaData\@\@QEBA_KXZ + * @symbol ?getCurrentHash\@LevelChunkMetaData\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCurrentHash() const; /** - * @symbol ?serialize\@LevelChunkMetaData\@\@QEBAXAEAVIDataOutput\@\@\@Z + * @symbol ?serialize\@LevelChunkMetaData\@\@QEBAXAEAVIDataOutput\@\@\@Z */ MCAPI void serialize(class IDataOutput &) const; /** - * @symbol ??1LevelChunkMetaData\@\@QEAA\@XZ + * @symbol ??1LevelChunkMetaData\@\@QEAA\@XZ */ MCAPI ~LevelChunkMetaData(); /** - * @symbol ?INVALID_META_DATA\@LevelChunkMetaData\@\@2_KB + * @symbol ?INVALID_META_DATA\@LevelChunkMetaData\@\@2_KB */ MCAPI static unsigned __int64 const INVALID_META_DATA; //protected: /** - * @symbol ?_recomputeHash\@LevelChunkMetaData\@\@IEBAXXZ + * @symbol ?_recomputeHash\@LevelChunkMetaData\@\@IEBAXXZ */ MCAPI void _recomputeHash() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkMetaDataDictionary.hpp b/LiteLoader/include/llapi/mc/LevelChunkMetaDataDictionary.hpp index 90fcba158e..9ae206672c 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkMetaDataDictionary.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkMetaDataDictionary.hpp @@ -28,28 +28,28 @@ class LevelChunkMetaDataDictionary { public: /** - * @symbol ?checkAndSerialize\@LevelChunkMetaDataDictionary\@\@QEBAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?checkAndSerialize\@LevelChunkMetaDataDictionary\@\@QEBAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI void checkAndSerialize(class std::function) const; /** - * @symbol ?deserialize\@LevelChunkMetaDataDictionary\@\@QEAAXAEAVIDataInput\@\@\@Z + * @symbol ?deserialize\@LevelChunkMetaDataDictionary\@\@QEAAXAEAVIDataInput\@\@\@Z */ MCAPI void deserialize(class IDataInput &); /** - * @symbol ?getMetaData\@LevelChunkMetaDataDictionary\@\@QEBA?AV?$shared_ptr\@$$CBVLevelChunkMetaData\@\@\@std\@\@_K\@Z + * @symbol ?getMetaData\@LevelChunkMetaDataDictionary\@\@QEBA?AV?$shared_ptr\@$$CBVLevelChunkMetaData\@\@\@std\@\@_K\@Z */ MCAPI class std::shared_ptr getMetaData(unsigned __int64) const; /** - * @symbol ?registerMetaData\@LevelChunkMetaDataDictionary\@\@QEAA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@AEBVLevelChunkMetaData\@\@\@Z + * @symbol ?registerMetaData\@LevelChunkMetaDataDictionary\@\@QEAA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@AEBVLevelChunkMetaData\@\@\@Z */ MCAPI class std::shared_ptr registerMetaData(class LevelChunkMetaData const &); //protected: /** - * @symbol ?_registerMetaData\@LevelChunkMetaDataDictionary\@\@IEAA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@AEBVLevelChunkMetaData\@\@\@Z + * @symbol ?_registerMetaData\@LevelChunkMetaDataDictionary\@\@IEAA?AV?$shared_ptr\@VLevelChunkMetaData\@\@\@std\@\@AEBVLevelChunkMetaData\@\@\@Z */ MCAPI class std::shared_ptr _registerMetaData(class LevelChunkMetaData const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp b/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp index 5d4f0f36a7..1b3e0fa8f7 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkMetaDataInitializer.hpp @@ -20,19 +20,19 @@ namespace LevelChunkMetaDataInitializer { #undef AFTER_EXTRA /** - * @symbol ?inferInitialMetaDataAfterDeserialization\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@AEAVLevelChunkMetaData\@\@\@Z + * @symbol ?inferInitialMetaDataAfterDeserialization\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@AEAVLevelChunkMetaData\@\@\@Z */ MCAPI void inferInitialMetaDataAfterDeserialization(class LevelChunk &, class LevelChunkMetaData &); /** - * @symbol ?inferTargetMetaData\@LevelChunkMetaDataInitializer\@\@YAXAEBVBaseGameVersion\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVLevelChunkMetaData\@\@\@Z + * @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 + * @symbol ?setupInitialMetaData\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@AEAVLevelChunkMetaData\@\@\@Z */ MCAPI void setupInitialMetaData(class LevelChunk &, class LevelChunkMetaData &); /** - * @symbol ?updateLevelChunkMetaDataForSaving\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@\@Z + * @symbol ?updateLevelChunkMetaDataForSaving\@LevelChunkMetaDataInitializer\@\@YAXAEAVLevelChunk\@\@\@Z */ MCAPI void updateLevelChunkMetaDataForSaving(class LevelChunk &); diff --git a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp index efdeafba7b..cdf5091226 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkPacket.hpp @@ -30,37 +30,37 @@ class LevelChunkPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelChunkPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LevelChunkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LevelChunkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LevelChunkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LevelChunkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LevelChunkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LevelChunkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LevelChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0LevelChunkPacket\@\@QEAA\@XZ + * @symbol ??0LevelChunkPacket\@\@QEAA\@XZ */ MCAPI LevelChunkPacket(); /** - * @symbol ?pushSubChunkMetadata\@LevelChunkPacket\@\@QEAAX_K\@Z + * @symbol ?pushSubChunkMetadata\@LevelChunkPacket\@\@QEAAX_K\@Z */ MCAPI void pushSubChunkMetadata(unsigned __int64); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp b/LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp index ce95958220..a153cc075f 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkPhase1Deleter.hpp @@ -30,7 +30,7 @@ struct LevelChunkPhase1Deleter { public: /** - * @symbol ??RLevelChunkPhase1Deleter\@\@QEAAXPEAVLevelChunk\@\@\@Z + * @symbol ??RLevelChunkPhase1Deleter\@\@QEAAXPEAVLevelChunk\@\@\@Z */ MCAPI void operator()(class LevelChunk *); diff --git a/LiteLoader/include/llapi/mc/LevelChunkTickingSystem.hpp b/LiteLoader/include/llapi/mc/LevelChunkTickingSystem.hpp index 3eaa2577a9..446a5c6393 100644 --- a/LiteLoader/include/llapi/mc/LevelChunkTickingSystem.hpp +++ b/LiteLoader/include/llapi/mc/LevelChunkTickingSystem.hpp @@ -28,35 +28,35 @@ class LevelChunkTickingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelChunkTickingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@LevelChunkTickingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@LevelChunkTickingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_determineLevelChunksToTick\@LevelChunkTickingSystem\@\@CAXAEBVActor\@\@AEAVBlockSource\@\@AEAVLoadedChunksComponent\@\@AEAV?$vector\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@2\@\@std\@\@3AEBUTick\@\@\@Z + * @symbol ?_determineLevelChunksToTick\@LevelChunkTickingSystem\@\@CAXAEBVActor\@\@AEAVBlockSource\@\@AEAVLoadedChunksComponent\@\@AEAV?$vector\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@2\@\@std\@\@3AEBUTick\@\@\@Z */ MCAPI static void _determineLevelChunksToTick(class Actor const &, class BlockSource &, class LoadedChunksComponent &, std::vector> &, std::vector> &, struct Tick const &); /** - * @symbol ?_tickLevelChunksAroundActor\@LevelChunkTickingSystem\@\@CAXAEAVActor\@\@AEAVBlockSource\@\@AEAVLoadedChunksComponent\@\@\@Z + * @symbol ?_tickLevelChunksAroundActor\@LevelChunkTickingSystem\@\@CAXAEAVActor\@\@AEAVBlockSource\@\@AEAVLoadedChunksComponent\@\@\@Z */ MCAPI static void _tickLevelChunksAroundActor(class Actor &, class BlockSource &, class LoadedChunksComponent &); /** - * @symbol ?_tickLevelChunksAroundActorView\@LevelChunkTickingSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVLoadedChunksComponent\@\@\@Z + * @symbol ?_tickLevelChunksAroundActorView\@LevelChunkTickingSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVLoadedChunksComponent\@\@\@Z */ MCAPI static void _tickLevelChunksAroundActorView(class ActorOwnerComponent &, class LoadedChunksComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelComponent.hpp b/LiteLoader/include/llapi/mc/LevelComponent.hpp index 8e4fd67905..2252e35f32 100644 --- a/LiteLoader/include/llapi/mc/LevelComponent.hpp +++ b/LiteLoader/include/llapi/mc/LevelComponent.hpp @@ -28,16 +28,16 @@ class LevelComponent { public: /** - * @symbol ??0LevelComponent\@\@QEAA\@V?$unique_ptr\@VILevel\@\@U?$default_delete\@VILevel\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0LevelComponent\@\@QEAA\@V?$unique_ptr\@VILevel\@\@U?$default_delete\@VILevel\@\@\@std\@\@\@std\@\@\@Z */ MCAPI LevelComponent(std::unique_ptr); /** - * @symbol ?getLevel\@LevelComponent\@\@QEAAAEAVILevel\@\@XZ + * @symbol ?getLevel\@LevelComponent\@\@QEAAAEAVILevel\@\@XZ */ MCAPI class ILevel & getLevel(); /** - * @symbol ??1LevelComponent\@\@QEAA\@XZ + * @symbol ??1LevelComponent\@\@QEAA\@XZ */ MCAPI ~LevelComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp index 1df6632c28..f8bba1f145 100644 --- a/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerManagerModel.hpp @@ -31,72 +31,78 @@ class LevelContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@LevelContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@LevelContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@LevelContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@LevelContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@LevelContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@LevelContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@LevelContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@LevelContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@LevelContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@LevelContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@LevelContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@LevelContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@LevelContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@LevelContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELCONTAINERMANAGERMODEL /** - * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelContainerManagerModel(); +#endif + /** + * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@UActorUniqueID\@\@\@Z */ MCAPI LevelContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID); /** - * @symbol ??0LevelContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@W4BlockActorType\@\@\@Z + * @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 + * @symbol ?getBlockPos\@LevelContainerManagerModel\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getBlockPos() const; /** - * @symbol ?getEntityUniqueID\@LevelContainerManagerModel\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getEntityUniqueID\@LevelContainerManagerModel\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getEntityUniqueID() const; //protected: /** - * @symbol ?_getBlockEntity\@LevelContainerManagerModel\@\@IEAAPEAVBlockActor\@\@XZ + * @symbol ?_getBlockEntity\@LevelContainerManagerModel\@\@IEAAPEAVBlockActor\@\@XZ */ MCAPI class BlockActor * _getBlockEntity(); /** - * @symbol ?_getRawContainer\@LevelContainerManagerModel\@\@IEAAPEAVContainer\@\@XZ + * @symbol ?_getRawContainer\@LevelContainerManagerModel\@\@IEAAPEAVContainer\@\@XZ */ MCAPI class Container * _getRawContainer(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelContainerModel.hpp b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp index 1578bc0f8c..8f8af34bcb 100644 --- a/LiteLoader/include/llapi/mc/LevelContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/LevelContainerModel.hpp @@ -35,102 +35,102 @@ class LevelContainerModel : public ContainerModel { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@LevelContainerModel\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@LevelContainerModel\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~LevelContainerModel(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?postInit\@LevelContainerModel\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?postInit\@LevelContainerModel\@\@UEAAXXZ */ virtual void postInit(); /** - * @vftbl 3 - * @symbol ?releaseResources\@LevelContainerModel\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?releaseResources\@LevelContainerModel\@\@UEAAXXZ */ virtual void releaseResources(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getContainerWeakRef\@LevelContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ + * @vftbl 7 + * @symbol ?getContainerWeakRef\@LevelContainerModel\@\@UEBA?AVContainerWeakRef\@\@XZ */ virtual class ContainerWeakRef getContainerWeakRef() const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 14 - * @symbol ?isValid\@LevelContainerModel\@\@UEAA_NXZ + * @vftbl 14 + * @symbol ?isValid\@LevelContainerModel\@\@UEAA_NXZ */ virtual bool isValid(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?_getContainer\@LevelContainerModel\@\@EEBAPEAVContainer\@\@XZ + * @vftbl 20 + * @symbol ?_getContainer\@LevelContainerModel\@\@EEBAPEAVContainer\@\@XZ */ virtual class Container * _getContainer() const; /** - * @vftbl 21 - * @symbol ?_getContainerOffset\@LevelContainerModel\@\@MEBAHXZ + * @vftbl 21 + * @symbol ?_getContainerOffset\@LevelContainerModel\@\@MEBAHXZ */ virtual int _getContainerOffset() const; /** - * @vftbl 22 - * @symbol ?_onItemChanged\@LevelContainerModel\@\@MEAAXHAEBVItemStack\@\@0\@Z + * @vftbl 22 + * @symbol ?_onItemChanged\@LevelContainerModel\@\@MEAAXHAEBVItemStack\@\@0\@Z */ virtual void _onItemChanged(int, class ItemStack const &, class ItemStack const &); /** - * @symbol ??0LevelContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@W4BlockActorType\@\@AEBVBlockPos\@\@W4ContainerCategory\@\@\@Z + * @symbol ??0LevelContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@W4BlockActorType\@\@AEBVBlockPos\@\@W4ContainerCategory\@\@\@Z */ MCAPI LevelContainerModel(enum class ContainerEnumName, int, class Player &, enum class BlockActorType, class BlockPos const &, enum class ContainerCategory); /** - * @symbol ??0LevelContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@UActorUniqueID\@\@W4ContainerCategory\@\@\@Z + * @symbol ??0LevelContainerModel\@\@QEAA\@W4ContainerEnumName\@\@HAEAVPlayer\@\@UActorUniqueID\@\@W4ContainerCategory\@\@\@Z */ MCAPI LevelContainerModel(enum class ContainerEnumName, int, class Player &, struct ActorUniqueID, enum class ContainerCategory); /** - * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@W4BlockActorType\@\@AEBVBlockPos\@\@\@Z */ - MCAPI static class Container * getContainerHelper(class Player &, struct ActorUniqueID const &); + MCAPI static class Container * getContainerHelper(class Player &, enum class BlockActorType, class BlockPos const &); /** - * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@W4BlockActorType\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getContainerHelper\@LevelContainerModel\@\@SAPEAVContainer\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ - MCAPI static class Container * getContainerHelper(class Player &, enum class BlockActorType, class BlockPos const &); + MCAPI static class Container * getContainerHelper(class Player &, struct ActorUniqueID const &); //private: /** - * @symbol ?_getEntity\@LevelContainerModel\@\@AEBAPEAVActor\@\@XZ + * @symbol ?_getEntity\@LevelContainerModel\@\@AEBAPEAVActor\@\@XZ */ MCAPI class Actor * _getEntity() const; /** - * @symbol ?_refreshSlot\@LevelContainerModel\@\@AEAAXH\@Z + * @symbol ?_refreshSlot\@LevelContainerModel\@\@AEAAXH\@Z */ MCAPI void _refreshSlot(int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelData.hpp b/LiteLoader/include/llapi/mc/LevelData.hpp index 1057120a6f..99d8716494 100644 --- a/LiteLoader/include/llapi/mc/LevelData.hpp +++ b/LiteLoader/include/llapi/mc/LevelData.hpp @@ -33,584 +33,576 @@ class LevelData { public: /** - * @symbol ??0LevelData\@\@QEAA\@_N\@Z + * @symbol ??0LevelData\@\@QEAA\@_N\@Z */ MCAPI LevelData(bool); /** - * @symbol ??0LevelData\@\@QEAA\@$$QEAV0\@\@Z + * @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 LevelData &&); + MCAPI LevelData(class LevelSettings const &, std::string const &, enum class GeneratorType, class BlockPos const &, bool, enum class EducationEditionOffer, float, float); /** - * @symbol ??0LevelData\@\@QEAA\@AEBVLevelSettings\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4GeneratorType\@\@AEBVBlockPos\@\@_NW4EducationEditionOffer\@\@MM\@Z + * @symbol ??0LevelData\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI LevelData(class LevelSettings const &, std::string const &, enum class GeneratorType, class BlockPos const &, bool, enum class EducationEditionOffer, float, float); + MCAPI LevelData(class LevelData &&); /** - * @symbol ?_getValue\@LevelData\@\@QEBAPEBULevelDataValue\@\@AEBVHashedString\@\@\@Z + * @symbol ?_getValue\@LevelData\@\@QEBAPEBULevelDataValue\@\@AEBVHashedString\@\@\@Z */ MCAPI struct LevelDataValue const * _getValue(class HashedString const &) const; /** - * @symbol ?achievementsWillBeDisabledOnLoad\@LevelData\@\@QEBA_NXZ + * @symbol ?achievementsWillBeDisabledOnLoad\@LevelData\@\@QEBA_NXZ */ MCAPI bool achievementsWillBeDisabledOnLoad() const; /** - * @symbol ?createTag\@LevelData\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createTag\@LevelData\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr createTag() const; /** - * @symbol ?disableAchievements\@LevelData\@\@QEAAXXZ + * @symbol ?disableAchievements\@LevelData\@\@QEAAXXZ */ MCAPI void disableAchievements(); /** - * @symbol ?educationFeaturesEnabled\@LevelData\@\@QEBA_NXZ + * @symbol ?educationFeaturesEnabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool educationFeaturesEnabled() const; /** - * @symbol ?getAdventureSettings\@LevelData\@\@QEAAAEAUAdventureSettings\@\@XZ + * @symbol ?getAdventureSettings\@LevelData\@\@QEBAAEBUAdventureSettings\@\@XZ */ - MCAPI struct AdventureSettings & getAdventureSettings(); + MCAPI struct AdventureSettings const & getAdventureSettings() const; /** - * @symbol ?getAdventureSettings\@LevelData\@\@QEBAAEBUAdventureSettings\@\@XZ + * @symbol ?getAdventureSettings\@LevelData\@\@QEAAAEAUAdventureSettings\@\@XZ */ - MCAPI struct AdventureSettings const & getAdventureSettings() const; + MCAPI struct AdventureSettings & getAdventureSettings(); /** - * @symbol ?getBaseGameVersion\@LevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getBaseGameVersion\@LevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getBaseGameVersion() const; /** - * @symbol ?getBiomeOverride\@LevelData\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getBiomeOverride\@LevelData\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const getBiomeOverride() const; /** - * @symbol ?getBonusChestSpawned\@LevelData\@\@QEBA_NXZ + * @symbol ?getBonusChestSpawned\@LevelData\@\@QEBA_NXZ */ MCAPI bool getBonusChestSpawned() const; /** - * @symbol ?getChatRestrictionLevel\@LevelData\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ + * @symbol ?getChatRestrictionLevel\@LevelData\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ */ MCAPI enum class ChatRestrictionLevel getChatRestrictionLevel() const; /** - * @symbol ?getCurrentTick\@LevelData\@\@QEBAAEBUTick\@\@XZ + * @symbol ?getCurrentTick\@LevelData\@\@QEBAAEBUTick\@\@XZ */ MCAPI struct Tick const & getCurrentTick() const; /** - * @symbol ?getCustomSkinsDisabled\@LevelData\@\@QEBA_NXZ + * @symbol ?getCustomSkinsDisabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool getCustomSkinsDisabled() const; /** - * @symbol ?getDefaultAbilities\@LevelData\@\@QEAAAEAVAbilities\@\@XZ + * @symbol ?getDefaultAbilities\@LevelData\@\@QEAAAEAVAbilities\@\@XZ */ MCAPI class Abilities & getDefaultAbilities(); /** - * @symbol ?getDefaultPermissions\@LevelData\@\@QEAAAEAVPermissionsHandler\@\@XZ + * @symbol ?getDefaultPermissions\@LevelData\@\@QEAAAEAVPermissionsHandler\@\@XZ */ MCAPI class PermissionsHandler & getDefaultPermissions(); /** - * @symbol ?getDefaultPermissions\@LevelData\@\@QEBAAEBVPermissionsHandler\@\@XZ + * @symbol ?getDefaultPermissions\@LevelData\@\@QEBAAEBVPermissionsHandler\@\@XZ */ MCAPI class PermissionsHandler const & getDefaultPermissions() const; /** - * @symbol ?getEduSharedUriResource\@LevelData\@\@QEBAAEBVCompoundTag\@\@XZ + * @symbol ?getEduSharedUriResource\@LevelData\@\@QEBAAEBVCompoundTag\@\@XZ */ MCAPI class CompoundTag const & getEduSharedUriResource() const; /** - * @symbol ?getEducationEditionOffer\@LevelData\@\@QEBA?AW4EducationEditionOffer\@\@XZ + * @symbol ?getEducationEditionOffer\@LevelData\@\@QEBA?AW4EducationEditionOffer\@\@XZ */ MCAPI enum class EducationEditionOffer getEducationEditionOffer() const; /** - * @symbol ?getEducationOid\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEducationOid\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getEducationOid() const; /** - * @symbol ?getEducationProductId\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEducationProductId\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getEducationProductId() const; /** - * @symbol ?getEmoteChatMuted\@LevelData\@\@QEBA_NXZ + * @symbol ?getEmoteChatMuted\@LevelData\@\@QEBA_NXZ */ MCAPI bool getEmoteChatMuted() const; /** - * @symbol ?getExperiments\@LevelData\@\@QEAAAEAVExperiments\@\@XZ + * @symbol ?getExperiments\@LevelData\@\@QEAAAEAVExperiments\@\@XZ */ MCAPI class Experiments & getExperiments(); /** - * @symbol ?getExperiments\@LevelData\@\@QEBAAEBVExperiments\@\@XZ + * @symbol ?getExperiments\@LevelData\@\@QEBAAEBVExperiments\@\@XZ */ MCAPI class Experiments const & getExperiments() const; /** - * @symbol ?getFlatWorldGeneratorOptions\@LevelData\@\@QEBAAEBVValue\@Json\@\@XZ + * @symbol ?getFlatWorldGeneratorOptions\@LevelData\@\@QEBAAEBVValue\@Json\@\@XZ */ MCAPI class Json::Value const & getFlatWorldGeneratorOptions() const; /** - * @symbol ?getForceGameType\@LevelData\@\@QEBA_NXZ + * @symbol ?getForceGameType\@LevelData\@\@QEBA_NXZ */ MCAPI bool getForceGameType() const; /** - * @symbol ?getGameDifficulty\@LevelData\@\@QEBA?AW4Difficulty\@\@XZ + * @symbol ?getGameDifficulty\@LevelData\@\@QEBA?AW4Difficulty\@\@XZ */ MCAPI enum class Difficulty getGameDifficulty() const; /** - * @symbol ?getGameRules\@LevelData\@\@QEAAAEAVGameRules\@\@XZ + * @symbol ?getGameRules\@LevelData\@\@QEAAAEAVGameRules\@\@XZ */ MCAPI class GameRules & getGameRules(); /** - * @symbol ?getGameRules\@LevelData\@\@QEBAAEBVGameRules\@\@XZ + * @symbol ?getGameRules\@LevelData\@\@QEBAAEBVGameRules\@\@XZ */ MCAPI class GameRules const & getGameRules() const; /** - * @symbol ?getGameType\@LevelData\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getGameType\@LevelData\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getGameType() const; /** - * @symbol ?getGenerator\@LevelData\@\@QEBA?AW4GeneratorType\@\@XZ + * @symbol ?getGenerator\@LevelData\@\@QEBA?AW4GeneratorType\@\@XZ */ MCAPI enum class GeneratorType getGenerator() const; /** - * @symbol ?getIsSingleUseWorld\@LevelData\@\@QEBA?B_NXZ + * @symbol ?getIsSingleUseWorld\@LevelData\@\@QEBA?B_NXZ */ MCAPI bool const getIsSingleUseWorld() const; /** - * @symbol ?getLANBroadcast\@LevelData\@\@QEBA_NXZ + * @symbol ?getLANBroadcast\@LevelData\@\@QEBA_NXZ */ MCAPI bool getLANBroadcast() const; /** - * @symbol ?getLANBroadcastIntent\@LevelData\@\@QEBA_NXZ + * @symbol ?getLANBroadcastIntent\@LevelData\@\@QEBA_NXZ */ MCAPI bool getLANBroadcastIntent() const; /** - * @symbol ?getLastPlayed\@LevelData\@\@QEBA_JXZ + * @symbol ?getLastPlayed\@LevelData\@\@QEBA_JXZ */ MCAPI __int64 getLastPlayed() const; /** - * @symbol ?getLevelName\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLevelName\@LevelData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLevelName() const; /** - * @symbol ?getLightningLevel\@LevelData\@\@QEBAMXZ + * @symbol ?getLightningLevel\@LevelData\@\@QEBAMXZ */ MCAPI float getLightningLevel() const; /** - * @symbol ?getLightningTime\@LevelData\@\@QEBAHXZ + * @symbol ?getLightningTime\@LevelData\@\@QEBAHXZ */ MCAPI int getLightningTime() const; /** - * @symbol ?getLimitedWorldDepth\@LevelData\@\@QEBAHXZ + * @symbol ?getLimitedWorldDepth\@LevelData\@\@QEBAHXZ */ MCAPI int getLimitedWorldDepth() const; /** - * @symbol ?getLimitedWorldWidth\@LevelData\@\@QEBAHXZ + * @symbol ?getLimitedWorldWidth\@LevelData\@\@QEBAHXZ */ MCAPI int getLimitedWorldWidth() const; /** - * @symbol ?getLoadedPlayerTag\@LevelData\@\@QEAAAEAVCompoundTag\@\@XZ + * @symbol ?getLoadedPlayerTag\@LevelData\@\@QEAAAEAVCompoundTag\@\@XZ */ MCAPI class CompoundTag & getLoadedPlayerTag(); /** - * @symbol ?getMinCompatibleClientVersion\@LevelData\@\@QEBAAEBVGameVersion\@\@XZ + * @symbol ?getMinCompatibleClientVersion\@LevelData\@\@QEBAAEBVGameVersion\@\@XZ */ MCAPI class GameVersion const & getMinCompatibleClientVersion() const; /** - * @symbol ?getMultiplayerGameIntent\@LevelData\@\@QEBA_NXZ + * @symbol ?getMultiplayerGameIntent\@LevelData\@\@QEBA_NXZ */ MCAPI bool getMultiplayerGameIntent() const; /** - * @symbol ?getNetherScale\@LevelData\@\@QEBAHXZ + * @symbol ?getNetherScale\@LevelData\@\@QEBAHXZ */ MCAPI int getNetherScale() const; /** - * @symbol ?getNetherType\@LevelData\@\@QEBA?AW4NetherWorldType\@\@XZ + * @symbol ?getNetherType\@LevelData\@\@QEBA?AW4NetherWorldType\@\@XZ */ MCAPI enum class NetherWorldType getNetherType() const; /** - * @symbol ?getNetworkVersion\@LevelData\@\@QEBAHXZ + * @symbol ?getNetworkVersion\@LevelData\@\@QEBAHXZ */ MCAPI int getNetworkVersion() const; /** - * @symbol ?getOnlySpawnV1Villagers\@LevelData\@\@QEBA_NXZ + * @symbol ?getOnlySpawnV1Villagers\@LevelData\@\@QEBA_NXZ */ MCAPI bool getOnlySpawnV1Villagers() const; /** - * @symbol ?getPersonaDisabled\@LevelData\@\@QEBA_NXZ + * @symbol ?getPersonaDisabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool getPersonaDisabled() const; /** - * @symbol ?getPlatformBroadcastIntent\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getPlatformBroadcastIntent\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getPlatformBroadcastIntent() const; /** - * @symbol ?getPlatformBroadcastMode\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getPlatformBroadcastMode\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getPlatformBroadcastMode() const; /** - * @symbol ?getPremiumTemplateContentIdentity\@LevelData\@\@QEBAAEBVContentIdentity\@\@XZ + * @symbol ?getPremiumTemplateContentIdentity\@LevelData\@\@QEBAAEBVContentIdentity\@\@XZ */ MCAPI class ContentIdentity const & getPremiumTemplateContentIdentity() const; /** - * @symbol ?getRainLevel\@LevelData\@\@QEBAMXZ + * @symbol ?getRainLevel\@LevelData\@\@QEBAMXZ */ MCAPI float getRainLevel() const; /** - * @symbol ?getRainTime\@LevelData\@\@QEBAHXZ + * @symbol ?getRainTime\@LevelData\@\@QEBAHXZ */ MCAPI int getRainTime() const; /** - * @symbol ?getSeed\@LevelData\@\@QEBA?AVLevelSeed64\@\@XZ + * @symbol ?getSeed\@LevelData\@\@QEBA?AVLevelSeed64\@\@XZ */ MCAPI class LevelSeed64 getSeed() const; /** - * @symbol ?getServerChunkTickRange\@LevelData\@\@QEBAIXZ + * @symbol ?getServerChunkTickRange\@LevelData\@\@QEBAIXZ */ MCAPI unsigned int getServerChunkTickRange() const; /** - * @symbol ?getSpawnPos\@LevelData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getSpawnPos\@LevelData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSpawnPos() const; /** - * @symbol ?getSpawnSettings\@LevelData\@\@QEBAAEBUSpawnSettings\@\@XZ + * @symbol ?getSpawnSettings\@LevelData\@\@QEBAAEBUSpawnSettings\@\@XZ */ MCAPI struct SpawnSettings const & getSpawnSettings() const; /** - * @symbol ?getStorageVersion\@LevelData\@\@QEBA?AW4StorageVersion\@\@XZ + * @symbol ?getStorageVersion\@LevelData\@\@QEBA?AW4StorageVersion\@\@XZ */ MCAPI enum class StorageVersion getStorageVersion() const; /** - * @symbol ?getStoredGenerator\@LevelData\@\@QEBA?AW4GeneratorType\@\@XZ + * @symbol ?getStoredGenerator\@LevelData\@\@QEBA?AW4GeneratorType\@\@XZ */ MCAPI enum class GeneratorType getStoredGenerator() const; /** - * @symbol ?getTagData\@LevelData\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?getTagData\@LevelData\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void getTagData(class CompoundTag const &); /** - * @symbol ?getTime\@LevelData\@\@QEBAHXZ + * @symbol ?getTime\@LevelData\@\@QEBAHXZ */ MCAPI int getTime() const; /** - * @symbol ?getUseMsaGamertagsOnly\@LevelData\@\@QEBA_NXZ + * @symbol ?getUseMsaGamertagsOnly\@LevelData\@\@QEBA_NXZ */ MCAPI bool getUseMsaGamertagsOnly() const; /** - * @symbol ?getWorldCenter\@LevelData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getWorldCenter\@LevelData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getWorldCenter() const; /** - * @symbol ?getWorldStartCount\@LevelData\@\@QEBAIXZ + * @symbol ?getWorldStartCount\@LevelData\@\@QEBAIXZ */ MCAPI unsigned int getWorldStartCount() const; /** - * @symbol ?getWorldTemplateIdentity\@LevelData\@\@QEBAAEBUPackIdVersion\@\@XZ + * @symbol ?getWorldTemplateIdentity\@LevelData\@\@QEBAAEBUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion const & getWorldTemplateIdentity() const; /** - * @symbol ?getWorldVersion\@LevelData\@\@QEBA?AW4WorldVersion\@\@XZ + * @symbol ?getWorldVersion\@LevelData\@\@QEBA?AW4WorldVersion\@\@XZ */ MCAPI enum class WorldVersion getWorldVersion() const; /** - * @symbol ?getXBLBroadcastIntent\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getXBLBroadcastIntent\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getXBLBroadcastIntent() const; /** - * @symbol ?getXBLBroadcastMode\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getXBLBroadcastMode\@LevelData\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getXBLBroadcastMode() const; /** - * @symbol ?hasAchievementsDisabled\@LevelData\@\@QEBA_NXZ + * @symbol ?hasAchievementsDisabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasAchievementsDisabled() const; /** - * @symbol ?hasBonusChestEnabled\@LevelData\@\@QEBA_NXZ + * @symbol ?hasBonusChestEnabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasBonusChestEnabled() const; /** - * @symbol ?hasCommandsEnabled\@LevelData\@\@QEBA_NXZ + * @symbol ?hasCommandsEnabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasCommandsEnabled() const; /** - * @symbol ?hasConfirmedPlatformLockedContent\@LevelData\@\@QEBA_NXZ + * @symbol ?hasConfirmedPlatformLockedContent\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasConfirmedPlatformLockedContent() const; /** - * @symbol ?hasLockedBehaviorPack\@LevelData\@\@QEBA_NXZ + * @symbol ?hasLockedBehaviorPack\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasLockedBehaviorPack() const; /** - * @symbol ?hasLockedResourcePack\@LevelData\@\@QEBA_NXZ + * @symbol ?hasLockedResourcePack\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasLockedResourcePack() const; /** - * @symbol ?hasMapsCenteredToOrigin\@LevelData\@\@QEBA_NXZ + * @symbol ?hasMapsCenteredToOrigin\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasMapsCenteredToOrigin() const; /** - * @symbol ?hasStartWithMapEnabled\@LevelData\@\@QEBA_NXZ + * @symbol ?hasStartWithMapEnabled\@LevelData\@\@QEBA_NXZ */ MCAPI bool hasStartWithMapEnabled() const; /** - * @symbol ?incrementTick\@LevelData\@\@QEAAXXZ + * @symbol ?incrementTick\@LevelData\@\@QEAAXXZ */ MCAPI void incrementTick(); /** - * @symbol ?isEditorWorld\@LevelData\@\@QEBA_NXZ + * @symbol ?isEditorWorld\@LevelData\@\@QEBA_NXZ */ MCAPI bool isEditorWorld() const; /** - * @symbol ?isEducationEditionLevel\@LevelData\@\@QEBA_NXZ + * @symbol ?isEducationEditionLevel\@LevelData\@\@QEBA_NXZ */ MCAPI bool isEducationEditionLevel() const; /** - * @symbol ?isFromLockedTemplate\@LevelData\@\@QEBA_NXZ + * @symbol ?isFromLockedTemplate\@LevelData\@\@QEBA_NXZ */ MCAPI bool isFromLockedTemplate() const; /** - * @symbol ?isFromWorldTemplate\@LevelData\@\@QEBA_NXZ + * @symbol ?isFromWorldTemplate\@LevelData\@\@QEBA_NXZ */ MCAPI bool isFromWorldTemplate() const; /** - * @symbol ?isLegacyLevel\@LevelData\@\@QEBA_NXZ + * @symbol ?isLegacyLevel\@LevelData\@\@QEBA_NXZ */ MCAPI bool isLegacyLevel() const; /** - * @symbol ?isLightning\@LevelData\@\@QEBA_NXZ + * @symbol ?isLightning\@LevelData\@\@QEBA_NXZ */ MCAPI bool isLightning() const; /** - * @symbol ?isMultiplayerGame\@LevelData\@\@QEBA_NXZ + * @symbol ?isMultiplayerGame\@LevelData\@\@QEBA_NXZ */ MCAPI bool isMultiplayerGame() const; /** - * @symbol ?isPremiumWorldTemplate\@LevelData\@\@QEBA_NXZ + * @symbol ?isPremiumWorldTemplate\@LevelData\@\@QEBA_NXZ */ MCAPI bool isPremiumWorldTemplate() const; /** - * @symbol ?isRaining\@LevelData\@\@QEBA_NXZ + * @symbol ?isRaining\@LevelData\@\@QEBA_NXZ */ MCAPI bool isRaining() const; /** - * @symbol ?isTexturepacksRequired\@LevelData\@\@QEBA_NXZ + * @symbol ?isTexturepacksRequired\@LevelData\@\@QEBA_NXZ */ MCAPI bool isTexturepacksRequired() const; /** - * @symbol ?isWorldTemplateOptionLocked\@LevelData\@\@QEBA_NXZ + * @symbol ?isWorldTemplateOptionLocked\@LevelData\@\@QEBA_NXZ */ MCAPI bool isWorldTemplateOptionLocked() const; /** - * @symbol ??4LevelData\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4LevelData\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class LevelData & operator=(class LevelData &&); /** - * @symbol ?recordStartUp\@LevelData\@\@QEAAXXZ + * @symbol ?recordStartUp\@LevelData\@\@QEAAXXZ */ MCAPI void recordStartUp(); /** - * @symbol ?setBaseGameVersion\@LevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z + * @symbol ?setBaseGameVersion\@LevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z */ MCAPI void setBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?setBonusChestSpawned\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setBonusChestSpawned\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setBonusChestSpawned(bool); /** - * @symbol ?setChatRestrictionLevel\@LevelData\@\@QEAAXW4ChatRestrictionLevel\@\@\@Z + * @symbol ?setChatRestrictionLevel\@LevelData\@\@QEAAXW4ChatRestrictionLevel\@\@\@Z */ MCAPI void setChatRestrictionLevel(enum class ChatRestrictionLevel); /** - * @symbol ?setCommandsEnabled\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setCommandsEnabled\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setCommandsEnabled(bool); /** - * @symbol ?setCustomSkinsDisabled\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setCustomSkinsDisabled\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setCustomSkinsDisabled(bool); /** - * @symbol ?setDataDrivenGenerator\@LevelData\@\@QEAAXW4GeneratorType\@\@\@Z + * @symbol ?setDataDrivenGenerator\@LevelData\@\@QEAAXW4GeneratorType\@\@\@Z */ MCAPI void setDataDrivenGenerator(enum class GeneratorType); /** - * @symbol ?setEduSharedUriResource\@LevelData\@\@QEAAXAEBUEduSharedUriResource\@\@\@Z + * @symbol ?setEduSharedUriResource\@LevelData\@\@QEAAXAEBUEduSharedUriResource\@\@\@Z */ MCAPI void setEduSharedUriResource(struct EduSharedUriResource const &); /** - * @symbol ?setEducationEditionOffer\@LevelData\@\@QEAAXW4EducationEditionOffer\@\@\@Z + * @symbol ?setEducationEditionOffer\@LevelData\@\@QEAAXW4EducationEditionOffer\@\@\@Z */ MCAPI void setEducationEditionOffer(enum class EducationEditionOffer); /** - * @symbol ?setEducationFeaturesEnabled\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setEducationFeaturesEnabled\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setEducationFeaturesEnabled(bool); /** - * @symbol ?setEducationOid\@LevelData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setEducationOid\@LevelData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setEducationOid(std::string const &); /** - * @symbol ?setEmoteChatMuted\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setEmoteChatMuted\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setEmoteChatMuted(bool); /** - * @symbol ?setForceGameType\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setForceGameType\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setForceGameType(bool); /** - * @symbol ?setGameDifficulty\@LevelData\@\@QEAAXW4Difficulty\@\@\@Z + * @symbol ?setGameDifficulty\@LevelData\@\@QEAAXW4Difficulty\@\@\@Z */ MCAPI void setGameDifficulty(enum class Difficulty); /** - * @symbol ?setGameType\@LevelData\@\@QEAAXW4GameType\@\@\@Z + * @symbol ?setGameType\@LevelData\@\@QEAAXW4GameType\@\@\@Z */ MCAPI void setGameType(enum class GameType); /** - * @symbol ?setGenerator\@LevelData\@\@QEAAXW4GeneratorType\@\@\@Z + * @symbol ?setGenerator\@LevelData\@\@QEAAXW4GeneratorType\@\@\@Z */ MCAPI void setGenerator(enum class GeneratorType); /** - * @symbol ?setHasLockedBehaviorPack\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setHasLockedBehaviorPack\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setHasLockedBehaviorPack(bool); /** - * @symbol ?setHasLockedResourcePack\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setHasLockedResourcePack\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setHasLockedResourcePack(bool); /** - * @symbol ?setIsEditorWorld\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setIsEditorWorld\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setIsEditorWorld(bool); /** - * @symbol ?setLANBroadcast\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setLANBroadcast\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setLANBroadcast(bool); /** - * @symbol ?setLANBroadcastIntent\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setLANBroadcastIntent\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setLANBroadcastIntent(bool); /** - * @symbol ?setLevelName\@LevelData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setLevelName\@LevelData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setLevelName(std::string const &); /** - * @symbol ?setLightningLevel\@LevelData\@\@QEAAXM\@Z + * @symbol ?setLightningLevel\@LevelData\@\@QEAAXM\@Z */ MCAPI void setLightningLevel(float); /** - * @symbol ?setLightningTime\@LevelData\@\@QEAAXH\@Z + * @symbol ?setLightningTime\@LevelData\@\@QEAAXH\@Z */ MCAPI void setLightningTime(int); /** - * @symbol ?setMultiplayerGame\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setMultiplayerGame\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setMultiplayerGame(bool); /** - * @symbol ?setMultiplayerGameIntent\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setMultiplayerGameIntent\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setMultiplayerGameIntent(bool); /** - * @symbol ?setOnlySpawnV1Villagers\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setOnlySpawnV1Villagers\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setOnlySpawnV1Villagers(bool); /** - * @symbol ?setPersonaDisabled\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setPersonaDisabled\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setPersonaDisabled(bool); /** - * @symbol ?setPlatformBroadcastIntent\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setPlatformBroadcastIntent\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCAPI void setPlatformBroadcastIntent(enum class Social::GamePublishSetting); /** - * @symbol ?setPlatformBroadcastMode\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setPlatformBroadcastMode\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCAPI void setPlatformBroadcastMode(enum class Social::GamePublishSetting); /** - * @symbol ?setPremiumTemplateContentIdentity\@LevelData\@\@QEAAXAEBVContentIdentity\@\@\@Z + * @symbol ?setPremiumTemplateContentIdentity\@LevelData\@\@QEAAXAEBVContentIdentity\@\@\@Z */ MCAPI void setPremiumTemplateContentIdentity(class ContentIdentity const &); /** - * @symbol ?setRainLevel\@LevelData\@\@QEAAXM\@Z + * @symbol ?setRainLevel\@LevelData\@\@QEAAXM\@Z */ MCAPI void setRainLevel(float); /** - * @symbol ?setRainTime\@LevelData\@\@QEAAXH\@Z + * @symbol ?setRainTime\@LevelData\@\@QEAAXH\@Z */ MCAPI void setRainTime(int); /** - * @symbol ?setSeed\@LevelData\@\@QEAAXVLevelSeed64\@\@\@Z + * @symbol ?setSeed\@LevelData\@\@QEAAXVLevelSeed64\@\@\@Z */ MCAPI void setSeed(class LevelSeed64); /** - * @symbol ?setServerChunkTickRange\@LevelData\@\@QEAAXI\@Z + * @symbol ?setServerChunkTickRange\@LevelData\@\@QEAAXI\@Z */ MCAPI void setServerChunkTickRange(unsigned int); /** - * @symbol ?setSpawnPos\@LevelData\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setSpawnPos\@LevelData\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setSpawnPos(class BlockPos const &); /** - * @symbol ?setStorageVersion\@LevelData\@\@QEAAXW4StorageVersion\@\@\@Z + * @symbol ?setStorageVersion\@LevelData\@\@QEAAXW4StorageVersion\@\@\@Z */ MCAPI void setStorageVersion(enum class StorageVersion); /** - * @symbol ?setTagData\@LevelData\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?setTagData\@LevelData\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void setTagData(class CompoundTag &) const; /** - * @symbol ?setTexturepacksRequired\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setTexturepacksRequired\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setTexturepacksRequired(bool); /** - * @symbol ?setTime\@LevelData\@\@QEAAXH\@Z + * @symbol ?setTime\@LevelData\@\@QEAAXH\@Z */ MCAPI void setTime(int); /** - * @symbol ?setUseMsaGamertagsOnly\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setUseMsaGamertagsOnly\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setUseMsaGamertagsOnly(bool); /** - * @symbol ?setWorldTemplateIdentity\@LevelData\@\@QEAAXAEBUPackIdVersion\@\@\@Z + * @symbol ?setWorldTemplateIdentity\@LevelData\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void setWorldTemplateIdentity(struct PackIdVersion const &); /** - * @symbol ?setWorldTemplateOptionLocked\@LevelData\@\@QEAAX_N\@Z + * @symbol ?setWorldTemplateOptionLocked\@LevelData\@\@QEAAX_N\@Z */ MCAPI void setWorldTemplateOptionLocked(bool); /** - * @symbol ?setWorldVersion\@LevelData\@\@QEAAXW4WorldVersion\@\@\@Z + * @symbol ?setWorldVersion\@LevelData\@\@QEAAXW4WorldVersion\@\@\@Z */ MCAPI void setWorldVersion(enum class WorldVersion); /** - * @symbol ?setXBLBroadcastIntent\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setXBLBroadcastIntent\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCAPI void setXBLBroadcastIntent(enum class Social::GamePublishSetting); /** - * @symbol ?setXBLBroadcastMode\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setXBLBroadcastMode\@LevelData\@\@QEAAXW4GamePublishSetting\@Social\@\@\@Z */ MCAPI void setXBLBroadcastMode(enum class Social::GamePublishSetting); /** - * @symbol ?touchLastLoadedWithVersion\@LevelData\@\@QEAAXXZ + * @symbol ?touchLastLoadedWithVersion\@LevelData\@\@QEAAXXZ */ MCAPI void touchLastLoadedWithVersion(); /** - * @symbol ?updateLastTimePlayed\@LevelData\@\@QEBAXXZ + * @symbol ?updateLastTimePlayed\@LevelData\@\@QEBAXXZ */ MCAPI void updateLastTimePlayed() const; /** - * @symbol ?v1_read\@LevelData\@\@QEAAXAEAVBitStream\@RakNet\@\@W4StorageVersion\@\@\@Z + * @symbol ?v1_read\@LevelData\@\@QEAAXAEAVBitStream\@RakNet\@\@W4StorageVersion\@\@\@Z */ MCAPI void v1_read(class RakNet::BitStream &, enum class StorageVersion); /** - * @symbol ??1LevelData\@\@QEAA\@XZ + * @symbol ??1LevelData\@\@QEAA\@XZ */ MCAPI ~LevelData(); //private: /** - * @symbol ?_determineMaxBaseGameVersion\@LevelData\@\@AEAAXXZ - */ - MCAPI void _determineMaxBaseGameVersion(); - /** - * @symbol ?_setGameRulesBasedOnPremiumContentIdentity\@LevelData\@\@AEAAXXZ - */ - MCAPI void _setGameRulesBasedOnPremiumContentIdentity(); - /** - * @symbol ?_setValue\@LevelData\@\@AEAAXAEBVHashedString\@\@$$QEAULevelDataValue\@\@\@Z + * @symbol ?_setValue\@LevelData\@\@AEAAXAEBVHashedString\@\@$$QEAULevelDataValue\@\@\@Z */ MCAPI void _setValue(class HashedString const &, struct LevelDataValue &&); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDataHelper.hpp b/LiteLoader/include/llapi/mc/LevelDataHelper.hpp new file mode 100644 index 0000000000..3829e2fac2 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LevelDataHelper.hpp @@ -0,0 +1,32 @@ +/** + * @file LevelDataHelper.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace LevelDataHelper { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?setCommandsEnabled\@LevelDataHelper\@\@YAXAEAVLevelData\@\@_NPEAVIMinecraftEventing\@\@PEAVPlayer\@\@\@Z + */ + MCAPI void setCommandsEnabled(class LevelData &, bool, class IMinecraftEventing *, class Player *); + /** + * @symbol ?setDefaultGameType\@LevelDataHelper\@\@YAXAEAVLevelData\@\@W4GameType\@\@PEAVIMinecraftEventing\@\@\@Z + */ + MCAPI void setDefaultGameType(class LevelData &, enum class GameType, class IMinecraftEventing *); + /** + * @symbol ?setDifficulty\@LevelDataHelper\@\@YAXAEAVLevelData\@\@W4Difficulty\@\@PEAVIMinecraftEventing\@\@PEAVILevel\@\@\@Z + */ + MCAPI void setDifficulty(class LevelData &, enum class Difficulty, class IMinecraftEventing *, class ILevel *); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LevelDataKeys.hpp b/LiteLoader/include/llapi/mc/LevelDataKeys.hpp index c8bf59cb3c..2d46aa4efb 100644 --- a/LiteLoader/include/llapi/mc/LevelDataKeys.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataKeys.hpp @@ -22,43 +22,43 @@ namespace LevelDataKeys { #undef AFTER_EXTRA /** - * @symbol ?EDUCATION_OID\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?EDUCATION_OID\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString EDUCATION_OID; /** - * @symbol ?EDUCATION_SHARED_RESOURCE\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?EDUCATION_SHARED_RESOURCE\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString EDUCATION_SHARED_RESOURCE; /** - * @symbol ?FLAT_WORLD_VERSION\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?FLAT_WORLD_VERSION\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString FLAT_WORLD_VERSION; /** - * @symbol ?GAME_TYPE\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?GAME_TYPE\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString GAME_TYPE; /** - * @symbol ?GENERATOR\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?GENERATOR\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString GENERATOR; /** - * @symbol ?LIMITED_WORLD_DEPTH\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?LIMITED_WORLD_DEPTH\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString LIMITED_WORLD_DEPTH; /** - * @symbol ?LIMITED_WORLD_WIDTH\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?LIMITED_WORLD_WIDTH\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString LIMITED_WORLD_WIDTH; /** - * @symbol ?LOADED_PLAYER_TAG\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?LOADED_PLAYER_TAG\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString LOADED_PLAYER_TAG; /** - * @symbol ?SEED\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?SEED\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString SEED; /** - * @symbol ?SPAWN_POS\@LevelDataKeys\@\@3VHashedString\@\@A + * @symbol ?SPAWN_POS\@LevelDataKeys\@\@3VHashedString\@\@A */ MCAPI extern class HashedString SPAWN_POS; diff --git a/LiteLoader/include/llapi/mc/LevelDataValue.hpp b/LiteLoader/include/llapi/mc/LevelDataValue.hpp index df1e18d9ac..7f0d363409 100644 --- a/LiteLoader/include/llapi/mc/LevelDataValue.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataValue.hpp @@ -28,7 +28,7 @@ struct LevelDataValue { public: /** - * @symbol ??1LevelDataValue\@\@QEAA\@XZ + * @symbol ??1LevelDataValue\@\@QEAA\@XZ */ MCAPI ~LevelDataValue(); diff --git a/LiteLoader/include/llapi/mc/LevelDataWrapper.hpp b/LiteLoader/include/llapi/mc/LevelDataWrapper.hpp index 070791dd2d..9b287f3d54 100644 --- a/LiteLoader/include/llapi/mc/LevelDataWrapper.hpp +++ b/LiteLoader/include/llapi/mc/LevelDataWrapper.hpp @@ -29,32 +29,32 @@ class LevelDataWrapper { public: /** - * @symbol ??0LevelDataWrapper\@\@QEAA\@XZ + * @symbol ??0LevelDataWrapper\@\@QEAA\@XZ */ MCAPI LevelDataWrapper(); /** - * @symbol ??DLevelDataWrapper\@\@QEBAAEBVLevelData\@\@XZ + * @symbol ??DLevelDataWrapper\@\@QEBAAEBVLevelData\@\@XZ */ MCAPI class LevelData const & operator*() const; /** - * @symbol ??DLevelDataWrapper\@\@QEAAAEAVLevelData\@\@XZ + * @symbol ??DLevelDataWrapper\@\@QEAAAEAVLevelData\@\@XZ */ MCAPI class LevelData & operator*(); /** - * @symbol ??CLevelDataWrapper\@\@QEBAPEBVLevelData\@\@XZ + * @symbol ??CLevelDataWrapper\@\@QEBAPEBVLevelData\@\@XZ */ MCAPI class LevelData const * operator->() const; /** - * @symbol ??CLevelDataWrapper\@\@QEAAPEAVLevelData\@\@XZ + * @symbol ??CLevelDataWrapper\@\@QEAAPEAVLevelData\@\@XZ */ MCAPI class LevelData * operator->(); /** - * @symbol ?setLevelData\@LevelDataWrapper\@\@QEAAXAEAVLevelData\@\@\@Z + * @symbol ?setLevelData\@LevelDataWrapper\@\@QEAAXAEAVLevelData\@\@\@Z */ MCAPI void setLevelData(class LevelData &); /** - * @symbol ??1LevelDataWrapper\@\@QEAA\@XZ + * @symbol ??1LevelDataWrapper\@\@QEAA\@XZ */ MCAPI ~LevelDataWrapper(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDbEnv.hpp b/LiteLoader/include/llapi/mc/LevelDbEnv.hpp index 60972e1692..3b1a409c94 100644 --- a/LiteLoader/include/llapi/mc/LevelDbEnv.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbEnv.hpp @@ -30,92 +30,92 @@ class LevelDbEnv { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELDBENV /** - * @symbol ?CreateDir\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?CreateDir\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class leveldb::Status CreateDir(std::string const &); /** - * @symbol ?DeleteDir\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?DeleteDir\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class leveldb::Status DeleteDir(std::string const &); /** - * @symbol ?DeleteFileA\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?DeleteFileA\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class leveldb::Status DeleteFileA(std::string const &); /** - * @symbol ?FileExists\@LevelDbEnv\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?FileExists\@LevelDbEnv\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool FileExists(std::string const &); /** - * @symbol ?GetChildren\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @symbol ?GetChildren\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ MCVAPI class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @symbol ?GetFileSize\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @symbol ?GetFileSize\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ MCVAPI class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @symbol ?GetTestDirectory\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?GetTestDirectory\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class leveldb::Status GetTestDirectory(std::string *); /** - * @symbol ?LockFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@3\@\@Z + * @symbol ?LockFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@3\@\@Z */ MCVAPI class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @symbol ?NewAppendableFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @symbol ?NewAppendableFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ MCVAPI class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @symbol ?NewLogger\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@3\@\@Z + * @symbol ?NewLogger\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@3\@\@Z */ MCVAPI class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @symbol ?NewRandomAccessFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z + * @symbol ?NewRandomAccessFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z */ MCVAPI class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @symbol ?NewSequentialFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z + * @symbol ?NewSequentialFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z */ MCVAPI class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @symbol ?NewWritableFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @symbol ?NewWritableFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ MCVAPI class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @symbol ?NowMicros\@LevelDbEnv\@\@UEAA_KXZ + * @symbol ?NowMicros\@LevelDbEnv\@\@UEAA_KXZ */ MCVAPI unsigned __int64 NowMicros(); /** - * @symbol ?RenameFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?RenameFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @symbol ?Schedule\@LevelDbEnv\@\@UEAAXP6AXPEAX\@Z0\@Z + * @symbol ?Schedule\@LevelDbEnv\@\@UEAAXP6AXPEAX\@Z0\@Z */ MCVAPI void Schedule(void ( *)(void *), void *); /** - * @symbol ?SleepForMicroseconds\@LevelDbEnv\@\@UEAAXH\@Z + * @symbol ?SleepForMicroseconds\@LevelDbEnv\@\@UEAAXH\@Z */ MCVAPI void SleepForMicroseconds(int); /** - * @symbol ?StartThread\@LevelDbEnv\@\@UEAAXP6AXPEAX\@Z0\@Z + * @symbol ?StartThread\@LevelDbEnv\@\@UEAAXP6AXPEAX\@Z0\@Z */ MCVAPI void StartThread(void ( *)(void *), void *); /** - * @symbol ?UnlockFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@PEAVFileLock\@3\@\@Z + * @symbol ?UnlockFile\@LevelDbEnv\@\@UEAA?AVStatus\@leveldb\@\@PEAVFileLock\@3\@\@Z */ MCVAPI class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~LevelDbEnv(); #endif /** - * @symbol ?IsComplete\@LevelDbEnv\@\@QEBA_NXZ + * @symbol ?IsComplete\@LevelDbEnv\@\@QEBA_NXZ */ MCAPI bool IsComplete() const; /** - * @symbol ??0LevelDbEnv\@\@QEAA\@XZ + * @symbol ??0LevelDbEnv\@\@QEAA\@XZ */ MCAPI LevelDbEnv(); @@ -123,8 +123,8 @@ class LevelDbEnv { private: /** - * @symbol ?sSingleton\@LevelDbEnv\@\@0PEAV1\@EA + * @symbol ?sSingleton\@LevelDbEnv\@\@0PEAV1\@EA */ MCAPI static class LevelDbEnv * sSingleton; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDbFileLock.hpp b/LiteLoader/include/llapi/mc/LevelDbFileLock.hpp index 1d291fa882..bbcdeece8b 100644 --- a/LiteLoader/include/llapi/mc/LevelDbFileLock.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbFileLock.hpp @@ -30,4 +30,4 @@ class LevelDbFileLock { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDbLogger.hpp b/LiteLoader/include/llapi/mc/LevelDbLogger.hpp index ae1b85acb5..1732fcbb0e 100644 --- a/LiteLoader/include/llapi/mc/LevelDbLogger.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbLogger.hpp @@ -30,14 +30,14 @@ class LevelDbLogger { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelDbLogger(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Logv\@LevelDbLogger\@\@EEAAXPEBDPEAD\@Z + * @vftbl 1 + * @symbol ?Logv\@LevelDbLogger\@\@EEAAXPEBDPEAD\@Z */ virtual void Logv(char const *, char *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp b/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp index fed4ae63d0..e1ca10edcf 100644 --- a/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbRandomAccessFile.hpp @@ -31,18 +31,18 @@ class LevelDbRandomAccessFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelDbRandomAccessFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Read\@LevelDbRandomAccessFile\@\@UEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEAD\@Z + * @vftbl 1 + * @symbol ?Read\@LevelDbRandomAccessFile\@\@UEBA?AVStatus\@leveldb\@\@_K0PEAVSlice\@3\@PEAD\@Z */ virtual class leveldb::Status Read(unsigned __int64, unsigned __int64, class leveldb::Slice *, char *) const; /** - * @symbol ??0LevelDbRandomAccessFile\@\@QEAA\@$$QEAVFile\@Core\@\@\@Z + * @symbol ??0LevelDbRandomAccessFile\@\@QEAA\@$$QEAVFile\@Core\@\@\@Z */ MCAPI LevelDbRandomAccessFile(class Core::File &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp b/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp index 6dd06b1837..a5886b1473 100644 --- a/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbSequentialFile.hpp @@ -31,23 +31,23 @@ class LevelDbSequentialFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelDbSequentialFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Read\@LevelDbSequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_KPEAVSlice\@3\@PEAD\@Z + * @vftbl 1 + * @symbol ?Read\@LevelDbSequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_KPEAVSlice\@3\@PEAD\@Z */ virtual class leveldb::Status Read(unsigned __int64, class leveldb::Slice *, char *); /** - * @vftbl 2 - * @symbol ?Skip\@LevelDbSequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_K\@Z + * @vftbl 2 + * @symbol ?Skip\@LevelDbSequentialFile\@\@UEAA?AVStatus\@leveldb\@\@_K\@Z */ virtual class leveldb::Status Skip(unsigned __int64); /** - * @symbol ??0LevelDbSequentialFile\@\@QEAA\@$$QEAVFile\@Core\@\@\@Z + * @symbol ??0LevelDbSequentialFile\@\@QEAA\@$$QEAVFile\@Core\@\@\@Z */ MCAPI LevelDbSequentialFile(class Core::File &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp b/LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp index 055237e3e5..4d080e9b5c 100644 --- a/LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/LevelDbWritableFile.hpp @@ -31,41 +31,41 @@ class LevelDbWritableFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelDbWritableFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Append\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z + * @vftbl 1 + * @symbol ?Append\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z */ virtual class leveldb::Status Append(class leveldb::Slice const &); /** - * @vftbl 2 - * @symbol ?Close\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 2 + * @symbol ?Close\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Close(); /** - * @vftbl 3 - * @symbol ?Flush\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 3 + * @symbol ?Flush\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Flush(); /** - * @vftbl 4 - * @symbol ?Sync\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 4 + * @symbol ?Sync\@LevelDbWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Sync(); /** - * @symbol ??0LevelDbWritableFile\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVFile\@Core\@\@\@Z + * @symbol ??0LevelDbWritableFile\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVFile\@Core\@\@\@Z */ MCAPI LevelDbWritableFile(std::string, class Core::File &&); //private: /** - * @symbol ?SyncDirIfManifest\@LevelDbWritableFile\@\@AEAA?AVStatus\@leveldb\@\@XZ + * @symbol ?SyncDirIfManifest\@LevelDbWritableFile\@\@AEAA?AVStatus\@leveldb\@\@XZ */ MCAPI class leveldb::Status SyncDirIfManifest(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelEntityContainerValidation.hpp b/LiteLoader/include/llapi/mc/LevelEntityContainerValidation.hpp index 58481ccdec..c606e939e8 100644 --- a/LiteLoader/include/llapi/mc/LevelEntityContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/LevelEntityContainerValidation.hpp @@ -31,54 +31,54 @@ class LevelEntityContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelEntityContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@LevelEntityContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@LevelEntityContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@LevelEntityContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@LevelEntityContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp index 701bf251ff..b2af42a6fe 100644 --- a/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventCoordinator.hpp @@ -28,41 +28,51 @@ class LevelEventCoordinator { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTCOORDINATOR /** - * @symbol ??0LevelEventCoordinator\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelEventCoordinator(); +#endif + /** + * @symbol ??0LevelEventCoordinator\@\@QEAA\@XZ */ MCAPI LevelEventCoordinator(); /** - * @symbol ?registerLevelGameplayHandler\@LevelEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VLevelGameplayHandler\@\@U?$default_delete\@VLevelGameplayHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerLevelGameplayHandler\@LevelEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VLevelGameplayHandler\@\@U?$default_delete\@VLevelGameplayHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerLevelGameplayHandler(std::unique_ptr &&); /** - * @symbol ?sendEvent\@LevelEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$LevelGameplayEvent\@X\@\@\@\@\@Z + * @symbol ?sendEvent\@LevelEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$LevelGameplayEvent\@X\@\@\@\@\@Z */ MCAPI void sendEvent(class EventRef> const &); /** - * @symbol ?sendLevelBiomesRegistered\@LevelEventCoordinator\@\@QEAAXAEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ?sendLevelBiomesRegistered\@LevelEventCoordinator\@\@QEAAXAEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI void sendLevelBiomesRegistered(class IWorldRegistriesProvider &); /** - * @symbol ?sendLevelInitialized\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?sendLevelInitialized\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void sendLevelInitialized(class Level &); /** - * @symbol ?sendLevelRemovedActor\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVActor\@\@\@Z + * @symbol ?sendLevelRemovedActor\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVActor\@\@\@Z */ MCAPI void sendLevelRemovedActor(class Level &, class Actor &); /** - * @symbol ?sendLevelScriptTick\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?sendLevelTick\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z */ - MCAPI void sendLevelScriptTick(class Level &); + MCAPI void sendLevelTick(class Level &); /** - * @symbol ?sendLevelTick\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?sendLevelTickEnd\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z */ - MCAPI void sendLevelTick(class Level &); + MCAPI void sendLevelTickEnd(class Level &); + /** + * @symbol ?sendLevelTickStart\@LevelEventCoordinator\@\@QEAAXAEAVLevel\@\@\@Z + */ + MCAPI void sendLevelTickStart(class Level &); /** - * @symbol ?sendLevelWeatherChanged\@LevelEventCoordinator\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?sendLevelWeatherChanged\@LevelEventCoordinator\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ MCAPI void sendLevelWeatherChanged(std::string const &, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp index f94946ad06..9652a162fb 100644 --- a/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventGenericPacket.hpp @@ -30,37 +30,43 @@ class LevelEventGenericPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelEventGenericPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LevelEventGenericPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LevelEventGenericPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LevelEventGenericPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LevelEventGenericPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LevelEventGenericPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LevelEventGenericPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LevelEventGenericPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTGENERICPACKET /** - * @symbol ??0LevelEventGenericPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI LevelEventGenericPacket(); + MCVAPI ~LevelEventGenericPacket(); +#endif /** - * @symbol ??0LevelEventGenericPacket\@\@QEAA\@W4LevelEvent\@\@AEBVCompoundTag\@\@\@Z + * @symbol ??0LevelEventGenericPacket\@\@QEAA\@W4LevelEvent\@\@AEBVCompoundTag\@\@\@Z */ MCAPI LevelEventGenericPacket(enum class LevelEvent, class CompoundTag const &); + /** + * @symbol ??0LevelEventGenericPacket\@\@QEAA\@XZ + */ + MCAPI LevelEventGenericPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelEventListener.hpp b/LiteLoader/include/llapi/mc/LevelEventListener.hpp index 4aca60cbdb..d7440b5059 100644 --- a/LiteLoader/include/llapi/mc/LevelEventListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventListener.hpp @@ -31,45 +31,49 @@ class LevelEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTLISTENER /** - * @symbol ?onEvent\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEBULevelNotificationEvent\@\@\@Z + * @symbol ?onEvent\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEBULevelNotificationEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct LevelNotificationEvent const &); /** - * @symbol ?onLevelAddedPlayer\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z + * @symbol ?onLevelAddedPlayer\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onLevelAddedPlayer(class Level &, class Player &); /** - * @symbol ?onLevelBiomesRegistered\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ?onLevelBiomesRegistered\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVIWorldRegistriesProvider\@\@\@Z */ MCVAPI enum class EventResult onLevelBiomesRegistered(class IWorldRegistriesProvider &); /** - * @symbol ?onLevelInitialized\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + * @symbol ?onLevelInitialized\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ MCVAPI enum class EventResult onLevelInitialized(class Level &); /** - * @symbol ?onLevelRemovedActor\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVActor\@\@\@Z + * @symbol ?onLevelRemovedActor\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onLevelRemovedActor(class Level &, class Actor &); /** - * @symbol ?onLevelRemovedPlayer\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z + * @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 + * @symbol ?onLevelSaveData\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVCompoundTag\@\@\@Z */ MCVAPI enum class EventResult onLevelSaveData(class Level &, class CompoundTag &); /** - * @symbol ?onLevelScriptTick\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + * @symbol ?onLevelTick\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ - MCVAPI enum class EventResult onLevelScriptTick(class Level &); + MCVAPI enum class EventResult onLevelTick(class Level &); /** - * @symbol ?onLevelTick\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + * @symbol ?onLevelTickEnd\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z */ - MCVAPI enum class EventResult onLevelTick(class Level &); + MCVAPI enum class EventResult onLevelTickEnd(class Level &); + /** + * @symbol ?onLevelTickStart\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + */ + MCVAPI enum class EventResult onLevelTickStart(class Level &); /** - * @symbol ?onLevelWeatherChange\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?onLevelWeatherChange\@LevelEventListener\@\@UEAA?AW4EventResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ MCVAPI enum class EventResult onLevelWeatherChange(std::string const &, bool, bool); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp index 9cc58fab57..7eff97ff52 100644 --- a/LiteLoader/include/llapi/mc/LevelEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelEventPacket.hpp @@ -30,41 +30,47 @@ class LevelEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LevelEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LevelEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LevelEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LevelEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LevelEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LevelEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LevelEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LevelEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELEVENTPACKET /** - * @symbol ??0LevelEventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI LevelEventPacket(); + MCVAPI ~LevelEventPacket(); +#endif /** - * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z + * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@MMMH\@Z */ MCAPI LevelEventPacket(enum class LevelEvent, float, float, float, int); /** - * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z + * @symbol ??0LevelEventPacket\@\@QEAA\@XZ + */ + MCAPI LevelEventPacket(); + /** + * @symbol ??0LevelEventPacket\@\@QEAA\@W4LevelEvent\@\@AEBVVec3\@\@H\@Z */ MCAPI LevelEventPacket(enum class LevelEvent, class Vec3 const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelListCache.hpp b/LiteLoader/include/llapi/mc/LevelListCache.hpp index e3b808be1e..7f8d88515f 100644 --- a/LiteLoader/include/llapi/mc/LevelListCache.hpp +++ b/LiteLoader/include/llapi/mc/LevelListCache.hpp @@ -27,141 +27,141 @@ class LevelListCache { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELLISTCACHE /** - * @symbol ?addLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVLevelData\@\@\@Z + * @symbol ?addLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVLevelData\@\@\@Z */ MCVAPI void addLevel(std::string const &, class LevelData &&); /** - * @symbol ?addObserver\@LevelListCache\@\@UEAAXAEAVLevelLocationObserver\@\@\@Z + * @symbol ?addObserver\@LevelListCache\@\@UEAAXAEAVLevelLocationObserver\@\@\@Z */ MCVAPI void addObserver(class LevelLocationObserver &); /** - * @symbol ?createBackupCopyOfWorld\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?createBackupCopyOfWorld\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void createBackupCopyOfWorld(std::string const &, std::string const &, std::string const &); /** - * @symbol ?createLevelLooseStorage\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?createLevelLooseStorage\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelLooseFileStorage\@\@U?$default_delete\@VLevelLooseFileStorage\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCVAPI std::unique_ptr createLevelLooseStorage(std::string const &, class ContentIdentity const &, class gsl::not_null> const &); /** - * @symbol ?createLevelStorage\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@8\@V?$unique_ptr\@VLevelStorageEventing\@\@U?$default_delete\@VLevelStorageEventing\@\@\@std\@\@\@3\@\@Z + * @symbol ?createLevelStorage\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelStorage\@\@U?$default_delete\@VLevelStorage\@\@\@std\@\@\@std\@\@AEAVScheduler\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@V?$not_null\@V?$NonOwnerPointer\@VLevelDbEnv\@\@\@Bedrock\@\@\@8\@V?$unique_ptr\@VLevelStorageEventing\@\@U?$default_delete\@VLevelStorageEventing\@\@\@std\@\@\@3\@\@Z */ MCVAPI std::unique_ptr createLevelStorage(class Scheduler &, std::string const &, class ContentIdentity const &, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &, class gsl::not_null>, std::unique_ptr); /** - * @symbol ?createLevelStorageObserver\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createLevelStorageObserver\@LevelListCache\@\@UEAA?AV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr createLevelStorageObserver(); /** - * @symbol ?deleteLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?deleteLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void deleteLevel(std::string const &); /** - * @symbol ?deleteLevelFiles\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?deleteLevelFiles\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void deleteLevelFiles(std::string const &); /** - * @symbol ?getBasePath\@LevelListCache\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getBasePath\@LevelListCache\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCVAPI class Core::PathBuffer const getBasePath() const; /** - * @symbol ?getLevelData\@LevelListCache\@\@UEAAPEAVLevelData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getLevelData\@LevelListCache\@\@UEAAPEAVLevelData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI class LevelData * getLevelData(std::string const &); /** - * @symbol ?getLevelList\@LevelListCache\@\@UEAAXAEAV?$vector\@ULevelSummary\@\@V?$allocator\@ULevelSummary\@\@\@std\@\@\@std\@\@_N11\@Z + * @symbol ?getLevelList\@LevelListCache\@\@UEAAXAEAV?$vector\@ULevelSummary\@\@V?$allocator\@ULevelSummary\@\@\@std\@\@\@std\@\@_N11\@Z */ MCVAPI void getLevelList(std::vector &, bool, bool, bool); /** - * @symbol ?getLevelSummary\@LevelListCache\@\@UEAAPEAULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getLevelSummary\@LevelListCache\@\@UEAAPEAULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI struct LevelSummary * getLevelSummary(std::string const &); /** - * @symbol ?getLevelSummaryByName\@LevelListCache\@\@UEAAPEBULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getLevelSummaryByName\@LevelListCache\@\@UEAAPEBULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI struct LevelSummary const * getLevelSummaryByName(std::string const &); /** - * @symbol ?getOrCreateLevelSummary\@LevelListCache\@\@UEAAPEAULevelSummary\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?getOrCreateLevelSummary\@LevelListCache\@\@UEAAPEAULevelSummary\@\@AEBVPath\@Core\@\@\@Z */ MCVAPI struct LevelSummary * getOrCreateLevelSummary(class Core::Path const &); /** - * @symbol ?getShallowLevelSummary\@LevelListCache\@\@UEAAPEAULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getShallowLevelSummary\@LevelListCache\@\@UEAAPEAULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI struct LevelSummary * getShallowLevelSummary(std::string const &); /** - * @symbol ?hasLevelWithId\@LevelListCache\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?hasLevelWithId\@LevelListCache\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool hasLevelWithId(std::string const &); /** - * @symbol ?onSave\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onSave\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onSave(std::string const &); /** - * @symbol ?onStorageChanged\@LevelListCache\@\@UEAAXXZ + * @symbol ?onStorageChanged\@LevelListCache\@\@UEAAXXZ */ MCVAPI void onStorageChanged(); /** - * @symbol ?postDeleteLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?postDeleteLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void postDeleteLevel(std::string const &); /** - * @symbol ?refreshLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?refreshLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void refreshLevel(std::string const &); /** - * @symbol ?removeObserver\@LevelListCache\@\@UEAAXAEAVLevelLocationObserver\@\@\@Z + * @symbol ?removeObserver\@LevelListCache\@\@UEAAXAEAVLevelLocationObserver\@\@\@Z */ MCVAPI void removeObserver(class LevelLocationObserver &); /** - * @symbol ?renameLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?renameLevel\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void renameLevel(std::string const &, std::string const &); /** - * @symbol ?saveLevelData\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z + * @symbol ?saveLevelData\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@\@Z */ MCVAPI void saveLevelData(std::string const &, class LevelData const &); /** - * @symbol ?updateLevelCache\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?updateLevelCache\@LevelListCache\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void updateLevelCache(std::string const &); #endif /** - * @symbol ??0LevelListCache\@\@QEAA\@AEAVLevelStorageSource\@\@$$QEAV?$function\@$$A6A_NXZ\@std\@\@\@Z + * @symbol ??0LevelListCache\@\@QEAA\@AEAVLevelStorageSource\@\@$$QEAV?$function\@$$A6A_NXZ\@std\@\@\@Z */ MCAPI LevelListCache(class LevelStorageSource &, class std::function &&); //private: /** - * @symbol ?_addOrReplaceCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?_addOrReplaceCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBVPath\@Core\@\@\@Z */ MCAPI class LevelCache * _addOrReplaceCache(class Core::Path const &); /** - * @symbol ?_addToCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z + * @symbol ?_addToCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV2\@\@Z */ MCAPI class LevelCache * _addToCache(std::string const &, class LevelCache &&); /** - * @symbol ?_addToCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?_addToCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBVPath\@Core\@\@\@Z */ MCAPI class LevelCache * _addToCache(class Core::Path const &); /** - * @symbol ?_createAndAddToCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?_createAndAddToCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCAPI class LevelCache * _createAndAddToCache(std::string const &, class Core::Path const &); /** - * @symbol ?_getLevelCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getLevelCache\@LevelListCache\@\@AEAAPEAVLevelCache\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class LevelCache * _getLevelCache(std::string const &); /** - * @symbol ?_getLevelSummary\@LevelListCache\@\@AEAAPEAULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getLevelSummary\@LevelListCache\@\@AEAAPEAULevelSummary\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct LevelSummary * _getLevelSummary(std::string const &); /** - * @symbol ?_notifyLevelUpdated\@LevelListCache\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_notifyLevelUpdated\@LevelListCache\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _notifyLevelUpdated(std::string const &); /** - * @symbol ?_refreshSummary\@LevelListCache\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelCache\@\@\@Z + * @symbol ?_refreshSummary\@LevelListCache\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelCache\@\@\@Z */ MCAPI void _refreshSummary(std::string const &, class LevelCache &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelListener.hpp b/LiteLoader/include/llapi/mc/LevelListener.hpp index 8323bac9b4..a7fceee3f2 100644 --- a/LiteLoader/include/llapi/mc/LevelListener.hpp +++ b/LiteLoader/include/llapi/mc/LevelListener.hpp @@ -31,122 +31,122 @@ class LevelListener : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELLISTENER /** - * @symbol ?addBreakingItemParticleEffect\@LevelListener\@\@UEAAXAEBVVec3\@\@W4ParticleType\@\@AEBUResolvedItemIconInfo\@\@\@Z + * @symbol ?addBreakingItemParticleEffect\@LevelListener\@\@UEAAXAEBVVec3\@\@W4ParticleType\@\@AEBUResolvedItemIconInfo\@\@\@Z */ MCVAPI void addBreakingItemParticleEffect(class Vec3 const &, enum class ParticleType, struct ResolvedItemIconInfo const &); /** - * @symbol ?addParticleEffect\@LevelListener\@\@UEAAXAEBVHashedString\@\@AEBVActor\@\@0AEBVVec3\@\@AEBVMolangVariableMap\@\@\@Z + * @symbol ?addParticleEffect\@LevelListener\@\@UEAAXAEBVHashedString\@\@AEBVActor\@\@0AEBVVec3\@\@AEBVMolangVariableMap\@\@\@Z */ MCVAPI void addParticleEffect(class HashedString const &, class Actor const &, class HashedString const &, class Vec3 const &, class MolangVariableMap const &); /** - * @symbol ?addParticleEffect\@LevelListener\@\@UEAAXAEBVHashedString\@\@AEBVVec3\@\@AEBVMolangVariableMap\@\@\@Z - */ - MCVAPI void addParticleEffect(class HashedString const &, class Vec3 const &, class MolangVariableMap const &); - /** - * @symbol ?addTerrainParticleEffect\@LevelListener\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z + * @symbol ?addTerrainParticleEffect\@LevelListener\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z */ MCVAPI void addTerrainParticleEffect(class BlockPos const &, class Block const &, class Vec3 const &, float, float, float); /** - * @symbol ?addTerrainSlideEffect\@LevelListener\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z + * @symbol ?addTerrainSlideEffect\@LevelListener\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@AEBVVec3\@\@MMM\@Z */ MCVAPI void addTerrainSlideEffect(class BlockPos const &, class Block const &, class Vec3 const &, float, float, float); /** - * @symbol ?allChanged\@LevelListener\@\@UEAAXXZ + * @symbol ?allChanged\@LevelListener\@\@UEAAXXZ */ MCVAPI void allChanged(); /** - * @symbol ?levelEvent\@LevelListener\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?levelEvent\@LevelListener\@\@UEAAXW4LevelEvent\@\@AEBVCompoundTag\@\@\@Z */ MCVAPI void levelEvent(enum class LevelEvent, class CompoundTag const &); /** - * @symbol ?levelEvent\@LevelListener\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z + * @symbol ?levelEvent\@LevelListener\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z */ MCVAPI void levelEvent(enum class LevelEvent, class Vec3 const &, int); /** - * @symbol ?levelSoundEvent\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + * @symbol ?levelSoundEvent\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ MCVAPI void levelSoundEvent(std::string const &, class Vec3 const &, float, float); /** - * @symbol ?levelSoundEvent\@LevelListener\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + * @symbol ?levelSoundEvent\@LevelListener\@\@UEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z */ MCVAPI void levelSoundEvent(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); /** - * @symbol ?onChunkLoaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkLoaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?onChunkReloaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkReloaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkReloaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?onChunkUnloaded\@LevelListener\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?onChunkUnloaded\@LevelListener\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkUnloaded(class LevelChunk &); /** - * @symbol ?onEntityAdded\@LevelListener\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?onEntityAdded\@LevelListener\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void onEntityAdded(class Actor &); /** - * @symbol ?onEntityRemoved\@LevelListener\@\@UEAAXAEAVActor\@\@\@Z + * @symbol ?onEntityRemoved\@LevelListener\@\@UEAAXAEAVActor\@\@\@Z */ MCVAPI void onEntityRemoved(class Actor &); /** - * @symbol ?onLevelDestruction\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onLevelDestruction\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onLevelDestruction(std::string const &); /** - * @symbol ?onSubChunkLoaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@F_N\@Z + * @symbol ?onSubChunkLoaded\@LevelListener\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@F_N\@Z */ MCVAPI void onSubChunkLoaded(class ChunkSource &, class LevelChunk &, short, bool); /** - * @symbol ?playMusic\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + * @symbol ?playMusic\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ MCVAPI void playMusic(std::string const &, class Vec3 const &, float, float); /** - * @symbol ?playStreamingMusic\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHH\@Z + * @symbol ?playStreamingMusic\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHH\@Z */ MCVAPI void playStreamingMusic(std::string const &, int, int, int); /** - * @symbol ?playerListChanged\@LevelListener\@\@UEAAXXZ + * @symbol ?playerListChanged\@LevelListener\@\@UEAAXXZ */ MCVAPI void playerListChanged(); /** - * @symbol ?sendServerLegacyParticle\@LevelListener\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z + * @symbol ?sendServerLegacyParticle\@LevelListener\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z */ MCVAPI void sendServerLegacyParticle(enum class ParticleType, class Vec3 const &, class Vec3 const &, int); /** - * @symbol ?stopAllSounds\@LevelListener\@\@UEAAXXZ + * @symbol ?stopAllSounds\@LevelListener\@\@UEAAXXZ */ MCVAPI void stopAllSounds(); /** - * @symbol ?stopSoundEvent\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?stopSoundEvent\@LevelListener\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void stopSoundEvent(std::string const &); /** - * @symbol ?takePicture\@LevelListener\@\@UEAAXAEAVImageBuffer\@cg\@\@PEAVActor\@\@1AEAUScreenshotOptions\@\@\@Z + * @symbol ?takePicture\@LevelListener\@\@UEAAXAEAVImageBuffer\@cg\@\@PEAVActor\@\@1AEAUScreenshotOptions\@\@\@Z */ MCVAPI void takePicture(class cg::ImageBuffer &, class Actor *, class Actor *, struct ScreenshotOptions &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelListener(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp b/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp index d2b874546e..3deb5996d7 100644 --- a/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp +++ b/LiteLoader/include/llapi/mc/LevelLooseFileStorage.hpp @@ -32,12 +32,12 @@ class LevelLooseFileStorage { public: /** - * @symbol ??0LevelLooseFileStorage\@\@QEAA\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0LevelLooseFileStorage\@\@QEAA\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI LevelLooseFileStorage(class Core::Path const &, class ContentIdentity const &, class gsl::not_null> const &); /** - * @symbol ?getAccessStrategy\@LevelLooseFileStorage\@\@QEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAccessStrategy\@LevelLooseFileStorage\@\@QEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getAccessStrategy() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelNotificationEvent.hpp b/LiteLoader/include/llapi/mc/LevelNotificationEvent.hpp index 360b35926b..38f4a0a90f 100644 --- a/LiteLoader/include/llapi/mc/LevelNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/LevelNotificationEvent.hpp @@ -28,7 +28,7 @@ struct LevelNotificationEvent { public: /** - * @symbol ??1LevelNotificationEvent\@\@QEAA\@XZ + * @symbol ??1LevelNotificationEvent\@\@QEAA\@XZ */ MCAPI ~LevelNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/LevelSeed64.hpp b/LiteLoader/include/llapi/mc/LevelSeed64.hpp index 2a331f30d9..5ff3664fcd 100644 --- a/LiteLoader/include/llapi/mc/LevelSeed64.hpp +++ b/LiteLoader/include/llapi/mc/LevelSeed64.hpp @@ -28,12 +28,12 @@ class LevelSeed64 { public: /** - * @symbol ?to32BitRandomSeed\@LevelSeed64\@\@QEBAIXZ + * @symbol ?to32BitRandomSeed\@LevelSeed64\@\@QEBAIXZ */ MCAPI unsigned int to32BitRandomSeed() const; /** - * @symbol ?fromUnsigned32\@LevelSeed64\@\@SA?AV1\@I\@Z + * @symbol ?fromUnsigned32\@LevelSeed64\@\@SA?AV1\@I\@Z */ MCAPI static class LevelSeed64 fromUnsigned32(unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSettings.hpp b/LiteLoader/include/llapi/mc/LevelSettings.hpp index 549d67b35f..1bc9b1d031 100644 --- a/LiteLoader/include/llapi/mc/LevelSettings.hpp +++ b/LiteLoader/include/llapi/mc/LevelSettings.hpp @@ -29,340 +29,340 @@ class LevelSettings { public: /** - * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI LevelSettings(class LevelSettings &&); - /** - * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ??0LevelSettings\@\@QEAA\@AEBVLevelData\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI LevelSettings(class LevelData const &, class AutomaticID); /** - * @symbol ??0LevelSettings\@\@QEAA\@XZ + * @symbol ??0LevelSettings\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI LevelSettings(); + MCAPI LevelSettings(class LevelSettings &&); /** - * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0LevelSettings\@\@QEAA\@AEBV0\@\@Z */ MCAPI LevelSettings(class LevelSettings const &); /** - * @symbol ?achievementsWillBeDisabledOnLoad\@LevelSettings\@\@QEBA_NXZ + * @symbol ??0LevelSettings\@\@QEAA\@XZ + */ + MCAPI LevelSettings(); + /** + * @symbol ?achievementsWillBeDisabledOnLoad\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool achievementsWillBeDisabledOnLoad() const; /** - * @symbol ?educationFeaturesEnabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?educationFeaturesEnabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool educationFeaturesEnabled() const; /** - * @symbol ?educationProductID\@LevelSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?educationProductID\@LevelSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & educationProductID() const; /** - * @symbol ?forceGameType\@LevelSettings\@\@QEBA_NXZ + * @symbol ?forceGameType\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool forceGameType() const; /** - * @symbol ?getBaseGameVersion\@LevelSettings\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getBaseGameVersion\@LevelSettings\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getBaseGameVersion() const; /** - * @symbol ?getBiomeOverride\@LevelSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getBiomeOverride\@LevelSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getBiomeOverride() const; /** - * @symbol ?getChatRestrictionLevel\@LevelSettings\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ + * @symbol ?getChatRestrictionLevel\@LevelSettings\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ */ MCAPI enum class ChatRestrictionLevel getChatRestrictionLevel() const; /** - * @symbol ?getCustomSkinsDisabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getCustomSkinsDisabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getCustomSkinsDisabled() const; /** - * @symbol ?getDefaultPermissions\@LevelSettings\@\@QEBAAEBVPermissionsHandler\@\@XZ + * @symbol ?getDefaultPermissions\@LevelSettings\@\@QEBAAEBVPermissionsHandler\@\@XZ */ MCAPI class PermissionsHandler const & getDefaultPermissions() const; /** - * @symbol ?getDefaultSpawn\@LevelSettings\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getDefaultSpawn\@LevelSettings\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getDefaultSpawn() const; /** - * @symbol ?getDisablePlayerInteractions\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getDisablePlayerInteractions\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getDisablePlayerInteractions() const; /** - * @symbol ?getEduSharedUriResource\@LevelSettings\@\@QEBAAEBUEduSharedUriResource\@\@XZ + * @symbol ?getEduSharedUriResource\@LevelSettings\@\@QEBAAEBUEduSharedUriResource\@\@XZ */ MCAPI struct EduSharedUriResource const & getEduSharedUriResource() const; /** - * @symbol ?getEducationEditionOffer\@LevelSettings\@\@QEBA?AW4EducationEditionOffer\@\@XZ + * @symbol ?getEducationEditionOffer\@LevelSettings\@\@QEBA?AW4EducationEditionOffer\@\@XZ */ MCAPI enum class EducationEditionOffer getEducationEditionOffer() const; /** - * @symbol ?getEducationLevelSettings\@LevelSettings\@\@QEBAAEBV?$optional\@UEducationLevelSettings\@\@\@std\@\@XZ + * @symbol ?getEducationLevelSettings\@LevelSettings\@\@QEBAAEBV?$optional\@UEducationLevelSettings\@\@\@std\@\@XZ */ MCAPI class std::optional const & getEducationLevelSettings() const; /** - * @symbol ?getEmoteChatMuted\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getEmoteChatMuted\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getEmoteChatMuted() const; /** - * @symbol ?getExperiments\@LevelSettings\@\@QEBAAEBVExperiments\@\@XZ + * @symbol ?getExperiments\@LevelSettings\@\@QEBAAEBVExperiments\@\@XZ */ MCAPI class Experiments const & getExperiments() const; /** - * @symbol ?getGameDifficulty\@LevelSettings\@\@QEBA?AW4Difficulty\@\@XZ + * @symbol ?getGameDifficulty\@LevelSettings\@\@QEBA?AW4Difficulty\@\@XZ */ MCAPI enum class Difficulty getGameDifficulty() const; /** - * @symbol ?getGameRules\@LevelSettings\@\@QEBAAEBVGameRules\@\@XZ + * @symbol ?getGameRules\@LevelSettings\@\@QEBAAEBVGameRules\@\@XZ */ MCAPI class GameRules const & getGameRules() const; /** - * @symbol ?getGameType\@LevelSettings\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getGameType\@LevelSettings\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getGameType() const; /** - * @symbol ?getGenerator\@LevelSettings\@\@QEBA?AW4GeneratorType\@\@XZ + * @symbol ?getGenerator\@LevelSettings\@\@QEBA?AW4GeneratorType\@\@XZ */ MCAPI enum class GeneratorType getGenerator() const; /** - * @symbol ?getImmutableWorld\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getImmutableWorld\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getImmutableWorld() const; /** - * @symbol ?getLanBroadcastIntent\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getLanBroadcastIntent\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getLanBroadcastIntent() const; /** - * @symbol ?getLightningLevel\@LevelSettings\@\@QEBAMXZ + * @symbol ?getLightningLevel\@LevelSettings\@\@QEBAMXZ */ MCAPI float getLightningLevel() const; /** - * @symbol ?getLimitedWorldDepth\@LevelSettings\@\@QEBAHXZ + * @symbol ?getLimitedWorldDepth\@LevelSettings\@\@QEBAHXZ */ MCAPI int getLimitedWorldDepth() const; /** - * @symbol ?getLimitedWorldWidth\@LevelSettings\@\@QEBAHXZ + * @symbol ?getLimitedWorldWidth\@LevelSettings\@\@QEBAHXZ */ MCAPI int getLimitedWorldWidth() const; /** - * @symbol ?getMultiplayerGameIntent\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getMultiplayerGameIntent\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getMultiplayerGameIntent() const; /** - * @symbol ?getNetherType\@LevelSettings\@\@QEBA?AW4NetherWorldType\@\@XZ + * @symbol ?getNetherType\@LevelSettings\@\@QEBA?AW4NetherWorldType\@\@XZ */ MCAPI enum class NetherWorldType getNetherType() const; /** - * @symbol ?getOnlySpawnV1Villagers\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getOnlySpawnV1Villagers\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getOnlySpawnV1Villagers() const; /** - * @symbol ?getPersonaDisabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?getPersonaDisabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool getPersonaDisabled() const; /** - * @symbol ?getPlatformBroadcastIntent\@LevelSettings\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getPlatformBroadcastIntent\@LevelSettings\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getPlatformBroadcastIntent() const; /** - * @symbol ?getRainLevel\@LevelSettings\@\@QEBAMXZ + * @symbol ?getRainLevel\@LevelSettings\@\@QEBAMXZ */ MCAPI float getRainLevel() const; /** - * @symbol ?getSeed\@LevelSettings\@\@QEBA?AVLevelSeed64\@\@XZ + * @symbol ?getSeed\@LevelSettings\@\@QEBA?AVLevelSeed64\@\@XZ */ MCAPI class LevelSeed64 getSeed() const; /** - * @symbol ?getServerChunkTickRange\@LevelSettings\@\@QEBAIXZ + * @symbol ?getServerChunkTickRange\@LevelSettings\@\@QEBAIXZ */ MCAPI unsigned int getServerChunkTickRange() const; /** - * @symbol ?getSpawnSettings\@LevelSettings\@\@QEBA?AUSpawnSettings\@\@XZ + * @symbol ?getSpawnSettings\@LevelSettings\@\@QEBA?AUSpawnSettings\@\@XZ */ MCAPI struct SpawnSettings getSpawnSettings() const; /** - * @symbol ?getTime\@LevelSettings\@\@QEBAHXZ + * @symbol ?getTime\@LevelSettings\@\@QEBAHXZ */ MCAPI int getTime() const; /** - * @symbol ?getWorldVersion\@LevelSettings\@\@QEBA?AW4WorldVersion\@\@XZ + * @symbol ?getWorldVersion\@LevelSettings\@\@QEBA?AW4WorldVersion\@\@XZ */ MCAPI enum class WorldVersion getWorldVersion() const; /** - * @symbol ?getXBLBroadcastIntent\@LevelSettings\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ + * @symbol ?getXBLBroadcastIntent\@LevelSettings\@\@QEBA?AW4GamePublishSetting\@Social\@\@XZ */ MCAPI enum class Social::GamePublishSetting getXBLBroadcastIntent() const; /** - * @symbol ?hasAchievementsDisabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasAchievementsDisabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasAchievementsDisabled() const; /** - * @symbol ?hasBonusChestEnabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasBonusChestEnabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasBonusChestEnabled() const; /** - * @symbol ?hasCommandsEnabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasCommandsEnabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasCommandsEnabled() const; /** - * @symbol ?hasConfirmedPlatformLockedContent\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasConfirmedPlatformLockedContent\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasConfirmedPlatformLockedContent() const; /** - * @symbol ?hasLockedBehaviorPack\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasLockedBehaviorPack\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasLockedBehaviorPack() const; /** - * @symbol ?hasLockedResourcePack\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasLockedResourcePack\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasLockedResourcePack() const; /** - * @symbol ?hasStartWithMapEnabled\@LevelSettings\@\@QEBA_NXZ + * @symbol ?hasStartWithMapEnabled\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool hasStartWithMapEnabled() const; /** - * @symbol ?isEditorWorld\@LevelSettings\@\@QEBA_NXZ + * @symbol ?isEditorWorld\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isEditorWorld() const; /** - * @symbol ?isFromLockedTemplate\@LevelSettings\@\@QEBA_NXZ + * @symbol ?isFromLockedTemplate\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isFromLockedTemplate() const; /** - * @symbol ?isFromWorldTemplate\@LevelSettings\@\@QEBA_NXZ + * @symbol ?isFromWorldTemplate\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isFromWorldTemplate() const; /** - * @symbol ?isTexturepacksRequired\@LevelSettings\@\@QEBA_NXZ + * @symbol ?isTexturepacksRequired\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isTexturepacksRequired() const; /** - * @symbol ?isWorldTemplateOptionLocked\@LevelSettings\@\@QEBA_NXZ + * @symbol ?isWorldTemplateOptionLocked\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool isWorldTemplateOptionLocked() const; /** - * @symbol ??4LevelSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4LevelSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class LevelSettings & operator=(class LevelSettings &&); /** - * @symbol ?overrideSavedSettings\@LevelSettings\@\@QEBAXAEAVLevelData\@\@\@Z + * @symbol ?overrideSavedSettings\@LevelSettings\@\@QEBAXAEAVLevelData\@\@\@Z */ MCAPI void overrideSavedSettings(class LevelData &) const; /** - * @symbol ?setBaseGameVersion\@LevelSettings\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?setBaseGameVersion\@LevelSettings\@\@QEAAAEAV1\@AEBVBaseGameVersion\@\@\@Z */ MCAPI class LevelSettings & setBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?setChatRestrictionLevel\@LevelSettings\@\@QEAAAEAV1\@W4ChatRestrictionLevel\@\@\@Z + * @symbol ?setChatRestrictionLevel\@LevelSettings\@\@QEAAAEAV1\@W4ChatRestrictionLevel\@\@\@Z */ MCAPI class LevelSettings & setChatRestrictionLevel(enum class ChatRestrictionLevel); /** - * @symbol ?setCommandsEnabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setCommandsEnabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setCommandsEnabled(bool); /** - * @symbol ?setCustomSkinsDisabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setCustomSkinsDisabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setCustomSkinsDisabled(bool); /** - * @symbol ?setDefaultPlayerPermissions\@LevelSettings\@\@QEAAAEAV1\@W4PlayerPermissionLevel\@\@\@Z + * @symbol ?setDefaultPlayerPermissions\@LevelSettings\@\@QEAAAEAV1\@W4PlayerPermissionLevel\@\@\@Z */ MCAPI class LevelSettings & setDefaultPlayerPermissions(enum class PlayerPermissionLevel); /** - * @symbol ?setDifficulty\@LevelSettings\@\@QEAAAEAV1\@W4Difficulty\@\@\@Z + * @symbol ?setDifficulty\@LevelSettings\@\@QEAAAEAV1\@W4Difficulty\@\@\@Z */ MCAPI class LevelSettings & setDifficulty(enum class Difficulty); /** - * @symbol ?setDisablePlayerInteractions\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setDisablePlayerInteractions\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setDisablePlayerInteractions(bool); /** - * @symbol ?setEduSharedUriResource\@LevelSettings\@\@QEAAAEAV1\@AEBUEduSharedUriResource\@\@\@Z + * @symbol ?setEduSharedUriResource\@LevelSettings\@\@QEAAAEAV1\@AEBUEduSharedUriResource\@\@\@Z */ MCAPI class LevelSettings & setEduSharedUriResource(struct EduSharedUriResource const &); /** - * @symbol ?setEducationFeaturesEnabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setEducationFeaturesEnabled\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setEducationFeaturesEnabled(bool); /** - * @symbol ?setEducationProductID\@LevelSettings\@\@QEAAAEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setEducationProductID\@LevelSettings\@\@QEAAAEAV1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class LevelSettings & setEducationProductID(std::string); /** - * @symbol ?setEmoteChatMuted\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setEmoteChatMuted\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setEmoteChatMuted(bool); /** - * @symbol ?setForceGameType\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setForceGameType\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setForceGameType(bool); /** - * @symbol ?setGameRules\@LevelSettings\@\@QEAAAEAV1\@VGameRules\@\@\@Z + * @symbol ?setGameRules\@LevelSettings\@\@QEAAAEAV1\@VGameRules\@\@\@Z */ MCAPI class LevelSettings & setGameRules(class GameRules); /** - * @symbol ?setGameType\@LevelSettings\@\@QEAAAEAV1\@W4GameType\@\@\@Z + * @symbol ?setGameType\@LevelSettings\@\@QEAAAEAV1\@W4GameType\@\@\@Z */ MCAPI class LevelSettings & setGameType(enum class GameType); /** - * @symbol ?setGeneratorType\@LevelSettings\@\@QEAAAEAV1\@W4GeneratorType\@\@\@Z + * @symbol ?setGeneratorType\@LevelSettings\@\@QEAAAEAV1\@W4GeneratorType\@\@\@Z */ MCAPI class LevelSettings & setGeneratorType(enum class GeneratorType); /** - * @symbol ?setIsEditorWorld\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setIsEditorWorld\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setIsEditorWorld(bool); /** - * @symbol ?setOnlySpawnV1Villagers\@LevelSettings\@\@QEAAX_N\@Z + * @symbol ?setOnlySpawnV1Villagers\@LevelSettings\@\@QEAAX_N\@Z */ MCAPI void setOnlySpawnV1Villagers(bool); /** - * @symbol ?setOverrideSavedSettings\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setOverrideSavedSettings\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setOverrideSavedSettings(bool); /** - * @symbol ?setPlatformBroadcastIntent\@LevelSettings\@\@QEAAAEAV1\@W4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setPlatformBroadcastIntent\@LevelSettings\@\@QEAAAEAV1\@W4GamePublishSetting\@Social\@\@\@Z */ MCAPI class LevelSettings & setPlatformBroadcastIntent(enum class Social::GamePublishSetting); /** - * @symbol ?setRandomSeed\@LevelSettings\@\@QEAAAEAV1\@VLevelSeed64\@\@\@Z + * @symbol ?setRandomSeed\@LevelSettings\@\@QEAAAEAV1\@VLevelSeed64\@\@\@Z */ MCAPI class LevelSettings & setRandomSeed(class LevelSeed64); /** - * @symbol ?setServerChunkTickRange\@LevelSettings\@\@QEAAAEAV1\@I\@Z + * @symbol ?setServerChunkTickRange\@LevelSettings\@\@QEAAAEAV1\@I\@Z */ MCAPI class LevelSettings & setServerChunkTickRange(unsigned int); /** - * @symbol ?setSpawnSettings\@LevelSettings\@\@QEAAAEAV1\@USpawnSettings\@\@\@Z + * @symbol ?setSpawnSettings\@LevelSettings\@\@QEAAAEAV1\@USpawnSettings\@\@\@Z */ MCAPI class LevelSettings & setSpawnSettings(struct SpawnSettings); /** - * @symbol ?setTexturePackRequired\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setTexturePackRequired\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setTexturePackRequired(bool); /** - * @symbol ?setUseMsaGamertagsOnly\@LevelSettings\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setUseMsaGamertagsOnly\@LevelSettings\@\@QEAAAEAV1\@_N\@Z */ MCAPI class LevelSettings & setUseMsaGamertagsOnly(bool); /** - * @symbol ?setXblBroadcastIntent\@LevelSettings\@\@QEAAAEAV1\@W4GamePublishSetting\@Social\@\@\@Z + * @symbol ?setXblBroadcastIntent\@LevelSettings\@\@QEAAAEAV1\@W4GamePublishSetting\@Social\@\@\@Z */ MCAPI class LevelSettings & setXblBroadcastIntent(enum class Social::GamePublishSetting); /** - * @symbol ?shouldOverrideSavedSettings\@LevelSettings\@\@QEBA_NXZ + * @symbol ?shouldOverrideSavedSettings\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool shouldOverrideSavedSettings() const; /** - * @symbol ?useMsaGamertagsOnly\@LevelSettings\@\@QEBA_NXZ + * @symbol ?useMsaGamertagsOnly\@LevelSettings\@\@QEBA_NXZ */ MCAPI bool useMsaGamertagsOnly() const; /** - * @symbol ??1LevelSettings\@\@QEAA\@XZ + * @symbol ??1LevelSettings\@\@QEAA\@XZ */ MCAPI ~LevelSettings(); /** - * @symbol ?parseSeedString\@LevelSettings\@\@SA?AV?$optional\@VLevelSeed64\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?parseSeedString\@LevelSettings\@\@SA?AV?$optional\@VLevelSeed64\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static class std::optional parseSeedString(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp index 8475172b8e..c73920c20b 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventMap.hpp @@ -30,15 +30,15 @@ class LevelSoundEventMap { public: /** - * @symbol ?getId\@LevelSoundEventMap\@\@SA?AW4LevelSoundEvent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getId\@LevelSoundEventMap\@\@SA?AW4LevelSoundEvent\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class LevelSoundEvent getId(std::string const &); /** - * @symbol ?getName\@LevelSoundEventMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@Z + * @symbol ?getName\@LevelSoundEventMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@Z */ MCAPI static std::string const & getName(enum class LevelSoundEvent); /** - * @symbol ?initializerData\@LevelSoundEventMap\@\@2V?$initializer_list\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@B + * @symbol ?initializerData\@LevelSoundEventMap\@\@2V?$initializer_list\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@B */ MCAPI static class std::initializer_list> const initializerData; @@ -46,8 +46,8 @@ class LevelSoundEventMap { private: /** - * @symbol ?map\@LevelSoundEventMap\@\@0V?$BidirectionalUnorderedMap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@\@B + * @symbol ?map\@LevelSoundEventMap\@\@0V?$BidirectionalUnorderedMap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LevelSoundEvent\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const map; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp index 7784443377..2f1f44bfd8 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacket.hpp @@ -30,37 +30,37 @@ class LevelSoundEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_destructor_0 */ virtual ~LevelSoundEventPacket(); /** - * @vftbl 1 - * @symbol ?getId\@LevelSoundEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LevelSoundEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LevelSoundEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LevelSoundEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LevelSoundEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LevelSoundEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LevelSoundEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0LevelSoundEventPacket\@\@QEAA\@XZ + * @symbol ??0LevelSoundEventPacket\@\@QEAA\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N3\@Z */ - MCAPI LevelSoundEventPacket(); + MCAPI LevelSoundEventPacket(enum class LevelSoundEvent, class Vec3 const &, int, std::string const &, bool, bool); /** - * @symbol ??0LevelSoundEventPacket\@\@QEAA\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N3\@Z + * @symbol ??0LevelSoundEventPacket\@\@QEAA\@XZ */ - MCAPI LevelSoundEventPacket(enum class LevelSoundEvent, class Vec3 const &, int, std::string const &, bool, bool); + MCAPI LevelSoundEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp index bcd399b3f2..0b6bff2706 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV1.hpp @@ -30,33 +30,33 @@ class LevelSoundEventPacketV1 : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelSoundEventPacketV1(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LevelSoundEventPacketV1\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LevelSoundEventPacketV1\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LevelSoundEventPacketV1\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LevelSoundEventPacketV1\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LevelSoundEventPacketV1\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LevelSoundEventPacketV1\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LevelSoundEventPacketV1\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0LevelSoundEventPacketV1\@\@QEAA\@XZ + * @symbol ??0LevelSoundEventPacketV1\@\@QEAA\@XZ */ MCAPI LevelSoundEventPacketV1(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp index 9d1e7dcdc8..df0bb2ac9c 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventPacketV2.hpp @@ -30,33 +30,33 @@ class LevelSoundEventPacketV2 : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelSoundEventPacketV2(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LevelSoundEventPacketV2\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LevelSoundEventPacketV2\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LevelSoundEventPacketV2\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LevelSoundEventPacketV2\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LevelSoundEventPacketV2\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LevelSoundEventPacketV2\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LevelSoundEventPacketV2\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0LevelSoundEventPacketV2\@\@QEAA\@XZ + * @symbol ??0LevelSoundEventPacketV2\@\@QEAA\@XZ */ MCAPI LevelSoundEventPacketV2(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSoundEventUtils.hpp b/LiteLoader/include/llapi/mc/LevelSoundEventUtils.hpp index 57b6c91b5d..44e9fc1e5f 100644 --- a/LiteLoader/include/llapi/mc/LevelSoundEventUtils.hpp +++ b/LiteLoader/include/llapi/mc/LevelSoundEventUtils.hpp @@ -30,7 +30,7 @@ class LevelSoundEventUtils { public: /** - * @symbol ?serializePercentageToData\@LevelSoundEventUtils\@\@SAHM\@Z + * @symbol ?serializePercentageToData\@LevelSoundEventUtils\@\@SAHM\@Z */ MCAPI static int serializePercentageToData(float); @@ -38,8 +38,8 @@ class LevelSoundEventUtils { private: /** - * @symbol ?MAX_INT_REPRESENTABLE_AS_FLOAT\@LevelSoundEventUtils\@\@0HB + * @symbol ?MAX_INT_REPRESENTABLE_AS_FLOAT\@LevelSoundEventUtils\@\@0HB */ MCAPI static int const MAX_INT_REPRESENTABLE_AS_FLOAT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSoundManager.hpp b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp new file mode 100644 index 0000000000..60165a45a7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/LevelSoundManager.hpp @@ -0,0 +1,109 @@ +/** + * @file LevelSoundManager.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class LevelSoundManager { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LEVELSOUNDMANAGER +public: + class LevelSoundManager& operator=(class LevelSoundManager const &) = delete; + LevelSoundManager(class LevelSoundManager const &) = delete; + LevelSoundManager() = delete; +#endif + +public: + /** + * @symbol ??0LevelSoundManager\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z + */ + MCAPI LevelSoundManager(class gsl::not_null> const &, bool); + /** + * @symbol ?broadcastSoundEvent\@LevelSoundManager\@\@QEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4PEAVPlayer\@\@\@Z + */ + MCAPI void broadcastSoundEvent(class IDimension &, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool, class Player *); + /** + * @symbol ?getSoundPlayer\@LevelSoundManager\@\@QEBA?AV?$not_null\@V?$NonOwnerPointer\@VSoundPlayerInterface\@\@\@Bedrock\@\@\@gsl\@\@XZ + */ + 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 + */ + MCAPI void handleStopSoundEvent(std::string const &); + /** + * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z + */ + MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool); + /** + * @symbol ?playSound\@LevelSoundManager\@\@QEAAXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z + */ + MCAPI void playSound(enum class LevelSoundEvent, class Vec3 const &, float, float); + /** + * @symbol ?playSoundForPlayerInDimension\@LevelSoundManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N4PEAVPlayer\@\@\@Z + */ + MCAPI void playSoundForPlayerInDimension(class AutomaticID, enum class LevelSoundEvent, class Vec3 const &, int, struct ActorDefinitionIdentifier const &, bool, bool, class Player *); + /** + * @symbol ?playSynchronizedSound\@LevelSoundManager\@\@QEAAXAEAVIDimension\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@PEAVPlayer\@\@HAEBUActorDefinitionIdentifier\@\@_N5\@Z + */ + 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 + */ + MCAPI class Bedrock::PubSub::Subscription registerOnHandleLevelSoundEventCallback(class std::function); + /** + * @symbol ?registerOnHandleLevelSoundEventWithVolumeAndPitchCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnHandleLevelSoundEventWithVolumeAndPitchCallback(class std::function); + /** + * @symbol ?registerOnHandleStopAllLevelSoundsEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXXZ\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnHandleStopAllLevelSoundsEventCallback(class std::function); + /** + * @symbol ?registerOnHandleStopLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnHandleStopLevelSoundEventCallback(class std::function); + /** + * @symbol ?registerOnLevelSoundEventCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@HAEBUActorDefinitionIdentifier\@\@_N3\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnLevelSoundEventCallback(class std::function); + /** + * @symbol ?registerOnLevelSoundEventWithVolumeAndPitchCallback\@LevelSoundManager\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXW4LevelSoundEvent\@\@AEBVVec3\@\@MM\@Z\@std\@\@\@Z + */ + MCAPI class Bedrock::PubSub::Subscription registerOnLevelSoundEventWithVolumeAndPitchCallback(class std::function); + /** + * @symbol ?setLevelEventCoordinator\@LevelSoundManager\@\@QEAAXV?$shared_ptr\@VLevelEventCoordinator\@\@\@std\@\@\@Z + */ + MCAPI void setLevelEventCoordinator(class std::shared_ptr); + /** + * @symbol ?setPacketSender\@LevelSoundManager\@\@QEAAXAEAVPacketSender\@\@\@Z + */ + MCAPI void setPacketSender(class PacketSender &); + /** + * @symbol ??1LevelSoundManager\@\@QEAA\@XZ + */ + MCAPI ~LevelSoundManager(); + +}; diff --git a/LiteLoader/include/llapi/mc/LevelStorage.hpp b/LiteLoader/include/llapi/mc/LevelStorage.hpp index b3f02900b1..265fe9f336 100644 --- a/LiteLoader/include/llapi/mc/LevelStorage.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorage.hpp @@ -32,195 +32,201 @@ class LevelStorage { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelStorage(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?addStorageObserver\@DBStorage\@\@UEAAXV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?addStorageObserver\@DBStorage\@\@UEAAXV?$unique_ptr\@VLevelStorageObserver\@\@U?$default_delete\@VLevelStorageObserver\@\@\@std\@\@\@std\@\@\@Z */ virtual void addStorageObserver(std::unique_ptr) = 0; /** - * @vftbl 2 - * @symbol ?getCompoundTag\@DBStorage\@\@UEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 2 + * @symbol ?getCompoundTag\@DBStorage\@\@UEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z */ virtual std::unique_ptr getCompoundTag(std::string const &, enum class DBHelpers::Category) = 0; /** - * @vftbl 3 - * @symbol ?hasKey\@DBStorage\@\@UEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 3 + * @symbol ?hasKey\@DBStorage\@\@UEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4Category\@DBHelpers\@\@\@Z */ - virtual bool hasKey(class gsl::basic_string_span, enum class DBHelpers::Category) const = 0; + virtual bool hasKey(class std::basic_string_view>, enum class DBHelpers::Category) const = 0; /** - * @vftbl 4 - * @symbol ?forEachKeyWithPrefix\@DBStorage\@\@UEBAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Category\@DBHelpers\@\@AEBV?$function\@$$A6AXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z\@std\@\@\@Z + * @vftbl 4 + * @symbol ?forEachKeyWithPrefix\@DBStorage\@\@UEBAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4Category\@DBHelpers\@\@AEBV?$function\@$$A6AXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z\@3\@\@Z */ - virtual void forEachKeyWithPrefix(class gsl::basic_string_span, enum class DBHelpers::Category, class std::function, class gsl::basic_string_span)> const &) const = 0; + virtual void forEachKeyWithPrefix(class std::basic_string_view>, enum class DBHelpers::Category, class std::function>, class std::basic_string_view>)> const &) const = 0; /** - * @vftbl 5 - * @symbol ?loadLevelData\@DBStorage\@\@UEAA_NAEAVLevelData\@\@\@Z + * @vftbl 5 + * @symbol ?loadLevelData\@DBStorage\@\@UEAA_NAEAVLevelData\@\@\@Z */ virtual bool loadLevelData(class LevelData &) = 0; /** - * @vftbl 6 - * @symbol ?createChunkStorage\@DBStorage\@\@UEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z + * @vftbl 6 + * @symbol ?createChunkStorage\@DBStorage\@\@UEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z */ virtual std::unique_ptr createChunkStorage(std::unique_ptr, enum class StorageVersion) = 0; /** - * @vftbl 7 - * @symbol ?saveLevelData\@DBStorage\@\@UEAAXAEBVLevelData\@\@\@Z + * @vftbl 7 + * @symbol ?saveLevelData\@DBStorage\@\@UEAAXAEBVLevelData\@\@\@Z */ virtual void saveLevelData(class LevelData const &) = 0; /** - * @vftbl 8 - * @symbol ?getFullPath\@DBStorage\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 8 + * @symbol ?getFullPath\@DBStorage\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const & getFullPath() const = 0; /** - * @vftbl 9 - * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@$$QEAV43\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 9 + * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@$$QEAV43\@W4Category\@DBHelpers\@\@\@Z */ virtual class std::shared_ptr> saveData(std::string const &, std::string &&, enum class DBHelpers::Category) = 0; /** - * @vftbl 10 - * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBVLevelStorageWriteBatch\@\@\@Z + * @vftbl 10 + * @symbol ?saveData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBVLevelStorageWriteBatch\@\@\@Z */ virtual class std::shared_ptr> saveData(class LevelStorageWriteBatch const &) = 0; /** - * @vftbl 11 - * @symbol ?deleteData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 11 + * @symbol ?deleteData\@DBStorage\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z */ virtual class std::shared_ptr> deleteData(std::string const &, enum class DBHelpers::Category) = 0; /** - * @vftbl 12 - * @symbol ?getStatistics\@DBStorage\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 12 + * @symbol ?getStatistics\@DBStorage\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void getStatistics(std::string &) const = 0; /** - * @vftbl 13 - * @symbol ?clonePlayerData\@LevelStorage\@\@UEAA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z + * @vftbl 13 + * @symbol ?clonePlayerData\@LevelStorage\@\@UEAA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z */ - virtual bool clonePlayerData(class gsl::basic_string_span, class gsl::basic_string_span); + virtual bool clonePlayerData(class std::basic_string_view>, class std::basic_string_view>); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14() = 0; /** - * @vftbl 15 - * @symbol ?startShutdown\@DBStorage\@\@UEAAXXZ + * @vftbl 15 + * @symbol ?startShutdown\@DBStorage\@\@UEAAXXZ */ virtual void startShutdown() = 0; /** - * @vftbl 16 - * @symbol ?isShuttingDown\@DBStorage\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?isShuttingDown\@DBStorage\@\@UEBA_NXZ */ virtual bool isShuttingDown() const = 0; /** - * @vftbl 17 - * @symbol ?checkShutdownDone\@DBStorage\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?checkShutdownDone\@DBStorage\@\@UEAA_NXZ */ virtual bool checkShutdownDone() = 0; /** - * @vftbl 18 - * @symbol ?loadData\@LevelStorage\@\@UEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 18 + * @symbol ?loadData\@LevelStorage\@\@UEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4Category\@DBHelpers\@\@\@Z */ - virtual bool loadData(class gsl::basic_string_span, std::string &, enum class DBHelpers::Category) const; + virtual bool loadData(class std::basic_string_view>, std::string &, enum class DBHelpers::Category) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19() = 0; /** - * @vftbl 20 - * @symbol ?createSnapshot\@DBStorage\@\@UEAA?AV?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 20 + * @symbol ?createSnapshot\@DBStorage\@\@UEAA?AV?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual std::vector createSnapshot(std::string const &) = 0; /** - * @vftbl 21 - * @symbol ?releaseSnapshot\@DBStorage\@\@UEAAXXZ + * @vftbl 21 + * @symbol ?releaseSnapshot\@DBStorage\@\@UEAAXXZ */ virtual void releaseSnapshot() = 0; /** - * @vftbl 22 - * @symbol ?compactStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 22 + * @symbol ?compactStorage\@DBStorage\@\@UEAAXXZ */ virtual void compactStorage() = 0; /** - * @vftbl 23 - * @symbol ?syncAndSuspendStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 23 + * @symbol ?syncAndSuspendStorage\@DBStorage\@\@UEAAXXZ */ virtual void syncAndSuspendStorage() = 0; /** - * @vftbl 24 - * @symbol ?resumeStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 24 + * @symbol ?resumeStorage\@DBStorage\@\@UEAAXXZ */ virtual void resumeStorage() = 0; /** - * @vftbl 25 - * @symbol ?setFlushAllowed\@DBStorage\@\@UEAAX_N\@Z + * @vftbl 25 + * @symbol ?setFlushAllowed\@DBStorage\@\@UEAAX_N\@Z */ virtual void setFlushAllowed(bool) = 0; /** - * @vftbl 26 - * @symbol ?flushToPermanentStorage\@DBStorage\@\@UEAAXXZ + * @vftbl 26 + * @symbol ?flushToPermanentStorage\@DBStorage\@\@UEAAXXZ */ virtual void flushToPermanentStorage() = 0; /** - * @vftbl 27 - * @symbol ?freeCaches\@LevelStorage\@\@UEAAXXZ + * @vftbl 27 + * @symbol ?freeCaches\@LevelStorage\@\@UEAAXXZ */ virtual void freeCaches(); /** - * @vftbl 28 - * @symbol ?setCompactionCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z + * @vftbl 28 + * @symbol ?setCompactionCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXW4CompactionStatus\@\@\@Z\@std\@\@\@Z */ virtual void setCompactionCallback(class std::function) = 0; /** - * @vftbl 29 - * @symbol ?setCriticalSyncSaveCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @vftbl 29 + * @symbol ?setCriticalSyncSaveCallback\@DBStorage\@\@UEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ virtual void setCriticalSyncSaveCallback(class std::function) = 0; /** - * @vftbl 30 - * @symbol ?corruptLevel\@LevelStorage\@\@UEAAXXZ + * @vftbl 30 + * @symbol ?corruptLevel\@LevelStorage\@\@UEAAXXZ */ virtual void corruptLevel(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELSTORAGE /** - * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUPlayerStorageIds\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelStorage(); +#endif + /** + * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUPlayerStorageIds\@\@\@Z */ MCAPI std::string getServerId(struct PlayerStorageIds const &); /** - * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@_N\@Z + * @symbol ?getServerId\@LevelStorage\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@_N\@Z */ MCAPI std::string getServerId(class Player const &, bool); /** - * @symbol ?loadAllPlayerIDs\@LevelStorage\@\@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\@\@_N\@Z + * @symbol ?loadAllPlayerIDs\@LevelStorage\@\@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\@\@_N\@Z */ MCAPI std::vector loadAllPlayerIDs(bool) const; /** - * @symbol ?loadPlayerDataFromTag\@LevelStorage\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?loadPlayerDataFromTag\@LevelStorage\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::unique_ptr loadPlayerDataFromTag(class gsl::basic_string_span); + MCAPI std::unique_ptr loadPlayerDataFromTag(class std::basic_string_view>); /** - * @symbol ?loadServerPlayerData\@LevelStorage\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVPlayer\@\@_N\@Z + * @symbol ?loadServerPlayerData\@LevelStorage\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVPlayer\@\@_N\@Z */ MCAPI std::unique_ptr loadServerPlayerData(class Player const &, bool); /** - * @symbol ?save\@LevelStorage\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?save\@LevelStorage\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void save(class Actor &); /** - * @symbol ?saveData\@LevelStorage\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVCompoundTag\@\@W4Category\@DBHelpers\@\@\@Z + * @symbol ?saveData\@LevelStorage\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVCompoundTag\@\@W4Category\@DBHelpers\@\@\@Z */ MCAPI class std::shared_ptr> saveData(std::string const &, class CompoundTag const &, enum class DBHelpers::Category); /** - * @symbol ?LEGACY_CONSOLE_PLAYER_PREFIX\@LevelStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?LEGACY_CONSOLE_PLAYER_PREFIX\@LevelStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const LEGACY_CONSOLE_PLAYER_PREFIX; /** - * @symbol ?LOCAL_PLAYER_TAG\@LevelStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?LOCAL_PLAYER_TAG\@LevelStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const LOCAL_PLAYER_TAG; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelStorageEventing.hpp b/LiteLoader/include/llapi/mc/LevelStorageEventing.hpp index c54de91552..6ae911818c 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageEventing.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageEventing.hpp @@ -30,16 +30,16 @@ class LevelStorageEventing { public: /** - * @symbol ??0LevelStorageEventing\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@0\@Z + * @symbol ??0LevelStorageEventing\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@0\@Z */ MCAPI LevelStorageEventing(std::string const &, class LevelData const &, std::string const &); /** - * @symbol ?fireDBStorageError\@LevelStorageEventing\@\@QEAAXPEBD\@Z + * @symbol ?fireDBStorageError\@LevelStorageEventing\@\@QEAAXPEBD\@Z */ MCAPI void fireDBStorageError(char const *); /** - * @symbol ?fireEventWorldCorruptionCausedWorldShutdown\@LevelStorageEventing\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@_N\@3\@\@Z + * @symbol ?fireEventWorldCorruptionCausedWorldShutdown\@LevelStorageEventing\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@_N\@3\@\@Z */ MCAPI void fireEventWorldCorruptionCausedWorldShutdown(std::string const &, class std::optional); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp b/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp index f7735764d9..036add5df9 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageObserver.hpp @@ -30,12 +30,12 @@ class LevelStorageObserver { public: /** - * @symbol ??0LevelStorageObserver\@\@QEAA\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ??0LevelStorageObserver\@\@QEAA\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI LevelStorageObserver(class std::function); /** - * @symbol ?onSave\@LevelStorageObserver\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onSave\@LevelStorageObserver\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void onSave(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelStorageSource.hpp b/LiteLoader/include/llapi/mc/LevelStorageSource.hpp index 6e98aae136..9b0f87e6f7 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageSource.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageSource.hpp @@ -29,13 +29,19 @@ class LevelStorageSource { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELSTORAGESOURCE /** - * @symbol ?WORLD_SAVE_FLUSH_INTERVAL\@LevelStorageSource\@\@2V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@B + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelStorageSource(); +#endif + /** + * @symbol ?WORLD_SAVE_FLUSH_INTERVAL\@LevelStorageSource\@\@2V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@B */ MCAPI static class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const WORLD_SAVE_FLUSH_INTERVAL; /** - * @symbol ?WORLD_SAVE_MENU_FLUSH_INTERVAL\@LevelStorageSource\@\@2V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@B + * @symbol ?WORLD_SAVE_MENU_FLUSH_INTERVAL\@LevelStorageSource\@\@2V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@B */ MCAPI static class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const WORLD_SAVE_MENU_FLUSH_INTERVAL; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp b/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp index 6fb99e552d..a6f00b6646 100644 --- a/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp +++ b/LiteLoader/include/llapi/mc/LevelStorageWriteBatch.hpp @@ -35,75 +35,81 @@ struct BatchEntry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LevelStorageWriteBatch(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 1 + * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@W4Category\@DBHelpers\@\@\@Z */ - virtual void putKey(std::string const &, class gsl::basic_string_span, enum class DBHelpers::Category); + virtual void putKey(std::string const &, class std::basic_string_view>, enum class DBHelpers::Category); /** - * @vftbl 2 - * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4Category\@DBHelpers\@\@\@Z + * @vftbl 2 + * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4Category\@DBHelpers\@\@\@Z */ virtual void putKey(std::string const &, std::string const &, enum class DBHelpers::Category); /** - * @vftbl 3 - * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV23\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 3 + * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV23\@W4Category\@DBHelpers\@\@\@Z */ virtual void putKey(std::string const &, std::string &&, enum class DBHelpers::Category); /** - * @vftbl 4 - * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 4 + * @symbol ?putKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@W4Category\@DBHelpers\@\@\@Z */ virtual void putKey(std::string const &, class std::shared_ptr, enum class DBHelpers::Category); /** - * @vftbl 5 - * @symbol ?deleteKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z + * @vftbl 5 + * @symbol ?deleteKey\@LevelStorageWriteBatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Category\@DBHelpers\@\@\@Z */ virtual void deleteKey(std::string const &, enum class DBHelpers::Category); /** - * @vftbl 6 - * @symbol ?flush\@LevelStorageWriteBatch\@\@UEAAXAEAVLevelStorage\@\@\@Z + * @vftbl 6 + * @symbol ?flush\@LevelStorageWriteBatch\@\@UEAAXAEAVLevelStorage\@\@\@Z */ virtual void flush(class LevelStorage &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVELSTORAGEWRITEBATCH /** - * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@$$QEAV0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LevelStorageWriteBatch(); +#endif + /** + * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI LevelStorageWriteBatch(class LevelStorageWriteBatch &&); /** - * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@XZ + * @symbol ??0LevelStorageWriteBatch\@\@QEAA\@XZ */ MCAPI LevelStorageWriteBatch(); /** - * @symbol ?addFlushCallback\@LevelStorageWriteBatch\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?addFlushCallback\@LevelStorageWriteBatch\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void addFlushCallback(class std::function); /** - * @symbol ?clear\@LevelStorageWriteBatch\@\@QEAAXXZ + * @symbol ?clear\@LevelStorageWriteBatch\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?erase\@LevelStorageWriteBatch\@\@QEAAXAEBV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?erase\@LevelStorageWriteBatch\@\@QEAAXAEBV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void erase(class std::_Tree_const_iterator>>> const &); /** - * @symbol ?find\@LevelStorageWriteBatch\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?find\@LevelStorageWriteBatch\@\@QEBA?AV?$_Tree_const_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::_Tree_const_iterator>>> find(std::string const &) const; /** - * @symbol ?find\@LevelStorageWriteBatch\@\@QEAA?AV?$_Tree_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?find\@LevelStorageWriteBatch\@\@QEAA?AV?$_Tree_iterator\@V?$_Tree_val\@U?$_Tree_simple_types\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UBatchEntry\@LevelStorageWriteBatch\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::_Tree_iterator>>> find(std::string const &); //private: /** - * @symbol ?_writeKey\@LevelStorageWriteBatch\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$shared_ptr\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@W4Category\@DBHelpers\@\@\@Z + * @symbol ?_writeKey\@LevelStorageWriteBatch\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$shared_ptr\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@3\@W4Category\@DBHelpers\@\@\@Z */ MCAPI void _writeKey(std::string const &, class std::shared_ptr &&, enum class DBHelpers::Category); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LevelSummary.hpp b/LiteLoader/include/llapi/mc/LevelSummary.hpp index f85d5929cf..906d5ebd06 100644 --- a/LiteLoader/include/llapi/mc/LevelSummary.hpp +++ b/LiteLoader/include/llapi/mc/LevelSummary.hpp @@ -5,8 +5,8 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Core.hpp" #include "Social.hpp" +#include "Core.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -22,69 +22,69 @@ struct LevelSummary { #undef AFTER_EXTRA public: /** - * @symbol ??0LevelSummary\@\@QEAA\@XZ + * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_JW4GameType\@\@W4Difficulty\@\@VLevelSeed64\@\@H_K_N6W4GamePublishSetting\@Social\@\@6W4EducationEditionOffer\@\@AEBVGameVersion\@\@9W4StorageVersion\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@0_NAEBUEduSharedUriResource\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@6\@Z */ - MCAPI LevelSummary(); + 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\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@AEBVPath\@Core\@\@2_N\@Z + * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z */ - MCAPI LevelSummary(std::string const &, class LevelData const &, class Core::Path const &, class Core::Path const &, bool); + MCAPI LevelSummary(struct LevelSummary const &); /** - * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_JW4GameType\@\@W4Difficulty\@\@VLevelSeed64\@\@H_K_N6W4GamePublishSetting\@Social\@\@6W4EducationEditionOffer\@\@AEBVGameVersion\@\@9W4StorageVersion\@\@AEBVPath\@Core\@\@AEBVContentIdentity\@\@0_NAEBUEduSharedUriResource\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@6\@Z + * @symbol ??0LevelSummary\@\@QEAA\@XZ */ - 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); + MCAPI LevelSummary(); /** - * @symbol ??0LevelSummary\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0LevelSummary\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelData\@\@AEBVPath\@Core\@\@2_N\@Z */ - MCAPI LevelSummary(struct LevelSummary const &); + MCAPI LevelSummary(std::string const &, class LevelData const &, class Core::Path const &, class Core::Path const &, bool); /** - * @symbol ??4LevelSummary\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4LevelSummary\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct LevelSummary & operator=(struct LevelSummary const &); /** - * @symbol ?reinitializeWorldIconPath\@LevelSummary\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?reinitializeWorldIconPath\@LevelSummary\@\@QEAAXAEBVPath\@Core\@\@\@Z */ MCAPI void reinitializeWorldIconPath(class Core::Path const &); /** - * @symbol ?reinitializeWorldSize\@LevelSummary\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?reinitializeWorldSize\@LevelSummary\@\@QEAAXAEBVPath\@Core\@\@\@Z */ MCAPI void reinitializeWorldSize(class Core::Path const &); /** - * @symbol ?setName\@LevelSummary\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setName\@LevelSummary\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setName(std::string); /** - * @symbol ??1LevelSummary\@\@QEAA\@XZ + * @symbol ??1LevelSummary\@\@QEAA\@XZ */ MCAPI ~LevelSummary(); /** - * @symbol ?CUSTOM_ICON_FILENAME\@LevelSummary\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?CUSTOM_ICON_FILENAME\@LevelSummary\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const CUSTOM_ICON_FILENAME; /** - * @symbol ?DEFAULT_WORLD_ICON_FILENAME\@LevelSummary\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEFAULT_WORLD_ICON_FILENAME\@LevelSummary\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DEFAULT_WORLD_ICON_FILENAME; /** - * @symbol ?INVALID_LEVEL_ID\@LevelSummary\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?INVALID_LEVEL_ID\@LevelSummary\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const INVALID_LEVEL_ID; /** - * @symbol ?WORLD_ICON_FILENAME\@LevelSummary\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?WORLD_ICON_FILENAME\@LevelSummary\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const WORLD_ICON_FILENAME; /** - * @symbol ?buildCustomIconPath\@LevelSummary\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?buildCustomIconPath\@LevelSummary\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCAPI static class Core::PathBuffer buildCustomIconPath(class Core::Path const &); /** - * @symbol ?buildWorldIconPath\@LevelSummary\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z + * @symbol ?buildWorldIconPath\@LevelSummary\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@\@Z */ MCAPI static class Core::PathBuffer buildWorldIconPath(class Core::Path const &); //private: /** - * @symbol ?_initializeWorldIconPath\@LevelSummary\@\@AEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?_initializeWorldIconPath\@LevelSummary\@\@AEAAXAEBVPath\@Core\@\@\@Z */ MCAPI void _initializeWorldIconPath(class Core::Path const &); diff --git a/LiteLoader/include/llapi/mc/LevelUtils.hpp b/LiteLoader/include/llapi/mc/LevelUtils.hpp index ff666a24ff..d8fff12f35 100644 --- a/LiteLoader/include/llapi/mc/LevelUtils.hpp +++ b/LiteLoader/include/llapi/mc/LevelUtils.hpp @@ -22,7 +22,7 @@ namespace LevelUtils { #undef AFTER_EXTRA /** - * @symbol ?projectToTimeOfDay\@LevelUtils\@\@YAHHH\@Z + * @symbol ?projectToTimeOfDay\@LevelUtils\@\@YAHHH\@Z */ MCAPI int projectToTimeOfDay(int, int); diff --git a/LiteLoader/include/llapi/mc/LeverActionEvent.hpp b/LiteLoader/include/llapi/mc/LeverActionEvent.hpp index 526691437d..2ff7171190 100644 --- a/LiteLoader/include/llapi/mc/LeverActionEvent.hpp +++ b/LiteLoader/include/llapi/mc/LeverActionEvent.hpp @@ -27,11 +27,11 @@ struct LeverActionEvent { public: /** - * @symbol ??0LeverActionEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0LeverActionEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI LeverActionEvent(struct LeverActionEvent const &); /** - * @symbol ??1LeverActionEvent\@\@QEAA\@XZ + * @symbol ??1LeverActionEvent\@\@QEAA\@XZ */ MCAPI ~LeverActionEvent(); diff --git a/LiteLoader/include/llapi/mc/LeverBlock.hpp b/LiteLoader/include/llapi/mc/LeverBlock.hpp index bbc9c350e5..89cf0ed3ca 100644 --- a/LiteLoader/include/llapi/mc/LeverBlock.hpp +++ b/LiteLoader/include/llapi/mc/LeverBlock.hpp @@ -31,309 +31,314 @@ class LeverBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LeverBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@LeverBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@LeverBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 58 - * @symbol ?onFillBlock\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 58 + * @symbol ?onFillBlock\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LeverBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LeverBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 108 - * @symbol ?isAttachedTo\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 108 + * @symbol ?isAttachedTo\@LeverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool isAttachedTo(class BlockSource &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@LeverBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@LeverBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@LeverBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@LeverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@LeverBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@LeverBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@LeverBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@LeverBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?updateShape\@LeverBlock\@\@UEAAXPEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?updateShape\@LeverBlock\@\@UEAAXPEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void updateShape(class BlockSource *, class BlockPos const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LEVERBLOCK /** - * @symbol ?isInteractiveBlock\@LeverBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@LeverBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; /** - * @symbol ?isLeverBlock\@LeverBlock\@\@UEBA_NXZ + * @symbol ?isLeverBlock\@LeverBlock\@\@UEBA_NXZ */ MCVAPI bool isLeverBlock() const; #endif /** - * @symbol ??0LeverBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LeverBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LeverBlock(std::string const &, int); /** - * @symbol ?toggle\@LeverBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVPlayer\@\@\@Z + * @symbol ?toggle\@LeverBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVPlayer\@\@\@Z */ MCAPI void toggle(class BlockSource &, class BlockPos const &, class Player *) const; /** - * @symbol ?getLeverFacing\@LeverBlock\@\@SA?AW4LeverDirection\@\@H\@Z + * @symbol ?getLeverFacing\@LeverBlock\@\@SA?AW4LeverDirection\@\@H\@Z */ MCAPI static enum class LeverDirection getLeverFacing(int); //private: /** - * @symbol ?_getShape\@LeverBlock\@\@AEBAXAEBVBlock\@\@AEAVAABB\@\@\@Z + * @symbol ?_getShape\@LeverBlock\@\@AEBAXAEBVBlock\@\@AEAVAABB\@\@\@Z */ MCAPI void _getShape(class Block const &, class AABB &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp index f07db1a175..703e4b4849 100644 --- a/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/LibraryScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure LibraryScreenCapabilities. - * - */ -struct LibraryScreenCapabilities { + +class LibraryScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,27 @@ struct LibraryScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIBRARYSCREENCAPABILITIES public: - struct LibraryScreenCapabilities& operator=(struct LibraryScreenCapabilities const &) = delete; - LibraryScreenCapabilities(struct LibraryScreenCapabilities const &) = delete; + class LibraryScreenCapabilities& operator=(class LibraryScreenCapabilities const &) = delete; + LibraryScreenCapabilities(class LibraryScreenCapabilities const &) = delete; LibraryScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LibraryScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@ULibraryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@ULibraryScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LIBRARYSCREENCAPABILITIES + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LibraryScreenCapabilities(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LightBlock.hpp b/LiteLoader/include/llapi/mc/LightBlock.hpp index 72a4d6fabf..d98a41ce29 100644 --- a/LiteLoader/include/llapi/mc/LightBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightBlock.hpp @@ -31,268 +31,273 @@ class LightBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LightBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@LightBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@LightBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@LightBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@LightBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@LightBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@LightBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@LightBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@LightBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 83 - * @symbol ?isFilteredOut\@LightBlock\@\@UEBA_NW4BlockRenderLayer\@\@\@Z + * @vftbl 83 + * @symbol ?isFilteredOut\@LightBlock\@\@UEBA_NW4BlockRenderLayer\@\@\@Z */ virtual bool isFilteredOut(enum class BlockRenderLayer) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 - * @symbol ?tryToPlace\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z + * @vftbl 94 + * @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 - * @symbol ?asItemInstance\@LightBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LightBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LightBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 114 - * @symbol ?canBeBuiltOver\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z + * @vftbl 114 + * @symbol ?canBeBuiltOver\@LightBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@LightBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@LightBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 152 - * @symbol ?init\@LightBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@LightBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 153 - * @symbol ?getLightEmission\@LightBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@LightBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@LightBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@LightBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0LightBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0LightBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI LightBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LightGemBlock.hpp b/LiteLoader/include/llapi/mc/LightGemBlock.hpp index ff356c9358..44f848fba6 100644 --- a/LiteLoader/include/llapi/mc/LightGemBlock.hpp +++ b/LiteLoader/include/llapi/mc/LightGemBlock.hpp @@ -31,208 +31,213 @@ class LightGemBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LightGemBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 71 - * @symbol ?dispense\@LightGemBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @symbol ?dispense\@LightGemBlock\@\@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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@LightGemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@LightGemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@LightGemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@LightGemBlock\@\@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 ??0LightGemBlock\@\@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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LightningBolt.hpp b/LiteLoader/include/llapi/mc/LightningBolt.hpp index 8f1dd3378d..7e15d81585 100644 --- a/LiteLoader/include/llapi/mc/LightningBolt.hpp +++ b/LiteLoader/include/llapi/mc/LightningBolt.hpp @@ -31,157 +31,157 @@ class LightningBolt : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@LightningBolt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@LightningBolt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@LightningBolt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@LightningBolt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~LightningBolt(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@LightningBolt\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@LightningBolt\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@LightningBolt\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@LightningBolt\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@LightningBolt\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@LightningBolt\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@LightningBolt\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@LightningBolt\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LIGHTNINGBOLT /** - * @symbol ?shouldAlwaysRender\@LightningBolt\@\@UEAA_NXZ + * @symbol ?shouldAlwaysRender\@LightningBolt\@\@UEAA_NXZ */ MCVAPI bool shouldAlwaysRender(); #endif /** - * @symbol ??0LightningBolt\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0LightningBolt\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI LightningBolt(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); //private: /** - * @symbol ?_shouldSetOnFire\@LightningBolt\@\@AEBA_NXZ + * @symbol ?_shouldSetOnFire\@LightningBolt\@\@AEBA_NXZ */ MCAPI bool _shouldSetOnFire() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LightningBoltUtil.hpp b/LiteLoader/include/llapi/mc/LightningBoltUtil.hpp index 3886839081..9df61f549d 100644 --- a/LiteLoader/include/llapi/mc/LightningBoltUtil.hpp +++ b/LiteLoader/include/llapi/mc/LightningBoltUtil.hpp @@ -22,7 +22,7 @@ namespace LightningBoltUtil { #undef AFTER_EXTRA /** - * @symbol ?_clearCopperOnLightningStrike\@LightningBoltUtil\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_clearCopperOnLightningStrike\@LightningBoltUtil\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _clearCopperOnLightningStrike(class BlockSource &, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/LightningRod.hpp b/LiteLoader/include/llapi/mc/LightningRod.hpp index ace26538a2..26a8e17169 100644 --- a/LiteLoader/include/llapi/mc/LightningRod.hpp +++ b/LiteLoader/include/llapi/mc/LightningRod.hpp @@ -31,273 +31,268 @@ class LightningRod : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LightningRod(); + virtual void __unk_vfn_0(); /** - * @vftbl 15 - * @symbol ?onProjectileHit\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 16 - * @symbol ?onLightningHit\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?onLightningHit\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLightningHit(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@LightningRod\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@LightningRod\@\@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 + * @vftbl 25 + * @symbol ?canConnect\@LightningRod\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@LightningRod\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@LightningRod\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LightningRod\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@LightningRod\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@LightningRod\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@LightningRod\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@LightningRod\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@LightningRod\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@LightningRod\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@LightningRod\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@LightningRod\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@LightningRod\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 - * @symbol ?animateTick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@LightningRod\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@LightningRod\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@LightningRod\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z - */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; - /** - * @symbol ??0LightningRod\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0LightningRod\@\@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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LightningRodUtil.hpp b/LiteLoader/include/llapi/mc/LightningRodUtil.hpp index d05d317c10..8009b8070c 100644 --- a/LiteLoader/include/llapi/mc/LightningRodUtil.hpp +++ b/LiteLoader/include/llapi/mc/LightningRodUtil.hpp @@ -22,7 +22,7 @@ namespace LightningRodUtil { #undef AFTER_EXTRA /** - * @symbol ?emitLightningRodParticles\@LightningRodUtil\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?emitLightningRodParticles\@LightningRodUtil\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void emitLightningRodParticles(class BlockSource &, class BlockPos const &, int); diff --git a/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp index 0f5460bfc3..ce3efc0e03 100644 --- a/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/LingeringPotionItem.hpp @@ -33,118 +33,118 @@ class LingeringPotionItem : public PotionItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LingeringPotionItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@LingeringPotionItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@LingeringPotionItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@LingeringPotionItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@LingeringPotionItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@LingeringPotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@LingeringPotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@LingeringPotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@LingeringPotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@LingeringPotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@LingeringPotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@LingeringPotionItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@LingeringPotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@LingeringPotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 - * @symbol ?getPotionType\@LingeringPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ + * @vftbl 133 + * @symbol ?getPotionType\@LingeringPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ virtual enum class Potion::PotionType getPotionType() const; /** - * @symbol ??0LingeringPotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LingeringPotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LingeringPotionItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LiquidBlock.hpp b/LiteLoader/include/llapi/mc/LiquidBlock.hpp index f483297bb5..4e31c053a8 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlock.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlock.hpp @@ -31,307 +31,316 @@ class LiquidBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LiquidBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@LiquidBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@LiquidBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@LiquidBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@LiquidBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@LiquidBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 90 - * @symbol ?mayPick\@LiquidBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z + * @vftbl 90 + * @symbol ?mayPick\@LiquidBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 110 - * @symbol ?handleEntityInside\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z + * @vftbl 110 + * @symbol ?handleEntityInside\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z */ virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@LiquidBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@LiquidBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColorAtPos\@LiquidBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 137 + * @symbol ?getColorAtPos\@LiquidBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@LiquidBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@LiquidBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 151 - * @symbol ?animateTick\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@LiquidBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@LiquidBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@LiquidBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@LiquidBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LIQUIDBLOCK /** - * @symbol ?canBeSilkTouched\@LiquidBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@LiquidBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LiquidBlock(); #endif /** - * @symbol ??0LiquidBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0LiquidBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI LiquidBlock(std::string const &, int, class Material const &); /** - * @symbol ?getTickDelay\@LiquidBlock\@\@QEBAHAEAVBlockSource\@\@\@Z + * @symbol ?getTickDelay\@LiquidBlock\@\@QEBAHAEAVBlockSource\@\@\@Z */ MCAPI int getTickDelay(class BlockSource &) const; /** - * @symbol ?getHeightFromDepth\@LiquidBlock\@\@SAMH\@Z + * @symbol ?getHeightFromDepth\@LiquidBlock\@\@SAMH\@Z */ MCAPI static float getHeightFromDepth(int); /** - * @symbol ?handleEntityInside\@LiquidBlock\@\@SAXAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAVVec3\@\@AEBVMaterial\@\@\@Z + * @symbol ?handleEntityInside\@LiquidBlock\@\@SAXAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAVVec3\@\@AEBVMaterial\@\@\@Z */ MCAPI static void handleEntityInside(class IConstBlockSource const &, class BlockPos const &, class Vec3 &, class Material const &); //protected: /** - * @symbol ?emitFizzParticle\@LiquidBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?emitFizzParticle\@LiquidBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void emitFizzParticle(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?solidify\@LiquidBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?solidify\@LiquidBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCAPI void solidify(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @symbol ?trySpreadFire\@LiquidBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?trySpreadFire\@LiquidBlock\@\@IEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void trySpreadFire(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?getDepth\@LiquidBlock\@\@KAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVMaterial\@\@\@Z + * @symbol ?getDepth\@LiquidBlock\@\@KAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVMaterial\@\@\@Z */ MCAPI static int getDepth(class IConstBlockSource const &, class BlockPos const &, class Material const &); /** - * @symbol ?getRenderedDepth\@LiquidBlock\@\@KAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVMaterial\@\@\@Z + * @symbol ?getRenderedDepth\@LiquidBlock\@\@KAHAEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVMaterial\@\@\@Z */ MCAPI static int getRenderedDepth(class IConstBlockSource const &, class BlockPos const &, class Material const &); //private: /** - * @symbol ?_solidify\@LiquidBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?_solidify\@LiquidBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCAPI void _solidify(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @symbol ?_getFlow\@LiquidBlock\@\@CA?AVVec3\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVMaterial\@\@\@Z + * @symbol ?_getFlow\@LiquidBlock\@\@CA?AVVec3\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVMaterial\@\@\@Z */ MCAPI static class Vec3 _getFlow(class IConstBlockSource const &, class BlockPos const &, class Material const &); @@ -339,4 +348,4 @@ class LiquidBlock : public BlockLegacy { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp index 3b28de7954..ed4dcf7535 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockDynamic.hpp @@ -31,244 +31,249 @@ class LiquidBlockDynamic : public LiquidBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LiquidBlockDynamic(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@LiquidBlockDynamic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0LiquidBlockDynamic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0LiquidBlockDynamic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI LiquidBlockDynamic(std::string const &, int, class Material const &); /** - * @symbol ?getSpread\@LiquidBlockDynamic\@\@QEBA?AV?$array\@_N$03\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getSpread\@LiquidBlockDynamic\@\@QEBA?AV?$array\@_N$03\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::array getSpread(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?shouldBecomeStatic\@LiquidBlockDynamic\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?shouldBecomeStatic\@LiquidBlockDynamic\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI bool shouldBecomeStatic(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_canSpreadTo\@LiquidBlockDynamic\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@1E\@Z + * @symbol ?_canSpreadTo\@LiquidBlockDynamic\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@1E\@Z */ MCAPI bool _canSpreadTo(class BlockSource &, class BlockPos const &, class BlockPos const &, unsigned char) const; /** - * @symbol ?_getSlopeDistance\@LiquidBlockDynamic\@\@AEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?_getSlopeDistance\@LiquidBlockDynamic\@\@AEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI int _getSlopeDistance(class BlockSource &, class BlockPos const &, int, int) const; /** - * @symbol ?_isWaterBlocking\@LiquidBlockDynamic\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@1E\@Z + * @symbol ?_isWaterBlocking\@LiquidBlockDynamic\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@1E\@Z */ MCAPI bool _isWaterBlocking(class BlockSource &, class BlockPos const &, class BlockPos const &, unsigned char) const; /** - * @symbol ?_setStatic\@LiquidBlockDynamic\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_setStatic\@LiquidBlockDynamic\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void _setStatic(class BlockSource &, class BlockPos const &, bool) const; /** - * @symbol ?_tick\@LiquidBlockDynamic\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z + * @symbol ?_tick\@LiquidBlockDynamic\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI bool _tick(class BlockSource &, class BlockPos const &, class Random &, bool) const; /** - * @symbol ?_trySpreadTo\@LiquidBlockDynamic\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H1E\@Z + * @symbol ?_trySpreadTo\@LiquidBlockDynamic\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H1E\@Z */ MCAPI void _trySpreadTo(class BlockSource &, class BlockPos const &, int, class BlockPos const &, unsigned char) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp index 52febfaf4a..f707a79a14 100644 --- a/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp +++ b/LiteLoader/include/llapi/mc/LiquidBlockStatic.hpp @@ -31,216 +31,221 @@ class LiquidBlockStatic : public LiquidBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LiquidBlockStatic(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@LiquidBlockStatic\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0LiquidBlockStatic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0LiquidBlockStatic\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI LiquidBlockStatic(std::string const &, int, class Material const &); //private: /** - * @symbol ?_setDynamic\@LiquidBlockStatic\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_setDynamic\@LiquidBlockStatic\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _setDynamic(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp b/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp index 9ab509246d..2ac822e7a2 100644 --- a/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidPhysicsSystem.hpp @@ -10,46 +10,27 @@ #undef BEFORE_EXTRA -/** - * @brief MC class LiquidPhysicsSystem. - * - */ -class LiquidPhysicsSystem { + +namespace LiquidPhysicsSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIQUIDPHYSICSSYSTEM -public: - class LiquidPhysicsSystem& operator=(class LiquidPhysicsSystem const &) = delete; - LiquidPhysicsSystem(class LiquidPhysicsSystem const &) = delete; - LiquidPhysicsSystem() = delete; -#endif - -public: - /** - * @symbol ?_liquidBlockFetch\@LiquidPhysicsSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUUpdateWaterStateRequestComponent\@\@AEBUAABBShapeComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UItemActorFlag\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z - */ - MCAPI static void _liquidBlockFetch(class StrictEntityContext const &, struct UpdateWaterStateRequestComponent &, struct AABBShapeComponent const &, class Optional const>, class IConstBlockSource const &); - /** - * @symbol ?_tickLiquidBlocksFetch\@LiquidPhysicsSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UUpdateWaterStateRequestComponent\@\@$$CBUAABBShapeComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UItemActorFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI static void _tickLiquidBlocksFetch(class ViewT const>>, class ViewT, class OptionalGlobalT); /** - * @symbol ?applyPhysics\@LiquidPhysicsSystem\@\@SA_NW4MaterialType\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_liquidBlockFetch\@LiquidPhysicsSystem\@\@YAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@AEAUUpdateWaterStateRequestComponent\@\@AEBUAABBShapeComponent\@\@AEBUSubBBsComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UItemActorFlag\@\@\@\@\@\@AEAV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static bool applyPhysics(enum class MaterialType, class IConstBlockSource const &, class AABB const &, struct StateVectorComponent &); + MCAPI void _liquidBlockFetch(class StrictEntityContext const &, struct StateVectorComponent &, struct UpdateWaterStateRequestComponent &, struct AABBShapeComponent const &, struct SubBBsComponent const &, class Optional const>, std::vector &, class IConstBlockSource const &); /** - * @symbol ?createApplyFlowSystem\@LiquidPhysicsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?applyPhysics\@LiquidPhysicsSystem\@\@YA_NW4MaterialType\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@AEAUStateVectorComponent\@\@\@Z */ - MCAPI static struct TickingSystemWithInfo createApplyFlowSystem(); + MCAPI bool applyPhysics(enum class MaterialType, class IConstBlockSource const &, class AABB const &, struct StateVectorComponent &); /** - * @symbol ?createFilterSystem\@LiquidPhysicsSystem\@\@SA?AUTickingSystemWithInfo\@\@_N\@Z + * @symbol ?createFilterSystem\@LiquidPhysicsSystem\@\@YA?AUTickingSystemWithInfo\@\@_N\@Z */ - MCAPI static struct TickingSystemWithInfo createFilterSystem(bool); + MCAPI struct TickingSystemWithInfo createFilterSystem(bool); /** - * @symbol ?createLiquidFetchingSystem\@LiquidPhysicsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createLiquidFetchingSystem\@LiquidPhysicsSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createLiquidFetchingSystem(); + MCAPI struct TickingSystemWithInfo createLiquidFetchingSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp b/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp index d471347df6..f62685bb52 100644 --- a/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/LiquidPhysicsSystemImpl.hpp @@ -28,20 +28,20 @@ class LiquidPhysicsSystemImpl { public: /** - * @symbol ?_applyFlow\@LiquidPhysicsSystemImpl\@\@SAXAEAUStateVectorComponent\@\@VVec3\@\@W4MaterialType\@\@\@Z + * @symbol ?_applyFlow\@LiquidPhysicsSystemImpl\@\@SAXAEAUStateVectorComponent\@\@VVec3\@\@W4MaterialType\@\@\@Z */ MCAPI static void _applyFlow(struct StateVectorComponent &, class Vec3, enum class MaterialType); /** - * @symbol ?_getLiquidBlocksInAABB\@LiquidPhysicsSystemImpl\@\@SAXAEAV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@W4MaterialType\@\@\@Z + * @symbol ?_getLiquidBlocksInAABB\@LiquidPhysicsSystemImpl\@\@SAXAEAV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@AEBVAABB\@\@W4MaterialType\@\@\@Z */ MCAPI static void _getLiquidBlocksInAABB(std::vector &, class IConstBlockSource const &, class AABB const &, enum class MaterialType); /** - * @symbol ?_hasAdjacentFlowingBlock\@LiquidPhysicsSystemImpl\@\@SA_NAEBV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@W4MaterialType\@\@\@Z + * @symbol ?_hasAdjacentFlowingBlock\@LiquidPhysicsSystemImpl\@\@SA_NAEBV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@W4MaterialType\@\@\@Z */ MCAPI static bool _hasAdjacentFlowingBlock(std::vector const &, class IConstBlockSource const &, enum class MaterialType); /** - * @symbol ?_hasFlowingBlock\@LiquidPhysicsSystemImpl\@\@SA_NAEBV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_hasFlowingBlock\@LiquidPhysicsSystemImpl\@\@SA_NAEBV?$vector\@ULiquidBlockEntry\@\@V?$allocator\@ULiquidBlockEntry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static bool _hasFlowingBlock(std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LiquidSensingSystem.hpp b/LiteLoader/include/llapi/mc/LiquidSensingSystem.hpp deleted file mode 100644 index c5af4af39a..0000000000 --- a/LiteLoader/include/llapi/mc/LiquidSensingSystem.hpp +++ /dev/null @@ -1,47 +0,0 @@ -/** - * @file LiquidSensingSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class LiquidSensingSystem. - * - */ -class LiquidSensingSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_LIQUIDSENSINGSYSTEM -public: - class LiquidSensingSystem& operator=(class LiquidSensingSystem const &) = delete; - LiquidSensingSystem(class LiquidSensingSystem const &) = delete; - LiquidSensingSystem() = delete; -#endif - -public: - /** - * @symbol ?createFlagResetSystem\@LiquidSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createFlagResetSystem(); - /** - * @symbol ?createSensingSystem\@LiquidSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSensingSystem(); - -//private: - /** - * @symbol ?_tickSensingSystem\@LiquidSensingSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UUpdateWaterStateRequestComponent\@\@$$CBUAABBShapeComponent\@\@$$CBUSubBBsComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUDimensionTypeComponent\@\@\@\@V?$OptionalGlobalT\@$$CBULocalConstBlockSourceFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z - */ - MCAPI static void _tickSensingSystem(class ViewT, class ViewT, class OptionalGlobalT); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp index 5167a67dac..e109fe7f59 100644 --- a/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidSplashRequestSystem.hpp @@ -28,16 +28,16 @@ class LiquidSplashRequestSystem { public: /** - * @symbol ?createSystem\@LiquidSplashRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@LiquidSplashRequestSystem\@\@SA?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 + * @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>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp b/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp index ab1433c0e2..a0118bd6c4 100644 --- a/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp +++ b/LiteLoader/include/llapi/mc/LiquidSplashSystem.hpp @@ -28,8 +28,8 @@ class LiquidSplashSystem { public: /** - * @symbol ?createSystem\@LiquidSplashSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@LiquidSplashSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ListCommand.hpp b/LiteLoader/include/llapi/mc/ListCommand.hpp index 414a6a8b80..b2453b5c39 100644 --- a/LiteLoader/include/llapi/mc/ListCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListCommand.hpp @@ -31,18 +31,18 @@ class ListCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ListCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ListCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ListCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ListCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ListDCommand.hpp b/LiteLoader/include/llapi/mc/ListDCommand.hpp index 3a76ff8fd1..e99d9b0ac5 100644 --- a/LiteLoader/include/llapi/mc/ListDCommand.hpp +++ b/LiteLoader/include/llapi/mc/ListDCommand.hpp @@ -31,18 +31,18 @@ class ListDCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ListDCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ListDCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ListDCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ListDCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ListDCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ListTag.hpp b/LiteLoader/include/llapi/mc/ListTag.hpp index ffde804152..8d33135556 100644 --- a/LiteLoader/include/llapi/mc/ListTag.hpp +++ b/LiteLoader/include/llapi/mc/ListTag.hpp @@ -64,110 +64,116 @@ class ListTag : public Tag { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ListTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?deleteChildren\@ListTag\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?deleteChildren\@ListTag\@\@UEAAXXZ */ virtual void deleteChildren(); /** - * @vftbl 2 - * @symbol ?write\@ListTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ListTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@ListTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@ListTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@ListTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@ListTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@ListTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@ListTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@ListTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@ListTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 8 - * @symbol ?print\@ListTag\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPrintStream\@\@\@Z + * @vftbl 8 + * @symbol ?print\@ListTag\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPrintStream\@\@\@Z */ virtual void print(std::string const &, class PrintStream &) const; /** - * @vftbl 9 - * @symbol ?copy\@ListTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@ListTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@ListTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@ListTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LISTTAG /** - * @symbol ??0ListTag\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ListTag(); +#endif + /** + * @symbol ??0ListTag\@\@QEAA\@XZ */ MCAPI ListTag(); /** - * @symbol ?add\@ListTag\@\@QEAAXV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?add\@ListTag\@\@QEAAXV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void add(std::unique_ptr); /** - * @symbol ?copyList\@ListTag\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?copyList\@ListTag\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr copyList() const; /** - * @symbol ?erase\@ListTag\@\@QEAAX_K\@Z + * @symbol ?erase\@ListTag\@\@QEAAX_K\@Z */ MCAPI void erase(unsigned __int64); /** - * @symbol ?forEachCompoundTag\@ListTag\@\@QEBAXV?$function\@$$A6AXAEBVCompoundTag\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachCompoundTag\@ListTag\@\@QEBAXV?$function\@$$A6AXAEBVCompoundTag\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachCompoundTag(class std::function) const; /** - * @symbol ?get\@ListTag\@\@QEBAPEAVTag\@\@H\@Z + * @symbol ?get\@ListTag\@\@QEBAPEAVTag\@\@H\@Z */ MCAPI class Tag * get(int) const; /** - * @symbol ?getCompound\@ListTag\@\@QEAAPEAVCompoundTag\@\@_K\@Z + * @symbol ?getCompound\@ListTag\@\@QEAAPEAVCompoundTag\@\@_K\@Z */ MCAPI class CompoundTag * getCompound(unsigned __int64); /** - * @symbol ?getCompound\@ListTag\@\@QEBAPEBVCompoundTag\@\@_K\@Z + * @symbol ?getCompound\@ListTag\@\@QEBAPEBVCompoundTag\@\@_K\@Z */ MCAPI class CompoundTag const * getCompound(unsigned __int64) const; /** - * @symbol ?getDouble\@ListTag\@\@QEBANH\@Z + * @symbol ?getDouble\@ListTag\@\@QEBANH\@Z */ MCAPI double getDouble(int) const; /** - * @symbol ?getFloat\@ListTag\@\@QEBAMH\@Z + * @symbol ?getFloat\@ListTag\@\@QEBAMH\@Z */ MCAPI float getFloat(int) const; /** - * @symbol ?getInt\@ListTag\@\@QEBAHH\@Z + * @symbol ?getInt\@ListTag\@\@QEBAHH\@Z */ MCAPI int getInt(int) const; /** - * @symbol ?getString\@ListTag\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getString\@ListTag\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI std::string const & getString(int) const; /** - * @symbol ?popBack\@ListTag\@\@QEAAXXZ + * @symbol ?popBack\@ListTag\@\@QEAAXXZ */ MCAPI void popBack(); /** - * @symbol ?size\@ListTag\@\@QEBAHXZ + * @symbol ?size\@ListTag\@\@QEBAHXZ */ MCAPI int size() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp b/LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp index 71618aae15..74f973161b 100644 --- a/LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp +++ b/LiteLoader/include/llapi/mc/ListTagFloatAdder.hpp @@ -30,12 +30,12 @@ class ListTagFloatAdder { public: /** - * @symbol ??RListTagFloatAdder\@\@QEAAAEAV0\@M\@Z + * @symbol ??RListTagFloatAdder\@\@QEAAAEAV0\@M\@Z */ MCAPI class ListTagFloatAdder & operator()(float); /** - * @symbol ??1ListTagFloatAdder\@\@QEAA\@XZ + * @symbol ??1ListTagFloatAdder\@\@QEAA\@XZ */ MCAPI ~ListTagFloatAdder(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ListTagIntAdder.hpp b/LiteLoader/include/llapi/mc/ListTagIntAdder.hpp index 4027ba924c..6a2698d87d 100644 --- a/LiteLoader/include/llapi/mc/ListTagIntAdder.hpp +++ b/LiteLoader/include/llapi/mc/ListTagIntAdder.hpp @@ -30,12 +30,12 @@ class ListTagIntAdder { public: /** - * @symbol ??RListTagIntAdder\@\@QEAAAEAV0\@H\@Z + * @symbol ??RListTagIntAdder\@\@QEAAAEAV0\@H\@Z */ MCAPI class ListTagIntAdder & operator()(int); /** - * @symbol ??1ListTagIntAdder\@\@QEAA\@XZ + * @symbol ??1ListTagIntAdder\@\@QEAA\@XZ */ MCAPI ~ListTagIntAdder(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ListenerInfo.hpp b/LiteLoader/include/llapi/mc/ListenerInfo.hpp index c6a1411ee9..ef0293159f 100644 --- a/LiteLoader/include/llapi/mc/ListenerInfo.hpp +++ b/LiteLoader/include/llapi/mc/ListenerInfo.hpp @@ -34,8 +34,8 @@ class ListenerInfo { private: /** - * @symbol ?SQRT_FLT_MAX\@ListenerInfo\@\@0MB + * @symbol ?SQRT_FLT_MAX\@ListenerInfo\@\@0MB */ MCAPI static float const SQRT_FLT_MAX; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Llama.hpp b/LiteLoader/include/llapi/mc/Llama.hpp index 18bb8d44be..858daf75c6 100644 --- a/LiteLoader/include/llapi/mc/Llama.hpp +++ b/LiteLoader/include/llapi/mc/Llama.hpp @@ -32,163 +32,158 @@ class Llama : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Llama(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 123 - * @symbol ?onFailedTame\@Llama\@\@UEAAXXZ + * @vftbl 122 + * @symbol ?onFailedTame\@Llama\@\@UEAAXXZ */ virtual void onFailedTame(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 183 - * @symbol ?causeFallDamage\@Llama\@\@MEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@Llama\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Llama\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Llama\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Llama\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Llama\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@Llama\@\@UEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@Llama\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Llama\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Llama\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Llama(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LlamaSpit.hpp b/LiteLoader/include/llapi/mc/LlamaSpit.hpp index 748120d1c9..52817f51fc 100644 --- a/LiteLoader/include/llapi/mc/LlamaSpit.hpp +++ b/LiteLoader/include/llapi/mc/LlamaSpit.hpp @@ -32,143 +32,143 @@ class LlamaSpit : public PredictableProjectile { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~LlamaSpit(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@LlamaSpit\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@LlamaSpit\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@LlamaSpit\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@LlamaSpit\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 88 - * @symbol ?getBrightness\@LlamaSpit\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?getBrightness\@LlamaSpit\@\@UEBAMMAEBVIConstBlockSource\@\@\@Z */ virtual float getBrightness(float, class IConstBlockSource const &) const; /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@LlamaSpit\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@LlamaSpit\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 143 - * @symbol ?getPickRadius\@LlamaSpit\@\@UEAAMXZ + * @vftbl 142 + * @symbol ?getPickRadius\@LlamaSpit\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@LlamaSpit\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@LlamaSpit\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0LlamaSpit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0LlamaSpit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI LlamaSpit(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoadedResourceData.hpp b/LiteLoader/include/llapi/mc/LoadedResourceData.hpp index b2c1625cce..688a5129a6 100644 --- a/LiteLoader/include/llapi/mc/LoadedResourceData.hpp +++ b/LiteLoader/include/llapi/mc/LoadedResourceData.hpp @@ -28,8 +28,8 @@ class LoadedResourceData { public: /** - * @symbol ??1LoadedResourceData\@\@QEAA\@XZ + * @symbol ??1LoadedResourceData\@\@QEAA\@XZ */ MCAPI ~LoadedResourceData(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoadingProgressTickingSystem.hpp b/LiteLoader/include/llapi/mc/LoadingProgressTickingSystem.hpp index 29c74c24f9..549c5e2fb6 100644 --- a/LiteLoader/include/llapi/mc/LoadingProgressTickingSystem.hpp +++ b/LiteLoader/include/llapi/mc/LoadingProgressTickingSystem.hpp @@ -32,8 +32,8 @@ class LoadingProgressTickingSystem { private: /** - * @symbol ?mChunksNeededForLoadOffsets\@LoadingProgressTickingSystem\@\@0V?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@B + * @symbol ?mChunksNeededForLoadOffsets\@LoadingProgressTickingSystem\@\@0V?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const mChunksNeededForLoadOffsets; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LocalConnector.hpp b/LiteLoader/include/llapi/mc/LocalConnector.hpp index e4403e4643..9046e54567 100644 --- a/LiteLoader/include/llapi/mc/LocalConnector.hpp +++ b/LiteLoader/include/llapi/mc/LocalConnector.hpp @@ -32,105 +32,105 @@ class LocalConnector { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LocalConnector(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?getLocalIp\@LocalConnector\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocalIp\@LocalConnector\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getLocalIp(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?getConnectedGameInfo\@LocalConnector\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ + * @vftbl 5 + * @symbol ?getConnectedGameInfo\@LocalConnector\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ */ virtual class Social::GameConnectionInfo const & getConnectedGameInfo() const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getNatPunchInfo\@LocalConnector\@\@UEBA?AUNatPunchInfo\@Connector\@\@XZ + * @vftbl 7 + * @symbol ?getNatPunchInfo\@LocalConnector\@\@UEBA?AUNatPunchInfo\@Connector\@\@XZ */ virtual struct Connector::NatPunchInfo getNatPunchInfo() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOCALCONNECTOR /** - * @symbol ?addConnectionStateListener\@LocalConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z + * @symbol ?addConnectionStateListener\@LocalConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z */ MCVAPI void addConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?getIPv4Port\@LocalConnector\@\@UEBAGXZ + * @symbol ?getIPv4Port\@LocalConnector\@\@UEBAGXZ */ MCVAPI unsigned short getIPv4Port() const; /** - * @symbol ?getIPv6Port\@LocalConnector\@\@UEBAGXZ + * @symbol ?getIPv6Port\@LocalConnector\@\@UEBAGXZ */ MCVAPI unsigned short getIPv6Port() const; /** - * @symbol ?getLocalIps\@LocalConnector\@\@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\@\@XZ + * @symbol ?getLocalIps\@LocalConnector\@\@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\@\@XZ */ MCVAPI std::vector getLocalIps() const; /** - * @symbol ?getPort\@LocalConnector\@\@UEBAGXZ + * @symbol ?getPort\@LocalConnector\@\@UEBAGXZ */ MCVAPI unsigned short getPort() const; /** - * @symbol ?getRefinedLocalIps\@LocalConnector\@\@UEBA?AV?$vector\@USystemAddress\@RakNet\@\@V?$allocator\@USystemAddress\@RakNet\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getRefinedLocalIps\@LocalConnector\@\@UEBA?AV?$vector\@USystemAddress\@RakNet\@\@V?$allocator\@USystemAddress\@RakNet\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::vector getRefinedLocalIps() const; /** - * @symbol ?isIPv4Supported\@LocalConnector\@\@UEBA_NXZ + * @symbol ?isIPv4Supported\@LocalConnector\@\@UEBA_NXZ */ MCVAPI bool isIPv4Supported() const; /** - * @symbol ?isIPv6Supported\@LocalConnector\@\@UEBA_NXZ + * @symbol ?isIPv6Supported\@LocalConnector\@\@UEBA_NXZ */ MCVAPI bool isIPv6Supported() const; /** - * @symbol ?removeConnectionStateListener\@LocalConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z + * @symbol ?removeConnectionStateListener\@LocalConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z */ MCVAPI void removeConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?setupNatPunch\@LocalConnector\@\@UEAAX_N\@Z + * @symbol ?setupNatPunch\@LocalConnector\@\@UEAAX_N\@Z */ MCVAPI void setupNatPunch(bool); /** - * @symbol ?startNatPunchingClient\@LocalConnector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @symbol ?startNatPunchingClient\@LocalConnector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ MCVAPI void startNatPunchingClient(std::string const &, unsigned short); #endif /** - * @symbol ??0LocalConnector\@\@QEAA\@AEAUConnectionCallbacks\@Connector\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ??0LocalConnector\@\@QEAA\@AEAUConnectionCallbacks\@Connector\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI LocalConnector(struct Connector::ConnectionCallbacks &, class NetworkIdentifier const &); /** - * @symbol ?disconnect\@LocalConnector\@\@QEAAXXZ + * @symbol ?disconnect\@LocalConnector\@\@QEAAXXZ */ MCAPI void disconnect(); /** - * @symbol ?host\@LocalConnector\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z + * @symbol ?host\@LocalConnector\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z */ MCAPI void host(class NetworkIdentifier const &); /** - * @symbol ?runEvents\@LocalConnector\@\@QEAAXXZ + * @symbol ?runEvents\@LocalConnector\@\@QEAAXXZ */ MCAPI void runEvents(); @@ -138,8 +138,8 @@ class LocalConnector { private: /** - * @symbol ?sLocalConnectivitySystem\@LocalConnector\@\@0VLocalConnectivitySystem\@\@A + * @symbol ?sLocalConnectivitySystem\@LocalConnector\@\@0VLocalConnectivitySystem\@\@A */ MCAPI static class LocalConnectivitySystem sLocalConnectivitySystem; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LocalConstBlockSource.hpp b/LiteLoader/include/llapi/mc/LocalConstBlockSource.hpp index 431d4ed5b3..65c5aa5bfa 100644 --- a/LiteLoader/include/llapi/mc/LocalConstBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/LocalConstBlockSource.hpp @@ -25,8 +25,8 @@ class LocalConstBlockSource { public: /** - * @symbol ??1LocalConstBlockSource\@\@QEAA\@XZ + * @symbol ??1LocalConstBlockSource\@\@QEAA\@XZ */ MCAPI ~LocalConstBlockSource(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LocalSpatialEntityFetcher.hpp b/LiteLoader/include/llapi/mc/LocalSpatialEntityFetcher.hpp index 85a53905ec..33f2a3d3a9 100644 --- a/LiteLoader/include/llapi/mc/LocalSpatialEntityFetcher.hpp +++ b/LiteLoader/include/llapi/mc/LocalSpatialEntityFetcher.hpp @@ -25,8 +25,8 @@ class LocalSpatialEntityFetcher { public: /** - * @symbol ??1LocalSpatialEntityFetcher\@\@QEAA\@XZ + * @symbol ??1LocalSpatialEntityFetcher\@\@QEAA\@XZ */ MCAPI ~LocalSpatialEntityFetcher(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Localization.hpp b/LiteLoader/include/llapi/mc/Localization.hpp index cf065fd1b1..bb38eba7ef 100644 --- a/LiteLoader/include/llapi/mc/Localization.hpp +++ b/LiteLoader/include/llapi/mc/Localization.hpp @@ -31,76 +31,76 @@ class Localization { public: /** - * @symbol ??0Localization\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV0\@\@Z + * @symbol ??0Localization\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV0\@\@Z */ MCAPI Localization(std::string const &, class Localization *); /** - * @symbol ??0Localization\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0Localization\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI Localization(std::string const &); /** - * @symbol ?appendTranslations\@Localization\@\@QEAAXAEBV1\@\@Z + * @symbol ?appendTranslations\@Localization\@\@QEAAXAEBV?$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\@10\@Z */ - MCAPI void appendTranslations(class Localization const &); + MCAPI void appendTranslations(std::string const &, std::vector const &, std::vector const &, std::string const &); /** - * @symbol ?appendTranslations\@Localization\@\@QEAAXAEBV?$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\@10\@Z + * @symbol ?appendTranslations\@Localization\@\@QEAAXAEBV1\@\@Z */ - MCAPI void appendTranslations(std::string const &, std::vector const &, std::vector const &, std::string const &); + MCAPI void appendTranslations(class Localization const &); /** - * @symbol ?get\@Localization\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@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 + * @symbol ?get\@Localization\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@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 */ MCAPI bool get(std::string const &, std::string &, std::vector const &) const; /** - * @symbol ?getFullLanguageCode\@Localization\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFullLanguageCode\@Localization\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getFullLanguageCode() const; /** - * @symbol ?getStringIdExists\@Localization\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getStringIdExists\@Localization\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool getStringIdExists(std::string const &) const; /** - * @symbol ?loadFromPack\@Localization\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackAccessStrategy\@\@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 + * @symbol ?loadFromPack\@Localization\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPackAccessStrategy\@\@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 */ MCAPI void loadFromPack(std::string const &, class PackAccessStrategy const &, std::vector const &); /** - * @symbol ?loadFromResourcePackManager\@Localization\@\@QEAAXAEAVResourcePackManager\@\@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 ?loadFromResourcePackManager\@Localization\@\@QEAAXAEAVResourcePackManager\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void loadFromResourcePackManager(class ResourcePackManager &, std::vector const &); /** - * @symbol ??1Localization\@\@QEAA\@XZ + * @symbol ??1Localization\@\@QEAA\@XZ */ MCAPI ~Localization(); /** - * @symbol ?getLangFilePath\@Localization\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getLangFilePath\@Localization\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Core::PathBuffer getLangFilePath(std::string const &); /** - * @symbol ?getLanguageCode\@Localization\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getLanguageCode\@Localization\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI static std::string getLanguageCode(std::string const &); //protected: /** - * @symbol ?_get\@Localization\@\@IEBA?AUOptionalString\@\@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\@\@4\@\@Z + * @symbol ?_get\@Localization\@\@IEBA?AUOptionalString\@\@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\@\@4\@\@Z */ MCAPI struct OptionalString _get(std::string const &, std::vector const &) const; /** - * @symbol ?_getSimple\@Localization\@\@IEBA?AUOptionalString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_getSimple\@Localization\@\@IEBA?AUOptionalString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct OptionalString _getSimple(std::string const &) const; /** - * @symbol ?_parseFormattedString\@Localization\@\@IEBA?AUOptionalString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_parseFormattedString\@Localization\@\@IEBA?AUOptionalString\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct OptionalString _parseFormattedString(std::string const &) const; /** - * @symbol ?_replaceTokens\@Localization\@\@IEBAXAEAV?$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 + * @symbol ?_replaceTokens\@Localization\@\@IEBAXAEAV?$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 */ MCAPI void _replaceTokens(std::string &, std::vector const &) const; /** - * @symbol ?_isCommaSeperatedLanguage\@Localization\@\@KA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_isCommaSeperatedLanguage\@Localization\@\@KA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool _isCommaSeperatedLanguage(std::string const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LocateCommand.hpp b/LiteLoader/include/llapi/mc/LocateCommand.hpp index 0da7bb77bc..dfefac7001 100644 --- a/LiteLoader/include/llapi/mc/LocateCommand.hpp +++ b/LiteLoader/include/llapi/mc/LocateCommand.hpp @@ -31,30 +31,30 @@ class LocateCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LocateCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@LocateCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@LocateCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@LocateCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@LocateCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_executeLocateBiome\@LocateCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeLocateBiome\@LocateCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeLocateBiome(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_executeLocateStructure\@LocateCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeLocateStructure\@LocateCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeLocateStructure(class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LocateCommandUtil.hpp b/LiteLoader/include/llapi/mc/LocateCommandUtil.hpp index 5f54a11feb..221230eb82 100644 --- a/LiteLoader/include/llapi/mc/LocateCommandUtil.hpp +++ b/LiteLoader/include/llapi/mc/LocateCommandUtil.hpp @@ -20,7 +20,7 @@ namespace LocateCommandUtil { #undef AFTER_EXTRA /** - * @symbol ?locateNearbyBiome\@LocateCommandUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@VBlockPos\@\@PEAVDimension\@\@W4Biomes\@1\@\@Z + * @symbol ?locateNearbyBiome\@LocateCommandUtil\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@VBlockPos\@\@PEAVDimension\@\@W4Biomes\@1\@\@Z */ MCAPI class std::optional locateNearbyBiome(class BlockPos, class Dimension *, enum class LocateCommandUtil::Biomes); diff --git a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp index dfaee4c2b9..0727f98b91 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlock.hpp @@ -31,202 +31,207 @@ class LodestoneBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LodestoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@LodestoneBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0LodestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0LodestoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI LodestoneBlock(std::string const &, int, class Material const &); /** - * @symbol ?getBlockActor\@LodestoneBlock\@\@SAPEAVLodestoneBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlockActor\@LodestoneBlock\@\@SAPEAVLodestoneBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class LodestoneBlockActor * getBlockActor(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp index 358a43724f..4865e6a11c 100644 --- a/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneBlockActor.hpp @@ -31,94 +31,94 @@ class LodestoneBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LodestoneBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@LodestoneBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@LodestoneBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@LodestoneBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@LodestoneBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@LodestoneBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@LodestoneBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@LodestoneBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@LodestoneBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@LodestoneBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@LodestoneBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@LodestoneBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0LodestoneBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0LodestoneBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI LodestoneBlockActor(class BlockPos const &); /** - * @symbol ?getTrackingHandle\@LodestoneBlockActor\@\@QEBAAEBVPositionTrackingId\@\@XZ + * @symbol ?getTrackingHandle\@LodestoneBlockActor\@\@QEBAAEBVPositionTrackingId\@\@XZ */ MCAPI class PositionTrackingId const & getTrackingHandle() const; /** - * @symbol ?hasTrackingHandle\@LodestoneBlockActor\@\@QEBA_NXZ + * @symbol ?hasTrackingHandle\@LodestoneBlockActor\@\@QEBA_NXZ */ MCAPI bool hasTrackingHandle() const; /** - * @symbol ?setTrackingHandle\@LodestoneBlockActor\@\@QEAA_NAEBVPositionTrackingId\@\@\@Z + * @symbol ?setTrackingHandle\@LodestoneBlockActor\@\@QEAA_NAEBVPositionTrackingId\@\@\@Z */ MCAPI bool setTrackingHandle(class PositionTrackingId const &); @@ -126,8 +126,8 @@ class LodestoneBlockActor : public BlockActor { private: /** - * @symbol ?sTagName_Handle\@LodestoneBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?sTagName_Handle\@LodestoneBlockActor\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const sTagName_Handle; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp index 4fdbcb290b..333302f4fb 100644 --- a/LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassComponent.hpp @@ -30,48 +30,48 @@ class LodestoneCompassComponent { public: /** - * @symbol ??0LodestoneCompassComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0LodestoneCompassComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI LodestoneCompassComponent(class LodestoneCompassComponent &&); /** - * @symbol ?getAnimationFrame\@LodestoneCompassComponent\@\@QEAAHAEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@AEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getAnimationFrame\@LodestoneCompassComponent\@\@QEAAHAEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@AEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI int getAnimationFrame(class std::variant>> const &, class BlockPos const &, class AutomaticID const &); /** - * @symbol ?initialize\@LodestoneCompassComponent\@\@QEAAXAEBVPositionTrackingId\@\@\@Z + * @symbol ?initialize\@LodestoneCompassComponent\@\@QEAAXAEBVPositionTrackingId\@\@\@Z */ MCAPI void initialize(class PositionTrackingId const &); /** - * @symbol ??4LodestoneCompassComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4LodestoneCompassComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class LodestoneCompassComponent & operator=(class LodestoneCompassComponent &&); /** - * @symbol ?setTrackOnlyInSameDimension\@LodestoneCompassComponent\@\@QEAAXAEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?setTrackOnlyInSameDimension\@LodestoneCompassComponent\@\@QEAAXAEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI void setTrackOnlyInSameDimension(class std::variant>> const &, bool); /** - * @symbol ??1LodestoneCompassComponent\@\@QEAA\@XZ + * @symbol ??1LodestoneCompassComponent\@\@QEAA\@XZ */ MCAPI ~LodestoneCompassComponent(); /** - * @symbol ?getSpinningAnimationFrame\@LodestoneCompassComponent\@\@SAHXZ + * @symbol ?getSpinningAnimationFrame\@LodestoneCompassComponent\@\@SAHXZ */ MCAPI static int getSpinningAnimationFrame(); /** - * @symbol ?makeCalculatorId\@LodestoneCompassComponent\@\@SA?AV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?makeCalculatorId\@LodestoneCompassComponent\@\@SA?AV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI static class std::variant>> makeCalculatorId(struct ActorUniqueID const &); //private: /** - * @symbol ?_findCalculator\@LodestoneCompassComponent\@\@AEAAPEAVLodestoneCompassComponentCalculator\@\@AEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?_findCalculator\@LodestoneCompassComponent\@\@AEAAPEAVLodestoneCompassComponentCalculator\@\@AEBV?$variant\@UActorUniqueID\@\@U?$pair\@VBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI class LodestoneCompassComponentCalculator * _findCalculator(class std::variant>> const &, bool); private: /** - * @symbol ?mSpinningLodestone\@LodestoneCompassComponent\@\@0VCompassSpriteCalculator\@\@A + * @symbol ?mSpinningLodestone\@LodestoneCompassComponent\@\@0VCompassSpriteCalculator\@\@A */ MCAPI static class CompassSpriteCalculator mSpinningLodestone; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp index 9e91fb5373..de9393d274 100644 --- a/LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassComponentCalculator.hpp @@ -34,8 +34,8 @@ class LodestoneCompassComponentCalculator { private: /** - * @symbol ?COOLDOWN_TIME_SECONDS\@LodestoneCompassComponentCalculator\@\@0MA + * @symbol ?COOLDOWN_TIME_SECONDS\@LodestoneCompassComponentCalculator\@\@0MA */ MCAPI static float COOLDOWN_TIME_SECONDS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp index 42990fc5ef..a4c6a8469c 100644 --- a/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/LodestoneCompassItem.hpp @@ -32,96 +32,92 @@ class LodestoneCompassItem : public AbstractCompassItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LodestoneCompassItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 120 - * @symbol ?getAnimationFrameFor\@LodestoneCompassItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@LodestoneCompassItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; /** - * @vftbl 132 - * @symbol ?_useOn\@LodestoneCompassItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@LodestoneCompassItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0LodestoneCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LodestoneCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LodestoneCompassItem(std::string const &, int); /** - * @symbol ?getPositionTrackingId\@LodestoneCompassItem\@\@SA?AVPositionTrackingId\@\@AEBVItemStackBase\@\@\@Z - */ - MCAPI static class PositionTrackingId getPositionTrackingId(class ItemStackBase const &); - /** - * @symbol ?linkCompassToLodestone\@LodestoneCompassItem\@\@SA_NAEAVItemStack\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?linkCompassToLodestone\@LodestoneCompassItem\@\@SA_NAEAVItemStack\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI static bool linkCompassToLodestone(class ItemStack &, class BlockSource &, class BlockPos); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LogBlock.hpp b/LiteLoader/include/llapi/mc/LogBlock.hpp index 30ee42429b..4adf02d63f 100644 --- a/LiteLoader/include/llapi/mc/LogBlock.hpp +++ b/LiteLoader/include/llapi/mc/LogBlock.hpp @@ -31,203 +31,223 @@ class LogBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LogBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@LogBlock\@\@UEBA_NXZ - */ - virtual bool isAuxValueRelevantForPicking() const; - /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@LogBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@LogBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 177 + * @symbol ?use\@LogBlock\@\@MEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + */ + virtual bool use(class Player &, class BlockPos const &, unsigned char) const; + /** + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@LogBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@LogBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ - virtual void __unk_vfn_185(); + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0LogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@V?$optional\@ULogMapColors\@LogBlock\@\@\@2\@\@Z */ - MCAPI LogBlock(std::string const &, int); + MCAPI LogBlock(std::string const &, int, class WeakPtr, class std::optional); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoginPacket.hpp b/LiteLoader/include/llapi/mc/LoginPacket.hpp index babc478d77..9c5fea5d14 100644 --- a/LiteLoader/include/llapi/mc/LoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/LoginPacket.hpp @@ -21,8 +21,9 @@ class LoginPacket : public Packet { #define AFTER_EXTRA // Add Member There public: -int32_t mClientNetworkVersion; -std::unique_ptr mConnectionRequest; + int32_t mClientNetworkVersion; + std::unique_ptr mConnectionRequest; + #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_LOGINPACKET public: @@ -32,38 +33,38 @@ std::unique_ptr mConnectionRequest; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoginPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@LoginPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@LoginPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@LoginPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@LoginPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@LoginPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@LoginPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?disallowBatching\@LoginPacket\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?disallowBatching\@LoginPacket\@\@UEBA_NXZ */ virtual bool disallowBatching() const; /** - * @vftbl 6 - * @symbol ?_read\@LoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@LoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0LoginPacket\@\@QEAA\@XZ + * @symbol ??0LoginPacket\@\@QEAA\@XZ */ MCAPI LoginPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp b/LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp index ca9c8c5830..faa96a25ea 100644 --- a/LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LookAtActorDefinition.hpp @@ -32,14 +32,14 @@ class LookAtActorDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtActorDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@LookAtActorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@LookAtActorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtActorGoal.hpp b/LiteLoader/include/llapi/mc/LookAtActorGoal.hpp index 1cdd1a8419..f3888d00c5 100644 --- a/LiteLoader/include/llapi/mc/LookAtActorGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtActorGoal.hpp @@ -30,56 +30,62 @@ class LookAtActorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtActorGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@LookAtActorGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@LookAtActorGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@LookAtActorGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@LookAtActorGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@LookAtActorGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@LookAtActorGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@LookAtActorGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@LookAtActorGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@LookAtActorGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@LookAtActorGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@LookAtActorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@LookAtActorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOKATACTORGOAL /** - * @symbol ??0LookAtActorGoal\@\@QEAA\@AEAVMob\@\@MMHHHH\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LookAtActorGoal(); +#endif + /** + * @symbol ??0LookAtActorGoal\@\@QEAA\@AEAVMob\@\@MMHHHH\@Z */ MCAPI LookAtActorGoal(class Mob &, float, float, int, int, int, int); //private: /** - * @symbol ?_withinFieldOfView\@LookAtActorGoal\@\@AEAA_NAEAVActor\@\@\@Z + * @symbol ?_withinFieldOfView\@LookAtActorGoal\@\@AEAA_NAEAVActor\@\@\@Z */ MCAPI bool _withinFieldOfView(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtActorNode.hpp b/LiteLoader/include/llapi/mc/LookAtActorNode.hpp index 38502c0973..ce54f1c0d1 100644 --- a/LiteLoader/include/llapi/mc/LookAtActorNode.hpp +++ b/LiteLoader/include/llapi/mc/LookAtActorNode.hpp @@ -29,23 +29,23 @@ class LookAtActorNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtActorNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@LookAtActorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@LookAtActorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@LookAtActorNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@LookAtActorNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0LookAtActorNode\@\@QEAA\@XZ + * @symbol ??0LookAtActorNode\@\@QEAA\@XZ */ MCAPI LookAtActorNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp b/LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp index a30596c300..74c82fb00e 100644 --- a/LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LookAtBlockDefinition.hpp @@ -32,14 +32,14 @@ class LookAtBlockDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtBlockDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@LookAtBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@LookAtBlockDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtBlockNode.hpp b/LiteLoader/include/llapi/mc/LookAtBlockNode.hpp index 7d74472a04..e5b11961df 100644 --- a/LiteLoader/include/llapi/mc/LookAtBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/LookAtBlockNode.hpp @@ -29,23 +29,23 @@ class LookAtBlockNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtBlockNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@LookAtBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@LookAtBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@LookAtBlockNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@LookAtBlockNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0LookAtBlockNode\@\@QEAA\@XZ + * @symbol ??0LookAtBlockNode\@\@QEAA\@XZ */ MCAPI LookAtBlockNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtComponent.hpp b/LiteLoader/include/llapi/mc/LookAtComponent.hpp index 4b97509f77..409d2dc80a 100644 --- a/LiteLoader/include/llapi/mc/LookAtComponent.hpp +++ b/LiteLoader/include/llapi/mc/LookAtComponent.hpp @@ -29,24 +29,24 @@ class LookAtComponent { public: /** - * @symbol ??0LookAtComponent\@\@QEAA\@XZ + * @symbol ??0LookAtComponent\@\@QEAA\@XZ */ MCAPI LookAtComponent(); /** - * @symbol ?getCoolingTime\@LookAtComponent\@\@QEAAAEAHXZ + * @symbol ?getCoolingTime\@LookAtComponent\@\@QEAAAEAHXZ */ MCAPI int & getCoolingTime(); /** - * @symbol ?getSearchRadius\@LookAtComponent\@\@QEBAMXZ + * @symbol ?getSearchRadius\@LookAtComponent\@\@QEBAMXZ */ MCAPI float getSearchRadius() const; /** - * @symbol ?getTarget\@LookAtComponent\@\@QEBA_NXZ + * @symbol ?getTarget\@LookAtComponent\@\@QEBA_NXZ */ MCAPI bool getTarget() const; /** - * @symbol ?isLookingAtMe\@LookAtComponent\@\@QEAA_NAEAVActor\@\@0\@Z + * @symbol ?isLookingAtMe\@LookAtComponent\@\@QEAA_NAEAVActor\@\@0\@Z */ MCAPI bool isLookingAtMe(class Actor &, class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtDefinition.hpp b/LiteLoader/include/llapi/mc/LookAtDefinition.hpp index 6283948272..669cb50317 100644 --- a/LiteLoader/include/llapi/mc/LookAtDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LookAtDefinition.hpp @@ -30,16 +30,16 @@ class LookAtDefinition { public: /** - * @symbol ??0LookAtDefinition\@\@QEAA\@XZ + * @symbol ??0LookAtDefinition\@\@QEAA\@XZ */ MCAPI LookAtDefinition(); /** - * @symbol ?initialize\@LookAtDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVLookAtComponent\@\@\@Z + * @symbol ?initialize\@LookAtDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVLookAtComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class LookAtComponent &) const; /** - * @symbol ?buildSchema\@LookAtDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VLookAtDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@LookAtDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VLookAtDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp b/LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp index 6e6c703630..4d94d08cbc 100644 --- a/LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtEntityGoal.hpp @@ -31,14 +31,14 @@ class LookAtEntityGoal : public LookAtActorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtEntityGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp b/LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp index 0a2fc860e2..38ae1a785c 100644 --- a/LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtPlayerGoal.hpp @@ -31,14 +31,14 @@ class LookAtPlayerGoal : public LookAtActorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtPlayerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtSystem.hpp b/LiteLoader/include/llapi/mc/LookAtSystem.hpp index 95355679bc..fd4bc24e51 100644 --- a/LiteLoader/include/llapi/mc/LookAtSystem.hpp +++ b/LiteLoader/include/llapi/mc/LookAtSystem.hpp @@ -30,23 +30,23 @@ class LookAtSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@LookAtSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@LookAtSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?tickLookAtComponent\@LookAtSystem\@\@SAXAEAVActorOwnerComponent\@\@AEAVLookAtComponent\@\@\@Z + * @symbol ?tickLookAtComponent\@LookAtSystem\@\@SAXAEAVActorOwnerComponent\@\@AEAVLookAtComponent\@\@\@Z */ MCAPI static void tickLookAtComponent(class ActorOwnerComponent &, class LookAtComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp b/LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp index d9c102eb46..887fbed169 100644 --- a/LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtTargetGoal.hpp @@ -31,14 +31,14 @@ class LookAtTargetGoal : public LookAtActorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp b/LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp index 5c3262bfb4..613d9adb41 100644 --- a/LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/LookAtTradingPlayerGoal.hpp @@ -31,33 +31,33 @@ class LookAtTradingPlayerGoal : public LookAtActorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookAtTradingPlayerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@LookAtTradingPlayerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@LookAtTradingPlayerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@LookAtTradingPlayerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@LookAtTradingPlayerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@LookAtTradingPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@LookAtTradingPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0LookAtTradingPlayerGoal\@\@QEAA\@AEAVMob\@\@MMHHHH\@Z + * @symbol ??0LookAtTradingPlayerGoal\@\@QEAA\@AEAVMob\@\@MMHHHH\@Z */ MCAPI LookAtTradingPlayerGoal(class Mob &, float, float, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookControl.hpp b/LiteLoader/include/llapi/mc/LookControl.hpp index 82515556ff..47e629c20d 100644 --- a/LiteLoader/include/llapi/mc/LookControl.hpp +++ b/LiteLoader/include/llapi/mc/LookControl.hpp @@ -29,23 +29,29 @@ class LookControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@LookControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@LookControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void initializeInternal(class Mob &); /** - * @vftbl 2 - * @symbol ?tick\@LookControl\@\@UEAAXAEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@LookControl\@\@UEAAXAEAVMob\@\@\@Z */ virtual void tick(class Mob &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOKCONTROL /** - * @symbol ??0LookControl\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LookControl(); +#endif + /** + * @symbol ??0LookControl\@\@QEAA\@XZ */ MCAPI LookControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookControlComponent.hpp b/LiteLoader/include/llapi/mc/LookControlComponent.hpp index 0d7f4d07b2..5c0c1b8faa 100644 --- a/LiteLoader/include/llapi/mc/LookControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/LookControlComponent.hpp @@ -29,72 +29,72 @@ class LookControlComponent { public: /** - * @symbol ??0LookControlComponent\@\@QEAA\@XZ + * @symbol ??0LookControlComponent\@\@QEAA\@XZ */ MCAPI LookControlComponent(); /** - * @symbol ?getHasWantedPosition\@LookControlComponent\@\@QEBA_NXZ + * @symbol ?getHasWantedPosition\@LookControlComponent\@\@QEBA_NXZ */ MCAPI bool getHasWantedPosition() const; /** - * @symbol ?getHasWantedRotation\@LookControlComponent\@\@QEBA_NXZ + * @symbol ?getHasWantedRotation\@LookControlComponent\@\@QEBA_NXZ */ MCAPI bool getHasWantedRotation() const; /** - * @symbol ?getWantedPosition\@LookControlComponent\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getWantedPosition\@LookControlComponent\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getWantedPosition() const; /** - * @symbol ?getWantedRotation\@LookControlComponent\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getWantedRotation\@LookControlComponent\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getWantedRotation() const; /** - * @symbol ?getXMax\@LookControlComponent\@\@QEBAMXZ + * @symbol ?getXMax\@LookControlComponent\@\@QEBAMXZ */ MCAPI float getXMax() const; /** - * @symbol ?getYMax\@LookControlComponent\@\@QEBAMXZ + * @symbol ?getYMax\@LookControlComponent\@\@QEBAMXZ */ MCAPI float getYMax() const; /** - * @symbol ?initialize\@LookControlComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?initialize\@LookControlComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void initialize(class Mob &); /** - * @symbol ??4LookControlComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4LookControlComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class LookControlComponent & operator=(class LookControlComponent &&); /** - * @symbol ?setHasWantedPosition\@LookControlComponent\@\@QEAAX_N\@Z + * @symbol ?setHasWantedPosition\@LookControlComponent\@\@QEAAX_N\@Z */ MCAPI void setHasWantedPosition(bool); /** - * @symbol ?setHasWantedRotation\@LookControlComponent\@\@QEAAX_N\@Z + * @symbol ?setHasWantedRotation\@LookControlComponent\@\@QEAAX_N\@Z */ MCAPI void setHasWantedRotation(bool); /** - * @symbol ?setInternalType\@LookControlComponent\@\@QEAAXV?$unique_ptr\@VLookControl\@\@U?$default_delete\@VLookControl\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setInternalType\@LookControlComponent\@\@QEAAXV?$unique_ptr\@VLookControl\@\@U?$default_delete\@VLookControl\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setInternalType(std::unique_ptr); /** - * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z + * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z */ MCAPI void setLookAtPosition(class Vec3 const &, float, float); /** - * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXPEBVActor\@\@MM\@Z + * @symbol ?setLookAtPosition\@LookControlComponent\@\@QEAAXPEBVActor\@\@MM\@Z */ MCAPI void setLookAtPosition(class Actor const *, float, float); /** - * @symbol ?setLookAtRotation\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z + * @symbol ?setLookAtRotation\@LookControlComponent\@\@QEAAXAEBVVec3\@\@MM\@Z */ MCAPI void setLookAtRotation(class Vec3 const &, float, float); /** - * @symbol ?setYMax\@LookControlComponent\@\@QEAAXM\@Z + * @symbol ?setYMax\@LookControlComponent\@\@QEAAXM\@Z */ MCAPI void setYMax(float); /** - * @symbol ?update\@LookControlComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?update\@LookControlComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void update(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LookControlSystem.hpp b/LiteLoader/include/llapi/mc/LookControlSystem.hpp index af01dbad5f..3413ba242b 100644 --- a/LiteLoader/include/llapi/mc/LookControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/LookControlSystem.hpp @@ -30,19 +30,19 @@ class LookControlSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LookControlSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@LookControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@LookControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoomBlock.hpp b/LiteLoader/include/llapi/mc/LoomBlock.hpp index d88f50b53d..7322242347 100644 --- a/LiteLoader/include/llapi/mc/LoomBlock.hpp +++ b/LiteLoader/include/llapi/mc/LoomBlock.hpp @@ -31,208 +31,213 @@ class LoomBlock : public FaceDirectionalBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoomBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@LoomBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@LoomBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOMBLOCK /** - * @symbol ?isCraftingBlock\@LoomBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@LoomBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@LoomBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@LoomBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0LoomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0LoomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI LoomBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp index 274195ceee..12ce077a9a 100644 --- a/LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/LoomContainerManagerModel.hpp @@ -31,64 +31,64 @@ class LoomContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoomContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@LoomContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@LoomContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@LoomContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@LoomContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@LoomContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@LoomContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@LoomContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@LoomContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@LoomContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@LoomContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@LoomContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@LoomContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@LoomContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@LoomContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0LoomContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0LoomContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI LoomContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?BANNER_SLOT\@LoomContainerManagerModel\@\@2HB + * @symbol ?BANNER_SLOT\@LoomContainerManagerModel\@\@2HB */ MCAPI static int const BANNER_SLOT; /** - * @symbol ?DYE_SLOT\@LoomContainerManagerModel\@\@2HB + * @symbol ?DYE_SLOT\@LoomContainerManagerModel\@\@2HB */ MCAPI static int const DYE_SLOT; /** - * @symbol ?MATERIAL_SLOT\@LoomContainerManagerModel\@\@2HB + * @symbol ?MATERIAL_SLOT\@LoomContainerManagerModel\@\@2HB */ MCAPI static int const MATERIAL_SLOT; /** - * @symbol ?RESULT_SLOT\@LoomContainerManagerModel\@\@2HB + * @symbol ?RESULT_SLOT\@LoomContainerManagerModel\@\@2HB */ MCAPI static int const RESULT_SLOT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoomContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/LoomContainerScreenValidator.hpp index e8967aa57c..17f67dec8b 100644 --- a/LiteLoader/include/llapi/mc/LoomContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/LoomContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class LoomContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoomContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0LoomContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0LoomContainerScreenValidator\@\@QEAA\@XZ */ MCAPI LoomContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoomDyeContainerValidation.hpp b/LiteLoader/include/llapi/mc/LoomDyeContainerValidation.hpp index cc60b22270..c252d5ac43 100644 --- a/LiteLoader/include/llapi/mc/LoomDyeContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/LoomDyeContainerValidation.hpp @@ -31,54 +31,54 @@ class LoomDyeContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoomDyeContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@LoomDyeContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@LoomDyeContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@LoomDyeContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@LoomDyeContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoomInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/LoomInputContainerValidation.hpp index e929ee9888..8c2139d6df 100644 --- a/LiteLoader/include/llapi/mc/LoomInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/LoomInputContainerValidation.hpp @@ -31,54 +31,54 @@ class LoomInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoomInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@LoomInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@LoomInputContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@LoomInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@LoomInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoomMaterialContainerValidation.hpp b/LiteLoader/include/llapi/mc/LoomMaterialContainerValidation.hpp index 72b14db388..e2d490616e 100644 --- a/LiteLoader/include/llapi/mc/LoomMaterialContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/LoomMaterialContainerValidation.hpp @@ -31,54 +31,54 @@ class LoomMaterialContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoomMaterialContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@LoomMaterialContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@LoomMaterialContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@LoomMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@LoomMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp b/LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp index eea6eb4bf2..fbae36e703 100644 --- a/LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp +++ b/LiteLoader/include/llapi/mc/LoopbackPacketSender.hpp @@ -30,65 +30,65 @@ class LoopbackPacketSender { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LoopbackPacketSender(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?send\@LoopbackPacketSender\@\@UEAAXAEAVPacket\@\@\@Z + * @vftbl 1 + * @symbol ?send\@LoopbackPacketSender\@\@UEAAXAEAVPacket\@\@\@Z */ virtual void send(class Packet &); /** - * @vftbl 2 - * @symbol ?sendToServer\@LoopbackPacketSender\@\@UEAAXAEAVPacket\@\@\@Z + * @vftbl 2 + * @symbol ?sendToServer\@LoopbackPacketSender\@\@UEAAXAEAVPacket\@\@\@Z */ virtual void sendToServer(class Packet &); /** - * @vftbl 3 - * @symbol ?sendToClient\@LoopbackPacketSender\@\@UEAAXPEBVUserEntityIdentifierComponent\@\@AEBVPacket\@\@\@Z + * @vftbl 3 + * @symbol ?sendToClient\@LoopbackPacketSender\@\@UEAAXPEBVUserEntityIdentifierComponent\@\@AEBVPacket\@\@\@Z */ virtual void sendToClient(class UserEntityIdentifierComponent const *, class Packet const &); /** - * @vftbl 4 - * @symbol ?sendToClient\@LoopbackPacketSender\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@W4SubClientId\@\@\@Z + * @vftbl 4 + * @symbol ?sendToClient\@LoopbackPacketSender\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@W4SubClientId\@\@\@Z */ virtual void sendToClient(class NetworkIdentifier const &, class Packet const &, enum class SubClientId); /** - * @vftbl 5 - * @symbol ?sendToClients\@LoopbackPacketSender\@\@UEAAXAEBV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@AEBVPacket\@\@\@Z + * @vftbl 5 + * @symbol ?sendToClients\@LoopbackPacketSender\@\@UEAAXAEBV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@AEBVPacket\@\@\@Z */ virtual void sendToClients(std::vector const &, class Packet const &); /** - * @vftbl 6 - * @symbol ?sendBroadcast\@LoopbackPacketSender\@\@UEAAXAEBVPacket\@\@\@Z + * @vftbl 6 + * @symbol ?sendBroadcast\@LoopbackPacketSender\@\@UEAAXAEBVPacket\@\@\@Z */ virtual void sendBroadcast(class Packet const &); /** - * @vftbl 7 - * @symbol ?sendBroadcast\@LoopbackPacketSender\@\@UEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBVPacket\@\@\@Z + * @vftbl 7 + * @symbol ?sendBroadcast\@LoopbackPacketSender\@\@UEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBVPacket\@\@\@Z */ virtual void sendBroadcast(class NetworkIdentifier const &, enum class SubClientId, class Packet const &); /** - * @vftbl 8 - * @symbol ?flush\@LoopbackPacketSender\@\@UEAAXAEBVNetworkIdentifier\@\@$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z + * @vftbl 8 + * @symbol ?flush\@LoopbackPacketSender\@\@UEAAXAEBVNetworkIdentifier\@\@$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z */ virtual void flush(class NetworkIdentifier const &, class std::function &&); /** - * @symbol ??0LoopbackPacketSender\@\@QEAA\@W4SubClientId\@\@AEAVNetworkHandler\@\@\@Z + * @symbol ??0LoopbackPacketSender\@\@QEAA\@W4SubClientId\@\@AEAVNetworkSystem\@\@\@Z */ - MCAPI LoopbackPacketSender(enum class SubClientId, class NetworkHandler &); + MCAPI LoopbackPacketSender(enum class SubClientId, class NetworkSystem &); /** - * @symbol ?addLoopbackCallback\@LoopbackPacketSender\@\@QEAAXAEAVNetEventCallback\@\@\@Z + * @symbol ?addLoopbackCallback\@LoopbackPacketSender\@\@QEAAXAEAVNetEventCallback\@\@\@Z */ MCAPI void addLoopbackCallback(class NetEventCallback &); /** - * @symbol ?removeLoopbackCallback\@LoopbackPacketSender\@\@QEAAXAEAVNetEventCallback\@\@\@Z + * @symbol ?removeLoopbackCallback\@LoopbackPacketSender\@\@QEAAXAEAVNetEventCallback\@\@\@Z */ MCAPI void removeLoopbackCallback(class NetEventCallback &); /** - * @symbol ?setUserList\@LoopbackPacketSender\@\@QEAAXPEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setUserList\@LoopbackPacketSender\@\@QEAAXPEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setUserList(std::vector> const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootCommand.hpp b/LiteLoader/include/llapi/mc/LootCommand.hpp index 65dd798750..8f74499d0f 100644 --- a/LiteLoader/include/llapi/mc/LootCommand.hpp +++ b/LiteLoader/include/llapi/mc/LootCommand.hpp @@ -30,42 +30,42 @@ class LootCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@LootCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@LootCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?getToolItemStack\@LootCommand\@\@QEBA?AVItemStack\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?getToolItemStack\@LootCommand\@\@QEBA?AVItemStack\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI class ItemStack getToolItemStack(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@LootCommand\@\@SAXAEAVCommandRegistry\@\@VItemRegistryRef\@\@\@Z + * @symbol ?setup\@LootCommand\@\@SAXAEAVCommandRegistry\@\@VItemRegistryRef\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class ItemRegistryRef); //private: /** - * @symbol ?_getItemsFromSource\@LootCommand\@\@AEBA?AV?$optional\@V?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@std\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVItemStack\@\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?_getItemsFromSource\@LootCommand\@\@AEBA?AV?$optional\@V?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@std\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVItemStack\@\@AEAVLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class std::optional> _getItemsFromSource(class CommandOrigin const &, class CommandOutput &, class ItemStack const &, class Level &, class AutomaticID) const; /** - * @symbol ?_outputError\@LootCommand\@\@AEBAXAEAVCommandOutput\@\@UReplacementResults\@Util\@\@PEBVActor\@\@\@Z + * @symbol ?_outputError\@LootCommand\@\@AEBAXAEAVCommandOutput\@\@UReplacementResults\@Util\@\@PEBVActor\@\@\@Z */ MCAPI void _outputError(class CommandOutput &, struct Util::ReplacementResults, class Actor const *) const; /** - * @symbol ?_outputSuccess\@LootCommand\@\@AEBAXAEAVCommandOutput\@\@H\@Z + * @symbol ?_outputSuccess\@LootCommand\@\@AEBAXAEAVCommandOutput\@\@H\@Z */ MCAPI void _outputSuccess(class CommandOutput &, int) const; /** - * @symbol ?_placeItemsInTarget\@LootCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_placeItemsInTarget\@LootCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _placeItemsInTarget(class CommandOrigin const &, class CommandOutput &, std::vector &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootEnchant.hpp b/LiteLoader/include/llapi/mc/LootEnchant.hpp index 434178128c..736a44bc26 100644 --- a/LiteLoader/include/llapi/mc/LootEnchant.hpp +++ b/LiteLoader/include/llapi/mc/LootEnchant.hpp @@ -31,48 +31,48 @@ class LootEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@LootEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@LootEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@LootEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@LootEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@LootEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@LootEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @symbol ??0LootEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0LootEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI LootEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI LootEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItem.hpp b/LiteLoader/include/llapi/mc/LootItem.hpp index d80b02f9da..e10ccb7b51 100644 --- a/LiteLoader/include/llapi/mc/LootItem.hpp +++ b/LiteLoader/include/llapi/mc/LootItem.hpp @@ -31,13 +31,13 @@ class LootItem { public: /** - * @vftbl 0 - * @symbol ?_createItem\@LootItem\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 0 + * @symbol ?_createItem\@LootItem\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool _createItem(std::vector &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItem\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@HHAEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@LootItem\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@HHAEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value const &, int, int, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp b/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp index ba7940a094..483a536c13 100644 --- a/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemActorHasMarkVariantCondition.hpp @@ -31,18 +31,18 @@ class LootItemActorHasMarkVariantCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemActorHasMarkVariantCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemActorHasMarkVariantCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemActorHasMarkVariantCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemActorHasMarkVariantCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemActorHasMarkVariantCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp b/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp index 109aef170e..101180033b 100644 --- a/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemActorHasVariantCondition.hpp @@ -29,18 +29,18 @@ class LootItemActorHasVariantCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemActorHasVariantCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemActorHasVariantCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemActorHasVariantCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemActorHasVariantCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemActorHasVariantCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemActorKilledCondition.hpp b/LiteLoader/include/llapi/mc/LootItemActorKilledCondition.hpp index 4bd42f19b1..c0d17b81c1 100644 --- a/LiteLoader/include/llapi/mc/LootItemActorKilledCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemActorKilledCondition.hpp @@ -29,18 +29,18 @@ class LootItemActorKilledCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemActorKilledCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemActorKilledCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemActorKilledCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemActorKilledCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemActorKilledCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemCondition.hpp b/LiteLoader/include/llapi/mc/LootItemCondition.hpp index 0d359605e2..357ef2f8bc 100644 --- a/LiteLoader/include/llapi/mc/LootItemCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemCondition.hpp @@ -30,9 +30,15 @@ class LootItemCondition { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOTITEMCONDITION /** - * @symbol ?deserialize\@LootItemCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LootItemCondition(); +#endif + /** + * @symbol ?deserialize\@LootItemCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemConditions.hpp b/LiteLoader/include/llapi/mc/LootItemConditions.hpp index 824e2c5b07..33975e5827 100644 --- a/LiteLoader/include/llapi/mc/LootItemConditions.hpp +++ b/LiteLoader/include/llapi/mc/LootItemConditions.hpp @@ -31,12 +31,12 @@ class LootItemConditions { public: /** - * @symbol ?allApply\@LootItemConditions\@\@SA_NAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?allApply\@LootItemConditions\@\@SA_NAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI static bool allApply(std::vector> const &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemConditions\@\@SA?AV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemConditions\@\@SA?AV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::vector> deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemFunction.hpp b/LiteLoader/include/llapi/mc/LootItemFunction.hpp index af7cd429be..7f0c0b5400 100644 --- a/LiteLoader/include/llapi/mc/LootItemFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootItemFunction.hpp @@ -31,36 +31,42 @@ class LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SpecificEnchantFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &) = 0; /** - * @vftbl 2 - * @symbol ?apply\@LootItemFunction\@\@UEAAHAEAVItemStack\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 2 + * @symbol ?apply\@LootItemFunction\@\@UEAAHAEAVItemStack\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z */ virtual int apply(class ItemStack &, class Random &, struct Trade const &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SpecificEnchantFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@EnchantRandomlyFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &) = 0; /** - * @vftbl 4 - * @symbol ?apply\@LootItemFunction\@\@UEAAHAEAVItemInstance\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 4 + * @symbol ?apply\@LootItemFunction\@\@UEAAHAEAVItemInstance\@\@AEAVRandom\@\@AEBUTrade\@\@AEAVLootTableContext\@\@\@Z */ virtual int apply(class ItemInstance &, class Random &, struct Trade const &, class LootTableContext &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOTITEMFUNCTION /** - * @symbol ?getConditions\@LootItemFunction\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LootItemFunction(); +#endif + /** + * @symbol ?getConditions\@LootItemFunction\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getConditions() const; /** - * @symbol ?deserialize\@LootItemFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); @@ -68,8 +74,8 @@ class LootItemFunction { private: /** - * @symbol ?mLootingFunctions\@LootItemFunction\@\@0V?$unordered_map\@VHashedString\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@2\@\@Z\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@2\@\@Z\@std\@\@\@std\@\@\@3\@\@std\@\@B + * @symbol ?mLootingFunctions\@LootItemFunction\@\@0V?$unordered_map\@VHashedString\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@2\@\@Z\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$function\@$$A6A?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@2\@\@Z\@std\@\@\@std\@\@\@3\@\@std\@\@B */ MCAPI static class std::unordered_map (class Json::Value &, std::vector> &)>, struct std::hash, struct std::equal_to, class std::allocator (class Json::Value &, std::vector> &)>>>> const mLootingFunctions; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemFunctions.hpp b/LiteLoader/include/llapi/mc/LootItemFunctions.hpp index ad88e4e353..bd45e946d2 100644 --- a/LiteLoader/include/llapi/mc/LootItemFunctions.hpp +++ b/LiteLoader/include/llapi/mc/LootItemFunctions.hpp @@ -31,8 +31,8 @@ class LootItemFunctions { public: /** - * @symbol ?deserialize\@LootItemFunctions\@\@SA?AV?$vector\@V?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemFunctions\@\@SA?AV?$vector\@V?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::vector> deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp index 2aa6eb5230..f750469c6a 100644 --- a/LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByActorCondition.hpp @@ -31,18 +31,18 @@ class LootItemKilledByActorCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemKilledByActorCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemKilledByActorCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemKilledByActorCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemKilledByActorCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemKilledByActorCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp index 08ef98ca2c..61b4c76f41 100644 --- a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerCondition.hpp @@ -31,18 +31,18 @@ class LootItemKilledByPlayerCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemKilledByPlayerCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemKilledByPlayerCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemKilledByPlayerCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemKilledByPlayerCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemKilledByPlayerCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp index 3072c7690e..83a1886489 100644 --- a/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemKilledByPlayerOrPetsCondition.hpp @@ -31,18 +31,18 @@ class LootItemKilledByPlayerOrPetsCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemKilledByPlayerOrPetsCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemKilledByPlayerOrPetsCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemKilledByPlayerOrPetsCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemKilledByPlayerOrPetsCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemKilledByPlayerOrPetsCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemMatchToolCondition.hpp b/LiteLoader/include/llapi/mc/LootItemMatchToolCondition.hpp index dd344a2be3..317700c460 100644 --- a/LiteLoader/include/llapi/mc/LootItemMatchToolCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemMatchToolCondition.hpp @@ -31,22 +31,22 @@ class LootItemMatchToolCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemMatchToolCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemMatchToolCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemMatchToolCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ??0LootItemMatchToolCondition\@\@QEAA\@UIntRange\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UEnchantInfo\@LootItemMatchToolCondition\@\@V?$allocator\@UEnchantInfo\@LootItemMatchToolCondition\@\@\@std\@\@\@3\@\@Z + * @symbol ??0LootItemMatchToolCondition\@\@QEAA\@UIntRange\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UEnchantInfo\@LootItemMatchToolCondition\@\@V?$allocator\@UEnchantInfo\@LootItemMatchToolCondition\@\@\@std\@\@\@3\@\@Z */ MCAPI LootItemMatchToolCondition(struct IntRange, struct IntRange, std::string, std::vector const &); /** - * @symbol ?deserialize\@LootItemMatchToolCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemMatchToolCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp index 466df900ce..a7adbd678f 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceCondition.hpp @@ -31,18 +31,18 @@ class LootItemRandomChanceCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemRandomChanceCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemRandomChanceCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemRandomChanceCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemRandomChanceCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemRandomChanceCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp index a1f22acfc8..32c9f12bb9 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithLootingCondition.hpp @@ -31,18 +31,18 @@ class LootItemRandomChanceWithLootingCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemRandomChanceWithLootingCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemRandomChanceWithLootingCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemRandomChanceWithLootingCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemRandomChanceWithLootingCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemRandomChanceWithLootingCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp index 77900a4053..2e5c594b2e 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomChanceWithSpecialModifierCondition.hpp @@ -31,18 +31,18 @@ class LootItemRandomChanceWithSpecialModifierCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemRandomChanceWithSpecialModifierCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemRandomChanceWithSpecialModifierCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemRandomChanceWithSpecialModifierCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemRandomChanceWithSpecialModifierCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemRandomChanceWithSpecialModifierCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp b/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp index 3592e17c5a..b050d55e0e 100644 --- a/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp +++ b/LiteLoader/include/llapi/mc/LootItemRandomDifficultyChanceCondition.hpp @@ -31,18 +31,18 @@ class LootItemRandomDifficultyChanceCondition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootItemRandomDifficultyChanceCondition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applies\@LootItemRandomDifficultyChanceCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?applies\@LootItemRandomDifficultyChanceCondition\@\@UEAA_NAEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool applies(class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootItemRandomDifficultyChanceCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootItemRandomDifficultyChanceCondition\@\@SA?AV?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootPool.hpp b/LiteLoader/include/llapi/mc/LootPool.hpp index 728432d166..70eda2f7a7 100644 --- a/LiteLoader/include/llapi/mc/LootPool.hpp +++ b/LiteLoader/include/llapi/mc/LootPool.hpp @@ -31,20 +31,20 @@ class LootPool { public: /** - * @symbol ?addRandomItems\@LootPool\@\@QEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?addRandomItems\@LootPool\@\@QEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI void addRandomItems(std::vector &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootPool\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootPool\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void deserialize(class Json::Value const &); //protected: /** - * @symbol ?addRandomItem\@LootPool\@\@IEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?addRandomItem\@LootPool\@\@IEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI void addRandomItem(std::vector &, class Random &, class LootTableContext &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootPoolEntry.hpp b/LiteLoader/include/llapi/mc/LootPoolEntry.hpp index 745f478481..c3b61e00dc 100644 --- a/LiteLoader/include/llapi/mc/LootPoolEntry.hpp +++ b/LiteLoader/include/llapi/mc/LootPoolEntry.hpp @@ -30,21 +30,27 @@ class LootPoolEntry { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_LOOTPOOLENTRY /** - * @symbol ?createItem\@LootPoolEntry\@\@QEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~LootPoolEntry(); +#endif + /** + * @symbol ?createItem\@LootPoolEntry\@\@QEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI void createItem(std::vector &, class Random &, class LootTableContext &); /** - * @symbol ?getConditions\@LootPoolEntry\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getConditions\@LootPoolEntry\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getConditions() const; /** - * @symbol ?getWeight\@LootPoolEntry\@\@QEBAHM\@Z + * @symbol ?getWeight\@LootPoolEntry\@\@QEBAHM\@Z */ MCAPI int getWeight(float) const; /** - * @symbol ?deserialize\@LootPoolEntry\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootPoolEntry\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootPoolTiers.hpp b/LiteLoader/include/llapi/mc/LootPoolTiers.hpp index d52690a00d..af2a70becb 100644 --- a/LiteLoader/include/llapi/mc/LootPoolTiers.hpp +++ b/LiteLoader/include/llapi/mc/LootPoolTiers.hpp @@ -29,8 +29,8 @@ class LootPoolTiers { public: /** - * @symbol ?deserialize\@LootPoolTiers\@\@SA?AV?$unique_ptr\@VLootPoolTiers\@\@U?$default_delete\@VLootPoolTiers\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootPoolTiers\@\@SA?AV?$unique_ptr\@VLootPoolTiers\@\@U?$default_delete\@VLootPoolTiers\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootSystem.hpp b/LiteLoader/include/llapi/mc/LootSystem.hpp index 366e9334d4..c3c30e29de 100644 --- a/LiteLoader/include/llapi/mc/LootSystem.hpp +++ b/LiteLoader/include/llapi/mc/LootSystem.hpp @@ -30,19 +30,19 @@ class LootSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?registerEvents\@LootSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z + * @vftbl 1 + * @symbol ?registerEvents\@LootSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z */ virtual void registerEvents(class entt::basic_dispatcher> &); /** - * @vftbl 2 - * @symbol ?tick\@LootSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@LootSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootTable.hpp b/LiteLoader/include/llapi/mc/LootTable.hpp index 6d2ac89481..9cc80f336e 100644 --- a/LiteLoader/include/llapi/mc/LootTable.hpp +++ b/LiteLoader/include/llapi/mc/LootTable.hpp @@ -31,32 +31,32 @@ class LootTable { public: /** - * @symbol ??0LootTable\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0LootTable\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI LootTable(std::string); /** - * @symbol ?deserialize\@LootTable\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootTable\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void deserialize(class Json::Value const &); /** - * @symbol ?fill\@LootTable\@\@QEAAXAEAVContainer\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?fill\@LootTable\@\@QEAAXAEAVContainer\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI void fill(class Container &, class Random &, class LootTableContext &); /** - * @symbol ?getRandomItems\@LootTable\@\@QEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?getRandomItems\@LootTable\@\@QEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI std::vector getRandomItems(class Random &, class LootTableContext &) const; //private: /** - * @symbol ?getAvailableSlots\@LootTable\@\@AEAA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@AEAVContainer\@\@AEAVRandom\@\@\@Z + * @symbol ?getAvailableSlots\@LootTable\@\@AEAA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@AEAVContainer\@\@AEAVRandom\@\@\@Z */ MCAPI std::vector getAvailableSlots(class Container &, class Random &); /** - * @symbol ?shuffleAndSplitItems\@LootTable\@\@AEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@HAEAVRandom\@\@\@Z + * @symbol ?shuffleAndSplitItems\@LootTable\@\@AEAAXAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@HAEAVRandom\@\@\@Z */ MCAPI void shuffleAndSplitItems(std::vector &, int, class Random &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootTableContext.hpp b/LiteLoader/include/llapi/mc/LootTableContext.hpp index 2db6030389..d7e67c632d 100644 --- a/LiteLoader/include/llapi/mc/LootTableContext.hpp +++ b/LiteLoader/include/llapi/mc/LootTableContext.hpp @@ -30,72 +30,72 @@ class LootTableContext { public: /** - * @symbol ??0LootTableContext\@\@QEAA\@MPEAVILevel\@\@UActorUniqueID\@\@PEAVPlayer\@\@PEAVActor\@\@PEBVActorDamageSource\@\@MV?$AutomaticID\@VDimension\@\@H\@\@PEBVItemStack\@\@\@Z + * @symbol ??0LootTableContext\@\@QEAA\@MPEAVILevel\@\@UActorUniqueID\@\@PEAVPlayer\@\@PEAVActor\@\@PEBVActorDamageSource\@\@MV?$AutomaticID\@VDimension\@\@H\@\@PEBVItemStack\@\@\@Z */ MCAPI LootTableContext(float, class ILevel *, struct ActorUniqueID, class Player *, class Actor *, class ActorDamageSource const *, float, class AutomaticID, class ItemStack const *); /** - * @symbol ?addVisitedTable\@LootTableContext\@\@QEAA_NPEBVLootTable\@\@\@Z + * @symbol ?addVisitedTable\@LootTableContext\@\@QEAA_NPEBVLootTable\@\@\@Z */ MCAPI bool addVisitedTable(class LootTable const *); /** - * @symbol ?getDimensionId\@LootTableContext\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getDimensionId\@LootTableContext\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID getDimensionId() const; /** - * @symbol ?getEntity\@LootTableContext\@\@QEBAPEAVActor\@\@W4ActorTarget\@\@\@Z + * @symbol ?getEntity\@LootTableContext\@\@QEBAPEAVActor\@\@W4ActorTarget\@\@\@Z */ MCAPI class Actor * getEntity(enum class ActorTarget) const; /** - * @symbol ?getExplosionRadius\@LootTableContext\@\@QEBAMXZ + * @symbol ?getExplosionRadius\@LootTableContext\@\@QEBAMXZ */ MCAPI float getExplosionRadius() const; /** - * @symbol ?getKilledEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getKilledEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getKilledEntity() const; /** - * @symbol ?getKillerEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getKillerEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getKillerEntity() const; /** - * @symbol ?getKillerPet\@LootTableContext\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getKillerPet\@LootTableContext\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getKillerPet() const; /** - * @symbol ?getKillerPlayer\@LootTableContext\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getKillerPlayer\@LootTableContext\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getKillerPlayer() const; /** - * @symbol ?getLevel\@LootTableContext\@\@QEBAPEAVLevel\@\@XZ + * @symbol ?getLevel\@LootTableContext\@\@QEBAPEAVLevel\@\@XZ */ MCAPI class Level * getLevel() const; /** - * @symbol ?getLuck\@LootTableContext\@\@QEBAMXZ + * @symbol ?getLuck\@LootTableContext\@\@QEBAMXZ */ MCAPI float getLuck() const; /** - * @symbol ?getOriginalItemName\@LootTableContext\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getOriginalItemName\@LootTableContext\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getOriginalItemName() const; /** - * @symbol ?getThisEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getThisEntity\@LootTableContext\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getThisEntity() const; /** - * @symbol ?getTool\@LootTableContext\@\@QEBAPEBVItemStack\@\@XZ + * @symbol ?getTool\@LootTableContext\@\@QEBAPEBVItemStack\@\@XZ */ MCAPI class ItemStack const * getTool() const; /** - * @symbol ?removeVisitedTable\@LootTableContext\@\@QEAAXPEBVLootTable\@\@\@Z + * @symbol ?removeVisitedTable\@LootTableContext\@\@QEAAXPEBVLootTable\@\@\@Z */ MCAPI void removeVisitedTable(class LootTable const *); /** - * @symbol ?setOriginalItemName\@LootTableContext\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setOriginalItemName\@LootTableContext\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setOriginalItemName(std::string const &); /** - * @symbol ??1LootTableContext\@\@QEAA\@XZ + * @symbol ??1LootTableContext\@\@QEAA\@XZ */ MCAPI ~LootTableContext(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootTableDefinition.hpp b/LiteLoader/include/llapi/mc/LootTableDefinition.hpp index 1171aca3a5..3ae473ba92 100644 --- a/LiteLoader/include/llapi/mc/LootTableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/LootTableDefinition.hpp @@ -31,7 +31,7 @@ struct LootTableDefinition { public: /** - * @symbol ?buildSchema\@LootTableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@ULootTableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@LootTableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@ULootTableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/LootTableEntry.hpp b/LiteLoader/include/llapi/mc/LootTableEntry.hpp index b9bd7cb709..7f08482d2e 100644 --- a/LiteLoader/include/llapi/mc/LootTableEntry.hpp +++ b/LiteLoader/include/llapi/mc/LootTableEntry.hpp @@ -31,13 +31,13 @@ class LootTableEntry { public: /** - * @vftbl 0 - * @symbol ?_createItem\@LootTableEntry\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 0 + * @symbol ?_createItem\@LootTableEntry\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool _createItem(std::vector &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootTableEntry\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z + * @symbol ?deserialize\@LootTableEntry\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@VValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootTableReference.hpp b/LiteLoader/include/llapi/mc/LootTableReference.hpp index 93ab464d1c..2ae8e649c9 100644 --- a/LiteLoader/include/llapi/mc/LootTableReference.hpp +++ b/LiteLoader/include/llapi/mc/LootTableReference.hpp @@ -31,13 +31,13 @@ class LootTableReference { public: /** - * @vftbl 0 - * @symbol ?_createItem\@LootTableReference\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 0 + * @symbol ?_createItem\@LootTableReference\@\@MEAA_NAEAV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual bool _createItem(std::vector &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootTableReference\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@VValue\@Json\@\@HHAEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@LootTableReference\@\@SA?AV?$unique_ptr\@VLootPoolEntry\@\@U?$default_delete\@VLootPoolEntry\@\@\@std\@\@\@std\@\@VValue\@Json\@\@HHAEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, int, int, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootTables.hpp b/LiteLoader/include/llapi/mc/LootTables.hpp index e9ea770e6f..bcb28f613d 100644 --- a/LiteLoader/include/llapi/mc/LootTables.hpp +++ b/LiteLoader/include/llapi/mc/LootTables.hpp @@ -30,12 +30,12 @@ class LootTables { public: /** - * @symbol ?lookupByName\@LootTables\@\@QEAAPEAVLootTable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVResourcePackManager\@\@\@Z + * @symbol ?lookupByName\@LootTables\@\@QEAAPEAVLootTable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVResourcePackManager\@\@\@Z */ MCAPI class LootTable * lookupByName(std::string const &, class ResourcePackManager &); /** - * @symbol ??1LootTables\@\@QEAA\@XZ + * @symbol ??1LootTables\@\@QEAA\@XZ */ MCAPI ~LootTables(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp b/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp index efe4c14b5b..7d503e6452 100644 --- a/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp +++ b/LiteLoader/include/llapi/mc/LootingEnchantFunction.hpp @@ -32,23 +32,23 @@ class LootingEnchantFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~LootingEnchantFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@LootingEnchantFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@LootingEnchantFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@LootingEnchantFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@LootingEnchantFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@LootingEnchantFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@LootingEnchantFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MCRESULT.hpp b/LiteLoader/include/llapi/mc/MCRESULT.hpp index cc6946421a..bc47d9874a 100644 --- a/LiteLoader/include/llapi/mc/MCRESULT.hpp +++ b/LiteLoader/include/llapi/mc/MCRESULT.hpp @@ -35,11 +35,11 @@ struct MCRESULT { public: /** - * @symbol ?getFullCode\@MCRESULT\@\@QEBAHXZ + * @symbol ?getFullCode\@MCRESULT\@\@QEBAHXZ */ MCAPI int getFullCode() const; /** - * @symbol ?isSuccess\@MCRESULT\@\@QEBA_NXZ + * @symbol ?isSuccess\@MCRESULT\@\@QEBA_NXZ */ MCAPI bool isSuccess() const; diff --git a/LiteLoader/include/llapi/mc/MagmaBlock.hpp b/LiteLoader/include/llapi/mc/MagmaBlock.hpp index 48631f56c2..869012e988 100644 --- a/LiteLoader/include/llapi/mc/MagmaBlock.hpp +++ b/LiteLoader/include/llapi/mc/MagmaBlock.hpp @@ -31,237 +31,242 @@ class MagmaBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MagmaBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@MagmaBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@MagmaBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@MagmaBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 183 - * @symbol ?getEmissiveBrightness\@MagmaBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 184 + * @symbol ?getEmissiveBrightness\@MagmaBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAGMABLOCK /** - * @symbol ?shouldTickOnSetBlock\@MagmaBlock\@\@UEBA_NXZ + * @symbol ?shouldTickOnSetBlock\@MagmaBlock\@\@UEBA_NXZ */ MCVAPI bool shouldTickOnSetBlock() const; #endif /** - * @symbol ??0MagmaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MagmaBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MagmaBlock(std::string const &, int); //private: /** - * @symbol ?addToTickQueue\@MagmaBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?addToTickQueue\@MagmaBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void addToTickQueue(class BlockSource &, class BlockPos const &, class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MainChunkSource.hpp b/LiteLoader/include/llapi/mc/MainChunkSource.hpp index 53646af78b..ab19882fd1 100644 --- a/LiteLoader/include/llapi/mc/MainChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/MainChunkSource.hpp @@ -31,63 +31,63 @@ class MainChunkSource : public ChunkSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MainChunkSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getExistingChunk\@MainChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @vftbl 3 + * @symbol ?getExistingChunk\@MainChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ virtual class std::shared_ptr getExistingChunk(class ChunkPos const &); /** - * @vftbl 4 - * @symbol ?getRandomChunk\@MainChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 4 + * @symbol ?getRandomChunk\@MainChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEAVRandom\@\@\@Z */ virtual class std::shared_ptr getRandomChunk(class Random &); /** - * @vftbl 5 - * @symbol ?isChunkKnown\@MainChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z + * @vftbl 5 + * @symbol ?isChunkKnown\@MainChunkSource\@\@UEAA_NAEBVChunkPos\@\@\@Z */ virtual bool isChunkKnown(class ChunkPos const &); /** - * @vftbl 7 - * @symbol ?createNewChunk\@MainChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z + * @vftbl 7 + * @symbol ?createNewChunk\@MainChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z */ virtual class std::shared_ptr createNewChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 18 - * @symbol ?acquireDiscarded\@MainChunkSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z + * @vftbl 18 + * @symbol ?acquireDiscarded\@MainChunkSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z */ virtual void acquireDiscarded(class std::unique_ptr); /** - * @vftbl 23 - * @symbol ?getChunkMap\@MainChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @vftbl 23 + * @symbol ?getChunkMap\@MainChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const * getChunkMap(); /** - * @vftbl 24 - * @symbol ?getStorage\@MainChunkSource\@\@UEBAAEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @vftbl 24 + * @symbol ?getStorage\@MainChunkSource\@\@UEBAAEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getStorage() const; /** - * @vftbl 25 - * @symbol ?clearDeletedEntities\@MainChunkSource\@\@UEAAXXZ + * @vftbl 25 + * @symbol ?clearDeletedEntities\@MainChunkSource\@\@UEAAXXZ */ virtual void clearDeletedEntities(); /** - * @vftbl 26 - * @symbol ?canCreateViews\@MainChunkSource\@\@UEBA_NXZ + * @vftbl 26 + * @symbol ?canCreateViews\@MainChunkSource\@\@UEBA_NXZ */ virtual bool canCreateViews() const; /** - * @vftbl 29 - * @symbol ?setLevelChunk\@MainChunkSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z + * @vftbl 29 + * @symbol ?setLevelChunk\@MainChunkSource\@\@UEAAXV?$shared_ptr\@VLevelChunk\@\@\@std\@\@\@Z */ virtual void setLevelChunk(class std::shared_ptr); /** - * @symbol ??0MainChunkSource\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0MainChunkSource\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@\@Z */ MCAPI MainChunkSource(std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MakeLoveGoal.hpp b/LiteLoader/include/llapi/mc/MakeLoveGoal.hpp index 8fd4898fef..d3791e561b 100644 --- a/LiteLoader/include/llapi/mc/MakeLoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/MakeLoveGoal.hpp @@ -30,60 +30,60 @@ class MakeLoveGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MakeLoveGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MakeLoveGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MakeLoveGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MakeLoveGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MakeLoveGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MakeLoveGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MakeLoveGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MakeLoveGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MakeLoveGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MakeLoveGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MakeLoveGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MakeLoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MakeLoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MakeLoveGoal\@\@QEAA\@AEAVVillagerBase\@\@\@Z + * @symbol ??0MakeLoveGoal\@\@QEAA\@AEAVVillagerBase\@\@\@Z */ MCAPI MakeLoveGoal(class VillagerBase &); //private: /** - * @symbol ?_breed\@MakeLoveGoal\@\@AEBAXAEAVVillagerBase\@\@\@Z + * @symbol ?_breed\@MakeLoveGoal\@\@AEBAXAEAVVillagerBase\@\@\@Z */ MCAPI void _breed(class VillagerBase &) const; /** - * @symbol ?_findMate\@MakeLoveGoal\@\@AEBAPEAVVillagerBase\@\@XZ + * @symbol ?_findMate\@MakeLoveGoal\@\@AEBAPEAVVillagerBase\@\@XZ */ MCAPI class VillagerBase * _findMate() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ManagedWanderingTraderComponent.hpp b/LiteLoader/include/llapi/mc/ManagedWanderingTraderComponent.hpp index aeffdc41d6..98eb9f8a61 100644 --- a/LiteLoader/include/llapi/mc/ManagedWanderingTraderComponent.hpp +++ b/LiteLoader/include/llapi/mc/ManagedWanderingTraderComponent.hpp @@ -30,12 +30,12 @@ class ManagedWanderingTraderComponent { public: /** - * @symbol ?initFromDefinition\@ManagedWanderingTraderComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@ManagedWanderingTraderComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?reloadComponent\@ManagedWanderingTraderComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?reloadComponent\@ManagedWanderingTraderComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void reloadComponent(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp b/LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp index 12e1796605..edacc116b3 100644 --- a/LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp +++ b/LiteLoader/include/llapi/mc/ManagedWanderingTraderDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class ManagedWanderingTraderDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@ManagedWanderingTraderDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@ManagedWanderingTraderDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~ManagedWanderingTraderDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MANAGEDWANDERINGTRADERDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@ManagedWanderingTraderDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~ManagedWanderingTraderDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp b/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp index 13efe06635..7d10452682 100644 --- a/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveLeafBlock.hpp @@ -29,213 +29,218 @@ class MangroveLeafBlock : public LeafBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MangroveLeafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@MangroveLeafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @symbol ?onFertilized\@MangroveLeafBlock\@\@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 88 + * @symbol ?canBeFertilized\@MangroveLeafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@MangroveLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0MangroveLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0MangroveLeafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI MangroveLeafBlock(std::string const &, int, class WeakPtr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MangrovePropagule.hpp b/LiteLoader/include/llapi/mc/MangrovePropagule.hpp index b14367dc88..70229e48ba 100644 --- a/LiteLoader/include/llapi/mc/MangrovePropagule.hpp +++ b/LiteLoader/include/llapi/mc/MangrovePropagule.hpp @@ -29,285 +29,290 @@ class MangrovePropagule : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MangrovePropagule(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@MangrovePropagule\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @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 + * @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 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@MangrovePropagule\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@MangrovePropagule\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @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 + * @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 + * @vftbl 93 + * @symbol ?mayPlaceOn\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@MangrovePropagule\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@MangrovePropagule\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@MangrovePropagule\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@MangrovePropagule\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 - * @symbol ?init\@MangrovePropagule\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@MangrovePropagule\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@MangrovePropagule\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@MangrovePropagule\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@MangrovePropagule\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@MangrovePropagule\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@MangrovePropagule\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@MangrovePropagule\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MANGROVEPROPAGULE /** - * @symbol ?waterSpreadCausesSpawn\@MangrovePropagule\@\@UEBA_NXZ + * @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 + * @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 + * @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 + * @symbol ?_isFullyGrown\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isFullyGrown(class Block const &) const; /** - * @symbol ?_isHanging\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_isHanging\@MangrovePropagule\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isHanging(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp b/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp index 92d66bc7aa..0164b75063 100644 --- a/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp +++ b/LiteLoader/include/llapi/mc/MangroveRootBlock.hpp @@ -29,203 +29,208 @@ class MangroveRootBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MangroveRootBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@MangroveRootBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@MangroveRootBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@MangroveRootBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@MangroveRootBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0MangroveRootBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0MangroveRootBlock\@\@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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MangroveTreeCanopy.hpp b/LiteLoader/include/llapi/mc/MangroveTreeCanopy.hpp index 373c27f515..76d4b2a47d 100644 --- a/LiteLoader/include/llapi/mc/MangroveTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/MangroveTreeCanopy.hpp @@ -28,18 +28,18 @@ class MangroveTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MangroveTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@MangroveTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@MangroveTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; /** - * @symbol ??0MangroveTreeCanopy\@\@QEAA\@XZ + * @symbol ??0MangroveTreeCanopy\@\@QEAA\@XZ */ MCAPI MangroveTreeCanopy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp b/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp index dbffca6b34..8c23bd16a2 100644 --- a/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp +++ b/LiteLoader/include/llapi/mc/MangroveTreeRoots.hpp @@ -29,34 +29,34 @@ class MangroveTreeRoots { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MangroveTreeRoots(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeRoots\@MangroveTreeRoots\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@\@Z + * @vftbl 1 + * @symbol ?placeRoots\@MangroveTreeRoots\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@\@Z */ virtual class std::optional placeRoots(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &) const; //private: /** - * @symbol ?_placeRoot\@MangroveTreeRoots\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_placeRoot\@MangroveTreeRoots\@\@AEBAXAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void _placeRoot(class IBlockWorldGenAPI &, class BlockPos const &, class Random &) const; /** - * @symbol ?_potentialRootPositions\@MangroveTreeRoots\@\@AEBA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@EAEAVRandom\@\@0\@Z + * @symbol ?_potentialRootPositions\@MangroveTreeRoots\@\@AEBA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@EAEAVRandom\@\@0\@Z */ MCAPI std::vector _potentialRootPositions(class BlockPos const &, unsigned char, class Random &, class BlockPos const &) const; /** - * @symbol ?_simulateRoots\@MangroveTreeRoots\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@2EPEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@HAEBUTreeParams\@TreeHelper\@\@\@Z + * @symbol ?_simulateRoots\@MangroveTreeRoots\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@2EPEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@HAEBUTreeParams\@TreeHelper\@\@\@Z */ MCAPI bool _simulateRoots(class IBlockWorldGenAPI &, class Random &, class BlockPos const &, class BlockPos const &, unsigned char, std::vector *, int, struct TreeHelper::TreeParams const &) const; private: /** - * @symbol ?RANDOM_SKEW_CHANCE\@MangroveTreeRoots\@\@0MB + * @symbol ?RANDOM_SKEW_CHANCE\@MangroveTreeRoots\@\@0MB */ MCAPI static float const RANDOM_SKEW_CHANCE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MangroveTreeTrunk.hpp b/LiteLoader/include/llapi/mc/MangroveTreeTrunk.hpp index dd57691fb4..e3a19c14b9 100644 --- a/LiteLoader/include/llapi/mc/MangroveTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/MangroveTreeTrunk.hpp @@ -29,27 +29,27 @@ class MangroveTreeTrunk { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MangroveTreeTrunk(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeTrunk\@MangroveTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + * @vftbl 1 + * @symbol ?placeTrunk\@MangroveTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z */ virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; /** - * @vftbl 2 - * @symbol ?getTreeHeight\@MangroveTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?getTreeHeight\@MangroveTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z */ virtual int getTreeHeight(class Random &) const; //private: /** - * @symbol ?_placeBranch\@MangroveTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@PEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEAVBlockPos\@\@HEHHPEBVBlock\@\@\@Z + * @symbol ?_placeBranch\@MangroveTreeTrunk\@\@AEBAXAEAVIBlockWorldGenAPI\@\@PEAV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEAVBlockPos\@\@HEHHPEBVBlock\@\@\@Z */ MCAPI void _placeBranch(class IBlockWorldGenAPI &, std::vector *, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class BlockPos &, int, unsigned char, int, int, class Block const *) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp index 812fd6c05f..95444b712e 100644 --- a/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapCloningRecipe.hpp @@ -31,51 +31,51 @@ class MapCloningRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapCloningRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@MapCloningRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@MapCloningRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@MapCloningRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@MapCloningRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@MapCloningRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@MapCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@MapCloningRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@MapCloningRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@MapCloningRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0MapCloningRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0MapCloningRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI MapCloningRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI MapCloningRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ?CartographyTableID\@MapCloningRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CartographyTableID\@MapCloningRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CartographyTableID; /** - * @symbol ?CraftingTableID\@MapCloningRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CraftingTableID\@MapCloningRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CraftingTableID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapConstants.hpp b/LiteLoader/include/llapi/mc/MapConstants.hpp index 1e704d9539..649d1c774a 100644 --- a/LiteLoader/include/llapi/mc/MapConstants.hpp +++ b/LiteLoader/include/llapi/mc/MapConstants.hpp @@ -22,199 +22,199 @@ namespace MapConstants { #undef AFTER_EXTRA /** - * @symbol ?DEFAULT_SCALE\@MapConstants\@\@3HB + * @symbol ?DEFAULT_SCALE\@MapConstants\@\@3HB */ MCAPI extern int const DEFAULT_SCALE; /** - * @symbol ?DEFAULT_SCALE_LEGACY_STARTING_MAP\@MapConstants\@\@3HB + * @symbol ?DEFAULT_SCALE_LEGACY_STARTING_MAP\@MapConstants\@\@3HB */ MCAPI extern int const DEFAULT_SCALE_LEGACY_STARTING_MAP; /** - * @symbol ?DEFAULT_SCALE_STARTING_MAP\@MapConstants\@\@3HB + * @symbol ?DEFAULT_SCALE_STARTING_MAP\@MapConstants\@\@3HB */ MCAPI extern int const DEFAULT_SCALE_STARTING_MAP; /** - * @symbol ?HALF_MAP_SIZE\@MapConstants\@\@3HB + * @symbol ?HALF_MAP_SIZE\@MapConstants\@\@3HB */ MCAPI extern int const HALF_MAP_SIZE; /** - * @symbol ?MAP_BORDER\@MapConstants\@\@3MB + * @symbol ?MAP_BORDER\@MapConstants\@\@3MB */ MCAPI extern float const MAP_BORDER; /** - * @symbol ?MAP_FINAL_SCALE\@MapConstants\@\@3MB + * @symbol ?MAP_FINAL_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MAP_FINAL_SCALE; /** - * @symbol ?MAP_GLOBAL_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_GLOBAL_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_GLOBAL_POS; /** - * @symbol ?MAP_GLOBAL_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_GLOBAL_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_GLOBAL_ROT; /** - * @symbol ?MAP_HANDS_HEIGHT_SCALE\@MapConstants\@\@3MB + * @symbol ?MAP_HANDS_HEIGHT_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MAP_HANDS_HEIGHT_SCALE; /** - * @symbol ?MAP_HANDS_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_HANDS_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_HANDS_POS; /** - * @symbol ?MAP_HANDS_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_HANDS_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_HANDS_ROT; /** - * @symbol ?MAP_HANDS_TILT_SCALE\@MapConstants\@\@3MB + * @symbol ?MAP_HANDS_TILT_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MAP_HANDS_TILT_SCALE; /** - * @symbol ?MAP_HEIGHT\@MapConstants\@\@3MB + * @symbol ?MAP_HEIGHT\@MapConstants\@\@3MB */ MCAPI extern float const MAP_HEIGHT; /** - * @symbol ?MAP_LEFTHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_LEFTHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_LEFTHAND_POS; /** - * @symbol ?MAP_LEFTHAND_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_LEFTHAND_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_LEFTHAND_ROT; /** - * @symbol ?MAP_NORMAL\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_NORMAL\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_NORMAL; /** - * @symbol ?MAP_PLAYER_PITCH_SCALE\@MapConstants\@\@3MB + * @symbol ?MAP_PLAYER_PITCH_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MAP_PLAYER_PITCH_SCALE; /** - * @symbol ?MAP_PRE_ROT_SCALE\@MapConstants\@\@3MB + * @symbol ?MAP_PRE_ROT_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MAP_PRE_ROT_SCALE; /** - * @symbol ?MAP_RIGHTHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_RIGHTHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_RIGHTHAND_POS; /** - * @symbol ?MAP_RIGHTHAND_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_RIGHTHAND_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_RIGHTHAND_ROT; /** - * @symbol ?MAP_SIZE\@MapConstants\@\@3HB + * @symbol ?MAP_SIZE\@MapConstants\@\@3HB */ MCAPI extern int const MAP_SIZE; /** - * @symbol ?MAP_SWING_POS_SCALE\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_SWING_POS_SCALE\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_SWING_POS_SCALE; /** - * @symbol ?MAP_SWING_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MAP_SWING_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MAP_SWING_ROT; /** - * @symbol ?MAP_WIDTH\@MapConstants\@\@3MB + * @symbol ?MAP_WIDTH\@MapConstants\@\@3MB */ MCAPI extern float const MAP_WIDTH; /** - * @symbol ?MAX_SCALE\@MapConstants\@\@3HB + * @symbol ?MAX_SCALE\@MapConstants\@\@3HB */ MCAPI extern int const MAX_SCALE; /** - * @symbol ?MINI_MAP_BORDER\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_BORDER\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_BORDER; /** - * @symbol ?MINI_MAP_FINAL_SCALE\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_FINAL_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_FINAL_SCALE; /** - * @symbol ?MINI_MAP_HANDS_HEIGHT_SCALE\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_HANDS_HEIGHT_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_HANDS_HEIGHT_SCALE; /** - * @symbol ?MINI_MAP_HANDS_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_HANDS_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_HANDS_POS; /** - * @symbol ?MINI_MAP_HANDS_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_HANDS_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_HANDS_ROT; /** - * @symbol ?MINI_MAP_HANDS_TILT_SCALE\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_HANDS_TILT_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_HANDS_TILT_SCALE; /** - * @symbol ?MINI_MAP_HEIGHT\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_HEIGHT\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_HEIGHT; /** - * @symbol ?MINI_MAP_LEFTHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_LEFTHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_LEFTHAND_POS; /** - * @symbol ?MINI_MAP_LEFTHAND_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_LEFTHAND_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_LEFTHAND_ROT; /** - * @symbol ?MINI_MAP_MAINHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_MAINHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_MAINHAND_POS; /** - * @symbol ?MINI_MAP_NORMAL\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_NORMAL\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_NORMAL; /** - * @symbol ?MINI_MAP_OFFHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_OFFHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_OFFHAND_POS; /** - * @symbol ?MINI_MAP_PLAYER_PITCH_SCALE\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_PLAYER_PITCH_SCALE\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_PLAYER_PITCH_SCALE; /** - * @symbol ?MINI_MAP_RIGHTHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_RIGHTHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_RIGHTHAND_POS; /** - * @symbol ?MINI_MAP_RIGHTHAND_ROT\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_RIGHTHAND_ROT\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_RIGHTHAND_ROT; /** - * @symbol ?MINI_MAP_SWING_POS_SCALE\@MapConstants\@\@3VVec3\@\@B + * @symbol ?MINI_MAP_SWING_POS_SCALE\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const MINI_MAP_SWING_POS_SCALE; /** - * @symbol ?MINI_MAP_WIDTH\@MapConstants\@\@3MB + * @symbol ?MINI_MAP_WIDTH\@MapConstants\@\@3MB */ MCAPI extern float const MINI_MAP_WIDTH; /** - * @symbol ?SPLIT_SCREEN_ADJUST\@MapConstants\@\@3VVec3\@\@B + * @symbol ?SPLIT_SCREEN_ADJUST\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const SPLIT_SCREEN_ADJUST; /** - * @symbol ?VERT_MAINHAND_MAP_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?VERT_MAINHAND_MAP_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const VERT_MAINHAND_MAP_POS; /** - * @symbol ?VERT_MAP_LEFTHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?VERT_MAP_LEFTHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const VERT_MAP_LEFTHAND_POS; /** - * @symbol ?VERT_MAP_RIGHTHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?VERT_MAP_RIGHTHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const VERT_MAP_RIGHTHAND_POS; /** - * @symbol ?VERT_MINI_MAP_OFFHAND_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?VERT_MINI_MAP_OFFHAND_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const VERT_MINI_MAP_OFFHAND_POS; /** - * @symbol ?VERT_OFFHAND_MAP_POS\@MapConstants\@\@3VVec3\@\@B + * @symbol ?VERT_OFFHAND_MAP_POS\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const VERT_OFFHAND_MAP_POS; /** - * @symbol ?VERT_SPLIT_SCREEN_OFFSET\@MapConstants\@\@3VVec3\@\@B + * @symbol ?VERT_SPLIT_SCREEN_OFFSET\@MapConstants\@\@3VVec3\@\@B */ MCAPI extern class Vec3 const VERT_SPLIT_SCREEN_OFFSET; diff --git a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp index df1761bf8b..723c4d4f89 100644 --- a/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapCreateLockedCopyPacket.hpp @@ -30,45 +30,51 @@ class MapCreateLockedCopyPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapCreateLockedCopyPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MapCreateLockedCopyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MapCreateLockedCopyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MapCreateLockedCopyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MapCreateLockedCopyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MapCreateLockedCopyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MapCreateLockedCopyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MapCreateLockedCopyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAPCREATELOCKEDCOPYPACKET /** - * @symbol ??0MapCreateLockedCopyPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MapCreateLockedCopyPacket(); + MCVAPI ~MapCreateLockedCopyPacket(); +#endif /** - * @symbol ??0MapCreateLockedCopyPacket\@\@QEAA\@UActorUniqueID\@\@0\@Z + * @symbol ??0MapCreateLockedCopyPacket\@\@QEAA\@UActorUniqueID\@\@0\@Z */ MCAPI MapCreateLockedCopyPacket(struct ActorUniqueID, struct ActorUniqueID); /** - * @symbol ?getNewMapId\@MapCreateLockedCopyPacket\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ??0MapCreateLockedCopyPacket\@\@QEAA\@XZ + */ + MCAPI MapCreateLockedCopyPacket(); + /** + * @symbol ?getNewMapId\@MapCreateLockedCopyPacket\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getNewMapId() const; /** - * @symbol ?getOriginalMapId\@MapCreateLockedCopyPacket\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getOriginalMapId\@MapCreateLockedCopyPacket\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getOriginalMapId() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapDecoration.hpp b/LiteLoader/include/llapi/mc/MapDecoration.hpp index 8e5ef1f458..3a7dfb3df1 100644 --- a/LiteLoader/include/llapi/mc/MapDecoration.hpp +++ b/LiteLoader/include/llapi/mc/MapDecoration.hpp @@ -31,48 +31,48 @@ enum class Type; public: /** - * @symbol ??0MapDecoration\@\@QEAA\@XZ + * @symbol ??0MapDecoration\@\@QEAA\@XZ */ MCAPI MapDecoration(); /** - * @symbol ??0MapDecoration\@\@QEAA\@W4Type\@0\@CCCAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ??0MapDecoration\@\@QEAA\@W4Type\@0\@CCCAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI MapDecoration(enum class MapDecoration::Type, signed char, signed char, signed char, std::string const &, class mce::Color const &); /** - * @symbol ?getColor\@MapDecoration\@\@QEBAAEBVColor\@mce\@\@XZ + * @symbol ?getColor\@MapDecoration\@\@QEBAAEBVColor\@mce\@\@XZ */ MCAPI class mce::Color const & getColor() const; /** - * @symbol ?getImg\@MapDecoration\@\@QEBA?AW4Type\@1\@XZ + * @symbol ?getImg\@MapDecoration\@\@QEBA?AW4Type\@1\@XZ */ MCAPI enum class MapDecoration::Type getImg() const; /** - * @symbol ?getLabel\@MapDecoration\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLabel\@MapDecoration\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLabel() const; /** - * @symbol ?getRot\@MapDecoration\@\@QEBACXZ + * @symbol ?getRot\@MapDecoration\@\@QEBACXZ */ MCAPI signed char getRot() const; /** - * @symbol ?getX\@MapDecoration\@\@QEBACXZ + * @symbol ?getX\@MapDecoration\@\@QEBACXZ */ MCAPI signed char getX() const; /** - * @symbol ?getY\@MapDecoration\@\@QEBACXZ + * @symbol ?getY\@MapDecoration\@\@QEBACXZ */ MCAPI signed char getY() const; /** - * @symbol ?load\@MapDecoration\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?load\@MapDecoration\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void load(class CompoundTag const &); /** - * @symbol ?save\@MapDecoration\@\@QEAAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@MapDecoration\@\@QEAAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &); /** - * @symbol ??1MapDecoration\@\@QEAA\@XZ + * @symbol ??1MapDecoration\@\@QEAA\@XZ */ MCAPI ~MapDecoration(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp index df8acda105..0b9a82e3ed 100644 --- a/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapExtendingRecipe.hpp @@ -31,59 +31,59 @@ class MapExtendingRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapExtendingRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@MapExtendingRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@MapExtendingRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@MapExtendingRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@MapExtendingRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@MapExtendingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@MapExtendingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@MapExtendingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@MapExtendingRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@MapExtendingRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0MapExtendingRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0MapExtendingRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI MapExtendingRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI MapExtendingRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ?CartographyTableID\@MapExtendingRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CartographyTableID\@MapExtendingRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CartographyTableID; /** - * @symbol ?CraftingTableID\@MapExtendingRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CraftingTableID\@MapExtendingRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CraftingTableID; //private: /** - * @symbol ?_updateMapInstance\@MapExtendingRecipe\@\@AEBAXAEAVItemInstance\@\@\@Z + * @symbol ?_updateMapInstance\@MapExtendingRecipe\@\@AEBAXAEAVItemInstance\@\@\@Z */ MCAPI void _updateMapInstance(class ItemInstance &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp index 66cfb051ac..da4ea1c375 100644 --- a/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/MapInfoRequestPacket.hpp @@ -30,49 +30,55 @@ class MapInfoRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapInfoRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MapInfoRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MapInfoRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MapInfoRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MapInfoRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MapInfoRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MapInfoRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MapInfoRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MAPINFOREQUESTPACKET /** - * @symbol ??0MapInfoRequestPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MapInfoRequestPacket(); + MCVAPI ~MapInfoRequestPacket(); +#endif /** - * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@AEAVMapItemSavedData\@\@\@Z + * @symbol ??0MapInfoRequestPacket\@\@QEAA\@XZ */ - MCAPI MapInfoRequestPacket(struct ActorUniqueID, class MapItemSavedData &); + MCAPI MapInfoRequestPacket(); /** - * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@\@Z + * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@\@Z */ MCAPI MapInfoRequestPacket(struct ActorUniqueID); /** - * @symbol ?getMapId\@MapInfoRequestPacket\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ??0MapInfoRequestPacket\@\@QEAA\@UActorUniqueID\@\@AEAVMapItemSavedData\@\@\@Z + */ + MCAPI MapInfoRequestPacket(struct ActorUniqueID, class MapItemSavedData &); + /** + * @symbol ?getMapId\@MapInfoRequestPacket\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getMapId() const; /** - * @symbol ?replaceServerPixels\@MapInfoRequestPacket\@\@QEBA_NAEAVMapItemSavedData\@\@\@Z + * @symbol ?replaceServerPixels\@MapInfoRequestPacket\@\@QEBA_NAEAVMapItemSavedData\@\@\@Z */ MCAPI bool replaceServerPixels(class MapItemSavedData &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapItem.hpp b/LiteLoader/include/llapi/mc/MapItem.hpp index e58093fc94..8989be3dec 100644 --- a/LiteLoader/include/llapi/mc/MapItem.hpp +++ b/LiteLoader/include/llapi/mc/MapItem.hpp @@ -33,197 +33,207 @@ class MapItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@MapItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@MapItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@MapItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@MapItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 101 - * @symbol ?inventoryTick\@MapItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z + * @vftbl 101 + * @symbol ?inventoryTick\@MapItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z */ virtual bool inventoryTick(class ItemStack &, class Level &, class Actor &, int, bool) const; /** - * @vftbl 102 - * @symbol ?refreshedInContainer\@MapItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@\@Z + * @vftbl 102 + * @symbol ?refreshedInContainer\@MapItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@\@Z */ virtual void refreshedInContainer(class ItemStackBase const &, class Level &) const; /** - * @vftbl 106 - * @symbol ?fixupCommon\@MapItem\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z + * @vftbl 106 + * @symbol ?fixupCommon\@MapItem\@\@UEBAXAEAVItemStackBase\@\@AEAVLevel\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &, class Level &) const; /** - * @vftbl 115 - * @symbol ?isSameItem\@MapItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z + * @vftbl 115 + * @symbol ?isSameItem\@MapItem\@\@UEBA_NAEBVItemStackBase\@\@0\@Z */ virtual bool isSameItem(class ItemStackBase const &, class ItemStackBase const &) const; /** - * @vftbl 133 - * @symbol ?getUpdatePacket\@MapItem\@\@UEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@\@Z + * @vftbl 117 + * @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 + * @symbol ?getIconInfo\@MapItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + */ + virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; + /** + * @vftbl 133 + * @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; /** - * @symbol ??0MapItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0MapItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI MapItem(std::string const &, short); /** - * @symbol ?blockTick\@MapItem\@\@QEBAXAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?blockTick\@MapItem\@\@QEBAXAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void blockTick(class ItemStack &, class BlockSource &, class BlockPos const &) const; /** - * @symbol ?update\@MapItem\@\@QEBAXAEAVLevel\@\@AEAVActor\@\@AEAVMapItemSavedData\@\@\@Z + * @symbol ?update\@MapItem\@\@QEBAXAEAVLevel\@\@AEAVActor\@\@AEAVMapItemSavedData\@\@\@Z */ MCAPI void update(class Level &, class Actor &, class MapItemSavedData &) const; /** - * @symbol ?TAG_MAP_INIT\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_INIT\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_INIT; /** - * @symbol ?TAG_MAP_NAME_INDEX\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_NAME_INDEX\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_NAME_INDEX; /** - * @symbol ?TAG_MAP_PLAYER_DISPLAY\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_PLAYER_DISPLAY\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_PLAYER_DISPLAY; /** - * @symbol ?TAG_MAP_REGENERATE\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_REGENERATE\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_REGENERATE; /** - * @symbol ?TAG_MAP_SCALE\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_SCALE\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_SCALE; /** - * @symbol ?TAG_MAP_SCALING\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_SCALING\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_SCALING; /** - * @symbol ?TAG_MAP_UUID\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_MAP_UUID\@MapItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_MAP_UUID; /** - * @symbol ?doesDisplayPlayerMarkers\@MapItem\@\@SA_NAEBVItemStack\@\@\@Z + * @symbol ?doesDisplayPlayerMarkers\@MapItem\@\@SA_NAEBVItemStack\@\@\@Z */ MCAPI static bool doesDisplayPlayerMarkers(class ItemStack const &); /** - * @symbol ?getMapId\@MapItem\@\@SA?AUActorUniqueID\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?getMapId\@MapItem\@\@SA?AUActorUniqueID\@\@PEBVCompoundTag\@\@\@Z */ MCAPI static struct ActorUniqueID getMapId(class CompoundTag const *); /** - * @symbol ?markForRegeneration\@MapItem\@\@SAXAEAVItemInstance\@\@\@Z + * @symbol ?markForRegeneration\@MapItem\@\@SAXAEAVItemInstance\@\@\@Z */ MCAPI static void markForRegeneration(class ItemInstance &); /** - * @symbol ?renderBiomePreviewMap\@MapItem\@\@SAXAEAVDimension\@\@AEAVMapItemSavedData\@\@\@Z + * @symbol ?renderBiomePreviewMap\@MapItem\@\@SAXAEAVDimension\@\@AEAVMapItemSavedData\@\@\@Z */ MCAPI static void renderBiomePreviewMap(class Dimension &, class MapItemSavedData &); /** - * @symbol ?sampleMapData\@MapItem\@\@SA_NAEAVBlockSource\@\@HAEBVBlockPos\@\@1HHPEAV?$vector\@UMapSample\@\@V?$allocator\@UMapSample\@\@\@std\@\@\@std\@\@PEAVMapItemSavedData\@\@PEAV?$vector\@UClientTerrainPixel\@\@V?$allocator\@UClientTerrainPixel\@\@\@std\@\@\@5\@\@Z + * @symbol ?sampleMapData\@MapItem\@\@SA_NAEAVBlockSource\@\@HAEBVBlockPos\@\@1HHPEAV?$vector\@UMapSample\@\@V?$allocator\@UMapSample\@\@\@std\@\@\@std\@\@PEAVMapItemSavedData\@\@PEAV?$vector\@UClientTerrainPixel\@\@V?$allocator\@UClientTerrainPixel\@\@\@std\@\@\@5\@\@Z */ MCAPI static bool sampleMapData(class BlockSource &, int, class BlockPos const &, class BlockPos const &, int, int, std::vector *, class MapItemSavedData *, std::vector *); /** - * @symbol ?serializeMapData\@MapItem\@\@SAXAEBV?$vector\@UMapSample\@\@V?$allocator\@UMapSample\@\@\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?serializeMapData\@MapItem\@\@SAXAEBV?$vector\@UMapSample\@\@V?$allocator\@UMapSample\@\@\@std\@\@\@std\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static void serializeMapData(std::vector const &, std::string &); /** - * @symbol ?setItemInstanceInfo\@MapItem\@\@SAXAEAVItemInstance\@\@AEAVMapItemSavedData\@\@\@Z + * @symbol ?setItemInstanceInfo\@MapItem\@\@SAXAEAVItemInstance\@\@AEAVMapItemSavedData\@\@\@Z */ MCAPI static void setItemInstanceInfo(class ItemInstance &, class MapItemSavedData &); /** - * @symbol ?setItemInstanceInfo\@MapItem\@\@SAXAEAVItemStack\@\@AEAVMapItemSavedData\@\@\@Z + * @symbol ?setItemInstanceInfo\@MapItem\@\@SAXAEAVItemStack\@\@AEAVMapItemSavedData\@\@\@Z */ MCAPI static void setItemInstanceInfo(class ItemStack &, class MapItemSavedData &); /** - * @symbol ?setMapNameIndex\@MapItem\@\@SAXAEAVItemStack\@\@H\@Z + * @symbol ?setMapNameIndex\@MapItem\@\@SAXAEAVItemStack\@\@H\@Z */ MCAPI static void setMapNameIndex(class ItemStack &, int); //private: /** - * @symbol ?_makeNewExplorationMap\@MapItem\@\@AEBAXAEAVItemStack\@\@AEAVLevel\@\@PEAVActor\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_makeNewExplorationMap\@MapItem\@\@AEBAXAEAVItemStack\@\@AEAVLevel\@\@PEAVActor\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _makeNewExplorationMap(class ItemStack &, class Level &, class Actor *, std::string &) const; /** - * @symbol ?_scheduleMapChunkRendering\@MapItem\@\@CAXAEAVDimension\@\@AEBVMapItemSavedData\@\@UChunkBounds\@3\@V?$shared_ptr\@_N\@std\@\@\@Z + * @symbol ?_scheduleMapChunkRendering\@MapItem\@\@CAXAEAVDimension\@\@AEBVMapItemSavedData\@\@UChunkBounds\@3\@V?$shared_ptr\@_N\@std\@\@\@Z */ MCAPI static void _scheduleMapChunkRendering(class Dimension &, class MapItemSavedData const &, struct MapItemSavedData::ChunkBounds, class std::shared_ptr); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapItemSavedData.hpp b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp index fbf9e5aa0f..b1557f2955 100644 --- a/LiteLoader/include/llapi/mc/MapItemSavedData.hpp +++ b/LiteLoader/include/llapi/mc/MapItemSavedData.hpp @@ -38,200 +38,200 @@ struct ChunkBounds { public: /** - * @symbol ??0MapItemSavedData\@\@QEAA\@UActorUniqueID\@\@_N\@Z + * @symbol ??0MapItemSavedData\@\@QEAA\@UActorUniqueID\@\@_N\@Z */ MCAPI MapItemSavedData(struct ActorUniqueID, bool); /** - * @symbol ?addTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEAVActor\@\@W4Type\@MapDecoration\@\@\@Z + * @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 + * @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 ?areClientPixelsDirty\@MapItemSavedData\@\@QEBA_NXZ + * @symbol ?areClientPixelsDirty\@MapItemSavedData\@\@QEBA_NXZ */ MCAPI bool areClientPixelsDirty() const; /** - * @symbol ?checkNeedsResampling\@MapItemSavedData\@\@QEAAXXZ + * @symbol ?checkNeedsResampling\@MapItemSavedData\@\@QEAAXXZ */ MCAPI void checkNeedsResampling(); /** - * @symbol ?copyMapData\@MapItemSavedData\@\@QEAAXAEBV1\@\@Z + * @symbol ?copyMapData\@MapItemSavedData\@\@QEAAXAEBV1\@\@Z */ MCAPI void copyMapData(class MapItemSavedData const &); /** - * @symbol ?deserialize\@MapItemSavedData\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?deserialize\@MapItemSavedData\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void deserialize(class CompoundTag const &); /** - * @symbol ?enableUnlimitedTracking\@MapItemSavedData\@\@QEAAXXZ + * @symbol ?enableUnlimitedTracking\@MapItemSavedData\@\@QEAAXXZ */ MCAPI void enableUnlimitedTracking(); /** - * @symbol ?getClientPixels\@MapItemSavedData\@\@QEAAAEAV?$vector\@UClientTerrainPixel\@\@V?$allocator\@UClientTerrainPixel\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getClientPixels\@MapItemSavedData\@\@QEAAAEAV?$vector\@UClientTerrainPixel\@\@V?$allocator\@UClientTerrainPixel\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getClientPixels(); /** - * @symbol ?getClientSamplingLock\@MapItemSavedData\@\@QEAAPEAVSpinLock\@\@XZ + * @symbol ?getClientSamplingLock\@MapItemSavedData\@\@QEAAPEAVSpinLock\@\@XZ */ MCAPI class SpinLock * getClientSamplingLock(); /** - * @symbol ?getFullDataPacket\@MapItemSavedData\@\@QEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getFullDataPacket\@MapItemSavedData\@\@QEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getFullDataPacket() const; /** - * @symbol ?getMapId\@MapItemSavedData\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getMapId\@MapItemSavedData\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getMapId() const; /** - * @symbol ?getParentMapId\@MapItemSavedData\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getParentMapId\@MapItemSavedData\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getParentMapId() const; /** - * @symbol ?getPixels\@MapItemSavedData\@\@QEBA?AV?$buffer_span\@I\@\@XZ + * @symbol ?getPixels\@MapItemSavedData\@\@QEBA?AV?$buffer_span\@I\@\@XZ */ MCAPI class buffer_span getPixels() const; /** - * @symbol ?getTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEAVActor\@\@\@Z + * @symbol ?getTrackedMapEntity\@MapItemSavedData\@\@QEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEAVActor\@\@\@Z */ MCAPI class std::shared_ptr getTrackedMapEntity(class Actor &); /** - * @symbol ?getUpdatePacket\@MapItemSavedData\@\@QEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@\@Z + * @symbol ?getUpdatePacket\@MapItemSavedData\@\@QEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@\@Z */ MCAPI std::unique_ptr getUpdatePacket(class ItemStack const &, class Level &, class Actor &) const; /** - * @symbol ?getUpdatePacket\@MapItemSavedData\@\@QEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEAVLevel\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getUpdatePacket\@MapItemSavedData\@\@QEBA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEAVLevel\@\@AEBVBlockPos\@\@\@Z */ MCAPI std::unique_ptr getUpdatePacket(class Level &, class BlockPos const &) const; /** - * @symbol ?hasParentMap\@MapItemSavedData\@\@QEBA_NXZ + * @symbol ?hasParentMap\@MapItemSavedData\@\@QEBA_NXZ */ MCAPI bool hasParentMap() const; /** - * @symbol ?isAdjacent\@MapItemSavedData\@\@QEBA_NAEBV1\@H\@Z + * @symbol ?isAdjacent\@MapItemSavedData\@\@QEBA_NAEBV1\@H\@Z */ MCAPI bool isAdjacent(class MapItemSavedData const &, int) const; /** - * @symbol ?isChunkAllEmpty\@MapItemSavedData\@\@QEBA_NUChunkBounds\@1\@\@Z + * @symbol ?isChunkAllEmpty\@MapItemSavedData\@\@QEBA_NUChunkBounds\@1\@\@Z */ MCAPI bool isChunkAllEmpty(struct MapItemSavedData::ChunkBounds) const; /** - * @symbol ?isFullyExplored\@MapItemSavedData\@\@QEBA_NXZ + * @symbol ?isFullyExplored\@MapItemSavedData\@\@QEBA_NXZ */ MCAPI bool isFullyExplored() const; /** - * @symbol ?isLocked\@MapItemSavedData\@\@QEBA_NXZ + * @symbol ?isLocked\@MapItemSavedData\@\@QEBA_NXZ */ MCAPI bool isLocked() const; /** - * @symbol ?needsResampling\@MapItemSavedData\@\@QEBA_NXZ + * @symbol ?needsResampling\@MapItemSavedData\@\@QEBA_NXZ */ MCAPI bool needsResampling() const; /** - * @symbol ?removeTrackedMapEntity\@MapItemSavedData\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?removeTrackedMapEntity\@MapItemSavedData\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void removeTrackedMapEntity(class BlockPos const &); /** - * @symbol ?save\@MapItemSavedData\@\@QEAAXAEAVLevelStorage\@\@\@Z + * @symbol ?save\@MapItemSavedData\@\@QEAAXAEAVLevelStorage\@\@\@Z */ MCAPI void save(class LevelStorage &); /** - * @symbol ?serialize\@MapItemSavedData\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?serialize\@MapItemSavedData\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void serialize(class CompoundTag &) const; /** - * @symbol ?setClientPixelsDirty\@MapItemSavedData\@\@QEAAX_N\@Z + * @symbol ?setClientPixelsDirty\@MapItemSavedData\@\@QEAAX_N\@Z */ MCAPI void setClientPixelsDirty(bool); /** - * @symbol ?setDirtyForSaveAndPixelData\@MapItemSavedData\@\@QEAAXXZ + * @symbol ?setDirtyForSaveAndPixelData\@MapItemSavedData\@\@QEAAXXZ */ MCAPI void setDirtyForSaveAndPixelData(); /** - * @symbol ?setLocked\@MapItemSavedData\@\@QEAAXXZ + * @symbol ?setLocked\@MapItemSavedData\@\@QEAAXXZ */ MCAPI void setLocked(); /** - * @symbol ?setMapSection\@MapItemSavedData\@\@QEAAXV?$buffer_span\@I\@\@UChunkBounds\@1\@\@Z + * @symbol ?setMapSection\@MapItemSavedData\@\@QEAAXV?$buffer_span\@I\@\@UChunkBounds\@1\@\@Z */ MCAPI void setMapSection(class buffer_span, struct MapItemSavedData::ChunkBounds); /** - * @symbol ?setOrigin\@MapItemSavedData\@\@QEAAXVVec3\@\@HV?$AutomaticID\@VDimension\@\@H\@\@_N2AEBVBlockPos\@\@\@Z + * @symbol ?setOrigin\@MapItemSavedData\@\@QEAAXVVec3\@\@HV?$AutomaticID\@VDimension\@\@H\@\@_N2AEBVBlockPos\@\@\@Z */ MCAPI void setOrigin(class Vec3, int, class AutomaticID, bool, bool, class BlockPos const &); /** - * @symbol ?setPixel\@MapItemSavedData\@\@QEAA_NIII\@Z + * @symbol ?setPixel\@MapItemSavedData\@\@QEAA_NIII\@Z */ MCAPI bool setPixel(unsigned int, unsigned int, unsigned int); /** - * @symbol ?setPixelDirty\@MapItemSavedData\@\@QEAAXII\@Z + * @symbol ?setPixelDirty\@MapItemSavedData\@\@QEAAXII\@Z */ MCAPI void setPixelDirty(unsigned int, unsigned int); /** - * @symbol ?setScale\@MapItemSavedData\@\@QEAAXH\@Z + * @symbol ?setScale\@MapItemSavedData\@\@QEAAXH\@Z */ MCAPI void setScale(int); /** - * @symbol ?setScaleAndParentMapId\@MapItemSavedData\@\@QEAAXHUActorUniqueID\@\@\@Z + * @symbol ?setScaleAndParentMapId\@MapItemSavedData\@\@QEAAXHUActorUniqueID\@\@\@Z */ MCAPI void setScaleAndParentMapId(int, struct ActorUniqueID); /** - * @symbol ?tickByBlock\@MapItemSavedData\@\@QEAAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?tickByBlock\@MapItemSavedData\@\@QEAAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI void tickByBlock(class BlockPos const &, class BlockSource &); /** - * @symbol ?tickCarriedBy\@MapItemSavedData\@\@QEAAXAEAVActor\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?tickCarriedBy\@MapItemSavedData\@\@QEAAXAEAVActor\@\@PEBVCompoundTag\@\@\@Z */ MCAPI void tickCarriedBy(class Actor &, class CompoundTag const *); /** - * @symbol ?trySave\@MapItemSavedData\@\@QEAAXAEAVLevelStorage\@\@\@Z + * @symbol ?trySave\@MapItemSavedData\@\@QEAAXAEAVLevelStorage\@\@\@Z */ MCAPI void trySave(class LevelStorage &); /** - * @symbol ??1MapItemSavedData\@\@QEAA\@XZ + * @symbol ??1MapItemSavedData\@\@QEAA\@XZ */ MCAPI ~MapItemSavedData(); /** - * @symbol ?getSerializationKey\@MapItemSavedData\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z + * @symbol ?getSerializationKey\@MapItemSavedData\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z */ MCAPI static std::string getSerializationKey(struct ActorUniqueID); //private: /** - * @symbol ?_addDecoration\@MapItemSavedData\@\@AEAAXW4Type\@MapDecoration\@\@AEAVLevel\@\@AEBUUniqueId\@MapItemTrackedActor\@\@AEBVVec3\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z + * @symbol ?_addDecoration\@MapItemSavedData\@\@AEAAXW4Type\@MapDecoration\@\@AEAVLevel\@\@AEBUUniqueId\@MapItemTrackedActor\@\@AEBVVec3\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVColor\@mce\@\@\@Z */ MCAPI void _addDecoration(enum class MapDecoration::Type, class Level &, struct MapItemTrackedActor::UniqueId const &, class Vec3 const &, std::string const &, class mce::Color const &); /** - * @symbol ?_addTrackedMapEntity\@MapItemSavedData\@\@AEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEBUUniqueId\@MapItemTrackedActor\@\@AEAVBlockSource\@\@W4Type\@MapDecoration\@\@\@Z + * @symbol ?_addTrackedMapEntity\@MapItemSavedData\@\@AEAA?AV?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@AEBUUniqueId\@MapItemTrackedActor\@\@AEAVBlockSource\@\@W4Type\@MapDecoration\@\@\@Z */ MCAPI class std::shared_ptr _addTrackedMapEntity(struct MapItemTrackedActor::UniqueId const &, class BlockSource &, enum class MapDecoration::Type); /** - * @symbol ?_deserializeData\@MapItemSavedData\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_deserializeData\@MapItemSavedData\@\@AEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void _deserializeData(class CompoundTag const &); /** - * @symbol ?_removeDecoration\@MapItemSavedData\@\@AEAAXAEBUUniqueId\@MapItemTrackedActor\@\@\@Z + * @symbol ?_removeDecoration\@MapItemSavedData\@\@AEAAXAEBUUniqueId\@MapItemTrackedActor\@\@\@Z */ MCAPI void _removeDecoration(struct MapItemTrackedActor::UniqueId const &); /** - * @symbol ?_removeTrackedMapEntity\@MapItemSavedData\@\@AEAAXAEBUUniqueId\@MapItemTrackedActor\@\@\@Z + * @symbol ?_removeTrackedMapEntity\@MapItemSavedData\@\@AEAAXAEBUUniqueId\@MapItemTrackedActor\@\@\@Z */ MCAPI void _removeTrackedMapEntity(struct MapItemTrackedActor::UniqueId const &); /** - * @symbol ?_updateTrackedEntityDecoration\@MapItemSavedData\@\@AEAA_NAEAVBlockSource\@\@V?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@\@Z + * @symbol ?_updateTrackedEntityDecoration\@MapItemSavedData\@\@AEAA_NAEAVBlockSource\@\@V?$shared_ptr\@VMapItemTrackedActor\@\@\@std\@\@\@Z */ MCAPI bool _updateTrackedEntityDecoration(class BlockSource &, class std::shared_ptr); /** - * @symbol ?_updateTrackedEntityDecorations\@MapItemSavedData\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_updateTrackedEntityDecorations\@MapItemSavedData\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _updateTrackedEntityDecorations(class BlockSource &); /** - * @symbol ?_updateTrackedPlayerDecorations\@MapItemSavedData\@\@AEAAXAEAVBlockSource\@\@AEAVPlayer\@\@AEAVVec3\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVColor\@mce\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAW4Type\@MapDecoration\@\@\@Z + * @symbol ?_updateTrackedPlayerDecorations\@MapItemSavedData\@\@AEAAXAEAVBlockSource\@\@AEAVPlayer\@\@AEAVVec3\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVColor\@mce\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAW4Type\@MapDecoration\@\@\@Z */ MCAPI void _updateTrackedPlayerDecorations(class BlockSource &, class Player &, class Vec3 &, std::string &, class mce::Color &, class AutomaticID, enum class MapDecoration::Type &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp b/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp index 603955ed7d..784f552158 100644 --- a/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp +++ b/LiteLoader/include/llapi/mc/MapItemTrackedActor.hpp @@ -36,28 +36,28 @@ struct UniqueId { public: /** - * @symbol ??0MapItemTrackedActor\@\@QEAA\@AEBUUniqueId\@0\@AEAVBlockSource\@\@\@Z + * @symbol ??0MapItemTrackedActor\@\@QEAA\@AEBUUniqueId\@0\@AEAVBlockSource\@\@\@Z */ MCAPI MapItemTrackedActor(struct MapItemTrackedActor::UniqueId const &, class BlockSource &); /** - * @symbol ?getDecorationRotation\@MapItemTrackedActor\@\@QEAAMAEAVBlockSource\@\@\@Z + * @symbol ?getDecorationRotation\@MapItemTrackedActor\@\@QEAAMAEAVBlockSource\@\@\@Z */ MCAPI float getDecorationRotation(class BlockSource &); /** - * @symbol ?getEntity\@MapItemTrackedActor\@\@QEAAPEAVActor\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getEntity\@MapItemTrackedActor\@\@QEAAPEAVActor\@\@AEAVBlockSource\@\@\@Z */ MCAPI class Actor * getEntity(class BlockSource &); /** - * @symbol ?nextUpdatePacket\@MapItemTrackedActor\@\@QEAA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVMapItemSavedData\@\@\@Z + * @symbol ?nextUpdatePacket\@MapItemTrackedActor\@\@QEAA?AV?$unique_ptr\@VPacket\@\@U?$default_delete\@VPacket\@\@\@std\@\@\@std\@\@AEBVMapItemSavedData\@\@\@Z */ MCAPI std::unique_ptr nextUpdatePacket(class MapItemSavedData const &); /** - * @symbol ?setNeedsResend\@MapItemTrackedActor\@\@QEAAXXZ + * @symbol ?setNeedsResend\@MapItemTrackedActor\@\@QEAAXXZ */ MCAPI void setNeedsResend(); /** - * @symbol ?setPixelDirty\@MapItemTrackedActor\@\@QEAAXII\@Z + * @symbol ?setPixelDirty\@MapItemTrackedActor\@\@QEAAXII\@Z */ MCAPI void setPixelDirty(unsigned int, unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp index e5b906259a..754d6417f3 100644 --- a/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapLockingRecipe.hpp @@ -31,47 +31,47 @@ class MapLockingRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapLockingRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@MapLockingRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@MapLockingRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@MapLockingRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@MapLockingRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@MapLockingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@MapLockingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@MapLockingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@MapLockingRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@MapLockingRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0MapLockingRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0MapLockingRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI MapLockingRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI MapLockingRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ?CartographyTableID\@MapLockingRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CartographyTableID\@MapLockingRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CartographyTableID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp index 8984d043e7..f396c3f499 100644 --- a/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MapUpgradingRecipe.hpp @@ -31,51 +31,51 @@ class MapUpgradingRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MapUpgradingRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@MapUpgradingRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@MapUpgradingRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@MapUpgradingRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@MapUpgradingRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@MapUpgradingRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@MapUpgradingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@MapUpgradingRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@MapUpgradingRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@MapUpgradingRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0MapUpgradingRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ??0MapUpgradingRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ - MCAPI MapUpgradingRecipe(class gsl::basic_string_span, class mce::UUID const &); + MCAPI MapUpgradingRecipe(class std::basic_string_view>, class mce::UUID const &); /** - * @symbol ?CartographyTableID\@MapUpgradingRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CartographyTableID\@MapUpgradingRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CartographyTableID; /** - * @symbol ?CraftingTableID\@MapUpgradingRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?CraftingTableID\@MapUpgradingRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CraftingTableID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MarkVariantDefinition.hpp b/LiteLoader/include/llapi/mc/MarkVariantDefinition.hpp index e73de59bab..25a23f3cd5 100644 --- a/LiteLoader/include/llapi/mc/MarkVariantDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MarkVariantDefinition.hpp @@ -31,7 +31,7 @@ struct MarkVariantDefinition { public: /** - * @symbol ?buildSchema\@MarkVariantDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UMarkVariantDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@MarkVariantDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UMarkVariantDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp b/LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp index c9ff9cf18d..58c3b1639e 100644 --- a/LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp +++ b/LiteLoader/include/llapi/mc/MarketplaceSkinValidator.hpp @@ -30,8 +30,8 @@ class MarketplaceSkinValidator { public: /** - * @symbol ?checkIfValid\@MarketplaceSkinValidator\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?checkIfValid\@MarketplaceSkinValidator\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool checkIfValid(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Material.hpp b/LiteLoader/include/llapi/mc/Material.hpp index f61e8980cd..a5b66c2164 100644 --- a/LiteLoader/include/llapi/mc/Material.hpp +++ b/LiteLoader/include/llapi/mc/Material.hpp @@ -30,84 +30,84 @@ class Material { public: /** - * @symbol ?getBlocksMotion\@Material\@\@QEBA_NXZ + * @symbol ?getBlocksMotion\@Material\@\@QEBA_NXZ */ MCAPI bool getBlocksMotion() const; /** - * @symbol ?getBlocksPrecipitation\@Material\@\@QEBA_NXZ + * @symbol ?getBlocksPrecipitation\@Material\@\@QEBA_NXZ */ MCAPI bool getBlocksPrecipitation() const; /** - * @symbol ?getTranslucency\@Material\@\@QEBAMXZ + * @symbol ?getTranslucency\@Material\@\@QEBAMXZ */ MCAPI float getTranslucency() const; /** - * @symbol ?isAlwaysDestroyable\@Material\@\@QEBA_NXZ + * @symbol ?isAlwaysDestroyable\@Material\@\@QEBA_NXZ */ MCAPI bool isAlwaysDestroyable() const; /** - * @symbol ?isLiquid\@Material\@\@QEBA_NXZ + * @symbol ?isLiquid\@Material\@\@QEBA_NXZ */ MCAPI bool isLiquid() const; /** - * @symbol ?isSolid\@Material\@\@QEBA_NXZ + * @symbol ?isSolid\@Material\@\@QEBA_NXZ */ MCAPI bool isSolid() const; /** - * @symbol ?isSolidBlocking\@Material\@\@QEBA_NXZ + * @symbol ?isSolidBlocking\@Material\@\@QEBA_NXZ */ MCAPI bool isSolidBlocking() const; /** - * @symbol ?isSuperHot\@Material\@\@QEBA_NXZ + * @symbol ?isSuperHot\@Material\@\@QEBA_NXZ */ MCAPI bool isSuperHot() const; /** - * @symbol ?isTopSolid\@Material\@\@QEBA_N_N0\@Z + * @symbol ?isTopSolid\@Material\@\@QEBA_N_N0\@Z */ MCAPI bool isTopSolid(bool, bool) const; /** - * @symbol ?isType\@Material\@\@QEBA_NW4MaterialType\@\@\@Z + * @symbol ?isType\@Material\@\@QEBA_NW4MaterialType\@\@\@Z */ MCAPI bool isType(enum class MaterialType) const; /** - * @symbol ??9Material\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9Material\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class Material const &) const; /** - * @symbol ??8Material\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8Material\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class Material const &) const; /** - * @symbol ?addMaterial\@Material\@\@SAXV?$unique_ptr\@VMaterial\@\@U?$default_delete\@VMaterial\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addMaterial\@Material\@\@SAXV?$unique_ptr\@VMaterial\@\@U?$default_delete\@VMaterial\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void addMaterial(std::unique_ptr); /** - * @symbol ?getMaterial\@Material\@\@SAAEBV1\@W4MaterialType\@\@\@Z + * @symbol ?getMaterial\@Material\@\@SAAEBV1\@W4MaterialType\@\@\@Z */ MCAPI static class Material const & getMaterial(enum class MaterialType); /** - * @symbol ?initMaterials\@Material\@\@SAXXZ + * @symbol ?initMaterials\@Material\@\@SAXXZ */ MCAPI static void initMaterials(); /** - * @symbol ?teardownMaterials\@Material\@\@SAXXZ + * @symbol ?teardownMaterials\@Material\@\@SAXXZ */ MCAPI static void teardownMaterials(); //private: /** - * @symbol ?_setupSurfaceMaterials\@Material\@\@CAXXZ + * @symbol ?_setupSurfaceMaterials\@Material\@\@CAXXZ */ MCAPI static void _setupSurfaceMaterials(); private: /** - * @symbol ?mInitialized\@Material\@\@0_NA + * @symbol ?mInitialized\@Material\@\@0_NA */ MCAPI static bool mInitialized; /** - * @symbol ?mMaterials\@Material\@\@0V?$vector\@V?$unique_ptr\@VMaterial\@\@U?$default_delete\@VMaterial\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VMaterial\@\@U?$default_delete\@VMaterial\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mMaterials\@Material\@\@0V?$vector\@V?$unique_ptr\@VMaterial\@\@U?$default_delete\@VMaterial\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VMaterial\@\@U?$default_delete\@VMaterial\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static std::vector> mMaterials; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp index c49b2466d3..d4f85d6a16 100644 --- a/LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/MaterialReducerContainerManagerModel.hpp @@ -31,48 +31,48 @@ class MaterialReducerContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MaterialReducerContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@MaterialReducerContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@MaterialReducerContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@MaterialReducerContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@MaterialReducerContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@MaterialReducerContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@MaterialReducerContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@MaterialReducerContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@MaterialReducerContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@MaterialReducerContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@MaterialReducerContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@MaterialReducerContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@MaterialReducerContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@MaterialReducerContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@MaterialReducerContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0MaterialReducerContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0MaterialReducerContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI MaterialReducerContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MaterialReducerContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/MaterialReducerContainerScreenValidator.hpp index b6f8257262..ce42bf3c99 100644 --- a/LiteLoader/include/llapi/mc/MaterialReducerContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/MaterialReducerContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class MaterialReducerContainerScreenValidator : public ContainerScreenValidatorB public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MaterialReducerContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0MaterialReducerContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0MaterialReducerContainerScreenValidator\@\@QEAA\@XZ */ MCAPI MaterialReducerContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MaterialReducerDataEntry.hpp b/LiteLoader/include/llapi/mc/MaterialReducerDataEntry.hpp index ffda6044ce..5a3a0b2d69 100644 --- a/LiteLoader/include/llapi/mc/MaterialReducerDataEntry.hpp +++ b/LiteLoader/include/llapi/mc/MaterialReducerDataEntry.hpp @@ -25,7 +25,7 @@ struct MaterialReducerDataEntry { public: /** - * @symbol ??1MaterialReducerDataEntry\@\@QEAA\@XZ + * @symbol ??1MaterialReducerDataEntry\@\@QEAA\@XZ */ MCAPI ~MaterialReducerDataEntry(); diff --git a/LiteLoader/include/llapi/mc/MaterialReducerInputValidation.hpp b/LiteLoader/include/llapi/mc/MaterialReducerInputValidation.hpp index 19f221ace4..54f91bc9f4 100644 --- a/LiteLoader/include/llapi/mc/MaterialReducerInputValidation.hpp +++ b/LiteLoader/include/llapi/mc/MaterialReducerInputValidation.hpp @@ -31,63 +31,63 @@ class MaterialReducerInputValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MaterialReducerInputValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@MaterialReducerInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@MaterialReducerInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isItemAllowedToAdd\@MaterialReducerInputValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 4 + * @symbol ?isItemAllowedToAdd\@MaterialReducerInputValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?getContainerOffset\@MaterialReducerInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@MaterialReducerInputValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MATERIALREDUCERINPUTVALIDATION /** - * @symbol ?canDestroy\@MaterialReducerInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @symbol ?canDestroy\@MaterialReducerInputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ MCVAPI bool canDestroy(class ContainerScreenContext const &) const; /** - * @symbol ?getAvailableSetCount\@MaterialReducerInputValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @symbol ?getAvailableSetCount\@MaterialReducerInputValidation\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ MCVAPI int getAvailableSetCount(int, class ItemStackBase const &) const; #endif /** - * @symbol ??0MaterialReducerInputValidation\@\@QEAA\@AEBVContainerScreenContext\@\@\@Z + * @symbol ??0MaterialReducerInputValidation\@\@QEAA\@AEBVContainerScreenContext\@\@\@Z */ MCAPI MaterialReducerInputValidation(class ContainerScreenContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MaterialReducerOutputValidation.hpp b/LiteLoader/include/llapi/mc/MaterialReducerOutputValidation.hpp index f56f77bbe7..59981a66af 100644 --- a/LiteLoader/include/llapi/mc/MaterialReducerOutputValidation.hpp +++ b/LiteLoader/include/llapi/mc/MaterialReducerOutputValidation.hpp @@ -31,60 +31,60 @@ class MaterialReducerOutputValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MaterialReducerOutputValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?getContainerOffset\@MaterialReducerOutputValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@MaterialReducerOutputValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@MaterialReducerOutputValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@MaterialReducerOutputValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MATERIALREDUCEROUTPUTVALIDATION /** - * @symbol ?canDestroy\@MaterialReducerOutputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @symbol ?canDestroy\@MaterialReducerOutputValidation\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ MCVAPI bool canDestroy(class ContainerScreenContext const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Matrix.hpp b/LiteLoader/include/llapi/mc/Matrix.hpp index afec78a50d..84ba131125 100644 --- a/LiteLoader/include/llapi/mc/Matrix.hpp +++ b/LiteLoader/include/llapi/mc/Matrix.hpp @@ -30,8 +30,8 @@ class Matrix { public: /** - * @symbol ?transform3\@Matrix\@\@QEBAXAEAU?$vec\@$02M$0A\@\@glm\@\@AEAM\@Z + * @symbol ?transform3\@Matrix\@\@QEBAXAEAU?$vec\@$02M$0A\@\@glm\@\@AEAM\@Z */ MCAPI void transform3(struct glm::vec<3, float, 0> &, float &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MeCommand.hpp b/LiteLoader/include/llapi/mc/MeCommand.hpp index 68ce336896..f888723310 100644 --- a/LiteLoader/include/llapi/mc/MeCommand.hpp +++ b/LiteLoader/include/llapi/mc/MeCommand.hpp @@ -31,26 +31,26 @@ class MeCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MeCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@MeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@MeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@MeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@MeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_sendMessage\@MeCommand\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUCommandOriginIdentity\@\@AEBVLevel\@\@\@Z + * @symbol ?_sendMessage\@MeCommand\@\@AEBAXAEBV?$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 &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MeadowFlowerFeature.hpp b/LiteLoader/include/llapi/mc/MeadowFlowerFeature.hpp index 505dd599d4..4f8ffe4845 100644 --- a/LiteLoader/include/llapi/mc/MeadowFlowerFeature.hpp +++ b/LiteLoader/include/llapi/mc/MeadowFlowerFeature.hpp @@ -30,26 +30,26 @@ class MeadowFlowerFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MeadowFlowerFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@MeadowFlowerFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@MeadowFlowerFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0MeadowFlowerFeature\@\@QEAA\@XZ + * @symbol ??0MeadowFlowerFeature\@\@QEAA\@XZ */ MCAPI MeadowFlowerFeature(); //private: /** - * @symbol ?getRandomArrayIndex\@MeadowFlowerFeature\@\@AEBAHAEBVBlockPos\@\@_KM\@Z + * @symbol ?getRandomArrayIndex\@MeadowFlowerFeature\@\@AEBAHAEBVBlockPos\@\@_KM\@Z */ MCAPI int getRandomArrayIndex(class BlockPos const &, unsigned __int64, float) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MedicineItem.hpp b/LiteLoader/include/llapi/mc/MedicineItem.hpp index 232fd9f58c..44d80bc4c3 100644 --- a/LiteLoader/include/llapi/mc/MedicineItem.hpp +++ b/LiteLoader/include/llapi/mc/MedicineItem.hpp @@ -32,112 +32,112 @@ class MedicineItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MedicineItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@MedicineItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@MedicineItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@MedicineItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@MedicineItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@MedicineItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@MedicineItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@MedicineItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@MedicineItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@MedicineItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@MedicineItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@MedicineItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @symbol ??0MedicineItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MedicineItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MedicineItem(std::string const &, int); /** - * @symbol ?getMobEffect\@MedicineItem\@\@SAPEBVMobEffect\@\@AEBVItemStack\@\@\@Z + * @symbol ?getMobEffect\@MedicineItem\@\@SAPEBVMobEffect\@\@AEBVItemStack\@\@\@Z */ MCAPI static class MobEffect const * getMobEffect(class ItemStack const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp b/LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp index d6ad006a0c..fd37b24aa0 100644 --- a/LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/MegaPineTreeCanopy.hpp @@ -31,14 +31,14 @@ class MegaPineTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MegaPineTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@MegaPineTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@MegaPineTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp b/LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp index a23d187e7a..e16f52e4ac 100644 --- a/LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/MegaTreeCanopy.hpp @@ -31,14 +31,14 @@ class MegaTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MegaTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@MegaTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@MegaTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp b/LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp index 7670002d46..c4b4b4cb7a 100644 --- a/LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/MegaTreeTrunk.hpp @@ -31,27 +31,27 @@ class MegaTreeTrunk { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MegaTreeTrunk(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeTrunk\@MegaTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + * @vftbl 1 + * @symbol ?placeTrunk\@MegaTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z */ virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; /** - * @vftbl 2 - * @symbol ?getTreeHeight\@MegaTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?getTreeHeight\@MegaTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z */ virtual int getTreeHeight(class Random &) const; //private: /** - * @symbol ?_prepareSpawn\@MegaTreeTrunk\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HAEBUTreeParams\@TreeHelper\@\@\@Z + * @symbol ?_prepareSpawn\@MegaTreeTrunk\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HAEBUTreeParams\@TreeHelper\@\@\@Z */ MCAPI bool _prepareSpawn(class IBlockWorldGenAPI &, class BlockPos const &, int, struct TreeHelper::TreeParams const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp b/LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp index 404705972c..992a84a5e6 100644 --- a/LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MeleeAttackDefinition.hpp @@ -29,17 +29,23 @@ class MeleeAttackDefinition { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MELEEATTACKDEFINITION /** - * @symbol ??0MeleeAttackDefinition\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MeleeAttackDefinition(); +#endif + /** + * @symbol ??0MeleeAttackDefinition\@\@QEAA\@XZ */ MCAPI MeleeAttackDefinition(); /** - * @symbol ?initialize\@MeleeAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMeleeAttackGoal\@\@\@Z + * @symbol ?initialize\@MeleeAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMeleeAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class MeleeAttackGoal &) const; /** - * @symbol ?buildSchema\@MeleeAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMeleeAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@MeleeAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMeleeAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp b/LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp index 4023319d4c..c1b3cc57c6 100644 --- a/LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/MeleeAttackGoal.hpp @@ -30,108 +30,114 @@ class MeleeAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MeleeAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MeleeAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MeleeAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MeleeAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MeleeAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MeleeAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MeleeAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MeleeAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MeleeAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MeleeAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MeleeAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MeleeAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MeleeAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_attemptMoveToTarget\@MeleeAttackGoal\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 10 + * @symbol ?_attemptMoveToTarget\@MeleeAttackGoal\@\@MEAAXAEAVActor\@\@\@Z */ virtual void _attemptMoveToTarget(class Actor &); /** - * @vftbl 11 - * @symbol ?_attemptAttackTarget\@MeleeAttackGoal\@\@MEAAXAEAVActor\@\@MMMAEBVVec3\@\@\@Z + * @vftbl 11 + * @symbol ?_attemptAttackTarget\@MeleeAttackGoal\@\@MEAAXAEAVActor\@\@MMMAEBVVec3\@\@\@Z */ virtual void _attemptAttackTarget(class Actor &, float, float, float, class Vec3 const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MELEEATTACKGOAL /** - * @symbol ??0MeleeAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MeleeAttackGoal(); +#endif + /** + * @symbol ??0MeleeAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI MeleeAttackGoal(class Mob &); /** - * @symbol ?canReachTarget\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVVec3\@\@MMMMH\@Z + * @symbol ?canReachTarget\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVVec3\@\@MMMMH\@Z */ MCAPI static bool canReachTarget(class Mob const &, class Vec3 const &, float, float, float, float, int); /** - * @symbol ?canReachTargetLegacy\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVVec3\@\@MMMMH\@Z + * @symbol ?canReachTargetLegacy\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVVec3\@\@MMMMH\@Z */ MCAPI static bool canReachTargetLegacy(class Mob const &, class Vec3 const &, float, float, float, float, int); /** - * @symbol ?isTargetInLineOfSight\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVActor\@\@\@Z + * @symbol ?isTargetInLineOfSight\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVActor\@\@\@Z */ MCAPI static bool isTargetInLineOfSight(class Mob const &, class Actor const &); /** - * @symbol ?isTargetInLineOfSightLegacy\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVActor\@\@\@Z + * @symbol ?isTargetInLineOfSightLegacy\@MeleeAttackGoal\@\@SA_NAEBVMob\@\@AEBVActor\@\@\@Z */ MCAPI static bool isTargetInLineOfSightLegacy(class Mob const &, class Actor const &); /** - * @symbol ?min3DAttackVersion\@MeleeAttackGoal\@\@2VBaseGameVersion\@\@B + * @symbol ?min3DAttackVersion\@MeleeAttackGoal\@\@2VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const min3DAttackVersion; /** - * @symbol ?minHitThroughWallFixVersion\@MeleeAttackGoal\@\@2VBaseGameVersion\@\@B + * @symbol ?minHitThroughWallFixVersion\@MeleeAttackGoal\@\@2VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const minHitThroughWallFixVersion; //protected: /** - * @symbol ?_attemptMoveToTargetPosition\@MeleeAttackGoal\@\@IEAAXAEAVActor\@\@M\@Z + * @symbol ?_attemptMoveToTargetPosition\@MeleeAttackGoal\@\@IEAAXAEAVActor\@\@M\@Z */ MCAPI void _attemptMoveToTargetPosition(class Actor &, float); /** - * @symbol ?_getAttackReachSqr\@MeleeAttackGoal\@\@IEBAMAEBVActor\@\@\@Z + * @symbol ?_getAttackReachSqr\@MeleeAttackGoal\@\@IEBAMAEBVActor\@\@\@Z */ MCAPI float _getAttackReachSqr(class Actor const &) const; /** - * @symbol ?_inSunlight\@MeleeAttackGoal\@\@IEBA_NAEBVActor\@\@\@Z + * @symbol ?_inSunlight\@MeleeAttackGoal\@\@IEBA_NAEBVActor\@\@\@Z */ MCAPI bool _inSunlight(class Actor const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp b/LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp index b25e567982..6a7f5afbf9 100644 --- a/LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp +++ b/LiteLoader/include/llapi/mc/MeleeWeaponEnchant.hpp @@ -31,77 +31,77 @@ class MeleeWeaponEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MeleeWeaponEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@MeleeWeaponEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@MeleeWeaponEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@MeleeWeaponEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@MeleeWeaponEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@MeleeWeaponEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@MeleeWeaponEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 7 - * @symbol ?getDamageBonus\@MeleeWeaponEnchant\@\@UEBAMHAEBVActor\@\@\@Z + * @vftbl 7 + * @symbol ?getDamageBonus\@MeleeWeaponEnchant\@\@UEBAMHAEBVActor\@\@\@Z */ virtual float getDamageBonus(int, class Actor const &) const; /** - * @vftbl 8 - * @symbol ?doPostAttack\@MeleeWeaponEnchant\@\@UEBAXAEAVActor\@\@0H\@Z + * @vftbl 8 + * @symbol ?doPostAttack\@MeleeWeaponEnchant\@\@UEBAXAEAVActor\@\@0H\@Z */ virtual void doPostAttack(class Actor &, class Actor &, int) const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@MeleeWeaponEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@MeleeWeaponEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MELEEWEAPONENCHANT /** - * @symbol ?isMeleeDamageEnchant\@MeleeWeaponEnchant\@\@UEBA_NXZ + * @symbol ?isMeleeDamageEnchant\@MeleeWeaponEnchant\@\@UEBA_NXZ */ MCVAPI bool isMeleeDamageEnchant() const; #endif /** - * @symbol ??0MeleeWeaponEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0MeleeWeaponEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI MeleeWeaponEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI MeleeWeaponEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: private: /** - * @symbol ?VALID_ENCHANTMENTS\@MeleeWeaponEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B + * @symbol ?VALID_ENCHANTMENTS\@MeleeWeaponEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const VALID_ENCHANTMENTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MelonBlock.hpp b/LiteLoader/include/llapi/mc/MelonBlock.hpp index af826dfc00..701ec2a056 100644 --- a/LiteLoader/include/llapi/mc/MelonBlock.hpp +++ b/LiteLoader/include/llapi/mc/MelonBlock.hpp @@ -31,208 +31,213 @@ class MelonBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MelonBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@MelonBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@MelonBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@MelonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@MelonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@MelonBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@MelonBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0MelonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MelonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MelonBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MelonFeature.hpp b/LiteLoader/include/llapi/mc/MelonFeature.hpp index 43fcab9962..657770c347 100644 --- a/LiteLoader/include/llapi/mc/MelonFeature.hpp +++ b/LiteLoader/include/llapi/mc/MelonFeature.hpp @@ -31,14 +31,14 @@ class MelonFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MelonFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@MelonFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@MelonFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp b/LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp index 17011a2ce5..1e7e71f1fd 100644 --- a/LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/MemoryMappedFileAccess.hpp @@ -32,52 +32,52 @@ class MemoryMappedFileAccess { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MemoryMappedFileAccess(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fopen\@MemoryMappedFileAccess\@\@UEAAPEAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?fopen\@MemoryMappedFileAccess\@\@UEAAPEAXAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void * fopen(class Core::Path const &, std::string const &); /** - * @vftbl 2 - * @symbol ?fclose\@MemoryMappedFileAccess\@\@UEAAHPEAX\@Z + * @vftbl 2 + * @symbol ?fclose\@MemoryMappedFileAccess\@\@UEAAHPEAX\@Z */ virtual int fclose(void *); /** - * @vftbl 3 - * @symbol ?fseek\@MemoryMappedFileAccess\@\@UEAAHPEAX_JH\@Z + * @vftbl 3 + * @symbol ?fseek\@MemoryMappedFileAccess\@\@UEAAHPEAX_JH\@Z */ virtual int fseek(void *, __int64, int); /** - * @vftbl 4 - * @symbol ?ftell\@MemoryMappedFileAccess\@\@UEAA_JPEAX\@Z + * @vftbl 4 + * @symbol ?ftell\@MemoryMappedFileAccess\@\@UEAA_JPEAX\@Z */ virtual __int64 ftell(void *); /** - * @vftbl 5 - * @symbol ?getReadInterface\@MemoryMappedFileAccess\@\@UEBAPEBVIFileReadAccess\@\@XZ + * @vftbl 5 + * @symbol ?getReadInterface\@MemoryMappedFileAccess\@\@UEBAPEBVIFileReadAccess\@\@XZ */ virtual class IFileReadAccess const * getReadInterface() const; /** - * @vftbl 6 - * @symbol ?getWriteInterface\@MemoryMappedFileAccess\@\@UEAAPEAVIFileWriteAccess\@\@XZ + * @vftbl 6 + * @symbol ?getWriteInterface\@MemoryMappedFileAccess\@\@UEAAPEAVIFileWriteAccess\@\@XZ */ virtual class IFileWriteAccess * getWriteInterface(); /** - * @vftbl 7 - * @symbol ?unload\@MemoryMappedFileAccess\@\@UEAAXXZ + * @vftbl 7 + * @symbol ?unload\@MemoryMappedFileAccess\@\@UEAAXXZ */ virtual void unload(); /** - * @symbol ??0MemoryMappedFileAccess\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VFileAccessTransforms\@\@U?$default_delete\@VFileAccessTransforms\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0MemoryMappedFileAccess\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@V?$unique_ptr\@VFileAccessTransforms\@\@U?$default_delete\@VFileAccessTransforms\@\@\@std\@\@\@std\@\@\@Z */ MCAPI MemoryMappedFileAccess(class gsl::not_null> const &, std::unique_ptr); /** - * @symbol ?EMPTY_TRANSFORMS\@MemoryMappedFileAccess\@\@2VFileAccessTransforms\@\@B + * @symbol ?EMPTY_TRANSFORMS\@MemoryMappedFileAccess\@\@2VFileAccessTransforms\@\@B */ MCAPI static class FileAccessTransforms const EMPTY_TRANSFORMS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MendingEnchant.hpp b/LiteLoader/include/llapi/mc/MendingEnchant.hpp index 26e41ef958..61ce9bcb34 100644 --- a/LiteLoader/include/llapi/mc/MendingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/MendingEnchant.hpp @@ -31,54 +31,54 @@ class MendingEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MendingEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@MendingEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@MendingEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@MendingEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@MendingEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@MendingEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@MendingEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MENDINGENCHANT /** - * @symbol ?isTreasureOnly\@MendingEnchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@MendingEnchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; #endif /** - * @symbol ??0MendingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0MendingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI MendingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI MendingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp index 213d7ac534..dcebfcb7b1 100644 --- a/LiteLoader/include/llapi/mc/MerchantRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipe.hpp @@ -43,158 +43,161 @@ class MerchantRecipe { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MERCHANTRECIPE public: - class MerchantRecipe& operator=(class MerchantRecipe const &) = delete; MerchantRecipe() = delete; #endif public: /** - * @symbol ??0MerchantRecipe\@\@QEAA\@PEBVCompoundTag\@\@\@Z + * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@00\@Z */ - MCAPI MerchantRecipe(class CompoundTag const *); + MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); /** - * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z + * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z */ - MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &); + MCAPI MerchantRecipe(class MerchantRecipe const &); /** - * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@00\@Z + * @symbol ??0MerchantRecipe\@\@QEAA\@PEBVCompoundTag\@\@\@Z */ - MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); + MCAPI MerchantRecipe(class CompoundTag const *); /** - * @symbol ??0MerchantRecipe\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MerchantRecipe\@\@QEAA\@AEBVItemInstance\@\@0\@Z */ - MCAPI MerchantRecipe(class MerchantRecipe const &); + MCAPI MerchantRecipe(class ItemInstance const &, class ItemInstance const &); /** - * @symbol ?calculateDemandPrices\@MerchantRecipe\@\@QEAAXHHH_N\@Z + * @symbol ?calculateDemandPrices\@MerchantRecipe\@\@QEAAXHHH_N\@Z */ MCAPI void calculateDemandPrices(int, int, int, bool); /** - * @symbol ?createTag\@MerchantRecipe\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?createTag\@MerchantRecipe\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI std::unique_ptr createTag(bool) const; /** - * @symbol ?getBaseCountA\@MerchantRecipe\@\@QEBAHXZ + * @symbol ?getBaseCountA\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getBaseCountA() const; /** - * @symbol ?getBaseCountB\@MerchantRecipe\@\@QEBAHXZ + * @symbol ?getBaseCountB\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getBaseCountB() const; /** - * @symbol ?getBuyAItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getBuyAItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getBuyAItem() const; /** - * @symbol ?getBuyBItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getBuyBItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getBuyBItem() const; /** - * @symbol ?getDemand\@MerchantRecipe\@\@QEBAHXZ + * @symbol ?getDemand\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getDemand() const; /** - * @symbol ?getMaxUses\@MerchantRecipe\@\@QEBAHXZ + * @symbol ?getMaxUses\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getMaxUses() const; /** - * @symbol ?getNetId\@MerchantRecipe\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ + * @symbol ?getNetId\@MerchantRecipe\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ */ MCAPI class TypedServerNetId const & getNetId() const; /** - * @symbol ?getSellItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getSellItem\@MerchantRecipe\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getSellItem() const; /** - * @symbol ?getTier\@MerchantRecipe\@\@QEBAHXZ + * @symbol ?getTier\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getTier() const; /** - * @symbol ?getTraderExp\@MerchantRecipe\@\@QEBAIXZ + * @symbol ?getTraderExp\@MerchantRecipe\@\@QEBAIXZ */ MCAPI unsigned int getTraderExp() const; /** - * @symbol ?getUses\@MerchantRecipe\@\@QEBAHXZ + * @symbol ?getUses\@MerchantRecipe\@\@QEBAHXZ */ MCAPI int getUses() const; /** - * @symbol ?hasSecondaryBuyItem\@MerchantRecipe\@\@QEBA_NXZ + * @symbol ?hasSecondaryBuyItem\@MerchantRecipe\@\@QEBA_NXZ */ MCAPI bool hasSecondaryBuyItem() const; /** - * @symbol ?increaseMaxUses\@MerchantRecipe\@\@QEAAXH\@Z + * @symbol ?increaseMaxUses\@MerchantRecipe\@\@QEAAXH\@Z */ MCAPI void increaseMaxUses(int); /** - * @symbol ?increaseUses\@MerchantRecipe\@\@QEAAXXZ + * @symbol ?increaseUses\@MerchantRecipe\@\@QEAAXXZ */ MCAPI void increaseUses(); /** - * @symbol ?init\@MerchantRecipe\@\@QEAAXAEBVItemInstance\@\@00\@Z + * @symbol ?init\@MerchantRecipe\@\@QEAAXAEBVItemInstance\@\@00\@Z */ MCAPI void init(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); /** - * @symbol ?isOutOfUses\@MerchantRecipe\@\@QEBA_NXZ + * @symbol ?isOutOfUses\@MerchantRecipe\@\@QEBA_NXZ */ MCAPI bool isOutOfUses() const; /** - * @symbol ?isSame\@MerchantRecipe\@\@QEBA_NAEBV1\@\@Z + * @symbol ?isSame\@MerchantRecipe\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool isSame(class MerchantRecipe const &) const; /** - * @symbol ?isSameButBetter\@MerchantRecipe\@\@QEBA_NAEAV1\@\@Z + * @symbol ?isSameButBetter\@MerchantRecipe\@\@QEBA_NAEAV1\@\@Z */ MCAPI bool isSameButBetter(class MerchantRecipe &) const; /** - * @symbol ?legacyCalculateDemandPrices\@MerchantRecipe\@\@QEAAXHH\@Z + * @symbol ?legacyCalculateDemandPrices\@MerchantRecipe\@\@QEAAXHH\@Z */ MCAPI void legacyCalculateDemandPrices(int, int); /** - * @symbol ?load\@MerchantRecipe\@\@QEAAXPEBVCompoundTag\@\@\@Z + * @symbol ?load\@MerchantRecipe\@\@QEAAXPEBVCompoundTag\@\@\@Z */ MCAPI void load(class CompoundTag const *); /** - * @symbol ?setDemand\@MerchantRecipe\@\@QEAAXH\@Z + * @symbol ??4MerchantRecipe\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class MerchantRecipe & operator=(class MerchantRecipe const &); + /** + * @symbol ?setDemand\@MerchantRecipe\@\@QEAAXH\@Z */ MCAPI void setDemand(int); /** - * @symbol ?setMaxUses\@MerchantRecipe\@\@QEAAXH\@Z + * @symbol ?setMaxUses\@MerchantRecipe\@\@QEAAXH\@Z */ MCAPI void setMaxUses(int); /** - * @symbol ?setNetId\@MerchantRecipe\@\@QEAAXAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?setNetId\@MerchantRecipe\@\@QEAAXAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI void setNetId(class TypedServerNetId const &); /** - * @symbol ?setPriceMultiplierA\@MerchantRecipe\@\@QEAAXM\@Z + * @symbol ?setPriceMultiplierA\@MerchantRecipe\@\@QEAAXM\@Z */ MCAPI void setPriceMultiplierA(float); /** - * @symbol ?setPriceMultiplierB\@MerchantRecipe\@\@QEAAXM\@Z + * @symbol ?setPriceMultiplierB\@MerchantRecipe\@\@QEAAXM\@Z */ MCAPI void setPriceMultiplierB(float); /** - * @symbol ?setRewardExp\@MerchantRecipe\@\@QEAAX_N\@Z + * @symbol ?setRewardExp\@MerchantRecipe\@\@QEAAX_N\@Z */ MCAPI void setRewardExp(bool); /** - * @symbol ?setTier\@MerchantRecipe\@\@QEAAXH\@Z + * @symbol ?setTier\@MerchantRecipe\@\@QEAAXH\@Z */ MCAPI void setTier(int); /** - * @symbol ?setTraderExp\@MerchantRecipe\@\@QEAAXI\@Z + * @symbol ?setTraderExp\@MerchantRecipe\@\@QEAAXI\@Z */ MCAPI void setTraderExp(unsigned int); /** - * @symbol ?setUses\@MerchantRecipe\@\@QEAAXH\@Z + * @symbol ?setUses\@MerchantRecipe\@\@QEAAXH\@Z */ MCAPI void setUses(int); /** - * @symbol ?shouldRewardExp\@MerchantRecipe\@\@QEBA_NXZ + * @symbol ?shouldRewardExp\@MerchantRecipe\@\@QEBA_NXZ */ MCAPI bool shouldRewardExp() const; /** - * @symbol ??1MerchantRecipe\@\@QEAA\@XZ + * @symbol ??1MerchantRecipe\@\@QEAA\@XZ */ MCAPI ~MerchantRecipe(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MerchantRecipeList.hpp b/LiteLoader/include/llapi/mc/MerchantRecipeList.hpp index cf36e9a5c8..169f466706 100644 --- a/LiteLoader/include/llapi/mc/MerchantRecipeList.hpp +++ b/LiteLoader/include/llapi/mc/MerchantRecipeList.hpp @@ -43,59 +43,59 @@ class MerchantRecipeList { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MerchantRecipeList(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRecipeFor\@MerchantRecipeList\@\@UEAAPEAVMerchantRecipe\@\@AEBVItemInstance\@\@0H\@Z + * @vftbl 1 + * @symbol ?getRecipeFor\@MerchantRecipeList\@\@UEAAPEAVMerchantRecipe\@\@AEBVItemInstance\@\@0H\@Z */ virtual class MerchantRecipe * getRecipeFor(class ItemInstance const &, class ItemInstance const &, int); /** - * @vftbl 2 - * @symbol ?addIfNewOrBetter\@MerchantRecipeList\@\@UEAAXPEAVMerchantRecipe\@\@\@Z + * @vftbl 2 + * @symbol ?addIfNewOrBetter\@MerchantRecipeList\@\@UEAAXPEAVMerchantRecipe\@\@\@Z */ virtual void addIfNewOrBetter(class MerchantRecipe *); /** - * @vftbl 3 - * @symbol ?getMatchingRecipeFor\@MerchantRecipeList\@\@UEAAPEAVMerchantRecipe\@\@AEBVItemInstance\@\@00\@Z + * @vftbl 3 + * @symbol ?getMatchingRecipeFor\@MerchantRecipeList\@\@UEAAPEAVMerchantRecipe\@\@AEBVItemInstance\@\@00\@Z */ virtual class MerchantRecipe * getMatchingRecipeFor(class ItemInstance const &, class ItemInstance const &, class ItemInstance const &); /** - * @vftbl 4 - * @symbol ?getMatchingRecipeFor\@MerchantRecipeList\@\@UEAAPEAVMerchantRecipe\@\@AEBV2\@\@Z + * @vftbl 4 + * @symbol ?getMatchingRecipeFor\@MerchantRecipeList\@\@UEAAPEAVMerchantRecipe\@\@AEBV2\@\@Z */ virtual class MerchantRecipe * getMatchingRecipeFor(class MerchantRecipe const &); /** - * @vftbl 5 - * @symbol ?load\@MerchantRecipeList\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 5 + * @symbol ?load\@MerchantRecipeList\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void load(class CompoundTag const &); /** - * @vftbl 6 - * @symbol ?createTag\@MerchantRecipeList\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z + * @vftbl 6 + * @symbol ?createTag\@MerchantRecipeList\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@_N\@Z */ virtual std::unique_ptr createTag(bool) const; /** - * @symbol ??0MerchantRecipeList\@\@QEAA\@XZ + * @symbol ??0MerchantRecipeList\@\@QEAA\@XZ */ MCAPI MerchantRecipeList(); /** - * @symbol ?assignNetIds\@MerchantRecipeList\@\@QEAAXXZ + * @symbol ?assignNetIds\@MerchantRecipeList\@\@QEAAXXZ */ MCAPI void assignNetIds(); /** - * @symbol ?getRecipeByNetId\@MerchantRecipeList\@\@QEBAPEBVMerchantRecipe\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?getRecipeByNetId\@MerchantRecipeList\@\@QEBAPEBVMerchantRecipe\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI class MerchantRecipe const * getRecipeByNetId(class TypedServerNetId const &) const; /** - * @symbol ?getRecipeIndexByNetId\@MerchantRecipeList\@\@QEBA?AV?$optional\@_K\@std\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?getRecipeIndexByNetId\@MerchantRecipeList\@\@QEBA?AV?$optional\@_K\@std\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI class std::optional getRecipeIndexByNetId(class TypedServerNetId const &) const; /** - * @symbol ?isRequiredItem\@MerchantRecipeList\@\@QEAA_NAEBVItemInstance\@\@0\@Z + * @symbol ?isRequiredItem\@MerchantRecipeList\@\@QEAA_NAEBVItemInstance\@\@0\@Z */ MCAPI bool isRequiredItem(class ItemInstance const &, class ItemInstance const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MesaSurfaceAttributes.hpp b/LiteLoader/include/llapi/mc/MesaSurfaceAttributes.hpp index b3d3516359..cd7aeddbb0 100644 --- a/LiteLoader/include/llapi/mc/MesaSurfaceAttributes.hpp +++ b/LiteLoader/include/llapi/mc/MesaSurfaceAttributes.hpp @@ -28,7 +28,7 @@ struct MesaSurfaceAttributes { public: /** - * @symbol ??1MesaSurfaceAttributes\@\@QEAA\@XZ + * @symbol ??1MesaSurfaceAttributes\@\@QEAA\@XZ */ MCAPI ~MesaSurfaceAttributes(); diff --git a/LiteLoader/include/llapi/mc/MesaSurfaceBuilderNoises.hpp b/LiteLoader/include/llapi/mc/MesaSurfaceBuilderNoises.hpp index f21fa6b4bc..cadf4dbca7 100644 --- a/LiteLoader/include/llapi/mc/MesaSurfaceBuilderNoises.hpp +++ b/LiteLoader/include/llapi/mc/MesaSurfaceBuilderNoises.hpp @@ -30,20 +30,20 @@ class MesaSurfaceBuilderNoises { public: /** - * @symbol ??1MesaSurfaceBuilderNoises\@\@QEAA\@XZ + * @symbol ??1MesaSurfaceBuilderNoises\@\@QEAA\@XZ */ MCAPI ~MesaSurfaceBuilderNoises(); /** - * @symbol ?make\@MesaSurfaceBuilderNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ?make\@MesaSurfaceBuilderNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI static class MesaSurfaceBuilderNoises make(class XoroshiroPositionalRandomFactory const &); //private: /** - * @symbol ??0MesaSurfaceBuilderNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000\@Z + * @symbol ??0MesaSurfaceBuilderNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000\@Z */ MCAPI MesaSurfaceBuilderNoises(class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MessageEvent.hpp b/LiteLoader/include/llapi/mc/MessageEvent.hpp index bd1f8e7fd8..4ece438e06 100644 --- a/LiteLoader/include/llapi/mc/MessageEvent.hpp +++ b/LiteLoader/include/llapi/mc/MessageEvent.hpp @@ -28,7 +28,7 @@ struct MessageEvent { public: /** - * @symbol ??1MessageEvent\@\@QEAA\@XZ + * @symbol ??1MessageEvent\@\@QEAA\@XZ */ MCAPI ~MessageEvent(); diff --git a/LiteLoader/include/llapi/mc/MessagingCommand.hpp b/LiteLoader/include/llapi/mc/MessagingCommand.hpp index ea79e84a4d..1b51116181 100644 --- a/LiteLoader/include/llapi/mc/MessagingCommand.hpp +++ b/LiteLoader/include/llapi/mc/MessagingCommand.hpp @@ -31,29 +31,35 @@ class MessagingCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MessagingCommand(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MESSAGINGCOMMAND + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MessagingCommand(); +#endif //protected: /** - * @symbol ??0MessagingCommand\@\@IEAA\@_N0\@Z + * @symbol ??0MessagingCommand\@\@IEAA\@_N0\@Z */ MCAPI MessagingCommand(bool, bool); /** - * @symbol ?checkChatPermissions\@MessagingCommand\@\@IEBA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?checkChatPermissions\@MessagingCommand\@\@IEBA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI bool checkChatPermissions(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@IEBAXAEBUCommandOriginIdentity\@\@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\@\@IEBAXAEBVPlayer\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI void checkMutedAndSendToastIfMuted(struct CommandOriginIdentity const &, class Level const &, std::vector const &) const; + MCAPI void checkMutedAndSendToastIfMuted(class Player const &, std::vector const &) const; /** - * @symbol ?checkMutedAndSendToastIfMuted\@MessagingCommand\@\@IEBAXAEBVPlayer\@\@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\@\@IEBAXAEBUCommandOriginIdentity\@\@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 */ - MCAPI void checkMutedAndSendToastIfMuted(class Player const &, std::vector const &) const; + MCAPI void checkMutedAndSendToastIfMuted(struct CommandOriginIdentity const &, class Level const &, std::vector const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MetaDataTypeVisitor_Get.hpp b/LiteLoader/include/llapi/mc/MetaDataTypeVisitor_Get.hpp index 4970a71a21..993a8355ae 100644 --- a/LiteLoader/include/llapi/mc/MetaDataTypeVisitor_Get.hpp +++ b/LiteLoader/include/llapi/mc/MetaDataTypeVisitor_Get.hpp @@ -28,8 +28,8 @@ class MetaDataTypeVisitor_Get { public: /** - * @symbol ??1MetaDataTypeVisitor_Get\@\@QEAA\@XZ + * @symbol ??1MetaDataTypeVisitor_Get\@\@QEAA\@XZ */ MCAPI ~MetaDataTypeVisitor_Get(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MetalBlock.hpp b/LiteLoader/include/llapi/mc/MetalBlock.hpp index 5d6ebb8587..46cb93ce93 100644 --- a/LiteLoader/include/llapi/mc/MetalBlock.hpp +++ b/LiteLoader/include/llapi/mc/MetalBlock.hpp @@ -31,193 +31,198 @@ class MetalBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MetalBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0MetalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0MetalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MetalBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Minecart.hpp b/LiteLoader/include/llapi/mc/Minecart.hpp index c62a6e8d7c..37a63913d8 100644 --- a/LiteLoader/include/llapi/mc/Minecart.hpp +++ b/LiteLoader/include/llapi/mc/Minecart.hpp @@ -31,271 +31,265 @@ class Minecart : public Actor { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Minecart\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Minecart\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Minecart\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Minecart\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Minecart(); + virtual void __unk_vfn_16(); /** - * @vftbl 33 - * @symbol ?getInterpolatedBodyYaw\@Minecart\@\@UEBAMM\@Z + * @vftbl 33 + * @symbol ?getInterpolatedBodyYaw\@Minecart\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Minecart\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@Minecart\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@Minecart\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Minecart\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Minecart\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@Minecart\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Minecart\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Minecart\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Minecart\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 140 - * @symbol ?onBounceStarted\@Minecart\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 139 + * @symbol ?onBounceStarted\@Minecart\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 181 - * @symbol ?getControllingPlayer\@Minecart\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 180 + * @symbol ?getControllingPlayer\@Minecart\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 245 - * @symbol ?kill\@Minecart\@\@MEAAXXZ + * @vftbl 244 + * @symbol ?kill\@Minecart\@\@MEAAXXZ */ virtual void kill(); /** - * @vftbl 252 - * @symbol ?interpolatorTick\@Minecart\@\@UEAAXXZ - */ - virtual void interpolatorTick(); - /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Minecart\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Minecart\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Minecart\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Minecart\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Minecart\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Minecart\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Minecart\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Minecart\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?destroy\@Minecart\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z + * @vftbl 276 + * @symbol ?destroy\@Minecart\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 279 - * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 277 + * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType() = 0; /** - * @vftbl 280 - * @symbol ?getDefaultDisplayBlock\@Minecart\@\@UEBAPEBVBlock\@\@XZ + * @vftbl 278 + * @symbol ?getDefaultDisplayBlock\@Minecart\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 281 - * @symbol __unk_vfn_281 + * @vftbl 279 + * @symbol __unk_vfn_279 */ - virtual void __unk_vfn_281(); + virtual void __unk_vfn_279(); /** - * @vftbl 282 - * @symbol ?getDefaultDisplayOffset\@Minecart\@\@UEBAHXZ + * @vftbl 280 + * @symbol ?getDefaultDisplayOffset\@Minecart\@\@UEBAHXZ */ virtual int getDefaultDisplayOffset() const; /** - * @vftbl 283 - * @symbol ?applyNaturalSlowdown\@Minecart\@\@MEAAXAEAVBlockSource\@\@\@Z + * @vftbl 281 + * @symbol ?applyNaturalSlowdown\@Minecart\@\@MEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @vftbl 284 - * @symbol ?_lazyInitDisplayBlock\@Minecart\@\@EEAAXXZ + * @vftbl 282 + * @symbol ?_lazyInitDisplayBlock\@Minecart\@\@EEAAXXZ */ virtual void _lazyInitDisplayBlock(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MINECART /** - * @symbol ?canMakeStepSound\@Minecart\@\@EEBA_NXZ + * @symbol ?canMakeStepSound\@Minecart\@\@EEBA_NXZ */ MCVAPI bool canMakeStepSound() const; /** - * @symbol ?getDefaultDisplayData\@Minecart\@\@UEBAHXZ + * @symbol ?getDefaultDisplayData\@Minecart\@\@UEBAHXZ */ MCVAPI int getDefaultDisplayData() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Minecart(); #endif /** - * @symbol ??0Minecart\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Minecart\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Minecart(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?dropMinecartWithContentsAndRemove\@Minecart\@\@QEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@_N\@Z + * @symbol ?dropMinecartWithContentsAndRemove\@Minecart\@\@QEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@_N\@Z */ - MCAPI void dropMinecartWithContentsAndRemove(class gsl::basic_string_span, bool); + MCAPI void dropMinecartWithContentsAndRemove(class std::basic_string_view>, bool); /** - * @symbol ?postNormalTick\@Minecart\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?postNormalTick\@Minecart\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void postNormalTick(class BlockPos const &); /** - * @symbol ?preNormalTick\@Minecart\@\@QEAA?AVBlockPos\@\@XZ + * @symbol ?preNormalTick\@Minecart\@\@QEAA?AVBlockPos\@\@XZ */ MCAPI class BlockPos preNormalTick(); /** - * @symbol ?setCustomDisplay\@Minecart\@\@QEAAX_N\@Z + * @symbol ?setCustomDisplay\@Minecart\@\@QEAAX_N\@Z */ MCAPI void setCustomDisplay(bool); /** - * @symbol ?setDisplayBlock\@Minecart\@\@QEAAXAEBVBlock\@\@\@Z + * @symbol ?setDisplayBlock\@Minecart\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void setDisplayBlock(class Block const &); //private: /** - * @symbol ?_registerLoopingSounds\@Minecart\@\@AEAAXXZ + * @symbol ?_registerLoopingSounds\@Minecart\@\@AEAAXXZ */ MCAPI void _registerLoopingSounds(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp b/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp index 9d2b77b371..f5eeb55e49 100644 --- a/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/MinecartBlockCommandOrigin.hpp @@ -32,72 +32,72 @@ class MinecartBlockCommandOrigin : public BlockCommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecartBlockCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getBlockPosition\@MinecartBlockCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@MinecartBlockCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@MinecartBlockCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@MinecartBlockCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@MinecartBlockCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@MinecartBlockCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 8 - * @symbol ?getEntity\@MinecartBlockCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@MinecartBlockCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 10 - * @symbol ?clone\@MinecartBlockCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@MinecartBlockCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@MinecartBlockCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@MinecartBlockCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@MinecartBlockCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@MinecartBlockCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@MinecartBlockCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@MinecartBlockCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@MinecartBlockCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@MinecartBlockCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @vftbl 32 - * @symbol ?_getBaseCommandBlock\@MinecartBlockCommandOrigin\@\@MEBAPEAVBaseCommandBlock\@\@AEAVBlockSource\@\@\@Z + * @vftbl 32 + * @symbol ?_getBaseCommandBlock\@MinecartBlockCommandOrigin\@\@MEBAPEAVBaseCommandBlock\@\@AEAVBlockSource\@\@\@Z */ virtual class BaseCommandBlock * _getBaseCommandBlock(class BlockSource &) const; /** - * @vftbl 33 - * @symbol ?_getBlockEntity\@MinecartBlockCommandOrigin\@\@MEBAPEAVCommandBlockActor\@\@AEAVBlockSource\@\@\@Z + * @vftbl 33 + * @symbol ?_getBlockEntity\@MinecartBlockCommandOrigin\@\@MEBAPEAVCommandBlockActor\@\@AEAVBlockSource\@\@\@Z */ virtual class CommandBlockActor * _getBlockEntity(class BlockSource &) const; /** - * @symbol ??0MinecartBlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0MinecartBlockCommandOrigin\@\@QEAA\@AEAVBlockSource\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI MinecartBlockCommandOrigin(class BlockSource &, struct ActorUniqueID const &); /** - * @symbol ?load\@MinecartBlockCommandOrigin\@\@SA?AV?$unique_ptr\@VMinecartBlockCommandOrigin\@\@U?$default_delete\@VMinecartBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@MinecartBlockCommandOrigin\@\@SA?AV?$unique_ptr\@VMinecartBlockCommandOrigin\@\@U?$default_delete\@VMinecartBlockCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartCanSnapOnRailSystem.hpp b/LiteLoader/include/llapi/mc/MinecartCanSnapOnRailSystem.hpp index aa06094533..e6c319dc5d 100644 --- a/LiteLoader/include/llapi/mc/MinecartCanSnapOnRailSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartCanSnapOnRailSystem.hpp @@ -28,12 +28,12 @@ class MinecartCanSnapOnRailSystem { public: /** - * @symbol ?_checkCanSnapOnRail\@MinecartCanSnapOnRailSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USnapOnRailComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?_checkCanSnapOnRail\@MinecartCanSnapOnRailSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USnapOnRailComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _checkCanSnapOnRail(class StrictEntityContext const &, struct StateVectorComponent const &, class EntityModifierT, class IConstBlockSource const &); /** - * @symbol ?createSystem\@MinecartCanSnapOnRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MinecartCanSnapOnRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartChest.hpp b/LiteLoader/include/llapi/mc/MinecartChest.hpp index c78bfb7a0b..a0614cfc8d 100644 --- a/LiteLoader/include/llapi/mc/MinecartChest.hpp +++ b/LiteLoader/include/llapi/mc/MinecartChest.hpp @@ -32,142 +32,142 @@ class MinecartChest : public Minecart { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~MinecartChest(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?destroy\@MinecartChest\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z + * @vftbl 276 + * @symbol ?destroy\@MinecartChest\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 279 - * @symbol ?getType\@MinecartChest\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 277 + * @symbol ?getType\@MinecartChest\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 280 - * @symbol ?getDefaultDisplayBlock\@MinecartChest\@\@UEBAPEBVBlock\@\@XZ + * @vftbl 278 + * @symbol ?getDefaultDisplayBlock\@MinecartChest\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 281 - * @symbol __unk_vfn_281 + * @vftbl 279 + * @symbol __unk_vfn_279 */ - virtual void __unk_vfn_281(); + virtual void __unk_vfn_279(); /** - * @vftbl 283 - * @symbol ?applyNaturalSlowdown\@MinecartChest\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 281 + * @symbol ?applyNaturalSlowdown\@MinecartChest\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @symbol ??0MinecartChest\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0MinecartChest\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI MinecartChest(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); @@ -175,8 +175,8 @@ class MinecartChest : public Minecart { private: /** - * @symbol ?ITEMS_SIZE\@MinecartChest\@\@0HB + * @symbol ?ITEMS_SIZE\@MinecartChest\@\@0HB */ MCAPI static int const ITEMS_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp b/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp index 8c38531af9..5fb0f42cca 100644 --- a/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartComeOffRailSystem.hpp @@ -28,12 +28,12 @@ class MinecartComeOffRailSystem { public: /** - * @symbol ?_minecartComeOffRailSystem\@MinecartComeOffRailSystem\@\@SAXAEAVStrictEntityContext\@\@AEBVRailMovementComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + * @symbol ?_minecartComeOffRailSystem\@MinecartComeOffRailSystem\@\@SAXAEAVStrictEntityContext\@\@AEBVRailMovementComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z */ MCAPI static void _minecartComeOffRailSystem(class StrictEntityContext &, class RailMovementComponent const &, struct StateVectorComponent &, class Optional const>, class EntityModifierT); /** - * @symbol ?createSystem\@MinecartComeOffRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MinecartComeOffRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp index 7ce3d3e3f3..731a1f389d 100644 --- a/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp +++ b/LiteLoader/include/llapi/mc/MinecartCommandBlock.hpp @@ -32,163 +32,163 @@ class MinecartCommandBlock : public Minecart { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@MinecartCommandBlock\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@MinecartCommandBlock\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~MinecartCommandBlock(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 61 - * @symbol ?canShowNameTag\@MinecartCommandBlock\@\@UEBA_NXZ + * @vftbl 61 + * @symbol ?canShowNameTag\@MinecartCommandBlock\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@MinecartCommandBlock\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@MinecartCommandBlock\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@MinecartCommandBlock\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@MinecartCommandBlock\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol ?getType\@MinecartCommandBlock\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 277 + * @symbol ?getType\@MinecartCommandBlock\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 280 - * @symbol ?getDefaultDisplayBlock\@MinecartCommandBlock\@\@UEBAPEBVBlock\@\@XZ + * @vftbl 278 + * @symbol ?getDefaultDisplayBlock\@MinecartCommandBlock\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 281 - * @symbol __unk_vfn_281 + * @vftbl 279 + * @symbol __unk_vfn_279 */ - virtual void __unk_vfn_281(); + virtual void __unk_vfn_279(); /** - * @vftbl 283 - * @symbol ?applyNaturalSlowdown\@MinecartCommandBlock\@\@MEAAXAEAVBlockSource\@\@\@Z + * @vftbl 281 + * @symbol ?applyNaturalSlowdown\@MinecartCommandBlock\@\@MEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @vftbl 284 - * @symbol ?_lazyInitDisplayBlock\@MinecartCommandBlock\@\@EEAAXXZ + * @vftbl 282 + * @symbol ?_lazyInitDisplayBlock\@MinecartCommandBlock\@\@EEAAXXZ */ virtual void _lazyInitDisplayBlock(); /** - * @symbol ??0MinecartCommandBlock\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0MinecartCommandBlock\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI MinecartCommandBlock(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartHopper.hpp b/LiteLoader/include/llapi/mc/MinecartHopper.hpp index ce72278b71..7f1b899a19 100644 --- a/LiteLoader/include/llapi/mc/MinecartHopper.hpp +++ b/LiteLoader/include/llapi/mc/MinecartHopper.hpp @@ -32,148 +32,148 @@ class MinecartHopper : public Minecart { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~MinecartHopper(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?destroy\@MinecartHopper\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z + * @vftbl 276 + * @symbol ?destroy\@MinecartHopper\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 279 - * @symbol ?getType\@MinecartHopper\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 277 + * @symbol ?getType\@MinecartHopper\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 280 - * @symbol ?getDefaultDisplayBlock\@MinecartHopper\@\@UEBAPEBVBlock\@\@XZ + * @vftbl 278 + * @symbol ?getDefaultDisplayBlock\@MinecartHopper\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 281 - * @symbol __unk_vfn_281 + * @vftbl 279 + * @symbol __unk_vfn_279 */ - virtual void __unk_vfn_281(); + virtual void __unk_vfn_279(); /** - * @vftbl 282 - * @symbol ?getDefaultDisplayOffset\@MinecartHopper\@\@UEBAHXZ + * @vftbl 280 + * @symbol ?getDefaultDisplayOffset\@MinecartHopper\@\@UEBAHXZ */ virtual int getDefaultDisplayOffset() const; /** - * @vftbl 283 - * @symbol ?applyNaturalSlowdown\@MinecartHopper\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 281 + * @symbol ?applyNaturalSlowdown\@MinecartHopper\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void applyNaturalSlowdown(class BlockSource &); /** - * @symbol ??0MinecartHopper\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0MinecartHopper\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI MinecartHopper(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartItem.hpp b/LiteLoader/include/llapi/mc/MinecartItem.hpp index 753cf4ca8b..8e20afbe83 100644 --- a/LiteLoader/include/llapi/mc/MinecartItem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartItem.hpp @@ -32,93 +32,93 @@ class MinecartItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecartItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@MinecartItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@MinecartItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@MinecartItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@MinecartItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 132 - * @symbol ?_useOn\@MinecartItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@MinecartItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0MinecartItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4MinecartType\@\@\@Z + * @symbol ??0MinecartItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4MinecartType\@\@\@Z */ MCAPI MinecartItem(std::string const &, int, enum class MinecartType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp b/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp index 14f0b41ba8..a214b6575f 100644 --- a/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartMoveAlongRailSystem.hpp @@ -28,40 +28,40 @@ class MinecartMoveAlongRailSystem { public: /** - * @symbol ?_calculateAllPassengersRailMovementInput\@MinecartMoveAlongRailSystem\@\@SA_NAEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@AEAVVec3\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@\@\@\@Z + * @symbol ?_calculateAllPassengersRailMovementInput\@MinecartMoveAlongRailSystem\@\@SA_NAEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@AEAVVec3\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@\@\@\@Z */ MCAPI static bool _calculateAllPassengersRailMovementInput(std::vector const &, class Vec3 &, class ViewT>, struct ActorRotationComponent const, struct LocalMoveVelocityComponent const>); /** - * @symbol ?createCleanupSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createCleanupSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCleanupSystem(); /** - * @symbol ?createPostRailMovementPositionSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPostRailMovementPositionSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPostRailMovementPositionSystem(); /** - * @symbol ?createPreRailMovementPositionSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPreRailMovementPositionSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPreRailMovementPositionSystem(); /** - * @symbol ?createRailMovementSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createRailMovementSystem\@MinecartMoveAlongRailSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createRailMovementSystem(); //private: /** - * @symbol ?_calculateRailMovementSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBVRailMovementComponent\@\@AEAUSnapOnRailComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z + * @symbol ?_calculateRailMovementSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBVRailMovementComponent\@\@AEAUSnapOnRailComponent\@\@AEAUStateVectorComponent\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@$$CBUActorRotationComponent\@\@$$CBULocalMoveVelocityComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@\@Z */ MCAPI static void _calculateRailMovementSystem(class StrictEntityContext const &, class RailMovementComponent const &, struct SnapOnRailComponent &, struct StateVectorComponent &, class Optional, class ViewT>, struct ActorRotationComponent const, struct LocalMoveVelocityComponent const>, class EntityModifierT); /** - * @symbol ?_postRailMovementCalculateMinecartPositionSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUSnapOnRailComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?_postRailMovementCalculateMinecartPositionSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUSnapOnRailComponent\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _postRailMovementCalculateMinecartPositionSystem(class StrictEntityContext const &, struct SnapOnRailComponent const &, struct StateVectorComponent &, class EntityModifierT, class IConstBlockSource const &); /** - * @symbol ?_preRailMovementCalculateMinecartPositionSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@AEAUSnapOnRailComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?_preRailMovementCalculateMinecartPositionSystem\@MinecartMoveAlongRailSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@AEAUSnapOnRailComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UActorSetPositionRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void _preRailMovementCalculateMinecartPositionSystem(class StrictEntityContext const &, struct OffsetsComponent const &, struct StateVectorComponent const &, struct FallDistanceComponent &, struct SnapOnRailComponent &, class EntityModifierT, class IConstBlockSource const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/MinecartPostNormalTickSystem.hpp deleted file mode 100644 index ad39e68488..0000000000 --- a/LiteLoader/include/llapi/mc/MinecartPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file MinecartPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class MinecartPostNormalTickSystem. - * - */ -class MinecartPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MINECARTPOSTNORMALTICKSYSTEM -public: - class MinecartPostNormalTickSystem& operator=(class MinecartPostNormalTickSystem const &) = delete; - MinecartPostNormalTickSystem(class MinecartPostNormalTickSystem const &) = delete; - MinecartPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@MinecartPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doMinecartPostNormalTickSystem\@MinecartPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUMinecartPreNormalTickBlockPosComponent\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doMinecartPostNormalTickSystem(class StrictEntityContext const &, struct MinecartPreNormalTickBlockPosComponent const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp index c92a206c8c..53993d6db7 100644 --- a/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/MinecartPreNormalTickSystem.hpp @@ -28,16 +28,16 @@ class MinecartPreNormalTickSystem { public: /** - * @symbol ?createSystem\@MinecartPreNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MinecartPreNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doMinecartPreNormalTickSystem\@MinecartPreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMinecartPreNormalTickBlockPosComponent\@\@\@\@\@Z + * @symbol ?_doMinecartPreNormalTickSystem\@MinecartPreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMinecartPreNormalTickBlockPosComponent\@\@\@\@\@Z */ MCAPI static void _doMinecartPreNormalTickSystem(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartRideable.hpp b/LiteLoader/include/llapi/mc/MinecartRideable.hpp index ddc0b5f527..f4b6d75852 100644 --- a/LiteLoader/include/llapi/mc/MinecartRideable.hpp +++ b/LiteLoader/include/llapi/mc/MinecartRideable.hpp @@ -32,128 +32,128 @@ class MinecartRideable : public Minecart { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~MinecartRideable(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 277 + * @symbol ?getType\@MinecartRideable\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 281 - * @symbol __unk_vfn_281 + * @vftbl 279 + * @symbol __unk_vfn_279 */ - virtual void __unk_vfn_281(); + virtual void __unk_vfn_279(); /** - * @symbol ??0MinecartRideable\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0MinecartRideable\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI MinecartRideable(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecartTNT.hpp b/LiteLoader/include/llapi/mc/MinecartTNT.hpp index 1f47a062f4..e100fd129f 100644 --- a/LiteLoader/include/llapi/mc/MinecartTNT.hpp +++ b/LiteLoader/include/llapi/mc/MinecartTNT.hpp @@ -32,161 +32,161 @@ class MinecartTNT : public Minecart { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~MinecartTNT(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@MinecartTNT\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@MinecartTNT\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@MinecartTNT\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@MinecartTNT\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 183 - * @symbol ?causeFallDamage\@MinecartTNT\@\@MEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@MinecartTNT\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@MinecartTNT\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@MinecartTNT\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?destroy\@MinecartTNT\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z + * @vftbl 276 + * @symbol ?destroy\@MinecartTNT\@\@UEAAXAEBVActorDamageSource\@\@_N\@Z */ virtual void destroy(class ActorDamageSource const &, bool); /** - * @vftbl 279 - * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ + * @vftbl 277 + * @symbol ?getType\@MinecartTNT\@\@UEAA?AW4MinecartType\@\@XZ */ virtual enum class MinecartType getType(); /** - * @vftbl 280 - * @symbol ?getDefaultDisplayBlock\@MinecartTNT\@\@UEBAPEBVBlock\@\@XZ + * @vftbl 278 + * @symbol ?getDefaultDisplayBlock\@MinecartTNT\@\@UEBAPEBVBlock\@\@XZ */ virtual class Block const * getDefaultDisplayBlock() const; /** - * @vftbl 281 - * @symbol __unk_vfn_281 + * @vftbl 279 + * @symbol __unk_vfn_279 */ - virtual void __unk_vfn_281(); + virtual void __unk_vfn_279(); /** - * @symbol ??0MinecartTNT\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0MinecartTNT\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI MinecartTNT(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?primeFuse\@MinecartTNT\@\@QEAAXW4ActorDamageCause\@\@\@Z + * @symbol ?primeFuse\@MinecartTNT\@\@QEAAXW4ActorDamageCause\@\@\@Z */ MCAPI void primeFuse(enum class ActorDamageCause); @@ -194,8 +194,8 @@ class MinecartTNT : public Minecart { private: /** - * @symbol ?DEFAULT_FUSE_LENGTH\@MinecartTNT\@\@0HB + * @symbol ?DEFAULT_FUSE_LENGTH\@MinecartTNT\@\@0HB */ MCAPI static int const DEFAULT_FUSE_LENGTH; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Minecraft.hpp b/LiteLoader/include/llapi/mc/Minecraft.hpp index c85d0357d6..193cc70ee5 100644 --- a/LiteLoader/include/llapi/mc/Minecraft.hpp +++ b/LiteLoader/include/llapi/mc/Minecraft.hpp @@ -32,141 +32,153 @@ class Minecraft { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Minecraft(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?setSimTimePause\@Minecraft\@\@UEAAX_N\@Z + * @vftbl 3 + * @symbol ?setSimTimePause\@Minecraft\@\@UEAAX_N\@Z */ virtual void setSimTimePause(bool); /** - * @vftbl 4 - * @symbol ?setSimTimeScale\@Minecraft\@\@UEAAXM\@Z + * @vftbl 4 + * @symbol ?setSimTimeScale\@Minecraft\@\@UEAAXM\@Z */ virtual void setSimTimeScale(float); /** - * @vftbl 5 - * @symbol ?getSimPaused\@Minecraft\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?getSimPaused\@Minecraft\@\@UEBA_NXZ */ virtual bool getSimPaused() const; /** - * @vftbl 6 - * @symbol ?isOnlineClient\@Minecraft\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isOnlineClient\@Minecraft\@\@UEBA_NXZ */ virtual bool isOnlineClient() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MINECRAFT /** - * @symbol ?getEntityRegistry\@Minecraft\@\@UEBA?AV?$StackRefResultT\@UEntityRegistryConstRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@Minecraft\@\@UEBA?AV?$StackRefResultT\@UEntityRegistryConstRefTraits\@\@\@\@XZ */ MCVAPI class StackRefResultT getEntityRegistry() const; /** - * @symbol ?getEntityRegistry\@Minecraft\@\@UEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ + * @symbol ?getEntityRegistry\@Minecraft\@\@UEAA?AV?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@XZ */ MCVAPI class StackRefResultT getEntityRegistry(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Minecraft(); #endif /** - * @symbol ??0Minecraft\@\@QEAA\@AEAVIMinecraftApp\@\@AEAVGameCallbacks\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@AEAVIMinecraftEventing\@\@AEAVNetworkHandler\@\@AEAVPacketSender\@\@W4SubClientId\@\@AEAVTimer\@\@AEAVTimer\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@6\@PEAVServerMetrics\@\@\@Z + * @symbol ??0Minecraft\@\@QEAA\@AEAVIMinecraftApp\@\@AEAVGameCallbacks\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@gsl\@\@V?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@AEAVIMinecraftEventing\@\@AEAVNetworkSystem\@\@AEAVPacketSender\@\@W4SubClientId\@\@AEAVTimer\@\@AEAVTimer\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@6\@PEAVServerMetrics\@\@\@Z */ - MCAPI Minecraft(class IMinecraftApp &, class GameCallbacks &, class AllowList &, class PermissionsFile *, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1>>, class IMinecraftEventing &, class NetworkHandler &, class PacketSender &, enum class SubClientId, class Timer &, class Timer &, class gsl::not_null> const &, class ServerMetrics *); + MCAPI Minecraft(class IMinecraftApp &, class GameCallbacks &, class AllowList &, class PermissionsFile *, class gsl::not_null> const &, class std::chrono::duration<__int64, struct std::ratio<1, 1>>, class IMinecraftEventing &, class NetworkSystem &, class PacketSender &, enum class SubClientId, class Timer &, class Timer &, class gsl::not_null> const &, class ServerMetrics *); /** - * @symbol ?activateAllowList\@Minecraft\@\@QEAAXXZ + * @symbol ?activateAllowList\@Minecraft\@\@QEAAXXZ */ MCAPI void activateAllowList(); /** - * @symbol ?configureGameTest\@Minecraft\@\@QEAAXAEAVLevel\@\@AEBVExperiments\@\@\@Z + * @symbol ?configureGameTest\@Minecraft\@\@QEAAXAEAVLevel\@\@AEBVExperiments\@\@\@Z */ MCAPI void configureGameTest(class Level &, class Experiments const &); /** - * @symbol ?disconnectClient\@Minecraft\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?disconnectClient\@Minecraft\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void disconnectClient(class NetworkIdentifier const &, std::string const &); /** - * @symbol ?getCommands\@Minecraft\@\@QEAAAEAVMinecraftCommands\@\@XZ + * @symbol ?getCommands\@Minecraft\@\@QEAAAEAVMinecraftCommands\@\@XZ */ MCAPI class MinecraftCommands & getCommands(); /** - * @symbol ?getGameModuleServer\@Minecraft\@\@QEAAAEAVGameModuleServer\@\@XZ + * @symbol ?getEventing\@Minecraft\@\@QEBAAEAVIMinecraftEventing\@\@XZ + */ + MCAPI class IMinecraftEventing & getEventing() const; + /** + * @symbol ?getGameModuleServer\@Minecraft\@\@QEAAAEAVGameModuleServer\@\@XZ */ MCAPI class GameModuleServer & getGameModuleServer(); /** - * @symbol ?getGameTest\@Minecraft\@\@QEAA?AV?$optional_ref\@VMinecraftGameTest\@\@\@\@XZ + * @symbol ?getGameTest\@Minecraft\@\@QEAA?AV?$optional_ref\@VMinecraftGameTest\@\@\@\@XZ */ MCAPI class optional_ref getGameTest(); /** - * @symbol ?getLastTimestep\@Minecraft\@\@QEAANXZ + * @symbol ?getLastTimestep\@Minecraft\@\@QEAANXZ */ MCAPI double getLastTimestep(); /** - * @symbol ?getLevel\@Minecraft\@\@QEBAPEAVLevel\@\@XZ + * @symbol ?getLevel\@Minecraft\@\@QEBAPEAVLevel\@\@XZ */ MCAPI class Level * getLevel() const; /** - * @symbol ?getNetworkHandler\@Minecraft\@\@QEAAAEAVNetworkHandler\@\@XZ + * @symbol ?getNetworkSystem\@Minecraft\@\@QEAAAEAVNetworkSystem\@\@XZ */ - MCAPI class NetworkHandler & getNetworkHandler(); + MCAPI class NetworkSystem & getNetworkSystem(); /** - * @symbol ?getResourceLoader\@Minecraft\@\@QEAAAEAVResourcePackManager\@\@XZ + * @symbol ?getResourceLoader\@Minecraft\@\@QEAAAEAVResourcePackManager\@\@XZ */ MCAPI class ResourcePackManager & getResourceLoader(); /** - * @symbol ?getServerNetworkHandler\@Minecraft\@\@QEAA?AV?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@XZ + * @symbol ?getServerNetworkHandler\@Minecraft\@\@QEAA?AV?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@XZ */ MCAPI class Bedrock::NonOwnerPointer getServerNetworkHandler(); /** - * @symbol ?getStructureManager\@Minecraft\@\@QEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getStructureManager\@Minecraft\@\@QEAA?AV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null> getStructureManager(); /** - * @symbol ?hostMultiplayer\@Minecraft\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@3\@PEAVPlayer\@\@AEBVUUID\@mce\@\@V?$unique_ptr\@VNetEventCallback\@\@U?$default_delete\@VNetEventCallback\@\@\@std\@\@\@3\@H_N5AEBV?$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\@V23\@AEBUConnectionDefinition\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@3\@AEAVScheduler\@\@PEAVTextFilteringProcessor\@\@\@Z + * @symbol ?hasCommands\@Minecraft\@\@QEAA_NXZ + */ + MCAPI bool hasCommands(); + /** + * @symbol ?hostMultiplayer\@Minecraft\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$pair\@V?$unique_ptr\@VLevel\@\@U?$default_delete\@VLevel\@\@\@std\@\@\@std\@\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@3\@PEAVPlayer\@\@AEBVUUID\@mce\@\@V?$unique_ptr\@VNetEventCallback\@\@U?$default_delete\@VNetEventCallback\@\@\@std\@\@\@3\@H_N5AEBV?$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\@V23\@AEBUConnectionDefinition\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@3\@AEAVScheduler\@\@PEAVTextFilteringProcessor\@\@\@Z */ MCAPI bool hostMultiplayer(std::string const &, struct std::pair, class OwnerPtrT>, class Player *, class mce::UUID const &, std::unique_ptr, int, bool, bool, std::vector const &, std::string, struct ConnectionDefinition const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class TextFilteringProcessor *); /** - * @symbol ?init\@Minecraft\@\@QEAAXXZ + * @symbol ?init\@Minecraft\@\@QEAAXXZ */ MCAPI void init(); /** - * @symbol ?initAsDedicatedServer\@Minecraft\@\@QEAAXXZ + * @symbol ?initAsDedicatedServer\@Minecraft\@\@QEAAXXZ */ MCAPI void initAsDedicatedServer(); /** - * @symbol ?isLeaveGameDone\@Minecraft\@\@QEBA_NXZ + * @symbol ?isLeaveGameDone\@Minecraft\@\@QEBA_NXZ */ MCAPI bool isLeaveGameDone() const; /** - * @symbol ?requestResourceReload\@Minecraft\@\@QEAAXXZ + * @symbol ?requestResourceReload\@Minecraft\@\@QEAAXXZ */ MCAPI void requestResourceReload(); /** - * @symbol ?requestServerShutdown\@Minecraft\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?requestServerShutdown\@Minecraft\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void requestServerShutdown(std::string const &); /** - * @symbol ?startLeaveGame\@Minecraft\@\@QEAAX_N\@Z + * @symbol ?startLeaveGame\@Minecraft\@\@QEAAX_N\@Z */ MCAPI void startLeaveGame(bool); /** - * @symbol ?update\@Minecraft\@\@QEAA_NXZ + * @symbol ?update\@Minecraft\@\@QEAA_NXZ */ MCAPI bool update(); //private: /** - * @symbol ?_tryCatchupMovementTicks\@Minecraft\@\@AEAAXXZ + * @symbol ?_tryCatchupMovementTicks\@Minecraft\@\@AEAAXXZ */ MCAPI void _tryCatchupMovementTicks(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp index f051ec980d..00509d35ce 100644 --- a/LiteLoader/include/llapi/mc/MinecraftCommands.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftCommands.hpp @@ -61,104 +61,104 @@ class MinecraftCommands { public: /** - * @symbol ??0MinecraftCommands\@\@QEAA\@AEAVMinecraft\@\@\@Z + * @symbol ??0MinecraftCommands\@\@QEAA\@AEAVMinecraft\@\@\@Z */ MCAPI MinecraftCommands(class Minecraft &); /** - * @symbol ?compileCommand\@MinecraftCommands\@\@QEAAPEAVCommand\@\@AEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?compileCommand\@MinecraftCommands\@\@QEAAPEAVCommand\@\@AEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@V?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI class Command * compileCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion, class std::function); /** - * @symbol ?enqueueDeferredCommand\@MinecraftCommands\@\@QEAAXV?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@_N1V?$function\@$$A6AXUMCRESULT\@\@\@Z\@3\@\@Z + * @symbol ?enqueueDeferredCommand\@MinecraftCommands\@\@QEAAXV?$unique_ptr\@VCommandContext\@\@U?$default_delete\@VCommandContext\@\@\@std\@\@\@std\@\@_N1V?$function\@$$A6AXUMCRESULT\@\@\@Z\@3\@\@Z */ MCAPI void enqueueDeferredCommand(std::unique_ptr, bool, bool, class std::function); /** - * @symbol ?enqueueDeferredCommandBlockCommand\@MinecraftCommands\@\@QEAAXVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?enqueueDeferredCommandBlockCommand\@MinecraftCommands\@\@QEAAXVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI void enqueueDeferredCommandBlockCommand(class BlockPos, class BlockSource &); /** - * @symbol ?enqueueDeferredScriptCommand\@MinecraftCommands\@\@QEAA_NV?$unique_ptr\@VDeferredScriptCommand\@\@U?$default_delete\@VDeferredScriptCommand\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?enqueueDeferredScriptCommand\@MinecraftCommands\@\@QEAA_NV?$unique_ptr\@VDeferredScriptCommand\@\@U?$default_delete\@VDeferredScriptCommand\@\@\@std\@\@\@std\@\@\@Z */ MCAPI bool enqueueDeferredScriptCommand(std::unique_ptr); /** - * @symbol ?executeCommand\@MinecraftCommands\@\@QEBA?AUMCRESULT\@\@AEAVCommandContext\@\@_N\@Z + * @symbol ?executeCommand\@MinecraftCommands\@\@QEBA?AUMCRESULT\@\@AEAVCommandContext\@\@_N\@Z */ MCAPI struct MCRESULT executeCommand(class CommandContext &, bool) const; /** - * @symbol ?getRegistry\@MinecraftCommands\@\@QEAAAEAVCommandRegistry\@\@XZ + * @symbol ?getRegistry\@MinecraftCommands\@\@QEAAAEAVCommandRegistry\@\@XZ */ MCAPI class CommandRegistry & getRegistry(); /** - * @symbol ?handleOutput\@MinecraftCommands\@\@QEBAXAEBVCommandOrigin\@\@AEBVCommandOutput\@\@\@Z + * @symbol ?handleOutput\@MinecraftCommands\@\@QEBAXAEBVCommandOrigin\@\@AEBVCommandOutput\@\@\@Z */ MCAPI void handleOutput(class CommandOrigin const &, class CommandOutput const &) const; /** - * @symbol ?initCoreEnums\@MinecraftCommands\@\@QEAAXVItemRegistryRef\@\@AEBVIWorldRegistriesProvider\@\@AEBVActorFactory\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?initCoreEnums\@MinecraftCommands\@\@QEAAXVItemRegistryRef\@\@AEBVIWorldRegistriesProvider\@\@AEBVActorFactory\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI void initCoreEnums(class ItemRegistryRef, class IWorldRegistriesProvider const &, class ActorFactory const &, class Experiments const &, class BaseGameVersion const &); /** - * @symbol ?initCoreEnumsServer\@MinecraftCommands\@\@QEAAXAEBVActorDefinitionGroup\@\@\@Z + * @symbol ?initCoreEnumsServer\@MinecraftCommands\@\@QEAAXAEBVActorDefinitionGroup\@\@AEBVCameraPresets\@\@\@Z */ - MCAPI void initCoreEnumsServer(class ActorDefinitionGroup const &); + MCAPI void initCoreEnumsServer(class ActorDefinitionGroup const &, class CameraPresets const &); /** - * @symbol ?requestCommandExecution\@MinecraftCommands\@\@QEAA?AUMCRESULT\@\@AEAVCommandContext\@\@_N\@Z + * @symbol ?requestCommandExecution\@MinecraftCommands\@\@QEAA?AUMCRESULT\@\@AEAVCommandContext\@\@_N\@Z */ MCAPI struct MCRESULT requestCommandExecution(class CommandContext &, bool); /** - * @symbol ?runCommand\@MinecraftCommands\@\@QEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@\@Z + * @symbol ?runCommand\@MinecraftCommands\@\@QEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@\@Z */ MCAPI void runCommand(class Command &, class CommandOrigin &); /** - * @symbol ?runCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z + * @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 + * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXV?$not_null\@PEAVCommand\@\@\@gsl\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z */ - MCAPI void runOrDeferCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion); + MCAPI void runOrDeferCommand(class gsl::not_null, class CommandOrigin &, enum class CurrentCmdVersion); /** - * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXV?$not_null\@PEAVCommand\@\@\@gsl\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z + * @symbol ?runOrDeferCommand\@MinecraftCommands\@\@QEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CurrentCmdVersion\@\@\@Z */ - MCAPI void runOrDeferCommand(class gsl::not_null, class CommandOrigin &, enum class CurrentCmdVersion); + MCAPI void runOrDeferCommand(class HashedString const &, class CommandOrigin &, enum class CurrentCmdVersion); /** - * @symbol ?setRegistryNetworkUpdateCallback\@MinecraftCommands\@\@QEBAXV?$function\@$$A6AXAEBVPacket\@\@\@Z\@std\@\@\@Z + * @symbol ?setRegistryNetworkUpdateCallback\@MinecraftCommands\@\@QEBAXV?$function\@$$A6AXAEBVPacket\@\@\@Z\@std\@\@\@Z */ MCAPI void setRegistryNetworkUpdateCallback(class std::function) const; /** - * @symbol ?shouldDeferCommand\@MinecraftCommands\@\@QEBA_NW4CurrentCmdVersion\@\@\@Z + * @symbol ?shouldDeferCommand\@MinecraftCommands\@\@QEBA_NW4CurrentCmdVersion\@\@\@Z */ MCAPI bool shouldDeferCommand(enum class CurrentCmdVersion) const; /** - * @symbol ?tick\@MinecraftCommands\@\@QEAAXXZ + * @symbol ?tick\@MinecraftCommands\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?getOutputType\@MinecraftCommands\@\@SA?AW4CommandOutputType\@\@AEBVCommandOrigin\@\@\@Z + * @symbol ?getOutputType\@MinecraftCommands\@\@SA?AW4CommandOutputType\@\@AEBVCommandOrigin\@\@\@Z */ MCAPI static enum class CommandOutputType getOutputType(class CommandOrigin const &); /** - * @symbol ?initBlockEnum\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?initBlockEnum\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI static void initBlockEnum(class CommandRegistry &, class BaseGameVersion const &); /** - * @symbol ?initEntityEnum\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@AEBVActorFactory\@\@AEBVExperiments\@\@\@Z + * @symbol ?initEntityEnum\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@AEBVActorFactory\@\@AEBVExperiments\@\@\@Z */ MCAPI static void initEntityEnum(class CommandRegistry &, class ActorFactory const &, class Experiments const &); /** - * @symbol ?initItemEnum\@MinecraftCommands\@\@SAXVItemRegistryRef\@\@AEAVCommandRegistry\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?initItemEnum\@MinecraftCommands\@\@SAXVItemRegistryRef\@\@AEAVCommandRegistry\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI static void initItemEnum(class ItemRegistryRef, class CommandRegistry &, class BaseGameVersion const &); /** - * @symbol ?initItemTagEnum\@MinecraftCommands\@\@SAXVItemRegistryRef\@\@AEAVCommandRegistry\@\@\@Z + * @symbol ?initItemTagEnum\@MinecraftCommands\@\@SAXVItemRegistryRef\@\@AEAVCommandRegistry\@\@\@Z */ MCAPI static void initItemTagEnum(class ItemRegistryRef, class CommandRegistry &); /** - * @symbol ?initStructureFeatureEnum\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?initStructureFeatureEnum\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void initStructureFeatureEnum(class CommandRegistry &); /** - * @symbol ?registerSharedClientServerEnums\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?registerSharedClientServerEnums\@MinecraftCommands\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void registerSharedClientServerEnums(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp index 3844fd5fa2..a493bf7435 100644 --- a/LiteLoader/include/llapi/mc/MinecraftEventing.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftEventing.hpp @@ -44,1305 +44,1321 @@ enum class AcquisitionMethod; public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MINECRAFTEVENTING /** - * @symbol ?addCrashTelemetryToBatch\@MinecraftEventing\@\@UEAAXV?$shared_ptr\@VSessionInfo\@Bedrock\@\@\@std\@\@\@Z + * @symbol ?addCrashTelemetryToBatch\@MinecraftEventing\@\@UEAAXV?$shared_ptr\@VSessionInfo\@Bedrock\@\@\@std\@\@\@Z */ MCVAPI void addCrashTelemetryToBatch(class std::shared_ptr); /** - * @symbol ?addListener\@MinecraftEventing\@\@UEAAXV?$unique_ptr\@VIEventListener\@Events\@Social\@\@U?$default_delete\@VIEventListener\@Events\@Social\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addListener\@MinecraftEventing\@\@UEAAXV?$unique_ptr\@VIEventListener\@Events\@Social\@\@U?$default_delete\@VIEventListener\@Events\@Social\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void addListener(std::unique_ptr); /** - * @symbol ?fileEventCloudWorldPullFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @symbol ?fileEventCloudWorldPullFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCVAPI void fileEventCloudWorldPullFailed(std::string const &, std::string const &, bool); /** - * @symbol ?fireChatUsedEvent\@MinecraftEventing\@\@UEAAXI_N\@Z + * @symbol ?fireChatUsedEvent\@MinecraftEventing\@\@UEAAXI_N\@Z */ MCVAPI void fireChatUsedEvent(unsigned int, bool); /** - * @symbol ?fireChunkRecyclerTelemetryData\@MinecraftEventing\@\@UEAAXAEBUChunkRecyclerTelemetryOutput\@\@\@Z + * @symbol ?fireChunkRecyclerTelemetryData\@MinecraftEventing\@\@UEAAXAEBUChunkRecyclerTelemetryOutput\@\@\@Z */ MCVAPI void fireChunkRecyclerTelemetryData(struct ChunkRecyclerTelemetryOutput const &); /** - * @symbol ?fireClassroomSettingUpdated\@MinecraftEventing\@\@UEAAXW4ClassroomSetting\@\@W4SettingsScreenMode\@\@\@Z + * @symbol ?fireClassroomSettingUpdated\@MinecraftEventing\@\@UEAAXW4ClassroomSetting\@\@W4SettingsScreenMode\@\@\@Z */ MCVAPI void fireClassroomSettingUpdated(enum class ClassroomSetting, enum class SettingsScreenMode); /** - * @symbol ?fireClubsEngagementEvent\@MinecraftEventing\@\@UEAAXW4ClubsEngagementAction\@IMinecraftEventing\@\@W4ClubsEngagementTargetType\@3\@PEBDURealmId\@Realms\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireClubsEngagementEvent\@MinecraftEventing\@\@UEAAXW4ClubsEngagementAction\@IMinecraftEventing\@\@W4ClubsEngagementTargetType\@3\@PEBDURealmId\@Realms\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireClubsEngagementEvent(enum class IMinecraftEventing::ClubsEngagementAction, enum class IMinecraftEventing::ClubsEngagementTargetType, char const *, struct Realms::RealmId, std::string const &); /** - * @symbol ?fireClubsOpenFeedScreenEvent\@MinecraftEventing\@\@UEAAXW4ClubsFeedScreenSource\@IMinecraftEventing\@\@URealmId\@Realms\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireClubsOpenFeedScreenEvent\@MinecraftEventing\@\@UEAAXW4ClubsFeedScreenSource\@IMinecraftEventing\@\@URealmId\@Realms\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireClubsOpenFeedScreenEvent(enum class IMinecraftEventing::ClubsFeedScreenSource, struct Realms::RealmId, std::string const &); /** - * @symbol ?fireCodeCommandButtonPressed\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireCodeCommandButtonPressed\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireCodeCommandButtonPressed(); /** - * @symbol ?fireCommunitySIFTProcessEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4TextProcessingEventOrigin\@\@G0_NNDDAEBVValue\@Json\@\@\@Z + * @symbol ?fireCommandParseTableTelemetry\@MinecraftEventing\@\@UEBAX_NAEBV?$vector\@UCommandParseTableEntry\@IMinecraftEventing\@\@V?$allocator\@UCommandParseTableEntry\@IMinecraftEventing\@\@\@std\@\@\@std\@\@\@Z + */ + MCVAPI void fireCommandParseTableTelemetry(bool, std::vector const &) const; + /** + * @symbol ?fireCommunitySIFTProcessEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4TextProcessingEventOrigin\@\@G0_NNDDAEBVValue\@Json\@\@\@Z */ MCVAPI void fireCommunitySIFTProcessEvent(std::string const &, enum class TextProcessingEventOrigin, unsigned short, std::string const &, bool, double, char, char, class Json::Value const &); /** - * @symbol ?fireCourseButtonPressed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireCourseButtonPressed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireCourseButtonPressed(std::string const &, std::string const &); /** - * @symbol ?fireCurrentInputUpdated\@MinecraftEventing\@\@UEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VIClientInstance\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?fireCurrentInputUpdated\@MinecraftEventing\@\@UEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VIClientInstance\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCVAPI void fireCurrentInputUpdated(class gsl::not_null> const &); /** - * @symbol ?fireDBStorageError\@MinecraftEventing\@\@UEAAXAEBULevelStorageEventingContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireDBStorageError\@MinecraftEventing\@\@UEAAXAEBULevelStorageEventingContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireDBStorageError(struct LevelStorageEventingContext const &, std::string const &); /** - * @symbol ?fireDayOneExperienceStateChanged\@MinecraftEventing\@\@UEAAXW4DayOneExperienceState\@IMinecraftEventing\@\@V?$optional\@I\@std\@\@V?$optional\@_K\@5\@\@Z + * @symbol ?fireDayOneExperienceStateChanged\@MinecraftEventing\@\@UEAAXW4DayOneExperienceState\@IMinecraftEventing\@\@V?$optional\@I\@std\@\@V?$optional\@_K\@5\@\@Z */ MCVAPI void fireDayOneExperienceStateChanged(enum class IMinecraftEventing::DayOneExperienceState, class std::optional, class std::optional); /** - * @symbol ?fireEduServiceRequestFailed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00V?$buffer_span\@U?$pair\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@V12\@\@std\@\@\@\@\@Z + * @symbol ?fireDelayedEventReportOfflineAction\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCVAPI void fireDelayedEventReportOfflineAction(std::string const &); + /** + * @symbol ?fireEduServiceRequestFailed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00V?$buffer_span\@U?$pair\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V12\@\@std\@\@\@\@\@Z */ - MCVAPI void fireEduServiceRequestFailed(std::string const &, std::string const &, std::string const &, class buffer_span, class gsl::basic_string_span>>) const; + MCVAPI void fireEduServiceRequestFailed(std::string const &, std::string const &, std::string const &, class buffer_span>, class std::basic_string_view>>>) const; /** - * @symbol ?fireEventAchievementReceived\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireEventAchievementReceived\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireEventAchievementReceived(std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventActorValueValidationFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z + * @symbol ?fireEventActorValueValidationFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ MCVAPI void fireEventActorValueValidationFailed(std::string const &, char const *); /** - * @symbol ?fireEventAndroidHelpRequest\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventAndroidHelpRequest\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventAndroidHelpRequest(); /** - * @symbol ?fireEventAndroidScopedStorageDebug\@MinecraftEventing\@\@UEAAX_K\@Z + * @symbol ?fireEventAndroidScopedStorageDebug\@MinecraftEventing\@\@UEAAX_K\@Z */ MCVAPI void fireEventAndroidScopedStorageDebug(unsigned __int64); /** - * @symbol ?fireEventAppInitFileOpenStats\@MinecraftEventing\@\@UEAAXAEBUFileCounters\@Profile\@Core\@\@0\@Z + * @symbol ?fireEventAppInitFileOpenStats\@MinecraftEventing\@\@UEAAXAEBUFileCounters\@Profile\@Core\@\@0\@Z */ MCVAPI void fireEventAppInitFileOpenStats(struct Core::Profile::FileCounters const &, struct Core::Profile::FileCounters const &); /** - * @symbol ?fireEventAppPaused\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventAppPaused\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventAppPaused(); /** - * @symbol ?fireEventAppUnpaused\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventAppSurfaceCreated\@MinecraftEventing\@\@UEAAXXZ + */ + MCVAPI void fireEventAppSurfaceCreated(); + /** + * @symbol ?fireEventAppSurfaceDestroyed\@MinecraftEventing\@\@UEAAXXZ + */ + MCVAPI void fireEventAppSurfaceDestroyed(); + /** + * @symbol ?fireEventAppUnpaused\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventAppUnpaused(); /** - * @symbol ?fireEventArmorStandItemEquipped\@MinecraftEventing\@\@UEAAXAEBVArmorStand\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?fireEventArmorStandItemEquipped\@MinecraftEventing\@\@UEAAXAEBVArmorStand\@\@AEBVItemDescriptor\@\@\@Z */ MCVAPI void fireEventArmorStandItemEquipped(class ArmorStand const &, class ItemDescriptor const &); /** - * @symbol ?fireEventAssertFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventAssertFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventAssertFailed(std::string const &, std::string const &); /** - * @symbol ?fireEventBlockPlacedByCommand\@MinecraftEventing\@\@UEAAXAEBVBlock\@\@H\@Z + * @symbol ?fireEventBlockPlacedByCommand\@MinecraftEventing\@\@UEAAXAEBVBlock\@\@H\@Z */ MCVAPI void fireEventBlockPlacedByCommand(class Block const &, int); /** - * @symbol ?fireEventBlockTypeRegistryChecksumMismatch\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEB_K10\@Z + * @symbol ?fireEventBlockTypeRegistryChecksumMismatch\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEB_K10\@Z */ MCVAPI void fireEventBlockTypeRegistryChecksumMismatch(std::string const &, unsigned __int64 const &, unsigned __int64 const &, std::string const &); /** - * @symbol ?fireEventBoardTextUpdated\@MinecraftEventing\@\@UEAAXAEAVChalkboardBlockActor\@\@\@Z + * @symbol ?fireEventBoardTextUpdated\@MinecraftEventing\@\@UEAAXAEAVChalkboardBlockActor\@\@\@Z */ MCVAPI void fireEventBoardTextUpdated(class ChalkboardBlockActor &); /** - * @symbol ?fireEventBundleSubOfferClicked\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N0\@Z + * @symbol ?fireEventBundleSubOfferClicked\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N0\@Z */ MCVAPI void fireEventBundleSubOfferClicked(int, int, std::string const &, std::string const &, bool, std::string const &); /** - * @symbol ?fireEventButtonPressed\@MinecraftEventing\@\@UEBAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@V?$buffer_span\@U?$pair\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@V12\@\@std\@\@\@\@\@Z + * @symbol ?fireEventButtonPressed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z */ - MCVAPI void fireEventButtonPressed(class gsl::basic_string_span, class buffer_span, class gsl::basic_string_span>>) const; + MCVAPI void fireEventButtonPressed(std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &) const; /** - * @symbol ?fireEventCameraUsed\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireEventCameraUsed\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireEventCameraUsed(bool); /** - * @symbol ?fireEventChatSettingsUpdated\@MinecraftEventing\@\@UEBAXPEBVPlayer\@\@AEBV?$vector\@VProperty\@Events\@Social\@\@V?$allocator\@VProperty\@Events\@Social\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?fireEventChatSettingsUpdated\@MinecraftEventing\@\@UEBAXPEBVPlayer\@\@AEBV?$vector\@VProperty\@Events\@Social\@\@V?$allocator\@VProperty\@Events\@Social\@\@\@std\@\@\@std\@\@\@Z */ MCVAPI void fireEventChatSettingsUpdated(class Player const *, std::vector const &) const; /** - * @symbol ?fireEventChildAccountSignIn\@MinecraftEventing\@\@UEAAX_N0\@Z + * @symbol ?fireEventChildAccountSignIn\@MinecraftEventing\@\@UEAAX_N0\@Z */ MCVAPI void fireEventChildAccountSignIn(bool, bool); /** - * @symbol ?fireEventChunkChanged\@MinecraftEventing\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?fireEventChunkChanged\@MinecraftEventing\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void fireEventChunkChanged(class LevelChunk &); /** - * @symbol ?fireEventChunkLoaded\@MinecraftEventing\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?fireEventChunkLoaded\@MinecraftEventing\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void fireEventChunkLoaded(class LevelChunk &); /** - * @symbol ?fireEventChunkUnloaded\@MinecraftEventing\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?fireEventChunkUnloaded\@MinecraftEventing\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void fireEventChunkUnloaded(class LevelChunk &); /** - * @symbol ?fireEventClientLeftGameDueToUnrecoverableError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?fireEventClientLeftGameDueToUnrecoverableError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCVAPI void fireEventClientLeftGameDueToUnrecoverableError(std::string const &, bool); /** - * @symbol ?fireEventCodeBuilderClosed\@MinecraftEventing\@\@UEBAXXZ + * @symbol ?fireEventCodeBuilderClosed\@MinecraftEventing\@\@UEBAXXZ */ MCVAPI void fireEventCodeBuilderClosed() const; /** - * @symbol ?fireEventCodeBuilderLog\@MinecraftEventing\@\@UEBAXAEBUTelemetryCommonProperties\@Webview\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV45\@\@Z + * @symbol ?fireEventCodeBuilderLog\@MinecraftEventing\@\@UEBAXAEBUTelemetryCommonProperties\@Webview\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV45\@\@Z */ MCVAPI void fireEventCodeBuilderLog(struct Webview::TelemetryCommonProperties const &, std::string const &, std::string &) const; /** - * @symbol ?fireEventCodeBuilderRuntimeAction\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventCodeBuilderRuntimeAction\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventCodeBuilderRuntimeAction(std::string const &) const; /** - * @symbol ?fireEventCodeBuilderScoreChanged\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?fireEventCodeBuilderScoreChanged\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCVAPI void fireEventCodeBuilderScoreChanged(std::string const &, int) const; /** - * @symbol ?fireEventCompoundCreatorCreated\@MinecraftEventing\@\@UEAAXHH\@Z + * @symbol ?fireEventCompoundCreatorCreated\@MinecraftEventing\@\@UEAAXHH\@Z */ MCVAPI void fireEventCompoundCreatorCreated(int, int); /** - * @symbol ?fireEventConnectedStorageError\@MinecraftEventing\@\@UEAAXPEBDAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z + * @symbol ?fireEventConnectedStorageError\@MinecraftEventing\@\@UEAAXPEBDAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_J\@Z */ MCVAPI void fireEventConnectedStorageError(char const *, std::string const &, __int64); /** - * @symbol ?fireEventConnectedStorageResult\@MinecraftEventing\@\@UEAAXW4ConnectedStorageEventType\@\@_NIV?$optional\@I\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@4\@3_J222\@Z + * @symbol ?fireEventConnectedStorageResult\@MinecraftEventing\@\@UEAAXW4ConnectedStorageEventType\@\@_NIV?$optional\@I\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@4\@3_J222\@Z */ MCVAPI void fireEventConnectedStorageResult(enum class ConnectedStorageEventType, bool, unsigned int, class std::optional, std::string const &, std::string const &, __int64, class std::optional, class std::optional, class std::optional); /** - * @symbol ?fireEventConnectionFailed\@MinecraftEventing\@\@UEAAXW4ConnectionFailureReason\@IConnectionEventing\@\@\@Z + * @symbol ?fireEventConnectionFailed\@MinecraftEventing\@\@UEAAXW4ConnectionFailureReason\@IConnectionEventing\@\@\@Z */ MCVAPI void fireEventConnectionFailed(enum class IConnectionEventing::ConnectionFailureReason); /** - * @symbol ?fireEventContentLogsInWorldSession\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@II\@Z + * @symbol ?fireEventContentLogsInWorldSession\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@II\@Z */ MCVAPI void fireEventContentLogsInWorldSession(std::string const &, unsigned int, unsigned int); /** - * @symbol ?fireEventContentShared\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBW4ShareMode\@IMinecraftEventing\@\@\@Z + * @symbol ?fireEventContentShared\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBW4ShareMode\@IMinecraftEventing\@\@\@Z */ MCVAPI void fireEventContentShared(std::string const &, std::string const &, enum class IMinecraftEventing::ShareMode const &); /** - * @symbol ?fireEventControlRemappedByPlayer\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4RawInputType\@\@H\@Z + * @symbol ?fireEventControlRemappedByPlayer\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4RawInputType\@\@H\@Z */ MCVAPI void fireEventControlRemappedByPlayer(std::string const &, enum class RawInputType, int) const; /** - * @symbol ?fireEventControlTipsPanelUpdated\@MinecraftEventing\@\@UEBAXW4EduControlPanelUpdateType\@\@N\@Z + * @symbol ?fireEventControlTipsPanelUpdated\@MinecraftEventing\@\@UEBAXW4EduControlPanelUpdateType\@\@N\@Z */ MCVAPI void fireEventControlTipsPanelUpdated(enum class EduControlPanelUpdateType, double) const; /** - * @symbol ?fireEventCopyWorldEducationEnabled\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventCopyWorldEducationEnabled\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventCopyWorldEducationEnabled(); /** - * @symbol ?fireEventCrashSystemFailedToInit\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventCrashSystemFailedToInit\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventCrashSystemFailedToInit(); /** - * @symbol ?fireEventDefaultCastSelected\@MinecraftEventing\@\@UEAAXHVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventDefaultCastSelected\@MinecraftEventing\@\@UEAAXHVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventDefaultCastSelected(int, class mce::UUID, std::string const &); /** - * @symbol ?fireEventDefaultGameTypeChanged\@MinecraftEventing\@\@UEAAXW4GameType\@\@0\@Z + * @symbol ?fireEventDefaultGameTypeChanged\@MinecraftEventing\@\@UEAAXW4GameType\@\@0\@Z */ MCVAPI void fireEventDefaultGameTypeChanged(enum class GameType, enum class GameType); /** - * @symbol ?fireEventDevSlashCommandExecuted\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventDevSlashCommandExecuted\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventDevSlashCommandExecuted(std::string const &, std::string const &); /** - * @symbol ?fireEventDeviceAccountFailure\@MinecraftEventing\@\@UEAAXW4SignInStage\@IMinecraftEventing\@\@W4DeviceAccountFailurePhase\@3\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventDeviceAccountFailure\@MinecraftEventing\@\@UEAAXW4SignInStage\@IMinecraftEventing\@\@W4DeviceAccountFailurePhase\@3\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventDeviceAccountFailure(enum class IMinecraftEventing::SignInStage, enum class IMinecraftEventing::DeviceAccountFailurePhase, unsigned int, std::string const &); /** - * @symbol ?fireEventDeviceAccountSuccess\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventDeviceAccountSuccess\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventDeviceAccountSuccess(bool, std::string const &); /** - * @symbol ?fireEventDeviceIdManagerFailOnIdentityGained\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventDeviceIdManagerFailOnIdentityGained\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventDeviceIdManagerFailOnIdentityGained(); /** - * @symbol ?fireEventDeviceLost\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventDeviceLost\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventDeviceLost(); /** - * @symbol ?fireEventDifficultySet\@MinecraftEventing\@\@UEAAXW4Difficulty\@\@0\@Z + * @symbol ?fireEventDifficultySet\@MinecraftEventing\@\@UEAAXW4Difficulty\@\@0\@Z */ MCVAPI void fireEventDifficultySet(enum class Difficulty, enum class Difficulty); /** - * @symbol ?fireEventDiskStatus\@MinecraftEventing\@\@UEAAXW4DiskStatus\@\@W4LevelStorageState\@Core\@\@_K\@Z + * @symbol ?fireEventDiskStatus\@MinecraftEventing\@\@UEAAXW4DiskStatus\@\@W4LevelStorageState\@Core\@\@_K\@Z */ MCVAPI void fireEventDiskStatus(enum class DiskStatus, enum class Core::LevelStorageState, unsigned __int64); /** - * @symbol ?fireEventEduContentVerificationFailed\@MinecraftEventing\@\@UEBAXXZ + * @symbol ?fireEventEduContentVerificationFailed\@MinecraftEventing\@\@UEBAXXZ */ MCVAPI void fireEventEduContentVerificationFailed() const; /** - * @symbol ?fireEventEduDemoConversion\@MinecraftEventing\@\@UEAAXW4ADRole\@\@W4LastClickedSource\@\@\@Z + * @symbol ?fireEventEduDemoConversion\@MinecraftEventing\@\@UEAAXW4ADRole\@\@W4LastClickedSource\@\@\@Z */ MCVAPI void fireEventEduDemoConversion(enum class ADRole, enum class LastClickedSource); /** - * @symbol ?fireEventEduResources\@MinecraftEventing\@\@UEBAXXZ + * @symbol ?fireEventEduResources\@MinecraftEventing\@\@UEBAXXZ */ MCVAPI void fireEventEduResources() const; /** - * @symbol ?fireEventEduServiceStatus\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0HV?$buffer_span\@U?$pair\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@V12\@\@std\@\@\@\@\@Z + * @symbol ?fireEventEduServiceStatus\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0HV?$buffer_span\@U?$pair\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V12\@\@std\@\@\@\@\@Z */ - MCVAPI void fireEventEduServiceStatus(std::string const &, std::string const &, int, class buffer_span, class gsl::basic_string_span>>) const; + MCVAPI void fireEventEduServiceStatus(std::string const &, std::string const &, int, class buffer_span>, class std::basic_string_view>>>) const; /** - * @symbol ?fireEventEduiOSPurchaseTransaction\@MinecraftEventing\@\@UEBAXAEBW4TransactionStatus\@\@\@Z + * @symbol ?fireEventEduiOSPurchaseTransaction\@MinecraftEventing\@\@UEBAXAEBW4TransactionStatus\@\@\@Z */ MCVAPI void fireEventEduiOSPurchaseTransaction(enum class TransactionStatus const &) const; /** - * @symbol ?fireEventElementConstructorUsed\@MinecraftEventing\@\@UEAAXHHW4ElementConstructorUseType\@IMinecraftEventing\@\@\@Z + * @symbol ?fireEventElementConstructorUsed\@MinecraftEventing\@\@UEAAXHHW4ElementConstructorUseType\@IMinecraftEventing\@\@\@Z */ MCVAPI void fireEventElementConstructorUsed(int, int, enum class IMinecraftEventing::ElementConstructorUseType); /** - * @symbol ?fireEventEmptyLibraryCategoryError\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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 ?fireEventEntitlementListInfo\@MinecraftEventing\@\@UEAAXAEAV?$vector\@VContentIdentity\@\@V?$allocator\@VContentIdentity\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ?fireEventEntitlementListInfo\@MinecraftEventing\@\@UEAAXAEAV?$vector\@VContentIdentity\@\@V?$allocator\@VContentIdentity\@\@\@std\@\@\@std\@\@_N\@Z */ MCVAPI void fireEventEntitlementListInfo(std::vector &, bool); /** - * @symbol ?fireEventEntitySpawned\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@HI\@Z + * @symbol ?fireEventEntitySpawned\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@HI\@Z */ MCVAPI void fireEventEntitySpawned(class Player *, int, unsigned int); /** - * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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\@\@UEAAX_N0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventGameRulesUpdated\@MinecraftEventing\@\@UEAAXMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCVAPI void fireEventGameRulesUpdated(bool, bool, std::string const &); + MCVAPI void fireEventGameRulesUpdated(float, float, std::string const &); /** - * @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 ?fireEventGoogleAccountHoldWarning\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireEventGoogleAccountHoldWarning\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireEventGoogleAccountHoldWarning(bool); /** - * @symbol ?fireEventHardwareInfo\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventHardwareInfo\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventHardwareInfo(); /** - * @symbol ?fireEventHowToPlayTopicChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4InputMode\@\@\@Z + * @symbol ?fireEventHowToPlayTopicChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4InputMode\@\@\@Z */ MCVAPI void fireEventHowToPlayTopicChanged(std::string const &, enum class InputMode); /** - * @symbol ?fireEventIAPPurchaseAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVOffer\@\@W4PurchasePath\@\@\@Z + * @symbol ?fireEventIAPPurchaseAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVOffer\@\@W4PurchasePath\@\@\@Z */ MCVAPI void fireEventIAPPurchaseAttempt(std::string const &, std::string const &, class Offer &, enum class PurchasePath); /** - * @symbol ?fireEventIAPPurchaseResolved\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVOffer\@\@W4PurchaseResult\@IMinecraftEventing\@\@W4PurchasePath\@\@\@Z + * @symbol ?fireEventIAPPurchaseResolved\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVOffer\@\@W4PurchaseResult\@IMinecraftEventing\@\@W4PurchasePath\@\@\@Z */ MCVAPI void fireEventIAPPurchaseResolved(std::string const &, std::string const &, class Offer &, enum class IMinecraftEventing::PurchaseResult, enum class PurchasePath); /** - * @symbol ?fireEventIAPRedeemAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4PurchasePath\@\@\@Z + * @symbol ?fireEventIAPRedeemAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4PurchasePath\@\@\@Z */ MCVAPI void fireEventIAPRedeemAttempt(std::string const &, std::string const &, std::string const &, enum class PurchasePath); /** - * @symbol ?fireEventIAPRedeemResolved\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4PurchaseResult\@IMinecraftEventing\@\@W4PurchasePath\@\@\@Z + * @symbol ?fireEventIAPRedeemResolved\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4PurchaseResult\@IMinecraftEventing\@\@W4PurchasePath\@\@\@Z */ MCVAPI void fireEventIAPRedeemResolved(std::string const &, std::string const &, std::string const &, enum class IMinecraftEventing::PurchaseResult, enum class PurchasePath); /** - * @symbol ?fireEventImGuiScreenChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?fireEventImGuiScreenChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z */ MCVAPI void fireEventImGuiScreenChanged(std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?fireEventJoinByCode\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventJoinByCode\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventJoinByCode(std::string const &); /** - * @symbol ?fireEventJoinCanceled\@MinecraftEventing\@\@UEAAXW4LoadingState\@\@\@Z + * @symbol ?fireEventJoinCanceled\@MinecraftEventing\@\@UEAAXW4LoadingState\@\@\@Z */ MCVAPI void fireEventJoinCanceled(enum class LoadingState); /** - * @symbol ?fireEventLabTableCreated\@MinecraftEventing\@\@UEAAXHHH\@Z + * @symbol ?fireEventLabTableCreated\@MinecraftEventing\@\@UEAAXHHH\@Z */ MCVAPI void fireEventLabTableCreated(int, int, int); /** - * @symbol ?fireEventLevelChunkPerformanceData\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireEventLevelChunkPerformanceData\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireEventLevelChunkPerformanceData(bool); /** - * @symbol ?fireEventLevelDatLoadFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @symbol ?fireEventLevelDatLoadFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCVAPI void fireEventLevelDatLoadFailed(std::string const &, std::string const &, bool); /** - * @symbol ?fireEventLevelDataOverride\@MinecraftEventing\@\@UEBAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?fireEventLevelDataOverride\@MinecraftEventing\@\@UEBAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCVAPI void fireEventLevelDataOverride(class gsl::basic_string_span) const; + MCVAPI void fireEventLevelDataOverride(class std::basic_string_view>) const; /** - * @symbol ?fireEventLevelDestruct\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventLevelDestruct\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventLevelDestruct(); /** - * @symbol ?fireEventLibrarySearch\@MinecraftEventing\@\@UEBAXAEBUTelemetryData\@librarySearch\@\@\@Z + * @symbol ?fireEventLibrarySearch\@MinecraftEventing\@\@UEBAXAEBUTelemetryData\@librarySearch\@\@\@Z */ MCVAPI void fireEventLibrarySearch(struct librarySearch::TelemetryData const &) const; /** - * @symbol ?fireEventLibrarySearchItemSelected\@MinecraftEventing\@\@UEBAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z + * @symbol ?fireEventLibrarySearchItemSelected\@MinecraftEventing\@\@UEBAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z */ MCVAPI void fireEventLibrarySearchItemSelected(int, int, std::string const &, int, int) const; /** - * @symbol ?fireEventLicenseCheck\@MinecraftEventing\@\@UEAAX_NAEAUExtraLicenseData\@\@\@Z + * @symbol ?fireEventLicenseCheck\@MinecraftEventing\@\@UEAAX_NAEAUExtraLicenseData\@\@\@Z */ MCVAPI void fireEventLicenseCheck(bool, struct ExtraLicenseData &); /** - * @symbol ?fireEventLockedItemGiven\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventLockedItemGiven\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventLockedItemGiven(); /** - * @symbol ?fireEventMessageServiceImpression\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?fireEventMessageServiceImpression\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCVAPI void fireEventMessageServiceImpression(std::string const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventMultiplayerConnectionStateChanged\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1III1\@Z + * @symbol ?fireEventMultiplayerConnectionStateChanged\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1III1\@Z */ MCVAPI void fireEventMultiplayerConnectionStateChanged(bool, std::string const &, std::string const &, unsigned int, unsigned int, unsigned int, std::string const &); /** - * @symbol ?fireEventMultiplayerSessionUpdate\@MinecraftEventing\@\@UEAAXV?$not_null\@PEBVLevel\@\@\@gsl\@\@PEBVPlayer\@\@\@Z + * @symbol ?fireEventMultiplayerSessionUpdate\@MinecraftEventing\@\@UEAAXV?$not_null\@PEBVLevel\@\@\@gsl\@\@PEBVPlayer\@\@\@Z */ MCVAPI void fireEventMultiplayerSessionUpdate(class gsl::not_null, class Player const *); /** - * @symbol ?fireEventNewContentCheckCompleted\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?fireEventNewContentCheckCompleted\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCVAPI void fireEventNewContentCheckCompleted(std::string const &, bool); /** - * @symbol ?fireEventNpcPropertiesUpdated\@MinecraftEventing\@\@UEAAXAEAVActor\@\@_N\@Z + * @symbol ?fireEventNpcPropertiesUpdated\@MinecraftEventing\@\@UEAAXAEAVActor\@\@_N\@Z */ MCVAPI void fireEventNpcPropertiesUpdated(class Actor &, bool); /** - * @symbol ?fireEventOSKTextTruncation\@MinecraftEventing\@\@UEAAXI\@Z + * @symbol ?fireEventOSKTextTruncation\@MinecraftEventing\@\@UEAAXI\@Z */ MCVAPI void fireEventOSKTextTruncation(unsigned int); /** - * @symbol ?fireEventOfferRated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHHN\@Z + * @symbol ?fireEventOfferRated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHHN\@Z */ MCVAPI void fireEventOfferRated(std::string const &, int, int, int, double); /** - * @symbol ?fireEventOnAppResume\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?fireEventOnAppResume\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@\@Z */ MCVAPI void fireEventOnAppResume(std::vector>); /** - * @symbol ?fireEventOnAppStart\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?fireEventOnAppStart\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@\@Z */ MCVAPI void fireEventOnAppStart(std::vector>); /** - * @symbol ?fireEventOnAppSuspend\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@_N\@Z + * @symbol ?fireEventOnAppSuspend\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@_N\@Z */ MCVAPI void fireEventOnAppSuspend(std::vector>, bool); /** - * @symbol ?fireEventOnDeviceLost\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?fireEventOnDeviceLost\@MinecraftEventing\@\@UEAAXV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@std\@\@\@Z */ MCVAPI void fireEventOnDeviceLost(std::vector>); /** - * @symbol ?fireEventOnSuccessfulClientLogin\@MinecraftEventing\@\@UEAAXPEBVLevel\@\@\@Z + * @symbol ?fireEventOnSuccessfulClientLogin\@MinecraftEventing\@\@UEAAXPEBVLevel\@\@\@Z */ MCVAPI void fireEventOnSuccessfulClientLogin(class Level const *); /** - * @symbol ?fireEventOneDSPlayerReportPayload\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventOneDSPlayerReportPayload\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventOneDSPlayerReportPayload(std::string const &); /** - * @symbol ?fireEventOptionsUpdated\@MinecraftEventing\@\@UEAAXAEAVOptions\@\@W4InputMode\@\@_N\@Z + * @symbol ?fireEventOptionsUpdated\@MinecraftEventing\@\@UEAAXAEAVOptions\@\@W4InputMode\@\@_N\@Z */ MCVAPI void fireEventOptionsUpdated(class Options &, enum class InputMode, bool); /** - * @symbol ?fireEventOreUIError\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventOreUIError\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventOreUIError(unsigned int const &, std::string const &); /** - * @symbol ?fireEventPackHashChanged\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@\@Z + * @symbol ?fireEventPackHashChanged\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@\@Z */ MCVAPI void fireEventPackHashChanged(class PackManifest const &); /** - * @symbol ?fireEventPackPlayed\@MinecraftEventing\@\@UEAAXAEBVPackInstance\@\@I\@Z + * @symbol ?fireEventPackPlayed\@MinecraftEventing\@\@UEAAXAEBVPackInstance\@\@I\@Z */ MCVAPI void fireEventPackPlayed(class PackInstance const &, unsigned int); /** - * @symbol ?fireEventPackUpgradeAttempt\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@AEBVPackReport\@\@\@Z + * @symbol ?fireEventPackUpgradeAttempt\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@AEBVPackReport\@\@\@Z */ MCVAPI void fireEventPackUpgradeAttempt(class PackManifest const &, class PackReport const &); /** - * @symbol ?fireEventPacketViolationDetected\@MinecraftEventing\@\@UEAAXAEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?fireEventPacketViolationDetected\@MinecraftEventing\@\@UEAAXAEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z */ MCVAPI void fireEventPacketViolationDetected(struct ExtendedStreamReadResult const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); /** - * @symbol ?fireEventPerformanceContext\@MinecraftEventing\@\@UEAAXAEBVPerfContextTrackerReport\@\@\@Z + * @symbol ?fireEventPerformanceContext\@MinecraftEventing\@\@UEAAXAEBVPerfContextTrackerReport\@\@\@Z */ MCVAPI void fireEventPerformanceContext(class PerfContextTrackerReport const &); /** - * @symbol ?fireEventPerformanceMetrics\@MinecraftEventing\@\@UEAAXAEBUProfilerLiteTelemetry\@\@_N\@Z + * @symbol ?fireEventPerformanceMetrics\@MinecraftEventing\@\@UEAAXAEBUProfilerLiteTelemetry\@\@_N\@Z */ MCVAPI void fireEventPerformanceMetrics(struct ProfilerLiteTelemetry const &, bool); /** - * @symbol ?fireEventPersonaAvatarUpdated\@MinecraftEventing\@\@UEAAXAEBV?$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\@AEBV?$vector\@_NV?$allocator\@_N\@std\@\@\@3\@2_N3000311\@Z + * @symbol ?fireEventPersonaAvatarUpdated\@MinecraftEventing\@\@UEAAXAEBV?$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\@AEBV?$vector\@_NV?$allocator\@_N\@std\@\@\@3\@2_N3000311\@Z */ MCVAPI void fireEventPersonaAvatarUpdated(std::string const &, std::vector const &, std::vector const &, std::vector const &, bool, bool, std::string const &, std::string const &, std::string const &, bool, std::vector const &, std::vector const &); /** - * @symbol ?fireEventPersonaAvatarsListed\@MinecraftEventing\@\@UEAAXAEBV?$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 ?fireEventPersonaAvatarsListed\@MinecraftEventing\@\@UEAAXAEBV?$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 */ MCVAPI void fireEventPersonaAvatarsListed(std::vector const &); /** - * @symbol ?fireEventPersonaCategoryInformation\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventPersonaCategoryInformation\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventPersonaCategoryInformation(std::string const &); /** - * @symbol ?fireEventPersonaCreationFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N100\@Z + * @symbol ?fireEventPersonaCreationFailed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N100\@Z */ MCVAPI void fireEventPersonaCreationFailed(std::string const &, std::string const &, bool, bool, std::string const &, std::string const &); /** - * @symbol ?fireEventPersonaEmotePlayed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NH\@Z + * @symbol ?fireEventPersonaEmotePlayed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NH\@Z */ 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\@\@\@Z */ MCVAPI void fireEventPersonaGeneralError(std::string const &); /** - * @symbol ?fireEventPersonaInitalizationEvent\@MinecraftEventing\@\@UEAAXIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventPersonaInitalizationEvent\@MinecraftEventing\@\@UEAAXIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventPersonaInitalizationEvent(unsigned int, std::string const &, std::string const &); /** - * @symbol ?fireEventPersonaItemPreviewed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00IIW4PromotionType\@IMinecraftEventing\@\@_N00NW4StoreType\@5\@\@Z + * @symbol ?fireEventPersonaItemPreviewed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00IIW4PromotionType\@IMinecraftEventing\@\@_N00NW4StoreType\@5\@\@Z */ MCVAPI void fireEventPersonaItemPreviewed(std::string const &, std::string const &, std::string const &, unsigned int, unsigned int, enum class IMinecraftEventing::PromotionType, bool, std::string const &, std::string const &, double, enum class IMinecraftEventing::StoreType); /** - * @symbol ?fireEventPersonaLoadingPieces\@MinecraftEventing\@\@UEAAXIN\@Z + * @symbol ?fireEventPersonaLoadingPieces\@MinecraftEventing\@\@UEAAXIN\@Z */ MCVAPI void fireEventPersonaLoadingPieces(unsigned int, double); /** - * @symbol ?fireEventPersonaSkinChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @symbol ?fireEventPersonaSkinChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCVAPI void fireEventPersonaSkinChanged(std::string const &, std::string const &, bool); /** - * @symbol ?fireEventPersonaStillLoading\@MinecraftEventing\@\@UEAAX_N0000000AEBV?$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\@\@HN\@Z + * @symbol ?fireEventPersonaStillLoading\@MinecraftEventing\@\@UEAAX_N0000000AEBV?$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\@\@HN\@Z */ MCVAPI void fireEventPersonaStillLoading(bool, bool, bool, bool, bool, bool, bool, bool, std::vector const &, int, double); /** - * @symbol ?fireEventPersonaUserLoadedActive\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @symbol ?fireEventPersonaUserLoadedActive\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z */ MCVAPI void fireEventPersonaUserLoadedActive(std::string const &, std::string const &, bool); /** - * @symbol ?fireEventPlayIntegrityCheck\@MinecraftEventing\@\@UEAAXHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @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 ?fireEventPlayerBanned\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventPlayerBanned\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventPlayerBanned(std::string const &); /** - * @symbol ?fireEventPlayerBounced\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@AEBVBlock\@\@H\@Z + * @symbol ?fireEventPlayerBounced\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@AEBVBlock\@\@H\@Z */ MCVAPI void fireEventPlayerBounced(class Player *, class Block const &, int); /** - * @symbol ?fireEventPlayerDamaged\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@W4ActorDamageCause\@\@\@Z + * @symbol ?fireEventPlayerDamaged\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@W4ActorDamageCause\@\@\@Z */ MCVAPI void fireEventPlayerDamaged(class Player *, enum class ActorDamageCause); /** - * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@Z + * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@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, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class TransportLayer); /** - * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4TransportLayer\@\@\@Z + * @symbol ?fireEventPlayerJoinWorld\@MinecraftEventing\@\@UEAAXAEBIW4SubClientId\@\@W4PlayerJoinWorldAttemptState\@IConnectionEventing\@\@HW4DisconnectFailReason\@Connection\@\@W4TransportLayer\@\@\@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, enum class IConnectionEventing::PlayerJoinWorldAttemptState, int, enum class Connection::DisconnectFailReason, enum class TransportLayer); /** - * @symbol ?fireEventPlayerKicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventPlayerKicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventPlayerKicked(std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerMessageChat\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventPlayerMessageChat\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventPlayerMessageChat(std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerMessageMe\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventPlayerMessageMe\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventPlayerMessageMe(std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerMessageSay\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventPlayerMessageSay\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventPlayerMessageSay(std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerMessageTell\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireEventPlayerMessageTell\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireEventPlayerMessageTell(std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerMessageTitle\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireEventPlayerMessageTitle\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireEventPlayerMessageTitle(std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerReportSent\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ?fireEventPlayerReportSent\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCVAPI void fireEventPlayerReportSent(bool, std::string const &, std::string const &); /** - * @symbol ?fireEventPlayerTravelled\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@M\@Z + * @symbol ?fireEventPlayerTravelled\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@M\@Z */ MCVAPI void fireEventPlayerTravelled(class Player *, float); /** - * @symbol ?fireEventPopupClosed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventPopupClosed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventPopupClosed(std::string const &) const; /** - * @symbol ?fireEventPopupFiredEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4ActiveDirectoryAction\@\@\@Z + * @symbol ?fireEventPopupFiredEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4ActiveDirectoryAction\@\@\@Z */ MCVAPI void fireEventPopupFiredEdu(std::string const &, std::string const &, std::string const &, std::string const &, enum class ActiveDirectoryAction); /** - * @symbol ?fireEventPortfolioExported\@MinecraftEventing\@\@UEAAXHH\@Z + * @symbol ?fireEventPortfolioExported\@MinecraftEventing\@\@UEAAXHH\@Z */ MCVAPI void fireEventPortfolioExported(int, int); /** - * @symbol ?fireEventProgressionsSet\@MinecraftEventing\@\@UEAAXAEBV?$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 ?fireEventProgressionsSet\@MinecraftEventing\@\@UEAAXAEBV?$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 */ MCVAPI void fireEventProgressionsSet(std::vector const &); /** - * @symbol ?fireEventPromotionNotificationClicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventPromotionNotificationClicked\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventPromotionNotificationClicked(std::string const &); /** - * @symbol ?fireEventPurchaseAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4StoreType\@IMinecraftEventing\@\@W4PurchasePath\@\@\@Z + * @symbol ?fireEventPurchaseAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4StoreType\@IMinecraftEventing\@\@W4PurchasePath\@\@\@Z */ MCVAPI void fireEventPurchaseAttempt(std::string const &, std::string const &, std::string const &, enum class IMinecraftEventing::StoreType, enum class PurchasePath); /** - * @symbol ?fireEventPurchaseFailureDetails\@MinecraftEventing\@\@UEAAXHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireEventPurchaseFailureDetails\@MinecraftEventing\@\@UEAAXHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireEventPurchaseFailureDetails(int, std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventPurchaseGameAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireEventPurchaseGameAttempt\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireEventPurchaseGameAttempt(std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventPurchaseResolved\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4StoreType\@IMinecraftEventing\@\@W4PurchaseResult\@5\@W4PurchasePath\@\@\@Z + * @symbol ?fireEventPurchaseResolved\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4StoreType\@IMinecraftEventing\@\@W4PurchaseResult\@5\@W4PurchasePath\@\@\@Z */ MCVAPI void fireEventPurchaseResolved(std::string const &, std::string const &, std::string const &, enum class IMinecraftEventing::StoreType, enum class IMinecraftEventing::PurchaseResult, enum class PurchasePath); /** - * @symbol ?fireEventPushNotificationOpened\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventPushNotificationOpened\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventPushNotificationOpened(std::string const &, std::string const &); /** - * @symbol ?fireEventPushNotificationPermission\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventPushNotificationPermission\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventPushNotificationPermission(bool, std::string const &); /** - * @symbol ?fireEventPushNotificationReceived\@MinecraftEventing\@\@UEAAXAEBVPushNotificationMessage\@\@\@Z + * @symbol ?fireEventPushNotificationReceived\@MinecraftEventing\@\@UEAAXAEBVPushNotificationMessage\@\@\@Z */ MCVAPI void fireEventPushNotificationReceived(class PushNotificationMessage const &); /** - * @symbol ?fireEventRealmDownload\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0HHH\@Z + * @symbol ?fireEventRealmDownload\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0HHH\@Z */ MCVAPI void fireEventRealmDownload(std::string const &, std::string const &, int, int, int); /** - * @symbol ?fireEventRealmMemberlistCleared\@MinecraftEventing\@\@UEAAXAEBURealmId\@Realms\@\@AEBH\@Z + * @symbol ?fireEventRealmMemberlistCleared\@MinecraftEventing\@\@UEAAXAEBURealmId\@Realms\@\@AEBH\@Z */ MCVAPI void fireEventRealmMemberlistCleared(struct Realms::RealmId const &, int const &); /** - * @symbol ?fireEventRealmShared\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4ShareMode\@IMinecraftEventing\@\@AEBURealmId\@Realms\@\@\@Z + * @symbol ?fireEventRealmShared\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4ShareMode\@IMinecraftEventing\@\@AEBURealmId\@Realms\@\@\@Z */ MCVAPI void fireEventRealmShared(std::string const &, enum class IMinecraftEventing::ShareMode const &, struct Realms::RealmId const &); /** - * @symbol ?fireEventRealmUpload\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0HHH_N\@Z + * @symbol ?fireEventRealmUpload\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0HHH_N\@Z */ MCVAPI void fireEventRealmUpload(std::string const &, std::string const &, int, int, int, bool); /** - * @symbol ?fireEventRealmUrlGenerated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBURealmId\@Realms\@\@\@Z + * @symbol ?fireEventRealmUrlGenerated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBURealmId\@Realms\@\@\@Z */ MCVAPI void fireEventRealmUrlGenerated(std::string const &, struct Realms::RealmId const &); /** - * @symbol ?fireEventRealmsSubscriptionPurchaseFailed\@MinecraftEventing\@\@UEAAXAEBUProductSku\@\@W4RealmsPurchaseIntent\@\@W4RealmsPurchaseFailureReason\@\@\@Z + * @symbol ?fireEventRealmsSubscriptionPurchaseFailed\@MinecraftEventing\@\@UEAAXAEBUProductSku\@\@W4RealmsPurchaseIntent\@\@W4RealmsPurchaseFailureReason\@\@\@Z */ MCVAPI void fireEventRealmsSubscriptionPurchaseFailed(struct ProductSku const &, enum class RealmsPurchaseIntent, enum class RealmsPurchaseFailureReason); /** - * @symbol ?fireEventRealmsSubscriptionPurchaseStarted\@MinecraftEventing\@\@UEAAXAEBUProductSku\@\@W4RealmsPurchaseIntent\@\@\@Z + * @symbol ?fireEventRealmsSubscriptionPurchaseStarted\@MinecraftEventing\@\@UEAAXAEBUProductSku\@\@W4RealmsPurchaseIntent\@\@\@Z */ MCVAPI void fireEventRealmsSubscriptionPurchaseStarted(struct ProductSku const &, enum class RealmsPurchaseIntent); /** - * @symbol ?fireEventRealmsSubscriptionPurchaseSucceeded\@MinecraftEventing\@\@UEAAXAEBUProductSku\@\@W4RealmsPurchaseIntent\@\@\@Z + * @symbol ?fireEventRealmsSubscriptionPurchaseSucceeded\@MinecraftEventing\@\@UEAAXAEBUProductSku\@\@W4RealmsPurchaseIntent\@\@\@Z */ MCVAPI void fireEventRealmsSubscriptionPurchaseSucceeded(struct ProductSku const &, enum class RealmsPurchaseIntent); /** - * @symbol ?fireEventReducerBlockEntered\@MinecraftEventing\@\@UEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?fireEventReducerBlockEntered\@MinecraftEventing\@\@UEAAXAEBVItemDescriptor\@\@\@Z */ MCVAPI void fireEventReducerBlockEntered(class ItemDescriptor const &); /** - * @symbol ?fireEventRenderingSizeChanged\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventRenderingSizeChanged\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventRenderingSizeChanged(); /** - * @symbol ?fireEventRespawn\@MinecraftEventing\@\@UEAAXAEAVPlayer\@\@H\@Z + * @symbol ?fireEventRespawn\@MinecraftEventing\@\@UEAAXAEAVPlayer\@\@H\@Z */ MCVAPI void fireEventRespawn(class Player &, int); /** - * @symbol ?fireEventRespondedToAcceptContent\@MinecraftEventing\@\@UEAAXAEBUPacksInfoData\@\@_N\@Z + * @symbol ?fireEventRespondedToAcceptContent\@MinecraftEventing\@\@UEAAXAEBUPacksInfoData\@\@_N\@Z */ MCVAPI void fireEventRespondedToAcceptContent(struct PacksInfoData const &, bool); /** - * @symbol ?fireEventScreenChanged\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?fireEventScreenChanged\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z */ MCVAPI void fireEventScreenChanged(unsigned int const &, std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?fireEventScreenLoaded\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@NNN\@Z + * @symbol ?fireEventScreenLoaded\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@NNN\@Z */ MCVAPI void fireEventScreenLoaded(unsigned int const &, std::string const &, double, double, double); /** - * @symbol ?fireEventScriptDebuggerConnect\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireEventScriptDebuggerConnect\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireEventScriptDebuggerConnect(bool); /** - * @symbol ?fireEventScriptDebuggerListen\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireEventScriptDebuggerListen\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireEventScriptDebuggerListen(bool); /** - * @symbol ?fireEventScriptPluginDiscovery\@MinecraftEventing\@\@UEAAXAEBVScriptPluginResult\@\@_N\@Z + * @symbol ?fireEventScriptPluginDiscovery\@MinecraftEventing\@\@UEAAXAEBVScriptPluginResult\@\@_N\@Z */ MCVAPI void fireEventScriptPluginDiscovery(class ScriptPluginResult const &, bool); /** - * @symbol ?fireEventScriptPluginRun\@MinecraftEventing\@\@UEAAXAEBVScriptPluginResult\@\@V?$duration\@_JU?$ratio\@$00$0PECEA\@\@std\@\@\@chrono\@std\@\@_N\@Z + * @symbol ?fireEventScriptPluginRun\@MinecraftEventing\@\@UEAAXAEBVScriptPluginResult\@\@V?$duration\@_JU?$ratio\@$00$0PECEA\@\@std\@\@\@chrono\@std\@\@_N\@Z */ MCVAPI void fireEventScriptPluginRun(class ScriptPluginResult const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000>>, bool); /** - * @symbol ?fireEventScriptWatchdog\@MinecraftEventing\@\@UEAAXW4WatchdogEventType\@Scripting\@\@_N_KMH2PEBUModuleDescriptor\@3\@1\@Z + * @symbol ?fireEventScriptWatchdog\@MinecraftEventing\@\@UEAAXW4WatchdogEventType\@Scripting\@\@_N_KMH2PEBUModuleDescriptor\@3\@1\@Z */ MCVAPI void fireEventScriptWatchdog(enum class Scripting::WatchdogEventType, bool, unsigned __int64, float, int, unsigned __int64, struct Scripting::ModuleDescriptor const *, bool); /** - * @symbol ?fireEventSearchCatalogRequest\@MinecraftEventing\@\@UEAAXAEBVSearchRequestTelemetry\@\@\@Z + * @symbol ?fireEventSearchCatalogRequest\@MinecraftEventing\@\@UEAAXAEBVSearchRequestTelemetry\@\@\@Z */ MCVAPI void fireEventSearchCatalogRequest(class SearchRequestTelemetry const &); /** - * @symbol ?fireEventSearchItemSelected\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHH\@Z + * @symbol ?fireEventSearchItemSelected\@MinecraftEventing\@\@UEAAXHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHH\@Z */ MCVAPI void fireEventSearchItemSelected(int, int, std::string const &, int, int, int); /** - * @symbol ?fireEventServerDrivenLayoutImagesLoaded\@MinecraftEventing\@\@UEAAXAEAVRequestTelemetry\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_KHHHAEAV?$vector\@GV?$allocator\@G\@std\@\@\@4\@\@Z + * @symbol ?fireEventServerDrivenLayoutImagesLoaded\@MinecraftEventing\@\@UEAAXAEAVRequestTelemetry\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_KHHHAEAV?$vector\@GV?$allocator\@G\@std\@\@\@4\@\@Z */ MCVAPI void fireEventServerDrivenLayoutImagesLoaded(class RequestTelemetry &, std::string, int, unsigned __int64, int, int, int, std::vector &); /** - * @symbol ?fireEventServerDrivenLayoutPageLoaded\@MinecraftEventing\@\@UEAAXAEAVRequestTelemetry\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHHHH\@Z + * @symbol ?fireEventServerDrivenLayoutPageLoaded\@MinecraftEventing\@\@UEAAXAEAVRequestTelemetry\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HHHHH\@Z */ MCVAPI void fireEventServerDrivenLayoutPageLoaded(class RequestTelemetry &, std::string, int, int, int, int, int); /** - * @symbol ?fireEventServerRespawnSearchTime\@MinecraftEventing\@\@UEAAXAEAVPlayer\@\@AEBVPlayerRespawnTelemetryData\@\@\@Z + * @symbol ?fireEventServerRespawnSearchTime\@MinecraftEventing\@\@UEAAXAEAVPlayer\@\@AEBVPlayerRespawnTelemetryData\@\@\@Z */ MCVAPI void fireEventServerRespawnSearchTime(class Player &, class PlayerRespawnTelemetryData const &); /** - * @symbol ?fireEventServerShutdownDueToError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventServerShutdownDueToError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventServerShutdownDueToError(std::string const &); /** - * @symbol ?fireEventSetMultiplayerCorrelationId\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ?fireEventSetMultiplayerCorrelationId\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCVAPI void fireEventSetMultiplayerCorrelationId(class Player *, std::string const &, std::string const &); /** - * @symbol ?fireEventSetValidForAchievements\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z + * @symbol ?fireEventSetValidForAchievements\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z */ MCVAPI void fireEventSetValidForAchievements(class Player *, bool); /** - * @symbol ?fireEventSideBySideValidationError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000_N11\@Z + * @symbol ?fireEventSideBySideValidationError\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000_N11\@Z */ MCVAPI void fireEventSideBySideValidationError(std::string const &, std::string const &, std::string const &, std::string const &, std::string const &, bool, bool, bool); /** - * @symbol ?fireEventSidebarNavigation\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1H_N22\@Z + * @symbol ?fireEventSidebarNavigation\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1H_N22\@Z */ MCVAPI void fireEventSidebarNavigation(unsigned int const &, std::string const &, std::string const &, int, bool, bool, bool); /** - * @symbol ?fireEventSidebarVerboseToggled\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z + * @symbol ?fireEventSidebarVerboseToggled\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z */ MCVAPI void fireEventSidebarVerboseToggled(unsigned int const &, std::string const &, std::string const &, bool); /** - * @symbol ?fireEventSignInEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@W4EduSignInStage\@IMinecraftEventing\@\@00AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?fireEventSignInEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@W4EduSignInStage\@IMinecraftEventing\@\@00AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@3\@\@Z */ 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\@\@UPlayerIDs\@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 &); /** - * @symbol ?fireEventSignOutEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@00\@Z + * @symbol ?fireEventSignOutEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@00\@Z */ MCVAPI void fireEventSignOutEdu(std::string const &, enum class ADRole, std::string const &, std::string const &); /** - * @symbol ?fireEventSignOutOfIdentity\@MinecraftEventing\@\@UEAAXW4SignInAccountType\@IMinecraftEventing\@\@W4SignInTrigger\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2\@Z + * @symbol ?fireEventSignOutOfIdentity\@MinecraftEventing\@\@UEAAXW4SignInAccountType\@IMinecraftEventing\@\@W4SignInTrigger\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@2\@Z */ MCVAPI void fireEventSignOutOfIdentity(enum class IMinecraftEventing::SignInAccountType, enum class IMinecraftEventing::SignInTrigger, std::string const &, std::string const &); /** - * @symbol ?fireEventSignalServiceConnect\@MinecraftEventing\@\@UEAAXW4SignalServiceConnectState\@IConnectionEventing\@\@_NHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventSignalServiceConnect\@MinecraftEventing\@\@UEAAXW4SignalServiceConnectState\@IConnectionEventing\@\@_NHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventSignalServiceConnect(enum class IConnectionEventing::SignalServiceConnectState, bool, int, std::string const &); /** - * @symbol ?fireEventSplitScreenUpdated\@MinecraftEventing\@\@UEAAXAEBVIClientInstance\@\@\@Z + * @symbol ?fireEventSplitScreenUpdated\@MinecraftEventing\@\@UEAAXAEBVIClientInstance\@\@\@Z */ MCVAPI void fireEventSplitScreenUpdated(class IClientInstance const &); /** - * @symbol ?fireEventStackLoaded\@MinecraftEventing\@\@UEAAXAEBUStackStats\@\@\@Z + * @symbol ?fireEventStackLoaded\@MinecraftEventing\@\@UEAAXAEBUStackStats\@\@\@Z */ MCVAPI void fireEventStackLoaded(struct StackStats const &); /** - * @symbol ?fireEventStartClient\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventStartClient\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventStartClient(std::string const &); /** - * @symbol ?fireEventStartWorld\@MinecraftEventing\@\@UEAAXW4NetworkType\@IMinecraftEventing\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MultiplayerServiceIdentifier\@Social\@\@\@Z + * @symbol ?fireEventStartWorld\@MinecraftEventing\@\@UEAAXW4NetworkType\@IMinecraftEventing\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4MultiplayerServiceIdentifier\@Social\@\@\@Z */ MCVAPI void fireEventStartWorld(enum class IMinecraftEventing::NetworkType, std::string const &, enum class Social::MultiplayerServiceIdentifier); /** - * @symbol ?fireEventStorage\@MinecraftEventing\@\@UEAAXHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventStorage\@MinecraftEventing\@\@UEAAXHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventStorage(int, std::string const &); /** - * @symbol ?fireEventStorageAreaFull\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UDirectoryEntry\@Bedrock\@\@V?$allocator\@UDirectoryEntry\@Bedrock\@\@\@std\@\@\@3\@\@Z + * @symbol ?fireEventStorageAreaFull\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UDirectoryEntry\@Bedrock\@\@V?$allocator\@UDirectoryEntry\@Bedrock\@\@\@std\@\@\@3\@\@Z */ MCVAPI void fireEventStorageAreaFull(std::string const &, std::vector const &); /** - * @symbol ?fireEventStorageReport\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventStorageReport\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventStorageReport(std::string const &); /** - * @symbol ?fireEventStoreDiscoveryRequestResponse\@MinecraftEventing\@\@UEAAXHH\@Z + * @symbol ?fireEventStoreDiscoveryRequestResponse\@MinecraftEventing\@\@UEAAXHH\@Z */ MCVAPI void fireEventStoreDiscoveryRequestResponse(int, int); /** - * @symbol ?fireEventStoreErrorPage\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventStoreErrorPage\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventStoreErrorPage(std::string const &, std::string const &); /** - * @symbol ?fireEventStoreLocalizationBinaryFetchResponse\@MinecraftEventing\@\@UEAAXHI\@Z + * @symbol ?fireEventStoreLocalizationBinaryFetchResponse\@MinecraftEventing\@\@UEAAXHI\@Z */ MCVAPI void fireEventStoreLocalizationBinaryFetchResponse(int, unsigned int); /** - * @symbol ?fireEventStoreOfferClicked\@MinecraftEventing\@\@UEAAXHHHHHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NH0\@Z + * @symbol ?fireEventStoreOfferClicked\@MinecraftEventing\@\@UEAAXHHHHHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NH0\@Z */ MCVAPI void fireEventStoreOfferClicked(int, int, int, int, int, int, std::string const &, std::string const &, bool, int, std::string const &); /** - * @symbol ?fireEventStorePlayFabRequestResponse\@MinecraftEventing\@\@UEAAXG\@Z + * @symbol ?fireEventStorePlayFabRequestResponse\@MinecraftEventing\@\@UEAAXG\@Z */ MCVAPI void fireEventStorePlayFabRequestResponse(unsigned short); /** - * @symbol ?fireEventStorePromotionNotification\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventStorePromotionNotification\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventStorePromotionNotification(std::string const &); /** - * @symbol ?fireEventStoreSearch\@MinecraftEventing\@\@UEAAXAEBUTelemetryData\@storeSearch\@\@\@Z + * @symbol ?fireEventStoreSearch\@MinecraftEventing\@\@UEAAXAEBUTelemetryData\@storeSearch\@\@\@Z */ MCVAPI void fireEventStoreSearch(struct storeSearch::TelemetryData const &); /** - * @symbol ?fireEventStoreSessionResponse\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z + * @symbol ?fireEventStoreSessionResponse\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH\@Z */ MCVAPI void fireEventStoreSessionResponse(std::string const &, int, int); /** - * @symbol ?fireEventStructureExport\@MinecraftEventing\@\@UEBAXAEBUglTFExportData\@\@W4ExportOutcome\@IMinecraftEventing\@\@W4ExportStage\@4\@\@Z + * @symbol ?fireEventStructureExport\@MinecraftEventing\@\@UEBAXAEBUglTFExportData\@\@W4ExportOutcome\@IMinecraftEventing\@\@W4ExportStage\@4\@\@Z */ MCVAPI void fireEventStructureExport(struct glTFExportData const &, enum class IMinecraftEventing::ExportOutcome, enum class IMinecraftEventing::ExportStage) const; /** - * @symbol ?fireEventSwitchAccountEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@0\@Z + * @symbol ?fireEventSwitchAccountEdu\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ADRole\@\@0\@Z */ MCVAPI void fireEventSwitchAccountEdu(std::string const &, enum class ADRole, std::string const &); /** - * @symbol ?fireEventTagButtonPressed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?fireEventTagButtonPressed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCVAPI void fireEventTagButtonPressed(std::string const &, bool) const; /** - * @symbol ?fireEventTelemetryHttpError\@MinecraftEventing\@\@UEAAXW4TelemetrySystemType\@Events\@Social\@\@VStatus\@Http\@Bedrock\@\@\@Z + * @symbol ?fireEventTelemetryHttpError\@MinecraftEventing\@\@UEAAXW4TelemetrySystemType\@Events\@Social\@\@VStatus\@Http\@Bedrock\@\@\@Z */ MCVAPI void fireEventTelemetryHttpError(enum class Social::Events::TelemetrySystemType, class Bedrock::Http::Status); /** - * @symbol ?fireEventTreatmentPackApplied\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@\@Z + * @symbol ?fireEventTreatmentPackApplied\@MinecraftEventing\@\@UEAAXAEBVPackManifest\@\@\@Z */ MCVAPI void fireEventTreatmentPackApplied(class PackManifest const &); /** - * @symbol ?fireEventTreatmentPackDownloadFailed\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?fireEventTreatmentPackDownloadFailed\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCVAPI void fireEventTreatmentPackDownloadFailed(std::string, std::string, std::string, std::string); /** - * @symbol ?fireEventTreatmentPackDownloaded\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?fireEventTreatmentPackDownloaded\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCVAPI void fireEventTreatmentPackDownloaded(std::string, std::string, std::string, std::string); /** - * @symbol ?fireEventTreatmentPackRemoved\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventTreatmentPackRemoved\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventTreatmentPackRemoved(std::string); /** - * @symbol ?fireEventTreatmentsCleared\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireEventTreatmentsCleared\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireEventTreatmentsCleared(); /** - * @symbol ?fireEventTreatmentsSet\@MinecraftEventing\@\@UEAAXAEBV?$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 ?fireEventTreatmentsSet\@MinecraftEventing\@\@UEAAXAEBV?$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 */ MCVAPI void fireEventTreatmentsSet(std::vector const &); /** - * @symbol ?fireEventTrialDeviceIdCorrelation\@MinecraftEventing\@\@UEAAX_JAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@01\@Z + * @symbol ?fireEventTrialDeviceIdCorrelation\@MinecraftEventing\@\@UEAAX_JAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@01\@Z */ MCVAPI void fireEventTrialDeviceIdCorrelation(__int64, std::string const &, __int64, std::string const &); /** - * @symbol ?fireEventUgcAcquisitionStateChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KN_NH2H00\@Z + * @symbol ?fireEventUgcAcquisitionStateChanged\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KN_NH2H00\@Z */ MCVAPI void fireEventUgcAcquisitionStateChanged(std::string const &, unsigned __int64, double, bool, int, bool, int, std::string const &, std::string const &); /** - * @symbol ?fireEventUnknownBlockReceived\@MinecraftEventing\@\@UEAAXAEBUNewBlockID\@\@G\@Z + * @symbol ?fireEventUnknownBlockReceived\@MinecraftEventing\@\@UEAAXAEBUNewBlockID\@\@G\@Z */ MCVAPI void fireEventUnknownBlockReceived(struct NewBlockID const &, unsigned short); /** - * @symbol ?fireEventUserListUpdated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00_N\@Z + * @symbol ?fireEventUserListUpdated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00_N\@Z */ MCVAPI void fireEventUserListUpdated(std::string const &, std::string const &, std::string const &, bool); /** - * @symbol ?fireEventUwpToGdkMigrationComplete\@MinecraftEventing\@\@UEAAXAEBUDeviceIdContext\@Bedrock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventUwpToGdkMigrationComplete\@MinecraftEventing\@\@UEAAXAEBUDeviceIdContext\@Bedrock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireEventUwpToGdkMigrationComplete(struct Bedrock::DeviceIdContext const &, std::string const &); /** - * @symbol ?fireEventVRModeChanged\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireEventVRModeChanged\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireEventVRModeChanged(bool); /** - * @symbol ?fireEventVideoPlayed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?fireEventVideoPlayed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void fireEventVideoPlayed(std::string const &, std::string const &); /** - * @symbol ?fireEventWebviewDownload\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUWebviewDownloadInfo\@\@\@Z + * @symbol ?fireEventWebviewDownload\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUWebviewDownloadInfo\@\@\@Z */ MCVAPI void fireEventWebviewDownload(std::string const &, struct WebviewDownloadInfo const &) const; /** - * @symbol ?fireEventWorldCorruptionCausedWorldShutdown\@MinecraftEventing\@\@UEAAXAEBULevelStorageEventingContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@_N\@4\@\@Z + * @symbol ?fireEventWorldCorruptionCausedWorldShutdown\@MinecraftEventing\@\@UEAAXAEBULevelStorageEventingContext\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$optional\@_N\@4\@\@Z */ MCVAPI void fireEventWorldCorruptionCausedWorldShutdown(struct LevelStorageEventingContext const &, std::string const &, class std::optional); /** - * @symbol ?fireEventWorldExported\@MinecraftEventing\@\@UEAAX_J_K\@Z + * @symbol ?fireEventWorldExported\@MinecraftEventing\@\@UEAAX_J_K\@Z */ MCVAPI void fireEventWorldExported(__int64, unsigned __int64); /** - * @symbol ?fireEventWorldFilesListed\@MinecraftEventing\@\@UEAAX_K000\@Z + * @symbol ?fireEventWorldFilesListed\@MinecraftEventing\@\@UEAAX_K000\@Z */ MCVAPI void fireEventWorldFilesListed(unsigned __int64, unsigned __int64, unsigned __int64, unsigned __int64); /** - * @symbol ?fireEventWorldGenerated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelSettings\@\@_N\@Z + * @symbol ?fireEventWorldGenerated\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelSettings\@\@_N\@Z */ MCVAPI void fireEventWorldGenerated(std::string const &, class LevelSettings const &, bool); /** - * @symbol ?fireEventWorldHistoryPackSourceMissingDuringUpgrade\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireEventWorldHistoryPackSourceMissingDuringUpgrade\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireEventWorldHistoryPackSourceMissingDuringUpgrade(std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireEventWorldImported\@MinecraftEventing\@\@UEAAX_J_K\@Z + * @symbol ?fireEventWorldImported\@MinecraftEventing\@\@UEAAX_J_K\@Z */ MCVAPI void fireEventWorldImported(__int64, unsigned __int64); /** - * @symbol ?fireEventWorldLoaded\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z + * @symbol ?fireEventWorldLoaded\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z */ MCVAPI void fireEventWorldLoaded(class Player *, std::string const &, std::string const &, bool); /** - * @symbol ?fireEventWorldLoadedClassroomCustomization\@MinecraftEventing\@\@UEAAXW4WorldClassroomCustomization\@IMinecraftEventing\@\@V?$buffer_span\@U?$pair\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@V12\@\@std\@\@\@\@\@Z + * @symbol ?fireEventWorldLoadedClassroomCustomization\@MinecraftEventing\@\@UEAAXW4WorldClassroomCustomization\@IMinecraftEventing\@\@V?$buffer_span\@U?$pair\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V12\@\@std\@\@\@\@\@Z */ - MCVAPI void fireEventWorldLoadedClassroomCustomization(enum class IMinecraftEventing::WorldClassroomCustomization, class buffer_span, class gsl::basic_string_span>>); + MCVAPI void fireEventWorldLoadedClassroomCustomization(enum class IMinecraftEventing::WorldClassroomCustomization, class buffer_span>, class std::basic_string_view>>>); /** - * @symbol ?fireExternalUriLaunched\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireExternalUriLaunched\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireExternalUriLaunched(std::string const &) const; /** - * @symbol ?fireGlobalResourcePackCrashRecovery\@MinecraftEventing\@\@UEAAXAEAVPackInstance\@\@VUUID\@mce\@\@H\@Z + * @symbol ?fireGlobalResourcePackCrashRecovery\@MinecraftEventing\@\@UEAAXAEAVPackInstance\@\@VUUID\@mce\@\@H\@Z */ MCVAPI void fireGlobalResourcePackCrashRecovery(class PackInstance &, class mce::UUID, int); /** - * @symbol ?fireHostClientTransportSettingSync\@MinecraftEventing\@\@UEAAXW4TransportLayer\@\@0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11_K_N\@Z + * @symbol ?fireHostClientTransportSettingSync\@MinecraftEventing\@\@UEAAXW4TransportLayer\@\@0AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11_K_N\@Z */ MCVAPI void fireHostClientTransportSettingSync(enum class TransportLayer, enum class TransportLayer, std::string const &, std::string const &, std::string const &, unsigned __int64, bool); /** - * @symbol ?fireIDESelected\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireIDESelected\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireIDESelected(std::string const &) const; /** - * @symbol ?fireInAppCodeBuilderActivated\@MinecraftEventing\@\@UEBAXW4OpenCodeMethod\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireInAppCodeBuilderActivated\@MinecraftEventing\@\@UEBAXW4OpenCodeMethod\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireInAppCodeBuilderActivated(enum class OpenCodeMethod, std::string const &) const; /** - * @symbol ?fireInAppCodeBuilderDismissed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireInAppCodeBuilderDismissed\@MinecraftEventing\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireInAppCodeBuilderDismissed(std::string const &) const; /** - * @symbol ?fireInviteStatusReceived\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireInviteStatusReceived\@MinecraftEventing\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireInviteStatusReceived(std::string); /** - * @symbol ?fireInviteStatusSentImpl\@MinecraftEventing\@\@UEAAXIV?$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 ?fireInviteStatusSentImpl\@MinecraftEventing\@\@UEAAXIV?$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 */ MCVAPI void fireInviteStatusSentImpl(unsigned int, std::vector); /** - * @symbol ?fireLessonActionTaken\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4EducationLessonAction\@IMinecraftEventing\@\@H\@Z + * @symbol ?fireLessonActionTaken\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00W4EducationLessonAction\@IMinecraftEventing\@\@H\@Z */ MCVAPI void fireLessonActionTaken(std::string const &, std::string const &, std::string const &, enum class IMinecraftEventing::EducationLessonAction, int); /** - * @symbol ?fireLessonCompleteDialogOpened\@MinecraftEventing\@\@UEBAXW4LessonCompleteDialogEntryPoint\@IMinecraftEventing\@\@\@Z + * @symbol ?fireLessonCompleteDialogOpened\@MinecraftEventing\@\@UEBAXW4LessonCompleteDialogEntryPoint\@IMinecraftEventing\@\@\@Z */ MCVAPI void fireLessonCompleteDialogOpened(enum class IMinecraftEventing::LessonCompleteDialogEntryPoint) const; /** - * @symbol ?fireLessonProgressEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000H\@Z + * @symbol ?fireLessonProgressEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0000H\@Z */ MCVAPI void fireLessonProgressEvent(std::string const &, std::string const &, std::string const &, std::string const &, std::string const &, int); /** - * @symbol ?fireLibraryButtonPressed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @symbol ?fireLibraryButtonPressed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z */ MCVAPI void fireLibraryButtonPressed(std::string const &, std::string const &, std::string const &); /** - * @symbol ?fireMinecraftVersionInviteAccepted\@MinecraftEventing\@\@UEAAX_N_K\@Z + * @symbol ?fireMinecraftVersionInviteAccepted\@MinecraftEventing\@\@UEAAX_N_K\@Z */ MCVAPI void fireMinecraftVersionInviteAccepted(bool, unsigned __int64); /** - * @symbol ?fireMinecraftVersionLaunched\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?fireMinecraftVersionLaunched\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void fireMinecraftVersionLaunched(bool); /** - * @symbol ?fireNetworkChangedEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireNetworkChangedEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireNetworkChangedEvent(std::string const &); /** - * @symbol ?firePackSettingsEvent\@MinecraftEventing\@\@UEAAXAEBVPackSettings\@\@AEBVPackManifest\@\@\@Z + * @symbol ?firePackSettingsEvent\@MinecraftEventing\@\@UEAAXAEBVPackSettings\@\@AEBVPackManifest\@\@\@Z */ MCVAPI void firePackSettingsEvent(class PackSettings const &, class PackManifest const &); /** - * @symbol ?firePerfTestEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00II0AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@3\@\@Z + * @symbol ?firePerfTestEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00II0AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@3\@\@Z */ MCVAPI void firePerfTestEvent(std::string const &, std::string const &, std::string const &, unsigned int, unsigned int, std::string const &, std::vector> const &); /** - * @symbol ?firePermissionsSetEvent\@MinecraftEventing\@\@UEAAXW4PlayerPermissionLevel\@\@W4CommandPermissionLevel\@\@01\@Z + * @symbol ?firePermissionsSetEvent\@MinecraftEventing\@\@UEAAXW4PlayerPermissionLevel\@\@W4CommandPermissionLevel\@\@01\@Z */ MCVAPI void firePermissionsSetEvent(enum class PlayerPermissionLevel, enum class CommandPermissionLevel, enum class PlayerPermissionLevel, enum class CommandPermissionLevel); /** - * @symbol ?fireQueryOfferResult\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ?fireQueryOfferResult\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCVAPI void fireQueryOfferResult(std::string const &, int, bool); /** - * @symbol ?fireQuickPlayEvent\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?fireQuickPlayEvent\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void fireQuickPlayEvent(); /** - * @symbol ?fireRealmConnectionEventGenericLambdaCalled\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@W4RealmConnectionLambda\@3\@W4RealmConnectionResult\@3\@\@Z + * @symbol ?fireRealmConnectionEventGenericLambdaCalled\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@W4RealmConnectionLambda\@3\@W4RealmConnectionResult\@3\@\@Z */ MCVAPI void fireRealmConnectionEventGenericLambdaCalled(enum class IMinecraftEventing::RealmConnectionFlow, enum class IMinecraftEventing::RealmConnectionLambda, enum class IMinecraftEventing::RealmConnectionResult); /** - * @symbol ?fireRealmConnectionEventRealmAPIRequest\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@\@Z + * @symbol ?fireRealmConnectionEventRealmAPIRequest\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@\@Z */ MCVAPI void fireRealmConnectionEventRealmAPIRequest(enum class IMinecraftEventing::RealmConnectionFlow); /** - * @symbol ?fireRealmConnectionEventRealmAPIResponse\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@H\@Z + * @symbol ?fireRealmConnectionEventRealmAPIResponse\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@H\@Z */ MCVAPI void fireRealmConnectionEventRealmAPIResponse(enum class IMinecraftEventing::RealmConnectionFlow, int); /** - * @symbol ?fireRealmConnectionEventStart\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@\@Z + * @symbol ?fireRealmConnectionEventStart\@MinecraftEventing\@\@UEAAXW4RealmConnectionFlow\@IMinecraftEventing\@\@\@Z */ MCVAPI void fireRealmConnectionEventStart(enum class IMinecraftEventing::RealmConnectionFlow); /** - * @symbol ?fireScreenLoadTimeUpdateEvent\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@1\@Z + * @symbol ?fireScreenLoadTimeUpdateEvent\@MinecraftEventing\@\@UEAAXAEBIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@3\@1\@Z */ MCVAPI void fireScreenLoadTimeUpdateEvent(unsigned int const &, std::string const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>, std::string const &); /** - * @symbol ?fireServerConnectionAttemptEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N0\@Z + * @symbol ?fireServerConnectionAttemptEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N0\@Z */ MCVAPI void fireServerConnectionAttemptEvent(std::string const &, bool, std::string const &); /** - * @symbol ?fireServerConnectionEvent\@MinecraftEventing\@\@UEAAXW4ServerConnectionOutcome\@IConnectionEventing\@\@INAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireServerConnectionEvent\@MinecraftEventing\@\@UEAAXW4ServerConnectionOutcome\@IConnectionEventing\@\@INAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireServerConnectionEvent(enum class IConnectionEventing::ServerConnectionOutcome, unsigned int, double, std::string const &); /** - * @symbol ?fireServerShutdown\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireServerShutdown\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireServerShutdown(std::string const &); /** - * @symbol ?fireServerStarted\@MinecraftEventing\@\@UEAAXW4ServerType\@IMinecraftEventing\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireServerStarted\@MinecraftEventing\@\@UEAAXW4ServerType\@IMinecraftEventing\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireServerStarted(enum class IMinecraftEventing::ServerType, std::string const &); /** - * @symbol ?fireShareButtonPressed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4EduShareUriType\@\@W4EduShareMethodType\@\@_N\@Z + * @symbol ?fireShareButtonPressed\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4EduShareUriType\@\@W4EduShareMethodType\@\@_N\@Z */ MCVAPI void fireShareButtonPressed(std::string const &, enum class EduShareUriType, enum class EduShareMethodType, bool); /** - * @symbol ?fireStorageMigrationEvent\@MinecraftEventing\@\@UEAAX_NW4StorageMigrationType\@StorageMigration\@Bedrock\@\@HHV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@7\@\@Z + * @symbol ?fireStorageMigrationEvent\@MinecraftEventing\@\@UEAAX_NW4StorageMigrationType\@StorageMigration\@Bedrock\@\@HHV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@7\@\@Z */ MCVAPI void fireStorageMigrationEvent(bool, enum class Bedrock::StorageMigration::StorageMigrationType, int, int, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>, std::string const &); /** - * @symbol ?fireStructureBlockAction\@MinecraftEventing\@\@UEAAXW4StructureBlockActionType\@IMinecraftEventing\@\@AEBVStructureEditorData\@\@PEBVStructureTelemetryClientData\@\@\@Z + * @symbol ?fireStructureBlockAction\@MinecraftEventing\@\@UEAAXW4StructureBlockActionType\@IMinecraftEventing\@\@AEBVStructureEditorData\@\@PEBVStructureTelemetryClientData\@\@\@Z */ MCVAPI void fireStructureBlockAction(enum class IMinecraftEventing::StructureBlockActionType, class StructureEditorData const &, class StructureTelemetryClientData const *); /** - * @symbol ?fireStructureBlockRedstoneActivated\@MinecraftEventing\@\@UEAAXW4StructureBlockActionType\@IMinecraftEventing\@\@AEBVStructureEditorData\@\@PEBVStructureTelemetryClientData\@\@\@Z + * @symbol ?fireStructureBlockRedstoneActivated\@MinecraftEventing\@\@UEAAXW4StructureBlockActionType\@IMinecraftEventing\@\@AEBVStructureEditorData\@\@PEBVStructureTelemetryClientData\@\@\@Z */ MCVAPI void fireStructureBlockRedstoneActivated(enum class IMinecraftEventing::StructureBlockActionType, class StructureEditorData const &, class StructureTelemetryClientData const *); /** - * @symbol ?fireTextToSpeechToggled\@MinecraftEventing\@\@UEAAX_N0\@Z + * @symbol ?fireTextToSpeechToggled\@MinecraftEventing\@\@UEAAX_N0\@Z */ MCVAPI void fireTextToSpeechToggled(bool, bool); /** - * @symbol ?fireUserGeneratedUriLaunchFailed\@MinecraftEventing\@\@UEBAXW4UserGeneratedUriSource\@\@W4ValidationStatus\@ResourceUri\@Util\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireUserGeneratedUriLaunchFailed\@MinecraftEventing\@\@UEBAXW4UserGeneratedUriSource\@\@W4ValidationStatus\@ResourceUri\@Util\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireUserGeneratedUriLaunchFailed(enum class UserGeneratedUriSource, enum class Util::ResourceUri::ValidationStatus, std::string const &) const; /** - * @symbol ?fireUserGeneratedUriLaunched\@MinecraftEventing\@\@UEBAXW4UserGeneratedUriSource\@\@\@Z + * @symbol ?fireUserGeneratedUriLaunched\@MinecraftEventing\@\@UEBAXW4UserGeneratedUriSource\@\@\@Z */ MCVAPI void fireUserGeneratedUriLaunched(enum class UserGeneratedUriSource) const; /** - * @symbol ?fireWorldConversionAttemptEvent\@MinecraftEventing\@\@UEAAXAEBUWorldConversionReport\@Legacy\@\@\@Z + * @symbol ?fireWorldConversionAttemptEvent\@MinecraftEventing\@\@UEAAXAEBUWorldConversionReport\@Legacy\@\@\@Z */ MCVAPI void fireWorldConversionAttemptEvent(struct Legacy::WorldConversionReport const &); /** - * @symbol ?fireWorldConversionInitiatedEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireWorldConversionInitiatedEvent\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void fireWorldConversionInitiatedEvent(std::string const &); /** - * @symbol ?fireWorldRecoveryTelemetryEvent\@MinecraftEventing\@\@UEAAXAEBUWorldRecoveryTelemetryEvent\@Bedrock\@\@\@Z + * @symbol ?fireWorldRecoveryTelemetryEvent\@MinecraftEventing\@\@UEAAXAEBUWorldRecoveryTelemetryEvent\@Bedrock\@\@\@Z */ MCVAPI void fireWorldRecoveryTelemetryEvent(struct Bedrock::WorldRecoveryTelemetryEvent const &); /** - * @symbol ?fireWorldUpgradedToCnCPart2\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVExperiments\@\@1VLevelSeed64\@\@M\@Z + * @symbol ?fireWorldUpgradedToCnCPart2\@MinecraftEventing\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVExperiments\@\@1VLevelSeed64\@\@M\@Z */ MCVAPI void fireWorldUpgradedToCnCPart2(bool, std::string const &, class Experiments const &, std::string const &, class LevelSeed64, float); /** - * @symbol ?flagEventDeepLink\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?flagEventDeepLink\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void flagEventDeepLink(); /** - * @symbol ?flagEventPlayerGameTypeDefault\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?flagEventPlayerGameTypeDefault\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void flagEventPlayerGameTypeDefault(bool); /** - * @symbol ?forceSendEvents\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?forceSendEvents\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void forceSendEvents(); /** - * @symbol ?getAchievementsAlwaysEnabled\@MinecraftEventing\@\@EEAA_NXZ + * @symbol ?getAchievementsAlwaysEnabled\@MinecraftEventing\@\@EEAA_NXZ */ MCVAPI bool getAchievementsAlwaysEnabled(); /** - * @symbol ?getCrashTelemetryProcessor\@MinecraftEventing\@\@UEAA?AV?$not_null\@PEAVCrashTelemetryProcessor\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?getCrashTelemetryProcessor\@MinecraftEventing\@\@UEAA?AV?$not_null\@PEAVCrashTelemetryProcessor\@Bedrock\@\@\@gsl\@\@XZ */ MCVAPI class gsl::not_null getCrashTelemetryProcessor(); /** - * @symbol ?getEventManager\@MinecraftEventing\@\@EEBAAEAVEventManager\@Events\@Social\@\@XZ + * @symbol ?getEventManager\@MinecraftEventing\@\@EEBAAEAVEventManager\@Events\@Social\@\@XZ */ MCVAPI class Social::Events::EventManager & getEventManager() const; /** - * @symbol ?getPlayerSessionId\@MinecraftEventing\@\@UEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlayerSessionId\@MinecraftEventing\@\@UEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string const & getPlayerSessionId(); /** - * @symbol ?getPrimaryLocalUserId\@MinecraftEventing\@\@EEBAIXZ + * @symbol ?getPrimaryLocalUserId\@MinecraftEventing\@\@EEBAIXZ */ MCVAPI unsigned int getPrimaryLocalUserId() const; /** - * @symbol ?getSessionId\@MinecraftEventing\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSessionId\@MinecraftEventing\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getSessionId(); /** - * @symbol ?getShouldHaveAchievementsEnabled\@MinecraftEventing\@\@EEAA_NXZ + * @symbol ?getShouldHaveAchievementsEnabled\@MinecraftEventing\@\@EEAA_NXZ */ MCVAPI bool getShouldHaveAchievementsEnabled(); /** - * @symbol ?init\@MinecraftEventing\@\@UEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VIUserManager\@Social\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @symbol ?init\@MinecraftEventing\@\@UEAAXAEBV?$not_null\@V?$NonOwnerPointer\@VIUserManager\@Social\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ MCVAPI void init(class gsl::not_null> const &, class Bedrock::NonOwnerPointer const &); /** - * @symbol ?initDeviceAndSessionIds\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?initDeviceAndSessionIds\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void initDeviceAndSessionIds(); /** - * @symbol ?prepEventSearchCatalogRequest\@MinecraftEventing\@\@UEAAXAEBVSearchRequestTelemetry\@\@\@Z + * @symbol ?prepEventSearchCatalogRequest\@MinecraftEventing\@\@UEAAXAEBVSearchRequestTelemetry\@\@\@Z */ MCVAPI void prepEventSearchCatalogRequest(class SearchRequestTelemetry const &); /** - * @symbol ?propertiesAsJsonValue\@MinecraftEventing\@\@UEBA?AVValue\@Json\@\@XZ + * @symbol ?propertiesAsJsonValue\@MinecraftEventing\@\@UEBA?AVValue\@Json\@\@XZ */ MCVAPI class Json::Value propertiesAsJsonValue() const; /** - * @symbol ?registerOptionsObserver\@MinecraftEventing\@\@UEAAXV?$shared_ptr\@VOptions\@\@\@std\@\@\@Z + * @symbol ?registerOptionsObserver\@MinecraftEventing\@\@UEAAXV?$shared_ptr\@VOptions\@\@\@std\@\@\@Z */ MCVAPI void registerOptionsObserver(class std::shared_ptr); /** - * @symbol ?removeTestBuildIdTag\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?removeTestBuildIdTag\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void removeTestBuildIdTag(); /** - * @symbol ?removeTestTelemetryTag\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?removeTestTelemetryTag\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void removeTestTelemetryTag(); /** - * @symbol ?requestEventDeferment\@MinecraftEventing\@\@UEAA?AV?$shared_ptr\@PEAX\@std\@\@XZ + * @symbol ?requestEventDeferment\@MinecraftEventing\@\@UEAA?AV?$shared_ptr\@PEAX\@std\@\@XZ */ MCVAPI class std::shared_ptr requestEventDeferment(); /** - * @symbol ?sendBatchedCrashTelemetry\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?sendBatchedCrashTelemetry\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void sendBatchedCrashTelemetry(); /** - * @symbol ?sendCrashStatusTelemetry\@MinecraftEventing\@\@UEAAXAEBUCrashUploadStatus\@Bedrock\@\@\@Z + * @symbol ?sendCrashStatusTelemetry\@MinecraftEventing\@\@UEAAXAEBUCrashUploadStatus\@Bedrock\@\@\@Z */ MCVAPI void sendCrashStatusTelemetry(struct Bedrock::CrashUploadStatus const &); /** - * @symbol ?sendCrashTelemetryNow\@MinecraftEventing\@\@UEAAXV?$shared_ptr\@VSessionInfo\@Bedrock\@\@\@std\@\@\@Z + * @symbol ?sendCrashTelemetryNow\@MinecraftEventing\@\@UEAAXV?$shared_ptr\@VSessionInfo\@Bedrock\@\@\@std\@\@\@Z */ MCVAPI void sendCrashTelemetryNow(class std::shared_ptr); /** - * @symbol ?setShouldHaveAchievementsEnabled\@MinecraftEventing\@\@EEAAX_N\@Z + * @symbol ?setShouldHaveAchievementsEnabled\@MinecraftEventing\@\@EEAAX_N\@Z */ MCVAPI void setShouldHaveAchievementsEnabled(bool); /** - * @symbol ?setTestBuildIdTag\@MinecraftEventing\@\@UEAAXPEBD\@Z + * @symbol ?setTestBuildIdTag\@MinecraftEventing\@\@UEAAXPEBD\@Z */ MCVAPI void setTestBuildIdTag(char const *); /** - * @symbol ?setTestTelemetryTag\@MinecraftEventing\@\@UEAAXPEBD\@Z + * @symbol ?setTestTelemetryTag\@MinecraftEventing\@\@UEAAXPEBD\@Z */ MCVAPI void setTestTelemetryTag(char const *); /** - * @symbol ?shutdown\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?shutdown\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void shutdown(); /** - * @symbol ?stopDebugEventLoggingForAllListeners\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?stopDebugEventLoggingForAllListeners\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void stopDebugEventLoggingForAllListeners(); /** - * @symbol ?tick\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?tick\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void tick(); /** - * @symbol ?tryFireEventProgressLoadTimes\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@3\@\@Z + * @symbol ?tryFireEventProgressLoadTimes\@MinecraftEventing\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@std\@\@\@2\@\@3\@\@Z */ MCVAPI void tryFireEventProgressLoadTimes(std::string const &, std::vector>); /** - * @symbol ?updateEditionType\@MinecraftEventing\@\@UEAAXXZ + * @symbol ?updateEditionType\@MinecraftEventing\@\@UEAAXXZ */ MCVAPI void updateEditionType(); /** - * @symbol ?updateIsLegacyPlayer\@MinecraftEventing\@\@UEAAX_N\@Z + * @symbol ?updateIsLegacyPlayer\@MinecraftEventing\@\@UEAAX_N\@Z */ MCVAPI void updateIsLegacyPlayer(bool); /** - * @symbol ?updateIsTrial\@MinecraftEventing\@\@UEBAX_N\@Z + * @symbol ?updateIsTrial\@MinecraftEventing\@\@UEBAX_N\@Z */ MCVAPI void updateIsTrial(bool) const; /** - * @symbol ?updatePlayerUndergroundStatus\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z + * @symbol ?updatePlayerUndergroundStatus\@MinecraftEventing\@\@UEAAXPEAVPlayer\@\@_N\@Z */ MCVAPI void updatePlayerUndergroundStatus(class Player *, bool); /** - * @symbol ?updatePrimaryLocalUserId\@MinecraftEventing\@\@UEAAXAEBI\@Z + * @symbol ?updatePrimaryLocalUserId\@MinecraftEventing\@\@UEAAXAEBI\@Z */ MCVAPI void updatePrimaryLocalUserId(unsigned int const &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~MinecraftEventing(); #endif /** - * @symbol ??0MinecraftEventing\@\@QEAA\@AEBVPath\@Core\@\@\@Z + * @symbol ??0MinecraftEventing\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ MCAPI MinecraftEventing(class Core::Path const &); /** - * @symbol ?init\@MinecraftEventing\@\@QEAAXAEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @symbol ?init\@MinecraftEventing\@\@QEAAXAEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ MCAPI void init(class Bedrock::NonOwnerPointer const &); /** - * @symbol ?initForDedicatedServer\@MinecraftEventing\@\@QEAAXAEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@_N1\@Z + * @symbol ?initForDedicatedServer\@MinecraftEventing\@\@QEAAXAEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@_N1\@Z */ MCAPI void initForDedicatedServer(class Bedrock::NonOwnerPointer const &, bool, bool); /** - * @symbol ?fireEventAwardAchievement\@MinecraftEventing\@\@SAXPEAVPlayer\@\@W4AchievementIds\@1\@\@Z + * @symbol ?fireEventAwardAchievement\@MinecraftEventing\@\@SAXPEAVPlayer\@\@W4AchievementIds\@1\@\@Z */ MCAPI static void fireEventAwardAchievement(class Player *, enum class MinecraftEventing::AchievementIds); /** - * @symbol ?fireEventBehaviorErrored\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventBehaviorErrored\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void fireEventBehaviorErrored(class Player *, std::string const &); /** - * @symbol ?fireEventBehaviorFailed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventBehaviorFailed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void fireEventBehaviorFailed(class Player *, std::string const &); /** - * @symbol ?fireEventBellBlockUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventBellBlockUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void fireEventBellBlockUsed(class Player *, std::string const &); /** - * @symbol ?fireEventBlockBroken\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVBlock\@\@W4BlockPlacementMethod\@1\@H\@Z + * @symbol ?fireEventBlockBroken\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVBlock\@\@W4BlockPlacementMethod\@1\@H\@Z */ MCAPI static void fireEventBlockBroken(class Player *, class Block const &, enum class MinecraftEventing::BlockPlacementMethod, int); /** - * @symbol ?fireEventBlockFound\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?fireEventBlockFound\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void fireEventBlockFound(class Player *, class BlockPos const &); /** - * @symbol ?fireEventCampfireBlockUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIBlockInteractionType\@1\@\@Z + * @symbol ?fireEventCampfireBlockUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIBlockInteractionType\@1\@\@Z */ MCAPI static void fireEventCampfireBlockUsed(class Player *, std::string const &, enum class MinecraftEventing::POIBlockInteractionType); /** - * @symbol ?fireEventCaravanChanged\@MinecraftEventing\@\@SAXAEAVMob\@\@H\@Z + * @symbol ?fireEventCaravanChanged\@MinecraftEventing\@\@SAXAEAVMob\@\@H\@Z */ MCAPI static void fireEventCaravanChanged(class Mob &, int); /** - * @symbol ?fireEventItemUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVItemDescriptor\@\@W4ItemUseMethod\@\@\@Z + * @symbol ?fireEventItemUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVItemDescriptor\@\@W4ItemUseMethod\@\@\@Z */ MCAPI static void fireEventItemUsed(class Player *, class ItemDescriptor const &, enum class ItemUseMethod); /** - * @symbol ?fireEventJukeboxUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVItemDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fireEventJukeboxUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBVItemDescriptor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void fireEventJukeboxUsed(class Player *, class ItemDescriptor const &, std::string const &); /** - * @symbol ?fireEventLecternBlockUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIBlockInteractionType\@1\@\@Z + * @symbol ?fireEventLecternBlockUsed\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIBlockInteractionType\@1\@\@Z */ MCAPI static void fireEventLecternBlockUsed(class Player *, std::string const &, enum class MinecraftEventing::POIBlockInteractionType); /** - * @symbol ?fireEventMobEffectChanged\@MinecraftEventing\@\@SAXAEAVMob\@\@AEBVMobEffectInstance\@\@W4ChangeType\@1\@\@Z + * @symbol ?fireEventMobEffectChanged\@MinecraftEventing\@\@SAXAEAVMob\@\@AEBVMobEffectInstance\@\@W4ChangeType\@1\@\@Z */ MCAPI static void fireEventMobEffectChanged(class Mob &, class MobEffectInstance const &, enum class MinecraftEventing::ChangeType); /** - * @symbol ?fireEventPlayerTeleported\@MinecraftEventing\@\@SAXPEAVPlayer\@\@MW4TeleportationCause\@1\@H\@Z + * @symbol ?fireEventPlayerTeleported\@MinecraftEventing\@\@SAXPEAVPlayer\@\@MW4TeleportationCause\@1\@H\@Z */ MCAPI static void fireEventPlayerTeleported(class Player *, float, enum class MinecraftEventing::TeleportationCause, int); /** - * @symbol ?fireEventPlayerTransform\@MinecraftEventing\@\@SAXAEAVPlayer\@\@\@Z + * @symbol ?fireEventPlayerTransform\@MinecraftEventing\@\@SAXAEAVPlayer\@\@\@Z */ MCAPI static void fireEventPlayerTransform(class Player &); /** - * @symbol ?fireEventSlashCommandExecuted\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z + * @symbol ?fireEventSlashCommandExecuted\@MinecraftEventing\@\@SAXPEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HH1\@Z */ MCAPI static void fireEventSlashCommandExecuted(class Player *, std::string const &, int, int, std::string const &); //private: /** - * @symbol ?_fireStructureBlockAction\@MinecraftEventing\@\@AEAAXW4StructureBlockActionType\@IMinecraftEventing\@\@AEBVStructureEditorData\@\@_NPEBVStructureTelemetryClientData\@\@\@Z + * @symbol ?_fireStructureBlockAction\@MinecraftEventing\@\@AEAAXW4StructureBlockActionType\@IMinecraftEventing\@\@AEBVStructureEditorData\@\@_NPEBVStructureTelemetryClientData\@\@\@Z */ MCAPI void _fireStructureBlockAction(enum class IMinecraftEventing::StructureBlockActionType, class StructureEditorData const &, bool, class StructureTelemetryClientData const *); /** - * @symbol ?_generateWorldSessionId\@MinecraftEventing\@\@AEAAXXZ + * @symbol ?_generateWorldSessionId\@MinecraftEventing\@\@AEAAXXZ */ MCAPI void _generateWorldSessionId(); /** - * @symbol ?fireEventPlayerMessage\@MinecraftEventing\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @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 &); private: /** - * @symbol ?mAchievementEventing\@MinecraftEventing\@\@0V?$unique_ptr\@VAchievementEventing\@Events\@Social\@\@U?$default_delete\@VAchievementEventing\@Events\@Social\@\@\@std\@\@\@std\@\@A + * @symbol ?mAchievementEventing\@MinecraftEventing\@\@0V?$unique_ptr\@VAchievementEventing\@Events\@Social\@\@U?$default_delete\@VAchievementEventing\@Events\@Social\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mAchievementEventing; /** - * @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 + * @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 ?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 + * @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 */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const mUseMethodMap; /** - * @symbol ?sMutex\@MinecraftEventing\@\@0Vmutex\@std\@\@A + * @symbol ?sMutex\@MinecraftEventing\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex sMutex; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftExplorer.hpp b/LiteLoader/include/llapi/mc/MinecraftExplorer.hpp index ffa37e33fc..911680d113 100644 --- a/LiteLoader/include/llapi/mc/MinecraftExplorer.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftExplorer.hpp @@ -17,7 +17,7 @@ namespace MinecraftExplorer { #undef AFTER_EXTRA /** - * @symbol ?registerGeneratedBlocks\@MinecraftExplorer\@\@YAXXZ + * @symbol ?registerGeneratedBlocks\@MinecraftExplorer\@\@YAXXZ */ MCAPI void registerGeneratedBlocks(); diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp index 9a99bc83d0..e0f28367ea 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTest.hpp @@ -31,171 +31,166 @@ class MinecraftGameTest : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftGameTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @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 ?onLevelDestruction\@MinecraftGameTest\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 23 + * @symbol ?onLevelDestruction\@MinecraftGameTest\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void onLevelDestruction(std::string const &); /** - * @symbol ??0MinecraftGameTest\@\@QEAA\@AEAVLevel\@\@\@Z + * @symbol ??0MinecraftGameTest\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI MinecraftGameTest(class Level &); /** - * @symbol ?clearAllTests\@MinecraftGameTest\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?clearAllTests\@MinecraftGameTest\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void clearAllTests(class BlockSource &); /** - * @symbol ?getRegistry\@MinecraftGameTest\@\@QEAAAEAVGameTestRegistry\@gametest\@\@XZ + * @symbol ?getRegistry\@MinecraftGameTest\@\@QEAAAEAVGameTestRegistry\@gametest\@\@XZ */ MCAPI class gametest::GameTestRegistry & getRegistry(); /** - * @symbol ?getTicker\@MinecraftGameTest\@\@QEAAAEAVGameTestTicker\@gametest\@\@XZ + * @symbol ?getTicker\@MinecraftGameTest\@\@QEAAAEAVGameTestTicker\@gametest\@\@XZ */ MCAPI class gametest::GameTestTicker & getTicker(); /** - * @symbol ?loadExistingTests\@MinecraftGameTest\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?loadExistingTests\@MinecraftGameTest\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void loadExistingTests(class Level &); /** - * @symbol ?registerDefaultGameBatches\@MinecraftGameTest\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?registerDefaultGameBatches\@MinecraftGameTest\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void registerDefaultGameBatches(class Level &); /** - * @symbol ?registerNativeGameTests\@MinecraftGameTest\@\@QEAAXXZ + * @symbol ?registerNativeGameTests\@MinecraftGameTest\@\@QEAAXXZ */ MCAPI void registerNativeGameTests(); /** - * @symbol ?runTest\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEAVDimension\@\@AEBUTestParameters\@gametest\@\@\@Z + * @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 &); + 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\@\@V?$vector\@V?$shared_ptr\@VIGameTestListener\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VIGameTestListener\@gametest\@\@\@std\@\@\@2\@\@3\@\@Z + * @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 &, std::vector>); + MCAPI std::string runTest(std::string const &, class Dimension &, struct gametest::TestParameters const &); /** - * @symbol ?runTestAt\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@V?$optional\@W4Rotation\@\@\@3\@\@Z + * @symbol ?runTestAt\@MinecraftGameTest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@V?$optional\@W4Rotation\@\@\@3\@\@Z */ MCAPI std::string runTestAt(class BlockSource &, class BlockPos const &, class std::optional); /** - * @symbol ?runTests\@MinecraftGameTest\@\@QEAAAEBV?$vector\@V?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@\@2\@\@std\@\@AEAVDimension\@\@$$QEAUTestParameters\@gametest\@\@\@Z + * @symbol ?runTests\@MinecraftGameTest\@\@QEAAAEBV?$vector\@V?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@\@2\@\@std\@\@AEAVDimension\@\@$$QEAUTestParameters\@gametest\@\@\@Z */ MCAPI std::vector> const & runTests(class Dimension &, struct gametest::TestParameters &&); //private: /** - * @symbol ?_runTestPreparation\@MinecraftGameTest\@\@AEAAXAEBVBaseGameTestFunction\@gametest\@\@\@Z + * @symbol ?_runTestPreparation\@MinecraftGameTest\@\@AEAAXAEBVBaseGameTestFunction\@gametest\@\@\@Z */ MCAPI void _runTestPreparation(class gametest::BaseGameTestFunction const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp index 03581b63c4..3c8e41fba4 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestBatchRunner.hpp @@ -30,23 +30,23 @@ class MinecraftGameTestBatchRunner { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftGameTestBatchRunner(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_createGameTestInstance\@MinecraftGameTestBatchRunner\@\@MEAA?AV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVBaseGameTestFunction\@gametest\@\@\@Z + * @vftbl 1 + * @symbol ?_createGameTestInstance\@MinecraftGameTestBatchRunner\@\@MEAA?AV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVBaseGameTestFunction\@gametest\@\@\@Z */ virtual class std::shared_ptr _createGameTestInstance(class gametest::BaseGameTestFunction &); /** - * @vftbl 2 - * @symbol ?_runTest\@MinecraftGameTestBatchRunner\@\@MEAAXV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@\@Z + * @vftbl 2 + * @symbol ?_runTest\@MinecraftGameTestBatchRunner\@\@MEAAXV?$shared_ptr\@VBaseGameTestInstance\@gametest\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@\@Z */ virtual void _runTest(class std::shared_ptr, class gametest::GameTestTicker &); /** - * @symbol ??0MinecraftGameTestBatchRunner\@\@QEAA\@$$QEAV?$vector\@VGameTestBatch\@gametest\@\@V?$allocator\@VGameTestBatch\@gametest\@\@\@std\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@$$QEAUTestParameters\@4\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@2\@AEAVDimension\@\@\@Z + * @symbol ??0MinecraftGameTestBatchRunner\@\@QEAA\@$$QEAV?$vector\@VGameTestBatch\@gametest\@\@V?$allocator\@VGameTestBatch\@gametest\@\@\@std\@\@\@std\@\@AEAVGameTestTicker\@gametest\@\@$$QEAUTestParameters\@4\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@2\@AEAVDimension\@\@\@Z */ MCAPI MinecraftGameTestBatchRunner(std::vector &&, class gametest::GameTestTicker &, struct gametest::TestParameters &&, std::unique_ptr, class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp index 11352bca3c..c4a500e613 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestHelper.hpp @@ -32,350 +32,359 @@ class MinecraftGameTestHelper { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftGameTestHelper(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?succeedWhenEntityPresent\@MinecraftGameTestHelper\@\@UEAAXAEBUActorDefinitionIdentifier\@\@HHH_N\@Z + * @vftbl 1 + * @symbol ?succeedWhenEntityPresent\@MinecraftGameTestHelper\@\@UEAAXAEBUActorDefinitionIdentifier\@\@HHH_N\@Z */ virtual void succeedWhenEntityPresent(struct ActorDefinitionIdentifier const &, int, int, int, bool); /** - * @vftbl 2 - * @symbol ?succeedWhenEntityPresent\@MinecraftGameTestHelper\@\@UEAAXAEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 2 + * @symbol ?succeedWhenEntityPresent\@MinecraftGameTestHelper\@\@UEAAXAEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@_N\@Z */ virtual void succeedWhenEntityPresent(struct ActorDefinitionIdentifier const &, class BlockPos const &, bool); /** - * @vftbl 3 - * @symbol ?succeedWhenEntityData\@MinecraftGameTestHelper\@\@UEAAXAEBVBlockPos\@\@AEBUActorDefinitionIdentifier\@\@V?$function\@$$A6A_NAEAVActor\@\@\@Z\@std\@\@\@Z + * @vftbl 3 + * @symbol ?succeedWhenEntityData\@MinecraftGameTestHelper\@\@UEAAXAEBVBlockPos\@\@AEBUActorDefinitionIdentifier\@\@V?$function\@$$A6A_NAEAVActor\@\@\@Z\@std\@\@\@Z */ virtual void succeedWhenEntityData(class BlockPos const &, struct ActorDefinitionIdentifier const &, class std::function); /** - * @vftbl 4 - * @symbol ?succeedWhenEntityHasComponent\@MinecraftGameTestHelper\@\@UEAAXAEBUActorDefinitionIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 4 + * @symbol ?succeedWhenEntityHasComponent\@MinecraftGameTestHelper\@\@UEAAXAEBUActorDefinitionIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@_N\@Z */ virtual void succeedWhenEntityHasComponent(struct ActorDefinitionIdentifier const &, std::string const &, class BlockPos const &, bool); /** - * @vftbl 5 - * @symbol ?succeedWhenBlockPresent\@MinecraftGameTestHelper\@\@UEAAXAEBVBlock\@\@HHH_N\@Z + * @vftbl 5 + * @symbol ?succeedWhenBlockPresent\@MinecraftGameTestHelper\@\@UEAAXAEBVBlock\@\@HHH_N\@Z */ virtual void succeedWhenBlockPresent(class Block const &, int, int, int, bool); /** - * @vftbl 6 - * @symbol ?succeedWhenBlockPresent\@MinecraftGameTestHelper\@\@UEAAXAEBVBlock\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 6 + * @symbol ?succeedWhenBlockPresent\@MinecraftGameTestHelper\@\@UEAAXAEBVBlock\@\@AEBVBlockPos\@\@_N\@Z */ virtual void succeedWhenBlockPresent(class Block const &, class BlockPos const &, bool); /** - * @vftbl 7 - * @symbol ?succeedWhenBlockPresent\@MinecraftGameTestHelper\@\@UEAAXAEBVBlockLegacy\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 7 + * @symbol ?succeedWhenBlockPresent\@MinecraftGameTestHelper\@\@UEAAXAEBVBlockLegacy\@\@AEBVBlockPos\@\@_N\@Z */ virtual void succeedWhenBlockPresent(class BlockLegacy const &, class BlockPos const &, bool); /** - * @vftbl 8 - * @symbol ?setNight\@MinecraftGameTestHelper\@\@UEAAXXZ + * @vftbl 8 + * @symbol ?setNight\@MinecraftGameTestHelper\@\@UEAAXXZ */ virtual void setNight(); /** - * @vftbl 9 - * @symbol ?setDayTime\@MinecraftGameTestHelper\@\@UEAAXH\@Z + * @vftbl 9 + * @symbol ?setDayTime\@MinecraftGameTestHelper\@\@UEAAXH\@Z */ virtual void setDayTime(int); /** - * @vftbl 10 - * @symbol ?setBlock\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@HHHAEBVBlock\@\@H\@Z + * @vftbl 10 + * @symbol ?setBlock\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@HHHAEBVBlock\@\@H\@Z */ virtual class std::optional setBlock(int, int, int, class Block const &, int); /** - * @vftbl 11 - * @symbol ?setBlock\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @vftbl 11 + * @symbol ?setBlock\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ virtual class std::optional setBlock(class BlockPos const &, class Block const &, int); /** - * @vftbl 12 - * @symbol ?destroyBlock\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 12 + * @symbol ?destroyBlock\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional destroyBlock(class BlockPos const &, bool); /** - * @vftbl 13 - * @symbol ?pressButton\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@HHH\@Z + * @vftbl 13 + * @symbol ?pressButton\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@HHH\@Z */ virtual class std::optional pressButton(int, int, int); /** - * @vftbl 14 - * @symbol ?pressButton\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?pressButton\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual class std::optional pressButton(class BlockPos const &); /** - * @vftbl 15 - * @symbol ?pullLever\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@HHH\@Z + * @vftbl 15 + * @symbol ?pullLever\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@HHH\@Z */ virtual class std::optional pullLever(int, int, int); /** - * @vftbl 16 - * @symbol ?pullLever\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?pullLever\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual class std::optional pullLever(class BlockPos const &); /** - * @vftbl 17 - * @symbol ?killAllEntities\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@XZ + * @vftbl 17 + * @symbol ?killAllEntities\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@XZ */ virtual class std::optional killAllEntities(); /** - * @vftbl 18 - * @symbol ?spawn\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@HHH\@Z + * @vftbl 18 + * @symbol ?spawn\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@HHH\@Z */ virtual class std::variant spawn(struct ActorDefinitionIdentifier const &, int, int, int); /** - * @vftbl 19 - * @symbol ?spawn\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@\@Z + * @vftbl 19 + * @symbol ?spawn\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@\@Z */ virtual class std::variant spawn(struct ActorDefinitionIdentifier const &, class BlockPos const &); /** - * @vftbl 20 - * @symbol ?spawn\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@\@Z + * @vftbl 20 + * @symbol ?spawn\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@\@Z */ virtual class std::variant spawn(struct ActorDefinitionIdentifier const &, class Vec3 const &); /** - * @vftbl 21 - * @symbol ?spawnItem\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBVItemStack\@\@AEBVVec3\@\@\@Z + * @vftbl 21 + * @symbol ?spawnItem\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBVItemStack\@\@AEBVVec3\@\@\@Z */ virtual class std::variant spawnItem(class ItemStack const &, class Vec3 const &); /** - * @vftbl 22 - * @symbol ?spawnWithoutBehaviors\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@\@Z + * @vftbl 22 + * @symbol ?spawnWithoutBehaviors\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@\@Z */ virtual class std::variant spawnWithoutBehaviors(struct ActorDefinitionIdentifier const &, class BlockPos const &); /** - * @vftbl 23 - * @symbol ?spawnWithoutBehaviors\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@\@Z + * @vftbl 23 + * @symbol ?spawnWithoutBehaviors\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVActor\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@\@Z */ virtual class std::variant spawnWithoutBehaviors(struct ActorDefinitionIdentifier const &, class Vec3 const &); /** - * @vftbl 24 - * @symbol ?walkTo\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@AEBVBlockPos\@\@M\@Z + * @vftbl 24 + * @symbol ?walkTo\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@AEBVBlockPos\@\@M\@Z */ virtual class std::optional walkTo(class Mob &, class BlockPos const &, float); /** - * @vftbl 25 - * @symbol ?walkTo\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z + * @vftbl 25 + * @symbol ?walkTo\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z */ virtual class std::optional walkTo(class Mob &, class Vec3 const &, float); /** - * @vftbl 26 - * @symbol ?setTntFuse\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVActor\@\@H\@Z + * @vftbl 26 + * @symbol ?setTntFuse\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVActor\@\@H\@Z */ virtual class std::optional setTntFuse(class Actor &, int); /** - * @vftbl 27 - * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@_N\@Z + * @vftbl 27 + * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@_N\@Z */ virtual class std::optional assertEntityPresent(struct ActorDefinitionIdentifier const &, bool); /** - * @vftbl 28 - * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@HHH_N\@Z + * @vftbl 28 + * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@HHH_N\@Z */ virtual class std::optional assertEntityPresent(struct ActorDefinitionIdentifier const &, int, int, int, bool); /** - * @vftbl 29 - * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 29 + * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertEntityPresent(struct ActorDefinitionIdentifier const &, class BlockPos const &, bool); /** - * @vftbl 30 - * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@M_N\@Z + * @vftbl 30 + * @symbol ?assertEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVBlockPos\@\@M_N\@Z */ virtual class std::optional assertEntityPresent(struct ActorDefinitionIdentifier const &, class BlockPos const &, float, bool); /** - * @vftbl 31 - * @symbol ?assertEntityInstancePresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@PEBVActor\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 31 + * @symbol ?assertEntityInstancePresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@PEBVActor\@\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertEntityInstancePresent(class Actor const *, class BlockPos const &, bool); /** - * @vftbl 32 - * @symbol ?assertEntityTouching\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@_N\@Z + * @vftbl 32 + * @symbol ?assertEntityInstancePresent\@MinecraftGameTestHelper\@\@UEBA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@PEBVActor\@\@_N\@Z + */ + virtual class std::optional assertEntityInstancePresent(class Actor const *, bool) const; + /** + * @vftbl 33 + * @symbol ?assertEntityTouching\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVVec3\@\@_N\@Z */ virtual class std::optional assertEntityTouching(struct ActorDefinitionIdentifier const &, class Vec3 const &, bool); /** - * @vftbl 33 - * @symbol ?assertEntityState\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@AEBUActorDefinitionIdentifier\@\@V?$function\@$$A6A_NAEAVActor\@\@\@Z\@3\@\@Z + * @vftbl 34 + * @symbol ?assertEntityState\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@AEBUActorDefinitionIdentifier\@\@V?$function\@$$A6A_NAEAVActor\@\@\@Z\@3\@\@Z */ virtual class std::optional assertEntityState(class BlockPos const &, struct ActorDefinitionIdentifier const &, class std::function); /** - * @vftbl 34 - * @symbol ?assertBlockPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockLegacy\@\@HHH_N\@Z + * @vftbl 35 + * @symbol ?assertBlockPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockLegacy\@\@HHH_N\@Z */ virtual class std::optional assertBlockPresent(class BlockLegacy const &, int, int, int, bool); /** - * @vftbl 35 - * @symbol ?assertBlockPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockLegacy\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 36 + * @symbol ?assertBlockPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockLegacy\@\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertBlockPresent(class BlockLegacy const &, class BlockPos const &, bool); /** - * @vftbl 36 - * @symbol ?assertBlockState\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@3\@\@Z + * @vftbl 37 + * @symbol ?assertBlockState\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@3\@\@Z */ virtual class std::optional assertBlockState(class BlockPos const &, class std::function); /** - * @vftbl 37 - * @symbol ?assertItemEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItem\@\@HHHM_N\@Z + * @vftbl 38 + * @symbol ?assertItemEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItem\@\@HHHM_N\@Z */ virtual class std::optional assertItemEntityPresent(class Item const &, int, int, int, float, bool); /** - * @vftbl 38 - * @symbol ?assertItemEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItem\@\@AEBVBlockPos\@\@M_N\@Z + * @vftbl 39 + * @symbol ?assertItemEntityPresent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItem\@\@AEBVBlockPos\@\@M_N\@Z */ virtual class std::optional assertItemEntityPresent(class Item const &, class BlockPos const &, float, bool); /** - * @vftbl 39 - * @symbol ?assertItemEntityCountIs\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItem\@\@AEBVBlockPos\@\@MH\@Z + * @vftbl 40 + * @symbol ?assertItemEntityCountIs\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItem\@\@AEBVBlockPos\@\@MH\@Z */ virtual class std::optional assertItemEntityCountIs(class Item const &, class BlockPos const &, float, int); /** - * @vftbl 40 - * @symbol ?assertContainerEmpty\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 41 + * @symbol ?assertContainerEmpty\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual class std::optional assertContainerEmpty(class BlockPos const &); /** - * @vftbl 41 - * @symbol ?assertContainerContains\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItemStack\@\@AEBVBlockPos\@\@\@Z + * @vftbl 42 + * @symbol ?assertContainerContains\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVItemStack\@\@AEBVBlockPos\@\@\@Z */ virtual class std::optional assertContainerContains(class ItemStack const &, class BlockPos const &); /** - * @vftbl 42 - * @symbol ?assertEntityHasComponent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVBlockPos\@\@_N\@Z + * @vftbl 43 + * @symbol ?assertEntityHasComponent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertEntityHasComponent(struct ActorDefinitionIdentifier const &, std::string const &, class BlockPos const &, bool); /** - * @vftbl 43 - * @symbol ?assertEntityHasArmor\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@W4ArmorSlot\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@HAEBVBlockPos\@\@_N\@Z + * @vftbl 44 + * @symbol ?assertEntityHasArmor\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@W4ArmorSlot\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@HAEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertEntityHasArmor(struct ActorDefinitionIdentifier const &, enum class ArmorSlot, std::string const &, int, class BlockPos const &, bool); /** - * @vftbl 44 - * @symbol ?print\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 45 + * @symbol ?print\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual class std::optional print(std::string const &); /** - * @vftbl 45 - * @symbol ?assertRedstonePower\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 46 + * @symbol ?assertRedstonePower\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@H\@Z */ virtual class std::optional assertRedstonePower(class BlockPos const &, int); /** - * @vftbl 46 - * @symbol ?assertIsWaterlogged\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 47 + * @symbol ?assertIsWaterlogged\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertIsWaterlogged(class BlockPos const &, bool); /** - * @vftbl 47 - * @symbol ?pulseRedstone\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 48 + * @symbol ?pulseRedstone\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@H\@Z */ virtual class std::optional pulseRedstone(class BlockPos const &, int); /** - * @vftbl 48 - * @symbol ?getFenceConnectivity\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@VScriptGameTestConnectivity\@ScriptModuleGameTest\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 49 + * @symbol ?getFenceConnectivity\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@VScriptGameTestConnectivity\@ScriptModuleGameTest\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual class std::variant getFenceConnectivity(class BlockPos const &); /** - * @vftbl 49 - * @symbol ?worldPosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 50 + * @symbol ?worldPosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual class std::variant worldPosition(class BlockPos const &) const; /** - * @vftbl 50 - * @symbol ?worldPosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBUScriptVec3Interface\@ScriptModuleMinecraft\@\@\@Z + * @vftbl 51 + * @symbol ?worldPosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBVVec3\@\@\@Z */ - virtual class std::variant worldPosition(struct ScriptModuleMinecraft::ScriptVec3Interface const &) const; + virtual class std::variant worldPosition(class Vec3 const &) const; /** - * @vftbl 51 - * @symbol ?relativePosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 52 + * @symbol ?relativePosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual class std::variant relativePosition(class BlockPos const &) const; /** - * @vftbl 52 - * @symbol ?relativePosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBUScriptVec3Interface\@ScriptModuleMinecraft\@\@\@Z + * @vftbl 53 + * @symbol ?relativePosition\@MinecraftGameTestHelper\@\@UEBA?AV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBVVec3\@\@\@Z */ - virtual class std::variant relativePosition(struct ScriptModuleMinecraft::ScriptVec3Interface const &) const; + virtual class std::variant relativePosition(class Vec3 const &) const; /** - * @vftbl 53 - * @symbol ?setFluidContainer\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 54 + * @symbol ?setFluidContainer\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@H\@Z */ virtual class std::optional setFluidContainer(class BlockPos const &, int); /** - * @vftbl 54 - * @symbol ?triggerInternalBlockEvent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV?$vector\@MV?$allocator\@M\@std\@\@\@3\@\@Z + * @vftbl 55 + * @symbol ?triggerInternalBlockEvent\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV?$vector\@MV?$allocator\@M\@std\@\@\@3\@\@Z */ virtual class std::optional triggerInternalBlockEvent(class BlockPos const &, std::string const &, std::vector const &); /** - * @vftbl 55 - * @symbol ?assertCanReachLocation\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@AEBVBlockPos\@\@_N\@Z + * @vftbl 56 + * @symbol ?assertCanReachLocation\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@AEBVBlockPos\@\@_N\@Z */ virtual class std::optional assertCanReachLocation(class Mob &, class BlockPos const &, bool); /** - * @vftbl 56 - * @symbol ?spreadFromFaceTowardDirection\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@1\@Z + * @vftbl 57 + * @symbol ?spreadFromFaceTowardDirection\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@1\@Z */ virtual class std::optional spreadFromFaceTowardDirection(class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing, enum class ScriptModuleMinecraft::ScriptFacing); /** - * @vftbl 57 - * @symbol ?spawnSimulatedPlayer\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVSimulatedPlayer\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVBlockPos\@\@W4GameType\@\@\@Z + * @vftbl 58 + * @symbol ?spawnSimulatedPlayer\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVSimulatedPlayer\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVBlockPos\@\@W4GameType\@\@\@Z */ virtual class std::variant spawnSimulatedPlayer(std::string const &, class BlockPos const &, enum class GameType); /** - * @vftbl 58 - * @symbol ?removeSimulatedPlayer\@MinecraftGameTestHelper\@\@UEAAXAEAVSimulatedPlayer\@\@\@Z + * @vftbl 59 + * @symbol ?removeSimulatedPlayer\@MinecraftGameTestHelper\@\@UEAAXAEAVSimulatedPlayer\@\@\@Z */ virtual void removeSimulatedPlayer(class SimulatedPlayer &); /** - * @vftbl 59 - * @symbol ?getDimension\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVDimension\@\@\@std\@\@XZ + * @vftbl 60 + * @symbol ?getDimension\@MinecraftGameTestHelper\@\@UEAA?AV?$variant\@UGameTestError\@gametest\@\@PEAVDimension\@\@\@std\@\@XZ */ virtual class std::variant getDimension(); /** - * @vftbl 60 - * @symbol ?getBlockSource\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAPEAVBlockSource\@\@\@Z + * @vftbl 61 + * @symbol ?getBlockSource\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAPEAVBlockSource\@\@\@Z */ virtual class std::optional getBlockSource(class BlockSource *&); /** - * @vftbl 61 - * @symbol ?onPlayerJump\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@H\@Z + * @vftbl 62 + * @symbol ?onPlayerJump\@MinecraftGameTestHelper\@\@UEAA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEAVMob\@\@H\@Z */ virtual class std::optional onPlayerJump(class Mob &, int); /** - * @symbol ??0MinecraftGameTestHelper\@\@QEAA\@AEAVMinecraftGameTestInstance\@\@\@Z + * @symbol ??0MinecraftGameTestHelper\@\@QEAA\@AEAVMinecraftGameTestInstance\@\@\@Z */ MCAPI MinecraftGameTestHelper(class MinecraftGameTestInstance &); //private: /** - * @symbol ?_assertEntityPresent\@MinecraftGameTestHelper\@\@AEBA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_assertEntityInstancePresent\@MinecraftGameTestHelper\@\@AEBA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@PEBVActor\@\@AEBVAABB\@\@AEBVBlockPos\@\@_N\@Z + */ + MCAPI class std::optional _assertEntityInstancePresent(class Actor const *, class AABB const &, class BlockPos const &, bool) const; + /** + * @symbol ?_assertEntityPresent\@MinecraftGameTestHelper\@\@AEBA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI class std::optional _assertEntityPresent(struct ActorDefinitionIdentifier const &, class AABB const &, class BlockPos const &, bool) const; /** - * @symbol ?_getBlock\@MinecraftGameTestHelper\@\@AEAAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getBlock\@MinecraftGameTestHelper\@\@AEAAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Block const & _getBlock(class BlockPos const &); /** - * @symbol ?_getContainer\@MinecraftGameTestHelper\@\@AEAAPEBVContainer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getContainer\@MinecraftGameTestHelper\@\@AEAAPEBVContainer\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Container const * _getContainer(class BlockPos const &); /** - * @symbol ?_getItemEntityCount\@MinecraftGameTestHelper\@\@AEAAHAEBVItem\@\@AEBVAABB\@\@\@Z + * @symbol ?_getItemEntityCount\@MinecraftGameTestHelper\@\@AEAAHAEBVItem\@\@AEBVAABB\@\@\@Z */ MCAPI int _getItemEntityCount(class Item const &, class AABB const &); /** - * @symbol ?_getServerNetworkHandler\@MinecraftGameTestHelper\@\@AEBA?AV?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @symbol ?_getServerNetworkHandler\@MinecraftGameTestHelper\@\@AEBA?AV?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null> _getServerNetworkHandler() const; /** - * @symbol ?_getStructureBlockMissingError\@MinecraftGameTestHelper\@\@AEBA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@XZ + * @symbol ?_getStructureBlockMissingError\@MinecraftGameTestHelper\@\@AEBA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@XZ */ MCAPI class std::optional _getStructureBlockMissingError() const; /** - * @symbol ?_isEntityPresent\@MinecraftGameTestHelper\@\@AEBA_NAEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@\@Z + * @symbol ?_isEntityPresent\@MinecraftGameTestHelper\@\@AEBA_NAEBUActorDefinitionIdentifier\@\@AEBVAABB\@\@\@Z */ MCAPI bool _isEntityPresent(struct ActorDefinitionIdentifier const &, class AABB const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp index 4b30d32b5a..e3e094637b 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestHelperProvider.hpp @@ -30,19 +30,19 @@ class MinecraftGameTestHelperProvider { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftGameTestHelperProvider(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?createGameTestHelper\@MinecraftGameTestHelperProvider\@\@UEAA?AV?$unique_ptr\@VBaseGameTestHelper\@gametest\@\@U?$default_delete\@VBaseGameTestHelper\@gametest\@\@\@std\@\@\@std\@\@AEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 1 + * @symbol ?createGameTestHelper\@MinecraftGameTestHelperProvider\@\@UEAA?AV?$unique_ptr\@VBaseGameTestHelper\@gametest\@\@U?$default_delete\@VBaseGameTestHelper\@gametest\@\@\@std\@\@\@std\@\@AEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual std::unique_ptr createGameTestHelper(class gametest::BaseGameTestInstance &); /** - * @vftbl 2 - * @symbol ?clone\@MinecraftGameTestHelperProvider\@\@UEAA?AV?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?clone\@MinecraftGameTestHelperProvider\@\@UEAA?AV?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp b/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp index 0ec9bbb41a..8995627133 100644 --- a/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftGameTestInstance.hpp @@ -30,73 +30,73 @@ class MinecraftGameTestInstance { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftGameTestInstance(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initialize\@MinecraftGameTestInstance\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?initialize\@MinecraftGameTestInstance\@\@UEAAXXZ */ virtual void initialize(); /** - * @vftbl 2 - * @symbol ?hasStructureBlock\@MinecraftGameTestInstance\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?hasStructureBlock\@MinecraftGameTestInstance\@\@UEBA_NXZ */ virtual bool hasStructureBlock() const; /** - * @vftbl 3 - * @symbol ?clearStructure\@MinecraftGameTestInstance\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?clearStructure\@MinecraftGameTestInstance\@\@UEAAXXZ */ virtual void clearStructure(); /** - * @vftbl 4 - * @symbol ?spawnStructure\@MinecraftGameTestInstance\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?spawnStructure\@MinecraftGameTestInstance\@\@UEAAXXZ */ virtual void spawnStructure(); /** - * @vftbl 5 - * @symbol ?getStructureBounds\@MinecraftGameTestInstance\@\@UEBA?AV?$optional\@VAABB\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getStructureBounds\@MinecraftGameTestInstance\@\@UEBA?AV?$optional\@VAABB\@\@\@std\@\@XZ */ virtual class std::optional getStructureBounds() const; /** - * @vftbl 6 - * @symbol ?getStructureBlockPivot\@MinecraftGameTestInstance\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getStructureBlockPivot\@MinecraftGameTestInstance\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ */ virtual class std::optional getStructureBlockPivot() const; /** - * @vftbl 7 - * @symbol ?getStructureBlockPosPivot\@MinecraftGameTestInstance\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ + * @vftbl 7 + * @symbol ?getStructureBlockPosPivot\@MinecraftGameTestInstance\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ */ virtual class std::optional getStructureBlockPosPivot() const; /** - * @vftbl 8 - * @symbol ?getStructureBoundingBox\@MinecraftGameTestInstance\@\@UEBA?AVBoundingBox\@\@XZ + * @vftbl 8 + * @symbol ?getStructureBoundingBox\@MinecraftGameTestInstance\@\@UEBA?AVBoundingBox\@\@XZ */ virtual class BoundingBox getStructureBoundingBox() const; /** - * @vftbl 9 - * @symbol ?getStructureDimension\@MinecraftGameTestInstance\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @vftbl 9 + * @symbol ?getStructureDimension\@MinecraftGameTestInstance\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ virtual class AutomaticID getStructureDimension() const; /** - * @vftbl 10 - * @symbol ?_getLevelTick\@MinecraftGameTestInstance\@\@MEBAHXZ + * @vftbl 10 + * @symbol ?_getLevelTick\@MinecraftGameTestInstance\@\@MEBAHXZ */ virtual int _getLevelTick() const; /** - * @vftbl 11 - * @symbol ?_isTestReady\@MinecraftGameTestInstance\@\@MEAA_NXZ + * @vftbl 11 + * @symbol ?_isTestReady\@MinecraftGameTestInstance\@\@MEAA_NXZ */ virtual bool _isTestReady(); /** - * @vftbl 14 - * @symbol ?getBlockSource\@MinecraftGameTestInstance\@\@UEBAAEAVBlockSource\@\@XZ + * @vftbl 14 + * @symbol ?getBlockSource\@MinecraftGameTestInstance\@\@UEBAAEAVBlockSource\@\@XZ */ virtual class BlockSource & getBlockSource() const; /** - * @symbol ??0MinecraftGameTestInstance\@\@QEAA\@AEBVBaseGameTestFunction\@gametest\@\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@std\@\@AEAVDimension\@\@\@Z + * @symbol ??0MinecraftGameTestInstance\@\@QEAA\@AEBVBaseGameTestFunction\@gametest\@\@V?$unique_ptr\@VIGameTestHelperProvider\@gametest\@\@U?$default_delete\@VIGameTestHelperProvider\@gametest\@\@\@std\@\@\@std\@\@AEAVDimension\@\@\@Z */ MCAPI MinecraftGameTestInstance(class gametest::BaseGameTestFunction const &, std::unique_ptr, class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftPackets.hpp b/LiteLoader/include/llapi/mc/MinecraftPackets.hpp index 3f11126f59..f5a6ddd92d 100644 --- a/LiteLoader/include/llapi/mc/MinecraftPackets.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftPackets.hpp @@ -35,8 +35,8 @@ static std::shared_ptr createPacket(int type) public: /** - * @symbol ?createPacket\@MinecraftPackets\@\@SA?AV?$shared_ptr\@VPacket\@\@\@std\@\@W4MinecraftPacketIds\@\@\@Z + * @symbol ?createPacket\@MinecraftPackets\@\@SA?AV?$shared_ptr\@VPacket\@\@\@std\@\@W4MinecraftPacketIds\@\@\@Z */ MCAPI static class std::shared_ptr createPacket(enum class MinecraftPacketIds); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp b/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp index 4fd4f2f9c4..e3912a8864 100644 --- a/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftReportGameListener.hpp @@ -30,60 +30,60 @@ class MinecraftReportGameListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftReportGameListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onTestStructureLoaded\@MinecraftReportGameListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 1 + * @symbol ?onTestStructureLoaded\@MinecraftReportGameListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestStructureLoaded(class gametest::BaseGameTestInstance &); /** - * @vftbl 2 - * @symbol ?onTestPassed\@MinecraftReportGameListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 2 + * @symbol ?onTestPassed\@MinecraftReportGameListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestPassed(class gametest::BaseGameTestInstance &); /** - * @vftbl 3 - * @symbol ?onTestFailed\@MinecraftReportGameListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @vftbl 3 + * @symbol ?onTestFailed\@MinecraftReportGameListener\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ virtual void onTestFailed(class gametest::BaseGameTestInstance &); /** - * @symbol ??0MinecraftReportGameListener\@\@QEAA\@AEAVMinecraftGameTestInstance\@\@AEAVGameTestTicker\@gametest\@\@\@Z + * @symbol ??0MinecraftReportGameListener\@\@QEAA\@AEAVMinecraftGameTestInstance\@\@AEAVGameTestTicker\@gametest\@\@\@Z */ MCAPI MinecraftReportGameListener(class MinecraftGameTestInstance &, class gametest::GameTestTicker &); //private: /** - * @symbol ?_generateErrorDescription\@MinecraftReportGameListener\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUGameTestError\@gametest\@\@\@Z + * @symbol ?_generateErrorDescription\@MinecraftReportGameListener\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUGameTestError\@gametest\@\@\@Z */ MCAPI std::string _generateErrorDescription(struct gametest::GameTestError const &) const; /** - * @symbol ?_reportFailure\@MinecraftReportGameListener\@\@AEAAXAEBUGameTestError\@gametest\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_reportFailure\@MinecraftReportGameListener\@\@AEAAXAEBUGameTestError\@gametest\@\@AEAVBlockSource\@\@\@Z */ MCAPI void _reportFailure(struct gametest::GameTestError const &, class BlockSource &); /** - * @symbol ?_reportPassed\@MinecraftReportGameListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_reportPassed\@MinecraftReportGameListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCAPI void _reportPassed(std::string const &, class BlockSource &); /** - * @symbol ?_say\@MinecraftReportGameListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?_say\@MinecraftReportGameListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI void _say(std::string const &, std::string const &); /** - * @symbol ?_spawnBeacon\@MinecraftReportGameListener\@\@AEAAXAEBVBlock\@\@\@Z + * @symbol ?_spawnBeacon\@MinecraftReportGameListener\@\@AEAAXAEBVBlock\@\@\@Z */ MCAPI void _spawnBeacon(class Block const &); /** - * @symbol ?_spawnLectern\@MinecraftReportGameListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_spawnLectern\@MinecraftReportGameListener\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _spawnLectern(std::string const &); /** - * @symbol ?_visualizeFailedTest\@MinecraftReportGameListener\@\@AEAAXAEBUGameTestError\@gametest\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_visualizeFailedTest\@MinecraftReportGameListener\@\@AEAAXAEBUGameTestError\@gametest\@\@AEAVBlockSource\@\@\@Z */ MCAPI void _visualizeFailedTest(struct gametest::GameTestError const &, class BlockSource &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftScheduler.hpp b/LiteLoader/include/llapi/mc/MinecraftScheduler.hpp index 23e8902d94..49ea58c80f 100644 --- a/LiteLoader/include/llapi/mc/MinecraftScheduler.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftScheduler.hpp @@ -30,11 +30,11 @@ class MinecraftScheduler { public: /** - * @symbol ?client\@MinecraftScheduler\@\@SAAEAVScheduler\@\@XZ + * @symbol ?client\@MinecraftScheduler\@\@SAAEAVScheduler\@\@XZ */ MCAPI static class Scheduler & client(); /** - * @symbol ?destroyClientSingleton\@MinecraftScheduler\@\@SAXXZ + * @symbol ?destroyClientSingleton\@MinecraftScheduler\@\@SAXXZ */ MCAPI static void destroyClientSingleton(); @@ -42,8 +42,8 @@ class MinecraftScheduler { private: /** - * @symbol ?mInstance\@MinecraftScheduler\@\@0V?$unique_ptr\@VScheduler\@\@U?$default_delete\@VScheduler\@\@\@std\@\@\@std\@\@A + * @symbol ?mInstance\@MinecraftScheduler\@\@0V?$unique_ptr\@VScheduler\@\@U?$default_delete\@VScheduler\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mInstance; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftScriptTelemetryLogger.hpp b/LiteLoader/include/llapi/mc/MinecraftScriptTelemetryLogger.hpp index 11e3dbd3a8..74977a491e 100644 --- a/LiteLoader/include/llapi/mc/MinecraftScriptTelemetryLogger.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftScriptTelemetryLogger.hpp @@ -28,33 +28,33 @@ class MinecraftScriptTelemetryLogger { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MinecraftScriptTelemetryLogger(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onPluginDiscovery\@MinecraftScriptTelemetryLogger\@\@UEAAXAEBVScriptPluginResult\@\@\@Z + * @vftbl 1 + * @symbol ?onPluginDiscovery\@MinecraftScriptTelemetryLogger\@\@UEAAXAEBVScriptPluginResult\@\@\@Z */ virtual void onPluginDiscovery(class ScriptPluginResult const &); /** - * @vftbl 2 - * @symbol ?onPluginRun\@MinecraftScriptTelemetryLogger\@\@UEAAXAEBVScriptPluginResult\@\@V?$duration\@_JU?$ratio\@$00$0PECEA\@\@std\@\@\@chrono\@std\@\@\@Z + * @vftbl 2 + * @symbol ?onPluginRun\@MinecraftScriptTelemetryLogger\@\@UEAAXAEBVScriptPluginResult\@\@V?$duration\@_JU?$ratio\@$00$0PECEA\@\@std\@\@\@chrono\@std\@\@\@Z */ virtual void onPluginRun(class ScriptPluginResult const &, class std::chrono::duration<__int64, struct std::ratio<1, 1000000>>); /** - * @vftbl 3 - * @symbol ?onDebuggerListen\@MinecraftScriptTelemetryLogger\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?onDebuggerListen\@MinecraftScriptTelemetryLogger\@\@UEAAXXZ */ virtual void onDebuggerListen(); /** - * @vftbl 4 - * @symbol ?onDebuggerConnect\@MinecraftScriptTelemetryLogger\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?onDebuggerConnect\@MinecraftScriptTelemetryLogger\@\@UEAAXXZ */ virtual void onDebuggerConnect(); /** - * @symbol ??0MinecraftScriptTelemetryLogger\@\@QEAA\@AEAVIMinecraftEventing\@\@_N\@Z + * @symbol ??0MinecraftScriptTelemetryLogger\@\@QEAA\@AEAVIMinecraftEventing\@\@_N\@Z */ MCAPI MinecraftScriptTelemetryLogger(class IMinecraftEventing &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp b/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp index 1002309e02..d43a3f1887 100644 --- a/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp +++ b/LiteLoader/include/llapi/mc/MinecraftWorkerPool.hpp @@ -31,76 +31,76 @@ class MinecraftWorkerPool { public: /** - * @symbol ?ASYNC\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?ASYNC\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer ASYNC; /** - * @symbol ?CONNECTEDSTORAGE\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?CONNECTEDSTORAGE\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer CONNECTEDSTORAGE; /** - * @symbol ?DISK\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?DISK\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer DISK; /** - * @symbol ?GAMEFACE_LAYOUT\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?GAMEFACE_LAYOUT\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer GAMEFACE_LAYOUT; /** - * @symbol ?INPUT\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?INPUT\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer INPUT; /** - * @symbol ?LEVELDB\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?LEVELDB\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer LEVELDB; /** - * @symbol ?LEVELDB_COMPACTION\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?LEVELDB_COMPACTION\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer LEVELDB_COMPACTION; /** - * @symbol ?NETWORK\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?NETWORK\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer NETWORK; /** - * @symbol ?PYTHONRUNTIME\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?PYTHONRUNTIME\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer PYTHONRUNTIME; /** - * @symbol ?RENDERING\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?RENDERING\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer RENDERING; /** - * @symbol ?VR\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?VR\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer VR; /** - * @symbol ?WATCHDOG\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A + * @symbol ?WATCHDOG\@MinecraftWorkerPool\@\@2V?$NonOwnerPointer\@VWorkerPool\@\@\@Bedrock\@\@A */ MCAPI static class Bedrock::NonOwnerPointer WATCHDOG; /** - * @symbol ?configureMainThread\@MinecraftWorkerPool\@\@SAXXZ + * @symbol ?configureMainThread\@MinecraftWorkerPool\@\@SAXXZ */ MCAPI static void configureMainThread(); /** - * @symbol ?configureServerThread\@MinecraftWorkerPool\@\@SAXXZ + * @symbol ?configureServerThread\@MinecraftWorkerPool\@\@SAXXZ */ MCAPI static void configureServerThread(); /** - * @symbol ?createSingletons\@MinecraftWorkerPool\@\@SAXXZ + * @symbol ?createSingletons\@MinecraftWorkerPool\@\@SAXXZ */ MCAPI static void createSingletons(); /** - * @symbol ?destroySingletons\@MinecraftWorkerPool\@\@SAXXZ + * @symbol ?destroySingletons\@MinecraftWorkerPool\@\@SAXXZ */ MCAPI static void destroySingletons(); /** - * @symbol ?initializeDefaults\@MinecraftWorkerPool\@\@SAXXZ + * @symbol ?initializeDefaults\@MinecraftWorkerPool\@\@SAXXZ */ MCAPI static void initializeDefaults(); /** - * @symbol ?loadWorkerConfigurations\@MinecraftWorkerPool\@\@SAXII\@Z + * @symbol ?loadWorkerConfigurations\@MinecraftWorkerPool\@\@SAXII\@Z */ MCAPI static void loadWorkerConfigurations(unsigned int, unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftCorridor.hpp b/LiteLoader/include/llapi/mc/MineshaftCorridor.hpp index 7273e32cd0..9c0bc684d1 100644 --- a/LiteLoader/include/llapi/mc/MineshaftCorridor.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftCorridor.hpp @@ -31,49 +31,49 @@ class MineshaftCorridor : public MineshaftPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftCorridor(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@MineshaftCorridor\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@MineshaftCorridor\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@MineshaftCorridor\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@MineshaftCorridor\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@MineshaftCorridor\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@MineshaftCorridor\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@MineshaftCorridor\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@MineshaftCorridor\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?_placeCobWeb\@MineshaftCorridor\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHH\@Z + * @symbol ?_placeCobWeb\@MineshaftCorridor\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHH\@Z */ MCAPI void _placeCobWeb(class BlockSource &, class BoundingBox const &, class Random &, float, int, int, int); /** - * @symbol ?_placeSupport\@MineshaftCorridor\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHAEAVRandom\@\@\@Z + * @symbol ?_placeSupport\@MineshaftCorridor\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHAEAVRandom\@\@\@Z */ MCAPI void _placeSupport(class BlockSource &, class BoundingBox const &, int, int, int, int, int, class Random &); //private: /** - * @symbol ?_fillPillarDownOrChainUp\@MineshaftCorridor\@\@AEAAXAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z + * @symbol ?_fillPillarDownOrChainUp\@MineshaftCorridor\@\@AEAAXAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z */ MCAPI void _fillPillarDownOrChainUp(class BlockSource &, int, int, int, class BoundingBox const &); /** - * @symbol ?_placeDoubleLowerOrUpperSupport\@MineshaftCorridor\@\@AEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHH\@Z + * @symbol ?_placeDoubleLowerOrUpperSupport\@MineshaftCorridor\@\@AEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHH\@Z */ MCAPI void _placeDoubleLowerOrUpperSupport(class BlockSource &, class BoundingBox const &, int, int, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftCrossing.hpp b/LiteLoader/include/llapi/mc/MineshaftCrossing.hpp index 2476c541ab..ef90007452 100644 --- a/LiteLoader/include/llapi/mc/MineshaftCrossing.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftCrossing.hpp @@ -31,28 +31,28 @@ class MineshaftCrossing : public MineshaftPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftCrossing(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@MineshaftCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@MineshaftCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@MineshaftCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@MineshaftCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@MineshaftCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@MineshaftCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?_placeSupportPillar\@MineshaftCrossing\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHH\@Z + * @symbol ?_placeSupportPillar\@MineshaftCrossing\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHH\@Z */ MCAPI void _placeSupportPillar(class BlockSource &, class BoundingBox const &, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftData.hpp b/LiteLoader/include/llapi/mc/MineshaftData.hpp index f68113544a..645a211fb6 100644 --- a/LiteLoader/include/llapi/mc/MineshaftData.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftData.hpp @@ -28,7 +28,7 @@ struct MineshaftData { public: /** - * @symbol ??0MineshaftData\@\@QEAA\@_N\@Z + * @symbol ??0MineshaftData\@\@QEAA\@_N\@Z */ MCAPI MineshaftData(bool); diff --git a/LiteLoader/include/llapi/mc/MineshaftFeature.hpp b/LiteLoader/include/llapi/mc/MineshaftFeature.hpp index a3f8f47508..df879528a9 100644 --- a/LiteLoader/include/llapi/mc/MineshaftFeature.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftFeature.hpp @@ -31,24 +31,24 @@ class MineshaftFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@MineshaftFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@MineshaftFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@MineshaftFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@MineshaftFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@MineshaftFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@MineshaftFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftPiece.hpp b/LiteLoader/include/llapi/mc/MineshaftPiece.hpp index beac4344b0..52d895d3f7 100644 --- a/LiteLoader/include/llapi/mc/MineshaftPiece.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftPiece.hpp @@ -31,31 +31,37 @@ class MineshaftPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?isInInvalidLocation\@MineshaftPiece\@\@UEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 6 + * @symbol ?isInInvalidLocation\@MineshaftPiece\@\@UEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@\@Z */ virtual bool isInInvalidLocation(class BlockSource &, class BoundingBox const &); /** - * @vftbl 10 - * @symbol ?canBeReplaced\@MineshaftPiece\@\@UEAA_NAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z + * @vftbl 10 + * @symbol ?canBeReplaced\@MineshaftPiece\@\@UEAA_NAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z */ virtual bool canBeReplaced(class BlockSource &, int, int, int, class BoundingBox const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MINESHAFTPIECE /** - * @symbol ?createRandomShaftPiece\@MineshaftPiece\@\@QEAA?AV?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@AEAUMineshaftData\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MineshaftPiece(); +#endif + /** + * @symbol ?createRandomShaftPiece\@MineshaftPiece\@\@QEAA?AV?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@AEAUMineshaftData\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI std::unique_ptr createRandomShaftPiece(struct MineshaftData &, std::vector> &, class Random &, int, int, int, int, int); /** - * @symbol ?generateAndAddPiece\@MineshaftPiece\@\@QEAAPEAVStructurePiece\@\@AEAV2\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?generateAndAddPiece\@MineshaftPiece\@\@QEAAPEAVStructurePiece\@\@AEAV2\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHHH\@Z */ MCAPI class StructurePiece * generateAndAddPiece(class StructurePiece &, std::vector> &, class Random &, int, int, int, int, int); /** - * @symbol ?setPlanksBlock\@MineshaftPiece\@\@QEAAXAEAVBlockSource\@\@AEBVBlock\@\@HHH\@Z + * @symbol ?setPlanksBlock\@MineshaftPiece\@\@QEAAXAEAVBlockSource\@\@AEBVBlock\@\@HHH\@Z */ MCAPI void setPlanksBlock(class BlockSource &, class Block const &, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftRoom.hpp b/LiteLoader/include/llapi/mc/MineshaftRoom.hpp index df58b62444..b964aa98eb 100644 --- a/LiteLoader/include/llapi/mc/MineshaftRoom.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftRoom.hpp @@ -31,33 +31,33 @@ class MineshaftRoom : public MineshaftPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?moveBoundingBox\@MineshaftRoom\@\@UEAAXHHH\@Z + * @vftbl 1 + * @symbol ?moveBoundingBox\@MineshaftRoom\@\@UEAAXHHH\@Z */ virtual void moveBoundingBox(int, int, int); /** - * @vftbl 2 - * @symbol ?getType\@MineshaftRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@MineshaftRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@MineshaftRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@MineshaftRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@MineshaftRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@MineshaftRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ??0MineshaftRoom\@\@QEAA\@AEAUMineshaftData\@\@HAEAVRandom\@\@HH\@Z + * @symbol ??0MineshaftRoom\@\@QEAA\@AEAUMineshaftData\@\@HAEAVRandom\@\@HH\@Z */ MCAPI MineshaftRoom(struct MineshaftData &, int, class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftStairs.hpp b/LiteLoader/include/llapi/mc/MineshaftStairs.hpp index 0fa0667edc..9b5b5fa7a0 100644 --- a/LiteLoader/include/llapi/mc/MineshaftStairs.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftStairs.hpp @@ -31,24 +31,24 @@ class MineshaftStairs : public MineshaftPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftStairs(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@MineshaftStairs\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@MineshaftStairs\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@MineshaftStairs\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@MineshaftStairs\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@MineshaftStairs\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@MineshaftStairs\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftStart.hpp b/LiteLoader/include/llapi/mc/MineshaftStart.hpp index afab06f84a..0a7d54954d 100644 --- a/LiteLoader/include/llapi/mc/MineshaftStart.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftStart.hpp @@ -31,13 +31,13 @@ class MineshaftStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MineshaftStart(); + virtual void __unk_vfn_0(); /** - * @symbol ??0MineshaftStart\@\@QEAA\@AEBVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ??0MineshaftStart\@\@QEAA\@AEBVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI MineshaftStart(class Dimension const &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MineshaftUtil.hpp b/LiteLoader/include/llapi/mc/MineshaftUtil.hpp index 7a56d24271..e9d0dd5951 100644 --- a/LiteLoader/include/llapi/mc/MineshaftUtil.hpp +++ b/LiteLoader/include/llapi/mc/MineshaftUtil.hpp @@ -20,15 +20,15 @@ namespace MineshaftUtil { #undef AFTER_EXTRA /** - * @symbol ?_isLava\@MineshaftUtil\@\@YA_NAEBVBlockLegacy\@\@\@Z + * @symbol ?_isLava\@MineshaftUtil\@\@YA_NAEBVBlockLegacy\@\@\@Z */ MCAPI bool _isLava(class BlockLegacy const &); /** - * @symbol ?fillColumnBetween\@MineshaftUtil\@\@YAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?fillColumnBetween\@MineshaftUtil\@\@YAXAEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI void fillColumnBetween(class BlockSource &, class Block const &, class BlockPos const &, int, int); /** - * @symbol ?isCavesAndCliffs\@MineshaftUtil\@\@YA_NAEBVLevel\@\@\@Z + * @symbol ?isCavesAndCliffs\@MineshaftUtil\@\@YA_NAEBVLevel\@\@\@Z */ MCAPI bool isCavesAndCliffs(class Level const &); diff --git a/LiteLoader/include/llapi/mc/MingleComponent.hpp b/LiteLoader/include/llapi/mc/MingleComponent.hpp index 45dfdbfe38..b76b0c8079 100644 --- a/LiteLoader/include/llapi/mc/MingleComponent.hpp +++ b/LiteLoader/include/llapi/mc/MingleComponent.hpp @@ -31,28 +31,28 @@ enum class MingleState; public: /** - * @symbol ??0MingleComponent\@\@QEAA\@XZ + * @symbol ??0MingleComponent\@\@QEAA\@XZ */ MCAPI MingleComponent(); /** - * @symbol ?clearPreviousPartnerId\@MingleComponent\@\@QEAAAEAV1\@XZ + * @symbol ?clearPreviousPartnerId\@MingleComponent\@\@QEAAAEAV1\@XZ */ MCAPI class MingleComponent & clearPreviousPartnerId(); /** - * @symbol ?fetchCurrentPartner\@MingleComponent\@\@QEBAPEAVActor\@\@AEBV2\@\@Z + * @symbol ?fetchCurrentPartner\@MingleComponent\@\@QEBAPEAVActor\@\@AEBV2\@\@Z */ MCAPI class Actor * fetchCurrentPartner(class Actor const &) const; /** - * @symbol ?resetState\@MingleComponent\@\@QEAAXXZ + * @symbol ?resetState\@MingleComponent\@\@QEAAXXZ */ MCAPI void resetState(); /** - * @symbol ?setMingleState\@MingleComponent\@\@QEAAAEAV1\@W4MingleState\@1\@\@Z + * @symbol ?setMingleState\@MingleComponent\@\@QEAAAEAV1\@W4MingleState\@1\@\@Z */ MCAPI class MingleComponent & setMingleState(enum class MingleComponent::MingleState); /** - * @symbol ?setPartnerId\@MingleComponent\@\@QEAAAEAV1\@UActorUniqueID\@\@\@Z + * @symbol ?setPartnerId\@MingleComponent\@\@QEAAAEAV1\@UActorUniqueID\@\@\@Z */ MCAPI class MingleComponent & setPartnerId(struct ActorUniqueID); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MingleGoal.hpp b/LiteLoader/include/llapi/mc/MingleGoal.hpp index c23eb1df5c..4c2c52dd6e 100644 --- a/LiteLoader/include/llapi/mc/MingleGoal.hpp +++ b/LiteLoader/include/llapi/mc/MingleGoal.hpp @@ -31,82 +31,82 @@ class MingleGoal : public MoveToPOIGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MingleGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MingleGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MingleGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MingleGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MingleGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MingleGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MingleGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MingleGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MingleGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MingleGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MingleGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MingleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MingleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0MingleGoal\@\@QEAA\@AEAVMob\@\@MMMUActorDefinitionIdentifier\@\@M\@Z + * @symbol ??0MingleGoal\@\@QEAA\@AEAVMob\@\@MMMUActorDefinitionIdentifier\@\@M\@Z */ MCAPI MingleGoal(class Mob &, float, float, float, struct ActorDefinitionIdentifier, float); //private: /** - * @symbol ?_findNewPartner\@MingleGoal\@\@AEAAXUActorUniqueID\@\@\@Z + * @symbol ?_findNewPartner\@MingleGoal\@\@AEAAXUActorUniqueID\@\@\@Z */ MCAPI void _findNewPartner(struct ActorUniqueID); /** - * @symbol ?_isWithinInteractRange\@MingleGoal\@\@AEBA_NAEAVActor\@\@\@Z + * @symbol ?_isWithinInteractRange\@MingleGoal\@\@AEBA_NAEAVActor\@\@\@Z */ MCAPI bool _isWithinInteractRange(class Actor &) const; private: /** - * @symbol ?FIND_PARTNER_INTERVAL_TICKS\@MingleGoal\@\@0HB + * @symbol ?FIND_PARTNER_INTERVAL_TICKS\@MingleGoal\@\@0HB */ MCAPI static int const FIND_PARTNER_INTERVAL_TICKS; /** - * @symbol ?SPEAK_INTERVAL_TICKS_MAX\@MingleGoal\@\@0HB + * @symbol ?SPEAK_INTERVAL_TICKS_MAX\@MingleGoal\@\@0HB */ MCAPI static int const SPEAK_INTERVAL_TICKS_MAX; /** - * @symbol ?SPEAK_INTERVAL_TICKS_MIN\@MingleGoal\@\@0HB + * @symbol ?SPEAK_INTERVAL_TICKS_MIN\@MingleGoal\@\@0HB */ MCAPI static int const SPEAK_INTERVAL_TICKS_MIN; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Mob.hpp b/LiteLoader/include/llapi/mc/Mob.hpp index d6940368c8..15be54ba86 100644 --- a/LiteLoader/include/llapi/mc/Mob.hpp +++ b/LiteLoader/include/llapi/mc/Mob.hpp @@ -42,1276 +42,1283 @@ struct JumpPreventionResult { public: /** - * @vftbl 2 - * @symbol ?hasComponent\@Mob\@\@UEBA_NAEBVHashedString\@\@\@Z + * @vftbl 2 + * @symbol ?hasComponent\@Mob\@\@UEBA_NAEBVHashedString\@\@\@Z */ virtual bool hasComponent(class HashedString const &) const; /** - * @vftbl 9 - * @symbol ?outOfWorld\@Mob\@\@MEAAXXZ + * @vftbl 9 + * @symbol ?outOfWorld\@Mob\@\@MEAAXXZ */ virtual void outOfWorld(); /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Mob\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Mob\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Mob\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Mob\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@Mob\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Mob\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 15 - * @symbol ?_doInitialMove\@Mob\@\@MEAAXXZ + * @vftbl 15 + * @symbol ?_doInitialMove\@Mob\@\@MEAAXXZ */ virtual void _doInitialMove(); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Mob(); + virtual void __unk_vfn_16(); /** - * @vftbl 31 - * @symbol ?getInterpolatedBodyRot\@Mob\@\@UEBAMM\@Z + * @vftbl 31 + * @symbol ?getInterpolatedBodyRot\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyRot(float) const; /** - * @vftbl 32 - * @symbol ?getInterpolatedHeadRot\@Mob\@\@UEBAMM\@Z + * @vftbl 32 + * @symbol ?getInterpolatedHeadRot\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedHeadRot(float) const; /** - * @vftbl 33 - * @symbol ?getInterpolatedBodyYaw\@Mob\@\@UEBAMM\@Z + * @vftbl 33 + * @symbol ?getInterpolatedBodyYaw\@Mob\@\@UEBAMM\@Z */ virtual float getInterpolatedBodyYaw(float) const; /** - * @vftbl 34 - * @symbol ?getYawSpeedInDegreesPerSecond\@Mob\@\@UEBAMXZ + * @vftbl 34 + * @symbol ?getYawSpeedInDegreesPerSecond\@Mob\@\@UEBAMXZ */ virtual float getYawSpeedInDegreesPerSecond() const; /** - * @vftbl 37 - * @symbol ?resetInterpolated\@Mob\@\@UEAAXXZ + * @vftbl 37 + * @symbol ?resetInterpolated\@Mob\@\@UEAAXXZ */ virtual void resetInterpolated(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol ?blockedByShield\@Mob\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z + * @vftbl 42 + * @symbol ?blockedByShield\@Mob\@\@UEAAXAEBVActorDamageSource\@\@AEAVActor\@\@\@Z */ virtual void blockedByShield(class ActorDamageSource const &, class Actor &); /** - * @vftbl 44 - * @symbol ?teleportTo\@Mob\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@Mob\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 - * @symbol ?normalTick\@Mob\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Mob\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 50 - * @symbol ?baseTick\@Mob\@\@UEAAXXZ + * @vftbl 50 + * @symbol ?baseTick\@Mob\@\@UEAAXXZ */ virtual void baseTick(); /** - * @vftbl 53 - * @symbol ?startRiding\@Mob\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 53 + * @symbol ?startRiding\@Mob\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 54 - * @symbol ?addPassenger\@Mob\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 54 + * @symbol ?addPassenger\@Mob\@\@UEAAXAEAVActor\@\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 93 - * @symbol ?isImmobile\@Mob\@\@UEBA_NXZ + * @vftbl 92 + * @symbol ?isImmobile\@Mob\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 96 - * @symbol ?isPickable\@Mob\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Mob\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 98 - * @symbol ?isSleeping\@Mob\@\@UEBA_NXZ + * @vftbl 97 + * @symbol ?isSleeping\@Mob\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 99 - * @symbol ?setSleeping\@Mob\@\@UEAAX_N\@Z + * @vftbl 98 + * @symbol ?setSleeping\@Mob\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 102 - * @symbol ?isBlocking\@Mob\@\@UEBA_NXZ + * @vftbl 101 + * @symbol ?isBlocking\@Mob\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 104 - * @symbol ?isAlive\@Mob\@\@UEBA_NXZ + * @vftbl 103 + * @symbol ?isAlive\@Mob\@\@UEBA_NXZ */ virtual bool isAlive() const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 108 - * @symbol ?isSurfaceMob\@Mob\@\@UEBA_NXZ + * @vftbl 107 + * @symbol ?isSurfaceMob\@Mob\@\@UEBA_NXZ */ virtual bool isSurfaceMob() const; /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 115 - * @symbol ?setTarget\@Mob\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 114 + * @symbol ?setTarget\@Mob\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 117 - * @symbol ?attack\@Mob\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 116 + * @symbol ?attack\@Mob\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 128 - * @symbol ?canPowerJump\@Mob\@\@UEBA_NXZ + * @vftbl 127 + * @symbol ?canPowerJump\@Mob\@\@UEBA_NXZ */ virtual bool canPowerJump() const; /** - * @vftbl 136 - * @symbol ?getBlockDamageCause\@Mob\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getBlockDamageCause\@Mob\@\@UEBA?AW4ActorDamageCause\@\@AEBVBlock\@\@\@Z */ virtual enum class ActorDamageCause getBlockDamageCause(class Block const &) const; /** - * @vftbl 137 - * @symbol ?animateHurt\@Mob\@\@UEAAXXZ + * @vftbl 136 + * @symbol ?animateHurt\@Mob\@\@UEAAXXZ */ virtual void animateHurt(); /** - * @vftbl 138 - * @symbol ?doFireHurt\@Mob\@\@UEAA_NH\@Z + * @vftbl 137 + * @symbol ?doFireHurt\@Mob\@\@UEAA_NH\@Z */ virtual bool doFireHurt(int); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Mob\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Mob\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 154 - * @symbol ?getArmorMaterialTypeInSlot\@Mob\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z + * @vftbl 153 + * @symbol ?getArmorMaterialTypeInSlot\@Mob\@\@UEBA?AW4ArmorMaterialType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorMaterialType getArmorMaterialTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 155 - * @symbol ?getArmorMaterialTextureTypeInSlot\@Mob\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z + * @vftbl 154 + * @symbol ?getArmorMaterialTextureTypeInSlot\@Mob\@\@UEBA?AW4ArmorTextureType\@\@W4ArmorSlot\@\@\@Z */ virtual enum class ArmorTextureType getArmorMaterialTextureTypeInSlot(enum class ArmorSlot) const; /** - * @vftbl 156 - * @symbol ?getArmorColorInSlot\@Mob\@\@UEBAMW4ArmorSlot\@\@H\@Z + * @vftbl 155 + * @symbol ?getArmorColorInSlot\@Mob\@\@UEBAMW4ArmorSlot\@\@H\@Z */ virtual float getArmorColorInSlot(enum class ArmorSlot, int) const; /** - * @vftbl 158 - * @symbol ?setEquippedSlot\@Mob\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 157 + * @symbol ?setEquippedSlot\@Mob\@\@UEAAXW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setEquippedSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 172 - * @symbol ?canFreeze\@Mob\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@Mob\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@Mob\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@Mob\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 183 - * @symbol ?causeFallDamage\@Mob\@\@MEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@Mob\@\@MEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Mob\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Mob\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 192 - * @symbol ?inCaravan\@Mob\@\@UEBA_NXZ + * @vftbl 191 + * @symbol ?inCaravan\@Mob\@\@UEBA_NXZ */ virtual bool inCaravan() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 197 - * @symbol ?stopRiding\@Mob\@\@UEAAX_N00\@Z + * @vftbl 196 + * @symbol ?stopRiding\@Mob\@\@UEAAX_N00\@Z */ virtual void stopRiding(bool, bool, bool); /** - * @vftbl 200 - * @symbol ?buildDebugInfo\@Mob\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 199 + * @symbol ?buildDebugInfo\@Mob\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 205 - * @symbol ?getDeathTime\@Mob\@\@UEBAHXZ + * @vftbl 204 + * @symbol ?getDeathTime\@Mob\@\@UEBAHXZ */ virtual int getDeathTime() const; /** - * @vftbl 216 - * @symbol ?swing\@Mob\@\@UEAAXXZ + * @vftbl 215 + * @symbol ?swing\@Mob\@\@UEAAXXZ */ virtual void swing(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 245 - * @symbol ?kill\@Mob\@\@UEAAXXZ + * @vftbl 244 + * @symbol ?kill\@Mob\@\@UEAAXXZ */ virtual void kill(); /** - * @vftbl 246 - * @symbol ?die\@Mob\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Mob\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 247 - * @symbol ?shouldDropDeathLoot\@Mob\@\@UEBA_NXZ + * @vftbl 246 + * @symbol ?shouldDropDeathLoot\@Mob\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Mob\@\@MEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Mob\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Mob\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Mob\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Mob\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Mob\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Mob\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Mob\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 268 - * @symbol ?_playStepSound\@Mob\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Mob\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 275 - * @symbol ?_removePassenger\@Mob\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z + * @vftbl 273 + * @symbol ?_removePassenger\@Mob\@\@MEAAXAEBUActorUniqueID\@\@_N11\@Z */ virtual void _removePassenger(struct ActorUniqueID const &, bool, bool, bool); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Mob\@\@MEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Mob\@\@MEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?knockback\@Mob\@\@UEAAXPEAVActor\@\@HMMMMM\@Z + * @vftbl 276 + * @symbol ?knockback\@Mob\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 279 - * @symbol ?spawnAnim\@Mob\@\@UEAAXXZ + * @vftbl 277 + * @symbol ?spawnAnim\@Mob\@\@UEAAXXZ */ virtual void spawnAnim(); /** - * @vftbl 280 - * @symbol ?setSprinting\@Mob\@\@UEAAX_N\@Z + * @vftbl 278 + * @symbol ?setSprinting\@Mob\@\@UEAAX_N\@Z */ virtual void setSprinting(bool); /** - * @vftbl 281 - * @symbol ?getHurtSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ + * @vftbl 279 + * @symbol ?getHurtSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getHurtSound(); /** - * @vftbl 282 - * @symbol ?getDeathSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ + * @vftbl 280 + * @symbol ?getDeathSound\@Mob\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getDeathSound(); /** - * @vftbl 283 - * @symbol ?getSpeed\@Mob\@\@UEBAMXZ + * @vftbl 281 + * @symbol ?getSpeed\@Mob\@\@UEBAMXZ */ virtual float getSpeed() const; /** - * @vftbl 284 - * @symbol ?setSpeed\@Mob\@\@UEAAXM\@Z + * @vftbl 282 + * @symbol ?setSpeed\@Mob\@\@UEAAXM\@Z */ virtual void setSpeed(float); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 286 - * @symbol ?hurtEffects\@Mob\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 283 + * @symbol ?hurtEffects\@Mob\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 287 - * @symbol ?getMeleeWeaponDamageBonus\@Mob\@\@UEAAMPEAV1\@\@Z + * @vftbl 284 + * @symbol ?getMeleeWeaponDamageBonus\@Mob\@\@UEAAMPEAV1\@\@Z */ virtual float getMeleeWeaponDamageBonus(class Mob *); /** - * @vftbl 288 - * @symbol ?getMeleeKnockbackBonus\@Mob\@\@UEAAHXZ + * @vftbl 285 + * @symbol ?getMeleeKnockbackBonus\@Mob\@\@UEAAHXZ */ virtual int getMeleeKnockbackBonus(); /** - * @vftbl 289 - * @symbol ?travel\@Mob\@\@UEAAXMMM\@Z + * @vftbl 286 + * @symbol ?travel\@Mob\@\@UEAAXMMM_N\@Z */ - virtual void travel(float, float, float); + virtual void travel(float, float, float, bool); /** - * @vftbl 290 - * @symbol ?applyFinalFriction\@Mob\@\@UEAAXM_N\@Z + * @vftbl 287 + * @symbol ?applyFinalFriction\@Mob\@\@UEAAXM_N\@Z */ virtual void applyFinalFriction(float, bool); /** - * @vftbl 291 - * @symbol ?aiStep\@Mob\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Mob\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 292 - * @symbol ?aiStep\@Mob\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z + * @vftbl 289 + * @symbol ?aiStep\@Mob\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z */ virtual void aiStep(struct IMobMovementProxy &) const; /** - * @vftbl 293 - * @symbol ?pushActors\@Mob\@\@UEAAXXZ + * @vftbl 290 + * @symbol ?pushActors\@Mob\@\@UEAAXXZ */ virtual void pushActors(); /** - * @vftbl 294 - * @symbol ?lookAt\@Mob\@\@UEAAXPEAVActor\@\@MM\@Z + * @vftbl 291 + * @symbol ?lookAt\@Mob\@\@UEAAXPEAVActor\@\@MM\@Z */ virtual void lookAt(class Actor *, float, float); /** - * @vftbl 295 - * @symbol ?isLookingAtAnEntity\@Mob\@\@UEAA_NXZ + * @vftbl 292 + * @symbol ?isLookingAtAnEntity\@Mob\@\@UEAA_NXZ */ virtual bool isLookingAtAnEntity(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Mob\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Mob\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 297 - * @symbol ?checkSpawnObstruction\@Mob\@\@UEBA_NXZ + * @vftbl 294 + * @symbol ?checkSpawnObstruction\@Mob\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 298 - * @symbol ?getAttackAnim\@Mob\@\@UEAAMM\@Z + * @vftbl 295 + * @symbol ?getAttackAnim\@Mob\@\@UEAAMM\@Z */ virtual float getAttackAnim(float); /** - * @vftbl 299 - * @symbol ?getItemUseDuration\@Mob\@\@UEBAHXZ + * @vftbl 296 + * @symbol ?getItemUseDuration\@Mob\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 300 - * @symbol ?getItemUseStartupProgress\@Mob\@\@UEBAMXZ + * @vftbl 297 + * @symbol ?getItemUseStartupProgress\@Mob\@\@UEBAMXZ */ virtual float getItemUseStartupProgress() const; /** - * @vftbl 301 - * @symbol ?getItemUseIntervalProgress\@Mob\@\@UEBAMXZ + * @vftbl 298 + * @symbol ?getItemUseIntervalProgress\@Mob\@\@UEBAMXZ */ virtual float getItemUseIntervalProgress() const; /** - * @vftbl 302 - * @symbol ?getItemUseIntervalAxis\@Mob\@\@UEBAHXZ + * @vftbl 299 + * @symbol ?getItemUseIntervalAxis\@Mob\@\@UEBAHXZ */ virtual int getItemUseIntervalAxis() const; /** - * @vftbl 303 - * @symbol ?getTimeAlongSwing\@Mob\@\@UEBAHXZ + * @vftbl 300 + * @symbol ?getTimeAlongSwing\@Mob\@\@UEBAHXZ */ virtual int getTimeAlongSwing() const; /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 305 - * @symbol ?getMaxHeadXRot\@Mob\@\@UEAAMXZ + * @vftbl 302 + * @symbol ?getMaxHeadXRot\@Mob\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 306 - * @symbol ?isAlliedTo\@Mob\@\@UEAA_NPEAV1\@\@Z + * @vftbl 303 + * @symbol ?isAlliedTo\@Mob\@\@UEAA_NPEAV1\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 307 - * @symbol ?doHurtTarget\@Mob\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 304 + * @symbol ?doHurtTarget\@Mob\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 309 - * @symbol ?leaveCaravan\@Mob\@\@UEAAXXZ + * @vftbl 306 + * @symbol ?leaveCaravan\@Mob\@\@UEAAXXZ */ virtual void leaveCaravan(); /** - * @vftbl 310 - * @symbol ?joinCaravan\@Mob\@\@UEAAXPEAV1\@\@Z + * @vftbl 307 + * @symbol ?joinCaravan\@Mob\@\@UEAAXPEAV1\@\@Z */ virtual void joinCaravan(class Mob *); /** - * @vftbl 311 - * @symbol ?hasCaravanTail\@Mob\@\@UEBA_NXZ + * @vftbl 308 + * @symbol ?hasCaravanTail\@Mob\@\@UEBA_NXZ */ virtual bool hasCaravanTail() const; /** - * @vftbl 312 - * @symbol ?getCaravanHead\@Mob\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 309 + * @symbol ?getCaravanHead\@Mob\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getCaravanHead() const; /** - * @vftbl 313 - * @symbol ?getArmorValue\@Mob\@\@UEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@Mob\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 314 - * @symbol ?getArmorCoverPercentage\@Mob\@\@UEBAMXZ + * @vftbl 311 + * @symbol ?getArmorCoverPercentage\@Mob\@\@UEBAMXZ */ virtual float getArmorCoverPercentage() const; /** - * @vftbl 315 - * @symbol ?getToughnessValue\@Mob\@\@UEBAHXZ + * @vftbl 312 + * @symbol ?getToughnessValue\@Mob\@\@UEBAHXZ */ virtual int getToughnessValue() const; /** - * @vftbl 316 - * @symbol ?hurtArmorSlots\@Mob\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z + * @vftbl 313 + * @symbol ?hurtArmorSlots\@Mob\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z */ virtual void hurtArmorSlots(class ActorDamageSource const &, int, class std::bitset<4>); /** - * @vftbl 317 - * @symbol ?setDamagedArmor\@Mob\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 314 + * @symbol ?setDamagedArmor\@Mob\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setDamagedArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 318 - * @symbol ?sendArmorDamage\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z + * @vftbl 315 + * @symbol ?sendArmorDamage\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmorDamage(class std::bitset<4>); /** - * @vftbl 319 - * @symbol ?sendArmor\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z + * @vftbl 316 + * @symbol ?sendArmor\@Mob\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmor(class std::bitset<4>); /** - * @vftbl 320 - * @symbol ?containerChanged\@Mob\@\@UEAAXH\@Z + * @vftbl 317 + * @symbol ?containerChanged\@Mob\@\@UEAAXH\@Z */ virtual void containerChanged(int); /** - * @vftbl 321 - * @symbol ?updateEquipment\@Mob\@\@UEAAXXZ + * @vftbl 318 + * @symbol ?updateEquipment\@Mob\@\@UEAAXXZ */ virtual void updateEquipment(); /** - * @vftbl 322 - * @symbol ?clearEquipment\@Mob\@\@UEAAHXZ + * @vftbl 319 + * @symbol ?clearEquipment\@Mob\@\@UEAAHXZ */ virtual int clearEquipment(); /** - * @vftbl 323 - * @symbol ?getAllArmorID\@Mob\@\@UEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ + * @vftbl 320 + * @symbol ?getAllArmorID\@Mob\@\@UEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ virtual std::vector getAllArmorID() const; /** - * @vftbl 324 - * @symbol ?getAllHand\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 321 + * @symbol ?getAllHand\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllHand() const; /** - * @vftbl 325 - * @symbol ?getAllEquipment\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 322 + * @symbol ?getAllEquipment\@Mob\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllEquipment() const; /** - * @vftbl 326 - * @symbol ?getArmorTypeHash\@Mob\@\@UEAAHXZ + * @vftbl 323 + * @symbol ?getArmorTypeHash\@Mob\@\@UEAAHXZ */ virtual int getArmorTypeHash(); /** - * @vftbl 327 - * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXAEBVActorDamageSource\@\@H\@Z + * @vftbl 324 + * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXAEBVActorDamageSource\@\@H\@Z */ virtual void dropEquipmentOnDeath(class ActorDamageSource const &, int); /** - * @vftbl 328 - * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXXZ + * @vftbl 325 + * @symbol ?dropEquipmentOnDeath\@Mob\@\@UEAAXXZ */ virtual void dropEquipmentOnDeath(); /** - * @vftbl 329 - * @symbol ?clearVanishEnchantedItemsOnDeath\@Mob\@\@UEAAXXZ + * @vftbl 326 + * @symbol ?clearVanishEnchantedItemsOnDeath\@Mob\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 330 - * @symbol ?sendInventory\@Mob\@\@UEAAX_N\@Z + * @vftbl 327 + * @symbol ?sendInventory\@Mob\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 331 - * @symbol ?getDamageAfterEnchantReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z + * @vftbl 328 + * @symbol ?getDamageAfterEnchantReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterEnchantReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 332 - * @symbol ?getDamageAfterArmorReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z + * @vftbl 329 + * @symbol ?getDamageAfterArmorReduction\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterArmorReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 333 - * @symbol ?getDamageAfterResistanceEffect\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z + * @vftbl 330 + * @symbol ?getDamageAfterResistanceEffect\@Mob\@\@UEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterResistanceEffect(class ActorDamageSource const &, float) const; /** - * @vftbl 334 - * @symbol ?createAIGoals\@Mob\@\@UEAA_NXZ + * @vftbl 331 + * @symbol ?createAIGoals\@Mob\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 335 - * @symbol ?onBorn\@Mob\@\@UEAAXAEAVActor\@\@0\@Z + * @vftbl 332 + * @symbol ?onBorn\@Mob\@\@UEAAXAEAVActor\@\@0\@Z */ virtual void onBorn(class Actor &, class Actor &); /** - * @vftbl 336 - * @symbol ?setItemSlot\@Mob\@\@UEAA_NW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 333 + * @symbol ?setItemSlot\@Mob\@\@UEAA_NW4EquipmentSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool setItemSlot(enum class EquipmentSlot, class ItemStack const &); /** - * @vftbl 337 - * @symbol ?setTransitioningSitting\@Mob\@\@UEAAX_N\@Z + * @vftbl 334 + * @symbol ?setTransitioningSitting\@Mob\@\@UEAAX_N\@Z */ virtual void setTransitioningSitting(bool); /** - * @vftbl 338 - * @symbol ?attackAnimation\@Mob\@\@UEAAXPEAVActor\@\@M\@Z + * @vftbl 335 + * @symbol ?attackAnimation\@Mob\@\@UEAAXPEAVActor\@\@M\@Z */ virtual void attackAnimation(class Actor *, float); /** - * @vftbl 339 - * @symbol ?getAttackTime\@Mob\@\@UEAAHXZ + * @vftbl 336 + * @symbol ?getAttackTime\@Mob\@\@UEAAHXZ */ virtual int getAttackTime(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Mob\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Mob\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 341 - * @symbol ?canExistWhenDisallowMob\@Mob\@\@UEBA_NXZ + * @vftbl 338 + * @symbol ?canExistWhenDisallowMob\@Mob\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 342 - * @symbol ?ascendLadder\@Mob\@\@UEAAXXZ + * @vftbl 339 + * @symbol ?ascendLadder\@Mob\@\@UEAAXXZ */ virtual void ascendLadder(); /** - * @vftbl 343 - * @symbol ?ascendBlockByJumping\@Mob\@\@UEAAXXZ + * @vftbl 340 + * @symbol ?ascendBlockByJumping\@Mob\@\@UEAAXXZ */ virtual void ascendBlockByJumping(); /** - * @vftbl 344 - * @symbol ?descendBlockByCrouching\@Mob\@\@UEAAXXZ + * @vftbl 341 + * @symbol ?descendBlockByCrouching\@Mob\@\@UEAAXXZ */ virtual void descendBlockByCrouching(); /** - * @vftbl 345 - * @symbol ?dropContainer\@Mob\@\@UEAAXXZ + * @vftbl 342 + * @symbol ?dropContainer\@Mob\@\@UEAAXXZ */ virtual void dropContainer(); /** - * @vftbl 346 - * @symbol ?initBodyControl\@Mob\@\@MEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ + * @vftbl 343 + * @symbol ?initBodyControl\@Mob\@\@MEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 347 - * @symbol ?jumpFromGround\@Mob\@\@MEAAXXZ + * @vftbl 344 + * @symbol ?jumpFromGround\@Mob\@\@MEAAXAEBVIConstBlockSource\@\@\@Z */ - virtual void jumpFromGround(); + virtual void jumpFromGround(class IConstBlockSource const &); /** - * @vftbl 348 - * @symbol ?jumpFromGround\@Mob\@\@MEBAXAEAUIMobMovementProxy\@\@\@Z + * @vftbl 345 + * @symbol ?jumpFromGround\@Mob\@\@MEBAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - virtual void jumpFromGround(struct IMobMovementProxy &) const; + virtual void jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &) const; /** - * @vftbl 349 - * @symbol ?newServerAiStep\@Mob\@\@MEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@Mob\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 350 - * @symbol ?_serverAiMobStep\@Mob\@\@MEAAXXZ + * @vftbl 347 + * @symbol ?_serverAiMobStep\@Mob\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 351 - * @symbol ?dropBags\@Mob\@\@MEAAXXZ + * @vftbl 348 + * @symbol ?dropBags\@Mob\@\@MEAAXXZ */ virtual void dropBags(); /** - * @vftbl 352 - * @symbol ?tickDeath\@Mob\@\@MEAAXXZ + * @vftbl 349 + * @symbol ?tickDeath\@Mob\@\@MEAAXXZ */ virtual void tickDeath(); /** - * @vftbl 353 - * @symbol ?updateGliding\@Mob\@\@MEAAXXZ + * @vftbl 350 + * @symbol ?updateGliding\@Mob\@\@MEAAXXZ */ virtual void updateGliding(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 355 - * @symbol ?_getAdjustedAABBForSpawnCheck\@Mob\@\@MEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z + * @vftbl 352 + * @symbol ?_getAdjustedAABBForSpawnCheck\@Mob\@\@MEBA?AVAABB\@\@AEBV2\@AEBVVec3\@\@\@Z */ virtual class AABB _getAdjustedAABBForSpawnCheck(class AABB const &, class Vec3 const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOB /** - * @symbol ?_allowAscendingScaffolding\@Mob\@\@MEBA_NXZ + * @symbol ?_allowAscendingScaffolding\@Mob\@\@MEBA_NXZ */ MCVAPI bool _allowAscendingScaffolding() const; /** - * @symbol ?ate\@Mob\@\@UEAAXXZ + * @symbol ?ate\@Mob\@\@UEAAXXZ */ MCVAPI void ate(); /** - * @symbol ?canBeControlledByPassenger\@Mob\@\@UEAA_NXZ + * @symbol ?canBeControlledByPassenger\@Mob\@\@UEAA_NXZ */ MCVAPI bool canBeControlledByPassenger(); /** - * @symbol ?getSprintSpeedIncrease\@Mob\@\@UEBAMXZ - */ - MCVAPI float getSprintSpeedIncrease() const; - /** - * @symbol ?isShootable\@Mob\@\@UEAA_NXZ + * @symbol ?isShootable\@Mob\@\@UEAA_NXZ */ MCVAPI bool isShootable(); /** - * @symbol ?renderDebugServerState\@Mob\@\@UEAAXAEBVOptions\@\@\@Z + * @symbol ?renderDebugServerState\@Mob\@\@UEAAXAEBVOptions\@\@\@Z */ MCVAPI void renderDebugServerState(class Options const &); -#endif /** - * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + MCVAPI ~Mob(); +#endif /** - * @symbol ??0Mob\@\@QEAA\@AEAVLevel\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Mob\@\@QEAA\@AEAVLevel\@\@AEAVEntityContext\@\@\@Z */ MCAPI Mob(class Level &, class EntityContext &); /** - * @symbol ?_endJump\@Mob\@\@QEAAXXZ + * @symbol ??0Mob\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + */ + MCAPI Mob(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); + /** + * @symbol ?_endJump\@Mob\@\@QEAAXXZ */ MCAPI void _endJump(); /** - * @symbol ?addSpeedModifier\@Mob\@\@QEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z + * @symbol ?addSpeedModifier\@Mob\@\@QEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z */ MCAPI void addSpeedModifier(class mce::UUID const &, std::string const &, float); /** - * @symbol ?calcMoveRelativeSpeed\@Mob\@\@QEAAMW4TravelType\@\@\@Z + * @symbol ?calcMoveRelativeSpeed\@Mob\@\@QEAAMW4TravelType\@\@\@Z */ MCAPI float calcMoveRelativeSpeed(enum class TravelType); /** - * @symbol ?checkForPostHitDamageImmunity\@Mob\@\@QEAA_NMAEBVActorDamageSource\@\@\@Z + * @symbol ?checkForPostHitDamageImmunity\@Mob\@\@QEAA_NMAEBVActorDamageSource\@\@\@Z */ MCAPI bool checkForPostHitDamageImmunity(float, class ActorDamageSource const &); /** - * @symbol ?checkTotemDeathProtection\@Mob\@\@QEAA_NAEBVActorDamageSource\@\@\@Z + * @symbol ?checkTotemDeathProtection\@Mob\@\@QEAA_NAEBVActorDamageSource\@\@\@Z */ MCAPI bool checkTotemDeathProtection(class ActorDamageSource const &); /** - * @symbol ?createAI\@Mob\@\@QEAAXV?$vector\@UGoalDefinition\@\@V?$allocator\@UGoalDefinition\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?createAI\@Mob\@\@QEAAXV?$vector\@UGoalDefinition\@\@V?$allocator\@UGoalDefinition\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void createAI(std::vector); /** - * @symbol ?discardFriction\@Mob\@\@QEBA_NXZ - */ - MCAPI bool discardFriction() const; - /** - * @symbol ?emitJumpPreventedEvent\@Mob\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?emitJumpPreventedEvent\@Mob\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void emitJumpPreventedEvent(class BlockPos const &); /** - * @symbol ?frostWalk\@Mob\@\@QEAAXXZ + * @symbol ?frostWalk\@Mob\@\@QEAAXXZ */ MCAPI void frostWalk(); /** - * @symbol ?getBoundOrigin\@Mob\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?getBoundOrigin\@Mob\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos getBoundOrigin() const; /** - * @symbol ?getCaravanSize\@Mob\@\@QEBAHXZ + * @symbol ?getCaravanSize\@Mob\@\@QEBAHXZ */ MCAPI int getCaravanSize() const; /** - * @symbol ?getEatCounter\@Mob\@\@QEBAHXZ + * @symbol ?getEatCounter\@Mob\@\@QEBAHXZ */ MCAPI int getEatCounter() const; /** - * @symbol ?getFirstCaravanHead\@Mob\@\@QEAAPEAV1\@XZ + * @symbol ?getFirstCaravanHead\@Mob\@\@QEAAPEAV1\@XZ */ MCAPI class Mob * getFirstCaravanHead(); /** - * @symbol ?getGlidingTicks\@Mob\@\@QEBAHXZ + * @symbol ?getGlidingTicks\@Mob\@\@QEBAHXZ */ MCAPI int getGlidingTicks() const; /** - * @symbol ?getItemSlot\@Mob\@\@QEBAAEBVItemStack\@\@W4EquipmentSlot\@\@\@Z + * @symbol ?getItemSlot\@Mob\@\@QEBAAEBVItemStack\@\@W4EquipmentSlot\@\@\@Z */ MCAPI class ItemStack const & getItemSlot(enum class EquipmentSlot) const; /** - * @symbol ?getJumpEffectAmplifierValue\@Mob\@\@QEAAMXZ + * @symbol ?getJumpEffectAmplifierValue\@Mob\@\@QEAAMXZ */ MCAPI float getJumpEffectAmplifierValue(); /** - * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMXZ + * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMAEBVIConstBlockSource\@\@\@Z + */ + MCAPI float getJumpMultiplier(class IConstBlockSource const &); + /** + * @symbol ?getJumpMultiplier\@Mob\@\@QEAAMXZ */ MCAPI float getJumpMultiplier(); /** - * @symbol ?getJumpPower\@Mob\@\@QEBAMXZ + * @symbol ?getJumpPower\@Mob\@\@QEBAMXZ */ MCAPI float getJumpPower() const; /** - * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@XZ + * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@XZ */ MCAPI struct JumpPreventionResult getJumpPrevention(); /** - * @symbol ?getJumpTicks\@Mob\@\@QEBAHXZ + * @symbol ?getJumpPrevention\@Mob\@\@QEAA?AUJumpPreventionResult\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI struct JumpPreventionResult getJumpPrevention(class IConstBlockSource const &); + /** + * @symbol ?getJumpTicks\@Mob\@\@QEBAHXZ */ MCAPI int getJumpTicks() const; /** - * @symbol ?getMovementComponentCurrentSpeed\@Mob\@\@QEBAMXZ + * @symbol ?getMovementComponentCurrentSpeed\@Mob\@\@QEBAMXZ */ MCAPI float getMovementComponentCurrentSpeed() const; /** - * @symbol ?getNoActionTime\@Mob\@\@QEBAHXZ + * @symbol ?getNoActionTime\@Mob\@\@QEBAHXZ */ MCAPI int getNoActionTime() const; /** - * @symbol ?getRollCounter\@Mob\@\@QEBAHXZ + * @symbol ?getRollCounter\@Mob\@\@QEBAHXZ */ MCAPI int getRollCounter() const; /** - * @symbol ?getSwimSpeedMultiplier\@Mob\@\@QEBAMXZ + * @symbol ?getSwimSpeedMultiplier\@Mob\@\@QEBAMXZ */ MCAPI float getSwimSpeedMultiplier() const; /** - * @symbol ?getTargetCaptain\@Mob\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getTargetCaptain\@Mob\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getTargetCaptain() const; /** - * @symbol ?getTravelType\@Mob\@\@QEAA?AW4TravelType\@\@XZ + * @symbol ?getTravelType\@Mob\@\@QEAA?AW4TravelType\@\@XZ */ MCAPI enum class TravelType getTravelType(); /** - * @symbol ?getYBodyRotation\@Mob\@\@QEBAMXZ + * @symbol ?getYBodyRotation\@Mob\@\@QEBAMXZ */ MCAPI float getYBodyRotation() const; /** - * @symbol ?hasBoundOrigin\@Mob\@\@QEBA_NXZ + * @symbol ?hasBoundOrigin\@Mob\@\@QEBA_NXZ */ MCAPI bool hasBoundOrigin() const; /** - * @symbol ?hurtArmor\@Mob\@\@QEAAXAEBVActorDamageSource\@\@H\@Z + * @symbol ?hurtArmor\@Mob\@\@QEAAXAEBVActorDamageSource\@\@H\@Z */ MCAPI void hurtArmor(class ActorDamageSource const &, int); /** - * @symbol ?isAbleToMove\@Mob\@\@QEBA_NXZ + * @symbol ?isAbleToMove\@Mob\@\@QEBA_NXZ */ MCAPI bool isAbleToMove() const; /** - * @symbol ?isEating\@Mob\@\@QEBA_NXZ + * @symbol ?isEating\@Mob\@\@QEBA_NXZ */ MCAPI bool isEating() const; /** - * @symbol ?isFrostWalking\@Mob\@\@QEBA_NXZ + * @symbol ?isFrostWalking\@Mob\@\@QEBA_NXZ */ MCAPI bool isFrostWalking() const; /** - * @symbol ?isGliding\@Mob\@\@QEBA_NXZ + * @symbol ?isGliding\@Mob\@\@QEBA_NXZ */ MCAPI bool isGliding() const; /** - * @symbol ?isLayingEgg\@Mob\@\@QEBA_NXZ + * @symbol ?isLayingEgg\@Mob\@\@QEBA_NXZ */ MCAPI bool isLayingEgg() const; /** - * @symbol ?isPregnant\@Mob\@\@QEBA_NXZ + * @symbol ?isPregnant\@Mob\@\@QEBA_NXZ */ MCAPI bool isPregnant() const; /** - * @symbol ?isRolling\@Mob\@\@QEBA_NXZ + * @symbol ?isRolling\@Mob\@\@QEBA_NXZ */ MCAPI bool isRolling() const; /** - * @symbol ?isSprinting\@Mob\@\@QEBA_NXZ + * @symbol ?isSprinting\@Mob\@\@QEBA_NXZ */ MCAPI bool isSprinting() const; /** - * @symbol ?isTransitioningSitting\@Mob\@\@QEBA_NXZ + * @symbol ?isTransitioningSitting\@Mob\@\@QEBA_NXZ */ MCAPI bool isTransitioningSitting() const; /** - * @symbol ?onPlayerDimensionChanged\@Mob\@\@QEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @symbol ?onPlayerDimensionChanged\@Mob\@\@QEAAXPEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ MCAPI void onPlayerDimensionChanged(class Player *, class AutomaticID, class AutomaticID); /** - * @symbol ?onPlayerJump\@Mob\@\@QEAAXH\@Z + * @symbol ?onPlayerJump\@Mob\@\@QEAAXH\@Z */ MCAPI void onPlayerJump(int); /** - * @symbol ?removeSpeedModifier\@Mob\@\@QEAAXAEBVUUID\@mce\@\@\@Z + * @symbol ?removeSpeedModifier\@Mob\@\@QEAAXAEBVUUID\@mce\@\@\@Z */ MCAPI void removeSpeedModifier(class mce::UUID const &); /** - * @symbol ?resetAttributes\@Mob\@\@QEAAXXZ + * @symbol ?resetAttributes\@Mob\@\@QEAAXXZ */ MCAPI void resetAttributes(); /** - * @symbol ?resetNoActionTime\@Mob\@\@QEAAXXZ + * @symbol ?resetNoActionTime\@Mob\@\@QEAAXXZ */ MCAPI void resetNoActionTime(); /** - * @symbol ?sendArmorDamageSlot\@Mob\@\@QEAAXW4ArmorSlot\@\@\@Z + * @symbol ?sendArmorDamageSlot\@Mob\@\@QEAAXW4ArmorSlot\@\@\@Z */ MCAPI void sendArmorDamageSlot(enum class ArmorSlot); /** - * @symbol ?sendArmorSlot\@Mob\@\@QEAAXW4ArmorSlot\@\@\@Z + * @symbol ?sendArmorSlot\@Mob\@\@QEAAXW4ArmorSlot\@\@\@Z */ MCAPI void sendArmorSlot(enum class ArmorSlot); /** - * @symbol ?setEatCounter\@Mob\@\@QEAAXH\@Z + * @symbol ?setEatCounter\@Mob\@\@QEAAXH\@Z */ MCAPI void setEatCounter(int); /** - * @symbol ?setEating\@Mob\@\@QEAAX_N\@Z + * @symbol ?setEating\@Mob\@\@QEAAX_N\@Z */ MCAPI void setEating(bool); /** - * @symbol ?setIsLayingEgg\@Mob\@\@QEAAX_N\@Z + * @symbol ?setIsLayingEgg\@Mob\@\@QEAAX_N\@Z */ MCAPI void setIsLayingEgg(bool); /** - * @symbol ?setIsPregnant\@Mob\@\@QEAAX_N\@Z + * @symbol ?setIsPregnant\@Mob\@\@QEAAX_N\@Z */ MCAPI void setIsPregnant(bool); /** - * @symbol ?setJumpTicks\@Mob\@\@QEAAXH\@Z + * @symbol ?setJumpTicks\@Mob\@\@QEAAXH\@Z */ MCAPI void setJumpTicks(int); /** - * @symbol ?setMovementComponentCurrentSpeed\@Mob\@\@QEAAXM\@Z + * @symbol ?setMovementComponentCurrentSpeed\@Mob\@\@QEAAXM\@Z */ MCAPI void setMovementComponentCurrentSpeed(float); /** - * @symbol ?setNaturallySpawned\@Mob\@\@QEAAX_N\@Z + * @symbol ?setNaturallySpawned\@Mob\@\@QEAAX_N\@Z */ MCAPI void setNaturallySpawned(bool); /** - * @symbol ?setPassengerLockedBodyRot\@Mob\@\@QEAAXM\@Z + * @symbol ?setPassengerLockedBodyRot\@Mob\@\@QEAAXM\@Z */ MCAPI void setPassengerLockedBodyRot(float); /** - * @symbol ?setPassengerRotLimit\@Mob\@\@QEAAXM\@Z + * @symbol ?setPassengerRotLimit\@Mob\@\@QEAAXM\@Z */ MCAPI void setPassengerRotLimit(float); /** - * @symbol ?setRolling\@Mob\@\@QEAAX_N\@Z + * @symbol ?setRolling\@Mob\@\@QEAAX_N\@Z */ MCAPI void setRolling(bool); /** - * @symbol ?setSpawnMethod\@Mob\@\@QEAAXW4MobSpawnMethod\@\@\@Z + * @symbol ?setSpawnMethod\@Mob\@\@QEAAXW4MobSpawnMethod\@\@\@Z */ MCAPI void setSpawnMethod(enum class MobSpawnMethod); /** - * @symbol ?setSpeedModifier\@Mob\@\@QEAAXM\@Z + * @symbol ?setSpeedModifier\@Mob\@\@QEAAXM\@Z */ MCAPI void setSpeedModifier(float); /** - * @symbol ?setSurfaceMob\@Mob\@\@QEAAX_N\@Z + * @symbol ?setSurfaceMob\@Mob\@\@QEAAX_N\@Z */ MCAPI void setSurfaceMob(bool); /** - * @symbol ?setSwimSpeedMultiplier\@Mob\@\@QEAAXM\@Z + * @symbol ?setSwimSpeedMultiplier\@Mob\@\@QEAAXM\@Z */ MCAPI void setSwimSpeedMultiplier(float); /** - * @symbol ?setTargetCaptain\@Mob\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setTargetCaptain\@Mob\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setTargetCaptain(struct ActorUniqueID); /** - * @symbol ?setYBodyRotation\@Mob\@\@QEAAXM\@Z + * @symbol ?setYBodyRotation\@Mob\@\@QEAAXM\@Z */ MCAPI void setYBodyRotation(float); /** - * @symbol ?setYBodyRotations\@Mob\@\@QEAAXMM\@Z + * @symbol ?setYBodyRotations\@Mob\@\@QEAAXMM\@Z */ MCAPI void setYBodyRotations(float, float); /** - * @symbol ?snapToYBodyRot\@Mob\@\@QEAAXM\@Z + * @symbol ?snapToYBodyRot\@Mob\@\@QEAAXM\@Z */ MCAPI void snapToYBodyRot(float); /** - * @symbol ?snapToYHeadRot\@Mob\@\@QEAAXM\@Z + * @symbol ?snapToYHeadRot\@Mob\@\@QEAAXM\@Z */ MCAPI void snapToYHeadRot(float); /** - * @symbol ?tryFrostWalk\@Mob\@\@QEAAXXZ + * @symbol ?tryFrostWalk\@Mob\@\@QEAAXXZ */ MCAPI void tryFrostWalk(); /** - * @symbol ?tryProcessSoulSpeed\@Mob\@\@QEAAXXZ + * @symbol ?tryProcessSoulSpeed\@Mob\@\@QEAAXXZ */ MCAPI void tryProcessSoulSpeed(); /** - * @symbol ?tryUpdateAI\@Mob\@\@QEAAXXZ + * @symbol ?tryUpdateAI\@Mob\@\@QEAAXXZ */ MCAPI void tryUpdateAI(); /** - * @symbol ?ARMOR_DAMAGE_DIVISOR\@Mob\@\@2HB + * @symbol ?ARMOR_DAMAGE_DIVISOR\@Mob\@\@2HB */ MCAPI static int const ARMOR_DAMAGE_DIVISOR; /** - * @symbol ?ARMOR_PROTECTION_DIVIDER\@Mob\@\@2MB + * @symbol ?ARMOR_PROTECTION_DIVIDER\@Mob\@\@2MB */ MCAPI static float const ARMOR_PROTECTION_DIVIDER; /** - * @symbol ?ASCEND_BLOCK_BY_JUMPING_SPEED\@Mob\@\@2MB + * @symbol ?ASCEND_BLOCK_BY_JUMPING_SPEED\@Mob\@\@2MB */ MCAPI static float const ASCEND_BLOCK_BY_JUMPING_SPEED; /** - * @symbol ?BASE_ARMOR_TOUGHNESS\@Mob\@\@2MB + * @symbol ?BASE_ARMOR_TOUGHNESS\@Mob\@\@2MB */ MCAPI static float const BASE_ARMOR_TOUGHNESS; /** - * @symbol ?DEFAULT_GRAVITY\@Mob\@\@2MB + * @symbol ?DEFAULT_GRAVITY\@Mob\@\@2MB */ MCAPI static float const DEFAULT_GRAVITY; /** - * @symbol ?FRICTION_CONSTANT\@Mob\@\@2MB + * @symbol ?FRICTION_CONSTANT\@Mob\@\@2MB */ MCAPI static float const FRICTION_CONSTANT; /** - * @symbol ?FRICTION_CONSTANT_MODIFIED\@Mob\@\@2MB + * @symbol ?FRICTION_CONSTANT_MODIFIED\@Mob\@\@2MB */ MCAPI static float const FRICTION_CONSTANT_MODIFIED; /** - * @symbol ?FRICTION_MODIFIER\@Mob\@\@2MB + * @symbol ?FRICTION_MODIFIER\@Mob\@\@2MB */ MCAPI static float const FRICTION_MODIFIER; /** - * @symbol ?GLIDING_FALL_RESET_DELTA\@Mob\@\@2MB + * @symbol ?GLIDING_FALL_RESET_DELTA\@Mob\@\@2MB */ MCAPI static float const GLIDING_FALL_RESET_DELTA; /** - * @symbol ?LADDER_CLIMB_SPEED\@Mob\@\@2MB + * @symbol ?LADDER_CLIMB_SPEED\@Mob\@\@2MB */ MCAPI static float const LADDER_CLIMB_SPEED; /** - * @symbol ?MAX_ARMOR\@Mob\@\@2MB + * @symbol ?MAX_ARMOR\@Mob\@\@2MB */ MCAPI static float const MAX_ARMOR; /** - * @symbol ?MIN_ARMOR_RATIO\@Mob\@\@2MB + * @symbol ?MIN_ARMOR_RATIO\@Mob\@\@2MB */ MCAPI static float const MIN_ARMOR_RATIO; /** - * @symbol ?NUM_ARMOR_ITEMS\@Mob\@\@2MB + * @symbol ?NUM_ARMOR_ITEMS\@Mob\@\@2MB */ MCAPI static float const NUM_ARMOR_ITEMS; /** - * @symbol ?PLAYER_SWIMMING_SURFACE_OFFSET\@Mob\@\@2MB + * @symbol ?PLAYER_SWIMMING_SURFACE_OFFSET\@Mob\@\@2MB */ MCAPI static float const PLAYER_SWIMMING_SURFACE_OFFSET; /** - * @symbol ?REMOVE_PASSENGERS_DELAY\@Mob\@\@2HB + * @symbol ?REMOVE_PASSENGERS_DELAY\@Mob\@\@2HB */ MCAPI static int const REMOVE_PASSENGERS_DELAY; /** - * @symbol ?SLOW_FALL_GRAVITY\@Mob\@\@2MB + * @symbol ?SLOW_FALL_GRAVITY\@Mob\@\@2MB */ MCAPI static float const SLOW_FALL_GRAVITY; /** - * @symbol ?SPAWN_XP_DELAY\@Mob\@\@2HB + * @symbol ?SPAWN_XP_DELAY\@Mob\@\@2HB */ MCAPI static int const SPAWN_XP_DELAY; /** - * @symbol ?TOTAL_ROLL_STEPS\@Mob\@\@2HB + * @symbol ?TOTAL_ROLL_STEPS\@Mob\@\@2HB */ MCAPI static int const TOTAL_ROLL_STEPS; /** - * @symbol ?_aiStep\@Mob\@\@SAXAEAUIMobMovementProxy\@\@\@Z + * @symbol ?_aiStep\@Mob\@\@SAXAEAUIMobMovementProxy\@\@\@Z */ MCAPI static void _aiStep(struct IMobMovementProxy &); /** - * @symbol ?_calcMoveRelativeSpeed\@Mob\@\@SAMAEAUIMobMovementProxy\@\@W4TravelType\@\@\@Z + * @symbol ?_calcMoveRelativeSpeed\@Mob\@\@SAMAEAUIMobMovementProxy\@\@W4TravelType\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static float _calcMoveRelativeSpeed(struct IMobMovementProxy &, enum class TravelType); + MCAPI static float _calcMoveRelativeSpeed(struct IMobMovementProxy &, enum class TravelType, class IConstBlockSource const &); /** - * @symbol ?_travel\@Mob\@\@SAXAEAUIMobMovementProxy\@\@MMM\@Z + * @symbol ?_travel\@Mob\@\@SAXAEAUIMobMovementProxy\@\@MMM_N\@Z */ - MCAPI static void _travel(struct IMobMovementProxy &, float, float, float); + MCAPI static void _travel(struct IMobMovementProxy &, float, float, float, bool); /** - * @symbol ?_updateMobTravel\@Mob\@\@SAXAEAUIMobMovementProxy\@\@\@Z + * @symbol ?_updateMobTravel\@Mob\@\@SAXAEAUIMobMovementProxy\@\@_N\@Z */ - MCAPI static void _updateMobTravel(struct IMobMovementProxy &); + MCAPI static void _updateMobTravel(struct IMobMovementProxy &, bool); /** - * @symbol ?calculateJumpImpulse\@Mob\@\@SAMAEBUIMobMovementProxy\@\@\@Z + * @symbol ?calculateJumpImpulse\@Mob\@\@SAMAEBUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static float calculateJumpImpulse(struct IMobMovementProxy const &); + MCAPI static float calculateJumpImpulse(struct IMobMovementProxy const &, class IConstBlockSource const &); /** - * @symbol ?getJumpEffectAmplifierValue\@Mob\@\@SAMAEBUIMobMovementProxy\@\@\@Z + * @symbol ?getJumpEffectAmplifierValue\@Mob\@\@SAMAEBUIMobMovementProxy\@\@\@Z */ MCAPI static float getJumpEffectAmplifierValue(struct IMobMovementProxy const &); /** - * @symbol ?getJumpPrevention\@Mob\@\@SA?AUJumpPreventionResult\@\@AEBUIMobMovementProxy\@\@\@Z + * @symbol ?getJumpPrevention\@Mob\@\@SA?AUJumpPreventionResult\@\@AEBUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static struct JumpPreventionResult getJumpPrevention(struct IMobMovementProxy const &); + MCAPI static struct JumpPreventionResult getJumpPrevention(struct IMobMovementProxy const &, class IConstBlockSource const &); /** - * @symbol ?getTravelType\@Mob\@\@SA?AW4TravelType\@\@AEAUIMobMovementProxy\@\@\@Z + * @symbol ?getTravelType\@Mob\@\@SA?AW4TravelType\@\@AEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static enum class TravelType getTravelType(struct IMobMovementProxy &); + MCAPI static enum class TravelType getTravelType(struct IMobMovementProxy &, class IConstBlockSource const &); /** - * @symbol ?isImmobile\@Mob\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isImmobile\@Mob\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool isImmobile(struct IActorMovementProxy const &); /** - * @symbol ?setSprinting\@Mob\@\@SAXAEAVBaseAttributeMap\@\@VSynchedActorDataWriter\@\@_N\@Z + * @symbol ?setSprinting\@Mob\@\@SAXAEAVBaseAttributeMap\@\@VSynchedActorDataWriter\@\@_N\@Z */ MCAPI static void setSprinting(class BaseAttributeMap &, class SynchedActorDataWriter, bool); /** - * @symbol ?shouldApplyWaterGravity\@Mob\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?shouldApplyWaterGravity\@Mob\@\@SA_NAEBUIActorMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI static bool shouldApplyWaterGravity(struct IActorMovementProxy const &, class IConstBlockSource const &); + /** + * @symbol ?shouldApplyWaterGravity\@Mob\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI static bool shouldApplyWaterGravity(struct IActorMovementProxy const &); /** - * @symbol ?tryGetFromEntity\@Mob\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Mob\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class Mob * tryGetFromEntity(class EntityContext &, bool); //protected: /** - * @symbol ?_doSprintParticleEffect\@Mob\@\@IEAAXXZ + * @symbol ?_addBuiltInMobComponents\@Mob\@\@IEAA?AUBuiltInMobComponents\@\@XZ + */ + MCAPI struct BuiltInMobComponents _addBuiltInMobComponents(); + /** + * @symbol ?_doSprintParticleEffect\@Mob\@\@IEAAXXZ */ MCAPI void _doSprintParticleEffect(); /** - * @symbol ?_processSoulSpeed\@Mob\@\@IEAAXXZ + * @symbol ?_processSoulSpeed\@Mob\@\@IEAAXXZ */ MCAPI void _processSoulSpeed(); /** - * @symbol ?_registerMobAttributes\@Mob\@\@IEAAXXZ + * @symbol ?_registerMobAttributes\@Mob\@\@IEAAXXZ */ MCAPI void _registerMobAttributes(); /** - * @symbol ?getCurrentSwingDuration\@Mob\@\@IEAAHXZ + * @symbol ?getCurrentSwingDuration\@Mob\@\@IEAAHXZ */ MCAPI int getCurrentSwingDuration(); /** - * @symbol ?saveOffhand\@Mob\@\@IEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?saveOffhand\@Mob\@\@IEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr saveOffhand() const; /** - * @symbol ?setNoActionTime\@Mob\@\@IEAAXH\@Z + * @symbol ?setNoActionTime\@Mob\@\@IEAAXH\@Z */ MCAPI void setNoActionTime(int); /** - * @symbol ?tickEffects\@Mob\@\@IEAAXXZ + * @symbol ?tickEffects\@Mob\@\@IEAAXXZ */ MCAPI void tickEffects(); /** - * @symbol ?updateAttackAnim\@Mob\@\@IEAAXXZ + * @symbol ?updateAttackAnim\@Mob\@\@IEAAXXZ */ MCAPI void updateAttackAnim(); /** - * @symbol ?updateGlidingDurability\@Mob\@\@IEAA_NXZ + * @symbol ?updateGlidingDurability\@Mob\@\@IEAA_NXZ */ MCAPI bool updateGlidingDurability(); /** - * @symbol ?_jumpFromGround\@Mob\@\@KAXAEAUIMobMovementProxy\@\@\@Z + * @symbol ?_jumpFromGround\@Mob\@\@KAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void _jumpFromGround(struct IMobMovementProxy &); + MCAPI static void _jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &); //private: /** - * @symbol ?_initHardCodedComponents\@Mob\@\@AEAA_N_N\@Z + * @symbol ?_initHardCodedComponents\@Mob\@\@AEAA_N_N\@Z */ MCAPI bool _initHardCodedComponents(bool); /** - * @symbol ?_initialize\@Mob\@\@AEAAXAEAVEntityContext\@\@_N\@Z + * @symbol ?_initialize\@Mob\@\@AEAAXAEAVEntityContext\@\@_N\@Z */ MCAPI void _initialize(class EntityContext &, bool); /** - * @symbol ?_saveArmor\@Mob\@\@AEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_saveArmor\@Mob\@\@AEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr _saveArmor() const; /** - * @symbol ?_updateSprintingState\@Mob\@\@AEAAXXZ + * @symbol ?_updateSprintingState\@Mob\@\@AEAAXXZ */ MCAPI void _updateSprintingState(); /** - * @symbol ?_verifyAttributes\@Mob\@\@AEAAXXZ + * @symbol ?_verifyAttributes\@Mob\@\@AEAAXXZ */ MCAPI void _verifyAttributes(); /** - * @symbol ?_executeDash\@Mob\@\@CAXAEAV1\@AEAUIMobMovementProxy\@\@\@Z + * @symbol ?_executeDash\@Mob\@\@CAXAEAV1\@AEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void _executeDash(class Mob &, struct IMobMovementProxy &); + MCAPI static void _executeDash(class Mob &, struct IMobMovementProxy &, class IConstBlockSource const &); /** - * @symbol ?_tryApplyingLevitation\@Mob\@\@CA_NAEBUIMobMovementProxy\@\@AEAVVec3\@\@\@Z + * @symbol ?_tryApplyingLevitation\@Mob\@\@CA_NAEBUIMobMovementProxy\@\@AEAVVec3\@\@\@Z */ MCAPI static bool _tryApplyingLevitation(struct IMobMovementProxy const &, class Vec3 &); protected: /** - * @symbol ?MAX_INACTIVITY_TIMER\@Mob\@\@1HB + * @symbol ?MAX_INACTIVITY_TIMER\@Mob\@\@1HB */ MCAPI static int const MAX_INACTIVITY_TIMER; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobAnimation.hpp b/LiteLoader/include/llapi/mc/MobAnimation.hpp index 4dd8fa6fb4..e9b2ddc571 100644 --- a/LiteLoader/include/llapi/mc/MobAnimation.hpp +++ b/LiteLoader/include/llapi/mc/MobAnimation.hpp @@ -17,64 +17,12 @@ namespace MobAnimation { #undef AFTER_EXTRA /** - * @symbol ?getAnimStep\@MobAnimation\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?decrementHurtTime\@MobAnimation\@\@YAXV?$not_null\@PEAUMobHurtTimeComponent\@\@\@gsl\@\@\@Z */ - MCAPI float getAnimStep(class EntityContext const &); + MCAPI void decrementHurtTime(class gsl::not_null); /** - * @symbol ?getHurtTime\@MobAnimation\@\@YAHAEBVEntityContext\@\@\@Z + * @symbol ?getWalkAnimSpeedNewOld\@MobAnimation\@\@YA?AUInterpolationPair\@\@V?$not_null\@PEBUActorWalkAnimationComponent\@\@\@gsl\@\@\@Z */ - MCAPI int getHurtTime(class EntityContext const &); - /** - * @symbol ?getWalkAnimPos\@MobAnimation\@\@YAMAEBVEntityContext\@\@\@Z - */ - MCAPI float getWalkAnimPos(class EntityContext const &); - /** - * @symbol ?getWalkAnimSpeed\@MobAnimation\@\@YAMAEBVEntityContext\@\@\@Z - */ - MCAPI float getWalkAnimSpeed(class EntityContext const &); - /** - * @symbol ?getWalkAnimSpeedMultiplier\@MobAnimation\@\@YAMAEBVEntityContext\@\@\@Z - */ - MCAPI float getWalkAnimSpeedMultiplier(class EntityContext const &); - /** - * @symbol ?getWalkAnimSpeedNewOld\@MobAnimation\@\@YA?AUInterpolationPair\@\@AEBVEntityContext\@\@\@Z - */ - MCAPI struct InterpolationPair getWalkAnimSpeedNewOld(class EntityContext const &); - /** - * @symbol ?initializeActor\@MobAnimation\@\@YAXAEAVEntityContext\@\@\@Z - */ - MCAPI void initializeActor(class EntityContext &); - /** - * @symbol ?initializeMob\@MobAnimation\@\@YAXAEAVEntityContext\@\@\@Z - */ - MCAPI void initializeMob(class EntityContext &); - /** - * @symbol ?setAnimStep\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z - */ - MCAPI void setAnimStep(class EntityContext &, float); - /** - * @symbol ?setAnimStepO\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z - */ - MCAPI void setAnimStepO(class EntityContext &, float); - /** - * @symbol ?setHurtTime\@MobAnimation\@\@YAXAEAVEntityContext\@\@H\@Z - */ - MCAPI void setHurtTime(class EntityContext &, int); - /** - * @symbol ?setWalkAnimPos\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z - */ - MCAPI void setWalkAnimPos(class EntityContext &, float); - /** - * @symbol ?setWalkAnimSpeed\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z - */ - MCAPI void setWalkAnimSpeed(class EntityContext &, float); - /** - * @symbol ?setWalkAnimSpeedMultiplier\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z - */ - MCAPI void setWalkAnimSpeedMultiplier(class EntityContext &, float); - /** - * @symbol ?setWalkAnimSpeedO\@MobAnimation\@\@YAXAEAVEntityContext\@\@M\@Z - */ - MCAPI void setWalkAnimSpeedO(class EntityContext &, float); + MCAPI struct InterpolationPair getWalkAnimSpeedNewOld(class gsl::not_null); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp index cd1ccbec7a..dd135aff72 100644 --- a/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobArmorEquipmentPacket.hpp @@ -30,37 +30,43 @@ class MobArmorEquipmentPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobArmorEquipmentPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MobArmorEquipmentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MobArmorEquipmentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MobArmorEquipmentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MobArmorEquipmentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MobArmorEquipmentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MobArmorEquipmentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MobArmorEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBARMOREQUIPMENTPACKET /** - * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MobArmorEquipmentPacket(); + MCVAPI ~MobArmorEquipmentPacket(); +#endif /** - * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI MobArmorEquipmentPacket(class Actor const &); + /** + * @symbol ??0MobArmorEquipmentPacket\@\@QEAA\@XZ + */ + MCAPI MobArmorEquipmentPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobDescriptor.hpp b/LiteLoader/include/llapi/mc/MobDescriptor.hpp index df4704d39f..dca20f0037 100644 --- a/LiteLoader/include/llapi/mc/MobDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/MobDescriptor.hpp @@ -21,17 +21,20 @@ struct MobDescriptor { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBDESCRIPTOR public: - struct MobDescriptor& operator=(struct MobDescriptor const &) = delete; MobDescriptor() = delete; #endif public: /** - * @symbol ??0MobDescriptor\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0MobDescriptor\@\@QEAA\@AEBU0\@\@Z */ MCAPI MobDescriptor(struct MobDescriptor const &); /** - * @symbol ??1MobDescriptor\@\@QEAA\@XZ + * @symbol ??4MobDescriptor\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct MobDescriptor & operator=(struct MobDescriptor const &); + /** + * @symbol ??1MobDescriptor\@\@QEAA\@XZ */ MCAPI ~MobDescriptor(); diff --git a/LiteLoader/include/llapi/mc/MobEffect.hpp b/LiteLoader/include/llapi/mc/MobEffect.hpp index 99906d60fc..06316af89f 100644 --- a/LiteLoader/include/llapi/mc/MobEffect.hpp +++ b/LiteLoader/include/llapi/mc/MobEffect.hpp @@ -69,270 +69,276 @@ class MobEffect { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEffect(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?applyEffects\@MobEffect\@\@UEBAXPEAVActor\@\@HH\@Z + * @vftbl 1 + * @symbol ?applyEffects\@MobEffect\@\@UEBAXPEAVActor\@\@HH\@Z */ virtual void applyEffects(class Actor *, int, int) const; /** - * @vftbl 2 - * @symbol ?removeEffects\@MobEffect\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?removeEffects\@MobEffect\@\@UEAAXPEAVActor\@\@\@Z */ virtual void removeEffects(class Actor *); /** - * @vftbl 3 - * @symbol ?updateEffects\@MobEffect\@\@UEAAXPEAVActor\@\@HH\@Z + * @vftbl 3 + * @symbol ?updateEffects\@MobEffect\@\@UEAAXPEAVActor\@\@HH\@Z */ virtual void updateEffects(class Actor *, int, int); /** - * @vftbl 4 - * @symbol ?applyInstantaneousEffect\@MobEffect\@\@UEBAXPEAVActor\@\@00HM\@Z + * @vftbl 4 + * @symbol ?applyInstantaneousEffect\@MobEffect\@\@UEBAXPEAVActor\@\@00HM\@Z */ virtual void applyInstantaneousEffect(class Actor *, class Actor *, class Actor *, int, float) const; /** - * @vftbl 5 - * @symbol ?isInstantaneous\@MobEffect\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isInstantaneous\@MobEffect\@\@UEBA_NXZ */ virtual bool isInstantaneous() const; /** - * @vftbl 6 - * @symbol ?getAttributeModifierValue\@MobEffect\@\@UEBAMHAEBVAttributeModifier\@\@\@Z + * @vftbl 6 + * @symbol ?getAttributeModifierValue\@MobEffect\@\@UEBAMHAEBVAttributeModifier\@\@\@Z */ virtual float getAttributeModifierValue(int, class AttributeModifier const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEFFECT /** - * @symbol ??0MobEffect\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH01AEBUFactorCalculationData\@0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MobEffect(); +#endif + /** + * @symbol ??0MobEffect\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_NHH01AEBUFactorCalculationData\@0\@\@Z */ MCAPI MobEffect(unsigned int, std::string const &, std::string const &, bool, int, int, std::string const &, bool, struct MobEffect::FactorCalculationData const &); /** - * @symbol ?addAttributeBuff\@MobEffect\@\@QEAAXAEBVAttribute\@\@V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@\@Z + * @symbol ?addAttributeBuff\@MobEffect\@\@QEAAXAEBVAttribute\@\@V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@\@Z */ MCAPI void addAttributeBuff(class Attribute const &, class std::shared_ptr); /** - * @symbol ?addAttributeModifier\@MobEffect\@\@QEAAXAEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z + * @symbol ?addAttributeModifier\@MobEffect\@\@QEAAXAEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@Z */ MCAPI void addAttributeModifier(class Attribute const &, class std::shared_ptr); /** - * @symbol ?getColor\@MobEffect\@\@QEBAAEBVColor\@mce\@\@XZ + * @symbol ?getColor\@MobEffect\@\@QEBAAEBVColor\@mce\@\@XZ */ MCAPI class mce::Color const & getColor() const; /** - * @symbol ?getComponentName\@MobEffect\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getComponentName\@MobEffect\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getComponentName() const; /** - * @symbol ?getDescriptionId\@MobEffect\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@MobEffect\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDescriptionId() const; /** - * @symbol ?getDurationModifier\@MobEffect\@\@QEBAMXZ + * @symbol ?getDurationModifier\@MobEffect\@\@QEBAMXZ */ MCAPI float getDurationModifier() const; /** - * @symbol ?getFactorCalculationData\@MobEffect\@\@QEBAAEBUFactorCalculationData\@1\@XZ + * @symbol ?getFactorCalculationData\@MobEffect\@\@QEBAAEBUFactorCalculationData\@1\@XZ */ MCAPI struct MobEffect::FactorCalculationData const & getFactorCalculationData() const; /** - * @symbol ?getId\@MobEffect\@\@QEBAIXZ + * @symbol ?getId\@MobEffect\@\@QEBAIXZ */ MCAPI unsigned int getId() const; /** - * @symbol ?getResourceName\@MobEffect\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getResourceName\@MobEffect\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getResourceName() const; /** - * @symbol ?isHarmful\@MobEffect\@\@QEBA_NXZ + * @symbol ?isHarmful\@MobEffect\@\@QEBA_NXZ */ MCAPI bool isHarmful() const; /** - * @symbol ?isVisible\@MobEffect\@\@QEBA_NXZ + * @symbol ?isVisible\@MobEffect\@\@QEBA_NXZ */ MCAPI bool isVisible() const; /** - * @symbol ?setDurationAmplifier\@MobEffect\@\@QEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z + * @symbol ?setDurationAmplifier\@MobEffect\@\@QEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z */ MCAPI void setDurationAmplifier(class std::shared_ptr); /** - * @symbol ?setValueAmplifier\@MobEffect\@\@QEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z + * @symbol ?setValueAmplifier\@MobEffect\@\@QEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z */ MCAPI void setValueAmplifier(class std::shared_ptr); /** - * @symbol ?viewAttributeModifiers\@MobEffect\@\@QEBAAEBV?$vector\@U?$pair\@PEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@PEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?viewAttributeModifiers\@MobEffect\@\@QEBAAEBV?$vector\@U?$pair\@PEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@PEBVAttribute\@\@V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector>> const & viewAttributeModifiers() const; /** - * @symbol ?ABSORPTION\@MobEffect\@\@2PEAV1\@EA + * @symbol ?ABSORPTION\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * ABSORPTION; /** - * @symbol ?BAD_OMEN\@MobEffect\@\@2PEAV1\@EA + * @symbol ?BAD_OMEN\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * BAD_OMEN; /** - * @symbol ?BLINDNESS\@MobEffect\@\@2PEAV1\@EA + * @symbol ?BLINDNESS\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * BLINDNESS; /** - * @symbol ?CONDUIT_POWER\@MobEffect\@\@2PEAV1\@EA + * @symbol ?CONDUIT_POWER\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * CONDUIT_POWER; /** - * @symbol ?CONFUSION\@MobEffect\@\@2PEAV1\@EA + * @symbol ?CONFUSION\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * CONFUSION; /** - * @symbol ?DAMAGE_BOOST\@MobEffect\@\@2PEAV1\@EA + * @symbol ?DAMAGE_BOOST\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * DAMAGE_BOOST; /** - * @symbol ?DAMAGE_RESISTANCE\@MobEffect\@\@2PEAV1\@EA + * @symbol ?DAMAGE_RESISTANCE\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * DAMAGE_RESISTANCE; /** - * @symbol ?DARKNESS\@MobEffect\@\@2PEAV1\@EA + * @symbol ?DARKNESS\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * DARKNESS; /** - * @symbol ?DEFAULT_COLOR\@MobEffect\@\@2VColor\@mce\@\@B + * @symbol ?DEFAULT_COLOR\@MobEffect\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const DEFAULT_COLOR; /** - * @symbol ?DIG_SLOWDOWN\@MobEffect\@\@2PEAV1\@EA + * @symbol ?DIG_SLOWDOWN\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * DIG_SLOWDOWN; /** - * @symbol ?DIG_SPEED\@MobEffect\@\@2PEAV1\@EA + * @symbol ?DIG_SPEED\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * DIG_SPEED; /** - * @symbol ?EMPTY_EFFECT\@MobEffect\@\@2PEAV1\@EA + * @symbol ?EMPTY_EFFECT\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * EMPTY_EFFECT; /** - * @symbol ?FATAL_POISON\@MobEffect\@\@2PEAV1\@EA + * @symbol ?FATAL_POISON\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * FATAL_POISON; /** - * @symbol ?FIRE_RESISTANCE\@MobEffect\@\@2PEAV1\@EA + * @symbol ?FIRE_RESISTANCE\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * FIRE_RESISTANCE; /** - * @symbol ?HARM\@MobEffect\@\@2PEAV1\@EA + * @symbol ?HARM\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * HARM; /** - * @symbol ?HEAL\@MobEffect\@\@2PEAV1\@EA + * @symbol ?HEAL\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * HEAL; /** - * @symbol ?HEALTH_BOOST\@MobEffect\@\@2PEAV1\@EA + * @symbol ?HEALTH_BOOST\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * HEALTH_BOOST; /** - * @symbol ?HERO_OF_THE_VILLAGE\@MobEffect\@\@2PEAV1\@EA + * @symbol ?HERO_OF_THE_VILLAGE\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * HERO_OF_THE_VILLAGE; /** - * @symbol ?HUNGER\@MobEffect\@\@2PEAV1\@EA + * @symbol ?HUNGER\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * HUNGER; /** - * @symbol ?INVISIBILITY\@MobEffect\@\@2PEAV1\@EA + * @symbol ?INVISIBILITY\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * INVISIBILITY; /** - * @symbol ?JUMP\@MobEffect\@\@2PEAV1\@EA + * @symbol ?JUMP\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * JUMP; /** - * @symbol ?LEVITATION\@MobEffect\@\@2PEAV1\@EA + * @symbol ?LEVITATION\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * LEVITATION; /** - * @symbol ?MOVEMENT_SLOWDOWN\@MobEffect\@\@2PEAV1\@EA + * @symbol ?MOVEMENT_SLOWDOWN\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * MOVEMENT_SLOWDOWN; /** - * @symbol ?MOVEMENT_SPEED\@MobEffect\@\@2PEAV1\@EA + * @symbol ?MOVEMENT_SPEED\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * MOVEMENT_SPEED; /** - * @symbol ?NIGHT_VISION\@MobEffect\@\@2PEAV1\@EA + * @symbol ?NIGHT_VISION\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * NIGHT_VISION; /** - * @symbol ?POISON\@MobEffect\@\@2PEAV1\@EA + * @symbol ?POISON\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * POISON; /** - * @symbol ?REGENERATION\@MobEffect\@\@2PEAV1\@EA + * @symbol ?REGENERATION\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * REGENERATION; /** - * @symbol ?SATURATION\@MobEffect\@\@2PEAV1\@EA + * @symbol ?SATURATION\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * SATURATION; /** - * @symbol ?SLOW_FALLING\@MobEffect\@\@2PEAV1\@EA + * @symbol ?SLOW_FALLING\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * SLOW_FALLING; /** - * @symbol ?WATER_BREATHING\@MobEffect\@\@2PEAV1\@EA + * @symbol ?WATER_BREATHING\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * WATER_BREATHING; /** - * @symbol ?WEAKNESS\@MobEffect\@\@2PEAV1\@EA + * @symbol ?WEAKNESS\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * WEAKNESS; /** - * @symbol ?WITHER\@MobEffect\@\@2PEAV1\@EA + * @symbol ?WITHER\@MobEffect\@\@2PEAV1\@EA */ MCAPI static class MobEffect * WITHER; /** - * @symbol ?getById\@MobEffect\@\@SAPEAV1\@I\@Z + * @symbol ?getById\@MobEffect\@\@SAPEAV1\@I\@Z */ MCAPI static class MobEffect * getById(unsigned int); /** - * @symbol ?getByName\@MobEffect\@\@SAPEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getByName\@MobEffect\@\@SAPEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class MobEffect * getByName(std::string const &); /** - * @symbol ?getNameById\@MobEffect\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@Z + * @symbol ?getNameById\@MobEffect\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@Z */ MCAPI static std::string getNameById(unsigned int); /** - * @symbol ?initEffects\@MobEffect\@\@SAXPEAVResourcePackManager\@\@AEBVExperiments\@\@\@Z + * @symbol ?initEffects\@MobEffect\@\@SAXPEAVResourcePackManager\@\@AEBVExperiments\@\@\@Z */ MCAPI static void initEffects(class ResourcePackManager *, class Experiments const &); /** - * @symbol ?mMobEffects\@MobEffect\@\@2PAV?$unique_ptr\@VMobEffect\@\@U?$default_delete\@VMobEffect\@\@\@std\@\@\@std\@\@A + * @symbol ?mMobEffects\@MobEffect\@\@2PAV?$unique_ptr\@VMobEffect\@\@U?$default_delete\@VMobEffect\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mMobEffects[]; /** - * @symbol ?shutdownEffects\@MobEffect\@\@SAXXZ + * @symbol ?shutdownEffects\@MobEffect\@\@SAXXZ */ MCAPI static void shutdownEffects(); //protected: /** - * @symbol ?_createAttributeModifer\@MobEffect\@\@IEBA?AVAttributeModifier\@\@AEBV2\@H\@Z + * @symbol ?_createAttributeModifer\@MobEffect\@\@IEBA?AVAttributeModifier\@\@AEBV2\@H\@Z */ MCAPI class AttributeModifier _createAttributeModifer(class AttributeModifier const &, int) const; /** - * @symbol ?_createInstantBuff\@MobEffect\@\@IEBA?AVInstantaneousAttributeBuff\@\@AEBVAttributeBuff\@\@HM\@Z + * @symbol ?_createInstantBuff\@MobEffect\@\@IEBA?AVInstantaneousAttributeBuff\@\@AEBVAttributeBuff\@\@HM\@Z */ MCAPI class InstantaneousAttributeBuff _createInstantBuff(class AttributeBuff const &, int, float) const; /** - * @symbol ?_createTemporalBuff\@MobEffect\@\@IEBA?AVTemporalAttributeBuff\@\@AEBVAttributeBuff\@\@HH\@Z + * @symbol ?_createTemporalBuff\@MobEffect\@\@IEBA?AVTemporalAttributeBuff\@\@AEBVAttributeBuff\@\@HH\@Z */ MCAPI class TemporalAttributeBuff _createTemporalBuff(class AttributeBuff const &, int, int) const; //private: /** - * @symbol ?darknessEffectFactorUpdate\@MobEffect\@\@CAXAEAUFactorCalculationData\@1\@H\@Z + * @symbol ?darknessEffectFactorUpdate\@MobEffect\@\@CAXAEAUFactorCalculationData\@1\@H\@Z */ MCAPI static void darknessEffectFactorUpdate(struct MobEffect::FactorCalculationData &, int); @@ -340,4 +346,4 @@ class MobEffect { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp b/LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp index eafc74d20e..d619b99dfd 100644 --- a/LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectChangeDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MobEffectChangeDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MobEffectChangeDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MobEffectChangeDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MobEffectChangeDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MobEffectChangeDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MobEffectChangeDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEFFECTCHANGEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MobEffectChangeDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MobEffectChangeDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectComponent.hpp b/LiteLoader/include/llapi/mc/MobEffectComponent.hpp index 0a83206364..1ef2e69be0 100644 --- a/LiteLoader/include/llapi/mc/MobEffectComponent.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectComponent.hpp @@ -29,32 +29,32 @@ class MobEffectComponent { public: /** - * @symbol ??0MobEffectComponent\@\@QEAA\@XZ + * @symbol ??0MobEffectComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI MobEffectComponent(); + MCAPI MobEffectComponent(class MobEffectComponent &&); /** - * @symbol ??0MobEffectComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0MobEffectComponent\@\@QEAA\@XZ */ - MCAPI MobEffectComponent(class MobEffectComponent &&); + MCAPI MobEffectComponent(); /** - * @symbol ?addAdditionalSaveData\@MobEffectComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z + * @symbol ?addAdditionalSaveData\@MobEffectComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &, class Actor const &) const; /** - * @symbol ??4MobEffectComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4MobEffectComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class MobEffectComponent & operator=(class MobEffectComponent &&); /** - * @symbol ?readAdditionalSaveData\@MobEffectComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@MobEffectComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?tick\@MobEffectComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?tick\@MobEffectComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void tick(class Actor &); /** - * @symbol ??1MobEffectComponent\@\@QEAA\@XZ + * @symbol ??1MobEffectComponent\@\@QEAA\@XZ */ MCAPI ~MobEffectComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectDefinition.hpp b/LiteLoader/include/llapi/mc/MobEffectDefinition.hpp index e691dd42f8..190a4fefc0 100644 --- a/LiteLoader/include/llapi/mc/MobEffectDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectDefinition.hpp @@ -30,36 +30,28 @@ class MobEffectDefinition { public: /** - * @symbol ??0MobEffectDefinition\@\@QEAA\@XZ + * @symbol ??0MobEffectDefinition\@\@QEAA\@XZ */ MCAPI MobEffectDefinition(); /** - * @symbol ?initialize\@MobEffectDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMobEffectComponent\@\@\@Z + * @symbol ?initialize\@MobEffectDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMobEffectComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class MobEffectComponent &) const; /** - * @symbol ?setCooldownTimeInTicks\@MobEffectDefinition\@\@QEAAXAEBH\@Z + * @symbol ?setCooldownTimeInTicks\@MobEffectDefinition\@\@QEAAXAEBH\@Z */ MCAPI void setCooldownTimeInTicks(int const &); /** - * @symbol ?setEffectTimeInTicks\@MobEffectDefinition\@\@QEAAXAEBH\@Z + * @symbol ?setEffectTimeInTicks\@MobEffectDefinition\@\@QEAAXAEBH\@Z */ MCAPI void setEffectTimeInTicks(int const &); /** - * @symbol ?setMobEffectByName\@MobEffectDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setMobEffectByName\@MobEffectDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setMobEffectByName(std::string const &); /** - * @symbol ?buildSchema\@MobEffectDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMobEffectDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@MobEffectDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMobEffectDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -//private: - /** - * @symbol ?_parseMobEffectId\@MobEffectDefinition\@\@CAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static int _parseMobEffectId(std::string const &); - -private: - -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp index 56e041a21d..084dc245f3 100644 --- a/LiteLoader/include/llapi/mc/MobEffectInstance.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectInstance.hpp @@ -31,156 +31,156 @@ char filler[122]; public: /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool); + MCAPI MobEffectInstance(unsigned int, int, int); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool); + MCAPI MobEffectInstance(class MobEffectInstance &&); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IHH\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHH_N00\@Z */ - MCAPI MobEffectInstance(unsigned int, int, int); + MCAPI MobEffectInstance(unsigned int, int, int, bool, bool, bool); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z */ - MCAPI MobEffectInstance(unsigned int, int); + MCAPI MobEffectInstance(unsigned int); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@I\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IH\@Z */ - MCAPI MobEffectInstance(unsigned int); + MCAPI MobEffectInstance(unsigned int, int); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@IHHHHH_N00\@Z */ - MCAPI MobEffectInstance(class MobEffectInstance &&); + MCAPI MobEffectInstance(unsigned int, int, int, int, int, int, bool, bool, bool); /** - * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MobEffectInstance\@\@QEAA\@AEBV0\@\@Z */ MCAPI MobEffectInstance(class MobEffectInstance const &); /** - * @symbol ?applyEffects\@MobEffectInstance\@\@QEAAXPEAVActor\@\@\@Z + * @symbol ?applyEffects\@MobEffectInstance\@\@QEAAXPEAVActor\@\@\@Z */ MCAPI void applyEffects(class Actor *); /** - * @symbol ?displaysOnScreenTextureAnimation\@MobEffectInstance\@\@QEBA_NXZ + * @symbol ?displaysOnScreenTextureAnimation\@MobEffectInstance\@\@QEBA_NXZ */ MCAPI bool displaysOnScreenTextureAnimation() const; /** - * @symbol ?getAmplifier\@MobEffectInstance\@\@QEBAHXZ + * @symbol ?getAmplifier\@MobEffectInstance\@\@QEBAHXZ */ MCAPI int getAmplifier() const; /** - * @symbol ?getComponentName\@MobEffectInstance\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getComponentName\@MobEffectInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getComponentName() const; /** - * @symbol ?getDifficulityDuration\@MobEffectInstance\@\@QEBAHW4Difficulty\@\@\@Z + * @symbol ?getDifficulityDuration\@MobEffectInstance\@\@QEBAHW4Difficulty\@\@\@Z */ MCAPI int getDifficulityDuration(enum class Difficulty) const; /** - * @symbol ?getDisplayName\@MobEffectInstance\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDisplayName\@MobEffectInstance\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDisplayName() const; /** - * @symbol ?getDuration\@MobEffectInstance\@\@QEBAHXZ + * @symbol ?getDuration\@MobEffectInstance\@\@QEBAHXZ */ MCAPI int getDuration() const; /** - * @symbol ?getId\@MobEffectInstance\@\@QEBAIXZ + * @symbol ?getId\@MobEffectInstance\@\@QEBAIXZ */ MCAPI unsigned int getId() const; /** - * @symbol ?getLingerDuration\@MobEffectInstance\@\@QEBAHXZ + * @symbol ?getLingerDuration\@MobEffectInstance\@\@QEBAHXZ */ MCAPI int getLingerDuration() const; /** - * @symbol ?getSplashDuration\@MobEffectInstance\@\@QEBAHXZ + * @symbol ?getSplashDuration\@MobEffectInstance\@\@QEBAHXZ */ MCAPI int getSplashDuration() const; /** - * @symbol ?getSplashEffect\@MobEffectInstance\@\@QEBA?AV1\@XZ + * @symbol ?getSplashEffect\@MobEffectInstance\@\@QEBA?AV1\@XZ */ MCAPI class MobEffectInstance getSplashEffect() const; /** - * @symbol ?isAmbient\@MobEffectInstance\@\@QEBA_NXZ + * @symbol ?isAmbient\@MobEffectInstance\@\@QEBA_NXZ */ MCAPI bool isAmbient() const; /** - * @symbol ?isEffectVisible\@MobEffectInstance\@\@QEBA_NXZ + * @symbol ?isEffectVisible\@MobEffectInstance\@\@QEBA_NXZ */ MCAPI bool isEffectVisible() const; /** - * @symbol ??9MobEffectInstance\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9MobEffectInstance\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class MobEffectInstance const &) const; /** - * @symbol ??4MobEffectInstance\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4MobEffectInstance\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class MobEffectInstance & operator=(class MobEffectInstance &&); /** - * @symbol ??4MobEffectInstance\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4MobEffectInstance\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class MobEffectInstance & operator=(class MobEffectInstance const &); /** - * @symbol ??8MobEffectInstance\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8MobEffectInstance\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class MobEffectInstance const &) const; /** - * @symbol ?removeEffects\@MobEffectInstance\@\@QEBAXPEAVActor\@\@\@Z + * @symbol ?removeEffects\@MobEffectInstance\@\@QEBAXPEAVActor\@\@\@Z */ MCAPI void removeEffects(class Actor *) const; /** - * @symbol ?save\@MobEffectInstance\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@MobEffectInstance\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ?setDifficulityDuration\@MobEffectInstance\@\@QEAAXW4Difficulty\@\@H\@Z + * @symbol ?setDifficulityDuration\@MobEffectInstance\@\@QEAAXW4Difficulty\@\@H\@Z */ MCAPI void setDifficulityDuration(enum class Difficulty, int); /** - * @symbol ?setDuration\@MobEffectInstance\@\@QEAAXH\@Z + * @symbol ?setDuration\@MobEffectInstance\@\@QEAAXH\@Z */ MCAPI void setDuration(int); /** - * @symbol ?tick\@MobEffectInstance\@\@QEAA_NPEAVActor\@\@\@Z + * @symbol ?tick\@MobEffectInstance\@\@QEAA_NPEAVActor\@\@\@Z */ MCAPI bool tick(class Actor *); /** - * @symbol ?tryInitializeMobEffectData\@MobEffectInstance\@\@QEAAXXZ + * @symbol ?tryInitializeMobEffectData\@MobEffectInstance\@\@QEAAXXZ */ MCAPI void tryInitializeMobEffectData(); /** - * @symbol ?update\@MobEffectInstance\@\@QEAAXAEBV1\@\@Z + * @symbol ?update\@MobEffectInstance\@\@QEAAXAEBV1\@\@Z */ MCAPI void update(class MobEffectInstance const &); /** - * @symbol ?updateEffects\@MobEffectInstance\@\@QEBAXPEAVActor\@\@\@Z + * @symbol ?updateEffects\@MobEffectInstance\@\@QEBAXPEAVActor\@\@\@Z */ MCAPI void updateEffects(class Actor *) const; /** - * @symbol ??1MobEffectInstance\@\@QEAA\@XZ + * @symbol ??1MobEffectInstance\@\@QEAA\@XZ */ MCAPI ~MobEffectInstance(); /** - * @symbol ?MAX_AMPLIFIER_COUNT\@MobEffectInstance\@\@2HB + * @symbol ?MAX_AMPLIFIER_COUNT\@MobEffectInstance\@\@2HB */ MCAPI static int const MAX_AMPLIFIER_COUNT; /** - * @symbol ?NO_EFFECT\@MobEffectInstance\@\@2V1\@B + * @symbol ?NO_EFFECT\@MobEffectInstance\@\@2V1\@B */ MCAPI static class MobEffectInstance const NO_EFFECT; /** - * @symbol ?areAllEffectsAmbientOrInvisible\@MobEffectInstance\@\@SA_NAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?areAllEffectsAmbientOrInvisible\@MobEffectInstance\@\@SA_NAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static bool areAllEffectsAmbientOrInvisible(std::vector const &); /** - * @symbol ?getColorValue\@MobEffectInstance\@\@SA?AVColor\@mce\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getColorValue\@MobEffectInstance\@\@SA?AVColor\@mce\@\@AEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static class mce::Color getColorValue(std::vector const &); /** - * @symbol ?load\@MobEffectInstance\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z + * @symbol ?load\@MobEffectInstance\@\@SA?AV1\@AEBVCompoundTag\@\@\@Z */ MCAPI static class MobEffectInstance load(class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp index 54d8f08282..c7099f4a51 100644 --- a/LiteLoader/include/llapi/mc/MobEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectPacket.hpp @@ -30,37 +30,43 @@ class MobEffectPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEffectPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MobEffectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MobEffectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MobEffectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MobEffectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MobEffectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MobEffectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MobEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MobEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEFFECTPACKET /** - * @symbol ??0MobEffectPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MobEffectPacket(); +#endif + /** + * @symbol ??0MobEffectPacket\@\@QEAA\@XZ */ MCAPI MobEffectPacket(); /** - * @symbol ??0MobEffectPacket\@\@QEAA\@VActorRuntimeID\@\@W4Event\@0\@HHH_N\@Z + * @symbol ??0MobEffectPacket\@\@QEAA\@VActorRuntimeID\@\@W4Event\@0\@HHH_N\@Z */ MCAPI MobEffectPacket(class ActorRuntimeID, enum class MobEffectPacket::Event, int, int, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectPacketUtils.hpp b/LiteLoader/include/llapi/mc/MobEffectPacketUtils.hpp index af184017de..154e093a5b 100644 --- a/LiteLoader/include/llapi/mc/MobEffectPacketUtils.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectPacketUtils.hpp @@ -20,7 +20,7 @@ namespace MobEffectPacketUtils { #undef AFTER_EXTRA /** - * @symbol ?shouldAlwaysSendToClient\@MobEffectPacketUtils\@\@YA_NI\@Z + * @symbol ?shouldAlwaysSendToClient\@MobEffectPacketUtils\@\@YA_NI\@Z */ MCAPI bool shouldAlwaysSendToClient(unsigned int); diff --git a/LiteLoader/include/llapi/mc/MobEffectResponse.hpp b/LiteLoader/include/llapi/mc/MobEffectResponse.hpp index ee3e7a78fc..e41cad5142 100644 --- a/LiteLoader/include/llapi/mc/MobEffectResponse.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectResponse.hpp @@ -31,28 +31,28 @@ class MobEffectResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEffectResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@MobEffectResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@MobEffectResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@MobEffectResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@MobEffectResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@MobEffectResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@MobEffectResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@MobEffectResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@MobEffectResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp index a326e03646..c68b85e9ea 100644 --- a/LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectSubcomponent.hpp @@ -30,41 +30,47 @@ class MobEffectSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEffectSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@MobEffectSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@MobEffectSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@MobEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@MobEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@MobEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@MobEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@MobEffectSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@MobEffectSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEFFECTSUBCOMPONENT /** - * @symbol ??0MobEffectSubcomponent\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MobEffectSubcomponent(); +#endif + /** + * @symbol ??0MobEffectSubcomponent\@\@QEAA\@XZ */ MCAPI MobEffectSubcomponent(); //private: /** - * @symbol ?_addEffectFromJSON\@MobEffectSubcomponent\@\@AEAAXAEAVValue\@Json\@\@\@Z + * @symbol ?_addEffectFromJSON\@MobEffectSubcomponent\@\@AEAAXAEAVValue\@Json\@\@\@Z */ MCAPI void _addEffectFromJSON(class Json::Value &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectSystem.hpp b/LiteLoader/include/llapi/mc/MobEffectSystem.hpp index 73b764df71..97ee8c6c97 100644 --- a/LiteLoader/include/llapi/mc/MobEffectSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectSystem.hpp @@ -30,27 +30,27 @@ class MobEffectSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEffectSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@MobEffectSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@MobEffectSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@MobEffectSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVMobEffectComponent\@\@\@Z + * @symbol ?_tickComponent\@MobEffectSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVMobEffectComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class MobEffectComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp b/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp index 330c0992bb..17c1c5a2c8 100644 --- a/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp +++ b/LiteLoader/include/llapi/mc/MobEffectsComponent.hpp @@ -28,11 +28,11 @@ struct MobEffectsComponent { public: /** - * @symbol ??4MobEffectsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4MobEffectsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MobEffectsComponent & operator=(struct MobEffectsComponent &&); /** - * @symbol ??1MobEffectsComponent\@\@QEAA\@XZ + * @symbol ??1MobEffectsComponent\@\@QEAA\@XZ */ MCAPI ~MobEffectsComponent(); diff --git a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp index 6030cf5ed9..3645e95824 100644 --- a/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp +++ b/LiteLoader/include/llapi/mc/MobEquipmentPacket.hpp @@ -33,41 +33,47 @@ class MobEquipmentPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEquipmentPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MobEquipmentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MobEquipmentPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MobEquipmentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MobEquipmentPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MobEquipmentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MobEquipmentPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MobEquipmentPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBEQUIPMENTPACKET /** - * @symbol ??0MobEquipmentPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MobEquipmentPacket(); + MCVAPI ~MobEquipmentPacket(); +#endif /** - * @symbol ??0MobEquipmentPacket\@\@QEAA\@VActorRuntimeID\@\@AEBVNetworkItemStackDescriptor\@\@HHW4ContainerID\@\@\@Z + * @symbol ??0MobEquipmentPacket\@\@QEAA\@VActorRuntimeID\@\@AEBVItemStack\@\@HHW4ContainerID\@\@\@Z + */ + MCAPI MobEquipmentPacket(class ActorRuntimeID, class ItemStack const &, int, int, enum class ContainerID); + /** + * @symbol ??0MobEquipmentPacket\@\@QEAA\@VActorRuntimeID\@\@AEBVNetworkItemStackDescriptor\@\@HHW4ContainerID\@\@\@Z */ MCAPI MobEquipmentPacket(class ActorRuntimeID, class NetworkItemStackDescriptor const &, int, int, enum class ContainerID); /** - * @symbol ??0MobEquipmentPacket\@\@QEAA\@VActorRuntimeID\@\@AEBVItemStack\@\@HHW4ContainerID\@\@\@Z + * @symbol ??0MobEquipmentPacket\@\@QEAA\@XZ */ - MCAPI MobEquipmentPacket(class ActorRuntimeID, class ItemStack const &, int, int, enum class ContainerID); + MCAPI MobEquipmentPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEvent.hpp b/LiteLoader/include/llapi/mc/MobEvent.hpp index 0e7b1cd106..04d266ef2c 100644 --- a/LiteLoader/include/llapi/mc/MobEvent.hpp +++ b/LiteLoader/include/llapi/mc/MobEvent.hpp @@ -29,28 +29,28 @@ class MobEvent { public: /** - * @symbol ??0MobEvent\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0_N\@Z + * @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 + * @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 + * @symbol ?getLocalizableName\@MobEvent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLocalizableName() const; /** - * @symbol ?getName\@MobEvent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@MobEvent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?isEnabled\@MobEvent\@\@QEBA_NXZ + * @symbol ?isEnabled\@MobEvent\@\@QEBA_NXZ */ MCAPI bool isEnabled() const; /** - * @symbol ??1MobEvent\@\@QEAA\@XZ + * @symbol ??1MobEvent\@\@QEAA\@XZ */ MCAPI ~MobEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEventCommand.hpp b/LiteLoader/include/llapi/mc/MobEventCommand.hpp index e4de40bbeb..6dacae162b 100644 --- a/LiteLoader/include/llapi/mc/MobEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/MobEventCommand.hpp @@ -37,18 +37,18 @@ struct InitProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobEventCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@MobEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@MobEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@MobEventCommand\@\@SAXAEAVCommandRegistry\@\@$$QEAUInitProxy\@1\@\@Z + * @symbol ?setup\@MobEventCommand\@\@SAXAEAVCommandRegistry\@\@$$QEAUInitProxy\@1\@\@Z */ MCAPI static void setup(class CommandRegistry &, struct MobEventCommand::InitProxy &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobEvents.hpp b/LiteLoader/include/llapi/mc/MobEvents.hpp index 2e40138a0b..dbc8e00566 100644 --- a/LiteLoader/include/llapi/mc/MobEvents.hpp +++ b/LiteLoader/include/llapi/mc/MobEvents.hpp @@ -30,56 +30,56 @@ class MobEvents { public: /** - * @symbol ??0MobEvents\@\@QEAA\@AEAVLevelStorage\@\@\@Z + * @symbol ??0MobEvents\@\@QEAA\@AEAVLevelStorage\@\@\@Z */ MCAPI MobEvents(class LevelStorage &); /** - * @symbol ?areEventsEnabled\@MobEvents\@\@QEBA_NXZ + * @symbol ?areEventsEnabled\@MobEvents\@\@QEBA_NXZ */ MCAPI bool areEventsEnabled() const; /** - * @symbol ?deserialize\@MobEvents\@\@QEAAXAEBVCompoundTag\@\@\@Z - */ - MCAPI void deserialize(class CompoundTag const &); - /** - * @symbol ?getEvent\@MobEvents\@\@QEBAAEBVMobEvent\@\@W4MobEventsIndex\@\@\@Z + * @symbol ?getEvent\@MobEvents\@\@QEBAAEBVMobEvent\@\@W4MobEventsIndex\@\@\@Z */ MCAPI class MobEvent const & getEvent(enum class MobEventsIndex) const; /** - * @symbol ?getIndexFromName\@MobEvents\@\@QEBA?AW4MobEventsIndex\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getIndexFromName\@MobEvents\@\@QEBA?AW4MobEventsIndex\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class MobEventsIndex getIndexFromName(std::string const &) const; /** - * @symbol ?isEnabled\@MobEvents\@\@QEBA_NW4MobEventsIndex\@\@\@Z + * @symbol ?isEnabled\@MobEvents\@\@QEBA_NW4MobEventsIndex\@\@\@Z */ MCAPI bool isEnabled(enum class MobEventsIndex) const; /** - * @symbol ?serialize\@MobEvents\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?readFromLevelStorage\@MobEvents\@\@QEAAXXZ + */ + MCAPI void readFromLevelStorage(); + /** + * @symbol ?serialize\@MobEvents\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr serialize() const; /** - * @symbol ?setEnabled\@MobEvents\@\@QEAAXW4MobEventsIndex\@\@_N\@Z + * @symbol ?setEnabled\@MobEvents\@\@QEAAXW4MobEventsIndex\@\@_N\@Z */ MCAPI void setEnabled(enum class MobEventsIndex, bool); /** - * @symbol ?setEventsEnabled\@MobEvents\@\@QEAAX_N\@Z + * @symbol ?setEventsEnabled\@MobEvents\@\@QEAAX_N\@Z */ MCAPI void setEventsEnabled(bool); /** - * @symbol ?setMarketplaceDefaults\@MobEvents\@\@QEAAXXZ + * @symbol ?setMarketplaceDefaults\@MobEvents\@\@QEAAXXZ */ MCAPI void setMarketplaceDefaults(); /** - * @symbol ?tick\@MobEvents\@\@QEAAXXZ + * @symbol ?tick\@MobEvents\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?writeToLevelStorage\@MobEvents\@\@QEAAXXZ + * @symbol ?writeToLevelStorage\@MobEvents\@\@QEAAXXZ */ MCAPI void writeToLevelStorage(); /** - * @symbol ?EVENTS_ENABLED_STRING\@MobEvents\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EVENTS_ENABLED_STRING\@MobEvents\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const EVENTS_ENABLED_STRING; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobGliding.hpp b/LiteLoader/include/llapi/mc/MobGliding.hpp index d4323add2d..b8a7a146e3 100644 --- a/LiteLoader/include/llapi/mc/MobGliding.hpp +++ b/LiteLoader/include/llapi/mc/MobGliding.hpp @@ -17,15 +17,23 @@ namespace MobGliding { #undef AFTER_EXTRA /** - * @symbol ?getFallFlyTicks\@MobGliding\@\@YAHAEBVEntityContext\@\@\@Z + * @symbol ?getArmorFlyEnabled\@MobGliding\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool getArmorFlyEnabled(class EntityContext const &); + /** + * @symbol ?getFallFlyTicks\@MobGliding\@\@YAHAEBVEntityContext\@\@\@Z */ MCAPI int getFallFlyTicks(class EntityContext const &); /** - * @symbol ?initializeMob\@MobGliding\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeMob\@MobGliding\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeMob(class EntityContext &); /** - * @symbol ?setFallFlyTicks\@MobGliding\@\@YAXAEAVEntityContext\@\@H\@Z + * @symbol ?setArmorFlyEnabled\@MobGliding\@\@YAXAEAVEntityContext\@\@_N\@Z + */ + MCAPI void setArmorFlyEnabled(class EntityContext &, bool); + /** + * @symbol ?setFallFlyTicks\@MobGliding\@\@YAXAEAVEntityContext\@\@H\@Z */ MCAPI void setFallFlyTicks(class EntityContext &, int); diff --git a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp index 5d1116c8d7..fbf6621da0 100644 --- a/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobIsImmobileFilterSystem.hpp @@ -25,16 +25,16 @@ class MobIsImmobileFilterSystem { public: /** - * @symbol ?createSystem\@MobIsImmobileFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MobIsImmobileFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //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 ?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 */ 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>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobJump.hpp b/LiteLoader/include/llapi/mc/MobJump.hpp index 67c4c8880c..ab5eeedcb6 100644 --- a/LiteLoader/include/llapi/mc/MobJump.hpp +++ b/LiteLoader/include/llapi/mc/MobJump.hpp @@ -17,47 +17,47 @@ namespace MobJump { #undef AFTER_EXTRA /** - * @symbol ?getJumpPendingScale\@MobJump\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getJumpPendingScale\@MobJump\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getJumpPendingScale(class EntityContext const &); /** - * @symbol ?getJumpStartPosition\@MobJump\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getJumpStartPosition\@MobJump\@\@YA?AVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 getJumpStartPosition(class EntityContext const &); /** - * @symbol ?getJumpVelRedux\@MobJump\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?getJumpVelRedux\@MobJump\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool getJumpVelRedux(class EntityContext const &); /** - * @symbol ?getNoJumpDelay\@MobJump\@\@YAHAEBVEntityContext\@\@\@Z + * @symbol ?getNoJumpDelay\@MobJump\@\@YAHAEBVEntityContext\@\@\@Z */ MCAPI int getNoJumpDelay(class EntityContext const &); /** - * @symbol ?initializeMob\@MobJump\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeMob\@MobJump\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeMob(class EntityContext &); /** - * @symbol ?isAutoJumping\@MobJump\@\@YA_NAEBVEntityContext\@\@\@Z + * @symbol ?isAutoJumping\@MobJump\@\@YA_NAEBVEntityContext\@\@\@Z */ MCAPI bool isAutoJumping(class EntityContext const &); /** - * @symbol ?setIsAutoJumping\@MobJump\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setIsAutoJumping\@MobJump\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setIsAutoJumping(class EntityContext &, bool); /** - * @symbol ?setJumpPendingScale\@MobJump\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setJumpPendingScale\@MobJump\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setJumpPendingScale(class EntityContext &, float); /** - * @symbol ?setJumpStartPosition\@MobJump\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z + * @symbol ?setJumpStartPosition\@MobJump\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z */ MCAPI void setJumpStartPosition(class EntityContext &, class Vec3 const &); /** - * @symbol ?setJumpVelRedux\@MobJump\@\@YAXAEAVEntityContext\@\@_N\@Z + * @symbol ?setJumpVelRedux\@MobJump\@\@YAXAEAVEntityContext\@\@_N\@Z */ MCAPI void setJumpVelRedux(class EntityContext &, bool); /** - * @symbol ?setNoJumpDelay\@MobJump\@\@YAXAEAVEntityContext\@\@H\@Z + * @symbol ?setNoJumpDelay\@MobJump\@\@YAXAEAVEntityContext\@\@H\@Z */ MCAPI void setNoJumpDelay(class EntityContext &, int); diff --git a/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp new file mode 100644 index 0000000000..a66be9abc7 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobJumpFromGroundSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file MobJumpFromGroundSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobJumpFromGroundSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createCleanupFilterJumpRequestSystem\@MobJumpFromGroundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createCleanupFilterJumpRequestSystem(); + /** + * @symbol ?createCleanupTriggerJumpRequestSystem\@MobJumpFromGroundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createCleanupTriggerJumpRequestSystem(); + /** + * @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 + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobJumpSystem.hpp b/LiteLoader/include/llapi/mc/MobJumpSystem.hpp new file mode 100644 index 0000000000..76ec8932fb --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobJumpSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file MobJumpSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobJumpSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createCleanupSystem\@MobJumpSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createCleanupSystem(); + /** + * @symbol ?createDecrementNoJumpDelaySystem\@MobJumpSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createDecrementNoJumpDelaySystem(); + /** + * @symbol ?createMobJumpSystem\@MobJumpSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createMobJumpSystem(); + /** + * @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/MobMovement.hpp b/LiteLoader/include/llapi/mc/MobMovement.hpp index 1f7d403a0f..11ea9c890c 100644 --- a/LiteLoader/include/llapi/mc/MobMovement.hpp +++ b/LiteLoader/include/llapi/mc/MobMovement.hpp @@ -17,55 +17,63 @@ namespace MobMovement { #undef AFTER_EXTRA /** - * @symbol ?getFlySpeed\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getFlySpeed\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getFlySpeed(class EntityContext const &); /** - * @symbol ?getFrictionModifier\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getFrictionModifier\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getFrictionModifier(class EntityContext const &); /** - * @symbol ?getLocalMoveVelocity\@MobMovement\@\@YAAEBVVec3\@\@AEBVEntityContext\@\@\@Z + * @symbol ?getLocalMoveVelocity\@MobMovement\@\@YAAEBVVec3\@\@AEBVEntityContext\@\@\@Z */ MCAPI class Vec3 const & getLocalMoveVelocity(class EntityContext const &); /** - * @symbol ?getMobRotation\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getMobRotation\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getMobRotation(class EntityContext const &); /** - * @symbol ?getMovementSpeed\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z + * @symbol ?getMovementSpeed\@MobMovement\@\@YAMAEBVEntityContext\@\@\@Z */ MCAPI float getMovementSpeed(class EntityContext const &); /** - * @symbol ?initializeMob\@MobMovement\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?initializeMob\@MobMovement\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void initializeMob(class EntityContext &); /** - * @symbol ?resetLocalMoveVelocity\@MobMovement\@\@YAXAEAVEntityContext\@\@\@Z + * @symbol ?isFrictionDiscarded\@MobMovement\@\@YA_NAEBVEntityContext\@\@\@Z + */ + MCAPI bool isFrictionDiscarded(class EntityContext const &); + /** + * @symbol ?resetLocalMoveVelocity\@MobMovement\@\@YAXAEAVEntityContext\@\@\@Z */ MCAPI void resetLocalMoveVelocity(class EntityContext &); /** - * @symbol ?setFlySpeed\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setDiscardFriction\@MobMovement\@\@YAXAEAVEntityContext\@\@_N\@Z + */ + MCAPI void setDiscardFriction(class EntityContext &, bool); + /** + * @symbol ?setFlySpeed\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setFlySpeed(class EntityContext &, float); /** - * @symbol ?setFrictionModifier\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setFrictionModifier\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setFrictionModifier(class EntityContext &, float); /** - * @symbol ?setLocalMoveVelocity\@MobMovement\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z + * @symbol ?setLocalMoveVelocity\@MobMovement\@\@YAXAEAVEntityContext\@\@V?$optional\@M\@std\@\@11\@Z */ - MCAPI void setLocalMoveVelocity(class EntityContext &, class Vec3 const &); + MCAPI void setLocalMoveVelocity(class EntityContext &, class std::optional, class std::optional, class std::optional); /** - * @symbol ?setLocalMoveVelocity\@MobMovement\@\@YAXAEAVEntityContext\@\@V?$optional\@M\@std\@\@11\@Z + * @symbol ?setLocalMoveVelocity\@MobMovement\@\@YAXAEAVEntityContext\@\@AEBVVec3\@\@\@Z */ - MCAPI void setLocalMoveVelocity(class EntityContext &, class std::optional, class std::optional, class std::optional); + MCAPI void setLocalMoveVelocity(class EntityContext &, class Vec3 const &); /** - * @symbol ?setMobRotation\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setMobRotation\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setMobRotation(class EntityContext &, float); /** - * @symbol ?setMovementSpeed\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z + * @symbol ?setMovementSpeed\@MobMovement\@\@YAXAEAVEntityContext\@\@M\@Z */ MCAPI void setMovementSpeed(class EntityContext &, float); diff --git a/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp b/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp index cc79c65da5..f5fa8a66b5 100644 --- a/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobOnPlayerJumpSystem.hpp @@ -28,20 +28,20 @@ class MobOnPlayerJumpSystem { public: /** - * @symbol ?createClientSystem\@MobOnPlayerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClientSystem\@MobOnPlayerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClientSystem(); /** - * @symbol ?getPlayerJumpPendingScale\@MobOnPlayerJumpSystem\@\@SAMH\@Z + * @symbol ?getPlayerJumpPendingScale\@MobOnPlayerJumpSystem\@\@SAMH\@Z */ MCAPI static float getPlayerJumpPendingScale(int); //private: /** - * @symbol ?_tickMobOnPlayerJumpSystem\@MobOnPlayerJumpSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMobOnPlayerJumpRequestComponent\@\@AEAUJumpPendingScaleComponent\@\@AEAUSynchedActorDataComponent\@\@V?$Optional\@UHorseStandCounterComponent\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@UMobOnPlayerJumpRequestComponent\@\@\@\@_N\@Z + * @symbol ?_tickMobOnPlayerJumpSystem\@MobOnPlayerJumpSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMobOnPlayerJumpRequestComponent\@\@AEAUJumpPendingScaleComponent\@\@AEAUSynchedActorDataComponent\@\@V?$Optional\@UHorseStandCounterComponent\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UMobAllowStandSlidingFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@UMobOnPlayerJumpRequestComponent\@\@\@\@_N\@Z */ MCAPI static void _tickMobOnPlayerJumpSystem(class StrictEntityContext &, struct MobOnPlayerJumpRequestComponent const &, struct JumpPendingScaleComponent &, struct SynchedActorDataComponent &, class Optional, class Optional, class EntityModifierT, class FlagComponent, class FlagComponent, struct MobOnPlayerJumpRequestComponent> &, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobRemovePassengerSystem.hpp b/LiteLoader/include/llapi/mc/MobRemovePassengerSystem.hpp index df14191cfa..e5169dd5d3 100644 --- a/LiteLoader/include/llapi/mc/MobRemovePassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobRemovePassengerSystem.hpp @@ -28,12 +28,12 @@ class MobRemovePassengerSystem { public: /** - * @symbol ?createSystem\@MobRemovePassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MobRemovePassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?removePassengerSystem\@MobRemovePassengerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@AEAUMobJumpComponent\@\@AEAUSynchedActorDataComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UParrotFlag\@\@\@\@\@\@$$CBUPassengerComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UMobIsJumpingFlag\@\@\@\@\@\@\@Z + * @symbol ?removePassengerSystem\@MobRemovePassengerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@AEAUMobJumpComponent\@\@AEAUSynchedActorDataComponent\@\@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 static void removePassengerSystem(class StrictEntityContext const &, struct StateVectorComponent const &, class Optional, struct MobJumpComponent &, struct SynchedActorDataComponent &, class ViewT>, struct PassengerComponent const>, class EntityModifierT, class FlagComponent, class FlagComponent> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp b/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp index b6f9e3d523..ecc1163364 100644 --- a/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobResetPassengerYRotLimitSystem.hpp @@ -28,16 +28,16 @@ class MobResetPassengerYRotLimitSystem { public: /** - * @symbol ?createSystem\@MobResetPassengerYRotLimitSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MobResetPassengerYRotLimitSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_tickPassengerView\@MobResetPassengerYRotLimitSystem\@\@CAXAEAVStrictEntityContext\@\@AEAUPassengerYRotLimitComponent\@\@\@Z + * @symbol ?_tickPassengerView\@MobResetPassengerYRotLimitSystem\@\@CAXAEAVStrictEntityContext\@\@AEAUPassengerYRotLimitComponent\@\@\@Z */ MCAPI static void _tickPassengerView(class StrictEntityContext &, struct PassengerYRotLimitComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp b/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp index cfd1e44524..5a1f5ac801 100644 --- a/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp +++ b/LiteLoader/include/llapi/mc/MobSetPreviousRotSystem.hpp @@ -28,16 +28,16 @@ class MobSetPreviousRotSystem { public: /** - * @symbol ?createSystem\@MobSetPreviousRotSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MobSetPreviousRotSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_setPreviousRotation\@MobSetPreviousRotSystem\@\@CAXAEAVStrictEntityContext\@\@AEAUActorHeadRotationComponent\@\@AEAUActorRotationComponent\@\@AEAUMobBodyRotationComponent\@\@\@Z + * @symbol ?_setPreviousRotation\@MobSetPreviousRotSystem\@\@CAXAEAVStrictEntityContext\@\@AEAUActorHeadRotationComponent\@\@AEAUActorRotationComponent\@\@AEAUMobBodyRotationComponent\@\@\@Z */ MCAPI static void _setPreviousRotation(class StrictEntityContext &, struct ActorHeadRotationComponent &, struct ActorRotationComponent &, struct MobBodyRotationComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp b/LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp index 0a8e868f73..e01959ec48 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnHerdInfo.hpp @@ -28,11 +28,11 @@ struct MobSpawnHerdInfo { public: /** - * @symbol ??0MobSpawnHerdInfo\@\@QEAA\@IIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I0I\@Z + * @symbol ??0MobSpawnHerdInfo\@\@QEAA\@IIAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I0I\@Z */ MCAPI MobSpawnHerdInfo(unsigned int, unsigned int, std::string const &, unsigned int, std::string const &, unsigned int); /** - * @symbol ??1MobSpawnHerdInfo\@\@QEAA\@XZ + * @symbol ??1MobSpawnHerdInfo\@\@QEAA\@XZ */ MCAPI ~MobSpawnHerdInfo(); diff --git a/LiteLoader/include/llapi/mc/MobSpawnInfo.hpp b/LiteLoader/include/llapi/mc/MobSpawnInfo.hpp index 196cf3ed91..bceac40df0 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnInfo.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnInfo.hpp @@ -30,8 +30,8 @@ class MobSpawnInfo { public: /** - * @symbol ?categoryID\@MobSpawnInfo\@\@SAHW4ActorType\@\@\@Z + * @symbol ?categoryID\@MobSpawnInfo\@\@SAHW4ActorType\@\@\@Z */ MCAPI static int categoryID(enum class ActorType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp index 93ab846062..e9a1b1f511 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnRules.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnRules.hpp @@ -28,212 +28,212 @@ class MobSpawnRules { public: /** - * @symbol ??0MobSpawnRules\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0MobSpawnRules\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI MobSpawnRules(class MobSpawnRules &&); /** - * @symbol ??0MobSpawnRules\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MobSpawnRules\@\@QEAA\@AEBV0\@\@Z */ MCAPI MobSpawnRules(class MobSpawnRules const &); /** - * @symbol ??0MobSpawnRules\@\@QEAA\@XZ + * @symbol ??0MobSpawnRules\@\@QEAA\@XZ */ MCAPI MobSpawnRules(); /** - * @symbol ?addHerd\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addHerd\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class MobSpawnRules & addHerd(int, int, std::string const &); /** - * @symbol ?addPermutation\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBUActorDefinitionIdentifier\@\@\@Z + * @symbol ?addPermutation\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBUActorDefinitionIdentifier\@\@\@Z */ MCAPI class MobSpawnRules & addPermutation(int, int, struct ActorDefinitionIdentifier const &); /** - * @symbol ?canSpawnInConditions\@MobSpawnRules\@\@QEBA_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z + * @symbol ?canSpawnInConditions\@MobSpawnRules\@\@QEBA_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ MCAPI bool canSpawnInConditions(class SpawnConditions const &, class BlockSource &) const; /** - * @symbol ?getAboveBlockDistance\@MobSpawnRules\@\@QEBAHXZ + * @symbol ?getAboveBlockDistance\@MobSpawnRules\@\@QEBAHXZ */ MCAPI int getAboveBlockDistance() const; /** - * @symbol ?getDelayRange\@MobSpawnRules\@\@QEBA?BU?$pair\@HH\@std\@\@XZ + * @symbol ?getDelayRange\@MobSpawnRules\@\@QEBA?BU?$pair\@HH\@std\@\@XZ */ MCAPI struct std::pair const getDelayRange() const; /** - * @symbol ?getDelaySpawnChance\@MobSpawnRules\@\@QEBAHXZ + * @symbol ?getDelaySpawnChance\@MobSpawnRules\@\@QEBAHXZ */ MCAPI int getDelaySpawnChance() const; /** - * @symbol ?getGuaranteedPermutations\@MobSpawnRules\@\@QEBAAEBV?$vector\@VMobSpawnerPermutation\@\@V?$allocator\@VMobSpawnerPermutation\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getGuaranteedPermutations\@MobSpawnRules\@\@QEBAAEBV?$vector\@VMobSpawnerPermutation\@\@V?$allocator\@VMobSpawnerPermutation\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getGuaranteedPermutations() const; /** - * @symbol ?getHerdListMutable\@MobSpawnRules\@\@QEAAAEAV?$vector\@UMobSpawnHerdInfo\@\@V?$allocator\@UMobSpawnHerdInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getHerdListMutable\@MobSpawnRules\@\@QEAAAEAV?$vector\@UMobSpawnHerdInfo\@\@V?$allocator\@UMobSpawnHerdInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getHerdListMutable(); /** - * @symbol ?getMobToDelayId\@MobSpawnRules\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getMobToDelayId\@MobSpawnRules\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const getMobToDelayId() const; /** - * @symbol ?getPermutations\@MobSpawnRules\@\@QEBAAEBV?$vector\@VMobSpawnerPermutation\@\@V?$allocator\@VMobSpawnerPermutation\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getPermutations\@MobSpawnRules\@\@QEBAAEBV?$vector\@VMobSpawnerPermutation\@\@V?$allocator\@VMobSpawnerPermutation\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getPermutations() const; /** - * @symbol ?getPersistence\@MobSpawnRules\@\@QEBA_NXZ + * @symbol ?getPersistence\@MobSpawnRules\@\@QEBA_NXZ */ MCAPI bool getPersistence() const; /** - * @symbol ?getPopulationCap\@MobSpawnRules\@\@QEBAHAEBVSpawnConditions\@\@\@Z + * @symbol ?getPopulationCap\@MobSpawnRules\@\@QEBAHAEBVSpawnConditions\@\@\@Z */ MCAPI int getPopulationCap(class SpawnConditions const &) const; /** - * @symbol ?getSpawnAboveBlockList\@MobSpawnRules\@\@QEBAAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ + * @symbol ?getSpawnAboveBlockList\@MobSpawnRules\@\@QEBAAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & getSpawnAboveBlockList() const; /** - * @symbol ?getSpawnAboveBlockListMutable\@MobSpawnRules\@\@QEAAAEAV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ + * @symbol ?getSpawnAboveBlockListMutable\@MobSpawnRules\@\@QEAAAEAV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> & getSpawnAboveBlockListMutable(); /** - * @symbol ?getSpawnCount\@MobSpawnRules\@\@QEBAHAEBVSpawnConditions\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBUMobSpawnHerdInfo\@\@\@Z + * @symbol ?getSpawnCount\@MobSpawnRules\@\@QEBAHAEBVSpawnConditions\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBUMobSpawnHerdInfo\@\@\@Z */ MCAPI int getSpawnCount(class SpawnConditions const &, class BlockSource &, class Random &, struct MobSpawnHerdInfo const &) const; /** - * @symbol ?getSpawnOnBlockList\@MobSpawnRules\@\@QEBAAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ + * @symbol ?getSpawnOnBlockList\@MobSpawnRules\@\@QEBAAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & getSpawnOnBlockList() const; /** - * @symbol ?getSpawnOnBlockListMutable\@MobSpawnRules\@\@QEAAAEAV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ + * @symbol ?getSpawnOnBlockListMutable\@MobSpawnRules\@\@QEAAAEAV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> & getSpawnOnBlockListMutable(); /** - * @symbol ?getSpawnOnBlockPreventedList\@MobSpawnRules\@\@QEBAAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ + * @symbol ?getSpawnOnBlockPreventedList\@MobSpawnRules\@\@QEBAAEBV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & getSpawnOnBlockPreventedList() const; /** - * @symbol ?getSpawnOnBlockPreventedListMutable\@MobSpawnRules\@\@QEAAAEAV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ + * @symbol ?getSpawnOnBlockPreventedListMutable\@MobSpawnRules\@\@QEAAAEAV?$unordered_set\@PEBVBlockLegacy\@\@U?$hash\@PEBVBlockLegacy\@\@\@std\@\@U?$equal_to\@PEBVBlockLegacy\@\@\@3\@V?$allocator\@PEBVBlockLegacy\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> & getSpawnOnBlockPreventedListMutable(); /** - * @symbol ?isLavaSpawner\@MobSpawnRules\@\@QEBA_NXZ + * @symbol ?isLavaSpawner\@MobSpawnRules\@\@QEBA_NXZ */ MCAPI bool isLavaSpawner() const; /** - * @symbol ?isUnderwaterSpawner\@MobSpawnRules\@\@QEBA_NXZ + * @symbol ?isUnderwaterSpawner\@MobSpawnRules\@\@QEBA_NXZ */ MCAPI bool isUnderwaterSpawner() const; /** - * @symbol ?selectRandomHerd\@MobSpawnRules\@\@QEBAAEBUMobSpawnHerdInfo\@\@AEAVRandom\@\@\@Z + * @symbol ?selectRandomHerd\@MobSpawnRules\@\@QEBAAEBUMobSpawnHerdInfo\@\@AEAVRandom\@\@\@Z */ MCAPI struct MobSpawnHerdInfo const & selectRandomHerd(class Random &) const; /** - * @symbol ?setAboveBlockDistance\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z + * @symbol ?setAboveBlockDistance\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z */ MCAPI class MobSpawnRules & setAboveBlockDistance(int); /** - * @symbol ?setBrightnessRange\@MobSpawnRules\@\@QEAAAEAV1\@HH_N\@Z + * @symbol ?setBrightnessRange\@MobSpawnRules\@\@QEAAAEAV1\@HH_N\@Z */ MCAPI class MobSpawnRules & setBrightnessRange(int, int, bool); /** - * @symbol ?setBubbleSpawner\@MobSpawnRules\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setBubbleSpawner\@MobSpawnRules\@\@QEAAAEAV1\@_N\@Z */ MCAPI class MobSpawnRules & setBubbleSpawner(bool); /** - * @symbol ?setDelayRange\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setDelayRange\@MobSpawnRules\@\@QEAAAEAV1\@HHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class MobSpawnRules & setDelayRange(int, int, std::string const &); /** - * @symbol ?setDelaySpawnChance\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z + * @symbol ?setDelaySpawnChance\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z */ MCAPI class MobSpawnRules & setDelaySpawnChance(int); /** - * @symbol ?setDifficultyRange\@MobSpawnRules\@\@QEAAAEAV1\@W4Difficulty\@\@0\@Z + * @symbol ?setDifficultyRange\@MobSpawnRules\@\@QEAAAEAV1\@W4Difficulty\@\@0\@Z */ MCAPI class MobSpawnRules & setDifficultyRange(enum class Difficulty, enum class Difficulty); /** - * @symbol ?setExperimentalGameplay\@MobSpawnRules\@\@QEAAAEAV1\@XZ + * @symbol ?setExperimentalGameplay\@MobSpawnRules\@\@QEAAAEAV1\@XZ */ MCAPI class MobSpawnRules & setExperimentalGameplay(); /** - * @symbol ?setHardcodedSpawnRuleCallback\@MobSpawnRules\@\@QEAAAEAV1\@V?$function\@$$A6A_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z\@std\@\@\@Z + * @symbol ?setHardcodedSpawnRuleCallback\@MobSpawnRules\@\@QEAAAEAV1\@V?$function\@$$A6A_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z\@std\@\@\@Z */ MCAPI class MobSpawnRules & setHardcodedSpawnRuleCallback(class std::function); /** - * @symbol ?setHeightRange\@MobSpawnRules\@\@QEAAAEAV1\@HH\@Z + * @symbol ?setHeightRange\@MobSpawnRules\@\@QEAAAEAV1\@HH\@Z */ MCAPI class MobSpawnRules & setHeightRange(int, int); /** - * @symbol ?setLavaSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ + * @symbol ?setLavaSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ */ MCAPI class MobSpawnRules & setLavaSpawner(); /** - * @symbol ?setMobEventType\@MobSpawnRules\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setMobEventType\@MobSpawnRules\@\@QEAAAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class MobSpawnRules & setMobEventType(std::string const &); /** - * @symbol ?setPersistence\@MobSpawnRules\@\@QEAAAEAV1\@_N\@Z + * @symbol ?setPersistence\@MobSpawnRules\@\@QEAAAEAV1\@_N\@Z */ MCAPI class MobSpawnRules & setPersistence(bool); /** - * @symbol ?setPlayerInVillageBorderTolerance\@MobSpawnRules\@\@QEAAAEAV1\@I\@Z + * @symbol ?setPlayerInVillageBorderTolerance\@MobSpawnRules\@\@QEAAAEAV1\@I\@Z */ MCAPI class MobSpawnRules & setPlayerInVillageBorderTolerance(unsigned int); /** - * @symbol ?setPlayerInVillageDistance\@MobSpawnRules\@\@QEAAAEAV1\@I\@Z + * @symbol ?setPlayerInVillageDistance\@MobSpawnRules\@\@QEAAAEAV1\@I\@Z */ MCAPI class MobSpawnRules & setPlayerInVillageDistance(unsigned int); /** - * @symbol ?setPopulationCap\@MobSpawnRules\@\@QEAAAEAV1\@HH\@Z + * @symbol ?setPopulationCap\@MobSpawnRules\@\@QEAAAEAV1\@HH\@Z */ MCAPI class MobSpawnRules & setPopulationCap(int, int); /** - * @symbol ?setRarity\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z + * @symbol ?setRarity\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z */ MCAPI class MobSpawnRules & setRarity(int); /** - * @symbol ?setSpawnDistanceCap\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z + * @symbol ?setSpawnDistanceCap\@MobSpawnRules\@\@QEAAAEAV1\@H\@Z */ MCAPI class MobSpawnRules & setSpawnDistanceCap(int); /** - * @symbol ?setSpawnDistances\@MobSpawnRules\@\@QEAAAEAV1\@HH\@Z + * @symbol ?setSpawnDistances\@MobSpawnRules\@\@QEAAAEAV1\@HH\@Z */ MCAPI class MobSpawnRules & setSpawnDistances(int, int); /** - * @symbol ?setSurfaceSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ + * @symbol ?setSurfaceSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ */ MCAPI class MobSpawnRules & setSurfaceSpawner(); /** - * @symbol ?setUndergroundSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ + * @symbol ?setUndergroundSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ */ MCAPI class MobSpawnRules & setUndergroundSpawner(); /** - * @symbol ?setUnderwaterSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ + * @symbol ?setUnderwaterSpawner\@MobSpawnRules\@\@QEAAAEAV1\@XZ */ MCAPI class MobSpawnRules & setUnderwaterSpawner(); /** - * @symbol ?setWorldAgeRange\@MobSpawnRules\@\@QEAAAEAV1\@_K0\@Z + * @symbol ?setWorldAgeRange\@MobSpawnRules\@\@QEAAAEAV1\@_K0\@Z */ MCAPI class MobSpawnRules & setWorldAgeRange(unsigned __int64, unsigned __int64); /** - * @symbol ??1MobSpawnRules\@\@QEAA\@XZ + * @symbol ??1MobSpawnRules\@\@QEAA\@XZ */ MCAPI ~MobSpawnRules(); /** - * @symbol ?LOW_END_MAX_SPAWN_DISTANCE\@MobSpawnRules\@\@2HB + * @symbol ?LOW_END_MAX_SPAWN_DISTANCE\@MobSpawnRules\@\@2HB */ MCAPI static int const LOW_END_MAX_SPAWN_DISTANCE; /** - * @symbol ?MAX_DEFAULT_SPAWN_DISTANCE\@MobSpawnRules\@\@2HB + * @symbol ?MAX_DEFAULT_SPAWN_DISTANCE\@MobSpawnRules\@\@2HB */ MCAPI static int const MAX_DEFAULT_SPAWN_DISTANCE; /** - * @symbol ?MAX_WORLD_AGE\@MobSpawnRules\@\@2_KB + * @symbol ?MAX_WORLD_AGE\@MobSpawnRules\@\@2_KB */ MCAPI static unsigned __int64 const MAX_WORLD_AGE; /** - * @symbol ?MIN_DEFAULT_SPAWN_DISTANCE\@MobSpawnRules\@\@2HB + * @symbol ?MIN_DEFAULT_SPAWN_DISTANCE\@MobSpawnRules\@\@2HB */ MCAPI static int const MIN_DEFAULT_SPAWN_DISTANCE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSpawnUtils.hpp b/LiteLoader/include/llapi/mc/MobSpawnUtils.hpp index 959da54f1a..fbe72ec56f 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnUtils.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnUtils.hpp @@ -22,11 +22,11 @@ namespace MobSpawnUtils { #undef AFTER_EXTRA /** - * @symbol ?spawnIfSummonable\@MobSpawnUtils\@\@YA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@AEAVActorDefinitionGroup\@\@AEAVActorFactory\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?spawnIfSummonable\@MobSpawnUtils\@\@YA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBUActorDefinitionIdentifier\@\@AEAVActorDefinitionGroup\@\@AEAVActorFactory\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI class OwnerPtrT spawnIfSummonable(struct ActorDefinitionIdentifier const &, class ActorDefinitionGroup &, class ActorFactory &, class Vec3 const &, class Vec2 const &); /** - * @symbol ?trySpawnMob\@MobSpawnUtils\@\@YAPEAVMob\@\@AEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@VBlockPos\@\@HHHAEBV?$function\@$$A6A_NVBlockPos\@\@\@Z\@std\@\@W4SurfaceDetectionType\@1\@\@Z + * @symbol ?trySpawnMob\@MobSpawnUtils\@\@YAPEAVMob\@\@AEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@VBlockPos\@\@HHHAEBV?$function\@$$A6A_NVBlockPos\@\@\@Z\@std\@\@W4SurfaceDetectionType\@1\@\@Z */ MCAPI class Mob * trySpawnMob(class BlockSource &, struct ActorDefinitionIdentifier const &, class BlockPos, int, int, int, class std::function const &, enum class MobSpawnUtils::SurfaceDetectionType); diff --git a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp index 71c880f538..79f4a3c84a 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlock.hpp @@ -31,224 +31,229 @@ class MobSpawnerBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobSpawnerBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@MobSpawnerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@MobSpawnerBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@MobSpawnerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@MobSpawnerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@MobSpawnerBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@MobSpawnerBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@MobSpawnerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@MobSpawnerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@MobSpawnerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@MobSpawnerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOBSPAWNERBLOCK /** - * @symbol ?isInteractiveBlock\@MobSpawnerBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@MobSpawnerBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0MobSpawnerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MobSpawnerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MobSpawnerBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp index 511a0ab3e8..193bad83d2 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerBlockActor.hpp @@ -31,87 +31,87 @@ class MobSpawnerBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MobSpawnerBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@MobSpawnerBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@MobSpawnerBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@MobSpawnerBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@MobSpawnerBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@MobSpawnerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@MobSpawnerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@MobSpawnerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@MobSpawnerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@MobSpawnerBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@MobSpawnerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@MobSpawnerBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0MobSpawnerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0MobSpawnerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI MobSpawnerBlockActor(class BlockPos const &); /** - * @symbol ?getSpawner\@MobSpawnerBlockActor\@\@QEAAAEAVBaseMobSpawner\@\@XZ + * @symbol ?getSpawner\@MobSpawnerBlockActor\@\@QEAAAEAVBaseMobSpawner\@\@XZ */ MCAPI class BaseMobSpawner & getSpawner(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSpawnerData.hpp b/LiteLoader/include/llapi/mc/MobSpawnerData.hpp index 3cea45370f..451d52fbe0 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerData.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerData.hpp @@ -27,12 +27,12 @@ class MobSpawnerData { public: /** - * @symbol ??0MobSpawnerData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MobSpawnerData\@\@QEAA\@AEBV0\@\@Z */ MCAPI MobSpawnerData(class MobSpawnerData const &); /** - * @symbol ??1MobSpawnerData\@\@QEAA\@XZ + * @symbol ??1MobSpawnerData\@\@QEAA\@XZ */ MCAPI ~MobSpawnerData(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp b/LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp index cbbe0e8f9d..aa6f7d21d4 100644 --- a/LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp +++ b/LiteLoader/include/llapi/mc/MobSpawnerPermutation.hpp @@ -28,8 +28,8 @@ class MobSpawnerPermutation { public: /** - * @symbol ??1MobSpawnerPermutation\@\@QEAA\@XZ + * @symbol ??1MobSpawnerPermutation\@\@QEAA\@XZ */ MCAPI ~MobSpawnerPermutation(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp new file mode 100644 index 0000000000..24acdf53ca --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelFilterSystem.hpp @@ -0,0 +1,24 @@ +/** + * @file MobTravelFilterSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobTravelFilterSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSystem\@MobTravelFilterSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp new file mode 100644 index 0000000000..19ab9f6454 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelImmobileFilterSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file MobTravelImmobileFilterSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MobTravelImmobileFilterSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBTRAVELIMMOBILEFILTERSYSTEM +public: + class MobTravelImmobileFilterSystem& operator=(class MobTravelImmobileFilterSystem const &) = delete; + MobTravelImmobileFilterSystem(class MobTravelImmobileFilterSystem const &) = delete; + MobTravelImmobileFilterSystem() = delete; +#endif + +public: + /** + * @symbol ?create\@MobTravelImmobileFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + +}; diff --git a/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp new file mode 100644 index 0000000000..85fb504003 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelIntentSystem.hpp @@ -0,0 +1,28 @@ +/** + * @file MobTravelIntentSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace MobTravelIntentSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSystem\@MobTravelIntentSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?createUpdateSystem\@MobTravelIntentSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createUpdateSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp new file mode 100644 index 0000000000..b5f8faecb1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelPlaceholderFilterSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file MobTravelPlaceholderFilterSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MobTravelPlaceholderFilterSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBTRAVELPLACEHOLDERFILTERSYSTEM +public: + class MobTravelPlaceholderFilterSystem& operator=(class MobTravelPlaceholderFilterSystem const &) = delete; + MobTravelPlaceholderFilterSystem(class MobTravelPlaceholderFilterSystem const &) = delete; + MobTravelPlaceholderFilterSystem() = delete; +#endif + +public: + /** + * @symbol ?create\@MobTravelPlaceholderFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?createSideBySide\@MobTravelPlaceholderFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSideBySide(); + /** + * @symbol ?tick\@MobTravelPlaceholderFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobTravelComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI static void tick(class StrictEntityContext const &, struct StateVectorComponent &, class EntityModifierT, class IConstBlockSource const &); + +}; diff --git a/LiteLoader/include/llapi/mc/MobTravelPlayerOrLocalFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelPlayerOrLocalFilterSystem.hpp new file mode 100644 index 0000000000..57acb6be89 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelPlayerOrLocalFilterSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file MobTravelPlayerOrLocalFilterSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MobTravelPlayerOrLocalFilterSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBTRAVELPLAYERORLOCALFILTERSYSTEM +public: + class MobTravelPlayerOrLocalFilterSystem& operator=(class MobTravelPlayerOrLocalFilterSystem const &) = delete; + MobTravelPlayerOrLocalFilterSystem(class MobTravelPlayerOrLocalFilterSystem const &) = delete; + MobTravelPlayerOrLocalFilterSystem() = delete; +#endif + +public: + /** + * @symbol ?create\@MobTravelPlayerOrLocalFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + +}; diff --git a/LiteLoader/include/llapi/mc/MobTravelTeleportedFilterSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelTeleportedFilterSystem.hpp new file mode 100644 index 0000000000..a5c8f43693 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelTeleportedFilterSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file MobTravelTeleportedFilterSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MobTravelTeleportedFilterSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBTRAVELTELEPORTEDFILTERSYSTEM +public: + class MobTravelTeleportedFilterSystem& operator=(class MobTravelTeleportedFilterSystem const &) = delete; + MobTravelTeleportedFilterSystem(class MobTravelTeleportedFilterSystem const &) = delete; + MobTravelTeleportedFilterSystem() = delete; +#endif + +public: + /** + * @symbol ?create\@MobTravelTeleportedFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + +}; diff --git a/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp b/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp new file mode 100644 index 0000000000..24d914c7b9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/MobTravelUpdateSpeedsSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file MobTravelUpdateSpeedsSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class MobTravelUpdateSpeedsSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOBTRAVELUPDATESPEEDSSYSTEM +public: + class MobTravelUpdateSpeedsSystem& operator=(class MobTravelUpdateSpeedsSystem const &) = delete; + MobTravelUpdateSpeedsSystem(class MobTravelUpdateSpeedsSystem const &) = delete; + MobTravelUpdateSpeedsSystem() = delete; +#endif + +public: + /** + * @symbol ?createMobTravelUpdateSpeedsSystem\@MobTravelUpdateSpeedsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createMobTravelUpdateSpeedsSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp index de2f0aff30..1cbd6c89b5 100644 --- a/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/MockUnknownBlockTypeRegistry.hpp @@ -30,14 +30,14 @@ class MockUnknownBlockTypeRegistry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MockUnknownBlockTypeRegistry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getUnknownBlock\@MockUnknownBlockTypeRegistry\@\@UEAAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z + * @vftbl 1 + * @symbol ?getUnknownBlock\@MockUnknownBlockTypeRegistry\@\@UEAAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z */ virtual class Block const & getUnknownBlock(class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp index b5f9cd9ea3..f4e5964181 100644 --- a/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormRequestPacket.hpp @@ -33,37 +33,43 @@ class ModalFormRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ModalFormRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ModalFormRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ModalFormRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ModalFormRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ModalFormRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ModalFormRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ModalFormRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ModalFormRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MODALFORMREQUESTPACKET /** - * @symbol ??0ModalFormRequestPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ModalFormRequestPacket(); + MCVAPI ~ModalFormRequestPacket(); +#endif /** - * @symbol ??0ModalFormRequestPacket\@\@QEAA\@IAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp index 68cb251083..c80ba2bda9 100644 --- a/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ModalFormResponsePacket.hpp @@ -34,33 +34,33 @@ class ModalFormResponsePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ModalFormResponsePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ModalFormResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ModalFormResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ModalFormResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ModalFormResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ModalFormResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ModalFormResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ModalFormResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ModalFormResponsePacket\@\@QEAA\@XZ + * @symbol ??0ModalFormResponsePacket\@\@QEAA\@XZ */ MCAPI ModalFormResponsePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ModuleIdentifier.hpp b/LiteLoader/include/llapi/mc/ModuleIdentifier.hpp index c6b6e45f43..b0b7014f50 100644 --- a/LiteLoader/include/llapi/mc/ModuleIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/ModuleIdentifier.hpp @@ -28,7 +28,7 @@ struct ModuleIdentifier { public: /** - * @symbol ??1ModuleIdentifier\@\@QEAA\@XZ + * @symbol ??1ModuleIdentifier\@\@QEAA\@XZ */ MCAPI ~ModuleIdentifier(); diff --git a/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp b/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp index cb4ae985f2..4232ca1496 100644 --- a/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp +++ b/LiteLoader/include/llapi/mc/MolangActorArrayPtr.hpp @@ -28,7 +28,7 @@ struct MolangActorArrayPtr { public: /** - * @symbol ??1MolangActorArrayPtr\@\@QEAA\@XZ + * @symbol ??1MolangActorArrayPtr\@\@QEAA\@XZ */ MCAPI ~MolangActorArrayPtr(); diff --git a/LiteLoader/include/llapi/mc/MolangActorIdArrayPtr.hpp b/LiteLoader/include/llapi/mc/MolangActorIdArrayPtr.hpp index 6136c0dcb9..2658df7c68 100644 --- a/LiteLoader/include/llapi/mc/MolangActorIdArrayPtr.hpp +++ b/LiteLoader/include/llapi/mc/MolangActorIdArrayPtr.hpp @@ -28,11 +28,11 @@ struct MolangActorIdArrayPtr { public: /** - * @symbol ??0MolangActorIdArrayPtr\@\@QEAA\@V?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0MolangActorIdArrayPtr\@\@QEAA\@V?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@\@Z */ MCAPI MolangActorIdArrayPtr(std::vector); /** - * @symbol ??1MolangActorIdArrayPtr\@\@QEAA\@XZ + * @symbol ??1MolangActorIdArrayPtr\@\@QEAA\@XZ */ MCAPI ~MolangActorIdArrayPtr(); diff --git a/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp b/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp index 9eb6591666..4bd1848431 100644 --- a/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangArrayVariable.hpp @@ -11,22 +11,22 @@ #undef BEFORE_EXTRA -struct MolangArrayVariable { +class MolangArrayVariable { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOLANGARRAYVARIABLE public: - struct MolangArrayVariable& operator=(struct MolangArrayVariable const &) = delete; - MolangArrayVariable(struct MolangArrayVariable const &) = delete; + class MolangArrayVariable& operator=(class MolangArrayVariable const &) = delete; + MolangArrayVariable(class MolangArrayVariable const &) = delete; MolangArrayVariable() = delete; #endif public: /** - * @symbol ??1MolangArrayVariable\@\@QEAA\@XZ + * @symbol ??1MolangArrayVariable\@\@QEAA\@XZ */ MCAPI ~MolangArrayVariable(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MolangContextVariable.hpp b/LiteLoader/include/llapi/mc/MolangContextVariable.hpp index fb81b5cba2..aaa06ae974 100644 --- a/LiteLoader/include/llapi/mc/MolangContextVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangContextVariable.hpp @@ -28,11 +28,11 @@ struct MolangContextVariable { public: /** - * @symbol ??0MolangContextVariable\@\@QEAA\@AEBVHashedString\@\@\@Z + * @symbol ??0MolangContextVariable\@\@QEAA\@AEBVHashedString\@\@\@Z */ MCAPI MolangContextVariable(class HashedString const &); /** - * @symbol ??1MolangContextVariable\@\@QEAA\@XZ + * @symbol ??1MolangContextVariable\@\@QEAA\@XZ */ MCAPI ~MolangContextVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangContextVariableMapWithCleanup.hpp b/LiteLoader/include/llapi/mc/MolangContextVariableMapWithCleanup.hpp index dff89c3a5d..cd6376c00a 100644 --- a/LiteLoader/include/llapi/mc/MolangContextVariableMapWithCleanup.hpp +++ b/LiteLoader/include/llapi/mc/MolangContextVariableMapWithCleanup.hpp @@ -28,8 +28,8 @@ class MolangContextVariableMapWithCleanup { public: /** - * @symbol ??1MolangContextVariableMapWithCleanup\@\@QEAA\@XZ + * @symbol ??1MolangContextVariableMapWithCleanup\@\@QEAA\@XZ */ MCAPI ~MolangContextVariableMapWithCleanup(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp b/LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp index 0d81556980..767e8768ee 100644 --- a/LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp +++ b/LiteLoader/include/llapi/mc/MolangDataDrivenGeometry.hpp @@ -28,11 +28,11 @@ struct MolangDataDrivenGeometry { public: /** - * @symbol ??8MolangDataDrivenGeometry\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8MolangDataDrivenGeometry\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct MolangDataDrivenGeometry const &) const; /** - * @symbol ??1MolangDataDrivenGeometry\@\@QEAA\@XZ + * @symbol ??1MolangDataDrivenGeometry\@\@QEAA\@XZ */ MCAPI ~MolangDataDrivenGeometry(); diff --git a/LiteLoader/include/llapi/mc/MolangDescriptor.hpp b/LiteLoader/include/llapi/mc/MolangDescriptor.hpp index c18b9a4977..5ef892fb9f 100644 --- a/LiteLoader/include/llapi/mc/MolangDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/MolangDescriptor.hpp @@ -12,76 +12,73 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure MolangDescriptor. - * - */ -struct MolangDescriptor { + +class MolangDescriptor { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MOLANGDESCRIPTOR public: - struct MolangDescriptor& operator=(struct MolangDescriptor const &) = delete; - MolangDescriptor(struct MolangDescriptor const &) = delete; + class MolangDescriptor& operator=(class MolangDescriptor const &) = delete; + MolangDescriptor(class MolangDescriptor const &) = delete; MolangDescriptor() = delete; #endif public: /** - * @vftbl 0 - * @symbol ?clone\@MolangDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ + * @vftbl 0 + * @symbol ?clone\@MolangDescriptor\@\@UEBA?AV?$unique_ptr\@UBaseDescriptor\@ItemDescriptor\@\@U?$default_delete\@UBaseDescriptor\@ItemDescriptor\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 1 - * @symbol ?sameItems\@MolangDescriptor\@\@UEBA_NAEBUBaseDescriptor\@ItemDescriptor\@\@_N\@Z + * @vftbl 1 + * @symbol ?sameItems\@MolangDescriptor\@\@UEBA_NAEBUBaseDescriptor\@ItemDescriptor\@\@_N\@Z */ virtual bool sameItems(struct ItemDescriptor::BaseDescriptor const &, bool) const; /** - * @vftbl 2 - * @symbol ?sameItem\@MolangDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z + * @vftbl 2 + * @symbol ?sameItem\@MolangDescriptor\@\@UEBA_NAEBUItemEntry\@ItemDescriptor\@\@_N\@Z */ virtual bool sameItem(struct ItemDescriptor::ItemEntry const &, bool) const; /** - * @vftbl 3 - * @symbol ?getFullName\@MolangDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getFullName\@MolangDescriptor\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getFullName() const; /** - * @vftbl 6 - * @symbol ?toMap\@MolangDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?toMap\@MolangDescriptor\@\@UEBA?AV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::map, class std::allocator>> toMap() const; /** - * @vftbl 7 - * @symbol ?save\@MolangDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ + * @vftbl 7 + * @symbol ?save\@MolangDescriptor\@\@UEBA?AV?$optional\@VCompoundTag\@\@\@std\@\@XZ */ virtual class std::optional save() const; /** - * @vftbl 8 - * @symbol ?serialize\@MolangDescriptor\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 8 + * @symbol ?serialize\@MolangDescriptor\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void serialize(class Json::Value &) const; /** - * @vftbl 9 - * @symbol ?serialize\@MolangDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 9 + * @symbol ?serialize\@MolangDescriptor\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void serialize(class BinaryStream &) const; /** - * @vftbl 10 - * @symbol ?getType\@MolangDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ + * @vftbl 10 + * @symbol ?getType\@MolangDescriptor\@\@UEBA?AW4InternalType\@ItemDescriptor\@\@XZ */ virtual enum class ItemDescriptor::InternalType getType() const; /** - * @vftbl 12 - * @symbol ?getHash\@MolangDescriptor\@\@UEBA_KXZ + * @vftbl 12 + * @symbol ?getHash\@MolangDescriptor\@\@UEBA_KXZ */ virtual unsigned __int64 getHash() const; /** - * @symbol ?fromExpressionTag\@MolangDescriptor\@\@SA?AV?$unique_ptr\@UMolangDescriptor\@\@U?$default_delete\@UMolangDescriptor\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4MolangVersion\@\@\@Z + * @symbol ?fromExpressionTag\@MolangDescriptor\@\@SA?AV?$unique_ptr\@UMolangDescriptor\@\@U?$default_delete\@UMolangDescriptor\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4MolangVersion\@\@\@Z */ MCAPI static std::unique_ptr fromExpressionTag(std::string const &, enum class MolangVersion); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MolangEntityVariable.hpp b/LiteLoader/include/llapi/mc/MolangEntityVariable.hpp index d15f650e5c..f7adb6c8db 100644 --- a/LiteLoader/include/llapi/mc/MolangEntityVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangEntityVariable.hpp @@ -28,11 +28,11 @@ struct MolangEntityVariable { public: /** - * @symbol ??0MolangEntityVariable\@\@QEAA\@AEBVHashedString\@\@\@Z + * @symbol ??0MolangEntityVariable\@\@QEAA\@AEBVHashedString\@\@\@Z */ MCAPI MolangEntityVariable(class HashedString const &); /** - * @symbol ??1MolangEntityVariable\@\@QEAA\@XZ + * @symbol ??1MolangEntityVariable\@\@QEAA\@XZ */ MCAPI ~MolangEntityVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangEvalParams.hpp b/LiteLoader/include/llapi/mc/MolangEvalParams.hpp index 1101b699f1..cb52f260b1 100644 --- a/LiteLoader/include/llapi/mc/MolangEvalParams.hpp +++ b/LiteLoader/include/llapi/mc/MolangEvalParams.hpp @@ -31,75 +31,75 @@ struct MolangEvalParams { public: /** - * @symbol ?getActorFromArg\@MolangEvalParams\@\@QEBAPEAVActor\@\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?getActorFromArg\@MolangEvalParams\@\@QEBAPEAVActor\@\@AEBUMolangScriptArg\@\@\@Z */ MCAPI class Actor * getActorFromArg(struct MolangScriptArg const &) const; /** - * @symbol ?getActorPtrFromPushedArray\@MolangEvalParams\@\@QEBAPEAVActor\@\@_K0AEA_N\@Z + * @symbol ?getActorPtrFromPushedArray\@MolangEvalParams\@\@QEBAPEAVActor\@\@_K0AEA_N\@Z */ MCAPI class Actor * getActorPtrFromPushedArray(unsigned __int64, unsigned __int64, bool &) const; /** - * @symbol ?popActor\@MolangEvalParams\@\@QEAAPEAVActor\@\@XZ + * @symbol ?popActor\@MolangEvalParams\@\@QEAAPEAVActor\@\@XZ */ MCAPI class Actor * popActor(); /** - * @symbol ?popFloat\@MolangEvalParams\@\@QEAAMXZ + * @symbol ?popFloat\@MolangEvalParams\@\@QEAAMXZ */ MCAPI float popFloat(); /** - * @symbol ?popHash\@MolangEvalParams\@\@QEAA_KXZ + * @symbol ?popHash\@MolangEvalParams\@\@QEAA_KXZ */ MCAPI unsigned __int64 popHash(); /** - * @symbol ?popMissingVariableOrActorAddress\@MolangEvalParams\@\@QEAA_KAEBVHashedString\@\@\@Z + * @symbol ?popMissingVariableOrActorAddress\@MolangEvalParams\@\@QEAA_KW4MolangVariableIndex\@\@\@Z */ - MCAPI unsigned __int64 popMissingVariableOrActorAddress(class HashedString const &); + MCAPI unsigned __int64 popMissingVariableOrActorAddress(enum class MolangVariableIndex); /** - * @symbol ?popMissingVariableOrActorAddress\@MolangEvalParams\@\@QEAA_KW4MolangVariableIndex\@\@\@Z + * @symbol ?popMissingVariableOrActorAddress\@MolangEvalParams\@\@QEAA_KAEBVHashedString\@\@\@Z */ - MCAPI unsigned __int64 popMissingVariableOrActorAddress(enum class MolangVariableIndex); + MCAPI unsigned __int64 popMissingVariableOrActorAddress(class HashedString const &); /** - * @symbol ?popPublicAccessMode\@MolangEvalParams\@\@QEAA_NXZ + * @symbol ?popPublicAccessMode\@MolangEvalParams\@\@QEAA_NXZ */ MCAPI bool popPublicAccessMode(); /** - * @symbol ?popRenderParamsCopyAndPtr\@MolangEvalParams\@\@QEAAXXZ + * @symbol ?popRenderParamsCopyAndPtr\@MolangEvalParams\@\@QEAAXXZ */ MCAPI void popRenderParamsCopyAndPtr(); /** - * @symbol ?pushLoopScope\@MolangEvalParams\@\@QEAAX_K0\@Z + * @symbol ?pushLoopScope\@MolangEvalParams\@\@QEAAX_K0\@Z */ MCAPI void pushLoopScope(unsigned __int64, unsigned __int64); /** - * @symbol ?pushRenderParams\@MolangEvalParams\@\@QEAAXAEBVRenderParams\@\@\@Z + * @symbol ?pushRenderParams\@MolangEvalParams\@\@QEAAXAEBVRenderParams\@\@\@Z */ MCAPI void pushRenderParams(class RenderParams const &); /** - * @symbol ?pushReturnValue\@MolangEvalParams\@\@QEAAXXZ + * @symbol ?pushReturnValue\@MolangEvalParams\@\@QEAAXXZ */ MCAPI void pushReturnValue(); /** - * @symbol ?pushValue\@MolangEvalParams\@\@QEAAXM\@Z + * @symbol ?pushValue\@MolangEvalParams\@\@QEAAXM\@Z */ MCAPI void pushValue(float); /** - * @symbol ?renderParams\@MolangEvalParams\@\@QEAAAEAVRenderParams\@\@XZ + * @symbol ?renderParams\@MolangEvalParams\@\@QEAAAEAVRenderParams\@\@XZ */ MCAPI class RenderParams & renderParams(); /** - * @symbol ?renderParams\@MolangEvalParams\@\@QEBAAEBVRenderParams\@\@XZ + * @symbol ?renderParams\@MolangEvalParams\@\@QEBAAEBVRenderParams\@\@XZ */ MCAPI class RenderParams const & renderParams() const; /** - * @symbol ?restoreAndPopStackState\@MolangEvalParams\@\@QEAAXXZ + * @symbol ?restoreAndPopStackState\@MolangEvalParams\@\@QEAAXXZ */ MCAPI void restoreAndPopStackState(); /** - * @symbol ??1MolangEvalParams\@\@QEAA\@XZ + * @symbol ??1MolangEvalParams\@\@QEAA\@XZ */ MCAPI ~MolangEvalParams(); /** - * @symbol ?getLocalThreadEvalParams\@MolangEvalParams\@\@SAAEAU1\@XZ + * @symbol ?getLocalThreadEvalParams\@MolangEvalParams\@\@SAAEAU1\@XZ */ MCAPI static struct MolangEvalParams & getLocalThreadEvalParams(); diff --git a/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp b/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp index ef6613a152..88d63f6025 100644 --- a/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp +++ b/LiteLoader/include/llapi/mc/MolangEvalStackState.hpp @@ -25,7 +25,7 @@ struct MolangEvalStackState { public: /** - * @symbol ??0MolangEvalStackState\@\@QEAA\@AEAUMolangEvalParams\@\@\@Z + * @symbol ??0MolangEvalStackState\@\@QEAA\@AEAUMolangEvalParams\@\@\@Z */ MCAPI MolangEvalStackState(struct MolangEvalParams &); diff --git a/LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp b/LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp index 1e153c8a97..f33b4336ad 100644 --- a/LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangGeometryVariable.hpp @@ -28,7 +28,7 @@ struct MolangGeometryVariable { public: /** - * @symbol ??1MolangGeometryVariable\@\@QEAA\@XZ + * @symbol ??1MolangGeometryVariable\@\@QEAA\@XZ */ MCAPI ~MolangGeometryVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp b/LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp index e4e1b474d2..4b16af5adc 100644 --- a/LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangMaterialVariable.hpp @@ -28,7 +28,7 @@ struct MolangMaterialVariable { public: /** - * @symbol ??1MolangMaterialVariable\@\@QEAA\@XZ + * @symbol ??1MolangMaterialVariable\@\@QEAA\@XZ */ MCAPI ~MolangMaterialVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangMemberAccessor.hpp b/LiteLoader/include/llapi/mc/MolangMemberAccessor.hpp index e112d9ad3f..e83b923c7e 100644 --- a/LiteLoader/include/llapi/mc/MolangMemberAccessor.hpp +++ b/LiteLoader/include/llapi/mc/MolangMemberAccessor.hpp @@ -28,7 +28,7 @@ struct MolangMemberAccessor { public: /** - * @symbol ??1MolangMemberAccessor\@\@QEAA\@XZ + * @symbol ??1MolangMemberAccessor\@\@QEAA\@XZ */ MCAPI ~MolangMemberAccessor(); diff --git a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp index b907c38d67..5d26c0112f 100644 --- a/LiteLoader/include/llapi/mc/MolangMemberArray.hpp +++ b/LiteLoader/include/llapi/mc/MolangMemberArray.hpp @@ -25,83 +25,80 @@ struct MolangMemberArray { public: struct MolangMemberArray& operator=(struct MolangMemberArray const &) = delete; MolangMemberArray(struct MolangMemberArray const &) = delete; + MolangMemberArray() = delete; #endif public: /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XYZ\@\@AEBVVec3\@\@\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_BaseAndPattern\@\@HH\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_XYZ, class Vec3 const &); + MCAPI MolangMemberArray(enum class MolangStruct_BaseAndPattern, int, int); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XY\@\@AEBVVec2\@\@\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGB\@\@AEBVColor\@mce\@\@\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_XY, class Vec2 const &); + MCAPI MolangMemberArray(enum class MolangStruct_RGB, class mce::Color const &); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_UV\@\@MM\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_MinAndMax\@\@$$QEAU0\@1\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_UV, float, float); + MCAPI MolangMemberArray(enum class MolangStruct_MinAndMax, struct MolangMemberArray &&, struct MolangMemberArray &&); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XYZ\@\@AEBVVec3\@\@\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_TentacleAngleAndSwimRotation, float, float); + MCAPI MolangMemberArray(enum class MolangStruct_XYZ, class Vec3 const &); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TRS\@\@$$QEAU0\@11\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGBA\@\@AEBVColor\@mce\@\@\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_TRS, struct MolangMemberArray &&, struct MolangMemberArray &&, struct MolangMemberArray &&); + MCAPI MolangMemberArray(enum class MolangStruct_RGBA, class mce::Color const &); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_SpeedAndDirection\@\@MAEBVVec3\@\@\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_SpeedAndDirection\@\@MAEBVVec3\@\@\@Z */ MCAPI MolangMemberArray(enum class MolangStruct_SpeedAndDirection, float, class Vec3 const &); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z - */ - MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); - /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGBA\@\@AEBVColor\@mce\@\@\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TentacleAngleAndSwimRotation\@\@MM\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_RGBA, class mce::Color const &); + MCAPI MolangMemberArray(enum class MolangStruct_TentacleAngleAndSwimRotation, float, float); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RGB\@\@AEBVColor\@mce\@\@\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_RotYAndPosY\@\@MM\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_RGB, class mce::Color const &); + MCAPI MolangMemberArray(enum class MolangStruct_RotYAndPosY, float, float); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_PoseIndexAndHurtTime\@\@HH\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_TRS\@\@$$QEAU0\@11\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_PoseIndexAndHurtTime, int, int); + MCAPI MolangMemberArray(enum class MolangStruct_TRS, struct MolangMemberArray &&, struct MolangMemberArray &&, struct MolangMemberArray &&); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_MinAndMax\@\@$$QEAU0\@1\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_XY\@\@AEBVVec2\@\@\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_MinAndMax, struct MolangMemberArray &&, struct MolangMemberArray &&); + MCAPI MolangMemberArray(enum class MolangStruct_XY, class Vec2 const &); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_BaseAndPattern\@\@HH\@Z + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_PoseIndexAndHurtTime\@\@HH\@Z */ - MCAPI MolangMemberArray(enum class MolangStruct_BaseAndPattern, int, int); + MCAPI MolangMemberArray(enum class MolangStruct_PoseIndexAndHurtTime, int, int); /** - * @symbol ??0MolangMemberArray\@\@QEAA\@XZ + * @symbol ??0MolangMemberArray\@\@QEAA\@W4MolangStruct_UV\@\@MM\@Z */ - MCAPI MolangMemberArray(); + MCAPI MolangMemberArray(enum class MolangStruct_UV, float, float); /** - * @symbol ?add\@MolangMemberArray\@\@QEAAXAEBVHashedString\@\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?add\@MolangMemberArray\@\@QEAAXAEBVHashedString\@\@AEBUMolangScriptArg\@\@\@Z */ MCAPI void add(class HashedString const &, struct MolangScriptArg const &); /** - * @symbol ?get\@MolangMemberArray\@\@QEBAPEBUMolangScriptArg\@\@AEBVHashedString\@\@\@Z + * @symbol ?get\@MolangMemberArray\@\@QEBAPEBUMolangScriptArg\@\@AEBVHashedString\@\@\@Z */ MCAPI struct MolangScriptArg const * get(class HashedString const &) const; /** - * @symbol ?getMembers\@MolangMemberArray\@\@QEBAPEBV?$vector\@UMolangMemberVariable\@\@V?$allocator\@UMolangMemberVariable\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMembers\@MolangMemberArray\@\@QEBAPEBV?$vector\@UMolangMemberVariable\@\@V?$allocator\@UMolangMemberVariable\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const * getMembers() const; /** - * @symbol ?getOrAdd\@MolangMemberArray\@\@QEAAAEAUMolangScriptArg\@\@AEBVHashedString\@\@\@Z + * @symbol ?getOrAdd\@MolangMemberArray\@\@QEAAAEAUMolangScriptArg\@\@AEBVHashedString\@\@\@Z */ MCAPI struct MolangScriptArg & getOrAdd(class HashedString const &); /** - * @symbol ??8MolangMemberArray\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8MolangMemberArray\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct MolangMemberArray const &) const; /** - * @symbol ??1MolangMemberArray\@\@QEAA\@XZ + * @symbol ??1MolangMemberArray\@\@QEAA\@XZ */ MCAPI ~MolangMemberArray(); diff --git a/LiteLoader/include/llapi/mc/MolangMemberVariable.hpp b/LiteLoader/include/llapi/mc/MolangMemberVariable.hpp index d73f5a5415..85a0bd87ad 100644 --- a/LiteLoader/include/llapi/mc/MolangMemberVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangMemberVariable.hpp @@ -28,7 +28,7 @@ struct MolangMemberVariable { public: /** - * @symbol ??1MolangMemberVariable\@\@QEAA\@XZ + * @symbol ??1MolangMemberVariable\@\@QEAA\@XZ */ MCAPI ~MolangMemberVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangProgramBuildState.hpp b/LiteLoader/include/llapi/mc/MolangProgramBuildState.hpp index 1b5c3eb3a9..51576b1399 100644 --- a/LiteLoader/include/llapi/mc/MolangProgramBuildState.hpp +++ b/LiteLoader/include/llapi/mc/MolangProgramBuildState.hpp @@ -30,35 +30,35 @@ struct MolangProgramBuildState { public: /** - * @symbol ?allocateInstruction\@MolangProgramBuildState\@\@QEAA_KXZ + * @symbol ?allocateInstruction\@MolangProgramBuildState\@\@QEAA_KXZ */ MCAPI unsigned __int64 allocateInstruction(); /** - * @symbol ?emplaceInstruction\@MolangProgramBuildState\@\@QEAAXV?$function\@$$A6AXAEAUMolangEvalParams\@\@\@Z\@std\@\@\@Z + * @symbol ?emplaceInstruction\@MolangProgramBuildState\@\@QEAAX_KV?$function\@$$A6AXAEAUMolangEvalParams\@\@\@Z\@std\@\@\@Z */ - MCAPI void emplaceInstruction(class std::function); + MCAPI void emplaceInstruction(unsigned __int64, class std::function); /** - * @symbol ?emplaceInstruction\@MolangProgramBuildState\@\@QEAAX_KV?$function\@$$A6AXAEAUMolangEvalParams\@\@\@Z\@std\@\@\@Z + * @symbol ?emplaceInstruction\@MolangProgramBuildState\@\@QEAAXV?$function\@$$A6AXAEAUMolangEvalParams\@\@\@Z\@std\@\@\@Z */ - MCAPI void emplaceInstruction(unsigned __int64, class std::function); + MCAPI void emplaceInstruction(class std::function); /** - * @symbol ?insertJumpWithMaddAtIndex\@MolangProgramBuildState\@\@QEAAX_K0MM\@Z + * @symbol ?insertJumpWithMaddAtIndex\@MolangProgramBuildState\@\@QEAAX_K0MM\@Z */ MCAPI void insertJumpWithMaddAtIndex(unsigned __int64, unsigned __int64, float, float); /** - * @symbol ?numInstructions\@MolangProgramBuildState\@\@QEBA_KXZ + * @symbol ?numInstructions\@MolangProgramBuildState\@\@QEBA_KXZ */ MCAPI unsigned __int64 numInstructions() const; /** - * @symbol ?pushReturnValue\@MolangProgramBuildState\@\@QEAAXXZ + * @symbol ?pushReturnValue\@MolangProgramBuildState\@\@QEAAXXZ */ MCAPI void pushReturnValue(); /** - * @symbol ?setReturnValue\@MolangProgramBuildState\@\@QEAAXM\@Z + * @symbol ?setReturnValue\@MolangProgramBuildState\@\@QEAAXM\@Z */ MCAPI void setReturnValue(float); /** - * @symbol ??1MolangProgramBuildState\@\@QEAA\@XZ + * @symbol ??1MolangProgramBuildState\@\@QEAA\@XZ */ MCAPI ~MolangProgramBuildState(); diff --git a/LiteLoader/include/llapi/mc/MolangQueryFunction.hpp b/LiteLoader/include/llapi/mc/MolangQueryFunction.hpp index 7a960a534f..a214e2f8e5 100644 --- a/LiteLoader/include/llapi/mc/MolangQueryFunction.hpp +++ b/LiteLoader/include/llapi/mc/MolangQueryFunction.hpp @@ -28,7 +28,7 @@ struct MolangQueryFunction { public: /** - * @symbol ??1MolangQueryFunction\@\@QEAA\@XZ + * @symbol ??1MolangQueryFunction\@\@QEAA\@XZ */ MCAPI ~MolangQueryFunction(); diff --git a/LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp b/LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp index ae5632a729..75e76008a0 100644 --- a/LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp +++ b/LiteLoader/include/llapi/mc/MolangQueryFunctionPtr.hpp @@ -28,7 +28,7 @@ struct MolangQueryFunctionPtr { public: /** - * @symbol ??1MolangQueryFunctionPtr\@\@QEAA\@XZ + * @symbol ??1MolangQueryFunctionPtr\@\@QEAA\@XZ */ MCAPI ~MolangQueryFunctionPtr(); diff --git a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp index bcfb8fa26c..ef17c548f5 100644 --- a/LiteLoader/include/llapi/mc/MolangScriptArg.hpp +++ b/LiteLoader/include/llapi/mc/MolangScriptArg.hpp @@ -28,59 +28,59 @@ struct MolangScriptArg { public: /** - * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z + * @symbol ??0MolangScriptArg\@\@QEAA\@H\@Z */ MCAPI MolangScriptArg(int); /** - * @symbol ??0MolangScriptArg\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0MolangScriptArg\@\@QEAA\@AEBU0\@\@Z */ MCAPI MolangScriptArg(struct MolangScriptArg const &); /** - * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z + * @symbol ??0MolangScriptArg\@\@QEAA\@M\@Z */ MCAPI MolangScriptArg(float); /** - * @symbol ?clear\@MolangScriptArg\@\@QEAAXXZ + * @symbol ?clear\@MolangScriptArg\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg &&); /** - * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4MolangScriptArg\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct MolangScriptArg & operator=(struct MolangScriptArg const &); /** - * @symbol ??1MolangScriptArg\@\@QEAA\@XZ + * @symbol ??1MolangScriptArg\@\@QEAA\@XZ */ MCAPI ~MolangScriptArg(); /** - * @symbol ?mDefaultReturnValue_break\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_break\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_break; /** - * @symbol ?mDefaultReturnValue_emptyStringHash\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_emptyStringHash\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_emptyStringHash; /** - * @symbol ?mDefaultReturnValue_float0\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_float0\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_float0; /** - * @symbol ?mDefaultReturnValue_float1\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_float1\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_float1; /** - * @symbol ?mDefaultReturnValue_floatNeg1\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_floatNeg1\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_floatNeg1; /** - * @symbol ?mDefaultReturnValue_molangActorIdEmptyArrayPtr\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_molangActorIdEmptyArrayPtr\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_molangActorIdEmptyArrayPtr; /** - * @symbol ?mDefaultReturnValue_structUV0\@MolangScriptArg\@\@2U1\@B + * @symbol ?mDefaultReturnValue_structUV0\@MolangScriptArg\@\@2U1\@B */ MCAPI static struct MolangScriptArg const mDefaultReturnValue_structUV0; diff --git a/LiteLoader/include/llapi/mc/MolangSerializer.hpp b/LiteLoader/include/llapi/mc/MolangSerializer.hpp index 9956d32010..aaadb517d6 100644 --- a/LiteLoader/include/llapi/mc/MolangSerializer.hpp +++ b/LiteLoader/include/llapi/mc/MolangSerializer.hpp @@ -21,19 +21,19 @@ namespace MolangSerializer { #undef AFTER_EXTRA /** - * @symbol ?deserializeScriptArg\@MolangSerializer\@\@YA?AV?$unique_ptr\@UMolangScriptArg\@\@U?$default_delete\@UMolangScriptArg\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?deserializeScriptArg\@MolangSerializer\@\@YA?AV?$unique_ptr\@UMolangScriptArg\@\@U?$default_delete\@UMolangScriptArg\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI std::unique_ptr deserializeScriptArg(class Json::Value const &); /** - * @symbol ?deserializeVariable\@MolangSerializer\@\@YA?AV?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?deserializeVariable\@MolangSerializer\@\@YA?AV?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI std::unique_ptr deserializeVariable(class Json::Value const &); /** - * @symbol ?deserializeVariableMap\@MolangSerializer\@\@YA?AV?$unique_ptr\@VMolangVariableMap\@\@U?$default_delete\@VMolangVariableMap\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?deserializeVariableMap\@MolangSerializer\@\@YA?AV?$unique_ptr\@VMolangVariableMap\@\@U?$default_delete\@VMolangVariableMap\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI std::unique_ptr deserializeVariableMap(class Json::Value const &); /** - * @symbol ?serializeScriptArg\@MolangSerializer\@\@YA?AVValue\@Json\@\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?serializeScriptArg\@MolangSerializer\@\@YA?AVValue\@Json\@\@AEBUMolangScriptArg\@\@\@Z */ MCAPI class Json::Value serializeScriptArg(struct MolangScriptArg const &); diff --git a/LiteLoader/include/llapi/mc/MolangTempVariable.hpp b/LiteLoader/include/llapi/mc/MolangTempVariable.hpp index cd4708cd2c..cae7645950 100644 --- a/LiteLoader/include/llapi/mc/MolangTempVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangTempVariable.hpp @@ -28,11 +28,11 @@ struct MolangTempVariable { public: /** - * @symbol ??0MolangTempVariable\@\@QEAA\@AEBVHashedString\@\@\@Z + * @symbol ??0MolangTempVariable\@\@QEAA\@AEBVHashedString\@\@\@Z */ MCAPI MolangTempVariable(class HashedString const &); /** - * @symbol ??1MolangTempVariable\@\@QEAA\@XZ + * @symbol ??1MolangTempVariable\@\@QEAA\@XZ */ MCAPI ~MolangTempVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangTextureVariable.hpp b/LiteLoader/include/llapi/mc/MolangTextureVariable.hpp index c3f2670551..9b4090985d 100644 --- a/LiteLoader/include/llapi/mc/MolangTextureVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangTextureVariable.hpp @@ -28,7 +28,7 @@ struct MolangTextureVariable { public: /** - * @symbol ??1MolangTextureVariable\@\@QEAA\@XZ + * @symbol ??1MolangTextureVariable\@\@QEAA\@XZ */ MCAPI ~MolangTextureVariable(); diff --git a/LiteLoader/include/llapi/mc/MolangVariable.hpp b/LiteLoader/include/llapi/mc/MolangVariable.hpp index 923fdf0a7f..10c3365a70 100644 --- a/LiteLoader/include/llapi/mc/MolangVariable.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariable.hpp @@ -30,64 +30,64 @@ class MolangVariable { public: /** - * @symbol ??0MolangVariable\@\@QEAA\@W4MolangVariableIndex\@\@VHashedString\@\@UMolangScriptArg\@\@\@Z + * @symbol ??0MolangVariable\@\@QEAA\@W4MolangVariableIndex\@\@VHashedString\@\@UMolangScriptArg\@\@\@Z */ MCAPI MolangVariable(enum class MolangVariableIndex, class HashedString, struct MolangScriptArg); /** - * @symbol ??1MolangVariable\@\@QEAA\@XZ + * @symbol ??1MolangVariable\@\@QEAA\@XZ */ MCAPI ~MolangVariable(); /** - * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@AEBVHashedString\@\@\@Z + * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_KPEBD_N\@Z */ - MCAPI static enum class MolangVariableIndex getVariableIndex(class HashedString const &); + MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64, char const *, bool); /** - * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z + * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_K\@Z */ MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64); /** - * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@_KPEBD_N\@Z + * @symbol ?getVariableIndex\@MolangVariable\@\@SA?AW4MolangVariableIndex\@\@AEBVHashedString\@\@\@Z */ - MCAPI static enum class MolangVariableIndex getVariableIndex(unsigned __int64, char const *, bool); + MCAPI static enum class MolangVariableIndex getVariableIndex(class HashedString const &); /** - * @symbol ?getVariableName\@MolangVariable\@\@SAAEBVHashedString\@\@W4MolangVariableIndex\@\@\@Z + * @symbol ?getVariableName\@MolangVariable\@\@SAAEBVHashedString\@\@W4MolangVariableIndex\@\@\@Z */ MCAPI static class HashedString const & getVariableName(enum class MolangVariableIndex); /** - * @symbol ?initVariableMaps\@MolangVariable\@\@SAXXZ + * @symbol ?initVariableMaps\@MolangVariable\@\@SAXXZ */ MCAPI static void initVariableMaps(); /** - * @symbol ?processWaterMark\@MolangVariable\@\@SAXXZ + * @symbol ?processWaterMark\@MolangVariable\@\@SAXXZ */ MCAPI static void processWaterMark(); //private: /** - * @symbol ?_getMolangVariableIndexLock\@MolangVariable\@\@CAAEAVrecursive_mutex\@std\@\@XZ + * @symbol ?_getMolangVariableIndexLock\@MolangVariable\@\@CAAEAVrecursive_mutex\@std\@\@XZ */ MCAPI static class std::recursive_mutex & _getMolangVariableIndexLock(); private: /** - * @symbol ?mHasSetWatermark\@MolangVariable\@\@0_NA + * @symbol ?mHasSetWatermark\@MolangVariable\@\@0_NA */ MCAPI static bool mHasSetWatermark; /** - * @symbol ?mIndexToVariableNameMap\@MolangVariable\@\@0V?$unordered_map\@W4MolangVariableIndex\@\@VHashedString\@\@U?$hash\@W4MolangVariableIndex\@\@\@std\@\@U?$equal_to\@W4MolangVariableIndex\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4MolangVariableIndex\@\@VHashedString\@\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mIndexToVariableNameMap\@MolangVariable\@\@0V?$unordered_map\@W4MolangVariableIndex\@\@VHashedString\@\@U?$hash\@W4MolangVariableIndex\@\@\@std\@\@U?$equal_to\@W4MolangVariableIndex\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4MolangVariableIndex\@\@VHashedString\@\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mIndexToVariableNameMap; /** - * @symbol ?mIndexToVariableNameMap_LowWaterMark\@MolangVariable\@\@0V?$unordered_map\@W4MolangVariableIndex\@\@VHashedString\@\@U?$hash\@W4MolangVariableIndex\@\@\@std\@\@U?$equal_to\@W4MolangVariableIndex\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4MolangVariableIndex\@\@VHashedString\@\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mIndexToVariableNameMap_LowWaterMark\@MolangVariable\@\@0V?$unordered_map\@W4MolangVariableIndex\@\@VHashedString\@\@U?$hash\@W4MolangVariableIndex\@\@\@std\@\@U?$equal_to\@W4MolangVariableIndex\@\@\@4\@V?$allocator\@U?$pair\@$$CBW4MolangVariableIndex\@\@VHashedString\@\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mIndexToVariableNameMap_LowWaterMark; /** - * @symbol ?mVariableNameToIndexMap\@MolangVariable\@\@0V?$unordered_map\@_KW4MolangVariableIndex\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@3\@V?$allocator\@U?$pair\@$$CB_KW4MolangVariableIndex\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mVariableNameToIndexMap\@MolangVariable\@\@0V?$unordered_map\@_KW4MolangVariableIndex\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@3\@V?$allocator\@U?$pair\@$$CB_KW4MolangVariableIndex\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mVariableNameToIndexMap; /** - * @symbol ?mVariableNameToIndexMap_LowWaterMark\@MolangVariable\@\@0V?$unordered_map\@_KW4MolangVariableIndex\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@3\@V?$allocator\@U?$pair\@$$CB_KW4MolangVariableIndex\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?mVariableNameToIndexMap_LowWaterMark\@MolangVariable\@\@0V?$unordered_map\@_KW4MolangVariableIndex\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@3\@V?$allocator\@U?$pair\@$$CB_KW4MolangVariableIndex\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mVariableNameToIndexMap_LowWaterMark; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp index b7d38af530..1d3341796f 100644 --- a/LiteLoader/include/llapi/mc/MolangVariableMap.hpp +++ b/LiteLoader/include/llapi/mc/MolangVariableMap.hpp @@ -28,96 +28,96 @@ class MolangVariableMap { public: /** - * @symbol ??0MolangVariableMap\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0MolangVariableMap\@\@QEAA\@AEBV0\@\@Z */ MCAPI MolangVariableMap(class MolangVariableMap const &); /** - * @symbol ??0MolangVariableMap\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0MolangVariableMap\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI MolangVariableMap(class MolangVariableMap &&); /** - * @symbol ?clear\@MolangVariableMap\@\@QEAAAEAV1\@XZ + * @symbol ?clear\@MolangVariableMap\@\@QEAAAEAV1\@XZ */ MCAPI class MolangVariableMap & clear(); /** - * @symbol ?getConstScriptArgReference\@MolangVariableMap\@\@QEBAPEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z + * @symbol ?getConstScriptArgReference\@MolangVariableMap\@\@QEBAPEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z */ MCAPI struct MolangScriptArg const * getConstScriptArgReference(enum class MolangVariableIndex const &) const; /** - * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z + * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z */ MCAPI struct MolangScriptArg const & getMolangVariable(enum class MolangVariableIndex const &, bool &) const; /** - * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEB_KAEA_N\@Z + * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@_KPEBD\@Z */ - MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64 const &, bool &) const; + MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64, char const *) const; /** - * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@_KPEBD\@Z + * @symbol ?getMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEB_KAEA_N\@Z */ - MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64, char const *) const; + MCAPI struct MolangScriptArg const & getMolangVariable(unsigned __int64 const &, bool &) const; /** - * @symbol ?getNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z + * @symbol ?getNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z */ MCAPI struct MolangScriptArg * getNonConstScriptArgReference(enum class MolangVariableIndex const &); /** - * @symbol ?getOrAddNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z + * @symbol ?getOrAddNonConstScriptArgReference\@MolangVariableMap\@\@QEAAPEAUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@\@Z */ MCAPI struct MolangScriptArg * getOrAddNonConstScriptArgReference(enum class MolangVariableIndex const &); /** - * @symbol ?getPublicMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z + * @symbol ?getPublicMolangVariable\@MolangVariableMap\@\@QEBAAEBUMolangScriptArg\@\@AEBW4MolangVariableIndex\@\@AEA_N\@Z */ MCAPI struct MolangScriptArg const & getPublicMolangVariable(enum class MolangVariableIndex const &, bool &) const; /** - * @symbol ?getVariables\@MolangVariableMap\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getVariables\@MolangVariableMap\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VMolangVariable\@\@U?$default_delete\@VMolangVariable\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getVariables() const; /** - * @symbol ??4MolangVariableMap\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4MolangVariableMap\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class MolangVariableMap & operator=(class MolangVariableMap const &); /** - * @symbol ??4MolangVariableMap\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4MolangVariableMap\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class MolangVariableMap & operator=(class MolangVariableMap &&); /** - * @symbol ?setMolangStructMember\@MolangVariableMap\@\@QEAAXAEBVHashedString\@\@0AEBUMolangScriptArg\@\@\@Z + * @symbol ?setMolangStructMember\@MolangVariableMap\@\@QEAAXAEBVHashedString\@\@0AEBUMolangScriptArg\@\@\@Z */ MCAPI void setMolangStructMember(class HashedString const &, class HashedString const &, struct MolangScriptArg const &); /** - * @symbol ?setMolangVariable\@MolangVariableMap\@\@QEAAXAEBVHashedString\@\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?setMolangVariable\@MolangVariableMap\@\@QEAAXAEBVHashedString\@\@AEBUMolangScriptArg\@\@\@Z */ MCAPI void setMolangVariable(class HashedString const &, struct MolangScriptArg const &); /** - * @symbol ?setMolangVariable\@MolangVariableMap\@\@QEAAXW4MolangVariableIndex\@\@AEBUMolangScriptArg\@\@\@Z + * @symbol ?setMolangVariable\@MolangVariableMap\@\@QEAAX_KPEBDAEBUMolangScriptArg\@\@\@Z */ - MCAPI void setMolangVariable(enum class MolangVariableIndex, struct MolangScriptArg const &); + MCAPI void setMolangVariable(unsigned __int64, char const *, struct MolangScriptArg const &); /** - * @symbol ?setMolangVariable\@MolangVariableMap\@\@QEAAX_KPEBDAEBUMolangScriptArg\@\@\@Z + * @symbol ?setMolangVariable\@MolangVariableMap\@\@QEAAXW4MolangVariableIndex\@\@AEBUMolangScriptArg\@\@\@Z */ - MCAPI void setMolangVariable(unsigned __int64, char const *, struct MolangScriptArg const &); + MCAPI void setMolangVariable(enum class MolangVariableIndex, struct MolangScriptArg const &); /** - * @symbol ?setMolangVariableSettings\@MolangVariableMap\@\@QEAAXAEBUMolangVariableSettings\@\@\@Z + * @symbol ?setMolangVariableSettings\@MolangVariableMap\@\@QEAAXAEBUMolangVariableSettings\@\@\@Z */ MCAPI void setMolangVariableSettings(struct MolangVariableSettings const &); /** - * @symbol ??1MolangVariableMap\@\@QEAA\@XZ + * @symbol ??1MolangVariableMap\@\@QEAA\@XZ */ MCAPI ~MolangVariableMap(); //private: /** - * @symbol ?_getMolangVariable\@MolangVariableMap\@\@AEBAPEBVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z + * @symbol ?_getMolangVariable\@MolangVariableMap\@\@AEBAPEBVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z */ MCAPI class MolangVariable const * _getMolangVariable(enum class MolangVariableIndex) const; /** - * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@AEB_KPEBD_N\@Z + * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z */ - MCAPI class MolangVariable * _getOrAddMolangVariable(unsigned __int64 const &, char const *, bool); + MCAPI class MolangVariable * _getOrAddMolangVariable(enum class MolangVariableIndex); /** - * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@W4MolangVariableIndex\@\@\@Z + * @symbol ?_getOrAddMolangVariable\@MolangVariableMap\@\@AEAAPEAVMolangVariable\@\@AEB_KPEBD_N\@Z */ - MCAPI class MolangVariable * _getOrAddMolangVariable(enum class MolangVariableIndex); + MCAPI class MolangVariable * _getOrAddMolangVariable(unsigned __int64 const &, char const *, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MolangVersionMapping.hpp b/LiteLoader/include/llapi/mc/MolangVersionMapping.hpp index 9472d3d419..89a101da42 100644 --- a/LiteLoader/include/llapi/mc/MolangVersionMapping.hpp +++ b/LiteLoader/include/llapi/mc/MolangVersionMapping.hpp @@ -30,8 +30,8 @@ class MolangVersionMapping { public: /** - * @symbol ?getVersion\@MolangVersionMapping\@\@SA?BW4MolangVersion\@\@AEBVSemVersion\@\@\@Z + * @symbol ?getVersion\@MolangVersionMapping\@\@SA?BW4MolangVersion\@\@AEBVSemVersion\@\@\@Z */ MCAPI static enum class MolangVersion const getVersion(class SemVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Monster.hpp b/LiteLoader/include/llapi/mc/Monster.hpp index f628e2719c..bdbb42fb71 100644 --- a/LiteLoader/include/llapi/mc/Monster.hpp +++ b/LiteLoader/include/llapi/mc/Monster.hpp @@ -32,184 +32,178 @@ class Monster : public Mob { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Monster(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Monster\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Monster\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Monster\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Monster\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Monster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Monster\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Monster\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Monster\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_268(); /** - * @vftbl 291 - * @symbol ?aiStep\@Monster\@\@UEAAXXZ + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void aiStep(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Monster\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Monster\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Monster\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Monster\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Monster\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Monster\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MONSTER /** - * @symbol ?canExistInPeaceful\@Monster\@\@UEBA_NXZ + * @symbol ?canExistInPeaceful\@Monster\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Monster(); #endif /** - * @symbol ??0Monster\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Monster\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Monster(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp b/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp index edf4a9bc4b..16c05ed513 100644 --- a/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/MonsterAiStepSystem.hpp @@ -11,50 +11,46 @@ #undef BEFORE_EXTRA -struct MonsterAiStepSystem { +class MonsterAiStepSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_MONSTERAISTEPSYSTEM public: - struct MonsterAiStepSystem& operator=(struct MonsterAiStepSystem const &) = delete; - MonsterAiStepSystem(struct MonsterAiStepSystem const &) = delete; + class MonsterAiStepSystem& operator=(class MonsterAiStepSystem const &) = delete; + MonsterAiStepSystem(class MonsterAiStepSystem const &) = delete; MonsterAiStepSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MonsterAiStepSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@MonsterAiStepSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UBlazeFlag\@\@\@\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@V?$FlagComponent\@UMonsterFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@U?$Read\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UOffsetsComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UNoActionTimeComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@MonsterAiStepSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UBlazeFlag\@\@\@\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@V?$FlagComponent\@UMonsterFlag\@\@\@\@\@\@U?$Read\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UOffsetsComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UNoActionTimeComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove<>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?createSideBySideSystem\@MonsterAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSideBySideSystem(); - /** - * @symbol ?createSystem\@MonsterAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MonsterAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickMonsterAiStep\@MonsterAiStepSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@AEAUNoActionTimeComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBlazeFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickMonsterAiStep\@MonsterAiStepSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUOffsetsComponent\@\@AEBUStateVectorComponent\@\@AEAUNoActionTimeComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBlazeFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@ULavaSlimeFlag\@\@\@\@\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void tickMonsterAiStep(class StrictEntityContext const &, struct AABBShapeComponent const &, struct OffsetsComponent const &, struct StateVectorComponent const &, struct NoActionTimeComponent &, class ViewT>>, class ViewT>>, class IConstBlockSource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp index 483637dcfb..b56f1ceb93 100644 --- a/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/MonsterEggBlock.hpp @@ -31,218 +31,223 @@ class MonsterEggBlock : public InfestedBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MonsterEggBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@MonsterEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @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 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@MonsterEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @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 134 - * @symbol ?isAuxValueRelevantForPicking\@MonsterEggBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@MonsterEggBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@MonsterEggBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@MonsterEggBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 160 - * @symbol ?tryGetUninfested\@MonsterEggBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 160 + * @symbol ?tryGetUninfested\@MonsterEggBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetUninfested(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0MonsterEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0MonsterEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MonsterEggBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp b/LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp index 9ea17dd369..b5d3b7503d 100644 --- a/LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp +++ b/LiteLoader/include/llapi/mc/MonsterRoomFeature.hpp @@ -30,18 +30,24 @@ class MonsterRoomFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MonsterRoomFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@MonsterRoomFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@MonsterRoomFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MONSTERROOMFEATURE /** - * @symbol ??0MonsterRoomFeature\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MonsterRoomFeature(); +#endif + /** + * @symbol ??0MonsterRoomFeature\@\@QEAA\@XZ */ MCAPI MonsterRoomFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MonumentBuilding.hpp b/LiteLoader/include/llapi/mc/MonumentBuilding.hpp index 18834dac62..d9a446b70a 100644 --- a/LiteLoader/include/llapi/mc/MonumentBuilding.hpp +++ b/LiteLoader/include/llapi/mc/MonumentBuilding.hpp @@ -31,64 +31,64 @@ class MonumentBuilding : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MonumentBuilding(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@MonumentBuilding\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@MonumentBuilding\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@MonumentBuilding\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@MonumentBuilding\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@MonumentBuilding\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@MonumentBuilding\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ??0MonumentBuilding\@\@QEAA\@AEAVRandom\@\@FHHAEAH\@Z + * @symbol ??0MonumentBuilding\@\@QEAA\@AEAVRandom\@\@FHHAEAH\@Z */ MCAPI MonumentBuilding(class Random &, short, int, int, int &); //private: /** - * @symbol ?generateEntranceArchs\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateEntranceArchs\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateEntranceArchs(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?generateEntranceWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateEntranceWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateEntranceWall(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?generateLowerWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateLowerWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateLowerWall(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?generateMiddleWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateMiddleWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateMiddleWall(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?generateRoofPiece\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateRoofPiece\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateRoofPiece(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?generateRoomGraph\@MonumentBuilding\@\@AEAA?AV?$vector\@V?$shared_ptr\@VRoomDefinition\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VRoomDefinition\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @symbol ?generateRoomGraph\@MonumentBuilding\@\@AEAA?AV?$vector\@V?$shared_ptr\@VRoomDefinition\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VRoomDefinition\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI std::vector> generateRoomGraph(class Random &); /** - * @symbol ?generateUpperWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateUpperWall\@MonumentBuilding\@\@AEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateUpperWall(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?generateWing\@MonumentBuilding\@\@AEAAX_NHAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?generateWing\@MonumentBuilding\@\@AEAAX_NHAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void generateWing(bool, int, class BlockSource &, class Random &, class BoundingBox const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp b/LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp index d057ebc530..d7d9d86969 100644 --- a/LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp +++ b/LiteLoader/include/llapi/mc/MonumentRoomFitter.hpp @@ -30,4 +30,4 @@ class MonumentRoomFitter { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MossBlock.hpp b/LiteLoader/include/llapi/mc/MossBlock.hpp index e83db2dafe..492c02384d 100644 --- a/LiteLoader/include/llapi/mc/MossBlock.hpp +++ b/LiteLoader/include/llapi/mc/MossBlock.hpp @@ -31,203 +31,208 @@ class MossBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MossBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@MossBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@MossBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0MossBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0MossBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MossBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MossStoneSelector.hpp b/LiteLoader/include/llapi/mc/MossStoneSelector.hpp index 16d70d0979..df2ea3818d 100644 --- a/LiteLoader/include/llapi/mc/MossStoneSelector.hpp +++ b/LiteLoader/include/llapi/mc/MossStoneSelector.hpp @@ -30,14 +30,20 @@ class MossStoneSelector { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MossStoneSelector(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?next\@MossStoneSelector\@\@UEBAAEBVBlock\@\@AEAVRandom\@\@HHH_N\@Z + * @vftbl 1 + * @symbol ?next\@MossStoneSelector\@\@UEBAAEBVBlock\@\@AEAVRandom\@\@HHH_N\@Z */ virtual class Block const & next(class Random &, int, int, int, bool) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOSSSTONESELECTOR + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MossStoneSelector(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MossVegetationFeature.hpp b/LiteLoader/include/llapi/mc/MossVegetationFeature.hpp index 8ae1c5221a..f5e91392a5 100644 --- a/LiteLoader/include/llapi/mc/MossVegetationFeature.hpp +++ b/LiteLoader/include/llapi/mc/MossVegetationFeature.hpp @@ -30,18 +30,18 @@ class MossVegetationFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MossVegetationFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@MossVegetationFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@MossVegetationFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0MossVegetationFeature\@\@QEAA\@XZ + * @symbol ??0MossVegetationFeature\@\@QEAA\@XZ */ MCAPI MossVegetationFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp index 67fd3f3d13..d66a89a682 100644 --- a/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MotionPredictionHintsPacket.hpp @@ -30,37 +30,43 @@ class MotionPredictionHintsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MotionPredictionHintsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MotionPredictionHintsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MotionPredictionHintsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MotionPredictionHintsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MotionPredictionHintsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MotionPredictionHintsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MotionPredictionHintsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MotionPredictionHintsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOTIONPREDICTIONHINTSPACKET /** - * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MotionPredictionHintsPacket(); +#endif + /** + * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@XZ */ MCAPI MotionPredictionHintsPacket(); /** - * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0MotionPredictionHintsPacket\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI MotionPredictionHintsPacket(class Actor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Motive.hpp b/LiteLoader/include/llapi/mc/Motive.hpp index 2a580d1432..1d6ba746e3 100644 --- a/LiteLoader/include/llapi/mc/Motive.hpp +++ b/LiteLoader/include/llapi/mc/Motive.hpp @@ -30,152 +30,152 @@ class Motive { public: /** - * @symbol ?getHeight\@Motive\@\@QEBAHXZ + * @symbol ?getHeight\@Motive\@\@QEBAHXZ */ MCAPI int getHeight() const; /** - * @symbol ?getName\@Motive\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@Motive\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const getName() const; /** - * @symbol ?getWidth\@Motive\@\@QEBAHXZ + * @symbol ?getWidth\@Motive\@\@QEBAHXZ */ MCAPI int getWidth() const; /** - * @symbol ?isPublic\@Motive\@\@QEBA_NXZ + * @symbol ?isPublic\@Motive\@\@QEBA_NXZ */ MCAPI bool isPublic() const; /** - * @symbol ?getAllMotivesAsList\@Motive\@\@SA?AV?$vector\@PEBVMotive\@\@V?$allocator\@PEBVMotive\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAllMotivesAsList\@Motive\@\@SA?AV?$vector\@PEBVMotive\@\@V?$allocator\@PEBVMotive\@\@\@std\@\@\@std\@\@XZ */ MCAPI static std::vector getAllMotivesAsList(); /** - * @symbol ?getMotiveByName\@Motive\@\@SAAEBV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getMotiveByName\@Motive\@\@SAAEBV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Motive const & getMotiveByName(std::string const &); /** - * @symbol ?mAlban\@Motive\@\@2V1\@B + * @symbol ?mAlban\@Motive\@\@2V1\@B */ MCAPI static class Motive const mAlban; /** - * @symbol ?mAztec\@Motive\@\@2V1\@B + * @symbol ?mAztec\@Motive\@\@2V1\@B */ MCAPI static class Motive const mAztec; /** - * @symbol ?mAztec2\@Motive\@\@2V1\@B + * @symbol ?mAztec2\@Motive\@\@2V1\@B */ MCAPI static class Motive const mAztec2; /** - * @symbol ?mBomb\@Motive\@\@2V1\@B + * @symbol ?mBomb\@Motive\@\@2V1\@B */ MCAPI static class Motive const mBomb; /** - * @symbol ?mBurningSkull\@Motive\@\@2V1\@B + * @symbol ?mBurningSkull\@Motive\@\@2V1\@B */ MCAPI static class Motive const mBurningSkull; /** - * @symbol ?mBust\@Motive\@\@2V1\@B + * @symbol ?mBust\@Motive\@\@2V1\@B */ MCAPI static class Motive const mBust; /** - * @symbol ?mCourbet\@Motive\@\@2V1\@B + * @symbol ?mCourbet\@Motive\@\@2V1\@B */ MCAPI static class Motive const mCourbet; /** - * @symbol ?mCreebet\@Motive\@\@2V1\@B + * @symbol ?mCreebet\@Motive\@\@2V1\@B */ MCAPI static class Motive const mCreebet; /** - * @symbol ?mDefaultImage\@Motive\@\@2AEBV1\@EB + * @symbol ?mDefaultImage\@Motive\@\@2AEBV1\@EB */ MCAPI static class Motive const & mDefaultImage; /** - * @symbol ?mDonkeyKong\@Motive\@\@2V1\@B + * @symbol ?mDonkeyKong\@Motive\@\@2V1\@B */ MCAPI static class Motive const mDonkeyKong; /** - * @symbol ?mEarth\@Motive\@\@2V1\@B + * @symbol ?mEarth\@Motive\@\@2V1\@B */ MCAPI static class Motive const mEarth; /** - * @symbol ?mFighters\@Motive\@\@2V1\@B + * @symbol ?mFighters\@Motive\@\@2V1\@B */ MCAPI static class Motive const mFighters; /** - * @symbol ?mFire\@Motive\@\@2V1\@B + * @symbol ?mFire\@Motive\@\@2V1\@B */ MCAPI static class Motive const mFire; /** - * @symbol ?mGraham\@Motive\@\@2V1\@B + * @symbol ?mGraham\@Motive\@\@2V1\@B */ MCAPI static class Motive const mGraham; /** - * @symbol ?mKebab\@Motive\@\@2V1\@B + * @symbol ?mKebab\@Motive\@\@2V1\@B */ MCAPI static class Motive const mKebab; /** - * @symbol ?mMatch\@Motive\@\@2V1\@B + * @symbol ?mMatch\@Motive\@\@2V1\@B */ MCAPI static class Motive const mMatch; /** - * @symbol ?mPigscene\@Motive\@\@2V1\@B + * @symbol ?mPigscene\@Motive\@\@2V1\@B */ MCAPI static class Motive const mPigscene; /** - * @symbol ?mPlant\@Motive\@\@2V1\@B + * @symbol ?mPlant\@Motive\@\@2V1\@B */ MCAPI static class Motive const mPlant; /** - * @symbol ?mPointer\@Motive\@\@2V1\@B + * @symbol ?mPointer\@Motive\@\@2V1\@B */ MCAPI static class Motive const mPointer; /** - * @symbol ?mPool\@Motive\@\@2V1\@B + * @symbol ?mPool\@Motive\@\@2V1\@B */ MCAPI static class Motive const mPool; /** - * @symbol ?mSea\@Motive\@\@2V1\@B + * @symbol ?mSea\@Motive\@\@2V1\@B */ MCAPI static class Motive const mSea; /** - * @symbol ?mSkeleton\@Motive\@\@2V1\@B + * @symbol ?mSkeleton\@Motive\@\@2V1\@B */ MCAPI static class Motive const mSkeleton; /** - * @symbol ?mSkullAndRoses\@Motive\@\@2V1\@B + * @symbol ?mSkullAndRoses\@Motive\@\@2V1\@B */ MCAPI static class Motive const mSkullAndRoses; /** - * @symbol ?mStage\@Motive\@\@2V1\@B + * @symbol ?mStage\@Motive\@\@2V1\@B */ MCAPI static class Motive const mStage; /** - * @symbol ?mSunset\@Motive\@\@2V1\@B + * @symbol ?mSunset\@Motive\@\@2V1\@B */ MCAPI static class Motive const mSunset; /** - * @symbol ?mVoid\@Motive\@\@2V1\@B + * @symbol ?mVoid\@Motive\@\@2V1\@B */ MCAPI static class Motive const mVoid; /** - * @symbol ?mWanderer\@Motive\@\@2V1\@B + * @symbol ?mWanderer\@Motive\@\@2V1\@B */ MCAPI static class Motive const mWanderer; /** - * @symbol ?mWasteland\@Motive\@\@2V1\@B + * @symbol ?mWasteland\@Motive\@\@2V1\@B */ MCAPI static class Motive const mWasteland; /** - * @symbol ?mWater\@Motive\@\@2V1\@B + * @symbol ?mWater\@Motive\@\@2V1\@B */ MCAPI static class Motive const mWater; /** - * @symbol ?mWind\@Motive\@\@2V1\@B + * @symbol ?mWind\@Motive\@\@2V1\@B */ MCAPI static class Motive const mWind; /** - * @symbol ?mWither\@Motive\@\@2V1\@B + * @symbol ?mWither\@Motive\@\@2V1\@B */ MCAPI static class Motive const mWither; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MountPathingGoal.hpp b/LiteLoader/include/llapi/mc/MountPathingGoal.hpp index 607fd675ea..62b3166b36 100644 --- a/LiteLoader/include/llapi/mc/MountPathingGoal.hpp +++ b/LiteLoader/include/llapi/mc/MountPathingGoal.hpp @@ -30,63 +30,63 @@ class MountPathingGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MountPathingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MountPathingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MountPathingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MountPathingGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MountPathingGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MountPathingGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MountPathingGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MountPathingGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MountPathingGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MountPathingGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MountPathingGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MountPathingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MountPathingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_getAttackReachSqr\@MountPathingGoal\@\@MEAAMXZ + * @vftbl 10 + * @symbol ?_getAttackReachSqr\@MountPathingGoal\@\@MEAAMXZ */ virtual float _getAttackReachSqr(); /** - * @symbol ??0MountPathingGoal\@\@QEAA\@AEAVMob\@\@MM_N\@Z + * @symbol ??0MountPathingGoal\@\@QEAA\@AEAVMob\@\@MM_N\@Z */ MCAPI MountPathingGoal(class Mob &, float, float, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MountTameableDefinition.hpp b/LiteLoader/include/llapi/mc/MountTameableDefinition.hpp index 384679e147..57871ec4e7 100644 --- a/LiteLoader/include/llapi/mc/MountTameableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MountTameableDefinition.hpp @@ -30,16 +30,16 @@ class MountTameableDefinition { public: /** - * @symbol ??0MountTameableDefinition\@\@QEAA\@XZ + * @symbol ??0MountTameableDefinition\@\@QEAA\@XZ */ MCAPI MountTameableDefinition(); /** - * @symbol ?initialize\@MountTameableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMountTamingComponent\@\@\@Z + * @symbol ?initialize\@MountTameableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMountTamingComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class MountTamingComponent &) const; /** - * @symbol ?buildSchema\@MountTameableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMountTameableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@MountTameableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMountTameableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MountTamingComponent.hpp b/LiteLoader/include/llapi/mc/MountTamingComponent.hpp index 3b7f2f2fec..710a4175d9 100644 --- a/LiteLoader/include/llapi/mc/MountTamingComponent.hpp +++ b/LiteLoader/include/llapi/mc/MountTamingComponent.hpp @@ -29,56 +29,56 @@ class MountTamingComponent { public: /** - * @symbol ??0MountTamingComponent\@\@QEAA\@XZ + * @symbol ??0MountTamingComponent\@\@QEAA\@XZ */ MCAPI MountTamingComponent(); /** - * @symbol ?addAdditionalSaveData\@MountTamingComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@MountTamingComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?becomeTame\@MountTamingComponent\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?becomeTame\@MountTamingComponent\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void becomeTame(class Actor &, bool); /** - * @symbol ?getCounter\@MountTamingComponent\@\@QEAAAEAHXZ + * @symbol ?getCounter\@MountTamingComponent\@\@QEAAAEAHXZ */ MCAPI int & getCounter(); /** - * @symbol ?getInteraction\@MountTamingComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@MountTamingComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?getTemper\@MountTamingComponent\@\@QEAAAEAHXZ + * @symbol ?getTemper\@MountTamingComponent\@\@QEAAAEAHXZ */ MCAPI int & getTemper(); /** - * @symbol ?getTemperMod\@MountTamingComponent\@\@QEBAHXZ + * @symbol ?getTemperMod\@MountTamingComponent\@\@QEBAHXZ */ MCAPI int getTemperMod() const; /** - * @symbol ?getWaitCount\@MountTamingComponent\@\@QEBAHXZ + * @symbol ?getWaitCount\@MountTamingComponent\@\@QEBAHXZ */ MCAPI int getWaitCount() const; /** - * @symbol ?readAdditionalSaveData\@MountTamingComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@MountTamingComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?tameToPlayer\@MountTamingComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@_N\@Z + * @symbol ?tameToPlayer\@MountTamingComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@_N\@Z */ MCAPI void tameToPlayer(class Actor &, class Player &, bool); //private: /** - * @symbol ?_feedItem\@MountTamingComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@H\@Z + * @symbol ?_feedItem\@MountTamingComponent\@\@AEAAXAEAVActor\@\@AEAVPlayer\@\@H\@Z */ MCAPI void _feedItem(class Actor &, class Player &, int); /** - * @symbol ?_autoReject\@MountTamingComponent\@\@CA_NAEBVItemStack\@\@PEBVMountTameableDefinition\@\@\@Z + * @symbol ?_autoReject\@MountTamingComponent\@\@CA_NAEBVItemStack\@\@PEBVMountTameableDefinition\@\@\@Z */ MCAPI static bool _autoReject(class ItemStack const &, class MountTameableDefinition const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MountTamingEvent.hpp b/LiteLoader/include/llapi/mc/MountTamingEvent.hpp index 7cd63723c8..97f80dc31b 100644 --- a/LiteLoader/include/llapi/mc/MountTamingEvent.hpp +++ b/LiteLoader/include/llapi/mc/MountTamingEvent.hpp @@ -25,7 +25,7 @@ struct MountTamingEvent { public: /** - * @symbol ??1MountTamingEvent\@\@QEAA\@XZ + * @symbol ??1MountTamingEvent\@\@QEAA\@XZ */ MCAPI ~MountTamingEvent(); diff --git a/LiteLoader/include/llapi/mc/MountTamingSystem.hpp b/LiteLoader/include/llapi/mc/MountTamingSystem.hpp index c1c49e2177..094c159519 100644 --- a/LiteLoader/include/llapi/mc/MountTamingSystem.hpp +++ b/LiteLoader/include/llapi/mc/MountTamingSystem.hpp @@ -30,19 +30,19 @@ class MountTamingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MountTamingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@MountTamingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@MountTamingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MountainAttributes.hpp b/LiteLoader/include/llapi/mc/MountainAttributes.hpp index 9ee8aa5e4a..15b75d8d96 100644 --- a/LiteLoader/include/llapi/mc/MountainAttributes.hpp +++ b/LiteLoader/include/llapi/mc/MountainAttributes.hpp @@ -28,7 +28,7 @@ struct MountainAttributes { public: /** - * @symbol ??1MountainAttributes\@\@QEAA\@XZ + * @symbol ??1MountainAttributes\@\@QEAA\@XZ */ MCAPI ~MountainAttributes(); diff --git a/LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp index 2ccaeb8453..584dbd7e1a 100644 --- a/LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsoluteData.hpp @@ -29,44 +29,44 @@ class MoveActorAbsoluteData { public: /** - * @symbol ??0MoveActorAbsoluteData\@\@QEAA\@XZ + * @symbol ??0MoveActorAbsoluteData\@\@QEAA\@XZ */ MCAPI MoveActorAbsoluteData(); /** - * @symbol ??0MoveActorAbsoluteData\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0MoveActorAbsoluteData\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI MoveActorAbsoluteData(class Actor const &); /** - * @symbol ?calculateDelta\@MoveActorAbsoluteData\@\@QEBA?AVMoveActorDeltaData\@\@AEBV1\@\@Z + * @symbol ?calculateDelta\@MoveActorAbsoluteData\@\@QEBA?AVMoveActorDeltaData\@\@AEBV1\@\@Z */ MCAPI class MoveActorDeltaData calculateDelta(class MoveActorAbsoluteData const &) const; /** - * @symbol ?getRot\@MoveActorAbsoluteData\@\@QEBA?AVVec2\@\@XZ + * @symbol ?getRot\@MoveActorAbsoluteData\@\@QEBA?AVVec2\@\@XZ */ MCAPI class Vec2 getRot() const; /** - * @symbol ?getYBodyRot\@MoveActorAbsoluteData\@\@QEBAMXZ + * @symbol ?getYBodyRot\@MoveActorAbsoluteData\@\@QEBAMXZ */ MCAPI float getYBodyRot() const; /** - * @symbol ?getYHeadRot\@MoveActorAbsoluteData\@\@QEBAMXZ + * @symbol ?getYHeadRot\@MoveActorAbsoluteData\@\@QEBAMXZ */ MCAPI float getYHeadRot() const; /** - * @symbol ?isDifferenceSignificant\@MoveActorAbsoluteData\@\@QEBA_NAEBV1\@AEBVVec3\@\@\@Z + * @symbol ?isDifferenceSignificant\@MoveActorAbsoluteData\@\@QEBA_NAEBV1\@AEBVVec3\@\@\@Z */ MCAPI bool isDifferenceSignificant(class MoveActorAbsoluteData const &, class Vec3 const &) const; /** - * @symbol ?setRot\@MoveActorAbsoluteData\@\@QEAAXAEBVVec2\@\@\@Z + * @symbol ?setRot\@MoveActorAbsoluteData\@\@QEAAXAEBVVec2\@\@\@Z */ MCAPI void setRot(class Vec2 const &); /** - * @symbol ?setYBodyRot\@MoveActorAbsoluteData\@\@QEAAXM\@Z + * @symbol ?setYBodyRot\@MoveActorAbsoluteData\@\@QEAAXM\@Z */ MCAPI void setYBodyRot(float); /** - * @symbol ?setYHeadRot\@MoveActorAbsoluteData\@\@QEAAXM\@Z + * @symbol ?setYHeadRot\@MoveActorAbsoluteData\@\@QEAAXM\@Z */ MCAPI void setYHeadRot(float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp index 1768acc435..bdb34730b1 100644 --- a/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorAbsolutePacket.hpp @@ -30,37 +30,43 @@ class MoveActorAbsolutePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveActorAbsolutePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MoveActorAbsolutePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MoveActorAbsolutePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MoveActorAbsolutePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MoveActorAbsolutePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MoveActorAbsolutePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MoveActorAbsolutePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MoveActorAbsolutePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEACTORABSOLUTEPACKET /** - * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveActorAbsolutePacket(); +#endif + /** + * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@XZ */ MCAPI MoveActorAbsolutePacket(); /** - * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@AEBVMoveActorAbsoluteData\@\@\@Z + * @symbol ??0MoveActorAbsolutePacket\@\@QEAA\@AEBVMoveActorAbsoluteData\@\@\@Z */ MCAPI MoveActorAbsolutePacket(class MoveActorAbsoluteData const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp index 8b889b7042..d714703f60 100644 --- a/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp +++ b/LiteLoader/include/llapi/mc/MoveActorDeltaPacket.hpp @@ -30,37 +30,43 @@ class MoveActorDeltaPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveActorDeltaPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MoveActorDeltaPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MoveActorDeltaPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MoveActorDeltaPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MoveActorDeltaPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MoveActorDeltaPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MoveActorDeltaPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MoveActorDeltaPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEACTORDELTAPACKET /** - * @symbol ??0MoveActorDeltaPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MoveActorDeltaPacket(); + MCVAPI ~MoveActorDeltaPacket(); +#endif /** - * @symbol ??0MoveActorDeltaPacket\@\@QEAA\@AEBVMoveActorDeltaData\@\@\@Z + * @symbol ??0MoveActorDeltaPacket\@\@QEAA\@AEBVMoveActorDeltaData\@\@\@Z */ MCAPI MoveActorDeltaPacket(class MoveActorDeltaData const &); + /** + * @symbol ??0MoveActorDeltaPacket\@\@QEAA\@XZ + */ + MCAPI MoveActorDeltaPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp index 49d5ae860d..eabb9af633 100644 --- a/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveCollisionSystem.hpp @@ -28,36 +28,36 @@ class MoveCollisionSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveCollisionSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@MoveCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 + * @vftbl 3 + * @symbol ?tick\@MoveCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ virtual void tick(class StrictExecutionContext, class FlagComponent, 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 + * @symbol ?createSideBySideSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySideSystem(); /** - * @symbol ?createSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MoveCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?tickMoveCollisionSystem\@MoveCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEAUMoveRequestComponent\@\@AEAUTerrainSurfaceOffsetComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ MCAPI static void tickMoveCollisionSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct MoveRequestComponent &, struct TerrainSurfaceOffsetComponent &, class StrictExecutionContext, class FlagComponent, 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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControl.hpp b/LiteLoader/include/llapi/mc/MoveControl.hpp index e8322cbfa0..87d4e157b8 100644 --- a/LiteLoader/include/llapi/mc/MoveControl.hpp +++ b/LiteLoader/include/llapi/mc/MoveControl.hpp @@ -29,64 +29,70 @@ class MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@MoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@MoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct MoveControlDescription *); /** - * @vftbl 2 - * @symbol ?tick\@MoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@MoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?setWantedPosition\@MoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z + * @vftbl 3 + * @symbol ?setWantedPosition\@MoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z */ virtual void setWantedPosition(class MoveControlComponent &, class Mob &, class Vec3 const &, float); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROL /** - * @symbol ??0MoveControl\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveControl(); +#endif + /** + * @symbol ??0MoveControl\@\@QEAA\@XZ */ MCAPI MoveControl(); /** - * @symbol ?MIN_DELTA_TO_JUMP\@MoveControl\@\@2MB + * @symbol ?MIN_DELTA_TO_JUMP\@MoveControl\@\@2MB */ MCAPI static float const MIN_DELTA_TO_JUMP; /** - * @symbol ?MIN_DELTA_TO_JUMP_UNDERWATER\@MoveControl\@\@2MB + * @symbol ?MIN_DELTA_TO_JUMP_UNDERWATER\@MoveControl\@\@2MB */ MCAPI static float const MIN_DELTA_TO_JUMP_UNDERWATER; /** - * @symbol ?MIN_DELTA_TO_MOVE\@MoveControl\@\@2MB + * @symbol ?MIN_DELTA_TO_MOVE\@MoveControl\@\@2MB */ MCAPI static float const MIN_DELTA_TO_MOVE; /** - * @symbol ?MIN_SPEED\@MoveControl\@\@2MB + * @symbol ?MIN_SPEED\@MoveControl\@\@2MB */ MCAPI static float const MIN_SPEED; /** - * @symbol ?MIN_SPEED_SQR\@MoveControl\@\@2MB + * @symbol ?MIN_SPEED_SQR\@MoveControl\@\@2MB */ MCAPI static float const MIN_SPEED_SQR; /** - * @symbol ?getDiffVector\@MoveControl\@\@SA?AVVec3\@\@AEBV2\@AEBVMob\@\@\@Z + * @symbol ?getDiffVector\@MoveControl\@\@SA?AVVec3\@\@AEBV2\@AEBVMob\@\@\@Z */ MCAPI static class Vec3 getDiffVector(class Vec3 const &, class Mob const &); //protected: /** - * @symbol ?calculateMoveSpeed\@MoveControl\@\@IEAAMAEBVMoveControlComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z + * @symbol ?calculateMoveSpeed\@MoveControl\@\@IEAAMAEBVMoveControlComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z */ MCAPI float calculateMoveSpeed(class MoveControlComponent const &, class Mob &, class Vec3 const &, float); /** - * @symbol ?calculateYRotation\@MoveControl\@\@IEAAMAEBVMoveControlComponent\@\@AEBVMob\@\@AEBVVec3\@\@M\@Z + * @symbol ?calculateYRotation\@MoveControl\@\@IEAAMAEBVMoveControlComponent\@\@AEBVMob\@\@AEBVVec3\@\@M\@Z */ MCAPI float calculateYRotation(class MoveControlComponent const &, class Mob const &, class Vec3 const &, float); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp index 422b987263..073d04042c 100644 --- a/LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlBasicDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MoveControlBasicDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MoveControlBasicDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MoveControlBasicDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MoveControlBasicDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLBASICDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MoveControlBasicDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlComponent.hpp b/LiteLoader/include/llapi/mc/MoveControlComponent.hpp index b011cba43a..ee829257b5 100644 --- a/LiteLoader/include/llapi/mc/MoveControlComponent.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlComponent.hpp @@ -29,76 +29,76 @@ class MoveControlComponent { public: /** - * @symbol ??0MoveControlComponent\@\@QEAA\@XZ + * @symbol ??0MoveControlComponent\@\@QEAA\@XZ */ MCAPI MoveControlComponent(); /** - * @symbol ?getHasWantedPosition\@MoveControlComponent\@\@QEBA_NXZ + * @symbol ?getHasWantedPosition\@MoveControlComponent\@\@QEBA_NXZ */ MCAPI bool getHasWantedPosition() const; /** - * @symbol ?getMaxTurn\@MoveControlComponent\@\@QEBAMXZ + * @symbol ?getMaxTurn\@MoveControlComponent\@\@QEBAMXZ */ MCAPI float getMaxTurn() const; /** - * @symbol ?getShouldBreach\@MoveControlComponent\@\@QEBA_NXZ + * @symbol ?getShouldBreach\@MoveControlComponent\@\@QEBA_NXZ */ MCAPI bool getShouldBreach() const; /** - * @symbol ?getSpeedModifier\@MoveControlComponent\@\@QEBAMXZ + * @symbol ?getSpeedModifier\@MoveControlComponent\@\@QEBAMXZ */ MCAPI float getSpeedModifier() const; /** - * @symbol ?getWantedPosition\@MoveControlComponent\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getWantedPosition\@MoveControlComponent\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getWantedPosition() const; /** - * @symbol ?initMultiTypeMovementComponent\@MoveControlComponent\@\@QEAAXAEAVMob\@\@AEAVActorDefinitionDescriptor\@\@\@Z + * @symbol ?initMultiTypeMovementComponent\@MoveControlComponent\@\@QEAAXAEAVMob\@\@AEAVActorDefinitionDescriptor\@\@\@Z */ MCAPI void initMultiTypeMovementComponent(class Mob &, class ActorDefinitionDescriptor &); /** - * @symbol ?initializeFromDefinition\@MoveControlComponent\@\@QEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z + * @symbol ?initializeFromDefinition\@MoveControlComponent\@\@QEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z */ MCAPI void initializeFromDefinition(class Mob &, struct MoveControlDescription *); /** - * @symbol ??4MoveControlComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4MoveControlComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class MoveControlComponent & operator=(class MoveControlComponent &&); /** - * @symbol ?setHasWantedPosition\@MoveControlComponent\@\@QEAAX_N\@Z + * @symbol ?setHasWantedPosition\@MoveControlComponent\@\@QEAAX_N\@Z */ MCAPI void setHasWantedPosition(bool); /** - * @symbol ?setInternalType\@MoveControlComponent\@\@QEAAXV?$unique_ptr\@VMoveControl\@\@U?$default_delete\@VMoveControl\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setInternalType\@MoveControlComponent\@\@QEAAXV?$unique_ptr\@VMoveControl\@\@U?$default_delete\@VMoveControl\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setInternalType(std::unique_ptr); /** - * @symbol ?setMaxTurn\@MoveControlComponent\@\@QEAAXM\@Z + * @symbol ?setMaxTurn\@MoveControlComponent\@\@QEAAXM\@Z */ MCAPI void setMaxTurn(float); /** - * @symbol ?setShouldBreach\@MoveControlComponent\@\@QEAAX_N\@Z + * @symbol ?setShouldBreach\@MoveControlComponent\@\@QEAAX_N\@Z */ MCAPI void setShouldBreach(bool); /** - * @symbol ?setSpeedModifier\@MoveControlComponent\@\@QEAAXM\@Z + * @symbol ?setSpeedModifier\@MoveControlComponent\@\@QEAAXM\@Z */ MCAPI void setSpeedModifier(float); /** - * @symbol ?setWantedPosition\@MoveControlComponent\@\@QEAAXAEAVMob\@\@AEBVVec3\@\@M\@Z + * @symbol ?setWantedPosition\@MoveControlComponent\@\@QEAAXAEAVMob\@\@AEBVVec3\@\@M\@Z */ MCAPI void setWantedPosition(class Mob &, class Vec3 const &, float); /** - * @symbol ?update\@MoveControlComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?update\@MoveControlComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void update(class Mob &); //private: /** - * @symbol ?_setWantedPosition\@MoveControlComponent\@\@AEAAXAEBVVec3\@\@\@Z + * @symbol ?_setWantedPosition\@MoveControlComponent\@\@AEAAXAEBVVec3\@\@\@Z */ MCAPI void _setWantedPosition(class Vec3 const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlDescription.hpp index 2294257070..268c9d860a 100644 --- a/LiteLoader/include/llapi/mc/MoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlDescription.hpp @@ -31,13 +31,9 @@ struct MoveControlDescription { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLDESCRIPTION /** - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ MCVAPI void deserializeData(struct DeserializeDataParams); - /** - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z - */ - MCVAPI void serializeData(class Json::Value &) const; #endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp index 77846b77d3..4fbca34a64 100644 --- a/LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlDolphinDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MoveControlDolphinDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MoveControlDolphinDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MoveControlDolphinDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MoveControlDolphinDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLDOLPHINDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MoveControlDolphinDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp index 5f367fd687..fb6175fa02 100644 --- a/LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlFlyDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MoveControlFlyDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MoveControlFlyDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MoveControlFlyDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MoveControlFlyDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLFLYDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MoveControlFlyDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp index f7092080ec..50f46e2342 100644 --- a/LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlHoverDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MoveControlHoverDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MoveControlHoverDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MoveControlHoverDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MoveControlHoverDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLHOVERDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MoveControlHoverDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp index 5d6df6035a..dc0f611faf 100644 --- a/LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlSkipDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MoveControlSkipDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MoveControlSkipDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MoveControlSkipDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MoveControlSkipDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLSKIPDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MoveControlSkipDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp b/LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp index 71f99cb98b..c19bf5df78 100644 --- a/LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlSwayDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class MoveControlSwayDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@MoveControlSwayDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@MoveControlSwayDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~MoveControlSwayDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@MoveControlSwayDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@MoveControlSwayDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVECONTROLSWAYDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@MoveControlSwayDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~MoveControlSwayDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveControlSystem.hpp b/LiteLoader/include/llapi/mc/MoveControlSystem.hpp index a779d0e49c..771abe60df 100644 --- a/LiteLoader/include/llapi/mc/MoveControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveControlSystem.hpp @@ -30,19 +30,19 @@ class MoveControlSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveControlSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@MoveControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@MoveControlSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveDefinition.hpp b/LiteLoader/include/llapi/mc/MoveDefinition.hpp index d43468e9b8..c8cff8c35c 100644 --- a/LiteLoader/include/llapi/mc/MoveDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveDefinition.hpp @@ -32,14 +32,20 @@ class MoveDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@MoveDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@MoveDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEDEFINITION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveDefinition(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp b/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp index 2c841e00ee..a9b17f3659 100644 --- a/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveHitboxSystem.hpp @@ -28,12 +28,12 @@ class MoveHitboxSystem { public: /** - * @symbol ?createMoveHitboxSystem\@MoveHitboxSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createMoveHitboxSystem\@MoveHitboxSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createMoveHitboxSystem(); /** - * @symbol ?moveHitboxTo\@MoveHitboxSystem\@\@SAXAEBVVec3\@\@AEAV?$vector\@UHitbox\@\@V?$allocator\@UHitbox\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?moveHitboxTo\@MoveHitboxSystem\@\@SAXAEBVVec3\@\@AEAV?$vector\@UHitbox\@\@V?$allocator\@UHitbox\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void moveHitboxTo(class Vec3 const &, std::vector &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp b/LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp index 8c12954452..1d288747c1 100644 --- a/LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveIndoorsGoal.hpp @@ -30,60 +30,60 @@ class MoveIndoorsGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveIndoorsGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveIndoorsGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveIndoorsGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveIndoorsGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveIndoorsGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveIndoorsGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveIndoorsGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MoveIndoorsGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MoveIndoorsGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MoveIndoorsGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MoveIndoorsGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveIndoorsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveIndoorsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MoveIndoorsGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0MoveIndoorsGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI MoveIndoorsGoal(class Mob &); //private: /** - * @symbol ?_isInside\@MoveIndoorsGoal\@\@AEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?_isInside\@MoveIndoorsGoal\@\@AEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool _isInside(class BlockPos const &); /** - * @symbol ?_startPathfinding\@MoveIndoorsGoal\@\@AEAAXXZ + * @symbol ?_startPathfinding\@MoveIndoorsGoal\@\@AEAAXXZ */ MCAPI void _startPathfinding(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveInput.hpp b/LiteLoader/include/llapi/mc/MoveInput.hpp index d10ce45725..8d73e8c939 100644 --- a/LiteLoader/include/llapi/mc/MoveInput.hpp +++ b/LiteLoader/include/llapi/mc/MoveInput.hpp @@ -30,83 +30,83 @@ class MoveInput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveInput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@MoveInput\@\@UEAAXAEAUIPlayerMovementProxy\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@MoveInput\@\@UEAAXAEAUIPlayerMovementProxy\@\@\@Z */ virtual void tick(struct IPlayerMovementProxy &); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?clearInputState\@MoveInput\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?clearInputState\@MoveInput\@\@UEAAXXZ */ virtual void clearInputState(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?allowPicking\@MoveInput\@\@UEAA_NMM\@Z + * @vftbl 6 + * @symbol ?allowPicking\@MoveInput\@\@UEAA_NMM\@Z */ virtual bool allowPicking(float, float); /** - * @vftbl 7 - * @symbol ?setJumping\@MoveInput\@\@UEAAX_N\@Z + * @vftbl 7 + * @symbol ?setJumping\@MoveInput\@\@UEAAX_N\@Z */ virtual void setJumping(bool); /** - * @vftbl 8 - * @symbol ?setAutoJumpingInWater\@MoveInput\@\@UEAAX_N\@Z + * @vftbl 8 + * @symbol ?setAutoJumpingInWater\@MoveInput\@\@UEAAX_N\@Z */ virtual void setAutoJumpingInWater(bool); /** - * @vftbl 9 - * @symbol ?isChangeHeight\@MoveInput\@\@UEBA_NXZ + * @vftbl 9 + * @symbol ?isChangeHeight\@MoveInput\@\@UEBA_NXZ */ virtual bool isChangeHeight() const; /** - * @vftbl 10 - * @symbol ?isPlayerMoving\@MoveInput\@\@UEBA_NXZ + * @vftbl 10 + * @symbol ?isPlayerMoving\@MoveInput\@\@UEBA_NXZ */ virtual bool isPlayerMoving() const; /** - * @vftbl 11 - * @symbol ?extractInputComponent\@MoveInput\@\@UEBA?AUMoveInputComponent\@\@XZ + * @vftbl 11 + * @symbol ?extractInputComponent\@MoveInput\@\@UEBA?AUMoveInputComponent\@\@XZ */ virtual struct MoveInputComponent extractInputComponent() const; /** - * @vftbl 12 - * @symbol ?applyInputComponent\@MoveInput\@\@UEAAXAEBUMoveInputComponent\@\@\@Z + * @vftbl 12 + * @symbol ?applyInputComponent\@MoveInput\@\@UEAAXAEBUMoveInputComponent\@\@\@Z */ virtual void applyInputComponent(struct MoveInputComponent const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEINPUT /** - * @symbol ?clearMovementState\@MoveInput\@\@UEAAXXZ + * @symbol ?clearMovementState\@MoveInput\@\@UEAAXXZ */ MCVAPI void clearMovementState(); /** - * @symbol ?render\@MoveInput\@\@UEAAXM\@Z + * @symbol ?render\@MoveInput\@\@UEAAXM\@Z */ MCVAPI void render(float); /** - * @symbol ?setKey\@MoveInput\@\@UEAAXH_N\@Z + * @symbol ?setKey\@MoveInput\@\@UEAAXH_N\@Z */ MCVAPI void setKey(int, bool); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveInputComponent.hpp b/LiteLoader/include/llapi/mc/MoveInputComponent.hpp index b03aa07357..8e0561e574 100644 --- a/LiteLoader/include/llapi/mc/MoveInputComponent.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputComponent.hpp @@ -28,7 +28,7 @@ struct MoveInputComponent { public: /** - * @symbol ??4MoveInputComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4MoveInputComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MoveInputComponent & operator=(struct MoveInputComponent &&); diff --git a/LiteLoader/include/llapi/mc/MoveInputHandler.hpp b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp index c4bd71cb1f..13b0953eed 100644 --- a/LiteLoader/include/llapi/mc/MoveInputHandler.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputHandler.hpp @@ -30,109 +30,120 @@ class MoveInputHandler : public MoveInput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveInputHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@MoveInputHandler\@\@UEAAXAEAUIPlayerMovementProxy\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@MoveInputHandler\@\@UEAAXAEAUIPlayerMovementProxy\@\@\@Z */ virtual void tick(struct IPlayerMovementProxy &); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?clearInputState\@MoveInputHandler\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?clearInputState\@MoveInputHandler\@\@UEAAXXZ */ virtual void clearInputState(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 9 - * @symbol ?isChangeHeight\@MoveInputHandler\@\@UEBA_NXZ + * @vftbl 9 + * @symbol ?isChangeHeight\@MoveInputHandler\@\@UEBA_NXZ */ virtual bool isChangeHeight() const; /** - * @vftbl 10 - * @symbol ?isPlayerMoving\@MoveInputHandler\@\@UEBA_NXZ + * @vftbl 10 + * @symbol ?isPlayerMoving\@MoveInputHandler\@\@UEBA_NXZ */ virtual bool isPlayerMoving() const; /** - * @vftbl 11 - * @symbol ?extractInputComponent\@MoveInputHandler\@\@UEBA?AUMoveInputComponent\@\@XZ + * @vftbl 11 + * @symbol ?extractInputComponent\@MoveInputHandler\@\@UEBA?AUMoveInputComponent\@\@XZ */ virtual struct MoveInputComponent extractInputComponent() const; /** - * @vftbl 12 - * @symbol ?applyInputComponent\@MoveInputHandler\@\@UEAAXAEBUMoveInputComponent\@\@\@Z + * @vftbl 12 + * @symbol ?applyInputComponent\@MoveInputHandler\@\@UEAAXAEBUMoveInputComponent\@\@\@Z */ virtual void applyInputComponent(struct MoveInputComponent const &); /** - * @vftbl 13 - * @symbol ?fillInputPacket\@MoveInputHandler\@\@UEAAXAEAVPlayerAuthInputPacket\@\@\@Z + * @vftbl 13 + * @symbol ?fillInputPacket\@MoveInputHandler\@\@UEAAXAEAVPlayerAuthInputPacket\@\@\@Z */ virtual void fillInputPacket(class PlayerAuthInputPacket &); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @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 + * @vftbl 15 + * @symbol ?createSnapshot\@MoveInputHandler\@\@UEAA?AV?$unique_ptr\@UIReplayableActorInput\@\@U?$default_delete\@UIReplayableActorInput\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr createSnapshot(); /** - * @symbol ?isAscendBlock\@MoveInputHandler\@\@QEBA_NXZ + * @vftbl 16 + * @symbol ?getClientRawInputStateCopy\@MoveInputHandler\@\@UEBA?AUMoveInputState\@\@XZ + */ + virtual struct MoveInputState getClientRawInputStateCopy() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEINPUTHANDLER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveInputHandler(); +#endif + /** + * @symbol ?isAscendBlock\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool isAscendBlock() const; /** - * @symbol ?isDescendBlock\@MoveInputHandler\@\@QEBA_NXZ + * @symbol ?isDescendBlock\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool isDescendBlock() const; /** - * @symbol ?isSneakDown\@MoveInputHandler\@\@QEBA_NXZ + * @symbol ?isSneakDown\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool isSneakDown() const; /** - * @symbol ?isSneakToggleButtonDown\@MoveInputHandler\@\@QEBA_NXZ + * @symbol ?isSneakToggleButtonDown\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool isSneakToggleButtonDown() const; /** - * @symbol ?wantsDownSlow\@MoveInputHandler\@\@QEBA_NXZ + * @symbol ?setInputState\@MoveInputHandler\@\@QEAAXAEAUMoveInputState\@\@\@Z + */ + MCAPI void setInputState(struct MoveInputState &); + /** + * @symbol ?wantsDownSlow\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool wantsDownSlow() const; /** - * @symbol ?wantsMoveForward\@MoveInputHandler\@\@QEBA_NXZ + * @symbol ?wantsMoveForward\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool wantsMoveForward() const; /** - * @symbol ?wantsUpSlow\@MoveInputHandler\@\@QEBA_NXZ + * @symbol ?wantsUpSlow\@MoveInputHandler\@\@QEBA_NXZ */ MCAPI bool wantsUpSlow() const; //protected: /** - * @symbol ??0MoveInputHandler\@\@IEAA\@XZ + * @symbol ??0MoveInputHandler\@\@IEAA\@XZ */ MCAPI MoveInputHandler(); - /** - * @symbol ?_calculateMoveVector\@MoveInputHandler\@\@KA?AVVec2\@\@AEBUMoveInputState\@\@\@Z - */ - MCAPI static class Vec2 _calculateMoveVector(struct MoveInputState const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveInputState.hpp b/LiteLoader/include/llapi/mc/MoveInputState.hpp index e6ab7fa387..7d274a79ef 100644 --- a/LiteLoader/include/llapi/mc/MoveInputState.hpp +++ b/LiteLoader/include/llapi/mc/MoveInputState.hpp @@ -25,8 +25,16 @@ struct MoveInputState { public: /** - * @symbol ?clear\@MoveInputState\@\@QEAAX_N\@Z + * @symbol ?clear\@MoveInputState\@\@QEAAX_N\@Z */ MCAPI void clear(bool); + /** + * @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/MoveNode.hpp b/LiteLoader/include/llapi/mc/MoveNode.hpp index 45db89d3cf..835d876d62 100644 --- a/LiteLoader/include/llapi/mc/MoveNode.hpp +++ b/LiteLoader/include/llapi/mc/MoveNode.hpp @@ -29,31 +29,31 @@ class MoveNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@MoveNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@MoveNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@MoveNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@MoveNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0MoveNode\@\@QEAA\@XZ + * @symbol ??0MoveNode\@\@QEAA\@XZ */ MCAPI MoveNode(); //private: /** - * @symbol ?convertDirectionStringToKeyPress\@MoveNode\@\@AEAAEV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?convertDirectionStringToKeyPress\@MoveNode\@\@AEAAEV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI unsigned char convertDirectionStringToKeyPress(std::string); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveOutdoorsGoal.hpp b/LiteLoader/include/llapi/mc/MoveOutdoorsGoal.hpp index f27ed36321..af109af99b 100644 --- a/LiteLoader/include/llapi/mc/MoveOutdoorsGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveOutdoorsGoal.hpp @@ -29,65 +29,65 @@ class MoveOutdoorsGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveOutdoorsGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveOutdoorsGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveOutdoorsGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveOutdoorsGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveOutdoorsGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 6 - * @symbol ?tick\@MoveOutdoorsGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MoveOutdoorsGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveOutdoorsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveOutdoorsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@MoveOutdoorsGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@MoveOutdoorsGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @symbol ??0MoveOutdoorsGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0MoveOutdoorsGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI MoveOutdoorsGoal(class Mob &); /** - * @symbol ?mobHasClearSpaceAbove\@MoveOutdoorsGoal\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?mobHasClearSpaceAbove\@MoveOutdoorsGoal\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool mobHasClearSpaceAbove(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_setNextTargetTick\@MoveOutdoorsGoal\@\@AEAAXXZ + * @symbol ?_setNextTargetTick\@MoveOutdoorsGoal\@\@AEAAXXZ */ MCAPI void _setNextTargetTick(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp index 49398e925a..181bb9b902 100644 --- a/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp +++ b/LiteLoader/include/llapi/mc/MovePlayerPacket.hpp @@ -5,11 +5,13 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Player.hpp" #include "Packet.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "Vec3.hpp" +#include "BlockPos.hpp" +#include "Player.hpp" enum class TeleportationCause { UNKNOWN, PROJECTILE, @@ -17,6 +19,11 @@ enum class TeleportationCause { COMMAND, BEHAVIOR, }; + +namespace PlayerPositionModeComponent { +enum class PositionMode; +} + #undef BEFORE_EXTRA /** @@ -54,41 +61,52 @@ class MovePlayerPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MovePlayerPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MovePlayerPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MovePlayerPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MovePlayerPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MovePlayerPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MovePlayerPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MovePlayerPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 6 + * @symbol ?isValid\@MovePlayerPacket\@\@UEBA_NXZ + */ + virtual bool isValid() const; + /** + * @vftbl 7 + * @symbol ?_read\@MovePlayerPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVEPLAYERPACKET /** - * @symbol ??0MovePlayerPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MovePlayerPacket(); + MCVAPI ~MovePlayerPacket(); +#endif /** - * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@W4PositionMode\@1\@HH\@Z + * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@W4PositionMode\@PlayerPositionModeComponent\@\@HH\@Z */ - MCAPI MovePlayerPacket(class Player const &, enum class Player::PositionMode, int, int); + MCAPI MovePlayerPacket(class Player const &, enum class PlayerPositionModeComponent::PositionMode, int, int); /** - * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@AEBVVec3\@\@\@Z + * @symbol ??0MovePlayerPacket\@\@QEAA\@AEBVPlayer\@\@AEBVVec3\@\@\@Z */ MCAPI MovePlayerPacket(class Player const &, class Vec3 const &); + /** + * @symbol ??0MovePlayerPacket\@\@QEAA\@XZ + */ + MCAPI MovePlayerPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp b/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp index c6bec8fa44..cba8c98207 100644 --- a/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp +++ b/LiteLoader/include/llapi/mc/MoveRequestComponent.hpp @@ -28,11 +28,11 @@ struct MoveRequestComponent { public: /** - * @symbol ??4MoveRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4MoveRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct MoveRequestComponent & operator=(struct MoveRequestComponent &&); /** - * @symbol ??1MoveRequestComponent\@\@QEAA\@XZ + * @symbol ??1MoveRequestComponent\@\@QEAA\@XZ */ MCAPI ~MoveRequestComponent(); diff --git a/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp b/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp index a77233fac1..08516fa47a 100644 --- a/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveSpeedCapSystem.hpp @@ -28,8 +28,8 @@ class MoveSpeedCapSystem { public: /** - * @symbol ?create\@MoveSpeedCapSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@MoveSpeedCapSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp b/LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp index b4353454f6..952b1f7582 100644 --- a/LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveThroughVillageGoal.hpp @@ -30,58 +30,58 @@ class MoveThroughVillageGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveThroughVillageGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveThroughVillageGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveThroughVillageGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MoveThroughVillageGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MoveThroughVillageGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveThroughVillageGoal\@\@EEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveThroughVillageGoal\@\@EEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVETHROUGHVILLAGEGOAL /** - * @symbol ?canContinueToUse\@MoveThroughVillageGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@MoveThroughVillageGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); /** - * @symbol ?canUse\@MoveThroughVillageGoal\@\@UEAA_NXZ + * @symbol ?canUse\@MoveThroughVillageGoal\@\@UEAA_NXZ */ MCVAPI bool canUse(); #endif /** - * @symbol ??0MoveThroughVillageGoal\@\@QEAA\@AEAVMob\@\@M_N\@Z + * @symbol ??0MoveThroughVillageGoal\@\@QEAA\@AEAVMob\@\@M_N\@Z */ MCAPI MoveThroughVillageGoal(class Mob &, float, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp b/LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp index 1a189a6c8c..0c58bc4628 100644 --- a/LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToBlockGoal.hpp @@ -30,68 +30,68 @@ class MoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveToBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveToBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveToBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveToBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveToBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveToBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MoveToBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MoveToBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MoveToBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MoveToBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveToBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveToBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MoveToBlockGoal\@\@QEAA\@AEAVMob\@\@MHHHHMVVec3\@\@MW4TargetSelectionMethod\@\@V?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@3V?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@5\@AEBVActorFilterGroup\@\@\@Z + * @symbol ??0MoveToBlockGoal\@\@QEAA\@AEAVMob\@\@MHHHHMVVec3\@\@MW4TargetSelectionMethod\@\@V?$vector\@VActorDefinitionTrigger\@\@V?$allocator\@VActorDefinitionTrigger\@\@\@std\@\@\@std\@\@3V?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@5\@AEBVActorFilterGroup\@\@\@Z */ MCAPI MoveToBlockGoal(class Mob &, float, int, int, int, int, float, class Vec3, float, enum class TargetSelectionMethod, std::vector, std::vector, std::vector, class ActorFilterGroup const &); //private: /** - * @symbol ?_checkIfStuck\@MoveToBlockGoal\@\@AEAAXXZ + * @symbol ?_checkIfStuck\@MoveToBlockGoal\@\@AEAAXXZ */ MCAPI void _checkIfStuck(); /** - * @symbol ?_isValidTarget\@MoveToBlockGoal\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_isValidTarget\@MoveToBlockGoal\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _isValidTarget(class Block const &) const; /** - * @symbol ?_moveToBlock\@MoveToBlockGoal\@\@AEAAXXZ + * @symbol ?_moveToBlock\@MoveToBlockGoal\@\@AEAAXXZ */ MCAPI void _moveToBlock(); /** - * @symbol ?_pathIsValid\@MoveToBlockGoal\@\@AEAA_NPEBVPath\@\@\@Z + * @symbol ?_pathIsValid\@MoveToBlockGoal\@\@AEAA_NPEBVPath\@\@\@Z */ MCAPI bool _pathIsValid(class Path const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToDefinition.hpp b/LiteLoader/include/llapi/mc/MoveToDefinition.hpp index ed0bb98823..e929c1d1a8 100644 --- a/LiteLoader/include/llapi/mc/MoveToDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveToDefinition.hpp @@ -32,14 +32,14 @@ class MoveToDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@MoveToDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@MoveToDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToLandGoal.hpp b/LiteLoader/include/llapi/mc/MoveToLandGoal.hpp index 5e63f52f31..fcead3b796 100644 --- a/LiteLoader/include/llapi/mc/MoveToLandGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToLandGoal.hpp @@ -31,53 +31,53 @@ class MoveToLandGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToLandGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveToLandGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveToLandGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveToLandGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveToLandGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveToLandGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveToLandGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@MoveToLandGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@MoveToLandGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@MoveToLandGoal\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@MoveToLandGoal\@\@MEAAXXZ */ virtual void _moveToBlock(); /** - * @symbol ??0MoveToLandGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z + * @symbol ??0MoveToLandGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z */ MCAPI MoveToLandGoal(class Mob &, float, int, int, int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp b/LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp index 2325e64bda..360c1a62d6 100644 --- a/LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToLavaGoal.hpp @@ -31,28 +31,28 @@ class MoveToLavaGoal : public MoveToLiquidGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToLavaGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0MoveToLavaGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z + * @symbol ??0MoveToLavaGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z */ MCAPI MoveToLavaGoal(class Mob &, float, int, int, int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp b/LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp index e2ae98cc02..f55e1ceadb 100644 --- a/LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToLiquidGoal.hpp @@ -31,53 +31,53 @@ class MoveToLiquidGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToLiquidGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveToLiquidGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveToLiquidGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveToLiquidGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveToLiquidGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveToLiquidGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveToLiquidGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@MoveToLiquidGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@MoveToLiquidGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 17 - * @symbol ?findTargetBlock\@MoveToLiquidGoal\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?findTargetBlock\@MoveToLiquidGoal\@\@UEAA_NXZ */ virtual bool findTargetBlock(); /** - * @symbol ??0MoveToLiquidGoal\@\@QEAA\@AEAVMob\@\@MHHHW4MaterialType\@\@M\@Z + * @symbol ??0MoveToLiquidGoal\@\@QEAA\@AEAVMob\@\@MHHHW4MaterialType\@\@M\@Z */ MCAPI MoveToLiquidGoal(class Mob &, float, int, int, int, enum class MaterialType, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToNode.hpp b/LiteLoader/include/llapi/mc/MoveToNode.hpp index 3c2072738c..79e063cfde 100644 --- a/LiteLoader/include/llapi/mc/MoveToNode.hpp +++ b/LiteLoader/include/llapi/mc/MoveToNode.hpp @@ -29,23 +29,23 @@ class MoveToNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@MoveToNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@MoveToNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@MoveToNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@MoveToNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0MoveToNode\@\@QEAA\@XZ + * @symbol ??0MoveToNode\@\@QEAA\@XZ */ MCAPI MoveToNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp b/LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp index 4f2583eb0c..1dbd12d0ce 100644 --- a/LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToPOIGoal.hpp @@ -31,83 +31,89 @@ class MoveToPOIGoal : public BaseMoveToGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToPOIGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveToPOIGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveToPOIGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 5 - * @symbol ?stop\@MoveToPOIGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MoveToPOIGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MoveToPOIGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MoveToPOIGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveToPOIGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveToPOIGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@MoveToPOIGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@MoveToPOIGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@MoveToPOIGoal\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@MoveToPOIGoal\@\@MEAAXXZ */ virtual void _moveToBlock(); /** - * @vftbl 15 - * @symbol ?_getTargetPosition\@MoveToPOIGoal\@\@MEBA?AVVec3\@\@XZ + * @vftbl 15 + * @symbol ?_getTargetPosition\@MoveToPOIGoal\@\@MEBA?AVVec3\@\@XZ */ virtual class Vec3 _getTargetPosition() const; /** - * @vftbl 17 - * @symbol ?_getOwnedPOI\@MoveToPOIGoal\@\@MEBA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@W4POIType\@\@\@Z + * @vftbl 17 + * @symbol ?_getOwnedPOI\@MoveToPOIGoal\@\@MEBA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@W4POIType\@\@\@Z */ virtual class std::weak_ptr _getOwnedPOI(enum class POIType) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVETOPOIGOAL /** - * @symbol ??0MoveToPOIGoal\@\@QEAA\@AEAVMob\@\@MW4POIType\@\@M\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveToPOIGoal(); +#endif + /** + * @symbol ??0MoveToPOIGoal\@\@QEAA\@AEAVMob\@\@MW4POIType\@\@M\@Z */ MCAPI MoveToPOIGoal(class Mob &, float, enum class POIType, float); /** - * @symbol ?getPOI\@MoveToPOIGoal\@\@QEAA_NW4POIType\@\@\@Z + * @symbol ?getPOI\@MoveToPOIGoal\@\@QEAA_NW4POIType\@\@\@Z */ MCAPI bool getPOI(enum class POIType); //protected: /** - * @symbol ?_canReachPOI\@MoveToPOIGoal\@\@IEAA_NAEBVVec3\@\@M_N\@Z + * @symbol ?_canReachPOI\@MoveToPOIGoal\@\@IEAA_NAEBVVec3\@\@M_N\@Z */ MCAPI bool _canReachPOI(class Vec3 const &, float, bool); //private: /** - * @symbol ?_updatePOIBooking\@MoveToPOIGoal\@\@AEAAXXZ + * @symbol ?_updatePOIBooking\@MoveToPOIGoal\@\@AEAAXXZ */ MCAPI void _updatePOIBooking(); @@ -115,4 +121,4 @@ class MoveToPOIGoal : public BaseMoveToGoal { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp b/LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp index 536708684a..9d6310d5e2 100644 --- a/LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToRandomBlockGoal.hpp @@ -30,56 +30,56 @@ class MoveToRandomBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToRandomBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveToRandomBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveToRandomBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveToRandomBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveToRandomBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveToRandomBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveToRandomBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MoveToRandomBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MoveToRandomBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@MoveToRandomBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MoveToRandomBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveToRandomBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveToRandomBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MoveToRandomBlockGoal\@\@QEAA\@AEAVMob\@\@MMM\@Z + * @symbol ??0MoveToRandomBlockGoal\@\@QEAA\@AEAVMob\@\@MMM\@Z */ MCAPI MoveToRandomBlockGoal(class Mob &, float, float, float); //private: /** - * @symbol ?_isValidDestinationBlock\@MoveToRandomBlockGoal\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isValidDestinationBlock\@MoveToRandomBlockGoal\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isValidDestinationBlock(class BlockSource &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp b/LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp index 190291fb89..a595d5d175 100644 --- a/LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToVillageGoal.hpp @@ -31,76 +31,76 @@ class MoveToVillageGoal : public BaseMoveToGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToVillageGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveToVillageGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveToVillageGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveToVillageGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveToVillageGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveToVillageGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveToVillageGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 6 - * @symbol ?tick\@MoveToVillageGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@MoveToVillageGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveToVillageGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveToVillageGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@MoveToVillageGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@MoveToVillageGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@MoveToVillageGoal\@\@UEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@MoveToVillageGoal\@\@UEAAXXZ */ virtual void _moveToBlock(); /** - * @vftbl 17 - * @symbol ?_selectRandomPosInVillage\@MoveToVillageGoal\@\@MEAA?AVBlockPos\@\@XZ + * @vftbl 17 + * @symbol ?_selectRandomPosInVillage\@MoveToVillageGoal\@\@MEAA?AVBlockPos\@\@XZ */ virtual class BlockPos _selectRandomPosInVillage(); /** - * @symbol ??0MoveToVillageGoal\@\@QEAA\@AEAVMob\@\@MMMH\@Z + * @symbol ??0MoveToVillageGoal\@\@QEAA\@AEAVMob\@\@MMMH\@Z */ MCAPI MoveToVillageGoal(class Mob &, float, float, float, int); //protected: /** - * @symbol ?_tryGetCurrentVillage\@MoveToVillageGoal\@\@IEAA?AV?$shared_ptr\@VVillage\@\@\@std\@\@XZ + * @symbol ?_tryGetCurrentVillage\@MoveToVillageGoal\@\@IEAA?AV?$shared_ptr\@VVillage\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr _tryGetCurrentVillage(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp b/LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp index 70211c537e..9a6866beb4 100644 --- a/LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveToWaterGoal.hpp @@ -31,28 +31,28 @@ class MoveToWaterGoal : public MoveToLiquidGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveToWaterGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0MoveToWaterGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z + * @symbol ??0MoveToWaterGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z */ MCAPI MoveToWaterGoal(class Mob &, float, int, int, int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp index d26a5f6bac..84828233d1 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystem.hpp @@ -28,8 +28,8 @@ class MoveTowardsClosestSpaceSystem { public: /** - * @symbol ?moveTowardsClosestSpace\@MoveTowardsClosestSpaceSystem\@\@SAXAEBVAABB\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@AEBVGetCollisionShapeInterface\@\@AEAVVec3\@\@\@Z + * @symbol ?moveTowardsClosestSpace\@MoveTowardsClosestSpaceSystem\@\@SAXAEBVAABB\@\@AEBV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVIConstBlockSource\@\@AEBVGetCollisionShapeInterface\@\@AEAVVec3\@\@\@Z */ MCAPI static void moveTowardsClosestSpace(class AABB const &, std::vector const &, class IConstBlockSource const &, class GetCollisionShapeInterface const &, class Vec3 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp index fcb9b837a4..e1ef6cc4c8 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsClosestSpaceSystemFromActorContext.hpp @@ -28,8 +28,8 @@ class MoveTowardsClosestSpaceSystemFromActorContext { public: /** - * @symbol ?createSystem\@MoveTowardsClosestSpaceSystemFromActorContext\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@MoveTowardsClosestSpaceSystemFromActorContext\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionDefinition.hpp b/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionDefinition.hpp index 3a6f4f795c..36afcc12bd 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionDefinition.hpp @@ -30,12 +30,12 @@ class MoveTowardsDwellingRestrictionDefinition { public: /** - * @symbol ??0MoveTowardsDwellingRestrictionDefinition\@\@QEAA\@XZ + * @symbol ??0MoveTowardsDwellingRestrictionDefinition\@\@QEAA\@XZ */ MCAPI MoveTowardsDwellingRestrictionDefinition(); /** - * @symbol ?buildSchema\@MoveTowardsDwellingRestrictionDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMoveTowardsDwellingRestrictionDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@MoveTowardsDwellingRestrictionDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMoveTowardsDwellingRestrictionDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp index 0d4110edda..af8659d79c 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsDwellingRestrictionGoal.hpp @@ -31,38 +31,38 @@ class MoveTowardsDwellingRestrictionGoal : public MoveTowardsRestrictionGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveTowardsDwellingRestrictionGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveTowardsDwellingRestrictionGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveTowardsDwellingRestrictionGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveTowardsDwellingRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveTowardsDwellingRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MoveTowardsDwellingRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0MoveTowardsDwellingRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI MoveTowardsDwellingRestrictionGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionDefinition.hpp b/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionDefinition.hpp index 47325926dc..f44b60ca4a 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionDefinition.hpp @@ -30,12 +30,12 @@ class MoveTowardsHomeRestrictionDefinition { public: /** - * @symbol ??0MoveTowardsHomeRestrictionDefinition\@\@QEAA\@XZ + * @symbol ??0MoveTowardsHomeRestrictionDefinition\@\@QEAA\@XZ */ MCAPI MoveTowardsHomeRestrictionDefinition(); /** - * @symbol ?buildSchema\@MoveTowardsHomeRestrictionDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMoveTowardsHomeRestrictionDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@MoveTowardsHomeRestrictionDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VMoveTowardsHomeRestrictionDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp index 73122dd98b..a0c0875bf3 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsHomeRestrictionGoal.hpp @@ -31,38 +31,38 @@ class MoveTowardsHomeRestrictionGoal : public MoveTowardsRestrictionGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveTowardsHomeRestrictionGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveTowardsHomeRestrictionGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveTowardsHomeRestrictionGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveTowardsHomeRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveTowardsHomeRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MoveTowardsHomeRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0MoveTowardsHomeRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI MoveTowardsHomeRestrictionGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp index 15c7c64a07..029da7d072 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionDefinition.hpp @@ -28,13 +28,19 @@ class MoveTowardsRestrictionDefinition { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVETOWARDSRESTRICTIONDEFINITION /** - * @symbol ??0MoveTowardsRestrictionDefinition\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveTowardsRestrictionDefinition(); +#endif + /** + * @symbol ??0MoveTowardsRestrictionDefinition\@\@QEAA\@XZ */ MCAPI MoveTowardsRestrictionDefinition(); /** - * @symbol ?initialize\@MoveTowardsRestrictionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMoveTowardsRestrictionGoal\@\@\@Z + * @symbol ?initialize\@MoveTowardsRestrictionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVMoveTowardsRestrictionGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class MoveTowardsRestrictionGoal &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp index c628c4ab38..02824d2365 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsRestrictionGoal.hpp @@ -30,60 +30,66 @@ class MoveTowardsRestrictionGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveTowardsRestrictionGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveTowardsHomeRestrictionGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveTowardsDwellingRestrictionGoal\@\@UEAA_NXZ */ virtual bool canUse() = 0; /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveTowardsRestrictionGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveTowardsRestrictionGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveTowardsRestrictionGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveTowardsRestrictionGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveTowardsHomeRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveTowardsDwellingRestrictionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVETOWARDSRESTRICTIONGOAL /** - * @symbol ??0MoveTowardsRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~MoveTowardsRestrictionGoal(); +#endif + /** + * @symbol ??0MoveTowardsRestrictionGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI MoveTowardsRestrictionGoal(class Mob &); //protected: /** - * @symbol ?_getMob\@MoveTowardsRestrictionGoal\@\@IEBAAEBVMob\@\@XZ + * @symbol ?_getMob\@MoveTowardsRestrictionGoal\@\@IEBAAEBVMob\@\@XZ */ MCAPI class Mob const & _getMob() const; /** - * @symbol ?_randomizeWantedPositionTowardsRestriction\@MoveTowardsRestrictionGoal\@\@IEAA_NAEBVVec3\@\@\@Z + * @symbol ?_randomizeWantedPositionTowardsRestriction\@MoveTowardsRestrictionGoal\@\@IEAA_NAEBVVec3\@\@\@Z */ MCAPI bool _randomizeWantedPositionTowardsRestriction(class Vec3 const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp b/LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp index 2a46e17643..545f1ab83f 100644 --- a/LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/MoveTowardsTargetGoal.hpp @@ -30,48 +30,48 @@ class MoveTowardsTargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MoveTowardsTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@MoveTowardsTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@MoveTowardsTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@MoveTowardsTargetGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@MoveTowardsTargetGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@MoveTowardsTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@MoveTowardsTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@MoveTowardsTargetGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@MoveTowardsTargetGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@MoveTowardsTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@MoveTowardsTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0MoveTowardsTargetGoal\@\@QEAA\@AEAVMob\@\@MM\@Z + * @symbol ??0MoveTowardsTargetGoal\@\@QEAA\@AEAVMob\@\@MM\@Z */ MCAPI MoveTowardsTargetGoal(class Mob &, float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MovementInterpolatorComponent.hpp b/LiteLoader/include/llapi/mc/MovementInterpolatorComponent.hpp index 137012b8eb..99a1231f99 100644 --- a/LiteLoader/include/llapi/mc/MovementInterpolatorComponent.hpp +++ b/LiteLoader/include/llapi/mc/MovementInterpolatorComponent.hpp @@ -28,31 +28,31 @@ struct MovementInterpolatorComponent { public: /** - * @symbol ?isActive\@MovementInterpolatorComponent\@\@QEBA_NXZ + * @symbol ?isActive\@MovementInterpolatorComponent\@\@QEBA_NXZ */ MCAPI bool isActive() const; /** - * @symbol ?lerpTo\@MovementInterpolatorComponent\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z + * @symbol ?lerpTo\@MovementInterpolatorComponent\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@H\@Z */ MCAPI void lerpTo(class Vec3 const &, class Vec2 const &, int); /** - * @symbol ?lerpToRotation\@MovementInterpolatorComponent\@\@QEAAXAEBVVec2\@\@H\@Z + * @symbol ?lerpToRotation\@MovementInterpolatorComponent\@\@QEAAXAEBVVec2\@\@H\@Z */ MCAPI void lerpToRotation(class Vec2 const &, int); /** - * @symbol ?reset\@MovementInterpolatorComponent\@\@QEAAXXZ + * @symbol ?reset\@MovementInterpolatorComponent\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?setHeadYawLerpTarget\@MovementInterpolatorComponent\@\@QEAAXMH\@Z + * @symbol ?setHeadYawLerpTarget\@MovementInterpolatorComponent\@\@QEAAXMH\@Z */ MCAPI void setHeadYawLerpTarget(float, int); /** - * @symbol ?start\@MovementInterpolatorComponent\@\@QEAAXXZ + * @symbol ?start\@MovementInterpolatorComponent\@\@QEAAXXZ */ MCAPI void start(); /** - * @symbol ?stop\@MovementInterpolatorComponent\@\@QEAAXXZ + * @symbol ?stop\@MovementInterpolatorComponent\@\@QEAAXXZ */ MCAPI void stop(); diff --git a/LiteLoader/include/llapi/mc/MovementInterpolatorSystem.hpp b/LiteLoader/include/llapi/mc/MovementInterpolatorSystem.hpp index 3434fe3d04..b8ef3dc219 100644 --- a/LiteLoader/include/llapi/mc/MovementInterpolatorSystem.hpp +++ b/LiteLoader/include/llapi/mc/MovementInterpolatorSystem.hpp @@ -28,20 +28,12 @@ class MovementInterpolatorSystem { public: /** - * @symbol ?createOnGroundPostTickSystem\@MovementInterpolatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createOnGroundPostTickSystem\@MovementInterpolatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createOnGroundPostTickSystem(); /** - * @symbol ?createTickSystem\@MovementInterpolatorSystem\@\@SA?AUTickingSystemWithInfo\@\@_N\@Z + * @symbol ?createTickSystem\@MovementInterpolatorSystem\@\@SA?AUTickingSystemWithInfo\@\@_N\@Z */ MCAPI static struct TickingSystemWithInfo createTickSystem(bool); - /** - * @symbol ?onGroundPostTick\@MovementInterpolatorSystem\@\@SAXAEBUMovementInterpolatorComponent\@\@AEAUStateVectorComponent\@\@\@Z - */ - MCAPI static void onGroundPostTick(struct MovementInterpolatorComponent const &, struct StateVectorComponent &); - /** - * @symbol ?tick\@MovementInterpolatorSystem\@\@SAXAEAVActor\@\@\@Z - */ - MCAPI static void tick(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MovementInterpolatorSystemImpl.hpp b/LiteLoader/include/llapi/mc/MovementInterpolatorSystemImpl.hpp index f782cc5dd2..56705b351e 100644 --- a/LiteLoader/include/llapi/mc/MovementInterpolatorSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/MovementInterpolatorSystemImpl.hpp @@ -28,16 +28,16 @@ class MovementInterpolatorSystemImpl { public: /** - * @symbol ?_onGroundPostTick\@MovementInterpolatorSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBUMovementInterpolatorComponent\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_onGroundPostTick\@MovementInterpolatorSystemImpl\@\@SAXAEBVStrictEntityContext\@\@AEBUMovementInterpolatorComponent\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _onGroundPostTick(class StrictEntityContext const &, struct MovementInterpolatorComponent const &, struct StateVectorComponent &); /** - * @symbol ?_tickPosition\@MovementInterpolatorSystemImpl\@\@SA?AV?$tuple\@VVec3\@\@M\@std\@\@AEAUMovementInterpolatorComponent\@\@AEBVVec3\@\@M\@Z + * @symbol ?_tickPosition\@MovementInterpolatorSystemImpl\@\@SA?AV?$tuple\@VVec3\@\@M\@std\@\@AEAUMovementInterpolatorComponent\@\@AEBVVec3\@\@M\@Z */ MCAPI static class std::tuple _tickPosition(struct MovementInterpolatorComponent &, class Vec3 const &, float); /** - * @symbol ?_tickRotation\@MovementInterpolatorSystemImpl\@\@SA?AV?$tuple\@VVec2\@\@V1\@\@std\@\@AEAUMovementInterpolatorComponent\@\@AEBVVec2\@\@1\@Z + * @symbol ?_tickRotation\@MovementInterpolatorSystemImpl\@\@SA?AV?$tuple\@VVec2\@\@V1\@\@std\@\@AEAUMovementInterpolatorComponent\@\@AEBVVec2\@\@1\@Z */ MCAPI static class std::tuple _tickRotation(struct MovementInterpolatorComponent &, class Vec2 const &, class Vec2 const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MovementProxyStateProvider.hpp b/LiteLoader/include/llapi/mc/MovementProxyStateProvider.hpp index f4b1667ff0..74b2e7d5e9 100644 --- a/LiteLoader/include/llapi/mc/MovementProxyStateProvider.hpp +++ b/LiteLoader/include/llapi/mc/MovementProxyStateProvider.hpp @@ -22,7 +22,7 @@ namespace MovementProxyStateProvider { #undef AFTER_EXTRA /** - * @symbol ?create\@MovementProxyStateProvider\@\@YA?AV?$unique_ptr\@UIMovementProxyStateProvider\@\@U?$default_delete\@UIMovementProxyStateProvider\@\@\@std\@\@\@std\@\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@AEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@\@Z + * @symbol ?create\@MovementProxyStateProvider\@\@YA?AV?$unique_ptr\@UIMovementProxyStateProvider\@\@U?$default_delete\@UIMovementProxyStateProvider\@\@\@std\@\@\@std\@\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@AEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@\@Z */ MCAPI std::unique_ptr create(class WeakRefT, class entt::basic_dispatcher> &, class gsl::not_null); diff --git a/LiteLoader/include/llapi/mc/MovementSoundDistanceOffsetDefinition.hpp b/LiteLoader/include/llapi/mc/MovementSoundDistanceOffsetDefinition.hpp index 3afdf5229c..c3aca86be9 100644 --- a/LiteLoader/include/llapi/mc/MovementSoundDistanceOffsetDefinition.hpp +++ b/LiteLoader/include/llapi/mc/MovementSoundDistanceOffsetDefinition.hpp @@ -29,7 +29,7 @@ struct MovementSoundDistanceOffsetDefinition { public: /** - * @symbol ?buildSchema\@MovementSoundDistanceOffsetDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UMovementSoundDistanceOffsetDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@MovementSoundDistanceOffsetDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UMovementSoundDistanceOffsetDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/MovingBlock.hpp b/LiteLoader/include/llapi/mc/MovingBlock.hpp index 4a982170cd..04d2ad69d7 100644 --- a/LiteLoader/include/llapi/mc/MovingBlock.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlock.hpp @@ -31,234 +31,239 @@ class MovingBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MovingBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@MovingBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@MovingBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 81 - * @symbol ?updateEntityAfterFallOn\@MovingBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @vftbl 81 + * @symbol ?updateEntityAfterFallOn\@MovingBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@MovingBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@MovingBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@MovingBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@MovingBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@MovingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MOVINGBLOCK /** - * @symbol ?pushesUpFallingBlocks\@MovingBlock\@\@UEBA_NXZ + * @symbol ?pushesUpFallingBlocks\@MovingBlock\@\@UEBA_NXZ */ MCVAPI bool pushesUpFallingBlocks() const; #endif /** - * @symbol ??0MovingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MovingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MovingBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp index 7ebb5a3ac6..6fb460e4cc 100644 --- a/LiteLoader/include/llapi/mc/MovingBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MovingBlockActor.hpp @@ -31,138 +31,138 @@ class MovingBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MovingBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@MovingBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@MovingBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@MovingBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@MovingBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@MovingBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@MovingBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 14 - * @symbol ?isPreserved\@MovingBlockActor\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 14 + * @symbol ?isPreserved\@MovingBlockActor\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool isPreserved(class BlockSource &) const; /** - * @vftbl 15 - * @symbol ?shouldPreserve\@MovingBlockActor\@\@UEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 15 + * @symbol ?shouldPreserve\@MovingBlockActor\@\@UEAA_NAEAVBlockSource\@\@\@Z */ virtual bool shouldPreserve(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 22 - * @symbol ?getCollisionShape\@MovingBlockActor\@\@UEBA?AVAABB\@\@AEBVIConstBlockSource\@\@\@Z + * @vftbl 22 + * @symbol ?getCollisionShape\@MovingBlockActor\@\@UEBA?AVAABB\@\@AEBVIConstBlockSource\@\@\@Z */ virtual class AABB getCollisionShape(class IConstBlockSource const &) const; /** - * @vftbl 30 - * @symbol ?getOwningPiston\@MovingBlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + * @vftbl 30 + * @symbol ?getOwningPiston\@MovingBlockActor\@\@UEAAPEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z */ virtual class PistonBlockActor * getOwningPiston(class BlockSource &); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@MovingBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@MovingBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@MovingBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0MovingBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0MovingBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI MovingBlockActor(class BlockPos const &); /** - * @symbol ?_validPistonPos\@MovingBlockActor\@\@QEBA_NAEBVIConstBlockSource\@\@\@Z + * @symbol ?_validPistonPos\@MovingBlockActor\@\@QEBA_NAEBVIConstBlockSource\@\@\@Z */ MCAPI bool _validPistonPos(class IConstBlockSource const &) const; /** - * @symbol ?aquireWrappedBlockActor\@MovingBlockActor\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@XZ + * @symbol ?aquireWrappedBlockActor\@MovingBlockActor\@\@QEAA?AV?$shared_ptr\@VBlockActor\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr aquireWrappedBlockActor(); /** - * @symbol ?getDrawPos\@MovingBlockActor\@\@QEBA?AVVec3\@\@AEBVIConstBlockSource\@\@M\@Z + * @symbol ?getDrawPos\@MovingBlockActor\@\@QEBA?AVVec3\@\@AEBVIConstBlockSource\@\@M\@Z */ MCAPI class Vec3 getDrawPos(class IConstBlockSource const &, float) const; /** - * @symbol ?getWrappedBlock\@MovingBlockActor\@\@QEBAAEBVBlock\@\@XZ + * @symbol ?getWrappedBlock\@MovingBlockActor\@\@QEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getWrappedBlock() const; /** - * @symbol ?getWrappedExtraBlock\@MovingBlockActor\@\@QEAAAEBVBlock\@\@XZ + * @symbol ?getWrappedExtraBlock\@MovingBlockActor\@\@QEAAAEBVBlock\@\@XZ */ MCAPI class Block const & getWrappedExtraBlock(); /** - * @symbol ?moveCollidedEntities\@MovingBlockActor\@\@QEAAXAEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z + * @symbol ?moveCollidedEntities\@MovingBlockActor\@\@QEAAXAEAVPistonBlockActor\@\@AEAVBlockSource\@\@\@Z */ MCAPI void moveCollidedEntities(class PistonBlockActor &, class BlockSource &); /** - * @symbol ?registerPiston\@MovingBlockActor\@\@QEAAXAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?registerPiston\@MovingBlockActor\@\@QEAAXAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void registerPiston(class BlockSource const &, class BlockPos const &); /** - * @symbol ?setWrappedBlock\@MovingBlockActor\@\@QEAAXAEBVBlock\@\@\@Z + * @symbol ?setWrappedBlock\@MovingBlockActor\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void setWrappedBlock(class Block const &); /** - * @symbol ?setWrappedBlockActor\@MovingBlockActor\@\@QEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z + * @symbol ?setWrappedBlockActor\@MovingBlockActor\@\@QEAAXV?$shared_ptr\@VBlockActor\@\@\@std\@\@\@Z */ MCAPI void setWrappedBlockActor(class std::shared_ptr); /** - * @symbol ?setWrappedExtraBlock\@MovingBlockActor\@\@QEAAXAEBVBlock\@\@\@Z + * @symbol ?setWrappedExtraBlock\@MovingBlockActor\@\@QEAAXAEBVBlock\@\@\@Z */ MCAPI void setWrappedExtraBlock(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MudBlock.hpp b/LiteLoader/include/llapi/mc/MudBlock.hpp index 08a9a834f9..97db09e5b4 100644 --- a/LiteLoader/include/llapi/mc/MudBlock.hpp +++ b/LiteLoader/include/llapi/mc/MudBlock.hpp @@ -29,222 +29,227 @@ class MudBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MudBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@MudBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@MudBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@MudBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@MudBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@MudBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@MudBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@MudBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@MudBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@MudBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0MudBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0MudBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MudBlock(std::string const &, int); /** - * @symbol ?BLOCK_AABB\@MudBlock\@\@2VAABB\@\@A + * @symbol ?BLOCK_AABB\@MudBlock\@\@2VAABB\@\@A */ MCAPI static class AABB BLOCK_AABB; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MultiRecipe.hpp b/LiteLoader/include/llapi/mc/MultiRecipe.hpp index 5d42bd1801..605221530b 100644 --- a/LiteLoader/include/llapi/mc/MultiRecipe.hpp +++ b/LiteLoader/include/llapi/mc/MultiRecipe.hpp @@ -31,23 +31,23 @@ class MultiRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MultiRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ + * @vftbl 5 + * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ */ virtual bool isShapeless() const; /** - * @vftbl 9 - * @symbol ?isMultiRecipe\@MultiRecipe\@\@EEBA_NXZ + * @vftbl 9 + * @symbol ?isMultiRecipe\@MultiRecipe\@\@EEBA_NXZ */ virtual bool isMultiRecipe() const; /** - * @symbol ??0MultiRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@VHashedString\@\@\@Z + * @symbol ??0MultiRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@VHashedString\@\@\@Z */ - MCAPI MultiRecipe(class gsl::basic_string_span, class HashedString); + MCAPI MultiRecipe(class std::basic_string_view>, class HashedString); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp index 691fc5fa1e..7525b92a3a 100644 --- a/LiteLoader/include/llapi/mc/MultifaceBlock.hpp +++ b/LiteLoader/include/llapi/mc/MultifaceBlock.hpp @@ -31,330 +31,335 @@ class MultifaceBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MultifaceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@MultifaceBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@MultifaceBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 57 - * @symbol ?sanitizeFillBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 57 + * @symbol ?sanitizeFillBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const & sanitizeFillBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@MultifaceBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@MultifaceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@MultifaceBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@MultifaceBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 178 - * @symbol ?canSurvive\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@MultifaceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?getMultifaceBlock\@SculkVeinBlock\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 194 + * @symbol ?getMultifaceBlock\@GlowLichenBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const = 0; /** - * @vftbl 194 - * @symbol ?getMultifaceSpreader\@SculkVeinBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ + * @vftbl 195 + * @symbol ?getMultifaceSpreader\@GlowLichenBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_MULTIFACEBLOCK /** - * @symbol ?isMultifaceBlock\@MultifaceBlock\@\@UEBA_NXZ + * @symbol ?isMultifaceBlock\@MultifaceBlock\@\@UEBA_NXZ */ MCVAPI bool isMultifaceBlock() const; #endif /** - * @symbol ??0MultifaceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0MultifaceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI MultifaceBlock(std::string const &, int, class Material const &); /** - * @symbol ?removeFace\@MultifaceBlock\@\@QEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@E_N\@Z + * @symbol ?removeFace\@MultifaceBlock\@\@QEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@E_N\@Z */ MCAPI void removeFace(class IBlockWorldGenAPI &, class BlockSource *, class Block const &, class BlockPos const &, unsigned char, bool) const; /** - * @symbol ?MULTIFACE_ALL\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_ALL\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_ALL; /** - * @symbol ?MULTIFACE_DOWN\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_DOWN\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_DOWN; /** - * @symbol ?MULTIFACE_EAST\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_EAST\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_EAST; /** - * @symbol ?MULTIFACE_NORTH\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_NORTH\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_NORTH; /** - * @symbol ?MULTIFACE_SIDES\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_SIDES\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_SIDES; /** - * @symbol ?MULTIFACE_SOUTH\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_SOUTH\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_SOUTH; /** - * @symbol ?MULTIFACE_UP\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_UP\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_UP; /** - * @symbol ?MULTIFACE_WEST\@MultifaceBlock\@\@2HB + * @symbol ?MULTIFACE_WEST\@MultifaceBlock\@\@2HB */ MCAPI static int const MULTIFACE_WEST; /** - * @symbol ?convertOldMultifaceToNewMultifaceValue\@MultifaceBlock\@\@SAHH\@Z + * @symbol ?convertOldMultifaceToNewMultifaceValue\@MultifaceBlock\@\@SAHH\@Z */ MCAPI static int convertOldMultifaceToNewMultifaceValue(int); /** - * @symbol ?getBlockForPlacement\@MultifaceBlock\@\@SAAEBVBlock\@\@AEBV2\@0AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?getBlockForPlacement\@MultifaceBlock\@\@SAAEBVBlock\@\@AEBV2\@0AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI static class Block const & getBlockForPlacement(class Block const &, class Block const &, class BlockSource &, class BlockPos const &, unsigned char); /** - * @symbol ?getBlockForPlacementWorldGen\@MultifaceBlock\@\@SAAEBVBlock\@\@AEBV2\@0AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?getBlockForPlacementWorldGen\@MultifaceBlock\@\@SAAEBVBlock\@\@AEBV2\@0AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@E\@Z */ MCAPI static class Block const & getBlockForPlacementWorldGen(class Block const &, class Block const &, class IBlockWorldGenAPI &, class BlockPos const &, unsigned char); /** - * @symbol ?getMultifaceValueFromFace\@MultifaceBlock\@\@SAHE\@Z + * @symbol ?getMultifaceValueFromFace\@MultifaceBlock\@\@SAHE\@Z */ MCAPI static int getMultifaceValueFromFace(unsigned char); /** - * @symbol ?hasFace\@MultifaceBlock\@\@SA_NAEBVBlock\@\@E\@Z + * @symbol ?hasFace\@MultifaceBlock\@\@SA_NAEBVBlock\@\@E\@Z */ MCAPI static bool hasFace(class Block const &, unsigned char); //protected: /** - * @symbol ?_canSpread\@MultifaceBlock\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_canSpread\@MultifaceBlock\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool _canSpread(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &, unsigned char) const; /** - * @symbol ?_getNumSides\@MultifaceBlock\@\@IEBAHAEBVBlock\@\@\@Z + * @symbol ?_getNumSides\@MultifaceBlock\@\@IEBAHAEBVBlock\@\@\@Z */ MCAPI int _getNumSides(class Block const &) const; //private: /** - * @symbol ?_removeBlock\@MultifaceBlock\@\@AEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_removeBlock\@MultifaceBlock\@\@AEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void _removeBlock(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, bool) const; @@ -362,4 +367,4 @@ class MultifaceBlock : public BlockLegacy { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MultifaceFeature.hpp b/LiteLoader/include/llapi/mc/MultifaceFeature.hpp index 0ada626c92..1f5704f9cc 100644 --- a/LiteLoader/include/llapi/mc/MultifaceFeature.hpp +++ b/LiteLoader/include/llapi/mc/MultifaceFeature.hpp @@ -29,30 +29,30 @@ class MultifaceFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MultifaceFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@MultifaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@MultifaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0MultifaceFeature\@\@QEAA\@XZ + * @symbol ??0MultifaceFeature\@\@QEAA\@XZ */ MCAPI MultifaceFeature(); //private: /** - * @symbol ?_placeBlockIfPossible\@MultifaceFeature\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBV?$vector\@EV?$allocator\@E\@std\@\@\@3\@\@Z + * @symbol ?_placeBlockIfPossible\@MultifaceFeature\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBV?$vector\@EV?$allocator\@E\@std\@\@\@3\@\@Z */ MCAPI class std::optional _placeBlockIfPossible(class BlockSource &, class BlockPos const &, class Random &, std::vector const &) const; /** - * @symbol ?_getShuffledDirections\@MultifaceFeature\@\@CA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@V23\@\@Z + * @symbol ?_getShuffledDirections\@MultifaceFeature\@\@CA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@V23\@\@Z */ MCAPI static std::vector _getShuffledDirections(std::vector); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MultifaceSpreader.hpp b/LiteLoader/include/llapi/mc/MultifaceSpreader.hpp index 4ec5ab4337..05b64d925d 100644 --- a/LiteLoader/include/llapi/mc/MultifaceSpreader.hpp +++ b/LiteLoader/include/llapi/mc/MultifaceSpreader.hpp @@ -28,68 +28,68 @@ class MultifaceSpreader { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MultifaceSpreader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_canSpreadFrom\@MultifaceSpreader\@\@MEBA_NAEBVBlock\@\@E\@Z + * @vftbl 1 + * @symbol ?_canSpreadFrom\@MultifaceSpreader\@\@MEBA_NAEBVBlock\@\@E\@Z */ virtual bool _canSpreadFrom(class Block const &, unsigned char) const; /** - * @vftbl 2 - * @symbol ?_canSpreadInto\@MultifaceSpreader\@\@MEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 2 + * @symbol ?_canSpreadInto\@MultifaceSpreader\@\@MEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canSpreadInto(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &, unsigned char) const; /** - * @vftbl 3 - * @symbol ?_isOtherBlockValidAsSource\@MultifaceSpreader\@\@MEBA_NAEBVBlock\@\@\@Z + * @vftbl 3 + * @symbol ?_isOtherBlockValidAsSource\@MultifaceSpreader\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool _isOtherBlockValidAsSource(class Block const &) const; /** - * @symbol ??0MultifaceSpreader\@\@QEAA\@AEBV?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0MultifaceSpreader\@\@QEAA\@AEBV?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@\@Z */ MCAPI MultifaceSpreader(std::vector const &); /** - * @symbol ?getSpreadFromFaceTowardDirection\@MultifaceSpreader\@\@QEBA?AV?$optional\@U?$pair\@$$CBVBlockPos\@\@$$CBE\@std\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@EE\@Z + * @symbol ?getSpreadFromFaceTowardDirection\@MultifaceSpreader\@\@QEBA?AV?$optional\@U?$pair\@$$CBVBlockPos\@\@$$CBE\@std\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@EE\@Z */ MCAPI class std::optional> getSpreadFromFaceTowardDirection(class IBlockWorldGenAPI &, class Block const &, class Block const &, class BlockPos const &, unsigned char, unsigned char) const; /** - * @symbol ?spreadFromAllFacesTowardAllDirections\@MultifaceSpreader\@\@QEBAHAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@\@Z + * @symbol ?spreadFromAllFacesTowardAllDirections\@MultifaceSpreader\@\@QEBAHAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@\@Z */ MCAPI int spreadFromAllFacesTowardAllDirections(class IBlockWorldGenAPI &, class Block const &, class Block const &, class BlockPos const &) const; /** - * @symbol ?spreadFromFaceTowardDirection\@MultifaceSpreader\@\@QEBA_NAEAVBlockSource\@\@AEBVBlock\@\@1AEBVBlockPos\@\@EE\@Z + * @symbol ?spreadFromFaceTowardDirection\@MultifaceSpreader\@\@QEBA_NAEAVBlockSource\@\@AEBVBlock\@\@1AEBVBlockPos\@\@EE\@Z */ MCAPI bool spreadFromFaceTowardDirection(class BlockSource &, class Block const &, class Block const &, class BlockPos const &, unsigned char, unsigned char) const; /** - * @symbol ?spreadFromFaceTowardDirectionWorldGen\@MultifaceSpreader\@\@QEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@EE\@Z + * @symbol ?spreadFromFaceTowardDirectionWorldGen\@MultifaceSpreader\@\@QEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@EE\@Z */ MCAPI bool spreadFromFaceTowardDirectionWorldGen(class IBlockWorldGenAPI &, class Block const &, class Block const &, class BlockPos const &, unsigned char, unsigned char) const; /** - * @symbol ?spreadFromFaceTowardRandomDirection\@MultifaceSpreader\@\@QEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@E\@Z + * @symbol ?spreadFromFaceTowardRandomDirection\@MultifaceSpreader\@\@QEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@E\@Z */ MCAPI bool spreadFromFaceTowardRandomDirection(class IBlockWorldGenAPI &, class Block const &, class Block const &, class BlockPos const &, unsigned char) const; /** - * @symbol ?spreadFromRandomFaceTowardRandomDirection\@MultifaceSpreader\@\@QEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@\@Z + * @symbol ?spreadFromRandomFaceTowardRandomDirection\@MultifaceSpreader\@\@QEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@1AEBVBlockPos\@\@\@Z */ MCAPI bool spreadFromRandomFaceTowardRandomDirection(class IBlockWorldGenAPI &, class Block const &, class Block const &, class BlockPos const &) const; /** - * @symbol ?ALL_SPREAD_TYPES\@MultifaceSpreader\@\@2V?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@B + * @symbol ?ALL_SPREAD_TYPES\@MultifaceSpreader\@\@2V?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const ALL_SPREAD_TYPES; /** - * @symbol ?SAME_POSITION_ONLY\@MultifaceSpreader\@\@2V?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@B + * @symbol ?SAME_POSITION_ONLY\@MultifaceSpreader\@\@2V?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const SAME_POSITION_ONLY; //protected: /** - * @symbol ?_canSpreadToFace\@MultifaceSpreader\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_canSpreadToFace\@MultifaceSpreader\@\@IEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool _canSpreadToFace(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &, unsigned char) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp index 8e30d758bc..0bcbc8c9b7 100644 --- a/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/MultiplayerSettingsPacket.hpp @@ -30,37 +30,43 @@ class MultiplayerSettingsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MultiplayerSettingsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@MultiplayerSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@MultiplayerSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@MultiplayerSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@MultiplayerSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@MultiplayerSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@MultiplayerSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@MultiplayerSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_MULTIPLAYERSETTINGSPACKET /** - * @symbol ??0MultiplayerSettingsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI MultiplayerSettingsPacket(); + MCVAPI ~MultiplayerSettingsPacket(); +#endif /** - * @symbol ??0MultiplayerSettingsPacket\@\@QEAA\@W4MultiplayerSettingsPacketType\@\@\@Z + * @symbol ??0MultiplayerSettingsPacket\@\@QEAA\@W4MultiplayerSettingsPacketType\@\@\@Z */ MCAPI MultiplayerSettingsPacket(enum class MultiplayerSettingsPacketType); + /** + * @symbol ??0MultiplayerSettingsPacket\@\@QEAA\@XZ + */ + MCAPI MultiplayerSettingsPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp b/LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp index 0f386518e2..abf55e2333 100644 --- a/LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp +++ b/LiteLoader/include/llapi/mc/MultiplyValueAmplifier.hpp @@ -30,18 +30,18 @@ class MultiplyValueAmplifier { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MultiplyValueAmplifier(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getAmount\@MultiplyValueAmplifier\@\@UEBAMHM\@Z + * @vftbl 1 + * @symbol ?getAmount\@MultiplyValueAmplifier\@\@UEBAMHM\@Z */ virtual float getAmount(int, float) const; /** - * @symbol ??0MultiplyValueAmplifier\@\@QEAA\@M\@Z + * @symbol ??0MultiplyValueAmplifier\@\@QEAA\@M\@Z */ MCAPI MultiplyValueAmplifier(float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MushroomBlock.hpp b/LiteLoader/include/llapi/mc/MushroomBlock.hpp index 82b40e0a65..37f8a12295 100644 --- a/LiteLoader/include/llapi/mc/MushroomBlock.hpp +++ b/LiteLoader/include/llapi/mc/MushroomBlock.hpp @@ -31,238 +31,243 @@ class MushroomBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MushroomBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@MushroomBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@MushroomBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@MushroomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@MushroomBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@MushroomBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 - * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 180 + * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@MushroomBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0MushroomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MushroomBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MushroomBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MushroomCow.hpp b/LiteLoader/include/llapi/mc/MushroomCow.hpp index 409ee06df1..4f92ec0dcc 100644 --- a/LiteLoader/include/llapi/mc/MushroomCow.hpp +++ b/LiteLoader/include/llapi/mc/MushroomCow.hpp @@ -32,143 +32,138 @@ class MushroomCow : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~MushroomCow(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@MushroomCow\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@MushroomCow\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0MushroomCow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0MushroomCow\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI MushroomCow(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MusicBlockActor.hpp b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp index be4909bea9..223fd13ac5 100644 --- a/LiteLoader/include/llapi/mc/MusicBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/MusicBlockActor.hpp @@ -31,83 +31,83 @@ class MusicBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MusicBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@MusicBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@MusicBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@MusicBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@MusicBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0MusicBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0MusicBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI MusicBlockActor(class BlockPos const &); /** - * @symbol ?playNote\@MusicBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?playNote\@MusicBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void playNote(class BlockSource &, class BlockPos const &); /** - * @symbol ?tune\@MusicBlockActor\@\@QEAAXXZ + * @symbol ?tune\@MusicBlockActor\@\@QEAAXXZ */ MCAPI void tune(); /** - * @symbol ?getInstrumentIndex\@MusicBlockActor\@\@SA?AV?$optional\@H\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getInstrumentIndex\@MusicBlockActor\@\@SA?AV?$optional\@H\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional getInstrumentIndex(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_getInstrumentIndexForBlock\@MusicBlockActor\@\@CAHAEBVBlockLegacy\@\@\@Z + * @symbol ?_getInstrumentIndexForBlock\@MusicBlockActor\@\@CAHAEBVBlockLegacy\@\@\@Z */ MCAPI static int _getInstrumentIndexForBlock(class BlockLegacy const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MusicCommand.hpp b/LiteLoader/include/llapi/mc/MusicCommand.hpp index 2fd539b7b8..a959bacfc3 100644 --- a/LiteLoader/include/llapi/mc/MusicCommand.hpp +++ b/LiteLoader/include/llapi/mc/MusicCommand.hpp @@ -31,34 +31,34 @@ class MusicCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MusicCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@MusicCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@MusicCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@MusicCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@MusicCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_handleActionQueueOrPlay\@MusicCommand\@\@AEBAXAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleActionQueueOrPlay\@MusicCommand\@\@AEBAXAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleActionQueueOrPlay(class CompoundTag &, class CommandOutput &) const; /** - * @symbol ?_handleActionStop\@MusicCommand\@\@AEBAXAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleActionStop\@MusicCommand\@\@AEBAXAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleActionStop(class CompoundTag &, class CommandOutput &) const; /** - * @symbol ?_handleActionVolume\@MusicCommand\@\@AEBAXAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleActionVolume\@MusicCommand\@\@AEBAXAEAVCompoundTag\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleActionVolume(class CompoundTag &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp index 8640113d73..6beca33d3e 100644 --- a/LiteLoader/include/llapi/mc/MyceliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/MyceliumBlock.hpp @@ -31,224 +31,229 @@ class MyceliumBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~MyceliumBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@MyceliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@MyceliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@MyceliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0MyceliumBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0MyceliumBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI MyceliumBlock(std::string const &, int); /** - * @symbol ?MIN_BRIGHTNESS_TO_PERSIST\@MyceliumBlock\@\@2UBrightness\@\@B + * @symbol ?MIN_BRIGHTNESS_TO_PERSIST\@MyceliumBlock\@\@2UBrightness\@\@B */ MCAPI static struct Brightness const MIN_BRIGHTNESS_TO_PERSIST; /** - * @symbol ?MIN_BRIGHTNESS_TO_SPREAD\@MyceliumBlock\@\@2UBrightness\@\@B + * @symbol ?MIN_BRIGHTNESS_TO_SPREAD\@MyceliumBlock\@\@2UBrightness\@\@B */ MCAPI static struct Brightness const MIN_BRIGHTNESS_TO_SPREAD; //private: /** - * @symbol ?_canSpreadToBlock\@MyceliumBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canSpreadToBlock\@MyceliumBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canSpreadToBlock(class BlockSource const &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp b/LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp index 4b56d599c0..2487fadf97 100644 --- a/LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp +++ b/LiteLoader/include/llapi/mc/NBBridgeCrossing.hpp @@ -31,24 +31,30 @@ class NBBridgeCrossing : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBBridgeCrossing(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBBridgeCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBBridgeCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBBridgeCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBBridgeCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBBridgeCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBBridgeCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBBRIDGECROSSING + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NBBridgeCrossing(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp b/LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp index cbff2a1c92..894b0a5cd2 100644 --- a/LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp +++ b/LiteLoader/include/llapi/mc/NBBridgeEndFiller.hpp @@ -31,23 +31,23 @@ class NBBridgeEndFiller : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBBridgeEndFiller(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBBridgeEndFiller\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBBridgeEndFiller\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@NBBridgeEndFiller\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBBridgeEndFiller\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?createPiece\@NBBridgeEndFiller\@\@SA?AV?$unique_ptr\@VNetherFortressPiece\@\@U?$default_delete\@VNetherFortressPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?createPiece\@NBBridgeEndFiller\@\@SA?AV?$unique_ptr\@VNetherFortressPiece\@\@U?$default_delete\@VNetherFortressPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI static std::unique_ptr createPiece(std::vector> &, class Random &, int, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBBridgeStraight.hpp b/LiteLoader/include/llapi/mc/NBBridgeStraight.hpp index 54cdd1abf6..faccb270ef 100644 --- a/LiteLoader/include/llapi/mc/NBBridgeStraight.hpp +++ b/LiteLoader/include/llapi/mc/NBBridgeStraight.hpp @@ -31,24 +31,24 @@ class NBBridgeStraight : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBBridgeStraight(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBBridgeStraight\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBBridgeStraight\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBBridgeStraight\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBBridgeStraight\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBBridgeStraight\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBBridgeStraight\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp index 89d17d60d3..7a53c5fca4 100644 --- a/LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleCorridorStairsPiece.hpp @@ -31,24 +31,24 @@ class NBCastleCorridorStairsPiece : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleCorridorStairsPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleCorridorStairsPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleCorridorStairsPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleCorridorStairsPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleCorridorStairsPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleCorridorStairsPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleCorridorStairsPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp index 7ccdb26724..d2006761cc 100644 --- a/LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleCorridorTBalconyPiece.hpp @@ -31,24 +31,24 @@ class NBCastleCorridorTBalconyPiece : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleCorridorTBalconyPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleCorridorTBalconyPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleCorridorTBalconyPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleCorridorTBalconyPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleCorridorTBalconyPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleCorridorTBalconyPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleCorridorTBalconyPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleEntrance.hpp b/LiteLoader/include/llapi/mc/NBCastleEntrance.hpp index 9998af3530..ea50b57671 100644 --- a/LiteLoader/include/llapi/mc/NBCastleEntrance.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleEntrance.hpp @@ -31,24 +31,24 @@ class NBCastleEntrance : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleEntrance(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleEntrance\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleEntrance\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleEntrance\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleEntrance\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleEntrance\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleEntrance\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp index 27ebbcf51d..fea5dc3e8e 100644 --- a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorCrossingPiece.hpp @@ -31,24 +31,24 @@ class NBCastleSmallCorridorCrossingPiece : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleSmallCorridorCrossingPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleSmallCorridorCrossingPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleSmallCorridorCrossingPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleSmallCorridorCrossingPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleSmallCorridorCrossingPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleSmallCorridorCrossingPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleSmallCorridorCrossingPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp index dd029c9d60..4c9e19ec6b 100644 --- a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorLeftTurnPiece.hpp @@ -31,24 +31,24 @@ class NBCastleSmallCorridorLeftTurnPiece : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleSmallCorridorLeftTurnPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleSmallCorridorLeftTurnPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleSmallCorridorLeftTurnPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleSmallCorridorLeftTurnPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleSmallCorridorLeftTurnPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleSmallCorridorLeftTurnPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleSmallCorridorLeftTurnPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp index 355bb8b524..ac9717d9c2 100644 --- a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorPiece.hpp @@ -31,24 +31,24 @@ class NBCastleSmallCorridorPiece : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleSmallCorridorPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleSmallCorridorPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleSmallCorridorPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleSmallCorridorPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleSmallCorridorPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleSmallCorridorPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleSmallCorridorPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp index 36c1aaf115..6581ab2923 100644 --- a/LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleSmallCorridorRightTurnPiece.hpp @@ -31,24 +31,24 @@ class NBCastleSmallCorridorRightTurnPiece : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleSmallCorridorRightTurnPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleSmallCorridorRightTurnPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleSmallCorridorRightTurnPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleSmallCorridorRightTurnPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleSmallCorridorRightTurnPiece\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleSmallCorridorRightTurnPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleSmallCorridorRightTurnPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp b/LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp index 03d62d4abb..d139e6d870 100644 --- a/LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp +++ b/LiteLoader/include/llapi/mc/NBCastleStalkRoom.hpp @@ -31,24 +31,24 @@ class NBCastleStalkRoom : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBCastleStalkRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBCastleStalkRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBCastleStalkRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBCastleStalkRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBCastleStalkRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBCastleStalkRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBCastleStalkRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBMonsterThrone.hpp b/LiteLoader/include/llapi/mc/NBMonsterThrone.hpp index 1afa76bdf4..ef3b23b3b0 100644 --- a/LiteLoader/include/llapi/mc/NBMonsterThrone.hpp +++ b/LiteLoader/include/llapi/mc/NBMonsterThrone.hpp @@ -31,19 +31,19 @@ class NBMonsterThrone : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBMonsterThrone(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBMonsterThrone\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBMonsterThrone\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@NBMonsterThrone\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBMonsterThrone\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBRoomCrossing.hpp b/LiteLoader/include/llapi/mc/NBRoomCrossing.hpp index 37c616d682..fefb91d7a9 100644 --- a/LiteLoader/include/llapi/mc/NBRoomCrossing.hpp +++ b/LiteLoader/include/llapi/mc/NBRoomCrossing.hpp @@ -31,24 +31,24 @@ class NBRoomCrossing : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBRoomCrossing(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBRoomCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBRoomCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBRoomCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBRoomCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBRoomCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBRoomCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBStairsRoom.hpp b/LiteLoader/include/llapi/mc/NBStairsRoom.hpp index 08048d3a7a..bbe23f12bc 100644 --- a/LiteLoader/include/llapi/mc/NBStairsRoom.hpp +++ b/LiteLoader/include/llapi/mc/NBStairsRoom.hpp @@ -31,24 +31,24 @@ class NBStairsRoom : public NetherFortressPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBStairsRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBStairsRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBStairsRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@NBStairsRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@NBStairsRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@NBStairsRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NBStairsRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBStartPiece.hpp b/LiteLoader/include/llapi/mc/NBStartPiece.hpp index dc0cc84f90..82a8067598 100644 --- a/LiteLoader/include/llapi/mc/NBStartPiece.hpp +++ b/LiteLoader/include/llapi/mc/NBStartPiece.hpp @@ -31,18 +31,18 @@ class NBStartPiece : public NBBridgeCrossing { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBStartPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@NBStartPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@NBStartPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @symbol ??0NBStartPiece\@\@QEAA\@AEAVRandom\@\@HH\@Z + * @symbol ??0NBStartPiece\@\@QEAA\@AEAVRandom\@\@HH\@Z */ MCAPI NBStartPiece(class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBTLoader.hpp b/LiteLoader/include/llapi/mc/NBTLoader.hpp index a20ce73a11..c862079c3d 100644 --- a/LiteLoader/include/llapi/mc/NBTLoader.hpp +++ b/LiteLoader/include/llapi/mc/NBTLoader.hpp @@ -29,9 +29,15 @@ class NBTLoader { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBTLOADER /** - * @symbol ??0NBTLoader\@\@QEAA\@V?$not_null\@PEBVCompoundTag\@\@\@gsl\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NBTLoader(); +#endif + /** + * @symbol ??0NBTLoader\@\@QEAA\@V?$not_null\@PEBVCompoundTag\@\@\@gsl\@\@\@Z */ MCAPI NBTLoader(class gsl::not_null); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBTSaver.hpp b/LiteLoader/include/llapi/mc/NBTSaver.hpp index 16ddcaf794..eaaf630590 100644 --- a/LiteLoader/include/llapi/mc/NBTSaver.hpp +++ b/LiteLoader/include/llapi/mc/NBTSaver.hpp @@ -29,9 +29,15 @@ class NBTSaver { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBTSAVER /** - * @symbol ?getSavedCompoundTag\@NBTSaver\@\@QEAA?AVCompoundTag\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NBTSaver(); +#endif + /** + * @symbol ?getSavedCompoundTag\@NBTSaver\@\@QEAA?AVCompoundTag\@\@XZ */ MCAPI class CompoundTag getSavedCompoundTag(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp b/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp index fc336213fb..fa4e4e7976 100644 --- a/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp +++ b/LiteLoader/include/llapi/mc/NBTSchemaReader.hpp @@ -28,243 +28,247 @@ class NBTSchemaReader { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBTSchemaReader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValid\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isValid\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @vftbl 2 - * @symbol ?isString\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isString\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool isString() const; /** - * @vftbl 3 - * @symbol ?isObject\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?isObject\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool isObject() const; /** - * @vftbl 4 - * @symbol ?isArray\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isArray\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool isArray() const; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?isFloat\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 14 + * @symbol ?isFloat\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool isFloat() const; /** - * @vftbl 15 - * @symbol ?isDouble\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 15 + * @symbol ?isDouble\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool isDouble() const; /** - * @vftbl 16 - * @symbol ?asBool\@NBTSchemaReader\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?asBool\@NBTSchemaReader\@\@UEBA_NXZ */ virtual bool asBool() const; /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol ?asFloat\@NBTSchemaReader\@\@UEBAMXZ + * @vftbl 25 + * @symbol ?asFloat\@NBTSchemaReader\@\@UEBAMXZ */ virtual float asFloat() const; /** - * @vftbl 26 - * @symbol ?asDouble\@NBTSchemaReader\@\@UEBANXZ + * @vftbl 26 + * @symbol ?asDouble\@NBTSchemaReader\@\@UEBANXZ */ virtual double asDouble() const; /** - * @vftbl 27 - * @symbol ?asString\@NBTSchemaReader\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 27 + * @symbol ?asString\@NBTSchemaReader\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 28 - * @symbol ?members\@NBTSchemaReader\@\@UEBA_KXZ + * @vftbl 28 + * @symbol ?members\@NBTSchemaReader\@\@UEBA_KXZ */ virtual unsigned __int64 members() const; /** - * @vftbl 29 - * @symbol ?length\@NBTSchemaReader\@\@UEBA_KXZ + * @vftbl 29 + * @symbol ?length\@NBTSchemaReader\@\@UEBA_KXZ */ virtual unsigned __int64 length() const; /** - * @vftbl 30 - * @symbol ?pushMember\@NBTSchemaReader\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z + * @vftbl 30 + * @symbol ?pushMember\@NBTSchemaReader\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z */ virtual std::string pushMember(unsigned __int64); /** - * @vftbl 31 - * @symbol ?pushElement\@NBTSchemaReader\@\@UEAAX_K\@Z + * @vftbl 31 + * @symbol ?pushElement\@NBTSchemaReader\@\@UEAAX_K\@Z */ virtual void pushElement(unsigned __int64); /** - * @vftbl 32 - * @symbol ?pop\@NBTSchemaReader\@\@UEAAXXZ + * @vftbl 32 + * @symbol ?pop\@NBTSchemaReader\@\@UEAAXXZ */ virtual void pop(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBTSCHEMAREADER /** - * @symbol ?asInt16\@NBTSchemaReader\@\@UEBAFXZ + * @symbol ?asInt16\@NBTSchemaReader\@\@UEBAFXZ */ MCVAPI short asInt16() const; /** - * @symbol ?asInt32\@NBTSchemaReader\@\@UEBAHXZ + * @symbol ?asInt32\@NBTSchemaReader\@\@UEBAHXZ */ MCVAPI int asInt32() const; /** - * @symbol ?asInt64\@NBTSchemaReader\@\@UEBA_JXZ + * @symbol ?asInt64\@NBTSchemaReader\@\@UEBA_JXZ */ MCVAPI __int64 asInt64() const; /** - * @symbol ?asInt8\@NBTSchemaReader\@\@UEBACXZ + * @symbol ?asInt8\@NBTSchemaReader\@\@UEBACXZ */ MCVAPI signed char asInt8() const; /** - * @symbol ?asUInt16\@NBTSchemaReader\@\@UEBAGXZ + * @symbol ?asUInt16\@NBTSchemaReader\@\@UEBAGXZ */ MCVAPI unsigned short asUInt16() const; /** - * @symbol ?asUInt32\@NBTSchemaReader\@\@UEBAIXZ + * @symbol ?asUInt32\@NBTSchemaReader\@\@UEBAIXZ */ MCVAPI unsigned int asUInt32() const; /** - * @symbol ?asUInt64\@NBTSchemaReader\@\@UEBA_KXZ + * @symbol ?asUInt64\@NBTSchemaReader\@\@UEBA_KXZ */ MCVAPI unsigned __int64 asUInt64() const; /** - * @symbol ?asUInt8\@NBTSchemaReader\@\@UEBAEXZ + * @symbol ?asUInt8\@NBTSchemaReader\@\@UEBAEXZ */ MCVAPI unsigned char asUInt8() const; /** - * @symbol ?isBool\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isBool\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isBool() const; /** - * @symbol ?isInt16\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isInt16\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isInt16() const; /** - * @symbol ?isInt32\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isInt32\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isInt32() const; /** - * @symbol ?isInt64\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isInt64\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isInt64() const; /** - * @symbol ?isInt8\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isInt8\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isInt8() const; /** - * @symbol ?isUInt16\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isUInt16\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isUInt16() const; /** - * @symbol ?isUInt32\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isUInt32\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isUInt32() const; /** - * @symbol ?isUInt64\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isUInt64\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isUInt64() const; /** - * @symbol ?isUInt8\@NBTSchemaReader\@\@UEBA_NXZ + * @symbol ?isUInt8\@NBTSchemaReader\@\@UEBA_NXZ */ MCVAPI bool isUInt8() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NBTSchemaReader(); #endif /** - * @symbol ??0NBTSchemaReader\@\@QEAA\@V?$not_null\@PEBVCompoundTag\@\@\@gsl\@\@\@Z + * @symbol ??0NBTSchemaReader\@\@QEAA\@V?$not_null\@PEBVCompoundTag\@\@\@gsl\@\@\@Z */ MCAPI NBTSchemaReader(class gsl::not_null); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp index 730c3f94ee..62cc80d118 100644 --- a/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp +++ b/LiteLoader/include/llapi/mc/NBTSchemaWriter.hpp @@ -27,148 +27,152 @@ class NBTSchemaWriter { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NBTSchemaWriter(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool write(std::string const &); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NM\@Z + * @vftbl 3 + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NM\@Z */ virtual bool write(float); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?pushMember\@NBTSchemaWriter\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 13 + * @symbol ?pushMember\@NBTSchemaWriter\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool pushMember(std::string const &); /** - * @vftbl 14 - * @symbol ?popMember\@NBTSchemaWriter\@\@UEAAXXZ + * @vftbl 14 + * @symbol ?popMember\@NBTSchemaWriter\@\@UEAAXXZ */ virtual void popMember(); /** - * @vftbl 15 - * @symbol ?openObject\@NBTSchemaWriter\@\@UEAA_NXZ + * @vftbl 15 + * @symbol ?openObject\@NBTSchemaWriter\@\@UEAA_NXZ */ virtual bool openObject(); /** - * @vftbl 16 - * @symbol ?openArray\@NBTSchemaWriter\@\@UEAA_NXZ + * @vftbl 16 + * @symbol ?openArray\@NBTSchemaWriter\@\@UEAA_NXZ */ virtual bool openArray(); /** - * @vftbl 17 - * @symbol ?close\@NBTSchemaWriter\@\@UEAAXXZ + * @vftbl 17 + * @symbol ?close\@NBTSchemaWriter\@\@UEAAXXZ */ virtual void close(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NBTSCHEMAWRITER /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NN\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NN\@Z */ MCVAPI bool write(double); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_K\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_K\@Z */ MCVAPI bool write(unsigned __int64); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_J\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_J\@Z */ MCVAPI bool write(__int64); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_N\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z + */ + MCVAPI bool write(int); + /** + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z + */ + MCVAPI bool write(unsigned int); + /** + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_N_N\@Z */ MCVAPI bool write(bool); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NE\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NE\@Z */ MCVAPI bool write(unsigned char); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NC\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NC\@Z */ MCVAPI bool write(signed char); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NF\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NF\@Z */ MCVAPI bool write(short); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NG\@Z + * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NG\@Z */ MCVAPI bool write(unsigned short); /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NH\@Z + * @symbol __unk_destructor_-1 */ - MCVAPI bool write(int); - /** - * @symbol ?write\@NBTSchemaWriter\@\@UEAA_NI\@Z - */ - MCVAPI bool write(unsigned int); + MCVAPI ~NBTSchemaWriter(); #endif /** - * @symbol ??0NBTSchemaWriter\@\@QEAA\@XZ + * @symbol ??0NBTSchemaWriter\@\@QEAA\@XZ */ MCAPI NBTSchemaWriter(); //private: /** - * @symbol ?_serializeTag\@NBTSchemaWriter\@\@AEAA_NV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_serializeTag\@NBTSchemaWriter\@\@AEAA_NV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI bool _serializeTag(std::unique_ptr); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NameAction.hpp b/LiteLoader/include/llapi/mc/NameAction.hpp index 3c9c8c9a8c..b9920434ce 100644 --- a/LiteLoader/include/llapi/mc/NameAction.hpp +++ b/LiteLoader/include/llapi/mc/NameAction.hpp @@ -29,15 +29,15 @@ struct NameAction { public: /** - * @symbol ??0NameAction\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0NameAction\@\@QEAA\@AEBU0\@\@Z */ MCAPI NameAction(struct NameAction const &); /** - * @symbol ?addNameFilterByName\@NameAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addNameFilterByName\@NameAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addNameFilterByName(std::string const &); /** - * @symbol ??1NameAction\@\@QEAA\@XZ + * @symbol ??1NameAction\@\@QEAA\@XZ */ MCAPI ~NameAction(); diff --git a/LiteLoader/include/llapi/mc/NameableComponent.hpp b/LiteLoader/include/llapi/mc/NameableComponent.hpp index 8ce39a1a1a..c0112ba08d 100644 --- a/LiteLoader/include/llapi/mc/NameableComponent.hpp +++ b/LiteLoader/include/llapi/mc/NameableComponent.hpp @@ -29,16 +29,16 @@ class NameableComponent { public: /** - * @symbol ??0NameableComponent\@\@QEAA\@XZ + * @symbol ??0NameableComponent\@\@QEAA\@XZ */ MCAPI NameableComponent(); /** - * @symbol ?getInteraction\@NameableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@NameableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?nameEntity\@NameableComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?nameEntity\@NameableComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void nameEntity(class Actor &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NameableDefinition.hpp b/LiteLoader/include/llapi/mc/NameableDefinition.hpp index c3a1f88ddf..aea229df51 100644 --- a/LiteLoader/include/llapi/mc/NameableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/NameableDefinition.hpp @@ -30,24 +30,24 @@ class NameableDefinition { public: /** - * @symbol ??0NameableDefinition\@\@QEAA\@XZ + * @symbol ??0NameableDefinition\@\@QEAA\@XZ */ MCAPI NameableDefinition(); /** - * @symbol ?addNameAction\@NameableDefinition\@\@QEAAXAEBUNameAction\@\@\@Z + * @symbol ?addNameAction\@NameableDefinition\@\@QEAAXAEBUNameAction\@\@\@Z */ MCAPI void addNameAction(struct NameAction const &); /** - * @symbol ?initialize\@NameableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVNameableComponent\@\@\@Z + * @symbol ?initialize\@NameableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVNameableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class NameableComponent &) const; /** - * @symbol ??1NameableDefinition\@\@QEAA\@XZ + * @symbol ??1NameableDefinition\@\@QEAA\@XZ */ MCAPI ~NameableDefinition(); /** - * @symbol ?buildSchema\@NameableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VNameableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@NameableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VNameableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NamedMolangScript.hpp b/LiteLoader/include/llapi/mc/NamedMolangScript.hpp index 91cbcd455b..259085b42c 100644 --- a/LiteLoader/include/llapi/mc/NamedMolangScript.hpp +++ b/LiteLoader/include/llapi/mc/NamedMolangScript.hpp @@ -28,7 +28,7 @@ struct NamedMolangScript { public: /** - * @symbol ??1NamedMolangScript\@\@QEAA\@XZ + * @symbol ??1NamedMolangScript\@\@QEAA\@XZ */ MCAPI ~NamedMolangScript(); diff --git a/LiteLoader/include/llapi/mc/NapGoal.hpp b/LiteLoader/include/llapi/mc/NapGoal.hpp index f43c8d5729..681a460ee8 100644 --- a/LiteLoader/include/llapi/mc/NapGoal.hpp +++ b/LiteLoader/include/llapi/mc/NapGoal.hpp @@ -30,68 +30,68 @@ class NapGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NapGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@NapGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@NapGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@NapGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@NapGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@NapGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@NapGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@NapGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@NapGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@NapGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@NapGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0NapGoal\@\@QEAA\@AEAVMob\@\@MMMMAEBVActorFilterGroup\@\@1\@Z + * @symbol ??0NapGoal\@\@QEAA\@AEAVMob\@\@MMMMAEBVActorFilterGroup\@\@1\@Z */ MCAPI NapGoal(class Mob &, float, float, float, float, class ActorFilterGroup const &, class ActorFilterGroup const &); //private: /** - * @symbol ?_canSleep\@NapGoal\@\@AEBA_NAEBUTick\@\@\@Z + * @symbol ?_canSleep\@NapGoal\@\@AEBA_NAEBUTick\@\@\@Z */ MCAPI bool _canSleep(struct Tick const &) const; /** - * @symbol ?_detectsMobs\@NapGoal\@\@AEBA_NXZ + * @symbol ?_detectsMobs\@NapGoal\@\@AEBA_NXZ */ MCAPI bool _detectsMobs() const; /** - * @symbol ?_setCooldown\@NapGoal\@\@AEAAXXZ + * @symbol ?_setCooldown\@NapGoal\@\@AEAAXXZ */ MCAPI void _setCooldown(); private: /** - * @symbol ?MOB_DETECT_TIME\@NapGoal\@\@0MB + * @symbol ?MOB_DETECT_TIME\@NapGoal\@\@0MB */ MCAPI static float const MOB_DETECT_TIME; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp b/LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp index eda60d7647..306f3863e4 100644 --- a/LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationClimbDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,14 +30,20 @@ class NavigationClimbDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationClimbDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationClimbDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationClimbDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONCLIMBDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NavigationClimbDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationComponent.hpp b/LiteLoader/include/llapi/mc/NavigationComponent.hpp index d173350660..c8f386146b 100644 --- a/LiteLoader/include/llapi/mc/NavigationComponent.hpp +++ b/LiteLoader/include/llapi/mc/NavigationComponent.hpp @@ -28,264 +28,268 @@ class NavigationComponent { public: /** - * @symbol ??0NavigationComponent\@\@QEAA\@XZ + * @symbol ??0NavigationComponent\@\@QEAA\@AEBV0\@\@Z */ - MCAPI NavigationComponent(); + MCAPI NavigationComponent(class NavigationComponent const &); /** - * @symbol ??0NavigationComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0NavigationComponent\@\@QEAA\@XZ */ - MCAPI NavigationComponent(class NavigationComponent const &); + MCAPI NavigationComponent(); /** - * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEAVActor\@\@\@Z + * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEAVActor\@\@\@Z */ MCAPI std::unique_ptr createPath(class Mob &, class Actor &); /** - * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBVVec3\@\@\@Z + * @symbol ?createPath\@NavigationComponent\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ MCAPI std::unique_ptr createPath(class Mob &, class Vec3 const &); /** - * @symbol ?getAvoidDamageBlocks\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getAvoidDamageBlocks\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getAvoidDamageBlocks() const; /** - * @symbol ?getAvoidPortals\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getAvoidPortals\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getAvoidPortals() const; /** - * @symbol ?getAvoidSun\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getAvoidSun\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getAvoidSun() const; /** - * @symbol ?getAvoidWater\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getAvoidWater\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getAvoidWater() const; /** - * @symbol ?getBlocksToAvoid\@NavigationComponent\@\@QEBAAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getBlocksToAvoid\@NavigationComponent\@\@QEBAAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getBlocksToAvoid() const; /** - * @symbol ?getCanBreach\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanBreach\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanBreach() const; /** - * @symbol ?getCanFloat\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanFloat\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanFloat() const; /** - * @symbol ?getCanJump\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanJump\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanJump() const; /** - * @symbol ?getCanOpenDoors\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanOpenDoors\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanOpenDoors() const; /** - * @symbol ?getCanOpenIronDoors\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanOpenIronDoors\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanOpenIronDoors() const; /** - * @symbol ?getCanPassDoors\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanPassDoors\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanPassDoors() const; /** - * @symbol ?getCanPathOverLava\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanPathOverLava\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanPathOverLava() const; /** - * @symbol ?getCanSink\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanSink\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanSink() const; /** - * @symbol ?getCanWalkInLava\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getCanWalkInLava\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getCanWalkInLava() const; /** - * @symbol ?getEndPathRadiusSqr\@NavigationComponent\@\@QEBAMXZ + * @symbol ?getEndPathRadiusSqr\@NavigationComponent\@\@QEBAMXZ */ MCAPI float getEndPathRadiusSqr() const; /** - * @symbol ?getHasDestination\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getHasDestination\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getHasDestination() const; /** - * @symbol ?getHasEndPathRadius\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getHasEndPathRadius\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getHasEndPathRadius() const; /** - * @symbol ?getIsAmphibious\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getIsAmphibious\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getIsAmphibious() const; /** - * @symbol ?getIsFollowingRivers\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?getIsFollowingRivers\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool getIsFollowingRivers() const; /** - * @symbol ?getLastStuckCheckPosition\@NavigationComponent\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getLastStuckCheckPosition\@NavigationComponent\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getLastStuckCheckPosition() const; /** - * @symbol ?getMaxDistance\@NavigationComponent\@\@QEBAMAEBVActor\@\@\@Z + * @symbol ?getMaxDistance\@NavigationComponent\@\@QEBAMAEBVActor\@\@\@Z */ MCAPI float getMaxDistance(class Actor const &) const; /** - * @symbol ?getPath\@NavigationComponent\@\@QEBAPEAVPath\@\@XZ + * @symbol ?getPath\@NavigationComponent\@\@QEBAPEAVPath\@\@XZ */ MCAPI class Path * getPath() const; /** - * @symbol ?getSpeed\@NavigationComponent\@\@QEBAMXZ + * @symbol ?getSpeed\@NavigationComponent\@\@QEBAMXZ */ MCAPI float getSpeed() const; /** - * @symbol ?getTargetOffset\@NavigationComponent\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getTargetOffset\@NavigationComponent\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getTargetOffset() const; /** - * @symbol ?getTerminationThreshold\@NavigationComponent\@\@QEBAMXZ + * @symbol ?getTerminationThreshold\@NavigationComponent\@\@QEBAMXZ */ MCAPI float getTerminationThreshold() const; /** - * @symbol ?getTickTimeout\@NavigationComponent\@\@QEBAHXZ + * @symbol ?getTickTimeout\@NavigationComponent\@\@QEBAHXZ */ MCAPI int getTickTimeout() const; /** - * @symbol ?incrementTick\@NavigationComponent\@\@QEAAXXZ + * @symbol ?incrementTick\@NavigationComponent\@\@QEAAXXZ */ MCAPI void incrementTick(); /** - * @symbol ?initMultiTypeNavigationComponent\@NavigationComponent\@\@QEAAXAEAVMob\@\@AEAVActorDefinitionDescriptor\@\@\@Z + * @symbol ?initMultiTypeNavigationComponent\@NavigationComponent\@\@QEAAXAEAVMob\@\@AEAVActorDefinitionDescriptor\@\@\@Z */ MCAPI void initMultiTypeNavigationComponent(class Mob &, class ActorDefinitionDescriptor &); /** - * @symbol ?initializeFromDefinition\@NavigationComponent\@\@QEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z + * @symbol ?initializeFromDefinition\@NavigationComponent\@\@QEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z */ MCAPI void initializeFromDefinition(class Mob &, struct NavigationDescription *); /** - * @symbol ?isDone\@NavigationComponent\@\@QEBA_NXZ + * @symbol ?isDone\@NavigationComponent\@\@QEBA_NXZ */ MCAPI bool isDone() const; /** - * @symbol ?isFree\@NavigationComponent\@\@QEAA?AW4NodeType\@\@AEAVMob\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@\@Z + * @symbol ?isFree\@NavigationComponent\@\@QEAA?AW4NodeType\@\@AEAVMob\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@\@Z */ MCAPI enum class NodeType isFree(class Mob &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode); /** - * @symbol ?isStuck\@NavigationComponent\@\@QEBA_NH\@Z + * @symbol ?isStuck\@NavigationComponent\@\@QEBA_NH\@Z */ MCAPI bool isStuck(int) const; /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z - */ - MCAPI bool moveTo(class Mob &, std::unique_ptr, float); - /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAVActor\@\@M\@Z + * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAVActor\@\@M\@Z */ MCAPI bool moveTo(class Mob &, class Actor &, float); /** - * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M1\@Z + * @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\@\@AEBVVec3\@\@M\@Z + * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z + */ + MCAPI bool moveTo(class Mob &, std::unique_ptr, float); + /** + * @symbol ?moveTo\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z */ MCAPI bool moveTo(class Mob &, class Vec3 const &, float); /** - * @symbol ??4NavigationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4NavigationComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class NavigationComponent & operator=(class NavigationComponent &&); /** - * @symbol ?resetPath\@NavigationComponent\@\@QEAAXXZ + * @symbol ?resetPath\@NavigationComponent\@\@QEAAXXZ */ MCAPI void resetPath(); /** - * @symbol ?setAvoidDamageBlocks\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setAvoidDamageBlocks\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setAvoidDamageBlocks(bool); /** - * @symbol ?setAvoidPortals\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setAvoidPortals\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setAvoidPortals(bool); /** - * @symbol ?setAvoidSun\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setAvoidSun\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setAvoidSun(bool); /** - * @symbol ?setAvoidWater\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setAvoidWater\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setAvoidWater(bool); /** - * @symbol ?setCanFloat\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setCanFloat\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setCanFloat(bool); /** - * @symbol ?setCanJump\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setCanJump\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setCanJump(bool); /** - * @symbol ?setCanOpenDoors\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setCanOpenDoors\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setCanOpenDoors(bool); /** - * @symbol ?setCanPassDoors\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setCanPassDoors\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setCanPassDoors(bool); /** - * @symbol ?setCanSink\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setCanSink\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setCanSink(bool); /** - * @symbol ?setEndPathRadius\@NavigationComponent\@\@QEAAXM\@Z + * @symbol ?setEndPathRadius\@NavigationComponent\@\@QEAAXM\@Z */ MCAPI void setEndPathRadius(float); /** - * @symbol ?setHasDestination\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setHasDestination\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setHasDestination(bool); /** - * @symbol ?setHasEndPathRadius\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setHasEndPathRadius\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setHasEndPathRadius(bool); /** - * @symbol ?setInternalType\@NavigationComponent\@\@QEAAXV?$unique_ptr\@VPathNavigation\@\@U?$default_delete\@VPathNavigation\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setInternalType\@NavigationComponent\@\@QEAAXV?$unique_ptr\@VPathNavigation\@\@U?$default_delete\@VPathNavigation\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setInternalType(std::unique_ptr); /** - * @symbol ?setIsFollowingRivers\@NavigationComponent\@\@QEAAX_N\@Z + * @symbol ?setIsFollowingRivers\@NavigationComponent\@\@QEAAX_N\@Z */ MCAPI void setIsFollowingRivers(bool); /** - * @symbol ?setPath\@NavigationComponent\@\@QEAAXV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setPath\@NavigationComponent\@\@QEAAXV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setPath(std::unique_ptr); /** - * @symbol ?setSpeed\@NavigationComponent\@\@QEAAXM\@Z + * @symbol ?setSpeed\@NavigationComponent\@\@QEAAXM\@Z */ MCAPI void setSpeed(float); /** - * @symbol ?setTargetOffset\@NavigationComponent\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setTargetOffset\@NavigationComponent\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setTargetOffset(class Vec3 const &); /** - * @symbol ?setTerminationThreshold\@NavigationComponent\@\@QEAAXM\@Z + * @symbol ?setTerminationThreshold\@NavigationComponent\@\@QEAAXM\@Z */ MCAPI void setTerminationThreshold(float); /** - * @symbol ?stop\@NavigationComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?setTickTimeout\@NavigationComponent\@\@QEAAXH\@Z + */ + MCAPI void setTickTimeout(int); + /** + * @symbol ?stop\@NavigationComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void stop(class Mob &); /** - * @symbol ?travel\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAM11\@Z + * @symbol ?travel\@NavigationComponent\@\@QEAA_NAEAVMob\@\@AEAM11\@Z */ MCAPI bool travel(class Mob &, float &, float &, float &); /** - * @symbol ?update\@NavigationComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?update\@NavigationComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void update(class Mob &); /** - * @symbol ?updateLastStuckCheck\@NavigationComponent\@\@QEAAXAEBVMob\@\@\@Z + * @symbol ?updateLastStuckCheck\@NavigationComponent\@\@QEAAXAEBVMob\@\@\@Z */ MCAPI void updateLastStuckCheck(class Mob const &); /** - * @symbol ??1NavigationComponent\@\@QEAA\@XZ + * @symbol ??1NavigationComponent\@\@QEAA\@XZ */ MCAPI ~NavigationComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationDescription.hpp b/LiteLoader/include/llapi/mc/NavigationDescription.hpp index 0edef9137b..01dfabb86b 100644 --- a/LiteLoader/include/llapi/mc/NavigationDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,27 +29,28 @@ struct NavigationDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationWalkDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationFlyDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const = 0; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@NavigationDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@NavigationDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@NavigationDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~NavigationDescription(); +#endif /** - * @symbol ??0NavigationDescription\@\@QEAA\@XZ + * @symbol ??0NavigationDescription\@\@QEAA\@XZ */ MCAPI NavigationDescription(); diff --git a/LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp b/LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp index f3972eeb0e..2fc5143248 100644 --- a/LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationFloatDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,14 +30,20 @@ class NavigationFloatDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationFloatDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationFloatDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationFloatDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONFLOATDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NavigationFloatDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp b/LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp index 9690dc53e0..c47770330c 100644 --- a/LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationFlyDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,14 +30,20 @@ class NavigationFlyDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationFlyDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationFlyDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationFlyDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONFLYDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NavigationFlyDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp b/LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp index d2c17db48e..608f1b8dc2 100644 --- a/LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationGenericDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,14 +30,20 @@ class NavigationGenericDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationGenericDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationGenericDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationGenericDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONGENERICDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NavigationGenericDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp b/LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp index 8d6006f448..8957357410 100644 --- a/LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationHoverDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,14 +30,20 @@ class NavigationHoverDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationHoverDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationHoverDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationHoverDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONHOVERDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NavigationHoverDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp b/LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp index 90c62925c6..b6a6138cfd 100644 --- a/LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationSwimDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class NavigationSwimDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationSwimDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationSwimDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationSwimDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONSWIMDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@NavigationSwimDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~NavigationSwimDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationSystem.hpp b/LiteLoader/include/llapi/mc/NavigationSystem.hpp index ae7f9391ff..ad60db2234 100644 --- a/LiteLoader/include/llapi/mc/NavigationSystem.hpp +++ b/LiteLoader/include/llapi/mc/NavigationSystem.hpp @@ -30,19 +30,19 @@ class NavigationSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NavigationSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@NavigationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@NavigationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp b/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp new file mode 100644 index 0000000000..e7ff0dafa5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/NavigationTravelSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file NavigationTravelSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NavigationTravelSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NAVIGATIONTRAVELSYSTEM +public: + class NavigationTravelSystem& operator=(class NavigationTravelSystem const &) = delete; + NavigationTravelSystem(class NavigationTravelSystem const &) = delete; + NavigationTravelSystem() = delete; +#endif + +public: + /** + * @symbol ?createNavigationTravelSystem\@NavigationTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createNavigationTravelSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/NavigationUtility.hpp b/LiteLoader/include/llapi/mc/NavigationUtility.hpp index a56f32ad65..aa05610925 100644 --- a/LiteLoader/include/llapi/mc/NavigationUtility.hpp +++ b/LiteLoader/include/llapi/mc/NavigationUtility.hpp @@ -22,83 +22,83 @@ namespace NavigationUtility { #undef AFTER_EXTRA /** - * @symbol ?canFlyDirectly\@NavigationUtility\@\@YA_NAEAVMob\@\@AEBVVec3\@\@1\@Z + * @symbol ?canFlyDirectly\@NavigationUtility\@\@YA_NAEAVMob\@\@AEBVVec3\@\@1\@Z */ MCAPI bool canFlyDirectly(class Mob &, class Vec3 const &, class Vec3 const &); /** - * @symbol ?canMoveDirectly\@NavigationUtility\@\@YA_NAEAVMob\@\@AEBVVec3\@\@1HHH_N\@Z + * @symbol ?canMoveDirectly\@NavigationUtility\@\@YA_NAEAVMob\@\@AEBVVec3\@\@1HHH_N\@Z */ MCAPI bool canMoveDirectly(class Mob &, class Vec3 const &, class Vec3 const &, int, int, int, bool); /** - * @symbol ?canMoveDirectlyWaterBound\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVVec3\@\@1\@Z + * @symbol ?canMoveDirectlyWaterBound\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVVec3\@\@1\@Z */ MCAPI bool canMoveDirectlyWaterBound(class Mob const &, class Vec3 const &, class Vec3 const &); /** - * @symbol ?canWalkDirectly\@NavigationUtility\@\@YA_NAEAVMob\@\@AEBVVec3\@\@1HHH_N\@Z + * @symbol ?canWalkDirectly\@NavigationUtility\@\@YA_NAEAVMob\@\@AEBVVec3\@\@1HHH_N\@Z */ MCAPI bool canWalkDirectly(class Mob &, class Vec3 const &, class Vec3 const &, int, int, int, bool); /** - * @symbol ?canWalkOn\@NavigationUtility\@\@YA_NAEAVMob\@\@HHHHHHAEBVVec3\@\@MM_N\@Z + * @symbol ?canWalkOn\@NavigationUtility\@\@YA_NAEAVMob\@\@HHHHHHAEBVVec3\@\@MM_N\@Z */ MCAPI bool canWalkOn(class Mob &, int, int, int, int, int, int, class Vec3 const &, float, float, bool); /** - * @symbol ?closeToDone\@NavigationUtility\@\@YA_NAEBVMob\@\@M\@Z + * @symbol ?closeToDone\@NavigationUtility\@\@YA_NAEBVMob\@\@M\@Z */ MCAPI bool closeToDone(class Mob const &, float); /** - * @symbol ?flyCondition\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockSource\@\@HHH\@Z + * @symbol ?flyCondition\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockSource\@\@HHH\@Z */ MCAPI bool flyCondition(class Mob const &, class BlockSource &, int, int, int); /** - * @symbol ?getHeightDifference\@NavigationUtility\@\@YAMAEAVBlockSource\@\@AEBVVec3\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getHeightDifference\@NavigationUtility\@\@YAMAEAVBlockSource\@\@AEBVVec3\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI float getHeightDifference(class BlockSource &, class Vec3 const &, class Block const &, class BlockPos const &); /** - * @symbol ?getMobScale\@NavigationUtility\@\@YA?BVBlockPos\@\@AEBVMob\@\@\@Z + * @symbol ?getMobScale\@NavigationUtility\@\@YA?BVBlockPos\@\@AEBVMob\@\@\@Z */ MCAPI class BlockPos const getMobScale(class Mob const &); /** - * @symbol ?getSurfaceY\@NavigationUtility\@\@YAHAEBVMob\@\@\@Z + * @symbol ?getSurfaceY\@NavigationUtility\@\@YAHAEBVMob\@\@\@Z */ MCAPI int getSurfaceY(class Mob const &); /** - * @symbol ?invalidPathStartStatus\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockPos\@\@\@Z + * @symbol ?invalidPathStartStatus\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockPos\@\@\@Z */ MCAPI bool invalidPathStartStatus(class Mob const &, class BlockPos &); /** - * @symbol ?isDoorBlockingPath\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlock\@\@AEBVPath\@\@AEBVBlockPos\@\@_K\@Z + * @symbol ?isDoorBlockingPath\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlock\@\@AEBVPath\@\@AEBVBlockPos\@\@_K\@Z */ MCAPI bool isDoorBlockingPath(class Mob const &, class Block const &, class Path const &, class BlockPos const &, unsigned __int64); /** - * @symbol ?isInLiquid\@NavigationUtility\@\@YA_NAEBVMob\@\@\@Z + * @symbol ?isInLiquid\@NavigationUtility\@\@YA_NAEBVMob\@\@\@Z */ MCAPI bool isInLiquid(class Mob const &); /** - * @symbol ?isInNode\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isInNode\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isInNode(class Mob const &, class BlockPos const &); /** - * @symbol ?isLastNode\@NavigationUtility\@\@YA_N_KAEBVPath\@\@\@Z + * @symbol ?isLastNode\@NavigationUtility\@\@YA_N_KAEBVPath\@\@\@Z */ MCAPI bool isLastNode(unsigned __int64, class Path const &); /** - * @symbol ?isStableDestination\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockPos\@\@\@Z + * @symbol ?isStableDestination\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockPos\@\@\@Z */ MCAPI bool isStableDestination(class Mob const &, class BlockPos &); /** - * @symbol ?isStairBlockFacingMob\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isStairBlockFacingMob\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isStairBlockFacingMob(class Mob const &, class BlockPos const &); /** - * @symbol ?moveCondition\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlock\@\@\@Z + * @symbol ?moveCondition\@NavigationUtility\@\@YA_NAEBVMob\@\@AEBVBlock\@\@\@Z */ MCAPI bool moveCondition(class Mob const &, class Block const &); /** - * @symbol ?swimCondition\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockSource\@\@HHH\@Z + * @symbol ?swimCondition\@NavigationUtility\@\@YA_NAEBVMob\@\@AEAVBlockSource\@\@HHH\@Z */ MCAPI bool swimCondition(class Mob const &, class BlockSource &, int, int, int); /** - * @symbol ?trimPathFromSun\@NavigationUtility\@\@YAXAEBVMob\@\@\@Z + * @symbol ?trimPathFromSun\@NavigationUtility\@\@YAXAEBVMob\@\@\@Z */ MCAPI void trimPathFromSun(class Mob const &); diff --git a/LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp b/LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp index b0abea4aeb..64d45a112e 100644 --- a/LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp +++ b/LiteLoader/include/llapi/mc/NavigationWalkDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,14 +30,20 @@ class NavigationWalkDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@NavigationWalkDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@NavigationWalkDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~NavigationWalkDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NAVIGATIONWALKDESCRIPTION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NavigationWalkDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NbtIo.hpp b/LiteLoader/include/llapi/mc/NbtIo.hpp index b5065a5773..c6c22b9bca 100644 --- a/LiteLoader/include/llapi/mc/NbtIo.hpp +++ b/LiteLoader/include/llapi/mc/NbtIo.hpp @@ -30,12 +30,12 @@ class NbtIo { public: /** - * @symbol ?read\@NbtIo\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVIDataInput\@\@\@Z + * @symbol ?read\@NbtIo\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVIDataInput\@\@\@Z */ MCAPI static std::unique_ptr read(class IDataInput &); /** - * @symbol ?write\@NbtIo\@\@SAXPEBVCompoundTag\@\@AEAVIDataOutput\@\@\@Z + * @symbol ?write\@NbtIo\@\@SAXPEBVCompoundTag\@\@AEAVIDataOutput\@\@\@Z */ MCAPI static void write(class CompoundTag const *, class IDataOutput &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp b/LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp index d0f6609f7b..47ab88851a 100644 --- a/LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp +++ b/LiteLoader/include/llapi/mc/NearestAttackableTargetDefinition.hpp @@ -31,27 +31,27 @@ class NearestAttackableTargetDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NearestAttackableTargetDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?validate\@NearestAttackableTargetDefinition\@\@UEBA_NAEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?validate\@NearestAttackableTargetDefinition\@\@UEBA_NAEAVMob\@\@\@Z */ virtual bool validate(class Mob &) const; /** - * @symbol ?initialize\@NearestAttackableTargetDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVNearestAttackableTargetGoal\@\@\@Z + * @symbol ?initialize\@NearestAttackableTargetDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVNearestAttackableTargetGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class NearestAttackableTargetGoal &) const; /** - * @symbol ?buildSchema\@NearestAttackableTargetDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VNearestAttackableTargetDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@NearestAttackableTargetDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VNearestAttackableTargetDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp b/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp index 61dc747311..07f6cf9085 100644 --- a/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/NearestAttackableTargetGoal.hpp @@ -31,67 +31,73 @@ class NearestAttackableTargetGoal : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NearestAttackableTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@NearestAttackableTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@NearestAttackableTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@NearestAttackableTargetGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@NearestAttackableTargetGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 4 - * @symbol ?start\@NearestAttackableTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@NearestAttackableTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@NearestAttackableTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@NearestAttackableTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?_findTarget\@NearestAttackableTargetGoal\@\@MEAA?AUActorUniqueID\@\@PEAPEBUMobDescriptor\@\@\@Z + * @vftbl 11 + * @symbol ?_findTarget\@NearestAttackableTargetGoal\@\@MEAA?AUActorUniqueID\@\@PEAPEBUMobDescriptor\@\@\@Z */ virtual struct ActorUniqueID _findTarget(struct MobDescriptor const **); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NEARESTATTACKABLETARGETGOAL /** - * @symbol ??0NearestAttackableTargetGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NearestAttackableTargetGoal(); +#endif + /** + * @symbol ??0NearestAttackableTargetGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI NearestAttackableTargetGoal(class Mob &); //protected: /** - * @symbol ?_canStartSearching\@NearestAttackableTargetGoal\@\@IEAA_NXZ + * @symbol ?_canStartSearching\@NearestAttackableTargetGoal\@\@IEAA_NXZ */ MCAPI bool _canStartSearching(); /** - * @symbol ?_getNearbyActors\@NearestAttackableTargetGoal\@\@IEAA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_getNearbyActors\@NearestAttackableTargetGoal\@\@IEAA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector _getNearbyActors(); /** - * @symbol ?_isTargetVisible\@NearestAttackableTargetGoal\@\@IEBA_NAEBVMob\@\@MM\@Z + * @symbol ?_isTargetVisible\@NearestAttackableTargetGoal\@\@IEBA_NAEBVMob\@\@MM\@Z */ MCAPI bool _isTargetVisible(class Mob const &, float, float) const; //private: /** - * @symbol ?_selectTarget\@NearestAttackableTargetGoal\@\@AEAA_NXZ + * @symbol ?_selectTarget\@NearestAttackableTargetGoal\@\@AEAA_NXZ */ MCAPI bool _selectTarget(); @@ -99,4 +105,4 @@ class NearestAttackableTargetGoal : public TargetGoal { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp b/LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp index f80a6cfbdc..102fd4d56f 100644 --- a/LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/NearestPrioritizedAttackableTargetGoal.hpp @@ -31,33 +31,33 @@ class NearestPrioritizedAttackableTargetGoal : public NearestAttackableTargetGoa public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NearestPrioritizedAttackableTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@NearestPrioritizedAttackableTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@NearestPrioritizedAttackableTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?_findTarget\@NearestPrioritizedAttackableTargetGoal\@\@EEAA?AUActorUniqueID\@\@PEAPEBUMobDescriptor\@\@\@Z + * @vftbl 11 + * @symbol ?_findTarget\@NearestPrioritizedAttackableTargetGoal\@\@EEAA?AUActorUniqueID\@\@PEAPEBUMobDescriptor\@\@\@Z */ virtual struct ActorUniqueID _findTarget(struct MobDescriptor const **); /** - * @symbol ??0NearestPrioritizedAttackableTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@MH_NH22HM2H2\@Z + * @symbol ??0NearestPrioritizedAttackableTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@MH_NH22HM2H2\@Z */ MCAPI NearestPrioritizedAttackableTargetGoal(class Mob &, std::vector const &, float, int, bool, int, bool, bool, int, float, bool, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetEventCallback.hpp b/LiteLoader/include/llapi/mc/NetEventCallback.hpp index 58df02db6c..939e2a8582 100644 --- a/LiteLoader/include/llapi/mc/NetEventCallback.hpp +++ b/LiteLoader/include/llapi/mc/NetEventCallback.hpp @@ -30,886 +30,902 @@ class NetEventCallback { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetEventCallback(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual void __unk_vfn_1() = 0; + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?onWebsocketRequest\@NetEventCallback\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z + * @vftbl 8 + * @symbol ?onWebsocketRequest\@NetEventCallback\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z */ virtual void onWebsocketRequest(std::string const &, std::string const &, class std::function); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol ?getGameSpecificNetEventCallback\@NetEventCallback\@\@UEAAPEAVGameSpecificNetEventCallback\@\@XZ + * @vftbl 11 + * @symbol ?getGameSpecificNetEventCallback\@NetEventCallback\@\@UEAAPEAVGameSpecificNetEventCallback\@\@XZ */ virtual class GameSpecificNetEventCallback * getGameSpecificNetEventCallback(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETEVENTCALLBACK /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorFallPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorFallPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ActorFallPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowProfilePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowProfilePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ShowProfilePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddPaintingPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddPaintingPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddPaintingPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameRulesChangedPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameRulesChangedPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class GameRulesChangedPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStopSoundPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStopSoundPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class StopSoundPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChunkRadiusUpdatedPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChunkRadiusUpdatedPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ChunkRadiusUpdatedPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorDeltaPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorDeltaPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MoveActorDeltaPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateSoftEnumPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateSoftEnumPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateSoftEnumPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVToastRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVToastRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ToastRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetScoreboardIdentityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetScoreboardIdentityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetScoreboardIdentityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlaySoundPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlaySoundPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlaySoundPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkChunkPublisherUpdatePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkChunkPublisherUpdatePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class NetworkChunkPublisherUpdatePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetTimePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetTimePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetTimePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookAddPagePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookAddPagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BookAddPagePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEducationSettingsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEducationSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EducationSettingsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EmoteListPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddItemActorPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddItemActorPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddItemActorPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAgentActionEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAgentActionEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AgentActionEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayStatusPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayStatusPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCorrectPlayerMovePredictionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCorrectPlayerMovePredictionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CorrectPlayerMovePredictionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCameraShakePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCameraShakePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CameraShakePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerArmorDamagePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerArmorDamagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerArmorDamagePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPhotoTransferPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPhotoTransferPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PhotoTransferPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class DisconnectPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateClientInputLocksPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateClientInputLocksPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateClientInputLocksPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerOpenPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerOpenPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ContainerOpenPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAttributesPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAttributesPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateAttributesPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerSettingsRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerSettingsRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ServerSettingsRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingDataPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingDataPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CraftingDataPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackStackPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackStackPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackStackPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddMobPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddMobPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddMobPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryContentPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryContentPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InventoryContentPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateTradePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateTradePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateTradePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataResponsePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataResponsePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataResponsePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveObjectivePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveObjectivePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RemoveObjectivePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EmotePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerEnchantOptionsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCameraInstructionPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class CameraInstructionPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerEnchantOptionsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerEnchantOptionsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAbilitiesPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAbilitiesPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateAbilitiesPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VLevelChunkPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VLevelChunkPacket\@\@\@std\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAdventureSettingsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateAdventureSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateAdventureSettingsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookSignPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookSignPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BookSignPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerStatsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerStatsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ServerStatsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VClientCacheMissResponsePacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VClientCacheMissResponsePacket\@\@\@std\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLessonProgressPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLessonProgressPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LessonProgressPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ChangeMobPropertyPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddPlayerPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddPlayerPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddPlayerPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddEntityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddEntityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddEntityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkSettingsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class NetworkSettingsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCreativeContentPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCreativeContentPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CreativeContentPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacketViolationWarningPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacketViolationWarningPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PacketViolationWarningPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackResponsePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackResponsePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ItemStackResponsePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorMotionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorMotionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetActorMotionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerSetDataPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerSetDataPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ContainerSetDataPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGuiDataPickItemPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGuiDataPickItemPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class GuiDataPickItemPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockPacket\@\@\@std\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetTitlePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetTitlePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetTitlePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddActorPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddActorPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddActorPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnParticleEffectPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnParticleEffectPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SpawnParticleEffectPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDisplayObjectivePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDisplayObjectivePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetDisplayObjectivePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveActorPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveActorPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RemoveActorPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetCommandsEnabledPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetCommandsEnabledPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetCommandsEnabledPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientboundMapItemDataPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientboundMapItemDataPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientboundMapItemDataPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBServerBroadcastPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBServerBroadcastPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBServerBroadcastPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockSyncedPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VUpdateBlockSyncedPacket\@\@\@std\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddVolumeEntityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddVolumeEntityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddVolumeEntityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLecternUpdatePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLecternUpdatePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LecternUpdatePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelEventGenericPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelEventGenericPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelEventGenericPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookSwapPagesPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookSwapPagesPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BookSwapPagesPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimulationTypePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimulationTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SimulationTypePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateEquipPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateEquipPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateEquipPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEffectPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEffectPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MobEffectPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCheatAbilityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCheatAbilityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCheatAbilityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFeatureRegistryPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFeatureRegistryPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class FeatureRegistryPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackDataInfoPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackDataInfoPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackDataInfoPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientboundDebugRendererPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientboundDebugRendererPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientboundDebugRendererPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookDeletePagePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookDeletePagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BookDeletePagePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcDialoguePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcDialoguePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class NpcDialoguePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimatePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimatePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AnimatePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStartGamePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStartGamePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class StartGamePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemComponentPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemComponentPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ItemComponentPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCameraPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCameraPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CameraPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerToClientHandshakePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerToClientHandshakePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ServerToClientHandshakePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAvailableActorIdentifiersPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAvailableActorIdentifiersPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AvailableActorIdentifiersPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetScorePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetScorePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetScorePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVHurtArmorPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVHurtArmorPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class HurtArmorPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEduUriResourcePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEduUriResourcePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EduUriResourcePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorAbsolutePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorAbsolutePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MoveActorAbsolutePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFilterTextPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFilterTextPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class FilterTextPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddBehaviorTreePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAddBehaviorTreePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AddBehaviorTreePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryActionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryActionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InventoryActionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDeathInfoPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDeathInfoPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class DeathInfoPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBiomeDefinitionListPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBiomeDefinitionListPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BiomeDefinitionListPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveVolumeEntityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveVolumeEntityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RemoveVolumeEntityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCompletedUsingItemPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCompletedUsingItemPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CompletedUsingItemPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMotionPredictionHintsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUnlockedRecipesPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class UnlockedRecipesPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMotionPredictionHintsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MotionPredictionHintsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPurchaseReceiptPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPurchaseReceiptPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PurchaseReceiptPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerListPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerListPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerListPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobArmorEquipmentPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobArmorEquipmentPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MobArmorEquipmentPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateSubChunkBlocksPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdateSubChunkBlocksPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class UpdateSubChunkBlocksPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLastHurtByPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLastHurtByPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetLastHurtByPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerStartItemCooldownPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerStartItemCooldownPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerStartItemCooldownPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTransferPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTransferPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class TransferPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePacksInfoPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePacksInfoPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePacksInfoPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class TickSyncPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetSpawnPositionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetSpawnPositionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetSpawnPositionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSyncActorPropertyPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSyncActorPropertyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SyncActorPropertyPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAutomationClientConnectPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAutomationClientConnectPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AutomationClientConnectPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowStoreOfferPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowStoreOfferPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ShowStoreOfferPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorDataPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorDataPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetActorDataPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimateEntityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimateEntityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AnimateEntityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCameraPresetsPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class CameraPresetsPacket const &); + /** + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class BlockEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTakeItemActorPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTakeItemActorPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class TakeItemActorPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickingAreasLoadStatusPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickingAreasLoadStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class TickingAreasLoadStatusPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEditorNetworkPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEditorNetworkPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EditorNetworkPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDimensionDataPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDimensionDataPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class DimensionDataPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerSettingsResponsePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVServerSettingsResponsePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ServerSettingsResponsePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeDimensionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeDimensionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ChangeDimensionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventorySlotPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventorySlotPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class InventorySlotPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAvailableCommandsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAvailableCommandsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AvailableCommandsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetHealthPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetHealthPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetHealthPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestResultsPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestResultsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class GameTestResultsPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SubChunkPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkDataPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkDataPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkDataPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormRequestPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormRequestPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ModalFormRequestPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerActionPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveEntityPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRemoveEntityPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RemoveEntityPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCreatePhotoPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCreatePhotoPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CreatePhotoPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandOutputPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandOutputPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CommandOutputPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerFogPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerFogPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PlayerFogPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVOnScreenTextureAnimationPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVOnScreenTextureAnimationPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class OnScreenTextureAnimationPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptCustomEventPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptCustomEventPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ScriptCustomEventPacket const &); /** - * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorLinkPacket\@\@\@Z + * @symbol ?handle\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetActorLinkPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class SetActorLinkPacket const &); /** - * @symbol ?onConnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@\@Z + * @symbol ?onConnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@\@Z */ MCVAPI void onConnect(class NetworkIdentifier const &); /** - * @symbol ?onDisconnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?onDisconnect\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ MCVAPI void onDisconnect(class NetworkIdentifier const &, std::string const &, bool, std::string const &); /** - * @symbol ?onPlayerReady\@NetEventCallback\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?onPlayerReady\@NetEventCallback\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void onPlayerReady(class Player &); /** - * @symbol ?onStoreOfferReceive\@NetEventCallback\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onStoreOfferReceive\@NetEventCallback\@\@UEAAX_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onStoreOfferReceive(bool, std::string const &); /** - * @symbol ?onTick\@NetEventCallback\@\@UEAAXXZ + * @symbol ?onTick\@NetEventCallback\@\@UEAAXXZ */ MCVAPI void onTick(); /** - * @symbol ?onTransferRequest\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?onTransferRequest\@NetEventCallback\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCVAPI void onTransferRequest(class NetworkIdentifier const &, std::string const &, int); /** - * @symbol ?onUnableToConnect\@NetEventCallback\@\@UEAAXXZ + * @symbol ?onUnableToConnect\@NetEventCallback\@\@UEAAXXZ */ MCVAPI void onUnableToConnect(); /** - * @symbol ?sendPacketViolationDetectedTelemetryData\@NetEventCallback\@\@UEAAXAEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?sendPacketViolationDetectedTelemetryData\@NetEventCallback\@\@UEAAXAEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z */ MCVAPI void sendPacketViolationDetectedTelemetryData(struct ExtendedStreamReadResult const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetEventCallback(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp b/LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp index 770f361d75..0fff4fa338 100644 --- a/LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp +++ b/LiteLoader/include/llapi/mc/NetherBrightnessRamp.hpp @@ -31,14 +31,14 @@ class NetherBrightnessRamp : public DimensionBrightnessRamp { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherBrightnessRamp(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getBaseAmbientValue\@NetherBrightnessRamp\@\@UEBAMXZ + * @vftbl 2 + * @symbol ?getBaseAmbientValue\@NetherBrightnessRamp\@\@UEBAMXZ */ virtual float getBaseAmbientValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherDimension.hpp b/LiteLoader/include/llapi/mc/NetherDimension.hpp index 1f54244ee1..640716a0e1 100644 --- a/LiteLoader/include/llapi/mc/NetherDimension.hpp +++ b/LiteLoader/include/llapi/mc/NetherDimension.hpp @@ -31,81 +31,81 @@ class NetherDimension { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERDIMENSION /** - * @symbol ?_upgradeOldLimboEntity\@NetherDimension\@\@EEAAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@\@Z + * @symbol ?_upgradeOldLimboEntity\@NetherDimension\@\@EEAAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@\@Z */ MCVAPI void _upgradeOldLimboEntity(class CompoundTag &, enum class LimboEntitiesVersion); /** - * @symbol ?_wrapStorageForVersionCompatibility\@NetherDimension\@\@EEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z + * @symbol ?_wrapStorageForVersionCompatibility\@NetherDimension\@\@EEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z */ MCVAPI std::unique_ptr _wrapStorageForVersionCompatibility(std::unique_ptr, enum class StorageVersion); /** - * @symbol ?createGenerator\@NetherDimension\@\@UEAA?AV?$unique_ptr\@VWorldGenerator\@\@U?$default_delete\@VWorldGenerator\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createGenerator\@NetherDimension\@\@UEAA?AV?$unique_ptr\@VWorldGenerator\@\@U?$default_delete\@VWorldGenerator\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr createGenerator(); /** - * @symbol ?fixWallChunk\@NetherDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?fixWallChunk\@NetherDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void fixWallChunk(class ChunkSource &, class LevelChunk &); /** - * @symbol ?forceCheckAllNeighChunkSavedStat\@NetherDimension\@\@UEBA_NXZ + * @symbol ?forceCheckAllNeighChunkSavedStat\@NetherDimension\@\@UEBA_NXZ */ MCVAPI bool forceCheckAllNeighChunkSavedStat() const; /** - * @symbol ?getDefaultBiome\@NetherDimension\@\@UEBA?AVHashedString\@\@XZ + * @symbol ?getDefaultBiome\@NetherDimension\@\@UEBA?AVHashedString\@\@XZ */ MCVAPI class HashedString getDefaultBiome() const; /** - * @symbol ?getTimeOfDay\@NetherDimension\@\@UEBAMHM\@Z + * @symbol ?getTimeOfDay\@NetherDimension\@\@UEBAMHM\@Z */ MCVAPI float getTimeOfDay(int, float) const; /** - * @symbol ?init\@NetherDimension\@\@UEAAXXZ + * @symbol ?init\@NetherDimension\@\@UEAAXXZ */ MCVAPI void init(); /** - * @symbol ?isFoggyAt\@NetherDimension\@\@UEBA_NHH\@Z + * @symbol ?isFoggyAt\@NetherDimension\@\@UEBA_NHH\@Z */ MCVAPI bool isFoggyAt(int, int) const; /** - * @symbol ?isNaturalDimension\@NetherDimension\@\@UEBA_NXZ + * @symbol ?isNaturalDimension\@NetherDimension\@\@UEBA_NXZ */ MCVAPI bool isNaturalDimension() const; /** - * @symbol ?isValidSpawn\@NetherDimension\@\@UEBA_NHH\@Z + * @symbol ?isValidSpawn\@NetherDimension\@\@UEBA_NHH\@Z */ MCVAPI bool isValidSpawn(int, int) const; /** - * @symbol ?levelChunkNeedsUpgrade\@NetherDimension\@\@UEBA_NAEBVLevelChunk\@\@\@Z + * @symbol ?levelChunkNeedsUpgrade\@NetherDimension\@\@UEBA_NAEBVLevelChunk\@\@\@Z */ MCVAPI bool levelChunkNeedsUpgrade(class LevelChunk const &) const; /** - * @symbol ?mayRespawnViaBed\@NetherDimension\@\@UEBA_NXZ + * @symbol ?mayRespawnViaBed\@NetherDimension\@\@UEBA_NXZ */ MCVAPI bool mayRespawnViaBed() const; /** - * @symbol ?showSky\@NetherDimension\@\@UEBA_NXZ + * @symbol ?showSky\@NetherDimension\@\@UEBA_NXZ */ MCVAPI bool showSky() const; /** - * @symbol ?translatePosAcrossDimension\@NetherDimension\@\@UEBA?AVVec3\@\@AEBV2\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?translatePosAcrossDimension\@NetherDimension\@\@UEBA?AVVec3\@\@AEBV2\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI class Vec3 translatePosAcrossDimension(class Vec3 const &, class AutomaticID) const; /** - * @symbol ?upgradeLevelChunk\@NetherDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@1\@Z + * @symbol ?upgradeLevelChunk\@NetherDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@1\@Z */ MCVAPI void upgradeLevelChunk(class ChunkSource &, class LevelChunk &, class LevelChunk &); #endif /** - * @symbol ??0NetherDimension\@\@QEAA\@AEAVLevel\@\@AEAVScheduler\@\@\@Z + * @symbol ??0NetherDimension\@\@QEAA\@AEAVILevel\@\@AEAVScheduler\@\@\@Z */ - MCAPI NetherDimension(class Level &, class Scheduler &); + MCAPI NetherDimension(class ILevel &, class Scheduler &); //private: /** - * @symbol ?makeStructureFeatures\@NetherDimension\@\@CA?AV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@IAEBVBaseGameVersion\@\@\@Z + * @symbol ?makeStructureFeatures\@NetherDimension\@\@CA?AV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@IAEBVBaseGameVersion\@\@\@Z */ MCAPI static std::unique_ptr makeStructureFeatures(unsigned int, class BaseGameVersion const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherFortressFeature.hpp b/LiteLoader/include/llapi/mc/NetherFortressFeature.hpp index 6acc636bbf..2fcb2f5fcb 100644 --- a/LiteLoader/include/llapi/mc/NetherFortressFeature.hpp +++ b/LiteLoader/include/llapi/mc/NetherFortressFeature.hpp @@ -31,33 +31,33 @@ class NetherFortressFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherFortressFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shouldAddHardcodedSpawnAreas\@NetherFortressFeature\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?shouldAddHardcodedSpawnAreas\@NetherFortressFeature\@\@UEBA_NXZ */ virtual bool shouldAddHardcodedSpawnAreas() const; /** - * @vftbl 4 - * @symbol ?initMobSpawnTypes\@NetherFortressFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z + * @vftbl 4 + * @symbol ?initMobSpawnTypes\@NetherFortressFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z */ virtual void initMobSpawnTypes(class HardcodedSpawnAreaRegistry &); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@NetherFortressFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@NetherFortressFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@NetherFortressFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@NetherFortressFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0NetherFortressFeature\@\@QEAA\@AEAIAEBVBaseGameVersion\@\@\@Z + * @symbol ??0NetherFortressFeature\@\@QEAA\@AEAIAEBVBaseGameVersion\@\@\@Z */ MCAPI NetherFortressFeature(unsigned int &, class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherFortressPiece.hpp b/LiteLoader/include/llapi/mc/NetherFortressPiece.hpp index 7f89dc64b5..3fcc9a658c 100644 --- a/LiteLoader/include/llapi/mc/NetherFortressPiece.hpp +++ b/LiteLoader/include/llapi/mc/NetherFortressPiece.hpp @@ -31,47 +31,53 @@ class NetherFortressPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherFortressPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?postProcess\@NetherFortressPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@NetherFortressPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 12 - * @symbol ?addHardcodedSpawnAreas\@NetherFortressPiece\@\@UEBAXAEAVLevelChunk\@\@\@Z + * @vftbl 12 + * @symbol ?addHardcodedSpawnAreas\@NetherFortressPiece\@\@UEBAXAEAVLevelChunk\@\@\@Z */ virtual void addHardcodedSpawnAreas(class LevelChunk &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERFORTRESSPIECE /** - * @symbol ??0NetherFortressPiece\@\@QEAA\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetherFortressPiece(); +#endif + /** + * @symbol ??0NetherFortressPiece\@\@QEAA\@H\@Z */ MCAPI NetherFortressPiece(int); /** - * @symbol ?findAndCreateBridgePieceFactory\@NetherFortressPiece\@\@QEAA?AV?$unique_ptr\@VNetherFortressPiece\@\@U?$default_delete\@VNetherFortressPiece\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?findAndCreateBridgePieceFactory\@NetherFortressPiece\@\@QEAA?AV?$unique_ptr\@VNetherFortressPiece\@\@U?$default_delete\@VNetherFortressPiece\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI std::unique_ptr findAndCreateBridgePieceFactory(std::string const &, std::vector> &, class Random &, int, int, int, int, int); /** - * @symbol ?generateAndAddPiece\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHHH_N\@Z + * @symbol ?generateAndAddPiece\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHHH_N\@Z */ MCAPI class StructurePiece * generateAndAddPiece(class NBStartPiece &, std::vector> &, class Random &, int, int, int, int, int, bool); /** - * @symbol ?generateChildForward\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH_N\@Z + * @symbol ?generateChildForward\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH_N\@Z */ MCAPI class StructurePiece * generateChildForward(class NBStartPiece &, std::vector> &, class Random &, int, int, bool); /** - * @symbol ?generateChildLeft\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH_N\@Z + * @symbol ?generateChildLeft\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH_N\@Z */ MCAPI class StructurePiece * generateChildLeft(class NBStartPiece &, std::vector> &, class Random &, int, int, bool); /** - * @symbol ?generateChildRight\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH_N\@Z + * @symbol ?generateChildRight\@NetherFortressPiece\@\@QEAAPEAVStructurePiece\@\@AEAVNBStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH_N\@Z */ MCAPI class StructurePiece * generateChildRight(class NBStartPiece &, std::vector> &, class Random &, int, int, bool); /** - * @symbol ?generatePiece\@NetherFortressPiece\@\@QEAA?AV?$unique_ptr\@VNetherFortressPiece\@\@U?$default_delete\@VNetherFortressPiece\@\@\@std\@\@\@std\@\@AEAVNBStartPiece\@\@AEAV?$vector\@VPieceWeight\@\@V?$allocator\@VPieceWeight\@\@\@std\@\@\@3\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?generatePiece\@NetherFortressPiece\@\@QEAA?AV?$unique_ptr\@VNetherFortressPiece\@\@U?$default_delete\@VNetherFortressPiece\@\@\@std\@\@\@std\@\@AEAVNBStartPiece\@\@AEAV?$vector\@VPieceWeight\@\@V?$allocator\@VPieceWeight\@\@\@std\@\@\@3\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI std::unique_ptr generatePiece(class NBStartPiece &, std::vector &, std::vector> &, class Random &, int, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherFortressStart.hpp b/LiteLoader/include/llapi/mc/NetherFortressStart.hpp index 6dfb806f4d..184cc25123 100644 --- a/LiteLoader/include/llapi/mc/NetherFortressStart.hpp +++ b/LiteLoader/include/llapi/mc/NetherFortressStart.hpp @@ -31,13 +31,13 @@ class NetherFortressStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherFortressStart(); + virtual void __unk_vfn_0(); /** - * @symbol ??0NetherFortressStart\@\@QEAA\@AEAVRandom\@\@FHH\@Z + * @symbol ??0NetherFortressStart\@\@QEAA\@AEAVRandom\@\@FHH\@Z */ MCAPI NetherFortressStart(class Random &, short, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherFossilFeature.hpp b/LiteLoader/include/llapi/mc/NetherFossilFeature.hpp index 01d8079132..39dd7e4220 100644 --- a/LiteLoader/include/llapi/mc/NetherFossilFeature.hpp +++ b/LiteLoader/include/llapi/mc/NetherFossilFeature.hpp @@ -31,17 +31,17 @@ class NetherFossilFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherFossilFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@NetherFossilFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@NetherFossilFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0NetherFossilFeature\@\@QEAA\@$$QEAV?$vector\@PEBVBlock\@\@V?$allocator\@PEBVBlock\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol ??0NetherFossilFeature\@\@QEAA\@$$QEAV?$vector\@PEBVBlock\@\@V?$allocator\@PEBVBlock\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI NetherFossilFeature(std::vector &&, bool); @@ -49,8 +49,8 @@ class NetherFossilFeature : public Feature { private: /** - * @symbol ?STRUCTURE_LOCATION_FOSSIL\@NetherFossilFeature\@\@0QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_LOCATION_FOSSIL\@NetherFossilFeature\@\@0QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_LOCATION_FOSSIL[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp index 0b4e22b756..342711f840 100644 --- a/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherFungusBlock.hpp @@ -31,244 +31,249 @@ class NetherFungusBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherFungusBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@NetherFungusBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@NetherFungusBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@NetherFungusBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@NetherFungusBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@NetherFungusBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@NetherFungusBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERFUNGUSBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@NetherFungusBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@NetherFungusBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0NetherFungusBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NetherFungusBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NetherFungusBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherGenerator.hpp b/LiteLoader/include/llapi/mc/NetherGenerator.hpp index 034acefd02..a74d5e1609 100644 --- a/LiteLoader/include/llapi/mc/NetherGenerator.hpp +++ b/LiteLoader/include/llapi/mc/NetherGenerator.hpp @@ -32,69 +32,69 @@ class NetherGenerator { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERGENERATOR /** - * @symbol ?decorateWorldGenLoadChunk\@NetherGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z + * @symbol ?decorateWorldGenLoadChunk\@NetherGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z */ MCVAPI void decorateWorldGenLoadChunk(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &) const; /** - * @symbol ?decorateWorldGenPostProcess\@NetherGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @symbol ?decorateWorldGenPostProcess\@NetherGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z */ MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; /** - * @symbol ?findSpawnPosition\@NetherGenerator\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?findSpawnPosition\@NetherGenerator\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos findSpawnPosition() const; /** - * @symbol ?getBiomeArea\@NetherGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + * @symbol ?getBiomeArea\@NetherGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z */ MCVAPI class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; /** - * @symbol ?getBiomeSource\@NetherGenerator\@\@UEBAAEBVBiomeSource\@\@XZ + * @symbol ?getBiomeSource\@NetherGenerator\@\@UEBAAEBVBiomeSource\@\@XZ */ MCVAPI class BiomeSource const & getBiomeSource() const; /** - * @symbol ?getBlockVolumeDimensions\@NetherGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ + * @symbol ?getBlockVolumeDimensions\@NetherGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ */ MCVAPI struct WorldGenerator::BlockVolumeDimensions getBlockVolumeDimensions() const; /** - * @symbol ?loadChunk\@NetherGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @symbol ?loadChunk\@NetherGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ MCVAPI void loadChunk(class LevelChunk &, bool); /** - * @symbol ?postProcess\@NetherGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + * @symbol ?postProcess\@NetherGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z */ MCVAPI bool postProcess(class ChunkViewSource &); /** - * @symbol ?prepareAndComputeHeights\@NetherGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@_NH\@Z + * @symbol ?prepareAndComputeHeights\@NetherGenerator\@\@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\@NetherGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z + * @symbol ?prepareHeights\@NetherGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z */ MCVAPI void prepareHeights(class BlockVolume &, class ChunkPos const &, bool); #endif /** - * @symbol ??0NetherGenerator\@\@QEAA\@AEAVDimension\@\@IPEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0NetherGenerator\@\@QEAA\@AEAVDimension\@\@IPEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI NetherGenerator(class Dimension &, unsigned int, class Biome const *, std::unique_ptr); /** - * @symbol ?buildSurfaces\@NetherGenerator\@\@QEAAXAEAVBlockVolume\@\@AEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z + * @symbol ?buildSurfaces\@NetherGenerator\@\@QEAAXAEAVBlockVolume\@\@AEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z */ MCAPI void buildSurfaces(class BlockVolume &, class LevelChunk &, class ChunkPos const &); /** - * @symbol ?generateDensityCellsForChunk\@NetherGenerator\@\@QEBA?AV?$MultidimensionalArray\@M$04$04$0BB\@\@Util\@\@AEBVChunkPos\@\@\@Z + * @symbol ?generateDensityCellsForChunk\@NetherGenerator\@\@QEBA?AV?$MultidimensionalArray\@M$04$04$0BB\@\@Util\@\@AEBVChunkPos\@\@\@Z */ MCAPI class Util::MultidimensionalArray generateDensityCellsForChunk(class ChunkPos const &) const; //private: /** - * @symbol ?_prepareHeights\@NetherGenerator\@\@AEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@H\@Z + * @symbol ?_prepareHeights\@NetherGenerator\@\@AEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@H\@Z */ MCAPI void _prepareHeights(class BlockVolume &, class ChunkPos const &, bool, std::vector *, int); /** - * @symbol ?_makeBiomeSource\@NetherGenerator\@\@CA?AV?$unique_ptr\@VBiomeSource\@\@U?$default_delete\@VBiomeSource\@\@\@std\@\@\@std\@\@AEAVDimension\@\@\@Z + * @symbol ?_makeBiomeSource\@NetherGenerator\@\@CA?AV?$unique_ptr\@VBiomeSource\@\@U?$default_delete\@VBiomeSource\@\@\@std\@\@\@std\@\@AEAVDimension\@\@\@Z */ MCAPI static std::unique_ptr _makeBiomeSource(class Dimension &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp index f9eb9943d0..508d2ac351 100644 --- a/LiteLoader/include/llapi/mc/NetherNetConnector.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetConnector.hpp @@ -11,30 +11,30 @@ #undef BEFORE_EXTRA -struct NetherNetConnector { +class NetherNetConnector { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERNETCONNECTOR public: - struct NetherNetConnector& operator=(struct NetherNetConnector const &) = delete; - NetherNetConnector(struct NetherNetConnector const &) = delete; + class NetherNetConnector& operator=(class NetherNetConnector const &) = delete; + NetherNetConnector(class NetherNetConnector const &) = delete; NetherNetConnector() = delete; #endif public: /** - * @symbol ?enableBroadcastDiscovery\@NetherNetConnector\@\@QEAAXXZ + * @symbol ?enableBroadcastDiscovery\@NetherNetConnector\@\@QEAAXXZ */ MCAPI void enableBroadcastDiscovery(); /** - * @symbol ?setBroadcastRequestCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6A_NPEAXPEAH\@Z\@std\@\@\@Z + * @symbol ?setBroadcastRequestCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6A_NPEAXPEAH\@Z\@std\@\@\@Z */ MCAPI void setBroadcastRequestCallback(class std::function &&); /** - * @symbol ?setBroadcastResponseCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6AXAEBUNetworkID\@NetherNet\@\@PEBXH\@Z\@std\@\@\@Z + * @symbol ?setBroadcastResponseCallback\@NetherNetConnector\@\@QEAAX$$QEAV?$function\@$$A6AXAEBUNetworkID\@NetherNet\@\@PEBXH\@Z\@std\@\@\@Z */ MCAPI void setBroadcastResponseCallback(class std::function &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherNetInstance.hpp b/LiteLoader/include/llapi/mc/NetherNetInstance.hpp deleted file mode 100644 index e2ae13582a..0000000000 --- a/LiteLoader/include/llapi/mc/NetherNetInstance.hpp +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @file NetherNetInstance.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure NetherNetInstance. - * - */ -struct NetherNetInstance { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETHERNETINSTANCE -public: - struct NetherNetInstance& operator=(struct NetherNetInstance const &) = delete; - NetherNetInstance(struct NetherNetInstance const &) = delete; - NetherNetInstance() = delete; -#endif - -public: - /** - * @symbol ?SetBroadcastRequestCallback@NetherNetInstance@@QEAAX$$QEAV?$function@$$A6A_NPEAXPEAH@Z@std@@@Z - * @hash -207062046 - */ - MCAPI void SetBroadcastRequestCallback(class std::function &&); - /** - * @symbol ?SetBroadcastResponseCallback@NetherNetInstance@@QEAAX$$QEAV?$function@$$A6AXAEBUNetworkID@NetherNet@@PEBXH@Z@std@@@Z - * @hash -20064896 - */ - MCAPI void SetBroadcastResponseCallback(class std::function &&); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp b/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp index e8f9ce207f..52af3c507a 100644 --- a/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetServerLocator.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "StubServerLocator.hpp" #define BEFORE_EXTRA @@ -36,106 +37,114 @@ struct ServerData { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherNetServerLocator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ 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 + * @vftbl 3 + * @symbol ?startAnnouncingServer\@NetherNetServerLocator\@\@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\@NetherNetServerLocator\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?stopAnnouncingServer\@NetherNetServerLocator\@\@UEAAXXZ */ virtual void stopAnnouncingServer(); /** - * @vftbl 5 - * @symbol ?startServerDiscovery\@NetherNetServerLocator\@\@UEAAXUPortPair\@\@\@Z + * @vftbl 5 + * @symbol ?startServerDiscovery\@NetherNetServerLocator\@\@UEAAXUPortPair\@\@\@Z */ virtual void startServerDiscovery(struct PortPair); /** - * @vftbl 6 - * @symbol ?stopServerDiscovery\@NetherNetServerLocator\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?stopServerDiscovery\@NetherNetServerLocator\@\@UEAAXXZ */ virtual void stopServerDiscovery(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getServerList\@NetherNetServerLocator\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?getServerList\@NetherNetServerLocator\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getServerList() const; /** - * @vftbl 10 - * @symbol ?clearServerList\@NetherNetServerLocator\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?clearServerList\@NetherNetServerLocator\@\@UEAAXXZ */ virtual void clearServerList(); /** - * @vftbl 11 - * @symbol ?update\@NetherNetServerLocator\@\@UEAAXXZ + * @vftbl 11 + * @symbol ?update\@NetherNetServerLocator\@\@UEAAXXZ */ virtual void update(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @symbol ??0NetherNetServerLocator\@\@QEAA\@XZ + * @symbol ??0NetherNetServerLocator\@\@QEAA\@XZ */ MCAPI NetherNetServerLocator(); /** - * @symbol ?setNetherNetConnector\@NetherNetServerLocator\@\@QEAAX$$QEAV?$shared_ptr\@UNetherNetConnector\@\@\@std\@\@\@Z + * @symbol ?setNetherNetConnector\@NetherNetServerLocator\@\@QEAAX$$QEAV?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@\@Z */ - MCAPI void setNetherNetConnector(class std::shared_ptr &&); + MCAPI void setNetherNetConnector(class Bedrock::NonOwnerPointer &&); //private: /** - * @symbol ?_cacheDiscoveryResponseData\@NetherNetServerLocator\@\@AEAAXAEBUServerData\@1\@\@Z + * @symbol ?_cacheDiscoveryResponseData\@NetherNetServerLocator\@\@AEAAXAEBUServerData\@1\@\@Z */ MCAPI void _cacheDiscoveryResponseData(struct NetherNetServerLocator::ServerData const &); /** - * @symbol ?_isNetherNetOverLANAllowed\@NetherNetServerLocator\@\@AEBA_NXZ + * @symbol ?_isNetherNetOverLANAllowed\@NetherNetServerLocator\@\@AEBA_NXZ */ MCAPI bool _isNetherNetOverLANAllowed() const; /** - * @symbol ?_onDiscoveryResponse\@NetherNetServerLocator\@\@AEAAX_KV?$span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?_onDiscoveryResponse\@NetherNetServerLocator\@\@AEAAX_KV?$span\@$$CBD$0?0\@gsl\@\@\@Z */ MCAPI void _onDiscoveryResponse(unsigned __int64, class gsl::span); /** - * @symbol ?_pruneStaleServers\@NetherNetServerLocator\@\@AEAAXV?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?_pruneStaleServers\@NetherNetServerLocator\@\@AEAAXV?$duration\@_JU?$ratio\@$00$00\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void _pruneStaleServers(class std::chrono::duration<__int64, struct std::ratio<1, 1>>); /** - * @symbol ?_setIsAnnouncing\@NetherNetServerLocator\@\@AEAAX_N\@Z + * @symbol ?_setIsAnnouncing\@NetherNetServerLocator\@\@AEAAX_N\@Z */ MCAPI void _setIsAnnouncing(bool); + /** + * @symbol ?_setIsDiscovering\@NetherNetServerLocator\@\@AEAAX_N\@Z + */ + MCAPI void _setIsDiscovering(bool); + /** + * @symbol ?_transformFrom\@NetherNetServerLocator\@\@CA?AUPingedCompatibleServer\@\@_K$$QEAUServerData\@1\@\@Z + */ + MCAPI static struct PingedCompatibleServer _transformFrom(unsigned __int64, struct NetherNetServerLocator::ServerData &&); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherNetTransportFactory.hpp b/LiteLoader/include/llapi/mc/NetherNetTransportFactory.hpp index 095a602a84..6435d0e1e5 100644 --- a/LiteLoader/include/llapi/mc/NetherNetTransportFactory.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetTransportFactory.hpp @@ -25,18 +25,24 @@ class NetherNetTransportFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherNetTransportFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?createTransport\@NetherNetTransportFactory\@\@UEBA?AV?$unique_ptr\@VINetherNetTransportInterface\@NetherNet\@\@V?$function\@$$A6AXPEAVINetherNetTransportInterface\@NetherNet\@\@\@Z\@std\@\@\@std\@\@AEBUNetworkID\@NetherNet\@\@PEAVINetherNetTransportInterfaceCallbacks\@5\@\@Z + * @vftbl 1 + * @symbol ?createTransport\@NetherNetTransportFactory\@\@UEBA?AV?$unique_ptr\@VINetherNetTransportInterface\@NetherNet\@\@V?$function\@$$A6AXPEAVINetherNetTransportInterface\@NetherNet\@\@\@Z\@std\@\@\@std\@\@AEBUNetworkID\@NetherNet\@\@PEAVINetherNetTransportInterfaceCallbacks\@5\@\@Z */ virtual class std::unique_ptr> createTransport(struct NetherNet::NetworkID const &, class NetherNet::INetherNetTransportInterfaceCallbacks *) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERNETTRANSPORTFACTORY /** - * @symbol ??0NetherNetTransportFactory\@\@QEAA\@AEBUNetworkHandlerToggles\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI NetherNetTransportFactory(struct NetworkHandlerToggles const &); + MCVAPI ~NetherNetTransportFactory(); +#endif + /** + * @symbol ??0NetherNetTransportFactory\@\@QEAA\@AEBUNetworkSystemToggles\@\@\@Z + */ + MCAPI NetherNetTransportFactory(struct NetworkSystemToggles const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp b/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp index bf4701202f..2a888d51b7 100644 --- a/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp +++ b/LiteLoader/include/llapi/mc/NetherNetTransportStub.hpp @@ -26,81 +26,81 @@ class NetherNetTransportStub { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERNETTRANSPORTSTUB /** - * @symbol ?AcceptSessionWithUser\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@\@Z + * @symbol ?AcceptSessionWithUser\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@\@Z */ MCVAPI bool AcceptSessionWithUser(struct NetherNet::NetworkID); /** - * @symbol ?ClearPacketData\@NetherNetTransportStub\@\@UEAAXUNetworkID\@NetherNet\@\@\@Z + * @symbol ?ClearPacketData\@NetherNetTransportStub\@\@UEAAXUNetworkID\@NetherNet\@\@\@Z */ MCVAPI void ClearPacketData(struct NetherNet::NetworkID); /** - * @symbol ?CloseSessionWithUser\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@\@Z + * @symbol ?CloseSessionWithUser\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@\@Z */ MCVAPI bool CloseSessionWithUser(struct NetherNet::NetworkID); /** - * @symbol ?DisableBroadcastDiscovery\@NetherNetTransportStub\@\@UEAAXXZ + * @symbol ?DisableBroadcastDiscovery\@NetherNetTransportStub\@\@UEAAXXZ */ MCVAPI void DisableBroadcastDiscovery(); /** - * @symbol ?DisableSignalingOverLAN\@NetherNetTransportStub\@\@UEAAXXZ + * @symbol ?DisableSignalingOverLAN\@NetherNetTransportStub\@\@UEAAXXZ */ MCVAPI void DisableSignalingOverLAN(); /** - * @symbol ?EnableBroadcastDiscovery\@NetherNetTransportStub\@\@UEAAXXZ + * @symbol ?EnableBroadcastDiscovery\@NetherNetTransportStub\@\@UEAAXXZ */ MCVAPI void EnableBroadcastDiscovery(); /** - * @symbol ?EnableSignalingOverLAN\@NetherNetTransportStub\@\@UEAAXXZ + * @symbol ?EnableSignalingOverLAN\@NetherNetTransportStub\@\@UEAAXXZ */ MCVAPI void EnableSignalingOverLAN(); /** - * @symbol ?GetSessionState\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAUSessionState\@3\@\@Z + * @symbol ?GetSessionState\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAUSessionState\@3\@\@Z */ MCVAPI bool GetSessionState(struct NetherNet::NetworkID, struct NetherNet::SessionState *); /** - * @symbol ?IsLANBroadcastModeAvailable\@NetherNetTransportStub\@\@UEBA_NXZ + * @symbol ?IsLANBroadcastModeAvailable\@NetherNetTransportStub\@\@UEBA_NXZ */ MCVAPI bool IsLANBroadcastModeAvailable() const; /** - * @symbol ?IsPacketAvailable\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAI\@Z + * @symbol ?IsPacketAvailable\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAI\@Z */ MCVAPI bool IsPacketAvailable(struct NetherNet::NetworkID, unsigned int *); /** - * @symbol ?IsSignedIntoSignalingService\@NetherNetTransportStub\@\@UEBA_NXZ + * @symbol ?IsSignedIntoSignalingService\@NetherNetTransportStub\@\@UEBA_NXZ */ MCVAPI bool IsSignedIntoSignalingService() const; /** - * @symbol ?OpenSessionWithUser\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@\@Z + * @symbol ?OpenSessionWithUser\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@\@Z */ MCVAPI bool OpenSessionWithUser(struct NetherNet::NetworkID); /** - * @symbol ?ReadPacket\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAXIPEAI\@Z + * @symbol ?ReadPacket\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEAXIPEAI\@Z */ MCVAPI bool ReadPacket(struct NetherNet::NetworkID, void *, unsigned int, unsigned int *); /** - * @symbol ?RegisterRelayServerCredentialsReadyCallback\@NetherNetTransportStub\@\@UEAAXAEBV?$function\@$$A6AXW4ERelayServerConfigurationResult\@NetherNet\@\@\@Z\@std\@\@\@Z + * @symbol ?RegisterRelayServerCredentialsReadyCallback\@NetherNetTransportStub\@\@UEAAXAEBV?$function\@$$A6AXW4ERelayServerConfigurationResult\@NetherNet\@\@\@Z\@std\@\@\@Z */ MCVAPI void RegisterRelayServerCredentialsReadyCallback(class std::function const &); /** - * @symbol ?SendPacket\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEBDIW4ESendType\@3\@\@Z + * @symbol ?SendPacket\@NetherNetTransportStub\@\@UEAA_NUNetworkID\@NetherNet\@\@PEBDIW4ESendType\@3\@\@Z */ MCVAPI bool SendPacket(struct NetherNet::NetworkID, char const *, unsigned int, enum class NetherNet::ESendType); /** - * @symbol ?SetServerConfiguration\@NetherNetTransportStub\@\@UEAAXPEBUNetherNetTransportServerConfiguration\@NetherNet\@\@\@Z + * @symbol ?SetServerConfiguration\@NetherNetTransportStub\@\@UEAAXPEBUNetherNetTransportServerConfiguration\@NetherNet\@\@\@Z */ MCVAPI void SetServerConfiguration(struct NetherNet::NetherNetTransportServerConfiguration const *); /** - * @symbol ?SetWebRTCSignalingInterface\@NetherNetTransportStub\@\@UEAAXAEBV?$shared_ptr\@VIWebRTCSignalingInterface\@NetherNet\@\@\@std\@\@\@Z + * @symbol ?SetWebRTCSignalingInterface\@NetherNetTransportStub\@\@UEAAXAEBV?$shared_ptr\@VIWebRTCSignalingInterface\@NetherNet\@\@\@std\@\@\@Z */ MCVAPI void SetWebRTCSignalingInterface(class std::shared_ptr const &); /** - * @symbol ?SignIntoSignalingService\@NetherNetTransportStub\@\@UEAAXAEBV?$function\@$$A6AXVerror_code\@std\@\@\@Z\@std\@\@AEBV?$function\@$$A6AXW4SignalingHostConnectionStatus\@NetherNet\@\@I\@Z\@3\@AEBUSignalingConfiguration\@IWebRTCSignalingInterface\@NetherNet\@\@\@Z + * @symbol ?SignIntoSignalingService\@NetherNetTransportStub\@\@UEAAXAEBV?$function\@$$A6AXVerror_code\@std\@\@\@Z\@std\@\@AEBV?$function\@$$A6AXW4SignalingHostConnectionStatus\@NetherNet\@\@I\@Z\@3\@AEBUSignalingConfiguration\@IWebRTCSignalingInterface\@NetherNet\@\@\@Z */ MCVAPI void SignIntoSignalingService(class std::function const &, class std::function const &, struct NetherNet::IWebRTCSignalingInterface::SignalingConfiguration const &); /** - * @symbol ?SignOutFromSignalingService\@NetherNetTransportStub\@\@UEAAXXZ + * @symbol ?SignOutFromSignalingService\@NetherNetTransportStub\@\@UEAAXXZ */ MCVAPI void SignOutFromSignalingService(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp index a467b26944..9ecc3775a9 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlock.hpp @@ -31,203 +31,208 @@ class NetherReactorBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherReactorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@NetherReactorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@NetherReactorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@NetherReactorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0NetherReactorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0NetherReactorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI NetherReactorBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp index 2d109ea2a9..e11ca69884 100644 --- a/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/NetherReactorBlockActor.hpp @@ -31,63 +31,63 @@ class NetherReactorBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherReactorBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@NetherReactorBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@NetherReactorBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@NetherReactorBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@NetherReactorBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0NetherReactorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0NetherReactorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI NetherReactorBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherSprouts.hpp b/LiteLoader/include/llapi/mc/NetherSprouts.hpp index cdc00a5b5a..c55602fc94 100644 --- a/LiteLoader/include/llapi/mc/NetherSprouts.hpp +++ b/LiteLoader/include/llapi/mc/NetherSprouts.hpp @@ -31,254 +31,259 @@ class NetherSprouts : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherSprouts(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@NetherSprouts\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@NetherSprouts\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@NetherSprouts\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@NetherSprouts\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@NetherSprouts\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@NetherSprouts\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@NetherSprouts\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@NetherSprouts\@\@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 103 + * @symbol ?asItemInstance\@NetherSprouts\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@NetherSprouts\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@NetherSprouts\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@NetherSprouts\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@NetherSprouts\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@NetherSprouts\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@NetherSprouts\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@NetherSprouts\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERSPROUTS /** - * @symbol ?canBeSilkTouched\@NetherSprouts\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@NetherSprouts\@\@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 ??0NetherSprouts\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NetherSprouts(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp b/LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp index aaf0a40c1f..47fd716aab 100644 --- a/LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp +++ b/LiteLoader/include/llapi/mc/NetherStructureFeatureHelper.hpp @@ -22,7 +22,7 @@ namespace NetherStructureFeatureHelper { #undef AFTER_EXTRA /** - * @symbol ?getStructureFeatureTypeForChunk\@NetherStructureFeatureHelper\@\@YA?AW4StructureFeatureType\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@\@Z + * @symbol ?getStructureFeatureTypeForChunk\@NetherStructureFeatureHelper\@\@YA?AW4StructureFeatureType\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@\@Z */ MCAPI enum class StructureFeatureType getStructureFeatureTypeForChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, std::vector const &); diff --git a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp index 580837eb92..196d3ab6f3 100644 --- a/LiteLoader/include/llapi/mc/NetherWartBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherWartBlock.hpp @@ -31,238 +31,243 @@ class NetherWartBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherWartBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@NetherWartBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@NetherWartBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@NetherWartBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@NetherWartBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@NetherWartBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@NetherWartBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@NetherWartBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@NetherWartBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@NetherWartBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@NetherWartBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@NetherWartBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@NetherWartBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@NetherWartBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERWARTBLOCK /** - * @symbol ?canBeSilkTouched\@NetherWartBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@NetherWartBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0NetherWartBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NetherWartBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NetherWartBlock(std::string const &, int); @@ -270,8 +275,8 @@ class NetherWartBlock : public BlockLegacy { private: /** - * @symbol ?MAX_AGE\@NetherWartBlock\@\@0HB + * @symbol ?MAX_AGE\@NetherWartBlock\@\@0HB */ MCAPI static int const MAX_AGE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp index e4aecc3cb3..fbc63fcff2 100644 --- a/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp +++ b/LiteLoader/include/llapi/mc/NetheriteArmorEquippedListener.hpp @@ -30,144 +30,145 @@ class NetheriteArmorEquippedListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetheriteArmorEquippedListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z + * @vftbl 1 + * @symbol ?onEvent\@ScriptActorEventListener\@ScriptModuleMinecraft\@\@UEAA?AW4EventResult\@\@AEBUActorRemoveEffectEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorRemoveEffectEvent const &); /** - * @vftbl 2 - * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z + * @vftbl 2 + * @symbol ?onEvent\@?$EventListenerDispatcher\@VActorEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUActorNotificationEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ActorNotificationEvent const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol __unk_vfn_26 + * @vftbl 26 + * @symbol ?onEvent\@NetheriteArmorEquippedListener\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z */ - virtual void __unk_vfn_26(); + virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETHERITEARMOREQUIPPEDLISTENER /** - * @vftbl 27 - * @symbol ?onEvent\@NetheriteArmorEquippedListener\@\@UEAA?AW4EventResult\@\@AEBUActorEquippedArmorEvent\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual enum class EventResult onEvent(struct ActorEquippedArmorEvent const &); + MCVAPI ~NetheriteArmorEquippedListener(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp index 9db62d61f2..1726a9e6a9 100644 --- a/LiteLoader/include/llapi/mc/NetherrackBlock.hpp +++ b/LiteLoader/include/llapi/mc/NetherrackBlock.hpp @@ -31,232 +31,237 @@ class NetherrackBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetherrackBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@NetherrackBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@NetherrackBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol __unk_vfn_194 + * @vftbl 194 + * @symbol __unk_vfn_194 */ virtual void __unk_vfn_194(); /** - * @vftbl 195 - * @symbol __unk_vfn_195 + * @vftbl 195 + * @symbol __unk_vfn_195 */ virtual void __unk_vfn_195(); /** - * @vftbl 196 - * @symbol __unk_vfn_196 + * @vftbl 196 + * @symbol __unk_vfn_196 */ virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol __unk_vfn_197 + * @vftbl 197 + * @symbol __unk_vfn_197 */ virtual void __unk_vfn_197(); /** - * @symbol ?getDescriptionId\@BlockLegacy\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 198 + * @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; /** - * @symbol ??0NetherrackBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NetherrackBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NetherrackBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkAddress.hpp b/LiteLoader/include/llapi/mc/NetworkAddress.hpp index 77a451eaa8..cadf2ba47c 100644 --- a/LiteLoader/include/llapi/mc/NetworkAddress.hpp +++ b/LiteLoader/include/llapi/mc/NetworkAddress.hpp @@ -28,7 +28,7 @@ struct NetworkAddress { public: /** - * @symbol ??1NetworkAddress\@\@QEAA\@XZ + * @symbol ??1NetworkAddress\@\@QEAA\@XZ */ MCAPI ~NetworkAddress(); diff --git a/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp index 0040683f7c..88559d8169 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisher.hpp @@ -35,61 +35,67 @@ class NetworkChunkPublisher { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKCHUNKPUBLISHER /** - * @symbol ??0NetworkChunkPublisher\@\@QEAA\@AEAVLevel\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkChunkPublisher(); +#endif + /** + * @symbol ??0NetworkChunkPublisher\@\@QEAA\@AEAVLevel\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI NetworkChunkPublisher(class Level &, class NetworkIdentifier const &, enum class SubClientId); /** - * @symbol ?clearRegion\@NetworkChunkPublisher\@\@QEAAXXZ + * @symbol ?clearRegion\@NetworkChunkPublisher\@\@QEAAXXZ */ MCAPI void clearRegion(); /** - * @symbol ?destroyRegion\@NetworkChunkPublisher\@\@QEAAXXZ + * @symbol ?destroyRegion\@NetworkChunkPublisher\@\@QEAAXXZ */ MCAPI void destroyRegion(); /** - * @symbol ?getChunksSentSinceStart\@NetworkChunkPublisher\@\@QEBAHXZ + * @symbol ?getChunksSentSinceStart\@NetworkChunkPublisher\@\@QEBAHXZ */ MCAPI int getChunksSentSinceStart() const; /** - * @symbol ?is2DPositionRelevant\@NetworkChunkPublisher\@\@QEBA_NAEBVBlockPos\@\@\@Z + * @symbol ?is2DPositionRelevant\@NetworkChunkPublisher\@\@QEBA_NAEBVBlockPos\@\@\@Z */ MCAPI bool is2DPositionRelevant(class BlockPos const &) const; /** - * @symbol ?moveRegion\@NetworkChunkPublisher\@\@QEAAXAEBVBlockPos\@\@IAEBVVec3\@\@M\@Z + * @symbol ?moveRegion\@NetworkChunkPublisher\@\@QEAAXAEBVBlockPos\@\@IAEBVVec3\@\@M\@Z */ MCAPI void moveRegion(class BlockPos const &, unsigned int, class Vec3 const &, float); /** - * @symbol ?prepareRegion\@NetworkChunkPublisher\@\@QEAAXAEAVChunkSource\@\@AEBVChunkPos\@\@\@Z + * @symbol ?prepareRegion\@NetworkChunkPublisher\@\@QEAAXAEAVChunkSource\@\@AEBVChunkPos\@\@\@Z */ MCAPI void prepareRegion(class ChunkSource &, class ChunkPos const &); /** - * @symbol ?resetInitialSpawn\@NetworkChunkPublisher\@\@QEAAXXZ + * @symbol ?resetInitialSpawn\@NetworkChunkPublisher\@\@QEAAXXZ */ MCAPI void resetInitialSpawn(); /** - * @symbol ?sendQueuedChunks\@NetworkChunkPublisher\@\@QEAAXXZ + * @symbol ?sendQueuedChunks\@NetworkChunkPublisher\@\@QEAAXXZ */ MCAPI void sendQueuedChunks(); /** - * @symbol ?setServerSettings\@NetworkChunkPublisher\@\@QEAAXAEAVNetworkHandler\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@\@Z + * @symbol ?setServerSettings\@NetworkChunkPublisher\@\@QEAAXAEAVNetworkSystem\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@\@Z */ - MCAPI void setServerSettings(class NetworkHandler &, class ClientBlobCache::Server::ActiveTransfersManager &); + MCAPI void setServerSettings(class NetworkSystem &, class ClientBlobCache::Server::ActiveTransfersManager &); //private: /** - * @symbol ?_isWaitingForFullyBuiltChunks\@NetworkChunkPublisher\@\@AEBA_NXZ + * @symbol ?_isWaitingForFullyBuiltChunks\@NetworkChunkPublisher\@\@AEBA_NXZ */ MCAPI bool _isWaitingForFullyBuiltChunks() const; /** - * @symbol ?_sendQueuedChunk\@NetworkChunkPublisher\@\@AEAA_NAEBUChunkPositionAndDimension\@\@PEAVTransferBuilder\@Server\@ClientBlobCache\@\@\@Z + * @symbol ?_sendQueuedChunk\@NetworkChunkPublisher\@\@AEAA_NAEBUChunkPositionAndDimension\@\@PEAVTransferBuilder\@Server\@ClientBlobCache\@\@\@Z */ MCAPI bool _sendQueuedChunk(struct ChunkPositionAndDimension const &, class ClientBlobCache::Server::TransferBuilder *); /** - * @symbol ?_serializeAndCache\@NetworkChunkPublisher\@\@AEAAXAEAVLevelChunkPacket\@\@AEAVTransferBuilder\@Server\@ClientBlobCache\@\@$$QEAV?$function\@$$A6AXAEAVVarIntDataOutput\@\@\@Z\@std\@\@\@Z + * @symbol ?_serializeAndCache\@NetworkChunkPublisher\@\@AEAAXAEAVLevelChunkPacket\@\@AEAVTransferBuilder\@Server\@ClientBlobCache\@\@$$QEAV?$function\@$$A6AXAEAVVarIntDataOutput\@\@\@Z\@std\@\@\@Z */ MCAPI void _serializeAndCache(class LevelChunkPacket &, class ClientBlobCache::Server::TransferBuilder &, class std::function &&); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp index 71b4a1886f..0fa9ac9c58 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkPublisherUpdatePacket.hpp @@ -30,37 +30,43 @@ class NetworkChunkPublisherUpdatePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkChunkPublisherUpdatePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@NetworkChunkPublisherUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@NetworkChunkPublisherUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@NetworkChunkPublisherUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@NetworkChunkPublisherUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@NetworkChunkPublisherUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@NetworkChunkPublisherUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@NetworkChunkPublisherUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKCHUNKPUBLISHERUPDATEPACKET /** - * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkChunkPublisherUpdatePacket(); +#endif + /** + * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@XZ */ MCAPI NetworkChunkPublisherUpdatePacket(); /** - * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@AEBVBlockPos\@\@I\@Z + * @symbol ??0NetworkChunkPublisherUpdatePacket\@\@QEAA\@AEBVBlockPos\@\@I\@Z */ MCAPI NetworkChunkPublisherUpdatePacket(class BlockPos const &, unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp b/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp index 2641d33024..d0d6528f53 100644 --- a/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/NetworkChunkSource.hpp @@ -31,48 +31,48 @@ class NetworkChunkSource : public ChunkSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkChunkSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getExistingChunk\@NetworkChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @vftbl 3 + * @symbol ?getExistingChunk\@NetworkChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ virtual class std::shared_ptr getExistingChunk(class ChunkPos const &); /** - * @vftbl 7 - * @symbol ?createNewChunk\@NetworkChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z + * @vftbl 7 + * @symbol ?createNewChunk\@NetworkChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z */ virtual class std::shared_ptr createNewChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 8 - * @symbol ?getOrLoadChunk\@NetworkChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z + * @vftbl 8 + * @symbol ?getOrLoadChunk\@NetworkChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z */ virtual class std::shared_ptr getOrLoadChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 18 - * @symbol ?acquireDiscarded\@NetworkChunkSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z + * @vftbl 18 + * @symbol ?acquireDiscarded\@NetworkChunkSource\@\@UEAAXV?$unique_ptr\@VLevelChunk\@\@ULevelChunkFinalDeleter\@\@\@std\@\@\@Z */ virtual void acquireDiscarded(class std::unique_ptr); /** - * @vftbl 23 - * @symbol ?getChunkMap\@NetworkChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @vftbl 23 + * @symbol ?getChunkMap\@NetworkChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const * getChunkMap(); /** - * @vftbl 24 - * @symbol ?getStorage\@NetworkChunkSource\@\@UEBAAEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @vftbl 24 + * @symbol ?getStorage\@NetworkChunkSource\@\@UEBAAEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getStorage() const; /** - * @vftbl 26 - * @symbol ?canCreateViews\@NetworkChunkSource\@\@UEBA_NXZ + * @vftbl 26 + * @symbol ?canCreateViews\@NetworkChunkSource\@\@UEBA_NXZ */ virtual bool canCreateViews() const; /** - * @symbol ??0NetworkChunkSource\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0NetworkChunkSource\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI NetworkChunkSource(class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkConnection.hpp b/LiteLoader/include/llapi/mc/NetworkConnection.hpp index 2f0044aab5..d76b5b96d2 100644 --- a/LiteLoader/include/llapi/mc/NetworkConnection.hpp +++ b/LiteLoader/include/llapi/mc/NetworkConnection.hpp @@ -30,24 +30,24 @@ class NetworkConnection { public: /** - * @symbol ??0NetworkConnection\@\@QEAA\@AEBVNetworkIdentifier\@\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@3\@_NV?$NonOwnerPointer\@VIPacketObserver\@\@\@Bedrock\@\@AEAVScheduler\@\@\@Z + * @symbol ??0NetworkConnection\@\@QEAA\@AEBVNetworkIdentifier\@\@V?$shared_ptr\@VNetworkPeer\@\@\@std\@\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@3\@_NV?$NonOwnerPointer\@VIPacketObserver\@\@\@Bedrock\@\@AEAVScheduler\@\@\@Z */ MCAPI NetworkConnection(class NetworkIdentifier const &, class std::shared_ptr, class std::chrono::time_point>>, bool, class Bedrock::NonOwnerPointer, class Scheduler &); /** - * @symbol ?disconnect\@NetworkConnection\@\@QEAAXXZ + * @symbol ?disconnect\@NetworkConnection\@\@QEAAXXZ */ MCAPI void disconnect(); /** - * @symbol ?receivePacket\@NetworkConnection\@\@QEAA?AW4DataStatus\@NetworkPeer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVNetworkHandler\@\@AEBV?$shared_ptr\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@5\@\@Z + * @symbol ?receivePacket\@NetworkConnection\@\@QEAA?AW4DataStatus\@NetworkPeer\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVNetworkSystem\@\@AEBV?$shared_ptr\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@5\@\@Z */ - MCAPI enum class NetworkPeer::DataStatus receivePacket(std::string &, class NetworkHandler &, class std::shared_ptr>>> const &); + MCAPI enum class NetworkPeer::DataStatus receivePacket(std::string &, class NetworkSystem &, class std::shared_ptr>>> const &); /** - * @symbol ?update\@NetworkConnection\@\@QEAAXXZ + * @symbol ?update\@NetworkConnection\@\@QEAAXXZ */ MCAPI void update(); /** - * @symbol ??1NetworkConnection\@\@QEAA\@XZ + * @symbol ??1NetworkConnection\@\@QEAA\@XZ */ MCAPI ~NetworkConnection(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkDebugManager.hpp b/LiteLoader/include/llapi/mc/NetworkDebugManager.hpp index 84bf7ffee7..67499cfcb5 100644 --- a/LiteLoader/include/llapi/mc/NetworkDebugManager.hpp +++ b/LiteLoader/include/llapi/mc/NetworkDebugManager.hpp @@ -30,12 +30,12 @@ class NetworkDebugManager { public: /** - * @symbol ?MAX_NUMBER_OF_SAMPLES\@NetworkDebugManager\@\@2HB + * @symbol ?MAX_NUMBER_OF_SAMPLES\@NetworkDebugManager\@\@2HB */ MCAPI static int const MAX_NUMBER_OF_SAMPLES; /** - * @symbol ?UPDATE_INTERVAL_MILLISECONDS\@NetworkDebugManager\@\@2HB + * @symbol ?UPDATE_INTERVAL_MILLISECONDS\@NetworkDebugManager\@\@2HB */ MCAPI static int const UPDATE_INTERVAL_MILLISECONDS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkEnableDisableListener.hpp b/LiteLoader/include/llapi/mc/NetworkEnableDisableListener.hpp index 5f912d880b..f5f6e214ab 100644 --- a/LiteLoader/include/llapi/mc/NetworkEnableDisableListener.hpp +++ b/LiteLoader/include/llapi/mc/NetworkEnableDisableListener.hpp @@ -30,37 +30,43 @@ class NetworkEnableDisableListener { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKENABLEDISABLELISTENER /** - * @symbol ??0NetworkEnableDisableListener\@\@QEAA\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkEnableDisableListener(); +#endif + /** + * @symbol ??0NetworkEnableDisableListener\@\@QEAA\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ MCAPI NetworkEnableDisableListener(class Bedrock::NonOwnerPointer const &); /** - * @symbol ?disable\@NetworkEnableDisableListener\@\@QEAAXXZ + * @symbol ?disable\@NetworkEnableDisableListener\@\@QEAAXXZ */ MCAPI void disable(); /** - * @symbol ?isDisabled\@NetworkEnableDisableListener\@\@QEBA_NXZ + * @symbol ?isDisabled\@NetworkEnableDisableListener\@\@QEBA_NXZ */ MCAPI bool isDisabled() const; /** - * @symbol ?isEnabled\@NetworkEnableDisableListener\@\@QEBA_NXZ + * @symbol ?isEnabled\@NetworkEnableDisableListener\@\@QEBA_NXZ */ MCAPI bool isEnabled() const; /** - * @symbol ?isNetworkAllowed\@NetworkEnableDisableListener\@\@QEBA_NXZ + * @symbol ?isNetworkAllowed\@NetworkEnableDisableListener\@\@QEBA_NXZ */ MCAPI bool isNetworkAllowed() const; /** - * @symbol ?isUninitialized\@NetworkEnableDisableListener\@\@QEBA_NXZ + * @symbol ?isUninitialized\@NetworkEnableDisableListener\@\@QEBA_NXZ */ MCAPI bool isUninitialized() const; /** - * @symbol ?tryEnable\@NetworkEnableDisableListener\@\@QEAAXXZ + * @symbol ?tryEnable\@NetworkEnableDisableListener\@\@QEAAXXZ */ MCAPI void tryEnable(); /** - * @symbol ?uninitialize\@NetworkEnableDisableListener\@\@QEAAXXZ + * @symbol ?uninitialize\@NetworkEnableDisableListener\@\@QEAAXXZ */ MCAPI void uninitialize(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkHandler.hpp b/LiteLoader/include/llapi/mc/NetworkHandler.hpp deleted file mode 100644 index cbb3c5c65b..0000000000 --- a/LiteLoader/include/llapi/mc/NetworkHandler.hpp +++ /dev/null @@ -1,235 +0,0 @@ -/** - * @file NetworkHandler.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" -#include "Bedrock.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class NetworkHandler. - * - */ -class NetworkHandler { - -#define AFTER_EXTRA -// Add Member There -public: -class Connection { -public: - Connection() = delete; - Connection(Connection const&) = delete; - Connection(Connection const&&) = delete; -}; - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKHANDLER -public: - class NetworkHandler& operator=(class NetworkHandler const &) = delete; - NetworkHandler(class NetworkHandler const &) = delete; - NetworkHandler() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKHANDLER - /** - * @symbol ?_onDisable\@NetworkHandler\@\@EEAAXXZ - */ - MCVAPI void _onDisable(); - /** - * @symbol ?_onEnable\@NetworkHandler\@\@EEAAXXZ - */ - MCVAPI void _onEnable(); - /** - * @symbol ?getConnectionInfo\@NetworkHandler\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ - */ - MCVAPI class Social::GameConnectionInfo const & getConnectionInfo() const; - /** - * @symbol ?getDefaultGamePort\@NetworkHandler\@\@UEBAGXZ - */ - MCVAPI unsigned short getDefaultGamePort() const; - /** - * @symbol ?getDefaultGamePortv6\@NetworkHandler\@\@UEBAGXZ - */ - MCVAPI unsigned short getDefaultGamePortv6() const; - /** - * @symbol ?onAllConnectionsClosed\@NetworkHandler\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCVAPI void onAllConnectionsClosed(std::string const &, bool); - /** - * @symbol ?onAllRemoteConnectionsClosed\@NetworkHandler\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCVAPI void onAllRemoteConnectionsClosed(std::string const &, bool); - /** - * @symbol ?onConnectionClosed\@NetworkHandler\@\@EEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z - */ - MCVAPI void onConnectionClosed(class NetworkIdentifier const &, std::string const &, bool); - /** - * @symbol ?onNewIncomingConnection\@NetworkHandler\@\@EEAAXAEBVNetworkIdentifier\@\@$$QEAV?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z - */ - MCVAPI void onNewIncomingConnection(class NetworkIdentifier const &, class std::shared_ptr &&); - /** - * @symbol ?onNewOutgoingConnection\@NetworkHandler\@\@EEAAXAEBVNetworkIdentifier\@\@$$QEAV?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z - */ - MCVAPI void onNewOutgoingConnection(class NetworkIdentifier const &, class std::shared_ptr &&); - /** - * @symbol ?onOutgoingConnectionFailed\@NetworkHandler\@\@EEAAXXZ - */ - MCVAPI void onOutgoingConnectionFailed(); - /** - * @symbol ?onWebsocketRequest\@NetworkHandler\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z - */ - MCVAPI void onWebsocketRequest(std::string const &, std::string const &, class std::function); - /** - * @symbol ?useIPv4Only\@NetworkHandler\@\@UEBA_NXZ - */ - MCVAPI bool useIPv4Only() const; - /** - * @symbol ?useIPv6Only\@NetworkHandler\@\@UEBA_NXZ - */ - MCVAPI bool useIPv6Only() const; - /** - * @symbol __unk_destructor_-1 - */ - MCVAPI ~NetworkHandler(); -#endif - /** - * @symbol ??0NetworkHandler\@\@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\@\@AEBUNetworkHandlerToggles\@\@AEBV?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@V?$ServiceReference\@VServicesManager\@\@\@\@AEBVNetherNetTransportFactory\@\@\@Z - */ - MCAPI NetworkHandler(class Scheduler &, std::vector const &, struct NetworkHandlerToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference, class NetherNetTransportFactory const &); - /** - * @symbol ??0NetworkHandler\@\@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\@\@AEBUNetworkHandlerToggles\@\@AEBV?$NonOwnerPointer\@VNetworkDebugManager\@\@\@Bedrock\@\@V?$ServiceReference\@VServicesManager\@\@\@\@\@Z - */ - MCAPI NetworkHandler(class Scheduler &, std::vector const &, struct NetworkHandlerToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference); - /** - * @symbol ?disconnect\@NetworkHandler\@\@QEAAXXZ - */ - MCAPI void disconnect(); - /** - * @symbol ?enableAsyncFlush\@NetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z - */ - MCAPI void enableAsyncFlush(class NetworkIdentifier const &); - /** - * @symbol ?flush\@NetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z - */ - MCAPI void flush(class NetworkIdentifier const &, class std::function &&); - /** - * @symbol ?getCompressedPeerForUser\@NetworkHandler\@\@QEAA?AV?$weak_ptr\@VCompressedNetworkPeer\@\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z - */ - MCAPI class std::weak_ptr getCompressedPeerForUser(class NetworkIdentifier const &); - /** - * @symbol ?getConnections\@NetworkHandler\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VNetworkConnection\@\@U?$default_delete\@VNetworkConnection\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNetworkConnection\@\@U?$default_delete\@VNetworkConnection\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ - */ - MCAPI std::vector> const & getConnections() const; - /** - * @symbol ?getConnector\@NetworkHandler\@\@QEAAAEAVConnector\@\@XZ - */ - MCAPI class Connector & getConnector(); - /** - * @symbol ?getEncryptedPeerForUser\@NetworkHandler\@\@QEAA?AV?$weak_ptr\@VEncryptedNetworkPeer\@\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z - */ - MCAPI class std::weak_ptr getEncryptedPeerForUser(class NetworkIdentifier const &); - /** - * @symbol ?getLocalNetworkId\@NetworkHandler\@\@QEBA?AVNetworkIdentifier\@\@XZ - */ - MCAPI class NetworkIdentifier getLocalNetworkId() const; - /** - * @symbol ?getNetworkStatistics\@NetworkHandler\@\@QEBAPEBVNetworkStatistics\@\@XZ - */ - MCAPI class NetworkStatistics const * getNetworkStatistics() const; - /** - * @symbol ?getPeerForUser\@NetworkHandler\@\@QEAAPEAVNetworkPeer\@\@AEBVNetworkIdentifier\@\@\@Z - */ - MCAPI class NetworkPeer * getPeerForUser(class NetworkIdentifier const &); - /** - * @symbol ?getPrimaryNetworkId\@NetworkHandler\@\@QEBA?AVNetworkIdentifier\@\@XZ - */ - MCAPI class NetworkIdentifier getPrimaryNetworkId() const; - /** - * @symbol ?getResourcePackUploadManager\@NetworkHandler\@\@QEAAAEAVResourcePackFileUploadManager\@\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI class ResourcePackFileUploadManager & getResourcePackUploadManager(class PacketSender &, class NetworkIdentifier const &, std::string const &); - /** - * @symbol ?getServerId\@NetworkHandler\@\@QEBA?AVNetworkIdentifier\@\@XZ - */ - MCAPI class NetworkIdentifier getServerId() const; - /** - * @symbol ?getServerLocatorComposite\@NetworkHandler\@\@QEAAAEAVServerLocatorComposite\@\@XZ - */ - MCAPI class ServerLocatorComposite & getServerLocatorComposite(); - /** - * @symbol ?host\@NetworkHandler\@\@QEAA_NAEBUConnectionDefinition\@\@\@Z - */ - MCAPI bool host(struct ConnectionDefinition const &); - /** - * @symbol ?isHostingPlayer\@NetworkHandler\@\@QEBA_NAEBVNetworkIdentifier\@\@AEBW4SubClientId\@\@\@Z - */ - MCAPI bool isHostingPlayer(class NetworkIdentifier const &, enum class SubClientId const &) const; - /** - * @symbol ?isServer\@NetworkHandler\@\@QEBA_NXZ - */ - MCAPI bool isServer() const; - /** - * @symbol ?registerServerInstance\@NetworkHandler\@\@QEAAXAEAVNetEventCallback\@\@\@Z - */ - MCAPI void registerServerInstance(class NetEventCallback &); - /** - * @symbol ?runEvents\@NetworkHandler\@\@QEAAX_N\@Z - */ - MCAPI void runEvents(bool); - /** - * @symbol ?send\@NetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@W4SubClientId\@\@\@Z - */ - MCAPI void send(class NetworkIdentifier const &, class Packet const &, enum class SubClientId); - /** - * @symbol ?sendToMultiple\@NetworkHandler\@\@QEAAXAEBV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@AEBVPacket\@\@\@Z - */ - MCAPI void sendToMultiple(std::vector const &, class Packet const &); - /** - * @symbol ?setCloseConnection\@NetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z - */ - MCAPI void setCloseConnection(class NetworkIdentifier const &); - /** - * @symbol ?unregisterClientOrServerInstance\@NetworkHandler\@\@QEAAXAEBW4SubClientId\@\@\@Z - */ - MCAPI void unregisterClientOrServerInstance(enum class SubClientId const &); - /** - * @symbol ?update\@NetworkHandler\@\@QEAAXPEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@\@Z - */ - MCAPI void update(std::vector const *); - -//private: - /** - * @symbol ?_getConnectionFromId\@NetworkHandler\@\@AEBAPEAVNetworkConnection\@\@AEBVNetworkIdentifier\@\@\@Z - */ - MCAPI class NetworkConnection * _getConnectionFromId(class NetworkIdentifier const &) const; - /** - * @symbol ?_handlePacketViolation\@NetworkHandler\@\@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\@NetworkHandler\@\@AEAAXXZ - */ - MCAPI void _initializeRakNetConnector(); - /** - * @symbol ?_sendInternal\@NetworkHandler\@\@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\@NetworkHandler\@\@AEAAXXZ - */ - MCAPI void _setActiveTransportLayer(); - /** - * @symbol ?_sortAndPacketizeEvents\@NetworkHandler\@\@AEAA_NAEAVNetworkConnection\@\@V?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z - */ - MCAPI bool _sortAndPacketizeEvents(class NetworkConnection &, class std::chrono::time_point>>); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp b/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp index 37951ccca7..6e95a8bee0 100644 --- a/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/NetworkIdentifier.hpp @@ -34,48 +34,48 @@ class NetworkIdentifier { public: /** - * @symbol ??0NetworkIdentifier\@\@QEAA\@_K\@Z + * @symbol ??0NetworkIdentifier\@\@QEAA\@AEBURakNetGUID\@RakNet\@\@\@Z */ - MCAPI NetworkIdentifier(unsigned __int64); + MCAPI NetworkIdentifier(struct RakNet::RakNetGUID const &); /** - * @symbol ??0NetworkIdentifier\@\@QEAA\@AEBUsockaddr_in\@\@\@Z + * @symbol ??0NetworkIdentifier\@\@QEAA\@_K\@Z */ - MCAPI NetworkIdentifier(struct sockaddr_in const &); + MCAPI NetworkIdentifier(unsigned __int64); /** - * @symbol ??0NetworkIdentifier\@\@QEAA\@AEBUsockaddr_in6\@\@\@Z + * @symbol ??0NetworkIdentifier\@\@QEAA\@AEBUsockaddr_in6\@\@\@Z */ MCAPI NetworkIdentifier(struct sockaddr_in6 const &); /** - * @symbol ??0NetworkIdentifier\@\@QEAA\@AEBURakNetGUID\@RakNet\@\@\@Z + * @symbol ??0NetworkIdentifier\@\@QEAA\@AEBUsockaddr_in\@\@\@Z */ - MCAPI NetworkIdentifier(struct RakNet::RakNetGUID const &); + MCAPI NetworkIdentifier(struct sockaddr_in const &); /** - * @symbol ?getAddress\@NetworkIdentifier\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getAddress\@NetworkIdentifier\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getAddress() const; /** - * @symbol ?getHash\@NetworkIdentifier\@\@QEBA_KXZ + * @symbol ?getHash\@NetworkIdentifier\@\@QEBA_KXZ */ MCAPI unsigned __int64 getHash() const; /** - * @symbol ?isUnassigned\@NetworkIdentifier\@\@QEBA_NXZ + * @symbol ?isUnassigned\@NetworkIdentifier\@\@QEBA_NXZ */ MCAPI bool isUnassigned() const; /** - * @symbol ?toString\@NetworkIdentifier\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@NetworkIdentifier\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; /** - * @symbol ?INVALID_ID\@NetworkIdentifier\@\@2V1\@A + * @symbol ?INVALID_ID\@NetworkIdentifier\@\@2V1\@A */ MCAPI static class NetworkIdentifier INVALID_ID; //private: /** - * @symbol ?equalsTypeData\@NetworkIdentifier\@\@AEBA_NAEBV1\@\@Z + * @symbol ?equalsTypeData\@NetworkIdentifier\@\@AEBA_NAEBV1\@\@Z */ MCAPI bool equalsTypeData(class NetworkIdentifier const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp index 07a0df4286..17aef8d479 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemInstanceDescriptor.hpp @@ -32,33 +32,39 @@ class NetworkItemInstanceDescriptor : public ItemDescriptorCount { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkItemInstanceDescriptor(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKITEMINSTANCEDESCRIPTOR /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &); + MCVAPI ~NetworkItemInstanceDescriptor(); +#endif /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemInstance\@\@\@Z */ MCAPI NetworkItemInstanceDescriptor(class ItemInstance const &); /** - * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NetworkItemInstanceDescriptor(class NetworkItemInstanceDescriptor &&); /** - * @symbol ?getItemInstance\@NetworkItemInstanceDescriptor\@\@QEBA?AVItemInstance\@\@AEBVBlockPalette\@\@\@Z + * @symbol ??0NetworkItemInstanceDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + */ + MCAPI NetworkItemInstanceDescriptor(class ItemStackDescriptor const &); + /** + * @symbol ?getItemInstance\@NetworkItemInstanceDescriptor\@\@QEBA?AVItemInstance\@\@AEBVBlockPalette\@\@\@Z */ MCAPI class ItemInstance getItemInstance(class BlockPalette const &) const; /** - * @symbol ?read\@NetworkItemInstanceDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@NetworkItemInstanceDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI void read(class ReadOnlyBinaryStream &); /** - * @symbol ?write\@NetworkItemInstanceDescriptor\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@NetworkItemInstanceDescriptor\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void write(class BinaryStream &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp index 3104606c6b..2a516712a8 100644 --- a/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/NetworkItemStackDescriptor.hpp @@ -34,53 +34,59 @@ class NetworkItemStackDescriptor : public ItemDescriptorCount { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkItemStackDescriptor(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKITEMSTACKDESCRIPTOR /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); + MCVAPI ~NetworkItemStackDescriptor(); +#endif /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStack\@\@\@Z + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStack\@\@\@Z */ MCAPI NetworkItemStackDescriptor(class ItemStack const &); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@$$QEAV0\@\@Z - */ - MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor &&); - /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@XZ */ MCAPI NetworkItemStackDescriptor(); /** - * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBV0\@\@Z */ MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor const &); /** - * @symbol ?read\@NetworkItemStackDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI NetworkItemStackDescriptor(class NetworkItemStackDescriptor &&); + /** + * @symbol ??0NetworkItemStackDescriptor\@\@QEAA\@AEBVItemStackDescriptor\@\@\@Z + */ + MCAPI NetworkItemStackDescriptor(class ItemStackDescriptor const &); + /** + * @symbol ?read\@NetworkItemStackDescriptor\@\@QEAAXAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI void read(class ReadOnlyBinaryStream &); /** - * @symbol ?setIncludeNetIds\@NetworkItemStackDescriptor\@\@QEBAX_N\@Z + * @symbol ?setIncludeNetIds\@NetworkItemStackDescriptor\@\@QEBAX_N\@Z */ MCAPI void setIncludeNetIds(bool) const; /** - * @symbol ?tryGetServerNetId\@NetworkItemStackDescriptor\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ + * @symbol ?tryGetServerNetId\@NetworkItemStackDescriptor\@\@QEBAPEBV?$TypedServerNetId\@UItemStackNetIdTag\@\@H$0A\@\@\@XZ */ MCAPI class TypedServerNetId const * tryGetServerNetId() const; /** - * @symbol ?write\@NetworkItemStackDescriptor\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@NetworkItemStackDescriptor\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void write(class BinaryStream &) const; //private: /** - * @symbol ?getItemStack\@NetworkItemStackDescriptor\@\@AEBA?AVItemStack\@\@AEBVBlockPalette\@\@\@Z + * @symbol ?getItemStack\@NetworkItemStackDescriptor\@\@AEBA?AVItemStack\@\@AEBVBlockPalette\@\@\@Z */ MCAPI class ItemStack getItemStack(class BlockPalette const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkPacketEventCoordinator.hpp b/LiteLoader/include/llapi/mc/NetworkPacketEventCoordinator.hpp index a44fa57ed3..4b770716f7 100644 --- a/LiteLoader/include/llapi/mc/NetworkPacketEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/NetworkPacketEventCoordinator.hpp @@ -30,8 +30,8 @@ class NetworkPacketEventCoordinator { public: /** - * @symbol ?sendPacketReceivedFrom\@NetworkPacketEventCoordinator\@\@QEAAXAEBVPacketHeader\@\@AEBVPacket\@\@\@Z + * @symbol ?sendPacketReceivedFrom\@NetworkPacketEventCoordinator\@\@QEAAXAEBVPacketHeader\@\@AEBVPacket\@\@\@Z */ MCAPI void sendPacketReceivedFrom(class PacketHeader const &, class Packet const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkPeer.hpp b/LiteLoader/include/llapi/mc/NetworkPeer.hpp index 17235f2d02..c988f2414f 100644 --- a/LiteLoader/include/llapi/mc/NetworkPeer.hpp +++ b/LiteLoader/include/llapi/mc/NetworkPeer.hpp @@ -65,44 +65,50 @@ struct NetworkStatus { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkPeer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?sendPacket\@RakNetNetworkPeer\@RakNetConnector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z + * @vftbl 1 + * @symbol ?sendPacket\@CompressedNetworkPeer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Reliability\@NetworkPeer\@\@W4Compressibility\@\@\@Z */ virtual void sendPacket(std::string const &, enum class NetworkPeer::Reliability, enum class Compressibility) = 0; /** - * @vftbl 2 - * @symbol ?receivePacket\@RakNetNetworkPeer\@RakNetConnector\@\@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\@\@\@6\@\@Z + * @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 */ virtual enum class NetworkPeer::DataStatus receivePacket(std::string &, class std::shared_ptr>>> const &) = 0; /** - * @vftbl 3 - * @symbol ?getNetworkStatus\@RakNetNetworkPeer\@RakNetConnector\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ + * @vftbl 3 + * @symbol ?getNetworkStatus\@CompressedNetworkPeer\@\@UEBA?AUNetworkStatus\@NetworkPeer\@\@XZ */ virtual struct NetworkPeer::NetworkStatus getNetworkStatus() const = 0; /** - * @vftbl 4 - * @symbol ?update\@NetworkPeer\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?update\@NetworkPeer\@\@UEAAXXZ */ virtual void update(); /** - * @vftbl 5 - * @symbol ?flush\@NetworkPeer\@\@UEAAX$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z + * @vftbl 5 + * @symbol ?flush\@NetworkPeer\@\@UEAAX$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z */ virtual void flush(class std::function &&); /** - * @vftbl 6 - * @symbol ?isLocal\@NetworkPeer\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isLocal\@NetworkPeer\@\@UEBA_NXZ */ virtual bool isLocal() const; /** - * @vftbl 7 - * @symbol ?isEncrypted\@NetworkPeer\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?isEncrypted\@NetworkPeer\@\@UEBA_NXZ */ virtual bool isEncrypted() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKPEER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkPeer(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp index b831ab2aa6..9ae1194722 100644 --- a/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkSettingsPacket.hpp @@ -31,29 +31,35 @@ class NetworkSettingsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkSettingsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@NetworkSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@NetworkSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@NetworkSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@NetworkSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@NetworkSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@NetworkSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@NetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKSETTINGSPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkSettingsPacket(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp index 59b79f7e45..72aa820a80 100644 --- a/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStackLatencyPacket.hpp @@ -31,29 +31,29 @@ class NetworkStackLatencyPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NetworkStackLatencyPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@NetworkStackLatencyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@NetworkStackLatencyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@NetworkStackLatencyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@NetworkStackLatencyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@NetworkStackLatencyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@NetworkStackLatencyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@NetworkStackLatencyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkStatistics.hpp b/LiteLoader/include/llapi/mc/NetworkStatistics.hpp index 45e0b525b7..fc2f19e1fc 100644 --- a/LiteLoader/include/llapi/mc/NetworkStatistics.hpp +++ b/LiteLoader/include/llapi/mc/NetworkStatistics.hpp @@ -30,8 +30,8 @@ class NetworkStatistics { public: /** - * @symbol ?getVerboseInfo\@NetworkStatistics\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getVerboseInfo\@NetworkStatistics\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getVerboseInfo() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NetworkSystem.hpp b/LiteLoader/include/llapi/mc/NetworkSystem.hpp new file mode 100644 index 0000000000..e336211f92 --- /dev/null +++ b/LiteLoader/include/llapi/mc/NetworkSystem.hpp @@ -0,0 +1,227 @@ +/** + * @file NetworkSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class NetworkSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_NETWORKSYSTEM +public: + class NetworkSystem& operator=(class NetworkSystem const &) = delete; + NetworkSystem(class NetworkSystem const &) = delete; + NetworkSystem() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NETWORKSYSTEM + /** + * @symbol ?_onDisable\@NetworkSystem\@\@EEAAXXZ + */ + MCVAPI void _onDisable(); + /** + * @symbol ?_onEnable\@NetworkSystem\@\@EEAAXXZ + */ + MCVAPI void _onEnable(); + /** + * @symbol ?getConnectionInfo\@NetworkSystem\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ + */ + MCVAPI class Social::GameConnectionInfo const & getConnectionInfo() const; + /** + * @symbol ?getDefaultGamePort\@NetworkSystem\@\@UEBAGXZ + */ + MCVAPI unsigned short getDefaultGamePort() const; + /** + * @symbol ?getDefaultGamePortv6\@NetworkSystem\@\@UEBAGXZ + */ + MCVAPI unsigned short getDefaultGamePortv6() const; + /** + * @symbol ?onAllConnectionsClosed\@NetworkSystem\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCVAPI void onAllConnectionsClosed(std::string const &, bool); + /** + * @symbol ?onAllRemoteConnectionsClosed\@NetworkSystem\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCVAPI void onAllRemoteConnectionsClosed(std::string const &, bool); + /** + * @symbol ?onConnectionClosed\@NetworkSystem\@\@EEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCVAPI void onConnectionClosed(class NetworkIdentifier const &, std::string const &, bool); + /** + * @symbol ?onNewIncomingConnection\@NetworkSystem\@\@EEAAXAEBVNetworkIdentifier\@\@$$QEAV?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z + */ + MCVAPI void onNewIncomingConnection(class NetworkIdentifier const &, class std::shared_ptr &&); + /** + * @symbol ?onNewOutgoingConnection\@NetworkSystem\@\@EEAAXAEBVNetworkIdentifier\@\@$$QEAV?$shared_ptr\@VNetworkPeer\@\@\@std\@\@\@Z + */ + MCVAPI void onNewOutgoingConnection(class NetworkIdentifier const &, class std::shared_ptr &&); + /** + * @symbol ?onOutgoingConnectionFailed\@NetworkSystem\@\@EEAAXXZ + */ + MCVAPI void onOutgoingConnectionFailed(); + /** + * @symbol ?onWebsocketRequest\@NetworkSystem\@\@EEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z + */ + MCVAPI void onWebsocketRequest(std::string const &, std::string const &, class std::function); + /** + * @symbol ?useIPv4Only\@NetworkSystem\@\@UEBA_NXZ + */ + MCVAPI bool useIPv4Only() const; + /** + * @symbol ?useIPv6Only\@NetworkSystem\@\@UEBA_NXZ + */ + MCVAPI bool useIPv6Only() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NetworkSystem(); +#endif + /** + * @symbol ?disconnect\@NetworkSystem\@\@QEAAXXZ + */ + MCAPI void disconnect(); + /** + * @symbol ?enableAsyncFlush\@NetworkSystem\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z + */ + MCAPI void enableAsyncFlush(class NetworkIdentifier const &); + /** + * @symbol ?flush\@NetworkSystem\@\@QEAAXAEBVNetworkIdentifier\@\@$$QEAV?$function\@$$A6AXXZ\@std\@\@\@Z + */ + MCAPI void flush(class NetworkIdentifier const &, class std::function &&); + /** + * @symbol ?getCompressedPeerForUser\@NetworkSystem\@\@QEAA?AV?$weak_ptr\@VCompressedNetworkPeer\@\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z + */ + MCAPI class std::weak_ptr getCompressedPeerForUser(class NetworkIdentifier const &); + /** + * @symbol ?getConnections\@NetworkSystem\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VNetworkConnection\@\@U?$default_delete\@VNetworkConnection\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNetworkConnection\@\@U?$default_delete\@VNetworkConnection\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + */ + MCAPI std::vector> const & getConnections() const; + /** + * @symbol ?getEncryptedPeerForUser\@NetworkSystem\@\@QEAA?AV?$weak_ptr\@VEncryptedNetworkPeer\@\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z + */ + MCAPI class std::weak_ptr getEncryptedPeerForUser(class NetworkIdentifier const &); + /** + * @symbol ?getLocalNetworkId\@NetworkSystem\@\@QEBA?AVNetworkIdentifier\@\@XZ + */ + MCAPI class NetworkIdentifier getLocalNetworkId() const; + /** + * @symbol ?getNetworkStatistics\@NetworkSystem\@\@QEBAPEBVNetworkStatistics\@\@XZ + */ + MCAPI class NetworkStatistics const * getNetworkStatistics() const; + /** + * @symbol ?getPeerForUser\@NetworkSystem\@\@QEAAPEAVNetworkPeer\@\@AEBVNetworkIdentifier\@\@\@Z + */ + MCAPI class NetworkPeer * getPeerForUser(class NetworkIdentifier const &); + /** + * @symbol ?getPrimaryNetworkId\@NetworkSystem\@\@QEBA?AVNetworkIdentifier\@\@XZ + */ + MCAPI class NetworkIdentifier getPrimaryNetworkId() const; + /** + * @symbol ?getRemoteConnector\@NetworkSystem\@\@QEBA?AV?$NonOwnerPointer\@VRemoteConnector\@\@\@Bedrock\@\@XZ + */ + MCAPI class Bedrock::NonOwnerPointer getRemoteConnector() const; + /** + * @symbol ?getResourcePackUploadManager\@NetworkSystem\@\@QEAAAEAVResourcePackFileUploadManager\@\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI class ResourcePackFileUploadManager & getResourcePackUploadManager(class PacketSender &, class NetworkIdentifier const &, std::string const &); + /** + * @symbol ?getServerId\@NetworkSystem\@\@QEBA?AVNetworkIdentifier\@\@XZ + */ + MCAPI class NetworkIdentifier getServerId() const; + /** + * @symbol ?getServerLocatorComposite\@NetworkSystem\@\@QEAAAEAVServerLocatorComposite\@\@XZ + */ + MCAPI class ServerLocatorComposite & getServerLocatorComposite(); + /** + * @symbol ?host\@NetworkSystem\@\@QEAA_NAEBUConnectionDefinition\@\@\@Z + */ + MCAPI bool host(struct ConnectionDefinition const &); + /** + * @symbol ?isHostingPlayer\@NetworkSystem\@\@QEBA_NAEBVNetworkIdentifier\@\@AEBW4SubClientId\@\@\@Z + */ + MCAPI bool isHostingPlayer(class NetworkIdentifier const &, enum class SubClientId const &) const; + /** + * @symbol ?isServer\@NetworkSystem\@\@QEBA_NXZ + */ + MCAPI bool isServer() const; + /** + * @symbol ?registerServerInstance\@NetworkSystem\@\@QEAAXAEAVNetEventCallback\@\@\@Z + */ + MCAPI void registerServerInstance(class NetEventCallback &); + /** + * @symbol ?runEvents\@NetworkSystem\@\@QEAAX_N\@Z + */ + MCAPI void runEvents(bool); + /** + * @symbol ?send\@NetworkSystem\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@W4SubClientId\@\@\@Z + */ + MCAPI void send(class NetworkIdentifier const &, class Packet const &, enum class SubClientId); + /** + * @symbol ?sendToMultiple\@NetworkSystem\@\@QEAAXAEBV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@AEBVPacket\@\@\@Z + */ + MCAPI void sendToMultiple(std::vector const &, class Packet const &); + /** + * @symbol ?setCloseConnection\@NetworkSystem\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z + */ + MCAPI void setCloseConnection(class NetworkIdentifier const &); + /** + * @symbol ?unregisterClientOrServerInstance\@NetworkSystem\@\@QEAAXAEBW4SubClientId\@\@\@Z + */ + MCAPI void unregisterClientOrServerInstance(enum class SubClientId const &); + /** + * @symbol ?update\@NetworkSystem\@\@QEAAXPEBV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void update(std::vector const *); + +//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 + */ + MCAPI NetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference); + /** + * @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 + */ + MCAPI NetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference, class NetherNetTransportFactory const &, class Bedrock::NonOwnerPointer); + +//private: + /** + * @symbol ?_getConnectionFromId\@NetworkSystem\@\@AEBAPEAVNetworkConnection\@\@AEBVNetworkIdentifier\@\@\@Z + */ + MCAPI class NetworkConnection * _getConnectionFromId(class NetworkIdentifier const &) const; + /** + * @symbol ?_handlePacketViolation\@NetworkSystem\@\@AEAAXW4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@AEAVNetworkConnection\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + 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 + */ + MCAPI bool _sortAndPacketizeEvents(class NetworkConnection &, class std::chrono::time_point>>); + +protected: + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp b/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp index 677859c50e..4b080893c1 100644 --- a/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp +++ b/LiteLoader/include/llapi/mc/NewExecuteCommand.hpp @@ -24,51 +24,60 @@ class NewExecuteCommand : public Command { public: class NewExecuteCommand& operator=(class NewExecuteCommand const &) = delete; NewExecuteCommand(class NewExecuteCommand const &) = delete; - NewExecuteCommand() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NewExecuteCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@NewExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@NewExecuteCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NEWEXECUTECOMMAND /** - * @symbol ?setup\@NewExecuteCommand\@\@SAXAEAVCommandRegistry\@\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NewExecuteCommand(); +#endif + /** + * @symbol ??0NewExecuteCommand\@\@QEAA\@XZ + */ + MCAPI NewExecuteCommand(); + /** + * @symbol ?setup\@NewExecuteCommand\@\@SAXAEAVCommandRegistry\@\@H\@Z */ MCAPI static void setup(class CommandRegistry &, int); //private: /** - * @symbol ?_commandOutputFail\@NewExecuteCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$optional\@H\@std\@\@\@Z + * @symbol ?_commandOutputFail\@NewExecuteCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$optional\@H\@std\@\@\@Z */ MCAPI void _commandOutputFail(class CommandOutput &, class std::optional const &) const; /** - * @symbol ?_commandOutputSuccess\@NewExecuteCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$optional\@H\@std\@\@\@Z + * @symbol ?_commandOutputSuccess\@NewExecuteCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$optional\@H\@std\@\@\@Z */ MCAPI void _commandOutputSuccess(class CommandOutput &, class std::optional const &) const; /** - * @symbol ?_detectConditionSubcommand\@NewExecuteCommand\@\@AEBA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAV?$optional\@H\@std\@\@\@Z + * @symbol ?_detectConditionSubcommand\@NewExecuteCommand\@\@AEBA_NAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAV?$optional\@H\@std\@\@\@Z */ MCAPI bool _detectConditionSubcommand(class CommandOrigin const &, class CommandOutput &, class std::optional &) const; /** - * @symbol ?_getScoreFromSelectorOnObjective\@NewExecuteCommand\@\@AEBA?AV?$optional\@UScoreInfo\@\@\@std\@\@AEBVScoreboard\@\@AEBV?$CommandSelector\@VActor\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_getScoreFromSelectorOnObjective\@NewExecuteCommand\@\@AEBA?AV?$optional\@UScoreInfo\@\@\@std\@\@AEBVScoreboard\@\@AEBV?$CommandSelector\@VActor\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI class std::optional _getScoreFromSelectorOnObjective(class Scoreboard const &, class CommandSelector const &, std::string const &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_getScoreboardIdForSelector\@NewExecuteCommand\@\@AEBA?AV?$optional\@UScoreboardId\@\@\@std\@\@AEBVScoreboard\@\@AEBV?$CommandSelector\@VActor\@\@\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_getScoreboardIdForSelector\@NewExecuteCommand\@\@AEBA?AV?$optional\@UScoreboardId\@\@\@std\@\@AEBVScoreboard\@\@AEBV?$CommandSelector\@VActor\@\@\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI class std::optional _getScoreboardIdForSelector(class Scoreboard const &, class CommandSelector const &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_handleScoreNotFound\@NewExecuteCommand\@\@AEBAXAEBVCommandOrigin\@\@AEBV?$CommandSelector\@VActor\@\@\@\@AEBVObjective\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleScoreNotFound\@NewExecuteCommand\@\@AEBAXAEBVCommandOrigin\@\@AEBV?$CommandSelector\@VActor\@\@\@\@AEBVObjective\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleScoreNotFound(class CommandOrigin const &, class CommandSelector const &, class Objective const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NewLeafBlock.hpp b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp index cd7d2b827c..c948683248 100644 --- a/LiteLoader/include/llapi/mc/NewLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLeafBlock.hpp @@ -31,228 +31,233 @@ class NewLeafBlock : public LeafBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NewLeafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @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 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@NewLeafBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @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 134 - * @symbol ?isAuxValueRelevantForPicking\@NewLeafBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@NewLeafBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@NewLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@NewLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getExtraResourceItem\@NewLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @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 + * @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); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NewLogBlock.hpp b/LiteLoader/include/llapi/mc/NewLogBlock.hpp index c5a68ffa25..09cdf96213 100644 --- a/LiteLoader/include/llapi/mc/NewLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/NewLogBlock.hpp @@ -31,228 +31,238 @@ class NewLogBlock : public LogBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NewLogBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@NewLogBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@NewLogBlock\@\@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 146 - * @symbol ?getVariant\@NewLogBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@NewLogBlock\@\@UEBA_NXZ + */ + virtual bool isAuxValueRelevantForPicking() const; + /** + * @vftbl 146 + * @symbol ?getVariant\@NewLogBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@NewLogBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@NewLogBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@NewLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 185 + * @symbol ?getMapColor\@NewLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@NewLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0NewLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NewLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NewLogBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp index 9681f0a78a..f9ed3f376e 100644 --- a/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/NewUniqueIdsDataLoadHelper.hpp @@ -29,148 +29,152 @@ class NewUniqueIdsDataLoadHelper { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NewUniqueIdsDataLoadHelper(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?loadActorUniqueID\@NewUniqueIdsDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z + * @vftbl 13 + * @symbol ?loadActorUniqueID\@NewUniqueIdsDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z */ virtual struct ActorUniqueID loadActorUniqueID(struct ActorUniqueID); /** - * @vftbl 14 - * @symbol ?loadOwnerID\@NewUniqueIdsDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z + * @vftbl 14 + * @symbol ?loadOwnerID\@NewUniqueIdsDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z */ virtual struct ActorUniqueID loadOwnerID(struct ActorUniqueID); /** - * @vftbl 15 - * @symbol ?loadActorInternalComponentInfo\@NewUniqueIdsDataLoadHelper\@\@UEAAPEBUComponentInfo\@InternalComponentRegistry\@\@AEBV?$unordered_map\@VHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@\@std\@\@\@5\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z + * @vftbl 15 + * @symbol ?loadActorInternalComponentInfo\@NewUniqueIdsDataLoadHelper\@\@UEAAPEBUComponentInfo\@InternalComponentRegistry\@\@AEBV?$unordered_map\@VHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@\@std\@\@\@5\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z */ virtual struct InternalComponentRegistry::ComponentInfo const * loadActorInternalComponentInfo(class std::unordered_map, struct std::equal_to, class std::allocator>> const &, std::string const &); /** - * @vftbl 16 - * @symbol ?getType\@NewUniqueIdsDataLoadHelper\@\@UEBA?AW4DataLoadHelperType\@\@XZ + * @vftbl 16 + * @symbol ?getType\@NewUniqueIdsDataLoadHelper\@\@UEBA?AW4DataLoadHelperType\@\@XZ */ virtual enum class DataLoadHelperType getType() const; /** - * @vftbl 17 - * @symbol ?shouldResetTime\@NewUniqueIdsDataLoadHelper\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?shouldResetTime\@NewUniqueIdsDataLoadHelper\@\@UEAA_NXZ */ virtual bool shouldResetTime(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NEWUNIQUEIDSDATALOADHELPER /** - * @symbol ?loadBlockPosition\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?loadBlockPosition\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ MCVAPI class BlockPos loadBlockPosition(class BlockPos const &); /** - * @symbol ?loadBlockPositionOffset\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z + * @symbol ?loadBlockPositionOffset\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ MCVAPI class BlockPos loadBlockPositionOffset(class BlockPos const &); /** - * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z + * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ - MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); + MCVAPI class Vec3 loadDirection(class Vec3 const &); /** - * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + * @symbol ?loadDirection\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z */ - MCVAPI class Vec3 loadDirection(class Vec3 const &); + MCVAPI enum class Direction::Type loadDirection(enum class Direction::Type); /** - * @symbol ?loadFacingID\@NewUniqueIdsDataLoadHelper\@\@UEAAEE\@Z + * @symbol ?loadFacingID\@NewUniqueIdsDataLoadHelper\@\@UEAAEE\@Z */ MCVAPI unsigned char loadFacingID(unsigned char); /** - * @symbol ?loadMirror\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Mirror\@\@W42\@\@Z + * @symbol ?loadMirror\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Mirror\@\@W42\@\@Z */ MCVAPI enum class Mirror loadMirror(enum class Mirror); /** - * @symbol ?loadPosition\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + * @symbol ?loadPosition\@NewUniqueIdsDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ MCVAPI class Vec3 loadPosition(class Vec3 const &); /** - * @symbol ?loadRotation\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Rotation\@\@W42\@\@Z + * @symbol ?loadRotation\@NewUniqueIdsDataLoadHelper\@\@UEAA?AW4Rotation\@\@W42\@\@Z */ MCVAPI enum class Rotation loadRotation(enum class Rotation); /** - * @symbol ?loadRotationDegreesX\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationDegreesX\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationDegreesX(float); /** - * @symbol ?loadRotationDegreesY\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationDegreesY\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationDegreesY(float); /** - * @symbol ?loadRotationRadiansX\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationRadiansX\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationRadiansX(float); /** - * @symbol ?loadRotationRadiansY\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationRadiansY\@NewUniqueIdsDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationRadiansY(float); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NewUniqueIdsDataLoadHelper(); #endif /** - * @symbol ??0NewUniqueIdsDataLoadHelper\@\@QEAA\@AEAVILevel\@\@\@Z + * @symbol ??0NewUniqueIdsDataLoadHelper\@\@QEAA\@AEAVILevel\@\@\@Z */ MCAPI NewUniqueIdsDataLoadHelper(class ILevel &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp b/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp index 8f04d43e23..76b57b415a 100644 --- a/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/NoClipOrNoBlockMoveFilterSystem.hpp @@ -28,16 +28,16 @@ class NoClipOrNoBlockMoveFilterSystem { public: /** - * @symbol ?create\@NoClipOrNoBlockMoveFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@NoClipOrNoBlockMoveFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createSideBySide\@NoClipOrNoBlockMoveFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySide\@NoClipOrNoBlockMoveFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySide(); /** - * @symbol ?tick\@NoClipOrNoBlockMoveFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUOffsetsComponent\@\@AEBUSlideOffsetComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUSubBBsComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tick\@NoClipOrNoBlockMoveFilterSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUOffsetsComponent\@\@AEBUSlideOffsetComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUAABBShapeComponent\@\@AEAUStateVectorComponent\@\@AEAUSubBBsComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMoveRequestComponent\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void tick(class StrictEntityContext const &, struct MoveRequestComponent const &, struct OffsetsComponent const &, struct SlideOffsetComponent const &, struct SynchedActorDataComponent const &, struct AABBShapeComponent &, struct StateVectorComponent &, struct SubBBsComponent &, class EntityModifierT, class IConstBlockSource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp b/LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp index b1173d31b7..6eed7feca9 100644 --- a/LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp +++ b/LiteLoader/include/llapi/mc/NoSurfaceOreFeature.hpp @@ -30,18 +30,18 @@ class NoSurfaceOreFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NoSurfaceOreFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@NoSurfaceOreFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@NoSurfaceOreFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0NoSurfaceOreFeature\@\@QEAA\@UIntRange\@\@AEBVBlockDescriptor\@\@11\@Z + * @symbol ??0NoSurfaceOreFeature\@\@QEAA\@UIntRange\@\@AEBVBlockDescriptor\@\@11\@Z */ MCAPI NoSurfaceOreFeature(struct IntRange, class BlockDescriptor const &, class BlockDescriptor const &, class BlockDescriptor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NoiseCellInterpolator.hpp b/LiteLoader/include/llapi/mc/NoiseCellInterpolator.hpp index 7f3ad44959..739c3703a0 100644 --- a/LiteLoader/include/llapi/mc/NoiseCellInterpolator.hpp +++ b/LiteLoader/include/llapi/mc/NoiseCellInterpolator.hpp @@ -30,28 +30,28 @@ class NoiseCellInterpolator { public: /** - * @symbol ??0NoiseCellInterpolator\@\@QEAA\@V?$span\@$$CBM$0?0\@gsl\@\@HH\@Z + * @symbol ??0NoiseCellInterpolator\@\@QEAA\@V?$span\@$$CBM$0?0\@gsl\@\@HH\@Z */ MCAPI NoiseCellInterpolator(class gsl::span, int, int); /** - * @symbol ??0NoiseCellInterpolator\@\@QEAA\@V?$span\@$$CBM$0?0\@gsl\@\@\@Z + * @symbol ??0NoiseCellInterpolator\@\@QEAA\@V?$span\@$$CBM$0?0\@gsl\@\@\@Z */ MCAPI NoiseCellInterpolator(class gsl::span); /** - * @symbol ?getLerpedValue\@NoiseCellInterpolator\@\@QEBAMXZ + * @symbol ?getLerpedValue\@NoiseCellInterpolator\@\@QEBAMXZ */ MCAPI float getLerpedValue() const; /** - * @symbol ?selectCellXZ\@NoiseCellInterpolator\@\@QEAAXHHHH\@Z + * @symbol ?selectCellXZ\@NoiseCellInterpolator\@\@QEAAXHHHH\@Z */ MCAPI void selectCellXZ(int, int, int, int); /** - * @symbol ?updateForX\@NoiseCellInterpolator\@\@QEAAXE\@Z + * @symbol ?updateForX\@NoiseCellInterpolator\@\@QEAAXE\@Z */ MCAPI void updateForX(unsigned char); /** - * @symbol ?updateForZ\@NoiseCellInterpolator\@\@QEAAXE\@Z + * @symbol ?updateForZ\@NoiseCellInterpolator\@\@QEAAXE\@Z */ MCAPI void updateForZ(unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NoodleCavifier.hpp b/LiteLoader/include/llapi/mc/NoodleCavifier.hpp index 45447ac622..b91179ed0c 100644 --- a/LiteLoader/include/llapi/mc/NoodleCavifier.hpp +++ b/LiteLoader/include/llapi/mc/NoodleCavifier.hpp @@ -30,20 +30,20 @@ class NoodleCavifier { public: /** - * @symbol ??0NoodleCavifier\@\@QEAA\@AEBVNoodleCavifierNoises\@\@F\@Z + * @symbol ??0NoodleCavifier\@\@QEAA\@AEBVNoodleCavifierNoises\@\@F\@Z */ MCAPI NoodleCavifier(class NoodleCavifierNoises const &, short); /** - * @symbol ?cavify\@NoodleCavifier\@\@QEBAMMAEBVBlockPos\@\@\@Z + * @symbol ?cavify\@NoodleCavifier\@\@QEBAMMAEBVBlockPos\@\@\@Z */ MCAPI float cavify(float, class BlockPos const &) const; /** - * @symbol ?fillNoiseAtPos\@NoodleCavifier\@\@QEAAXAEBVVec3\@\@HM\@Z + * @symbol ?fillNoiseAtPos\@NoodleCavifier\@\@QEAAXAEBVVec3\@\@HM\@Z */ MCAPI void fillNoiseAtPos(class Vec3 const &, int, float); /** - * @symbol ?getInterpolators\@NoodleCavifier\@\@QEAA?AV?$array\@PEAVNoiseCellInterpolator\@\@$03\@std\@\@HH\@Z + * @symbol ?getInterpolators\@NoodleCavifier\@\@QEAA?AV?$array\@PEAVNoiseCellInterpolator\@\@$03\@std\@\@HH\@Z */ MCAPI class std::array getInterpolators(int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NoodleCavifierNoises.hpp b/LiteLoader/include/llapi/mc/NoodleCavifierNoises.hpp index 94da322295..5605a5ea45 100644 --- a/LiteLoader/include/llapi/mc/NoodleCavifierNoises.hpp +++ b/LiteLoader/include/llapi/mc/NoodleCavifierNoises.hpp @@ -29,16 +29,16 @@ class NoodleCavifierNoises { public: /** - * @symbol ??0NoodleCavifierNoises\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0NoodleCavifierNoises\@\@QEAA\@AEBV0\@\@Z */ MCAPI NoodleCavifierNoises(class NoodleCavifierNoises const &); /** - * @symbol ??1NoodleCavifierNoises\@\@QEAA\@XZ + * @symbol ??1NoodleCavifierNoises\@\@QEAA\@XZ */ MCAPI ~NoodleCavifierNoises(); /** - * @symbol ?make\@NoodleCavifierNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ?make\@NoodleCavifierNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI static class NoodleCavifierNoises make(class XoroshiroPositionalRandomFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp b/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp index d22b754ed4..19acfc7182 100644 --- a/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp +++ b/LiteLoader/include/llapi/mc/NormalTickFilterSystem.hpp @@ -28,12 +28,12 @@ class NormalTickFilterSystem { public: /** - * @symbol ?createGenericSystem\@NormalTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createGenericSystem\@NormalTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createGenericSystem(); /** - * @symbol ?createLocalPlayerSystem\@NormalTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createLocalPlayerSystem\@NormalTickFilterSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLocalPlayerSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NoteBlock.hpp b/LiteLoader/include/llapi/mc/NoteBlock.hpp index 1e48edd378..8e89d3b9f1 100644 --- a/LiteLoader/include/llapi/mc/NoteBlock.hpp +++ b/LiteLoader/include/llapi/mc/NoteBlock.hpp @@ -31,241 +31,246 @@ class NoteBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NoteBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 109 - * @symbol ?attack\@NoteBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@NoteBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 116 - * @symbol ?triggerEvent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @vftbl 116 + * @symbol ?triggerEvent\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ virtual void triggerEvent(class BlockSource &, class BlockPos const &, int, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@NoteBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@NoteBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@NoteBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NOTEBLOCK /** - * @symbol ?isInteractiveBlock\@NoteBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@NoteBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0NoteBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NoteBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NoteBlock(std::string const &, int); /** - * @symbol ?enableSkullPlacement\@NoteBlock\@\@QEAAAEAV1\@_N\@Z + * @symbol ?enableSkullPlacement\@NoteBlock\@\@QEAAAEAV1\@_N\@Z */ MCAPI class NoteBlock & enableSkullPlacement(bool); //private: /** - * @symbol ?_triggerNoteParticle\@NoteBlock\@\@AEBAXAEAVLevel\@\@AEBVVec3\@\@H\@Z + * @symbol ?_triggerNoteParticle\@NoteBlock\@\@AEBAXAEAVLevel\@\@AEBVVec3\@\@H\@Z */ MCAPI void _triggerNoteParticle(class Level &, class Vec3 const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Npc.hpp b/LiteLoader/include/llapi/mc/Npc.hpp index 3ef05839f0..71bf76e496 100644 --- a/LiteLoader/include/llapi/mc/Npc.hpp +++ b/LiteLoader/include/llapi/mc/Npc.hpp @@ -32,234 +32,229 @@ class Npc : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Npc\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Npc\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@Npc\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Npc\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Npc(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 61 - * @symbol ?canShowNameTag\@Npc\@\@UEBA_NXZ + * @vftbl 61 + * @symbol ?canShowNameTag\@Npc\@\@UEBA_NXZ */ virtual bool canShowNameTag() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 66 - * @symbol ?getFormattedNameTag\@Npc\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 66 + * @symbol ?getFormattedNameTag\@Npc\@\@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 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Npc\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Npc\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 200 - * @symbol ?buildDebugInfo\@Npc\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 199 + * @symbol ?buildDebugInfo\@Npc\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 208 - * @symbol ?canBeAffected\@Npc\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@Npc\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@Npc\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Npc\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Npc\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Npc\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Npc\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Npc\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?knockback\@Npc\@\@UEAAXPEAVActor\@\@HMMMMM\@Z + * @vftbl 276 + * @symbol ?knockback\@Npc\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 341 - * @symbol ?canExistWhenDisallowMob\@Npc\@\@UEBA_NXZ + * @vftbl 338 + * @symbol ?canExistWhenDisallowMob\@Npc\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 349 - * @symbol ?newServerAiStep\@Npc\@\@UEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@Npc\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 350 - * @symbol ?_serverAiMobStep\@Npc\@\@MEAAXXZ + * @vftbl 347 + * @symbol ?_serverAiMobStep\@Npc\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPC /** - * @symbol ?breaksFallingBlocks\@Npc\@\@UEBA_NXZ + * @symbol ?breaksFallingBlocks\@Npc\@\@UEBA_NXZ */ MCVAPI bool breaksFallingBlocks() const; /** - * @symbol ?interactPreventDefault\@Npc\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@Npc\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); /** - * @symbol ?isFishable\@Npc\@\@UEBA_NXZ + * @symbol ?isFishable\@Npc\@\@UEBA_NXZ */ MCVAPI bool isFishable() const; /** - * @symbol ?isTargetable\@Npc\@\@UEBA_NXZ + * @symbol ?isTargetable\@Npc\@\@UEBA_NXZ */ MCVAPI bool isTargetable() const; #endif /** - * @symbol ??0Npc\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Npc\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Npc(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?SKIN_ID_TAG\@Npc\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SKIN_ID_TAG\@Npc\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SKIN_ID_TAG; /** - * @symbol ?Skins\@Npc\@\@2V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?Skins\@Npc\@\@2V?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static std::vector> const Skins; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcAction.hpp b/LiteLoader/include/llapi/mc/NpcAction.hpp index bfc3495a2f..fb6e168475 100644 --- a/LiteLoader/include/llapi/mc/NpcAction.hpp +++ b/LiteLoader/include/llapi/mc/NpcAction.hpp @@ -31,60 +31,66 @@ class NpcAction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcAction(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual void __unk_vfn_1() = 0; + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?fromJson\@NpcAction\@\@UEAA_NAEBVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?fromJson\@NpcAction\@\@UEAA_NAEBVValue\@Json\@\@\@Z */ virtual bool fromJson(class Json::Value const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCACTION /** - * @symbol ?getMode\@NpcAction\@\@QEBA?AW4NpcActionMode\@\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NpcAction(); +#endif + /** + * @symbol ?getMode\@NpcAction\@\@QEBA?AW4NpcActionMode\@\@XZ */ MCAPI enum class NpcActionMode getMode() const; /** - * @symbol ?getText\@NpcAction\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getText\@NpcAction\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getText() const; /** - * @symbol ?getType\@NpcAction\@\@QEBA?AW4NpcActionType\@\@XZ + * @symbol ?getType\@NpcAction\@\@QEBA?AW4NpcActionType\@\@XZ */ MCAPI enum class NpcActionType getType() const; /** - * @symbol ??9NpcAction\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9NpcAction\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class NpcAction const &) const; /** - * @symbol ??8NpcAction\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8NpcAction\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class NpcAction const &) const; /** - * @symbol ?setButtonName\@NpcAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setButtonName\@NpcAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setButtonName(std::string const &); /** - * @symbol ?setMode\@NpcAction\@\@QEAAXW4NpcActionMode\@\@\@Z + * @symbol ?setMode\@NpcAction\@\@QEAAXW4NpcActionMode\@\@\@Z */ MCAPI void setMode(enum class NpcActionMode); /** - * @symbol ?setText\@NpcAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setText\@NpcAction\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setText(std::string const &); /** - * @symbol ?read\@NpcAction\@\@SA?AV?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?read\@NpcAction\@\@SA?AV?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static std::unique_ptr read(class Json::Value const &); //protected: /** - * @symbol ?toJsonBase\@NpcAction\@\@IEAA?AVValue\@Json\@\@AEAV23\@\@Z + * @symbol ?toJsonBase\@NpcAction\@\@IEAA?AVValue\@Json\@\@AEAV23\@\@Z */ MCAPI class Json::Value toJsonBase(class Json::Value &); @@ -94,28 +100,28 @@ class NpcAction { private: /** - * @symbol ?BUTTON_NAME_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BUTTON_NAME_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BUTTON_NAME_KEY; /** - * @symbol ?DATA_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DATA_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DATA_KEY; /** - * @symbol ?MAX_BUTTON_NAME_LENGTH\@NpcAction\@\@0HB + * @symbol ?MAX_BUTTON_NAME_LENGTH\@NpcAction\@\@0HB */ MCAPI static int const MAX_BUTTON_NAME_LENGTH; /** - * @symbol ?MODE_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MODE_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MODE_KEY; /** - * @symbol ?TEXT_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TEXT_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TEXT_KEY; /** - * @symbol ?TYPE_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TYPE_KEY\@NpcAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TYPE_KEY; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp b/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp index f0fe91cc34..998f09d508 100644 --- a/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp +++ b/LiteLoader/include/llapi/mc/NpcActionsContainer.hpp @@ -30,31 +30,31 @@ struct NpcActionsContainer { public: /** - * @symbol ?cloneActions\@NpcActionsContainer\@\@QEBA?AV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?cloneActions\@NpcActionsContainer\@\@QEBA?AV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> cloneActions() const; /** - * @symbol ?getActionAt\@NpcActionsContainer\@\@QEAAPEAVNpcAction\@\@_K\@Z + * @symbol ?getActionAt\@NpcActionsContainer\@\@QEAAPEAVNpcAction\@\@_K\@Z */ MCAPI class NpcAction * getActionAt(unsigned __int64); /** - * @symbol ?getActionCount\@NpcActionsContainer\@\@QEBA_KXZ + * @symbol ?getActionCount\@NpcActionsContainer\@\@QEBA_KXZ */ MCAPI unsigned __int64 getActionCount() const; /** - * @symbol ?getActions\@NpcActionsContainer\@\@QEAAAEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getActions\@NpcActionsContainer\@\@QEAAAEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> & getActions(); /** - * @symbol ?getActions\@NpcActionsContainer\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getActions\@NpcActionsContainer\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getActions() const; /** - * @symbol ?getUrlCount\@NpcActionsContainer\@\@QEBAHXZ + * @symbol ?getUrlCount\@NpcActionsContainer\@\@QEBAHXZ */ MCAPI int getUrlCount() const; /** - * @symbol ??1NpcActionsContainer\@\@QEAA\@XZ + * @symbol ??1NpcActionsContainer\@\@QEAA\@XZ */ MCAPI ~NpcActionsContainer(); diff --git a/LiteLoader/include/llapi/mc/NpcCommandAction.hpp b/LiteLoader/include/llapi/mc/NpcCommandAction.hpp index 4e30962d68..81c2c3f4ce 100644 --- a/LiteLoader/include/llapi/mc/NpcCommandAction.hpp +++ b/LiteLoader/include/llapi/mc/NpcCommandAction.hpp @@ -36,34 +36,34 @@ struct SavedCommand { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcCommandAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?toJson\@NpcCommandAction\@\@UEAA?AVValue\@Json\@\@XZ + * @vftbl 1 + * @symbol ?toJson\@NpcCommandAction\@\@UEAA?AVValue\@Json\@\@XZ */ virtual class Json::Value toJson(); /** - * @vftbl 2 - * @symbol ?fromJson\@NpcCommandAction\@\@UEAA_NAEBVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?fromJson\@NpcCommandAction\@\@UEAA_NAEBVValue\@Json\@\@\@Z */ virtual bool fromJson(class Json::Value const &); /** - * @symbol ??0NpcCommandAction\@\@QEAA\@XZ + * @symbol ??0NpcCommandAction\@\@QEAA\@XZ */ MCAPI NpcCommandAction(); /** - * @symbol ?getCommands\@NpcCommandAction\@\@QEAAAEAV?$vector\@USavedCommand\@NpcCommandAction\@\@V?$allocator\@USavedCommand\@NpcCommandAction\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getCommands\@NpcCommandAction\@\@QEAAAEAV?$vector\@USavedCommand\@NpcCommandAction\@\@V?$allocator\@USavedCommand\@NpcCommandAction\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getCommands(); /** - * @symbol ?setCommands\@NpcCommandAction\@\@QEAAX$$QEAV?$vector\@USavedCommand\@NpcCommandAction\@\@V?$allocator\@USavedCommand\@NpcCommandAction\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setCommands\@NpcCommandAction\@\@QEAAX$$QEAV?$vector\@USavedCommand\@NpcCommandAction\@\@V?$allocator\@USavedCommand\@NpcCommandAction\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setCommands(std::vector &&); /** - * @symbol ?COMMAND_DELIMITER\@NpcCommandAction\@\@2DB + * @symbol ?COMMAND_DELIMITER\@NpcCommandAction\@\@2DB */ MCAPI static char const COMMAND_DELIMITER; @@ -71,12 +71,12 @@ struct SavedCommand { private: /** - * @symbol ?COMMAND_LINE_KEY\@NpcCommandAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?COMMAND_LINE_KEY\@NpcCommandAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const COMMAND_LINE_KEY; /** - * @symbol ?COMMAND_VERSION_KEY\@NpcCommandAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?COMMAND_VERSION_KEY\@NpcCommandAction\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const COMMAND_VERSION_KEY; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcComponent.hpp b/LiteLoader/include/llapi/mc/NpcComponent.hpp index 25f39c236b..a48cdef19e 100644 --- a/LiteLoader/include/llapi/mc/NpcComponent.hpp +++ b/LiteLoader/include/llapi/mc/NpcComponent.hpp @@ -28,185 +28,191 @@ class NpcComponent { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCCOMPONENT /** - * @symbol ??0NpcComponent\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NpcComponent(); +#endif + /** + * @symbol ??0NpcComponent\@\@QEAA\@XZ */ MCAPI NpcComponent(); /** - * @symbol ??0NpcComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0NpcComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI NpcComponent(class NpcComponent &&); /** - * @symbol ?addAdditionalSaveData\@NpcComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z + * @symbol ?addAdditionalSaveData\@NpcComponent\@\@QEBAXAEAVCompoundTag\@\@AEBVActor\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &, class Actor const &) const; /** - * @symbol ?clearSceneStateForAllPlayers\@NpcComponent\@\@QEAAXXZ + * @symbol ?clearSceneStateForAllPlayers\@NpcComponent\@\@QEAAXXZ */ MCAPI void clearSceneStateForAllPlayers(); /** - * @symbol ?executeClosingCommands\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?executeClosingCommands\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void executeClosingCommands(class Actor &, class Player &, std::string const &); /** - * @symbol ?executeCommandAction\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?executeCommandAction\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void executeCommandAction(class Actor &, class Player &, int, std::string const &); /** - * @symbol ?executeOpeningCommands\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?executeOpeningCommands\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void executeOpeningCommands(class Actor &, class Player &, std::string const &); /** - * @symbol ?getActionsContainer\@NpcComponent\@\@QEAAAEAUNpcActionsContainer\@\@XZ + * @symbol ?getActionsContainer\@NpcComponent\@\@QEAAAEAUNpcActionsContainer\@\@XZ */ MCAPI struct NpcActionsContainer & getActionsContainer(); /** - * @symbol ?getButtonCounts\@NpcComponent\@\@QEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ + * @symbol ?getButtonCounts\@NpcComponent\@\@QEBA?AV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ MCAPI std::vector getButtonCounts() const; /** - * @symbol ?getCommandPermissionLevel\@NpcComponent\@\@QEBA?AW4CommandPermissionLevel\@\@XZ + * @symbol ?getCommandPermissionLevel\@NpcComponent\@\@QEBA?AW4CommandPermissionLevel\@\@XZ */ MCAPI enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @symbol ?getInteraction\@NpcComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@NpcComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?getInteractiveText\@NpcComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @symbol ?getInteractiveText\@NpcComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ MCAPI std::string const & getInteractiveText(class Actor &) const; /** - * @symbol ?getName\@NpcComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z + * @symbol ?getName\@NpcComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z */ MCAPI std::string const & getName(class Actor const &) const; /** - * @symbol ?getNameRawText\@NpcComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z + * @symbol ?getNameRawText\@NpcComponent\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVActor\@\@\@Z */ MCAPI std::string const & getNameRawText(class Actor const &) const; /** - * @symbol ?getSkinIndex\@NpcComponent\@\@QEBAHXZ + * @symbol ?getSkinIndex\@NpcComponent\@\@QEBAHXZ */ MCAPI int getSkinIndex() const; /** - * @symbol ?getUpdatedActions\@NpcComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEA_N2\@Z + * @symbol ?getUpdatedActions\@NpcComponent\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEA_N2\@Z */ MCAPI void getUpdatedActions(std::string const &, std::vector> &, bool &, bool &); /** - * @symbol ?getUrlCount\@NpcComponent\@\@QEBAHXZ + * @symbol ?getUrlCount\@NpcComponent\@\@QEBAHXZ */ MCAPI int getUrlCount() const; /** - * @symbol ?handleNpcRequest\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBVNpcRequestPacket\@\@\@Z + * @symbol ?handleNpcRequest\@NpcComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@AEBVNpcRequestPacket\@\@\@Z */ MCAPI void handleNpcRequest(class Actor &, class Player &, class NpcRequestPacket const &); /** - * @symbol ?initClientOnlyData\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initClientOnlyData\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initClientOnlyData(class Actor &); /** - * @symbol ?initFromDefinition\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?loadActions\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?loadActions\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void loadActions(class Actor &); /** - * @symbol ?loadInteractiveRawText\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?loadInteractiveRawText\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void loadInteractiveRawText(class Actor &); /** - * @symbol ?loadNPCData\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?loadNPCData\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void loadNPCData(class Actor &); /** - * @symbol ?loadNameRawText\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?loadNameRawText\@NpcComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void loadNameRawText(class Actor &); /** - * @symbol ??4NpcComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4NpcComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class NpcComponent & operator=(class NpcComponent &&); /** - * @symbol ?readAdditionalSaveData\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setActions\@NpcComponent\@\@QEAAXAEAVActor\@\@$$QEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?setActions\@NpcComponent\@\@QEAAXAEAVActor\@\@$$QEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void setActions(class Actor &, std::vector> &&); /** - * @symbol ?setDialogueScene\@NpcComponent\@\@QEAA_NAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setDialogueScene\@NpcComponent\@\@QEAA_NAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool setDialogueScene(class Actor &, std::string const &); /** - * @symbol ?setInteractiveText\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?setInteractiveText\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void setInteractiveText(class Actor &, std::string const &, bool); /** - * @symbol ?setName\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?setName\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void setName(class Actor &, std::string const &, bool); /** - * @symbol ?setSceneStateForPlayer\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBUActorUniqueID\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setSceneStateForPlayer\@NpcComponent\@\@QEAAXAEAVActor\@\@AEBUActorUniqueID\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setSceneStateForPlayer(class Actor &, struct ActorUniqueID const &, std::string const &); /** - * @symbol ?setSkinIndex\@NpcComponent\@\@QEAAXAEAVActor\@\@H_N\@Z + * @symbol ?setSkinIndex\@NpcComponent\@\@QEAAXAEAVActor\@\@H_N\@Z */ MCAPI void setSkinIndex(class Actor &, int, bool); /** - * @symbol ?MAX_NPC_NAME_LENGTH\@NpcComponent\@\@2_KB + * @symbol ?MAX_NPC_NAME_LENGTH\@NpcComponent\@\@2_KB */ MCAPI static unsigned __int64 const MAX_NPC_NAME_LENGTH; //private: /** - * @symbol ?_defineEntityDataString\@NpcComponent\@\@AEAAXAEAVActor\@\@W4ActorDataIDs\@\@\@Z + * @symbol ?_defineEntityDataString\@NpcComponent\@\@AEAAXAEAVActor\@\@W4ActorDataIDs\@\@\@Z */ MCAPI void _defineEntityDataString(class Actor &, enum class ActorDataIDs); /** - * @symbol ?_deserializeData\@NpcComponent\@\@AEAAXXZ + * @symbol ?_deserializeData\@NpcComponent\@\@AEAAXXZ */ MCAPI void _deserializeData(); /** - * @symbol ?_loadActions\@NpcComponent\@\@AEBAXAEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?_loadActions\@NpcComponent\@\@AEBAXAEAV?$vector\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VNpcAction\@\@U?$default_delete\@VNpcAction\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI void _loadActions(std::vector> &, std::string const &) const; /** - * @symbol ?_serializeActions\@NpcComponent\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_serializeActions\@NpcComponent\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string _serializeActions() const; private: /** - * @symbol ?ACTIONS_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ACTIONS_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const ACTIONS_TAG; /** - * @symbol ?INTERACTIVE_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?INTERACTIVE_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const INTERACTIVE_TAG; /** - * @symbol ?NAME_RAW_TEXT_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NAME_RAW_TEXT_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NAME_RAW_TEXT_TAG; /** - * @symbol ?PLAYER_ID_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PLAYER_ID_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PLAYER_ID_TAG; /** - * @symbol ?PLAYER_SCENE_MAPPING_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PLAYER_SCENE_MAPPING_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PLAYER_SCENE_MAPPING_TAG; /** - * @symbol ?SCENE_NAME_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SCENE_NAME_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const SCENE_NAME_TAG; /** - * @symbol ?URL_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?URL_TAG\@NpcComponent\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const URL_TAG; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcDefinition.hpp b/LiteLoader/include/llapi/mc/NpcDefinition.hpp index 4477f74373..7f70a955c4 100644 --- a/LiteLoader/include/llapi/mc/NpcDefinition.hpp +++ b/LiteLoader/include/llapi/mc/NpcDefinition.hpp @@ -31,12 +31,12 @@ class NpcDefinition { public: /** - * @symbol ?initialize\@NpcDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVNpcComponent\@\@\@Z + * @symbol ?initialize\@NpcDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVNpcComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class NpcComponent &) const; /** - * @symbol ?buildSchema\@NpcDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VNpcDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@NpcDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VNpcDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcDialogueButton.hpp b/LiteLoader/include/llapi/mc/NpcDialogueButton.hpp index 1350bb238b..60fc5fa956 100644 --- a/LiteLoader/include/llapi/mc/NpcDialogueButton.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialogueButton.hpp @@ -30,15 +30,15 @@ struct NpcDialogueButton { public: /** - * @symbol ??0NpcDialogueButton\@\@QEAA\@XZ + * @symbol ??0NpcDialogueButton\@\@QEAA\@XZ */ MCAPI NpcDialogueButton(); /** - * @symbol ??1NpcDialogueButton\@\@QEAA\@XZ + * @symbol ??1NpcDialogueButton\@\@QEAA\@XZ */ MCAPI ~NpcDialogueButton(); /** - * @symbol ?parse\@NpcDialogueButton\@\@SA?AU1\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?parse\@NpcDialogueButton\@\@SA?AU1\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI static struct NpcDialogueButton parse(class Json::Value const &, std::string const &, int); diff --git a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp index 59bc1e3e58..e1d089e874 100644 --- a/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialoguePacket.hpp @@ -30,41 +30,47 @@ class NpcDialoguePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcDialoguePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@NpcDialoguePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@NpcDialoguePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@NpcDialoguePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@NpcDialoguePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@NpcDialoguePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@NpcDialoguePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@NpcDialoguePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCDIALOGUEPACKET /** - * @symbol ??0NpcDialoguePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI NpcDialoguePacket(); + MCVAPI ~NpcDialoguePacket(); +#endif /** - * @symbol ??0NpcDialoguePacket\@\@QEAA\@UActorUniqueID\@\@\@Z + * @symbol ??0NpcDialoguePacket\@\@QEAA\@UActorUniqueID\@\@\@Z */ MCAPI NpcDialoguePacket(struct ActorUniqueID); /** - * @symbol ?initializePacket\@NpcDialoguePacket\@\@SA_NAEAV1\@PEBVNpcDialogueStorage\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0NpcDialoguePacket\@\@QEAA\@XZ + */ + MCAPI NpcDialoguePacket(); + /** + * @symbol ?initializePacket\@NpcDialoguePacket\@\@SA_NAEAV1\@PEBVNpcDialogueStorage\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool initializePacket(class NpcDialoguePacket &, class NpcDialogueStorage const *, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp b/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp index b86a3c66e4..674218018a 100644 --- a/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialogueScene.hpp @@ -26,16 +26,19 @@ struct NpcDialogueScene { public: struct NpcDialogueScene& operator=(struct NpcDialogueScene const &) = delete; NpcDialogueScene(struct NpcDialogueScene const &) = delete; - NpcDialogueScene() = delete; #endif public: /** - * @symbol ??1NpcDialogueScene\@\@QEAA\@XZ + * @symbol ??0NpcDialogueScene\@\@QEAA\@XZ + */ + MCAPI NpcDialogueScene(); + /** + * @symbol ??1NpcDialogueScene\@\@QEAA\@XZ */ MCAPI ~NpcDialogueScene(); /** - * @symbol ?parse\@NpcDialogueScene\@\@SA?AU1\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?parse\@NpcDialogueScene\@\@SA?AU1\@AEBVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI static struct NpcDialogueScene parse(class Json::Value const &, std::string const &, int); diff --git a/LiteLoader/include/llapi/mc/NpcDialogueStorage.hpp b/LiteLoader/include/llapi/mc/NpcDialogueStorage.hpp index cbd34d9bab..098216278a 100644 --- a/LiteLoader/include/llapi/mc/NpcDialogueStorage.hpp +++ b/LiteLoader/include/llapi/mc/NpcDialogueStorage.hpp @@ -30,20 +30,20 @@ class NpcDialogueStorage { public: /** - * @symbol ?getScene\@NpcDialogueStorage\@\@QEAAPEAUNpcDialogueScene\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getScene\@NpcDialogueStorage\@\@QEAAPEAUNpcDialogueScene\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct NpcDialogueScene * getScene(std::string const &); /** - * @symbol ?getScene\@NpcDialogueStorage\@\@QEBAPEBUNpcDialogueScene\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getScene\@NpcDialogueStorage\@\@QEBAPEBUNpcDialogueScene\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct NpcDialogueScene const * getScene(std::string const &) const; /** - * @symbol ?init\@NpcDialogueStorage\@\@QEAAXAEAVResourcePackManager\@\@\@Z + * @symbol ?init\@NpcDialogueStorage\@\@QEAAXAEAVResourcePackManager\@\@\@Z */ MCAPI void init(class ResourcePackManager &); /** - * @symbol ?parseFile\@NpcDialogueStorage\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4CurrentCmdVersion\@\@\@Z + * @symbol ?parseFile\@NpcDialogueStorage\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0W4CurrentCmdVersion\@\@\@Z */ MCAPI bool parseFile(std::string const &, std::string const &, enum class CurrentCmdVersion); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcEventCoordinator.hpp b/LiteLoader/include/llapi/mc/NpcEventCoordinator.hpp index 38b64092e5..238ef529fc 100644 --- a/LiteLoader/include/llapi/mc/NpcEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/NpcEventCoordinator.hpp @@ -30,4 +30,4 @@ class NpcEventCoordinator { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcGUIOffset.hpp b/LiteLoader/include/llapi/mc/NpcGUIOffset.hpp index 342014dbef..da3599fef2 100644 --- a/LiteLoader/include/llapi/mc/NpcGUIOffset.hpp +++ b/LiteLoader/include/llapi/mc/NpcGUIOffset.hpp @@ -29,8 +29,8 @@ class NpcGUIOffset { public: /** - * @symbol ??0NpcGUIOffset\@\@QEAA\@AEBVValue\@Json\@\@\@Z + * @symbol ??0NpcGUIOffset\@\@QEAA\@AEBVValue\@Json\@\@\@Z */ MCAPI NpcGUIOffset(class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcI18nObserver.hpp b/LiteLoader/include/llapi/mc/NpcI18nObserver.hpp index f99c37b9af..8acf7793bc 100644 --- a/LiteLoader/include/llapi/mc/NpcI18nObserver.hpp +++ b/LiteLoader/include/llapi/mc/NpcI18nObserver.hpp @@ -30,32 +30,32 @@ class NpcI18nObserver { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcI18nObserver(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onLanguageChanged\@NpcI18nObserver\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 1 + * @symbol ?onLanguageChanged\@NpcI18nObserver\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void onLanguageChanged(std::string const &, bool); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCI18NOBSERVER /** - * @symbol ?onLanguageKeywordsLoadedFromPack\@NpcI18nObserver\@\@UEAAXAEBVPackManifest\@\@\@Z + * @symbol ?onLanguageKeywordsLoadedFromPack\@NpcI18nObserver\@\@UEAAXAEBVPackManifest\@\@\@Z */ MCVAPI void onLanguageKeywordsLoadedFromPack(class PackManifest const &); /** - * @symbol ?onLanguagesLoaded\@NpcI18nObserver\@\@UEAAXXZ + * @symbol ?onLanguagesLoaded\@NpcI18nObserver\@\@UEAAXXZ */ MCVAPI void onLanguagesLoaded(); #endif //private: /** - * @symbol ?_loadNpcData\@NpcI18nObserver\@\@AEAAXXZ + * @symbol ?_loadNpcData\@NpcI18nObserver\@\@AEAAXXZ */ MCAPI void _loadNpcData(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp index e3f82bdd53..78d77b873a 100644 --- a/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/NpcRequestPacket.hpp @@ -30,69 +30,75 @@ class NpcRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@NpcRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@NpcRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@NpcRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@NpcRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@NpcRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@NpcRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@NpcRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCREQUESTPACKET /** - * @symbol ??0NpcRequestPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NpcRequestPacket(); +#endif + /** + * @symbol ??0NpcRequestPacket\@\@QEAA\@XZ */ MCAPI NpcRequestPacket(); /** - * @symbol ?getInteractText\@NpcRequestPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getInteractText\@NpcRequestPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getInteractText() const; /** - * @symbol ?getNpcName\@NpcRequestPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getNpcName\@NpcRequestPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getNpcName() const; /** - * @symbol ?getSceneName\@NpcRequestPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSceneName\@NpcRequestPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getSceneName() const; /** - * @symbol ?getSkin\@NpcRequestPacket\@\@QEBAHXZ + * @symbol ?getSkin\@NpcRequestPacket\@\@QEBAHXZ */ MCAPI int getSkin() const; /** - * @symbol ?requestSetInteractText\@NpcRequestPacket\@\@SA?AV1\@VActorRuntimeID\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?requestSetInteractText\@NpcRequestPacket\@\@SA?AV1\@VActorRuntimeID\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class NpcRequestPacket requestSetInteractText(class ActorRuntimeID, std::string); /** - * @symbol ?requestSetName\@NpcRequestPacket\@\@SA?AV1\@VActorRuntimeID\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?requestSetName\@NpcRequestPacket\@\@SA?AV1\@VActorRuntimeID\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class NpcRequestPacket requestSetName(class ActorRuntimeID, std::string); /** - * @symbol ?requestSetSkin\@NpcRequestPacket\@\@SA?AV1\@VActorRuntimeID\@\@H\@Z + * @symbol ?requestSetSkin\@NpcRequestPacket\@\@SA?AV1\@VActorRuntimeID\@\@H\@Z */ MCAPI static class NpcRequestPacket requestSetSkin(class ActorRuntimeID, int); //private: /** - * @symbol ??0NpcRequestPacket\@\@AEAA\@VActorRuntimeID\@\@W4RequestType\@0\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@E\@Z + * @symbol ??0NpcRequestPacket\@\@AEAA\@VActorRuntimeID\@\@W4RequestType\@0\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@E\@Z */ MCAPI NpcRequestPacket(class ActorRuntimeID, enum class NpcRequestPacket::RequestType, std::string, unsigned char); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp b/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp index 3b5f1137ea..839588ed75 100644 --- a/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp +++ b/LiteLoader/include/llapi/mc/NpcSceneDialogueData.hpp @@ -34,71 +34,75 @@ class NpcSceneDialogueData { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcSceneDialogueData(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getDialogueText\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getDialogueText\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getDialogueText() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getNameText\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getNameText\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getNameText() const; /** - * @vftbl 4 - * @symbol ?getNameRawText\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getNameRawText\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getNameRawText() const; /** - * @vftbl 5 - * @symbol ?getSceneName\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getSceneName\@NpcSceneDialogueData\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getSceneName() const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol ?getActorUniqueID\@NpcSceneDialogueData\@\@UEAA?AUActorUniqueID\@\@XZ + * @vftbl 8 + * @symbol ?getActorUniqueID\@NpcSceneDialogueData\@\@UEAA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getActorUniqueID(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NPCSCENEDIALOGUEDATA /** - * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEAAPEAUNpcActionsContainer\@\@XZ + * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEAAPEAUNpcActionsContainer\@\@XZ */ MCVAPI struct NpcActionsContainer * getActionsContainer(); /** - * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEBAPEBUNpcActionsContainer\@\@XZ + * @symbol ?getActionsContainer\@NpcSceneDialogueData\@\@UEBAPEBUNpcActionsContainer\@\@XZ */ MCVAPI struct NpcActionsContainer const * getActionsContainer() const; /** - * @symbol ?getActor\@NpcSceneDialogueData\@\@UEAAPEAVActor\@\@XZ + * @symbol ?getActor\@NpcSceneDialogueData\@\@UEAAPEAVActor\@\@XZ */ MCVAPI class Actor * getActor(); /** - * @symbol ?getActor\@NpcSceneDialogueData\@\@UEBAPEBVActor\@\@XZ + * @symbol ?getActor\@NpcSceneDialogueData\@\@UEBAPEBVActor\@\@XZ */ MCVAPI class Actor const * getActor() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~NpcSceneDialogueData(); #endif /** - * @symbol ??0NpcSceneDialogueData\@\@QEAA\@VWeakEntityRef\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0NpcSceneDialogueData\@\@QEAA\@VWeakEntityRef\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI NpcSceneDialogueData(class WeakEntityRef, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcSystem.hpp b/LiteLoader/include/llapi/mc/NpcSystem.hpp index aa25527269..b1a8b66b11 100644 --- a/LiteLoader/include/llapi/mc/NpcSystem.hpp +++ b/LiteLoader/include/llapi/mc/NpcSystem.hpp @@ -30,23 +30,23 @@ class NpcSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@NpcSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@NpcSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?tickCountdown\@NpcSystem\@\@SAXAEAVEntityContext\@\@AEAULeaveMenuCountdown\@NpcComponents\@\@\@Z + * @symbol ?tickCountdown\@NpcSystem\@\@SAXAEAVEntityContext\@\@AEAULeaveMenuCountdown\@NpcComponents\@\@\@Z */ MCAPI static void tickCountdown(class EntityContext &, struct NpcComponents::LeaveMenuCountdown &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NpcSystemHelper.hpp b/LiteLoader/include/llapi/mc/NpcSystemHelper.hpp deleted file mode 100644 index 6e8bd02459..0000000000 --- a/LiteLoader/include/llapi/mc/NpcSystemHelper.hpp +++ /dev/null @@ -1,29 +0,0 @@ -/** - * @file NpcSystemHelper.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace NpcSystemHelper. - * - */ -namespace NpcSystemHelper { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?sendClosePacket@NpcSystemHelper@@YAXAEAVEntityContext@@AEBULeaveMenuCountdown@NpcComponents@@@Z - * @hash 1283826326 - */ - MCAPI void sendClosePacket(class EntityContext &, struct NpcComponents::LeaveMenuCountdown const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/NpcUrlAction.hpp b/LiteLoader/include/llapi/mc/NpcUrlAction.hpp index aaa5a87c56..cb227ede1f 100644 --- a/LiteLoader/include/llapi/mc/NpcUrlAction.hpp +++ b/LiteLoader/include/llapi/mc/NpcUrlAction.hpp @@ -30,18 +30,18 @@ class NpcUrlAction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NpcUrlAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?toJson\@NpcUrlAction\@\@UEAA?AVValue\@Json\@\@XZ + * @vftbl 1 + * @symbol ?toJson\@NpcUrlAction\@\@UEAA?AVValue\@Json\@\@XZ */ virtual class Json::Value toJson(); /** - * @symbol ??0NpcUrlAction\@\@QEAA\@XZ + * @symbol ??0NpcUrlAction\@\@QEAA\@XZ */ MCAPI NpcUrlAction(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NullLogger.hpp b/LiteLoader/include/llapi/mc/NullLogger.hpp index 4dc694d78e..a1cbbfbf55 100644 --- a/LiteLoader/include/llapi/mc/NullLogger.hpp +++ b/LiteLoader/include/llapi/mc/NullLogger.hpp @@ -30,18 +30,18 @@ class NullLogger { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NullLogger(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Logv\@NullLogger\@\@UEAAXPEBDPEAD\@Z + * @vftbl 1 + * @symbol ?Logv\@NullLogger\@\@UEAAXPEBDPEAD\@Z */ virtual void Logv(char const *, char *); /** - * @symbol ?instance\@NullLogger\@\@2V1\@A + * @symbol ?instance\@NullLogger\@\@2V1\@A */ MCAPI static class NullLogger instance; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NullSecureStorage.hpp b/LiteLoader/include/llapi/mc/NullSecureStorage.hpp index 0a235b1ffe..b38400f86f 100644 --- a/LiteLoader/include/llapi/mc/NullSecureStorage.hpp +++ b/LiteLoader/include/llapi/mc/NullSecureStorage.hpp @@ -31,21 +31,21 @@ class NullSecureStorage { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NULLSECURESTORAGE /** - * @symbol ?add\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?add\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI bool add(std::string const &, std::string const &); /** - * @symbol ?addOrUpdate\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?addOrUpdate\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI bool addOrUpdate(std::string const &, std::string const &); /** - * @symbol ?get\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z + * @symbol ?get\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ MCVAPI bool get(std::string const &, std::string &); /** - * @symbol ?remove\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?remove\@NullSecureStorage\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool remove(std::string const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NullSoundPlayer.hpp b/LiteLoader/include/llapi/mc/NullSoundPlayer.hpp index b7e38d23bb..429d390bab 100644 --- a/LiteLoader/include/llapi/mc/NullSoundPlayer.hpp +++ b/LiteLoader/include/llapi/mc/NullSoundPlayer.hpp @@ -31,202 +31,202 @@ class NullSoundPlayer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NullSoundPlayer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol ?getCurrentlyPlayingMusicName\@NullSoundPlayer\@\@UEAA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 15 + * @symbol ?getCurrentlyPlayingMusicName\@NullSoundPlayer\@\@UEAA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getCurrentlyPlayingMusicName(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol ?registerLoop\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXAEAULoopingSoundState\@\@\@Z\@3\@MM\@Z + * @vftbl 17 + * @symbol ?registerLoop\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXAEAULoopingSoundState\@\@\@Z\@3\@MM\@Z */ virtual unsigned __int64 registerLoop(std::string const &, class std::function, float, float); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol ?tryGetPlayingSoundAttributes\@NullSoundPlayer\@\@UEBA?AV?$optional\@UPlayingSoundAttributes\@\@\@std\@\@_K\@Z + * @vftbl 22 + * @symbol ?tryGetPlayingSoundAttributes\@NullSoundPlayer\@\@UEBA?AV?$optional\@UPlayingSoundAttributes\@\@\@std\@\@_K\@Z */ virtual class std::optional tryGetPlayingSoundAttributes(unsigned __int64) const; /** - * @vftbl 23 - * @symbol ?tryGetLoopingSoundAttributes\@NullSoundPlayer\@\@UEBA?AV?$optional\@ULoopingSoundAttributes\@\@\@std\@\@_K\@Z + * @vftbl 23 + * @symbol ?tryGetLoopingSoundAttributes\@NullSoundPlayer\@\@UEBA?AV?$optional\@ULoopingSoundAttributes\@\@\@std\@\@_K\@Z */ virtual class std::optional tryGetLoopingSoundAttributes(unsigned __int64) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_NULLSOUNDPLAYER /** - * @symbol ?fadeOut\@NullSoundPlayer\@\@UEAAX_KM\@Z + * @symbol ?fadeOut\@NullSoundPlayer\@\@UEAAX_KM\@Z */ MCVAPI void fadeOut(unsigned __int64, float); /** - * @symbol ?fadeToStopMusic\@NullSoundPlayer\@\@UEAAXM\@Z + * @symbol ?fadeToStopMusic\@NullSoundPlayer\@\@UEAAXM\@Z */ MCVAPI void fadeToStopMusic(float); /** - * @symbol ?getItem\@NullSoundPlayer\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@AEAVSoundItem\@\@\@Z + * @symbol ?getItem\@NullSoundPlayer\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@AEAVSoundItem\@\@\@Z */ MCVAPI bool getItem(std::string const &, class Core::Path const &, class SoundItem &) const; /** - * @symbol ?isLoadingMusic\@NullSoundPlayer\@\@UEBA_NXZ + * @symbol ?isLoadingMusic\@NullSoundPlayer\@\@UEBA_NXZ */ MCVAPI bool isLoadingMusic() const; /** - * @symbol ?isPlayingMusic\@NullSoundPlayer\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?isPlayingMusic\@NullSoundPlayer\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ MCVAPI bool isPlayingMusic(class Core::Path const &) const; /** - * @symbol ?isPlayingMusicEvent\@NullSoundPlayer\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isPlayingMusicEvent\@NullSoundPlayer\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI bool isPlayingMusicEvent(std::string const &) const; /** - * @symbol ?isPlayingSound\@NullSoundPlayer\@\@UEBA_N_K\@Z + * @symbol ?isPlayingSound\@NullSoundPlayer\@\@UEBA_N_K\@Z */ MCVAPI bool isPlayingSound(unsigned __int64) const; /** - * @symbol ?play\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + * @symbol ?play\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ MCVAPI unsigned __int64 play(std::string const &, class Vec3 const &, float, float); /** - * @symbol ?playAttached\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$function\@$$A6AXAEAUSoundInstanceProperties\@\@\@Z\@3\@\@Z + * @symbol ?playAttached\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAV?$function\@$$A6AXAEAUSoundInstanceProperties\@\@\@Z\@3\@\@Z */ MCVAPI unsigned __int64 playAttached(std::string const &, class std::function &&); /** - * @symbol ?playMusic\@NullSoundPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MAEAI\@Z + * @symbol ?playMusic\@NullSoundPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MAEAI\@Z */ MCVAPI void playMusic(std::string const &, float, unsigned int &); /** - * @symbol ?playMusic\@NullSoundPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z + * @symbol ?playMusic\@NullSoundPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@M\@Z */ MCVAPI void playMusic(std::string const &, float); /** - * @symbol ?playUI\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MM\@Z + * @symbol ?playUI\@NullSoundPlayer\@\@UEAA_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MM\@Z */ MCVAPI unsigned __int64 playUI(std::string const &, float, float); /** - * @symbol ?setMusicVolumeMultiplier\@NullSoundPlayer\@\@UEAAXM\@Z + * @symbol ?setMusicVolumeMultiplier\@NullSoundPlayer\@\@UEAAXM\@Z */ MCVAPI void setMusicVolumeMultiplier(float); /** - * @symbol ?stop\@NullSoundPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?stop\@NullSoundPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void stop(std::string const &); /** - * @symbol ?stop\@NullSoundPlayer\@\@UEAAX_K\@Z + * @symbol ?stop\@NullSoundPlayer\@\@UEAAX_K\@Z */ MCVAPI void stop(unsigned __int64); /** - * @symbol ?stopAllDelayedSoundActions\@NullSoundPlayer\@\@UEAAXXZ + * @symbol ?stopAllDelayedSoundActions\@NullSoundPlayer\@\@UEAAXXZ */ MCVAPI void stopAllDelayedSoundActions(); /** - * @symbol ?stopAllSounds\@NullSoundPlayer\@\@UEAAXXZ + * @symbol ?stopAllSounds\@NullSoundPlayer\@\@UEAAXXZ */ MCVAPI void stopAllSounds(); /** - * @symbol ?stopMusic\@NullSoundPlayer\@\@UEAAXXZ + * @symbol ?stopMusic\@NullSoundPlayer\@\@UEAAXXZ */ MCVAPI void stopMusic(); /** - * @symbol ?unregisterLoop\@NullSoundPlayer\@\@UEAAX_K_N\@Z + * @symbol ?unregisterLoop\@NullSoundPlayer\@\@UEAAX_K_N\@Z */ MCVAPI void unregisterLoop(unsigned __int64, bool); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/NyliumBlock.hpp b/LiteLoader/include/llapi/mc/NyliumBlock.hpp index af4cd7f9e3..37fa82ad4c 100644 --- a/LiteLoader/include/llapi/mc/NyliumBlock.hpp +++ b/LiteLoader/include/llapi/mc/NyliumBlock.hpp @@ -31,237 +31,242 @@ class NyliumBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~NyliumBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@NyliumBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@NyliumBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@NyliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@NyliumBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@NyliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@NyliumBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0NyliumBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0NyliumBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI NyliumBlock(std::string const &, int); /** - * @symbol ?canBeNylium\@NyliumBlock\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canBeNylium\@NyliumBlock\@\@QEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canBeNylium(class BlockSource const &, class BlockPos const &) const; /** - * @symbol ?crimsonBlockProvider\@NyliumBlock\@\@SAAEBVBlock\@\@AEBVRandomize\@\@\@Z + * @symbol ?crimsonBlockProvider\@NyliumBlock\@\@SAAEBVBlock\@\@AEBVRandomize\@\@\@Z */ MCAPI static class Block const & crimsonBlockProvider(class Randomize const &); /** - * @symbol ?netherSproutBlockProvider\@NyliumBlock\@\@SAAEBVBlock\@\@AEBVRandomize\@\@\@Z + * @symbol ?netherSproutBlockProvider\@NyliumBlock\@\@SAAEBVBlock\@\@AEBVRandomize\@\@\@Z */ MCAPI static class Block const & netherSproutBlockProvider(class Randomize const &); /** - * @symbol ?warpedBlockProvider\@NyliumBlock\@\@SAAEBVBlock\@\@AEBVRandomize\@\@\@Z + * @symbol ?warpedBlockProvider\@NyliumBlock\@\@SAAEBVBlock\@\@AEBVRandomize\@\@\@Z */ MCAPI static class Block const & warpedBlockProvider(class Randomize const &); //private: /** - * @symbol ?_scatterVegetation\@NyliumBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@V?$function\@$$A6AAEBVBlock\@\@AEBVRandomize\@\@\@Z\@std\@\@\@Z + * @symbol ?_scatterVegetation\@NyliumBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@V?$function\@$$A6AAEBVBlock\@\@AEBVRandomize\@\@\@Z\@std\@\@\@Z */ MCAPI bool _scatterVegetation(class BlockSource &, class BlockPos const &, class Random &, class std::function) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OSInformation.hpp b/LiteLoader/include/llapi/mc/OSInformation.hpp index bb7b1ba8ec..f586d42760 100644 --- a/LiteLoader/include/llapi/mc/OSInformation.hpp +++ b/LiteLoader/include/llapi/mc/OSInformation.hpp @@ -28,7 +28,7 @@ struct OSInformation { public: /** - * @symbol ??1OSInformation\@\@QEAA\@XZ + * @symbol ??1OSInformation\@\@QEAA\@XZ */ MCAPI ~OSInformation(); diff --git a/LiteLoader/include/llapi/mc/Objective.hpp b/LiteLoader/include/llapi/mc/Objective.hpp index 65833d66c0..46933b1011 100644 --- a/LiteLoader/include/llapi/mc/Objective.hpp +++ b/LiteLoader/include/llapi/mc/Objective.hpp @@ -37,72 +37,72 @@ class Objective { public: /** - * @symbol ??0Objective\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVObjectiveCriteria\@\@\@Z + * @symbol ??0Objective\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVObjectiveCriteria\@\@\@Z */ MCAPI Objective(std::string const &, class ObjectiveCriteria const &); /** - * @symbol ?getCriteria\@Objective\@\@QEBAAEBVObjectiveCriteria\@\@XZ + * @symbol ?getCriteria\@Objective\@\@QEBAAEBVObjectiveCriteria\@\@XZ */ MCAPI class ObjectiveCriteria const & getCriteria() const; /** - * @symbol ?getDisplayName\@Objective\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDisplayName\@Objective\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getDisplayName() const; /** - * @symbol ?getName\@Objective\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@Objective\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getPlayerScore\@Objective\@\@QEBA?AUScoreInfo\@\@AEBUScoreboardId\@\@\@Z + * @symbol ?getPlayerScore\@Objective\@\@QEBA?AUScoreInfo\@\@AEBUScoreboardId\@\@\@Z */ MCAPI struct ScoreInfo getPlayerScore(struct ScoreboardId const &) const; /** - * @symbol ?getPlayerScoreRef\@Objective\@\@QEAA_NAEBUScoreboardId\@\@AEAUScoreInfoRef\@\@\@Z + * @symbol ?getPlayerScoreRef\@Objective\@\@QEAA_NAEBUScoreboardId\@\@AEAUScoreInfoRef\@\@\@Z */ MCAPI bool getPlayerScoreRef(struct ScoreboardId const &, struct ScoreInfoRef &); /** - * @symbol ?getPlayers\@Objective\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getPlayers\@Objective\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getPlayers() const; /** - * @symbol ?getScores\@Objective\@\@QEBAAEBV?$unordered_map\@UScoreboardId\@\@HU?$hash\@UScoreboardId\@\@\@std\@\@U?$equal_to\@UScoreboardId\@\@\@3\@V?$allocator\@U?$pair\@$$CBUScoreboardId\@\@H\@std\@\@\@3\@\@std\@\@XZ + * @symbol ?getScores\@Objective\@\@QEBAAEBV?$unordered_map\@UScoreboardId\@\@HU?$hash\@UScoreboardId\@\@\@std\@\@U?$equal_to\@UScoreboardId\@\@\@3\@V?$allocator\@U?$pair\@$$CBUScoreboardId\@\@H\@std\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getScores() const; /** - * @symbol ?hasScore\@Objective\@\@QEBA_NAEBUScoreboardId\@\@\@Z + * @symbol ?hasScore\@Objective\@\@QEBA_NAEBUScoreboardId\@\@\@Z */ MCAPI bool hasScore(struct ScoreboardId const &) const; /** - * @symbol ?hasScores\@Objective\@\@QEBA_NXZ + * @symbol ?hasScores\@Objective\@\@QEBA_NXZ */ MCAPI bool hasScores() const; /** - * @symbol ?setDisplayName\@Objective\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setDisplayName\@Objective\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setDisplayName(std::string const &); /** - * @symbol ??1Objective\@\@QEAA\@XZ + * @symbol ??1Objective\@\@QEAA\@XZ */ MCAPI ~Objective(); /** - * @symbol ?deserialize\@Objective\@\@SA?AV?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVScoreboard\@\@\@Z + * @symbol ?deserialize\@Objective\@\@SA?AV?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVScoreboard\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class CompoundTag const &, class Scoreboard &); /** - * @symbol ?serialize\@Objective\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z + * @symbol ?serialize\@Objective\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z */ MCAPI static std::unique_ptr serialize(class Objective const &); //private: /** - * @symbol ?_modifyPlayerScore\@Objective\@\@AEAA_NAEAHAEBUScoreboardId\@\@HW4PlayerScoreSetFunction\@\@\@Z + * @symbol ?_modifyPlayerScore\@Objective\@\@AEAA_NAEAHAEBUScoreboardId\@\@HW4PlayerScoreSetFunction\@\@\@Z */ MCAPI bool _modifyPlayerScore(int &, struct ScoreboardId const &, int, enum class PlayerScoreSetFunction); /** - * @symbol ?_resetPlayer\@Objective\@\@AEAAXAEBUScoreboardId\@\@\@Z + * @symbol ?_resetPlayer\@Objective\@\@AEAAXAEBUScoreboardId\@\@\@Z */ MCAPI void _resetPlayer(struct ScoreboardId const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp b/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp index 2b3663a6c1..a04d91cd90 100644 --- a/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp +++ b/LiteLoader/include/llapi/mc/ObjectiveCriteria.hpp @@ -30,24 +30,24 @@ class ObjectiveCriteria { public: /** - * @symbol ??0ObjectiveCriteria\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NW4ObjectiveRenderType\@\@\@Z + * @symbol ??0ObjectiveCriteria\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NW4ObjectiveRenderType\@\@\@Z */ MCAPI ObjectiveCriteria(std::string const &, bool, enum class ObjectiveRenderType); /** - * @symbol ?getName\@ObjectiveCriteria\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ObjectiveCriteria\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?isReadOnly\@ObjectiveCriteria\@\@QEBA_NXZ + * @symbol ?isReadOnly\@ObjectiveCriteria\@\@QEBA_NXZ */ MCAPI bool isReadOnly() const; /** - * @symbol ?deserialize\@ObjectiveCriteria\@\@SA?AV?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?deserialize\@ObjectiveCriteria\@\@SA?AV?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class CompoundTag const &); /** - * @symbol ?serialize\@ObjectiveCriteria\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z + * @symbol ?serialize\@ObjectiveCriteria\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z */ MCAPI static std::unique_ptr serialize(class ObjectiveCriteria const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ObserverBlock.hpp b/LiteLoader/include/llapi/mc/ObserverBlock.hpp index 03d11e25fb..a5c1c4765a 100644 --- a/LiteLoader/include/llapi/mc/ObserverBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObserverBlock.hpp @@ -31,275 +31,295 @@ class ObserverBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ObserverBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@ObserverBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@ObserverBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@ObserverBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@ObserverBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@ObserverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@ObserverBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 76 - * @symbol ?movedByPiston\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 76 + * @symbol ?movedByPiston\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void movedByPiston(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ObserverBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ObserverBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@ObserverBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@ObserverBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@ObserverBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@ObserverBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 150 - * @symbol ?getFaceFlip\@ObserverBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z + * @vftbl 150 + * @symbol ?getFaceFlip\@ObserverBlock\@\@UEBA?AW4Flip\@\@EAEBVBlock\@\@\@Z */ virtual enum class Flip getFaceFlip(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 162 + * @symbol ?onRemove\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void onRemove(class BlockSource &, class BlockPos const &) const; + /** + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ObserverBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0ObserverBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OBSERVERBLOCK + /** + * @symbol ?allowStateMismatchOnPlacement\@ObserverBlock\@\@UEBA_NAEBVBlock\@\@0\@Z + */ + MCVAPI bool allowStateMismatchOnPlacement(class Block const &, class Block const &) const; +#endif + /** + * @symbol ??0ObserverBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ObserverBlock(std::string const &, int); + /** + * @symbol ?MAX_TICK_DELAY\@ObserverBlock\@\@2UTick\@\@B + */ + MCAPI static struct Tick const MAX_TICK_DELAY; //private: /** - * @symbol ?_installCircuit\@ObserverBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N2\@Z + * @symbol ?_installCircuit\@ObserverBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N2\@Z */ MCAPI void _installCircuit(class BlockSource &, class BlockPos const &, bool, bool) const; /** - * @symbol ?_updateState\@ObserverBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVPulseCapacitor\@\@_N\@Z + * @symbol ?_updateState\@ObserverBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVPulseCapacitor\@\@_N\@Z */ MCAPI void _updateState(class BlockSource &, class BlockPos const &, class PulseCapacitor &, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp index d745178976..3dfd6fe229 100644 --- a/LiteLoader/include/llapi/mc/ObsidianBlock.hpp +++ b/LiteLoader/include/llapi/mc/ObsidianBlock.hpp @@ -31,207 +31,212 @@ class ObsidianBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ObsidianBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@ObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@ObsidianBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@ObsidianBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@ObsidianBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0ObsidianBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0ObsidianBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI ObsidianBlock(std::string const &, int, bool); /** - * @symbol ?poofParticles\@ObsidianBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?poofParticles\@ObsidianBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void poofParticles(class BlockSource &, class BlockPos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMixerOperationNode.hpp b/LiteLoader/include/llapi/mc/OceanMixerOperationNode.hpp index 4c8f8c189f..c2fed03f98 100644 --- a/LiteLoader/include/llapi/mc/OceanMixerOperationNode.hpp +++ b/LiteLoader/include/llapi/mc/OceanMixerOperationNode.hpp @@ -30,33 +30,33 @@ class OceanMixerOperationNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMixerOperationNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_fillArea\@OceanMixerOperationNode\@\@MEBAXAEAV?$WorkingData\@PEAVBiome\@\@PEAV1\@\@OperationNodeDetails\@\@AEBVPos2d\@\@1HV?$OperationGraphResult\@W4BiomeTemperatureCategory\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?_fillArea\@OceanMixerOperationNode\@\@MEBAXAEAV?$WorkingData\@PEAVBiome\@\@PEAV1\@\@OperationNodeDetails\@\@AEBVPos2d\@\@1HV?$OperationGraphResult\@W4BiomeTemperatureCategory\@\@\@\@\@Z */ virtual void _fillArea(class OperationNodeDetails::WorkingData &, class Pos2d const &, class Pos2d const &, int, class OperationGraphResult) const; /** - * @vftbl 4 - * @symbol ?_getAreaRead\@OceanMixerOperationNode\@\@MEBA?AV?$tuple\@VPos2d\@\@V1\@\@std\@\@AEBVPos2d\@\@0\@Z + * @vftbl 4 + * @symbol ?_getAreaRead\@OceanMixerOperationNode\@\@MEBA?AV?$tuple\@VPos2d\@\@V1\@\@std\@\@AEBVPos2d\@\@0\@Z */ virtual class std::tuple _getAreaRead(class Pos2d const &, class Pos2d const &) const; /** - * @symbol ??0OceanMixerOperationNode\@\@QEAA\@IAEAV?$shared_ptr\@V?$OperationNode\@PEAVBiome\@\@VPos2d\@\@\@\@\@std\@\@AEAV?$shared_ptr\@V?$OperationNode\@W4BiomeTemperatureCategory\@\@VPos2d\@\@\@\@\@2\@AEBVBiomeRegistry\@\@AEAVBiome\@\@3\@Z + * @symbol ??0OceanMixerOperationNode\@\@QEAA\@IAEAV?$shared_ptr\@V?$OperationNode\@PEAVBiome\@\@VPos2d\@\@\@\@\@std\@\@AEAV?$shared_ptr\@V?$OperationNode\@W4BiomeTemperatureCategory\@\@VPos2d\@\@\@\@\@2\@AEBVBiomeRegistry\@\@AEAVBiome\@\@3\@Z */ MCAPI OceanMixerOperationNode(unsigned int, class std::shared_ptr> &, class std::shared_ptr> &, class BiomeRegistry const &, class Biome &, class Biome &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp index ccae82cf76..9189d62166 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentCoreRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentCoreRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentCoreRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentCoreRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentCoreRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentCoreRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentCoreRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp index 1bd9b9b14a..57bd31c139 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentDoubleXRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentDoubleXRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentDoubleXRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentDoubleXRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentDoubleXRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentDoubleXRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp index 3d52501b61..eafead084b 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleXYRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentDoubleXYRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentDoubleXYRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentDoubleXYRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentDoubleXYRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentDoubleXYRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentDoubleXYRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp index 001ac52802..bbc5b41f79 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentDoubleYRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentDoubleYRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentDoubleYRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentDoubleYRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentDoubleYRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentDoubleYRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp index 5867d70082..1cacd52136 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleYZRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentDoubleYZRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentDoubleYZRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentDoubleYZRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentDoubleYZRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentDoubleYZRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentDoubleYZRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp index 4a0cf90d00..e86ebf01f6 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentDoubleZRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentDoubleZRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentDoubleZRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentDoubleZRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentDoubleZRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentDoubleZRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentDoubleZRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp index 42a48367a7..83cfac2995 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentEntryRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentEntryRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentEntryRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentEntryRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentEntryRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentEntryRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentEntryRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp b/LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp index ad1c2cfcae..4dbe934183 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentFeature.hpp @@ -31,43 +31,43 @@ class OceanMonumentFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shouldAddHardcodedSpawnAreas\@OceanMonumentFeature\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?shouldAddHardcodedSpawnAreas\@OceanMonumentFeature\@\@UEBA_NXZ */ virtual bool shouldAddHardcodedSpawnAreas() const; /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@OceanMonumentFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@OceanMonumentFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@OceanMonumentFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@OceanMonumentFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 4 - * @symbol ?initMobSpawnTypes\@OceanMonumentFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z + * @vftbl 4 + * @symbol ?initMobSpawnTypes\@OceanMonumentFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z */ virtual void initMobSpawnTypes(class HardcodedSpawnAreaRegistry &); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@OceanMonumentFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@OceanMonumentFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@OceanMonumentFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@OceanMonumentFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0OceanMonumentFeature\@\@QEAA\@I\@Z + * @symbol ??0OceanMonumentFeature\@\@QEAA\@I\@Z */ MCAPI OceanMonumentFeature(unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp b/LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp index 3f6e1c538c..08bcaddeb5 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentPenthouse.hpp @@ -31,24 +31,24 @@ class OceanMonumentPenthouse : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentPenthouse(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentPenthouse\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentPenthouse\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentPenthouse\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentPenthouse\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@OceanMonumentPenthouse\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@OceanMonumentPenthouse\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp b/LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp index a55ebd151b..ec6d0c4b53 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentPiece.hpp @@ -31,81 +31,87 @@ class OceanMonumentPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@OceanMonumentPiece\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@OceanMonumentPiece\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 7 - * @symbol ?getWorldX\@OceanMonumentPiece\@\@UEAAHHH\@Z + * @vftbl 7 + * @symbol ?getWorldX\@OceanMonumentPiece\@\@UEAAHHH\@Z */ virtual int getWorldX(int, int); /** - * @vftbl 8 - * @symbol ?getWorldZ\@OceanMonumentPiece\@\@UEAAHHH\@Z + * @vftbl 8 + * @symbol ?getWorldZ\@OceanMonumentPiece\@\@UEAAHHH\@Z */ virtual int getWorldZ(int, int); /** - * @vftbl 12 - * @symbol ?addHardcodedSpawnAreas\@OceanMonumentPiece\@\@UEBAXAEAVLevelChunk\@\@\@Z + * @vftbl 12 + * @symbol ?addHardcodedSpawnAreas\@OceanMonumentPiece\@\@UEBAXAEAVLevelChunk\@\@\@Z */ virtual void addHardcodedSpawnAreas(class LevelChunk &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OCEANMONUMENTPIECE /** - * @symbol ??0OceanMonumentPiece\@\@QEAA\@AEAHAEAVBoundingBox\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~OceanMonumentPiece(); +#endif + /** + * @symbol ??0OceanMonumentPiece\@\@QEAA\@AEAHAEAVBoundingBox\@\@\@Z */ MCAPI OceanMonumentPiece(int &, class BoundingBox &); //protected: /** - * @symbol ??0OceanMonumentPiece\@\@IEAA\@HAEAHV?$shared_ptr\@VRoomDefinition\@\@\@std\@\@HHH\@Z + * @symbol ??0OceanMonumentPiece\@\@IEAA\@HAEAHV?$shared_ptr\@VRoomDefinition\@\@\@std\@\@HHH\@Z */ MCAPI OceanMonumentPiece(int, int &, class std::shared_ptr, int, int, int); /** - * @symbol ?chunkIntersects\@OceanMonumentPiece\@\@IEAA_NAEBVBoundingBox\@\@HHHH\@Z + * @symbol ?chunkIntersects\@OceanMonumentPiece\@\@IEAA_NAEBVBoundingBox\@\@HHHH\@Z */ MCAPI bool chunkIntersects(class BoundingBox const &, int, int, int, int); /** - * @symbol ?generateDefaultFloor\@OceanMonumentPiece\@\@IEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HH_N\@Z + * @symbol ?generateDefaultFloor\@OceanMonumentPiece\@\@IEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HH_N\@Z */ MCAPI void generateDefaultFloor(class BlockSource &, class BoundingBox const &, int, int, bool); /** - * @symbol ?spawnElder\@OceanMonumentPiece\@\@IEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHH\@Z + * @symbol ?spawnElder\@OceanMonumentPiece\@\@IEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHH\@Z */ MCAPI void spawnElder(class BlockSource &, class BoundingBox const &, int, int, int); protected: /** - * @symbol ?mGridroomLeftWingConnectIndex\@OceanMonumentPiece\@\@1HA + * @symbol ?mGridroomLeftWingConnectIndex\@OceanMonumentPiece\@\@1HA */ MCAPI static int mGridroomLeftWingConnectIndex; /** - * @symbol ?mGridroomRightWingConnectIndex\@OceanMonumentPiece\@\@1HA + * @symbol ?mGridroomRightWingConnectIndex\@OceanMonumentPiece\@\@1HA */ MCAPI static int mGridroomRightWingConnectIndex; /** - * @symbol ?mGridroomSourceIndex\@OceanMonumentPiece\@\@1HA + * @symbol ?mGridroomSourceIndex\@OceanMonumentPiece\@\@1HA */ MCAPI static int mGridroomSourceIndex; /** - * @symbol ?mGridroomTopConnectIndex\@OceanMonumentPiece\@\@1HA + * @symbol ?mGridroomTopConnectIndex\@OceanMonumentPiece\@\@1HA */ MCAPI static int mGridroomTopConnectIndex; /** - * @symbol ?mLeftWingIndex\@OceanMonumentPiece\@\@1HB + * @symbol ?mLeftWingIndex\@OceanMonumentPiece\@\@1HB */ MCAPI static int const mLeftWingIndex; /** - * @symbol ?mPenthouseIndex\@OceanMonumentPiece\@\@1HB + * @symbol ?mPenthouseIndex\@OceanMonumentPiece\@\@1HB */ MCAPI static int const mPenthouseIndex; /** - * @symbol ?mRightWingIndex\@OceanMonumentPiece\@\@1HB + * @symbol ?mRightWingIndex\@OceanMonumentPiece\@\@1HB */ MCAPI static int const mRightWingIndex; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp index 6e5a211331..ff6c132840 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentSimpleRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentSimpleRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentSimpleRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentSimpleRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentSimpleRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentSimpleRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentSimpleRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp index 357482e30f..6fc06730e8 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentSimpleTopRoom.hpp @@ -31,19 +31,19 @@ class OceanMonumentSimpleTopRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentSimpleTopRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentSimpleTopRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentSimpleTopRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentSimpleTopRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentSimpleTopRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentStart.hpp b/LiteLoader/include/llapi/mc/OceanMonumentStart.hpp index 5613211130..dfa2377ba6 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentStart.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentStart.hpp @@ -30,18 +30,18 @@ class OceanMonumentStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?postProcess\@OceanMonumentStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 1 + * @symbol ?postProcess\@OceanMonumentStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?createMonument\@OceanMonumentStart\@\@QEAAXAEAVDimension\@\@AEAVRandom\@\@HH\@Z + * @symbol ?createMonument\@OceanMonumentStart\@\@QEAAXAEAVDimension\@\@AEAVRandom\@\@HH\@Z */ MCAPI void createMonument(class Dimension &, class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp b/LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp index f2cea1eb2c..fd8ef22a83 100644 --- a/LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp +++ b/LiteLoader/include/llapi/mc/OceanMonumentWingRoom.hpp @@ -31,24 +31,24 @@ class OceanMonumentWingRoom : public OceanMonumentPiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanMonumentWingRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@OceanMonumentWingRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@OceanMonumentWingRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@OceanMonumentWingRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@OceanMonumentWingRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@OceanMonumentWingRoom\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@OceanMonumentWingRoom\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanRuinFeature.hpp b/LiteLoader/include/llapi/mc/OceanRuinFeature.hpp index ae4646ac93..bf87a301ae 100644 --- a/LiteLoader/include/llapi/mc/OceanRuinFeature.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinFeature.hpp @@ -31,28 +31,28 @@ class OceanRuinFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanRuinFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@OceanRuinFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@OceanRuinFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@OceanRuinFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@OceanRuinFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@OceanRuinFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@OceanRuinFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0OceanRuinFeature\@\@QEAA\@AEAVOceanMonumentFeature\@\@IAEBVBaseGameVersion\@\@\@Z + * @symbol ??0OceanRuinFeature\@\@QEAA\@AEAVOceanMonumentFeature\@\@IAEBVBaseGameVersion\@\@\@Z */ MCAPI OceanRuinFeature(class OceanMonumentFeature &, unsigned int, class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp b/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp index 37aa97baef..17354c5219 100644 --- a/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinPieces.hpp @@ -31,84 +31,84 @@ class OceanRuinPieces { public: /** - * @symbol ?addPieces\@OceanRuinPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEBUOceanRuinConfiguration\@\@\@Z + * @symbol ?addPieces\@OceanRuinPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEBUOceanRuinConfiguration\@\@\@Z */ MCAPI static void addPieces(class gsl::not_null>, class BlockPos const &, enum class Rotation const &, std::vector> &, class Random &, struct OceanRuinConfiguration const &); //private: /** - * @symbol ?_addClusterRuins\@OceanRuinPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVRandom\@\@AEBW4Rotation\@\@AEBVBlockPos\@\@AEBUOceanRuinConfiguration\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_addClusterRuins\@OceanRuinPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVRandom\@\@AEBW4Rotation\@\@AEBVBlockPos\@\@AEBUOceanRuinConfiguration\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI static void _addClusterRuins(class gsl::not_null>, class Random &, enum class Rotation const &, class BlockPos const &, struct OceanRuinConfiguration const &, std::vector> &); /** - * @symbol ?_addPiece\@OceanRuinPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEBUOceanRuinConfiguration\@\@_NM\@Z + * @symbol ?_addPiece\@OceanRuinPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEBUOceanRuinConfiguration\@\@_NM\@Z */ MCAPI static void _addPiece(class gsl::not_null>, class BlockPos const &, enum class Rotation const &, std::vector> &, class Random &, struct OceanRuinConfiguration const &, bool, float); /** - * @symbol ?_allPositions\@OceanRuinPieces\@\@CA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVRandom\@\@HHH\@Z + * @symbol ?_allPositions\@OceanRuinPieces\@\@CA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVRandom\@\@HHH\@Z */ MCAPI static std::vector _allPositions(class Random &, int, int, int); private: /** - * @symbol ?BIG_RUIN_LOOT\@OceanRuinPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?BIG_RUIN_LOOT\@OceanRuinPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span BIG_RUIN_LOOT; + MCAPI static class std::basic_string_view> BIG_RUIN_LOOT; /** - * @symbol ?RUIN_LOOT\@OceanRuinPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?RUIN_LOOT\@OceanRuinPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span RUIN_LOOT; + MCAPI static class std::basic_string_view> RUIN_LOOT; /** - * @symbol ?STRUCTURE_BIG_RUIN1_BRICK\@OceanRuinPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?STRUCTURE_BIG_RUIN1_BRICK\@OceanRuinPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span STRUCTURE_BIG_RUIN1_BRICK; + MCAPI static class std::basic_string_view> STRUCTURE_BIG_RUIN1_BRICK; /** - * @symbol ?STRUCTURE_BIG_RUIN8_BRICK\@OceanRuinPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?STRUCTURE_BIG_RUIN8_BRICK\@OceanRuinPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span STRUCTURE_BIG_RUIN8_BRICK; + MCAPI static class std::basic_string_view> STRUCTURE_BIG_RUIN8_BRICK; /** - * @symbol ?STRUCTURE_RUIN_2_BRICK\@OceanRuinPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?STRUCTURE_RUIN_2_BRICK\@OceanRuinPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span STRUCTURE_RUIN_2_BRICK; + MCAPI static class std::basic_string_view> STRUCTURE_RUIN_2_BRICK; /** - * @symbol ?STRUCTURE_RUIN_3_BRICK\@OceanRuinPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?STRUCTURE_RUIN_3_BRICK\@OceanRuinPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span STRUCTURE_RUIN_3_BRICK; + MCAPI static class std::basic_string_view> STRUCTURE_RUIN_3_BRICK; /** - * @symbol ?bigRuinsBrick\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?bigRuinsBrick\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span bigRuinsBrick[]; + MCAPI static class std::basic_string_view> bigRuinsBrick[]; /** - * @symbol ?bigRuinsCracked\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?bigRuinsCracked\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span bigRuinsCracked[]; + MCAPI static class std::basic_string_view> bigRuinsCracked[]; /** - * @symbol ?bigRuinsMossy\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?bigRuinsMossy\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span bigRuinsMossy[]; + MCAPI static class std::basic_string_view> bigRuinsMossy[]; /** - * @symbol ?bigWarmRuins\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?bigWarmRuins\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span bigWarmRuins[]; + MCAPI static class std::basic_string_view> bigWarmRuins[]; /** - * @symbol ?mSettings\@OceanRuinPieces\@\@0VLegacyStructureSettings\@\@A + * @symbol ?mSettings\@OceanRuinPieces\@\@0VLegacyStructureSettings\@\@A */ MCAPI static class LegacyStructureSettings mSettings; /** - * @symbol ?ruinsBrick\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?ruinsBrick\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span ruinsBrick[]; + MCAPI static class std::basic_string_view> ruinsBrick[]; /** - * @symbol ?ruinsCracked\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?ruinsCracked\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span ruinsCracked[]; + MCAPI static class std::basic_string_view> ruinsCracked[]; /** - * @symbol ?ruinsMossy\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?ruinsMossy\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span ruinsMossy[]; + MCAPI static class std::basic_string_view> ruinsMossy[]; /** - * @symbol ?warmRuins\@OceanRuinPieces\@\@0PAV?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?warmRuins\@OceanRuinPieces\@\@0PAV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span warmRuins[]; + MCAPI static class std::basic_string_view> warmRuins[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OceanRuinStart.hpp b/LiteLoader/include/llapi/mc/OceanRuinStart.hpp index 26babb2b6f..2eecd4b8d4 100644 --- a/LiteLoader/include/llapi/mc/OceanRuinStart.hpp +++ b/LiteLoader/include/llapi/mc/OceanRuinStart.hpp @@ -31,13 +31,13 @@ class OceanRuinStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OceanRuinStart(); + virtual void __unk_vfn_0(); /** - * @symbol ?createRuin\@OceanRuinStart\@\@QEAAXAEAVDimension\@\@AEAVRandom\@\@HH\@Z + * @symbol ?createRuin\@OceanRuinStart\@\@QEAAXAEAVDimension\@\@AEAVRandom\@\@HH\@Z */ MCAPI void createRuin(class Dimension &, class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Ocelot.hpp b/LiteLoader/include/llapi/mc/Ocelot.hpp index dddfeafc2c..83f7e128ba 100644 --- a/LiteLoader/include/llapi/mc/Ocelot.hpp +++ b/LiteLoader/include/llapi/mc/Ocelot.hpp @@ -32,156 +32,151 @@ class Ocelot : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Ocelot(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Ocelot\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Ocelot\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 350 - * @symbol ?_serverAiMobStep\@Ocelot\@\@UEAAXXZ + * @vftbl 347 + * @symbol ?_serverAiMobStep\@Ocelot\@\@UEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Ocelot\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Ocelot\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Ocelot(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?SNEAK_SPEED_MOD\@Ocelot\@\@2MB + * @symbol ?SNEAK_SPEED_MOD\@Ocelot\@\@2MB */ MCAPI static float const SNEAK_SPEED_MOD; /** - * @symbol ?SPRINT_SPEED_MOD\@Ocelot\@\@2MB + * @symbol ?SPRINT_SPEED_MOD\@Ocelot\@\@2MB */ MCAPI static float const SPRINT_SPEED_MOD; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp b/LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp index 23541e27b8..20ff9efd74 100644 --- a/LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OcelotAttackDefinition.hpp @@ -30,16 +30,16 @@ class OcelotAttackDefinition { public: /** - * @symbol ??0OcelotAttackDefinition\@\@QEAA\@XZ + * @symbol ??0OcelotAttackDefinition\@\@QEAA\@XZ */ MCAPI OcelotAttackDefinition(); /** - * @symbol ?initialize\@OcelotAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOcelotAttackGoal\@\@\@Z + * @symbol ?initialize\@OcelotAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOcelotAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class OcelotAttackGoal &) const; /** - * @symbol ?buildSchema\@OcelotAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VOcelotAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@OcelotAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VOcelotAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp b/LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp index 3c9f386526..0466519699 100644 --- a/LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/OcelotAttackGoal.hpp @@ -30,48 +30,48 @@ class OcelotAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OcelotAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@OcelotAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@OcelotAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@OcelotAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@OcelotAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?stop\@OcelotAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@OcelotAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@OcelotAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@OcelotAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@OcelotAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@OcelotAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0OcelotAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0OcelotAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI OcelotAttackGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp b/LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp index c27d53843c..d89e6c91d1 100644 --- a/LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/OcelotSitOnBlockGoal.hpp @@ -31,63 +31,63 @@ class OcelotSitOnBlockGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OcelotSitOnBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@OcelotSitOnBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@OcelotSitOnBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@OcelotSitOnBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@OcelotSitOnBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@OcelotSitOnBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@OcelotSitOnBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@OcelotSitOnBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@OcelotSitOnBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@OcelotSitOnBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@OcelotSitOnBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@OcelotSitOnBlockGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@OcelotSitOnBlockGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 13 - * @symbol ?_canReach\@OcelotSitOnBlockGoal\@\@UEAA_NAEBVBlockPos\@\@\@Z + * @vftbl 13 + * @symbol ?_canReach\@OcelotSitOnBlockGoal\@\@UEAA_NAEBVBlockPos\@\@\@Z */ virtual bool _canReach(class BlockPos const &); /** - * @symbol ??0OcelotSitOnBlockGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0OcelotSitOnBlockGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI OcelotSitOnBlockGoal(class Mob &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp b/LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp index 034a00028b..73f4a8e61b 100644 --- a/LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp +++ b/LiteLoader/include/llapi/mc/OfferFlowerGoal.hpp @@ -30,52 +30,52 @@ class OfferFlowerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OfferFlowerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@OfferFlowerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@OfferFlowerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@OfferFlowerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@OfferFlowerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@OfferFlowerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@OfferFlowerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@OfferFlowerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@OfferFlowerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@OfferFlowerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@OfferFlowerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@OfferFlowerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@OfferFlowerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0OfferFlowerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0OfferFlowerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI OfferFlowerGoal(class Mob &); /** - * @symbol ?getMaxOfferFlowerDurationTicks\@OfferFlowerGoal\@\@QEBAHXZ + * @symbol ?getMaxOfferFlowerDurationTicks\@OfferFlowerGoal\@\@QEBAHXZ */ MCAPI int getMaxOfferFlowerDurationTicks() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp b/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp index ce784f5bfe..269d251e74 100644 --- a/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/OfferFlowerTickSystem.hpp @@ -28,16 +28,16 @@ class OfferFlowerTickSystem { public: /** - * @symbol ?createSystem\@OfferFlowerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@OfferFlowerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doOfferFlowerTickSystem\@OfferFlowerTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUOfferFlowerTickComponent\@\@\@Z + * @symbol ?_doOfferFlowerTickSystem\@OfferFlowerTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUOfferFlowerTickComponent\@\@\@Z */ MCAPI static void _doOfferFlowerTickSystem(class StrictEntityContext const &, struct OfferFlowerTickComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OfferFlowerTickUtility.hpp b/LiteLoader/include/llapi/mc/OfferFlowerTickUtility.hpp index b53e260624..8a5fe18358 100644 --- a/LiteLoader/include/llapi/mc/OfferFlowerTickUtility.hpp +++ b/LiteLoader/include/llapi/mc/OfferFlowerTickUtility.hpp @@ -20,7 +20,7 @@ namespace OfferFlowerTickUtility { #undef AFTER_EXTRA /** - * @symbol ?offerFlower\@OfferFlowerTickUtility\@\@YAX_NAEAVActor\@\@H\@Z + * @symbol ?offerFlower\@OfferFlowerTickUtility\@\@YAX_NAEAVActor\@\@H\@Z */ MCAPI void offerFlower(bool, class Actor &, int); diff --git a/LiteLoader/include/llapi/mc/OffhandContainerValidation.hpp b/LiteLoader/include/llapi/mc/OffhandContainerValidation.hpp index fc99e3213d..fa42e733ad 100644 --- a/LiteLoader/include/llapi/mc/OffhandContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/OffhandContainerValidation.hpp @@ -31,54 +31,54 @@ class OffhandContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OffhandContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@OffhandContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@OffhandContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?isItemAllowedToRemove\@OffhandContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 5 + * @symbol ?isItemAllowedToRemove\@OffhandContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVItemStackBase\@\@\@Z */ virtual bool isItemAllowedToRemove(class ContainerScreenContext const &, class ItemStackBase const &) const; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OFFHANDCONTAINERVALIDATION /** - * @symbol ?canItemMoveToContainer\@OffhandContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?canItemMoveToContainer\@OffhandContainerValidation\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ MCVAPI bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @symbol ?getContainerOffset\@OffhandContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @symbol ?getContainerOffset\@OffhandContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ MCVAPI int getContainerOffset(class ContainerScreenContext const &) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OffsetsComponent.hpp b/LiteLoader/include/llapi/mc/OffsetsComponent.hpp index a8e4478db8..cd9850eb8e 100644 --- a/LiteLoader/include/llapi/mc/OffsetsComponent.hpp +++ b/LiteLoader/include/llapi/mc/OffsetsComponent.hpp @@ -28,7 +28,7 @@ struct OffsetsComponent { public: /** - * @symbol ??8OffsetsComponent\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8OffsetsComponent\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct OffsetsComponent const &) const; diff --git a/LiteLoader/include/llapi/mc/OldLeafBlock.hpp b/LiteLoader/include/llapi/mc/OldLeafBlock.hpp index 369c76f87d..4904362792 100644 --- a/LiteLoader/include/llapi/mc/OldLeafBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLeafBlock.hpp @@ -31,243 +31,248 @@ class OldLeafBlock : public LeafBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OldLeafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@OldLeafBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@OldLeafBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@OldLeafBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@OldLeafBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 136 - * @symbol ?getColor\@OldLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@OldLeafBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 146 - * @symbol ?getVariant\@OldLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@OldLeafBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 180 - * @symbol ?getRenderLayer\@OldLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 181 + * @symbol ?getRenderLayer\@OldLeafBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@OldLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @symbol ?getMapColor\@OldLeafBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@OldLeafBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getExtraResourceItem\@OldLeafBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getExtraResourceItem\@OldLeafBlock\@\@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 ??0OldLeafBlock\@\@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); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OldLogBlock.hpp b/LiteLoader/include/llapi/mc/OldLogBlock.hpp index cde37053ed..f7a270afb6 100644 --- a/LiteLoader/include/llapi/mc/OldLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/OldLogBlock.hpp @@ -31,233 +31,238 @@ class OldLogBlock : public LogBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OldLogBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@OldLogBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@OldLogBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@OldLogBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@OldLogBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@OldLogBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@OldLogBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@OldLogBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@OldLogBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@OldLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 185 + * @symbol ?getMapColor\@OldLogBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@OldLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0OldLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0OldLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI OldLogBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp b/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp index 90559af8e3..192f108a29 100644 --- a/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnActorEnterVolumeComponent.hpp @@ -28,8 +28,8 @@ class OnActorEnterVolumeComponent { public: /** - * @symbol ??1OnActorEnterVolumeComponent\@\@QEAA\@XZ + * @symbol ??1OnActorEnterVolumeComponent\@\@QEAA\@XZ */ MCAPI ~OnActorEnterVolumeComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp b/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp index 3b3a435df8..e1b0956b81 100644 --- a/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnActorEnterVolumeDefinition.hpp @@ -30,19 +30,19 @@ struct OnActorEnterVolumeDefinition { public: /** - * @symbol ?initialize\@OnActorEnterVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOnActorEnterVolumeComponent\@\@\@Z + * @symbol ?initialize\@OnActorEnterVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOnActorEnterVolumeComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class OnActorEnterVolumeComponent &) const; /** - * @symbol ??1OnActorEnterVolumeDefinition\@\@QEAA\@XZ + * @symbol ??1OnActorEnterVolumeDefinition\@\@QEAA\@XZ */ MCAPI ~OnActorEnterVolumeDefinition(); /** - * @symbol ?NAME\@OnActorEnterVolumeDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NAME\@OnActorEnterVolumeDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NAME; /** - * @symbol ?bindType\@OnActorEnterVolumeDefinition\@\@SAXXZ + * @symbol ?bindType\@OnActorEnterVolumeDefinition\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp index 24c141bc1b..512a261c4e 100644 --- a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeComponent.hpp @@ -28,8 +28,8 @@ class OnActorLeaveVolumeComponent { public: /** - * @symbol ??1OnActorLeaveVolumeComponent\@\@QEAA\@XZ + * @symbol ??1OnActorLeaveVolumeComponent\@\@QEAA\@XZ */ MCAPI ~OnActorLeaveVolumeComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp index b60d86651c..62c82e8e3b 100644 --- a/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnActorLeaveVolumeDefinition.hpp @@ -30,19 +30,19 @@ struct OnActorLeaveVolumeDefinition { public: /** - * @symbol ?initialize\@OnActorLeaveVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOnActorLeaveVolumeComponent\@\@\@Z + * @symbol ?initialize\@OnActorLeaveVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOnActorLeaveVolumeComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class OnActorLeaveVolumeComponent &) const; /** - * @symbol ??1OnActorLeaveVolumeDefinition\@\@QEAA\@XZ + * @symbol ??1OnActorLeaveVolumeDefinition\@\@QEAA\@XZ */ MCAPI ~OnActorLeaveVolumeDefinition(); /** - * @symbol ?NAME\@OnActorLeaveVolumeDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NAME\@OnActorLeaveVolumeDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NAME; /** - * @symbol ?bindType\@OnActorLeaveVolumeDefinition\@\@SAXXZ + * @symbol ?bindType\@OnActorLeaveVolumeDefinition\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/OnDeathDefinition.hpp b/LiteLoader/include/llapi/mc/OnDeathDefinition.hpp index 5ec5dd31cf..ec6a23ffca 100644 --- a/LiteLoader/include/llapi/mc/OnDeathDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnDeathDefinition.hpp @@ -31,7 +31,7 @@ struct OnDeathDefinition { public: /** - * @symbol ?buildSchema\@OnDeathDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnDeathDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnDeathDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnDeathDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp b/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp index be90ddd162..855521623c 100644 --- a/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp +++ b/LiteLoader/include/llapi/mc/OnExtractSideBySide.hpp @@ -28,7 +28,7 @@ struct OnExtractSideBySide { public: /** - * @symbol ?createContext\@OnExtractSideBySide\@\@QEBA?AUExtractionSystemContext\@\@XZ + * @symbol ?createContext\@OnExtractSideBySide\@\@QEBA?AUExtractionSystemContext\@\@XZ */ MCAPI struct ExtractionSystemContext createContext() const; diff --git a/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp b/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp index 78325c6691..0d44f578d9 100644 --- a/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnFallOnTrigger.hpp @@ -28,12 +28,12 @@ class OnFallOnTrigger { public: /** - * @symbol ??0OnFallOnTrigger\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0OnFallOnTrigger\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI OnFallOnTrigger(class OnFallOnTrigger &&); /** - * @symbol ??1OnFallOnTrigger\@\@QEAA\@XZ + * @symbol ??1OnFallOnTrigger\@\@QEAA\@XZ */ MCAPI ~OnFallOnTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp index ce8dccd24c..e2ed60ac98 100644 --- a/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnFallOnTriggerDescription.hpp @@ -31,28 +31,28 @@ class OnFallOnTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnFallOnTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnFallOnTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnFallOnTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?initializeComponent\@OnFallOnTriggerDescription\@\@UEBAXAEAVEntityContext\@\@\@Z + * @vftbl 2 + * @symbol ?initializeComponent\@OnFallOnTriggerDescription\@\@UEBAXAEAVEntityContext\@\@\@Z */ virtual void initializeComponent(class EntityContext &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@OnFallOnTriggerDescription\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UBlockComponentGroupDescription\@\@\@JsonUtil\@\@\@std\@\@AEBVBlockComponentFactory\@\@\@Z + * @vftbl 3 + * @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; /** - * @symbol ?NameID\@OnFallOnTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnFallOnTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnFireComponent.hpp b/LiteLoader/include/llapi/mc/OnFireComponent.hpp index c96c0c3281..335bc339a4 100644 --- a/LiteLoader/include/llapi/mc/OnFireComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnFireComponent.hpp @@ -30,19 +30,19 @@ struct OnFireComponent { public: /** - * @symbol ?addAdditionalSaveData\@OnFireComponent\@\@QEBAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@OnFireComponent\@\@QEBAXAEBVActor\@\@AEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class Actor const &, class CompoundTag &) const; /** - * @symbol ?readAdditionalSaveData\@OnFireComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?readAdditionalSaveData\@OnFireComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &); /** - * @symbol ?convertFromLegacyData\@OnFireComponent\@\@SAXAEBVCompoundTag\@\@AEAV2\@\@Z + * @symbol ?convertFromLegacyData\@OnFireComponent\@\@SAXAEBVCompoundTag\@\@AEAV2\@\@Z */ MCAPI static void convertFromLegacyData(class CompoundTag const &, class CompoundTag &); /** - * @symbol ?needsLegacyConversion\@OnFireComponent\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?needsLegacyConversion\@OnFireComponent\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool needsLegacyConversion(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/OnFireServerSystem.hpp b/LiteLoader/include/llapi/mc/OnFireServerSystem.hpp index 3149ba358f..2f74c99d7a 100644 --- a/LiteLoader/include/llapi/mc/OnFireServerSystem.hpp +++ b/LiteLoader/include/llapi/mc/OnFireServerSystem.hpp @@ -30,27 +30,27 @@ class OnFireServerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnFireServerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@OnFireServerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@OnFireServerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickServer\@OnFireServerSystem\@\@CAXAEAVEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUOnFireComponent\@\@\@Z + * @symbol ?_tickServer\@OnFireServerSystem\@\@CAXAEAVEntityContext\@\@AEAVActorOwnerComponent\@\@AEAUOnFireComponent\@\@\@Z */ MCAPI static void _tickServer(class EntityContext &, class ActorOwnerComponent &, struct OnFireComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnFireSystem.hpp b/LiteLoader/include/llapi/mc/OnFireSystem.hpp index 480a15f8d6..9abd5bdc7c 100644 --- a/LiteLoader/include/llapi/mc/OnFireSystem.hpp +++ b/LiteLoader/include/llapi/mc/OnFireSystem.hpp @@ -30,32 +30,32 @@ class OnFireSystem { public: /** - * @symbol ?extinguishFire\@OnFireSystem\@\@SAXAEAVActor\@\@\@Z + * @symbol ?extinguishFire\@OnFireSystem\@\@SAXAEAVActor\@\@\@Z */ MCAPI static void extinguishFire(class Actor &); /** - * @symbol ?onFireChanged\@OnFireSystem\@\@SAXAEAVActor\@\@\@Z + * @symbol ?onFireChanged\@OnFireSystem\@\@SAXAEAVActor\@\@\@Z */ MCAPI static void onFireChanged(class Actor &); /** - * @symbol ?setOnFire\@OnFireSystem\@\@SAXAEAVActor\@\@H\@Z + * @symbol ?setOnFire\@OnFireSystem\@\@SAXAEAVActor\@\@H\@Z */ MCAPI static void setOnFire(class Actor &, int); /** - * @symbol ?setOnFireNoEffects\@OnFireSystem\@\@SAXAEAVActor\@\@H\@Z + * @symbol ?setOnFireNoEffects\@OnFireSystem\@\@SAXAEAVActor\@\@H\@Z */ MCAPI static void setOnFireNoEffects(class Actor &, int); /** - * @symbol ?stopFire\@OnFireSystem\@\@SAXAEAVActor\@\@\@Z + * @symbol ?stopFire\@OnFireSystem\@\@SAXAEAVActor\@\@\@Z */ MCAPI static void stopFire(class Actor &); //protected: /** - * @symbol ?_extinguishFireIfInWater\@OnFireSystem\@\@KA_NAEAVActor\@\@\@Z + * @symbol ?_extinguishFireIfInWater\@OnFireSystem\@\@KA_NAEAVActor\@\@\@Z */ MCAPI static bool _extinguishFireIfInWater(class Actor &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnFriendlyAngerDefinition.hpp b/LiteLoader/include/llapi/mc/OnFriendlyAngerDefinition.hpp index c4e75d232f..15ec030c65 100644 --- a/LiteLoader/include/llapi/mc/OnFriendlyAngerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnFriendlyAngerDefinition.hpp @@ -31,7 +31,7 @@ struct OnFriendlyAngerDefinition { public: /** - * @symbol ?buildSchema\@OnFriendlyAngerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnFriendlyAngerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnFriendlyAngerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnFriendlyAngerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp index a641d23231..9efa069c8f 100644 --- a/LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/OnHitSubcomponent.hpp @@ -29,41 +29,47 @@ class OnHitSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnHitSubcomponent(); + virtual void __unk_vfn_0() = 0; /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1() = 0; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2() = 0; /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ - virtual void __unk_vfn_3() = 0; + virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?getName\@OnHitSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@OnHitSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONHITSUBCOMPONENT /** - * @symbol ??0OnHitSubcomponent\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~OnHitSubcomponent(); +#endif + /** + * @symbol ??0OnHitSubcomponent\@\@QEAA\@XZ */ MCAPI OnHitSubcomponent(); //protected: /** - * @symbol ?_canAttack\@OnHitSubcomponent\@\@IEBA_NPEAVActor\@\@0\@Z + * @symbol ?_canAttack\@OnHitSubcomponent\@\@IEBA_NPEAVActor\@\@0\@Z */ MCAPI bool _canAttack(class Actor *, class Actor *) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnHurtByPlayerDefinition.hpp b/LiteLoader/include/llapi/mc/OnHurtByPlayerDefinition.hpp index 26b2ee4f03..2f3c51c732 100644 --- a/LiteLoader/include/llapi/mc/OnHurtByPlayerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnHurtByPlayerDefinition.hpp @@ -31,7 +31,7 @@ struct OnHurtByPlayerDefinition { public: /** - * @symbol ?buildSchema\@OnHurtByPlayerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnHurtByPlayerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnHurtByPlayerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnHurtByPlayerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnHurtDefinition.hpp b/LiteLoader/include/llapi/mc/OnHurtDefinition.hpp index b6c08de908..f1d1d72c98 100644 --- a/LiteLoader/include/llapi/mc/OnHurtDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnHurtDefinition.hpp @@ -31,7 +31,7 @@ struct OnHurtDefinition { public: /** - * @symbol ?buildSchema\@OnHurtDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnHurtDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnHurtDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnHurtDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnIgniteDefinition.hpp b/LiteLoader/include/llapi/mc/OnIgniteDefinition.hpp index 14159ae22a..40278dcf2c 100644 --- a/LiteLoader/include/llapi/mc/OnIgniteDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnIgniteDefinition.hpp @@ -31,7 +31,7 @@ struct OnIgniteDefinition { public: /** - * @symbol ?buildSchema\@OnIgniteDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnIgniteDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnIgniteDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnIgniteDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp b/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp index ea2e577135..3c7408e052 100644 --- a/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnInteractTrigger.hpp @@ -28,8 +28,8 @@ class OnInteractTrigger { public: /** - * @symbol ??1OnInteractTrigger\@\@QEAA\@XZ + * @symbol ??1OnInteractTrigger\@\@QEAA\@XZ */ MCAPI ~OnInteractTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp index 32698b5f51..485fe9d3ae 100644 --- a/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnInteractTriggerDescription.hpp @@ -31,33 +31,33 @@ class OnInteractTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnInteractTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnInteractTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnInteractTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@OnInteractTriggerDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@OnInteractTriggerDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@OnInteractTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@OnInteractTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@OnInteractTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@OnInteractTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@OnInteractTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnInteractTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp b/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp index 439a8278db..a4da8a7a48 100644 --- a/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnPlacedTrigger.hpp @@ -28,8 +28,8 @@ class OnPlacedTrigger { public: /** - * @symbol ??1OnPlacedTrigger\@\@QEAA\@XZ + * @symbol ??1OnPlacedTrigger\@\@QEAA\@XZ */ MCAPI ~OnPlacedTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp index 2cb5463337..d468fcc6db 100644 --- a/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlacedTriggerDescription.hpp @@ -31,18 +31,18 @@ class OnPlacedTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnPlacedTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnPlacedTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnPlacedTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @symbol ?NameID\@OnPlacedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnPlacedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp index 1a226cce67..b153d442f4 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTrigger.hpp @@ -28,8 +28,8 @@ class OnPlayerDestroyedTrigger { public: /** - * @symbol ??1OnPlayerDestroyedTrigger\@\@QEAA\@XZ + * @symbol ??1OnPlayerDestroyedTrigger\@\@QEAA\@XZ */ MCAPI ~OnPlayerDestroyedTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp index 681f7096d3..b02a682353 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerDestroyedTriggerDescription.hpp @@ -31,18 +31,18 @@ class OnPlayerDestroyedTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnPlayerDestroyedTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnPlayerDestroyedTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnPlayerDestroyedTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @symbol ?NameID\@OnPlayerDestroyedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnPlayerDestroyedTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp b/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp index fafe64927b..c78ab2a936 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerPlacingTrigger.hpp @@ -28,8 +28,8 @@ class OnPlayerPlacingTrigger { public: /** - * @symbol ??1OnPlayerPlacingTrigger\@\@QEAA\@XZ + * @symbol ??1OnPlayerPlacingTrigger\@\@QEAA\@XZ */ MCAPI ~OnPlayerPlacingTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp index 82eee97d07..de1ce6a77a 100644 --- a/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnPlayerPlacingTriggerDescription.hpp @@ -31,33 +31,33 @@ class OnPlayerPlacingTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnPlayerPlacingTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnPlayerPlacingTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnPlayerPlacingTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@OnPlayerPlacingTriggerDescription\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@OnPlayerPlacingTriggerDescription\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@OnPlayerPlacingTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@OnPlayerPlacingTriggerDescription\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@OnPlayerPlacingTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@OnPlayerPlacingTriggerDescription\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?NameID\@OnPlayerPlacingTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnPlayerPlacingTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp index 932baf744b..6ab6cda7e2 100644 --- a/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp +++ b/LiteLoader/include/llapi/mc/OnScreenTextureAnimationPacket.hpp @@ -30,37 +30,43 @@ class OnScreenTextureAnimationPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnScreenTextureAnimationPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@OnScreenTextureAnimationPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@OnScreenTextureAnimationPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@OnScreenTextureAnimationPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@OnScreenTextureAnimationPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@OnScreenTextureAnimationPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@OnScreenTextureAnimationPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@OnScreenTextureAnimationPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ONSCREENTEXTUREANIMATIONPACKET /** - * @symbol ??0OnScreenTextureAnimationPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI OnScreenTextureAnimationPacket(); + MCVAPI ~OnScreenTextureAnimationPacket(); +#endif /** - * @symbol ??0OnScreenTextureAnimationPacket\@\@QEAA\@I\@Z + * @symbol ??0OnScreenTextureAnimationPacket\@\@QEAA\@I\@Z */ MCAPI OnScreenTextureAnimationPacket(unsigned int); + /** + * @symbol ??0OnScreenTextureAnimationPacket\@\@QEAA\@XZ + */ + MCAPI OnScreenTextureAnimationPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnStartLandingDefinition.hpp b/LiteLoader/include/llapi/mc/OnStartLandingDefinition.hpp index b2f3ad805c..76815b6281 100644 --- a/LiteLoader/include/llapi/mc/OnStartLandingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnStartLandingDefinition.hpp @@ -31,7 +31,7 @@ struct OnStartLandingDefinition { public: /** - * @symbol ?buildSchema\@OnStartLandingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnStartLandingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnStartLandingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnStartLandingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnStartTakeoffDefinition.hpp b/LiteLoader/include/llapi/mc/OnStartTakeoffDefinition.hpp index 02f03a55d7..41151a3ea9 100644 --- a/LiteLoader/include/llapi/mc/OnStartTakeoffDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnStartTakeoffDefinition.hpp @@ -31,7 +31,7 @@ struct OnStartTakeoffDefinition { public: /** - * @symbol ?buildSchema\@OnStartTakeoffDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnStartTakeoffDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnStartTakeoffDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnStartTakeoffDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp b/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp index d80eddb7f6..22bba88e09 100644 --- a/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOffTrigger.hpp @@ -28,8 +28,8 @@ class OnStepOffTrigger { public: /** - * @symbol ??1OnStepOffTrigger\@\@QEAA\@XZ + * @symbol ??1OnStepOffTrigger\@\@QEAA\@XZ */ MCAPI ~OnStepOffTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp index cd76f30fec..8f146d3c97 100644 --- a/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOffTriggerDescription.hpp @@ -31,18 +31,18 @@ class OnStepOffTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnStepOffTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnStepOffTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnStepOffTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @symbol ?NameID\@OnStepOffTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnStepOffTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp b/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp index 0d1be8c0ff..b14fbb7b91 100644 --- a/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOnTrigger.hpp @@ -28,8 +28,8 @@ class OnStepOnTrigger { public: /** - * @symbol ??1OnStepOnTrigger\@\@QEAA\@XZ + * @symbol ??1OnStepOnTrigger\@\@QEAA\@XZ */ MCAPI ~OnStepOnTrigger(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp b/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp index 056dc4d9f4..71e6291461 100644 --- a/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp +++ b/LiteLoader/include/llapi/mc/OnStepOnTriggerDescription.hpp @@ -31,18 +31,18 @@ class OnStepOnTriggerDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnStepOnTriggerDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@OnStepOnTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@OnStepOnTriggerDescription\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @symbol ?NameID\@OnStepOnTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@OnStepOnTriggerDescription\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp b/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp index 3147d6ac54..fe8f2fc662 100644 --- a/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp +++ b/LiteLoader/include/llapi/mc/OnStoreSideBySideResult.hpp @@ -28,15 +28,15 @@ struct OnStoreSideBySideResult { public: /** - * @symbol ??0OnStoreSideBySideResult\@\@QEAA\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@AEBVStrictEntityContext\@\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@USideBySideResult\@\@\@Z + * @symbol ??0OnStoreSideBySideResult\@\@QEAA\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@AEBVStrictEntityContext\@\@V?$not_null\@PEAVEntityRegistryBase\@\@\@gsl\@\@USideBySideResult\@\@\@Z */ MCAPI OnStoreSideBySideResult(class std::optional, class StrictEntityContext const &, class gsl::not_null, struct SideBySideResult); /** - * @symbol ?createContext\@OnStoreSideBySideResult\@\@QEBA?AUSideBySideResultSystemContext\@\@XZ + * @symbol ?createContext\@OnStoreSideBySideResult\@\@QEBA?AUSideBySideResultSystemContext\@\@XZ */ MCAPI struct SideBySideResultSystemContext createContext() const; /** - * @symbol ??1OnStoreSideBySideResult\@\@QEAA\@XZ + * @symbol ??1OnStoreSideBySideResult\@\@QEAA\@XZ */ MCAPI ~OnStoreSideBySideResult(); diff --git a/LiteLoader/include/llapi/mc/OnTargetAcquiredDefinition.hpp b/LiteLoader/include/llapi/mc/OnTargetAcquiredDefinition.hpp index ca973ef2b4..3d835c2145 100644 --- a/LiteLoader/include/llapi/mc/OnTargetAcquiredDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnTargetAcquiredDefinition.hpp @@ -31,7 +31,7 @@ struct OnTargetAcquiredDefinition { public: /** - * @symbol ?buildSchema\@OnTargetAcquiredDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnTargetAcquiredDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnTargetAcquiredDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnTargetAcquiredDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnTargetEscapeDefinition.hpp b/LiteLoader/include/llapi/mc/OnTargetEscapeDefinition.hpp index 628252c664..85b2822f60 100644 --- a/LiteLoader/include/llapi/mc/OnTargetEscapeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnTargetEscapeDefinition.hpp @@ -31,7 +31,7 @@ struct OnTargetEscapeDefinition { public: /** - * @symbol ?buildSchema\@OnTargetEscapeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnTargetEscapeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnTargetEscapeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnTargetEscapeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp b/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp index 84cf8f03cb..919ef38464 100644 --- a/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnUseItemComponent.hpp @@ -30,47 +30,47 @@ class OnUseItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnUseItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VOnUseItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VOnUseItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VOnUseItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VOnUseItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?bindType\@OnUseItemComponent\@\@SAXXZ + * @symbol ?bindType\@OnUseItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@OnUseItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@OnUseItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp b/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp index c56a7af018..716cf8f283 100644 --- a/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnUseOnItemComponent.hpp @@ -30,47 +30,47 @@ class OnUseOnItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OnUseOnItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?useOn\@OnUseOnItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 3 + * @symbol ?useOn\@OnUseOnItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VOnUseOnItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?bindType\@OnUseOnItemComponent\@\@SAXXZ + * @symbol ?bindType\@OnUseOnItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@OnUseOnItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@OnUseOnItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OnWakeWithOwnerDefinition.hpp b/LiteLoader/include/llapi/mc/OnWakeWithOwnerDefinition.hpp index 9ee98912c6..ba903ad437 100644 --- a/LiteLoader/include/llapi/mc/OnWakeWithOwnerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OnWakeWithOwnerDefinition.hpp @@ -31,7 +31,7 @@ struct OnWakeWithOwnerDefinition { public: /** - * @symbol ?buildSchema\@OnWakeWithOwnerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnWakeWithOwnerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OnWakeWithOwnerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UOnWakeWithOwnerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp b/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp index b2fce68f90..f61bb80698 100644 --- a/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp +++ b/LiteLoader/include/llapi/mc/OnewayPhysicsBlocksComponent.hpp @@ -28,11 +28,7 @@ struct OnewayPhysicsBlocksComponent { public: /** - * @symbol ??4OnewayPhysicsBlocksComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct OnewayPhysicsBlocksComponent & operator=(struct OnewayPhysicsBlocksComponent &&); - /** - * @symbol ??1OnewayPhysicsBlocksComponent\@\@QEAA\@XZ + * @symbol ??1OnewayPhysicsBlocksComponent\@\@QEAA\@XZ */ MCAPI ~OnewayPhysicsBlocksComponent(); diff --git a/LiteLoader/include/llapi/mc/OpCommand.hpp b/LiteLoader/include/llapi/mc/OpCommand.hpp index fff45811fb..9d34cd98b8 100644 --- a/LiteLoader/include/llapi/mc/OpCommand.hpp +++ b/LiteLoader/include/llapi/mc/OpCommand.hpp @@ -31,18 +31,18 @@ class OpCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OpCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@OpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@OpCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@OpCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@OpCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp b/LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp index 6d85f9bdaf..47f98c4354 100644 --- a/LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorAnnotationComponent.hpp @@ -29,32 +29,32 @@ class OpenDoorAnnotationComponent { public: /** - * @symbol ??0OpenDoorAnnotationComponent\@\@QEAA\@XZ + * @symbol ??0OpenDoorAnnotationComponent\@\@QEAA\@XZ */ MCAPI OpenDoorAnnotationComponent(); /** - * @symbol ??0OpenDoorAnnotationComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0OpenDoorAnnotationComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI OpenDoorAnnotationComponent(class OpenDoorAnnotationComponent &&); /** - * @symbol ?checkPath\@OpenDoorAnnotationComponent\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?checkPath\@OpenDoorAnnotationComponent\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void checkPath(class Mob &); /** - * @symbol ?initFromDefinition\@OpenDoorAnnotationComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@OpenDoorAnnotationComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?onComponentRemoved\@OpenDoorAnnotationComponent\@\@QEAAXAEAVEntityContext\@\@\@Z + * @symbol ?onComponentRemoved\@OpenDoorAnnotationComponent\@\@QEAAXAEAVEntityContext\@\@\@Z */ MCAPI void onComponentRemoved(class EntityContext &); //private: /** - * @symbol ?_cleanUp\@OpenDoorAnnotationComponent\@\@AEAAXAEAVMob\@\@\@Z + * @symbol ?_cleanUp\@OpenDoorAnnotationComponent\@\@AEAAXAEAVMob\@\@\@Z */ MCAPI void _cleanUp(class Mob &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp b/LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp index 968732c484..5df7806e64 100644 --- a/LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorAnnotationDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class OpenDoorAnnotationDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@OpenDoorAnnotationDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@OpenDoorAnnotationDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~OpenDoorAnnotationDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OPENDOORANNOTATIONDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@OpenDoorAnnotationDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~OpenDoorAnnotationDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp b/LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp index 6fbb37155b..bc0754091e 100644 --- a/LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorAnnotationSystem.hpp @@ -30,19 +30,19 @@ class OpenDoorAnnotationSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OpenDoorAnnotationSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@OpenDoorAnnotationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@OpenDoorAnnotationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OpenDoorGoal.hpp b/LiteLoader/include/llapi/mc/OpenDoorGoal.hpp index c7d2ac8d99..33d67bf0a1 100644 --- a/LiteLoader/include/llapi/mc/OpenDoorGoal.hpp +++ b/LiteLoader/include/llapi/mc/OpenDoorGoal.hpp @@ -30,48 +30,48 @@ class OpenDoorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OpenDoorGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@OpenDoorGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@OpenDoorGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@OpenDoorGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@OpenDoorGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@OpenDoorGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@OpenDoorGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@OpenDoorGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@OpenDoorGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@OpenDoorGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@OpenDoorGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@OpenDoorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@OpenDoorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0OpenDoorGoal\@\@QEAA\@AEAVMob\@\@_N\@Z + * @symbol ??0OpenDoorGoal\@\@QEAA\@AEAVMob\@\@_N\@Z */ MCAPI OpenDoorGoal(class Mob &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Option.hpp b/LiteLoader/include/llapi/mc/Option.hpp index d43e1ad704..27cb9a2012 100644 --- a/LiteLoader/include/llapi/mc/Option.hpp +++ b/LiteLoader/include/llapi/mc/Option.hpp @@ -32,73 +32,79 @@ class Option { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Option(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?save\@BoolOption\@\@UEAAXAEAV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?save\@BoolOption\@\@UEAAXAEAV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void save(std::vector> &) = 0; /** - * @vftbl 2 - * @symbol ?load\@BoolOption\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?load\@BoolOption\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void load(std::string const &) = 0; /** - * @vftbl 3 - * @symbol ?load\@Option\@\@UEAAXAEAV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?load\@Option\@\@UEAAXAEAV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@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\@\@V12\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void load(class std::map, class std::allocator>> &); /** - * @vftbl 4 - * @symbol ?load\@Option\@\@UEAAXAEBVValue\@Json\@\@\@Z + * @vftbl 4 + * @symbol ?load\@Option\@\@UEAAXAEBVValue\@Json\@\@\@Z */ virtual void load(class Json::Value const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_OPTION /** - * @symbol ??0Option\@\@QEAA\@W4OptionID\@\@W4OptionOwnerType\@\@W4OptionResetFlags\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3W4OptionType\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Option(); +#endif + /** + * @symbol ??0Option\@\@QEAA\@W4OptionID\@\@W4OptionOwnerType\@\@W4OptionResetFlags\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3W4OptionType\@\@\@Z */ MCAPI Option(enum class OptionID, enum class OptionOwnerType, enum class OptionResetFlags, std::string const &, std::string const &, enum class OptionType); /** - * @symbol ?canModify\@Option\@\@QEBA_NXZ + * @symbol ?canModify\@Option\@\@QEBA_NXZ */ MCAPI bool canModify() const; /** - * @symbol ?getBool\@Option\@\@QEBA_NXZ + * @symbol ?getBool\@Option\@\@QEBA_NXZ */ MCAPI bool getBool() const; /** - * @symbol ?hasOverrideSource\@Option\@\@QEBA_NXZ + * @symbol ?hasOverrideSource\@Option\@\@QEBA_NXZ */ MCAPI bool hasOverrideSource() const; /** - * @symbol ?notifyOptionValueChanged\@Option\@\@QEAAX_N\@Z + * @symbol ?notifyOptionValueChanged\@Option\@\@QEAAX_N\@Z */ MCAPI void notifyOptionValueChanged(bool); /** - * @symbol ?registerLock\@Option\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEA_N\@Z\@std\@\@\@Z + * @symbol ?registerLock\@Option\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEA_N\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerLock(class std::function); /** - * @symbol ?registerObserver\@Option\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVOption\@\@\@Z\@std\@\@\@Z + * @symbol ?registerObserver\@Option\@\@QEAA?AVSubscription\@PubSub\@Bedrock\@\@V?$function\@$$A6AXAEBVOption\@\@\@Z\@std\@\@\@Z */ MCAPI class Bedrock::PubSub::Subscription registerObserver(class std::function); /** - * @symbol ?setRequestSaveCallback\@Option\@\@QEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z + * @symbol ?setRequestSaveCallback\@Option\@\@QEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ MCAPI void setRequestSaveCallback(class std::function); /** - * @symbol ?read\@Option\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_N\@Z + * @symbol ?read\@Option\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_N\@Z */ MCAPI static bool read(std::string const &, bool &); //private: /** - * @symbol ?_updatePropertyVector\@Option\@\@AEAAXAEAV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?_updatePropertyVector\@Option\@\@AEAAXAEAV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI void _updatePropertyVector(std::vector> &, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OptionalString.hpp b/LiteLoader/include/llapi/mc/OptionalString.hpp index 411b86d2dc..32b7240af5 100644 --- a/LiteLoader/include/llapi/mc/OptionalString.hpp +++ b/LiteLoader/include/llapi/mc/OptionalString.hpp @@ -28,7 +28,7 @@ struct OptionalString { public: /** - * @symbol ??1OptionalString\@\@QEAA\@XZ + * @symbol ??1OptionalString\@\@QEAA\@XZ */ MCAPI ~OptionalString(); diff --git a/LiteLoader/include/llapi/mc/OreBlock.hpp b/LiteLoader/include/llapi/mc/OreBlock.hpp index 9914fd7c1a..6340e2d388 100644 --- a/LiteLoader/include/llapi/mc/OreBlock.hpp +++ b/LiteLoader/include/llapi/mc/OreBlock.hpp @@ -31,213 +31,218 @@ class OreBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OreBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@OreBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@OreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@OreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@OreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@OreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@OreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@OreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0OreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0OreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI OreBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OreFeature.hpp b/LiteLoader/include/llapi/mc/OreFeature.hpp index 9c434b515c..cfdd593387 100644 --- a/LiteLoader/include/llapi/mc/OreFeature.hpp +++ b/LiteLoader/include/llapi/mc/OreFeature.hpp @@ -29,22 +29,22 @@ class OreFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OreFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@OreFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@OreFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0OreFeature\@\@QEAA\@XZ + * @symbol ??0OreFeature\@\@QEAA\@XZ */ MCAPI OreFeature(); /** - * @symbol ??0OreFeature\@\@QEAA\@H$$QEAV?$vector\@UReplaceRule\@\@V?$allocator\@UReplaceRule\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0OreFeature\@\@QEAA\@H$$QEAV?$vector\@UReplaceRule\@\@V?$allocator\@UReplaceRule\@\@\@std\@\@\@std\@\@\@Z */ MCAPI OreFeature(int, std::vector &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OreVeinifier.hpp b/LiteLoader/include/llapi/mc/OreVeinifier.hpp index 55b1fdec8a..a3c273a009 100644 --- a/LiteLoader/include/llapi/mc/OreVeinifier.hpp +++ b/LiteLoader/include/llapi/mc/OreVeinifier.hpp @@ -30,20 +30,20 @@ class OreVeinifier { public: /** - * @symbol ??0OreVeinifier\@\@QEAA\@AEBVOreVeinifierNoises\@\@\@Z + * @symbol ??0OreVeinifier\@\@QEAA\@AEBVOreVeinifierNoises\@\@\@Z */ MCAPI OreVeinifier(class OreVeinifierNoises const &); /** - * @symbol ?fillNoiseAtPos\@OreVeinifier\@\@QEAAXAEBVVec3\@\@HM\@Z + * @symbol ?fillNoiseAtPos\@OreVeinifier\@\@QEAAXAEBVVec3\@\@HM\@Z */ MCAPI void fillNoiseAtPos(class Vec3 const &, int, float); /** - * @symbol ?getVeinBlockOrFallback\@OreVeinifier\@\@QEBAPEBVBlock\@\@VVec3\@\@PEBV2\@\@Z + * @symbol ?getVeinBlockOrFallback\@OreVeinifier\@\@QEBAPEBVBlock\@\@VVec3\@\@PEBV2\@\@Z */ MCAPI class Block const * getVeinBlockOrFallback(class Vec3, class Block const *) const; /** - * @symbol ?resetAndGetInterpolators\@OreVeinifier\@\@QEAA?AV?$array\@PEAVNoiseCellInterpolator\@\@$02\@std\@\@XZ + * @symbol ?resetAndGetInterpolators\@OreVeinifier\@\@QEAA?AV?$array\@PEAVNoiseCellInterpolator\@\@$02\@std\@\@XZ */ MCAPI class std::array resetAndGetInterpolators(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OreVeinifierNoises.hpp b/LiteLoader/include/llapi/mc/OreVeinifierNoises.hpp index 41fb98832d..35b3c7272e 100644 --- a/LiteLoader/include/llapi/mc/OreVeinifierNoises.hpp +++ b/LiteLoader/include/llapi/mc/OreVeinifierNoises.hpp @@ -29,44 +29,44 @@ class OreVeinifierNoises { public: /** - * @symbol ??0OreVeinifierNoises\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0OreVeinifierNoises\@\@QEAA\@AEBV0\@\@Z */ MCAPI OreVeinifierNoises(class OreVeinifierNoises const &); /** - * @symbol ?getPositionalRandomFactory\@OreVeinifierNoises\@\@QEBAAEBVXoroshiroPositionalRandomFactory\@\@XZ + * @symbol ?getPositionalRandomFactory\@OreVeinifierNoises\@\@QEBAAEBVXoroshiroPositionalRandomFactory\@\@XZ */ MCAPI class XoroshiroPositionalRandomFactory const & getPositionalRandomFactory() const; /** - * @symbol ?sampleGapNoise\@OreVeinifierNoises\@\@QEBAMMMM\@Z + * @symbol ?sampleGapNoise\@OreVeinifierNoises\@\@QEBAMMMM\@Z */ MCAPI float sampleGapNoise(float, float, float) const; /** - * @symbol ?sampleVeinNoiseA\@OreVeinifierNoises\@\@QEBAMMMM\@Z + * @symbol ?sampleVeinNoiseA\@OreVeinifierNoises\@\@QEBAMMMM\@Z */ MCAPI float sampleVeinNoiseA(float, float, float) const; /** - * @symbol ?sampleVeinNoiseB\@OreVeinifierNoises\@\@QEBAMMMM\@Z + * @symbol ?sampleVeinNoiseB\@OreVeinifierNoises\@\@QEBAMMMM\@Z */ MCAPI float sampleVeinNoiseB(float, float, float) const; /** - * @symbol ?sampleVeininessNoise\@OreVeinifierNoises\@\@QEBAMMMM\@Z + * @symbol ?sampleVeininessNoise\@OreVeinifierNoises\@\@QEBAMMMM\@Z */ MCAPI float sampleVeininessNoise(float, float, float) const; /** - * @symbol ??1OreVeinifierNoises\@\@QEAA\@XZ + * @symbol ??1OreVeinifierNoises\@\@QEAA\@XZ */ MCAPI ~OreVeinifierNoises(); /** - * @symbol ?make\@OreVeinifierNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ?make\@OreVeinifierNoises\@\@SA?AV1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI static class OreVeinifierNoises make(class XoroshiroPositionalRandomFactory const &); //private: /** - * @symbol ??0OreVeinifierNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000VXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ??0OreVeinifierNoises\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000VXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI OreVeinifierNoises(class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class XoroshiroPositionalRandomFactory); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OutOfControlDefinition.hpp b/LiteLoader/include/llapi/mc/OutOfControlDefinition.hpp index 137b2ac429..7d07ece592 100644 --- a/LiteLoader/include/llapi/mc/OutOfControlDefinition.hpp +++ b/LiteLoader/include/llapi/mc/OutOfControlDefinition.hpp @@ -31,16 +31,16 @@ class OutOfControlDefinition { public: /** - * @symbol ?initialize\@OutOfControlDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOutOfControlComponent\@\@\@Z + * @symbol ?initialize\@OutOfControlDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOutOfControlComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class OutOfControlComponent &) const; /** - * @symbol ?uninitialize\@OutOfControlDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOutOfControlComponent\@\@\@Z + * @symbol ?uninitialize\@OutOfControlDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVOutOfControlComponent\@\@\@Z */ MCAPI void uninitialize(class EntityContext &, class OutOfControlComponent &) const; /** - * @symbol ?buildSchema\@OutOfControlDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VOutOfControlDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@OutOfControlDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VOutOfControlDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OutOfWorldSystem.hpp b/LiteLoader/include/llapi/mc/OutOfWorldSystem.hpp index c72603ea3d..e32edad273 100644 --- a/LiteLoader/include/llapi/mc/OutOfWorldSystem.hpp +++ b/LiteLoader/include/llapi/mc/OutOfWorldSystem.hpp @@ -30,19 +30,19 @@ class OutOfWorldSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OutOfWorldSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@OutOfWorldSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@OutOfWorldSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverloadSyntaxInformation.hpp b/LiteLoader/include/llapi/mc/OverloadSyntaxInformation.hpp index 98562f6ff0..2a7ec479c8 100644 --- a/LiteLoader/include/llapi/mc/OverloadSyntaxInformation.hpp +++ b/LiteLoader/include/llapi/mc/OverloadSyntaxInformation.hpp @@ -25,7 +25,7 @@ struct OverloadSyntaxInformation { public: /** - * @symbol ??0OverloadSyntaxInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@II\@Z + * @symbol ??0OverloadSyntaxInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@II\@Z */ MCAPI OverloadSyntaxInformation(std::string const &, unsigned int, unsigned int); diff --git a/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp b/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp index a48961af50..1ceea86d0b 100644 --- a/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp +++ b/LiteLoader/include/llapi/mc/OverworldBiomeBuilder.hpp @@ -31,124 +31,124 @@ class OverworldBiomeBuilder { public: /** - * @symbol ??0OverworldBiomeBuilder\@\@QEAA\@AEBVBaseGameVersion\@\@\@Z + * @symbol ??0OverworldBiomeBuilder\@\@QEAA\@AEBVBaseGameVersion\@\@\@Z */ MCAPI OverworldBiomeBuilder(class BaseGameVersion const &); /** - * @symbol ?addBiomes\@OverworldBiomeBuilder\@\@QEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?addBiomes\@OverworldBiomeBuilder\@\@QEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void addBiomes(std::vector &, class BiomeRegistry const &) const; /** - * @symbol ?getWorldSpawnParameters\@OverworldBiomeBuilder\@\@QEBA?AV?$vector\@UClimateParameters\@\@V?$allocator\@UClimateParameters\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getWorldSpawnParameters\@OverworldBiomeBuilder\@\@QEBA?AV?$vector\@UClimateParameters\@\@V?$allocator\@UClimateParameters\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getWorldSpawnParameters() const; /** - * @symbol ??1OverworldBiomeBuilder\@\@QEAA\@XZ + * @symbol ??1OverworldBiomeBuilder\@\@QEAA\@XZ */ MCAPI ~OverworldBiomeBuilder(); //private: /** - * @symbol ?_addHighSlice\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_addHighSlice\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void _addHighSlice(std::vector &, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_addInlandBiomes\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_addInlandBiomes\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void _addInlandBiomes(std::vector &, class BiomeRegistry const &) const; /** - * @symbol ?_addLowSlice\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_addLowSlice\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void _addLowSlice(std::vector &, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_addMidSlice\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_addMidSlice\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void _addMidSlice(std::vector &, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_addPeaks\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_addPeaks\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void _addPeaks(std::vector &, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_addSurfaceBiome\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@1111MPEAVBiome\@\@\@Z + * @symbol ?_addSurfaceBiome\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@1111MPEAVBiome\@\@\@Z */ MCAPI void _addSurfaceBiome(std::vector &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, float, class Biome *) const; /** - * @symbol ?_addUndergroundBiome\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@1111MPEAVBiome\@\@\@Z + * @symbol ?_addUndergroundBiome\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@1111MPEAVBiome\@\@\@Z */ MCAPI void _addUndergroundBiome(std::vector &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, struct ClimateUtils::Parameter const &, float, class Biome *) const; /** - * @symbol ?_addValleys\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_addValleys\@OverworldBiomeBuilder\@\@AEBAXAEAV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@AEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI void _addValleys(std::vector &, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_pickBadlandsBiome\@OverworldBiomeBuilder\@\@AEBAPEAVBiome\@\@HAEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_pickBadlandsBiome\@OverworldBiomeBuilder\@\@AEBAPEAVBiome\@\@HAEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI class Biome * _pickBadlandsBiome(int, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_pickShatteredCoastBiome\@OverworldBiomeBuilder\@\@AEBAPEAVBiome\@\@HHAEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_pickShatteredCoastBiome\@OverworldBiomeBuilder\@\@AEBAPEAVBiome\@\@HHAEBUParameter\@ClimateUtils\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI class Biome * _pickShatteredCoastBiome(int, int, struct ClimateUtils::Parameter const &, class BiomeRegistry const &) const; /** - * @symbol ?_populateBiomeArrays\@OverworldBiomeBuilder\@\@AEBAXAEBVBiomeRegistry\@\@\@Z + * @symbol ?_populateBiomeArrays\@OverworldBiomeBuilder\@\@AEBAXAEBVBiomeRegistry\@\@\@Z */ MCAPI void _populateBiomeArrays(class BiomeRegistry const &) const; private: /** - * @symbol ?EROSIONS\@OverworldBiomeBuilder\@\@0QBUParameter\@ClimateUtils\@\@B + * @symbol ?EROSIONS\@OverworldBiomeBuilder\@\@0QBUParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const EROSIONS[]; /** - * @symbol ?FULL_RANGE\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?FULL_RANGE\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const FULL_RANGE; /** - * @symbol ?HUMIDITIES\@OverworldBiomeBuilder\@\@0QBUParameter\@ClimateUtils\@\@B + * @symbol ?HUMIDITIES\@OverworldBiomeBuilder\@\@0QBUParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const HUMIDITIES[]; /** - * @symbol ?TEMPERATURES\@OverworldBiomeBuilder\@\@0QBUParameter\@ClimateUtils\@\@B + * @symbol ?TEMPERATURES\@OverworldBiomeBuilder\@\@0QBUParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const TEMPERATURES[]; /** - * @symbol ?coastContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?coastContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const coastContinentalness; /** - * @symbol ?deepOceanContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?deepOceanContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const deepOceanContinentalness; /** - * @symbol ?dripstoneCavesContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?dripstoneCavesContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const dripstoneCavesContinentalness; /** - * @symbol ?farInlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?farInlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const farInlandContinentalness; /** - * @symbol ?inlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?inlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const inlandContinentalness; /** - * @symbol ?lushCavesHumidity\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?lushCavesHumidity\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const lushCavesHumidity; /** - * @symbol ?midInlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?midInlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const midInlandContinentalness; /** - * @symbol ?mushroomFieldsContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?mushroomFieldsContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const mushroomFieldsContinentalness; /** - * @symbol ?nearInlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?nearInlandContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const nearInlandContinentalness; /** - * @symbol ?oceanContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B + * @symbol ?oceanContinentalness\@OverworldBiomeBuilder\@\@0UParameter\@ClimateUtils\@\@B */ MCAPI static struct ClimateUtils::Parameter const oceanContinentalness; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldBlendRules.hpp b/LiteLoader/include/llapi/mc/OverworldBlendRules.hpp index 386baa3c70..34f2ff2f29 100644 --- a/LiteLoader/include/llapi/mc/OverworldBlendRules.hpp +++ b/LiteLoader/include/llapi/mc/OverworldBlendRules.hpp @@ -28,7 +28,7 @@ struct OverworldBlendRules { public: /** - * @symbol ??1OverworldBlendRules\@\@QEAA\@XZ + * @symbol ??1OverworldBlendRules\@\@QEAA\@XZ */ MCAPI ~OverworldBlendRules(); diff --git a/LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp b/LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp index 3e4d1b747e..11f9c6d479 100644 --- a/LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp +++ b/LiteLoader/include/llapi/mc/OverworldBrightnessRamp.hpp @@ -31,9 +31,9 @@ class OverworldBrightnessRamp : public DimensionBrightnessRamp { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OverworldBrightnessRamp(); + virtual void __unk_vfn_0(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldDimension.hpp b/LiteLoader/include/llapi/mc/OverworldDimension.hpp index 50fa2e11a4..9e0506da80 100644 --- a/LiteLoader/include/llapi/mc/OverworldDimension.hpp +++ b/LiteLoader/include/llapi/mc/OverworldDimension.hpp @@ -31,57 +31,57 @@ class OverworldDimension { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OVERWORLDDIMENSION /** - * @symbol ?_upgradeOldLimboEntity\@OverworldDimension\@\@EEAAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@\@Z + * @symbol ?_upgradeOldLimboEntity\@OverworldDimension\@\@EEAAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@\@Z */ MCVAPI void _upgradeOldLimboEntity(class CompoundTag &, enum class LimboEntitiesVersion); /** - * @symbol ?_wrapStorageForVersionCompatibility\@OverworldDimension\@\@EEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z + * @symbol ?_wrapStorageForVersionCompatibility\@OverworldDimension\@\@EEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z */ MCVAPI std::unique_ptr _wrapStorageForVersionCompatibility(std::unique_ptr, enum class StorageVersion); /** - * @symbol ?createGenerator\@OverworldDimension\@\@UEAA?AV?$unique_ptr\@VWorldGenerator\@\@U?$default_delete\@VWorldGenerator\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createGenerator\@OverworldDimension\@\@UEAA?AV?$unique_ptr\@VWorldGenerator\@\@U?$default_delete\@VWorldGenerator\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr createGenerator(); /** - * @symbol ?fixWallChunk\@OverworldDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?fixWallChunk\@OverworldDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void fixWallChunk(class ChunkSource &, class LevelChunk &); /** - * @symbol ?getBrightnessDependentFogColor\@OverworldDimension\@\@UEBA?AVColor\@mce\@\@AEBV23\@M\@Z + * @symbol ?getBrightnessDependentFogColor\@OverworldDimension\@\@UEBA?AVColor\@mce\@\@AEBV23\@M\@Z */ MCVAPI class mce::Color getBrightnessDependentFogColor(class mce::Color const &, float) const; /** - * @symbol ?getCloudHeight\@OverworldDimension\@\@UEBAFXZ + * @symbol ?getCloudHeight\@OverworldDimension\@\@UEBAFXZ */ MCVAPI short getCloudHeight() const; /** - * @symbol ?hasPrecipitationFog\@OverworldDimension\@\@UEBA_NXZ + * @symbol ?hasPrecipitationFog\@OverworldDimension\@\@UEBA_NXZ */ MCVAPI bool hasPrecipitationFog() const; /** - * @symbol ?levelChunkNeedsUpgrade\@OverworldDimension\@\@UEBA_NAEBVLevelChunk\@\@\@Z + * @symbol ?levelChunkNeedsUpgrade\@OverworldDimension\@\@UEBA_NAEBVLevelChunk\@\@\@Z */ MCVAPI bool levelChunkNeedsUpgrade(class LevelChunk const &) const; /** - * @symbol ?translatePosAcrossDimension\@OverworldDimension\@\@UEBA?AVVec3\@\@AEBV2\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?translatePosAcrossDimension\@OverworldDimension\@\@UEBA?AVVec3\@\@AEBV2\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI class Vec3 translatePosAcrossDimension(class Vec3 const &, class AutomaticID) const; /** - * @symbol ?upgradeLevelChunk\@OverworldDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@1\@Z + * @symbol ?upgradeLevelChunk\@OverworldDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@1\@Z */ MCVAPI void upgradeLevelChunk(class ChunkSource &, class LevelChunk &, class LevelChunk &); #endif /** - * @symbol ??0OverworldDimension\@\@QEAA\@AEAVLevel\@\@AEAVScheduler\@\@\@Z + * @symbol ??0OverworldDimension\@\@QEAA\@AEAVILevel\@\@AEAVScheduler\@\@\@Z */ - MCAPI OverworldDimension(class Level &, class Scheduler &); + MCAPI OverworldDimension(class ILevel &, class Scheduler &); //private: /** - * @symbol ?makeStructureFeatures\@OverworldDimension\@\@CA?AV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@I_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?makeStructureFeatures\@OverworldDimension\@\@CA?AV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@I_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static std::unique_ptr makeStructureFeatures(unsigned int, bool, class BaseGameVersion const &, class Experiments const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldGenerator.hpp b/LiteLoader/include/llapi/mc/OverworldGenerator.hpp index d2899f8443..de418cf6c9 100644 --- a/LiteLoader/include/llapi/mc/OverworldGenerator.hpp +++ b/LiteLoader/include/llapi/mc/OverworldGenerator.hpp @@ -37,57 +37,57 @@ struct ThreadData { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OVERWORLDGENERATOR /** - * @symbol ?createNoiseCache\@OverworldGenerator\@\@MEBA?AVChunkLocalNoiseCache\@\@VChunkPos\@\@\@Z + * @symbol ?createNoiseCache\@OverworldGenerator\@\@MEBA?AVChunkLocalNoiseCache\@\@VChunkPos\@\@\@Z */ MCVAPI class ChunkLocalNoiseCache createNoiseCache(class ChunkPos) const; /** - * @symbol ?createWorldGenCache\@OverworldGenerator\@\@MEBA?AVWorldGenCache\@\@VChunkPos\@\@\@Z + * @symbol ?createWorldGenCache\@OverworldGenerator\@\@MEBA?AVWorldGenCache\@\@VChunkPos\@\@\@Z */ MCVAPI class WorldGenCache createWorldGenCache(class ChunkPos) const; /** - * @symbol ?decorateWorldGenLoadChunk\@OverworldGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z + * @symbol ?decorateWorldGenLoadChunk\@OverworldGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z */ MCVAPI void decorateWorldGenLoadChunk(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &) const; /** - * @symbol ?getBiomeArea\@OverworldGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + * @symbol ?getBiomeArea\@OverworldGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z */ MCVAPI class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; /** - * @symbol ?getBlockVolumeDimensions\@OverworldGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ + * @symbol ?getBlockVolumeDimensions\@OverworldGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ */ MCVAPI struct WorldGenerator::BlockVolumeDimensions getBlockVolumeDimensions() const; /** - * @symbol ?loadChunk\@OverworldGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @symbol ?loadChunk\@OverworldGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ MCVAPI void loadChunk(class LevelChunk &, bool); /** - * @symbol ?postProcess\@OverworldGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + * @symbol ?postProcess\@OverworldGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z */ MCVAPI bool postProcess(class ChunkViewSource &); /** - * @symbol ?prepareAndComputeHeights\@OverworldGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@_NH\@Z + * @symbol ?prepareAndComputeHeights\@OverworldGenerator\@\@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\@OverworldGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z + * @symbol ?prepareHeights\@OverworldGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z */ MCVAPI void prepareHeights(class BlockVolume &, class ChunkPos const &, bool); /** - * @symbol ?tryMakeAquifer\@OverworldGenerator\@\@MEBA?AV?$unique_ptr\@VAquifer\@\@U?$default_delete\@VAquifer\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@AEBVSurfaceLevelCache\@\@FFF\@Z + * @symbol ?tryMakeAquifer\@OverworldGenerator\@\@MEBA?AV?$unique_ptr\@VAquifer\@\@U?$default_delete\@VAquifer\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@AEBVSurfaceLevelCache\@\@FFF\@Z */ MCVAPI std::unique_ptr tryMakeAquifer(class ChunkPos const &, class SurfaceLevelCache const &, short, short, short) const; /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~OverworldGenerator(); #endif /** - * @symbol ??0OverworldGenerator\@\@QEAA\@AEAVDimension\@\@_NV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0OverworldGenerator\@\@QEAA\@AEAVDimension\@\@_NV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI OverworldGenerator(class Dimension &, bool, std::unique_ptr); /** - * @symbol ?buildSurfaces\@OverworldGenerator\@\@QEAAXAEAUThreadData\@1\@AEAVBlockVolume\@\@AEAVLevelChunk\@\@AEBVChunkPos\@\@AEBVSurfaceLevelCache\@\@\@Z + * @symbol ?buildSurfaces\@OverworldGenerator\@\@QEAAXAEAUThreadData\@1\@AEAVBlockVolume\@\@AEAVLevelChunk\@\@AEBVChunkPos\@\@AEBVSurfaceLevelCache\@\@\@Z */ MCAPI void buildSurfaces(struct OverworldGenerator::ThreadData &, class BlockVolume &, class LevelChunk &, class ChunkPos const &, class SurfaceLevelCache const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldGenerator2d.hpp b/LiteLoader/include/llapi/mc/OverworldGenerator2d.hpp index 83beb45a42..76e2ec9c3c 100644 --- a/LiteLoader/include/llapi/mc/OverworldGenerator2d.hpp +++ b/LiteLoader/include/llapi/mc/OverworldGenerator2d.hpp @@ -32,61 +32,61 @@ class OverworldGenerator2d { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OVERWORLDGENERATOR2D /** - * @symbol ?_prepareHeights\@OverworldGenerator2d\@\@EEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEBVWorldGenCache\@\@PEAVAquifer\@\@$$QEAV?$function\@$$A6AXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z\@std\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@7\@H\@Z + * @symbol ?_prepareHeights\@OverworldGenerator2d\@\@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\@OverworldGenerator2d\@\@EEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @symbol ?decorateWorldGenPostProcess\@OverworldGenerator2d\@\@EEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z */ MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; /** - * @symbol ?findSpawnPosition\@OverworldGenerator2d\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?findSpawnPosition\@OverworldGenerator2d\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos findSpawnPosition() const; /** - * @symbol ?generateDensityCellsForChunk\@OverworldGenerator2d\@\@UEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z + * @symbol ?generateDensityCellsForChunk\@OverworldGenerator2d\@\@UEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z */ MCVAPI class Util::MultidimensionalArray generateDensityCellsForChunk(class ChunkPos const &) const; /** - * @symbol ?getBiomeSource\@OverworldGenerator2d\@\@UEBAAEBVBiomeSource\@\@XZ + * @symbol ?getBiomeSource\@OverworldGenerator2d\@\@UEBAAEBVBiomeSource\@\@XZ */ MCVAPI class BiomeSource const & getBiomeSource() const; /** - * @symbol ?getLevelGenHeight\@OverworldGenerator2d\@\@UEBAHXZ + * @symbol ?getLevelGenHeight\@OverworldGenerator2d\@\@UEBAHXZ */ MCVAPI int getLevelGenHeight() const; /** - * @symbol ?getMaterialAdjNoise\@OverworldGenerator2d\@\@MEBAAEBV?$unique_ptr\@VPerlinSimplexNoise\@\@U?$default_delete\@VPerlinSimplexNoise\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMaterialAdjNoise\@OverworldGenerator2d\@\@MEBAAEBV?$unique_ptr\@VPerlinSimplexNoise\@\@U?$default_delete\@VPerlinSimplexNoise\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr const & getMaterialAdjNoise() const; /** - * @symbol ?getSurfaceNoise\@OverworldGenerator2d\@\@MEAAAEBVPerlinSimplexNoise\@\@XZ + * @symbol ?getSurfaceNoise\@OverworldGenerator2d\@\@MEAAAEBVPerlinSimplexNoise\@\@XZ */ MCVAPI class PerlinSimplexNoise const & getSurfaceNoise(); /** - * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGenerator2d\@\@EEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ + * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGenerator2d\@\@EEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ */ MCVAPI class std::optional getXoroshiroPositionalRandomFactory() const; #endif /** - * @symbol ??0OverworldGenerator2d\@\@QEAA\@AEAVDimension\@\@I_NPEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0OverworldGenerator2d\@\@QEAA\@AEAVDimension\@\@I_NPEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI OverworldGenerator2d(class Dimension &, unsigned int, bool, class Biome const *, std::unique_ptr); //private: /** - * @symbol ?_generateDensityCellsForChunk\@OverworldGenerator2d\@\@AEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z + * @symbol ?_generateDensityCellsForChunk\@OverworldGenerator2d\@\@AEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z */ MCAPI class Util::MultidimensionalArray _generateDensityCellsForChunk(class ChunkPos const &) const; /** - * @symbol ?_makeBiomeSource\@OverworldGenerator2d\@\@CA?AV?$unique_ptr\@VBiomeSource\@\@U?$default_delete\@VBiomeSource\@\@\@std\@\@\@std\@\@IAEBVDimension\@\@\@Z + * @symbol ?_makeBiomeSource\@OverworldGenerator2d\@\@CA?AV?$unique_ptr\@VBiomeSource\@\@U?$default_delete\@VBiomeSource\@\@\@std\@\@\@std\@\@IAEBVDimension\@\@\@Z */ MCAPI static std::unique_ptr _makeBiomeSource(unsigned int, class Dimension const &); /** - * @symbol ?_makeCommonNodeGraph\@OverworldGenerator2d\@\@CA?AV?$shared_ptr\@V?$OperationNode\@PEAVBiome\@\@VPos2d\@\@\@\@\@std\@\@W4GeneratorType\@\@AEBVBiomeRegistry\@\@\@Z + * @symbol ?_makeCommonNodeGraph\@OverworldGenerator2d\@\@CA?AV?$shared_ptr\@V?$OperationNode\@PEAVBiome\@\@VPos2d\@\@\@\@\@std\@\@W4GeneratorType\@\@AEBVBiomeRegistry\@\@\@Z */ MCAPI static class std::shared_ptr> _makeCommonNodeGraph(enum class GeneratorType, class BiomeRegistry const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp b/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp index ae19b6ed8d..5af1c3e2e9 100644 --- a/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp +++ b/LiteLoader/include/llapi/mc/OverworldGeneratorMultinoise.hpp @@ -32,81 +32,81 @@ class OverworldGeneratorMultinoise { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_OVERWORLDGENERATORMULTINOISE /** - * @symbol ?_prepareHeights\@OverworldGeneratorMultinoise\@\@EEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEBVWorldGenCache\@\@PEAVAquifer\@\@$$QEAV?$function\@$$A6AXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z\@std\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@7\@H\@Z + * @symbol ?_prepareHeights\@OverworldGeneratorMultinoise\@\@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 ?createNoiseCache\@OverworldGeneratorMultinoise\@\@EEBA?AVChunkLocalNoiseCache\@\@VChunkPos\@\@\@Z + * @symbol ?createNoiseCache\@OverworldGeneratorMultinoise\@\@EEBA?AVChunkLocalNoiseCache\@\@VChunkPos\@\@\@Z */ MCVAPI class ChunkLocalNoiseCache createNoiseCache(class ChunkPos) const; /** - * @symbol ?decorateWorldGenPostProcess\@OverworldGeneratorMultinoise\@\@EEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @symbol ?decorateWorldGenPostProcess\@OverworldGeneratorMultinoise\@\@EEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z */ MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; /** - * @symbol ?findSpawnPosition\@OverworldGeneratorMultinoise\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?findSpawnPosition\@OverworldGeneratorMultinoise\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos findSpawnPosition() const; /** - * @symbol ?generateDensityCellsForChunk\@OverworldGeneratorMultinoise\@\@UEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z + * @symbol ?generateDensityCellsForChunk\@OverworldGeneratorMultinoise\@\@UEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z */ MCVAPI class Util::MultidimensionalArray generateDensityCellsForChunk(class ChunkPos const &) const; /** - * @symbol ?getBiomeSource\@OverworldGeneratorMultinoise\@\@UEBAAEBVBiomeSource\@\@XZ + * @symbol ?getBiomeSource\@OverworldGeneratorMultinoise\@\@UEBAAEBVBiomeSource\@\@XZ */ MCVAPI class BiomeSource const & getBiomeSource() const; /** - * @symbol ?getLevelGenHeight\@OverworldGeneratorMultinoise\@\@UEBAHXZ + * @symbol ?getLevelGenHeight\@OverworldGeneratorMultinoise\@\@UEBAHXZ */ MCVAPI int getLevelGenHeight() const; /** - * @symbol ?getMaterialAdjNoise\@OverworldGeneratorMultinoise\@\@MEBAAEBV?$unique_ptr\@VPerlinSimplexNoise\@\@U?$default_delete\@VPerlinSimplexNoise\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMaterialAdjNoise\@OverworldGeneratorMultinoise\@\@MEBAAEBV?$unique_ptr\@VPerlinSimplexNoise\@\@U?$default_delete\@VPerlinSimplexNoise\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr const & getMaterialAdjNoise() const; /** - * @symbol ?getPreliminarySurfaceLevel\@OverworldGeneratorMultinoise\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z + * @symbol ?getPreliminarySurfaceLevel\@OverworldGeneratorMultinoise\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z */ MCVAPI class std::optional getPreliminarySurfaceLevel(class DividedPos2d<4>) const; /** - * @symbol ?getSurfaceNoise\@OverworldGeneratorMultinoise\@\@MEAAAEBVPerlinSimplexNoise\@\@XZ + * @symbol ?getSurfaceNoise\@OverworldGeneratorMultinoise\@\@MEAAAEBVPerlinSimplexNoise\@\@XZ */ MCVAPI class PerlinSimplexNoise const & getSurfaceNoise(); /** - * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGeneratorMultinoise\@\@EEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ + * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGeneratorMultinoise\@\@EEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ */ MCVAPI class std::optional getXoroshiroPositionalRandomFactory() const; /** - * @symbol ?tryMakeAquifer\@OverworldGeneratorMultinoise\@\@EEBA?AV?$unique_ptr\@VAquifer\@\@U?$default_delete\@VAquifer\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@AEBVSurfaceLevelCache\@\@FFF\@Z + * @symbol ?tryMakeAquifer\@OverworldGeneratorMultinoise\@\@EEBA?AV?$unique_ptr\@VAquifer\@\@U?$default_delete\@VAquifer\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@AEBVSurfaceLevelCache\@\@FFF\@Z */ MCVAPI std::unique_ptr tryMakeAquifer(class ChunkPos const &, class SurfaceLevelCache const &, short, short, short) const; /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~OverworldGeneratorMultinoise(); #endif /** - * @symbol ??0OverworldGeneratorMultinoise\@\@QEAA\@AEAVDimension\@\@VLevelSeed64\@\@PEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0OverworldGeneratorMultinoise\@\@QEAA\@AEAVDimension\@\@VLevelSeed64\@\@PEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI OverworldGeneratorMultinoise(class Dimension &, class LevelSeed64, class Biome const *, std::unique_ptr); /** - * @symbol ?_applySlides\@OverworldGeneratorMultinoise\@\@SAMAEBVDimensionHeightRange\@\@ME\@Z + * @symbol ?_applySlides\@OverworldGeneratorMultinoise\@\@SAMAEBVDimensionHeightRange\@\@ME\@Z */ MCAPI static float _applySlides(class DimensionHeightRange const &, float, unsigned char); //private: /** - * @symbol ?_attenuateOffsetAndFactor\@OverworldGeneratorMultinoise\@\@AEBA?AUTerrainInfo\@\@V?$DividedPos2d\@$03\@\@U2\@\@Z + * @symbol ?_attenuateOffsetAndFactor\@OverworldGeneratorMultinoise\@\@AEBA?AUTerrainInfo\@\@V?$DividedPos2d\@$03\@\@U2\@\@Z */ MCAPI struct TerrainInfo _attenuateOffsetAndFactor(class DividedPos2d<4>, struct TerrainInfo) const; /** - * @symbol ?_generateDensityCellsForChunk\@OverworldGeneratorMultinoise\@\@AEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@AEBVWorldGenCache\@\@PEAVNoodleCavifier\@\@PEAVOreVeinifier\@\@\@Z + * @symbol ?_generateDensityCellsForChunk\@OverworldGeneratorMultinoise\@\@AEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@AEBVWorldGenCache\@\@PEAVNoodleCavifier\@\@PEAVOreVeinifier\@\@\@Z */ MCAPI class Util::MultidimensionalArray _generateDensityCellsForChunk(class ChunkPos const &, class WorldGenCache const &, class NoodleCavifier *, class OreVeinifier *) const; /** - * @symbol ?_makeBiomeSource\@OverworldGeneratorMultinoise\@\@AEAA?AV?$unique_ptr\@VBiomeSource\@\@U?$default_delete\@VBiomeSource\@\@\@std\@\@\@std\@\@AEBVXoroshiroPositionalRandomFactory\@\@AEBVBiomeRegistry\@\@PEBVBiome\@\@\@Z + * @symbol ?_makeBiomeSource\@OverworldGeneratorMultinoise\@\@AEAA?AV?$unique_ptr\@VBiomeSource\@\@U?$default_delete\@VBiomeSource\@\@\@std\@\@\@std\@\@AEBVXoroshiroPositionalRandomFactory\@\@AEBVBiomeRegistry\@\@PEBVBiome\@\@\@Z */ MCAPI std::unique_ptr _makeBiomeSource(class XoroshiroPositionalRandomFactory const &, class BiomeRegistry const &, class Biome const *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp b/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp index 90b04145a2..2c9f4dfdb5 100644 --- a/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp +++ b/LiteLoader/include/llapi/mc/OverworldGeneratorVoid.hpp @@ -29,49 +29,49 @@ class OverworldGeneratorVoid { 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 + * @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 + * @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 + * @symbol ?findSpawnPosition\@OverworldGeneratorVoid\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos findSpawnPosition() const; /** - * @symbol ?generateDensityCellsForChunk\@OverworldGeneratorVoid\@\@UEBA?AV?$MultidimensionalArray\@M$04$04$0CJ\@\@Util\@\@AEBVChunkPos\@\@\@Z + * @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 + * @symbol ?getBiomeSource\@OverworldGeneratorVoid\@\@UEBAAEBVBiomeSource\@\@XZ */ MCVAPI class BiomeSource const & getBiomeSource() const; /** - * @symbol ?getLevelGenHeight\@OverworldGeneratorVoid\@\@UEBAHXZ + * @symbol ?getLevelGenHeight\@OverworldGeneratorVoid\@\@UEBAHXZ */ MCVAPI int getLevelGenHeight() const; /** - * @symbol ?getMaterialAdjNoise\@OverworldGeneratorVoid\@\@UEBAAEBV?$unique_ptr\@VPerlinSimplexNoise\@\@U?$default_delete\@VPerlinSimplexNoise\@\@\@std\@\@\@std\@\@XZ + * @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 + * @symbol ?getSurfaceNoise\@OverworldGeneratorVoid\@\@UEAAAEBVPerlinSimplexNoise\@\@XZ */ MCVAPI class PerlinSimplexNoise const & getSurfaceNoise(); /** - * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGeneratorVoid\@\@UEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ + * @symbol ?getXoroshiroPositionalRandomFactory\@OverworldGeneratorVoid\@\@UEBA?AV?$optional\@VXoroshiroPositionalRandomFactory\@\@\@std\@\@XZ */ MCVAPI class std::optional getXoroshiroPositionalRandomFactory() const; /** - * @symbol ?loadChunk\@OverworldGeneratorVoid\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @symbol ?loadChunk\@OverworldGeneratorVoid\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ MCVAPI void loadChunk(class LevelChunk &, bool); #endif /** - * @symbol ??0OverworldGeneratorVoid\@\@QEAA\@AEAVDimension\@\@I\@Z + * @symbol ??0OverworldGeneratorVoid\@\@QEAA\@AEAVDimension\@\@I\@Z */ MCAPI OverworldGeneratorVoid(class Dimension &, unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp b/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp index 7d11b735e5..cbbf311088 100644 --- a/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp +++ b/LiteLoader/include/llapi/mc/OverworldNoises3d.hpp @@ -30,49 +30,49 @@ struct OverworldNoises3d { public: /** - * @symbol ??0OverworldNoises3d\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0OverworldNoises3d\@\@QEAA\@AEBU0\@\@Z */ MCAPI OverworldNoises3d(struct OverworldNoises3d const &); /** - * @symbol ?computeErosionAndDepth\@OverworldNoises3d\@\@QEBA?AU?$pair\@MM\@std\@\@VBlockPos\@\@\@Z + * @symbol ?computeErosionAndDepth\@OverworldNoises3d\@\@QEBA?AU?$pair\@MM\@std\@\@VBlockPos\@\@\@Z */ MCAPI struct std::pair computeErosionAndDepth(class BlockPos) const; /** - * @symbol ?computeNoiseValues\@OverworldNoises3d\@\@QEBA?AUCacheEntry\@ChunkLocalNoiseCache\@\@AEBV?$DividedPos2d\@$03\@\@\@Z + * @symbol ?computeNoiseValues\@OverworldNoises3d\@\@QEBA?AUCacheEntry\@ChunkLocalNoiseCache\@\@AEBV?$DividedPos2d\@$03\@\@\@Z */ MCAPI struct ChunkLocalNoiseCache::CacheEntry computeNoiseValues(class DividedPos2d<4> const &) const; /** - * @symbol ?computeOffsetAndFactor\@OverworldNoises3d\@\@QEBA?AUTerrainInfo\@\@AEBV?$DividedPos2d\@$03\@\@\@Z + * @symbol ?computeOffsetAndFactor\@OverworldNoises3d\@\@QEBA?AUTerrainInfo\@\@AEBV?$DividedPos2d\@$03\@\@\@Z */ MCAPI struct TerrainInfo computeOffsetAndFactor(class DividedPos2d<4> const &) const; /** - * @symbol ?sample\@OverworldNoises3d\@\@QEBA?AUTargetPoint\@\@HAEBUCacheEntry\@ChunkLocalNoiseCache\@\@\@Z + * @symbol ?sample\@OverworldNoises3d\@\@QEBA?AUTargetPoint\@\@VBlockPos\@\@\@Z */ - MCAPI struct TargetPoint sample(int, struct ChunkLocalNoiseCache::CacheEntry const &) const; + MCAPI struct TargetPoint sample(class BlockPos) const; /** - * @symbol ?sample\@OverworldNoises3d\@\@QEBA?AUTargetPoint\@\@VBlockPos\@\@\@Z + * @symbol ?sample\@OverworldNoises3d\@\@QEBA?AUTargetPoint\@\@HAEBUCacheEntry\@ChunkLocalNoiseCache\@\@\@Z */ - MCAPI struct TargetPoint sample(class BlockPos) const; + MCAPI struct TargetPoint sample(int, struct ChunkLocalNoiseCache::CacheEntry const &) const; /** - * @symbol ??1OverworldNoises3d\@\@QEAA\@XZ + * @symbol ??1OverworldNoises3d\@\@QEAA\@XZ */ MCAPI ~OverworldNoises3d(); /** - * @symbol ?computeInitialDensity\@OverworldNoises3d\@\@SAMHMMM\@Z + * @symbol ?computeInitialDensity\@OverworldNoises3d\@\@SAMHMMM\@Z */ MCAPI static float computeInitialDensity(int, float, float, float); /** - * @symbol ?make\@OverworldNoises3d\@\@SA?AU1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z + * @symbol ?make\@OverworldNoises3d\@\@SA?AU1\@AEBVXoroshiroPositionalRandomFactory\@\@\@Z */ MCAPI static struct OverworldNoises3d make(class XoroshiroPositionalRandomFactory const &); //private: /** - * @symbol ??0OverworldNoises3d\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000000\@Z + * @symbol ??0OverworldNoises3d\@\@AEAA\@V?$NormalNoiseImpl\@$0A\@V?$MultiOctaveNoiseImpl\@$0A\@V?$ParityImprovedNoiseImpl\@$0A\@\@\@\@\@\@\@000000\@Z */ MCAPI OverworldNoises3d(class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>>); /** - * @symbol ?_computeBaseValueSetForCacheEntry\@OverworldNoises3d\@\@AEBA?AUCacheEntry\@ChunkLocalNoiseCache\@\@AEBV?$DividedPos2d\@$03\@\@\@Z + * @symbol ?_computeBaseValueSetForCacheEntry\@OverworldNoises3d\@\@AEBA?AUCacheEntry\@ChunkLocalNoiseCache\@\@AEBV?$DividedPos2d\@$03\@\@\@Z */ MCAPI struct ChunkLocalNoiseCache::CacheEntry _computeBaseValueSetForCacheEntry(class DividedPos2d<4> const &) const; diff --git a/LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp b/LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp index fb836e16a6..cbc65e32ee 100644 --- a/LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/OwnerHurtByTargetGoal.hpp @@ -31,33 +31,33 @@ class OwnerHurtByTargetGoal : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OwnerHurtByTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@OwnerHurtByTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@OwnerHurtByTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 4 - * @symbol ?start\@OwnerHurtByTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@OwnerHurtByTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0OwnerHurtByTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0OwnerHurtByTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI OwnerHurtByTargetGoal(class Mob &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp b/LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp index 0bad5b9880..03da46a1dc 100644 --- a/LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/OwnerHurtTargetGoal.hpp @@ -31,33 +31,33 @@ class OwnerHurtTargetGoal : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~OwnerHurtTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@OwnerHurtTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@OwnerHurtTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 4 - * @symbol ?start\@OwnerHurtTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@OwnerHurtTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0OwnerHurtTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0OwnerHurtTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI OwnerHurtTargetGoal(class Mob &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp index d3bdd3b689..0213bde5c6 100644 --- a/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/OwnerStorageEntity.hpp @@ -8,6 +8,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "EntityContext.hpp" #undef BEFORE_EXTRA @@ -18,7 +19,28 @@ class OwnerStorageEntity { #define AFTER_EXTRA -// Add Member There + // Add Member There +public: + + enum class VariadicInit : int { + NonAmbiguous = 0, + }; + enum class EmptyInit : int { + NoValue = 0, + }; + + std::optional mContext; + + + template + inline Entity* tryUnwrap() { + if (_hasValue()) { + return Entity::tryGetFromEntity(_getStackRef(), Unknown); + } + return nullptr; + } + +#define DISABLE_CONSTRUCTOR_PREVENTION_OWNERSTORAGEENTITY #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_OWNERSTORAGEENTITY @@ -32,42 +54,42 @@ class OwnerStorageEntity { //protected: /** - * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEAVEntityRegistry\@\@\@Z + * @symbol ??0OwnerStorageEntity\@\@IEAA\@$$QEAV0\@\@Z */ - MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::VariadicInit, class EntityRegistry &); + MCAPI OwnerStorageEntity(class OwnerStorageEntity &&); /** - * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z + * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEAVEntityRegistry\@\@\@Z */ - MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::EmptyInit); + MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::VariadicInit, class EntityRegistry &); /** - * @symbol ??0OwnerStorageEntity\@\@IEAA\@$$QEAV0\@\@Z + * @symbol ??0OwnerStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z */ - MCAPI OwnerStorageEntity(class OwnerStorageEntity &&); + MCAPI OwnerStorageEntity(enum class OwnerStorageEntity::EmptyInit); /** - * @symbol ?_getStackRef\@OwnerStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ + * @symbol ?_getStackRef\@OwnerStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ */ MCAPI class EntityContext & _getStackRef() const; /** - * @symbol ?_hasValue\@OwnerStorageEntity\@\@IEBA_NXZ + * @symbol ?_hasValue\@OwnerStorageEntity\@\@IEBA_NXZ */ MCAPI bool _hasValue() const; /** - * @symbol ?_remake\@OwnerStorageEntity\@\@IEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?_remake\@OwnerStorageEntity\@\@IEAAXAEAVEntityRegistry\@\@\@Z */ MCAPI void _remake(class EntityRegistry &); /** - * @symbol ?_reset\@OwnerStorageEntity\@\@IEAAXXZ + * @symbol ?_reset\@OwnerStorageEntity\@\@IEAAXXZ */ MCAPI void _reset(); /** - * @symbol ??4OwnerStorageEntity\@\@IEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4OwnerStorageEntity\@\@IEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class OwnerStorageEntity & operator=(class OwnerStorageEntity &&); /** - * @symbol ??1OwnerStorageEntity\@\@IEAA\@XZ + * @symbol ??1OwnerStorageEntity\@\@IEAA\@XZ */ MCAPI ~OwnerStorageEntity(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp b/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp index b22d637f5c..91cf126367 100644 --- a/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp +++ b/LiteLoader/include/llapi/mc/OwnerStorageFeature.hpp @@ -30,26 +30,26 @@ class OwnerStorageFeature { //protected: /** - * @symbol ??0OwnerStorageFeature\@\@IEAA\@W4VariadicInit\@0\@AEAVFeatureRegistry\@\@\@Z + * @symbol ??0OwnerStorageFeature\@\@IEAA\@W4VariadicInit\@0\@AEAVFeatureRegistry\@\@\@Z */ MCAPI OwnerStorageFeature(enum class OwnerStorageFeature::VariadicInit, class FeatureRegistry &); /** - * @symbol ??0OwnerStorageFeature\@\@IEAA\@$$QEAV0\@\@Z + * @symbol ??0OwnerStorageFeature\@\@IEAA\@$$QEAV0\@\@Z */ MCAPI OwnerStorageFeature(class OwnerStorageFeature &&); /** - * @symbol ?_getStackRef\@OwnerStorageFeature\@\@IEBAAEAVIFeature\@\@XZ + * @symbol ?_getStackRef\@OwnerStorageFeature\@\@IEBAAEAVIFeature\@\@XZ */ MCAPI class IFeature & _getStackRef() const; /** - * @symbol ?_hasValue\@OwnerStorageFeature\@\@IEBA_NXZ + * @symbol ?_hasValue\@OwnerStorageFeature\@\@IEBA_NXZ */ MCAPI bool _hasValue() const; /** - * @symbol ??1OwnerStorageFeature\@\@IEAA\@XZ + * @symbol ??1OwnerStorageFeature\@\@IEAA\@XZ */ MCAPI ~OwnerStorageFeature(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/POIBlueprint.hpp b/LiteLoader/include/llapi/mc/POIBlueprint.hpp index b4f83ba444..0110ef347e 100644 --- a/LiteLoader/include/llapi/mc/POIBlueprint.hpp +++ b/LiteLoader/include/llapi/mc/POIBlueprint.hpp @@ -11,22 +11,22 @@ #undef BEFORE_EXTRA -struct POIBlueprint { +class POIBlueprint { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_POIBLUEPRINT public: - struct POIBlueprint& operator=(struct POIBlueprint const &) = delete; - POIBlueprint(struct POIBlueprint const &) = delete; + class POIBlueprint& operator=(class POIBlueprint const &) = delete; + POIBlueprint(class POIBlueprint const &) = delete; POIBlueprint() = delete; #endif public: /** - * @symbol ??0POIBlueprint\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIType\@\@M_N_K3000\@Z + * @symbol ??0POIBlueprint\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIType\@\@M_N_K3000\@Z */ MCAPI POIBlueprint(std::string, enum class POIType, float, bool, unsigned __int64, unsigned __int64, std::string, std::string, std::string); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/POIInstance.hpp b/LiteLoader/include/llapi/mc/POIInstance.hpp index c543ffcc9b..29737ceade 100644 --- a/LiteLoader/include/llapi/mc/POIInstance.hpp +++ b/LiteLoader/include/llapi/mc/POIInstance.hpp @@ -30,92 +30,92 @@ class POIInstance { public: /** - * @symbol ??0POIInstance\@\@QEAA\@AEBVBlockPos\@\@_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIType\@\@M_K4222\@Z + * @symbol ??0POIInstance\@\@QEAA\@AEBVBlockPos\@\@_NV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4POIType\@\@M_K4222\@Z */ MCAPI POIInstance(class BlockPos const &, bool, std::string, enum class POIType, float, unsigned __int64, unsigned __int64, std::string, std::string, std::string); /** - * @symbol ?decreaseOwnerCount\@POIInstance\@\@QEAAX_K\@Z + * @symbol ?decreaseOwnerCount\@POIInstance\@\@QEAAX_K\@Z */ MCAPI void decreaseOwnerCount(unsigned __int64); /** - * @symbol ?getEndEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getEndEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getEndEvent() const; /** - * @symbol ?getInitEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getInitEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getInitEvent() const; /** - * @symbol ?getName\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getName\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getName() const; /** - * @symbol ?getOwnerCapacity\@POIInstance\@\@QEBA_KXZ + * @symbol ?getOwnerCapacity\@POIInstance\@\@QEBA_KXZ */ MCAPI unsigned __int64 getOwnerCapacity() const; /** - * @symbol ?getOwnerCount\@POIInstance\@\@QEBA_KXZ + * @symbol ?getOwnerCount\@POIInstance\@\@QEBA_KXZ */ MCAPI unsigned __int64 getOwnerCount() const; /** - * @symbol ?getPosition\@POIInstance\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getPosition\@POIInstance\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getPosition() const; /** - * @symbol ?getRadius\@POIInstance\@\@QEBAMXZ + * @symbol ?getRadius\@POIInstance\@\@QEBAMXZ */ MCAPI float getRadius() const; /** - * @symbol ?getSecondBlockFullAABB\@POIInstance\@\@QEAA?AVAABB\@\@AEAVBlockSource\@\@\@Z + * @symbol ?getSecondBlockFullAABB\@POIInstance\@\@QEAA?AVAABB\@\@AEAVBlockSource\@\@\@Z */ MCAPI class AABB getSecondBlockFullAABB(class BlockSource &); /** - * @symbol ?getSoundEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getSoundEvent\@POIInstance\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getSoundEvent() const; /** - * @symbol ?getType\@POIInstance\@\@QEBA?AW4POIType\@\@XZ + * @symbol ?getType\@POIInstance\@\@QEBA?AW4POIType\@\@XZ */ MCAPI enum class POIType getType() const; /** - * @symbol ?getTypeName\@POIInstance\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getTypeName\@POIInstance\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getTypeName() const; /** - * @symbol ?getWeight\@POIInstance\@\@QEBA_KXZ + * @symbol ?getWeight\@POIInstance\@\@QEBA_KXZ */ MCAPI unsigned __int64 getWeight() const; /** - * @symbol ?increaseOwnerCount\@POIInstance\@\@QEAAX_K\@Z + * @symbol ?increaseOwnerCount\@POIInstance\@\@QEAAX_K\@Z */ MCAPI void increaseOwnerCount(unsigned __int64); /** - * @symbol ?incrementArrivalFailureCount\@POIInstance\@\@QEAAXXZ + * @symbol ?incrementArrivalFailureCount\@POIInstance\@\@QEAAXXZ */ MCAPI void incrementArrivalFailureCount(); /** - * @symbol ?isFull\@POIInstance\@\@QEBA_NXZ + * @symbol ?isFull\@POIInstance\@\@QEBA_NXZ */ MCAPI bool isFull() const; /** - * @symbol ?isPathable\@POIInstance\@\@QEBA_NXZ + * @symbol ?isPathable\@POIInstance\@\@QEBA_NXZ */ MCAPI bool isPathable() const; /** - * @symbol ?resetArrivalFailureCount\@POIInstance\@\@QEAAXXZ + * @symbol ?resetArrivalFailureCount\@POIInstance\@\@QEAAXXZ */ MCAPI void resetArrivalFailureCount(); /** - * @symbol ?setVillage\@POIInstance\@\@QEAAXPEAVVillage\@\@\@Z + * @symbol ?setVillage\@POIInstance\@\@QEAAXPEAVVillage\@\@\@Z */ MCAPI void setVillage(class Village *); /** - * @symbol ?trySpawnParticles\@POIInstance\@\@QEBAXAEAVBlockSource\@\@AEAVRandom\@\@H\@Z + * @symbol ?trySpawnParticles\@POIInstance\@\@QEBAXAEAVBlockSource\@\@AEAVRandom\@\@H\@Z */ MCAPI void trySpawnParticles(class BlockSource &, class Random &, int) const; /** - * @symbol ?useBoundingBox\@POIInstance\@\@QEBA_NXZ + * @symbol ?useBoundingBox\@POIInstance\@\@QEBA_NXZ */ MCAPI bool useBoundingBox() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Pack.hpp b/LiteLoader/include/llapi/mc/Pack.hpp index 372eca7546..c9661f1ab8 100644 --- a/LiteLoader/include/llapi/mc/Pack.hpp +++ b/LiteLoader/include/llapi/mc/Pack.hpp @@ -32,98 +32,63 @@ class Pack { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 - */ - virtual ~Pack(); - /** - * @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 __unk_vfn_4 - */ - virtual void __unk_vfn_4(); - /** - * @vftbl 5 - * @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 6 - * @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 ??0Pack\@\@QEAA\@V?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@2\@V?$unique_ptr\@VSubpackInfoCollection\@\@U?$default_delete\@VSubpackInfoCollection\@\@\@std\@\@\@2\@V?$unique_ptr\@VPackMetadata\@\@U?$default_delete\@VPackMetadata\@\@\@std\@\@\@2\@\@Z + * @symbol ??0Pack\@\@QEAA\@V?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@2\@V?$unique_ptr\@VSubpackInfoCollection\@\@U?$default_delete\@VSubpackInfoCollection\@\@\@std\@\@\@2\@V?$unique_ptr\@VPackMetadata\@\@U?$default_delete\@VPackMetadata\@\@\@std\@\@\@2\@\@Z */ MCAPI Pack(std::unique_ptr, std::unique_ptr, std::unique_ptr, std::unique_ptr); /** - * @symbol ?getAccessStrategy\@Pack\@\@QEAAPEAVPackAccessStrategy\@\@XZ + * @symbol ?getAccessStrategy\@Pack\@\@QEAAPEAVPackAccessStrategy\@\@XZ */ MCAPI class PackAccessStrategy * getAccessStrategy(); /** - * @symbol ?getManifest\@Pack\@\@QEAAAEAVPackManifest\@\@XZ + * @symbol ?getManifest\@Pack\@\@QEAAAEAVPackManifest\@\@XZ */ MCAPI class PackManifest & getManifest(); /** - * @symbol ?getManifest\@Pack\@\@QEBAAEBVPackManifest\@\@XZ + * @symbol ?getManifest\@Pack\@\@QEBAAEBVPackManifest\@\@XZ */ MCAPI class PackManifest const & getManifest() const; /** - * @symbol ?getManifestPtr\@Pack\@\@QEAAPEAVPackManifest\@\@XZ + * @symbol ?getManifestPtr\@Pack\@\@QEAAPEAVPackManifest\@\@XZ */ MCAPI class PackManifest * getManifestPtr(); /** - * @symbol ?getSubpackInfoStack\@Pack\@\@QEAAPEAVSubpackInfoCollection\@\@XZ + * @symbol ?getSubpackInfoStack\@Pack\@\@QEAAPEAVSubpackInfoCollection\@\@XZ */ MCAPI class SubpackInfoCollection * getSubpackInfoStack(); /** - * @symbol ?move\@Pack\@\@QEAAX$$QEAV1\@\@Z + * @symbol ?move\@Pack\@\@QEAAX$$QEAV1\@\@Z */ MCAPI void move(class Pack &&); /** - * @symbol ?notifyDeleted\@Pack\@\@QEAAXXZ + * @symbol ?notifyDeleted\@Pack\@\@QEAAXXZ */ MCAPI void notifyDeleted(); /** - * @symbol ?notifyUpdated\@Pack\@\@QEAAXXZ + * @symbol ?notifyUpdated\@Pack\@\@QEAAXXZ */ MCAPI void notifyUpdated(); /** - * @symbol ?registerPackDeletedCallback\@Pack\@\@QEAAXPEAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?registerPackDeletedCallback\@Pack\@\@QEAAXPEAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ MCAPI void registerPackDeletedCallback(void *, class std::function); /** - * @symbol ?registerPackUpdatedCallback\@Pack\@\@QEAAXPEAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?registerPackUpdatedCallback\@Pack\@\@QEAAXPEAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ MCAPI void registerPackUpdatedCallback(void *, class std::function); /** - * @symbol ?unregisterPackDeletedCallback\@Pack\@\@QEAAXPEAX\@Z + * @symbol ?unregisterPackDeletedCallback\@Pack\@\@QEAAXPEAX\@Z */ MCAPI void unregisterPackDeletedCallback(void *); /** - * @symbol ?unregisterPackUpdatedCallback\@Pack\@\@QEAAXPEAX\@Z + * @symbol ?unregisterPackUpdatedCallback\@Pack\@\@QEAAXPEAX\@Z */ MCAPI void unregisterPackUpdatedCallback(void *); /** - * @symbol ?createPack\@Pack\@\@SA?AV?$unique_ptr\@VPack\@\@U?$default_delete\@VPack\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@W4PackType\@\@W4PackOrigin\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@PEAVPackSourceReport\@\@\@Z + * @symbol ?createPack\@Pack\@\@SA?AV?$unique_ptr\@VPack\@\@U?$default_delete\@VPack\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@W4PackType\@\@W4PackOrigin\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@PEAVPackSourceReport\@\@\@Z */ MCAPI static std::unique_ptr createPack(class ResourceLocation const &, enum class PackType, enum class PackOrigin, class IPackManifestFactory &, class gsl::not_null> const &, class PackSourceReport *); /** - * @symbol ?createPackMetadata\@Pack\@\@SA?AV?$unique_ptr\@VPackMetadata\@\@U?$default_delete\@VPackMetadata\@\@\@std\@\@\@std\@\@W4PackType\@\@AEAVPackManifest\@\@AEBVPackAccessStrategy\@\@AEAVPackReport\@\@\@Z + * @symbol ?createPackMetadata\@Pack\@\@SA?AV?$unique_ptr\@VPackMetadata\@\@U?$default_delete\@VPackMetadata\@\@\@std\@\@\@std\@\@W4PackType\@\@AEAVPackManifest\@\@AEBVPackAccessStrategy\@\@AEAVPackReport\@\@\@Z */ MCAPI static std::unique_ptr createPackMetadata(enum class PackType, class PackManifest &, class PackAccessStrategy const &, class PackReport &); @@ -131,8 +96,8 @@ class Pack { private: /** - * @symbol ?EDUCATION_METADATA_FILE\@Pack\@\@0V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?EDUCATION_METADATA_FILE\@Pack\@\@0V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const EDUCATION_METADATA_FILE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp index ca3decc23a..665adb17e0 100644 --- a/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/PackAccessStrategy.hpp @@ -30,142 +30,152 @@ class PackAccessStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackAccessStrategy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPackSize\@ZipPackAccessStrategy\@\@UEBA_KXZ + * @vftbl 1 + * @symbol ?getPackSize\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const = 0; /** - * @vftbl 2 - * @symbol ?getPackLocation\@ZipPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @vftbl 2 + * @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 + * @vftbl 3 + * @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 + * @vftbl 4 + * @symbol ?isWritable\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const = 0; /** - * @vftbl 5 - * @symbol ?setIsTrusted\@ZipPackAccessStrategy\@\@UEAAX_N\@Z + * @vftbl 5 + * @symbol ?setIsTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool) = 0; /** - * @vftbl 6 - * @symbol ?isTrusted\@ZipPackAccessStrategy\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isTrusted\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const = 0; /** - * @vftbl 7 - * @symbol ?hasAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N\@Z + * @vftbl 7 + * @symbol ?hasAsset\@DirectoryPackWithEncryptionAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ - virtual bool hasAsset(class Core::Path const &, bool) const = 0; + virtual bool hasAsset(class Core::Path const &, bool, bool) const = 0; /** - * @vftbl 8 - * @symbol ?hasFolder\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @vftbl 8 + * @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 + * @vftbl 9 + * @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 + * @vftbl 10 + * @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 + * @vftbl 11 + * @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 + * @vftbl 12 + * @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; /** - * @vftbl 13 - * @symbol ?forEachInAssetSet\@PackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@\@Z + * @vftbl 13 + * @symbol ?forEachInAssetSet\@PackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@\@Z */ virtual void forEachInAssetSet(class Core::Path const &, class std::function) const; /** - * @vftbl 14 - * @symbol ?getStrategyType\@ZipPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ + * @vftbl 14 + * @symbol ?getStrategyType\@ZipPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ */ virtual enum class PackAccessStrategyType getStrategyType() const = 0; /** - * @vftbl 15 - * @symbol ?getSubPath\@PackAccessStrategy\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 15 + * @symbol ?getSubPath\@PackAccessStrategy\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ 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 + * @vftbl 16 + * @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; /** - * @vftbl 17 - * @symbol ?generateAssetSet\@PackAccessStrategy\@\@UEAA?AW4PackAccessAssetGenerationResult\@\@XZ + * @vftbl 17 + * @symbol ?generateAssetSet\@PackAccessStrategy\@\@UEAA?AW4PackAccessAssetGenerationResult\@\@XZ */ virtual enum class PackAccessAssetGenerationResult generateAssetSet(); /** - * @vftbl 18 - * @symbol ?canRecurse\@PackAccessStrategy\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?canRecurse\@PackAccessStrategy\@\@UEBA_NXZ */ virtual bool canRecurse() const; /** - * @vftbl 19 - * @symbol ?unload\@ZipPackAccessStrategy\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?unload\@DirectoryPackWithEncryptionAccessStrategy\@\@UEAAXXZ */ virtual void unload() = 0; /** - * @vftbl 20 - * @symbol ?hasUpgradeFiles\@PackAccessStrategy\@\@UEBA_NXZ + * @vftbl 20 + * @symbol ?hasUpgradeFiles\@PackAccessStrategy\@\@UEBA_NXZ */ virtual bool hasUpgradeFiles() const; /** - * @vftbl 21 - * @symbol ?readContentIdentity\@PackAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ + * @vftbl 21 + * @symbol ?readContentIdentity\@PackAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ */ virtual class ContentIdentity readContentIdentity() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKACCESSSTRATEGY /** - * @symbol ??0PackAccessStrategy\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PackAccessStrategy(); +#endif + /** + * @symbol ??0PackAccessStrategy\@\@QEAA\@XZ */ MCAPI PackAccessStrategy(); /** - * @symbol ?hasGeneratedAssetSet\@PackAccessStrategy\@\@QEBA_NXZ + * @symbol ?hasGeneratedAssetSet\@PackAccessStrategy\@\@QEBA_NXZ */ MCAPI bool hasGeneratedAssetSet() const; /** - * @symbol ?PACK_IMPORT_LOCK_FILE\@PackAccessStrategy\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?PACK_IMPORT_LOCK_FILE\@PackAccessStrategy\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const PACK_IMPORT_LOCK_FILE; //protected: /** - * @symbol ?_addToAssetSet\@PackAccessStrategy\@\@IEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?_addToAssetSet\@PackAccessStrategy\@\@IEAAXAEBVPath\@Core\@\@\@Z */ MCAPI void _addToAssetSet(class Core::Path const &); /** - * @symbol ?_deleteFromAssetSet\@PackAccessStrategy\@\@IEAAXAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @symbol ?_deleteFromAssetSet\@PackAccessStrategy\@\@IEAAXAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ MCAPI void _deleteFromAssetSet(class Core::PathBuffer const &); /** - * @symbol ?_isInAssetSet\@PackAccessStrategy\@\@IEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?_isInAssetSet\@PackAccessStrategy\@\@IEBA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool _isInAssetSet(class Core::Path const &) const; + /** + * @symbol ?_isInAssetSetCaseInsensative\@PackAccessStrategy\@\@IEBA_NAEBVPath\@Core\@\@\@Z + */ + MCAPI bool _isInAssetSetCaseInsensative(class Core::Path const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp b/LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp index 7727f21fc8..3c1766012d 100644 --- a/LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackAccessStrategyFactory.hpp @@ -31,24 +31,24 @@ class PackAccessStrategyFactory { public: /** - * @symbol ?create\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEAVResourceLocation\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEAVPackReport\@\@_N\@Z + * @symbol ?create\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEAVResourceLocation\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEAVPackReport\@\@_N\@Z */ MCAPI static std::unique_ptr create(class ResourceLocation &, class gsl::not_null> const &, class PackReport &, bool); /** - * @symbol ?createForDirectory\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@_N\@Z + * @symbol ?createForDirectory\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@_N\@Z */ MCAPI static std::unique_ptr createForDirectory(class ResourceLocation const &, bool); /** - * @symbol ?createForEncrypted\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z + * @symbol ?createForEncrypted\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@AEBVContentIdentity\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z */ MCAPI static std::unique_ptr createForEncrypted(class ResourceLocation const &, class ContentIdentity const &, class gsl::not_null> const &, bool); /** - * @symbol ?createForEncryptedZip\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?createForEncryptedZip\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI static std::unique_ptr createForEncryptedZip(class ResourceLocation const &, class gsl::not_null> const &); /** - * @symbol ?createForZip\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@_N\@Z + * @symbol ?createForZip\@PackAccessStrategyFactory\@\@SA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@_N\@Z */ MCAPI static std::unique_ptr createForZip(class ResourceLocation const &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackCapabilities.hpp b/LiteLoader/include/llapi/mc/PackCapabilities.hpp index 1b4ae7a0e6..fa4c4f3ea6 100644 --- a/LiteLoader/include/llapi/mc/PackCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/PackCapabilities.hpp @@ -18,7 +18,7 @@ namespace PackCapabilities { #undef AFTER_EXTRA /** - * @symbol ?createRegistry\@PackCapabilities\@\@YA?AVPackCapabilityRegistry\@\@V?$NonOwnerPointer\@VIAdvancedGraphicsOptions\@\@\@Bedrock\@\@V2\@\@Z + * @symbol ?createRegistry\@PackCapabilities\@\@YA?AVPackCapabilityRegistry\@\@V?$NonOwnerPointer\@VIAdvancedGraphicsOptions\@\@\@Bedrock\@\@V2\@\@Z */ MCAPI class PackCapabilityRegistry createRegistry(class Bedrock::NonOwnerPointer, class PackCapabilityRegistry); diff --git a/LiteLoader/include/llapi/mc/PackCapability.hpp b/LiteLoader/include/llapi/mc/PackCapability.hpp index 6e7f3bfc24..c13042ef92 100644 --- a/LiteLoader/include/llapi/mc/PackCapability.hpp +++ b/LiteLoader/include/llapi/mc/PackCapability.hpp @@ -26,8 +26,8 @@ class PackCapability { public: /** - * @symbol ??1PackCapability\@\@QEAA\@XZ + * @symbol ??1PackCapability\@\@QEAA\@XZ */ MCAPI ~PackCapability(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp b/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp index 4062fd8da8..5bf983c924 100644 --- a/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp +++ b/LiteLoader/include/llapi/mc/PackCapabilityRegistry.hpp @@ -26,20 +26,20 @@ class PackCapabilityRegistry { public: /** - * @symbol ??0PackCapabilityRegistry\@\@QEAA\@AEBV?$initializer_list\@VPackCapability\@\@\@std\@\@\@Z + * @symbol ??0PackCapabilityRegistry\@\@QEAA\@AEBV?$initializer_list\@VPackCapability\@\@\@std\@\@\@Z */ MCAPI PackCapabilityRegistry(class std::initializer_list const &); /** - * @symbol ?lookup\@PackCapabilityRegistry\@\@QEBA?AV?$variant\@USucceeded\@ValidationResult\@PackCapability\@\@UFailed\@23\@UNotFound\@23\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z + * @symbol ?lookup\@PackCapabilityRegistry\@\@QEBA?AV?$variant\@USucceeded\@ValidationResult\@PackCapability\@\@UFailed\@23\@UNotFound\@23\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ MCAPI class std::variant lookup(class std::basic_string_view>) const; /** - * @symbol ?merge\@PackCapabilityRegistry\@\@QEAAXAEAV1\@\@Z + * @symbol ?merge\@PackCapabilityRegistry\@\@QEAAXAEAV1\@\@Z */ MCAPI void merge(class PackCapabilityRegistry &); /** - * @symbol ??1PackCapabilityRegistry\@\@QEAA\@XZ + * @symbol ??1PackCapabilityRegistry\@\@QEAA\@XZ */ MCAPI ~PackCapabilityRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackDependencyManager.hpp b/LiteLoader/include/llapi/mc/PackDependencyManager.hpp index b1ec012357..db1987ca55 100644 --- a/LiteLoader/include/llapi/mc/PackDependencyManager.hpp +++ b/LiteLoader/include/llapi/mc/PackDependencyManager.hpp @@ -22,15 +22,15 @@ namespace PackDependencyManager { #undef AFTER_EXTRA /** - * @symbol ?getMissingDependencyIdentities\@PackDependencyManager\@\@YA?AV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@V?$not_null\@PEBVPackSource\@\@\@gsl\@\@AEBVPackManifest\@\@\@Z + * @symbol ?getMissingDependencyIdentities\@PackDependencyManager\@\@YA?AV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@V?$not_null\@PEBVPackSource\@\@\@gsl\@\@AEBVPackManifest\@\@\@Z */ MCAPI std::vector getMissingDependencyIdentities(class gsl::not_null, class PackManifest const &); /** - * @symbol ?hasMissingDependencies\@PackDependencyManager\@\@YA_NV?$not_null\@PEBVPackSource\@\@\@gsl\@\@AEBVPackManifest\@\@\@Z + * @symbol ?hasMissingDependencies\@PackDependencyManager\@\@YA_NV?$not_null\@PEBVPackSource\@\@\@gsl\@\@AEBVPackManifest\@\@\@Z */ MCAPI bool hasMissingDependencies(class gsl::not_null, class PackManifest const &); /** - * @symbol ?isNativeModule\@PackDependencyManager\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isNativeModule\@PackDependencyManager\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isNativeModule(std::string const &); diff --git a/LiteLoader/include/llapi/mc/PackDiscoveryError.hpp b/LiteLoader/include/llapi/mc/PackDiscoveryError.hpp index 56a0d4031f..e7d2c99cbe 100644 --- a/LiteLoader/include/llapi/mc/PackDiscoveryError.hpp +++ b/LiteLoader/include/llapi/mc/PackDiscoveryError.hpp @@ -31,23 +31,29 @@ class PackDiscoveryError : public PackError { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackDiscoveryError(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getLocErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocErrorMessageMap() const; /** - * @vftbl 3 - * @symbol ?getEventErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getEventErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getEventErrorMessageMap() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKDISCOVERYERROR /** - * @symbol ??0PackDiscoveryError\@\@QEAA\@W4PackParseErrorType\@\@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 __unk_destructor_-1 + */ + MCVAPI ~PackDiscoveryError(); +#endif + /** + * @symbol ??0PackDiscoveryError\@\@QEAA\@W4PackParseErrorType\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI PackDiscoveryError(enum class PackParseErrorType, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackError.hpp b/LiteLoader/include/llapi/mc/PackError.hpp index 966eb2f507..134c30bd74 100644 --- a/LiteLoader/include/llapi/mc/PackError.hpp +++ b/LiteLoader/include/llapi/mc/PackError.hpp @@ -30,44 +30,44 @@ class PackError { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackError(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getLocErrorMessage\@PackError\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getLocErrorMessage\@PackError\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getLocErrorMessage() const; /** - * @vftbl 2 - * @symbol ?getLocErrorMessageMap\@PackLoadError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocErrorMessageMap() const = 0; /** - * @vftbl 3 - * @symbol ?getEventErrorMessageMap\@PackLoadError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getEventErrorMessageMap\@PackDiscoveryError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getEventErrorMessageMap() const = 0; /** - * @symbol ??0PackError\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PackError\@\@QEAA\@W4PackErrorType\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ - MCAPI PackError(class PackError const &); + MCAPI PackError(enum class PackErrorType, std::vector const &); /** - * @symbol ??0PackError\@\@QEAA\@W4PackErrorType\@\@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 ??0PackError\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PackError(enum class PackErrorType, std::vector const &); + MCAPI PackError(class PackError const &); /** - * @symbol ?getErrorParameters\@PackError\@\@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 + * @symbol ?getErrorParameters\@PackError\@\@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 & getErrorParameters() const; /** - * @symbol ?getEventErrorMessage\@PackError\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEventErrorMessage\@PackError\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getEventErrorMessage() const; /** - * @symbol ?serialize\@PackError\@\@QEAAXAEAVValue\@Json\@\@\@Z + * @symbol ?serialize\@PackError\@\@QEAAXAEAVValue\@Json\@\@\@Z */ MCAPI void serialize(class Json::Value &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackIdVersion.hpp b/LiteLoader/include/llapi/mc/PackIdVersion.hpp index a39373b2ff..5234cb5f59 100644 --- a/LiteLoader/include/llapi/mc/PackIdVersion.hpp +++ b/LiteLoader/include/llapi/mc/PackIdVersion.hpp @@ -32,43 +32,43 @@ struct PackIdVersion { public: /** - * @symbol ??0PackIdVersion\@\@QEAA\@XZ - */ - MCAPI PackIdVersion(); - /** - * @symbol ??0PackIdVersion\@\@QEAA\@AEBVUUID\@mce\@\@AEBVSemVersion\@\@W4PackType\@\@\@Z + * @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 + * @symbol ??0PackIdVersion\@\@QEAA\@AEBU0\@\@Z */ MCAPI PackIdVersion(struct PackIdVersion const &); /** - * @symbol ?asString\@PackIdVersion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ??0PackIdVersion\@\@QEAA\@XZ + */ + MCAPI PackIdVersion(); + /** + * @symbol ?asString\@PackIdVersion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string asString() const; /** - * @symbol ??9PackIdVersion\@\@QEBA_NAEBU0\@\@Z + * @symbol ??9PackIdVersion\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator!=(struct PackIdVersion const &) const; /** - * @symbol ??MPackIdVersion\@\@QEBA_NAEBU0\@\@Z + * @symbol ??MPackIdVersion\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator<(struct PackIdVersion const &) const; /** - * @symbol ??4PackIdVersion\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PackIdVersion\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PackIdVersion & operator=(struct PackIdVersion &&); /** - * @symbol ??8PackIdVersion\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8PackIdVersion\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct PackIdVersion const &) const; /** - * @symbol ?satisfies\@PackIdVersion\@\@QEBA_NAEBU1\@\@Z + * @symbol ?satisfies\@PackIdVersion\@\@QEBA_NAEBU1\@\@Z */ MCAPI bool satisfies(struct PackIdVersion const &) const; /** - * @symbol ??1PackIdVersion\@\@QEAA\@XZ + * @symbol ??1PackIdVersion\@\@QEAA\@XZ */ MCAPI ~PackIdVersion(); diff --git a/LiteLoader/include/llapi/mc/PackInfoData.hpp b/LiteLoader/include/llapi/mc/PackInfoData.hpp index c687c04758..5b848b9fda 100644 --- a/LiteLoader/include/llapi/mc/PackInfoData.hpp +++ b/LiteLoader/include/llapi/mc/PackInfoData.hpp @@ -42,11 +42,11 @@ struct PackInfoData { public: /** - * @symbol ??0PackInfoData\@\@QEAA\@AEBVUUID\@mce\@\@AEBVSemVersion\@\@_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3AEBVContentIdentity\@\@_N5\@Z + * @symbol ??0PackInfoData\@\@QEAA\@AEBVUUID\@mce\@\@AEBVSemVersion\@\@_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@3AEBVContentIdentity\@\@_N5\@Z */ MCAPI PackInfoData(class mce::UUID const &, class SemVersion const &, unsigned __int64, std::string const &, std::string const &, class ContentIdentity const &, bool, bool); /** - * @symbol ??1PackInfoData\@\@QEAA\@XZ + * @symbol ??1PackInfoData\@\@QEAA\@XZ */ MCAPI ~PackInfoData(); diff --git a/LiteLoader/include/llapi/mc/PackInstance.hpp b/LiteLoader/include/llapi/mc/PackInstance.hpp index 19c43a283f..8bbdb3ec50 100644 --- a/LiteLoader/include/llapi/mc/PackInstance.hpp +++ b/LiteLoader/include/llapi/mc/PackInstance.hpp @@ -26,122 +26,121 @@ class PackInstance { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PACKINSTANCE public: - class PackInstance& operator=(class PackInstance const &) = delete; PackInstance() = delete; #endif public: /** - * @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\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NPEAVPackSettings\@\@\@Z + * @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 + * @symbol ??0PackInstance\@\@QEAA\@AEBV0\@\@Z */ MCAPI PackInstance(class PackInstance const &); /** - * @symbol ??0PackInstance\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0PackInstance\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VResourcePack\@\@\@Bedrock\@\@\@gsl\@\@H_NPEAVPackSettings\@\@\@Z */ - MCAPI PackInstance(class PackInstance &&); + MCAPI PackInstance(class gsl::not_null>, int, bool, class PackSettings *); /** - * @symbol ?forEachIn\@PackInstance\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @symbol ?forEachIn\@PackInstance\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ MCAPI void forEachIn(class Core::Path const &, class std::function, bool) const; /** - * @symbol ?getLoadTime\@PackInstance\@\@QEBANXZ + * @symbol ?getLoadTime\@PackInstance\@\@QEBANXZ */ MCAPI double getLoadTime() const; /** - * @symbol ?getManifest\@PackInstance\@\@QEAAAEAVPackManifest\@\@XZ + * @symbol ?getManifest\@PackInstance\@\@QEBAAEBVPackManifest\@\@XZ */ - MCAPI class PackManifest & getManifest(); + MCAPI class PackManifest const & getManifest() const; /** - * @symbol ?getManifest\@PackInstance\@\@QEBAAEBVPackManifest\@\@XZ + * @symbol ?getManifest\@PackInstance\@\@QEAAAEAVPackManifest\@\@XZ */ - MCAPI class PackManifest const & getManifest() const; + MCAPI class PackManifest & getManifest(); /** - * @symbol ?getPackCategory\@PackInstance\@\@QEBA?AW4PackCategory\@\@XZ + * @symbol ?getPackCategory\@PackInstance\@\@QEBA?AW4PackCategory\@\@XZ */ MCAPI enum class PackCategory getPackCategory() const; /** - * @symbol ?getPackId\@PackInstance\@\@QEBA?BVUUID\@mce\@\@XZ + * @symbol ?getPackId\@PackInstance\@\@QEBA?BVUUID\@mce\@\@XZ */ MCAPI class mce::UUID const getPackId() const; /** - * @symbol ?getPackOrigin\@PackInstance\@\@QEBA?AW4PackOrigin\@\@XZ + * @symbol ?getPackOrigin\@PackInstance\@\@QEBA?AW4PackOrigin\@\@XZ */ MCAPI enum class PackOrigin getPackOrigin() const; /** - * @symbol ?getPackStats\@PackInstance\@\@QEAAAEAVPackStats\@\@XZ + * @symbol ?getPackStats\@PackInstance\@\@QEAAAEAVPackStats\@\@XZ */ MCAPI class PackStats & getPackStats(); /** - * @symbol ?getPackStats\@PackInstance\@\@QEBAAEBVPackStats\@\@XZ + * @symbol ?getPackStats\@PackInstance\@\@QEBAAEBVPackStats\@\@XZ */ MCAPI class PackStats const & getPackStats() const; /** - * @symbol ?getResource\@PackInstance\@\@QEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getResource\@PackInstance\@\@QEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool getResource(class Core::Path const &, std::string &) const; /** - * @symbol ?getResourceLocation\@PackInstance\@\@QEBAAEBVResourceLocation\@\@XZ + * @symbol ?getResourceLocation\@PackInstance\@\@QEBAAEBVResourceLocation\@\@XZ */ MCAPI class ResourceLocation const & getResourceLocation() const; /** - * @symbol ?getSubpackFolderName\@PackInstance\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSubpackFolderName\@PackInstance\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getSubpackFolderName() const; /** - * @symbol ?getSubpackIndex\@PackInstance\@\@QEBAHXZ + * @symbol ?getSubpackIndex\@PackInstance\@\@QEBAHXZ */ MCAPI int getSubpackIndex() const; /** - * @symbol ?getTierInfo\@PackInstance\@\@QEBA?AVContentTierInfo\@\@XZ + * @symbol ?getTierInfo\@PackInstance\@\@QEBA?AVContentTierInfo\@\@XZ */ MCAPI class ContentTierInfo getTierInfo() const; /** - * @symbol ?getVersion\@PackInstance\@\@QEBAAEBVSemVersion\@\@XZ + * @symbol ?getVersion\@PackInstance\@\@QEBAAEBVSemVersion\@\@XZ */ MCAPI class SemVersion const & getVersion() const; /** - * @symbol ?hasResource\@PackInstance\@\@QEBA_NAEBVPath\@Core\@\@\@Z + * @symbol ?hasResource\@PackInstance\@\@QEBA_NAEBVPath\@Core\@\@\@Z */ MCAPI bool hasResource(class Core::Path const &) const; /** - * @symbol ?isBaseGamePack\@PackInstance\@\@QEBA_NXZ + * @symbol ?isBaseGamePack\@PackInstance\@\@QEBA_NXZ */ MCAPI bool isBaseGamePack() const; /** - * @symbol ?isSlicePack\@PackInstance\@\@QEBA_NXZ + * @symbol ?isSlicePack\@PackInstance\@\@QEBA_NXZ */ MCAPI bool isSlicePack() const; /** - * @symbol ?isZipped\@PackInstance\@\@QEBA_NXZ + * @symbol ?isZipped\@PackInstance\@\@QEBA_NXZ */ MCAPI bool isZipped() const; /** - * @symbol ??8PackInstance\@\@QEBA_NAEBV0\@\@Z + * @symbol ??4PackInstance\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class PackInstance & operator=(class PackInstance const &); + /** + * @symbol ??8PackInstance\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class PackInstance const &) const; /** - * @symbol ?setLocale\@PackInstance\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setLocale\@PackInstance\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setLocale(std::string const &); /** - * @symbol ??1PackInstance\@\@QEAA\@XZ + * @symbol ??1PackInstance\@\@QEAA\@XZ */ MCAPI ~PackInstance(); //private: /** - * @symbol ?_isPackPointerValid\@PackInstance\@\@AEBA_NXZ + * @symbol ?_isPackPointerValid\@PackInstance\@\@AEBA_NXZ */ MCAPI bool _isPackPointerValid() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackInstanceId.hpp b/LiteLoader/include/llapi/mc/PackInstanceId.hpp index b6f0f4d063..e8c6ba3c27 100644 --- a/LiteLoader/include/llapi/mc/PackInstanceId.hpp +++ b/LiteLoader/include/llapi/mc/PackInstanceId.hpp @@ -28,15 +28,15 @@ struct PackInstanceId { public: /** - * @symbol ??0PackInstanceId\@\@QEAA\@AEBUPackIdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0PackInstanceId\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI PackInstanceId(struct PackIdVersion const &, std::string const &); + MCAPI PackInstanceId(struct PackInstanceId &&); /** - * @symbol ??0PackInstanceId\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0PackInstanceId\@\@QEAA\@AEBUPackIdVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI PackInstanceId(struct PackInstanceId &&); + MCAPI PackInstanceId(struct PackIdVersion const &, std::string const &); /** - * @symbol ??1PackInstanceId\@\@QEAA\@XZ + * @symbol ??1PackInstanceId\@\@QEAA\@XZ */ MCAPI ~PackInstanceId(); diff --git a/LiteLoader/include/llapi/mc/PackLoadError.hpp b/LiteLoader/include/llapi/mc/PackLoadError.hpp index 97083239fb..6dd7ce3bb6 100644 --- a/LiteLoader/include/llapi/mc/PackLoadError.hpp +++ b/LiteLoader/include/llapi/mc/PackLoadError.hpp @@ -31,23 +31,29 @@ class PackLoadError : public PackError { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackLoadError(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getLocErrorMessageMap\@PackLoadError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocErrorMessageMap\@PackLoadError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocErrorMessageMap() const; /** - * @vftbl 3 - * @symbol ?getEventErrorMessageMap\@PackLoadError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getEventErrorMessageMap\@PackLoadError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getEventErrorMessageMap() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKLOADERROR /** - * @symbol ??0PackLoadError\@\@QEAA\@W4PackParseErrorType\@\@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 __unk_destructor_-1 + */ + MCVAPI ~PackLoadError(); +#endif + /** + * @symbol ??0PackLoadError\@\@QEAA\@W4PackParseErrorType\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI PackLoadError(enum class PackParseErrorType, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackManifest.hpp b/LiteLoader/include/llapi/mc/PackManifest.hpp index b2a8be3cdb..03dd8c27f2 100644 --- a/LiteLoader/include/llapi/mc/PackManifest.hpp +++ b/LiteLoader/include/llapi/mc/PackManifest.hpp @@ -37,342 +37,348 @@ struct CapabilityRegisterer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackManifest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?clone\@PackManifest\@\@UEBA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?clone\@PackManifest\@\@UEBA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKMANIFEST /** - * @symbol ??0PackManifest\@\@QEAA\@W4ManifestType\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PackManifest(); +#endif + /** + * @symbol ??0PackManifest\@\@QEAA\@W4ManifestType\@\@\@Z */ MCAPI PackManifest(enum class ManifestType); /** - * @symbol ??0PackManifest\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PackManifest\@\@QEAA\@AEBV0\@\@Z */ MCAPI PackManifest(class PackManifest const &); /** - * @symbol ?addLegacyModuleDependency\@PackManifest\@\@QEAAXAEBULegacyPackIdVersion\@\@\@Z + * @symbol ?addLegacyModuleDependency\@PackManifest\@\@QEAAXAEBULegacyPackIdVersion\@\@\@Z */ MCAPI void addLegacyModuleDependency(struct LegacyPackIdVersion const &); /** - * @symbol ?addModule\@PackManifest\@\@QEAAXAEBVResourceInformation\@\@\@Z + * @symbol ?addModule\@PackManifest\@\@QEAAXAEBVResourceInformation\@\@\@Z */ MCAPI void addModule(class ResourceInformation const &); /** - * @symbol ?addModuleDependency\@PackManifest\@\@QEAAXAEBUModuleIdentifier\@\@\@Z + * @symbol ?addModuleDependency\@PackManifest\@\@QEAAXAEBUModuleIdentifier\@\@\@Z */ MCAPI void addModuleDependency(struct ModuleIdentifier const &); /** - * @symbol ?addPackCapability\@PackManifest\@\@QEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4TrustLevel\@PackCapability\@\@\@Z + * @symbol ?addPackCapability\@PackManifest\@\@QEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4TrustLevel\@PackCapability\@\@\@Z */ - MCAPI void addPackCapability(class gsl::basic_string_span, enum class PackCapability::TrustLevel); + MCAPI void addPackCapability(class std::basic_string_view>, enum class PackCapability::TrustLevel); /** - * @symbol ?addPackDependency\@PackManifest\@\@QEAAXAEBUPackIdVersion\@\@\@Z + * @symbol ?addPackDependency\@PackManifest\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void addPackDependency(struct PackIdVersion const &); /** - * @symbol ?clearLegacyModuleDependencies\@PackManifest\@\@QEAAXXZ + * @symbol ?clearLegacyModuleDependencies\@PackManifest\@\@QEAAXXZ */ MCAPI void clearLegacyModuleDependencies(); /** - * @symbol ?clearModules\@PackManifest\@\@QEAAXXZ + * @symbol ?clearModules\@PackManifest\@\@QEAAXXZ */ MCAPI void clearModules(); /** - * @symbol ?getContentIdentity\@PackManifest\@\@QEBAAEBVContentIdentity\@\@XZ + * @symbol ?getContentIdentity\@PackManifest\@\@QEBAAEBVContentIdentity\@\@XZ */ MCAPI class ContentIdentity const & getContentIdentity() const; /** - * @symbol ?getDependentPackIdentities\@PackManifest\@\@QEBAAEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getDependentPackIdentities\@PackManifest\@\@QEBAAEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getDependentPackIdentities() const; /** - * @symbol ?getDescription\@PackManifest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescription\@PackManifest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescription() const; /** - * @symbol ?getFormatVersion\@PackManifest\@\@QEBA?AW4PackManifestFormat\@\@XZ + * @symbol ?getFormatVersion\@PackManifest\@\@QEBA?AW4PackManifestFormat\@\@XZ */ MCAPI enum class PackManifestFormat getFormatVersion() const; /** - * @symbol ?getIdentity\@PackManifest\@\@QEBAAEBUPackIdVersion\@\@XZ + * @symbol ?getIdentity\@PackManifest\@\@QEBAAEBUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion const & getIdentity() const; /** - * @symbol ?getLegacyModuleDependencies\@PackManifest\@\@QEBAAEBV?$vector\@ULegacyPackIdVersion\@\@V?$allocator\@ULegacyPackIdVersion\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getLegacyModuleDependencies\@PackManifest\@\@QEBAAEBV?$vector\@ULegacyPackIdVersion\@\@V?$allocator\@ULegacyPackIdVersion\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getLegacyModuleDependencies() const; /** - * @symbol ?getLocation\@PackManifest\@\@QEBAAEBVResourceLocation\@\@XZ + * @symbol ?getLocation\@PackManifest\@\@QEBAAEBVResourceLocation\@\@XZ */ MCAPI class ResourceLocation const & getLocation() const; /** - * @symbol ?getManifestOrigin\@PackManifest\@\@QEBA?AW4ManifestOrigin\@\@XZ + * @symbol ?getManifestOrigin\@PackManifest\@\@QEBA?AW4ManifestOrigin\@\@XZ */ MCAPI enum class ManifestOrigin getManifestOrigin() const; /** - * @symbol ?getMetaData\@PackManifest\@\@QEBAAEBVResourceMetadata\@\@XZ + * @symbol ?getMetaData\@PackManifest\@\@QEBAAEBVResourceMetadata\@\@XZ */ MCAPI class ResourceMetadata const & getMetaData() const; /** - * @symbol ?getMinEngineVersion\@PackManifest\@\@QEBAAEBVSemVersion\@\@XZ + * @symbol ?getMinEngineVersion\@PackManifest\@\@QEBAAEBVSemVersion\@\@XZ */ MCAPI class SemVersion const & getMinEngineVersion() const; /** - * @symbol ?getModuleDependencies\@PackManifest\@\@QEBAAEBV?$vector\@UModuleIdentifier\@\@V?$allocator\@UModuleIdentifier\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getModuleDependencies\@PackManifest\@\@QEBAAEBV?$vector\@UModuleIdentifier\@\@V?$allocator\@UModuleIdentifier\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getModuleDependencies() const; /** - * @symbol ?getModules\@PackManifest\@\@QEBAAEBV?$vector\@VResourceInformation\@\@V?$allocator\@VResourceInformation\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getModules\@PackManifest\@\@QEBAAEBV?$vector\@VResourceInformation\@\@V?$allocator\@VResourceInformation\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getModules() const; /** - * @symbol ?getName\@PackManifest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@PackManifest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName() const; /** - * @symbol ?getNameForTelemetry\@PackManifest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getNameForTelemetry\@PackManifest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getNameForTelemetry() const; /** - * @symbol ?getOriginalFormatVersion\@PackManifest\@\@QEBA?AW4PackManifestFormat\@\@XZ + * @symbol ?getOriginalFormatVersion\@PackManifest\@\@QEBA?AW4PackManifestFormat\@\@XZ */ MCAPI enum class PackManifestFormat getOriginalFormatVersion() const; /** - * @symbol ?getPackCategory\@PackManifest\@\@QEBA?AW4PackCategory\@\@XZ + * @symbol ?getPackCategory\@PackManifest\@\@QEBA?AW4PackCategory\@\@XZ */ MCAPI enum class PackCategory getPackCategory() const; /** - * @symbol ?getPackOrigin\@PackManifest\@\@QEBA?AW4PackOrigin\@\@XZ + * @symbol ?getPackOrigin\@PackManifest\@\@QEBA?AW4PackOrigin\@\@XZ */ MCAPI enum class PackOrigin getPackOrigin() const; /** - * @symbol ?getPackScope\@PackManifest\@\@QEBA?AW4PackScope\@\@XZ + * @symbol ?getPackScope\@PackManifest\@\@QEBA?AW4PackScope\@\@XZ */ MCAPI enum class PackScope getPackScope() const; /** - * @symbol ?getPackSettings\@PackManifest\@\@QEBAAEBVValue\@Json\@\@XZ + * @symbol ?getPackSettings\@PackManifest\@\@QEBAAEBVValue\@Json\@\@XZ */ MCAPI class Json::Value const & getPackSettings() const; /** - * @symbol ?getPackSize\@PackManifest\@\@QEBA_KXZ + * @symbol ?getPackSize\@PackManifest\@\@QEBA_KXZ */ MCAPI unsigned __int64 getPackSize() const; /** - * @symbol ?getPackType\@PackManifest\@\@QEBA?AW4PackType\@\@XZ + * @symbol ?getPackType\@PackManifest\@\@QEBA?AW4PackType\@\@XZ */ MCAPI enum class PackType getPackType() const; /** - * @symbol ?getRequiredBaseGameVersion\@PackManifest\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getRequiredBaseGameVersion\@PackManifest\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getRequiredBaseGameVersion() const; /** - * @symbol ?hasClientScript\@PackManifest\@\@QEBA_NXZ + * @symbol ?hasClientScript\@PackManifest\@\@QEBA_NXZ */ MCAPI bool hasClientScript() const; /** - * @symbol ?hasEducationMetadata\@PackManifest\@\@QEBA_NXZ + * @symbol ?hasEducationMetadata\@PackManifest\@\@QEBA_NXZ */ MCAPI bool hasEducationMetadata() const; /** - * @symbol ?hasLegacyModuleDependencies\@PackManifest\@\@QEBA_NXZ + * @symbol ?hasLegacyModuleDependencies\@PackManifest\@\@QEBA_NXZ */ MCAPI bool hasLegacyModuleDependencies() const; /** - * @symbol ?hasModule\@PackManifest\@\@QEBA_NAEBUPackIdVersion\@\@\@Z + * @symbol ?hasModule\@PackManifest\@\@QEBA_NAEBUPackIdVersion\@\@\@Z */ MCAPI bool hasModule(struct PackIdVersion const &) const; /** - * @symbol ?hasPackCapability\@PackManifest\@\@QEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?hasPackCapability\@PackManifest\@\@QEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool hasPackCapability(class gsl::basic_string_span) const; + MCAPI bool hasPackCapability(class std::basic_string_view>) const; /** - * @symbol ?hasPlugins\@PackManifest\@\@QEBA_NXZ + * @symbol ?hasPlugins\@PackManifest\@\@QEBA_NXZ */ MCAPI bool hasPlugins() const; /** - * @symbol ?isHidden\@PackManifest\@\@QEBA_NXZ + * @symbol ?isHidden\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isHidden() const; /** - * @symbol ?isPlatformLocked\@PackManifest\@\@QEBA_NXZ + * @symbol ?isPlatformLocked\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isPlatformLocked() const; /** - * @symbol ?isPremium\@PackManifest\@\@QEBA_NXZ + * @symbol ?isPremium\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isPremium() const; /** - * @symbol ?isRestrictedPack\@PackManifest\@\@QEBA_NXZ + * @symbol ?isRestrictedPack\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isRestrictedPack() const; /** - * @symbol ?isUsingPackDescriptionKeyword\@PackManifest\@\@QEBA_NXZ + * @symbol ?isUsingPackDescriptionKeyword\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isUsingPackDescriptionKeyword() const; /** - * @symbol ?isUsingPackNameKeyword\@PackManifest\@\@QEBA_NXZ + * @symbol ?isUsingPackNameKeyword\@PackManifest\@\@QEBA_NXZ */ MCAPI bool isUsingPackNameKeyword() const; /** - * @symbol ?serialize\@PackManifest\@\@QEBAXW4PackManifestFormat\@\@AEAVValue\@Json\@\@\@Z + * @symbol ?serialize\@PackManifest\@\@QEBAXW4PackManifestFormat\@\@AEAVValue\@Json\@\@\@Z */ MCAPI void serialize(enum class PackManifestFormat, class Json::Value &) const; /** - * @symbol ?setCanBeRedownloaded\@PackManifest\@\@QEAAX_N\@Z + * @symbol ?setCanBeRedownloaded\@PackManifest\@\@QEAAX_N\@Z */ MCAPI void setCanBeRedownloaded(bool); /** - * @symbol ?setContentIdentity\@PackManifest\@\@QEAAXAEBVContentIdentity\@\@\@Z + * @symbol ?setContentIdentity\@PackManifest\@\@QEAAXAEBVContentIdentity\@\@\@Z */ MCAPI void setContentIdentity(class ContentIdentity const &); /** - * @symbol ?setDescription\@PackManifest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setDescription\@PackManifest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setDescription(std::string const &); /** - * @symbol ?setFormatVersion\@PackManifest\@\@QEAAXW4PackManifestFormat\@\@\@Z + * @symbol ?setFormatVersion\@PackManifest\@\@QEAAXW4PackManifestFormat\@\@\@Z */ MCAPI void setFormatVersion(enum class PackManifestFormat); /** - * @symbol ?setHasClientScript\@PackManifest\@\@QEAAXXZ + * @symbol ?setHasClientScript\@PackManifest\@\@QEAAXXZ */ MCAPI void setHasClientScript(); /** - * @symbol ?setHasEducationMetadata\@PackManifest\@\@QEAAX_N\@Z + * @symbol ?setHasEducationMetadata\@PackManifest\@\@QEAAX_N\@Z */ MCAPI void setHasEducationMetadata(bool); /** - * @symbol ?setHasPlugins\@PackManifest\@\@QEAAX_N\@Z + * @symbol ?setHasPlugins\@PackManifest\@\@QEAAX_N\@Z */ MCAPI void setHasPlugins(bool); /** - * @symbol ?setHidden\@PackManifest\@\@QEAAX_N\@Z + * @symbol ?setHidden\@PackManifest\@\@QEAAX_N\@Z */ MCAPI void setHidden(bool); /** - * @symbol ?setIdentity\@PackManifest\@\@QEAAXAEBUPackIdVersion\@\@\@Z + * @symbol ?setIdentity\@PackManifest\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void setIdentity(struct PackIdVersion const &); /** - * @symbol ?setInvalidUUID\@PackManifest\@\@QEAAXXZ + * @symbol ?setInvalidUUID\@PackManifest\@\@QEAAXXZ */ MCAPI void setInvalidUUID(); /** - * @symbol ?setLanguageCodesForPackKeywords\@PackManifest\@\@QEAAXV?$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 ?setLanguageCodesForPackKeywords\@PackManifest\@\@QEAAXV?$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 void setLanguageCodesForPackKeywords(std::vector); /** - * @symbol ?setLastModifiedDate\@PackManifest\@\@QEAAX_J\@Z + * @symbol ?setLastModifiedDate\@PackManifest\@\@QEAAX_J\@Z */ MCAPI void setLastModifiedDate(__int64); /** - * @symbol ?setLocalizedNameKeywords\@PackManifest\@\@QEAAXAEBV?$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\@\@\@Z + * @symbol ?setLocalizedNameKeywords\@PackManifest\@\@QEAAXAEBV?$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\@\@\@Z */ MCAPI void setLocalizedNameKeywords(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); /** - * @symbol ?setLocation\@PackManifest\@\@QEAAXAEBVResourceLocation\@\@\@Z + * @symbol ?setLocation\@PackManifest\@\@QEAAXAEBVResourceLocation\@\@\@Z */ MCAPI void setLocation(class ResourceLocation const &); /** - * @symbol ?setManifestOrigin\@PackManifest\@\@QEAAXAEBW4ManifestOrigin\@\@\@Z + * @symbol ?setManifestOrigin\@PackManifest\@\@QEAAXAEBW4ManifestOrigin\@\@\@Z */ MCAPI void setManifestOrigin(enum class ManifestOrigin const &); /** - * @symbol ?setMetadata\@PackManifest\@\@QEAAXAEBVResourceMetadata\@\@\@Z + * @symbol ?setMetadata\@PackManifest\@\@QEAAXAEBVResourceMetadata\@\@\@Z */ MCAPI void setMetadata(class ResourceMetadata const &); /** - * @symbol ?setMinEngineVersion\@PackManifest\@\@QEAAXAEBVSemVersion\@\@\@Z + * @symbol ?setMinEngineVersion\@PackManifest\@\@QEAAXAEBVSemVersion\@\@\@Z */ MCAPI void setMinEngineVersion(class SemVersion const &); /** - * @symbol ?setName\@PackManifest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setName\@PackManifest\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setName(std::string const &); /** - * @symbol ?setOptionLockedState\@PackManifest\@\@QEAAXW4TemplateLockState\@\@\@Z + * @symbol ?setOptionLockedState\@PackManifest\@\@QEAAXW4TemplateLockState\@\@\@Z */ MCAPI void setOptionLockedState(enum class TemplateLockState); /** - * @symbol ?setOriginalFormatVersion\@PackManifest\@\@QEAAXW4PackManifestFormat\@\@\@Z + * @symbol ?setOriginalFormatVersion\@PackManifest\@\@QEAAXW4PackManifestFormat\@\@\@Z */ MCAPI void setOriginalFormatVersion(enum class PackManifestFormat); /** - * @symbol ?setPackCapabilitiesTrusted\@PackManifest\@\@QEAAXXZ + * @symbol ?setPackCapabilitiesTrusted\@PackManifest\@\@QEAAXXZ */ MCAPI void setPackCapabilitiesTrusted(); /** - * @symbol ?setPackCategory\@PackManifest\@\@QEAAXW4PackCategory\@\@\@Z + * @symbol ?setPackCategory\@PackManifest\@\@QEAAXW4PackCategory\@\@\@Z */ MCAPI void setPackCategory(enum class PackCategory); /** - * @symbol ?setPackOrigin\@PackManifest\@\@QEAAXW4PackOrigin\@\@\@Z + * @symbol ?setPackOrigin\@PackManifest\@\@QEAAXW4PackOrigin\@\@\@Z */ MCAPI void setPackOrigin(enum class PackOrigin); /** - * @symbol ?setPackScope\@PackManifest\@\@QEAAXW4PackScope\@\@\@Z + * @symbol ?setPackScope\@PackManifest\@\@QEAAXW4PackScope\@\@\@Z */ MCAPI void setPackScope(enum class PackScope); /** - * @symbol ?setPackSettings\@PackManifest\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?setPackSettings\@PackManifest\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void setPackSettings(class Json::Value const &); /** - * @symbol ?setPackSize\@PackManifest\@\@QEAAX_K\@Z + * @symbol ?setPackSize\@PackManifest\@\@QEAAX_K\@Z */ MCAPI void setPackSize(unsigned __int64); /** - * @symbol ?setPackType\@PackManifest\@\@QEAAXW4PackType\@\@\@Z + * @symbol ?setPackType\@PackManifest\@\@QEAAXW4PackType\@\@\@Z */ MCAPI void setPackType(enum class PackType); /** - * @symbol ?setPlatformLocked\@PackManifest\@\@QEAAX_N\@Z + * @symbol ?setPlatformLocked\@PackManifest\@\@QEAAX_N\@Z */ MCAPI void setPlatformLocked(bool); /** - * @symbol ?setRequiredBaseGameVersion\@PackManifest\@\@QEAAXAEBVBaseGameVersion\@\@\@Z + * @symbol ?setRequiredBaseGameVersion\@PackManifest\@\@QEAAXAEBVBaseGameVersion\@\@\@Z */ MCAPI void setRequiredBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?setSourceIdentity\@PackManifest\@\@QEAAXAEBVContentIdentity\@\@\@Z + * @symbol ?setSourceIdentity\@PackManifest\@\@QEAAXAEBVContentIdentity\@\@\@Z */ MCAPI void setSourceIdentity(class ContentIdentity const &); /** - * @symbol ?MarioPackId\@PackManifest\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MarioPackId\@PackManifest\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MarioPackId; /** - * @symbol ?StringToPackScope\@PackManifest\@\@SA?AW4PackScope\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?StringToPackScope\@PackManifest\@\@SA?AW4PackScope\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class PackScope StringToPackScope(std::string const &); //private: /** - * @symbol ?_serializeDependencies\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?_serializeDependencies\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@\@Z */ MCAPI void _serializeDependencies(class Json::Value &) const; /** - * @symbol ?_serializeHeader\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?_serializeHeader\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@\@Z */ MCAPI void _serializeHeader(class Json::Value &) const; /** - * @symbol ?_serializeModules\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?_serializeModules\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@\@Z */ MCAPI void _serializeModules(class Json::Value &) const; /** - * @symbol ?_serializeVersion\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_serializeVersion\@PackManifest\@\@AEBAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI void _serializeVersion(class Json::Value &, class SemVersion const &) const; private: /** - * @symbol ?STRING_TO_PACK_SCOPE\@PackManifest\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PackScope\@\@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\@\@W4PackScope\@\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?STRING_TO_PACK_SCOPE\@PackManifest\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PackScope\@\@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\@\@W4PackScope\@\@\@std\@\@\@2\@\@std\@\@B */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> const STRING_TO_PACK_SCOPE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackManifestFactory.hpp b/LiteLoader/include/llapi/mc/PackManifestFactory.hpp index 2f90382dce..d3d9f79c86 100644 --- a/LiteLoader/include/llapi/mc/PackManifestFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackManifestFactory.hpp @@ -31,58 +31,64 @@ class PackManifestFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackManifestFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?create\@PackManifestFactory\@\@UEAA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@AEAVPackAccessStrategy\@\@AEBVResourceLocation\@\@AEAVPackReport\@\@PEAVSubpackInfoCollection\@\@\@Z + * @vftbl 1 + * @symbol ?create\@PackManifestFactory\@\@UEAA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@AEAVPackAccessStrategy\@\@AEBVResourceLocation\@\@AEAVPackReport\@\@PEAVSubpackInfoCollection\@\@\@Z */ virtual std::unique_ptr create(class PackAccessStrategy &, class ResourceLocation const &, class PackReport &, class SubpackInfoCollection *); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKMANIFESTFACTORY /** - * @symbol ??0PackManifestFactory\@\@QEAA\@AEBVPackCapabilityRegistry\@\@AEAVIPackTelemetry\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PackManifestFactory(); +#endif + /** + * @symbol ??0PackManifestFactory\@\@QEAA\@AEBVPackCapabilityRegistry\@\@AEAVIPackTelemetry\@\@\@Z */ MCAPI PackManifestFactory(class PackCapabilityRegistry const &, class IPackTelemetry &); /** - * @symbol ?create\@PackManifestFactory\@\@QEAA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@AEAVPackAccessStrategy\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAVPackReport\@\@V23\@PEAVSubpackInfoCollection\@\@\@Z + * @symbol ?create\@PackManifestFactory\@\@QEAA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@AEAVPackAccessStrategy\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAVPackReport\@\@V23\@PEAVSubpackInfoCollection\@\@\@Z */ MCAPI std::unique_ptr create(class PackAccessStrategy &, std::string const &, class PackReport &, std::unique_ptr, class SubpackInfoCollection *); /** - * @symbol ?MANIFEST_LOG_PATH\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?MANIFEST_LOG_PATH\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const MANIFEST_LOG_PATH; /** - * @symbol ?MANIFEST_PACK_UUID_UPGRADE_SALT\@PackManifestFactory\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MANIFEST_PACK_UUID_UPGRADE_SALT\@PackManifestFactory\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MANIFEST_PACK_UUID_UPGRADE_SALT; /** - * @symbol ?MANIFEST_PATH\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?MANIFEST_PATH\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const MANIFEST_PATH; /** - * @symbol ?MANIFEST_PATH_OLD\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?MANIFEST_PATH_OLD\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const MANIFEST_PATH_OLD; /** - * @symbol ?MANIFEST_PATH_OLD_BACKUP\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?MANIFEST_PATH_OLD_BACKUP\@PackManifestFactory\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const MANIFEST_PATH_OLD_BACKUP; /** - * @symbol ?REQUIRED_VANILLA_FOR_OLD_PACKS\@PackManifestFactory\@\@2VSemVersion\@\@B + * @symbol ?REQUIRED_VANILLA_FOR_OLD_PACKS\@PackManifestFactory\@\@2VSemVersion\@\@B */ MCAPI static class SemVersion const REQUIRED_VANILLA_FOR_OLD_PACKS; /** - * @symbol ?contentKeyLookup\@PackManifestFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?contentKeyLookup\@PackManifestFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI static std::string contentKeyLookup(std::string const &); /** - * @symbol ?mAlternateContentKeys\@PackManifestFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mAlternateContentKeys\@PackManifestFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map const, struct std::hash, struct std::equal_to, class std::allocator const>>> mAlternateContentKeys; /** - * @symbol ?mContentKeys\@PackManifestFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mContentKeys\@PackManifestFactory\@\@2V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$CBV?$vector\@DV?$allocator\@D\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map const, struct std::hash, struct std::equal_to, class std::allocator const>>> mContentKeys; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackMetadata.hpp b/LiteLoader/include/llapi/mc/PackMetadata.hpp index 47a78b39d2..dadc86fab2 100644 --- a/LiteLoader/include/llapi/mc/PackMetadata.hpp +++ b/LiteLoader/include/llapi/mc/PackMetadata.hpp @@ -27,12 +27,12 @@ class PackMetadata { public: /** - * @symbol ??0PackMetadata\@\@QEAA\@XZ + * @symbol ??0PackMetadata\@\@QEAA\@V?$unique_ptr\@UEducationMetadata\@\@U?$default_delete\@UEducationMetadata\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI PackMetadata(); + MCAPI PackMetadata(std::unique_ptr); /** - * @symbol ??0PackMetadata\@\@QEAA\@V?$unique_ptr\@UEducationMetadata\@\@U?$default_delete\@UEducationMetadata\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0PackMetadata\@\@QEAA\@XZ */ - MCAPI PackMetadata(std::unique_ptr); + MCAPI PackMetadata(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackReport.hpp b/LiteLoader/include/llapi/mc/PackReport.hpp index fa1dc63b27..0d28664513 100644 --- a/LiteLoader/include/llapi/mc/PackReport.hpp +++ b/LiteLoader/include/llapi/mc/PackReport.hpp @@ -29,80 +29,84 @@ class PackReport { public: /** - * @symbol ??0PackReport\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PackReport\@\@QEAA\@$$QEAV0\@\@Z + */ + MCAPI PackReport(class PackReport &&); + /** + * @symbol ??0PackReport\@\@QEAA\@AEBV0\@\@Z */ MCAPI PackReport(class PackReport const &); /** - * @symbol ??0PackReport\@\@QEAA\@XZ + * @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 + * @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 + * @symbol ?getIdentity\@PackReport\@\@QEBAAEBUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion const & getIdentity() const; /** - * @symbol ?getLocation\@PackReport\@\@QEBAAEBVResourceLocation\@\@XZ + * @symbol ?getLocation\@PackReport\@\@QEBAAEBVResourceLocation\@\@XZ */ MCAPI class ResourceLocation const & getLocation() const; /** - * @symbol ?getOriginalName\@PackReport\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getOriginalName\@PackReport\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getOriginalName() const; /** - * @symbol ?getOriginalVersion\@PackReport\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getOriginalVersion\@PackReport\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getOriginalVersion() const; /** - * @symbol ?getPackType\@PackReport\@\@QEBA?AW4PackType\@\@XZ + * @symbol ?getPackType\@PackReport\@\@QEBA?AW4PackType\@\@XZ */ MCAPI enum class PackType getPackType() const; /** - * @symbol ?hasErrors\@PackReport\@\@QEAA_NW4PackErrorType\@\@\@Z + * @symbol ?hasErrors\@PackReport\@\@QEAA_NW4PackErrorType\@\@\@Z */ MCAPI bool hasErrors(enum class PackErrorType); /** - * @symbol ?hasErrors\@PackReport\@\@QEBA_NXZ + * @symbol ?hasErrors\@PackReport\@\@QEBA_NXZ */ MCAPI bool hasErrors() const; /** - * @symbol ?serialize\@PackReport\@\@QEAAXAEAVValue\@Json\@\@\@Z + * @symbol ?serialize\@PackReport\@\@QEAAXAEAVValue\@Json\@\@\@Z */ MCAPI void serialize(class Json::Value &); /** - * @symbol ?setAttemptedUpgrade\@PackReport\@\@QEAAXXZ + * @symbol ?setAttemptedUpgrade\@PackReport\@\@QEAAXXZ */ MCAPI void setAttemptedUpgrade(); /** - * @symbol ?setIdentity\@PackReport\@\@QEAAXAEBUPackIdVersion\@\@\@Z + * @symbol ?setIdentity\@PackReport\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void setIdentity(struct PackIdVersion const &); /** - * @symbol ?setLocation\@PackReport\@\@QEAAXAEBVResourceLocation\@\@\@Z + * @symbol ?setLocation\@PackReport\@\@QEAAXAEBVResourceLocation\@\@\@Z */ MCAPI void setLocation(class ResourceLocation const &); /** - * @symbol ?setOriginalIdentity\@PackReport\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?setOriginalIdentity\@PackReport\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI void setOriginalIdentity(std::string const &, std::string const &); /** - * @symbol ?setPackType\@PackReport\@\@QEAAXW4PackType\@\@\@Z + * @symbol ?setPackType\@PackReport\@\@QEAAXW4PackType\@\@\@Z */ MCAPI void setPackType(enum class PackType); /** - * @symbol ?setUpgradeSuccess\@PackReport\@\@QEAAXXZ + * @symbol ?setUpgradeSuccess\@PackReport\@\@QEAAXXZ */ MCAPI void setUpgradeSuccess(); /** - * @symbol ?wasUpgraded\@PackReport\@\@QEBA_NXZ + * @symbol ?wasUpgraded\@PackReport\@\@QEBA_NXZ */ MCAPI bool wasUpgraded() const; /** - * @symbol ??1PackReport\@\@QEAA\@XZ + * @symbol ??1PackReport\@\@QEAA\@XZ */ MCAPI ~PackReport(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSetting.hpp b/LiteLoader/include/llapi/mc/PackSetting.hpp index 21cacfbf5c..4ff80f35a3 100644 --- a/LiteLoader/include/llapi/mc/PackSetting.hpp +++ b/LiteLoader/include/llapi/mc/PackSetting.hpp @@ -31,12 +31,12 @@ class PackSetting { public: /** - * @symbol ?set\@PackSetting\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?set\@PackSetting\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void set(class Json::Value const &); /** - * @symbol ??1PackSetting\@\@QEAA\@XZ + * @symbol ??1PackSetting\@\@QEAA\@XZ */ MCAPI ~PackSetting(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSettings.hpp b/LiteLoader/include/llapi/mc/PackSettings.hpp index ceac88ec2b..395ec5d104 100644 --- a/LiteLoader/include/llapi/mc/PackSettings.hpp +++ b/LiteLoader/include/llapi/mc/PackSettings.hpp @@ -26,25 +26,28 @@ class PackSettings { public: class PackSettings& operator=(class PackSettings const &) = delete; PackSettings(class PackSettings const &) = delete; - PackSettings() = delete; #endif public: /** - * @symbol ?getAllSettings\@PackSettings\@\@QEBAAEBVValue\@Json\@\@XZ + * @symbol ??0PackSettings\@\@QEAA\@XZ + */ + MCAPI PackSettings(); + /** + * @symbol ?getAllSettings\@PackSettings\@\@QEBAAEBVValue\@Json\@\@XZ */ MCAPI class Json::Value const & getAllSettings() const; /** - * @symbol ?loadPackSettings\@PackSettings\@\@QEAAXAEBUPackIdVersion\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?loadPackSettings\@PackSettings\@\@QEAAXAEBUPackIdVersion\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void loadPackSettings(struct PackIdVersion const &, class Json::Value const &); //private: /** - * @symbol ?_initPackSetting\@PackSettings\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_initPackSetting\@PackSettings\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void _initPackSetting(std::string const &, class Json::Value const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSettingsError.hpp b/LiteLoader/include/llapi/mc/PackSettingsError.hpp index 7f064bfb54..917f0a8245 100644 --- a/LiteLoader/include/llapi/mc/PackSettingsError.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsError.hpp @@ -30,28 +30,34 @@ class PackSettingsError { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackSettingsError(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getLocErrorMessage\@PackSettingsError\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getLocErrorMessage\@PackSettingsError\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getLocErrorMessage() const; /** - * @vftbl 2 - * @symbol ?getLocErrorMessageMap\@PackSettingsError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getLocErrorMessageMap\@PackSettingsError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocErrorMessageMap() const; /** - * @vftbl 3 - * @symbol ?getEventErrorMessageMap\@PackSettingsError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getEventErrorMessageMap\@PackSettingsError\@\@EEBAAEBV?$unordered_map\@HV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@H\@2\@U?$equal_to\@H\@2\@V?$allocator\@U?$pair\@$$CBHV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> const & getEventErrorMessageMap() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKSETTINGSERROR /** - * @symbol ??0PackSettingsError\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PackSettingsError(); +#endif + /** + * @symbol ??0PackSettingsError\@\@QEAA\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI PackSettingsError(std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp b/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp index 01c651e803..7d1dae669e 100644 --- a/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsFactory.hpp @@ -30,8 +30,8 @@ class PackSettingsFactory { public: /** - * @symbol ?getPackSettings\@PackSettingsFactory\@\@QEAAPEAVPackSettings\@\@AEBVPackManifest\@\@\@Z + * @symbol ?getPackSettings\@PackSettingsFactory\@\@QEAAPEAVPackSettings\@\@AEBVPackManifest\@\@\@Z */ MCAPI class PackSettings * getPackSettings(class PackManifest const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp b/LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp index be135e6c3c..a45464dfe6 100644 --- a/LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp +++ b/LiteLoader/include/llapi/mc/PackSettingsJsonValidator.hpp @@ -31,8 +31,8 @@ class PackSettingsJsonValidator { public: /** - * @symbol ?getValidator\@PackSettingsJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@XZ + * @symbol ?getValidator\@PackSettingsJsonValidator\@\@SA?AVProperty\@JsonValidator\@\@XZ */ MCAPI static class JsonValidator::Property getValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSource.hpp b/LiteLoader/include/llapi/mc/PackSource.hpp index 10bbb0227b..4c2d2ec1bc 100644 --- a/LiteLoader/include/llapi/mc/PackSource.hpp +++ b/LiteLoader/include/llapi/mc/PackSource.hpp @@ -32,25 +32,25 @@ class PackSource { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKSOURCE /** - * @symbol ?getPackOrigin\@PackSource\@\@UEBA?AW4PackOrigin\@\@XZ + * @symbol ?getPackOrigin\@PackSource\@\@UEBA?AW4PackOrigin\@\@XZ */ MCVAPI enum class PackOrigin getPackOrigin() const; /** - * @symbol ?getPackType\@PackSource\@\@UEBA?AW4PackType\@\@XZ + * @symbol ?getPackType\@PackSource\@\@UEBA?AW4PackType\@\@XZ */ MCVAPI enum class PackType getPackType() const; /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~PackSource(); #endif /** - * @symbol ?fetchPack\@PackSource\@\@QEAAPEAVPack\@\@AEBUPackIdVersion\@\@\@Z + * @symbol ?fetchPack\@PackSource\@\@QEAAPEAVPack\@\@AEBUPackIdVersion\@\@\@Z */ MCAPI class Pack * fetchPack(struct PackIdVersion const &); /** - * @symbol ?resolveUpgradeDependencies\@PackSource\@\@QEAAXAEAVPack\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?resolveUpgradeDependencies\@PackSource\@\@QEAAXAEAVPack\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI void resolveUpgradeDependencies(class Pack &, class gsl::not_null> const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSourceFactory.hpp b/LiteLoader/include/llapi/mc/PackSourceFactory.hpp index 6e4d0b49cd..600e806f8c 100644 --- a/LiteLoader/include/llapi/mc/PackSourceFactory.hpp +++ b/LiteLoader/include/llapi/mc/PackSourceFactory.hpp @@ -32,113 +32,119 @@ class PackSourceFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PackSourceFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?createWorldTemplatePackSource\@PackSourceFactory\@\@UEAAAEAVWorldTemplatePackSource\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVWorldTemplateManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVUUID\@mce\@\@W4PackType\@\@W4PackOrigin\@\@\@Z + * @vftbl 1 + * @symbol ?createWorldTemplatePackSource\@PackSourceFactory\@\@UEAAAEAVWorldTemplatePackSource\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVWorldTemplateManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVUUID\@mce\@\@W4PackType\@\@W4PackOrigin\@\@\@Z */ virtual class WorldTemplatePackSource & createWorldTemplatePackSource(class gsl::not_null> const &, class mce::UUID const &, enum class PackType, enum class PackOrigin); /** - * @vftbl 2 - * @symbol ?getWorldTemplatePackSource\@PackSourceFactory\@\@UEBAPEAVWorldTemplatePackSource\@\@AEBVUUID\@mce\@\@W4PackType\@\@\@Z + * @vftbl 2 + * @symbol ?getWorldTemplatePackSource\@PackSourceFactory\@\@UEBAPEAVWorldTemplatePackSource\@\@AEBVUUID\@mce\@\@W4PackType\@\@\@Z */ virtual class WorldTemplatePackSource * getWorldTemplatePackSource(class mce::UUID const &, enum class PackType) const; /** - * @vftbl 3 - * @symbol ?createDirectoryPackSource\@PackSourceFactory\@\@UEAAAEAVDirectoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@W4PackOrigin\@\@_N\@Z + * @vftbl 3 + * @symbol ?createDirectoryPackSource\@PackSourceFactory\@\@UEAAAEAVDirectoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@W4PackOrigin\@\@_N\@Z */ virtual class DirectoryPackSource & createDirectoryPackSource(class Core::Path const &, enum class PackType, enum class PackOrigin, bool); /** - * @vftbl 4 - * @symbol ?getDirectoryPackSource\@PackSourceFactory\@\@UEBAPEAVDirectoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@\@Z + * @vftbl 4 + * @symbol ?getDirectoryPackSource\@PackSourceFactory\@\@UEBAPEAVDirectoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@\@Z */ virtual class DirectoryPackSource * getDirectoryPackSource(class Core::Path const &, enum class PackType) const; /** - * @vftbl 5 - * @symbol ?createInPackagePackSource\@PackSourceFactory\@\@UEAAAEAVInPackagePackSource\@\@W4PackType\@\@\@Z + * @vftbl 5 + * @symbol ?createInPackagePackSource\@PackSourceFactory\@\@UEAAAEAVInPackagePackSource\@\@W4PackType\@\@\@Z */ virtual class InPackagePackSource & createInPackagePackSource(enum class PackType); /** - * @vftbl 6 - * @symbol ?getInPackagePackSource\@PackSourceFactory\@\@UEAAPEAVInPackagePackSource\@\@W4PackType\@\@\@Z + * @vftbl 6 + * @symbol ?getInPackagePackSource\@PackSourceFactory\@\@UEAAPEAVInPackagePackSource\@\@W4PackType\@\@\@Z */ virtual class InPackagePackSource * getInPackagePackSource(enum class PackType); /** - * @vftbl 7 - * @symbol ?createWorldHistoryPackSource\@PackSourceFactory\@\@UEAAAEAVWorldHistoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@\@Z + * @vftbl 7 + * @symbol ?createWorldHistoryPackSource\@PackSourceFactory\@\@UEAAAEAVWorldHistoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@\@Z */ virtual class WorldHistoryPackSource & createWorldHistoryPackSource(class Core::Path const &, enum class PackType); /** - * @vftbl 8 - * @symbol ?getWorldHistoryPackSource\@PackSourceFactory\@\@UEBAPEAVWorldHistoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@\@Z + * @vftbl 8 + * @symbol ?getWorldHistoryPackSource\@PackSourceFactory\@\@UEBAPEAVWorldHistoryPackSource\@\@AEBVPath\@Core\@\@W4PackType\@\@\@Z */ virtual class WorldHistoryPackSource * getWorldHistoryPackSource(class Core::Path const &, enum class PackType) const; /** - * @vftbl 9 - * @symbol ?getDirectoryPackSourceContaining\@PackSourceFactory\@\@UEBAPEAVDirectoryPackSource\@\@AEBUPackIdVersion\@\@\@Z + * @vftbl 9 + * @symbol ?getDirectoryPackSourceContaining\@PackSourceFactory\@\@UEBAPEAVDirectoryPackSource\@\@AEBUPackIdVersion\@\@\@Z */ virtual class DirectoryPackSource * getDirectoryPackSourceContaining(struct PackIdVersion const &) const; /** - * @vftbl 10 - * @symbol ?removeFromDirectoryPackSource\@PackSourceFactory\@\@UEAAXAEBVPath\@Core\@\@\@Z + * @vftbl 10 + * @symbol ?removeFromDirectoryPackSource\@PackSourceFactory\@\@UEAAXAEBVPath\@Core\@\@\@Z */ virtual void removeFromDirectoryPackSource(class Core::Path const &); /** - * @vftbl 11 - * @symbol ?createDynamicPackagePackSource\@PackSourceFactory\@\@UEAAAEAVInPackagePackSource\@\@W4PackType\@\@\@Z + * @vftbl 11 + * @symbol ?createDynamicPackagePackSource\@PackSourceFactory\@\@UEAAAEAVInPackagePackSource\@\@W4PackType\@\@\@Z */ virtual class InPackagePackSource & createDynamicPackagePackSource(enum class PackType); /** - * @vftbl 12 - * @symbol ?getDynamicPackagePackSource\@PackSourceFactory\@\@UEAAPEAVInPackagePackSource\@\@W4PackType\@\@\@Z + * @vftbl 12 + * @symbol ?getDynamicPackagePackSource\@PackSourceFactory\@\@UEAAPEAVInPackagePackSource\@\@W4PackType\@\@\@Z */ virtual class InPackagePackSource * getDynamicPackagePackSource(enum class PackType); /** - * @vftbl 13 - * @symbol ?setDynamicPackagePacks\@PackSourceFactory\@\@UEAAXAEBV?$shared_ptr\@VIDynamicPackagePacks\@\@\@std\@\@\@Z + * @vftbl 13 + * @symbol ?setDynamicPackagePacks\@PackSourceFactory\@\@UEAAXAEBV?$shared_ptr\@VIDynamicPackagePacks\@\@\@std\@\@\@Z */ virtual void setDynamicPackagePacks(class std::shared_ptr const &); /** - * @vftbl 14 - * @symbol ?setDynamicPackageRoot\@PackSourceFactory\@\@UEAAXV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @vftbl 14 + * @symbol ?setDynamicPackageRoot\@PackSourceFactory\@\@UEAAXV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ virtual void setDynamicPackageRoot(class Core::PathBuffer); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 19 + * @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 20 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ + * @vftbl 20 + * @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; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKSOURCEFACTORY /** - * @symbol ??0PackSourceFactory\@\@QEAA\@AEBV?$shared_ptr\@VIInPackagePacks\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PackSourceFactory(); +#endif + /** + * @symbol ??0PackSourceFactory\@\@QEAA\@AEBV?$shared_ptr\@VIInPackagePacks\@\@\@std\@\@\@Z */ MCAPI PackSourceFactory(class std::shared_ptr const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackSourceReport.hpp b/LiteLoader/include/llapi/mc/PackSourceReport.hpp index 403a04fb63..8fb20866cf 100644 --- a/LiteLoader/include/llapi/mc/PackSourceReport.hpp +++ b/LiteLoader/include/llapi/mc/PackSourceReport.hpp @@ -28,28 +28,28 @@ class PackSourceReport { public: /** - * @symbol ??0PackSourceReport\@\@QEAA\@XZ + * @symbol ??0PackSourceReport\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PackSourceReport(); + MCAPI PackSourceReport(class PackSourceReport const &); /** - * @symbol ??0PackSourceReport\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PackSourceReport\@\@QEAA\@XZ */ - MCAPI PackSourceReport(class PackSourceReport const &); + MCAPI PackSourceReport(); /** - * @symbol ?addReport\@PackSourceReport\@\@QEAAXAEBUPackIdVersion\@\@$$QEAVPackReport\@\@\@Z + * @symbol ?addReport\@PackSourceReport\@\@QEAAXAEBUPackIdVersion\@\@$$QEAVPackReport\@\@\@Z */ MCAPI void addReport(struct PackIdVersion const &, class PackReport &&); /** - * @symbol ?getReports\@PackSourceReport\@\@QEBAAEBV?$unordered_map\@UPackIdVersion\@\@VPackReport\@\@U?$hash\@UPackIdVersion\@\@\@std\@\@U?$equal_to\@UPackIdVersion\@\@\@4\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@VPackReport\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getReports\@PackSourceReport\@\@QEBAAEBV?$unordered_map\@UPackIdVersion\@\@VPackReport\@\@U?$hash\@UPackIdVersion\@\@\@std\@\@U?$equal_to\@UPackIdVersion\@\@\@4\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@VPackReport\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getReports() const; /** - * @symbol ?hasErrors\@PackSourceReport\@\@QEBA_NXZ + * @symbol ?hasErrors\@PackSourceReport\@\@QEBA_NXZ */ MCAPI bool hasErrors() const; /** - * @symbol ??1PackSourceReport\@\@QEAA\@XZ + * @symbol ??1PackSourceReport\@\@QEAA\@XZ */ MCAPI ~PackSourceReport(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp b/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp index fdc9a9006b..333dbf58c0 100644 --- a/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp +++ b/LiteLoader/include/llapi/mc/PackedItemUseLegacyInventoryTransaction.hpp @@ -25,16 +25,19 @@ struct PackedItemUseLegacyInventoryTransaction { public: struct PackedItemUseLegacyInventoryTransaction& operator=(struct PackedItemUseLegacyInventoryTransaction const &) = delete; PackedItemUseLegacyInventoryTransaction(struct PackedItemUseLegacyInventoryTransaction const &) = delete; - PackedItemUseLegacyInventoryTransaction() = delete; #endif public: /** - * @symbol ??0PackedItemUseLegacyInventoryTransaction\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0PackedItemUseLegacyInventoryTransaction\@\@QEAA\@XZ + */ + MCAPI PackedItemUseLegacyInventoryTransaction(); + /** + * @symbol ??0PackedItemUseLegacyInventoryTransaction\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI PackedItemUseLegacyInventoryTransaction(struct PackedItemUseLegacyInventoryTransaction &&); /** - * @symbol ??1PackedItemUseLegacyInventoryTransaction\@\@QEAA\@XZ + * @symbol ??1PackedItemUseLegacyInventoryTransaction\@\@QEAA\@XZ */ MCAPI ~PackedItemUseLegacyInventoryTransaction(); diff --git a/LiteLoader/include/llapi/mc/Packet.hpp b/LiteLoader/include/llapi/mc/Packet.hpp index 0e01a1003f..ca0b3ec050 100644 --- a/LiteLoader/include/llapi/mc/Packet.hpp +++ b/LiteLoader/include/llapi/mc/Packet.hpp @@ -68,51 +68,62 @@ class Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ virtual ~Packet(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateTradePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ChangeMobPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const = 0; /** - * @vftbl 2 - * @symbol ?getName\@UpdateTradePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ChangeMobPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const = 0; /** - * @vftbl 3 - * @symbol ?write\@UpdateTradePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ChangeMobPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const = 0; /** - * @vftbl 4 - * @symbol ?readExtended\@Packet\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@Packet\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 5 - * @symbol ?disallowBatching\@Packet\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?disallowBatching\@Packet\@\@UEBA_NXZ */ virtual bool disallowBatching() const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 6 + * @symbol ?isValid\@Packet\@\@UEBA_NXZ + */ + virtual bool isValid() const; + /** + * @vftbl 7 + * @symbol ?_read\@ChangeMobPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &) = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Packet(); +#endif /** - * @symbol ?handle\@Packet\@\@QEAAXAEBVNetworkIdentifier\@\@AEAVNetEventCallback\@\@AEAV?$shared_ptr\@VPacket\@\@\@std\@\@\@Z + * @symbol ?handle\@Packet\@\@QEAAXAEBVNetworkIdentifier\@\@AEAVNetEventCallback\@\@AEAV?$shared_ptr\@VPacket\@\@\@std\@\@\@Z */ MCAPI void handle(class NetworkIdentifier const &, class NetEventCallback &, class std::shared_ptr &); /** - * @symbol ?readNoHeader\@Packet\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@AEBW4SubClientId\@\@AEAUExtendedStreamReadResult\@\@\@Z + * @symbol ?readNoHeader\@Packet\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@AEBW4SubClientId\@\@AEAUExtendedStreamReadResult\@\@\@Z */ MCAPI bool readNoHeader(class ReadOnlyBinaryStream &, enum class SubClientId const &, struct ExtendedStreamReadResult &); /** - * @symbol ?writeWithHeader\@Packet\@\@QEBAXW4SubClientId\@\@AEAVBinaryStream\@\@\@Z + * @symbol ?writeWithHeader\@Packet\@\@QEBAXW4SubClientId\@\@AEAVBinaryStream\@\@\@Z */ MCAPI void writeWithHeader(enum class SubClientId, class BinaryStream &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacketHeader.hpp b/LiteLoader/include/llapi/mc/PacketHeader.hpp index 03ffd66de2..ecaa918503 100644 --- a/LiteLoader/include/llapi/mc/PacketHeader.hpp +++ b/LiteLoader/include/llapi/mc/PacketHeader.hpp @@ -28,8 +28,8 @@ class PacketHeader { public: /** - * @symbol ?getChannel\@PacketHeader\@\@QEBAIXZ + * @symbol ?getChannel\@PacketHeader\@\@QEBAIXZ */ MCAPI unsigned int getChannel() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacketObserver.hpp b/LiteLoader/include/llapi/mc/PacketObserver.hpp index dece40aea2..f66634f92a 100644 --- a/LiteLoader/include/llapi/mc/PacketObserver.hpp +++ b/LiteLoader/include/llapi/mc/PacketObserver.hpp @@ -30,44 +30,44 @@ class PacketObserver { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PacketObserver(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?packetSentTo\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@I\@Z + * @vftbl 1 + * @symbol ?packetSentTo\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@I\@Z */ virtual void packetSentTo(class NetworkIdentifier const &, class Packet const &, unsigned int); /** - * @vftbl 2 - * @symbol ?packetReceivedFrom\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@I\@Z + * @vftbl 2 + * @symbol ?packetReceivedFrom\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPacket\@\@I\@Z */ virtual void packetReceivedFrom(class NetworkIdentifier const &, class Packet const &, unsigned int); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?reset\@PacketObserver\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?reset\@PacketObserver\@\@UEAAXXZ */ virtual void reset(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKETOBSERVER /** - * @symbol ?dataReceivedFrom\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?dataReceivedFrom\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void dataReceivedFrom(class NetworkIdentifier const &, std::string const &); /** - * @symbol ?dataSentTo\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?dataSentTo\@PacketObserver\@\@UEAAXAEBVNetworkIdentifier\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCVAPI void dataSentTo(class NetworkIdentifier const &, class gsl::basic_string_span); + MCVAPI void dataSentTo(class NetworkIdentifier const &, class std::basic_string_view>); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacketSender.hpp b/LiteLoader/include/llapi/mc/PacketSender.hpp index aab5bfacf5..98745a0eec 100644 --- a/LiteLoader/include/llapi/mc/PacketSender.hpp +++ b/LiteLoader/include/llapi/mc/PacketSender.hpp @@ -30,4 +30,4 @@ class PacketSender { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacketUtil.hpp b/LiteLoader/include/llapi/mc/PacketUtil.hpp index cf4ecaca5a..2b0228c11a 100644 --- a/LiteLoader/include/llapi/mc/PacketUtil.hpp +++ b/LiteLoader/include/llapi/mc/PacketUtil.hpp @@ -22,11 +22,11 @@ namespace PacketUtil { #undef AFTER_EXTRA /** - * @symbol ?byteToDegrees\@PacketUtil\@\@YAMC\@Z + * @symbol ?byteToDegrees\@PacketUtil\@\@YAMC\@Z */ MCAPI float byteToDegrees(signed char); /** - * @symbol ?degreesToByte\@PacketUtil\@\@YACM\@Z + * @symbol ?degreesToByte\@PacketUtil\@\@YACM\@Z */ MCAPI signed char degreesToByte(float); diff --git a/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp b/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp index e71722f626..23db929e0d 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationDetectedTelemetryData.hpp @@ -31,15 +31,15 @@ class PacketViolationDetectedTelemetryData { public: /** - * @symbol ??0PacketViolationDetectedTelemetryData\@\@QEAA\@AEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ??0PacketViolationDetectedTelemetryData\@\@QEAA\@AEBUExtendedStreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI PacketViolationDetectedTelemetryData(struct ExtendedStreamReadResult const &, enum class PacketViolationResponse, enum class MinecraftPacketIds, class NetworkIdentifier const &); /** - * @symbol ?WriteEventData\@PacketViolationDetectedTelemetryData\@\@QEBAXAEAVEvent\@Events\@Social\@\@\@Z + * @symbol ?WriteEventData\@PacketViolationDetectedTelemetryData\@\@QEBAXAEAVEvent\@Events\@Social\@\@\@Z */ MCAPI void WriteEventData(class Social::Events::Event &) const; /** - * @symbol ??1PacketViolationDetectedTelemetryData\@\@QEAA\@XZ + * @symbol ??1PacketViolationDetectedTelemetryData\@\@QEAA\@XZ */ MCAPI ~PacketViolationDetectedTelemetryData(); @@ -47,8 +47,8 @@ class PacketViolationDetectedTelemetryData { private: /** - * @symbol ?mEventName\@PacketViolationDetectedTelemetryData\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?mEventName\@PacketViolationDetectedTelemetryData\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const mEventName; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp b/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp index 56a4c6b44a..f8cea763bc 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationHandler.hpp @@ -29,20 +29,20 @@ class PacketViolationHandler { public: /** - * @symbol ??0PacketViolationHandler\@\@QEAA\@XZ + * @symbol ??0PacketViolationHandler\@\@QEAA\@XZ */ MCAPI PacketViolationHandler(); /** - * @symbol ?checkForViolation\@PacketViolationHandler\@\@QEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@W4StreamReadResult\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z + * @symbol ?checkForViolation\@PacketViolationHandler\@\@QEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@W4StreamReadResult\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z */ MCAPI enum class PacketViolationResponse checkForViolation(enum class MinecraftPacketIds, enum class StreamReadResult, class NetworkIdentifier const &, bool *); //private: /** - * @symbol ?_handleViolation\@PacketViolationHandler\@\@AEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@W4StreamReadResult\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z + * @symbol ?_handleViolation\@PacketViolationHandler\@\@AEAA?AW4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@W4StreamReadResult\@\@AEBVNetworkIdentifier\@\@PEA_N\@Z */ MCAPI enum class PacketViolationResponse _handleViolation(enum class MinecraftPacketIds, enum class StreamReadResult, class NetworkIdentifier const &, bool *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp index 84ab622202..3a9b73176b 100644 --- a/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp +++ b/LiteLoader/include/llapi/mc/PacketViolationWarningPacket.hpp @@ -30,37 +30,43 @@ class PacketViolationWarningPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PacketViolationWarningPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PacketViolationWarningPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PacketViolationWarningPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PacketViolationWarningPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PacketViolationWarningPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PacketViolationWarningPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PacketViolationWarningPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PacketViolationWarningPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PACKETVIOLATIONWARNINGPACKET /** - * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI PacketViolationWarningPacket(); + MCVAPI ~PacketViolationWarningPacket(); +#endif /** - * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@W4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@W4StreamReadResult\@\@W4PacketViolationResponse\@\@W4MinecraftPacketIds\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI PacketViolationWarningPacket(enum class StreamReadResult, enum class PacketViolationResponse, enum class MinecraftPacketIds, std::string const &); + /** + * @symbol ??0PacketViolationWarningPacket\@\@QEAA\@XZ + */ + MCAPI PacketViolationWarningPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PacksInfoData.hpp b/LiteLoader/include/llapi/mc/PacksInfoData.hpp index 3a53dba251..1ff9ed89b9 100644 --- a/LiteLoader/include/llapi/mc/PacksInfoData.hpp +++ b/LiteLoader/include/llapi/mc/PacksInfoData.hpp @@ -30,11 +30,11 @@ struct PacksInfoData { public: /** - * @symbol ?getBehaviorPackSize\@PacksInfoData\@\@QEBA_KXZ + * @symbol ?getBehaviorPackSize\@PacksInfoData\@\@QEBA_KXZ */ MCAPI unsigned __int64 getBehaviorPackSize() const; /** - * @symbol ?getResourcePackSize\@PacksInfoData\@\@QEBA_KXZ + * @symbol ?getResourcePackSize\@PacksInfoData\@\@QEBA_KXZ */ MCAPI unsigned __int64 getResourcePackSize() const; diff --git a/LiteLoader/include/llapi/mc/PaddleBehaviorUtility.hpp b/LiteLoader/include/llapi/mc/PaddleBehaviorUtility.hpp index 21085050eb..c6eb25f2d6 100644 --- a/LiteLoader/include/llapi/mc/PaddleBehaviorUtility.hpp +++ b/LiteLoader/include/llapi/mc/PaddleBehaviorUtility.hpp @@ -20,15 +20,15 @@ namespace PaddleBehaviorUtility { #undef AFTER_EXTRA /** - * @symbol ?computePaddleForcesBasedOnGaze\@PaddleBehaviorUtility\@\@YAXAEAVVec3\@\@AEAM1MMM\@Z + * @symbol ?computePaddleForcesBasedOnGaze\@PaddleBehaviorUtility\@\@YAXAEAVVec3\@\@AEAM1MMM\@Z */ MCAPI void computePaddleForcesBasedOnGaze(class Vec3 &, float &, float &, float, float, float); /** - * @symbol ?setPaddleForce\@PaddleBehaviorUtility\@\@YA_NAEAUPaddle\@\@UTick\@\@M\@Z + * @symbol ?setPaddleForce\@PaddleBehaviorUtility\@\@YA_NAEAUPaddle\@\@AEBUTick\@\@M\@Z */ - MCAPI bool setPaddleForce(struct Paddle &, struct Tick, float); + MCAPI bool setPaddleForce(struct Paddle &, struct Tick const &, float); /** - * @symbol ?setPaddleState\@PaddleBehaviorUtility\@\@YA_NAEAUPaddle\@\@AEAVSynchedActorData\@\@_NW4Side\@\@UTick\@\@22\@Z + * @symbol ?setPaddleState\@PaddleBehaviorUtility\@\@YA_NAEAUPaddle\@\@AEAVSynchedActorData\@\@_NW4Side\@\@UTick\@\@22\@Z */ MCAPI bool setPaddleState(struct Paddle &, class SynchedActorData &, bool, enum class Side, struct Tick, bool, bool); diff --git a/LiteLoader/include/llapi/mc/PageContent.hpp b/LiteLoader/include/llapi/mc/PageContent.hpp index dc9258f3a0..b288a0bf9b 100644 --- a/LiteLoader/include/llapi/mc/PageContent.hpp +++ b/LiteLoader/include/llapi/mc/PageContent.hpp @@ -29,27 +29,27 @@ struct PageContent { public: /** - * @symbol ?createTag\@PageContent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createTag\@PageContent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr createTag() const; /** - * @symbol ??4PageContent\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4PageContent\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct PageContent & operator=(struct PageContent const &); /** - * @symbol ??1PageContent\@\@QEAA\@XZ + * @symbol ??1PageContent\@\@QEAA\@XZ */ MCAPI ~PageContent(); /** - * @symbol ?BLANK_PAGE\@PageContent\@\@2U1\@B + * @symbol ?BLANK_PAGE\@PageContent\@\@2U1\@B */ MCAPI static struct PageContent const BLANK_PAGE; /** - * @symbol ?read\@PageContent\@\@SA?AU1\@AEBVCompoundTag\@\@\@Z + * @symbol ?read\@PageContent\@\@SA?AU1\@AEBVCompoundTag\@\@\@Z */ MCAPI static struct PageContent read(class CompoundTag const &); /** - * @symbol ?write\@PageContent\@\@SAXAEBU1\@AEAVCompoundTag\@\@\@Z + * @symbol ?write\@PageContent\@\@SAXAEBU1\@AEAVCompoundTag\@\@\@Z */ MCAPI static void write(struct PageContent const &, class CompoundTag &); diff --git a/LiteLoader/include/llapi/mc/Painting.hpp b/LiteLoader/include/llapi/mc/Painting.hpp index b8e8f77b6f..abce8718e5 100644 --- a/LiteLoader/include/llapi/mc/Painting.hpp +++ b/LiteLoader/include/llapi/mc/Painting.hpp @@ -32,177 +32,177 @@ class Painting : public HangingActor { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Painting(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@Painting\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@Painting\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 20 - * @symbol ?setPos\@Painting\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 20 + * @symbol ?setPos\@Painting\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void setPos(class Vec3 const &); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 48 - * @symbol ?tryCreateAddActorPacket\@Painting\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ + * @vftbl 48 + * @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 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Painting\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Painting\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@Painting\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@Painting\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Painting\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Painting\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Painting\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Painting\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol ?getWidth\@Painting\@\@UEBAHXZ + * @vftbl 277 + * @symbol ?getWidth\@Painting\@\@UEBAHXZ */ virtual int getWidth() const; /** - * @vftbl 280 - * @symbol ?getHeight\@Painting\@\@UEBAHXZ + * @vftbl 278 + * @symbol ?getHeight\@Painting\@\@UEBAHXZ */ virtual int getHeight() const; /** - * @vftbl 281 - * @symbol ?dropItem\@Painting\@\@UEAAXXZ + * @vftbl 279 + * @symbol ?dropItem\@Painting\@\@UEAAXXZ */ virtual void dropItem(); /** - * @vftbl 282 - * @symbol ?placeHangingEntity\@Painting\@\@UEAA_NAEAVBlockSource\@\@H\@Z + * @vftbl 280 + * @symbol ?placeHangingEntity\@Painting\@\@UEAA_NAEAVBlockSource\@\@H\@Z */ virtual bool placeHangingEntity(class BlockSource &, int); /** - * @symbol ??0Painting\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Painting\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Painting(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getCurrentMotive\@Painting\@\@QEBAAEBVMotive\@\@XZ + * @symbol ?getCurrentMotive\@Painting\@\@QEBAAEBVMotive\@\@XZ */ MCAPI class Motive const & getCurrentMotive() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp b/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp index 4bda92f48d..b6b9a4bc5c 100644 --- a/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/PaintingUpdatePositionSystem.hpp @@ -28,8 +28,8 @@ class PaintingUpdatePositionSystem { public: /** - * @symbol ?createPaintingUpdatePositionSystem\@PaintingUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPaintingUpdatePositionSystem\@PaintingUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPaintingUpdatePositionSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Palette.hpp b/LiteLoader/include/llapi/mc/Palette.hpp index 5e9c4764e2..2064becf72 100644 --- a/LiteLoader/include/llapi/mc/Palette.hpp +++ b/LiteLoader/include/llapi/mc/Palette.hpp @@ -30,76 +30,76 @@ class Palette { public: /** - * @symbol ?BLACK\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?BLACK\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const BLACK; /** - * @symbol ?BLUE\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?BLUE\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const BLUE; /** - * @symbol ?BROWN\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?BROWN\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const BROWN; /** - * @symbol ?CYAN\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?CYAN\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const CYAN; /** - * @symbol ?GRAY\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?GRAY\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const GRAY; /** - * @symbol ?GREEN\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?GREEN\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const GREEN; /** - * @symbol ?LIGHT_BLUE\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?LIGHT_BLUE\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const LIGHT_BLUE; /** - * @symbol ?LIGHT_GREEN\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?LIGHT_GREEN\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const LIGHT_GREEN; /** - * @symbol ?MAGENTA\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?MAGENTA\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const MAGENTA; /** - * @symbol ?ORANGE\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?ORANGE\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const ORANGE; /** - * @symbol ?PINK\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?PINK\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const PINK; /** - * @symbol ?PURPLE\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?PURPLE\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const PURPLE; /** - * @symbol ?RED\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?RED\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const RED; /** - * @symbol ?SILVER\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?SILVER\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const SILVER; /** - * @symbol ?WHITE\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?WHITE\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const WHITE; /** - * @symbol ?YELLOW\@Palette\@\@2VColor\@mce\@\@B + * @symbol ?YELLOW\@Palette\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const YELLOW; /** - * @symbol ?fromByte\@Palette\@\@SA?AW4PaletteColor\@\@E\@Z + * @symbol ?fromByte\@Palette\@\@SA?AW4PaletteColor\@\@E\@Z */ MCAPI static enum class PaletteColor fromByte(unsigned char); /** - * @symbol ?getColor\@Palette\@\@SAAEBVColor\@mce\@\@W4PaletteColor\@\@\@Z + * @symbol ?getColor\@Palette\@\@SAAEBVColor\@mce\@\@W4PaletteColor\@\@\@Z */ MCAPI static class mce::Color const & getColor(enum class PaletteColor); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Panda.hpp b/LiteLoader/include/llapi/mc/Panda.hpp index b240f0565a..9294766f66 100644 --- a/LiteLoader/include/llapi/mc/Panda.hpp +++ b/LiteLoader/include/llapi/mc/Panda.hpp @@ -32,183 +32,173 @@ class Panda : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Panda(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Panda\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 134 - * @symbol ?getAmbientSound\@Panda\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@Panda\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Panda\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Panda\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Panda\@\@UEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Panda\@\@UEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 337 - * @symbol ?setTransitioningSitting\@Panda\@\@UEAAX_N\@Z + * @vftbl 334 + * @symbol ?setTransitioningSitting\@Panda\@\@UEAAX_N\@Z */ virtual void setTransitioningSitting(bool); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Panda\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Panda\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Panda(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getLieOnBackAmount\@Panda\@\@QEBAMM\@Z + * @symbol ?getLieOnBackAmount\@Panda\@\@QEBAMM\@Z */ MCAPI float getLieOnBackAmount(float) const; /** - * @symbol ?getSitAmount\@Panda\@\@QEBAMM\@Z + * @symbol ?getSitAmount\@Panda\@\@QEBAMM\@Z */ MCAPI float getSitAmount(float) const; /** - * @symbol ?getSneezeCounter\@Panda\@\@QEBAHXZ + * @symbol ?getSneezeCounter\@Panda\@\@QEBAHXZ */ MCAPI int getSneezeCounter() const; /** - * @symbol ?getUnhappyCounter\@Panda\@\@QEBAHXZ + * @symbol ?getUnhappyCounter\@Panda\@\@QEBAHXZ */ MCAPI int getUnhappyCounter() const; /** - * @symbol ?postNormalTick\@Panda\@\@QEAAXXZ + * @symbol ?postNormalTick\@Panda\@\@QEAAXXZ */ MCAPI void postNormalTick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PandaPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/PandaPostNormalTickSystem.hpp deleted file mode 100644 index 4560e2faea..0000000000 --- a/LiteLoader/include/llapi/mc/PandaPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file PandaPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PandaPostNormalTickSystem. - * - */ -class PandaPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PANDAPOSTNORMALTICKSYSTEM -public: - class PandaPostNormalTickSystem& operator=(class PandaPostNormalTickSystem const &) = delete; - PandaPostNormalTickSystem(class PandaPostNormalTickSystem const &) = delete; - PandaPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@PandaPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doPandaPostNormalTickSystem\@PandaPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doPandaPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PanicGoal.hpp b/LiteLoader/include/llapi/mc/PanicGoal.hpp index fc59f943c3..ff717b76b4 100644 --- a/LiteLoader/include/llapi/mc/PanicGoal.hpp +++ b/LiteLoader/include/llapi/mc/PanicGoal.hpp @@ -30,56 +30,62 @@ class PanicGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PanicGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@PanicGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@PanicGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@PanicGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@PanicGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@PanicGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@PanicGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@PanicGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@PanicGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@PanicGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@PanicGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@PanicGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@PanicGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PANICGOAL /** - * @symbol ??0PanicGoal\@\@QEAA\@AEAVMob\@\@M_NW4LevelSoundEvent\@\@UFloatRange\@\@11V?$vector\@W4ActorDamageCause\@\@V?$allocator\@W4ActorDamageCause\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PanicGoal(); +#endif + /** + * @symbol ??0PanicGoal\@\@QEAA\@AEAVMob\@\@M_NW4LevelSoundEvent\@\@UFloatRange\@\@11V?$vector\@W4ActorDamageCause\@\@V?$allocator\@W4ActorDamageCause\@\@\@std\@\@\@std\@\@\@Z */ MCAPI PanicGoal(class Mob &, float, bool, enum class LevelSoundEvent, struct FloatRange, bool, bool, std::vector); //private: /** - * @symbol ?_tryGeneratePathEnd\@PanicGoal\@\@AEAA_NXZ + * @symbol ?_tryGeneratePathEnd\@PanicGoal\@\@AEAA_NXZ */ MCAPI bool _tryGeneratePathEnd(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParameterList.hpp b/LiteLoader/include/llapi/mc/ParameterList.hpp index 3c321eaee1..b35d16d855 100644 --- a/LiteLoader/include/llapi/mc/ParameterList.hpp +++ b/LiteLoader/include/llapi/mc/ParameterList.hpp @@ -29,20 +29,20 @@ class ParameterList { public: /** - * @symbol ??0ParameterList\@\@QEAA\@AEBV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0ParameterList\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ParameterList(std::vector const &); + MCAPI ParameterList(class ParameterList &&); /** - * @symbol ??0ParameterList\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ParameterList\@\@QEAA\@AEBV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI ParameterList(class ParameterList &&); + MCAPI ParameterList(std::vector const &); /** - * @symbol ?findTarget\@ParameterList\@\@QEBAPEAVBiome\@\@AEBUTargetPoint\@\@PEAUHint\@RTree\@\@\@Z + * @symbol ?findTarget\@ParameterList\@\@QEBAPEAVBiome\@\@AEBUTargetPoint\@\@PEAUHint\@RTree\@\@\@Z */ MCAPI class Biome * findTarget(struct TargetPoint const &, struct RTree::Hint *) const; /** - * @symbol ??1ParameterList\@\@QEAA\@XZ + * @symbol ??1ParameterList\@\@QEAA\@XZ */ MCAPI ~ParameterList(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Parrot.hpp b/LiteLoader/include/llapi/mc/Parrot.hpp index 70cfab57e8..ebfdda52f7 100644 --- a/LiteLoader/include/llapi/mc/Parrot.hpp +++ b/LiteLoader/include/llapi/mc/Parrot.hpp @@ -32,211 +32,206 @@ class Parrot : public Animal { public: /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@Parrot\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@Parrot\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Parrot(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Parrot\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Parrot\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 121 - * @symbol ?setSitting\@Parrot\@\@UEAAX_N\@Z + * @vftbl 120 + * @symbol ?setSitting\@Parrot\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 131 - * @symbol ?vehicleLanded\@Parrot\@\@UEAAXAEBVVec3\@\@0\@Z + * @vftbl 130 + * @symbol ?vehicleLanded\@Parrot\@\@UEAAXAEBVVec3\@\@0\@Z */ virtual void vehicleLanded(class Vec3 const &, class Vec3 const &); /** - * @vftbl 133 - * @symbol ?playAmbientSound\@Parrot\@\@UEAAXXZ + * @vftbl 132 + * @symbol ?playAmbientSound\@Parrot\@\@UEAAXXZ */ virtual void playAmbientSound(); /** - * @vftbl 134 - * @symbol ?getAmbientSound\@Parrot\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@Parrot\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Parrot\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Parrot\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Parrot\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Parrot\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Parrot\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Parrot\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 291 - * @symbol ?aiStep\@Parrot\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Parrot\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Parrot\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Parrot\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PARROT /** - * @symbol ?_makeFlySound\@Parrot\@\@MEBA_NXZ + * @symbol ?_makeFlySound\@Parrot\@\@MEBA_NXZ */ MCVAPI bool _makeFlySound() const; #endif /** - * @symbol ??0Parrot\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Parrot\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Parrot(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getFlap\@Parrot\@\@QEBAMXZ + * @symbol ?getFlap\@Parrot\@\@QEBAMXZ */ MCAPI float getFlap() const; /** - * @symbol ?getFlapSpeed\@Parrot\@\@QEBAMXZ + * @symbol ?getFlapSpeed\@Parrot\@\@QEBAMXZ */ MCAPI float getFlapSpeed() const; /** - * @symbol ?postAiStep\@Parrot\@\@QEAAXXZ + * @symbol ?postAiStep\@Parrot\@\@QEAAXXZ */ MCAPI void postAiStep(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp index 6443568cf2..30483d4212 100644 --- a/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ParrotPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class ParrotPostAIStepSystem { public: /** - * @symbol ?createSystem\@ParrotPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ParrotPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doParrotPostAIStepSystem\@ParrotPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doParrotPostAIStepSystem\@ParrotPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doParrotPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Parser.hpp b/LiteLoader/include/llapi/mc/Parser.hpp index 59886f0619..de404ca875 100644 --- a/LiteLoader/include/llapi/mc/Parser.hpp +++ b/LiteLoader/include/llapi/mc/Parser.hpp @@ -31,180 +31,152 @@ class Parser { public: /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAEE\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char); - /** - * @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\@\@AEAIPEBDI\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned int &, char const *, unsigned int); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class BlockDescriptor &); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAMPEBDM\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAMPEBDM\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, float &, char const *, float); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@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\@\@AEAUFloatRange\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4FilterSubject\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct FloatRange &, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, enum class FilterSubject &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUIntRange\@\@PEBDHH\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct IntRange &, char const *, int, int); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV23\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, enum class ActorType &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class WeightedChoices &, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &); /** - * @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\@\@AEAV23\@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 Json::Value &, char const *); /** - * @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\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@PEBD\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAEE\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &); - /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@PEBD\@Z - */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, unsigned char &, unsigned char); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVBlockDescriptor\@\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAIPEBDI\@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 &, unsigned int &, char const *, unsigned int); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVHashedString\@\@PEBD3\@Z */ MCAPI static void parse(class Json::Value const &, class SemVersion const &, class HashedString &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAHPEBDH\@Z */ - MCAPI static void parse(class Json::Value const &, class SemVersion const &, class Vec3 &, char const *, class Vec3 const &); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, int &, char const *, int); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ActorType\@\@PEBD3\@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 &, enum class ActorType &, char const *, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::string &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4Difficulty\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVVec3\@\@PEBDAEBV5\@\@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 Vec3 &, char const *, class Vec3 const &); /** - * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4ParticleType\@\@PEBD3\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUIntRange\@\@PEBDHH\@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 &, struct IntRange &, char const *, int, int); /** - * @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\@\@AEAUActorDefinitionIdentifier\@\@PEBD3\@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 &, 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\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@PEBD3\@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 *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4Difficulty\@\@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 &, enum class Difficulty &, char const *, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@_N\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVMobEffectInstance\@\@PEBD\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class MobEffectInstance &, char const *); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVDefinitionTrigger\@\@_N\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEA_NPEBD_N\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class DefinitionTrigger &, bool); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, bool &, char const *, bool); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVItemDescriptor\@\@\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAVActorDefinitionTrigger\@\@_N\@Z */ - MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ItemDescriptor &); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, class ActorDefinitionTrigger &, bool); /** - * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAW4FilterSubject\@\@PEBD3\@Z + * @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 &, enum class FilterSubject &, char const *, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); /** - * @symbol ?serialize\@Parser\@\@SAXAEBUActorDefinitionIdentifier\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAUFloatRange\@\@PEBD\@Z */ - MCAPI static void serialize(struct ActorDefinitionIdentifier const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, struct FloatRange &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); + MCAPI static bool parse(class Json::Value const &, class SemVersion const &, std::vector &); /** - * @symbol ?serialize\@Parser\@\@SAXAEBUIntRange\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$WeightedChoices\@VActorDefinitionTrigger\@\@\@\@PEBD\@Z */ - MCAPI static void serialize(struct IntRange const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, class WeightedChoices &, char const *); /** - * @symbol ?serialize\@Parser\@\@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\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?parse\@Parser\@\@SAXAEBVValue\@Json\@\@AEBVSemVersion\@\@AEAV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@PEBD\@Z */ - MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + MCAPI static void parse(class Json::Value const &, class SemVersion const &, std::vector &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z + * @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\@\@SAXAEBV?$vector\@W4LevelSoundEvent\@\@V?$allocator\@W4LevelSoundEvent\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); + MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBVActorDefinitionTrigger\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(class ActorDefinitionTrigger const &, class Json::Value &, char const *); + MCAPI static void serialize(std::vector const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBVHashedString\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBUActorDefinitionIdentifier\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(class HashedString const &, class Json::Value &, char const *); + MCAPI static void serialize(struct ActorDefinitionIdentifier const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBVMobEffectInstance\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBW4ParticleType\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(class MobEffectInstance const &, class Json::Value &, char const *); + MCAPI static void serialize(enum class ParticleType const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBVVec3\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBUFloatRange\@\@AEAVValue\@Json\@\@PEBD\@Z */ - MCAPI static void serialize(class Vec3 const &, class Json::Value &, char const *); + MCAPI static void serialize(struct FloatRange const &, class Json::Value &, char const *); /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z + * @symbol ?serialize\@Parser\@\@SAXAEBW4ActorType\@\@AEAVValue\@Json\@\@PEBD\@Z */ MCAPI static void serialize(enum class ActorType const &, class Json::Value &, char const *); - /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4Difficulty\@\@AEAVValue\@Json\@\@PEBD\@Z - */ - MCAPI static void serialize(enum class Difficulty const &, class Json::Value &, char const *); - /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4FilterSubject\@\@AEAVValue\@Json\@\@PEBD\@Z - */ - MCAPI static void serialize(enum class FilterSubject const &, class Json::Value &, char const *); - /** - * @symbol ?serialize\@Parser\@\@SAXAEBW4ParticleType\@\@AEAVValue\@Json\@\@PEBD\@Z - */ - MCAPI static void serialize(enum class ParticleType const &, class Json::Value &, char const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PartiallyExposedBlobFeature.hpp b/LiteLoader/include/llapi/mc/PartiallyExposedBlobFeature.hpp index 7e15664a10..5e3c1b9fd8 100644 --- a/LiteLoader/include/llapi/mc/PartiallyExposedBlobFeature.hpp +++ b/LiteLoader/include/llapi/mc/PartiallyExposedBlobFeature.hpp @@ -30,22 +30,22 @@ class PartiallyExposedBlobFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PartiallyExposedBlobFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@PartiallyExposedBlobFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@PartiallyExposedBlobFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; //private: /** - * @symbol ?isWaterOrAir\@PartiallyExposedBlobFeature\@\@CA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isWaterOrAir\@PartiallyExposedBlobFeature\@\@CA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isWaterOrAir(class IBlockWorldGenAPI const &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParticleCommand.hpp b/LiteLoader/include/llapi/mc/ParticleCommand.hpp index e2232aa6ed..6731032591 100644 --- a/LiteLoader/include/llapi/mc/ParticleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ParticleCommand.hpp @@ -31,18 +31,18 @@ class ParticleCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ParticleCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ParticleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ParticleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ParticleCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ParticleCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParticleEffectResponse.hpp b/LiteLoader/include/llapi/mc/ParticleEffectResponse.hpp index 06c69f529d..083579fce2 100644 --- a/LiteLoader/include/llapi/mc/ParticleEffectResponse.hpp +++ b/LiteLoader/include/llapi/mc/ParticleEffectResponse.hpp @@ -31,28 +31,28 @@ class ParticleEffectResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ParticleEffectResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@ParticleEffectResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@ParticleEffectResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@ParticleEffectResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@ParticleEffectResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@ParticleEffectResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@ParticleEffectResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@ParticleEffectResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@ParticleEffectResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp b/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp index c5c2f69dc8..c8ea046142 100644 --- a/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp +++ b/LiteLoader/include/llapi/mc/ParticleEventRequestQueueComponent.hpp @@ -28,11 +28,11 @@ struct ParticleEventRequestQueueComponent { public: /** - * @symbol ??0ParticleEventRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ParticleEventRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ParticleEventRequestQueueComponent(struct ParticleEventRequestQueueComponent &&); /** - * @symbol ??1ParticleEventRequestQueueComponent\@\@QEAA\@XZ + * @symbol ??1ParticleEventRequestQueueComponent\@\@QEAA\@XZ */ MCAPI ~ParticleEventRequestQueueComponent(); diff --git a/LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp index 013e496abc..d17f3a33a2 100644 --- a/LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ParticleOnHitSubcomponent.hpp @@ -30,33 +30,33 @@ class ParticleOnHitSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ParticleOnHitSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@ParticleOnHitSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@ParticleOnHitSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@ParticleOnHitSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@ParticleOnHitSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@ParticleOnHitSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@ParticleOnHitSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@ParticleOnHitSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@ParticleOnHitSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0ParticleOnHitSubcomponent\@\@QEAA\@XZ + * @symbol ??0ParticleOnHitSubcomponent\@\@QEAA\@XZ */ MCAPI ParticleOnHitSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParticleProvider.hpp b/LiteLoader/include/llapi/mc/ParticleProvider.hpp new file mode 100644 index 0000000000..ee71eb9584 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ParticleProvider.hpp @@ -0,0 +1,40 @@ +/** + * @file ParticleProvider.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ParticleProvider { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PARTICLEPROVIDER +public: + class ParticleProvider& operator=(class ParticleProvider const &) = delete; + ParticleProvider(class ParticleProvider const &) = delete; + ParticleProvider() = delete; +#endif + +public: + /** + * @symbol ?addParticle\@ParticleProvider\@\@QEAAPEAVParticle\@\@W4ParticleType\@\@AEBVVec3\@\@1HPEBVCompoundTag\@\@_N\@Z + */ + MCAPI class Particle * addParticle(enum class ParticleType, class Vec3 const &, class Vec3 const &, int, class CompoundTag const *, bool); + /** + * @symbol ?addParticleEffect\@ParticleProvider\@\@QEAAXAEBVHashedString\@\@AEBVVec3\@\@AEBVMolangVariableMap\@\@\@Z + */ + MCAPI void addParticleEffect(class HashedString const &, class Vec3 const &, class MolangVariableMap const &); + /** + * @symbol ??1ParticleProvider\@\@QEAA\@XZ + */ + MCAPI ~ParticleProvider(); + +}; diff --git a/LiteLoader/include/llapi/mc/ParticleTypeMap.hpp b/LiteLoader/include/llapi/mc/ParticleTypeMap.hpp index f39859ebb0..9f1401b8f3 100644 --- a/LiteLoader/include/llapi/mc/ParticleTypeMap.hpp +++ b/LiteLoader/include/llapi/mc/ParticleTypeMap.hpp @@ -30,11 +30,11 @@ class ParticleTypeMap { public: /** - * @symbol ?getParticleName\@ParticleTypeMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ParticleType\@\@\@Z + * @symbol ?getParticleName\@ParticleTypeMap\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ParticleType\@\@\@Z */ MCAPI static std::string const & getParticleName(enum class ParticleType); /** - * @symbol ?getParticleTypeId\@ParticleTypeMap\@\@SA?AW4ParticleType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getParticleTypeId\@ParticleTypeMap\@\@SA?AW4ParticleType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class ParticleType getParticleTypeId(std::string const &); @@ -42,8 +42,8 @@ class ParticleTypeMap { private: /** - * @symbol ?map\@ParticleTypeMap\@\@0V?$BidirectionalUnorderedMap\@W4ParticleType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?map\@ParticleTypeMap\@\@0V?$BidirectionalUnorderedMap\@W4ParticleType\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const map; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp b/LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp index 969159343e..de6bc763fb 100644 --- a/LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp +++ b/LiteLoader/include/llapi/mc/ParticlesBlockExplosionEvent.hpp @@ -30,16 +30,16 @@ class ParticlesBlockExplosionEvent { public: /** - * @symbol ?addExplodePosition\@ParticlesBlockExplosionEvent\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?addExplodePosition\@ParticlesBlockExplosionEvent\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void addExplodePosition(class Vec3 const &); /** - * @symbol ?save\@ParticlesBlockExplosionEvent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@ParticlesBlockExplosionEvent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ??1ParticlesBlockExplosionEvent\@\@QEAA\@XZ + * @symbol ??1ParticlesBlockExplosionEvent\@\@QEAA\@XZ */ MCAPI ~ParticlesBlockExplosionEvent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp b/LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp index fa59779dc6..7f5ad55948 100644 --- a/LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp +++ b/LiteLoader/include/llapi/mc/ParticlesTeleportTrailEvent.hpp @@ -30,8 +30,8 @@ class ParticlesTeleportTrailEvent { public: /** - * @symbol ?save\@ParticlesTeleportTrailEvent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@ParticlesTeleportTrailEvent\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp b/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp index 67308de947..a32117fa00 100644 --- a/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerFreezeMovementSystem.hpp @@ -28,12 +28,12 @@ class PassengerFreezeMovementSystem { public: /** - * @symbol ?createSystem\@PassengerFreezeMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PassengerFreezeMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?freezeMovement\@PassengerFreezeMovementSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?freezeMovement\@PassengerFreezeMovementSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void freezeMovement(class StrictEntityContext &, struct StateVectorComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp index 4d13e42613..a6a6f70342 100644 --- a/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp +++ b/LiteLoader/include/llapi/mc/PassengerJumpPacket.hpp @@ -30,37 +30,37 @@ class PassengerJumpPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PassengerJumpPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PassengerJumpPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PassengerJumpPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PassengerJumpPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PassengerJumpPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PassengerJumpPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PassengerJumpPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PassengerJumpPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0PassengerJumpPacket\@\@QEAA\@XZ + * @symbol ??0PassengerJumpPacket\@\@QEAA\@XZ */ MCAPI PassengerJumpPacket(); /** - * @symbol ??0PassengerJumpPacket\@\@QEAA\@H\@Z + * @symbol ??0PassengerJumpPacket\@\@QEAA\@H\@Z */ MCAPI PassengerJumpPacket(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp b/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp index 02cf35c3e3..35942a28e2 100644 --- a/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerNeedsPostPositioningSystem.hpp @@ -28,12 +28,12 @@ class PassengerNeedsPostPositioningSystem { public: /** - * @symbol ?_addPositionPassengerRequestComponent\@PassengerNeedsPostPositioningSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBUPendingRemovePassengersComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@3V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + * @symbol ?_addPositionPassengerRequestComponent\@PassengerNeedsPostPositioningSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBUPendingRemovePassengersComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBV?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@3V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z */ MCAPI static void _addPositionPassengerRequestComponent(class StrictEntityContext &, struct PassengerComponent const &, class ViewT, struct PendingRemovePassengersComponent const>, class ViewT const>, class ViewT const>, class ViewT>, struct VehicleComponent const>, class ViewT>, struct VehicleComponent const, struct SynchedActorDataComponent const>, class ViewT const>, class EntityModifierT); /** - * @symbol ?createSystem\@PassengerNeedsPostPositioningSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PassengerNeedsPostPositioningSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp b/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp index 981b7763ed..54ab0bd951 100644 --- a/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerPositionSelfSystem.hpp @@ -28,16 +28,16 @@ class PassengerPositionSelfSystem { public: /** - * @symbol ?createSystem\@PassengerPositionSelfSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PassengerPositionSelfSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doPassengerPositionSelfSystem\@PassengerPositionSelfSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + * @symbol ?_doPassengerPositionSelfSystem\@PassengerPositionSelfSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z */ MCAPI static void _doPassengerPositionSelfSystem(class StrictEntityContext const &, struct PassengerComponent const &, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PassengerTickSystem.hpp b/LiteLoader/include/llapi/mc/PassengerTickSystem.hpp index 5ee35d07cd..8ea7132a29 100644 --- a/LiteLoader/include/llapi/mc/PassengerTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/PassengerTickSystem.hpp @@ -28,16 +28,16 @@ class PassengerTickSystem { public: /** - * @symbol ?createMobPostPassengerTickSystem\@PassengerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createMobPostPassengerTickSystem\@PassengerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createMobPostPassengerTickSystem(); /** - * @symbol ?createPlayerPostPassengerTickSystem\@PassengerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPlayerPostPassengerTickSystem\@PassengerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPlayerPostPassengerTickSystem(); /** - * @symbol ?createPlayerPrePassengerTickSystem\@PassengerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPlayerPrePassengerTickSystem\@PassengerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPlayerPrePassengerTickSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Path.hpp b/LiteLoader/include/llapi/mc/Path.hpp index 3fe5e2a2ae..f537feea7d 100644 --- a/LiteLoader/include/llapi/mc/Path.hpp +++ b/LiteLoader/include/llapi/mc/Path.hpp @@ -42,92 +42,92 @@ class Path { public: /** - * @symbol ??0Path\@\@QEAA\@XZ + * @symbol ??0Path\@\@QEAA\@XZ */ MCAPI Path(); /** - * @symbol ?currentPos\@Path\@\@QEBA?AVVec3\@\@PEBVActor\@\@\@Z + * @symbol ?currentPos\@Path\@\@QEBAAEBVBlockPos\@\@XZ */ - MCAPI class Vec3 currentPos(class Actor const *) const; + MCAPI class BlockPos const & currentPos() const; /** - * @symbol ?currentPos\@Path\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?currentPos\@Path\@\@QEBA?AVVec3\@\@PEBVActor\@\@\@Z */ - MCAPI class BlockPos const & currentPos() const; + MCAPI class Vec3 currentPos(class Actor const *) const; /** - * @symbol ?endsInXZ\@Path\@\@QEAA_NAEBVVec3\@\@\@Z + * @symbol ?endsInXZ\@Path\@\@QEAA_NAEBVVec3\@\@\@Z */ MCAPI bool endsInXZ(class Vec3 const &); /** - * @symbol ?getCompletionType\@Path\@\@QEBA?AW4PathCompletionType\@\@XZ + * @symbol ?getCompletionType\@Path\@\@QEBA?AW4PathCompletionType\@\@XZ */ MCAPI enum class PathCompletionType getCompletionType() const; /** - * @symbol ?getEndPos\@Path\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getEndPos\@Path\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getEndPos() const; /** - * @symbol ?getIndex\@Path\@\@QEBA_KXZ + * @symbol ?getIndex\@Path\@\@QEBA_KXZ */ MCAPI unsigned __int64 getIndex() const; /** - * @symbol ?getLastPos\@Path\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getLastPos\@Path\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getLastPos() const; /** - * @symbol ?getNodePos\@Path\@\@QEBAAEBVBlockPos\@\@_K\@Z + * @symbol ?getNodePos\@Path\@\@QEBAAEBVBlockPos\@\@_K\@Z */ MCAPI class BlockPos const & getNodePos(unsigned __int64) const; /** - * @symbol ?getNodeType\@Path\@\@QEBA?AW4NodeType\@\@_K\@Z + * @symbol ?getNodeType\@Path\@\@QEBA?AW4NodeType\@\@_K\@Z */ MCAPI enum class NodeType getNodeType(unsigned __int64) const; /** - * @symbol ?getPos\@Path\@\@QEBA?AVVec3\@\@PEBVActor\@\@_K\@Z + * @symbol ?getPos\@Path\@\@QEBA?AVVec3\@\@PEBVActor\@\@_K\@Z */ MCAPI class Vec3 getPos(class Actor const *, unsigned __int64) const; /** - * @symbol ?getSize\@Path\@\@QEBA_KXZ + * @symbol ?getSize\@Path\@\@QEBA_KXZ */ MCAPI unsigned __int64 getSize() const; /** - * @symbol ?isDone\@Path\@\@QEBA_NXZ + * @symbol ?isDone\@Path\@\@QEBA_NXZ */ MCAPI bool isDone() const; /** - * @symbol ?isValid\@Path\@\@QEBA_NXZ + * @symbol ?isValid\@Path\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?makeCopy\@Path\@\@QEBA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@XZ + * @symbol ?makeCopy\@Path\@\@QEBA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr makeCopy() const; /** - * @symbol ?next\@Path\@\@QEAAXXZ + * @symbol ?next\@Path\@\@QEAAXXZ */ MCAPI void next(); /** - * @symbol ?sameAs\@Path\@\@QEBA_NPEAV1\@\@Z + * @symbol ?sameAs\@Path\@\@QEBA_NPEAV1\@\@Z */ MCAPI bool sameAs(class Path *) const; /** - * @symbol ?setIndex\@Path\@\@QEAAX_K\@Z + * @symbol ?setIndex\@Path\@\@QEAAX_K\@Z */ MCAPI void setIndex(unsigned __int64); /** - * @symbol ?setSize\@Path\@\@QEAAX_K\@Z + * @symbol ?setSize\@Path\@\@QEAAX_K\@Z */ MCAPI void setSize(unsigned __int64); /** - * @symbol ??1Path\@\@QEAA\@XZ + * @symbol ??1Path\@\@QEAA\@XZ */ MCAPI ~Path(); //private: /** - * @symbol ?buildFromNodes\@Path\@\@AEAAX$$QEAV?$vector\@VNode\@Path\@\@V?$allocator\@VNode\@Path\@\@\@std\@\@\@std\@\@W4PathCompletionType\@\@\@Z + * @symbol ?buildFromNodes\@Path\@\@AEAAX$$QEAV?$vector\@VNode\@Path\@\@V?$allocator\@VNode\@Path\@\@\@std\@\@\@std\@\@W4PathCompletionType\@\@\@Z */ MCAPI void buildFromNodes(std::vector &&, enum class PathCompletionType); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PathBlockSource.hpp b/LiteLoader/include/llapi/mc/PathBlockSource.hpp index 4ac7bf54bb..9dc5e7853b 100644 --- a/LiteLoader/include/llapi/mc/PathBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/PathBlockSource.hpp @@ -28,34 +28,40 @@ class PathBlockSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PathBlockSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isInWater\@PathBlockSource\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isInWater\@PathBlockSource\@\@UEBA_NXZ */ virtual bool isInWater() const; /** - * @vftbl 2 - * @symbol ?isInLava\@PathBlockSource\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isInLava\@PathBlockSource\@\@UEBA_NXZ */ virtual bool isInLava() const; /** - * @vftbl 3 - * @symbol ?isWaterBlock\@PathBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 3 + * @symbol ?isWaterBlock\@PathBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool isWaterBlock(class BlockPos const &) const; /** - * @vftbl 4 - * @symbol ?isLavaBlock\@PathBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?isLavaBlock\@PathBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool isLavaBlock(class BlockPos const &) const; /** - * @vftbl 5 - * @symbol ?isSolidBlock\@PathBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?isSolidBlock\@PathBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool isSolidBlock(class BlockPos const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PATHBLOCKSOURCE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PathBlockSource(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PathFinder.hpp b/LiteLoader/include/llapi/mc/PathFinder.hpp index 57aea8cf8c..6213ca199c 100644 --- a/LiteLoader/include/llapi/mc/PathFinder.hpp +++ b/LiteLoader/include/llapi/mc/PathFinder.hpp @@ -30,120 +30,132 @@ class PathFinder { public: /** - * @symbol ??0PathFinder\@\@QEAA\@AEAVBlockSource\@\@AEBVNavigationComponent\@\@\@Z + * @symbol ??0PathFinder\@\@QEAA\@AEAVBlockSource\@\@AEBVNavigationComponent\@\@\@Z */ MCAPI PathFinder(class BlockSource &, class NavigationComponent const &); /** - * @symbol ?findPath\@PathFinder\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@0M\@Z + * @symbol ?findPath\@PathFinder\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@0M\@Z */ MCAPI std::unique_ptr findPath(class Actor &, class Actor &, float); /** - * @symbol ?findPath\@PathFinder\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@HHHM\@Z + * @symbol ?findPath\@PathFinder\@\@QEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@HHHM\@Z */ MCAPI std::unique_ptr findPath(class Actor &, int, int, int, float); /** - * @symbol ?isFree\@PathFinder\@\@QEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z + * @symbol ?isFree\@PathFinder\@\@QEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z */ MCAPI enum class NodeType isFree(class Actor &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); /** - * @symbol ??1PathFinder\@\@QEAA\@XZ + * @symbol ?isFree\@PathFinder\@\@QEAA?AW4NodeType\@\@AEBUActorPathingData\@\@AEBVBlockPos\@\@11W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z + */ + MCAPI enum class NodeType isFree(struct ActorPathingData const &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); + /** + * @symbol ??1PathFinder\@\@QEAA\@XZ */ MCAPI ~PathFinder(); /** - * @symbol ?_getStartPositionFlyingActor\@PathFinder\@\@SA?AVBlockPos\@\@AEBVIPathBlockSource\@\@V2\@_N2M\@Z + * @symbol ?DEFAULT_DESC\@PathFinder\@\@2UPreferredPathDescription\@\@B + */ + MCAPI static struct PreferredPathDescription const DEFAULT_DESC; + /** + * @symbol ?_getStartPositionFlyingActor\@PathFinder\@\@SA?AVBlockPos\@\@AEBVIPathBlockSource\@\@V2\@_N2M\@Z */ MCAPI static class BlockPos _getStartPositionFlyingActor(class IPathBlockSource const &, class BlockPos, bool, bool, float); + /** + * @symbol ?extractPathingData\@PathFinder\@\@SA?AUActorPathingData\@\@AEAVActor\@\@W4ExtractionPurpose\@1\@\@Z + */ + MCAPI static struct ActorPathingData extractPathingData(class Actor &, enum class PathFinder::ExtractionPurpose); //private: /** - * @symbol ?_checkBlockAndNeighborsProperty\@PathFinder\@\@AEAA_NAEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@W4BlockProperty\@\@HPEBVBreakBlocksComponent\@\@V?$function\@$$A6A_NAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@Z + * @symbol ?_checkBlockAndNeighborsProperty\@PathFinder\@\@AEAA_NAEBUActorPathingData\@\@AEBVBlockPos\@\@AEBVBlock\@\@W4BlockProperty\@\@HPEBVBreakBlocksComponent\@\@V?$function\@$$A6A_NAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@Z */ - MCAPI bool _checkBlockAndNeighborsProperty(class Actor &, class BlockPos const &, class Block const &, enum class BlockProperty, int, class BreakBlocksComponent const *, class std::function); + MCAPI bool _checkBlockAndNeighborsProperty(struct ActorPathingData const &, class BlockPos const &, class Block const &, enum class BlockProperty, int, class BreakBlocksComponent const *, class std::function); /** - * @symbol ?_checkForDamagingBlock\@PathFinder\@\@AEAA_NAEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@HPEBVBreakBlocksComponent\@\@\@Z + * @symbol ?_checkForDamagingBlock\@PathFinder\@\@AEAA_NAEBUActorPathingData\@\@AEBVBlockPos\@\@AEBVBlock\@\@HPEBVBreakBlocksComponent\@\@\@Z */ - MCAPI bool _checkForDamagingBlock(class Actor &, class BlockPos const &, class Block const &, int, class BreakBlocksComponent const *); + MCAPI bool _checkForDamagingBlock(struct ActorPathingData const &, class BlockPos const &, class Block const &, int, class BreakBlocksComponent const *); /** - * @symbol ?_classifyDoorNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlock\@\@AEBVBlockPos\@\@2\@Z + * @symbol ?_classifyDoorNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEBUActorPathingData\@\@AEBVBlock\@\@AEBVBlockPos\@\@2\@Z */ - MCAPI enum class NodeType _classifyDoorNode(class Actor &, class Block const &, class BlockPos const &, class BlockPos const &); + MCAPI enum class NodeType _classifyDoorNode(struct ActorPathingData const &, class Block const &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?_classifyNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@1W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z + * @symbol ?_classifyNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEBUActorPathingData\@\@AEBVBlockPos\@\@AEBVBlock\@\@1W4CanJumpIntoNode\@\@W4CanClimbIntoNode\@\@\@Z */ - MCAPI enum class NodeType _classifyNode(class Actor &, class BlockPos const &, class Block const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); + MCAPI enum class NodeType _classifyNode(struct ActorPathingData const &, class BlockPos const &, class Block const &, class BlockPos const &, enum class CanJumpIntoNode, enum class CanClimbIntoNode); /** - * @symbol ?_findNearestPathableNeighbor\@PathFinder\@\@AEAA_NAEAVBlockPos\@\@AEAVActor\@\@AEBV2\@\@Z + * @symbol ?_findNearestPathableNeighbor\@PathFinder\@\@AEAA_NAEAVBlockPos\@\@AEBUActorPathingData\@\@AEBV2\@\@Z */ - MCAPI bool _findNearestPathableNeighbor(class BlockPos &, class Actor &, class BlockPos const &); + MCAPI bool _findNearestPathableNeighbor(class BlockPos &, struct ActorPathingData const &, class BlockPos const &); /** - * @symbol ?_findPath\@PathFinder\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@MMMM\@Z + * @symbol ?_findPath\@PathFinder\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEBUActorPathingData\@\@MMMM\@Z */ - MCAPI std::unique_ptr _findPath(class Actor &, float, float, float, float); + MCAPI std::unique_ptr _findPath(struct ActorPathingData const &, float, float, float, float); /** - * @symbol ?_findPath\@PathFinder\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVActor\@\@PEAVPathfinderNode\@\@1AEBV5\@M\@Z + * @symbol ?_findPath\@PathFinder\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEBUActorPathingData\@\@PEAVPathfinderNode\@\@1AEBV5\@M\@Z */ - MCAPI std::unique_ptr _findPath(class Actor &, class PathfinderNode *, class PathfinderNode *, class PathfinderNode const &, float); + MCAPI std::unique_ptr _findPath(struct ActorPathingData const &, class PathfinderNode *, class PathfinderNode *, class PathfinderNode const &, float); /** - * @symbol ?_getAABBForHeightComputation\@PathFinder\@\@AEBAAEAVAABB\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@\@Z + * @symbol ?_getAABBForHeightComputation\@PathFinder\@\@AEBAAEAVAABB\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@\@Z */ MCAPI class AABB & _getAABBForHeightComputation(class BlockPos const &, class Block const &, class AABB &) const; /** - * @symbol ?_getAABBForPathfinding\@PathFinder\@\@AEBAAEAVAABB\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@\@Z + * @symbol ?_getAABBForPathfinding\@PathFinder\@\@AEBAAEAVAABB\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@\@Z */ MCAPI class AABB & _getAABBForPathfinding(class BlockPos const &, class Block const &, class AABB &) const; /** - * @symbol ?_getHeightAboveBlock\@PathFinder\@\@AEBAMAEBVBlockPos\@\@M\@Z + * @symbol ?_getHeightAboveBlock\@PathFinder\@\@AEBAMAEBVBlockPos\@\@M\@Z */ MCAPI float _getHeightAboveBlock(class BlockPos const &, float) const; /** - * @symbol ?_getHeightBelowBlock\@PathFinder\@\@AEBAMAEBVBlockPos\@\@M\@Z + * @symbol ?_getHeightBelowBlock\@PathFinder\@\@AEBAMAEBVBlockPos\@\@M\@Z */ MCAPI float _getHeightBelowBlock(class BlockPos const &, float) const; /** - * @symbol ?_getHighestReachablePosByJumping\@PathFinder\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@M0\@Z + * @symbol ?_getHighestReachablePosByJumping\@PathFinder\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@M0\@Z */ MCAPI class std::optional _getHighestReachablePosByJumping(class BlockPos const &, float, class BlockPos const &) const; /** - * @symbol ?_getNeighbors\@PathFinder\@\@AEAAHAEAVActor\@\@AEAVPathfinderNode\@\@AEBV3\@2I\@Z + * @symbol ?_getNeighbors\@PathFinder\@\@AEAAHAEBUActorPathingData\@\@AEAVPathfinderNode\@\@AEBV3\@2I\@Z */ - MCAPI int _getNeighbors(class Actor &, class PathfinderNode &, class PathfinderNode const &, class PathfinderNode const &, unsigned int); + MCAPI int _getNeighbors(struct ActorPathingData const &, class PathfinderNode &, class PathfinderNode const &, class PathfinderNode const &, unsigned int); /** - * @symbol ?_getNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@AEAVActor\@\@AEBVBlockPos\@\@1AEBV2\@MW4CanClimbIntoNode\@\@\@Z + * @symbol ?_getNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@AEBUActorPathingData\@\@AEBVBlockPos\@\@1AEBV2\@MW4CanClimbIntoNode\@\@\@Z */ - MCAPI class PathfinderNode * _getNode(class Actor &, class BlockPos const &, class BlockPos const &, class PathfinderNode const &, float, enum class CanClimbIntoNode); + MCAPI class PathfinderNode * _getNode(struct ActorPathingData const &, class BlockPos const &, class BlockPos const &, class PathfinderNode const &, float, enum class CanClimbIntoNode); /** - * @symbol ?_getNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@AEBVBlockPos\@\@W4NodeType\@\@\@Z + * @symbol ?_getNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@AEBVBlockPos\@\@W4NodeType\@\@\@Z */ MCAPI class PathfinderNode * _getNode(class BlockPos const &, enum class NodeType); /** - * @symbol ?_getPartialBlockNodeType\@PathFinder\@\@AEAA?AV?$optional\@W4NodeType\@\@\@std\@\@AEBVBlockPos\@\@0AEAVActor\@\@\@Z + * @symbol ?_getPartialBlockNodeType\@PathFinder\@\@AEAA?AV?$optional\@W4NodeType\@\@\@std\@\@AEBVBlockPos\@\@0AEBUActorPathingData\@\@\@Z */ - MCAPI class std::optional _getPartialBlockNodeType(class BlockPos const &, class BlockPos const &, class Actor &); + MCAPI class std::optional _getPartialBlockNodeType(class BlockPos const &, class BlockPos const &, struct ActorPathingData const &); /** - * @symbol ?_getPathfindingMalus\@PathFinder\@\@AEAAMAEAVActor\@\@W4NodeType\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getPathfindingMalus\@PathFinder\@\@AEAAMAEBUActorPathingData\@\@W4NodeType\@\@AEBVBlockPos\@\@\@Z */ - MCAPI float _getPathfindingMalus(class Actor &, enum class NodeType, class BlockPos const &); + MCAPI float _getPathfindingMalus(struct ActorPathingData const &, enum class NodeType, class BlockPos const &); /** - * @symbol ?_getUnderneathSupportedNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@PEAV2\@AEAVActor\@\@AEBVBlockPos\@\@AEBV2\@W4CanClimbIntoNode\@\@\@Z + * @symbol ?_getUnderneathSupportedNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@PEAV2\@AEBUActorPathingData\@\@AEBVBlockPos\@\@AEBV2\@W4CanClimbIntoNode\@\@\@Z */ - MCAPI class PathfinderNode * _getUnderneathSupportedNode(class PathfinderNode *, class Actor &, class BlockPos const &, class PathfinderNode const &, enum class CanClimbIntoNode); + MCAPI class PathfinderNode * _getUnderneathSupportedNode(class PathfinderNode *, struct ActorPathingData const &, class BlockPos const &, class PathfinderNode const &, enum class CanClimbIntoNode); /** - * @symbol ?_getWaterNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@AEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?_getWaterNode\@PathFinder\@\@AEAAPEAVPathfinderNode\@\@AEBUActorPathingData\@\@AEBVBlockPos\@\@1\@Z */ - MCAPI class PathfinderNode * _getWaterNode(class Actor &, class BlockPos const &, class BlockPos const &); + MCAPI class PathfinderNode * _getWaterNode(struct ActorPathingData const &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?_isFreeStartNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEAVActor\@\@AEBVAABB\@\@AEBVBlockPos\@\@2\@Z + * @symbol ?_isFreeStartNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEBUActorPathingData\@\@AEBVAABB\@\@AEBVBlockPos\@\@2\@Z */ - MCAPI enum class NodeType _isFreeStartNode(class Actor &, class AABB const &, class BlockPos const &, class BlockPos const &); + MCAPI enum class NodeType _isFreeStartNode(struct ActorPathingData const &, class AABB const &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?_isFreeWaterNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?_isFreeWaterNode\@PathFinder\@\@AEAA?AW4NodeType\@\@AEBUActorPathingData\@\@AEBVBlockPos\@\@1\@Z */ - MCAPI enum class NodeType _isFreeWaterNode(class Actor &, class BlockPos const &, class BlockPos const &); + MCAPI enum class NodeType _isFreeWaterNode(struct ActorPathingData const &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?_reconstructPath\@PathFinder\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@PEAVPathfinderNode\@\@W4PathCompletionType\@\@UActorUniqueID\@\@\@Z + * @symbol ?_reconstructPath\@PathFinder\@\@AEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@PEAVPathfinderNode\@\@W4PathCompletionType\@\@UActorUniqueID\@\@\@Z */ MCAPI std::unique_ptr _reconstructPath(class PathfinderNode *, enum class PathCompletionType, struct ActorUniqueID); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp b/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp index 713b533c45..bebb7b43ab 100644 --- a/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp +++ b/LiteLoader/include/llapi/mc/PathFinderHackUtils.hpp @@ -20,7 +20,7 @@ namespace PathFinderHackUtils { #undef AFTER_EXTRA /** - * @symbol ?canUseFreeStartNodeCheck\@PathFinderHackUtils\@\@YA_NW4ActorType\@\@\@Z + * @symbol ?canUseFreeStartNodeCheck\@PathFinderHackUtils\@\@YA_NW4ActorType\@\@\@Z */ MCAPI bool canUseFreeStartNodeCheck(enum class ActorType); diff --git a/LiteLoader/include/llapi/mc/PathFinderUtils.hpp b/LiteLoader/include/llapi/mc/PathFinderUtils.hpp index 5b2cd03635..7b8634916e 100644 --- a/LiteLoader/include/llapi/mc/PathFinderUtils.hpp +++ b/LiteLoader/include/llapi/mc/PathFinderUtils.hpp @@ -20,11 +20,11 @@ namespace PathFinderUtils { #undef AFTER_EXTRA /** - * @symbol ?getActorRadius\@PathFinderUtils\@\@YAMAEBVActor\@\@\@Z + * @symbol ?getActorRadius\@PathFinderUtils\@\@YAMAEBVActor\@\@\@Z */ MCAPI float getActorRadius(class Actor const &); /** - * @symbol ?getMaxJumpHeight\@PathFinderUtils\@\@YAMAEBVActor\@\@\@Z + * @symbol ?getMaxJumpHeight\@PathFinderUtils\@\@YAMAEBVActor\@\@\@Z */ MCAPI float getMaxJumpHeight(class Actor const &); diff --git a/LiteLoader/include/llapi/mc/PathNavigation.hpp b/LiteLoader/include/llapi/mc/PathNavigation.hpp index 2d120e19d1..459e178ea0 100644 --- a/LiteLoader/include/llapi/mc/PathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/PathNavigation.hpp @@ -30,85 +30,91 @@ class PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PathNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@PathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@PathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct NavigationDescription *); /** - * @vftbl 2 - * @symbol ?tick\@PathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@PathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class NavigationComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?getTempMobPos\@PathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z + * @vftbl 3 + * @symbol ?getTempMobPos\@PathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z */ virtual class Vec3 getTempMobPos(class Mob const &) const; /** - * @vftbl 4 - * @symbol ?createPath\@PathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z + * @vftbl 4 + * @symbol ?createPath\@PathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Vec3 const &); /** - * @vftbl 5 - * @symbol ?createPath\@PathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z + * @vftbl 5 + * @symbol ?createPath\@PathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Actor &); /** - * @vftbl 6 - * @symbol ?moveTo\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z + * @vftbl 6 + * @symbol ?moveTo\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@M\@Z */ virtual bool moveTo(class NavigationComponent &, class Mob &, class Vec3 const &, float); /** - * @vftbl 7 - * @symbol ?moveTo\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@M\@Z + * @vftbl 7 + * @symbol ?moveTo\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@M\@Z */ virtual bool moveTo(class NavigationComponent &, class Mob &, class Actor &, float); /** - * @vftbl 8 - * @symbol ?moveTo\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z + * @vftbl 8 + * @symbol ?moveTo\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@V?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@M\@Z */ virtual bool moveTo(class NavigationComponent &, class Mob &, std::unique_ptr, float); /** - * @vftbl 9 - * @symbol ?stop\@PathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 9 + * @symbol ?stop\@PathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void stop(class NavigationComponent &, class Mob &); /** - * @vftbl 10 - * @symbol ?travel\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAM22\@Z + * @vftbl 10 + * @symbol ?travel\@PathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAM22\@Z */ virtual bool travel(class NavigationComponent &, class Mob &, float &, float &, float &); /** - * @vftbl 11 - * @symbol ?canUpdatePath\@PathNavigation\@\@MEBA_NAEBVMob\@\@\@Z + * @vftbl 11 + * @symbol ?canUpdatePath\@PathNavigation\@\@MEBA_NAEBVMob\@\@\@Z */ virtual bool canUpdatePath(class Mob const &) const; /** - * @vftbl 12 - * @symbol ?updatePath\@PathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 12 + * @symbol ?updatePath\@PathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void updatePath(class NavigationComponent &, class Mob &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PATHNAVIGATION + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PathNavigation(); +#endif //protected: /** - * @symbol ?_getHighestBlockHeight\@PathNavigation\@\@IEBAMAEAVBlockSource\@\@AEAVMob\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?_getHighestBlockHeight\@PathNavigation\@\@IEBAMAEAVBlockSource\@\@AEAVMob\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI float _getHighestBlockHeight(class BlockSource &, class Mob &, class Vec3 const &, class Vec2 const &) const; /** - * @symbol ?_isPositionOnlyInAir\@PathNavigation\@\@IEBA_NAEBVBlockSource\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z + * @symbol ?_isPositionOnlyInAir\@PathNavigation\@\@IEBA_NAEBVBlockSource\@\@AEBVVec3\@\@AEBVVec2\@\@\@Z */ MCAPI bool _isPositionOnlyInAir(class BlockSource const &, class Vec3 const &, class Vec2 const &) const; /** - * @symbol ?isFree\@PathNavigation\@\@IEAA?AW4NodeType\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVBlockPos\@\@22W4CanJumpIntoNode\@\@\@Z + * @symbol ?isFree\@PathNavigation\@\@IEAA?AW4NodeType\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVBlockPos\@\@22W4CanJumpIntoNode\@\@\@Z */ MCAPI enum class NodeType isFree(class NavigationComponent &, class Mob &, class BlockPos const &, class BlockPos const &, class BlockPos const &, enum class CanJumpIntoNode); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PathfinderNode.hpp b/LiteLoader/include/llapi/mc/PathfinderNode.hpp index c8714cf3f4..cb2bcebdd8 100644 --- a/LiteLoader/include/llapi/mc/PathfinderNode.hpp +++ b/LiteLoader/include/llapi/mc/PathfinderNode.hpp @@ -29,44 +29,44 @@ class PathfinderNode { public: /** - * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z + * @symbol ??0PathfinderNode\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PathfinderNode(class BlockPos const &, enum class NodeType); + MCAPI PathfinderNode(class PathfinderNode const &); /** - * @symbol ??0PathfinderNode\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PathfinderNode\@\@QEAA\@AEBVBlockPos\@\@W4NodeType\@\@\@Z */ - MCAPI PathfinderNode(class PathfinderNode const &); + MCAPI PathfinderNode(class BlockPos const &, enum class NodeType); /** - * @symbol ?distanceTo\@PathfinderNode\@\@QEBAMPEAV1\@\@Z + * @symbol ?distanceTo\@PathfinderNode\@\@QEBAMPEAV1\@\@Z */ MCAPI float distanceTo(class PathfinderNode *) const; /** - * @symbol ?distanceToSqr\@PathfinderNode\@\@QEBAMPEAV1\@\@Z + * @symbol ?distanceToSqr\@PathfinderNode\@\@QEBAMPEAV1\@\@Z */ MCAPI float distanceToSqr(class PathfinderNode *) const; /** - * @symbol ?equals\@PathfinderNode\@\@QEAA_NPEAV1\@\@Z + * @symbol ?equals\@PathfinderNode\@\@QEAA_NPEAV1\@\@Z */ MCAPI bool equals(class PathfinderNode *); /** - * @symbol ?getCostMalus\@PathfinderNode\@\@QEBAMXZ + * @symbol ?getCostMalus\@PathfinderNode\@\@QEBAMXZ */ MCAPI float getCostMalus() const; /** - * @symbol ?getType\@PathfinderNode\@\@QEBA?AW4NodeType\@\@XZ + * @symbol ?getType\@PathfinderNode\@\@QEBA?AW4NodeType\@\@XZ */ MCAPI enum class NodeType getType() const; /** - * @symbol ?inOpenSet\@PathfinderNode\@\@QEAA_NXZ + * @symbol ?inOpenSet\@PathfinderNode\@\@QEAA_NXZ */ MCAPI bool inOpenSet(); /** - * @symbol ?setCostMalus\@PathfinderNode\@\@QEAAXM\@Z + * @symbol ?setCostMalus\@PathfinderNode\@\@QEAAXM\@Z */ MCAPI void setCostMalus(float); /** - * @symbol ?setMoveMalus\@PathfinderNode\@\@QEAAXM\@Z + * @symbol ?setMoveMalus\@PathfinderNode\@\@QEAAXM\@Z */ MCAPI void setMoveMalus(float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PauseManager.hpp b/LiteLoader/include/llapi/mc/PauseManager.hpp index c418e2e432..76c3ff29a5 100644 --- a/LiteLoader/include/llapi/mc/PauseManager.hpp +++ b/LiteLoader/include/llapi/mc/PauseManager.hpp @@ -30,12 +30,12 @@ class PauseManager { public: /** - * @symbol ?DEFAULT_SIMULATION_TYPE\@PauseManager\@\@2W4SimulationType\@\@B + * @symbol ?DEFAULT_SIMULATION_TYPE\@PauseManager\@\@2W4SimulationType\@\@B */ MCAPI static enum class SimulationType const DEFAULT_SIMULATION_TYPE; /** - * @symbol ?getSimulationType\@PauseManager\@\@SA?AW4SimulationType\@\@V?$StackRefResultT\@U?$SharePtrRefTraits\@$$CBVPauseManager\@\@\@\@\@\@\@Z + * @symbol ?getSimulationType\@PauseManager\@\@SA?AW4SimulationType\@\@V?$StackRefResultT\@U?$SharePtrRefTraits\@$$CBVPauseManager\@\@\@\@\@\@\@Z */ MCAPI static enum class SimulationType getSimulationType(class StackRefResultT>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp index ce313cf533..6b680fd40b 100644 --- a/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/PauseScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure PauseScreenCapabilities. - * - */ -struct PauseScreenCapabilities { + +class PauseScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,27 @@ struct PauseScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PAUSESCREENCAPABILITIES public: - struct PauseScreenCapabilities& operator=(struct PauseScreenCapabilities const &) = delete; - PauseScreenCapabilities(struct PauseScreenCapabilities const &) = delete; + class PauseScreenCapabilities& operator=(class PauseScreenCapabilities const &) = delete; + PauseScreenCapabilities(class PauseScreenCapabilities const &) = delete; PauseScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PauseScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UPauseScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UPauseScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PAUSESCREENCAPABILITIES + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PauseScreenCapabilities(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PeekComponent.hpp b/LiteLoader/include/llapi/mc/PeekComponent.hpp index 83735c5651..a1928ae66a 100644 --- a/LiteLoader/include/llapi/mc/PeekComponent.hpp +++ b/LiteLoader/include/llapi/mc/PeekComponent.hpp @@ -30,16 +30,16 @@ class PeekComponent { public: /** - * @symbol ?getDuration\@PeekComponent\@\@QEAAAEAHXZ + * @symbol ?getDuration\@PeekComponent\@\@QEAAAEAHXZ */ MCAPI int & getDuration(); /** - * @symbol ?getHadTarget\@PeekComponent\@\@QEBA_NXZ + * @symbol ?getHadTarget\@PeekComponent\@\@QEBA_NXZ */ MCAPI bool getHadTarget() const; /** - * @symbol ?setHadTarget\@PeekComponent\@\@QEAAX_N\@Z + * @symbol ?setHadTarget\@PeekComponent\@\@QEAAX_N\@Z */ MCAPI void setHadTarget(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PeekDefinition.hpp b/LiteLoader/include/llapi/mc/PeekDefinition.hpp index ab2977ec56..9198d3971d 100644 --- a/LiteLoader/include/llapi/mc/PeekDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PeekDefinition.hpp @@ -31,8 +31,8 @@ class PeekDefinition { public: /** - * @symbol ?buildSchema\@PeekDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VPeekDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@PeekDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VPeekDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PeekSystem.hpp b/LiteLoader/include/llapi/mc/PeekSystem.hpp index a890aadbc0..0a7a85cf64 100644 --- a/LiteLoader/include/llapi/mc/PeekSystem.hpp +++ b/LiteLoader/include/llapi/mc/PeekSystem.hpp @@ -30,19 +30,19 @@ class PeekSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PeekSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@PeekSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@PeekSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PendingArea.hpp b/LiteLoader/include/llapi/mc/PendingArea.hpp index 3c70a88df4..ba09c8ba46 100644 --- a/LiteLoader/include/llapi/mc/PendingArea.hpp +++ b/LiteLoader/include/llapi/mc/PendingArea.hpp @@ -30,39 +30,39 @@ struct PendingArea { public: /** - * @symbol ?getDescription\@PendingArea\@\@QEBA?AUTickingAreaDescription\@\@XZ + * @symbol ?getDescription\@PendingArea\@\@QEBA?AUTickingAreaDescription\@\@XZ */ MCAPI struct TickingAreaDescription getDescription() const; /** - * @symbol ?isEntityOwned\@PendingArea\@\@QEBA_NXZ + * @symbol ?isEntityOwned\@PendingArea\@\@QEBA_NXZ */ MCAPI bool isEntityOwned() const; /** - * @symbol ??4PendingArea\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PendingArea\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PendingArea & operator=(struct PendingArea &&); /** - * @symbol ?serialize\@PendingArea\@\@QEBA?AVCompoundTag\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?serialize\@PendingArea\@\@QEBA?AVCompoundTag\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class CompoundTag serialize(class AutomaticID) const; /** - * @symbol ??1PendingArea\@\@QEAA\@XZ + * @symbol ??1PendingArea\@\@QEAA\@XZ */ MCAPI ~PendingArea(); /** - * @symbol ?createEntityTickingArea\@PendingArea\@\@SA?AU1\@VUUID\@mce\@\@UActorUniqueID\@\@AEBUBounds\@\@_NM\@Z + * @symbol ?createEntityTickingArea\@PendingArea\@\@SA?AU1\@VUUID\@mce\@\@UActorUniqueID\@\@AEBUBounds\@\@_NM\@Z */ MCAPI static struct PendingArea createEntityTickingArea(class mce::UUID, struct ActorUniqueID, struct Bounds const &, bool, float); /** - * @symbol ?createTickingArea\@PendingArea\@\@SA?AU1\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUBounds\@\@_NW4TickingAreaLoadMode\@\@\@Z + * @symbol ?createTickingArea\@PendingArea\@\@SA?AU1\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUBounds\@\@_NW4TickingAreaLoadMode\@\@\@Z */ MCAPI static struct PendingArea createTickingArea(class mce::UUID, std::string const &, struct Bounds const &, bool, enum class TickingAreaLoadMode); /** - * @symbol ?load\@PendingArea\@\@SA?AU1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?load\@PendingArea\@\@SA?AU1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static struct PendingArea load(std::string const &, class CompoundTag const &); /** - * @symbol ?validTag\@PendingArea\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?validTag\@PendingArea\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool validTag(class CompoundTag const &); diff --git a/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp b/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp index 0bde6baac2..2d66bb82ba 100644 --- a/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp +++ b/LiteLoader/include/llapi/mc/PendingRemovePassengersComponent.hpp @@ -28,7 +28,7 @@ struct PendingRemovePassengersComponent { public: /** - * @symbol ??1PendingRemovePassengersComponent\@\@QEAA\@XZ + * @symbol ??1PendingRemovePassengersComponent\@\@QEAA\@XZ */ MCAPI ~PendingRemovePassengersComponent(); diff --git a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystem.hpp b/LiteLoader/include/llapi/mc/PendingRemovePassengersSystem.hpp index 7dd42b8c24..6ad6dc3f26 100644 --- a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystem.hpp +++ b/LiteLoader/include/llapi/mc/PendingRemovePassengersSystem.hpp @@ -28,8 +28,8 @@ class PendingRemovePassengersSystem { public: /** - * @symbol ?createPendingRemovePassengersSystem\@PendingRemovePassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPendingRemovePassengersSystem\@PendingRemovePassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPendingRemovePassengersSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp deleted file mode 100644 index 4cb3ac2691..0000000000 --- a/LiteLoader/include/llapi/mc/PendingRemovePassengersSystemImpl.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file PendingRemovePassengersSystemImpl.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PendingRemovePassengersSystemImpl. - * - */ -class PendingRemovePassengersSystemImpl { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PENDINGREMOVEPASSENGERSSYSTEMIMPL -public: - class PendingRemovePassengersSystemImpl& operator=(class PendingRemovePassengersSystemImpl const &) = delete; - PendingRemovePassengersSystemImpl(class PendingRemovePassengersSystemImpl const &) = delete; - PendingRemovePassengersSystemImpl() = delete; -#endif - -public: - /** - * @symbol ?_pendingRemovePassengersSystem@PendingRemovePassengersSystemImpl@@SAXAEAV?$ViewedEntityContextT@VStrictEntityContext@@$$CBUVehicleComponent@@$$CBUPendingRemovePassengersComponent@@@@V?$EntityModifierT@VEntityRegistryBase@@VStrictEntityContext@@UPendingRemovePassengersComponent@@URemovePassengersComponent@@@@@Z - * @hash 728905463 - */ - MCAPI static void _pendingRemovePassengersSystem(class ViewedEntityContextT &, class EntityModifierT); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PerfContextTracker.hpp b/LiteLoader/include/llapi/mc/PerfContextTracker.hpp index 5ffaf47a9c..fb985dfc32 100644 --- a/LiteLoader/include/llapi/mc/PerfContextTracker.hpp +++ b/LiteLoader/include/llapi/mc/PerfContextTracker.hpp @@ -29,28 +29,28 @@ class PerfContextTracker { public: /** - * @symbol ??0PerfContextTracker\@\@QEAA\@XZ + * @symbol ??0PerfContextTracker\@\@QEAA\@XZ */ MCAPI PerfContextTracker(); /** - * @symbol ?incrementPacketReceivedInfo\@PerfContextTracker\@\@QEAAXI\@Z + * @symbol ?incrementPacketReceivedInfo\@PerfContextTracker\@\@QEAAXI\@Z */ MCAPI void incrementPacketReceivedInfo(unsigned int); /** - * @symbol ?incrementPacketSentInfo\@PerfContextTracker\@\@QEAAXI\@Z + * @symbol ?incrementPacketSentInfo\@PerfContextTracker\@\@QEAAXI\@Z */ MCAPI void incrementPacketSentInfo(unsigned int); /** - * @symbol ?getInstance\@PerfContextTracker\@\@SAAEAV1\@XZ + * @symbol ?getInstance\@PerfContextTracker\@\@SAAEAV1\@XZ */ MCAPI static class PerfContextTracker & getInstance(); //private: /** - * @symbol ?_resetStats\@PerfContextTracker\@\@AEAAXXZ + * @symbol ?_resetStats\@PerfContextTracker\@\@AEAAXXZ */ MCAPI void _resetStats(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp b/LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp index 50176521ac..e3a55acb91 100644 --- a/LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp +++ b/LiteLoader/include/llapi/mc/PerfContextTrackerReport.hpp @@ -28,8 +28,8 @@ class PerfContextTrackerReport { public: /** - * @symbol ??1PerfContextTrackerReport\@\@QEAA\@XZ + * @symbol ??1PerfContextTrackerReport\@\@QEAA\@XZ */ MCAPI ~PerfContextTrackerReport(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PerfTimer.hpp b/LiteLoader/include/llapi/mc/PerfTimer.hpp index 85338806d3..6ad8d433e8 100644 --- a/LiteLoader/include/llapi/mc/PerfTimer.hpp +++ b/LiteLoader/include/llapi/mc/PerfTimer.hpp @@ -32,19 +32,19 @@ class PerfTimer { public: /** - * @symbol ??0PerfTimer\@\@QEAA\@Vid\@thread\@std\@\@\@Z + * @symbol ??0PerfTimer\@\@QEAA\@Vid\@thread\@std\@\@\@Z */ MCAPI PerfTimer(class std::thread::id); /** - * @symbol ??1PerfTimer\@\@QEAA\@XZ + * @symbol ??1PerfTimer\@\@QEAA\@XZ */ MCAPI ~PerfTimer(); /** - * @symbol ?mEnabled\@PerfTimer\@\@2_NA + * @symbol ?mEnabled\@PerfTimer\@\@2_NA */ MCAPI static bool mEnabled; /** - * @symbol ?test\@PerfTimer\@\@2V?$ThreadLocalObject\@VPerfTimer\@\@V?$allocator\@VPerfTimer\@\@\@std\@\@\@Threading\@Bedrock\@\@A + * @symbol ?test\@PerfTimer\@\@2V?$ThreadLocalObject\@VPerfTimer\@\@V?$allocator\@VPerfTimer\@\@\@std\@\@\@Threading\@Bedrock\@\@A */ MCAPI static class Bedrock::Threading::ThreadLocalObject> test; @@ -52,12 +52,12 @@ class PerfTimer { protected: /** - * @symbol ?MultiplyDeBruijnBitPosition\@PerfTimer\@\@1QBHB + * @symbol ?MultiplyDeBruijnBitPosition\@PerfTimer\@\@1QBHB */ MCAPI static int const MultiplyDeBruijnBitPosition[]; /** - * @symbol ?mPath\@PerfTimer\@\@1V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@A + * @symbol ?mPath\@PerfTimer\@\@1V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@A */ MCAPI static class Core::PathBuffer mPath; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp b/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp index 28c53e44ed..43979e89ec 100644 --- a/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp +++ b/LiteLoader/include/llapi/mc/PerformEnvDeleter.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure PerformEnvDeleter. - * - */ -struct PerformEnvDeleter { + +class PerformEnvDeleter { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PERFORMENVDELETER public: - struct PerformEnvDeleter& operator=(struct PerformEnvDeleter const &) = delete; - PerformEnvDeleter(struct PerformEnvDeleter const &) = delete; + class PerformEnvDeleter& operator=(class PerformEnvDeleter const &) = delete; + PerformEnvDeleter(class PerformEnvDeleter const &) = delete; PerformEnvDeleter() = delete; #endif public: /** - * @symbol ??RPerformEnvDeleter\@\@QEAAXPEAUHC_PERFORM_ENV\@\@\@Z + * @symbol ??RPerformEnvDeleter\@\@QEAAXPEAUHC_PERFORM_ENV\@\@\@Z */ MCAPI void operator()(struct HC_PERFORM_ENV *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PerlinNoise.hpp b/LiteLoader/include/llapi/mc/PerlinNoise.hpp index 1f39083627..8f27a97072 100644 --- a/LiteLoader/include/llapi/mc/PerlinNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinNoise.hpp @@ -29,48 +29,48 @@ class PerlinNoise { public: /** - * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PerlinNoise(unsigned int, int, int); + MCAPI PerlinNoise(class PerlinNoise const &); /** - * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@UYBlendingBugSettings\@\@HH\@Z */ MCAPI PerlinNoise(class IRandom &, struct YBlendingBugSettings, int, int); /** - * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@HH\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@AEAVIRandom\@\@HH\@Z */ MCAPI PerlinNoise(class IRandom &, int, int); /** - * @symbol ??0PerlinNoise\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PerlinNoise\@\@QEAA\@IHH\@Z */ - MCAPI PerlinNoise(class PerlinNoise const &); + MCAPI PerlinNoise(unsigned int, int, int); /** - * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec2\@\@HH1M\@Z + * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z */ - MCAPI void getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float) const; + MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; /** - * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec3\@\@HHH1\@Z + * @symbol ?getRegion\@PerlinNoise\@\@QEBAXPEAMAEBVVec2\@\@HH1M\@Z */ - MCAPI void getRegion(float *, class Vec3 const &, int, int, int, class Vec3 const &) const; + MCAPI void getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float) const; /** - * @symbol ?getValue\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?getValue\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float getValue(class Vec3 const &) const; /** - * @symbol ?getValueNormalized\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?getValueNormalized\@PerlinNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float getValueNormalized(class Vec3 const &) const; /** - * @symbol ??1PerlinNoise\@\@QEAA\@XZ + * @symbol ??1PerlinNoise\@\@QEAA\@XZ */ MCAPI ~PerlinNoise(); //private: /** - * @symbol ?_init\@PerlinNoise\@\@AEAAXAEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z + * @symbol ?_init\@PerlinNoise\@\@AEAAXAEAVIRandom\@\@UYBlendingBugSettings\@\@\@Z */ MCAPI void _init(class IRandom &, struct YBlendingBugSettings); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp index e567678b8b..06bc8aba44 100644 --- a/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/PerlinSimplexNoise.hpp @@ -29,48 +29,48 @@ class PerlinSimplexNoise { public: /** - * @symbol ??0PerlinSimplexNoise\@\@QEAA\@IH\@Z + * @symbol ??0PerlinSimplexNoise\@\@QEAA\@IH\@Z */ MCAPI PerlinSimplexNoise(unsigned int, int); /** - * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z + * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PerlinSimplexNoise(class IRandom &, int, bool); + MCAPI PerlinSimplexNoise(class PerlinSimplexNoise const &); /** - * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PerlinSimplexNoise\@\@QEAA\@AEAVIRandom\@\@H_N\@Z */ - MCAPI PerlinSimplexNoise(class PerlinSimplexNoise const &); + MCAPI PerlinSimplexNoise(class IRandom &, int, bool); /** - * @symbol ?getRegion\@PerlinSimplexNoise\@\@QEBAPEAMPEAMAEBVVec2\@\@HH1MM\@Z + * @symbol ?getRegion\@PerlinSimplexNoise\@\@QEBAPEAMPEAMAEBVVec2\@\@HH1MM\@Z */ MCAPI float * getRegion(float *, class Vec2 const &, int, int, class Vec2 const &, float, float) const; /** - * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float getValue(class Vec3 const &) const; /** - * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMMM\@Z + * @symbol ?getValue\@PerlinSimplexNoise\@\@QEBAMMM\@Z */ MCAPI float getValue(float, float) const; /** - * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMMM\@Z */ - MCAPI float getValueNormalized(class Vec3 const &) const; + MCAPI float getValueNormalized(float, float) const; /** - * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMMM\@Z + * @symbol ?getValueNormalized\@PerlinSimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z */ - MCAPI float getValueNormalized(float, float) const; + MCAPI float getValueNormalized(class Vec3 const &) const; /** - * @symbol ??1PerlinSimplexNoise\@\@QEAA\@XZ + * @symbol ??1PerlinSimplexNoise\@\@QEAA\@XZ */ MCAPI ~PerlinSimplexNoise(); //private: /** - * @symbol ?_init\@PerlinSimplexNoise\@\@AEAAXAEAVIRandom\@\@_N\@Z + * @symbol ?_init\@PerlinSimplexNoise\@\@AEAAXAEAVIRandom\@\@_N\@Z */ MCAPI void _init(class IRandom &, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PermissionCommand.hpp b/LiteLoader/include/llapi/mc/PermissionCommand.hpp index 1de74b875a..c0215dc49a 100644 --- a/LiteLoader/include/llapi/mc/PermissionCommand.hpp +++ b/LiteLoader/include/llapi/mc/PermissionCommand.hpp @@ -31,38 +31,38 @@ class PermissionCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PermissionCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@PermissionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@PermissionCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@PermissionCommand\@\@SAXAEAVCommandRegistry\@\@PEAVPermissionsFile\@\@\@Z + * @symbol ?setup\@PermissionCommand\@\@SAXAEAVCommandRegistry\@\@PEAVPermissionsFile\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class PermissionsFile *); //private: /** - * @symbol ?list\@PermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?list\@PermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void list(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?reload\@PermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?reload\@PermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void reload(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?set\@PermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?set\@PermissionCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void set(class CommandOrigin const &, class CommandOutput &) const; private: /** - * @symbol ?mPermissionsFile\@PermissionCommand\@\@0PEAVPermissionsFile\@\@EA + * @symbol ?mPermissionsFile\@PermissionCommand\@\@0PEAVPermissionsFile\@\@EA */ MCAPI static class PermissionsFile * mPermissionsFile; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PermissionsFile.hpp b/LiteLoader/include/llapi/mc/PermissionsFile.hpp index 561b62ff9e..fc54ad8ba3 100644 --- a/LiteLoader/include/llapi/mc/PermissionsFile.hpp +++ b/LiteLoader/include/llapi/mc/PermissionsFile.hpp @@ -32,48 +32,52 @@ class PermissionsFile { public: /** - * @symbol ??0PermissionsFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z + * @symbol ??0PermissionsFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ MCAPI PermissionsFile(class Core::Path const &); /** - * @symbol ?applyPlayerPermissionsFromDisk\@PermissionsFile\@\@QEAAXAEAVPlayer\@\@AEBVUserEntityIdentifierComponent\@\@W4CommandPermissionLevel\@\@\@Z + * @symbol ?applyPlayerPermissionsFromDisk\@PermissionsFile\@\@QEAAXAEAVPlayer\@\@AEBVUserEntityIdentifierComponent\@\@W4CommandPermissionLevel\@\@\@Z */ MCAPI void applyPlayerPermissionsFromDisk(class Player &, class UserEntityIdentifierComponent const &, enum class CommandPermissionLevel); /** - * @symbol ?getPermissions\@PermissionsFile\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@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\@\@W4PlayerPermissionLevel\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getPermissions\@PermissionsFile\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@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\@\@W4PlayerPermissionLevel\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getPermissions() const; /** - * @symbol ?getXUIDsByPermission\@PermissionsFile\@\@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\@\@W4PlayerPermissionLevel\@\@\@Z + * @symbol ?getXUIDsByPermission\@PermissionsFile\@\@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\@\@W4PlayerPermissionLevel\@\@\@Z */ MCAPI std::vector getXUIDsByPermission(enum class PlayerPermissionLevel) const; /** - * @symbol ?isPermissionsSet\@PermissionsFile\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@\@Z + * @symbol ?isPermissionsSet\@PermissionsFile\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@\@Z */ MCAPI bool isPermissionsSet(std::string const &, enum class PlayerPermissionLevel) const; /** - * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@\@Z + * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PlayerPermissionLevel\@\@\@Z */ MCAPI void persistPlayerPermissionsToDisk(std::string const &, enum class PlayerPermissionLevel); /** - * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBVUserEntityIdentifierComponent\@\@W4PlayerPermissionLevel\@\@\@Z + * @symbol ?persistPlayerPermissionsToDisk\@PermissionsFile\@\@QEAAXAEBVUserEntityIdentifierComponent\@\@W4PlayerPermissionLevel\@\@\@Z */ MCAPI void persistPlayerPermissionsToDisk(class UserEntityIdentifierComponent const &, enum class PlayerPermissionLevel); /** - * @symbol ?reload\@PermissionsFile\@\@QEAA?AW4FileReadResult\@\@XZ + * @symbol ?reload\@PermissionsFile\@\@QEAA?AW4FileReadResult\@\@XZ */ MCAPI enum class FileReadResult reload(); + /** + * @symbol ??1PermissionsFile\@\@QEAA\@XZ + */ + MCAPI ~PermissionsFile(); //private: /** - * @symbol ?readPermissionFile\@PermissionsFile\@\@AEAA?AV?$tuple\@W4FileReadResult\@\@VValue\@Json\@\@\@std\@\@XZ + * @symbol ?readPermissionFile\@PermissionsFile\@\@AEAA?AV?$tuple\@W4FileReadResult\@\@VValue\@Json\@\@\@std\@\@XZ */ MCAPI class std::tuple readPermissionFile(); /** - * @symbol ?setDefaultPlayerPermission\@PermissionsFile\@\@AEAAXAEAVPlayer\@\@W4CommandPermissionLevel\@\@\@Z + * @symbol ?setDefaultPlayerPermission\@PermissionsFile\@\@AEAAXAEAVPlayer\@\@W4CommandPermissionLevel\@\@\@Z */ MCAPI void setDefaultPlayerPermission(class Player &, enum class CommandPermissionLevel); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PermissionsHandler.hpp b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp index 593879ac93..188e47dda4 100644 --- a/LiteLoader/include/llapi/mc/PermissionsHandler.hpp +++ b/LiteLoader/include/llapi/mc/PermissionsHandler.hpp @@ -28,56 +28,56 @@ class PermissionsHandler { public: /** - * @symbol ??0PermissionsHandler\@\@QEAA\@XZ + * @symbol ??0PermissionsHandler\@\@QEAA\@AEBV0\@\@Z */ - MCAPI PermissionsHandler(); + MCAPI PermissionsHandler(class PermissionsHandler const &); /** - * @symbol ??0PermissionsHandler\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PermissionsHandler\@\@QEAA\@XZ */ - MCAPI PermissionsHandler(class PermissionsHandler const &); + MCAPI PermissionsHandler(); /** - * @symbol ?addSaveData\@PermissionsHandler\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addSaveData\@PermissionsHandler\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addSaveData(class CompoundTag &) const; /** - * @symbol ?getCommandPermissions\@PermissionsHandler\@\@QEBA?AW4CommandPermissionLevel\@\@XZ + * @symbol ?getCommandPermissions\@PermissionsHandler\@\@QEBA?AW4CommandPermissionLevel\@\@XZ */ MCAPI enum class CommandPermissionLevel getCommandPermissions() const; /** - * @symbol ?getPlayerPermissions\@PermissionsHandler\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ + * @symbol ?getPlayerPermissions\@PermissionsHandler\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel getPlayerPermissions() const; /** - * @symbol ?loadSaveData\@PermissionsHandler\@\@QEAA_NAEBVCompoundTag\@\@\@Z + * @symbol ?loadSaveData\@PermissionsHandler\@\@QEAA_NAEBVCompoundTag\@\@\@Z */ MCAPI bool loadSaveData(class CompoundTag const &); /** - * @symbol ?setCommandPermissions\@PermissionsHandler\@\@QEAAXW4CommandPermissionLevel\@\@\@Z + * @symbol ?setCommandPermissions\@PermissionsHandler\@\@QEAAXW4CommandPermissionLevel\@\@\@Z */ MCAPI void setCommandPermissions(enum class CommandPermissionLevel); /** - * @symbol ?setPlayerPermissions\@PermissionsHandler\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z + * @symbol ?setPlayerPermissions\@PermissionsHandler\@\@QEAAXW4PlayerPermissionLevel\@\@\@Z */ MCAPI void setPlayerPermissions(enum class PlayerPermissionLevel); /** - * @symbol ?DIFF_COMMAND_PERMISSION\@PermissionsHandler\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_COMMAND_PERMISSION\@PermissionsHandler\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_COMMAND_PERMISSION; /** - * @symbol ?DIFF_PLAYER_PERMISSION\@PermissionsHandler\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_PLAYER_PERMISSION\@PermissionsHandler\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_PLAYER_PERMISSION; /** - * @symbol ?getDiff\@PermissionsHandler\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z + * @symbol ?getDiff\@PermissionsHandler\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z */ MCAPI static class std::optional getDiff(class PermissionsHandler const &, class PermissionsHandler const &); /** - * @symbol ?playerPermissionLevelFromString\@PermissionsHandler\@\@SA?AW4PlayerPermissionLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?playerPermissionLevelFromString\@PermissionsHandler\@\@SA?AW4PlayerPermissionLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class PlayerPermissionLevel playerPermissionLevelFromString(std::string const &); /** - * @symbol ?playerPermissionLevelToString\@PermissionsHandler\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4PlayerPermissionLevel\@\@\@Z + * @symbol ?playerPermissionLevelToString\@PermissionsHandler\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4PlayerPermissionLevel\@\@\@Z */ MCAPI static std::string playerPermissionLevelToString(enum class PlayerPermissionLevel const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PersistSitDefinition.hpp b/LiteLoader/include/llapi/mc/PersistSitDefinition.hpp index 607e6ed0ad..806da73d48 100644 --- a/LiteLoader/include/llapi/mc/PersistSitDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PersistSitDefinition.hpp @@ -29,7 +29,7 @@ struct PersistSitDefinition { public: /** - * @symbol ?buildSchema\@PersistSitDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UPersistSitDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@PersistSitDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UPersistSitDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/PersistentBlendData.hpp b/LiteLoader/include/llapi/mc/PersistentBlendData.hpp index 50bda41a7b..da322a684c 100644 --- a/LiteLoader/include/llapi/mc/PersistentBlendData.hpp +++ b/LiteLoader/include/llapi/mc/PersistentBlendData.hpp @@ -28,11 +28,11 @@ struct PersistentBlendData { public: /** - * @symbol ??0PersistentBlendData\@\@QEAA\@AEAVStringByteInput\@\@\@Z + * @symbol ??0PersistentBlendData\@\@QEAA\@AEAVStringByteInput\@\@\@Z */ MCAPI PersistentBlendData(class StringByteInput &); /** - * @symbol ?serialize\@PersistentBlendData\@\@QEBAXAEAVStringByteOutput\@\@\@Z + * @symbol ?serialize\@PersistentBlendData\@\@QEBAXAEAVStringByteOutput\@\@\@Z */ MCAPI void serialize(class StringByteOutput &) const; diff --git a/LiteLoader/include/llapi/mc/PersistentDescription.hpp b/LiteLoader/include/llapi/mc/PersistentDescription.hpp index cafd1e322a..f3b5ca3c66 100644 --- a/LiteLoader/include/llapi/mc/PersistentDescription.hpp +++ b/LiteLoader/include/llapi/mc/PersistentDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class PersistentDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@PersistentDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@PersistentDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~PersistentDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PERSISTENTDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@PersistentDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~PersistentDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PersonaAnimationDefinition.hpp b/LiteLoader/include/llapi/mc/PersonaAnimationDefinition.hpp index b6a37fdc3b..b4ff03eb93 100644 --- a/LiteLoader/include/llapi/mc/PersonaAnimationDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PersonaAnimationDefinition.hpp @@ -28,11 +28,11 @@ struct PersonaAnimationDefinition { public: /** - * @symbol ??1PersonaAnimationDefinition\@\@QEAA\@XZ + * @symbol ??1PersonaAnimationDefinition\@\@QEAA\@XZ */ MCAPI ~PersonaAnimationDefinition(); /** - * @symbol ?INVALID_ANIMATION_DEFINITION\@PersonaAnimationDefinition\@\@2U1\@B + * @symbol ?INVALID_ANIMATION_DEFINITION\@PersonaAnimationDefinition\@\@2U1\@B */ MCAPI static struct PersonaAnimationDefinition const INVALID_ANIMATION_DEFINITION; diff --git a/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp b/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp index dc145bd15e..5f32372e87 100644 --- a/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/PersonaEmoteInputSystem.hpp @@ -28,16 +28,20 @@ class PersonaEmoteInputSystem { public: /** - * @symbol ?createSystem\@PersonaEmoteInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySideResultSystem\@PersonaEmoteInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSideBySideResultSystem(); + /** + * @symbol ?createSystem\@PersonaEmoteInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_personaEmoteInputSystem\@PersonaEmoteInputSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUEventingDispatcherComponent\@\@AEAUMoveInputComponent\@\@AEAUSynchedActorDataComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$Optional\@UEmotePlayedTelemetryDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UEmotePlayedTelemetryDataComponent\@\@\@\@\@Z + * @symbol ?_personaEmoteInputSystem\@PersonaEmoteInputSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUEventingDispatcherComponent\@\@AEBUEmotePlayedTelemetryDataComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@UEventingRequestQueueComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UEmotePlayedTelemetryDataComponent\@\@UShouldStopEmotingRequestComponent\@\@\@\@\@Z */ - MCAPI static void _personaEmoteInputSystem(class StrictEntityContext const &, struct EventingDispatcherComponent const &, struct MoveInputComponent &, struct SynchedActorDataComponent &, struct VanillaClientGameplayComponent &, class Optional, class ViewT, class EntityModifierT); + MCAPI static void _personaEmoteInputSystem(class StrictEntityContext const &, struct EventingDispatcherComponent const &, struct EmotePlayedTelemetryDataComponent const &, class ViewT, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PersonaPiece.hpp b/LiteLoader/include/llapi/mc/PersonaPiece.hpp index b6bddd7320..18cbbe4f19 100644 --- a/LiteLoader/include/llapi/mc/PersonaPiece.hpp +++ b/LiteLoader/include/llapi/mc/PersonaPiece.hpp @@ -27,16 +27,16 @@ class PersonaPiece { public: /** - * @symbol ??0PersonaPiece\@\@QEAA\@XZ + * @symbol ??0PersonaPiece\@\@QEAA\@XZ */ MCAPI PersonaPiece(); /** - * @symbol ??1PersonaPiece\@\@QEAA\@XZ + * @symbol ??1PersonaPiece\@\@QEAA\@XZ */ MCAPI ~PersonaPiece(); /** - * @symbol ?INVALID_PIECE\@PersonaPiece\@\@2V1\@B + * @symbol ?INVALID_PIECE\@PersonaPiece\@\@2V1\@B */ MCAPI static class PersonaPiece const INVALID_PIECE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp b/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp index e636e6a1a4..7de90437f3 100644 --- a/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp +++ b/LiteLoader/include/llapi/mc/PetSleepWithOwnerGoal.hpp @@ -30,64 +30,64 @@ class PetSleepWithOwnerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PetSleepWithOwnerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@PetSleepWithOwnerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@PetSleepWithOwnerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@PetSleepWithOwnerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@PetSleepWithOwnerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@PetSleepWithOwnerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@PetSleepWithOwnerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@PetSleepWithOwnerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@PetSleepWithOwnerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@PetSleepWithOwnerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@PetSleepWithOwnerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@PetSleepWithOwnerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@PetSleepWithOwnerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0PetSleepWithOwnerGoal\@\@QEAA\@AEAVMob\@\@MHHM\@Z + * @symbol ??0PetSleepWithOwnerGoal\@\@QEAA\@AEAVMob\@\@MHHM\@Z */ MCAPI PetSleepWithOwnerGoal(class Mob &, float, int, int, float); /** - * @symbol ?getBedTargetPos\@PetSleepWithOwnerGoal\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getBedTargetPos\@PetSleepWithOwnerGoal\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getBedTargetPos() const; /** - * @symbol ?getData\@PetSleepWithOwnerGoal\@\@QEBA?AUPetSleepWithOwnerGoalData\@\@XZ + * @symbol ?getData\@PetSleepWithOwnerGoal\@\@QEBA?AUPetSleepWithOwnerGoalData\@\@XZ */ MCAPI struct PetSleepWithOwnerGoalData getData() const; /** - * @symbol ?getMob\@PetSleepWithOwnerGoal\@\@QEBAAEAVMob\@\@XZ + * @symbol ?getMob\@PetSleepWithOwnerGoal\@\@QEBAAEAVMob\@\@XZ */ MCAPI class Mob & getMob() const; /** - * @symbol ?setState\@PetSleepWithOwnerGoal\@\@QEAAXV?$unique_ptr\@VPetSleepWithOwnerState\@\@U?$default_delete\@VPetSleepWithOwnerState\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setState\@PetSleepWithOwnerGoal\@\@QEAAXV?$unique_ptr\@VPetSleepWithOwnerState\@\@U?$default_delete\@VPetSleepWithOwnerState\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setState(std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp b/LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp index 9d1830d820..c460db0f96 100644 --- a/LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp +++ b/LiteLoader/include/llapi/mc/PetSleepWithOwnerState.hpp @@ -31,21 +31,21 @@ class PetSleepWithOwnerState { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PETSLEEPWITHOWNERSTATE /** - * @symbol ?start\@PetSleepWithOwnerState\@\@UEAAXXZ + * @symbol ?start\@PetSleepWithOwnerState\@\@UEAAXXZ */ MCVAPI void start(); /** - * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ + * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ */ MCVAPI void stop(); #endif //protected: /** - * @symbol ?dampenSpeed\@PetSleepWithOwnerState\@\@IEAAXXZ + * @symbol ?dampenSpeed\@PetSleepWithOwnerState\@\@IEAAXXZ */ MCAPI void dampenSpeed(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Phantom.hpp b/LiteLoader/include/llapi/mc/Phantom.hpp index 6e2bd1801a..5cf5a5a806 100644 --- a/LiteLoader/include/llapi/mc/Phantom.hpp +++ b/LiteLoader/include/llapi/mc/Phantom.hpp @@ -32,153 +32,148 @@ class Phantom : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Phantom(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Phantom\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Phantom\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 132 - * @symbol ?shouldRender\@Phantom\@\@UEBA_NXZ + * @vftbl 131 + * @symbol ?shouldRender\@Phantom\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Phantom\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Phantom\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Phantom\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Phantom\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Phantom(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PhotoItem.hpp b/LiteLoader/include/llapi/mc/PhotoItem.hpp index a8989edad9..c42ad6ace4 100644 --- a/LiteLoader/include/llapi/mc/PhotoItem.hpp +++ b/LiteLoader/include/llapi/mc/PhotoItem.hpp @@ -30,16 +30,16 @@ class PhotoItem { public: /** - * @symbol ?TAG_PHOTO_NAME\@PhotoItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_PHOTO_NAME\@PhotoItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_PHOTO_NAME; /** - * @symbol ?TAG_PHOTO_OWNER\@PhotoItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_PHOTO_OWNER\@PhotoItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_PHOTO_OWNER; /** - * @symbol ?TAG_PHOTO_UUID\@PhotoItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TAG_PHOTO_UUID\@PhotoItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TAG_PHOTO_UUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PhotoStorage.hpp b/LiteLoader/include/llapi/mc/PhotoStorage.hpp index 4c2882dbcd..c1fd28a398 100644 --- a/LiteLoader/include/llapi/mc/PhotoStorage.hpp +++ b/LiteLoader/include/llapi/mc/PhotoStorage.hpp @@ -31,36 +31,36 @@ class PhotoStorage { public: /** - * @symbol ??0PhotoStorage\@\@QEAA\@AEBVPath\@Core\@\@\@Z + * @symbol ??0PhotoStorage\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ MCAPI PhotoStorage(class Core::Path const &); /** - * @symbol ??1PhotoStorage\@\@QEAA\@XZ + * @symbol ??1PhotoStorage\@\@QEAA\@XZ */ MCAPI ~PhotoStorage(); /** - * @symbol ?BOOKS_DIR\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BOOKS_DIR\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const BOOKS_DIR; /** - * @symbol ?MANIFEST_NAME\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?MANIFEST_NAME\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const MANIFEST_NAME; /** - * @symbol ?PHOTOITEM_DIR\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PHOTOITEM_DIR\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PHOTOITEM_DIR; /** - * @symbol ?PHOTO_DIR\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PHOTO_DIR\@PhotoStorage\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PHOTO_DIR; //private: /** - * @symbol ?_readManifest\@PhotoStorage\@\@AEAAXXZ + * @symbol ?_readManifest\@PhotoStorage\@\@AEAAXXZ */ MCAPI void _readManifest(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp index 13b0aebbc2..de499796f9 100644 --- a/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/PhotoTransferPacket.hpp @@ -30,33 +30,39 @@ class PhotoTransferPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PhotoTransferPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PhotoTransferPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PhotoTransferPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PhotoTransferPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PhotoTransferPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PhotoTransferPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PhotoTransferPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PhotoTransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PHOTOTRANSFERPACKET /** - * @symbol ??0PhotoTransferPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PhotoTransferPacket(); +#endif + /** + * @symbol ??0PhotoTransferPacket\@\@QEAA\@XZ */ MCAPI PhotoTransferPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PhysicsComponent.hpp b/LiteLoader/include/llapi/mc/PhysicsComponent.hpp index cda2f13b5f..20f17dfab2 100644 --- a/LiteLoader/include/llapi/mc/PhysicsComponent.hpp +++ b/LiteLoader/include/llapi/mc/PhysicsComponent.hpp @@ -30,16 +30,16 @@ class PhysicsComponent { public: /** - * @symbol ?isAffectedByGravity\@PhysicsComponent\@\@QEBA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?isAffectedByGravity\@PhysicsComponent\@\@QEBA_NAEBUIActorMovementProxy\@\@\@Z */ MCAPI bool isAffectedByGravity(struct IActorMovementProxy const &) const; /** - * @symbol ?setAffectedByGravity\@PhysicsComponent\@\@QEBAXAEAUIActorMovementProxy\@\@_N\@Z + * @symbol ?setAffectedByGravity\@PhysicsComponent\@\@QEBAXAEAUIActorMovementProxy\@\@_N\@Z */ MCAPI void setAffectedByGravity(struct IActorMovementProxy &, bool) const; /** - * @symbol ?setHasCollision\@PhysicsComponent\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?setHasCollision\@PhysicsComponent\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void setHasCollision(class Actor &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PhysicsDefinition.hpp b/LiteLoader/include/llapi/mc/PhysicsDefinition.hpp index 69df587949..7871b2e258 100644 --- a/LiteLoader/include/llapi/mc/PhysicsDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PhysicsDefinition.hpp @@ -30,16 +30,16 @@ class PhysicsDefinition { public: /** - * @symbol ??0PhysicsDefinition\@\@QEAA\@XZ + * @symbol ??0PhysicsDefinition\@\@QEAA\@XZ */ MCAPI PhysicsDefinition(); /** - * @symbol ?initialize\@PhysicsDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVPhysicsComponent\@\@\@Z + * @symbol ?initialize\@PhysicsDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVPhysicsComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class PhysicsComponent &) const; /** - * @symbol ?buildSchema\@PhysicsDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VPhysicsDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@PhysicsDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VPhysicsDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PickaxeItem.hpp b/LiteLoader/include/llapi/mc/PickaxeItem.hpp index df3ec6e58a..50f02abd63 100644 --- a/LiteLoader/include/llapi/mc/PickaxeItem.hpp +++ b/LiteLoader/include/llapi/mc/PickaxeItem.hpp @@ -33,101 +33,101 @@ class PickaxeItem : public DiggerItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PickaxeItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 44 - * @symbol ?canDestroySpecial\@PickaxeItem\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 44 + * @symbol ?canDestroySpecial\@PickaxeItem\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroySpecial(class Block const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@PickaxeItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@PickaxeItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@PickaxeItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@PickaxeItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @symbol ??0PickaxeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z + * @symbol ??0PickaxeItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ MCAPI PickaxeItem(std::string const &, int, class Item::Tier const &); //private: /** - * @symbol ?_isTierOneBlock\@PickaxeItem\@\@AEBA?B_NAEBVBlockLegacy\@\@\@Z + * @symbol ?_isTierOneBlock\@PickaxeItem\@\@AEBA?B_NAEBVBlockLegacy\@\@\@Z */ MCAPI bool const _isTierOneBlock(class BlockLegacy const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PickupItemsGoal.hpp b/LiteLoader/include/llapi/mc/PickupItemsGoal.hpp index f793d640cc..811f24a5ff 100644 --- a/LiteLoader/include/llapi/mc/PickupItemsGoal.hpp +++ b/LiteLoader/include/llapi/mc/PickupItemsGoal.hpp @@ -30,72 +30,72 @@ class PickupItemsGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PickupItemsGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@PickupItemsGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@PickupItemsGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@PickupItemsGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@PickupItemsGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@PickupItemsGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@PickupItemsGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@PickupItemsGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@PickupItemsGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@PickupItemsGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@PickupItemsGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@PickupItemsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@PickupItemsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0PickupItemsGoal\@\@QEAA\@AEAVMob\@\@M_NHHM11H11AEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0PickupItemsGoal\@\@QEAA\@AEAVMob\@\@M_NHHM11H11AEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI PickupItemsGoal(class Mob &, float, bool, int, int, float, bool, bool, int, bool, bool, std::vector const &); //private: /** - * @symbol ?_dropItem\@PickupItemsGoal\@\@AEBAXAEBVItemStack\@\@\@Z + * @symbol ?_dropItem\@PickupItemsGoal\@\@AEBAXAEBVItemStack\@\@\@Z */ MCAPI void _dropItem(class ItemStack const &) const; /** - * @symbol ?_filterValidTargets\@PickupItemsGoal\@\@AEBA?AV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@AEBV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@3\@\@Z + * @symbol ?_filterValidTargets\@PickupItemsGoal\@\@AEBA?AV?$vector\@VWeakEntityRef\@\@V?$allocator\@VWeakEntityRef\@\@\@std\@\@\@std\@\@AEBV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@3\@\@Z */ MCAPI std::vector _filterValidTargets(std::vector const &) const; /** - * @symbol ?_getShareableItem\@PickupItemsGoal\@\@AEBAPEBUShareable\@\@AEBVItemStack\@\@\@Z + * @symbol ?_getShareableItem\@PickupItemsGoal\@\@AEBAPEBUShareable\@\@AEBVItemStack\@\@\@Z */ MCAPI struct Shareable const * _getShareableItem(class ItemStack const &) const; /** - * @symbol ?_hasRoomForCarriedItem\@PickupItemsGoal\@\@AEBA_NXZ + * @symbol ?_hasRoomForCarriedItem\@PickupItemsGoal\@\@AEBA_NXZ */ MCAPI bool _hasRoomForCarriedItem() const; /** - * @symbol ?_pickItemUp\@PickupItemsGoal\@\@AEAAXPEAVItemActor\@\@\@Z + * @symbol ?_pickItemUp\@PickupItemsGoal\@\@AEAAXPEAVItemActor\@\@\@Z */ MCAPI void _pickItemUp(class ItemActor *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PieceWeight.hpp b/LiteLoader/include/llapi/mc/PieceWeight.hpp index c71c45abe7..4545151952 100644 --- a/LiteLoader/include/llapi/mc/PieceWeight.hpp +++ b/LiteLoader/include/llapi/mc/PieceWeight.hpp @@ -28,8 +28,8 @@ class PieceWeight { public: /** - * @symbol ??1PieceWeight\@\@QEAA\@XZ + * @symbol ??1PieceWeight\@\@QEAA\@XZ */ MCAPI ~PieceWeight(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Pig.hpp b/LiteLoader/include/llapi/mc/Pig.hpp index 4631ca7993..5c825e129b 100644 --- a/LiteLoader/include/llapi/mc/Pig.hpp +++ b/LiteLoader/include/llapi/mc/Pig.hpp @@ -32,148 +32,143 @@ class Pig : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Pig(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Pig\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Pig\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Pig\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Pig\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Pig\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Pig\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Pig(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PigZombie.hpp b/LiteLoader/include/llapi/mc/PigZombie.hpp index d9ca5fb30b..92b8747ac5 100644 --- a/LiteLoader/include/llapi/mc/PigZombie.hpp +++ b/LiteLoader/include/llapi/mc/PigZombie.hpp @@ -32,167 +32,162 @@ class PigZombie : public Zombie { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~PigZombie(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@PigZombie\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@PigZombie\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@PigZombie\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@PigZombie\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@PigZombie\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@PigZombie\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@PigZombie\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@PigZombie\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@PigZombie\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@PigZombie\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 339 - * @symbol ?getAttackTime\@PigZombie\@\@UEAAHXZ + * @vftbl 336 + * @symbol ?getAttackTime\@PigZombie\@\@UEAAHXZ */ virtual int getAttackTime(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0PigZombie\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0PigZombie\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI PigZombie(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); @@ -200,8 +195,8 @@ class PigZombie : public Zombie { private: /** - * @symbol ?SPEED_MODIFIER_ATTACK_UUID\@PigZombie\@\@0VUUID\@mce\@\@B + * @symbol ?SPEED_MODIFIER_ATTACK_UUID\@PigZombie\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SPEED_MODIFIER_ATTACK_UUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Piglin.hpp b/LiteLoader/include/llapi/mc/Piglin.hpp index 7bd8c0e87d..04d2e87112 100644 --- a/LiteLoader/include/llapi/mc/Piglin.hpp +++ b/LiteLoader/include/llapi/mc/Piglin.hpp @@ -32,159 +32,154 @@ class Piglin : public HumanoidMonster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Piglin(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 231 - * @symbol ?getInteraction\@Piglin\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z + * @vftbl 230 + * @symbol ?getInteraction\@Piglin\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Piglin\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Piglin\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Piglin\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Piglin\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PIGLIN /** - * @symbol ?canExistInPeaceful\@Piglin\@\@UEBA_NXZ + * @symbol ?canExistInPeaceful\@Piglin\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; #endif /** - * @symbol ??0Piglin\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Piglin\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Piglin(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Pillager.hpp b/LiteLoader/include/llapi/mc/Pillager.hpp index cddec7c147..9a988f26a1 100644 --- a/LiteLoader/include/llapi/mc/Pillager.hpp +++ b/LiteLoader/include/llapi/mc/Pillager.hpp @@ -32,158 +32,153 @@ class Pillager : public HumanoidMonster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Pillager(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Pillager\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Pillager\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Pillager\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Pillager\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Pillager\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Pillager\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Pillager\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Pillager\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @symbol ??0Pillager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Pillager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Pillager(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp index deb71c3a86..6739a3851b 100644 --- a/LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostFeature.hpp @@ -31,43 +31,43 @@ class PillagerOutpostFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PillagerOutpostFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shouldAddHardcodedSpawnAreas\@PillagerOutpostFeature\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?shouldAddHardcodedSpawnAreas\@PillagerOutpostFeature\@\@UEBA_NXZ */ virtual bool shouldAddHardcodedSpawnAreas() const; /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@PillagerOutpostFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@PillagerOutpostFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@PillagerOutpostFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@PillagerOutpostFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 4 - * @symbol ?initMobSpawnTypes\@PillagerOutpostFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z + * @vftbl 4 + * @symbol ?initMobSpawnTypes\@PillagerOutpostFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z */ virtual void initMobSpawnTypes(class HardcodedSpawnAreaRegistry &); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@PillagerOutpostFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@PillagerOutpostFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@PillagerOutpostFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@PillagerOutpostFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0PillagerOutpostFeature\@\@QEAA\@I\@Z + * @symbol ??0PillagerOutpostFeature\@\@QEAA\@I\@Z */ MCAPI PillagerOutpostFeature(unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp index 38135eee74..b490fc9dda 100644 --- a/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostPieces.hpp @@ -31,36 +31,36 @@ class PillagerOutpostPieces { public: /** - * @symbol ?addPieces\@PillagerOutpostPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVDimension\@\@\@Z + * @symbol ?addPieces\@PillagerOutpostPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVDimension\@\@\@Z */ MCAPI static void addPieces(class gsl::not_null>, class BlockPos const &, enum class Rotation const &, std::vector> &, class Random &, class Dimension &); //private: /** - * @symbol ?_addPiece\@PillagerOutpostPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVDimension\@\@\@Z + * @symbol ?_addPiece\@PillagerOutpostPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVDimension\@\@\@Z */ MCAPI static void _addPiece(class gsl::not_null>, class BlockPos const &, enum class Rotation const &, std::vector> &, class Random &, class Dimension &); /** - * @symbol ?_addScatteredPieces\@PillagerOutpostPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVRandom\@\@AEBW4Rotation\@\@AEBVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVDimension\@\@\@Z + * @symbol ?_addScatteredPieces\@PillagerOutpostPieces\@\@CAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVRandom\@\@AEBW4Rotation\@\@AEBVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVDimension\@\@\@Z */ MCAPI static void _addScatteredPieces(class gsl::not_null>, class Random &, enum class Rotation const &, class BlockPos const &, std::vector> &, class Dimension &); private: /** - * @symbol ?MSC_FEATURES\@PillagerOutpostPieces\@\@0V?$array\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@$06\@std\@\@A + * @symbol ?MSC_FEATURES\@PillagerOutpostPieces\@\@0V?$array\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@$06\@std\@\@A */ - MCAPI static class std::array, 7> MSC_FEATURES; + MCAPI static class std::array>, 7> MSC_FEATURES; /** - * @symbol ?PILLAGER_LOOT\@PillagerOutpostPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?PILLAGER_LOOT\@PillagerOutpostPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span PILLAGER_LOOT; + MCAPI static class std::basic_string_view> PILLAGER_LOOT; /** - * @symbol ?STRUCTURE_WATCHTOWER\@PillagerOutpostPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?STRUCTURE_WATCHTOWER\@PillagerOutpostPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span STRUCTURE_WATCHTOWER; + MCAPI static class std::basic_string_view> STRUCTURE_WATCHTOWER; /** - * @symbol ?STRUCTURE_WATCHTOWER_OVERGROWN\@PillagerOutpostPieces\@\@0V?$basic_string_span\@$$CBD$0?0\@gsl\@\@A + * @symbol ?STRUCTURE_WATCHTOWER_OVERGROWN\@PillagerOutpostPieces\@\@0V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@A */ - MCAPI static class gsl::basic_string_span STRUCTURE_WATCHTOWER_OVERGROWN; + MCAPI static class std::basic_string_view> STRUCTURE_WATCHTOWER_OVERGROWN; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp b/LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp index aa3eb541eb..b254c25d25 100644 --- a/LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp +++ b/LiteLoader/include/llapi/mc/PillagerOutpostStart.hpp @@ -30,14 +30,14 @@ class PillagerOutpostStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PillagerOutpostStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?postProcess\@PillagerOutpostStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 1 + * @symbol ?postProcess\@PillagerOutpostStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PineTreeCanopy.hpp b/LiteLoader/include/llapi/mc/PineTreeCanopy.hpp index 8b7911dd1f..72f4fe4836 100644 --- a/LiteLoader/include/llapi/mc/PineTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/PineTreeCanopy.hpp @@ -31,14 +31,14 @@ class PineTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PineTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@PineTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@PineTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp b/LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp index f32f43b163..8f907265a6 100644 --- a/LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp +++ b/LiteLoader/include/llapi/mc/PingedCompatibleServer.hpp @@ -29,19 +29,19 @@ struct PingedCompatibleServer { public: /** - * @symbol ??0PingedCompatibleServer\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0PingedCompatibleServer\@\@QEAA\@AEBU0\@\@Z */ MCAPI PingedCompatibleServer(struct PingedCompatibleServer const &); /** - * @symbol ??0PingedCompatibleServer\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0PingedCompatibleServer\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI PingedCompatibleServer(struct PingedCompatibleServer &&); /** - * @symbol ??4PingedCompatibleServer\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PingedCompatibleServer\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PingedCompatibleServer & operator=(struct PingedCompatibleServer &&); /** - * @symbol ??1PingedCompatibleServer\@\@QEAA\@XZ + * @symbol ??1PingedCompatibleServer\@\@QEAA\@XZ */ MCAPI ~PingedCompatibleServer(); diff --git a/LiteLoader/include/llapi/mc/PistonActionEvent.hpp b/LiteLoader/include/llapi/mc/PistonActionEvent.hpp index 033a5c4a43..d137d581a3 100644 --- a/LiteLoader/include/llapi/mc/PistonActionEvent.hpp +++ b/LiteLoader/include/llapi/mc/PistonActionEvent.hpp @@ -28,7 +28,7 @@ struct PistonActionEvent { public: /** - * @symbol ??1PistonActionEvent\@\@QEAA\@XZ + * @symbol ??1PistonActionEvent\@\@QEAA\@XZ */ MCAPI ~PistonActionEvent(); diff --git a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp index c443aa8f36..e219ec3fa2 100644 --- a/LiteLoader/include/llapi/mc/PistonArmBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonArmBlock.hpp @@ -32,281 +32,286 @@ class PistonArmBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PistonArmBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@PistonArmBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@PistonArmBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@PistonArmBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@PistonArmBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@PistonArmBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@PistonArmBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @symbol ?getSecondPart\@PistonArmBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z */ virtual bool getSecondPart(class BlockSource const &, class BlockPos const &, class BlockPos &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@PistonArmBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@PistonArmBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@PistonArmBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@PistonArmBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 178 - * @symbol ?canSurvive\@PistonArmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@PistonArmBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@PistonArmBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PISTONARMBLOCK /** - * @symbol ?canBeSilkTouched\@PistonArmBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@PistonArmBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0PistonArmBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@PistonBlock\@\@\@Z + * @symbol ??0PistonArmBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@PistonBlock\@\@\@Z */ MCAPI PistonArmBlock(std::string const &, int, enum class PistonBlock::Type); //private: /** - * @symbol ?_getCollisions\@PistonArmBlock\@\@AEBAXAEAVAABB\@\@00E\@Z + * @symbol ?_getCollisions\@PistonArmBlock\@\@AEBAXAEAVAABB\@\@00E\@Z */ MCAPI void _getCollisions(class AABB &, class AABB &, class AABB &, unsigned char) const; /** - * @symbol ?_getResourceItem\@PistonArmBlock\@\@AEBA?AVItemInstance\@\@XZ + * @symbol ?_getResourceItem\@PistonArmBlock\@\@AEBA?AVItemInstance\@\@XZ */ MCAPI class ItemInstance _getResourceItem() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PistonBlock.hpp b/LiteLoader/include/llapi/mc/PistonBlock.hpp index 356289eb90..4b2b91af62 100644 --- a/LiteLoader/include/llapi/mc/PistonBlock.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlock.hpp @@ -31,282 +31,287 @@ class PistonBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PistonBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@PistonBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@PistonBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@PistonBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@PistonBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@PistonBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@PistonBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@PistonBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@PistonBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 100 - * @symbol ?getSecondPart\@PistonBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAV3\@\@Z + * @vftbl 100 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@PistonBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@PistonBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@PistonBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@PistonBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@PistonBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@PistonBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@PistonBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@PistonBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PistonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@PistonBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PISTONBLOCK /** - * @symbol ?pushesUpFallingBlocks\@PistonBlock\@\@UEBA_NXZ + * @symbol ?pushesUpFallingBlocks\@PistonBlock\@\@UEBA_NXZ */ MCVAPI bool pushesUpFallingBlocks() const; #endif /** - * @symbol ??0PistonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@\@Z + * @symbol ??0PistonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4Type\@0\@\@Z */ MCAPI PistonBlock(std::string const &, int, enum class PistonBlock::Type); /** - * @symbol ?getFacingDir\@PistonBlock\@\@SAAEBVBlockPos\@\@E\@Z + * @symbol ?getFacingDir\@PistonBlock\@\@SAAEBVBlockPos\@\@E\@Z */ MCAPI static class BlockPos const & getFacingDir(unsigned char); @@ -314,8 +319,8 @@ class PistonBlock : public ActorBlock { private: /** - * @symbol ?ARM_DIRECTION_OFFSETS\@PistonBlock\@\@0QBVBlockPos\@\@B + * @symbol ?ARM_DIRECTION_OFFSETS\@PistonBlock\@\@0QBVBlockPos\@\@B */ MCAPI static class BlockPos const ARM_DIRECTION_OFFSETS[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PistonBlockActor.hpp b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp index 946cc8306d..56db8c2dce 100644 --- a/LiteLoader/include/llapi/mc/PistonBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/PistonBlockActor.hpp @@ -31,188 +31,188 @@ class PistonBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PistonBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@PistonBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@PistonBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@PistonBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@PistonBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@PistonBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@PistonBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@PistonBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@PistonBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 30 - * @symbol ?getOwningPiston\@PistonBlockActor\@\@UEAAPEAV1\@AEAVBlockSource\@\@\@Z + * @vftbl 30 + * @symbol ?getOwningPiston\@PistonBlockActor\@\@UEAAPEAV1\@AEAVBlockSource\@\@\@Z */ virtual class PistonBlockActor * getOwningPiston(class BlockSource &); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@PistonBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@PistonBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@PistonBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0PistonBlockActor\@\@QEAA\@AEBVBlockPos\@\@_N\@Z + * @symbol ??0PistonBlockActor\@\@QEAA\@AEBVBlockPos\@\@_N\@Z */ MCAPI PistonBlockActor(class BlockPos const &, bool); /** - * @symbol ?getAttachedBlocks\@PistonBlockActor\@\@QEBAAEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAttachedBlocks\@PistonBlockActor\@\@QEBAAEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAttachedBlocks() const; /** - * @symbol ?getCorrectArmBlock\@PistonBlockActor\@\@QEBAPEBVBlock\@\@XZ + * @symbol ?getCorrectArmBlock\@PistonBlockActor\@\@QEBAPEBVBlock\@\@XZ */ MCAPI class Block const * getCorrectArmBlock() const; /** - * @symbol ?getFacingDir\@PistonBlockActor\@\@QEBAAEBVBlockPos\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?getFacingDir\@PistonBlockActor\@\@QEBAAEBVBlockPos\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI class BlockPos const & getFacingDir(class IConstBlockSource const &) const; /** - * @symbol ?getProgress\@PistonBlockActor\@\@QEBAMM\@Z + * @symbol ?getProgress\@PistonBlockActor\@\@QEBAMM\@Z */ MCAPI float getProgress(float) const; /** - * @symbol ?isExpanded\@PistonBlockActor\@\@QEBA_NXZ + * @symbol ?isExpanded\@PistonBlockActor\@\@QEBA_NXZ */ MCAPI bool isExpanded() const; /** - * @symbol ?isExpanding\@PistonBlockActor\@\@QEBA_NXZ + * @symbol ?isExpanding\@PistonBlockActor\@\@QEBA_NXZ */ MCAPI bool isExpanding() const; /** - * @symbol ?isMoving\@PistonBlockActor\@\@QEBA_NXZ + * @symbol ?isMoving\@PistonBlockActor\@\@QEBA_NXZ */ MCAPI bool isMoving() const; /** - * @symbol ?isRetracted\@PistonBlockActor\@\@QEBA_NXZ + * @symbol ?isRetracted\@PistonBlockActor\@\@QEBA_NXZ */ MCAPI bool isRetracted() const; /** - * @symbol ?isRetracting\@PistonBlockActor\@\@QEBA_NXZ + * @symbol ?isRetracting\@PistonBlockActor\@\@QEBA_NXZ */ MCAPI bool isRetracting() const; /** - * @symbol ?moveEntityLastProgress\@PistonBlockActor\@\@QEAAXAEAVActor\@\@VVec3\@\@\@Z + * @symbol ?moveEntityLastProgress\@PistonBlockActor\@\@QEAAXAEAVActor\@\@VVec3\@\@\@Z */ MCAPI void moveEntityLastProgress(class Actor &, class Vec3); /** - * @symbol ?setShouldVerifyArmType\@PistonBlockActor\@\@QEAAX_N\@Z + * @symbol ?setShouldVerifyArmType\@PistonBlockActor\@\@QEAAX_N\@Z */ MCAPI void setShouldVerifyArmType(bool); //private: /** - * @symbol ?_attachedBlockWalker\@PistonBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@EE\@Z + * @symbol ?_attachedBlockWalker\@PistonBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@EE\@Z */ MCAPI bool _attachedBlockWalker(class BlockSource &, class BlockPos const &, unsigned char, unsigned char); /** - * @symbol ?_checkAttachedBlocks\@PistonBlockActor\@\@AEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?_checkAttachedBlocks\@PistonBlockActor\@\@AEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool _checkAttachedBlocks(class BlockSource &); /** - * @symbol ?_checkInceptionAchievement\@PistonBlockActor\@\@AEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_checkInceptionAchievement\@PistonBlockActor\@\@AEAAXAEAVBlockActor\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _checkInceptionAchievement(class BlockActor &, class BlockSource &, class BlockPos const &); /** - * @symbol ?_handleSlimeConnections\@PistonBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@EE\@Z + * @symbol ?_handleSlimeConnections\@PistonBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@EE\@Z */ MCAPI bool _handleSlimeConnections(class BlockSource &, class BlockPos const &, unsigned char, unsigned char); /** - * @symbol ?_hasBlockAttached\@PistonBlockActor\@\@AEAA_NAEBVBlockPos\@\@\@Z + * @symbol ?_hasBlockAttached\@PistonBlockActor\@\@AEAA_NAEBVBlockPos\@\@\@Z */ MCAPI bool _hasBlockAttached(class BlockPos const &); /** - * @symbol ?_moveCollidedEntities\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_moveCollidedEntities\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _moveCollidedEntities(class BlockSource &); /** - * @symbol ?_moveCollidedEntitiesHelper\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVAABB\@\@AEBVBlockPos\@\@PEAVActor\@\@I\@Z + * @symbol ?_moveCollidedEntitiesHelper\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVAABB\@\@AEBVBlockPos\@\@PEAVActor\@\@I\@Z */ MCAPI void _moveCollidedEntitiesHelper(class BlockSource &, class AABB const &, class BlockPos const &, class Actor *, unsigned int); /** - * @symbol ?_sortAttachedBlocks\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_sortAttachedBlocks\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _sortAttachedBlocks(class BlockSource &); /** - * @symbol ?_spawnBlocks\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_spawnBlocks\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _spawnBlocks(class BlockSource &); /** - * @symbol ?_spawnMovingBlock\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_spawnMovingBlock\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _spawnMovingBlock(class BlockSource &, class BlockPos const &); /** - * @symbol ?_spawnMovingBlocks\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_spawnMovingBlocks\@PistonBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _spawnMovingBlocks(class BlockSource &); /** - * @symbol ?_spawnResourcesForBlockAndExtraBlock\@PistonBlockActor\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@VRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @symbol ?_spawnResourcesForBlockAndExtraBlock\@PistonBlockActor\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@VRandomize\@\@AEBUResourceDropsContext\@\@\@Z */ MCAPI static void _spawnResourcesForBlockAndExtraBlock(class BlockSource &, class BlockPos const &, class Randomize, struct ResourceDropsContext const &); private: /** - * @symbol ?ARM_ANIMATION_SPEED\@PistonBlockActor\@\@0MB + * @symbol ?ARM_ANIMATION_SPEED\@PistonBlockActor\@\@0MB */ MCAPI static float const ARM_ANIMATION_SPEED; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PistonConsumer.hpp b/LiteLoader/include/llapi/mc/PistonConsumer.hpp index 2b13dff171..f65c702694 100644 --- a/LiteLoader/include/llapi/mc/PistonConsumer.hpp +++ b/LiteLoader/include/llapi/mc/PistonConsumer.hpp @@ -30,47 +30,47 @@ class PistonConsumer : public ConsumerComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PistonConsumer(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?canConsumePowerAnyDirection\@PistonConsumer\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?canConsumePowerAnyDirection\@PistonConsumer\@\@UEBA_NXZ */ virtual bool canConsumePowerAnyDirection() const; /** - * @vftbl 11 - * @symbol ?addSource\@PistonConsumer\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@PistonConsumer\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@PistonConsumer\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@PistonConsumer\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@PistonConsumer\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@PistonConsumer\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @symbol ??0PistonConsumer\@\@QEAA\@XZ + * @symbol ??0PistonConsumer\@\@QEAA\@XZ */ MCAPI PistonConsumer(); /** - * @symbol ?setBlockPowerFace\@PistonConsumer\@\@QEAAXE\@Z + * @symbol ?setBlockPowerFace\@PistonConsumer\@\@QEAAXE\@Z */ MCAPI void setBlockPowerFace(unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp b/LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp index a4ead85cb2..8fd84b1ce3 100644 --- a/LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PlaceBlockDefinition.hpp @@ -32,9 +32,9 @@ class PlaceBlockDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlaceBlockDefinition(); + virtual void __unk_vfn_0(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlaceBlockNode.hpp b/LiteLoader/include/llapi/mc/PlaceBlockNode.hpp index a1fb0a5a7d..434d713c56 100644 --- a/LiteLoader/include/llapi/mc/PlaceBlockNode.hpp +++ b/LiteLoader/include/llapi/mc/PlaceBlockNode.hpp @@ -29,18 +29,18 @@ class PlaceBlockNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlaceBlockNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@PlaceBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@PlaceBlockNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @symbol ??0PlaceBlockNode\@\@QEAA\@XZ + * @symbol ??0PlaceBlockNode\@\@QEAA\@XZ */ MCAPI PlaceBlockNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlanksBlock.hpp b/LiteLoader/include/llapi/mc/PlanksBlock.hpp index 0e588cbf7d..23b067a611 100644 --- a/LiteLoader/include/llapi/mc/PlanksBlock.hpp +++ b/LiteLoader/include/llapi/mc/PlanksBlock.hpp @@ -31,236 +31,241 @@ class PlanksBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlanksBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@PlanksBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@PlanksBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@PlanksBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@PlanksBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@PlanksBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@PlanksBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@PlanksBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@PlanksBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0PlanksBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PlanksBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PlanksBlock(std::string const &, int); /** - * @symbol ?WOOD_NAMES\@PlanksBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B + * @symbol ?WOOD_NAMES\@PlanksBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B */ MCAPI static class std::array const WOOD_NAMES; /** - * @symbol ?isValidWoodMaterial\@PlanksBlock\@\@SA_NH\@Z + * @symbol ?isValidWoodMaterial\@PlanksBlock\@\@SA_NH\@Z */ MCAPI static bool isValidWoodMaterial(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp b/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp index a469057eb8..13d8c2dea3 100644 --- a/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlanterItemComponent.hpp @@ -30,51 +30,51 @@ class PlanterItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlanterItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VPlanterItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VPlanterItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?useOn\@PlanterItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 3 + * @symbol ?useOn\@PlanterItemComponent\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VPlanterItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VPlanterItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?calculatePlacePos\@PlanterItemComponent\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @symbol ?calculatePlacePos\@PlanterItemComponent\@\@QEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ MCAPI bool calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @symbol ?bindType\@PlanterItemComponent\@\@SAXXZ + * @symbol ?bindType\@PlanterItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@PlanterItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@PlanterItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp b/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp index 8b3769a09d..200d784a4c 100644 --- a/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlayAnimationCommand.hpp @@ -31,17 +31,23 @@ class PlayAnimationCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayAnimationCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@PlayAnimationCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@PlayAnimationCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYANIMATIONCOMMAND /** - * @symbol ?setup\@PlayAnimationCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayAnimationCommand(); +#endif + /** + * @symbol ?setup\@PlayAnimationCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); @@ -49,8 +55,8 @@ class PlayAnimationCommand : public Command { private: /** - * @symbol ?mStopExpressionVersion\@PlayAnimationCommand\@\@0W4MolangVersion\@\@B + * @symbol ?mStopExpressionVersion\@PlayAnimationCommand\@\@0W4MolangVersion\@\@B */ MCAPI static enum class MolangVersion const mStopExpressionVersion; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayDeadGoal.hpp b/LiteLoader/include/llapi/mc/PlayDeadGoal.hpp index 9b0612667f..2f4b195176 100644 --- a/LiteLoader/include/llapi/mc/PlayDeadGoal.hpp +++ b/LiteLoader/include/llapi/mc/PlayDeadGoal.hpp @@ -30,48 +30,48 @@ class PlayDeadGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayDeadGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@PlayDeadGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@PlayDeadGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@PlayDeadGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@PlayDeadGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@PlayDeadGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@PlayDeadGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@PlayDeadGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@PlayDeadGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@PlayDeadGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@PlayDeadGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0PlayDeadGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0PlayDeadGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI PlayDeadGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayGoal.hpp b/LiteLoader/include/llapi/mc/PlayGoal.hpp index 2a2f9b2be4..7bf65f84a7 100644 --- a/LiteLoader/include/llapi/mc/PlayGoal.hpp +++ b/LiteLoader/include/llapi/mc/PlayGoal.hpp @@ -30,48 +30,48 @@ class PlayGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@PlayGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@PlayGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@PlayGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@PlayGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@PlayGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@PlayGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@PlayGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@PlayGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@PlayGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@PlayGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@PlayGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@PlayGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0PlayGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0PlayGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI PlayGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayJumpSoundRequestsSystem.hpp b/LiteLoader/include/llapi/mc/PlayJumpSoundRequestsSystem.hpp new file mode 100644 index 0000000000..3e7f7ac170 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayJumpSoundRequestsSystem.hpp @@ -0,0 +1,28 @@ +/** + * @file PlayJumpSoundRequestsSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayJumpSoundRequestsSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createCleanupSystem\@PlayJumpSoundRequestsSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createCleanupSystem(); + /** + * @symbol ?createSystem\@PlayJumpSoundRequestsSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp b/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp new file mode 100644 index 0000000000..20139f1684 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayJumpSoundSystem.hpp @@ -0,0 +1,28 @@ +/** + * @file PlayJumpSoundSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayJumpSoundSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?createSideBySideSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSideBySideSystem(); + /** + * @symbol ?createSystem\@PlayJumpSoundSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI struct TickingSystemWithInfo createSystem(); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp index ffea504424..893bffa205 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundCommand.hpp @@ -31,18 +31,18 @@ class PlaySoundCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlaySoundCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@PlaySoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@PlaySoundCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@PlaySoundCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp index aebea1ddb1..62be263f7a 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundPacket.hpp @@ -30,37 +30,43 @@ class PlaySoundPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlaySoundPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlaySoundPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlaySoundPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlaySoundPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlaySoundPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlaySoundPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlaySoundPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlaySoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYSOUNDPACKET /** - * @symbol ??0PlaySoundPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI PlaySoundPacket(); + MCVAPI ~PlaySoundPacket(); +#endif /** - * @symbol ??0PlaySoundPacket\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z + * @symbol ??0PlaySoundPacket\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVVec3\@\@MM\@Z */ MCAPI PlaySoundPacket(std::string, class Vec3 const &, float, float); + /** + * @symbol ??0PlaySoundPacket\@\@QEAA\@XZ + */ + MCAPI PlaySoundPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp b/LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp index 7fa3d11f23..93058664cd 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundReactionComponent.hpp @@ -30,24 +30,24 @@ class PlaySoundReactionComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlaySoundReactionComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_onEnd\@PlaySoundReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @vftbl 3 + * @symbol ?_onEnd\@PlaySoundReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ virtual void _onEnd(class LabTableReaction &, class BlockSource &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlaySoundResponse.hpp b/LiteLoader/include/llapi/mc/PlaySoundResponse.hpp index bce80af94a..81c95ab530 100644 --- a/LiteLoader/include/llapi/mc/PlaySoundResponse.hpp +++ b/LiteLoader/include/llapi/mc/PlaySoundResponse.hpp @@ -31,28 +31,28 @@ class PlaySoundResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlaySoundResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@PlaySoundResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@PlaySoundResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@PlaySoundResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@PlaySoundResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@PlaySoundResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@PlaySoundResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@PlaySoundResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@PlaySoundResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp index fc009c7de0..0fdf91df31 100644 --- a/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayStatusPacket.hpp @@ -47,37 +47,43 @@ class PlayStatusPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayStatusPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYSTATUSPACKET /** - * @symbol ??0PlayStatusPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI PlayStatusPacket(); + MCVAPI ~PlayStatusPacket(); +#endif /** - * @symbol ??0PlayStatusPacket\@\@QEAA\@W4PlayStatus\@\@\@Z + * @symbol ??0PlayStatusPacket\@\@QEAA\@W4PlayStatus\@\@\@Z */ MCAPI PlayStatusPacket(enum class PlayStatus); + /** + * @symbol ??0PlayStatusPacket\@\@QEAA\@XZ + */ + MCAPI PlayStatusPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Player.hpp b/LiteLoader/include/llapi/mc/Player.hpp index 0144cb9053..b7e4090700 100644 --- a/LiteLoader/include/llapi/mc/Player.hpp +++ b/LiteLoader/include/llapi/mc/Player.hpp @@ -106,7 +106,7 @@ class Player : public Mob { LIAPI bool sendText(const std::string& text, TextType type = TextType::RAW); template - inline bool sendText(const std::string& text, Args&&... args) { + inline bool trSendText(const std::string& text, Args&&... args) { return sendText(this->tr(text, std::forward(args)...), ttype); } template @@ -130,12 +130,13 @@ class Player : public Mob { * @return True if the player is successfully given the items; otherwise false */ LIAPI bool giveItem(ItemStack* item); - LIAPI bool giveItem(string typeName, int amount); + LIAPI bool giveItem(std::string typeName, int amount); LIAPI bool giveItem(ItemStack* item, int amount); - LIAPI int clearItem(string typeName); + [[deprecated]] LIAPI int clearItem(std::string typeName); + LIAPI unsigned int clearItem(std::string_view typeName, unsigned int clearCount); LIAPI bool runcmd(const string& cmd); - LIAPI bool transferServer(const string& address, unsigned short port); + LIAPI bool transferServer(const std::string& address, unsigned short port); LIAPI bool setSidebar(const std::string& title, const std::vector>& data, ObjectiveSortOrder sortOrder); LIAPI bool removeSidebar(); @@ -219,1928 +220,1927 @@ class Player : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Player\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Player\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@Player\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Player\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 14 - * @symbol ?_serverInitItemStackIds\@Player\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_serverInitItemStackIds\@Player\@\@MEAAXXZ */ virtual void _serverInitItemStackIds(); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Player(); + virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol ?resetUserPos\@Player\@\@UEAAX_N\@Z + * @vftbl 17 + * @symbol ?resetUserPos\@Player\@\@UEAAX_N\@Z */ virtual void resetUserPos(bool); /** - * @vftbl 19 - * @symbol ?remove\@Player\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@Player\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 26 - * @symbol ?getAttachPos\@Player\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z + * @vftbl 26 + * @symbol ?getAttachPos\@Player\@\@UEBA?AVVec3\@\@W4ActorLocation\@\@M\@Z */ virtual class Vec3 getAttachPos(enum class ActorLocation, float) const; /** - * @vftbl 28 - * @symbol ?move\@Player\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 28 + * @symbol ?move\@Player\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void move(class Vec3 const &); /** - * @vftbl 29 - * @symbol ?move\@Player\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z + * @vftbl 29 + * @symbol ?move\@Player\@\@UEBAXAEAUIActorMovementProxy\@\@AEBVVec3\@\@\@Z */ virtual void move(struct IActorMovementProxy &, class Vec3 const &) const; /** - * @vftbl 36 - * @symbol ?getInterpolatedRidingOffset\@Player\@\@UEBA?AVVec3\@\@MH\@Z + * @vftbl 36 + * @symbol ?getInterpolatedRidingOffset\@Player\@\@UEBA?AVVec3\@\@MH\@Z */ virtual class Vec3 getInterpolatedRidingOffset(float, int) const; /** - * @vftbl 40 - * @symbol ?isFireImmune\@Player\@\@UEBA_NXZ + * @vftbl 40 + * @symbol ?isFireImmune\@Player\@\@UEBA_NXZ */ virtual bool isFireImmune() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 44 - * @symbol ?teleportTo\@Player\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@Player\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 48 - * @symbol ?tryCreateAddActorPacket\@Player\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ + * @vftbl 48 + * @symbol ?tryCreateAddActorPacket\@Player\@\@UEAA?AV?$unique_ptr\@VAddActorBasePacket\@\@U?$default_delete\@VAddActorBasePacket\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr tryCreateAddActorPacket(); /** - * @vftbl 49 - * @symbol ?normalTick\@Player\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Player\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 51 - * @symbol ?passengerTick\@Player\@\@UEAAXXZ + * @vftbl 51 + * @symbol ?passengerTick\@Player\@\@UEAAXXZ */ virtual void passengerTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 66 - * @symbol ?getFormattedNameTag\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 66 + * @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 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 77 - * @symbol ?setBlockMovementSlowdownMultiplier\@Player\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z + * @vftbl 76 + * @symbol ?setBlockMovementSlowdownMultiplier\@Player\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 79 - * @symbol ?getCameraOffset\@Player\@\@UEBAMXZ + * @vftbl 78 + * @symbol ?getCameraOffset\@Player\@\@UEBAMXZ */ virtual float getCameraOffset() const; /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Player\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Player\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 93 - * @symbol ?isImmobile\@Player\@\@UEBA_NXZ + * @vftbl 92 + * @symbol ?isImmobile\@Player\@\@UEBA_NXZ */ virtual bool isImmobile() const; /** - * @vftbl 95 - * @symbol ?isSilentObserver\@Player\@\@UEBA_NXZ + * @vftbl 94 + * @symbol ?isSilentObserver\@Player\@\@UEBA_NXZ */ virtual bool isSilentObserver() const; /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 98 - * @symbol ?isSleeping\@Player\@\@UEBA_NXZ + * @vftbl 97 + * @symbol ?isSleeping\@Player\@\@UEBA_NXZ */ virtual bool isSleeping() const; /** - * @vftbl 99 - * @symbol ?setSleeping\@Player\@\@UEAAX_N\@Z + * @vftbl 98 + * @symbol ?setSleeping\@Player\@\@UEAAX_N\@Z */ virtual void setSleeping(bool); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 102 - * @symbol ?isBlocking\@Player\@\@UEBA_NXZ + * @vftbl 101 + * @symbol ?isBlocking\@Player\@\@UEBA_NXZ */ virtual bool isBlocking() const; /** - * @vftbl 103 - * @symbol ?isDamageBlocked\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 102 + * @symbol ?isDamageBlocked\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isDamageBlocked(class ActorDamageSource const &) const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 117 - * @symbol ?attack\@Player\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 116 + * @symbol ?attack\@Player\@\@UEAA_NAEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool attack(class Actor &, enum class ActorDamageCause const &); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Player\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 140 - * @symbol ?onBounceStarted\@Player\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 139 + * @symbol ?onBounceStarted\@Player\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 141 - * @symbol ?feed\@Player\@\@UEAAXH\@Z + * @vftbl 140 + * @symbol ?feed\@Player\@\@UEAAXH\@Z */ virtual void feed(int); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Player\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Player\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 144 - * @symbol ?getActorRendererId\@Player\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 143 + * @symbol ?getActorRendererId\@Player\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getActorRendererId() const; /** - * @vftbl 150 - * @symbol ?awardKillScore\@Player\@\@UEAAXAEAVActor\@\@H\@Z + * @vftbl 149 + * @symbol ?awardKillScore\@Player\@\@UEAAXAEAVActor\@\@H\@Z */ virtual void awardKillScore(class Actor &, int); /** - * @vftbl 151 - * @symbol ?setArmor\@Player\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 150 + * @symbol ?setArmor\@Player\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 159 - * @symbol ?setCarriedItem\@Player\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 158 + * @symbol ?setCarriedItem\@Player\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setCarriedItem(class ItemStack const &); /** - * @vftbl 160 - * @symbol ?getCarriedItem\@Player\@\@UEBAAEBVItemStack\@\@XZ + * @vftbl 159 + * @symbol ?getCarriedItem\@Player\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getCarriedItem() const; /** - * @vftbl 161 - * @symbol ?setOffhandSlot\@Player\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 160 + * @symbol ?setOffhandSlot\@Player\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 162 - * @symbol ?getEquippedTotem\@Player\@\@UEBAAEBVItemStack\@\@XZ + * @vftbl 161 + * @symbol ?getEquippedTotem\@Player\@\@UEBAAEBVItemStack\@\@XZ */ virtual class ItemStack const & getEquippedTotem() const; /** - * @vftbl 163 - * @symbol ?consumeTotem\@Player\@\@UEAA_NXZ + * @vftbl 162 + * @symbol ?consumeTotem\@Player\@\@UEAA_NXZ */ virtual bool consumeTotem(); /** - * @vftbl 168 - * @symbol ?getEntityTypeId\@Player\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 167 + * @symbol ?getEntityTypeId\@Player\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 172 - * @symbol ?canFreeze\@Player\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@Player\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 176 - * @symbol ?getPortalCooldown\@Player\@\@UEBAHXZ + * @vftbl 175 + * @symbol ?getPortalCooldown\@Player\@\@UEBAHXZ */ virtual int getPortalCooldown() const; /** - * @vftbl 177 - * @symbol ?getPortalWaitTime\@Player\@\@UEBAHXZ + * @vftbl 176 + * @symbol ?getPortalWaitTime\@Player\@\@UEBAHXZ */ virtual int getPortalWaitTime() const; /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@Player\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@Player\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Player\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Player\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 189 - * @symbol ?canAddPassenger\@Player\@\@UEBA_NAEAVActor\@\@\@Z + * @vftbl 188 + * @symbol ?canAddPassenger\@Player\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool canAddPassenger(class Actor &) const; /** - * @vftbl 191 - * @symbol ?canBePulledIntoVehicle\@Player\@\@UEBA_NXZ + * @vftbl 190 + * @symbol ?canBePulledIntoVehicle\@Player\@\@UEBA_NXZ */ virtual bool canBePulledIntoVehicle() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 195 - * @symbol ?sendMotionPacketIfNeeded\@Player\@\@UEAAXXZ + * @vftbl 194 + * @symbol ?sendMotionPacketIfNeeded\@Player\@\@UEAAXXZ */ virtual void sendMotionPacketIfNeeded(); /** - * @vftbl 198 - * @symbol ?startSwimming\@Player\@\@UEAAXXZ + * @vftbl 197 + * @symbol ?startSwimming\@Player\@\@UEAAXXZ */ virtual void startSwimming(); /** - * @vftbl 199 - * @symbol ?stopSwimming\@Player\@\@UEAAXXZ + * @vftbl 198 + * @symbol ?stopSwimming\@Player\@\@UEAAXXZ */ virtual void stopSwimming(); /** - * @vftbl 201 - * @symbol ?getCommandPermissionLevel\@Player\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 200 + * @symbol ?getCommandPermissionLevel\@Player\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getCommandPermissionLevel() const; /** - * @vftbl 213 - * @symbol ?canObstructSpawningAndBlockPlacement\@Player\@\@UEBA_NXZ + * @vftbl 212 + * @symbol ?canObstructSpawningAndBlockPlacement\@Player\@\@UEBA_NXZ */ virtual bool canObstructSpawningAndBlockPlacement() const; /** - * @vftbl 214 - * @symbol ?getAnimationComponent\@Player\@\@UEAAAEAVAnimationComponent\@\@XZ + * @vftbl 213 + * @symbol ?getAnimationComponent\@Player\@\@UEAAAEAVAnimationComponent\@\@XZ */ virtual class AnimationComponent & getAnimationComponent(); /** - * @vftbl 217 - * @symbol ?useItem\@Player\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z + * @vftbl 216 + * @symbol ?useItem\@Player\@\@UEAAXAEAVItemStackBase\@\@W4ItemUseMethod\@\@_N\@Z */ virtual void useItem(class ItemStackBase &, enum class ItemUseMethod, bool); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 221 - * @symbol ?getMapDecorationRotation\@Player\@\@UEBAMXZ + * @vftbl 220 + * @symbol ?getMapDecorationRotation\@Player\@\@UEBAMXZ */ virtual float getMapDecorationRotation() const; /** - * @vftbl 223 - * @symbol ?isWorldBuilder\@Player\@\@UEBA_NXZ + * @vftbl 222 + * @symbol ?isWorldBuilder\@Player\@\@UEBA_NXZ */ virtual bool isWorldBuilder() const; /** - * @vftbl 224 - * @symbol ?isCreative\@Player\@\@UEBA_NXZ + * @vftbl 223 + * @symbol ?isCreative\@Player\@\@UEBA_NXZ */ virtual bool isCreative() const; /** - * @vftbl 225 - * @symbol ?isAdventure\@Player\@\@UEBA_NXZ + * @vftbl 224 + * @symbol ?isAdventure\@Player\@\@UEBA_NXZ */ virtual bool isAdventure() const; /** - * @vftbl 226 - * @symbol ?isSurvival\@Player\@\@UEBA_NXZ + * @vftbl 225 + * @symbol ?isSurvival\@Player\@\@UEBA_NXZ */ virtual bool isSurvival() const; /** - * @vftbl 227 - * @symbol ?isSpectator\@Player\@\@UEBA_NXZ + * @vftbl 226 + * @symbol ?isSpectator\@Player\@\@UEBA_NXZ */ virtual bool isSpectator() const; /** - * @vftbl 229 - * @symbol ?add\@Player\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 228 + * @symbol ?add\@Player\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool add(class ItemStack &); /** - * @vftbl 230 - * @symbol ?drop\@Player\@\@UEAA_NAEBVItemStack\@\@_N\@Z + * @vftbl 229 + * @symbol ?drop\@Player\@\@UEAA_NAEBVItemStack\@\@_N\@Z */ virtual bool drop(class ItemStack const &, bool); /** - * @vftbl 238 - * @symbol ?startSpinAttack\@Player\@\@UEAAXXZ + * @vftbl 237 + * @symbol ?startSpinAttack\@Player\@\@UEAAXXZ */ virtual void startSpinAttack(); /** - * @vftbl 239 - * @symbol ?stopSpinAttack\@Player\@\@UEAAXXZ + * @vftbl 238 + * @symbol ?stopSpinAttack\@Player\@\@UEAAXXZ */ virtual void stopSpinAttack(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@Player\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Player\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 247 - * @symbol ?shouldDropDeathLoot\@Player\@\@UEBA_NXZ + * @vftbl 246 + * @symbol ?shouldDropDeathLoot\@Player\@\@UEBA_NXZ */ virtual bool shouldDropDeathLoot() const; /** - * @vftbl 254 - * @symbol ?getLastDeathPos\@Player\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @vftbl 252 + * @symbol ?getLastDeathPos\@Player\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getLastDeathPos() const; /** - * @vftbl 255 - * @symbol ?getLastDeathDimension\@Player\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ + * @vftbl 253 + * @symbol ?getLastDeathDimension\@Player\@\@UEBA?AV?$optional\@V?$AutomaticID\@VDimension\@\@H\@\@\@std\@\@XZ */ virtual class std::optional> getLastDeathDimension() const; /** - * @vftbl 256 - * @symbol ?hasDiedBefore\@Player\@\@UEBA_NXZ + * @vftbl 254 + * @symbol ?hasDiedBefore\@Player\@\@UEBA_NXZ */ virtual bool hasDiedBefore() const; /** - * @vftbl 258 - * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Player\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 256 + * @symbol ?_shouldProvideFeedbackOnHandContainerItemSet\@Player\@\@MEBA_NW4HandSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnHandContainerItemSet(enum class HandSlot, class ItemStack const &) const; /** - * @vftbl 259 - * @symbol ?_shouldProvideFeedbackOnArmorSet\@Player\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 257 + * @symbol ?_shouldProvideFeedbackOnArmorSet\@Player\@\@MEBA_NW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual bool _shouldProvideFeedbackOnArmorSet(enum class ArmorSlot, class ItemStack const &) const; /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Player\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Player\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Player\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Player\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Player\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Player\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Player\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Player\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 283 - * @symbol ?getSpeed\@Player\@\@UEBAMXZ + * @vftbl 281 + * @symbol ?getSpeed\@Player\@\@UEBAMXZ */ virtual float getSpeed() const; /** - * @vftbl 284 - * @symbol ?setSpeed\@Player\@\@UEAAXM\@Z + * @vftbl 282 + * @symbol ?setSpeed\@Player\@\@UEAAXM\@Z */ virtual void setSpeed(float); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 286 + * @symbol ?travel\@Player\@\@UEAAXMMM_N\@Z */ - virtual void __unk_vfn_285(); + virtual void travel(float, float, float, bool); /** - * @vftbl 289 - * @symbol ?travel\@Player\@\@UEAAXMMM\@Z - */ - virtual void travel(float, float, float); - /** - * @vftbl 291 - * @symbol ?aiStep\@Player\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Player\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 292 - * @symbol ?aiStep\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z + * @vftbl 289 + * @symbol ?aiStep\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z */ virtual void aiStep(struct IMobMovementProxy &) const; /** - * @vftbl 299 - * @symbol ?getItemUseDuration\@Player\@\@UEBAHXZ + * @vftbl 296 + * @symbol ?getItemUseDuration\@Player\@\@UEBAHXZ */ virtual int getItemUseDuration() const; /** - * @vftbl 300 - * @symbol ?getItemUseStartupProgress\@Player\@\@UEBAMXZ + * @vftbl 297 + * @symbol ?getItemUseStartupProgress\@Player\@\@UEBAMXZ */ virtual float getItemUseStartupProgress() const; /** - * @vftbl 301 - * @symbol ?getItemUseIntervalProgress\@Player\@\@UEBAMXZ + * @vftbl 298 + * @symbol ?getItemUseIntervalProgress\@Player\@\@UEBAMXZ */ virtual float getItemUseIntervalProgress() const; /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 324 - * @symbol ?getAllHand\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 321 + * @symbol ?getAllHand\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllHand() const; /** - * @vftbl 325 - * @symbol ?getAllEquipment\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 322 + * @symbol ?getAllEquipment\@Player\@\@UEBA?AV?$vector\@PEBVItemStack\@\@V?$allocator\@PEBVItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getAllEquipment() const; /** - * @vftbl 327 - * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXAEBVActorDamageSource\@\@H\@Z + * @vftbl 324 + * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXAEBVActorDamageSource\@\@H\@Z */ virtual void dropEquipmentOnDeath(class ActorDamageSource const &, int); /** - * @vftbl 328 - * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXXZ + * @vftbl 325 + * @symbol ?dropEquipmentOnDeath\@Player\@\@UEAAXXZ */ virtual void dropEquipmentOnDeath(); /** - * @vftbl 329 - * @symbol ?clearVanishEnchantedItemsOnDeath\@Player\@\@UEAAXXZ + * @vftbl 326 + * @symbol ?clearVanishEnchantedItemsOnDeath\@Player\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 330 - * @symbol ?sendInventory\@Player\@\@UEAAX_N\@Z + * @vftbl 327 + * @symbol ?sendInventory\@Player\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 341 - * @symbol ?canExistWhenDisallowMob\@Player\@\@UEBA_NXZ + * @vftbl 338 + * @symbol ?canExistWhenDisallowMob\@Player\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 346 - * @symbol ?initBodyControl\@Player\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ + * @vftbl 343 + * @symbol ?initBodyControl\@Player\@\@EEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 347 - * @symbol ?jumpFromGround\@Player\@\@UEAAXXZ + * @vftbl 344 + * @symbol ?jumpFromGround\@Player\@\@UEAAXAEBVIConstBlockSource\@\@\@Z */ - virtual void jumpFromGround(); + virtual void jumpFromGround(class IConstBlockSource const &); /** - * @vftbl 348 - * @symbol ?jumpFromGround\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@\@Z + * @vftbl 345 + * @symbol ?jumpFromGround\@Player\@\@UEBAXAEAUIMobMovementProxy\@\@AEBVIConstBlockSource\@\@\@Z */ - virtual void jumpFromGround(struct IMobMovementProxy &) const; + virtual void jumpFromGround(struct IMobMovementProxy &, class IConstBlockSource const &) const; /** - * @vftbl 353 - * @symbol ?updateGliding\@Player\@\@MEAAXXZ + * @vftbl 350 + * @symbol ?updateGliding\@Player\@\@MEAAXXZ */ virtual void updateGliding(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?prepareRegion\@Player\@\@UEAAXAEAVChunkSource\@\@\@Z + * @vftbl 353 + * @symbol ?prepareRegion\@Player\@\@UEAAXAEAVChunkSource\@\@\@Z */ virtual void prepareRegion(class ChunkSource &); /** - * @vftbl 357 - * @symbol ?destroyRegion\@Player\@\@UEAAXXZ + * @vftbl 354 + * @symbol ?destroyRegion\@Player\@\@UEAAXXZ */ virtual void destroyRegion(); /** - * @vftbl 358 - * @symbol ?suspendRegion\@Player\@\@UEAAXXZ + * @vftbl 355 + * @symbol ?suspendRegion\@Player\@\@UEAAXXZ */ virtual void suspendRegion(); /** - * @vftbl 359 - * @symbol ?resendAllChunks\@Player\@\@UEAAXXZ + * @vftbl 356 + * @symbol ?resendAllChunks\@Player\@\@UEAAXXZ */ virtual void resendAllChunks(); /** - * @vftbl 360 - * @symbol ?_fireWillChangeDimension\@Player\@\@UEAAXXZ + * @vftbl 357 + * @symbol ?_fireWillChangeDimension\@Player\@\@UEAAXXZ */ virtual void _fireWillChangeDimension(); /** - * @vftbl 361 - * @symbol ?_fireDimensionChanged\@Player\@\@UEAAXXZ + * @vftbl 358 + * @symbol ?_fireDimensionChanged\@Player\@\@UEAAXXZ */ virtual void _fireDimensionChanged(); /** - * @vftbl 362 - * @symbol ?changeDimensionWithCredits\@Player\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @vftbl 359 + * @symbol ?changeDimensionWithCredits\@Player\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimensionWithCredits(class AutomaticID); /** - * @vftbl 363 - * @symbol ?tickWorld\@Player\@\@UEAAXAEBUTick\@\@\@Z + * @vftbl 360 + * @symbol ?tickWorld\@Player\@\@UEAAXAEBUTick\@\@\@Z */ virtual void tickWorld(struct Tick const &); /** - * @vftbl 364 - * @symbol __unk_vfn_364 + * @vftbl 361 + * @symbol __unk_vfn_361 */ - virtual void __unk_vfn_364() = 0; + virtual void __unk_vfn_361() = 0; /** - * @vftbl 365 - * @symbol ?getTickingOffsets\@Player\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ + * @vftbl 362 + * @symbol ?getTickingOffsets\@Player\@\@UEBAAEBV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getTickingOffsets() const; /** - * @vftbl 366 - * @symbol ?moveView\@Player\@\@UEAAXXZ + * @vftbl 363 + * @symbol ?moveView\@Player\@\@UEAAXXZ */ virtual void moveView(); /** - * @vftbl 367 - * @symbol ?moveSpawnView\@Player\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @vftbl 364 + * @symbol ?moveSpawnView\@Player\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void moveSpawnView(class Vec3 const &, class AutomaticID); /** - * @vftbl 368 - * @symbol ?setName\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 365 + * @symbol ?setName\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void setName(std::string const &); /** - * @vftbl 369 - * @symbol ?getTravelledMethod\@Player\@\@UEBA?AW4TravelMethod\@\@XZ + * @vftbl 366 + * @symbol ?getTravelledMethod\@Player\@\@UEBA?AW4TravelMethod\@\@XZ */ virtual enum class TravelMethod getTravelledMethod() const; /** - * @vftbl 370 - * @symbol ?checkMovementStats\@Player\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 367 + * @symbol ?checkMovementStats\@Player\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void checkMovementStats(class Vec3 const &); /** - * @vftbl 371 - * @symbol __unk_vfn_371 + * @vftbl 368 + * @symbol __unk_vfn_368 */ - virtual void __unk_vfn_371(); + virtual void __unk_vfn_368(); /** - * @vftbl 372 - * @symbol __unk_vfn_372 + * @vftbl 369 + * @symbol __unk_vfn_369 */ - virtual void __unk_vfn_372(); + virtual void __unk_vfn_369(); /** - * @vftbl 373 - * @symbol ?respawn\@Player\@\@UEAAXXZ + * @vftbl 370 + * @symbol ?respawn\@Player\@\@UEAAXXZ */ virtual void respawn(); /** - * @vftbl 374 - * @symbol __unk_vfn_374 + * @vftbl 371 + * @symbol __unk_vfn_371 */ - virtual void __unk_vfn_374(); + virtual void __unk_vfn_371(); /** - * @vftbl 375 - * @symbol __unk_vfn_375 + * @vftbl 372 + * @symbol __unk_vfn_372 */ - virtual void __unk_vfn_375(); + virtual void __unk_vfn_372(); /** - * @vftbl 376 - * @symbol ?hasResource\@Player\@\@UEAA_NH\@Z + * @vftbl 373 + * @symbol ?hasResource\@Player\@\@UEAA_NH\@Z */ virtual bool hasResource(int); /** - * @vftbl 377 - * @symbol ?completeUsingItem\@Player\@\@UEAAXXZ + * @vftbl 374 + * @symbol ?completeUsingItem\@Player\@\@UEAAXXZ */ virtual void completeUsingItem(); /** - * @vftbl 378 - * @symbol ?startDestroying\@Player\@\@UEAAXXZ + * @vftbl 375 + * @symbol ?startDestroying\@Player\@\@UEAAXXZ */ virtual void startDestroying(); /** - * @vftbl 379 - * @symbol ?stopDestroying\@Player\@\@UEAAXXZ + * @vftbl 376 + * @symbol ?stopDestroying\@Player\@\@UEAAXXZ */ virtual void stopDestroying(); /** - * @vftbl 380 - * @symbol __unk_vfn_380 + * @vftbl 377 + * @symbol __unk_vfn_377 */ - virtual void __unk_vfn_380(); + virtual void __unk_vfn_377(); /** - * @vftbl 381 - * @symbol __unk_vfn_381 + * @vftbl 378 + * @symbol __unk_vfn_378 */ - virtual void __unk_vfn_381(); + virtual void __unk_vfn_378(); /** - * @vftbl 382 - * @symbol ?openTrading\@Player\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z + * @vftbl 379 + * @symbol ?openTrading\@Player\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z */ virtual void openTrading(struct ActorUniqueID const &, bool); /** - * @vftbl 383 - * @symbol ?canOpenContainerScreen\@Player\@\@UEAA_NXZ + * @vftbl 380 + * @symbol ?canOpenContainerScreen\@Player\@\@UEAA_NXZ */ virtual bool canOpenContainerScreen(); /** - * @vftbl 384 - * @symbol __unk_vfn_384 + * @vftbl 381 + * @symbol __unk_vfn_381 */ - virtual void __unk_vfn_384(); + virtual void __unk_vfn_381(); /** - * @vftbl 385 - * @symbol ?openNpcInteractScreen\@Player\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z + * @vftbl 382 + * @symbol ?openNpcInteractScreen\@Player\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z */ virtual void openNpcInteractScreen(class std::shared_ptr); /** - * @vftbl 386 - * @symbol ?openInventory\@Player\@\@UEAAXXZ + * @vftbl 383 + * @symbol ?openInventory\@Player\@\@UEAAXXZ */ virtual void openInventory(); /** - * @vftbl 387 - * @symbol __unk_vfn_387 + * @vftbl 384 + * @symbol __unk_vfn_384 */ - virtual void __unk_vfn_387(); + virtual void __unk_vfn_384(); /** - * @vftbl 388 - * @symbol __unk_vfn_388 + * @vftbl 385 + * @symbol __unk_vfn_385 */ - virtual void __unk_vfn_388(); + virtual void __unk_vfn_385(); /** - * @vftbl 389 - * @symbol ?displayTextObjectMessage\@Player\@\@UEAAXAEBVTextObjectRoot\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @vftbl 386 + * @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 390 - * @symbol ?displayTextObjectWhisperMessage\@Player\@\@UEAAXAEBVResolvedTextObject\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @vftbl 387 + * @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 391 - * @symbol ?displayTextObjectWhisperMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @vftbl 388 + * @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 392 - * @symbol ?displayWhisperMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @vftbl 389 + * @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 393 - * @symbol ?startSleepInBed\@Player\@\@UEAA?AW4BedSleepingResult\@\@AEBVBlockPos\@\@\@Z + * @vftbl 390 + * @symbol ?startSleepInBed\@Player\@\@UEAA?AW4BedSleepingResult\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BedSleepingResult startSleepInBed(class BlockPos const &); /** - * @vftbl 394 - * @symbol ?stopSleepInBed\@Player\@\@UEAAX_N0\@Z + * @vftbl 391 + * @symbol ?stopSleepInBed\@Player\@\@UEAAX_N0\@Z */ virtual void stopSleepInBed(bool, bool); /** - * @vftbl 395 - * @symbol ?canStartSleepInBed\@Player\@\@UEAA_NXZ + * @vftbl 392 + * @symbol ?canStartSleepInBed\@Player\@\@UEAA_NXZ */ virtual bool canStartSleepInBed(); /** - * @vftbl 396 - * @symbol ?getSleepTimer\@Player\@\@UEBAHXZ + * @vftbl 393 + * @symbol ?getSleepTimer\@Player\@\@UEBAHXZ */ virtual int getSleepTimer() const; /** - * @vftbl 397 - * @symbol ?getPreviousTickSleepTimer\@Player\@\@UEBAHXZ + * @vftbl 394 + * @symbol ?getPreviousTickSleepTimer\@Player\@\@UEBAHXZ */ virtual int getPreviousTickSleepTimer() const; /** - * @vftbl 398 - * @symbol __unk_vfn_398 + * @vftbl 395 + * @symbol __unk_vfn_395 */ - virtual void __unk_vfn_398(); + virtual void __unk_vfn_395(); /** - * @vftbl 399 - * @symbol __unk_vfn_399 + * @vftbl 396 + * @symbol __unk_vfn_396 */ - virtual void __unk_vfn_399(); + virtual void __unk_vfn_396(); /** - * @vftbl 400 - * @symbol ?isHostingPlayer\@Player\@\@UEBA_NXZ + * @vftbl 397 + * @symbol ?isHostingPlayer\@Player\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 401 - * @symbol ?isLoading\@Player\@\@UEBA_NXZ + * @vftbl 398 + * @symbol ?isLoading\@Player\@\@UEBA_NXZ */ virtual bool isLoading() const; /** - * @vftbl 402 - * @symbol ?isPlayerInitialized\@Player\@\@UEBA_NXZ + * @vftbl 399 + * @symbol ?isPlayerInitialized\@Player\@\@UEBA_NXZ */ virtual bool isPlayerInitialized() const; /** - * @vftbl 403 - * @symbol __unk_vfn_403 + * @vftbl 400 + * @symbol __unk_vfn_400 */ - virtual void __unk_vfn_403(); + virtual void __unk_vfn_400(); /** - * @vftbl 404 - * @symbol ?registerTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z + * @vftbl 401 + * @symbol ?registerTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void registerTrackedBoss(struct ActorUniqueID); /** - * @vftbl 405 - * @symbol ?unRegisterTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z + * @vftbl 402 + * @symbol ?unRegisterTrackedBoss\@Player\@\@UEAAXUActorUniqueID\@\@\@Z */ virtual void unRegisterTrackedBoss(struct ActorUniqueID); /** - * @vftbl 406 - * @symbol ?setPlayerGameType\@Player\@\@UEAAXW4GameType\@\@\@Z + * @vftbl 403 + * @symbol ?setPlayerGameType\@Player\@\@UEAAXW4GameType\@\@\@Z */ virtual void setPlayerGameType(enum class GameType); /** - * @vftbl 407 - * @symbol ?initHUDContainerManager\@Player\@\@UEAAXXZ + * @vftbl 404 + * @symbol ?initHUDContainerManager\@Player\@\@UEAAXXZ */ virtual void initHUDContainerManager(); /** - * @vftbl 408 - * @symbol ?_crit\@Player\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 405 + * @symbol ?_crit\@Player\@\@UEAAXAEAVActor\@\@\@Z */ virtual void _crit(class Actor &); /** - * @vftbl 409 - * @symbol ?getEventing\@Player\@\@UEBAPEAVIMinecraftEventing\@\@XZ + * @vftbl 406 + * @symbol ?getEventing\@Player\@\@UEBAPEAVIMinecraftEventing\@\@XZ */ virtual class IMinecraftEventing * getEventing() const; /** - * @vftbl 410 - * @symbol __unk_vfn_410 + * @vftbl 407 + * @symbol __unk_vfn_407 */ - virtual void __unk_vfn_410(); + virtual void __unk_vfn_407(); /** - * @vftbl 411 - * @symbol ?sendEventPacket\@Player\@\@UEBAXAEAVEventPacket\@\@\@Z + * @vftbl 408 + * @symbol ?sendEventPacket\@Player\@\@UEBAXAEAVEventPacket\@\@\@Z */ virtual void sendEventPacket(class EventPacket &) const; /** - * @vftbl 412 - * @symbol ?addExperience\@Player\@\@UEAAXH\@Z + * @vftbl 409 + * @symbol ?addExperience\@Player\@\@UEAAXH\@Z */ virtual void addExperience(int); /** - * @vftbl 413 - * @symbol ?addLevels\@Player\@\@UEAAXH\@Z + * @vftbl 410 + * @symbol ?addLevels\@Player\@\@UEAAXH\@Z */ virtual void addLevels(int); /** - * @vftbl 414 - * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z + * @vftbl 411 + * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z */ virtual void setContainerData(class IContainerManager &, int, int) = 0; /** - * @vftbl 415 - * @symbol ?slotChanged\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@AEAVContainer\@\@HAEBVItemStack\@\@2_N\@Z + * @vftbl 412 + * @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 416 - * @symbol ?inventoryChanged\@Player\@\@UEAAXAEAVContainer\@\@HAEBVItemStack\@\@1_N\@Z + * @vftbl 413 + * @symbol ?inventoryChanged\@Player\@\@UEAAXAEAVContainer\@\@HAEBVItemStack\@\@1_N\@Z */ virtual void inventoryChanged(class Container &, int, class ItemStack const &, class ItemStack const &, bool); /** - * @vftbl 417 - * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z + * @vftbl 414 + * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z */ virtual void refreshContainer(class IContainerManager &) = 0; /** - * @vftbl 418 - * @symbol ?deleteContainerManager\@Player\@\@UEAAXXZ + * @vftbl 415 + * @symbol ?deleteContainerManager\@Player\@\@UEAAXXZ */ virtual void deleteContainerManager(); /** - * @vftbl 419 - * @symbol ?isActorRelevant\@Player\@\@UEAA_NAEBVActor\@\@\@Z + * @vftbl 416 + * @symbol ?isActorRelevant\@Player\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool isActorRelevant(class Actor const &); /** - * @vftbl 420 - * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ + * @vftbl 417 + * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isTeacher() const = 0; /** - * @vftbl 421 - * @symbol ?onSuspension\@Player\@\@UEAAXXZ + * @vftbl 418 + * @symbol ?onSuspension\@Player\@\@UEAAXXZ */ virtual void onSuspension(); /** - * @vftbl 422 - * @symbol ?onLinkedSlotsChanged\@Player\@\@UEAAXXZ + * @vftbl 419 + * @symbol ?onLinkedSlotsChanged\@Player\@\@UEAAXXZ */ virtual void onLinkedSlotsChanged(); /** - * @vftbl 423 - * @symbol ?startCooldown\@Player\@\@UEAAXPEBVItem\@\@_N\@Z + * @vftbl 420 + * @symbol ?startCooldown\@Player\@\@UEAAXPEBVItem\@\@_N\@Z */ virtual void startCooldown(class Item const *, bool); /** - * @vftbl 424 - * @symbol ?getItemCooldownLeft\@Player\@\@UEBAHAEBVHashedString\@\@\@Z + * @vftbl 421 + * @symbol ?getItemCooldownLeft\@Player\@\@UEBAHAEBVHashedString\@\@\@Z */ virtual int getItemCooldownLeft(class HashedString const &) const; /** - * @vftbl 425 - * @symbol ?getItemCooldownLeft\@Player\@\@UEBAH_K\@Z + * @vftbl 422 + * @symbol ?getItemCooldownLeft\@Player\@\@UEBAH_K\@Z */ virtual int getItemCooldownLeft(unsigned __int64) const; /** - * @vftbl 426 - * @symbol ?getMaxItemCooldownLeft\@Player\@\@UEBAHXZ + * @vftbl 423 + * @symbol ?getMaxItemCooldownLeft\@Player\@\@UEBAHXZ */ virtual int getMaxItemCooldownLeft() const; /** - * @vftbl 427 - * @symbol ?isItemOnCooldown\@Player\@\@UEBA_NAEBVHashedString\@\@\@Z + * @vftbl 424 + * @symbol ?isItemOnCooldown\@Player\@\@UEBA_NAEBVHashedString\@\@\@Z */ virtual bool isItemOnCooldown(class HashedString const &) const; /** - * @vftbl 428 - * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z + * @vftbl 425 + * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z */ virtual void sendInventoryTransaction(class InventoryTransaction const &) const = 0; /** - * @vftbl 429 - * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 426 + * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z */ virtual void sendComplexInventoryTransaction(std::unique_ptr) const = 0; /** - * @vftbl 430 - * @symbol ?sendNetworkPacket\@Player\@\@UEBAXAEAVPacket\@\@\@Z + * @vftbl 427 + * @symbol ?sendNetworkPacket\@Player\@\@UEBAXAEAVPacket\@\@\@Z */ virtual void sendNetworkPacket(class Packet &) const; /** - * @vftbl 431 - * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ + * @vftbl 428 + * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ virtual class PlayerEventCoordinator & getPlayerEventCoordinator() = 0; /** - * @vftbl 432 - * @symbol ?tryGetMoveInputHandler\@ServerPlayer\@\@UEBAPEAVMoveInputHandler\@\@XZ + * @vftbl 429 + * @symbol ?tryGetMoveInputHandler\@ServerPlayer\@\@UEBAPEAVMoveInputHandler\@\@XZ */ virtual class MoveInputHandler * tryGetMoveInputHandler() const = 0; /** - * @vftbl 433 - * @symbol ?getInputMode\@ServerPlayer\@\@UEBA?AW4InputMode\@\@XZ + * @vftbl 430 + * @symbol ?getInputMode\@ServerPlayer\@\@UEBA?AW4InputMode\@\@XZ */ virtual enum class InputMode getInputMode() const = 0; /** - * @vftbl 434 - * @symbol ?getPlayMode\@ServerPlayer\@\@UEBA?AW4ClientPlayMode\@\@XZ + * @vftbl 431 + * @symbol ?getPlayMode\@ServerPlayer\@\@UEBA?AW4ClientPlayMode\@\@XZ */ virtual enum class ClientPlayMode getPlayMode() const = 0; /** - * @vftbl 435 - * @symbol ?reportMovementTelemetry\@Player\@\@UEAAXW4MovementEventType\@\@\@Z + * @vftbl 432 + * @symbol ?reportMovementTelemetry\@Player\@\@UEAAXW4MovementEventType\@\@\@Z */ virtual void reportMovementTelemetry(enum class MovementEventType); /** - * @vftbl 436 - * @symbol __unk_vfn_436 + * @vftbl 433 + * @symbol __unk_vfn_433 */ - virtual void __unk_vfn_436(); + virtual void __unk_vfn_433(); /** - * @vftbl 437 - * @symbol ?getXuid\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 434 + * @symbol ?getXuid\@Player\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getXuid() const; /** - * @vftbl 438 - * @symbol ?getMovementSettings\@Player\@\@UEBAAEBUPlayerMovementSettings\@\@XZ + * @vftbl 435 + * @symbol ?getMovementSettings\@Player\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ virtual struct PlayerMovementSettings const & getMovementSettings() const; /** - * @vftbl 439 - * @symbol __unk_vfn_439 + * @vftbl 436 + * @symbol __unk_vfn_436 */ - virtual void __unk_vfn_439(); + virtual void __unk_vfn_436(); /** - * @vftbl 440 - * @symbol ?onMovePlayerPacketNormal\@Player\@\@MEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z + * @vftbl 437 + * @symbol ?onMovePlayerPacketNormal\@Player\@\@MEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z */ virtual void onMovePlayerPacketNormal(class Vec3 const &, class Vec2 const &, float); /** - * @vftbl 441 - * @symbol ?_createChunkSource\@Player\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z + * @vftbl 438 + * @symbol ?_createChunkSource\@Player\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 442 - * @symbol ?setAbilities\@Player\@\@UEAAXAEBVLayeredAbilities\@\@\@Z + * @vftbl 439 + * @symbol ?setAbilities\@Player\@\@UEAAXAEBVLayeredAbilities\@\@\@Z */ virtual void setAbilities(class LayeredAbilities const &); /** - * @vftbl 443 - * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ + * @vftbl 440 + * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const = 0; /** - * @vftbl 444 - * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ + * @vftbl 441 + * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer() = 0; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYER /** - * @symbol ?addSavedChunk\@Player\@\@UEAAXAEBVChunkPos\@\@\@Z + * @symbol ?addSavedChunk\@Player\@\@UEAAXAEBVChunkPos\@\@\@Z */ MCVAPI void addSavedChunk(class ChunkPos const &); /** - * @symbol ?canInteractWithOtherEntitiesInGame\@Player\@\@UEBA_NXZ + * @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 + * @symbol ?displayChatMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCVAPI void displayChatMessage(std::string const &, std::string const &); /** - * @symbol ?displayClientMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?displayClientMessage\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void displayClientMessage(std::string const &); /** - * @symbol ?getAlwaysShowNameTag\@Player\@\@UEBA_NXZ + * @symbol ?getAlwaysShowNameTag\@Player\@\@UEBA_NXZ */ MCVAPI bool getAlwaysShowNameTag() const; /** - * @symbol ?getCurrentStructureFeature\@Player\@\@UEBA?AW4StructureFeatureType\@\@XZ + * @symbol ?getCurrentStructureFeature\@Player\@\@UEBA?AW4StructureFeatureType\@\@XZ */ MCVAPI enum class StructureFeatureType getCurrentStructureFeature() const; /** - * @symbol ?getUserId\@Player\@\@UEBAIXZ + * @symbol ?getUserId\@Player\@\@UEBAIXZ */ MCVAPI unsigned int getUserId() const; /** - * @symbol ?isAutoJumpEnabled\@Player\@\@UEBA_NXZ + * @symbol ?isAutoJumpEnabled\@Player\@\@UEBA_NXZ */ MCVAPI bool isAutoJumpEnabled() const; /** - * @symbol ?isCreativeModeAllowed\@Player\@\@UEAA_NXZ + * @symbol ?isCreativeModeAllowed\@Player\@\@UEAA_NXZ */ MCVAPI bool isCreativeModeAllowed(); /** - * @symbol ?isInTrialMode\@Player\@\@UEAA_NXZ + * @symbol ?isInTrialMode\@Player\@\@UEAA_NXZ */ MCVAPI bool isInTrialMode(); /** - * @symbol ?isPlayer\@Player\@\@UEBA_NXZ + * @symbol ?isPlayer\@Player\@\@UEBA_NXZ */ MCVAPI bool isPlayer() const; /** - * @symbol ?isShootable\@Player\@\@UEAA_NXZ + * @symbol ?isShootable\@Player\@\@UEAA_NXZ */ MCVAPI bool isShootable(); /** - * @symbol ?isSimulated\@Player\@\@UEBA_NXZ + * @symbol ?isSimulated\@Player\@\@UEBA_NXZ */ MCVAPI bool isSimulated() const; /** - * @symbol ?openBook\@Player\@\@UEAAXH_NHPEAVBlockActor\@\@\@Z + * @symbol ?openBook\@Player\@\@UEAAXH_NHPEAVBlockActor\@\@\@Z */ MCVAPI void openBook(int, bool, int, class BlockActor *); /** - * @symbol ?openChalkboard\@Player\@\@UEAAXAEAVChalkboardBlockActor\@\@_N\@Z + * @symbol ?openChalkboard\@Player\@\@UEAAXAEAVChalkboardBlockActor\@\@_N\@Z */ MCVAPI void openChalkboard(class ChalkboardBlockActor &, bool); /** - * @symbol ?openPortfolio\@Player\@\@UEAAXXZ + * @symbol ?openPortfolio\@Player\@\@UEAAXXZ */ MCVAPI void openPortfolio(); /** - * @symbol ?openSign\@Player\@\@UEAAXAEBVBlockPos\@\@\@Z + * @symbol ?openSign\@Player\@\@UEAAXAEBVBlockPos\@\@\@Z */ MCVAPI void openSign(class BlockPos const &); /** - * @symbol ?playEmote\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?playEmote\@Player\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCVAPI void playEmote(std::string const &, bool); /** - * @symbol ?resetRot\@Player\@\@UEAAXXZ + * @symbol ?resetRot\@Player\@\@UEAAXXZ */ MCVAPI void resetRot(); /** - * @symbol ?stopLoading\@Player\@\@UEAAXXZ + * @symbol ?stopLoading\@Player\@\@UEAAXXZ */ MCVAPI void stopLoading(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Player(); #endif /** - * @symbol ??0Player\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@6V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@9\@AEAVEntityContext\@\@66\@Z + * @symbol ??0Player\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@6V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@9\@AEAVEntityContext\@\@66\@Z */ MCAPI Player(class Level &, class PacketSender &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class mce::UUID, std::string const &, std::string const &, std::unique_ptr, class EntityContext &, std::string const &, std::string const &); /** - * @symbol ?applyExhaustion\@Player\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?applyExhaustion\@Player\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void applyExhaustion(class Vec3 const &); /** - * @symbol ?broadcastPlayerSpawnedMobEvent\@Player\@\@QEAAXW4ActorType\@\@W4MobSpawnMethod\@\@\@Z + * @symbol ?broadcastPlayerSpawnedMobEvent\@Player\@\@QEAAXW4ActorType\@\@W4MobSpawnMethod\@\@\@Z */ MCAPI void broadcastPlayerSpawnedMobEvent(enum class ActorType, enum class MobSpawnMethod); /** - * @symbol ?canBeSeenOnMap\@Player\@\@QEBA_NXZ + * @symbol ?canBeSeenOnMap\@Player\@\@QEBA_NXZ */ MCAPI bool canBeSeenOnMap() const; /** - * @symbol ?canDestroy\@Player\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?canDestroy\@Player\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool canDestroy(class Block const &) const; /** - * @symbol ?canSleep\@Player\@\@QEBA_NXZ + * @symbol ?canSleep\@Player\@\@QEBA_NXZ */ MCAPI bool canSleep() const; /** - * @symbol ?canStackInOffhand\@Player\@\@QEBA_NAEBVItemStack\@\@\@Z + * @symbol ?canStackInOffhand\@Player\@\@QEBA_NAEBVItemStack\@\@\@Z */ MCAPI bool canStackInOffhand(class ItemStack const &) const; /** - * @symbol ?canUseAbility\@Player\@\@QEBA_NW4AbilitiesIndex\@\@\@Z + * @symbol ?canUseAbility\@Player\@\@QEBA_NW4AbilitiesIndex\@\@\@Z */ MCAPI bool canUseAbility(enum class AbilitiesIndex) const; /** - * @symbol ?canUseOperatorBlocks\@Player\@\@QEBA_NXZ + * @symbol ?canUseOperatorBlocks\@Player\@\@QEBA_NXZ */ MCAPI bool canUseOperatorBlocks() const; /** - * @symbol ?causeFoodExhaustion\@Player\@\@QEAAXM\@Z + * @symbol ?causeFoodExhaustion\@Player\@\@QEAAXM\@Z */ MCAPI void causeFoodExhaustion(float); /** - * @symbol ?clearRespawnPosition\@Player\@\@QEAAXXZ + * @symbol ?clearRespawnPosition\@Player\@\@QEAAXXZ */ MCAPI void clearRespawnPosition(); /** - * @symbol ?eat\@Player\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?eat\@Player\@\@QEAAXHM\@Z */ - MCAPI void eat(class ItemStack const &); + MCAPI void eat(int, float); /** - * @symbol ?eat\@Player\@\@QEAAXHM\@Z + * @symbol ?eat\@Player\@\@QEAAXAEBVItemStack\@\@\@Z */ - MCAPI void eat(int, float); + MCAPI void eat(class ItemStack const &); /** - * @symbol ?equippedArmorItemCanBeMoved\@Player\@\@QEBA_NAEBVItemStack\@\@\@Z + * @symbol ?equippedArmorItemCanBeMoved\@Player\@\@QEBA_NAEBVItemStack\@\@\@Z */ MCAPI bool equippedArmorItemCanBeMoved(class ItemStack const &) const; /** - * @symbol ?fireDimensionChangedEvent\@Player\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@0\@Z + * @symbol ?fireDimensionChangedEvent\@Player\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@0\@Z */ MCAPI void fireDimensionChangedEvent(class AutomaticID, class AutomaticID); /** - * @symbol ?forceAllowEating\@Player\@\@QEBA_NXZ + * @symbol ?forceAllowEating\@Player\@\@QEBA_NXZ */ MCAPI bool forceAllowEating() const; /** - * @symbol ?getAbilities\@Player\@\@QEAAAEAVLayeredAbilities\@\@XZ + * @symbol ?getAbilities\@Player\@\@QEBAAEBVLayeredAbilities\@\@XZ */ - MCAPI class LayeredAbilities & getAbilities(); + MCAPI class LayeredAbilities const & getAbilities() const; /** - * @symbol ?getAbilities\@Player\@\@QEBAAEBVLayeredAbilities\@\@XZ + * @symbol ?getAbilities\@Player\@\@QEAAAEAVLayeredAbilities\@\@XZ */ - MCAPI class LayeredAbilities const & getAbilities() const; + MCAPI class LayeredAbilities & getAbilities(); /** - * @symbol ?getAgent\@Player\@\@QEBAPEAVAgent\@\@XZ + * @symbol ?getAgent\@Player\@\@QEBAPEAVAgent\@\@XZ */ MCAPI class Agent * getAgent() const; /** - * @symbol ?getAgentID\@Player\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getAgentID\@Player\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getAgentID() const; /** - * @symbol ?getAgentIfAllowed\@Player\@\@QEBAPEAVAgent\@\@_NUActorUniqueID\@\@\@Z + * @symbol ?getAgentIfAllowed\@Player\@\@QEBAPEAVAgent\@\@_NUActorUniqueID\@\@\@Z */ MCAPI class Agent * getAgentIfAllowed(bool, struct ActorUniqueID) const; /** - * @symbol ?getBedPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getBedPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getBedPosition() const; /** - * @symbol ?getBlockedUsingDamagedShieldTimeStamp\@Player\@\@QEBA_JXZ + * @symbol ?getBlockedUsingDamagedShieldTimeStamp\@Player\@\@QEBA_JXZ */ MCAPI __int64 getBlockedUsingDamagedShieldTimeStamp() const; /** - * @symbol ?getBlockedUsingShieldTimeStamp\@Player\@\@QEBA_JXZ + * @symbol ?getBlockedUsingShieldTimeStamp\@Player\@\@QEBA_JXZ */ MCAPI __int64 getBlockedUsingShieldTimeStamp() const; /** - * @symbol ?getBlockingStartTimeStamp\@Player\@\@QEBA_JXZ + * @symbol ?getBlockingStartTimeStamp\@Player\@\@QEBA_JXZ */ MCAPI __int64 getBlockingStartTimeStamp() const; /** - * @symbol ?getCapePos\@Player\@\@QEAA?AVVec3\@\@M\@Z + * @symbol ?getCapePos\@Player\@\@QEAA?AVVec3\@\@M\@Z */ MCAPI class Vec3 getCapePos(float); /** - * @symbol ?getChunkRadius\@Player\@\@QEBAIXZ + * @symbol ?getChunkRadius\@Player\@\@QEBAIXZ */ MCAPI unsigned int getChunkRadius() const; /** - * @symbol ?getContainerManager\@Player\@\@QEAA?AV?$weak_ptr\@VIContainerManager\@\@\@std\@\@XZ + * @symbol ?getContainerManager\@Player\@\@QEAA?AV?$weak_ptr\@VIContainerManager\@\@\@std\@\@XZ */ MCAPI class std::weak_ptr getContainerManager(); /** - * @symbol ?getCurrentActiveShield\@Player\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getCurrentActiveShield\@Player\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getCurrentActiveShield() const; /** - * @symbol ?getDestroyProgress\@Player\@\@QEBAMAEBVBlock\@\@\@Z + * @symbol ?getDestroyProgress\@Player\@\@QEBAMAEBVBlock\@\@\@Z */ MCAPI float getDestroyProgress(class Block const &) const; /** - * @symbol ?getDestroySpeed\@Player\@\@QEBAMAEBVBlock\@\@\@Z + * @symbol ?getDestroySpeed\@Player\@\@QEBAMAEBVBlock\@\@\@Z */ MCAPI float getDestroySpeed(class Block const &) const; /** - * @symbol ?getDirection\@Player\@\@QEBAHXZ + * @symbol ?getDirection\@Player\@\@QEBAHXZ */ MCAPI int getDirection() const; /** - * @symbol ?getEnchantmentSeed\@Player\@\@QEBAHXZ + * @symbol ?getEnchantmentSeed\@Player\@\@QEBAHXZ */ MCAPI int getEnchantmentSeed() const; /** - * @symbol ?getExpectedSpawnDimensionId\@Player\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getExpectedSpawnDimensionId\@Player\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID getExpectedSpawnDimensionId() const; /** - * @symbol ?getExpectedSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getExpectedSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getExpectedSpawnPosition() const; /** - * @symbol ?getInteractText\@Player\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getInteractText\@Player\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getInteractText() const; /** - * @symbol ?getInventory\@Player\@\@QEAAAEAVContainer\@\@XZ + * @symbol ?getInventory\@Player\@\@QEAAAEAVContainer\@\@XZ */ MCAPI class Container & getInventory(); /** - * @symbol ?getItemInUse\@Player\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getItemInUse\@Player\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getItemInUse() const; /** - * @symbol ?getItemInteractText\@Player\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItem\@\@\@Z + * @symbol ?getItemInteractText\@Player\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItem\@\@\@Z */ MCAPI std::string getItemInteractText(class Item const &) const; /** - * @symbol ?getItemStackNetManager\@Player\@\@QEBAPEBVItemStackNetManagerBase\@\@XZ + * @symbol ?getItemStackNetManager\@Player\@\@QEBAPEBVItemStackNetManagerBase\@\@XZ */ MCAPI class ItemStackNetManagerBase const * getItemStackNetManager() const; /** - * @symbol ?getItemStackNetManager\@Player\@\@QEAAPEAVItemStackNetManagerBase\@\@XZ + * @symbol ?getItemStackNetManager\@Player\@\@QEAAPEAVItemStackNetManagerBase\@\@XZ */ MCAPI class ItemStackNetManagerBase * getItemStackNetManager(); /** - * @symbol ?getLuck\@Player\@\@QEAAMXZ + * @symbol ?getLuck\@Player\@\@QEAAMXZ */ MCAPI float getLuck(); /** - * @symbol ?getMapIndex\@Player\@\@QEAAHXZ + * @symbol ?getMapIndex\@Player\@\@QEAAHXZ */ MCAPI int getMapIndex(); /** - * @symbol ?getMoveInputHandler\@Player\@\@QEBAPEAVMoveInputHandler\@\@XZ + * @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 + * @symbol ?getName\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getNewEnchantmentSeed\@Player\@\@QEAAXXZ + * @symbol ?getNewEnchantmentSeed\@Player\@\@QEAAXXZ */ MCAPI void getNewEnchantmentSeed(); /** - * @symbol ?getPickupArea\@Player\@\@QEBA?AVAABB\@\@XZ + * @symbol ?getPickupArea\@Player\@\@QEBA?AVAABB\@\@XZ */ MCAPI class AABB getPickupArea() const; /** - * @symbol ?getPlatform\@Player\@\@QEBA?AW4BuildPlatform\@\@XZ + * @symbol ?getPlatform\@Player\@\@QEBA?AW4BuildPlatform\@\@XZ */ MCAPI enum class BuildPlatform getPlatform() const; /** - * @symbol ?getPlatformOnlineId\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlatformOnlineId\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getPlatformOnlineId() const; /** - * @symbol ?getPlayerGameType\@Player\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getPlayerGameType\@Player\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getPlayerGameType() const; /** - * @symbol ?getPlayerIndex\@Player\@\@QEBAHXZ + * @symbol ?getPlayerIndex\@Player\@\@QEBAHXZ */ MCAPI int getPlayerIndex() const; /** - * @symbol ?getPlayerLevel\@Player\@\@QEBAHXZ + * @symbol ?getPlayerLevel\@Player\@\@QEBAHXZ */ MCAPI int getPlayerLevel() const; /** - * @symbol ?getPlayerPermissionLevel\@Player\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ + * @symbol ?getPlayerPermissionLevel\@Player\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel getPlayerPermissionLevel() const; /** - * @symbol ?getPlayerSessionId\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlayerSessionId\@Player\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getPlayerSessionId() const; /** - * @symbol ?getPlayerUIItem\@Player\@\@QEAAAEBVItemStack\@\@W4PlayerUISlot\@\@\@Z + * @symbol ?getPlayerUIItem\@Player\@\@QEAAAEBVItemStack\@\@W4PlayerUISlot\@\@\@Z */ MCAPI class ItemStack const & getPlayerUIItem(enum class PlayerUISlot); /** - * @symbol ?getRespawnAnchorPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getRespawnAnchorPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getRespawnAnchorPosition() const; /** - * @symbol ?getSelectedItem\@Player\@\@QEBAAEBVItemStack\@\@XZ + * @symbol ?getSelectedItem\@Player\@\@QEBAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getSelectedItem() const; /** - * @symbol ?getSelectedItemSlot\@Player\@\@QEBAHXZ + * @symbol ?getSelectedItemSlot\@Player\@\@QEBAHXZ */ MCAPI int getSelectedItemSlot() const; /** - * @symbol ?getSkin\@Player\@\@QEAAAEAVSerializedSkin\@\@XZ + * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ */ - MCAPI class SerializedSkin & getSkin(); + MCAPI class SerializedSkin const & getSkin() const; /** - * @symbol ?getSkin\@Player\@\@QEBAAEBVSerializedSkin\@\@XZ + * @symbol ?getSkin\@Player\@\@QEAAAEAVSerializedSkin\@\@XZ */ - MCAPI class SerializedSkin const & getSkin() const; + MCAPI class SerializedSkin & getSkin(); /** - * @symbol ?getSleepRotation\@Player\@\@QEBAMXZ + * @symbol ?getSleepRotation\@Player\@\@QEBAMXZ */ MCAPI float getSleepRotation() const; /** - * @symbol ?getSpawnDimension\@Player\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getSpawnDimension\@Player\@\@QEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID getSpawnDimension() const; /** - * @symbol ?getSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getSpawnPosition\@Player\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSpawnPosition() const; /** - * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ + * @symbol ?getSupplies\@Player\@\@QEBAAEBVPlayerInventory\@\@XZ */ - MCAPI class PlayerInventory & getSupplies(); + MCAPI class PlayerInventory const & getSupplies() const; /** - * @symbol ?getSupplies\@Player\@\@QEBAAEBVPlayerInventory\@\@XZ + * @symbol ?getSupplies\@Player\@\@QEAAAEAVPlayerInventory\@\@XZ */ - MCAPI class PlayerInventory const & getSupplies() const; + MCAPI class PlayerInventory & getSupplies(); /** - * @symbol ?getTrackedBosses\@Player\@\@QEAAAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getTrackedBosses\@Player\@\@QEAAAEBV?$vector\@UActorUniqueID\@\@V?$allocator\@UActorUniqueID\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getTrackedBosses(); /** - * @symbol ?getUnmappedPlayerGameType\@Player\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getUnmappedPlayerGameType\@Player\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getUnmappedPlayerGameType() const; /** - * @symbol ?getUsedPotion\@Player\@\@QEAA_NXZ + * @symbol ?getUsedPotion\@Player\@\@QEAA_NXZ */ MCAPI bool getUsedPotion(); /** - * @symbol ?getXpEarnedAtCurrentLevel\@Player\@\@QEBAHXZ + * @symbol ?getXpEarnedAtCurrentLevel\@Player\@\@QEBAHXZ */ MCAPI int getXpEarnedAtCurrentLevel() const; /** - * @symbol ?getXpNeededForLevelRange\@Player\@\@QEBAIHH\@Z + * @symbol ?getXpNeededForLevelRange\@Player\@\@QEBAIHH\@Z */ MCAPI unsigned int getXpNeededForLevelRange(int, int) const; /** - * @symbol ?getXpNeededForNextLevel\@Player\@\@QEBAHXZ + * @symbol ?getXpNeededForNextLevel\@Player\@\@QEBAHXZ */ MCAPI int getXpNeededForNextLevel() const; /** - * @symbol ?hasBedPosition\@Player\@\@QEBA_NXZ + * @symbol ?hasBedPosition\@Player\@\@QEBA_NXZ */ MCAPI bool hasBedPosition() const; /** - * @symbol ?hasOpenContainer\@Player\@\@QEBA_NXZ + * @symbol ?hasOpenContainer\@Player\@\@QEBA_NXZ */ MCAPI bool hasOpenContainer() const; /** - * @symbol ?hasOpenContainerOfContainerType\@Player\@\@QEBA_NW4ContainerType\@\@\@Z + * @symbol ?hasOpenContainerOfContainerType\@Player\@\@QEBA_NW4ContainerType\@\@\@Z */ MCAPI bool hasOpenContainerOfContainerType(enum class ContainerType) const; /** - * @symbol ?hasOwnedChunkSource\@Player\@\@QEBA_NXZ + * @symbol ?hasOwnedChunkSource\@Player\@\@QEBA_NXZ */ MCAPI bool hasOwnedChunkSource() const; /** - * @symbol ?hasResource\@Player\@\@QEAA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?hasResource\@Player\@\@QEAA_NAEBVItemDescriptor\@\@\@Z */ MCAPI bool hasResource(class ItemDescriptor const &); /** - * @symbol ?hasRespawnAnchorPosition\@Player\@\@QEBA_NXZ + * @symbol ?hasRespawnAnchorPosition\@Player\@\@QEBA_NXZ */ MCAPI bool hasRespawnAnchorPosition() const; /** - * @symbol ?hasRespawnPosition\@Player\@\@QEBA_NXZ + * @symbol ?hasRespawnPosition\@Player\@\@QEBA_NXZ */ MCAPI bool hasRespawnPosition() const; /** - * @symbol ?interact\@Player\@\@QEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?interact\@Player\@\@QEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z */ MCAPI bool interact(class Actor &, class Vec3 const &); /** - * @symbol ?is2DPositionRelevant\@Player\@\@QEAA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z + * @symbol ?is2DPositionRelevant\@Player\@\@QEAA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool is2DPositionRelevant(class AutomaticID, class BlockPos const &); /** - * @symbol ?isFlying\@Player\@\@QEBA_NXZ + * @symbol ?isFlying\@Player\@\@QEBA_NXZ */ MCAPI bool isFlying() const; /** - * @symbol ?isForcedRespawn\@Player\@\@QEBA_NXZ + * @symbol ?isForcedRespawn\@Player\@\@QEBA_NXZ */ MCAPI bool isForcedRespawn() const; /** - * @symbol ?isHiddenFrom\@Player\@\@QEBA_NAEAVMob\@\@\@Z + * @symbol ?isHiddenFrom\@Player\@\@QEBA_NAEAVMob\@\@\@Z */ MCAPI bool isHiddenFrom(class Mob &) const; /** - * @symbol ?isHungry\@Player\@\@QEBA_NXZ + * @symbol ?isHungry\@Player\@\@QEBA_NXZ */ MCAPI bool isHungry() const; /** - * @symbol ?isHurt\@Player\@\@QEAA_NXZ + * @symbol ?isHurt\@Player\@\@QEAA_NXZ */ MCAPI bool isHurt(); /** - * @symbol ?isInCreativeMode\@Player\@\@QEBA_NXZ + * @symbol ?isInCreativeMode\@Player\@\@QEBA_NXZ */ MCAPI bool isInCreativeMode() const; /** - * @symbol ?isInRaid\@Player\@\@QEBA_NXZ + * @symbol ?isInRaid\@Player\@\@QEBA_NXZ */ MCAPI bool isInRaid() const; /** - * @symbol ?isRespawningFromTheEnd\@Player\@\@QEBA_NXZ + * @symbol ?isRespawningFromTheEnd\@Player\@\@QEBA_NXZ */ MCAPI bool isRespawningFromTheEnd() const; /** - * @symbol ?isSleepingLongEnough\@Player\@\@QEBA_NXZ + * @symbol ?isSleepingLongEnough\@Player\@\@QEBA_NXZ */ MCAPI bool isSleepingLongEnough() const; /** - * @symbol ?isSpawned\@Player\@\@QEBA_NXZ + * @symbol ?isSpawned\@Player\@\@QEBA_NXZ */ MCAPI bool isSpawned() const; /** - * @symbol ?isUsingItem\@Player\@\@QEBA_NXZ + * @symbol ?isUsingItem\@Player\@\@QEBA_NXZ */ MCAPI bool isUsingItem() const; /** - * @symbol ?loadLastDeathLocation\@Player\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?isValidSpawn\@Player\@\@QEBA_NXZ + */ + MCAPI bool isValidSpawn() const; + /** + * @symbol ?loadLastDeathLocation\@Player\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void loadLastDeathLocation(class CompoundTag const &); /** - * @symbol ?passengerCheckMovementStats\@Player\@\@QEAAXXZ + * @symbol ?passengerCheckMovementStats\@Player\@\@QEAAXXZ */ MCAPI void passengerCheckMovementStats(); /** - * @symbol ?recheckSpawnPosition\@Player\@\@QEAAXXZ + * @symbol ?recheckSpawnPosition\@Player\@\@QEAAXXZ */ MCAPI void recheckSpawnPosition(); /** - * @symbol ?releaseUsingItem\@Player\@\@QEAAXXZ + * @symbol ?releaseUsingItem\@Player\@\@QEAAXXZ */ MCAPI void releaseUsingItem(); /** - * @symbol ?resetPlayerLevel\@Player\@\@QEAAXXZ + * @symbol ?resetPlayerLevel\@Player\@\@QEAAXXZ */ MCAPI void resetPlayerLevel(); /** - * @symbol ?resetPublisherInitialSpawn\@Player\@\@QEAAXXZ + * @symbol ?resetPublisherInitialSpawn\@Player\@\@QEAAXXZ */ MCAPI void resetPublisherInitialSpawn(); /** - * @symbol ?resetToDefaultGameMode\@Player\@\@QEAAXXZ + * @symbol ?resetToDefaultGameMode\@Player\@\@QEAAXXZ */ MCAPI void resetToDefaultGameMode(); /** - * @symbol ?sendSpawnExperienceOrbPacketToServer\@Player\@\@QEAAXAEBVVec3\@\@H\@Z + * @symbol ?saveLastDeathLocation\@Player\@\@QEBAXAEAVCompoundTag\@\@\@Z + */ + MCAPI void saveLastDeathLocation(class CompoundTag &) const; + /** + * @symbol ?sendPlayerTeleported\@Player\@\@QEAAXXZ + */ + MCAPI void sendPlayerTeleported(); + /** + * @symbol ?sendSpawnExperienceOrbPacketToServer\@Player\@\@QEAAXAEBVVec3\@\@H\@Z */ MCAPI void sendSpawnExperienceOrbPacketToServer(class Vec3 const &, int); /** - * @symbol ?setAgent\@Player\@\@QEAAXPEAVAgent\@\@\@Z + * @symbol ?setAgent\@Player\@\@QEAAXPEAVAgent\@\@\@Z */ MCAPI void setAgent(class Agent *); /** - * @symbol ?setBedRespawnPosition\@Player\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setBedRespawnPosition\@Player\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setBedRespawnPosition(class BlockPos const &); /** - * @symbol ?setBlockRespawnUntilClientMessage\@Player\@\@QEAAX_N\@Z + * @symbol ?setBlockRespawnUntilClientMessage\@Player\@\@QEAAX_N\@Z */ MCAPI void setBlockRespawnUntilClientMessage(bool); /** - * @symbol ?setChunkRadius\@Player\@\@QEAAXI\@Z + * @symbol ?setChunkRadius\@Player\@\@QEAAXI\@Z */ MCAPI void setChunkRadius(unsigned int); /** - * @symbol ?setContainerManager\@Player\@\@QEAAXV?$shared_ptr\@VIContainerManager\@\@\@std\@\@\@Z + * @symbol ?setContainerManager\@Player\@\@QEAAXV?$shared_ptr\@VIContainerManager\@\@\@std\@\@\@Z */ MCAPI void setContainerManager(class std::shared_ptr); /** - * @symbol ?setCursorSelectedItem\@Player\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setCursorSelectedItem\@Player\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setCursorSelectedItem(class ItemStack const &); /** - * @symbol ?setCursorSelectedItemGroup\@Player\@\@QEAAXAEBVItemGroup\@\@\@Z + * @symbol ?setCursorSelectedItemGroup\@Player\@\@QEAAXAEBVItemGroup\@\@\@Z */ MCAPI void setCursorSelectedItemGroup(class ItemGroup const &); /** - * @symbol ?setEnchantmentSeed\@Player\@\@QEAAXH\@Z + * @symbol ?setEnchantmentSeed\@Player\@\@QEAAXH\@Z */ MCAPI void setEnchantmentSeed(int); /** - * @symbol ?setHasDied\@Player\@\@QEAAX_N\@Z + * @symbol ?setHasDied\@Player\@\@QEAAX_N\@Z */ MCAPI void setHasDied(bool); /** - * @symbol ?setHasSeenCredits\@Player\@\@QEAAX_N\@Z + * @symbol ?setHasSeenCredits\@Player\@\@QEAAX_N\@Z */ MCAPI void setHasSeenCredits(bool); /** - * @symbol ?setLastHurtBy\@Player\@\@QEAAXW4ActorType\@\@\@Z + * @symbol ?setLastHurtBy\@Player\@\@QEAAXW4ActorType\@\@\@Z */ MCAPI void setLastHurtBy(enum class ActorType); /** - * @symbol ?setMapIndex\@Player\@\@QEAAXH\@Z + * @symbol ?setMapIndex\@Player\@\@QEAAXH\@Z */ MCAPI void setMapIndex(int); /** - * @symbol ?setPermissions\@Player\@\@QEAAXW4CommandPermissionLevel\@\@\@Z + * @symbol ?setPermissions\@Player\@\@QEAAXW4CommandPermissionLevel\@\@\@Z */ MCAPI void setPermissions(enum class CommandPermissionLevel); /** - * @symbol ?setPlatformOnlineId\@Player\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setPlatformOnlineId\@Player\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setPlatformOnlineId(std::string const &); /** - * @symbol ?setPlayerIndex\@Player\@\@QEAAXH\@Z + * @symbol ?setPlayerIndex\@Player\@\@QEAAXH\@Z */ MCAPI void setPlayerIndex(int); /** - * @symbol ?setPlayerUIItem\@Player\@\@QEAAXW4PlayerUISlot\@\@AEBVItemStack\@\@\@Z + * @symbol ?setPlayerUIItem\@Player\@\@QEAAXW4PlayerUISlot\@\@AEBVItemStack\@\@\@Z */ MCAPI void setPlayerUIItem(enum class PlayerUISlot, class ItemStack const &); /** - * @symbol ?setRespawnPosition\@Player\@\@QEAAXAEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?setRespawnPosition\@Player\@\@QEAAXAEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void setRespawnPosition(class BlockPos const &, class AutomaticID); /** - * @symbol ?setRespawnPositionCandidate\@Player\@\@QEAAXXZ + * @symbol ?setRespawnPositionCandidate\@Player\@\@QEAAXXZ */ MCAPI void setRespawnPositionCandidate(); /** - * @symbol ?setRespawnReady\@Player\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setRespawnReady\@Player\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setRespawnReady(class Vec3 const &); /** - * @symbol ?setSelectedItem\@Player\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setSelectedItem\@Player\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setSelectedItem(class ItemStack const &); /** - * @symbol ?setSelectedSlot\@Player\@\@QEAAAEBVItemStack\@\@H\@Z + * @symbol ?setSelectedSlot\@Player\@\@QEAAAEBVItemStack\@\@H\@Z */ MCAPI class ItemStack const & setSelectedSlot(int); /** - * @symbol ?setSpawnBlockRespawnPosition\@Player\@\@QEAAXAEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?setSpawnBlockRespawnPosition\@Player\@\@QEAAXAEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void setSpawnBlockRespawnPosition(class BlockPos const &, class AutomaticID); /** - * @symbol ?setUsedPotion\@Player\@\@QEAAX_N\@Z + * @symbol ?setUsedPotion\@Player\@\@QEAAX_N\@Z */ MCAPI void setUsedPotion(bool); /** - * @symbol ?shouldShowCredits\@Player\@\@QEBA_NXZ + * @symbol ?shouldShowCredits\@Player\@\@QEBA_NXZ */ MCAPI bool shouldShowCredits() const; /** - * @symbol ?startCooldown\@Player\@\@QEAAXAEBVHashedString\@\@H_N\@Z + * @symbol ?startCooldown\@Player\@\@QEAAXAEBVHashedString\@\@H_N\@Z */ MCAPI void startCooldown(class HashedString const &, int, bool); /** - * @symbol ?startGliding\@Player\@\@QEAAXXZ + * @symbol ?startGliding\@Player\@\@QEAAXXZ */ MCAPI void startGliding(); /** - * @symbol ?startUsingItem\@Player\@\@QEAAXAEBVItemStack\@\@H\@Z + * @symbol ?startUsingItem\@Player\@\@QEAAXAEBVItemStack\@\@H\@Z */ MCAPI void startUsingItem(class ItemStack const &, int); /** - * @symbol ?stopGliding\@Player\@\@QEAAXXZ + * @symbol ?stopGliding\@Player\@\@QEAAXXZ */ MCAPI void stopGliding(); /** - * @symbol ?stopUsingItem\@Player\@\@QEAAXXZ + * @symbol ?stopUsingItem\@Player\@\@QEAAXXZ */ MCAPI void stopUsingItem(); /** - * @symbol ?take\@Player\@\@QEAA_NAEAVActor\@\@HH\@Z + * @symbol ?take\@Player\@\@QEAA_NAEAVActor\@\@HH\@Z */ MCAPI bool take(class Actor &, int, int); /** - * @symbol ?trySendPlayerTeleported\@Player\@\@QEAAXXZ - */ - MCAPI void trySendPlayerTeleported(); - /** - * @symbol ?updateBlockSourceTick\@Player\@\@QEAAXXZ + * @symbol ?updateBlockSourceTick\@Player\@\@QEAAXXZ */ MCAPI void updateBlockSourceTick(); /** - * @symbol ?updateInventoryTransactions\@Player\@\@QEAAXXZ + * @symbol ?updateInventoryTransactions\@Player\@\@QEAAXXZ */ MCAPI void updateInventoryTransactions(); /** - * @symbol ?updateSkin\@Player\@\@QEAAXAEBVSerializedSkin\@\@H\@Z + * @symbol ?updateSkin\@Player\@\@QEAAXAEBVSerializedSkin\@\@H\@Z */ MCAPI void updateSkin(class SerializedSkin const &, int); /** - * @symbol ?updateSpawnChunkView\@Player\@\@QEAAXXZ + * @symbol ?updateSpawnChunkView\@Player\@\@QEAAXXZ */ MCAPI void updateSpawnChunkView(); /** - * @symbol ?updateTrackedBosses\@Player\@\@QEAAXXZ + * @symbol ?updateTrackedBosses\@Player\@\@QEAAXXZ */ MCAPI void updateTrackedBosses(); /** - * @symbol ?useSelectedItem\@Player\@\@QEAAXW4ItemUseMethod\@\@_N\@Z + * @symbol ?useSelectedItem\@Player\@\@QEAAXW4ItemUseMethod\@\@_N\@Z */ MCAPI void useSelectedItem(enum class ItemUseMethod, bool); /** - * @symbol ?DEFAULT_BB_HEIGHT\@Player\@\@2MB + * @symbol ?DEFAULT_BB_HEIGHT\@Player\@\@2MB */ MCAPI static float const DEFAULT_BB_HEIGHT; /** - * @symbol ?DEFAULT_BB_WIDTH\@Player\@\@2MB + * @symbol ?DEFAULT_BB_WIDTH\@Player\@\@2MB */ MCAPI static float const DEFAULT_BB_WIDTH; /** - * @symbol ?DEFAULT_FLY_SPEED\@Player\@\@2MB - */ - MCAPI static float const DEFAULT_FLY_SPEED; - /** - * @symbol ?DEFAULT_PLAYER_HEIGHT_OFFSET\@Player\@\@2MB + * @symbol ?DEFAULT_PLAYER_HEIGHT_OFFSET\@Player\@\@2MB */ MCAPI static float const DEFAULT_PLAYER_HEIGHT_OFFSET; /** - * @symbol ?DEFAULT_WALK_SPEED\@Player\@\@2MB + * @symbol ?DEFAULT_WALK_SPEED\@Player\@\@2MB */ MCAPI static float const DEFAULT_WALK_SPEED; /** - * @symbol ?DISTANCE_TO_TRANSFORM_EVENT\@Player\@\@2MB + * @symbol ?DISTANCE_TO_TRANSFORM_EVENT\@Player\@\@2MB */ MCAPI static float const DISTANCE_TO_TRANSFORM_EVENT; /** - * @symbol ?DISTANCE_TO_TRAVELLED_EVENT\@Player\@\@2MB + * @symbol ?DISTANCE_TO_TRAVELLED_EVENT\@Player\@\@2MB */ MCAPI static float const DISTANCE_TO_TRAVELLED_EVENT; /** - * @symbol ?EXHAUSTION\@Player\@\@2VAttribute\@\@B + * @symbol ?EXHAUSTION\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const EXHAUSTION; /** - * @symbol ?EXPERIENCE\@Player\@\@2VAttribute\@\@B + * @symbol ?EXPERIENCE\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const EXPERIENCE; /** - * @symbol ?GLIDE_STOP_DELAY\@Player\@\@2HB + * @symbol ?GLIDE_STOP_DELAY\@Player\@\@2HB */ MCAPI static int const GLIDE_STOP_DELAY; /** - * @symbol ?HUNGER\@Player\@\@2VAttribute\@\@B + * @symbol ?HUNGER\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const HUNGER; /** - * @symbol ?ITEM_USE_INTERVAL_COUNT\@Player\@\@2HB + * @symbol ?ITEM_USE_INTERVAL_COUNT\@Player\@\@2HB */ MCAPI static int const ITEM_USE_INTERVAL_COUNT; /** - * @symbol ?ITEM_USE_INTERVAL_DURATION\@Player\@\@2HB + * @symbol ?ITEM_USE_INTERVAL_DURATION\@Player\@\@2HB */ MCAPI static int const ITEM_USE_INTERVAL_DURATION; /** - * @symbol ?LEVEL\@Player\@\@2VAttribute\@\@B + * @symbol ?LEVEL\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const LEVEL; /** - * @symbol ?MAX_ITEM_USE_DURATION\@Player\@\@2HB + * @symbol ?MAX_ITEM_USE_DURATION\@Player\@\@2HB */ MCAPI static int const MAX_ITEM_USE_DURATION; /** - * @symbol ?PLAYER_ALIVE_HEIGHT\@Player\@\@2MB + * @symbol ?PLAYER_ALIVE_HEIGHT\@Player\@\@2MB */ MCAPI static float const PLAYER_ALIVE_HEIGHT; /** - * @symbol ?PLAYER_ALIVE_WIDTH\@Player\@\@2MB + * @symbol ?PLAYER_ALIVE_WIDTH\@Player\@\@2MB */ MCAPI static float const PLAYER_ALIVE_WIDTH; /** - * @symbol ?PLAYER_DEAD_HEIGHT\@Player\@\@2MB + * @symbol ?PLAYER_DEAD_HEIGHT\@Player\@\@2MB */ MCAPI static float const PLAYER_DEAD_HEIGHT; /** - * @symbol ?PLAYER_DEAD_WIDTH\@Player\@\@2MB + * @symbol ?PLAYER_DEAD_WIDTH\@Player\@\@2MB */ MCAPI static float const PLAYER_DEAD_WIDTH; /** - * @symbol ?PLAYER_DIMENSION_CHANGE_OWNED_MOB_SEARCH_RADIUS\@Player\@\@2HB + * @symbol ?PLAYER_DIMENSION_CHANGE_OWNED_MOB_SEARCH_RADIUS\@Player\@\@2HB */ MCAPI static int const PLAYER_DIMENSION_CHANGE_OWNED_MOB_SEARCH_RADIUS; /** - * @symbol ?PLAYER_DOWN_SWIM_SPEED\@Player\@\@2MB + * @symbol ?PLAYER_DOWN_SWIM_SPEED\@Player\@\@2MB */ MCAPI static float const PLAYER_DOWN_SWIM_SPEED; /** - * @symbol ?PLAYER_GLIDING_CAMERA_OFFSET\@Player\@\@2MB + * @symbol ?PLAYER_GLIDING_CAMERA_OFFSET\@Player\@\@2MB */ MCAPI static float const PLAYER_GLIDING_CAMERA_OFFSET; /** - * @symbol ?PLAYER_ITEM_USE_DEFAULT_SPEED_MODIFIER\@Player\@\@2MB - */ - MCAPI static float const PLAYER_ITEM_USE_DEFAULT_SPEED_MODIFIER; - /** - * @symbol ?PLAYER_SLEEPING_CAMERA_OFFSET\@Player\@\@2MB + * @symbol ?PLAYER_SLEEPING_CAMERA_OFFSET\@Player\@\@2MB */ MCAPI static float const PLAYER_SLEEPING_CAMERA_OFFSET; /** - * @symbol ?PLAYER_SLEEPING_HEIGHT\@Player\@\@2MB + * @symbol ?PLAYER_SLEEPING_HEIGHT\@Player\@\@2MB */ MCAPI static float const PLAYER_SLEEPING_HEIGHT; /** - * @symbol ?PLAYER_SLEEPING_WIDTH\@Player\@\@2MB + * @symbol ?PLAYER_SLEEPING_WIDTH\@Player\@\@2MB */ MCAPI static float const PLAYER_SLEEPING_WIDTH; /** - * @symbol ?PLAYER_SNEAK_OFFSET\@Player\@\@2MB - */ - MCAPI static float const PLAYER_SNEAK_OFFSET; - /** - * @symbol ?PLAYER_SWIMMING_CAMERA_OFFSET\@Player\@\@2MB + * @symbol ?PLAYER_SWIMMING_CAMERA_OFFSET\@Player\@\@2MB */ MCAPI static float const PLAYER_SWIMMING_CAMERA_OFFSET; /** - * @symbol ?PLAYER_SWIM_BREACH_ANGLE\@Player\@\@2MB + * @symbol ?PLAYER_SWIM_BREACH_ANGLE\@Player\@\@2MB */ MCAPI static float const PLAYER_SWIM_BREACH_ANGLE; /** - * @symbol ?PLAYER_SWIM_ENTER_THRESHOLD\@Player\@\@2MB + * @symbol ?PLAYER_SWIM_ENTER_THRESHOLD\@Player\@\@2MB */ MCAPI static float const PLAYER_SWIM_ENTER_THRESHOLD; /** - * @symbol ?PLAYER_SWIM_FLY_MULTI\@Player\@\@2MB + * @symbol ?PLAYER_SWIM_FLY_MULTI\@Player\@\@2MB */ MCAPI static float const PLAYER_SWIM_FLY_MULTI; /** - * @symbol ?PLAYER_UP_SWIM_SPEED\@Player\@\@2MB + * @symbol ?PLAYER_UP_SWIM_SPEED\@Player\@\@2MB */ MCAPI static float const PLAYER_UP_SWIM_SPEED; /** - * @symbol ?SATURATION\@Player\@\@2VAttribute\@\@B + * @symbol ?SATURATION\@Player\@\@2VAttribute\@\@B */ MCAPI static class Attribute const SATURATION; /** - * @symbol ?SPAWN_CHUNK_LARGE_JUMP\@Player\@\@2IB + * @symbol ?SPAWN_CHUNK_LARGE_JUMP\@Player\@\@2IB */ MCAPI static unsigned int const SPAWN_CHUNK_LARGE_JUMP; /** - * @symbol ?SPAWN_CHUNK_RADIUS\@Player\@\@2IB + * @symbol ?SPAWN_CHUNK_RADIUS\@Player\@\@2IB */ MCAPI static unsigned int const SPAWN_CHUNK_RADIUS; /** - * @symbol ?_aiStep\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@\@Z + * @symbol ?_aiStep\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@\@Z */ MCAPI static void _aiStep(struct IPlayerMovementProxy &); /** - * @symbol ?_travel\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@MMM\@Z + * @symbol ?_travel\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@MMM_N\@Z */ - MCAPI static void _travel(struct IPlayerMovementProxy &, float, float, float); + MCAPI static void _travel(struct IPlayerMovementProxy &, float, float, float, bool); /** - * @symbol ?canJump\@Player\@\@SA_NAEAUIPlayerMovementProxy\@\@\@Z + * @symbol ?canJump\@Player\@\@SA_NAEAUIPlayerMovementProxy\@\@\@Z */ MCAPI static bool canJump(struct IPlayerMovementProxy &); /** - * @symbol ?checkAndFixSpawnPosition\@Player\@\@SA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@VAABB\@\@_N33333F\@Z + * @symbol ?checkAndFixSpawnPosition\@Player\@\@SA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@VAABB\@\@_N33333F\@Z */ MCAPI static bool checkAndFixSpawnPosition(class Vec3 &, std::vector>, class AABB, bool, bool, bool, bool, bool, bool, short); /** - * @symbol ?checkNeedAutoJump\@Player\@\@SA_NPEAUIPlayerMovementProxy\@\@MM\@Z + * @symbol ?checkNeedAutoJump\@Player\@\@SA_NPEAUIPlayerMovementProxy\@\@MM\@Z */ MCAPI static bool checkNeedAutoJump(struct IPlayerMovementProxy *, float, float); /** - * @symbol ?goDownInWater\@Player\@\@SAXAEAUIActorMovementProxy\@\@\@Z + * @symbol ?goDownInWater\@Player\@\@SAXAEAUIActorMovementProxy\@\@\@Z */ MCAPI static void goDownInWater(struct IActorMovementProxy &); /** - * @symbol ?handleJumpEffects\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@\@Z + * @symbol ?handleJumpEffects\@Player\@\@SAXAEAUIPlayerMovementProxy\@\@\@Z */ MCAPI static void handleJumpEffects(struct IPlayerMovementProxy &); /** - * @symbol ?isDangerousVolume\@Player\@\@SA_NAEAVBlockSource\@\@AEBVAABB\@\@_N\@Z + * @symbol ?isDangerousVolume\@Player\@\@SA_NAEAVBlockSource\@\@AEBVAABB\@\@_N\@Z */ MCAPI static bool isDangerousVolume(class BlockSource &, class AABB const &, bool); /** - * @symbol ?tryGetFromComponent\@Player\@\@SAPEAV1\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAVActorOwnerComponent\@\@_N\@Z + * @symbol ?tryGetFromComponent\@Player\@\@SAPEAV1\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAVActorOwnerComponent\@\@_N\@Z */ MCAPI static class Player * tryGetFromComponent(class FlagComponent const &, class ActorOwnerComponent &, bool); /** - * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ - MCAPI static class Player * tryGetFromEntity(class StackRefResultT, bool); + MCAPI static class Player * tryGetFromEntity(class EntityContext &, bool); /** - * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@Player\@\@SAPEBV1\@AEBVEntityContext\@\@_N\@Z */ - MCAPI static class Player * tryGetFromEntity(class EntityContext &, bool); + MCAPI static class Player const * tryGetFromEntity(class EntityContext const &, bool); + /** + * @symbol ?tryGetFromEntity\@Player\@\@SAPEAV1\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@_N\@Z + */ + MCAPI static class Player * tryGetFromEntity(class StackRefResultT, bool); //protected: /** - * @symbol ?_checkAndFixSpawnPosition\@Player\@\@IEBA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@_N2222\@Z + * @symbol ?_checkAndFixSpawnPosition\@Player\@\@IEBA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@_N2222\@Z */ MCAPI bool _checkAndFixSpawnPosition(class Vec3 &, std::vector>, bool, bool, bool, bool, bool) const; /** - * @symbol ?_chooseSpawnArea\@Player\@\@IEAAXXZ + * @symbol ?_chooseSpawnArea\@Player\@\@IEAAXXZ */ MCAPI void _chooseSpawnArea(); /** - * @symbol ?_chooseSpawnPositionWithinArea\@Player\@\@IEAA_NXZ + * @symbol ?_chooseSpawnPositionWithinArea\@Player\@\@IEAA_NXZ */ MCAPI bool _chooseSpawnPositionWithinArea(); /** - * @symbol ?_registerPlayerAttributes\@Player\@\@IEAAXXZ + * @symbol ?_registerPlayerAttributes\@Player\@\@IEAAXXZ */ MCAPI void _registerPlayerAttributes(); /** - * @symbol ?_setPreDimensionTransferSpawnPosition\@Player\@\@IEAAXVVec3\@\@\@Z + * @symbol ?_setPreDimensionTransferSpawnPosition\@Player\@\@IEAAXVVec3\@\@\@Z */ MCAPI void _setPreDimensionTransferSpawnPosition(class Vec3); /** - * @symbol ?_updateInteraction\@Player\@\@IEAAXXZ + * @symbol ?_updateInteraction\@Player\@\@IEAAXXZ */ MCAPI void _updateInteraction(); /** - * @symbol ?_validateSpawnPositionAvailability\@Player\@\@IEBA_NAEBVVec3\@\@PEAVBlockSource\@\@QEBV2\@\@Z + * @symbol ?_validateSpawnPositionAvailability\@Player\@\@IEBA_NAEBVVec3\@\@PEAVBlockSource\@\@QEBV2\@\@Z */ MCAPI bool _validateSpawnPositionAvailability(class Vec3 const &, class BlockSource *, class Vec3 const *const) const; /** - * @symbol ?checkBed\@Player\@\@IEAA_NPEAVBlockSource\@\@QEBVVec3\@\@\@Z + * @symbol ?checkBed\@Player\@\@IEAA_NPEAVBlockSource\@\@QEBVVec3\@\@\@Z */ MCAPI bool checkBed(class BlockSource *, class Vec3 const *const); /** - * @symbol ?checkSpawnBlock\@Player\@\@IEBA_NAEBVBlockSource\@\@\@Z + * @symbol ?checkSpawnBlock\@Player\@\@IEBA_NAEBVBlockSource\@\@\@Z */ MCAPI bool checkSpawnBlock(class BlockSource const &) const; /** - * @symbol ?_isDangerousBlock\@Player\@\@KA_NAEBVBlock\@\@_N\@Z + * @symbol ?_isDangerousBlock\@Player\@\@KA_NAEBVBlock\@\@_N\@Z */ MCAPI static bool _isDangerousBlock(class Block const &, bool); //private: /** - * @symbol ?_addLevels\@Player\@\@AEAAXH\@Z + * @symbol ?_addLevels\@Player\@\@AEAAXH\@Z */ MCAPI void _addLevels(int); /** - * @symbol ?_blockUsingShield\@Player\@\@AEAA_NAEBVActorDamageSource\@\@M\@Z + * @symbol ?_blockUsingShield\@Player\@\@AEAA_NAEBVActorDamageSource\@\@M\@Z */ MCAPI bool _blockUsingShield(class ActorDamageSource const &, float); /** - * @symbol ?_ensureSafeSpawnPosition\@Player\@\@AEAAXAEAVVec3\@\@\@Z + * @symbol ?_ensureSafeSpawnPosition\@Player\@\@AEAAXAEAVVec3\@\@\@Z */ MCAPI void _ensureSafeSpawnPosition(class Vec3 &); /** - * @symbol ?_findFallbackSpawnPosition\@Player\@\@AEAA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@I\@Z + * @symbol ?_findFallbackSpawnPosition\@Player\@\@AEAA_NAEAVVec3\@\@V?$vector\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@V?$allocator\@V?$not_null\@PEAVBlockSource\@\@\@gsl\@\@\@std\@\@\@std\@\@I\@Z */ MCAPI bool _findFallbackSpawnPosition(class Vec3 &, std::vector>, unsigned int); /** - * @symbol ?_handleCarriedItemInteractText\@Player\@\@AEAAXXZ + * @symbol ?_handleCarriedItemInteractText\@Player\@\@AEAAXXZ */ MCAPI void _handleCarriedItemInteractText(); /** - * @symbol ?_isChunkSourceLoaded\@Player\@\@AEBA_NAEBVVec3\@\@AEBVBlockSource\@\@\@Z + * @symbol ?_isChunkSourceLoaded\@Player\@\@AEBA_NAEBVVec3\@\@AEBVBlockSource\@\@\@Z */ MCAPI bool _isChunkSourceLoaded(class Vec3 const &, class BlockSource const &) const; /** - * @symbol ?_registerElytraLoopSound\@Player\@\@AEAAXXZ + * @symbol ?_registerElytraLoopSound\@Player\@\@AEAAXXZ */ MCAPI void _registerElytraLoopSound(); /** - * @symbol ?_sendShieldUpdatePacket\@Player\@\@AEAAXAEBVShieldItem\@\@AEBVItemStack\@\@1W4ContainerID\@\@H\@Z + * @symbol ?_sendShieldUpdatePacket\@Player\@\@AEAAXAEBVShieldItem\@\@AEBVItemStack\@\@1W4ContainerID\@\@H\@Z */ MCAPI void _sendShieldUpdatePacket(class ShieldItem const &, class ItemStack const &, class ItemStack const &, enum class ContainerID, int); /** - * @symbol ?_updateFroglightCountAndTestForAchievement\@Player\@\@AEAA_NAEBVItemStack\@\@0\@Z + * @symbol ?_updateFroglightCountAndTestForAchievement\@Player\@\@AEAA_NAEBVItemStack\@\@0\@Z */ MCAPI bool _updateFroglightCountAndTestForAchievement(class ItemStack const &, class ItemStack const &); @@ -2148,4 +2148,4 @@ class Player : public Mob { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerActionComponent.hpp b/LiteLoader/include/llapi/mc/PlayerActionComponent.hpp index ade50636d8..9fa0798159 100644 --- a/LiteLoader/include/llapi/mc/PlayerActionComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerActionComponent.hpp @@ -29,35 +29,35 @@ struct PlayerActionComponent { public: /** - * @symbol ??0PlayerActionComponent\@\@QEAA\@XZ + * @symbol ??0PlayerActionComponent\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI PlayerActionComponent(); + MCAPI PlayerActionComponent(struct PlayerActionComponent &&); /** - * @symbol ??0PlayerActionComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0PlayerActionComponent\@\@QEAA\@XZ */ - MCAPI PlayerActionComponent(struct PlayerActionComponent &&); + MCAPI PlayerActionComponent(); /** - * @symbol ?addAbortDestroyBlock\@PlayerActionComponent\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addAbortDestroyBlock\@PlayerActionComponent\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addAbortDestroyBlock(class BlockPos const &, int); /** - * @symbol ?addContinueDestroyBlock\@PlayerActionComponent\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addContinueDestroyBlock\@PlayerActionComponent\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addContinueDestroyBlock(class BlockPos const &, int); /** - * @symbol ?addStartDestroyBlock\@PlayerActionComponent\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addStartDestroyBlock\@PlayerActionComponent\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addStartDestroyBlock(class BlockPos const &, int); /** - * @symbol ?addStopDestroyBlock\@PlayerActionComponent\@\@QEAAXXZ + * @symbol ?addStopDestroyBlock\@PlayerActionComponent\@\@QEAAXXZ */ MCAPI void addStopDestroyBlock(); /** - * @symbol ??4PlayerActionComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PlayerActionComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PlayerActionComponent & operator=(struct PlayerActionComponent &&); /** - * @symbol ??1PlayerActionComponent\@\@QEAA\@XZ + * @symbol ??1PlayerActionComponent\@\@QEAA\@XZ */ MCAPI ~PlayerActionComponent(); diff --git a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp index d398ff51ab..f4c1329a1c 100644 --- a/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerActionPacket.hpp @@ -73,53 +73,59 @@ class PlayerActionPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerActionPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerActionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerActionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerActionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerActionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerActionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerActionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerActionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERACTIONPACKET /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI PlayerActionPacket(); + MCVAPI ~PlayerActionPacket(); +#endif /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@1HVActorRuntimeID\@\@\@Z */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class ActorRuntimeID); + MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class BlockPos const &, int, class ActorRuntimeID); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@VActorRuntimeID\@\@\@Z + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@VActorRuntimeID\@\@\@Z */ MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class ActorRuntimeID); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@HVActorRuntimeID\@\@\@Z + * @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\@W4PlayerActionType\@\@AEBVBlockPos\@\@EVActorRuntimeID\@\@\@Z + * @symbol ??0PlayerActionPacket\@\@QEAA\@XZ */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, unsigned char, class ActorRuntimeID); + MCAPI PlayerActionPacket(); /** - * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@AEBVBlockPos\@\@1HVActorRuntimeID\@\@\@Z + * @symbol ??0PlayerActionPacket\@\@QEAA\@W4PlayerActionType\@\@VActorRuntimeID\@\@\@Z */ - MCAPI PlayerActionPacket(enum class PlayerActionType, class BlockPos const &, class BlockPos const &, int, class ActorRuntimeID); + MCAPI PlayerActionPacket(enum class PlayerActionType, class ActorRuntimeID); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerAddEvent.hpp b/LiteLoader/include/llapi/mc/PlayerAddEvent.hpp index d24452a3a3..d357637a3c 100644 --- a/LiteLoader/include/llapi/mc/PlayerAddEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAddEvent.hpp @@ -25,7 +25,7 @@ struct PlayerAddEvent { public: /** - * @symbol ??1PlayerAddEvent\@\@QEAA\@XZ + * @symbol ??1PlayerAddEvent\@\@QEAA\@XZ */ MCAPI ~PlayerAddEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerAddExpEvent.hpp b/LiteLoader/include/llapi/mc/PlayerAddExpEvent.hpp index cb6412761e..b7d76659b2 100644 --- a/LiteLoader/include/llapi/mc/PlayerAddExpEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAddExpEvent.hpp @@ -25,7 +25,7 @@ struct PlayerAddExpEvent { public: /** - * @symbol ??1PlayerAddExpEvent\@\@QEAA\@XZ + * @symbol ??1PlayerAddExpEvent\@\@QEAA\@XZ */ MCAPI ~PlayerAddExpEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerAddLevelEvent.hpp b/LiteLoader/include/llapi/mc/PlayerAddLevelEvent.hpp index 95bdf6e8e9..077f229ca1 100644 --- a/LiteLoader/include/llapi/mc/PlayerAddLevelEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAddLevelEvent.hpp @@ -25,7 +25,7 @@ struct PlayerAddLevelEvent { public: /** - * @symbol ??1PlayerAddLevelEvent\@\@QEAA\@XZ + * @symbol ??1PlayerAddLevelEvent\@\@QEAA\@XZ */ MCAPI ~PlayerAddLevelEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp index a653fbaf56..0a7dae085d 100644 --- a/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerArmorDamagePacket.hpp @@ -31,29 +31,35 @@ class PlayerArmorDamagePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerArmorDamagePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerArmorDamagePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerArmorDamagePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerArmorDamagePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerArmorDamagePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerArmorDamagePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerArmorDamagePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerArmorDamagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERARMORDAMAGEPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerArmorDamagePacket(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerArmorExchangeEvent.hpp b/LiteLoader/include/llapi/mc/PlayerArmorExchangeEvent.hpp index cbac86217f..bee2b05c58 100644 --- a/LiteLoader/include/llapi/mc/PlayerArmorExchangeEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerArmorExchangeEvent.hpp @@ -27,11 +27,11 @@ struct PlayerArmorExchangeEvent { public: /** - * @symbol ??0PlayerArmorExchangeEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0PlayerArmorExchangeEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI PlayerArmorExchangeEvent(struct PlayerArmorExchangeEvent const &); /** - * @symbol ??1PlayerArmorExchangeEvent\@\@QEAA\@XZ + * @symbol ??1PlayerArmorExchangeEvent\@\@QEAA\@XZ */ MCAPI ~PlayerArmorExchangeEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp index da30e3b762..c7a76c1ba6 100644 --- a/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerAuthInputPacket.hpp @@ -32,57 +32,68 @@ enum class InputData; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerAuthInputPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerAuthInputPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerAuthInputPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerAuthInputPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerAuthInputPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerAuthInputPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerAuthInputPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 6 + * @symbol ?isValid\@PlayerAuthInputPacket\@\@UEBA_NXZ + */ + virtual bool isValid() const; + /** + * @vftbl 7 + * @symbol ?_read\@PlayerAuthInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERAUTHINPUTPACKET /** - * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI PlayerAuthInputPacket(); + MCVAPI ~PlayerAuthInputPacket(); +#endif /** - * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI PlayerAuthInputPacket(class PlayerAuthInputPacket &&); /** - * @symbol ?getInput\@PlayerAuthInputPacket\@\@QEBA_NW4InputData\@1\@\@Z + * @symbol ??0PlayerAuthInputPacket\@\@QEAA\@XZ + */ + MCAPI PlayerAuthInputPacket(); + /** + * @symbol ?getInput\@PlayerAuthInputPacket\@\@QEBA_NW4InputData\@1\@\@Z */ MCAPI bool getInput(enum class PlayerAuthInputPacket::InputData) const; /** - * @symbol ??4PlayerAuthInputPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4PlayerAuthInputPacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class PlayerAuthInputPacket & operator=(class PlayerAuthInputPacket &&); /** - * @symbol ?readIntoComponent\@PlayerAuthInputPacket\@\@QEBA?AUPlayerActionComponent\@\@XZ + * @symbol ?readIntoComponent\@PlayerAuthInputPacket\@\@QEBA?AUPlayerActionComponent\@\@XZ */ MCAPI struct PlayerActionComponent readIntoComponent() const; /** - * @symbol ?setInput\@PlayerAuthInputPacket\@\@QEAAXW4InputData\@1\@_N\@Z + * @symbol ?setInput\@PlayerAuthInputPacket\@\@QEAAXW4InputData\@1\@_N\@Z */ MCAPI void setInput(enum class PlayerAuthInputPacket::InputData, bool); /** - * @symbol ?takeCopy\@PlayerAuthInputPacket\@\@QEBA?AV1\@XZ + * @symbol ?takeCopy\@PlayerAuthInputPacket\@\@QEBA?AV1\@XZ */ MCAPI class PlayerAuthInputPacket takeCopy() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp b/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp index 2712fedf83..6c7a4b9347 100644 --- a/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp +++ b/LiteLoader/include/llapi/mc/PlayerBlockActions.hpp @@ -30,44 +30,44 @@ class PlayerBlockActions { public: /** - * @symbol ?addAbortDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addAbortDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addAbortDestroyBlock(class BlockPos const &, int); /** - * @symbol ?addContinueDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addContinueDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addContinueDestroyBlock(class BlockPos const &, int); /** - * @symbol ?addStartDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addStartDestroyBlock\@PlayerBlockActions\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addStartDestroyBlock(class BlockPos const &, int); /** - * @symbol ?addStopDestroyBlock\@PlayerBlockActions\@\@QEAAXXZ + * @symbol ?addStopDestroyBlock\@PlayerBlockActions\@\@QEAAXXZ */ MCAPI void addStopDestroyBlock(); /** - * @symbol ?findFirstOfType\@PlayerBlockActions\@\@QEBAPEBUPlayerBlockActionData\@\@W4PlayerActionType\@\@\@Z + * @symbol ?findFirstOfType\@PlayerBlockActions\@\@QEBAPEBUPlayerBlockActionData\@\@W4PlayerActionType\@\@\@Z */ MCAPI struct PlayerBlockActionData const * findFirstOfType(enum class PlayerActionType) const; /** - * @symbol ?get\@PlayerBlockActions\@\@QEBA?AV?$span\@$$CBUPlayerBlockActionData\@\@$0?0\@gsl\@\@XZ + * @symbol ?get\@PlayerBlockActions\@\@QEBA?AV?$span\@$$CBUPlayerBlockActionData\@\@$0?0\@gsl\@\@XZ */ MCAPI class gsl::span get() const; /** - * @symbol ??4PlayerBlockActions\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4PlayerBlockActions\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class PlayerBlockActions & operator=(class PlayerBlockActions &&); /** - * @symbol ??1PlayerBlockActions\@\@QEAA\@XZ + * @symbol ??1PlayerBlockActions\@\@QEAA\@XZ */ MCAPI ~PlayerBlockActions(); /** - * @symbol ?read\@PlayerBlockActions\@\@SA?AV1\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerBlockActions\@\@SA?AV1\@AEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI static class PlayerBlockActions read(class ReadOnlyBinaryStream &); /** - * @symbol ?write\@PlayerBlockActions\@\@SAXAEBV1\@AEAVBinaryStream\@\@\@Z + * @symbol ?write\@PlayerBlockActions\@\@SAXAEBV1\@AEAVBinaryStream\@\@\@Z */ MCAPI static void write(class PlayerBlockActions const &, class BinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp b/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp index 6b61c55d04..83c29742e6 100644 --- a/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/PlayerCapabilities.hpp @@ -27,7 +27,7 @@ struct ISharedController { #undef AFTER_EXTRA /** - * @symbol ?createController\@PlayerCapabilities\@\@YA?AV?$unique_ptr\@UISharedController\@PlayerCapabilities\@\@U?$default_delete\@UISharedController\@PlayerCapabilities\@\@\@std\@\@\@std\@\@AEBVLevel\@\@\@Z + * @symbol ?createController\@PlayerCapabilities\@\@YA?AV?$unique_ptr\@UISharedController\@PlayerCapabilities\@\@U?$default_delete\@UISharedController\@PlayerCapabilities\@\@\@std\@\@\@std\@\@AEBVLevel\@\@\@Z */ MCAPI std::unique_ptr createController(class Level const &); diff --git a/LiteLoader/include/llapi/mc/PlayerChangeDimensionRequestComponent.hpp b/LiteLoader/include/llapi/mc/PlayerChangeDimensionRequestComponent.hpp index e37ba0c959..b0dfffc4da 100644 --- a/LiteLoader/include/llapi/mc/PlayerChangeDimensionRequestComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerChangeDimensionRequestComponent.hpp @@ -25,11 +25,11 @@ struct PlayerChangeDimensionRequestComponent { public: /** - * @symbol ??4PlayerChangeDimensionRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PlayerChangeDimensionRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PlayerChangeDimensionRequestComponent & operator=(struct PlayerChangeDimensionRequestComponent &&); /** - * @symbol ??1PlayerChangeDimensionRequestComponent\@\@QEAA\@XZ + * @symbol ??1PlayerChangeDimensionRequestComponent\@\@QEAA\@XZ */ MCAPI ~PlayerChangeDimensionRequestComponent(); diff --git a/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp index 2dcdbcc7a6..0e6610398d 100644 --- a/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/PlayerCommandOrigin.hpp @@ -32,117 +32,117 @@ class PlayerCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@PlayerCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@PlayerCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@PlayerCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@PlayerCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@PlayerCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@PlayerCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@PlayerCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@PlayerCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@PlayerCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@PlayerCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@PlayerCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@PlayerCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@PlayerCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@PlayerCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@PlayerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@PlayerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@PlayerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@PlayerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 11 - * @symbol ?getCursorHitBlockPos\@PlayerCommandOrigin\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @vftbl 11 + * @symbol ?getCursorHitBlockPos\@PlayerCommandOrigin\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ virtual class std::optional getCursorHitBlockPos() const; /** - * @vftbl 12 - * @symbol ?getCursorHitPos\@PlayerCommandOrigin\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ + * @vftbl 12 + * @symbol ?getCursorHitPos\@PlayerCommandOrigin\@\@UEBA?AV?$optional\@VVec3\@\@\@std\@\@XZ */ virtual class std::optional getCursorHitPos() const; /** - * @vftbl 15 - * @symbol ?canUseAbility\@PlayerCommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z + * @vftbl 15 + * @symbol ?canUseAbility\@PlayerCommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z */ virtual bool canUseAbility(enum class AbilitiesIndex) const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@PlayerCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@PlayerCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 19 - * @symbol ?getSourceId\@PlayerCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ + * @vftbl 19 + * @symbol ?getSourceId\@PlayerCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ */ virtual class NetworkIdentifier const & getSourceId() const; /** - * @vftbl 20 - * @symbol ?getSourceSubId\@PlayerCommandOrigin\@\@UEBA?AW4SubClientId\@\@XZ + * @vftbl 20 + * @symbol ?getSourceSubId\@PlayerCommandOrigin\@\@UEBA?AW4SubClientId\@\@XZ */ virtual enum class SubClientId getSourceSubId() const; /** - * @vftbl 22 - * @symbol ?getIdentity\@PlayerCommandOrigin\@\@UEBA?AUCommandOriginIdentity\@\@XZ + * @vftbl 22 + * @symbol ?getIdentity\@PlayerCommandOrigin\@\@UEBA?AUCommandOriginIdentity\@\@XZ */ virtual struct CommandOriginIdentity getIdentity() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@PlayerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@PlayerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@PlayerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@PlayerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@PlayerCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@PlayerCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0PlayerCommandOrigin\@\@QEAA\@AEAVPlayer\@\@\@Z + * @symbol ??0PlayerCommandOrigin\@\@QEAA\@AEAVPlayer\@\@\@Z */ MCAPI PlayerCommandOrigin(class Player &); /** - * @symbol ?load\@PlayerCommandOrigin\@\@SA?AV?$unique_ptr\@VPlayerCommandOrigin\@\@U?$default_delete\@VPlayerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@PlayerCommandOrigin\@\@SA?AV?$unique_ptr\@VPlayerCommandOrigin\@\@U?$default_delete\@VPlayerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class Level &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerContainerSetter.hpp b/LiteLoader/include/llapi/mc/PlayerContainerSetter.hpp index 274fd6d49e..47f05da284 100644 --- a/LiteLoader/include/llapi/mc/PlayerContainerSetter.hpp +++ b/LiteLoader/include/llapi/mc/PlayerContainerSetter.hpp @@ -30,28 +30,28 @@ class PlayerContainerSetter { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerContainerSetter(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setArmor\@PlayerContainerSetter\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 1 + * @symbol ?setArmor\@PlayerContainerSetter\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setArmor(int, class ItemStack const &); /** - * @vftbl 2 - * @symbol ?setOffhandSlot\@PlayerContainerSetter\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 2 + * @symbol ?setOffhandSlot\@PlayerContainerSetter\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 3 - * @symbol ?setPlayerUIItem\@PlayerContainerSetter\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 3 + * @symbol ?setPlayerUIItem\@PlayerContainerSetter\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setPlayerUIItem(int, class ItemStack const &); /** - * @symbol ??0PlayerContainerSetter\@\@QEAA\@AEAVPlayer\@\@\@Z + * @symbol ??0PlayerContainerSetter\@\@QEAA\@AEAVPlayer\@\@\@Z */ MCAPI PlayerContainerSetter(class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerDamageEvent.hpp b/LiteLoader/include/llapi/mc/PlayerDamageEvent.hpp index a04f6a77fd..14cd874727 100644 --- a/LiteLoader/include/llapi/mc/PlayerDamageEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerDamageEvent.hpp @@ -28,11 +28,11 @@ struct PlayerDamageEvent { public: /** - * @symbol ??0PlayerDamageEvent\@\@QEAA\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0PlayerDamageEvent\@\@QEAA\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$unique_ptr\@VActorDamageSource\@\@U?$default_delete\@VActorDamageSource\@\@\@std\@\@\@std\@\@\@Z */ MCAPI PlayerDamageEvent(class WeakRefT, std::unique_ptr); /** - * @symbol ??1PlayerDamageEvent\@\@QEAA\@XZ + * @symbol ??1PlayerDamageEvent\@\@QEAA\@XZ */ MCAPI ~PlayerDamageEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp index c50c526558..ad7dca2498 100644 --- a/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerDataSystem.hpp @@ -23,48 +23,48 @@ namespace PlayerDataSystem { #undef AFTER_EXTRA /** - * @symbol ?forEachIdByPrecedence\@PlayerDataSystem\@\@YAXAEBUPlayerStorageIds\@\@V?$function\@$$A6A_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z\@std\@\@\@Z + * @symbol ?forEachIdByPrecedence\@PlayerDataSystem\@\@YAXAEBUPlayerStorageIds\@\@V?$function\@$$A6A_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z\@std\@\@\@Z */ MCAPI void forEachIdByPrecedence(struct PlayerStorageIds const &, class std::function); /** - * @symbol ?getPlayerFilename\@PlayerDataSystem\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPlayerFilename\@PlayerDataSystem\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class Core::PathBuffer getPlayerFilename(class Core::Path const &, std::string const &); /** - * @symbol ?getServerId\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBUPlayerStorageIds\@\@\@Z + * @symbol ?getServerId\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBUPlayerStorageIds\@\@\@Z */ MCAPI std::string getServerId(class LevelStorage &, struct PlayerStorageIds const &); /** - * @symbol ?legacyLoadClientPlayer\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVPath\@Core\@\@\@Z + * @symbol ?legacyLoadClientPlayer\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVPath\@Core\@\@\@Z */ MCAPI std::unique_ptr legacyLoadClientPlayer(std::string const &, class Core::Path const &); /** - * @symbol ?legacyLoadPlayer\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?legacyLoadPlayer\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::unique_ptr legacyLoadPlayer(class LevelStorage &, std::string const &); /** - * @symbol ?loadLocalPlayerData\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?loadLocalPlayerData\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z */ MCAPI std::unique_ptr loadLocalPlayerData(class LevelStorage &); /** - * @symbol ?loadPlayerData\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBUPlayerStorageIds\@\@_N\@Z + * @symbol ?loadPlayerData\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBUPlayerStorageIds\@\@_N\@Z */ MCAPI std::unique_ptr loadPlayerData(class LevelStorage &, struct PlayerStorageIds const &, bool); /** - * @symbol ?loadPlayerDataFromTag\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?loadPlayerDataFromTag\@PlayerDataSystem\@\@YA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::unique_ptr loadPlayerDataFromTag(class LevelStorage &, class gsl::basic_string_span); + MCAPI std::unique_ptr loadPlayerDataFromTag(class LevelStorage &, class std::basic_string_view>); /** - * @symbol ?playerKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?playerKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string playerKey(class gsl::basic_string_span); + MCAPI std::string playerKey(class std::basic_string_view>); /** - * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBVPlayer\@\@\@Z + * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string serverKey(class LevelStorage &, class Player const &); + MCAPI std::string serverKey(class LevelStorage &, class std::basic_string_view>); /** - * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?serverKey\@PlayerDataSystem\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@AEBVPlayer\@\@\@Z */ - MCAPI std::string serverKey(class LevelStorage &, class gsl::basic_string_span); + MCAPI std::string serverKey(class LevelStorage &, class Player const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerDestroyBlockEvent.hpp b/LiteLoader/include/llapi/mc/PlayerDestroyBlockEvent.hpp index 5ee407a1f9..91a8e59b5e 100644 --- a/LiteLoader/include/llapi/mc/PlayerDestroyBlockEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerDestroyBlockEvent.hpp @@ -25,7 +25,7 @@ struct PlayerDestroyBlockEvent { public: /** - * @symbol ??1PlayerDestroyBlockEvent\@\@QEAA\@XZ + * @symbol ??1PlayerDestroyBlockEvent\@\@QEAA\@XZ */ MCAPI ~PlayerDestroyBlockEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerDropItemEvent.hpp b/LiteLoader/include/llapi/mc/PlayerDropItemEvent.hpp index eb4a471b71..391ef813c5 100644 --- a/LiteLoader/include/llapi/mc/PlayerDropItemEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerDropItemEvent.hpp @@ -25,7 +25,7 @@ struct PlayerDropItemEvent { public: /** - * @symbol ??1PlayerDropItemEvent\@\@QEAA\@XZ + * @symbol ??1PlayerDropItemEvent\@\@QEAA\@XZ */ MCAPI ~PlayerDropItemEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerEatFoodEvent.hpp b/LiteLoader/include/llapi/mc/PlayerEatFoodEvent.hpp index 59e72bca4c..24eecf156c 100644 --- a/LiteLoader/include/llapi/mc/PlayerEatFoodEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEatFoodEvent.hpp @@ -25,7 +25,7 @@ struct PlayerEatFoodEvent { public: /** - * @symbol ??1PlayerEatFoodEvent\@\@QEAA\@XZ + * @symbol ??1PlayerEatFoodEvent\@\@QEAA\@XZ */ MCAPI ~PlayerEatFoodEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp index 8bd5c7a6b5..2378b32a0d 100644 --- a/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEnchantOptionsPacket.hpp @@ -31,29 +31,35 @@ class PlayerEnchantOptionsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerEnchantOptionsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerEnchantOptionsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerEnchantOptionsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerEnchantOptionsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerEnchantOptionsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerEnchantOptionsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerEnchantOptionsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerEnchantOptionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERENCHANTOPTIONSPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerEnchantOptionsPacket(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp b/LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp index 7afd612983..e155b529df 100644 --- a/LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEventCoordinator.hpp @@ -31,56 +31,56 @@ class PlayerEventCoordinator { public: /** - * @symbol ?registerPlayerGameplayHandler\@PlayerEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VPlayerGameplayHandler\@\@U?$default_delete\@VPlayerGameplayHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerPlayerGameplayHandler\@PlayerEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VPlayerGameplayHandler\@\@U?$default_delete\@VPlayerGameplayHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerPlayerGameplayHandler(std::unique_ptr &&); /** - * @symbol ?sendEvent\@PlayerEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$PlayerGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@PlayerEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$PlayerGameplayEvent\@X\@\@\@\@\@Z */ - MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); + MCAPI void sendEvent(class EventRef> const &); /** - * @symbol ?sendEvent\@PlayerEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$PlayerGameplayEvent\@X\@\@\@\@\@Z + * @symbol ?sendEvent\@PlayerEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@AEBV?$EventRef\@U?$PlayerGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ - MCAPI void sendEvent(class EventRef> const &); + MCAPI enum class CoordinatorResult sendEvent(class EventRef> const &); /** - * @symbol ?sendPlayerAwardAchievement\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@\@Z + * @symbol ?sendPlayerAwardAchievement\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@\@Z */ MCAPI void sendPlayerAwardAchievement(class Player &, enum class MinecraftEventing::AchievementIds); /** - * @symbol ?sendPlayerCaravanChanged\@PlayerEventCoordinator\@\@QEAAXAEBVActor\@\@H\@Z + * @symbol ?sendPlayerCaravanChanged\@PlayerEventCoordinator\@\@QEAAXAEBVActor\@\@H\@Z */ MCAPI void sendPlayerCaravanChanged(class Actor const &, int); /** - * @symbol ?sendPlayerDestroyedBlock\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@HHH\@Z + * @symbol ?sendPlayerDestroyedBlock\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@HHH\@Z */ MCAPI void sendPlayerDestroyedBlock(class Player &, int, int, int); /** - * @symbol ?sendPlayerItemEquipped\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVItemInstance\@\@H\@Z + * @symbol ?sendPlayerItemEquipped\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVItemInstance\@\@H\@Z */ MCAPI void sendPlayerItemEquipped(class Player &, class ItemInstance const &, int); /** - * @symbol ?sendPlayerItemPlaceInteraction\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVItemInstance\@\@\@Z + * @symbol ?sendPlayerItemPlaceInteraction\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVItemInstance\@\@\@Z */ MCAPI void sendPlayerItemPlaceInteraction(class Player &, class ItemInstance const &); /** - * @symbol ?sendPlayerItemUseInteraction\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVItemInstance\@\@\@Z + * @symbol ?sendPlayerItemUseInteraction\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVItemInstance\@\@\@Z */ MCAPI void sendPlayerItemUseInteraction(class Player &, class ItemInstance const &); /** - * @symbol ?sendPlayerMove\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerMove\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerMove(class Player &); /** - * @symbol ?sendPlayerSlide\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerSlide\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerSlide(class Player &); /** - * @symbol ?sendPlayerTeleported\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerTeleported\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerTeleported(class Player &); /** - * @symbol ?sendPlayerTick\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerTick\@PlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerTick(class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerEventListener.hpp b/LiteLoader/include/llapi/mc/PlayerEventListener.hpp index 99471bd834..ab938ef656 100644 --- a/LiteLoader/include/llapi/mc/PlayerEventListener.hpp +++ b/LiteLoader/include/llapi/mc/PlayerEventListener.hpp @@ -31,169 +31,169 @@ class PlayerEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYEREVENTLISTENER /** - * @symbol ?onCameraSetPlayerRot\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec2\@\@\@Z + * @symbol ?onCameraSetPlayerRot\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec2\@\@\@Z */ MCVAPI enum class EventResult onCameraSetPlayerRot(class Player &, class Vec2 const &); /** - * @symbol ?onEvent\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEBUPlayerNotificationEvent\@\@\@Z + * @symbol ?onEvent\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEBUPlayerNotificationEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct PlayerNotificationEvent const &); /** - * @symbol ?onLocalPlayerDeath\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVIClientInstance\@\@AEAVLocalPlayer\@\@\@Z + * @symbol ?onLocalPlayerDeath\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVIClientInstance\@\@AEAVLocalPlayer\@\@\@Z */ MCVAPI enum class EventResult onLocalPlayerDeath(class IClientInstance &, class LocalPlayer &); /** - * @symbol ?onLocalPlayerRespawn\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVIClientInstance\@\@AEAVLocalPlayer\@\@\@Z + * @symbol ?onLocalPlayerRespawn\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVIClientInstance\@\@AEAVLocalPlayer\@\@\@Z */ MCVAPI enum class EventResult onLocalPlayerRespawn(class IClientInstance &, class LocalPlayer &); /** - * @symbol ?onPlayerAIStepBegin\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerAIStepBegin\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerAIStepBegin(class Player &); /** - * @symbol ?onPlayerAIStepEnd\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerAIStepEnd\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerAIStepEnd(class Player &); /** - * @symbol ?onPlayerAction\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@W4PlayerActionType\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?onPlayerAction\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@W4PlayerActionType\@\@AEBVBlockPos\@\@H\@Z */ MCVAPI enum class EventResult onPlayerAction(class Player &, enum class PlayerActionType, class BlockPos const &, int); /** - * @symbol ?onPlayerAttackedActor\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVActor\@\@\@Z + * @symbol ?onPlayerAttackedActor\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onPlayerAttackedActor(class Player &, class Actor &); /** - * @symbol ?onPlayerAuthInputApplied\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerAuthInputApplied\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerAuthInputApplied(class Player &); /** - * @symbol ?onPlayerAuthInputReceived\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerAuthInputReceived\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerAuthInputReceived(class Player &); /** - * @symbol ?onPlayerAwardAchievement\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@\@Z + * @symbol ?onPlayerAwardAchievement\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@W4AchievementIds\@MinecraftEventing\@\@\@Z */ MCVAPI enum class EventResult onPlayerAwardAchievement(class Player &, enum class MinecraftEventing::AchievementIds); /** - * @symbol ?onPlayerCaravanChanged\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEBVActor\@\@H\@Z + * @symbol ?onPlayerCaravanChanged\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEBVActor\@\@H\@Z */ MCVAPI enum class EventResult onPlayerCaravanChanged(class Actor const &, int); /** - * @symbol ?onPlayerCraftedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@_N22HHH22AEBV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@Z + * @symbol ?onPlayerCraftedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@_N22HHH22AEBV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@Z */ MCVAPI enum class EventResult onPlayerCraftedItem(class Player &, class ItemInstance const &, bool, bool, bool, int, int, int, bool, bool, std::vector const &); /** - * @symbol ?onPlayerCreated\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVLocalPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z + * @symbol ?onPlayerCreated\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVLocalPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1_N\@Z */ MCVAPI enum class EventResult onPlayerCreated(class LocalPlayer &, std::string const &, std::string const &, bool); /** - * @symbol ?onPlayerDestroyedBlock\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@HHH\@Z + * @symbol ?onPlayerDestroyedBlock\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@HHH\@Z */ MCVAPI enum class EventResult onPlayerDestroyedBlock(class Player &, int, int, int); /** - * @symbol ?onPlayerDestroyedBlock\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@\@Z + * @symbol ?onPlayerDestroyedBlock\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@\@Z */ MCVAPI enum class EventResult onPlayerDestroyedBlock(class Player &, class Block const &); /** - * @symbol ?onPlayerEnchantedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemStack\@\@AEBVItemEnchants\@\@\@Z + * @symbol ?onPlayerEnchantedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemStack\@\@AEBVItemEnchants\@\@\@Z */ MCVAPI enum class EventResult onPlayerEnchantedItem(class Player &, class ItemStack const &, class ItemEnchants const &); /** - * @symbol ?onPlayerEquippedArmor\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?onPlayerEquippedArmor\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@\@Z */ MCVAPI enum class EventResult onPlayerEquippedArmor(class Player &, class ItemDescriptor const &); /** - * @symbol ?onPlayerInput\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z + * @symbol ?onPlayerInput\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z */ MCVAPI enum class EventResult onPlayerInput(struct IPlayerMovementProxy &, class MoveInputHandler &); /** - * @symbol ?onPlayerItemEquipped\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@H\@Z + * @symbol ?onPlayerItemEquipped\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@H\@Z */ MCVAPI enum class EventResult onPlayerItemEquipped(class Player &, class ItemInstance const &, int); /** - * @symbol ?onPlayerItemPlaceInteraction\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@\@Z + * @symbol ?onPlayerItemPlaceInteraction\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@\@Z */ MCVAPI enum class EventResult onPlayerItemPlaceInteraction(class Player &, class ItemInstance const &); /** - * @symbol ?onPlayerItemUseInteraction\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@\@Z + * @symbol ?onPlayerItemUseInteraction\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemInstance\@\@\@Z */ MCVAPI enum class EventResult onPlayerItemUseInteraction(class Player &, class ItemInstance const &); /** - * @symbol ?onPlayerMove\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerMove\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerMove(class Player &); /** - * @symbol ?onPlayerMovementAnomaly\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z + * @symbol ?onPlayerMovementAnomaly\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z */ MCVAPI enum class EventResult onPlayerMovementAnomaly(class Player &, class Vec3 const &, float, float); /** - * @symbol ?onPlayerMovementCorrected\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z + * @symbol ?onPlayerMovementCorrected\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z */ MCVAPI enum class EventResult onPlayerMovementCorrected(class Player &, class Vec3 const &, float, float); /** - * @symbol ?onPlayerMovementRewindCorrected\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@_K\@Z + * @symbol ?onPlayerMovementRewindCorrected\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@_K\@Z */ MCVAPI enum class EventResult onPlayerMovementRewindCorrected(class Player &, unsigned __int64); /** - * @symbol ?onPlayerNamedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?onPlayerNamedItem\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVItemDescriptor\@\@\@Z */ MCVAPI enum class EventResult onPlayerNamedItem(class Player &, class ItemDescriptor const &); /** - * @symbol ?onPlayerOnGround\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerOnGround\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerOnGround(class Player &); /** - * @symbol ?onPlayerPiglinBarter\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?onPlayerPiglinBarter\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCVAPI enum class EventResult onPlayerPiglinBarter(class Player &, std::string const &, bool); /** - * @symbol ?onPlayerPortalBuilt\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?onPlayerPortalBuilt\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI enum class EventResult onPlayerPortalBuilt(class Player &, class AutomaticID); /** - * @symbol ?onPlayerPortalUsed\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z + * @symbol ?onPlayerPortalUsed\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@V?$AutomaticID\@VDimension\@\@H\@\@1\@Z */ MCVAPI enum class EventResult onPlayerPortalUsed(class Player &, class AutomaticID, class AutomaticID); /** - * @symbol ?onPlayerSaved\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerSaved\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerSaved(class Player &); /** - * @symbol ?onPlayerSlide\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerSlide\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerSlide(class Player &); /** - * @symbol ?onPlayerStartRiding\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVActor\@\@\@Z + * @symbol ?onPlayerStartRiding\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVActor\@\@\@Z */ MCVAPI enum class EventResult onPlayerStartRiding(class Player &, class Actor &); /** - * @symbol ?onPlayerStopRiding\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@_N11\@Z + * @symbol ?onPlayerStopRiding\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@_N11\@Z */ MCVAPI enum class EventResult onPlayerStopRiding(class Player &, bool, bool, bool); /** - * @symbol ?onPlayerTargetBlockHit\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@H\@Z + * @symbol ?onPlayerTargetBlockHit\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@H\@Z */ MCVAPI enum class EventResult onPlayerTargetBlockHit(class Player &, int); /** - * @symbol ?onPlayerTeleported\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerTeleported\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerTeleported(class Player &); /** - * @symbol ?onPlayerTick\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z + * @symbol ?onPlayerTick\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onPlayerTick(class Player &); /** - * @symbol ?onPlayerTurn\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVVec2\@\@\@Z + * @symbol ?onPlayerTurn\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEAVVec2\@\@\@Z */ MCVAPI enum class EventResult onPlayerTurn(class Player &, class Vec2 &); /** - * @symbol ?onPlayerWaxOnWaxOff\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@H\@Z + * @symbol ?onPlayerWaxOnWaxOff\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@H\@Z */ MCVAPI enum class EventResult onPlayerWaxOnWaxOff(class Player &, int); /** - * @symbol ?onStartDestroyBlock\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@AEAE\@Z + * @symbol ?onStartDestroyBlock\@PlayerEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@AEAE\@Z */ MCVAPI enum class EventResult onStartDestroyBlock(class Player &, class BlockPos const &, unsigned char &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp index 48fd83cff7..5e421ef17b 100644 --- a/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerFogPacket.hpp @@ -31,33 +31,39 @@ class PlayerFogPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerFogPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerFogPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerFogPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerFogPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerFogPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerFogPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerFogPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerFogPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERFOGPACKET /** - * @symbol ??0PlayerFogPacket\@\@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\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerFogPacket(); +#endif + /** + * @symbol ??0PlayerFogPacket\@\@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\@\@\@Z */ MCAPI PlayerFogPacket(std::vector); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerFormCloseEvent.hpp b/LiteLoader/include/llapi/mc/PlayerFormCloseEvent.hpp index 81c105a4d9..2ba732629b 100644 --- a/LiteLoader/include/llapi/mc/PlayerFormCloseEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerFormCloseEvent.hpp @@ -28,7 +28,7 @@ struct PlayerFormCloseEvent { public: /** - * @symbol ??1PlayerFormCloseEvent\@\@QEAA\@XZ + * @symbol ??1PlayerFormCloseEvent\@\@QEAA\@XZ */ MCAPI ~PlayerFormCloseEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerFormResponseEvent.hpp b/LiteLoader/include/llapi/mc/PlayerFormResponseEvent.hpp index f94f668d17..456fdc9abf 100644 --- a/LiteLoader/include/llapi/mc/PlayerFormResponseEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerFormResponseEvent.hpp @@ -28,7 +28,7 @@ struct PlayerFormResponseEvent { public: /** - * @symbol ??1PlayerFormResponseEvent\@\@QEAA\@XZ + * @symbol ??1PlayerFormResponseEvent\@\@QEAA\@XZ */ MCAPI ~PlayerFormResponseEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp b/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp index d8b488280b..22ee63e65c 100644 --- a/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp +++ b/LiteLoader/include/llapi/mc/PlayerGameTypeUtility.hpp @@ -20,11 +20,11 @@ namespace PlayerGameTypeUtility { #undef AFTER_EXTRA /** - * @symbol ?isCreative\@PlayerGameTypeUtility\@\@YA_NAEBUPlayerGameTypeComponent\@\@\@Z + * @symbol ?isCreative\@PlayerGameTypeUtility\@\@YA_NAEBUPlayerGameTypeComponent\@\@\@Z */ MCAPI bool isCreative(struct PlayerGameTypeComponent const &); /** - * @symbol ?isSpectator\@PlayerGameTypeUtility\@\@YA_NAEBUPlayerGameTypeComponent\@\@\@Z + * @symbol ?isSpectator\@PlayerGameTypeUtility\@\@YA_NAEBUPlayerGameTypeComponent\@\@\@Z */ MCAPI bool isSpectator(struct PlayerGameTypeComponent const &); diff --git a/LiteLoader/include/llapi/mc/PlayerGetExperienceOrbEvent.hpp b/LiteLoader/include/llapi/mc/PlayerGetExperienceOrbEvent.hpp index 918a0a71ae..f42036cfd5 100644 --- a/LiteLoader/include/llapi/mc/PlayerGetExperienceOrbEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerGetExperienceOrbEvent.hpp @@ -25,7 +25,7 @@ struct PlayerGetExperienceOrbEvent { public: /** - * @symbol ??1PlayerGetExperienceOrbEvent\@\@QEAA\@XZ + * @symbol ??1PlayerGetExperienceOrbEvent\@\@QEAA\@XZ */ MCAPI ~PlayerGetExperienceOrbEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp index 6dd1a56cf0..63467b2ce3 100644 --- a/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerHotbarPacket.hpp @@ -30,37 +30,43 @@ class PlayerHotbarPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerHotbarPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerHotbarPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerHotbarPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerHotbarPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerHotbarPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerHotbarPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerHotbarPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerHotbarPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERHOTBARPACKET /** - * @symbol ??0PlayerHotbarPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerHotbarPacket(); +#endif + /** + * @symbol ??0PlayerHotbarPacket\@\@QEAA\@XZ */ MCAPI PlayerHotbarPacket(); /** - * @symbol ??0PlayerHotbarPacket\@\@QEAA\@IW4ContainerID\@\@_N\@Z + * @symbol ??0PlayerHotbarPacket\@\@QEAA\@IW4ContainerID\@\@_N\@Z */ MCAPI PlayerHotbarPacket(unsigned int, enum class ContainerID, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerInitialSpawnEvent.hpp b/LiteLoader/include/llapi/mc/PlayerInitialSpawnEvent.hpp index ad55b3f1e3..b216171bc2 100644 --- a/LiteLoader/include/llapi/mc/PlayerInitialSpawnEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInitialSpawnEvent.hpp @@ -25,7 +25,7 @@ struct PlayerInitialSpawnEvent { public: /** - * @symbol ??1PlayerInitialSpawnEvent\@\@QEAA\@XZ + * @symbol ??1PlayerInitialSpawnEvent\@\@QEAA\@XZ */ MCAPI ~PlayerInitialSpawnEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp index d0fefc8870..38605d48bd 100644 --- a/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInputPacket.hpp @@ -30,33 +30,33 @@ class PlayerInputPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerInputPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerInputPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerInputPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerInputPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerInputPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerInputPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerInputPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerInputPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0PlayerInputPacket\@\@QEAA\@XZ + * @symbol ??0PlayerInputPacket\@\@QEAA\@XZ */ MCAPI PlayerInputPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerInteractEvent.hpp b/LiteLoader/include/llapi/mc/PlayerInteractEvent.hpp index 6ed9711530..21af378834 100644 --- a/LiteLoader/include/llapi/mc/PlayerInteractEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInteractEvent.hpp @@ -27,11 +27,11 @@ struct PlayerInteractEvent { public: /** - * @symbol ??0PlayerInteractEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0PlayerInteractEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI PlayerInteractEvent(struct PlayerInteractEvent const &); /** - * @symbol ??1PlayerInteractEvent\@\@QEAA\@XZ + * @symbol ??1PlayerInteractEvent\@\@QEAA\@XZ */ MCAPI ~PlayerInteractEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp b/LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp index 0e425cc39e..94f43c3b7b 100644 --- a/LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInteractionSystem.hpp @@ -30,8 +30,8 @@ class PlayerInteractionSystem { public: /** - * @symbol ?getInteraction\@PlayerInteractionSystem\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@PlayerInteractionSystem\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerInventory.hpp b/LiteLoader/include/llapi/mc/PlayerInventory.hpp index ffa505eba1..d5d0667680 100644 --- a/LiteLoader/include/llapi/mc/PlayerInventory.hpp +++ b/LiteLoader/include/llapi/mc/PlayerInventory.hpp @@ -37,169 +37,169 @@ struct SlotData { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERINVENTORY /** - * @symbol ?containerContentChanged\@PlayerInventory\@\@UEAAXH\@Z + * @symbol ?containerContentChanged\@PlayerInventory\@\@UEAAXH\@Z */ MCVAPI void containerContentChanged(int); /** - * @symbol ?containerSizeChanged\@PlayerInventory\@\@UEAAXH\@Z + * @symbol ?containerSizeChanged\@PlayerInventory\@\@UEAAXH\@Z */ MCVAPI void containerSizeChanged(int); /** - * @symbol ?createTransactionContext\@PlayerInventory\@\@UEAAXV?$function\@$$A6AXAEAVContainer\@\@HAEBVItemStack\@\@1\@Z\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?createTransactionContext\@PlayerInventory\@\@UEAAXV?$function\@$$A6AXAEAVContainer\@\@HAEBVItemStack\@\@1\@Z\@std\@\@V?$function\@$$A6AXXZ\@3\@\@Z */ MCVAPI void createTransactionContext(class std::function, class std::function); #endif /** - * @symbol ??0PlayerInventory\@\@QEAA\@V?$unique_ptr\@VInventory\@\@U?$default_delete\@VInventory\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0PlayerInventory\@\@QEAA\@V?$unique_ptr\@VInventory\@\@U?$default_delete\@VInventory\@\@\@std\@\@\@std\@\@\@Z */ MCAPI PlayerInventory(std::unique_ptr); /** - * @symbol ?_getHudContainerManagerModel\@PlayerInventory\@\@QEAA?AV?$weak_ptr\@VHudContainerManagerModel\@\@\@std\@\@XZ + * @symbol ?_getHudContainerManagerModel\@PlayerInventory\@\@QEAA?AV?$weak_ptr\@VHudContainerManagerModel\@\@\@std\@\@XZ */ MCAPI class std::weak_ptr _getHudContainerManagerModel(); /** - * @symbol ?add\@PlayerInventory\@\@QEAA_NAEAVItemStack\@\@_N\@Z + * @symbol ?add\@PlayerInventory\@\@QEAA_NAEAVItemStack\@\@_N\@Z */ MCAPI bool add(class ItemStack &, bool); /** - * @symbol ?addListener\@PlayerInventory\@\@QEAAXPEAVContainerContentChangeListener\@\@\@Z + * @symbol ?addListener\@PlayerInventory\@\@QEAAXPEAVContainerContentChangeListener\@\@\@Z */ MCAPI void addListener(class ContainerContentChangeListener *); /** - * @symbol ?canAdd\@PlayerInventory\@\@QEBA_NAEBVItemStack\@\@\@Z + * @symbol ?canAdd\@PlayerInventory\@\@QEBA_NAEBVItemStack\@\@\@Z */ MCAPI bool canAdd(class ItemStack const &) const; /** - * @symbol ?clearInventory\@PlayerInventory\@\@QEAAHH\@Z + * @symbol ?clearInventory\@PlayerInventory\@\@QEAAHH\@Z */ MCAPI int clearInventory(int); /** - * @symbol ?clearSlot\@PlayerInventory\@\@QEAAXHW4ContainerID\@\@\@Z + * @symbol ?clearSlot\@PlayerInventory\@\@QEAAXHW4ContainerID\@\@\@Z */ MCAPI void clearSlot(int, enum class ContainerID); /** - * @symbol ?clearVanishEnchantedItemsOnDeath\@PlayerInventory\@\@QEAAXXZ + * @symbol ?clearVanishEnchantedItemsOnDeath\@PlayerInventory\@\@QEAAXXZ */ MCAPI void clearVanishEnchantedItemsOnDeath(); /** - * @symbol ?dropAllOnDeath\@PlayerInventory\@\@QEAAX_N\@Z + * @symbol ?dropAllOnDeath\@PlayerInventory\@\@QEAAX_N\@Z */ MCAPI void dropAllOnDeath(bool); /** - * @symbol ?getAllContainerIds\@PlayerInventory\@\@QEAAAEBV?$vector\@W4ContainerID\@\@V?$allocator\@W4ContainerID\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAllContainerIds\@PlayerInventory\@\@QEAAAEBV?$vector\@W4ContainerID\@\@V?$allocator\@W4ContainerID\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getAllContainerIds(); /** - * @symbol ?getComplexItems\@PlayerInventory\@\@QEBAAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@W4ContainerID\@\@\@Z + * @symbol ?getComplexItems\@PlayerInventory\@\@QEBAAEBV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@W4ContainerID\@\@\@Z */ MCAPI std::vector const & getComplexItems(enum class ContainerID) const; /** - * @symbol ?getContainer\@PlayerInventory\@\@QEAAAEAVContainer\@\@XZ + * @symbol ?getContainer\@PlayerInventory\@\@QEAAAEAVContainer\@\@XZ */ MCAPI class Container & getContainer(); /** - * @symbol ?getContainerSize\@PlayerInventory\@\@QEBAHW4ContainerID\@\@\@Z + * @symbol ?getContainerSize\@PlayerInventory\@\@QEBAHW4ContainerID\@\@\@Z */ MCAPI int getContainerSize(enum class ContainerID) const; /** - * @symbol ?getFirstEmptySlot\@PlayerInventory\@\@QEBAHXZ + * @symbol ?getFirstEmptySlot\@PlayerInventory\@\@QEBAHXZ */ MCAPI int getFirstEmptySlot() const; /** - * @symbol ?getHotbarSize\@PlayerInventory\@\@QEBAHXZ + * @symbol ?getHotbarSize\@PlayerInventory\@\@QEBAHXZ */ MCAPI int getHotbarSize() const; /** - * @symbol ?getItem\@PlayerInventory\@\@QEBAAEBVItemStack\@\@HW4ContainerID\@\@\@Z + * @symbol ?getItem\@PlayerInventory\@\@QEBAAEBVItemStack\@\@HW4ContainerID\@\@\@Z */ MCAPI class ItemStack const & getItem(int, enum class ContainerID) const; /** - * @symbol ?getItemCount\@PlayerInventory\@\@QEAAHV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?getItemCount\@PlayerInventory\@\@QEAAHV?$function\@$$A6A_NAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI int getItemCount(class std::function); /** - * @symbol ?getSelectedContainerId\@PlayerInventory\@\@QEAA?AW4ContainerID\@\@XZ + * @symbol ?getSelectedContainerId\@PlayerInventory\@\@QEAA?AW4ContainerID\@\@XZ */ MCAPI enum class ContainerID getSelectedContainerId(); /** - * @symbol ?getSelectedItem\@PlayerInventory\@\@QEAAAEBVItemStack\@\@XZ + * @symbol ?getSelectedItem\@PlayerInventory\@\@QEAAAEBVItemStack\@\@XZ */ MCAPI class ItemStack const & getSelectedItem(); /** - * @symbol ?getSelectedSlot\@PlayerInventory\@\@QEBA?AUSlotData\@1\@XZ + * @symbol ?getSelectedSlot\@PlayerInventory\@\@QEBA?AUSlotData\@1\@XZ */ MCAPI struct PlayerInventory::SlotData getSelectedSlot() const; /** - * @symbol ?getSlotWithItem\@PlayerInventory\@\@QEBAHAEBVItemStack\@\@_N1\@Z + * @symbol ?getSlotWithItem\@PlayerInventory\@\@QEBAHAEBVItemStack\@\@_N1\@Z */ MCAPI int getSlotWithItem(class ItemStack const &, bool, bool) const; /** - * @symbol ?hasResource\@PlayerInventory\@\@QEAA_NH\@Z + * @symbol ?hasResource\@PlayerInventory\@\@QEAA_NH\@Z */ MCAPI bool hasResource(int); /** - * @symbol ?init\@PlayerInventory\@\@QEAAXV?$weak_ptr\@VHudContainerManagerModel\@\@\@std\@\@\@Z + * @symbol ?init\@PlayerInventory\@\@QEAAXV?$weak_ptr\@VHudContainerManagerModel\@\@\@std\@\@\@Z */ MCAPI void init(class std::weak_ptr); /** - * @symbol ?load\@PlayerInventory\@\@QEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z + * @symbol ?load\@PlayerInventory\@\@QEAAXAEBVListTag\@\@AEBVSemVersion\@\@AEAVLevel\@\@\@Z */ MCAPI void load(class ListTag const &, class SemVersion const &, class Level &); /** - * @symbol ?removeItem\@PlayerInventory\@\@QEAAXHHW4ContainerID\@\@\@Z + * @symbol ?removeItem\@PlayerInventory\@\@QEAAXHHW4ContainerID\@\@\@Z */ MCAPI void removeItem(int, int, enum class ContainerID); /** - * @symbol ?removeListener\@PlayerInventory\@\@QEAAXPEAVContainerContentChangeListener\@\@\@Z + * @symbol ?removeListener\@PlayerInventory\@\@QEAAXPEAVContainerContentChangeListener\@\@\@Z */ MCAPI void removeListener(class ContainerContentChangeListener *); /** - * @symbol ?removeResource\@PlayerInventory\@\@QEAAHAEBVItemStack\@\@_N1H\@Z + * @symbol ?removeResource\@PlayerInventory\@\@QEAAHAEBVItemStack\@\@_N1H\@Z */ MCAPI int removeResource(class ItemStack const &, bool, bool, int); /** - * @symbol ?removeResource\@PlayerInventory\@\@QEAA_NH\@Z + * @symbol ?removeResource\@PlayerInventory\@\@QEAA_NH\@Z */ MCAPI bool removeResource(int); /** - * @symbol ?save\@PlayerInventory\@\@QEAA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@PlayerInventory\@\@QEAA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save(); /** - * @symbol ?selectSlot\@PlayerInventory\@\@QEAA_NHW4ContainerID\@\@\@Z + * @symbol ?selectSlot\@PlayerInventory\@\@QEAA_NHW4ContainerID\@\@\@Z */ MCAPI bool selectSlot(int, enum class ContainerID); /** - * @symbol ?serverInitItemStackId\@PlayerInventory\@\@QEAAXH\@Z + * @symbol ?serverInitItemStackId\@PlayerInventory\@\@QEAAXH\@Z */ MCAPI void serverInitItemStackId(int); /** - * @symbol ?serverInitItemStackIds\@PlayerInventory\@\@QEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@PlayerInventory\@\@QEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setContainerChanged\@PlayerInventory\@\@QEAAXH\@Z + * @symbol ?setContainerChanged\@PlayerInventory\@\@QEAAXH\@Z */ MCAPI void setContainerChanged(int); /** - * @symbol ?setItem\@PlayerInventory\@\@QEAAXHAEBVItemStack\@\@W4ContainerID\@\@_N\@Z + * @symbol ?setItem\@PlayerInventory\@\@QEAAXHAEBVItemStack\@\@W4ContainerID\@\@_N\@Z */ MCAPI void setItem(int, class ItemStack const &, enum class ContainerID, bool); /** - * @symbol ?setSelectedItem\@PlayerInventory\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setSelectedItem\@PlayerInventory\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setSelectedItem(class ItemStack const &); /** - * @symbol ?setupDefaultInventory\@PlayerInventory\@\@QEAAXXZ + * @symbol ?setupDefaultInventory\@PlayerInventory\@\@QEAAXXZ */ MCAPI void setupDefaultInventory(); /** - * @symbol ?swapSlots\@PlayerInventory\@\@QEAAXHH\@Z + * @symbol ?swapSlots\@PlayerInventory\@\@QEAAXHH\@Z */ MCAPI void swapSlots(int, int); /** - * @symbol ?tick\@PlayerInventory\@\@QEAAXXZ + * @symbol ?tick\@PlayerInventory\@\@QEAAXXZ */ MCAPI void tick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp index 145d20f092..2e4514fe7c 100644 --- a/LiteLoader/include/llapi/mc/PlayerListEntry.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListEntry.hpp @@ -21,12 +21,13 @@ class PlayerListEntry { #define AFTER_EXTRA // Add Member There public: - ActorUniqueID uid; - mce::UUID uuid; - std::string name, xuid, platform_online_id; - enum class BuildPlatform platform; - SerializedSkin skin; - bool teacher, host; + ActorUniqueID mId; + mce::UUID mUUID; + std::string mName, mXUID, mPlatformOnlineId; + BuildPlatform mBuildPlatform; + char filler[4]; + SerializedSkin mSkin; + bool mIsTeacher, mIsHost; #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERLISTENTRY @@ -38,28 +39,24 @@ class PlayerListEntry { public: /** - * @symbol ??0PlayerListEntry\@\@QEAA\@VUUID\@mce\@\@\@Z + * @symbol ??0PlayerListEntry\@\@QEAA\@VUUID\@mce\@\@\@Z */ MCAPI PlayerListEntry(class mce::UUID); /** - * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z + * @symbol ??0PlayerListEntry\@\@QEAA\@AEBVPlayer\@\@\@Z */ MCAPI PlayerListEntry(class Player const &); /** - * @symbol ?clone\@PlayerListEntry\@\@QEBA?AV1\@XZ + * @symbol ?clone\@PlayerListEntry\@\@QEBA?AV1\@XZ */ MCAPI class PlayerListEntry clone() const; /** - * @symbol ?read\@PlayerListEntry\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@PlayerListEntry\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI bool read(class ReadOnlyBinaryStream &); /** - * @symbol ?write\@PlayerListEntry\@\@QEBAXAEAVBinaryStream\@\@\@Z - */ - MCAPI void write(class BinaryStream &) const; - /** - * @symbol ??1PlayerListEntry\@\@QEAA\@XZ + * @symbol ??1PlayerListEntry\@\@QEAA\@XZ */ MCAPI ~PlayerListEntry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp index 844826fed9..9a7c7a6037 100644 --- a/LiteLoader/include/llapi/mc/PlayerListPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerListPacket.hpp @@ -41,42 +41,48 @@ class PlayerListPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerListPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerListPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerListPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerListPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol ?readExtended\@PlayerListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@PlayerListPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?_read\@PlayerListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerListPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERLISTPACKET /** - * @symbol ??0PlayerListPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerListPacket(); +#endif + /** + * @symbol ??0PlayerListPacket\@\@QEAA\@XZ */ MCAPI PlayerListPacket(); /** - * @symbol ?emplace\@PlayerListPacket\@\@QEAAX$$QEAVPlayerListEntry\@\@\@Z + * @symbol ?emplace\@PlayerListPacket\@\@QEAAX$$QEAVPlayerListEntry\@\@\@Z */ MCAPI void emplace(class PlayerListEntry &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp b/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp index 6b38d87538..8710167c6e 100644 --- a/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMoveSystems.hpp @@ -28,12 +28,12 @@ class PlayerMoveSystems { public: /** - * @symbol ?createLocalPlayerPreMoveJumpSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createLocalPlayerPreMoveJumpSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createLocalPlayerPreMoveJumpSystem(); /** - * @symbol ?createPlayerPostMoveSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPlayerPostMoveSystem\@PlayerMoveSystems\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPlayerPostMoveSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerMovement.hpp b/LiteLoader/include/llapi/mc/PlayerMovement.hpp index 3c3cfc93b8..854a076bd6 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovement.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovement.hpp @@ -22,20 +22,48 @@ namespace PlayerMovement { #undef AFTER_EXTRA /** - * @symbol ?getControllingPassengerID\@PlayerMovement\@\@YA?AUActorUniqueID\@\@AEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@H\@Z + * @symbol ?applyInputLocks\@PlayerMovement\@\@YAXAEBUClientInputLockComponent\@\@AEAUMoveInputState\@\@\@Z + */ + MCAPI void applyInputLocks(struct ClientInputLockComponent const &, struct MoveInputState &); + /** + * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEAUIPlayerMovementProxy\@\@\@Z + */ + MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, struct IPlayerMovementProxy &); + /** + * @symbol ?calculateMoveVector\@PlayerMovement\@\@YA?AVVec2\@\@AEBUMoveInputState\@\@AEBVLayeredAbilities\@\@AEBVSynchedActorData\@\@_NPEBUSneakingComponent\@\@\@Z + */ + MCAPI class Vec2 calculateMoveVector(struct MoveInputState const &, class LayeredAbilities const &, class SynchedActorData const &, bool, struct SneakingComponent const *); + /** + * @symbol ?getControllingPassengerID\@PlayerMovement\@\@YA?AUActorUniqueID\@\@AEBV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@H\@Z */ MCAPI struct ActorUniqueID getControllingPassengerID(std::vector const &, int); /** - * @symbol ?updatePlayerOnInput\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@AEAVVec3\@\@\@Z + * @symbol ?getPositionMode\@PlayerMovement\@\@YA?AW4PositionMode\@PlayerPositionModeComponent\@\@AEBVEntityContext\@\@\@Z + */ + MCAPI enum class PlayerPositionModeComponent::PositionMode getPositionMode(class EntityContext const &); + /** + * @symbol ?initializePlayer\@PlayerMovement\@\@YAXAEAVEntityContext\@\@\@Z + */ + MCAPI void initializePlayer(class EntityContext &); + /** + * @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 + * @symbol ?updatePlayerRiding\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@\@Z */ MCAPI void updatePlayerRiding(struct IPlayerMovementProxy &, class MoveInputHandler &); /** - * @symbol ?updateSwimTravel\@PlayerMovement\@\@YAXAEAUIPlayerMovementProxy\@\@AEAVMoveInputHandler\@\@AEAVVec3\@\@\@Z + * @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 &); + 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/PlayerMovementRateSystem.hpp b/LiteLoader/include/llapi/mc/PlayerMovementRateSystem.hpp index adc6d550d9..2c410ee637 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovementRateSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovementRateSystem.hpp @@ -27,19 +27,19 @@ class PlayerMovementRateSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerMovementRateSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@PlayerMovementRateSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@PlayerMovementRateSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerMovementSettings.hpp b/LiteLoader/include/llapi/mc/PlayerMovementSettings.hpp index 7225bcde1d..98a12f9352 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovementSettings.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovementSettings.hpp @@ -30,11 +30,11 @@ struct PlayerMovementSettings { public: /** - * @symbol ?INVALID\@PlayerMovementSettings\@\@2U1\@B + * @symbol ?INVALID\@PlayerMovementSettings\@\@2U1\@B */ MCAPI static struct PlayerMovementSettings const INVALID; /** - * @symbol ?getDefault\@PlayerMovementSettings\@\@SA?AU1\@XZ + * @symbol ?getDefault\@PlayerMovementSettings\@\@SA?AU1\@XZ */ MCAPI static struct PlayerMovementSettings getDefault(); diff --git a/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp b/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp index 9ba018d097..eb7ae6f7c5 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovementStatsEventSystem.hpp @@ -25,8 +25,8 @@ class PlayerMovementStatsEventSystem { public: /** - * @symbol ?createSystem\@PlayerMovementStatsEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PlayerMovementStatsEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerMovementTelemetryData.hpp b/LiteLoader/include/llapi/mc/PlayerMovementTelemetryData.hpp index 24fedf331b..2ed5b00a7a 100644 --- a/LiteLoader/include/llapi/mc/PlayerMovementTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PlayerMovementTelemetryData.hpp @@ -29,16 +29,16 @@ class PlayerMovementTelemetryData { public: /** - * @symbol ??0PlayerMovementTelemetryData\@\@QEAA\@XZ + * @symbol ??0PlayerMovementTelemetryData\@\@QEAA\@XZ */ MCAPI PlayerMovementTelemetryData(); /** - * @symbol ?getAverage\@PlayerMovementTelemetryData\@\@QEBAMXZ + * @symbol ?getAverage\@PlayerMovementTelemetryData\@\@QEBAMXZ */ MCAPI float getAverage() const; /** - * @symbol ?reset\@PlayerMovementTelemetryData\@\@QEAAXXZ + * @symbol ?reset\@PlayerMovementTelemetryData\@\@QEAAXXZ */ MCAPI void reset(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerNotificationEvent.hpp b/LiteLoader/include/llapi/mc/PlayerNotificationEvent.hpp index c14dbdddf1..dac0e8133c 100644 --- a/LiteLoader/include/llapi/mc/PlayerNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerNotificationEvent.hpp @@ -28,7 +28,7 @@ struct PlayerNotificationEvent { public: /** - * @symbol ??1PlayerNotificationEvent\@\@QEAA\@XZ + * @symbol ??1PlayerNotificationEvent\@\@QEAA\@XZ */ MCAPI ~PlayerNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerOpenContainerEvent.hpp b/LiteLoader/include/llapi/mc/PlayerOpenContainerEvent.hpp index 195037ab83..6f246ba4ed 100644 --- a/LiteLoader/include/llapi/mc/PlayerOpenContainerEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerOpenContainerEvent.hpp @@ -28,7 +28,7 @@ struct PlayerOpenContainerEvent { public: /** - * @symbol ??1PlayerOpenContainerEvent\@\@QEAA\@XZ + * @symbol ??1PlayerOpenContainerEvent\@\@QEAA\@XZ */ MCAPI ~PlayerOpenContainerEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerPaddleComponent.hpp b/LiteLoader/include/llapi/mc/PlayerPaddleComponent.hpp new file mode 100644 index 0000000000..787c6b7b7c --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerPaddleComponent.hpp @@ -0,0 +1,32 @@ +/** + * @file PlayerPaddleComponent.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct PlayerPaddleComponent { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERPADDLECOMPONENT +public: + struct PlayerPaddleComponent& operator=(struct PlayerPaddleComponent const &) = delete; + PlayerPaddleComponent(struct PlayerPaddleComponent const &) = delete; + PlayerPaddleComponent() = delete; +#endif + +public: + /** + * @symbol ?toString\@PlayerPaddleComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string toString() const; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerPostTravelSystem.hpp b/LiteLoader/include/llapi/mc/PlayerPostTravelSystem.hpp index bc44f847ac..b1a882773d 100644 --- a/LiteLoader/include/llapi/mc/PlayerPostTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerPostTravelSystem.hpp @@ -25,8 +25,8 @@ class PlayerPostTravelSystem { public: /** - * @symbol ?create\@PlayerPostTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@PlayerPostTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp b/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp new file mode 100644 index 0000000000..4d5d48f996 --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerPreMobTravelSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file PlayerPreMobTravelSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerPreMobTravelSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERPREMOBTRAVELSYSTEM +public: + class PlayerPreMobTravelSystem& operator=(class PlayerPreMobTravelSystem const &) = delete; + PlayerPreMobTravelSystem(class PlayerPreMobTravelSystem const &) = delete; + PlayerPreMobTravelSystem() = delete; +#endif + +public: + /** + * @symbol ?createPlayerPreMobTravelSystem\@PlayerPreMobTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createPlayerPreMobTravelSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerResetMovementSpeedSystem.hpp b/LiteLoader/include/llapi/mc/PlayerResetMovementSpeedSystem.hpp new file mode 100644 index 0000000000..6e14e6d97b --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerResetMovementSpeedSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file PlayerResetMovementSpeedSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerResetMovementSpeedSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERRESETMOVEMENTSPEEDSYSTEM +public: + class PlayerResetMovementSpeedSystem& operator=(class PlayerResetMovementSpeedSystem const &) = delete; + PlayerResetMovementSpeedSystem(class PlayerResetMovementSpeedSystem const &) = delete; + PlayerResetMovementSpeedSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@PlayerResetMovementSpeedSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp index cfefeef002..e93ae97565 100644 --- a/LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnBlockRadiusRandomizer.hpp @@ -30,12 +30,12 @@ class PlayerRespawnBlockRadiusRandomizer { public: /** - * @symbol ?getNextPosition\@PlayerRespawnBlockRadiusRandomizer\@\@QEAA_NAEAVVec3\@\@_N\@Z + * @symbol ?getNextPosition\@PlayerRespawnBlockRadiusRandomizer\@\@QEAA_NAEAVVec3\@\@_N\@Z */ MCAPI bool getNextPosition(class Vec3 &, bool); /** - * @symbol ?init\@PlayerRespawnBlockRadiusRandomizer\@\@QEAAXIAEAVRandom\@\@\@Z + * @symbol ?init\@PlayerRespawnBlockRadiusRandomizer\@\@QEAAXIAEAVRandom\@\@\@Z */ MCAPI void init(unsigned int, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerRespawnEvent.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnEvent.hpp index 411d1dc4cb..6e4f93350c 100644 --- a/LiteLoader/include/llapi/mc/PlayerRespawnEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnEvent.hpp @@ -25,7 +25,7 @@ struct PlayerRespawnEvent { public: /** - * @symbol ??1PlayerRespawnEvent\@\@QEAA\@XZ + * @symbol ??1PlayerRespawnEvent\@\@QEAA\@XZ */ MCAPI ~PlayerRespawnEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerRespawnRandomizer.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnRandomizer.hpp index 6c34af7219..c0f1007862 100644 --- a/LiteLoader/include/llapi/mc/PlayerRespawnRandomizer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnRandomizer.hpp @@ -28,8 +28,8 @@ class PlayerRespawnRandomizer { public: /** - * @symbol ??1PlayerRespawnRandomizer\@\@QEAA\@XZ + * @symbol ??1PlayerRespawnRandomizer\@\@QEAA\@XZ */ MCAPI ~PlayerRespawnRandomizer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp b/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp index a357bae935..5b2e08f661 100644 --- a/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRespawnTelemetryData.hpp @@ -30,35 +30,35 @@ class PlayerRespawnTelemetryData { public: /** - * @symbol ??0PlayerRespawnTelemetryData\@\@QEAA\@XZ + * @symbol ??0PlayerRespawnTelemetryData\@\@QEAA\@XZ */ MCAPI PlayerRespawnTelemetryData(); /** - * @symbol ?WriteEventData\@PlayerRespawnTelemetryData\@\@QEBAXAEAVEvent\@Events\@Social\@\@\@Z + * @symbol ?WriteEventData\@PlayerRespawnTelemetryData\@\@QEBAXAEAVEvent\@Events\@Social\@\@\@Z */ MCAPI void WriteEventData(class Social::Events::Event &) const; /** - * @symbol ?setChangedDimension\@PlayerRespawnTelemetryData\@\@QEAAX_N\@Z + * @symbol ?setChangedDimension\@PlayerRespawnTelemetryData\@\@QEAAX_N\@Z */ MCAPI void setChangedDimension(bool); /** - * @symbol ?setJumpDistance\@PlayerRespawnTelemetryData\@\@QEAAXN\@Z + * @symbol ?setJumpDistance\@PlayerRespawnTelemetryData\@\@QEAAXN\@Z */ MCAPI void setJumpDistance(double); /** - * @symbol ?setLongJumpCount\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z + * @symbol ?setLongJumpCount\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z */ MCAPI void setLongJumpCount(unsigned int); /** - * @symbol ?setPositionSourceType\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z + * @symbol ?setPositionSourceType\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z */ MCAPI void setPositionSourceType(unsigned int); /** - * @symbol ?setSearchTime\@PlayerRespawnTelemetryData\@\@QEAAXN\@Z + * @symbol ?setSearchTime\@PlayerRespawnTelemetryData\@\@QEAAXN\@Z */ MCAPI void setSearchTime(double); /** - * @symbol ?setShortJumpCount\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z + * @symbol ?setShortJumpCount\@PlayerRespawnTelemetryData\@\@QEAAXI\@Z */ MCAPI void setShortJumpCount(unsigned int); @@ -66,8 +66,8 @@ class PlayerRespawnTelemetryData { private: /** - * @symbol ?mEventName\@PlayerRespawnTelemetryData\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?mEventName\@PlayerRespawnTelemetryData\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const mEventName; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerRotationSystem.hpp b/LiteLoader/include/llapi/mc/PlayerRotationSystem.hpp index c3f33b2a86..4c3d1fe718 100644 --- a/LiteLoader/include/llapi/mc/PlayerRotationSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerRotationSystem.hpp @@ -10,26 +10,15 @@ #undef BEFORE_EXTRA -/** - * @brief MC class PlayerRotationSystem. - * - */ -class PlayerRotationSystem { + +namespace PlayerRotationSystem { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERROTATIONSYSTEM -public: - class PlayerRotationSystem& operator=(class PlayerRotationSystem const &) = delete; - PlayerRotationSystem(class PlayerRotationSystem const &) = delete; - PlayerRotationSystem() = delete; -#endif - -public: /** - * @symbol ?createPlayerRotationSystem\@PlayerRotationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PlayerRotationSystem\@\@YA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createPlayerRotationSystem(); + MCAPI struct TickingSystemWithInfo createSystem(); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerRotationSystemImpl.hpp b/LiteLoader/include/llapi/mc/PlayerRotationSystemImpl.hpp new file mode 100644 index 0000000000..2bc4c9612a --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerRotationSystemImpl.hpp @@ -0,0 +1,24 @@ +/** + * @file PlayerRotationSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace PlayerRotationSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?doPlayerRotationSystem\@PlayerRotationSystemImpl\@\@YAXAEBUMoveInputComponent\@\@AEAUActorRotationComponent\@\@\@Z + */ + MCAPI void doPlayerRotationSystem(struct MoveInputComponent const &, struct ActorRotationComponent &); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PlayerSayCommandEvent.hpp b/LiteLoader/include/llapi/mc/PlayerSayCommandEvent.hpp index e44e56fb7a..f23a76736d 100644 --- a/LiteLoader/include/llapi/mc/PlayerSayCommandEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerSayCommandEvent.hpp @@ -25,7 +25,7 @@ struct PlayerSayCommandEvent { public: /** - * @symbol ??1PlayerSayCommandEvent\@\@QEAA\@XZ + * @symbol ??1PlayerSayCommandEvent\@\@QEAA\@XZ */ MCAPI ~PlayerSayCommandEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerScore.hpp b/LiteLoader/include/llapi/mc/PlayerScore.hpp index 68933c2195..122f9dfea6 100644 --- a/LiteLoader/include/llapi/mc/PlayerScore.hpp +++ b/LiteLoader/include/llapi/mc/PlayerScore.hpp @@ -28,11 +28,11 @@ struct PlayerScore { public: /** - * @symbol ??0PlayerScore\@\@QEAA\@AEBUScoreboardId\@\@H\@Z + * @symbol ??0PlayerScore\@\@QEAA\@AEBUScoreboardId\@\@H\@Z */ MCAPI PlayerScore(struct ScoreboardId const &, int); /** - * @symbol ?getId\@PlayerScore\@\@QEBAAEBUScoreboardId\@\@XZ + * @symbol ?getId\@PlayerScore\@\@QEBAAEBUScoreboardId\@\@XZ */ MCAPI struct ScoreboardId const & getId() const; diff --git a/LiteLoader/include/llapi/mc/PlayerScoreboardEventListener.hpp b/LiteLoader/include/llapi/mc/PlayerScoreboardEventListener.hpp index 0aa11772a2..84e6da559c 100644 --- a/LiteLoader/include/llapi/mc/PlayerScoreboardEventListener.hpp +++ b/LiteLoader/include/llapi/mc/PlayerScoreboardEventListener.hpp @@ -25,42 +25,51 @@ class PlayerScoreboardEventListener { public: class PlayerScoreboardEventListener& operator=(class PlayerScoreboardEventListener const &) = delete; PlayerScoreboardEventListener(class PlayerScoreboardEventListener const &) = delete; - PlayerScoreboardEventListener() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerScoreboardEventListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?onScoreChanged\@PlayerScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 4 + * @symbol ?onScoreChanged\@PlayerScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ virtual enum class EventResult onScoreChanged(struct ScoreboardId const &, std::string const &, int); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSCOREBOARDEVENTLISTENER /** - * @symbol ?getPlayerSubscriptions\@PlayerScoreboardEventListener\@\@QEAAAEAVSubscribedObjectives\@\@AEBUScoreboardId\@\@AEBVPlayer\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerScoreboardEventListener(); +#endif + /** + * @symbol ??0PlayerScoreboardEventListener\@\@QEAA\@XZ + */ + MCAPI PlayerScoreboardEventListener(); + /** + * @symbol ?getPlayerSubscriptions\@PlayerScoreboardEventListener\@\@QEAAAEAVSubscribedObjectives\@\@AEBUScoreboardId\@\@AEBVPlayer\@\@\@Z */ MCAPI class SubscribedObjectives & getPlayerSubscriptions(struct ScoreboardId const &, class Player const &); /** - * @symbol ?removePlayerSubscriptions\@PlayerScoreboardEventListener\@\@QEAAXAEBUScoreboardId\@\@\@Z + * @symbol ?removePlayerSubscriptions\@PlayerScoreboardEventListener\@\@QEAAXAEBUScoreboardId\@\@\@Z */ MCAPI void removePlayerSubscriptions(struct ScoreboardId const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp b/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp index 9bdc29cbfc..4e49b9aae5 100644 --- a/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp +++ b/LiteLoader/include/llapi/mc/PlayerScoreboardId.hpp @@ -41,23 +41,23 @@ struct PlayerScoreboardId { public: /** - * @symbol ??0PlayerScoreboardId\@\@QEAA\@XZ + * @symbol ??0PlayerScoreboardId\@\@QEAA\@XZ */ MCAPI PlayerScoreboardId(); /** - * @symbol ??0PlayerScoreboardId\@\@QEAA\@_J\@Z + * @symbol ??0PlayerScoreboardId\@\@QEAA\@_J\@Z */ MCAPI PlayerScoreboardId(__int64); /** - * @symbol ?getHash\@PlayerScoreboardId\@\@QEBA_KXZ + * @symbol ?getHash\@PlayerScoreboardId\@\@QEBA_KXZ */ MCAPI unsigned __int64 getHash() const; /** - * @symbol ??8PlayerScoreboardId\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8PlayerScoreboardId\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct PlayerScoreboardId const &) const; /** - * @symbol ?INVALID\@PlayerScoreboardId\@\@2U1\@B + * @symbol ?INVALID\@PlayerScoreboardId\@\@2U1\@B */ MCAPI static struct PlayerScoreboardId const INVALID; diff --git a/LiteLoader/include/llapi/mc/PlayerSetWalkOrSprintFlySpeedSystem.hpp b/LiteLoader/include/llapi/mc/PlayerSetWalkOrSprintFlySpeedSystem.hpp new file mode 100644 index 0000000000..c15e216b4a --- /dev/null +++ b/LiteLoader/include/llapi/mc/PlayerSetWalkOrSprintFlySpeedSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file PlayerSetWalkOrSprintFlySpeedSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class PlayerSetWalkOrSprintFlySpeedSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PLAYERSETWALKORSPRINTFLYSPEEDSYSTEM +public: + class PlayerSetWalkOrSprintFlySpeedSystem& operator=(class PlayerSetWalkOrSprintFlySpeedSystem const &) = delete; + PlayerSetWalkOrSprintFlySpeedSystem(class PlayerSetWalkOrSprintFlySpeedSystem const &) = delete; + PlayerSetWalkOrSprintFlySpeedSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@PlayerSetWalkOrSprintFlySpeedSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/PlayerShootArrowEvent.hpp b/LiteLoader/include/llapi/mc/PlayerShootArrowEvent.hpp index 497bead196..1de9ddef6a 100644 --- a/LiteLoader/include/llapi/mc/PlayerShootArrowEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerShootArrowEvent.hpp @@ -27,11 +27,11 @@ struct PlayerShootArrowEvent { public: /** - * @symbol ??0PlayerShootArrowEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0PlayerShootArrowEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI PlayerShootArrowEvent(struct PlayerShootArrowEvent const &); /** - * @symbol ??1PlayerShootArrowEvent\@\@QEAA\@XZ + * @symbol ??1PlayerShootArrowEvent\@\@QEAA\@XZ */ MCAPI ~PlayerShootArrowEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp index 91e537d21d..ff762565dd 100644 --- a/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerSkinPacket.hpp @@ -30,38 +30,44 @@ class PlayerSkinPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerSkinPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerSkinPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerSkinPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerSkinPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerSkinPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerSkinPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerSkinPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol ?readExtended\@PlayerSkinPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@PlayerSkinPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerSkinPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSKINPACKET /** - * @symbol ??0PlayerSkinPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerSkinPacket(); +#endif + /** + * @symbol ??0PlayerSkinPacket\@\@QEAA\@XZ */ MCAPI PlayerSkinPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp index dc353474f6..e39c78cd24 100644 --- a/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp +++ b/LiteLoader/include/llapi/mc/PlayerStartItemCooldownPacket.hpp @@ -28,37 +28,43 @@ class PlayerStartItemCooldownPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerStartItemCooldownPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PlayerStartItemCooldownPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PlayerStartItemCooldownPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PlayerStartItemCooldownPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PlayerStartItemCooldownPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PlayerStartItemCooldownPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PlayerStartItemCooldownPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PlayerStartItemCooldownPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERSTARTITEMCOOLDOWNPACKET /** - * @symbol ??0PlayerStartItemCooldownPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI PlayerStartItemCooldownPacket(); + MCVAPI ~PlayerStartItemCooldownPacket(); +#endif /** - * @symbol ??0PlayerStartItemCooldownPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PlayerStartItemCooldownPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PlayerStartItemCooldownPacket(std::string const &, int); + /** + * @symbol ??0PlayerStartItemCooldownPacket\@\@QEAA\@XZ + */ + MCAPI PlayerStartItemCooldownPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerStorageIds.hpp b/LiteLoader/include/llapi/mc/PlayerStorageIds.hpp index 52a08c97f3..548bbd2ab3 100644 --- a/LiteLoader/include/llapi/mc/PlayerStorageIds.hpp +++ b/LiteLoader/include/llapi/mc/PlayerStorageIds.hpp @@ -28,7 +28,7 @@ struct PlayerStorageIds { public: /** - * @symbol ??1PlayerStorageIds\@\@QEAA\@XZ + * @symbol ??1PlayerStorageIds\@\@QEAA\@XZ */ MCAPI ~PlayerStorageIds(); diff --git a/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp b/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp index caf70236d6..b7a298916d 100644 --- a/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerTickComponent.hpp @@ -30,19 +30,19 @@ struct PlayerTickComponent { public: /** - * @symbol ??0PlayerTickComponent\@\@QEAA\@V?$unique_ptr\@UIPlayerTickPolicy\@\@U?$default_delete\@UIPlayerTickPolicy\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0PlayerTickComponent\@\@QEAA\@V?$unique_ptr\@UIPlayerTickPolicy\@\@U?$default_delete\@UIPlayerTickPolicy\@\@\@std\@\@\@std\@\@\@Z */ MCAPI PlayerTickComponent(std::unique_ptr); /** - * @symbol ??0PlayerTickComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0PlayerTickComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI PlayerTickComponent(struct PlayerTickComponent &&); /** - * @symbol ??4PlayerTickComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PlayerTickComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PlayerTickComponent & operator=(struct PlayerTickComponent &&); /** - * @symbol ??1PlayerTickComponent\@\@QEAA\@XZ + * @symbol ??1PlayerTickComponent\@\@QEAA\@XZ */ MCAPI ~PlayerTickComponent(); diff --git a/LiteLoader/include/llapi/mc/PlayerTickPolicy.hpp b/LiteLoader/include/llapi/mc/PlayerTickPolicy.hpp index aa9b8a427e..df45b97e12 100644 --- a/LiteLoader/include/llapi/mc/PlayerTickPolicy.hpp +++ b/LiteLoader/include/llapi/mc/PlayerTickPolicy.hpp @@ -22,7 +22,7 @@ namespace PlayerTickPolicy { #undef AFTER_EXTRA /** - * @symbol ?createPolicy\@PlayerTickPolicy\@\@YA?AV?$unique_ptr\@UIPlayerTickPolicy\@\@U?$default_delete\@UIPlayerTickPolicy\@\@\@std\@\@\@std\@\@AEBUPlayerTickConfig\@\@\@Z + * @symbol ?createPolicy\@PlayerTickPolicy\@\@YA?AV?$unique_ptr\@UIPlayerTickPolicy\@\@U?$default_delete\@UIPlayerTickPolicy\@\@\@std\@\@\@std\@\@AEBUPlayerTickConfig\@\@\@Z */ MCAPI std::unique_ptr createPolicy(struct PlayerTickConfig const &); diff --git a/LiteLoader/include/llapi/mc/PlayerTickSystem.hpp b/LiteLoader/include/llapi/mc/PlayerTickSystem.hpp index 93834fa20a..bd25c05173 100644 --- a/LiteLoader/include/llapi/mc/PlayerTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/PlayerTickSystem.hpp @@ -30,16 +30,16 @@ class PlayerTickSystem { public: /** - * @symbol ?create\@PlayerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@PlayerTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?onTickAdded\@PlayerTickSystem\@\@SAXAEAUPlayerTickComponent\@\@_K\@Z + * @symbol ?onTickAdded\@PlayerTickSystem\@\@SAXAEAUPlayerTickComponent\@\@_K\@Z */ MCAPI static void onTickAdded(struct PlayerTickComponent &, unsigned __int64); /** - * @symbol ?shouldTickMovementSystemOnEntity\@PlayerTickSystem\@\@SA_NAEBVEntityContext\@\@\@Z + * @symbol ?shouldTickMovementSystemOnEntity\@PlayerTickSystem\@\@SA_NAEBVEntityContext\@\@\@Z */ MCAPI static bool shouldTickMovementSystemOnEntity(class EntityContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp index 8110d1ef7f..66cd95ffe5 100644 --- a/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainer.hpp @@ -31,31 +31,37 @@ class PlayerUIContainer : public SimpleContainer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerUIContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 23 + * @symbol __unk_vfn_23 */ - virtual void __unk_vfn_22(); + virtual void __unk_vfn_23(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_23(); + virtual void __unk_vfn_24(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERUICONTAINER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerUIContainer(); +#endif /** - * @symbol ??0PlayerUIContainer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NH\@Z + * @symbol ??0PlayerUIContainer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NH\@Z */ MCAPI PlayerUIContainer(std::string const &, bool, int); /** - * @symbol ?load\@PlayerUIContainer\@\@QEAAXAEBVListTag\@\@AEBVSemVersion\@\@\@Z + * @symbol ?load\@PlayerUIContainer\@\@QEAAXAEBVListTag\@\@AEBVSemVersion\@\@\@Z */ MCAPI void load(class ListTag const &, class SemVersion const &); /** - * @symbol ?save\@PlayerUIContainer\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@PlayerUIContainer\@\@QEBA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp index af05c937ad..8b60504156 100644 --- a/LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainerModel.hpp @@ -31,43 +31,43 @@ class PlayerUIContainerModel : public PlayerUIContainerModelBase { public: /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~PlayerUIContainerModel(); + virtual void __unk_vfn_1(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 21 - * @symbol ?_getContainerOffset\@PlayerUIContainerModel\@\@MEBAHXZ + * @vftbl 21 + * @symbol ?_getContainerOffset\@PlayerUIContainerModel\@\@MEBAHXZ */ virtual int _getContainerOffset() const; /** - * @symbol ??0PlayerUIContainerModel\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@\@Z + * @symbol ??0PlayerUIContainerModel\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@\@Z */ MCAPI PlayerUIContainerModel(enum class ContainerEnumName, class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp b/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp index 8294454f5c..d34e9c2773 100644 --- a/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUIContainerModelBase.hpp @@ -31,86 +31,92 @@ class PlayerUIContainerModelBase : public ContainerModel { public: /** - * @vftbl 0 - * @symbol ?containerContentChanged\@PlayerUIContainerModelBase\@\@UEAAXH\@Z + * @vftbl 0 + * @symbol ?containerContentChanged\@PlayerUIContainerModelBase\@\@UEAAXH\@Z */ virtual void containerContentChanged(int); /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~PlayerUIContainerModelBase(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?postInit\@PlayerUIContainerModelBase\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?postInit\@PlayerUIContainerModelBase\@\@UEAAXXZ */ virtual void postInit(); /** - * @vftbl 3 - * @symbol ?releaseResources\@PlayerUIContainerModelBase\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?releaseResources\@PlayerUIContainerModelBase\@\@UEAAXXZ */ virtual void releaseResources(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getContainerWeakRef\@PlayerUIContainerModelBase\@\@UEBA?AVContainerWeakRef\@\@XZ + * @vftbl 7 + * @symbol ?getContainerWeakRef\@PlayerUIContainerModelBase\@\@UEBA?AVContainerWeakRef\@\@XZ */ virtual class ContainerWeakRef getContainerWeakRef() const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 14 - * @symbol ?isValid\@PlayerUIContainerModelBase\@\@UEAA_NXZ + * @vftbl 14 + * @symbol ?isValid\@PlayerUIContainerModelBase\@\@UEAA_NXZ */ virtual bool isValid(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?_getContainer\@PlayerUIContainerModelBase\@\@MEBAPEAVContainer\@\@XZ + * @vftbl 20 + * @symbol ?_getContainer\@PlayerUIContainerModelBase\@\@MEBAPEAVContainer\@\@XZ */ virtual class Container * _getContainer() const; /** - * @vftbl 21 - * @symbol ?_getContainerOffset\@PlayerUIContainerModelBase\@\@MEBAHXZ + * @vftbl 21 + * @symbol ?_getContainerOffset\@PlayerUIContainerModelBase\@\@MEBAHXZ */ virtual int _getContainerOffset() const; /** - * @vftbl 22 - * @symbol ?_onItemChanged\@PlayerUIContainerModelBase\@\@MEAAXHAEBVItemStack\@\@0\@Z + * @vftbl 22 + * @symbol ?_onItemChanged\@PlayerUIContainerModelBase\@\@MEAAXHAEBVItemStack\@\@0\@Z */ virtual void _onItemChanged(int, class ItemStack const &, class ItemStack const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERUICONTAINERMODELBASE /** - * @symbol ??0PlayerUIContainerModelBase\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@HW4ContainerCategory\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PlayerUIContainerModelBase(); +#endif + /** + * @symbol ??0PlayerUIContainerModelBase\@\@QEAA\@W4ContainerEnumName\@\@AEAVPlayer\@\@HW4ContainerCategory\@\@\@Z */ MCAPI PlayerUIContainerModelBase(enum class ContainerEnumName, class Player &, int, enum class ContainerCategory); //protected: /** - * @symbol ?_refreshContainer\@PlayerUIContainerModelBase\@\@IEAAX_N\@Z + * @symbol ?_refreshContainer\@PlayerUIContainerModelBase\@\@IEAAX_N\@Z */ MCAPI void _refreshContainer(bool); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PlayerUpdateInteractionEvent.hpp b/LiteLoader/include/llapi/mc/PlayerUpdateInteractionEvent.hpp index 8d42742445..a59bc2085b 100644 --- a/LiteLoader/include/llapi/mc/PlayerUpdateInteractionEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUpdateInteractionEvent.hpp @@ -25,7 +25,7 @@ struct PlayerUpdateInteractionEvent { public: /** - * @symbol ??1PlayerUpdateInteractionEvent\@\@QEAA\@XZ + * @symbol ??1PlayerUpdateInteractionEvent\@\@QEAA\@XZ */ MCAPI ~PlayerUpdateInteractionEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerUseNameTagEvent.hpp b/LiteLoader/include/llapi/mc/PlayerUseNameTagEvent.hpp index 264b2701f0..18d1e0d4b0 100644 --- a/LiteLoader/include/llapi/mc/PlayerUseNameTagEvent.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUseNameTagEvent.hpp @@ -24,11 +24,11 @@ struct PlayerUseNameTagEvent { public: /** - * @symbol ??0PlayerUseNameTagEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0PlayerUseNameTagEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI PlayerUseNameTagEvent(struct PlayerUseNameTagEvent const &); /** - * @symbol ??1PlayerUseNameTagEvent\@\@QEAA\@XZ + * @symbol ??1PlayerUseNameTagEvent\@\@QEAA\@XZ */ MCAPI ~PlayerUseNameTagEvent(); diff --git a/LiteLoader/include/llapi/mc/PlayerUtils.hpp b/LiteLoader/include/llapi/mc/PlayerUtils.hpp index a65e3b1b8c..9eb5e0b3ec 100644 --- a/LiteLoader/include/llapi/mc/PlayerUtils.hpp +++ b/LiteLoader/include/llapi/mc/PlayerUtils.hpp @@ -17,11 +17,11 @@ namespace PlayerUtils { #undef AFTER_EXTRA /** - * @symbol ?addItem\@PlayerUtils\@\@YAXAEAVPlayer\@\@AEAVItemStack\@\@\@Z + * @symbol ?addItem\@PlayerUtils\@\@YAXAEAVPlayer\@\@AEAVItemStack\@\@\@Z */ MCAPI void addItem(class Player &, class ItemStack &); /** - * @symbol ?replaceCurrentItem\@PlayerUtils\@\@YAXAEAVPlayer\@\@AEAVItemStack\@\@\@Z + * @symbol ?replaceCurrentItem\@PlayerUtils\@\@YAXAEAVPlayer\@\@AEAVItemStack\@\@\@Z */ MCAPI void replaceCurrentItem(class Player &, class ItemStack &); diff --git a/LiteLoader/include/llapi/mc/PlayerVehicleTamedGoal.hpp b/LiteLoader/include/llapi/mc/PlayerVehicleTamedGoal.hpp index 5c4d46f9b8..b1d5a39ad4 100644 --- a/LiteLoader/include/llapi/mc/PlayerVehicleTamedGoal.hpp +++ b/LiteLoader/include/llapi/mc/PlayerVehicleTamedGoal.hpp @@ -30,66 +30,66 @@ class PlayerVehicleTamedGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PlayerVehicleTamedGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@PlayerVehicleTamedGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@PlayerVehicleTamedGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PLAYERVEHICLETAMEDGOAL /** - * @symbol ?canContinueToUse\@PlayerVehicleTamedGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@PlayerVehicleTamedGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); /** - * @symbol ?canUse\@PlayerVehicleTamedGoal\@\@UEAA_NXZ + * @symbol ?canUse\@PlayerVehicleTamedGoal\@\@UEAA_NXZ */ MCVAPI bool canUse(); /** - * @symbol ?start\@PlayerVehicleTamedGoal\@\@UEAAXXZ + * @symbol ?start\@PlayerVehicleTamedGoal\@\@UEAAXXZ */ MCVAPI void start(); /** - * @symbol ?tick\@PlayerVehicleTamedGoal\@\@UEAAXXZ + * @symbol ?tick\@PlayerVehicleTamedGoal\@\@UEAAXXZ */ MCVAPI void tick(); #endif /** - * @symbol ??0PlayerVehicleTamedGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0PlayerVehicleTamedGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI PlayerVehicleTamedGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp b/LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp index c34262376c..a05c534e38 100644 --- a/LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp +++ b/LiteLoader/include/llapi/mc/PodzolAreaFeature.hpp @@ -31,14 +31,14 @@ class PodzolAreaFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PodzolAreaFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@PodzolAreaFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@PodzolAreaFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PodzolBlock.hpp b/LiteLoader/include/llapi/mc/PodzolBlock.hpp index b9b1298e8b..d4e4f612db 100644 --- a/LiteLoader/include/llapi/mc/PodzolBlock.hpp +++ b/LiteLoader/include/llapi/mc/PodzolBlock.hpp @@ -31,198 +31,203 @@ class PodzolBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PodzolBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PodzolBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@PodzolBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0PodzolBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PodzolBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PodzolBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp index 90b03c5096..96cd6c6da9 100644 --- a/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/PointedDripstoneBlock.hpp @@ -31,412 +31,407 @@ class PointedDripstoneBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PointedDripstoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@PointedDripstoneBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@PointedDripstoneBlock\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 15 - * @symbol ?onProjectileHit\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@PointedDripstoneBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@PointedDripstoneBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@PointedDripstoneBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@PointedDripstoneBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@PointedDripstoneBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 152 - * @symbol ?init\@PointedDripstoneBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@PointedDripstoneBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; - /** - * @vftbl 185 - * @symbol __unk_vfn_185 - */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PointedDripstoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 179 + * @symbol ?canSurvive\@PointedDripstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@PointedDripstoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?getDustColor\@PointedDripstoneBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@PointedDripstoneBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@PointedDripstoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @vftbl 196 - * @symbol ?onLand\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 197 + * @symbol ?onLand\@PointedDripstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onLand(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 - * @symbol ?startFalling\@PointedDripstoneBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z + * @vftbl 199 + * @symbol ?startFalling\@PointedDripstoneBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POINTEDDRIPSTONEBLOCK /** - * @symbol ?falling\@PointedDripstoneBlock\@\@UEBA_NXZ + * @symbol ?falling\@PointedDripstoneBlock\@\@UEBA_NXZ */ MCVAPI bool falling() const; #endif /** - * @symbol ??0PointedDripstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PointedDripstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PointedDripstoneBlock(std::string const &, int); /** - * @symbol ?addDripParticle\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@W4ParticleType\@\@\@Z + * @symbol ?addDripParticle\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@W4ParticleType\@\@\@Z */ MCAPI static void addDripParticle(class BlockSource &, class BlockPos const &, enum class ParticleType); /** - * @symbol ?canGrow\@PointedDripstoneBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?canGrow\@PointedDripstoneBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCAPI static bool canGrow(class BlockSource &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?fillCauldron\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?fillCauldron\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void fillCauldron(class BlockSource &, class BlockPos const &); /** - * @symbol ?findStalactiteTipAboveCauldron\@PointedDripstoneBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?findStalactiteTipAboveCauldron\@PointedDripstoneBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional findStalactiteTipAboveCauldron(class BlockSource &, class BlockPos const &); /** - * @symbol ?getCauldronFillLiquidType\@PointedDripstoneBlock\@\@SA?AV?$optional\@W4MaterialType\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getCauldronFillLiquidType\@PointedDripstoneBlock\@\@SA?AV?$optional\@W4MaterialType\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional getCauldronFillLiquidType(class BlockSource &, class BlockPos const &); /** - * @symbol ?getStalactiteTipBelowFillSource\@PointedDripstoneBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getStalactiteTipBelowFillSource\@PointedDripstoneBlock\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional getStalactiteTipBelowFillSource(class BlockSource &, class BlockPos const &); /** - * @symbol ?growStalactite\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?growStalactite\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void growStalactite(class BlockSource &, class BlockPos const &); /** - * @symbol ?growStalagmite\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?growStalagmite\@PointedDripstoneBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void growStalagmite(class BlockSource &, class BlockPos const &); //private: /** - * @symbol ?_updateBlockThickness\@PointedDripstoneBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_updateBlockThickness\@PointedDripstoneBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _updateBlockThickness(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_calculateDripstoneThickness\@PointedDripstoneBlock\@\@CA?AW4DripstoneThickness\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E_N\@Z + * @symbol ?_calculateDripstoneThickness\@PointedDripstoneBlock\@\@CA?AW4DripstoneThickness\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E_N\@Z */ MCAPI static enum class DripstoneThickness _calculateDripstoneThickness(class BlockSource &, class BlockPos const &, unsigned char, bool); /** - * @symbol ?_canDrip\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canDrip\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _canDrip(class BlockSource &, class BlockPos const &); /** - * @symbol ?_canFillCauldron\@PointedDripstoneBlock\@\@CA_NAEBVBlock\@\@\@Z + * @symbol ?_canFillCauldron\@PointedDripstoneBlock\@\@CA_NAEBVBlock\@\@\@Z */ MCAPI static bool _canFillCauldron(class Block const &); /** - * @symbol ?_canTipGrow\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canTipGrow\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _canTipGrow(class BlockSource &, class BlockPos const &); /** - * @symbol ?_createDripstone\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@EW4DripstoneThickness\@\@\@Z + * @symbol ?_createDripstone\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@EW4DripstoneThickness\@\@\@Z */ MCAPI static void _createDripstone(class BlockSource &, class BlockPos const &, unsigned char, enum class DripstoneThickness); /** - * @symbol ?_findBlockVertically\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@EV?$function\@$$A6A_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z\@3\@2H\@Z + * @symbol ?_findBlockVertically\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@EV?$function\@$$A6A_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z\@3\@2H\@Z */ MCAPI static class std::optional _findBlockVertically(class BlockSource &, class BlockPos const &, unsigned char, class std::function, class std::function, int); /** - * @symbol ?_findRootBlock\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_findRootBlock\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI static class std::optional _findRootBlock(class BlockSource &, class BlockPos const &, int); /** - * @symbol ?_findTip\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@EH_N\@Z + * @symbol ?_findTip\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@EH_N\@Z */ MCAPI static class std::optional _findTip(class BlockSource &, class BlockPos const &, unsigned char, int, bool); /** - * @symbol ?_getBlockAboveStalactiteRoot\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getBlockAboveStalactiteRoot\@PointedDripstoneBlock\@\@CA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional _getBlockAboveStalactiteRoot(class BlockSource &, class BlockPos const &); /** - * @symbol ?_getRandomBlockPositionOffset\@PointedDripstoneBlock\@\@CA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_getRandomBlockPositionOffset\@PointedDripstoneBlock\@\@CA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class Vec3 _getRandomBlockPositionOffset(class BlockPos const &); /** - * @symbol ?_grow\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_grow\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI static void _grow(class BlockSource &, class BlockPos const &, unsigned char); /** - * @symbol ?_growStalagmiteBelow\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_growStalagmiteBelow\@PointedDripstoneBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void _growStalagmiteBelow(class BlockSource &, class BlockPos const &); /** - * @symbol ?_isStalactiteBase\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isStalactiteBase\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _isStalactiteBase(class BlockSource &, class BlockPos const &); /** - * @symbol ?_isTip\@PointedDripstoneBlock\@\@CA_NAEBVBlock\@\@E_N\@Z + * @symbol ?_isTip\@PointedDripstoneBlock\@\@CA_NAEBVBlock\@\@E_N\@Z */ MCAPI static bool _isTip(class Block const &, unsigned char, bool); /** - * @symbol ?_isValidPointedDripstonePlacement\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_isValidPointedDripstonePlacement\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI static bool _isValidPointedDripstonePlacement(class BlockSource &, class BlockPos const &, bool); /** - * @symbol ?_mayPlaceHanging\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_mayPlaceHanging\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _mayPlaceHanging(class BlockSource &, class BlockPos const &); /** - * @symbol ?_mayPlaceStanding\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_mayPlaceStanding\@PointedDripstoneBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _mayPlaceStanding(class BlockSource &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PointedDripstoneFeature.hpp b/LiteLoader/include/llapi/mc/PointedDripstoneFeature.hpp index 9ee8103f22..e08d5f4702 100644 --- a/LiteLoader/include/llapi/mc/PointedDripstoneFeature.hpp +++ b/LiteLoader/include/llapi/mc/PointedDripstoneFeature.hpp @@ -30,14 +30,14 @@ class PointedDripstoneFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PointedDripstoneFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@PointedDripstoneFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@PointedDripstoneFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PolarBear.hpp b/LiteLoader/include/llapi/mc/PolarBear.hpp index 4682e09e51..d95277caf4 100644 --- a/LiteLoader/include/llapi/mc/PolarBear.hpp +++ b/LiteLoader/include/llapi/mc/PolarBear.hpp @@ -32,151 +32,146 @@ class PolarBear : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~PolarBear(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@PolarBear\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@PolarBear\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 172 - * @symbol ?canFreeze\@PolarBear\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@PolarBear\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0PolarBear\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0PolarBear\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI PolarBear(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getStandingAnimationScale\@PolarBear\@\@QEAAMM\@Z + * @symbol ?getStandingAnimationScale\@PolarBear\@\@QEAAMM\@Z */ MCAPI float getStandingAnimationScale(float); @@ -184,8 +179,8 @@ class PolarBear : public Animal { private: /** - * @symbol ?STAND_ANIMATION_TICKS\@PolarBear\@\@0MB + * @symbol ?STAND_ANIMATION_TICKS\@PolarBear\@\@0MB */ MCAPI static float const STAND_ANIMATION_TICKS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp b/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp index 22979c03e7..0ffb76222a 100644 --- a/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/PoolElementStructurePiece.hpp @@ -31,65 +31,71 @@ class PoolElementStructurePiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PoolElementStructurePiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?moveBoundingBox\@PoolElementStructurePiece\@\@UEAAXHHH\@Z + * @vftbl 1 + * @symbol ?moveBoundingBox\@PoolElementStructurePiece\@\@UEAAXHHH\@Z */ virtual void moveBoundingBox(int, int, int); /** - * @vftbl 4 - * @symbol ?postProcess\@PoolElementStructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@PoolElementStructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@PoolElementStructurePiece\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@PoolElementStructurePiece\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 13 - * @symbol ?generateHeightAtPosition\@VillagePiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 13 + * @symbol ?generateHeightAtPosition\@VillagePiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual int generateHeightAtPosition(class BlockPos const &, class Dimension &, class BlockVolume &, class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> &) const = 0; /** - * @vftbl 14 - * @symbol ?getSupportBlock\@VillagePiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 14 + * @symbol ?getSupportBlock\@VillagePiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const * getSupportBlock(class BlockSource &, class BlockPos const &, class Block const &) const = 0; /** - * @vftbl 15 - * @symbol ?getBeardStabilizeBlock\@VillagePiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + * @vftbl 15 + * @symbol ?getBeardStabilizeBlock\@VillagePiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getBeardStabilizeBlock(class Block const &) const = 0; /** - * @vftbl 16 - * @symbol ?getTerrainAdjustmentEffect\@VillagePiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ + * @vftbl 16 + * @symbol ?getTerrainAdjustmentEffect\@VillagePiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ */ virtual enum class AdjustmentEffect getTerrainAdjustmentEffect() const = 0; /** - * @vftbl 17 - * @symbol ?_needsPostProcessing\@PoolElementStructurePiece\@\@MEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 17 + * @symbol ?_needsPostProcessing\@PoolElementStructurePiece\@\@MEAA_NAEAVBlockSource\@\@\@Z */ virtual bool _needsPostProcessing(class BlockSource &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_POOLELEMENTSTRUCTUREPIECE /** - * @symbol ??0PoolElementStructurePiece\@\@QEAA\@AEBVStructurePoolElement\@\@VBlockPos\@\@W4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PoolElementStructurePiece(); +#endif + /** + * @symbol ??0PoolElementStructurePiece\@\@QEAA\@AEBVStructurePoolElement\@\@VBlockPos\@\@W4Rotation\@\@HAEAUJigsawJunction\@\@AEBVBoundingBox\@\@1\@Z */ MCAPI PoolElementStructurePiece(class StructurePoolElement const &, class BlockPos, enum class Rotation, int, struct JigsawJunction &, class BoundingBox const &, class BlockPos); /** - * @symbol ?getElement\@PoolElementStructurePiece\@\@QEBAAEBVStructurePoolElement\@\@XZ + * @symbol ?getElement\@PoolElementStructurePiece\@\@QEBAAEBVStructurePoolElement\@\@XZ */ MCAPI class StructurePoolElement const & getElement() const; /** - * @symbol ?getPosition\@PoolElementStructurePiece\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getPosition\@PoolElementStructurePiece\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getPosition() const; /** - * @symbol ?setReferencePosition\@PoolElementStructurePiece\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setReferencePosition\@PoolElementStructurePiece\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setReferencePosition(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PopulateGlobalPassengersToPositionListSystem.hpp b/LiteLoader/include/llapi/mc/PopulateGlobalPassengersToPositionListSystem.hpp index 35f11c94d5..eb49c26a45 100644 --- a/LiteLoader/include/llapi/mc/PopulateGlobalPassengersToPositionListSystem.hpp +++ b/LiteLoader/include/llapi/mc/PopulateGlobalPassengersToPositionListSystem.hpp @@ -28,20 +28,20 @@ class PopulateGlobalPassengersToPositionListSystem { public: /** - * @symbol ?_populateList\@PopulateGlobalPassengersToPositionListSystem\@\@SA_NV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@U?$Exclude\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@AEAUPassengersToPositionComponent\@\@\@Z + * @symbol ?_populateList\@PopulateGlobalPassengersToPositionListSystem\@\@SA_NV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@U?$Exclude\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@AEAUPassengersToPositionComponent\@\@\@Z */ MCAPI static bool _populateList(class ViewT>, class ViewT, class ViewT>, class ViewT, struct PassengersToPositionComponent &); /** - * @symbol ?_removeRequestsFromBrokenLinks\@PopulateGlobalPassengersToPositionListSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + * @symbol ?_removeRequestsFromBrokenLinks\@PopulateGlobalPassengersToPositionListSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z */ MCAPI static void _removeRequestsFromBrokenLinks(class ViewT, class ViewT>, class ViewT, class EntityModifierT); /** - * @symbol ?_tick\@PopulateGlobalPassengersToPositionListSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@U?$Exclude\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$OptionalGlobalT\@UPassengersToPositionComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z + * @symbol ?_tick\@PopulateGlobalPassengersToPositionListSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@U?$Exclude\@UPassengerComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPositionPassengerRequestComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$OptionalGlobalT\@UPassengersToPositionComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UPositionPassengerRequestComponent\@\@\@\@\@Z */ MCAPI static void _tick(class ViewT>, class ViewT, class ViewT>, class ViewT, class OptionalGlobalT, class EntityModifierT); /** - * @symbol ?createSystem\@PopulateGlobalPassengersToPositionListSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PopulateGlobalPassengersToPositionListSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PortalBlock.hpp b/LiteLoader/include/llapi/mc/PortalBlock.hpp index 4154355084..90d86f1b7d 100644 --- a/LiteLoader/include/llapi/mc/PortalBlock.hpp +++ b/LiteLoader/include/llapi/mc/PortalBlock.hpp @@ -31,267 +31,272 @@ class PortalBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PortalBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@PortalBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@PortalBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@PortalBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@PortalBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 90 - * @symbol ?mayPick\@PortalBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z + * @vftbl 90 + * @symbol ?mayPick\@PortalBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@PortalBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@PortalBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 151 - * @symbol ?animateTick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@PortalBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PORTALBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@PortalBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@PortalBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0PortalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PortalBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PortalBlock(std::string const &, int); /** - * @symbol ?tryMatchPortalRecordToFrameBlocksContainingPos\@PortalBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryMatchPortalRecordToFrameBlocksContainingPos\@PortalBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void tryMatchPortalRecordToFrameBlocksContainingPos(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?trySpawnPortal\@PortalBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?trySpawnPortal\@PortalBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool trySpawnPortal(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PortalForcer.hpp b/LiteLoader/include/llapi/mc/PortalForcer.hpp index ae6579c867..6afda59297 100644 --- a/LiteLoader/include/llapi/mc/PortalForcer.hpp +++ b/LiteLoader/include/llapi/mc/PortalForcer.hpp @@ -30,67 +30,67 @@ class PortalForcer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PortalForcer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?deserialize\@PortalForcer\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @vftbl 1 + * @symbol ?deserialize\@PortalForcer\@\@UEAAXAEBVCompoundTag\@\@\@Z */ virtual void deserialize(class CompoundTag const &); /** - * @vftbl 2 - * @symbol ?serialize\@PortalForcer\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?serialize\@PortalForcer\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void serialize(class CompoundTag &) const; /** - * @symbol ??0PortalForcer\@\@QEAA\@AEAVLevel\@\@\@Z + * @symbol ??0PortalForcer\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI PortalForcer(class Level &); /** - * @symbol ?addPortalRecord\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVPortalShape\@\@\@Z + * @symbol ?addPortalRecord\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@V?$AutomaticID\@VDimension\@\@H\@\@V2\@\@Z */ - MCAPI class PortalRecord const & addPortalRecord(class AutomaticID, class PortalShape const &); + MCAPI class PortalRecord const & addPortalRecord(class AutomaticID, class PortalRecord); /** - * @symbol ?addPortalRecord\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@V?$AutomaticID\@VDimension\@\@H\@\@V2\@\@Z + * @symbol ?addPortalRecord\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVPortalShape\@\@\@Z */ - MCAPI class PortalRecord const & addPortalRecord(class AutomaticID, class PortalRecord); + MCAPI class PortalRecord const & addPortalRecord(class AutomaticID, class PortalShape const &); /** - * @symbol ?createPortal\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@AEBVActor\@\@H\@Z + * @symbol ?createPortal\@PortalForcer\@\@QEAAAEBVPortalRecord\@\@AEBVActor\@\@H\@Z */ MCAPI class PortalRecord const & createPortal(class Actor const &, int); /** - * @symbol ?findPortal\@PortalForcer\@\@QEBA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@HAEAV3\@\@Z + * @symbol ?findPortal\@PortalForcer\@\@QEBA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@HAEAV3\@\@Z */ MCAPI bool findPortal(class AutomaticID, class BlockPos const &, int, class BlockPos &) const; /** - * @symbol ?force\@PortalForcer\@\@QEAAXAEAVActor\@\@AEBUDimensionTransitionComponent\@\@\@Z + * @symbol ?force\@PortalForcer\@\@QEAAXAEAVActor\@\@AEBUDimensionTransitionComponent\@\@\@Z */ MCAPI void force(class Actor &, struct DimensionTransitionComponent const &); /** - * @symbol ?portalRecordExists\@PortalForcer\@\@QEBA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVPortalRecord\@\@\@Z + * @symbol ?portalRecordExists\@PortalForcer\@\@QEBA_NV?$AutomaticID\@VDimension\@\@H\@\@AEBVPortalRecord\@\@\@Z */ MCAPI bool portalRecordExists(class AutomaticID, class PortalRecord const &) const; /** - * @symbol ?removeMisalignedPortalRecords\@PortalForcer\@\@QEAAXAEAVBlockSource\@\@AEBVPortalShape\@\@AEBVPortalRecord\@\@\@Z + * @symbol ?removeMisalignedPortalRecords\@PortalForcer\@\@QEAAXAEAVBlockSource\@\@AEBVPortalShape\@\@AEBVPortalRecord\@\@\@Z */ MCAPI void removeMisalignedPortalRecords(class BlockSource &, class PortalShape const &, class PortalRecord const &); /** - * @symbol ?removePortalRecord\@PortalForcer\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?removePortalRecord\@PortalForcer\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void removePortalRecord(class BlockSource &, class BlockPos const &); /** - * @symbol ?PORTAL_FILE_ID\@PortalForcer\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PORTAL_FILE_ID\@PortalForcer\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const PORTAL_FILE_ID; //private: /** - * @symbol ?_findPortal\@PortalForcer\@\@AEBA?AV?$optional\@VPortalRecord\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@HAEAV5\@\@Z + * @symbol ?_findPortal\@PortalForcer\@\@AEBA?AV?$optional\@VPortalRecord\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@HAEAV5\@\@Z */ MCAPI class std::optional _findPortal(class AutomaticID, class BlockPos const &, int, class BlockPos &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PortalRecord.hpp b/LiteLoader/include/llapi/mc/PortalRecord.hpp index d7ea07f45a..393653f353 100644 --- a/LiteLoader/include/llapi/mc/PortalRecord.hpp +++ b/LiteLoader/include/llapi/mc/PortalRecord.hpp @@ -28,24 +28,24 @@ class PortalRecord { public: /** - * @symbol ??0PortalRecord\@\@QEAA\@AEBVBlockPos\@\@HHH\@Z + * @symbol ??0PortalRecord\@\@QEAA\@AEBVBlockPos\@\@\@Z */ - MCAPI PortalRecord(class BlockPos const &, int, int, int); + MCAPI PortalRecord(class BlockPos const &); /** - * @symbol ??0PortalRecord\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0PortalRecord\@\@QEAA\@AEBVBlockPos\@\@HHH\@Z */ - MCAPI PortalRecord(class BlockPos const &); + MCAPI PortalRecord(class BlockPos const &, int, int, int); /** - * @symbol ?closestBlockPosTo\@PortalRecord\@\@QEBA?AVBlockPos\@\@AEBVActor\@\@\@Z + * @symbol ?closestBlockPosTo\@PortalRecord\@\@QEBA?AVBlockPos\@\@AEBVActor\@\@\@Z */ MCAPI class BlockPos closestBlockPosTo(class Actor const &) const; /** - * @symbol ?hashCode\@PortalRecord\@\@QEBA_KXZ + * @symbol ?hashCode\@PortalRecord\@\@QEBA_KXZ */ MCAPI unsigned __int64 hashCode() const; /** - * @symbol ??8PortalRecord\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8PortalRecord\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class PortalRecord const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PortalShape.hpp b/LiteLoader/include/llapi/mc/PortalShape.hpp index d9562f7f56..406c7de822 100644 --- a/LiteLoader/include/llapi/mc/PortalShape.hpp +++ b/LiteLoader/include/llapi/mc/PortalShape.hpp @@ -31,60 +31,60 @@ class PortalShape { public: /** - * @symbol ??0PortalShape\@\@QEAA\@AEBVBlockSource\@\@AEBVBlockPos\@\@W4PortalAxis\@\@\@Z + * @symbol ??0PortalShape\@\@QEAA\@AEBVBlockSource\@\@AEBVBlockPos\@\@W4PortalAxis\@\@\@Z */ MCAPI PortalShape(class BlockSource const &, class BlockPos const &, enum class PortalAxis); /** - * @symbol ?createPortalBlocks\@PortalShape\@\@QEBAXAEAVWorldChangeTransaction\@\@\@Z + * @symbol ?createPortalBlocks\@PortalShape\@\@QEBAXAEAVWorldChangeTransaction\@\@\@Z */ MCAPI void createPortalBlocks(class WorldChangeTransaction &) const; /** - * @symbol ?createRecord\@PortalShape\@\@QEBA?AVPortalRecord\@\@XZ + * @symbol ?createRecord\@PortalShape\@\@QEBA?AVPortalRecord\@\@XZ */ MCAPI class PortalRecord createRecord() const; /** - * @symbol ?evaluate\@PortalShape\@\@QEAAXAEBVBlockPos\@\@AEBVBlockSource\@\@\@Z + * @symbol ?evaluate\@PortalShape\@\@QEAAXAEBVBlockPos\@\@AEBVBlockSource\@\@\@Z */ MCAPI void evaluate(class BlockPos const &, class BlockSource const &); /** - * @symbol ?getNumberOfPortalBlocks\@PortalShape\@\@QEBAHXZ + * @symbol ?getNumberOfPortalBlocks\@PortalShape\@\@QEBAHXZ */ MCAPI int getNumberOfPortalBlocks() const; /** - * @symbol ?getPortalBlockAABB\@PortalShape\@\@QEBA?AVAABB\@\@XZ + * @symbol ?getPortalBlockAABB\@PortalShape\@\@QEBA?AVAABB\@\@XZ */ MCAPI class AABB getPortalBlockAABB() const; /** - * @symbol ?isFilled\@PortalShape\@\@QEBA_NXZ + * @symbol ?isFilled\@PortalShape\@\@QEBA_NXZ */ MCAPI bool isFilled() const; /** - * @symbol ?isValid\@PortalShape\@\@QEBA_NXZ + * @symbol ?isValid\@PortalShape\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ?removePortalBlocks\@PortalShape\@\@QEBAXAEAVWorldChangeTransaction\@\@AEBVBlockPos\@\@\@Z + * @symbol ?removePortalBlocks\@PortalShape\@\@QEBAXAEAVWorldChangeTransaction\@\@AEBVBlockPos\@\@\@Z */ MCAPI void removePortalBlocks(class WorldChangeTransaction &, class BlockPos const &) const; /** - * @symbol ?setAxis\@PortalShape\@\@QEAAXW4PortalAxis\@\@\@Z + * @symbol ?setAxis\@PortalShape\@\@QEAAXW4PortalAxis\@\@\@Z */ MCAPI void setAxis(enum class PortalAxis); /** - * @symbol ?updateNeighboringBlocks\@PortalShape\@\@QEBAXAEAVBlockSource\@\@AEBVVec3\@\@\@Z + * @symbol ?updateNeighboringBlocks\@PortalShape\@\@QEBAXAEAVBlockSource\@\@AEBVVec3\@\@\@Z */ MCAPI void updateNeighboringBlocks(class BlockSource &, class Vec3 const &) const; //private: /** - * @symbol ?_calculatePortalHeight\@PortalShape\@\@AEAAHAEBVBlockSource\@\@\@Z + * @symbol ?_calculatePortalHeight\@PortalShape\@\@AEAAHAEBVBlockSource\@\@\@Z */ MCAPI int _calculatePortalHeight(class BlockSource const &); /** - * @symbol ?_getDistanceUntilEdge\@PortalShape\@\@AEBAHAEBVBlockPos\@\@W4Name\@Facing\@\@AEBVBlockSource\@\@\@Z + * @symbol ?_getDistanceUntilEdge\@PortalShape\@\@AEBAHAEBVBlockPos\@\@W4Name\@Facing\@\@AEBVBlockSource\@\@\@Z */ MCAPI int _getDistanceUntilEdge(class BlockPos const &, enum class Facing::Name, class BlockSource const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PosibleTransformation.hpp b/LiteLoader/include/llapi/mc/PosibleTransformation.hpp index bb013f8b83..3c18bf32e0 100644 --- a/LiteLoader/include/llapi/mc/PosibleTransformation.hpp +++ b/LiteLoader/include/llapi/mc/PosibleTransformation.hpp @@ -18,14 +18,17 @@ struct PosibleTransformation { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_POSIBLETRANSFORMATION public: - struct PosibleTransformation& operator=(struct PosibleTransformation const &) = delete; PosibleTransformation(struct PosibleTransformation const &) = delete; PosibleTransformation() = delete; #endif public: /** - * @symbol ??1PosibleTransformation\@\@QEAA\@XZ + * @symbol ??4PosibleTransformation\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct PosibleTransformation & operator=(struct PosibleTransformation const &); + /** + * @symbol ??1PosibleTransformation\@\@QEAA\@XZ */ MCAPI ~PosibleTransformation(); diff --git a/LiteLoader/include/llapi/mc/PositionPassengerUtility.hpp b/LiteLoader/include/llapi/mc/PositionPassengerUtility.hpp index 388ee31cbc..ea56c436cb 100644 --- a/LiteLoader/include/llapi/mc/PositionPassengerUtility.hpp +++ b/LiteLoader/include/llapi/mc/PositionPassengerUtility.hpp @@ -28,8 +28,8 @@ class PositionPassengerUtility { public: /** - * @symbol ?getNewPassengerPosition\@PositionPassengerUtility\@\@SA?AVVec3\@\@VSynchedActorDataReader\@\@AEBV2\@AEBVVec2\@\@\@Z + * @symbol ?getNewPassengerPosition\@PositionPassengerUtility\@\@SA?AVVec3\@\@VSynchedActorDataReader\@\@AEBV2\@AEBVVec2\@\@\@Z */ MCAPI static class Vec3 getNewPassengerPosition(class SynchedActorDataReader, class Vec3 const &, class Vec2 const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp index fc560eb3d7..103c2e15e5 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBClientRequestPacket.hpp @@ -30,33 +30,39 @@ class PositionTrackingDBClientRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PositionTrackingDBClientRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PositionTrackingDBClientRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PositionTrackingDBClientRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PositionTrackingDBClientRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PositionTrackingDBClientRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PositionTrackingDBClientRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PositionTrackingDBClientRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PositionTrackingDBClientRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_POSITIONTRACKINGDBCLIENTREQUESTPACKET /** - * @symbol ??0PositionTrackingDBClientRequestPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PositionTrackingDBClientRequestPacket(); +#endif + /** + * @symbol ??0PositionTrackingDBClientRequestPacket\@\@QEAA\@XZ */ MCAPI PositionTrackingDBClientRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp index 7df3e085f2..b7b60c37ba 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingDBServerBroadcastPacket.hpp @@ -30,33 +30,39 @@ class PositionTrackingDBServerBroadcastPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PositionTrackingDBServerBroadcastPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PositionTrackingDBServerBroadcastPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PositionTrackingDBServerBroadcastPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PositionTrackingDBServerBroadcastPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PositionTrackingDBServerBroadcastPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PositionTrackingDBServerBroadcastPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PositionTrackingDBServerBroadcastPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PositionTrackingDBServerBroadcastPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_POSITIONTRACKINGDBSERVERBROADCASTPACKET /** - * @symbol ??0PositionTrackingDBServerBroadcastPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PositionTrackingDBServerBroadcastPacket(); +#endif + /** + * @symbol ??0PositionTrackingDBServerBroadcastPacket\@\@QEAA\@XZ */ MCAPI PositionTrackingDBServerBroadcastPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PositionTrackingId.hpp b/LiteLoader/include/llapi/mc/PositionTrackingId.hpp index d4980a3cd9..f43024bdee 100644 --- a/LiteLoader/include/llapi/mc/PositionTrackingId.hpp +++ b/LiteLoader/include/llapi/mc/PositionTrackingId.hpp @@ -28,43 +28,43 @@ class PositionTrackingId { public: /** - * @symbol ??0PositionTrackingId\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0PositionTrackingId\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI PositionTrackingId(std::string const &); /** - * @symbol ??0PositionTrackingId\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0PositionTrackingId\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI PositionTrackingId(class PositionTrackingId &&); /** - * @symbol ??0PositionTrackingId\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0PositionTrackingId\@\@QEAA\@AEBV0\@\@Z */ MCAPI PositionTrackingId(class PositionTrackingId const &); /** - * @symbol ?fromTag\@PositionTrackingId\@\@QEAAXPEBVTag\@\@\@Z + * @symbol ?fromTag\@PositionTrackingId\@\@QEAAXPEBVTag\@\@\@Z */ MCAPI void fromTag(class Tag const *); /** - * @symbol ?getTag\@PositionTrackingId\@\@QEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getTag\@PositionTrackingId\@\@QEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getTag() const; /** - * @symbol ?init\@PositionTrackingId\@\@QEAAXXZ + * @symbol ?init\@PositionTrackingId\@\@QEAAXXZ */ MCAPI void init(); /** - * @symbol ??4PositionTrackingId\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4PositionTrackingId\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class PositionTrackingId & operator=(class PositionTrackingId &&); /** - * @symbol ??4PositionTrackingId\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4PositionTrackingId\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class PositionTrackingId & operator=(class PositionTrackingId const &); /** - * @symbol ?toString\@PositionTrackingId\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@PositionTrackingId\@\@QEBA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const toString() const; /** - * @symbol ?INVALID_ID\@PositionTrackingId\@\@2V1\@B + * @symbol ?INVALID_ID\@PositionTrackingId\@\@2V1\@B */ MCAPI static class PositionTrackingId const INVALID_ID; @@ -72,8 +72,8 @@ class PositionTrackingId { protected: /** - * @symbol ?sNextId\@PositionTrackingId\@\@1IA + * @symbol ?sNextId\@PositionTrackingId\@\@1IA */ MCAPI static unsigned int sNextId; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PostAIUpdateSystem.hpp b/LiteLoader/include/llapi/mc/PostAIUpdateSystem.hpp index 5b03a9e9d3..dbc40fa96f 100644 --- a/LiteLoader/include/llapi/mc/PostAIUpdateSystem.hpp +++ b/LiteLoader/include/llapi/mc/PostAIUpdateSystem.hpp @@ -25,16 +25,16 @@ class PostAIUpdateSystem { public: /** - * @symbol ?createSystem\@PostAIUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PostAIUpdateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?doPostAiUpdate\@PostAIUpdateSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUAttributesComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEAUNoActionTimeComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z + * @symbol ?doPostAiUpdate\@PostAIUpdateSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUAttributesComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEAUNoActionTimeComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z */ MCAPI static void doPostAiUpdate(class StrictEntityContext &, struct AttributesComponent const &, class Optional const>, struct NoActionTimeComponent &, class EntityModifierT>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp index cb7fbf4e8f..68c21440ec 100644 --- a/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/PostFallDamageFinalizeMoveSystem.hpp @@ -28,8 +28,8 @@ class PostFallDamageFinalizeMoveSystem { public: /** - * @symbol ?createPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createPostFallDamageFinalizeMoveSystem\@PostFallDamageFinalizeMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPostFallDamageFinalizeMoveSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PostprocessingManager.hpp b/LiteLoader/include/llapi/mc/PostprocessingManager.hpp index ce686f7837..e779fddf98 100644 --- a/LiteLoader/include/llapi/mc/PostprocessingManager.hpp +++ b/LiteLoader/include/llapi/mc/PostprocessingManager.hpp @@ -35,16 +35,16 @@ struct LockedChunk { public: /** - * @symbol ??0PostprocessingManager\@\@QEAA\@XZ + * @symbol ??0PostprocessingManager\@\@QEAA\@XZ */ MCAPI PostprocessingManager(); /** - * @symbol ?tryLock\@PostprocessingManager\@\@QEAA?AV?$optional\@V?$vector\@ULockedChunk\@PostprocessingManager\@\@V?$allocator\@ULockedChunk\@PostprocessingManager\@\@\@std\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@AEAVChunkSource\@\@\@Z + * @symbol ?tryLock\@PostprocessingManager\@\@QEAA?AV?$optional\@V?$vector\@ULockedChunk\@PostprocessingManager\@\@V?$allocator\@ULockedChunk\@PostprocessingManager\@\@\@std\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@AEAVChunkSource\@\@\@Z */ MCAPI class std::optional> tryLock(class ChunkPos const &, class ChunkSource &); /** - * @symbol ??1PostprocessingManager\@\@QEAA\@XZ + * @symbol ??1PostprocessingManager\@\@QEAA\@XZ */ MCAPI ~PostprocessingManager(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PotatoBlock.hpp b/LiteLoader/include/llapi/mc/PotatoBlock.hpp index 994977ebab..e98b9fc424 100644 --- a/LiteLoader/include/llapi/mc/PotatoBlock.hpp +++ b/LiteLoader/include/llapi/mc/PotatoBlock.hpp @@ -31,228 +31,233 @@ class PotatoBlock : public CropBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PotatoBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@PotatoBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@PotatoBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@PotatoBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@PotatoBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@PotatoBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol ?getBaseSeed\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ + * @vftbl 194 + * @symbol __unk_vfn_194 + */ + virtual void __unk_vfn_194(); + /** + * @vftbl 195 + * @symbol ?getBaseSeed\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseSeed() const; /** - * @vftbl 195 - * @symbol ?getBaseCrop\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ + * @vftbl 196 + * @symbol ?getBaseCrop\@PotatoBlock\@\@UEBA?BVItemInstance\@\@XZ */ virtual class ItemInstance const getBaseCrop() const; /** - * @vftbl 197 - * @symbol ?getCropNum\@PotatoBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z + * @vftbl 198 + * @symbol ?getCropNum\@PotatoBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z */ virtual int getCropNum(class Randomize &, int, int) const; /** - * @symbol ??0PotatoBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PotatoBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PotatoBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Potion.hpp b/LiteLoader/include/llapi/mc/Potion.hpp index 147cac9694..96512a696d 100644 --- a/LiteLoader/include/llapi/mc/Potion.hpp +++ b/LiteLoader/include/llapi/mc/Potion.hpp @@ -32,296 +32,296 @@ enum class PotionVariant; public: /** - * @symbol ??0Potion\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0Potion\@\@QEAA\@AEBV0\@\@Z */ MCAPI Potion(class Potion const &); /** - * @symbol ?appendFormattedPotionText\@Potion\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@W4PotionVariant\@1\@AEBVPlayer\@\@M\@Z + * @symbol ?appendFormattedPotionText\@Potion\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@W4PotionVariant\@1\@AEBVPlayer\@\@M\@Z */ MCAPI void appendFormattedPotionText(std::string &, enum class Potion::PotionType, enum class Potion::PotionVariant, class Player const &, float) const; /** - * @symbol ?effectDurationToString\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@MAEBVMobEffectInstance\@\@\@Z + * @symbol ?effectDurationToString\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@MAEBVMobEffectInstance\@\@\@Z */ MCAPI std::string effectDurationToString(enum class Potion::PotionType, float, class MobEffectInstance const &) const; /** - * @symbol ?effectPotencyToString\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVMobEffectInstance\@\@\@Z + * @symbol ?effectPotencyToString\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVMobEffectInstance\@\@\@Z */ MCAPI std::string effectPotencyToString(class MobEffectInstance const &) const; /** - * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z + * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z */ MCAPI std::string getDescriptionId(enum class Potion::PotionType) const; /** - * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDescriptionId\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDescriptionId() const; /** - * @symbol ?getMobEffect\@Potion\@\@QEBAAEBVMobEffectInstance\@\@XZ + * @symbol ?getMobEffect\@Potion\@\@QEBAAEBVMobEffectInstance\@\@XZ */ MCAPI class MobEffectInstance const & getMobEffect() const; /** - * @symbol ?getMobEffectId\@Potion\@\@QEBAHXZ + * @symbol ?getMobEffectId\@Potion\@\@QEBAHXZ */ MCAPI int getMobEffectId() const; /** - * @symbol ?getMobEffects\@Potion\@\@QEBAAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getMobEffects\@Potion\@\@QEBAAEBV?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getMobEffects() const; /** - * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@M\@Z + * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@MV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@AEBVMobEffectInstance\@\@\@Z */ - MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float) const; + MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float, class std::basic_string_view>, class MobEffectInstance const &) const; /** - * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@MV?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBVMobEffectInstance\@\@\@Z + * @symbol ?getPotentencyDescription\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@M\@Z */ - MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float, class gsl::basic_string_span, class MobEffectInstance const &) const; + MCAPI std::string getPotentencyDescription(enum class Potion::PotionType, float) const; /** - * @symbol ?getPotionId\@Potion\@\@QEBAHXZ + * @symbol ?getPotionId\@Potion\@\@QEBAHXZ */ MCAPI int getPotionId() const; /** - * @symbol ?getPotionVariant\@Potion\@\@QEBA?AW4PotionVariant\@1\@XZ + * @symbol ?getPotionVariant\@Potion\@\@QEBA?AW4PotionVariant\@1\@XZ */ MCAPI enum class Potion::PotionVariant getPotionVariant() const; /** - * @symbol ?getPrefix\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPrefix\@Potion\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPrefix() const; /** - * @symbol ??1Potion\@\@QEAA\@XZ + * @symbol ??1Potion\@\@QEAA\@XZ */ MCAPI ~Potion(); /** - * @symbol ?Awkward\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Awkward\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Awkward; /** - * @symbol ?FireResistance\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?FireResistance\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const FireResistance; /** - * @symbol ?Harming\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Harming\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Harming; /** - * @symbol ?Healing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Healing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Healing; /** - * @symbol ?Invisibility\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Invisibility\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Invisibility; /** - * @symbol ?Leaping\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Leaping\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Leaping; /** - * @symbol ?LongFireResistance\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongFireResistance\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongFireResistance; /** - * @symbol ?LongInvisibility\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongInvisibility\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongInvisibility; /** - * @symbol ?LongLeaping\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongLeaping\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongLeaping; /** - * @symbol ?LongMundane\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongMundane\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongMundane; /** - * @symbol ?LongNightvision\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongNightvision\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongNightvision; /** - * @symbol ?LongPoison\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongPoison\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongPoison; /** - * @symbol ?LongRegeneration\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongRegeneration\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongRegeneration; /** - * @symbol ?LongSlowFalling\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongSlowFalling\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongSlowFalling; /** - * @symbol ?LongSlowness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongSlowness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongSlowness; /** - * @symbol ?LongStrength\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongStrength\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongStrength; /** - * @symbol ?LongSwiftness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongSwiftness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongSwiftness; /** - * @symbol ?LongTurtleMaster\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongTurtleMaster\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongTurtleMaster; /** - * @symbol ?LongWaterBreathing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongWaterBreathing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongWaterBreathing; /** - * @symbol ?LongWeakness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?LongWeakness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const LongWeakness; /** - * @symbol ?Mundane\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Mundane\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Mundane; /** - * @symbol ?Nightvision\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Nightvision\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Nightvision; /** - * @symbol ?Poison\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Poison\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Poison; /** - * @symbol ?Regeneration\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Regeneration\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Regeneration; /** - * @symbol ?SlowFalling\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?SlowFalling\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const SlowFalling; /** - * @symbol ?Slowness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Slowness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Slowness; /** - * @symbol ?Strength\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Strength\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Strength; /** - * @symbol ?StrongHarming\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongHarming\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongHarming; /** - * @symbol ?StrongHealing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongHealing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongHealing; /** - * @symbol ?StrongLeaping\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongLeaping\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongLeaping; /** - * @symbol ?StrongPoison\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongPoison\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongPoison; /** - * @symbol ?StrongRegeneration\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongRegeneration\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongRegeneration; /** - * @symbol ?StrongSlowness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongSlowness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongSlowness; /** - * @symbol ?StrongStrength\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongStrength\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongStrength; /** - * @symbol ?StrongSwiftness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongSwiftness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongSwiftness; /** - * @symbol ?StrongTurtleMaster\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?StrongTurtleMaster\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const StrongTurtleMaster; /** - * @symbol ?Swiftness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Swiftness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Swiftness; /** - * @symbol ?Thick\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Thick\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Thick; /** - * @symbol ?TurtleMaster\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?TurtleMaster\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const TurtleMaster; /** - * @symbol ?Water\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Water\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Water; /** - * @symbol ?WaterBreathing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?WaterBreathing\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const WaterBreathing; /** - * @symbol ?Weakness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Weakness\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Weakness; /** - * @symbol ?Wither\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B + * @symbol ?Wither\@Potion\@\@2V?$shared_ptr\@$$CBVPotion\@\@\@std\@\@B */ MCAPI static class std::shared_ptr const Wither; /** - * @symbol ?getBasePotion\@Potion\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z + * @symbol ?getBasePotion\@Potion\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z */ MCAPI static std::string getBasePotion(enum class Potion::PotionType); /** - * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@H\@Z */ - MCAPI static class std::shared_ptr getPotion(class gsl::basic_string_span); + MCAPI static class std::shared_ptr getPotion(int); /** - * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@H\@Z + * @symbol ?getPotion\@Potion\@\@SA?AV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI static class std::shared_ptr getPotion(int); + MCAPI static class std::shared_ptr getPotion(class std::basic_string_view>); /** - * @symbol ?getPotionCount\@Potion\@\@SAHXZ + * @symbol ?getPotionCount\@Potion\@\@SAHXZ */ MCAPI static int getPotionCount(); /** - * @symbol ?initPotions\@Potion\@\@SAXXZ + * @symbol ?initPotions\@Potion\@\@SAXXZ */ MCAPI static void initPotions(); /** - * @symbol ?shutdownPotions\@Potion\@\@SAXXZ + * @symbol ?shutdownPotions\@Potion\@\@SAXXZ */ MCAPI static void shutdownPotions(); //private: /** - * @symbol ??0Potion\@\@AEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@V?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@4\@W4PotionVariant\@0\@\@Z + * @symbol ??0Potion\@\@AEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@2\@V?$vector\@VMobEffectInstance\@\@V?$allocator\@VMobEffectInstance\@\@\@std\@\@\@2\@W4PotionVariant\@0\@\@Z */ - MCAPI Potion(class gsl::basic_string_span, std::vector, std::vector, enum class Potion::PotionVariant); + MCAPI Potion(class std::basic_string_view>, std::vector, std::vector, enum class Potion::PotionVariant); /** - * @symbol ??0Potion\@\@AEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@0AEBVMobEffectInstance\@\@W4PotionVariant\@0\@\@Z + * @symbol ??0Potion\@\@AEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0AEBVMobEffectInstance\@\@W4PotionVariant\@0\@\@Z */ - MCAPI Potion(class gsl::basic_string_span, class gsl::basic_string_span, class MobEffectInstance const &, enum class Potion::PotionVariant); + MCAPI Potion(class std::basic_string_view>, class std::basic_string_view>, class MobEffectInstance const &, enum class Potion::PotionVariant); /** - * @symbol ?_getDescriptionIdCombiningStrings\@Potion\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z + * @symbol ?_getDescriptionIdCombiningStrings\@Potion\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z */ MCAPI std::string _getDescriptionIdCombiningStrings(enum class Potion::PotionType) const; /** - * @symbol ?_getDescriptionIdSingleString\@Potion\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z + * @symbol ?_getDescriptionIdSingleString\@Potion\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PotionType\@1\@\@Z */ MCAPI std::string _getDescriptionIdSingleString(enum class Potion::PotionType) const; /** - * @symbol ?addPotion\@Potion\@\@CAXV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@\@Z + * @symbol ?addPotion\@Potion\@\@CAXV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@\@Z */ MCAPI static void addPotion(class std::shared_ptr); private: /** - * @symbol ?mLastId\@Potion\@\@0HA + * @symbol ?mLastId\@Potion\@\@0HA */ MCAPI static int mLastId; /** - * @symbol ?mPotionsById\@Potion\@\@0PAV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@A + * @symbol ?mPotionsById\@Potion\@\@0PAV?$shared_ptr\@$$CBVPotion\@\@\@std\@\@A */ MCAPI static class std::shared_ptr mPotionsById[]; /** - * @symbol ?mPotionsByName\@Potion\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@std\@\@A + * @symbol ?mPotionsByName\@Potion\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map, struct std::equal_to, class std::allocator>> mPotionsByName; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PotionBrewing.hpp b/LiteLoader/include/llapi/mc/PotionBrewing.hpp index c7f7f1b6b1..f070a330d0 100644 --- a/LiteLoader/include/llapi/mc/PotionBrewing.hpp +++ b/LiteLoader/include/llapi/mc/PotionBrewing.hpp @@ -44,84 +44,84 @@ class Mix { public: /** - * @symbol ?addContainerRecipe\@PotionBrewing\@\@SAXAEBVItem\@\@AEBVIngredient\@1\@0\@Z + * @symbol ?addContainerRecipe\@PotionBrewing\@\@SAXAEBVItem\@\@AEBVIngredient\@1\@0\@Z */ MCAPI static void addContainerRecipe(class Item const &, class PotionBrewing::Ingredient const &, class Item const &); /** - * @symbol ?addPotionMix\@PotionBrewing\@\@SAXAEBVItemDescriptor\@\@AEBVIngredient\@1\@0\@Z + * @symbol ?addPotionMix\@PotionBrewing\@\@SAXAEBVItemDescriptor\@\@AEBVIngredient\@1\@0\@Z */ MCAPI static void addPotionMix(class ItemDescriptor const &, class PotionBrewing::Ingredient const &, class ItemDescriptor const &); /** - * @symbol ?getFuelValue\@PotionBrewing\@\@SAHAEBVItemDescriptor\@\@\@Z + * @symbol ?getFuelValue\@PotionBrewing\@\@SAHAEBVItemDescriptor\@\@\@Z */ MCAPI static int getFuelValue(class ItemDescriptor const &); /** - * @symbol ?hasMix\@PotionBrewing\@\@SA_NAEBVItemInstance\@\@AEBVItemDescriptor\@\@\@Z + * @symbol ?hasMix\@PotionBrewing\@\@SA_NAEBVItemInstance\@\@AEBVItemDescriptor\@\@\@Z */ MCAPI static bool hasMix(class ItemInstance const &, class ItemDescriptor const &); /** - * @symbol ?initPotionBrewing\@PotionBrewing\@\@SAXXZ + * @symbol ?initPotionBrewing\@PotionBrewing\@\@SAXXZ */ MCAPI static void initPotionBrewing(); /** - * @symbol ?isFuel\@PotionBrewing\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isFuel\@PotionBrewing\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isFuel(class ItemDescriptor const &); /** - * @symbol ?isIngredient\@PotionBrewing\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isIngredient\@PotionBrewing\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isIngredient(class ItemDescriptor const &); /** - * @symbol ?isPotionRecipeInput\@PotionBrewing\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isPotionRecipeInput\@PotionBrewing\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isPotionRecipeInput(class ItemDescriptor const &); /** - * @symbol ?mix\@PotionBrewing\@\@SA?AVItemInstance\@\@AEBVItemDescriptor\@\@AEBV2\@\@Z + * @symbol ?mix\@PotionBrewing\@\@SA?AVItemInstance\@\@AEBVItemDescriptor\@\@AEBV2\@\@Z */ MCAPI static class ItemInstance mix(class ItemDescriptor const &, class ItemInstance const &); /** - * @symbol ?shutdown\@PotionBrewing\@\@SAXXZ + * @symbol ?shutdown\@PotionBrewing\@\@SAXXZ */ MCAPI static void shutdown(); //private: /** - * @symbol ?addChemistryMix\@PotionBrewing\@\@CAXAEBVItemInstance\@\@AEBVIngredient\@1\@0\@Z + * @symbol ?addChemistryMix\@PotionBrewing\@\@CAXAEBVItemInstance\@\@AEBVIngredient\@1\@0\@Z */ MCAPI static void addChemistryMix(class ItemInstance const &, class PotionBrewing::Ingredient const &, class ItemInstance const &); /** - * @symbol ?getChemistryMix\@PotionBrewing\@\@CA?AVItemInstance\@\@AEBVItemDescriptor\@\@0\@Z + * @symbol ?getChemistryMix\@PotionBrewing\@\@CA?AVItemInstance\@\@AEBVItemDescriptor\@\@0\@Z */ MCAPI static class ItemInstance getChemistryMix(class ItemDescriptor const &, class ItemDescriptor const &); private: /** - * @symbol ?mChemistryMixes\@PotionBrewing\@\@0V?$vector\@V?$Mix\@VItemInstance\@\@\@PotionBrewing\@\@V?$allocator\@V?$Mix\@VItemInstance\@\@\@PotionBrewing\@\@\@std\@\@\@std\@\@A + * @symbol ?mChemistryMixes\@PotionBrewing\@\@0V?$vector\@V?$Mix\@VItemInstance\@\@\@PotionBrewing\@\@V?$allocator\@V?$Mix\@VItemInstance\@\@\@PotionBrewing\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector> mChemistryMixes; /** - * @symbol ?mContainerMixes\@PotionBrewing\@\@0V?$vector\@V?$Mix\@AEBVItem\@\@\@PotionBrewing\@\@V?$allocator\@V?$Mix\@AEBVItem\@\@\@PotionBrewing\@\@\@std\@\@\@std\@\@A + * @symbol ?mContainerMixes\@PotionBrewing\@\@0V?$vector\@V?$Mix\@AEBVItem\@\@\@PotionBrewing\@\@V?$allocator\@V?$Mix\@AEBVItem\@\@\@PotionBrewing\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector> mContainerMixes; /** - * @symbol ?mIsInitialized\@PotionBrewing\@\@0_NA + * @symbol ?mIsInitialized\@PotionBrewing\@\@0_NA */ MCAPI static bool mIsInitialized; /** - * @symbol ?mPotionMixes\@PotionBrewing\@\@0V?$vector\@V?$Mix\@VItemDescriptor\@\@\@PotionBrewing\@\@V?$allocator\@V?$Mix\@VItemDescriptor\@\@\@PotionBrewing\@\@\@std\@\@\@std\@\@A + * @symbol ?mPotionMixes\@PotionBrewing\@\@0V?$vector\@V?$Mix\@VItemDescriptor\@\@\@PotionBrewing\@\@V?$allocator\@V?$Mix\@VItemDescriptor\@\@\@PotionBrewing\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector> mPotionMixes; /** - * @symbol ?mValidContainers\@PotionBrewing\@\@0V?$vector\@VIngredient\@PotionBrewing\@\@V?$allocator\@VIngredient\@PotionBrewing\@\@\@std\@\@\@std\@\@A + * @symbol ?mValidContainers\@PotionBrewing\@\@0V?$vector\@VIngredient\@PotionBrewing\@\@V?$allocator\@VIngredient\@PotionBrewing\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector mValidContainers; /** - * @symbol ?mValidIngredients\@PotionBrewing\@\@0V?$unordered_set\@VIngredient\@PotionBrewing\@\@U?$hash\@VIngredient\@PotionBrewing\@\@\@std\@\@U?$equal_to\@VIngredient\@PotionBrewing\@\@\@4\@V?$allocator\@VIngredient\@PotionBrewing\@\@\@4\@\@std\@\@A + * @symbol ?mValidIngredients\@PotionBrewing\@\@0V?$unordered_set\@VIngredient\@PotionBrewing\@\@U?$hash\@VIngredient\@PotionBrewing\@\@\@std\@\@U?$equal_to\@VIngredient\@PotionBrewing\@\@\@4\@V?$allocator\@VIngredient\@PotionBrewing\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_set, struct std::equal_to, class std::allocator> mValidIngredients; /** - * @symbol ?mValidRecipeInputs\@PotionBrewing\@\@0V?$unordered_set\@VIngredient\@PotionBrewing\@\@U?$hash\@VIngredient\@PotionBrewing\@\@\@std\@\@U?$equal_to\@VIngredient\@PotionBrewing\@\@\@4\@V?$allocator\@VIngredient\@PotionBrewing\@\@\@4\@\@std\@\@A + * @symbol ?mValidRecipeInputs\@PotionBrewing\@\@0V?$unordered_set\@VIngredient\@PotionBrewing\@\@U?$hash\@VIngredient\@PotionBrewing\@\@\@std\@\@U?$equal_to\@VIngredient\@PotionBrewing\@\@\@4\@V?$allocator\@VIngredient\@PotionBrewing\@\@\@4\@\@std\@\@A */ MCAPI static class std::unordered_set, struct std::equal_to, class std::allocator> mValidRecipeInputs; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PotionItem.hpp b/LiteLoader/include/llapi/mc/PotionItem.hpp index 69374c65fb..e1cd87207a 100644 --- a/LiteLoader/include/llapi/mc/PotionItem.hpp +++ b/LiteLoader/include/llapi/mc/PotionItem.hpp @@ -33,157 +33,161 @@ class PotionItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PotionItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 50 - * @symbol ?isGlint\@PotionItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@PotionItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 56 - * @symbol ?isDestructive\@PotionItem\@\@UEBA_NH\@Z + * @vftbl 56 + * @symbol ?isDestructive\@PotionItem\@\@UEBA_NH\@Z */ virtual bool isDestructive(int) const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@PotionItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@PotionItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@PotionItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@PotionItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@PotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@PotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@PotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@PotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@PotionItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@PotionItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@PotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@PotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 96 - * @symbol ?buildEffectDescriptionName\@PotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 96 + * @symbol ?buildEffectDescriptionName\@PotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z */ virtual std::string buildEffectDescriptionName(class ItemStackBase const &) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@PotionItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@PotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@PotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 132 - * @symbol ?_useOn\@PotionItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@PotionItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @vftbl 133 - * @symbol ?getPotionType\@PotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ + * @vftbl 133 + * @symbol ?getPotionType\@PotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ virtual enum class Potion::PotionType getPotionType() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POTIONITEM /** - * @symbol ?uniqueAuxValues\@PotionItem\@\@UEBA_NXZ + * @symbol ?uniqueAuxValues\@PotionItem\@\@UEBA_NXZ */ MCVAPI bool uniqueAuxValues() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PotionItem(); #endif /** - * @symbol ??0PotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PotionItem(std::string const &, int); /** - * @symbol ?applyEffect\@PotionItem\@\@SAXPEAVThrownPotion\@\@AEBVItemStack\@\@\@Z + * @symbol ?applyEffect\@PotionItem\@\@SAXPEAVThrownPotion\@\@AEBVItemStack\@\@\@Z */ MCAPI static void applyEffect(class ThrownPotion *, class ItemStack const &); /** - * @symbol ?isDestructivePotion\@PotionItem\@\@SA_NW4PotionVariant\@Potion\@\@\@Z + * @symbol ?isDestructivePotion\@PotionItem\@\@SA_NW4PotionVariant\@Potion\@\@\@Z */ MCAPI static bool isDestructivePotion(enum class Potion::PotionVariant); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp index 51634d6f53..ed157d5d26 100644 --- a/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/PowderSnowBlock.hpp @@ -31,283 +31,288 @@ class PowderSnowBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PowderSnowBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@PowderSnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@PowderSnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@PowderSnowBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@PowderSnowBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 31 - * @symbol ?isClimbable\@PowderSnowBlock\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z + * @vftbl 31 + * @symbol ?isClimbable\@PowderSnowBlock\@\@UEBA_NAEBUIActorMovementProxy\@\@\@Z */ virtual bool isClimbable(struct IActorMovementProxy const &) const; /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@PowderSnowBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@PowderSnowBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 53 - * @symbol ?canBeAscendedByJumping\@PowderSnowBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 53 + * @symbol ?canBeAscendedByJumping\@PowderSnowBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@PowderSnowBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@PowderSnowBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@PowderSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@PowderSnowBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@PowderSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POWDERSNOWBLOCK /** - * @symbol ?canBeDestroyedByWaterSpread\@PowderSnowBlock\@\@UEBA_NXZ + * @symbol ?canBeDestroyedByWaterSpread\@PowderSnowBlock\@\@UEBA_NXZ */ MCVAPI bool canBeDestroyedByWaterSpread() const; /** - * @symbol ?canBeSilkTouched\@PowderSnowBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@PowderSnowBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?causesFreezeEffect\@PowderSnowBlock\@\@UEBA_NXZ + * @symbol ?causesFreezeEffect\@PowderSnowBlock\@\@UEBA_NXZ */ MCVAPI bool causesFreezeEffect() const; #endif /** - * @symbol ??0PowderSnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0PowderSnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI PowderSnowBlock(std::string const &, int, class Material const &); /** - * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBVGetCollisionShapeInterface\@\@\@Z */ - MCAPI static bool canWalkOnTop(struct IActorMovementProxy const &); + MCAPI static bool canWalkOnTop(class GetCollisionShapeInterface const &); /** - * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBVGetCollisionShapeInterface\@\@\@Z + * @symbol ?canWalkOnTop\@PowderSnowBlock\@\@SA_NAEBUIActorMovementProxy\@\@\@Z */ - MCAPI static bool canWalkOnTop(class GetCollisionShapeInterface const &); + MCAPI static bool canWalkOnTop(struct IActorMovementProxy const &); /** - * @symbol ?clearFire\@PowderSnowBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?clearFire\@PowderSnowBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI static void clearFire(class BlockSource &, class BlockPos const &, class Block const &); /** - * @symbol ?spawnPowderSnowParticles\@PowderSnowBlock\@\@SAXAEAVLevel\@\@AEBVBlockPos\@\@\@Z + * @symbol ?spawnPowderSnowParticles\@PowderSnowBlock\@\@SAXAEAVLevel\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void spawnPowderSnowParticles(class Level &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp b/LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp index 3620ac667a..4817ad4645 100644 --- a/LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp +++ b/LiteLoader/include/llapi/mc/PoweredBlockComponent.hpp @@ -31,59 +31,59 @@ class PoweredBlockComponent : public BaseCircuitComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PoweredBlockComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getStrength\@PoweredBlockComponent\@\@UEBAHXZ + * @vftbl 1 + * @symbol ?getStrength\@PoweredBlockComponent\@\@UEBAHXZ */ virtual int getStrength() const; /** - * @vftbl 7 - * @symbol ?canConsumerPower\@PoweredBlockComponent\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?canConsumerPower\@PoweredBlockComponent\@\@UEBA_NXZ */ virtual bool canConsumerPower() const; /** - * @vftbl 11 - * @symbol ?addSource\@PoweredBlockComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@PoweredBlockComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@PoweredBlockComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@PoweredBlockComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@PoweredBlockComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@PoweredBlockComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@PoweredBlockComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@PoweredBlockComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_POWEREDBLOCKCOMPONENT /** - * @symbol ?hasChildrenSource\@PoweredBlockComponent\@\@UEBA_NXZ + * @symbol ?hasChildrenSource\@PoweredBlockComponent\@\@UEBA_NXZ */ MCVAPI bool hasChildrenSource() const; #endif /** - * @symbol ??0PoweredBlockComponent\@\@QEAA\@E\@Z + * @symbol ??0PoweredBlockComponent\@\@QEAA\@E\@Z */ MCAPI PoweredBlockComponent(unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp index edb1c8fc11..d6ee4b1c39 100644 --- a/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp +++ b/LiteLoader/include/llapi/mc/PoweredRailBlock.hpp @@ -31,203 +31,208 @@ class PoweredRailBlock : public BaseRailBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PoweredRailBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@PoweredRailBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@PoweredRailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@PoweredRailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0PoweredRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0PoweredRailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PoweredRailBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp b/LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp index 0869f9f58a..5d0945f7d7 100644 --- a/LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/PrecompiledCommandOrigin.hpp @@ -32,104 +32,104 @@ class PrecompiledCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PrecompiledCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@PrecompiledCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@PrecompiledCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@PrecompiledCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PrecompiledCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@PrecompiledCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@PrecompiledCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@PrecompiledCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@PrecompiledCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@PrecompiledCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@PrecompiledCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@PrecompiledCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@PrecompiledCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@PrecompiledCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@PrecompiledCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@PrecompiledCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@PrecompiledCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@PrecompiledCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@PrecompiledCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@PrecompiledCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@PrecompiledCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 13 - * @symbol ?hasChatPerms\@PrecompiledCommandOrigin\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?hasChatPerms\@PrecompiledCommandOrigin\@\@UEBA_NXZ */ virtual bool hasChatPerms() const; /** - * @vftbl 14 - * @symbol ?hasTellPerms\@PrecompiledCommandOrigin\@\@UEBA_NXZ + * @vftbl 14 + * @symbol ?hasTellPerms\@PrecompiledCommandOrigin\@\@UEBA_NXZ */ virtual bool hasTellPerms() const; /** - * @vftbl 15 - * @symbol ?canUseAbility\@PrecompiledCommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z + * @vftbl 15 + * @symbol ?canUseAbility\@PrecompiledCommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z */ virtual bool canUseAbility(enum class AbilitiesIndex) const; /** - * @vftbl 16 - * @symbol ?isWorldBuilder\@PrecompiledCommandOrigin\@\@UEBA_NXZ + * @vftbl 16 + * @symbol ?isWorldBuilder\@PrecompiledCommandOrigin\@\@UEBA_NXZ */ virtual bool isWorldBuilder() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@PrecompiledCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@PrecompiledCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@PrecompiledCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@PrecompiledCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@PrecompiledCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@PrecompiledCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@PrecompiledCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@PrecompiledCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@PrecompiledCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@PrecompiledCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Predicate.hpp b/LiteLoader/include/llapi/mc/Predicate.hpp index 436fbd19d8..bd180eb296 100644 --- a/LiteLoader/include/llapi/mc/Predicate.hpp +++ b/LiteLoader/include/llapi/mc/Predicate.hpp @@ -22,7 +22,7 @@ namespace Predicate { #undef AFTER_EXTRA /** - * @symbol ?_calulatePositionalChance\@Predicate\@\@YA_NMMHHHM\@Z + * @symbol ?_calulatePositionalChance\@Predicate\@\@YA_NMMHHHM\@Z */ MCAPI bool _calulatePositionalChance(float, float, int, int, int, float); diff --git a/LiteLoader/include/llapi/mc/PredictableProjectile.hpp b/LiteLoader/include/llapi/mc/PredictableProjectile.hpp index c57036caaa..7945e191c8 100644 --- a/LiteLoader/include/llapi/mc/PredictableProjectile.hpp +++ b/LiteLoader/include/llapi/mc/PredictableProjectile.hpp @@ -31,118 +31,124 @@ class PredictableProjectile : public Actor { public: /** - * @vftbl 15 - * @symbol ?_doInitialMove\@PredictableProjectile\@\@MEAAXXZ + * @vftbl 15 + * @symbol ?_doInitialMove\@PredictableProjectile\@\@MEAAXXZ */ virtual void _doInitialMove(); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~PredictableProjectile(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PREDICTABLEPROJECTILE /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @symbol __unk_destructor_-1 */ - virtual void __unk_vfn_270(); + MCVAPI ~PredictableProjectile(); +#endif /** - * @symbol ??0PredictableProjectile\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0PredictableProjectile\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI PredictableProjectile(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PredictedMovementComponent.hpp b/LiteLoader/include/llapi/mc/PredictedMovementComponent.hpp index a2215f308d..aee77bc607 100644 --- a/LiteLoader/include/llapi/mc/PredictedMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/PredictedMovementComponent.hpp @@ -46,52 +46,52 @@ struct HistoryItem { public: /** - * @symbol ??0PredictedMovementComponent\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0PredictedMovementComponent\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI PredictedMovementComponent(class Actor &); /** - * @symbol ?isEnabled\@PredictedMovementComponent\@\@QEBA_NXZ + * @symbol ?isEnabled\@PredictedMovementComponent\@\@QEBA_NXZ */ MCAPI bool isEnabled() const; /** - * @symbol ?reset\@PredictedMovementComponent\@\@QEAAXXZ + * @symbol ?reset\@PredictedMovementComponent\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?tick\@PredictedMovementComponent\@\@QEAAXAEBV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?tick\@PredictedMovementComponent\@\@QEAAXAEBV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI void tick(class std::chrono::time_point>> const &); /** - * @symbol ??1PredictedMovementComponent\@\@QEAA\@XZ + * @symbol ??1PredictedMovementComponent\@\@QEAA\@XZ */ MCAPI ~PredictedMovementComponent(); //private: /** - * @symbol ?_debugLog\@PredictedMovementComponent\@\@AEBAXAEBUPredictionDbgData\@1\@\@Z + * @symbol ?_debugLog\@PredictedMovementComponent\@\@AEBAXAEBUPredictionDbgData\@1\@\@Z */ MCAPI void _debugLog(struct PredictedMovementComponent::PredictionDbgData const &) const; /** - * @symbol ?_isDebugLoggingEnabled\@PredictedMovementComponent\@\@AEBA_NXZ + * @symbol ?_isDebugLoggingEnabled\@PredictedMovementComponent\@\@AEBA_NXZ */ MCAPI bool _isDebugLoggingEnabled() const; /** - * @symbol ?_tickNextPosition\@PredictedMovementComponent\@\@AEAAXAEBV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?_tickNextPosition\@PredictedMovementComponent\@\@AEAAXAEBV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI void _tickNextPosition(class std::chrono::time_point>> const &); /** - * @symbol ?_tryInterpolate\@PredictedMovementComponent\@\@AEAA_NAEBV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?_tryInterpolate\@PredictedMovementComponent\@\@AEAA_NAEBV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI bool _tryInterpolate(class std::chrono::time_point>> const &); private: /** - * @symbol ?LERP_STEP_SIZE\@PredictedMovementComponent\@\@0IB + * @symbol ?LERP_STEP_SIZE\@PredictedMovementComponent\@\@0IB */ MCAPI static unsigned int const LERP_STEP_SIZE; /** - * @symbol ?mGlobalRuntimePredictionData\@PredictedMovementComponent\@\@0V?$unique_ptr\@URuntimePredictionData\@PredictedMovementComponent\@\@U?$default_delete\@URuntimePredictionData\@PredictedMovementComponent\@\@\@std\@\@\@std\@\@A + * @symbol ?mGlobalRuntimePredictionData\@PredictedMovementComponent\@\@0V?$unique_ptr\@URuntimePredictionData\@PredictedMovementComponent\@\@U?$default_delete\@URuntimePredictionData\@PredictedMovementComponent\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mGlobalRuntimePredictionData; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PredictedMovementValues.hpp b/LiteLoader/include/llapi/mc/PredictedMovementValues.hpp index a763a69de9..b4ed1dc37a 100644 --- a/LiteLoader/include/llapi/mc/PredictedMovementValues.hpp +++ b/LiteLoader/include/llapi/mc/PredictedMovementValues.hpp @@ -30,15 +30,15 @@ struct PredictedMovementValues { public: /** - * @symbol ?DEFAULT_INTERPOLATION_WINDOW_SIZE_IN_TICKS\@PredictedMovementValues\@\@2_JB + * @symbol ?DEFAULT_INTERPOLATION_WINDOW_SIZE_IN_TICKS\@PredictedMovementValues\@\@2_JB */ MCAPI static __int64 const DEFAULT_INTERPOLATION_WINDOW_SIZE_IN_TICKS; /** - * @symbol ?DEFAULT_USE_AGGRESSIVE_TICK_INTERVAL\@PredictedMovementValues\@\@2_NB + * @symbol ?DEFAULT_USE_AGGRESSIVE_TICK_INTERVAL\@PredictedMovementValues\@\@2_NB */ MCAPI static bool const DEFAULT_USE_AGGRESSIVE_TICK_INTERVAL; /** - * @symbol ?SMALL_INTERPOLATION_WINDOW_SIZE_IN_TICKS\@PredictedMovementValues\@\@2_JB + * @symbol ?SMALL_INTERPOLATION_WINDOW_SIZE_IN_TICKS\@PredictedMovementValues\@\@2_JB */ MCAPI static __int64 const SMALL_INTERPOLATION_WINDOW_SIZE_IN_TICKS; diff --git a/LiteLoader/include/llapi/mc/PreferredPathComponent.hpp b/LiteLoader/include/llapi/mc/PreferredPathComponent.hpp index 9780ae8569..f7255f0faa 100644 --- a/LiteLoader/include/llapi/mc/PreferredPathComponent.hpp +++ b/LiteLoader/include/llapi/mc/PreferredPathComponent.hpp @@ -30,12 +30,12 @@ class PreferredPathComponent { public: /** - * @symbol ?getPreferredPath\@PreferredPathComponent\@\@QEAAAEBUPreferredPathDescription\@\@AEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@PreferredPathComponent\@\@QEAAXAEAVActor\@\@\@Z */ - MCAPI struct PreferredPathDescription const & getPreferredPath(class Actor &); + MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?initFromDefinition\@PreferredPathComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?getPreferredPath\@PreferredPathComponent\@\@SAAEBUPreferredPathDescription\@\@AEBVActor\@\@\@Z */ - MCAPI void initFromDefinition(class Actor &); + MCAPI static struct PreferredPathDescription const & getPreferredPath(class Actor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PreferredPathDescription.hpp b/LiteLoader/include/llapi/mc/PreferredPathDescription.hpp index 2ebeadbbc1..8db197794f 100644 --- a/LiteLoader/include/llapi/mc/PreferredPathDescription.hpp +++ b/LiteLoader/include/llapi/mc/PreferredPathDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,27 +29,28 @@ struct PreferredPathDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@PreferredPathDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@PreferredPathDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~PreferredPathDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@PreferredPathDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@PreferredPathDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PREFERREDPATHDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@PreferredPathDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~PreferredPathDescription(); +#endif /** - * @symbol ??0PreferredPathDescription\@\@QEAA\@XZ + * @symbol ??0PreferredPathDescription\@\@QEAA\@XZ */ MCAPI PreferredPathDescription(); diff --git a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp index ba35863035..a9b4fc8807 100644 --- a/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/PressurePlateBlock.hpp @@ -31,213 +31,213 @@ class PressurePlateBlock : public BasePressurePlateBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PressurePlateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @vftbl 194 - * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 195 + * @symbol ?getSignalStrength\@PressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 195 - * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z + * @vftbl 196 + * @symbol ?getSignalForData\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 196 - * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z + * @vftbl 197 + * @symbol ?getRedstoneSignal\@PressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; /** - * @symbol ??0PressurePlateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@W4Sensitivity\@0\@\@Z + * @symbol ??0PressurePlateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@W4Sensitivity\@0\@\@Z */ MCAPI PressurePlateBlock(std::string const &, int, class Material const &, enum class PressurePlateBlock::Sensitivity); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PreviewContainerValidation.hpp b/LiteLoader/include/llapi/mc/PreviewContainerValidation.hpp index 05d1be7675..ce5175dae3 100644 --- a/LiteLoader/include/llapi/mc/PreviewContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/PreviewContainerValidation.hpp @@ -31,58 +31,58 @@ class PreviewContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PreviewContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PREVIEWCONTAINERVALIDATION /** - * @symbol ?isItemAllowedInSlot\@PreviewContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @symbol ?isItemAllowedInSlot\@PreviewContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ MCVAPI bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @symbol ?isItemAllowedToAdd\@PreviewContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z + * @symbol ?isItemAllowedToAdd\@PreviewContainerValidation\@\@UEBA_NAEBVItemStack\@\@\@Z */ MCVAPI bool isItemAllowedToAdd(class ItemStack const &) const; /** - * @symbol ?isValidSlotForContainer\@PreviewContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @symbol ?isValidSlotForContainer\@PreviewContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ MCVAPI bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PrimedTnt.hpp b/LiteLoader/include/llapi/mc/PrimedTnt.hpp index e211131ad3..04fc918bea 100644 --- a/LiteLoader/include/llapi/mc/PrimedTnt.hpp +++ b/LiteLoader/include/llapi/mc/PrimedTnt.hpp @@ -32,182 +32,182 @@ class PrimedTnt : public PredictableProjectile { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@PrimedTnt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@PrimedTnt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@PrimedTnt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@PrimedTnt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@PrimedTnt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@PrimedTnt\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~PrimedTnt(); + virtual void __unk_vfn_16(); /** - * @vftbl 18 - * @symbol ?getOwnerEntityType\@PrimedTnt\@\@UEAA?AW4ActorType\@\@XZ + * @vftbl 18 + * @symbol ?getOwnerEntityType\@PrimedTnt\@\@UEAA?AW4ActorType\@\@XZ */ virtual enum class ActorType getOwnerEntityType(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 44 - * @symbol ?teleportTo\@PrimedTnt\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@PrimedTnt\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 49 - * @symbol ?normalTick\@PrimedTnt\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@PrimedTnt\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@PrimedTnt\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@PrimedTnt\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@PrimedTnt\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@PrimedTnt\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@PrimedTnt\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@PrimedTnt\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@PrimedTnt\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@PrimedTnt\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@PrimedTnt\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@PrimedTnt\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@PrimedTnt\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@PrimedTnt\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@PrimedTnt\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@PrimedTnt\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0PrimedTnt\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0PrimedTnt\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI PrimedTnt(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@PrimedTnt\@\@QEAAXXZ + * @symbol ?postNormalTick\@PrimedTnt\@\@QEAAXXZ */ MCAPI void postNormalTick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PrimedTntPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/PrimedTntPostNormalTickSystem.hpp deleted file mode 100644 index d203d285f9..0000000000 --- a/LiteLoader/include/llapi/mc/PrimedTntPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file PrimedTntPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class PrimedTntPostNormalTickSystem. - * - */ -class PrimedTntPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PRIMEDTNTPOSTNORMALTICKSYSTEM -public: - class PrimedTntPostNormalTickSystem& operator=(class PrimedTntPostNormalTickSystem const &) = delete; - PrimedTntPostNormalTickSystem(class PrimedTntPostNormalTickSystem const &) = delete; - PrimedTntPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@PrimedTntPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doPrimedTntPostNormalTickSystem\@PrimedTntPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doPrimedTntPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/PrintStream.hpp b/LiteLoader/include/llapi/mc/PrintStream.hpp index 398708174f..29cac5e489 100644 --- a/LiteLoader/include/llapi/mc/PrintStream.hpp +++ b/LiteLoader/include/llapi/mc/PrintStream.hpp @@ -30,14 +30,14 @@ class PrintStream { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PrintStream(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?print\@PrintStream\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?print\@PrintStream\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void print(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PrioritizedGoal.hpp b/LiteLoader/include/llapi/mc/PrioritizedGoal.hpp index 13e9b01f0e..4bcc9293f2 100644 --- a/LiteLoader/include/llapi/mc/PrioritizedGoal.hpp +++ b/LiteLoader/include/llapi/mc/PrioritizedGoal.hpp @@ -30,28 +30,28 @@ class PrioritizedGoal { public: /** - * @symbol ?getPriority\@PrioritizedGoal\@\@QEBAHXZ + * @symbol ?getPriority\@PrioritizedGoal\@\@QEBAHXZ */ MCAPI int getPriority() const; /** - * @symbol ?getToStart\@PrioritizedGoal\@\@QEBA_NXZ + * @symbol ?getToStart\@PrioritizedGoal\@\@QEBA_NXZ */ MCAPI bool getToStart() const; /** - * @symbol ?getUsed\@PrioritizedGoal\@\@QEBA_NXZ + * @symbol ?getUsed\@PrioritizedGoal\@\@QEBA_NXZ */ MCAPI bool getUsed() const; /** - * @symbol ?setToStart\@PrioritizedGoal\@\@QEAAX_N\@Z + * @symbol ?setToStart\@PrioritizedGoal\@\@QEAAX_N\@Z */ MCAPI void setToStart(bool); /** - * @symbol ?setUsed\@PrioritizedGoal\@\@QEAAX_N\@Z + * @symbol ?setUsed\@PrioritizedGoal\@\@QEAAX_N\@Z */ MCAPI void setUsed(bool); /** - * @symbol ??1PrioritizedGoal\@\@QEAA\@XZ + * @symbol ??1PrioritizedGoal\@\@QEAA\@XZ */ MCAPI ~PrioritizedGoal(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp index 8625e5b34d..96ea91a920 100644 --- a/LiteLoader/include/llapi/mc/PrismarineBlock.hpp +++ b/LiteLoader/include/llapi/mc/PrismarineBlock.hpp @@ -31,218 +31,223 @@ class PrismarineBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PrismarineBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@PrismarineBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@PrismarineBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@PrismarineBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@PrismarineBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@PrismarineBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@PrismarineBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0PrismarineBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PrismarineBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PrismarineBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp index 0be8ebd0ec..22b201dfa1 100644 --- a/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp +++ b/LiteLoader/include/llapi/mc/PrivateKeyManager.hpp @@ -31,26 +31,32 @@ class PrivateKeyManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PrivateKeyManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValid\@PrivateKeyManager\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isValid\@PrivateKeyManager\@\@UEBA_NXZ */ virtual bool isValid() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PRIVATEKEYMANAGER /** - * @symbol ??0PrivateKeyManager\@\@QEAA\@W4System\@Asymmetric\@Crypto\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~PrivateKeyManager(); +#endif + /** + * @symbol ??0PrivateKeyManager\@\@QEAA\@W4System\@Asymmetric\@Crypto\@\@\@Z */ MCAPI PrivateKeyManager(enum class Crypto::Asymmetric::System); /** - * @symbol ?computeSecret\@PrivateKeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVKeyManager\@\@\@Z + * @symbol ?computeSecret\@PrivateKeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVKeyManager\@\@\@Z */ MCAPI std::string computeSecret(class KeyManager const &) const; /** - * @symbol ?sign\@PrivateKeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@W4HashType\@Hash\@Crypto\@\@\@Z + * @symbol ?sign\@PrivateKeyManager\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@W4HashType\@Hash\@Crypto\@\@\@Z */ MCAPI std::string sign(std::string const &, enum class Crypto::Hash::HashType) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProcessGlobals.hpp b/LiteLoader/include/llapi/mc/ProcessGlobals.hpp index 725efc3039..a51ec66a1d 100644 --- a/LiteLoader/include/llapi/mc/ProcessGlobals.hpp +++ b/LiteLoader/include/llapi/mc/ProcessGlobals.hpp @@ -20,11 +20,11 @@ namespace ProcessGlobals { #undef AFTER_EXTRA /** - * @symbol ?g_defaultProcessQueue\@ProcessGlobals\@\@3U?$atomic\@PEAUXTaskQueueObject\@\@\@std\@\@A + * @symbol ?g_defaultProcessQueue\@ProcessGlobals\@\@3U?$atomic\@PEAUXTaskQueueObject\@\@\@std\@\@A */ MCAPI extern struct std::atomic g_defaultProcessQueue; /** - * @symbol ?g_processQueue\@ProcessGlobals\@\@3U?$atomic\@PEAUXTaskQueueObject\@\@\@std\@\@A + * @symbol ?g_processQueue\@ProcessGlobals\@\@3U?$atomic\@PEAUXTaskQueueObject\@\@\@std\@\@A */ MCAPI extern struct std::atomic g_processQueue; diff --git a/LiteLoader/include/llapi/mc/ProducerComponent.hpp b/LiteLoader/include/llapi/mc/ProducerComponent.hpp index 437b53f060..194c16076f 100644 --- a/LiteLoader/include/llapi/mc/ProducerComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProducerComponent.hpp @@ -30,57 +30,57 @@ class ProducerComponent : public BaseCircuitComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ProducerComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?setStrength\@ProducerComponent\@\@UEAAXH\@Z + * @vftbl 3 + * @symbol ?setStrength\@ProducerComponent\@\@UEAAXH\@Z */ virtual void setStrength(int); /** - * @vftbl 8 - * @symbol ?canStopPower\@ProducerComponent\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?canStopPower\@ProducerComponent\@\@UEBA_NXZ */ virtual bool canStopPower() const; /** - * @vftbl 9 - * @symbol ?setStopPower\@ProducerComponent\@\@UEAAX_N\@Z + * @vftbl 9 + * @symbol ?setStopPower\@ProducerComponent\@\@UEAAX_N\@Z */ virtual void setStopPower(bool); /** - * @vftbl 12 - * @symbol ?allowConnection\@ProducerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@ProducerComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@ProducerComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@ProducerComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@ProducerComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@ProducerComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @symbol ??0ProducerComponent\@\@QEAA\@XZ + * @symbol ??0ProducerComponent\@\@QEAA\@XZ */ MCAPI ProducerComponent(); /** - * @symbol ?allowAttachments\@ProducerComponent\@\@QEAAX_N\@Z + * @symbol ?allowAttachments\@ProducerComponent\@\@QEAAX_N\@Z */ MCAPI void allowAttachments(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProfilerLite.hpp b/LiteLoader/include/llapi/mc/ProfilerLite.hpp index fc75634dca..15a01ef245 100644 --- a/LiteLoader/include/llapi/mc/ProfilerLite.hpp +++ b/LiteLoader/include/llapi/mc/ProfilerLite.hpp @@ -29,27 +29,27 @@ class ProfilerLite { public: /** - * @symbol ??0ProfilerLite\@\@QEAA\@XZ + * @symbol ??0ProfilerLite\@\@QEAA\@XZ */ MCAPI ProfilerLite(); /** - * @symbol ?calculateAndSetServerNetworkTime\@ProfilerLite\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?calculateAndSetServerNetworkTime\@ProfilerLite\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI void calculateAndSetServerNetworkTime(class std::chrono::time_point>>); /** - * @symbol ?calculateAndSetServerTickTimes\@ProfilerLite\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?calculateAndSetServerTickTimes\@ProfilerLite\@\@QEAAXV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI void calculateAndSetServerTickTimes(class std::chrono::time_point>>); /** - * @symbol ?getServerTickTime\@ProfilerLite\@\@QEBA?AV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@XZ + * @symbol ?getServerTickTime\@ProfilerLite\@\@QEBA?AV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@XZ */ MCAPI class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> getServerTickTime() const; /** - * @symbol ??1ProfilerLite\@\@QEAA\@XZ + * @symbol ??1ProfilerLite\@\@QEAA\@XZ */ MCAPI ~ProfilerLite(); /** - * @symbol ?sEmptyThreadID\@ProfilerLite\@\@2Vid\@thread\@std\@\@A + * @symbol ?sEmptyThreadID\@ProfilerLite\@\@2Vid\@thread\@std\@\@A */ MCAPI static class std::thread::id sEmptyThreadID; @@ -57,8 +57,8 @@ class ProfilerLite { private: /** - * @symbol ?gProfilerLiteInstance\@ProfilerLite\@\@0V1\@A + * @symbol ?gProfilerLiteInstance\@ProfilerLite\@\@0V1\@A */ MCAPI static class ProfilerLite gProfilerLiteInstance; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp index f2f3da9d4a..e5950c60a7 100644 --- a/LiteLoader/include/llapi/mc/ProjectileComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileComponent.hpp @@ -23,182 +23,191 @@ class ProjectileComponent { enum class EAxis; #undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_PROJECTILECOMPONENT public: + class ProjectileComponent& operator=(class ProjectileComponent const &) = delete; +#endif + +public: + /** + * @symbol ??0ProjectileComponent\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI ProjectileComponent(class ProjectileComponent const &); /** - * @symbol ??0ProjectileComponent\@\@QEAA\@XZ + * @symbol ??0ProjectileComponent\@\@QEAA\@XZ */ MCAPI ProjectileComponent(); /** - * @symbol ??0ProjectileComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ProjectileComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ProjectileComponent(class ProjectileComponent const &); + MCAPI ProjectileComponent(class ProjectileComponent &&); /** - * @symbol ?addAdditionalSaveData\@ProjectileComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@ProjectileComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getAnchor\@ProjectileComponent\@\@QEAA?AW4ProjectileAnchor\@\@XZ + * @symbol ?getAnchor\@ProjectileComponent\@\@QEAA?AW4ProjectileAnchor\@\@XZ */ MCAPI enum class ProjectileAnchor getAnchor(); /** - * @symbol ?getCatchFire\@ProjectileComponent\@\@QEBA_NXZ + * @symbol ?getCatchFire\@ProjectileComponent\@\@QEBA_NXZ */ MCAPI bool getCatchFire() const; /** - * @symbol ?getEnchantChanneling\@ProjectileComponent\@\@QEBA_NXZ + * @symbol ?getEnchantChanneling\@ProjectileComponent\@\@QEBA_NXZ */ MCAPI bool getEnchantChanneling() const; /** - * @symbol ?getGravity\@ProjectileComponent\@\@QEAAMXZ + * @symbol ?getGravity\@ProjectileComponent\@\@QEAAMXZ */ MCAPI float getGravity(); /** - * @symbol ?getIsDangerous\@ProjectileComponent\@\@QEAA_NXZ + * @symbol ?getIsDangerous\@ProjectileComponent\@\@QEAA_NXZ */ MCAPI bool getIsDangerous(); /** - * @symbol ?getKnockbackForce\@ProjectileComponent\@\@QEBAMXZ + * @symbol ?getKnockbackForce\@ProjectileComponent\@\@QEBAMXZ */ MCAPI float getKnockbackForce() const; /** - * @symbol ?getNoPhysics\@ProjectileComponent\@\@QEBA_NXZ + * @symbol ?getNoPhysics\@ProjectileComponent\@\@QEBA_NXZ */ MCAPI bool getNoPhysics() const; /** - * @symbol ?getOffset\@ProjectileComponent\@\@QEAA?AVVec3\@\@XZ + * @symbol ?getOffset\@ProjectileComponent\@\@QEAA?AVVec3\@\@XZ */ MCAPI class Vec3 getOffset(); /** - * @symbol ?getShootSound\@ProjectileComponent\@\@QEAA?AW4LevelSoundEvent\@\@XZ + * @symbol ?getShootSound\@ProjectileComponent\@\@QEAA?AW4LevelSoundEvent\@\@XZ */ MCAPI enum class LevelSoundEvent getShootSound(); /** - * @symbol ?getShootTarget\@ProjectileComponent\@\@QEAA_NXZ + * @symbol ?getShootTarget\@ProjectileComponent\@\@QEAA_NXZ */ MCAPI bool getShootTarget(); /** - * @symbol ?getShooterAngle\@ProjectileComponent\@\@QEBA?AVVec3\@\@AEAVActor\@\@\@Z + * @symbol ?getShooterAngle\@ProjectileComponent\@\@QEBA?AVVec3\@\@AEAVActor\@\@\@Z */ MCAPI class Vec3 getShooterAngle(class Actor &) const; /** - * @symbol ?getThrowPower\@ProjectileComponent\@\@QEBAMXZ + * @symbol ?getThrowPower\@ProjectileComponent\@\@QEBAMXZ */ MCAPI float getThrowPower() const; /** - * @symbol ?getUncertainty\@ProjectileComponent\@\@QEBAMW4Difficulty\@\@\@Z + * @symbol ?getUncertainty\@ProjectileComponent\@\@QEBAMW4Difficulty\@\@\@Z */ MCAPI float getUncertainty(enum class Difficulty) const; /** - * @symbol ?getUncertaintyBase\@ProjectileComponent\@\@QEBAMXZ + * @symbol ?getUncertaintyBase\@ProjectileComponent\@\@QEBAMXZ */ MCAPI float getUncertaintyBase() const; /** - * @symbol ?getUncertaintyMultiplier\@ProjectileComponent\@\@QEBAMXZ + * @symbol ?getUncertaintyMultiplier\@ProjectileComponent\@\@QEBAMXZ */ MCAPI float getUncertaintyMultiplier() const; /** - * @symbol ?handleMovementGravity\@ProjectileComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?handleMovementGravity\@ProjectileComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void handleMovementGravity(class Actor &); /** - * @symbol ?handleMovementHoming\@ProjectileComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?handleMovementHoming\@ProjectileComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void handleMovementHoming(class Actor &); /** - * @symbol ?hurt\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@\@Z + * @symbol ?hurt\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVActorDamageSource\@\@\@Z */ MCAPI void hurt(class Actor &, class ActorDamageSource const &); /** - * @symbol ?incrementFlightTime\@ProjectileComponent\@\@QEAAHXZ + * @symbol ?incrementFlightTime\@ProjectileComponent\@\@QEAAHXZ */ MCAPI int incrementFlightTime(); /** - * @symbol ?incrementLife\@ProjectileComponent\@\@QEAAHXZ + * @symbol ?incrementLife\@ProjectileComponent\@\@QEAAHXZ */ MCAPI int incrementLife(); /** - * @symbol ?incrementOnGroundTime\@ProjectileComponent\@\@QEAAHXZ + * @symbol ?incrementOnGroundTime\@ProjectileComponent\@\@QEAAHXZ */ MCAPI int incrementOnGroundTime(); /** - * @symbol ?initFromDefinition\@ProjectileComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@ProjectileComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?lerpMotion\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?lerpMotion\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z */ MCAPI void lerpMotion(class Actor &, class Vec3 const &); /** - * @symbol ?onHit\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVHitResult\@\@\@Z + * @symbol ?onHit\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVHitResult\@\@\@Z */ MCAPI void onHit(class Actor &, class HitResult const &); /** - * @symbol ??4ProjectileComponent\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ProjectileComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ - MCAPI class ProjectileComponent & operator=(class ProjectileComponent const &); + MCAPI class ProjectileComponent & operator=(class ProjectileComponent &&); /** - * @symbol ?readAdditionalSaveData\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?setActiveTarget\@ProjectileComponent\@\@QEAAXAEAVActor\@\@PEAV2\@\@Z + * @symbol ?setActiveTarget\@ProjectileComponent\@\@QEAAXAEAVActor\@\@PEAV2\@\@Z */ MCAPI void setActiveTarget(class Actor &, class Actor *); /** - * @symbol ?setChanneling\@ProjectileComponent\@\@QEAAXXZ + * @symbol ?setChanneling\@ProjectileComponent\@\@QEAAXXZ */ MCAPI void setChanneling(); /** - * @symbol ?setEnchantImpaler\@ProjectileComponent\@\@QEAAXAEBH\@Z + * @symbol ?setEnchantImpaler\@ProjectileComponent\@\@QEAAXAEBH\@Z */ MCAPI void setEnchantImpaler(int const &); /** - * @symbol ?setKnockbackForce\@ProjectileComponent\@\@QEAAXM\@Z + * @symbol ?setKnockbackForce\@ProjectileComponent\@\@QEAAXM\@Z */ MCAPI void setKnockbackForce(float); /** - * @symbol ?setNoPhysics\@ProjectileComponent\@\@QEAAX_N\@Z + * @symbol ?setNoPhysics\@ProjectileComponent\@\@QEAAX_N\@Z */ MCAPI void setNoPhysics(bool); /** - * @symbol ?setOwnerId\@ProjectileComponent\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setOwnerId\@ProjectileComponent\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setOwnerId(struct ActorUniqueID); /** - * @symbol ?setPotionEffect\@ProjectileComponent\@\@QEAAXH\@Z + * @symbol ?setPotionEffect\@ProjectileComponent\@\@QEAAXH\@Z */ MCAPI void setPotionEffect(int); /** - * @symbol ?setSplashRange\@ProjectileComponent\@\@QEAAXM\@Z + * @symbol ?setSplashRange\@ProjectileComponent\@\@QEAAXM\@Z */ MCAPI void setSplashRange(float); /** - * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@0\@Z + * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@MM1PEAV2\@\@Z */ - MCAPI void shoot(class Actor &, class Actor &); + MCAPI void shoot(class Actor &, class Vec3 const &, float, float, class Vec3 const &, class Actor *); /** - * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@MM1PEAV2\@\@Z + * @symbol ?shoot\@ProjectileComponent\@\@QEAAXAEAVActor\@\@0\@Z */ - MCAPI void shoot(class Actor &, class Vec3 const &, float, float, class Vec3 const &, class Actor *); + MCAPI void shoot(class Actor &, class Actor &); /** - * @symbol ??1ProjectileComponent\@\@QEAA\@XZ + * @symbol ??1ProjectileComponent\@\@QEAA\@XZ */ MCAPI ~ProjectileComponent(); /** - * @symbol ?DELAY_ON_HIT\@ProjectileComponent\@\@2IB + * @symbol ?DELAY_ON_HIT\@ProjectileComponent\@\@2IB */ MCAPI static unsigned int const DELAY_ON_HIT; //private: /** - * @symbol ?_handleLightningOnHit\@ProjectileComponent\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_handleLightningOnHit\@ProjectileComponent\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _handleLightningOnHit(class Actor &); /** - * @symbol ?_selectNextMoveDirection\@ProjectileComponent\@\@AEAAXAEAVActor\@\@W4EAxis\@1\@\@Z + * @symbol ?_selectNextMoveDirection\@ProjectileComponent\@\@AEAAXAEAVActor\@\@W4EAxis\@1\@\@Z */ MCAPI void _selectNextMoveDirection(class Actor &, enum class ProjectileComponent::EAxis); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProjectileDescription.hpp b/LiteLoader/include/llapi/mc/ProjectileDescription.hpp index 0b042f2cb0..79fb30913b 100644 --- a/LiteLoader/include/llapi/mc/ProjectileDescription.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,28 +29,29 @@ class ProjectileDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@ProjectileDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@ProjectileDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~ProjectileDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@ProjectileDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@ProjectileDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PROJECTILEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@ProjectileDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~ProjectileDescription(); +#endif /** - * @symbol ??0ProjectileDescription\@\@QEAA\@XZ + * @symbol ??0ProjectileDescription\@\@QEAA\@XZ */ MCAPI ProjectileDescription(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProjectileFactory.hpp b/LiteLoader/include/llapi/mc/ProjectileFactory.hpp index 76078b6aec..053ce80bae 100644 --- a/LiteLoader/include/llapi/mc/ProjectileFactory.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileFactory.hpp @@ -31,23 +31,23 @@ class ProjectileFactory { public: /** - * @symbol ??0ProjectileFactory\@\@QEAA\@AEAVLevel\@\@\@Z + * @symbol ??0ProjectileFactory\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI ProjectileFactory(class Level &); /** - * @symbol ?shootProjectileFromDefinition\@ProjectileFactory\@\@QEAAPEAVActor\@\@AEBUActorDefinitionIdentifier\@\@PEAVMob\@\@VVec3\@\@HM\@Z + * @symbol ?shootProjectileFromDefinition\@ProjectileFactory\@\@QEAAPEAVActor\@\@AEBUActorDefinitionIdentifier\@\@PEAVMob\@\@VVec3\@\@HM\@Z */ MCAPI class Actor * shootProjectileFromDefinition(struct ActorDefinitionIdentifier const &, class Mob *, class Vec3, int, float); /** - * @symbol ?createSubcomponent\@ProjectileFactory\@\@SA?AV?$unique_ptr\@VOnHitSubcomponent\@\@U?$default_delete\@VOnHitSubcomponent\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?createSubcomponent\@ProjectileFactory\@\@SA?AV?$unique_ptr\@VOnHitSubcomponent\@\@U?$default_delete\@VOnHitSubcomponent\@\@\@std\@\@\@std\@\@AEAVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr createSubcomponent(class Json::Value &, class SemVersion const &, std::string const &); /** - * @symbol ?initFactory\@ProjectileFactory\@\@SAXXZ + * @symbol ?initFactory\@ProjectileFactory\@\@SAXXZ */ MCAPI static void initFactory(); /** - * @symbol ?shutdown\@ProjectileFactory\@\@SAXXZ + * @symbol ?shutdown\@ProjectileFactory\@\@SAXXZ */ MCAPI static void shutdown(); @@ -55,8 +55,8 @@ class ProjectileFactory { private: /** - * @symbol ?mSubcomponentMap\@ProjectileFactory\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VOnHitSubcomponent\@\@U?$default_delete\@VOnHitSubcomponent\@\@\@std\@\@\@std\@\@XZ\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VOnHitSubcomponent\@\@U?$default_delete\@VOnHitSubcomponent\@\@\@std\@\@\@std\@\@XZ\@2\@\@std\@\@\@2\@\@std\@\@A + * @symbol ?mSubcomponentMap\@ProjectileFactory\@\@0V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VOnHitSubcomponent\@\@U?$default_delete\@VOnHitSubcomponent\@\@\@std\@\@\@std\@\@XZ\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6A?AV?$unique_ptr\@VOnHitSubcomponent\@\@U?$default_delete\@VOnHitSubcomponent\@\@\@std\@\@\@std\@\@XZ\@2\@\@std\@\@\@2\@\@std\@\@A */ MCAPI static class std::unordered_map (void)>, struct std::hash, struct std::equal_to, class std::allocator (void)>>>> mSubcomponentMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProjectileHitEvent.hpp b/LiteLoader/include/llapi/mc/ProjectileHitEvent.hpp index 7ad53c7a85..66acedc545 100644 --- a/LiteLoader/include/llapi/mc/ProjectileHitEvent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileHitEvent.hpp @@ -27,11 +27,11 @@ struct ProjectileHitEvent { public: /** - * @symbol ??0ProjectileHitEvent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ProjectileHitEvent\@\@QEAA\@AEBU0\@\@Z */ MCAPI ProjectileHitEvent(struct ProjectileHitEvent const &); /** - * @symbol ??1ProjectileHitEvent\@\@QEAA\@XZ + * @symbol ??1ProjectileHitEvent\@\@QEAA\@XZ */ MCAPI ~ProjectileHitEvent(); diff --git a/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp b/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp index 7afdcfafe5..df4c5a921d 100644 --- a/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileItemComponent.hpp @@ -30,59 +30,59 @@ class ProjectileItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ProjectileItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VProjectileItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?dispense\@ProjectileItemComponent\@\@QEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @symbol ?dispense\@ProjectileItemComponent\@\@QEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ MCAPI bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @symbol ?getShootDir\@ProjectileItemComponent\@\@QEBA?AVVec3\@\@AEBVPlayer\@\@M\@Z + * @symbol ?getShootDir\@ProjectileItemComponent\@\@QEBA?AVVec3\@\@AEBVPlayer\@\@M\@Z */ MCAPI class Vec3 getShootDir(class Player const &, float) const; /** - * @symbol ?shootProjectile\@ProjectileItemComponent\@\@QEBAPEAVActor\@\@AEAVBlockSource\@\@AEBVVec3\@\@1MPEAVPlayer\@\@\@Z + * @symbol ?shootProjectile\@ProjectileItemComponent\@\@QEBAPEAVActor\@\@AEAVBlockSource\@\@AEBVVec3\@\@1MPEAVPlayer\@\@\@Z */ MCAPI class Actor * shootProjectile(class BlockSource &, class Vec3 const &, class Vec3 const &, float, class Player *) const; /** - * @symbol ?bindType\@ProjectileItemComponent\@\@SAXXZ + * @symbol ?bindType\@ProjectileItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@ProjectileItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@ProjectileItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ProjectileSystem.hpp b/LiteLoader/include/llapi/mc/ProjectileSystem.hpp index 3f9c015ffd..27477a202f 100644 --- a/LiteLoader/include/llapi/mc/ProjectileSystem.hpp +++ b/LiteLoader/include/llapi/mc/ProjectileSystem.hpp @@ -30,23 +30,23 @@ class ProjectileSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ProjectileSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@ProjectileSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@ProjectileSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); /** - * @symbol ?_tickProjectileComponent\@ProjectileSystem\@\@SAXPEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @symbol ?_tickProjectileComponent\@ProjectileSystem\@\@SAXPEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ MCAPI static void _tickProjectileComponent(class Actor *, class ProjectileComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp index d7c095aec0..8b802badab 100644 --- a/LiteLoader/include/llapi/mc/PropertiesSettings.hpp +++ b/LiteLoader/include/llapi/mc/PropertiesSettings.hpp @@ -31,216 +31,212 @@ class PropertiesSettings { public: /** - * @symbol ??0PropertiesSettings\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0PropertiesSettings\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI PropertiesSettings(std::string const &); /** - * @symbol ?allowCheats\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?allowCheats\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool allowCheats() const; /** - * @symbol ?areCustomSkinsDisabled\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?areCustomSkinsDisabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool areCustomSkinsDisabled() const; /** - * @symbol ?canEmitTelemetryEvents\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?canEmitTelemetryEvents\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool canEmitTelemetryEvents() const; /** - * @symbol ?disablePlayerInteractions\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?disablePlayerInteractions\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool disablePlayerInteractions() const; /** - * @symbol ?enableItemStackNetManager\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?enableItemStackNetManager\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool enableItemStackNetManager() const; /** - * @symbol ?forceGamemode\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?forceGamemode\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool forceGamemode() const; /** - * @symbol ?getChatRestrictionLevel\@PropertiesSettings\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ + * @symbol ?getChatRestrictionLevel\@PropertiesSettings\@\@QEBA?AW4ChatRestrictionLevel\@\@XZ */ MCAPI enum class ChatRestrictionLevel getChatRestrictionLevel() const; /** - * @symbol ?getCompressionAlgorithm\@PropertiesSettings\@\@QEBA?AW4PacketCompressionAlgorithm\@\@XZ + * @symbol ?getCompressionAlgorithm\@PropertiesSettings\@\@QEBA?AW4PacketCompressionAlgorithm\@\@XZ */ MCAPI enum class PacketCompressionAlgorithm getCompressionAlgorithm() const; /** - * @symbol ?getCompressionThresholdBytesize\@PropertiesSettings\@\@QEBAGXZ + * @symbol ?getCompressionThresholdBytesize\@PropertiesSettings\@\@QEBAGXZ */ MCAPI unsigned short getCompressionThresholdBytesize() const; /** - * @symbol ?getCustomProperty\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getCustomProperty\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string const & getCustomProperty(std::string const &) const; /** - * @symbol ?getDefaultPlayerPermissionLevel\@PropertiesSettings\@\@QEBA?BW4PlayerPermissionLevel\@\@XZ + * @symbol ?getDefaultPlayerPermissionLevel\@PropertiesSettings\@\@QEBA?BW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel const getDefaultPlayerPermissionLevel() const; /** - * @symbol ?getDesiredHttpImplementation\@PropertiesSettings\@\@QEBA?AW4Implementation\@Http\@Bedrock\@\@XZ + * @symbol ?getDesiredHttpImplementation\@PropertiesSettings\@\@QEBA?AW4Implementation\@Http\@Bedrock\@\@XZ */ MCAPI enum class Bedrock::Http::Implementation getDesiredHttpImplementation() const; /** - * @symbol ?getDifficulty\@PropertiesSettings\@\@QEBA?AW4Difficulty\@\@XZ + * @symbol ?getDifficulty\@PropertiesSettings\@\@QEBA?AW4Difficulty\@\@XZ */ MCAPI enum class Difficulty getDifficulty() const; /** - * @symbol ?getExtraTrustedKeys\@PropertiesSettings\@\@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 + * @symbol ?getExtraTrustedKeys\@PropertiesSettings\@\@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 & getExtraTrustedKeys() const; /** - * @symbol ?getGameMode\@PropertiesSettings\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getGameMode\@PropertiesSettings\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getGameMode() const; /** - * @symbol ?getLanguage\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLanguage\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLanguage() const; /** - * @symbol ?getLevelName\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLevelName\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLevelName() const; /** - * @symbol ?getLevelSeed\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLevelSeed\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLevelSeed() const; /** - * @symbol ?getLevelType\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLevelType\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getLevelType() const; /** - * @symbol ?getMaxPlayerIdleTime\@PropertiesSettings\@\@QEBA?AV?$duration\@HU?$ratio\@$0DM\@$00\@std\@\@\@chrono\@std\@\@XZ + * @symbol ?getMaxPlayerIdleTime\@PropertiesSettings\@\@QEBA?AV?$duration\@HU?$ratio\@$0DM\@$00\@std\@\@\@chrono\@std\@\@XZ */ MCAPI class std::chrono::duration> getMaxPlayerIdleTime() const; /** - * @symbol ?getMaxPlayers\@PropertiesSettings\@\@QEBAHXZ + * @symbol ?getMaxPlayers\@PropertiesSettings\@\@QEBAHXZ */ MCAPI int getMaxPlayers() const; /** - * @symbol ?getMaxThreads\@PropertiesSettings\@\@QEBAIXZ + * @symbol ?getMaxThreads\@PropertiesSettings\@\@QEBAIXZ */ MCAPI unsigned int getMaxThreads() const; /** - * @symbol ?getMaxViewDistanceChunks\@PropertiesSettings\@\@QEBAHXZ + * @symbol ?getMaxViewDistanceChunks\@PropertiesSettings\@\@QEBAHXZ */ MCAPI int getMaxViewDistanceChunks() const; /** - * @symbol ?getMotd\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getMotd\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getMotd() const; /** - * @symbol ?getOpPermissionLevel\@PropertiesSettings\@\@QEBA?AW4CommandPermissionLevel\@\@XZ + * @symbol ?getOpPermissionLevel\@PropertiesSettings\@\@QEBA?AW4CommandPermissionLevel\@\@XZ */ MCAPI enum class CommandPermissionLevel getOpPermissionLevel() const; /** - * @symbol ?getPlayerMovementSettings\@PropertiesSettings\@\@QEBAAEBUPlayerMovementSettings\@\@XZ + * @symbol ?getPlayerMovementSettings\@PropertiesSettings\@\@QEBAAEBUPlayerMovementSettings\@\@XZ */ MCAPI struct PlayerMovementSettings const & getPlayerMovementSettings() const; /** - * @symbol ?getRemoteServerCommunicationEndpoint\@PropertiesSettings\@\@QEBA?AUNetworkAddress\@\@XZ + * @symbol ?getRemoteServerCommunicationEndpoint\@PropertiesSettings\@\@QEBA?AUNetworkAddress\@\@XZ */ MCAPI struct NetworkAddress getRemoteServerCommunicationEndpoint() const; /** - * @symbol ?getScriptSettings\@PropertiesSettings\@\@QEBAAEBUScriptSettings\@\@XZ + * @symbol ?getScriptSettings\@PropertiesSettings\@\@QEBAAEBUScriptSettings\@\@XZ */ MCAPI struct ScriptSettings const & getScriptSettings() const; /** - * @symbol ?getServerId\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getServerId\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getServerId() const; /** - * @symbol ?getServerPort\@PropertiesSettings\@\@QEBAGXZ + * @symbol ?getServerPort\@PropertiesSettings\@\@QEBAGXZ */ MCAPI unsigned short getServerPort() const; /** - * @symbol ?getServerPortv6\@PropertiesSettings\@\@QEBAGXZ + * @symbol ?getServerPortv6\@PropertiesSettings\@\@QEBAGXZ */ MCAPI unsigned short getServerPortv6() const; /** - * @symbol ?getServerTickRange\@PropertiesSettings\@\@QEBAHXZ + * @symbol ?getServerTickRange\@PropertiesSettings\@\@QEBAHXZ */ MCAPI int getServerTickRange() const; /** - * @symbol ?getServerType\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getServerType\@PropertiesSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getServerType() const; /** - * @symbol ?getServerWakeupFrequency\@PropertiesSettings\@\@QEBAHXZ + * @symbol ?getServerWakeupFrequency\@PropertiesSettings\@\@QEBAHXZ */ MCAPI int getServerWakeupFrequency() const; /** - * @symbol ?getTransportLayerType\@PropertiesSettings\@\@QEBA?AW4TransportLayer\@\@XZ + * @symbol ?getTransportLayerType\@PropertiesSettings\@\@QEBA?AW4TransportLayer\@\@XZ */ MCAPI enum class TransportLayer getTransportLayerType() const; /** - * @symbol ?isClientSideGenEnabled\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?isClientSideGenEnabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isClientSideGenEnabled() const; /** - * @symbol ?isContentLogFileEnabled\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?isContentLogFileEnabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isContentLogFileEnabled() const; /** - * @symbol ?isEmoteChatMuted\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?isEmoteChatMuted\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isEmoteChatMuted() const; /** - * @symbol ?isItemTransactionManagerLoggingEnabled\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?isItemTransactionManagerLoggingEnabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isItemTransactionManagerLoggingEnabled() const; /** - * @symbol ?isPropertiesFileLoaded\@PropertiesSettings\@\@QEBA?B_NXZ + * @symbol ?isPropertiesFileLoaded\@PropertiesSettings\@\@QEBA?B_NXZ */ MCAPI bool const isPropertiesFileLoaded() const; /** - * @symbol ?isRealmsStoriesEnabled\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?isRealmsStoriesEnabled\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isRealmsStoriesEnabled() const; /** - * @symbol ?isServerVisibleToLanDiscovery\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?isServerVisibleToLanDiscovery\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool isServerVisibleToLanDiscovery() const; /** - * @symbol ?texturePackRequired\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?texturePackRequired\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool texturePackRequired() const; /** - * @symbol ?useAllowList\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?useAllowList\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool useAllowList() const; /** - * @symbol ?useMsaGamertagsOnly\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?useMsaGamertagsOnly\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool useMsaGamertagsOnly() const; /** - * @symbol ?useOnlineAuthentication\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?useOnlineAuthentication\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool useOnlineAuthentication() const; /** - * @symbol ?useWebsocketEncryption\@PropertiesSettings\@\@QEBA_NXZ + * @symbol ?useWebsocketEncryption\@PropertiesSettings\@\@QEBA_NXZ */ MCAPI bool useWebsocketEncryption() const; /** - * @symbol ?websocketRetryTime\@PropertiesSettings\@\@QEBAMXZ + * @symbol ?websocketRetryTime\@PropertiesSettings\@\@QEBAMXZ */ MCAPI float websocketRetryTime() const; /** - * @symbol ??1PropertiesSettings\@\@QEAA\@XZ + * @symbol ??1PropertiesSettings\@\@QEAA\@XZ */ MCAPI ~PropertiesSettings(); /** - * @symbol ?parseBoolValue\@PropertiesSettings\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?parseBoolValue\@PropertiesSettings\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool parseBoolValue(std::string const &); /** - * @symbol ?parseGameMode\@PropertiesSettings\@\@SA?AW4GameType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?parseGameMode\@PropertiesSettings\@\@SA?AW4GameType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class GameType parseGameMode(std::string const &); - /** - * @symbol ?parseInt32Value\@PropertiesSettings\@\@SAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static int parseInt32Value(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertyBag.hpp b/LiteLoader/include/llapi/mc/PropertyBag.hpp index 00d80b4f77..cab7e516bf 100644 --- a/LiteLoader/include/llapi/mc/PropertyBag.hpp +++ b/LiteLoader/include/llapi/mc/PropertyBag.hpp @@ -30,24 +30,24 @@ class PropertyBag { public: /** - * @symbol ??0PropertyBag\@\@QEAA\@XZ + * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z */ - MCAPI PropertyBag(); + MCAPI PropertyBag(class Json::Value const &); /** - * @symbol ??0PropertyBag\@\@QEAA\@AEBVValue\@Json\@\@\@Z + * @symbol ??0PropertyBag\@\@QEAA\@XZ */ - MCAPI PropertyBag(class Json::Value const &); + MCAPI PropertyBag(); /** - * @symbol ?toJsonValue\@PropertyBag\@\@QEBAAEBVValue\@Json\@\@XZ + * @symbol ?toJsonValue\@PropertyBag\@\@QEBAAEBVValue\@Json\@\@XZ */ MCAPI class Json::Value const & toJsonValue() const; /** - * @symbol ?toString\@PropertyBag\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@PropertyBag\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; /** - * @symbol ?EMPTY\@PropertyBag\@\@2V1\@A + * @symbol ?EMPTY\@PropertyBag\@\@2V1\@A */ MCAPI static class PropertyBag EMPTY; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertyComponent.hpp b/LiteLoader/include/llapi/mc/PropertyComponent.hpp index 4586596932..40d4737d17 100644 --- a/LiteLoader/include/llapi/mc/PropertyComponent.hpp +++ b/LiteLoader/include/llapi/mc/PropertyComponent.hpp @@ -31,68 +31,68 @@ class PropertyComponent { public: /** - * @symbol ??0PropertyComponent\@\@QEAA\@V?$not_null\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@gsl\@\@AEAVRenderParams\@\@\@Z + * @symbol ??0PropertyComponent\@\@QEAA\@V?$not_null\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@gsl\@\@AEAVRenderParams\@\@\@Z */ MCAPI PropertyComponent(class gsl::not_null>, class RenderParams &); /** - * @symbol ??0PropertyComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0PropertyComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI PropertyComponent(class PropertyComponent &&); /** - * @symbol ?addAdditionalSaveData\@PropertyComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@PropertyComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?applyPendingChanges\@PropertyComponent\@\@QEAAXAEBV?$unordered_map\@_KV?$variant\@HM_N_K\@std\@\@U?$hash\@_K\@2\@U?$equal_to\@_K\@2\@V?$allocator\@U?$pair\@$$CB_KV?$variant\@HM_N_K\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?applyPendingChanges\@PropertyComponent\@\@QEAAXAEBV?$unordered_map\@_KV?$variant\@HM_N_K\@std\@\@U?$hash\@_K\@2\@U?$equal_to\@_K\@2\@V?$allocator\@U?$pair\@$$CB_KV?$variant\@HM_N_K\@std\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void applyPendingChanges(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &); /** - * @symbol ?getMolangValue\@PropertyComponent\@\@QEBA_N_KAEAUMolangScriptArg\@\@\@Z + * @symbol ?getMolangValue\@PropertyComponent\@\@QEBA_N_KAEAUMolangScriptArg\@\@\@Z */ MCAPI bool getMolangValue(unsigned __int64, struct MolangScriptArg &) const; /** - * @symbol ?getPropertyType\@PropertyComponent\@\@QEBA?AW4ContainedType\@PropertyMetadata\@\@_K\@Z + * @symbol ?getPropertyType\@PropertyComponent\@\@QEBA?AW4ContainedType\@PropertyMetadata\@\@_K\@Z */ MCAPI enum class PropertyMetadata::ContainedType getPropertyType(unsigned __int64) const; /** - * @symbol ?hasDirtyProperties\@PropertyComponent\@\@QEBA_NXZ + * @symbol ?hasDirtyProperties\@PropertyComponent\@\@QEBA_NXZ */ MCAPI bool hasDirtyProperties() const; /** - * @symbol ?packAllSyncData\@PropertyComponent\@\@QEBA?AUPropertySyncData\@\@XZ + * @symbol ?packAllSyncData\@PropertyComponent\@\@QEBA?AUPropertySyncData\@\@XZ */ MCAPI struct PropertySyncData packAllSyncData() const; /** - * @symbol ?packDirtySyncData\@PropertyComponent\@\@QEAA?AUPropertySyncData\@\@XZ + * @symbol ?packDirtySyncData\@PropertyComponent\@\@QEAA?AUPropertySyncData\@\@XZ */ MCAPI struct PropertySyncData packDirtySyncData(); /** - * @symbol ?readLoadedProperties\@PropertyComponent\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?readLoadedProperties\@PropertyComponent\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void readLoadedProperties(class CompoundTag const &); /** - * @symbol ?setAliasProperties\@PropertyComponent\@\@QEAAXAEBV?$unordered_map\@VHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@1\@Z + * @symbol ?setAliasProperties\@PropertyComponent\@\@QEAAXAEBV?$unordered_map\@VHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@1\@Z */ MCAPI void setAliasProperties(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &, std::string const &, std::string const &); /** - * @symbol ?tryGetBool\@PropertyComponent\@\@QEBA?AV?$optional\@_N\@std\@\@_K\@Z + * @symbol ?tryGetBool\@PropertyComponent\@\@QEBA?AV?$optional\@_N\@std\@\@_K\@Z */ MCAPI class std::optional tryGetBool(unsigned __int64) const; /** - * @symbol ?tryGetFloat\@PropertyComponent\@\@QEBA?AV?$optional\@M\@std\@\@_K\@Z + * @symbol ?tryGetFloat\@PropertyComponent\@\@QEBA?AV?$optional\@M\@std\@\@_K\@Z */ MCAPI class std::optional tryGetFloat(unsigned __int64) const; /** - * @symbol ?tryGetInt\@PropertyComponent\@\@QEBA?AV?$optional\@H\@std\@\@_K\@Z + * @symbol ?tryGetInt\@PropertyComponent\@\@QEBA?AV?$optional\@H\@std\@\@_K\@Z */ MCAPI class std::optional tryGetInt(unsigned __int64) const; /** - * @symbol ?tryGetString\@PropertyComponent\@\@QEBAPEBVHashedString\@\@_K\@Z + * @symbol ?tryGetString\@PropertyComponent\@\@QEBAPEBVHashedString\@\@_K\@Z */ MCAPI class HashedString const * tryGetString(unsigned __int64) const; /** - * @symbol ??1PropertyComponent\@\@QEAA\@XZ + * @symbol ??1PropertyComponent\@\@QEAA\@XZ */ MCAPI ~PropertyComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertyContainer.hpp b/LiteLoader/include/llapi/mc/PropertyContainer.hpp index 4e6f7d7774..ad49ccdef9 100644 --- a/LiteLoader/include/llapi/mc/PropertyContainer.hpp +++ b/LiteLoader/include/llapi/mc/PropertyContainer.hpp @@ -29,84 +29,84 @@ class PropertyContainer { public: /** - * @symbol ??0PropertyContainer\@\@QEAA\@V?$not_null\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@gsl\@\@AEAVRenderParams\@\@\@Z + * @symbol ??0PropertyContainer\@\@QEAA\@V?$not_null\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@gsl\@\@AEAVRenderParams\@\@\@Z */ MCAPI PropertyContainer(class gsl::not_null>, class RenderParams &); /** - * @symbol ?addAdditionalSaveDataToCompoundTag\@PropertyContainer\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveDataToCompoundTag\@PropertyContainer\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveDataToCompoundTag(class CompoundTag &) const; /** - * @symbol ?addEntryToSyncData\@PropertyContainer\@\@QEBAXAEBVPropertyMetadata\@\@AEAUPropertySyncData\@\@\@Z + * @symbol ?addEntryToSyncData\@PropertyContainer\@\@QEBAXAEBVPropertyMetadata\@\@AEAUPropertySyncData\@\@\@Z */ MCAPI void addEntryToSyncData(class PropertyMetadata const &, struct PropertySyncData &) const; /** - * @symbol ?getBoolValue\@PropertyContainer\@\@QEBA?AV?$optional\@_N\@std\@\@_K\@Z + * @symbol ?getBoolValue\@PropertyContainer\@\@QEBA?AV?$optional\@_N\@std\@\@_K\@Z */ MCAPI class std::optional getBoolValue(unsigned __int64) const; /** - * @symbol ?getEnumIndexValue\@PropertyContainer\@\@QEBA?AV?$optional\@_K\@std\@\@_K\@Z + * @symbol ?getEnumIndexValue\@PropertyContainer\@\@QEBA?AV?$optional\@_K\@std\@\@_K\@Z */ MCAPI class std::optional getEnumIndexValue(unsigned __int64) const; /** - * @symbol ?getFloatValue\@PropertyContainer\@\@QEBA?AV?$optional\@M\@std\@\@_K\@Z + * @symbol ?getFloatValue\@PropertyContainer\@\@QEBA?AV?$optional\@M\@std\@\@_K\@Z */ MCAPI class std::optional getFloatValue(unsigned __int64) const; /** - * @symbol ?getIntValue\@PropertyContainer\@\@QEBA?AV?$optional\@H\@std\@\@_K\@Z + * @symbol ?getIntValue\@PropertyContainer\@\@QEBA?AV?$optional\@H\@std\@\@_K\@Z */ MCAPI class std::optional getIntValue(unsigned __int64) const; /** - * @symbol ?getMolangValue\@PropertyContainer\@\@QEBA_N_KAEAUMolangScriptArg\@\@\@Z + * @symbol ?getMolangValue\@PropertyContainer\@\@QEBA_N_KAEAUMolangScriptArg\@\@\@Z */ MCAPI bool getMolangValue(unsigned __int64, struct MolangScriptArg &) const; /** - * @symbol ?readLoadedProperties\@PropertyContainer\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?readLoadedProperties\@PropertyContainer\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void readLoadedProperties(class CompoundTag const &); /** - * @symbol ?setAliasProperties\@PropertyContainer\@\@QEAAXAEBV?$unordered_map\@VHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@1\@Z + * @symbol ?setAliasProperties\@PropertyContainer\@\@QEAAXAEBV?$unordered_map\@VHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$shared_ptr\@VTag\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@1\@Z */ MCAPI void setAliasProperties(class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const &, std::string const &, std::string const &); /** - * @symbol ?setBoolValue\@PropertyContainer\@\@QEAAX_K_N\@Z + * @symbol ?setBoolValue\@PropertyContainer\@\@QEAAX_K_N\@Z */ MCAPI void setBoolValue(unsigned __int64, bool); /** - * @symbol ?setEnumIndexValue\@PropertyContainer\@\@QEAAX_K0\@Z + * @symbol ?setEnumIndexValue\@PropertyContainer\@\@QEAAX_K0\@Z */ MCAPI void setEnumIndexValue(unsigned __int64, unsigned __int64); /** - * @symbol ?setFloatValue\@PropertyContainer\@\@QEAAX_KM\@Z + * @symbol ?setFloatValue\@PropertyContainer\@\@QEAAX_KM\@Z */ MCAPI void setFloatValue(unsigned __int64, float); /** - * @symbol ?setIntValue\@PropertyContainer\@\@QEAAX_KH\@Z + * @symbol ?setIntValue\@PropertyContainer\@\@QEAAX_KH\@Z */ MCAPI void setIntValue(unsigned __int64, int); /** - * @symbol ??1PropertyContainer\@\@QEAA\@XZ + * @symbol ??1PropertyContainer\@\@QEAA\@XZ */ MCAPI ~PropertyContainer(); //private: /** - * @symbol ?_addDataToCompoundTag\@PropertyContainer\@\@AEBAXAEAVCompoundTag\@\@AEBVPropertyMetadata\@\@\@Z + * @symbol ?_addDataToCompoundTag\@PropertyContainer\@\@AEBAXAEAVCompoundTag\@\@AEBVPropertyMetadata\@\@\@Z */ MCAPI void _addDataToCompoundTag(class CompoundTag &, class PropertyMetadata const &) const; /** - * @symbol ?_getPropertyTypeArrayIndex\@PropertyContainer\@\@AEBA?AV?$optional\@_K\@std\@\@_KW4ContainedType\@PropertyMetadata\@\@\@Z + * @symbol ?_getPropertyTypeArrayIndex\@PropertyContainer\@\@AEBA?AV?$optional\@_K\@std\@\@_KW4ContainedType\@PropertyMetadata\@\@\@Z */ MCAPI class std::optional _getPropertyTypeArrayIndex(unsigned __int64, enum class PropertyMetadata::ContainedType) const; /** - * @symbol ?_readValueFromTag\@PropertyContainer\@\@AEAA_NAEBVPropertyMetadata\@\@AEBVTag\@\@\@Z + * @symbol ?_readValueFromTag\@PropertyContainer\@\@AEAA_NAEBVPropertyMetadata\@\@AEBVTag\@\@\@Z */ MCAPI bool _readValueFromTag(class PropertyMetadata const &, class Tag const &); /** - * @symbol ?_trySetEnumIndexByString\@PropertyContainer\@\@AEAA_N_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_trySetEnumIndexByString\@PropertyContainer\@\@AEAA_N_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _trySetEnumIndexByString(unsigned __int64, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertyGroup.hpp b/LiteLoader/include/llapi/mc/PropertyGroup.hpp index c9e88c374c..e60e4a7671 100644 --- a/LiteLoader/include/llapi/mc/PropertyGroup.hpp +++ b/LiteLoader/include/llapi/mc/PropertyGroup.hpp @@ -31,100 +31,104 @@ class PropertyGroup { public: /** - * @symbol ??0PropertyGroup\@\@QEAA\@XZ + * @symbol ??0PropertyGroup\@\@QEAA\@XZ */ MCAPI PropertyGroup(); /** - * @symbol ?getDefaultBoolValue\@PropertyGroup\@\@QEBA_N_KAEAVRenderParams\@\@\@Z + * @symbol ?getDefaultBoolValue\@PropertyGroup\@\@QEBA_N_KAEAVRenderParams\@\@\@Z */ MCAPI bool getDefaultBoolValue(unsigned __int64, class RenderParams &) const; /** - * @symbol ?getDefaultEnumIndexValue\@PropertyGroup\@\@QEBA_K_KAEAVRenderParams\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getDefaultEnumIndexValue\@PropertyGroup\@\@QEBA_K_KAEAVRenderParams\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI unsigned __int64 getDefaultEnumIndexValue(unsigned __int64, class RenderParams &, std::string const &) const; /** - * @symbol ?getDefaultFloatValue\@PropertyGroup\@\@QEBAM_KAEAVRenderParams\@\@\@Z + * @symbol ?getDefaultFloatValue\@PropertyGroup\@\@QEBAM_KAEAVRenderParams\@\@\@Z */ MCAPI float getDefaultFloatValue(unsigned __int64, class RenderParams &) const; /** - * @symbol ?getDefaultIntValue\@PropertyGroup\@\@QEBAH_KAEAVRenderParams\@\@\@Z + * @symbol ?getDefaultIntValue\@PropertyGroup\@\@QEBAH_KAEAVRenderParams\@\@\@Z */ MCAPI int getDefaultIntValue(unsigned __int64, class RenderParams &) const; /** - * @symbol ?getNetworkSyncPropertyDescriptionsAsListTag\@PropertyGroup\@\@QEBA?AVListTag\@\@XZ + * @symbol ?getNetworkSyncPropertyDescriptionsAsListTag\@PropertyGroup\@\@QEBA?AVListTag\@\@XZ */ MCAPI class ListTag getNetworkSyncPropertyDescriptionsAsListTag() const; /** - * @symbol ?getPropertyMetadata\@PropertyGroup\@\@QEBAPEBVPropertyMetadata\@\@_K\@Z + * @symbol ?getPropertyMetadata\@PropertyGroup\@\@QEBAPEBVPropertyMetadata\@\@_K\@Z */ MCAPI class PropertyMetadata const * getPropertyMetadata(unsigned __int64) const; /** - * @symbol ?getPropertyMetadataByString\@PropertyGroup\@\@QEBAPEBVPropertyMetadata\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPropertyMetadataByString\@PropertyGroup\@\@QEBAPEBVPropertyMetadata\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class PropertyMetadata const * getPropertyMetadataByString(std::string const &) const; /** - * @symbol ??1PropertyGroup\@\@QEAA\@XZ + * @symbol ?hasAnyClientSyncProperties\@PropertyGroup\@\@QEBA_NXZ + */ + MCAPI bool hasAnyClientSyncProperties() const; + /** + * @symbol ??1PropertyGroup\@\@QEAA\@XZ */ MCAPI ~PropertyGroup(); /** - * @symbol ?MAX_ENUM_SIZE\@PropertyGroup\@\@2_KB + * @symbol ?MAX_ENUM_SIZE\@PropertyGroup\@\@2_KB */ MCAPI static unsigned __int64 const MAX_ENUM_SIZE; /** - * @symbol ?MAX_ENUM_VALUE_SIZE\@PropertyGroup\@\@2_KB + * @symbol ?MAX_ENUM_VALUE_SIZE\@PropertyGroup\@\@2_KB */ MCAPI static unsigned __int64 const MAX_ENUM_VALUE_SIZE; /** - * @symbol ?isValidEnumEntry\@PropertyGroup\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isValidEnumEntry\@PropertyGroup\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool isValidEnumEntry(std::string const &); /** - * @symbol ?loadPropertiesFromJson\@PropertyGroup\@\@SA?AV?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?loadPropertiesFromJson\@PropertyGroup\@\@SA?AV?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI static class std::shared_ptr loadPropertiesFromJson(class Json::Value const &, class SemVersion const &); //private: /** - * @symbol ?_addBoolProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?_addBoolProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ MCAPI void _addBoolProperty(std::string const &, bool, bool); /** - * @symbol ?_addEnumIndexProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N_KAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@\@Z + * @symbol ?_addEnumIndexProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N_KAEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@\@Z */ MCAPI void _addEnumIndexProperty(std::string const &, bool, unsigned __int64, std::vector const &); /** - * @symbol ?_addFloatProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NMMM\@Z + * @symbol ?_addFloatProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NMMM\@Z */ MCAPI void _addFloatProperty(std::string const &, bool, float, float, float); /** - * @symbol ?_addIntProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHHH\@Z + * @symbol ?_addIntProperty\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHHH\@Z */ MCAPI void _addIntProperty(std::string const &, bool, int, int, int); /** - * @symbol ?_addPropertyMetadata\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NW4ContainedType\@PropertyMetadata\@\@\@Z + * @symbol ?_addPropertyMetadata\@PropertyGroup\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NW4ContainedType\@PropertyMetadata\@\@\@Z */ MCAPI void _addPropertyMetadata(std::string const &, bool, enum class PropertyMetadata::ContainedType); /** - * @symbol ?_getFriendlyJsonTypeString\@PropertyGroup\@\@AEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ContainedType\@PropertyMetadata\@\@\@Z + * @symbol ?_getFriendlyJsonTypeString\@PropertyGroup\@\@AEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ContainedType\@PropertyMetadata\@\@\@Z */ MCAPI std::string const & _getFriendlyJsonTypeString(enum class PropertyMetadata::ContainedType); /** - * @symbol ?_loadPropertyFromJson\@PropertyGroup\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@W4MolangVersion\@\@_N\@Z + * @symbol ?_loadPropertyFromJson\@PropertyGroup\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@W4MolangVersion\@\@_N\@Z */ MCAPI bool _loadPropertyFromJson(std::string const &, class Json::Value const &, enum class MolangVersion, bool); /** - * @symbol ?_reserveSpaceForTypes\@PropertyGroup\@\@AEAAXAEBV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@\@Z + * @symbol ?_reserveSpaceForTypes\@PropertyGroup\@\@AEAAXAEBV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@\@Z */ MCAPI void _reserveSpaceForTypes(std::vector const &); /** - * @symbol ?_validateDataType\@PropertyGroup\@\@AEAA_NAEBVValue\@Json\@\@W4ContainedType\@PropertyMetadata\@\@\@Z + * @symbol ?_validateDataType\@PropertyGroup\@\@AEAA_NAEBVValue\@Json\@\@W4ContainedType\@PropertyMetadata\@\@\@Z */ MCAPI bool _validateDataType(class Json::Value const &, enum class PropertyMetadata::ContainedType); /** - * @symbol ?_getJsonPropertyType\@PropertyGroup\@\@CA?AW4ContainedType\@PropertyMetadata\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_getJsonPropertyType\@PropertyGroup\@\@CA?AW4ContainedType\@PropertyMetadata\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static enum class PropertyMetadata::ContainedType _getJsonPropertyType(class Json::Value const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertyGroupManager.hpp b/LiteLoader/include/llapi/mc/PropertyGroupManager.hpp index 4a52643130..de873aaf4d 100644 --- a/LiteLoader/include/llapi/mc/PropertyGroupManager.hpp +++ b/LiteLoader/include/llapi/mc/PropertyGroupManager.hpp @@ -29,24 +29,28 @@ class PropertyGroupManager { public: /** - * @symbol ??0PropertyGroupManager\@\@QEAA\@XZ + * @symbol ??0PropertyGroupManager\@\@QEAA\@XZ */ MCAPI PropertyGroupManager(); /** - * @symbol ?getActorPropertyDataTag\@PropertyGroupManager\@\@QEBA?AVCompoundTag\@\@AEBVHashedString\@\@\@Z + * @symbol ?getActorPropertyDataTag\@PropertyGroupManager\@\@QEBA?AVCompoundTag\@\@AEBVHashedString\@\@\@Z */ MCAPI class CompoundTag getActorPropertyDataTag(class HashedString const &) const; /** - * @symbol ?registerGroup\@PropertyGroupManager\@\@QEAAXAEBVHashedString\@\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@Z + * @symbol ?getAllPropertyGroups\@PropertyGroupManager\@\@QEBAAEBV?$unordered_map\@VHashedString\@\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@U?$hash\@VHashedString\@\@\@3\@U?$equal_to\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + */ + MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & getAllPropertyGroups() const; + /** + * @symbol ?registerGroup\@PropertyGroupManager\@\@QEAAXAEBVHashedString\@\@V?$shared_ptr\@$$CBVPropertyGroup\@\@\@std\@\@\@Z */ MCAPI void registerGroup(class HashedString const &, class std::shared_ptr); /** - * @symbol ?tryInitPropertiesOnActor\@PropertyGroupManager\@\@QEBAXAEAVActor\@\@\@Z + * @symbol ?tryInitPropertiesOnActor\@PropertyGroupManager\@\@QEBAXAEAVActor\@\@\@Z */ MCAPI void tryInitPropertiesOnActor(class Actor &) const; /** - * @symbol ??1PropertyGroupManager\@\@QEAA\@XZ + * @symbol ??1PropertyGroupManager\@\@QEAA\@XZ */ MCAPI ~PropertyGroupManager(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertyMetadata.hpp b/LiteLoader/include/llapi/mc/PropertyMetadata.hpp index 169da22fc2..8d0125e8a9 100644 --- a/LiteLoader/include/llapi/mc/PropertyMetadata.hpp +++ b/LiteLoader/include/llapi/mc/PropertyMetadata.hpp @@ -28,8 +28,8 @@ class PropertyMetadata { public: /** - * @symbol ??1PropertyMetadata\@\@QEAA\@XZ + * @symbol ??1PropertyMetadata\@\@QEAA\@XZ */ MCAPI ~PropertyMetadata(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PropertySyncData.hpp b/LiteLoader/include/llapi/mc/PropertySyncData.hpp index 463291f931..a8bd4de97e 100644 --- a/LiteLoader/include/llapi/mc/PropertySyncData.hpp +++ b/LiteLoader/include/llapi/mc/PropertySyncData.hpp @@ -28,11 +28,11 @@ struct PropertySyncData { public: /** - * @symbol ??4PropertySyncData\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PropertySyncData\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PropertySyncData & operator=(struct PropertySyncData &&); /** - * @symbol ??1PropertySyncData\@\@QEAA\@XZ + * @symbol ??1PropertySyncData\@\@QEAA\@XZ */ MCAPI ~PropertySyncData(); diff --git a/LiteLoader/include/llapi/mc/PropertyValues.hpp b/LiteLoader/include/llapi/mc/PropertyValues.hpp index c3ad39e3c7..5028152488 100644 --- a/LiteLoader/include/llapi/mc/PropertyValues.hpp +++ b/LiteLoader/include/llapi/mc/PropertyValues.hpp @@ -27,19 +27,19 @@ struct PropertyValues { public: /** - * @symbol ??0PropertyValues\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0PropertyValues\@\@QEAA\@AEBU0\@\@Z */ MCAPI PropertyValues(struct PropertyValues const &); /** - * @symbol ??4PropertyValues\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4PropertyValues\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct PropertyValues & operator=(struct PropertyValues &&); /** - * @symbol ?resize\@PropertyValues\@\@QEAAX_K000\@Z + * @symbol ?resize\@PropertyValues\@\@QEAAX_K000\@Z */ MCAPI void resize(unsigned __int64, unsigned __int64, unsigned __int64, unsigned __int64); /** - * @symbol ??1PropertyValues\@\@QEAA\@XZ + * @symbol ??1PropertyValues\@\@QEAA\@XZ */ MCAPI ~PropertyValues(); diff --git a/LiteLoader/include/llapi/mc/ProtectionEnchant.hpp b/LiteLoader/include/llapi/mc/ProtectionEnchant.hpp index c3b440a2e3..6ac6403943 100644 --- a/LiteLoader/include/llapi/mc/ProtectionEnchant.hpp +++ b/LiteLoader/include/llapi/mc/ProtectionEnchant.hpp @@ -31,81 +31,81 @@ class ProtectionEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ProtectionEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@ProtectionEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@ProtectionEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@ProtectionEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@ProtectionEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@ProtectionEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@ProtectionEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 6 - * @symbol ?getDamageProtection\@ProtectionEnchant\@\@UEBAHHAEBVActorDamageSource\@\@\@Z + * @vftbl 6 + * @symbol ?getDamageProtection\@ProtectionEnchant\@\@UEBAHHAEBVActorDamageSource\@\@\@Z */ virtual int getDamageProtection(int, class ActorDamageSource const &) const; /** - * @vftbl 9 - * @symbol ?doPostHurt\@ProtectionEnchant\@\@UEBAXAEAVItemInstance\@\@AEAVActor\@\@1H\@Z + * @vftbl 9 + * @symbol ?doPostHurt\@ProtectionEnchant\@\@UEBAXAEAVItemInstance\@\@AEAVActor\@\@1H\@Z */ virtual void doPostHurt(class ItemInstance &, class Actor &, class Actor &, int) const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@ProtectionEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@ProtectionEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PROTECTIONENCHANT /** - * @symbol ?isProtectionEnchant\@ProtectionEnchant\@\@UEBA_NXZ + * @symbol ?isProtectionEnchant\@ProtectionEnchant\@\@UEBA_NXZ */ MCVAPI bool isProtectionEnchant() const; #endif /** - * @symbol ??0ProtectionEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0ProtectionEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI ProtectionEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI ProtectionEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: private: /** - * @symbol ?THORNS_CHANCE_PER_LEVEL\@ProtectionEnchant\@\@0MB + * @symbol ?THORNS_CHANCE_PER_LEVEL\@ProtectionEnchant\@\@0MB */ MCAPI static float const THORNS_CHANCE_PER_LEVEL; /** - * @symbol ?VALID_ENCHANTMENTS\@ProtectionEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B + * @symbol ?VALID_ENCHANTMENTS\@ProtectionEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const VALID_ENCHANTMENTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Pufferfish.hpp b/LiteLoader/include/llapi/mc/Pufferfish.hpp index 25e5f8cf4b..bc6162cca9 100644 --- a/LiteLoader/include/llapi/mc/Pufferfish.hpp +++ b/LiteLoader/include/llapi/mc/Pufferfish.hpp @@ -32,163 +32,158 @@ class Pufferfish : public Fish { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Pufferfish(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Pufferfish\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Pufferfish\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 53 - * @symbol ?startRiding\@Pufferfish\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 53 + * @symbol ?startRiding\@Pufferfish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Pufferfish\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Pufferfish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Pufferfish\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Pufferfish\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Pufferfish\@\@UEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Pufferfish\@\@UEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Pufferfish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Pufferfish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Pufferfish(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PulseCapacitor.hpp b/LiteLoader/include/llapi/mc/PulseCapacitor.hpp index fb351253f0..2fda8c6823 100644 --- a/LiteLoader/include/llapi/mc/PulseCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/PulseCapacitor.hpp @@ -30,63 +30,63 @@ class PulseCapacitor : public ProducerComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PulseCapacitor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getStrength\@PulseCapacitor\@\@UEBAHXZ + * @vftbl 1 + * @symbol ?getStrength\@PulseCapacitor\@\@UEBAHXZ */ virtual int getStrength() const; /** - * @vftbl 3 - * @symbol ?setStrength\@PulseCapacitor\@\@UEAAXH\@Z + * @vftbl 3 + * @symbol ?setStrength\@PulseCapacitor\@\@UEAAXH\@Z */ virtual void setStrength(int); /** - * @vftbl 6 - * @symbol ?canConsumePowerAnyDirection\@PulseCapacitor\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?canConsumePowerAnyDirection\@PulseCapacitor\@\@UEBA_NXZ */ virtual bool canConsumePowerAnyDirection() const; /** - * @vftbl 7 - * @symbol ?canConsumerPower\@PulseCapacitor\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?canConsumerPower\@PulseCapacitor\@\@UEBA_NXZ */ virtual bool canConsumerPower() const; /** - * @vftbl 12 - * @symbol ?allowConnection\@PulseCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@PulseCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@PulseCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@PulseCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@PulseCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@PulseCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @vftbl 25 - * @symbol ?getPoweroutDirection\@PulseCapacitor\@\@UEBAEXZ + * @vftbl 25 + * @symbol ?getPoweroutDirection\@PulseCapacitor\@\@UEBAEXZ */ virtual unsigned char getPoweroutDirection() const; /** - * @symbol ??0PulseCapacitor\@\@QEAA\@XZ + * @symbol ??0PulseCapacitor\@\@QEAA\@XZ */ MCAPI PulseCapacitor(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp index f1921a136d..7a17973076 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlock.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlock.hpp @@ -31,256 +31,256 @@ class PumpkinBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PumpkinBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@PumpkinBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@PumpkinBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 71 - * @symbol ?dispense\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@PumpkinBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@PumpkinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@PumpkinBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@PumpkinBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@PumpkinBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@PumpkinBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@PumpkinBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@PumpkinBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@PumpkinBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@PumpkinBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@PumpkinBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_PUMPKINBLOCK /** - * @symbol ?canBeSilkTouched\@PumpkinBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@PumpkinBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0PumpkinBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N1\@Z + * @symbol ??0PumpkinBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N1\@Z */ MCAPI PumpkinBlock(std::string const &, int, bool, bool); //private: /** - * @symbol ?_canDispense\@PumpkinBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVVec3\@\@E\@Z + * @symbol ?_canDispense\@PumpkinBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVVec3\@\@E\@Z */ MCAPI bool _canDispense(class BlockSource &, class Vec3 const &, unsigned char) const; /** - * @symbol ?_canSpawnGolem\@PumpkinBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canSpawnGolem\@PumpkinBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canSpawnGolem(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp index 3a37906b71..e1ef46554f 100644 --- a/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/PumpkinBlockItem.hpp @@ -32,93 +32,93 @@ class PumpkinBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PumpkinBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@PumpkinBlockItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@PumpkinBlockItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 113 - * @symbol ?getEquipLocation\@PumpkinBlockItem\@\@UEBA?AW4ActorLocation\@\@XZ + * @vftbl 113 + * @symbol ?getEquipLocation\@PumpkinBlockItem\@\@UEBA?AW4ActorLocation\@\@XZ */ virtual enum class ActorLocation getEquipLocation() const; /** - * @vftbl 114 - * @symbol ?getEquipSound\@PumpkinBlockItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 114 + * @symbol ?getEquipSound\@PumpkinBlockItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getEquipSound() const; /** - * @symbol ??0PumpkinBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0PumpkinBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI PumpkinBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp index 0e9747cc20..c0abbd47a0 100644 --- a/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp +++ b/LiteLoader/include/llapi/mc/PurchaseReceiptPacket.hpp @@ -30,37 +30,37 @@ class PurchaseReceiptPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~PurchaseReceiptPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@PurchaseReceiptPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@PurchaseReceiptPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@PurchaseReceiptPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@PurchaseReceiptPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@PurchaseReceiptPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@PurchaseReceiptPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@PurchaseReceiptPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0PurchaseReceiptPacket\@\@QEAA\@XZ + * @symbol ??0PurchaseReceiptPacket\@\@QEAA\@XZ */ MCAPI PurchaseReceiptPacket(); /** - * @symbol ?sMaxReceiptsPerPacket\@PurchaseReceiptPacket\@\@2_KB + * @symbol ?sMaxReceiptsPerPacket\@PurchaseReceiptPacket\@\@2_KB */ MCAPI static unsigned __int64 const sMaxReceiptsPerPacket; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PushActorsSystem.hpp b/LiteLoader/include/llapi/mc/PushActorsSystem.hpp index 2b980dd854..8c5abf3e9b 100644 --- a/LiteLoader/include/llapi/mc/PushActorsSystem.hpp +++ b/LiteLoader/include/llapi/mc/PushActorsSystem.hpp @@ -28,12 +28,12 @@ class PushActorsSystem { public: /** - * @symbol ?createSystem\@PushActorsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@PushActorsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?pushActors\@PushActorsSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z + * @symbol ?pushActors\@PushActorsSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorMovementProxyComponent\@\@\@Z */ MCAPI static void pushActors(class StrictEntityContext &, class ActorMovementProxyComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PushThroughDefinition.hpp b/LiteLoader/include/llapi/mc/PushThroughDefinition.hpp index 1b1af39ce0..70a5dafc83 100644 --- a/LiteLoader/include/llapi/mc/PushThroughDefinition.hpp +++ b/LiteLoader/include/llapi/mc/PushThroughDefinition.hpp @@ -31,11 +31,11 @@ struct PushThroughDefinition { public: /** - * @symbol ?initialize\@PushThroughDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@PushThroughDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@PushThroughDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UPushThroughDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@PushThroughDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UPushThroughDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/PushableComponent.hpp b/LiteLoader/include/llapi/mc/PushableComponent.hpp index aedbfe3e40..ebc3bc39f9 100644 --- a/LiteLoader/include/llapi/mc/PushableComponent.hpp +++ b/LiteLoader/include/llapi/mc/PushableComponent.hpp @@ -29,44 +29,44 @@ class PushableComponent { public: /** - * @symbol ??0PushableComponent\@\@QEAA\@XZ + * @symbol ??0PushableComponent\@\@QEAA\@XZ */ MCAPI PushableComponent(); /** - * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBUPushableDescription\@\@\@Z + * @symbol ?initFromDefinition\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBUPushableDescription\@\@\@Z */ MCAPI void initFromDefinition(class Actor &, struct PushableDescription const &); /** - * @symbol ?isPushable\@PushableComponent\@\@QEAA_NXZ + * @symbol ?isPushable\@PushableComponent\@\@QEAA_NXZ */ MCAPI bool isPushable(); /** - * @symbol ?isPushableByPiston\@PushableComponent\@\@QEAA_NXZ + * @symbol ?isPushableByPiston\@PushableComponent\@\@QEAA_NXZ */ MCAPI bool isPushableByPiston(); /** - * @symbol ?push\@PushableComponent\@\@QEAAXAEAVActor\@\@0_N\@Z + * @symbol ?push\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z */ - MCAPI void push(class Actor &, class Actor &, bool); + MCAPI void push(class Actor &, class Vec3 const &); /** - * @symbol ?push\@PushableComponent\@\@QEAAXAEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?push\@PushableComponent\@\@QEAAXAEAVActor\@\@0_N\@Z */ - MCAPI void push(class Actor &, class Vec3 const &); + MCAPI void push(class Actor &, class Actor &, bool); //private: /** - * @symbol ?_calculatePushVectorBoat\@PushableComponent\@\@AEAA?AU?$pair\@VVec3\@\@V1\@\@std\@\@AEAVActor\@\@0_N\@Z + * @symbol ?_calculatePushVectorBoat\@PushableComponent\@\@AEAA?AU?$pair\@VVec3\@\@V1\@\@std\@\@AEAVActor\@\@0_N\@Z */ MCAPI struct std::pair _calculatePushVectorBoat(class Actor &, class Actor &, bool); /** - * @symbol ?_calculatePushVectorMinecart\@PushableComponent\@\@AEAA?AU?$pair\@VVec3\@\@V1\@\@std\@\@AEAVActor\@\@0_N\@Z + * @symbol ?_calculatePushVectorMinecart\@PushableComponent\@\@AEAA?AU?$pair\@VVec3\@\@V1\@\@std\@\@AEAVActor\@\@0_N\@Z */ MCAPI struct std::pair _calculatePushVectorMinecart(class Actor &, class Actor &, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/PushableDescription.hpp b/LiteLoader/include/llapi/mc/PushableDescription.hpp index f859bb7a4b..dd0a238c7c 100644 --- a/LiteLoader/include/llapi/mc/PushableDescription.hpp +++ b/LiteLoader/include/llapi/mc/PushableDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,27 +29,28 @@ struct PushableDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@PushableDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@PushableDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~PushableDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@PushableDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@PushableDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_PUSHABLEDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@PushableDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~PushableDescription(); +#endif /** - * @symbol ??0PushableDescription\@\@QEAA\@XZ + * @symbol ??0PushableDescription\@\@QEAA\@XZ */ MCAPI PushableDescription(); diff --git a/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp b/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp index 70632d55cc..3827d6ea16 100644 --- a/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp +++ b/LiteLoader/include/llapi/mc/QuartzBlockBlock.hpp @@ -31,233 +31,238 @@ class QuartzBlockBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~QuartzBlockBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@QuartzBlockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@QuartzBlockBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@QuartzBlockBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@QuartzBlockBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@QuartzBlockBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@QuartzBlockBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@QuartzBlockBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@QuartzBlockBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@QuartzBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@QuartzBlockBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 149 - * @symbol ?getMappedFace\@QuartzBlockBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@QuartzBlockBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@QuartzBlockBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@QuartzBlockBlock\@\@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 ??0QuartzBlockBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI QuartzBlockBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/QuerySetIdentifier.hpp b/LiteLoader/include/llapi/mc/QuerySetIdentifier.hpp index 376f398d9a..b8b9896ebb 100644 --- a/LiteLoader/include/llapi/mc/QuerySetIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/QuerySetIdentifier.hpp @@ -22,11 +22,11 @@ namespace QuerySetIdentifier { #undef AFTER_EXTRA /** - * @symbol ?getDefaultCollection\@QuerySetIdentifier\@\@YA?AV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@XZ + * @symbol ?getDefaultCollection\@QuerySetIdentifier\@\@YA?AV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@XZ */ MCAPI class gsl::span getDefaultCollection(); /** - * @symbol ?getTagsCollection\@QuerySetIdentifier\@\@YA?AV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@XZ + * @symbol ?getTagsCollection\@QuerySetIdentifier\@\@YA?AV?$span\@$$CBVHashedString\@\@$0?0\@gsl\@\@XZ */ MCAPI class gsl::span getTagsCollection(); diff --git a/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp index 44f3cd0b21..da7d4595f0 100644 --- a/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp +++ b/LiteLoader/include/llapi/mc/QueryTargetCommand.hpp @@ -31,18 +31,18 @@ class QueryTargetCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~QueryTargetCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@QueryTargetCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@QueryTargetCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@QueryTargetCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@QueryTargetCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RTree.hpp b/LiteLoader/include/llapi/mc/RTree.hpp index e36de3a2e4..ad99122cf8 100644 --- a/LiteLoader/include/llapi/mc/RTree.hpp +++ b/LiteLoader/include/llapi/mc/RTree.hpp @@ -42,20 +42,20 @@ class Node { public: /** - * @symbol ??1RTree\@\@QEAA\@XZ + * @symbol ??1RTree\@\@QEAA\@XZ */ MCAPI ~RTree(); /** - * @symbol ?create\@RTree\@\@SA?AV?$optional\@VRTree\@\@\@std\@\@AEBV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@3\@\@Z + * @symbol ?create\@RTree\@\@SA?AV?$optional\@VRTree\@\@\@std\@\@AEBV?$vector\@UBiomeNoiseTarget\@\@V?$allocator\@UBiomeNoiseTarget\@\@\@std\@\@\@3\@\@Z */ MCAPI static class std::optional create(std::vector const &); //private: /** - * @symbol ?build\@RTree\@\@CA?AV?$optional\@VNode\@RTree\@\@\@std\@\@$$QEAV?$vector\@VNode\@RTree\@\@V?$allocator\@VNode\@RTree\@\@\@std\@\@\@3\@\@Z + * @symbol ?build\@RTree\@\@CA?AV?$optional\@VNode\@RTree\@\@\@std\@\@$$QEAV?$vector\@VNode\@RTree\@\@V?$allocator\@VNode\@RTree\@\@\@std\@\@\@3\@\@Z */ MCAPI static class std::optional build(std::vector &&); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Rabbit.hpp b/LiteLoader/include/llapi/mc/Rabbit.hpp index 86148ea996..0a2171956b 100644 --- a/LiteLoader/include/llapi/mc/Rabbit.hpp +++ b/LiteLoader/include/llapi/mc/Rabbit.hpp @@ -32,163 +32,158 @@ class Rabbit : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Rabbit(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Rabbit\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Rabbit\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Rabbit\@\@MEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Rabbit\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Rabbit\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Rabbit\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Rabbit\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Rabbit\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 349 - * @symbol ?newServerAiStep\@Rabbit\@\@UEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@Rabbit\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Rabbit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Rabbit\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Rabbit(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp b/LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp index 962005f68d..c41af5d6a9 100644 --- a/LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp +++ b/LiteLoader/include/llapi/mc/RabbitPanicGoal.hpp @@ -31,14 +31,14 @@ class RabbitPanicGoal : public PanicGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RabbitPanicGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Raid.hpp b/LiteLoader/include/llapi/mc/Raid.hpp index 15c2060d16..843928477f 100644 --- a/LiteLoader/include/llapi/mc/Raid.hpp +++ b/LiteLoader/include/llapi/mc/Raid.hpp @@ -30,68 +30,68 @@ class Raid { public: /** - * @symbol ??0Raid\@\@QEAA\@HHHHW4Difficulty\@\@E$$QEAV?$function\@$$A6A_N_KAEAVVec3\@\@\@Z\@std\@\@$$QEAV?$function\@$$A6A_N_KVVec3\@\@EAEAV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@\@Z\@3\@$$QEAV?$function\@$$A6A_NAEBUActorUniqueID\@\@\@Z\@3\@$$QEAV?$function\@$$A6A_NXZ\@3\@\@Z + * @symbol ??0Raid\@\@QEAA\@HHHHW4Difficulty\@\@E$$QEAV?$function\@$$A6A_N_KAEAVVec3\@\@\@Z\@std\@\@$$QEAV?$function\@$$A6A_N_KVVec3\@\@EAEAV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@\@Z\@3\@$$QEAV?$function\@$$A6A_NAEBUActorUniqueID\@\@\@Z\@3\@$$QEAV?$function\@$$A6A_NXZ\@3\@\@Z */ MCAPI Raid(int, int, int, int, enum class Difficulty, unsigned char, class std::function &&, class std::function, struct std::equal_to, class std::allocator> &)> &&, class std::function &&, class std::function &&); /** - * @symbol ?addAdditionalSaveData\@Raid\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@Raid\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?addPlayerToHeroList\@Raid\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?addPlayerToHeroList\@Raid\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void addPlayerToHeroList(class Actor const &); /** - * @symbol ?appendDebugInfo\@Raid\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?appendDebugInfo\@Raid\@\@QEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void appendDebugInfo(std::string &) const; /** - * @symbol ?getBossBarFilledFraction\@Raid\@\@QEBAMXZ + * @symbol ?getBossBarFilledFraction\@Raid\@\@QEBAMXZ */ MCAPI float getBossBarFilledFraction() const; /** - * @symbol ?getRemainingRaiders\@Raid\@\@QEBA_KXZ + * @symbol ?getRemainingRaiders\@Raid\@\@QEBA_KXZ */ MCAPI unsigned __int64 getRemainingRaiders() const; /** - * @symbol ?readAdditionalSaveData\@Raid\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?readAdditionalSaveData\@Raid\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void readAdditionalSaveData(class CompoundTag const &); /** - * @symbol ?tick\@Raid\@\@QEAAXUTick\@\@\@Z + * @symbol ?tick\@Raid\@\@QEAAXUTick\@\@\@Z */ MCAPI void tick(struct Tick); /** - * @symbol ??1Raid\@\@QEAA\@XZ + * @symbol ??1Raid\@\@QEAA\@XZ */ MCAPI ~Raid(); /** - * @symbol ?INVALID_SPAWN_POINT\@Raid\@\@2VVec3\@\@B + * @symbol ?INVALID_SPAWN_POINT\@Raid\@\@2VVec3\@\@B */ MCAPI static class Vec3 const INVALID_SPAWN_POINT; //private: /** - * @symbol ?_getTotalRaiderHealth\@Raid\@\@AEBAMXZ + * @symbol ?_getTotalRaiderHealth\@Raid\@\@AEBAMXZ */ MCAPI float _getTotalRaiderHealth() const; /** - * @symbol ?_tickGroupInPlay\@Raid\@\@AEAAXXZ + * @symbol ?_tickGroupInPlay\@Raid\@\@AEAAXXZ */ MCAPI void _tickGroupInPlay(); private: /** - * @symbol ?NUM_GROUPS_ON_EASY\@Raid\@\@0EB + * @symbol ?NUM_GROUPS_ON_EASY\@Raid\@\@0EB */ MCAPI static unsigned char const NUM_GROUPS_ON_EASY; /** - * @symbol ?NUM_GROUPS_ON_HARD\@Raid\@\@0EB + * @symbol ?NUM_GROUPS_ON_HARD\@Raid\@\@0EB */ MCAPI static unsigned char const NUM_GROUPS_ON_HARD; /** - * @symbol ?NUM_GROUPS_ON_NORMAL\@Raid\@\@0EB + * @symbol ?NUM_GROUPS_ON_NORMAL\@Raid\@\@0EB */ MCAPI static unsigned char const NUM_GROUPS_ON_NORMAL; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RaidBossComponent.hpp b/LiteLoader/include/llapi/mc/RaidBossComponent.hpp index 2dd239cbcf..5d5aa81829 100644 --- a/LiteLoader/include/llapi/mc/RaidBossComponent.hpp +++ b/LiteLoader/include/llapi/mc/RaidBossComponent.hpp @@ -30,104 +30,104 @@ class RaidBossComponent { public: /** - * @symbol ??0RaidBossComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0RaidBossComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI RaidBossComponent(class RaidBossComponent &&); /** - * @symbol ?getColor\@RaidBossComponent\@\@QEAA?AW4BossBarColor\@\@XZ + * @symbol ?getColor\@RaidBossComponent\@\@QEAA?AW4BossBarColor\@\@XZ */ MCAPI enum class BossBarColor getColor(); /** - * @symbol ?getHealthPercent\@RaidBossComponent\@\@QEAAMXZ + * @symbol ?getHealthPercent\@RaidBossComponent\@\@QEAAMXZ */ MCAPI float getHealthPercent(); /** - * @symbol ?getName\@RaidBossComponent\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@RaidBossComponent\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName(); /** - * @symbol ?getOwnerUniqueID\@RaidBossComponent\@\@QEAA?AUActorUniqueID\@\@XZ + * @symbol ?getOwnerUniqueID\@RaidBossComponent\@\@QEAA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getOwnerUniqueID(); /** - * @symbol ?getRaidInProgress\@RaidBossComponent\@\@QEAA_NXZ + * @symbol ?getRaidInProgress\@RaidBossComponent\@\@QEAA_NXZ */ MCAPI bool getRaidInProgress(); /** - * @symbol ?getVillage\@RaidBossComponent\@\@QEAA?AV?$shared_ptr\@VVillage\@\@\@std\@\@XZ + * @symbol ?getVillage\@RaidBossComponent\@\@QEAA?AV?$shared_ptr\@VVillage\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getVillage(); /** - * @symbol ?getWaveStarted\@RaidBossComponent\@\@QEAA_NXZ + * @symbol ?getWaveStarted\@RaidBossComponent\@\@QEAA_NXZ */ MCAPI bool getWaveStarted(); /** - * @symbol ?initialize\@RaidBossComponent\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?initialize\@RaidBossComponent\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void initialize(struct ActorUniqueID); /** - * @symbol ?isWithinRange\@RaidBossComponent\@\@QEAA_NAEBVMob\@\@\@Z + * @symbol ?isWithinRange\@RaidBossComponent\@\@QEAA_NAEBVMob\@\@\@Z */ MCAPI bool isWithinRange(class Mob const &); /** - * @symbol ??4RaidBossComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4RaidBossComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class RaidBossComponent & operator=(class RaidBossComponent &&); /** - * @symbol ?registerPlayer\@RaidBossComponent\@\@QEAAXPEAVPlayer\@\@\@Z + * @symbol ?registerPlayer\@RaidBossComponent\@\@QEAAXPEAVPlayer\@\@\@Z */ MCAPI void registerPlayer(class Player *); /** - * @symbol ?removeBossBar\@RaidBossComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?removeBossBar\@RaidBossComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void removeBossBar(class Actor &); /** - * @symbol ?resendRaidBossEventData\@RaidBossComponent\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?resendRaidBossEventData\@RaidBossComponent\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void resendRaidBossEventData(class Player &); /** - * @symbol ?sendRegistryMessages\@RaidBossComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?sendRegistryMessages\@RaidBossComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void sendRegistryMessages(class Actor &); /** - * @symbol ?setVillage\@RaidBossComponent\@\@QEAAXV?$weak_ptr\@VVillage\@\@\@std\@\@\@Z + * @symbol ?setVillage\@RaidBossComponent\@\@QEAAXV?$weak_ptr\@VVillage\@\@\@std\@\@\@Z */ MCAPI void setVillage(class std::weak_ptr); /** - * @symbol ?setWaveStarted\@RaidBossComponent\@\@QEAAX_N\@Z + * @symbol ?setWaveStarted\@RaidBossComponent\@\@QEAAX_N\@Z */ MCAPI void setWaveStarted(bool); /** - * @symbol ?setupBossBarInfo\@RaidBossComponent\@\@QEAAXAEAVActor\@\@PEAVVillage\@\@\@Z + * @symbol ?setupBossBarInfo\@RaidBossComponent\@\@QEAAXAEAVActor\@\@PEAVVillage\@\@\@Z */ MCAPI void setupBossBarInfo(class Actor &, class Village *); /** - * @symbol ?tryRemoveBoss\@RaidBossComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?tryRemoveBoss\@RaidBossComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI bool tryRemoveBoss(class Actor &, class Player &); /** - * @symbol ?unRegisterPlayer\@RaidBossComponent\@\@QEAAXPEAVPlayer\@\@\@Z + * @symbol ?unRegisterPlayer\@RaidBossComponent\@\@QEAAXPEAVPlayer\@\@\@Z */ MCAPI void unRegisterPlayer(class Player *); /** - * @symbol ?updateBossBarStats\@RaidBossComponent\@\@QEAAXAEAVActor\@\@AEBVRaid\@\@\@Z + * @symbol ?updateBossBarStats\@RaidBossComponent\@\@QEAAXAEAVActor\@\@AEBVRaid\@\@\@Z */ MCAPI void updateBossBarStats(class Actor &, class Raid const &); /** - * @symbol ??1RaidBossComponent\@\@QEAA\@XZ + * @symbol ??1RaidBossComponent\@\@QEAA\@XZ */ MCAPI ~RaidBossComponent(); //private: /** - * @symbol ?_broadcastBossEvent\@RaidBossComponent\@\@AEAAXW4BossEventUpdateType\@\@AEAVActor\@\@\@Z + * @symbol ?_broadcastBossEvent\@RaidBossComponent\@\@AEAAXW4BossEventUpdateType\@\@AEAVActor\@\@\@Z */ MCAPI void _broadcastBossEvent(enum class BossEventUpdateType, class Actor &); /** - * @symbol ?_sendBossEvent\@RaidBossComponent\@\@AEAAXW4BossEventUpdateType\@\@AEAVPlayer\@\@\@Z + * @symbol ?_sendBossEvent\@RaidBossComponent\@\@AEAAXW4BossEventUpdateType\@\@AEAVPlayer\@\@\@Z */ MCAPI void _sendBossEvent(enum class BossEventUpdateType, class Player &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RaidBossSystem.hpp b/LiteLoader/include/llapi/mc/RaidBossSystem.hpp index abaa86910f..760f190d9f 100644 --- a/LiteLoader/include/llapi/mc/RaidBossSystem.hpp +++ b/LiteLoader/include/llapi/mc/RaidBossSystem.hpp @@ -30,19 +30,19 @@ class RaidBossSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RaidBossSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@RaidBossSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@RaidBossSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RaidGardenGoal.hpp b/LiteLoader/include/llapi/mc/RaidGardenGoal.hpp index faadd61a80..2edd29e909 100644 --- a/LiteLoader/include/llapi/mc/RaidGardenGoal.hpp +++ b/LiteLoader/include/llapi/mc/RaidGardenGoal.hpp @@ -31,58 +31,58 @@ class RaidGardenGoal : public BaseMoveToBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RaidGardenGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RaidGardenGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RaidGardenGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RaidGardenGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RaidGardenGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RaidGardenGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RaidGardenGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 6 - * @symbol ?tick\@RaidGardenGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RaidGardenGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RaidGardenGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RaidGardenGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@RaidGardenGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@RaidGardenGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @symbol ??0RaidGardenGoal\@\@QEAA\@AEAVMob\@\@MHHHMHHHHAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0RaidGardenGoal\@\@QEAA\@AEAVMob\@\@MHHHMHHHHAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI RaidGardenGoal(class Mob &, float, int, int, int, float, int, int, int, int, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RaidTriggerComponent.hpp b/LiteLoader/include/llapi/mc/RaidTriggerComponent.hpp deleted file mode 100644 index cd57f6aa7a..0000000000 --- a/LiteLoader/include/llapi/mc/RaidTriggerComponent.hpp +++ /dev/null @@ -1,44 +0,0 @@ -/** - * @file RaidTriggerComponent.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class RaidTriggerComponent. - * - */ -class RaidTriggerComponent { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAIDTRIGGERCOMPONENT -public: - class RaidTriggerComponent& operator=(class RaidTriggerComponent const &) = delete; - RaidTriggerComponent(class RaidTriggerComponent const &) = delete; - RaidTriggerComponent() = delete; -#endif - -public: - /** - * @symbol ?initFromDefinition@RaidTriggerComponent@@QEAAXAEAVActor@@@Z - * @hash 181521082 - */ - MCAPI void initFromDefinition(class Actor &); - /** - * @symbol ?reloadComponent@RaidTriggerComponent@@QEAAXAEAVActor@@@Z - * @hash -1169856932 - */ - MCAPI void reloadComponent(class Actor &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RaidTriggerDefinition.hpp b/LiteLoader/include/llapi/mc/RaidTriggerDefinition.hpp index 93fa8c98a8..59b46ac408 100644 --- a/LiteLoader/include/llapi/mc/RaidTriggerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RaidTriggerDefinition.hpp @@ -26,12 +26,12 @@ class RaidTriggerDefinition { public: /** - * @symbol ?buildSchema\@RaidTriggerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRaidTriggerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@RaidTriggerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRaidTriggerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); /** - * @symbol ?getStrictParsingVersion\@RaidTriggerDefinition\@\@SA?AVSemVersion\@\@XZ + * @symbol ?getStrictParsingVersion\@RaidTriggerDefinition\@\@SA?AVSemVersion\@\@XZ */ MCAPI static class SemVersion getStrictParsingVersion(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RaidTriggerDescription.hpp b/LiteLoader/include/llapi/mc/RaidTriggerDescription.hpp deleted file mode 100644 index 3332e2e205..0000000000 --- a/LiteLoader/include/llapi/mc/RaidTriggerDescription.hpp +++ /dev/null @@ -1,58 +0,0 @@ -/** - * @file RaidTriggerDescription.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "Json.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class RaidTriggerDescription. - * - */ -class RaidTriggerDescription { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAIDTRIGGERDESCRIPTION -public: - class RaidTriggerDescription& operator=(class RaidTriggerDescription const &) = delete; - RaidTriggerDescription(class RaidTriggerDescription const &) = delete; - RaidTriggerDescription() = delete; -#endif - -public: - /** - * @vftbl 0 - * @symbol ?getJsonName@RaidTriggerDescription@@UEBAPEBDXZ - * @hash 1781920502 - */ - virtual char const * getJsonName() const; - /** - * @vftbl 1 - * @hash -1292827112 - */ - virtual ~RaidTriggerDescription(); - /** - * @vftbl 2 - * @symbol ?deserializeData@RaidTriggerDescription@@UEAAXUDeserializeDataParams@@@Z - * @hash 2072456509 - */ - virtual void deserializeData(struct DeserializeDataParams); - /** - * @vftbl 3 - * @symbol ?serializeData@RaidTriggerDescription@@UEBAXAEAVValue@Json@@@Z - * @hash -1768417657 - */ - virtual void serializeData(class Json::Value &) const; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp b/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp index 7534acd7a8..c710f229fe 100644 --- a/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/RaidTriggerSystem.hpp @@ -25,16 +25,16 @@ class RaidTriggerSystem { public: /** - * @symbol ?createSystem\@RaidTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@RaidTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doRaidTriggerSystem\@RaidTriggerSystem\@\@CAXAEBUDimensionTypeComponent\@\@AEBUStateVectorComponent\@\@AEAVActorOwnerComponent\@\@AEBUVillageManagerComponent\@\@\@Z + * @symbol ?_doRaidTriggerSystem\@RaidTriggerSystem\@\@CAXAEBUDimensionTypeComponent\@\@AEBUStateVectorComponent\@\@AEAVActorOwnerComponent\@\@AEBUVillageManagerComponent\@\@\@Z */ MCAPI static void _doRaidTriggerSystem(struct DimensionTypeComponent const &, struct StateVectorComponent const &, class ActorOwnerComponent &, struct VillageManagerComponent const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp b/LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp index 53128fd5a6..a21664e92d 100644 --- a/LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp +++ b/LiteLoader/include/llapi/mc/RaiderCelebrationGoal.hpp @@ -30,48 +30,48 @@ class RaiderCelebrationGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RaiderCelebrationGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RaiderCelebrationGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RaiderCelebrationGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RaiderCelebrationGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RaiderCelebrationGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RaiderCelebrationGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RaiderCelebrationGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RaiderCelebrationGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RaiderCelebrationGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RaiderCelebrationGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RaiderCelebrationGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RaiderCelebrationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RaiderCelebrationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RaiderCelebrationGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0RaiderCelebrationGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI RaiderCelebrationGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailActivatorComponent.hpp b/LiteLoader/include/llapi/mc/RailActivatorComponent.hpp index b89ca71384..dbaf47413a 100644 --- a/LiteLoader/include/llapi/mc/RailActivatorComponent.hpp +++ b/LiteLoader/include/llapi/mc/RailActivatorComponent.hpp @@ -30,8 +30,8 @@ class RailActivatorComponent { public: /** - * @symbol ?ejectAllPassengers\@RailActivatorComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?ejectAllPassengers\@RailActivatorComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void ejectAllPassengers(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp b/LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp index b680196d03..ae565fb246 100644 --- a/LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RailActivatorDefinition.hpp @@ -31,8 +31,8 @@ class RailActivatorDefinition { public: /** - * @symbol ?buildSchema\@RailActivatorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRailActivatorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@RailActivatorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRailActivatorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailActivatorSystem.hpp b/LiteLoader/include/llapi/mc/RailActivatorSystem.hpp index c5e18e2f58..0df7a255a8 100644 --- a/LiteLoader/include/llapi/mc/RailActivatorSystem.hpp +++ b/LiteLoader/include/llapi/mc/RailActivatorSystem.hpp @@ -30,27 +30,27 @@ class RailActivatorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RailActivatorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@RailActivatorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@RailActivatorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@RailActivatorSystem\@\@CAXAEAVEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVRailActivatorComponent\@\@\@Z + * @symbol ?_tickComponent\@RailActivatorSystem\@\@CAXAEAVEntityContext\@\@AEAVActorOwnerComponent\@\@AEAVRailActivatorComponent\@\@\@Z */ MCAPI static void _tickComponent(class EntityContext &, class ActorOwnerComponent &, class RailActivatorComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailBlock.hpp b/LiteLoader/include/llapi/mc/RailBlock.hpp index a6f44b9d77..f6421ffdc8 100644 --- a/LiteLoader/include/llapi/mc/RailBlock.hpp +++ b/LiteLoader/include/llapi/mc/RailBlock.hpp @@ -31,198 +31,203 @@ class RailBlock : public BaseRailBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RailBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@RailBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@RailBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0RailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0RailBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RailBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailMovementComponent.hpp b/LiteLoader/include/llapi/mc/RailMovementComponent.hpp index e9c666cde3..b9119fcb85 100644 --- a/LiteLoader/include/llapi/mc/RailMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/RailMovementComponent.hpp @@ -29,16 +29,16 @@ class RailMovementComponent { public: /** - * @symbol ??0RailMovementComponent\@\@QEAA\@XZ + * @symbol ??0RailMovementComponent\@\@QEAA\@XZ */ MCAPI RailMovementComponent(); /** - * @symbol ?getMaxSpeed\@RailMovementComponent\@\@QEBAMXZ + * @symbol ?getMaxSpeed\@RailMovementComponent\@\@QEBAMXZ */ MCAPI float getMaxSpeed() const; /** - * @symbol ??8RailMovementComponent\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8RailMovementComponent\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class RailMovementComponent const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailMovementDefinition.hpp b/LiteLoader/include/llapi/mc/RailMovementDefinition.hpp index bfc675048f..f9eed5eaf0 100644 --- a/LiteLoader/include/llapi/mc/RailMovementDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RailMovementDefinition.hpp @@ -30,16 +30,16 @@ class RailMovementDefinition { public: /** - * @symbol ??0RailMovementDefinition\@\@QEAA\@XZ + * @symbol ??0RailMovementDefinition\@\@QEAA\@XZ */ MCAPI RailMovementDefinition(); /** - * @symbol ?initialize\@RailMovementDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVRailMovementComponent\@\@\@Z + * @symbol ?initialize\@RailMovementDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVRailMovementComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class RailMovementComponent &) const; /** - * @symbol ?buildSchema\@RailMovementDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRailMovementDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@RailMovementDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRailMovementDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RailMovementSystem.hpp b/LiteLoader/include/llapi/mc/RailMovementSystem.hpp deleted file mode 100644 index 0d68ca16f3..0000000000 --- a/LiteLoader/include/llapi/mc/RailMovementSystem.hpp +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @file RailMovementSystem.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class RailMovementSystem. - * - */ -class RailMovementSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAILMOVEMENTSYSTEM -public: - class RailMovementSystem& operator=(class RailMovementSystem const &) = delete; - RailMovementSystem(class RailMovementSystem const &) = delete; - RailMovementSystem() = delete; -#endif - -public: - /** - * @symbol ?tickRailMovementComponent@RailMovementSystem@@SAXAEAVActor@@AEAVRailMovementComponent@@@Z - * @hash -558690389 - */ - MCAPI static void tickRailMovementComponent(class Actor &, class RailMovementComponent &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RailMovementUtility.hpp b/LiteLoader/include/llapi/mc/RailMovementUtility.hpp index 5abed9802d..8f2329eac1 100644 --- a/LiteLoader/include/llapi/mc/RailMovementUtility.hpp +++ b/LiteLoader/include/llapi/mc/RailMovementUtility.hpp @@ -28,27 +28,27 @@ class RailMovementUtility { public: /** - * @symbol ?calculateGoldenRailSpeedIncrease\@RailMovementUtility\@\@SA?AVVec3\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@HV2\@\@Z + * @symbol ?calculateGoldenRailSpeedIncrease\@RailMovementUtility\@\@SA?AVVec3\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@HV2\@\@Z */ MCAPI static class Vec3 calculateGoldenRailSpeedIncrease(class IConstBlockSource const &, class BlockPos const &, int, class Vec3); /** - * @symbol ?calculateMoveVelocity\@RailMovementUtility\@\@SA?AVVec3\@\@AEBVBlock\@\@HM_NAEAV2\@AEA_N3AEBV?$function\@$$A6A_NAEAVVec3\@\@\@Z\@std\@\@\@Z + * @symbol ?calculateMoveVelocity\@RailMovementUtility\@\@SA?AVVec3\@\@AEBVBlock\@\@HM_NAEAV2\@AEA_N3AEBV?$function\@$$A6A_NAEAVVec3\@\@\@Z\@std\@\@\@Z */ MCAPI static class Vec3 calculateMoveVelocity(class Block const &, int, float, bool, class Vec3 &, bool &, bool &, class std::function const &); /** - * @symbol ?calculatePassengerRailMovementInput\@RailMovementUtility\@\@SA_NAEAVVec3\@\@MM\@Z + * @symbol ?calculatePassengerRailMovementInput\@RailMovementUtility\@\@SA_NAEAVVec3\@\@MM\@Z */ MCAPI static bool calculatePassengerRailMovementInput(class Vec3 &, float, float); /** - * @symbol ?calculatePostRailMovementMinecartPosition\@RailMovementUtility\@\@SA?AVVec3\@\@AEBVIConstBlockSource\@\@AEBV2\@V2\@AEBVBlockPos\@\@HAEAV2\@\@Z + * @symbol ?calculatePostRailMovementMinecartPosition\@RailMovementUtility\@\@SA?AVVec3\@\@AEBVIConstBlockSource\@\@AEBV2\@V2\@AEBVBlockPos\@\@HAEAV2\@\@Z */ MCAPI static class Vec3 calculatePostRailMovementMinecartPosition(class IConstBlockSource const &, class Vec3 const &, class Vec3, class BlockPos const &, int, class Vec3 &); /** - * @symbol ?calculatePreRailMovementMinecartPosition\@RailMovementUtility\@\@SA?AVVec3\@\@V2\@AEBVBlockPos\@\@HM\@Z + * @symbol ?calculatePreRailMovementMinecartPosition\@RailMovementUtility\@\@SA?AVVec3\@\@V2\@AEBVBlockPos\@\@HM\@Z */ MCAPI static class Vec3 calculatePreRailMovementMinecartPosition(class Vec3, class BlockPos const &, int, float); /** - * @symbol ?getPos\@RailMovementUtility\@\@SA_NAEBVIConstBlockSource\@\@AEAVVec3\@\@V3\@\@Z + * @symbol ?getPos\@RailMovementUtility\@\@SA_NAEBVIConstBlockSource\@\@AEAVVec3\@\@V3\@\@Z */ MCAPI static bool getPos(class IConstBlockSource const &, class Vec3 &, class Vec3); @@ -56,8 +56,8 @@ class RailMovementUtility { private: /** - * @symbol ?RAIL_EXITS\@RailMovementUtility\@\@0V?$array\@URailExits\@RailMovementUtility\@\@$09\@std\@\@B + * @symbol ?RAIL_EXITS\@RailMovementUtility\@\@0V?$array\@URailExits\@RailMovementUtility\@\@$09\@std\@\@B */ MCAPI static class std::array const RAIL_EXITS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakDataInput.hpp b/LiteLoader/include/llapi/mc/RakDataInput.hpp index 2675b57e0b..f599836121 100644 --- a/LiteLoader/include/llapi/mc/RakDataInput.hpp +++ b/LiteLoader/include/llapi/mc/RakDataInput.hpp @@ -30,59 +30,65 @@ class RakDataInput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RakDataInput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?readString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string readString(); /** - * @vftbl 2 - * @symbol ?readLongString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?readLongString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string readLongString(); /** - * @vftbl 3 - * @symbol ?readFloat\@BytesDataInput\@\@UEAAMXZ + * @vftbl 3 + * @symbol ?readFloat\@BytesDataInput\@\@UEAAMXZ */ virtual float readFloat(); /** - * @vftbl 4 - * @symbol ?readDouble\@BytesDataInput\@\@UEAANXZ + * @vftbl 4 + * @symbol ?readDouble\@BytesDataInput\@\@UEAANXZ */ virtual double readDouble(); /** - * @vftbl 5 - * @symbol ?readByte\@BytesDataInput\@\@UEAADXZ + * @vftbl 5 + * @symbol ?readByte\@BytesDataInput\@\@UEAADXZ */ virtual char readByte(); /** - * @vftbl 6 - * @symbol ?readShort\@BytesDataInput\@\@UEAAFXZ + * @vftbl 6 + * @symbol ?readShort\@BytesDataInput\@\@UEAAFXZ */ virtual short readShort(); /** - * @vftbl 7 - * @symbol ?readInt\@BytesDataInput\@\@UEAAHXZ + * @vftbl 7 + * @symbol ?readInt\@BytesDataInput\@\@UEAAHXZ */ virtual int readInt(); /** - * @vftbl 8 - * @symbol ?readLongLong\@BytesDataInput\@\@UEAA_JXZ + * @vftbl 8 + * @symbol ?readLongLong\@BytesDataInput\@\@UEAA_JXZ */ virtual __int64 readLongLong(); /** - * @vftbl 9 - * @symbol ?readBytes\@RakDataInput\@\@UEAA_NPEAX_K\@Z + * @vftbl 9 + * @symbol ?readBytes\@RakDataInput\@\@UEAA_NPEAX_K\@Z */ virtual bool readBytes(void *, unsigned __int64); /** - * @vftbl 10 - * @symbol ?numBytesLeft\@RakDataInput\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?numBytesLeft\@RakDataInput\@\@UEBA_KXZ */ virtual unsigned __int64 numBytesLeft() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKDATAINPUT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RakDataInput(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakDataOutput.hpp b/LiteLoader/include/llapi/mc/RakDataOutput.hpp index c08949cec8..6b530b9ac6 100644 --- a/LiteLoader/include/llapi/mc/RakDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/RakDataOutput.hpp @@ -30,54 +30,60 @@ class RakDataOutput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RakDataOutput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?writeString\@BytesDataOutput\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @vftbl 1 + * @symbol ?writeString\@BytesDataOutput\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual void writeString(class gsl::basic_string_span); + virtual void writeString(class std::basic_string_view>); /** - * @vftbl 2 - * @symbol ?writeLongString\@BytesDataOutput\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @vftbl 2 + * @symbol ?writeLongString\@BytesDataOutput\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual void writeLongString(class gsl::basic_string_span); + virtual void writeLongString(class std::basic_string_view>); /** - * @vftbl 3 - * @symbol ?writeFloat\@BytesDataOutput\@\@UEAAXM\@Z + * @vftbl 3 + * @symbol ?writeFloat\@BytesDataOutput\@\@UEAAXM\@Z */ virtual void writeFloat(float); /** - * @vftbl 4 - * @symbol ?writeDouble\@BytesDataOutput\@\@UEAAXN\@Z + * @vftbl 4 + * @symbol ?writeDouble\@BytesDataOutput\@\@UEAAXN\@Z */ virtual void writeDouble(double); /** - * @vftbl 5 - * @symbol ?writeByte\@BytesDataOutput\@\@UEAAXD\@Z + * @vftbl 5 + * @symbol ?writeByte\@BytesDataOutput\@\@UEAAXD\@Z */ virtual void writeByte(char); /** - * @vftbl 6 - * @symbol ?writeShort\@BytesDataOutput\@\@UEAAXF\@Z + * @vftbl 6 + * @symbol ?writeShort\@BytesDataOutput\@\@UEAAXF\@Z */ virtual void writeShort(short); /** - * @vftbl 7 - * @symbol ?writeInt\@BytesDataOutput\@\@UEAAXH\@Z + * @vftbl 7 + * @symbol ?writeInt\@BytesDataOutput\@\@UEAAXH\@Z */ virtual void writeInt(int); /** - * @vftbl 8 - * @symbol ?writeLongLong\@BytesDataOutput\@\@UEAAX_J\@Z + * @vftbl 8 + * @symbol ?writeLongLong\@BytesDataOutput\@\@UEAAX_J\@Z */ virtual void writeLongLong(__int64); /** - * @vftbl 9 - * @symbol ?writeBytes\@RakDataOutput\@\@UEAAXPEBX_K\@Z + * @vftbl 9 + * @symbol ?writeBytes\@RakDataOutput\@\@UEAAXPEBX_K\@Z */ virtual void writeBytes(void const *, unsigned __int64); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKDATAOUTPUT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RakDataOutput(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakNet.hpp b/LiteLoader/include/llapi/mc/RakNet.hpp index bb895d2afd..84dd27aea7 100644 --- a/LiteLoader/include/llapi/mc/RakNet.hpp +++ b/LiteLoader/include/llapi/mc/RakNet.hpp @@ -65,87 +65,87 @@ namespace RakNet { }; #undef AFTER_EXTRA /** - * @symbol ?ConnectionAttemptLoop\@RakNet\@\@YAIPEAX\@Z + * @symbol ?ConnectionAttemptLoop\@RakNet\@\@YAIPEAX\@Z */ MCAPI unsigned int ConnectionAttemptLoop(void *); /** - * @symbol ?GetTime\@RakNet\@\@YA_KXZ + * @symbol ?GetTime\@RakNet\@\@YA_KXZ */ MCAPI unsigned __int64 GetTime(); /** - * @symbol ?GetTimeMS\@RakNet\@\@YAIXZ + * @symbol ?GetTimeMS\@RakNet\@\@YAIXZ */ MCAPI unsigned int GetTimeMS(); /** - * @symbol ?GetTimeUS\@RakNet\@\@YA_KXZ + * @symbol ?GetTimeUS\@RakNet\@\@YA_KXZ */ MCAPI unsigned __int64 GetTimeUS(); /** - * @symbol ?NonNumericHostString\@RakNet\@\@YA_NPEBD\@Z + * @symbol ?NonNumericHostString\@RakNet\@\@YA_NPEBD\@Z */ MCAPI bool NonNumericHostString(char const *); /** - * @symbol ?ProcessNetworkPacket\@RakNet\@\@YAXUSystemAddress\@1\@PEBDHPEAVRakPeer\@1\@PEAVRakNetSocket2\@1\@_KAEAVBitStream\@1\@\@Z + * @symbol ?ProcessNetworkPacket\@RakNet\@\@YAXUSystemAddress\@1\@PEBDHPEAVRakPeer\@1\@PEAVRakNetSocket2\@1\@_KAEAVBitStream\@1\@\@Z */ MCAPI void ProcessNetworkPacket(struct RakNet::SystemAddress, char const *, int, class RakNet::RakPeer *, class RakNet::RakNetSocket2 *, unsigned __int64, class RakNet::BitStream &); /** - * @symbol ?ProcessOfflineNetworkPacket\@RakNet\@\@YA_NUSystemAddress\@1\@PEBDHPEAVRakPeer\@1\@PEAVRakNetSocket2\@1\@PEA_N_K\@Z + * @symbol ?ProcessOfflineNetworkPacket\@RakNet\@\@YA_NUSystemAddress\@1\@PEBDHPEAVRakPeer\@1\@PEAVRakNetSocket2\@1\@PEA_N_K\@Z */ MCAPI bool ProcessOfflineNetworkPacket(struct RakNet::SystemAddress, char const *, int, class RakNet::RakPeer *, class RakNet::RakNetSocket2 *, bool *, unsigned __int64); /** - * @symbol ?SplitPacketChannelComp\@RakNet\@\@YAHAEBGAEBQEAUSplitPacketChannel\@1\@\@Z + * @symbol ?SplitPacketChannelComp\@RakNet\@\@YAHAEBGAEBQEAUSplitPacketChannel\@1\@\@Z */ MCAPI int SplitPacketChannelComp(unsigned short const &, struct RakNet::SplitPacketChannel *const &); /** - * @symbol ?UNASSIGNED_RAKNET_GUID\@RakNet\@\@3URakNetGUID\@1\@B + * @symbol ?UNASSIGNED_RAKNET_GUID\@RakNet\@\@3URakNetGUID\@1\@B */ MCAPI extern struct RakNet::RakNetGUID const UNASSIGNED_RAKNET_GUID; /** - * @symbol ?UNASSIGNED_SYSTEM_ADDRESS\@RakNet\@\@3USystemAddress\@1\@B + * @symbol ?UNASSIGNED_SYSTEM_ADDRESS\@RakNet\@\@3USystemAddress\@1\@B */ MCAPI extern struct RakNet::SystemAddress const UNASSIGNED_SYSTEM_ADDRESS; /** - * @symbol ?UpdateNetworkLoop\@RakNet\@\@YAIPEAX\@Z + * @symbol ?UpdateNetworkLoop\@RakNet\@\@YAIPEAX\@Z */ MCAPI unsigned int UpdateNetworkLoop(void *); /** - * @symbol ?UpdateTCPInterfaceLoop\@RakNet\@\@YAIPEAX\@Z + * @symbol ?UpdateTCPInterfaceLoop\@RakNet\@\@YAIPEAX\@Z */ MCAPI unsigned int UpdateTCPInterfaceLoop(void *); /** - * @symbol ?_DLMallocDirectMMap\@RakNet\@\@YAPEAX_K\@Z + * @symbol ?_DLMallocDirectMMap\@RakNet\@\@YAPEAX_K\@Z */ MCAPI void * _DLMallocDirectMMap(unsigned __int64); /** - * @symbol ?_DLMallocMMap\@RakNet\@\@YAPEAX_K\@Z + * @symbol ?_DLMallocMMap\@RakNet\@\@YAPEAX_K\@Z */ MCAPI void * _DLMallocMMap(unsigned __int64); /** - * @symbol ?_DLMallocMUnmap\@RakNet\@\@YAHPEAX_K\@Z + * @symbol ?_DLMallocMUnmap\@RakNet\@\@YAHPEAX_K\@Z */ MCAPI int _DLMallocMUnmap(void *, unsigned __int64); /** - * @symbol ?_RakFree\@RakNet\@\@YAXPEAX\@Z + * @symbol ?_RakFree\@RakNet\@\@YAXPEAX\@Z */ MCAPI void _RakFree(void *); /** - * @symbol ?_RakFree_Ex\@RakNet\@\@YAXPEAXPEBDI\@Z + * @symbol ?_RakFree_Ex\@RakNet\@\@YAXPEAXPEBDI\@Z */ MCAPI void _RakFree_Ex(void *, char const *, unsigned int); /** - * @symbol ?_RakMalloc\@RakNet\@\@YAPEAX_K\@Z + * @symbol ?_RakMalloc\@RakNet\@\@YAPEAX_K\@Z */ MCAPI void * _RakMalloc(unsigned __int64); /** - * @symbol ?_RakMalloc_Ex\@RakNet\@\@YAPEAX_KPEBDI\@Z + * @symbol ?_RakMalloc_Ex\@RakNet\@\@YAPEAX_KPEBDI\@Z */ MCAPI void * _RakMalloc_Ex(unsigned __int64, char const *, unsigned int); /** - * @symbol ?_RakRealloc\@RakNet\@\@YAPEAXPEAX_K\@Z + * @symbol ?_RakRealloc\@RakNet\@\@YAPEAXPEAX_K\@Z */ MCAPI void * _RakRealloc(void *, unsigned __int64); /** - * @symbol ?_RakRealloc_Ex\@RakNet\@\@YAPEAXPEAX_KPEBDI\@Z + * @symbol ?_RakRealloc_Ex\@RakNet\@\@YAPEAXPEAX_KPEBDI\@Z */ MCAPI void * _RakRealloc_Ex(void *, unsigned __int64, char const *, unsigned int); diff --git a/LiteLoader/include/llapi/mc/RakNetConnector.hpp b/LiteLoader/include/llapi/mc/RakNetConnector.hpp index e15f7d04be..359ce4197d 100644 --- a/LiteLoader/include/llapi/mc/RakNetConnector.hpp +++ b/LiteLoader/include/llapi/mc/RakNetConnector.hpp @@ -29,141 +29,141 @@ class RakNetConnector { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKNETCONNECTOR /** - * @symbol ?_onDisable\@RakNetConnector\@\@EEAAXXZ + * @symbol ?_onDisable\@RakNetConnector\@\@EEAAXXZ */ MCVAPI void _onDisable(); /** - * @symbol ?_onEnable\@RakNetConnector\@\@EEAAXXZ + * @symbol ?_onEnable\@RakNetConnector\@\@EEAAXXZ */ MCVAPI void _onEnable(); /** - * @symbol ?addConnectionStateListener\@RakNetConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z + * @symbol ?addConnectionStateListener\@RakNetConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z */ MCVAPI void addConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?closeNetworkConnection\@RakNetConnector\@\@UEAAXAEAVNetworkConnection\@\@\@Z + * @symbol ?closeNetworkConnection\@RakNetConnector\@\@UEAAXAEAVNetworkConnection\@\@\@Z */ MCVAPI void closeNetworkConnection(class NetworkConnection &); /** - * @symbol ?connect\@RakNetConnector\@\@UEAA_NAEBVGameConnectionInfo\@Social\@\@0\@Z + * @symbol ?connect\@RakNetConnector\@\@UEAA_NAEBVGameConnectionInfo\@Social\@\@0\@Z */ MCVAPI bool connect(class Social::GameConnectionInfo const &, class Social::GameConnectionInfo const &); /** - * @symbol ?disconnect\@RakNetConnector\@\@UEAAXXZ + * @symbol ?disconnect\@RakNetConnector\@\@UEAAXXZ */ MCVAPI void disconnect(); /** - * @symbol ?getConnectedGameInfo\@RakNetConnector\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ + * @symbol ?getConnectedGameInfo\@RakNetConnector\@\@UEBAAEBVGameConnectionInfo\@Social\@\@XZ */ MCVAPI class Social::GameConnectionInfo const & getConnectedGameInfo() const; /** - * @symbol ?getIPv4Port\@RakNetConnector\@\@UEBAGXZ + * @symbol ?getIPv4Port\@RakNetConnector\@\@UEBAGXZ */ MCVAPI unsigned short getIPv4Port() const; /** - * @symbol ?getIPv6Port\@RakNetConnector\@\@UEBAGXZ + * @symbol ?getIPv6Port\@RakNetConnector\@\@UEBAGXZ */ MCVAPI unsigned short getIPv6Port() const; /** - * @symbol ?getLocalIp\@RakNetConnector\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getLocalIp\@RakNetConnector\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getLocalIp(); /** - * @symbol ?getLocalIps\@RakNetConnector\@\@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\@\@XZ + * @symbol ?getLocalIps\@RakNetConnector\@\@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\@\@XZ */ MCVAPI std::vector getLocalIps() const; /** - * @symbol ?getNatPunchInfo\@RakNetConnector\@\@UEBA?AUNatPunchInfo\@Connector\@\@XZ + * @symbol ?getNatPunchInfo\@RakNetConnector\@\@UEBA?AUNatPunchInfo\@Connector\@\@XZ */ MCVAPI struct Connector::NatPunchInfo getNatPunchInfo() const; /** - * @symbol ?getPeer\@RakNetConnector\@\@UEAAPEAVRakPeerInterface\@RakNet\@\@XZ + * @symbol ?getPeer\@RakNetConnector\@\@UEAAPEAVRakPeerInterface\@RakNet\@\@XZ */ MCVAPI class RakNet::RakPeerInterface * getPeer(); /** - * @symbol ?getPeer\@RakNetConnector\@\@UEBAPEBVRakPeerInterface\@RakNet\@\@XZ + * @symbol ?getPeer\@RakNetConnector\@\@UEBAPEBVRakPeerInterface\@RakNet\@\@XZ */ MCVAPI class RakNet::RakPeerInterface const * getPeer() const; /** - * @symbol ?getPort\@RakNetConnector\@\@UEBAGXZ + * @symbol ?getPort\@RakNetConnector\@\@UEBAGXZ */ MCVAPI unsigned short getPort() const; /** - * @symbol ?getRefinedLocalIps\@RakNetConnector\@\@UEBA?AV?$vector\@USystemAddress\@RakNet\@\@V?$allocator\@USystemAddress\@RakNet\@\@\@std\@\@\@std\@\@XZ + * @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 + * @symbol ?getTransportIdentifier\@RakNetConnector\@\@UEBA_KXZ */ MCVAPI unsigned __int64 getTransportIdentifier() const; /** - * @symbol ?host\@RakNetConnector\@\@UEAA_NAEBUConnectionDefinition\@\@\@Z + * @symbol ?host\@RakNetConnector\@\@UEAA_NAEBUConnectionDefinition\@\@\@Z */ MCVAPI bool host(struct ConnectionDefinition const &); /** - * @symbol ?isIPv4Supported\@RakNetConnector\@\@UEBA_NXZ + * @symbol ?isIPv4Supported\@RakNetConnector\@\@UEBA_NXZ */ MCVAPI bool isIPv4Supported() const; /** - * @symbol ?isIPv6Supported\@RakNetConnector\@\@UEBA_NXZ + * @symbol ?isIPv6Supported\@RakNetConnector\@\@UEBA_NXZ */ MCVAPI bool isIPv6Supported() const; /** - * @symbol ?isServer\@RakNetConnector\@\@UEBA_NXZ + * @symbol ?isServer\@RakNetConnector\@\@UEBA_NXZ */ MCVAPI bool isServer() const; /** - * @symbol ?removeConnectionStateListener\@RakNetConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z + * @symbol ?removeConnectionStateListener\@RakNetConnector\@\@UEAAXPEAVConnectionStateListener\@Connector\@\@\@Z */ MCVAPI void removeConnectionStateListener(class Connector::ConnectionStateListener *); /** - * @symbol ?runEvents\@RakNetConnector\@\@UEAAXXZ + * @symbol ?runEvents\@RakNetConnector\@\@UEAAXXZ */ MCVAPI void runEvents(); /** - * @symbol ?setupNatPunch\@RakNetConnector\@\@UEAAX_N\@Z + * @symbol ?setupNatPunch\@RakNetConnector\@\@UEAAX_N\@Z */ MCVAPI void setupNatPunch(bool); /** - * @symbol ?startNatPunchingClient\@RakNetConnector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @symbol ?startNatPunchingClient\@RakNetConnector\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ MCVAPI void startNatPunchingClient(std::string const &, unsigned short); /** - * @symbol ?tick\@RakNetConnector\@\@UEAAXXZ + * @symbol ?tick\@RakNetConnector\@\@UEAAXXZ */ MCVAPI void tick(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~RakNetConnector(); #endif /** - * @symbol ??0RakNetConnector\@\@QEAA\@AEAUConnectionCallbacks\@0\@AEAVIPSupportInterface\@RakPeerHelper\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @symbol ??0RakNetConnector\@\@QEAA\@AEAUConnectionCallbacks\@0\@AEAVIPSupportInterface\@RakPeerHelper\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ MCAPI RakNetConnector(struct RakNetConnector::ConnectionCallbacks &, class RakPeerHelper::IPSupportInterface &, class Bedrock::NonOwnerPointer const &); //private: /** - * @symbol ?_changeNatState\@RakNetConnector\@\@AEAAXW4NATState\@1\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_changeNatState\@RakNetConnector\@\@AEAAXW4NATState\@1\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _changeNatState(enum class RakNetConnector::NATState, int, std::string const &); /** - * @symbol ?_createPeer\@RakNetConnector\@\@AEAA?AV?$shared_ptr\@VRakNetNetworkPeer\@RakNetConnector\@\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?_createPeer\@RakNetConnector\@\@AEAA?AV?$shared_ptr\@VRakNetNetworkPeer\@RakNetConnector\@\@\@std\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI class std::shared_ptr _createPeer(class NetworkIdentifier const &); /** - * @symbol ?_openNatConnection\@RakNetConnector\@\@AEAAXAEBUSystemAddress\@RakNet\@\@\@Z + * @symbol ?_openNatConnection\@RakNetConnector\@\@AEAAXAEBUSystemAddress\@RakNet\@\@\@Z */ MCAPI void _openNatConnection(struct RakNet::SystemAddress const &); /** - * @symbol ?_pingNatService\@RakNetConnector\@\@AEAAX_N\@Z + * @symbol ?_pingNatService\@RakNetConnector\@\@AEAAX_N\@Z */ MCAPI void _pingNatService(bool); /** - * @symbol ?_storeLocalIP\@RakNetConnector\@\@AEAAXXZ + * @symbol ?_storeLocalIP\@RakNetConnector\@\@AEAAXXZ */ MCAPI void _storeLocalIP(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakNetInstance.hpp b/LiteLoader/include/llapi/mc/RakNetInstance.hpp deleted file mode 100644 index 6dec12b0ac..0000000000 --- a/LiteLoader/include/llapi/mc/RakNetInstance.hpp +++ /dev/null @@ -1,216 +0,0 @@ -/** - * @file RakNetInstance.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "RakPeerHelper.hpp" -#include "Bedrock.hpp" -#include "RakNet.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class RakNetInstance. - * - */ -class RakNetInstance { - -#define AFTER_EXTRA -// Add Member There -public: -class RakNetNetworkPeer { -public: - RakNetNetworkPeer() = delete; - RakNetNetworkPeer(RakNetNetworkPeer const&) = delete; - RakNetNetworkPeer(RakNetNetworkPeer const&&) = delete; -}; -enum class NATState; - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RAKNETINSTANCE -public: - class RakNetInstance& operator=(class RakNetInstance const &) = delete; - RakNetInstance(class RakNetInstance const &) = delete; - RakNetInstance() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKNETINSTANCE - /** - * @symbol ?_onDisable@RakNetInstance@@EEAAXXZ - * @hash -632997555 - */ - MCVAPI void _onDisable(); - /** - * @symbol ?_onEnable@RakNetInstance@@EEAAXXZ - * @hash 773456180 - */ - MCVAPI void _onEnable(); - /** - * @symbol ?addConnectionStateListener@RakNetInstance@@UEAAXPEAVConnectionStateListener@Connector@@@Z - * @hash -1313832249 - */ - MCVAPI void addConnectionStateListener(class Connector::ConnectionStateListener *); - /** - * @symbol ?closeNetworkConnection@RakNetInstance@@UEAAXAEAVNetworkConnection@@@Z - * @hash -2088613237 - */ - MCVAPI void closeNetworkConnection(class NetworkConnection &); - /** - * @symbol ?connect@RakNetInstance@@UEAA_NAEBVGameConnectionInfo@Social@@0@Z - * @hash -1847087843 - */ - MCVAPI bool connect(class Social::GameConnectionInfo const &, class Social::GameConnectionInfo const &); - /** - * @symbol ?disconnect@RakNetInstance@@UEAAXXZ - * @hash 425947949 - */ - MCVAPI void disconnect(); - /** - * @symbol ?getConnectedGameInfo@RakNetInstance@@UEBAAEBVGameConnectionInfo@Social@@XZ - * @hash 1849241015 - */ - MCVAPI class Social::GameConnectionInfo const & getConnectedGameInfo() const; - /** - * @symbol ?getIPv4Port@RakNetInstance@@UEBAGXZ - * @hash 781527151 - */ - MCVAPI unsigned short getIPv4Port() const; - /** - * @symbol ?getIPv6Port@RakNetInstance@@UEBAGXZ - * @hash -1424530751 - */ - MCVAPI unsigned short getIPv6Port() const; - /** - * @symbol ?getLocalIp@RakNetInstance@@UEAA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - * @hash -1626880319 - */ - MCVAPI std::string getLocalIp(); - /** - * @symbol ?getLocalIps@RakNetInstance@@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@@XZ - * @hash -1788502266 - */ - MCVAPI std::vector getLocalIps() const; - /** - * @symbol ?getNatPunchInfo@RakNetInstance@@UEBA?AUNatPunchInfo@Connector@@XZ - * @hash -1152432283 - */ - MCVAPI struct Connector::NatPunchInfo getNatPunchInfo() const; - /** - * @symbol ?getPeer@RakNetInstance@@UEAAPEAVRakPeerInterface@RakNet@@XZ - * @hash -1136775301 - */ - MCVAPI class RakNet::RakPeerInterface * getPeer(); - /** - * @symbol ?getPeer@RakNetInstance@@UEBAPEBVRakPeerInterface@RakNet@@XZ - * @hash -956917961 - */ - MCVAPI class RakNet::RakPeerInterface const * getPeer() const; - /** - * @symbol ?getPort@RakNetInstance@@UEBAGXZ - * @hash -837274630 - */ - MCVAPI unsigned short getPort() const; - /** - * @symbol ?getRefinedLocalIps@RakNetInstance@@UEBA?AV?$vector@USystemAddress@RakNet@@V?$allocator@USystemAddress@RakNet@@@std@@@std@@XZ - * @hash 829055961 - */ - MCVAPI std::vector getRefinedLocalIps() const; - /** - * @symbol ?getTransportIdentifier@RakNetInstance@@UEBA_KXZ - * @hash 1109495622 - */ - MCVAPI unsigned __int64 getTransportIdentifier() const; - /** - * @symbol ?host@RakNetInstance@@UEAA_NAEBUConnectionDefinition@@@Z - * @hash 1839508962 - */ - MCVAPI bool host(struct ConnectionDefinition const &); - /** - * @symbol ?isIPv4Supported@RakNetInstance@@UEBA_NXZ - * @hash 1261645089 - */ - MCVAPI bool isIPv4Supported() const; - /** - * @symbol ?isIPv6Supported@RakNetInstance@@UEBA_NXZ - * @hash -987829073 - */ - MCVAPI bool isIPv6Supported() const; - /** - * @symbol ?isServer@RakNetInstance@@UEBA_NXZ - * @hash 475810415 - */ - MCVAPI bool isServer() const; - /** - * @symbol ?removeConnectionStateListener@RakNetInstance@@UEAAXPEAVConnectionStateListener@Connector@@@Z - * @hash -547864182 - */ - MCVAPI void removeConnectionStateListener(class Connector::ConnectionStateListener *); - /** - * @symbol ?runEvents@RakNetInstance@@UEAAXXZ - * @hash 357473189 - */ - MCVAPI void runEvents(); - /** - * @symbol ?setupNatPunch@RakNetInstance@@UEAAX_N@Z - * @hash -123280959 - */ - MCVAPI void setupNatPunch(bool); - /** - * @symbol ?startNatPunchingClient@RakNetInstance@@UEAAXAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@G@Z - * @hash 1382840000 - */ - MCVAPI void startNatPunchingClient(std::string const &, unsigned short); - /** - * @symbol ?tick@RakNetInstance@@UEAAXXZ - * @hash 59273310 - */ - MCVAPI void tick(); - /** - * @symbol ??1RakNetInstance@@UEAA@XZ - * @hash 1107815044 - */ - MCVAPI ~RakNetInstance(); -#endif - /** - * @symbol ??0RakNetInstance@@QEAA@AEAUConnectionCallbacks@0@AEAVIPSupportInterface@RakPeerHelper@@AEBV?$NonOwnerPointer@VAppPlatform@@@Bedrock@@@Z - * @hash -1776871536 - */ - MCAPI RakNetInstance(struct RakNetInstance::ConnectionCallbacks &, class RakPeerHelper::IPSupportInterface &, class Bedrock::NonOwnerPointer const &); - -//private: - /** - * @symbol ?_changeNatState@RakNetInstance@@AEAAXW4NATState@1@HAEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z - * @hash 1859283534 - */ - MCAPI void _changeNatState(enum RakNetInstance::NATState, int, std::string const &); - /** - * @symbol ?_createPeer@RakNetInstance@@AEAA?AV?$shared_ptr@VRakNetNetworkPeer@RakNetInstance@@@std@@AEBVNetworkIdentifier@@@Z - * @hash -749995720 - */ - MCAPI class std::shared_ptr _createPeer(class NetworkIdentifier const &); - /** - * @symbol ?_openNatConnection@RakNetInstance@@AEAAXAEBUSystemAddress@RakNet@@@Z - * @hash -792858548 - */ - MCAPI void _openNatConnection(struct RakNet::SystemAddress const &); - /** - * @symbol ?_pingNatService@RakNetInstance@@AEAAX_N@Z - * @hash 986205305 - */ - MCAPI void _pingNatService(bool); - /** - * @symbol ?_storeLocalIP@RakNetInstance@@AEAAXXZ - * @hash -1885306810 - */ - MCAPI void _storeLocalIP(); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp index ca7527f087..d59667cb85 100644 --- a/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/RakNetServerLocator.hpp @@ -39,176 +39,182 @@ struct AnnounceServerData { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RakNetServerLocator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_onDisable\@RakNetServerLocator\@\@EEAAXXZ + * @vftbl 1 + * @symbol ?_onDisable\@RakNetServerLocator\@\@EEAAXXZ */ virtual void _onDisable(); /** - * @vftbl 2 - * @symbol ?_onEnable\@RakNetServerLocator\@\@EEAAXXZ + * @vftbl 2 + * @symbol ?_onEnable\@RakNetServerLocator\@\@EEAAXXZ */ 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 + * @vftbl 3 + * @symbol ?startAnnouncingServer\@RakNetServerLocator\@\@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\@RakNetServerLocator\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?stopAnnouncingServer\@RakNetServerLocator\@\@UEAAXXZ */ virtual void stopAnnouncingServer(); /** - * @vftbl 5 - * @symbol ?startServerDiscovery\@RakNetServerLocator\@\@UEAAXUPortPair\@\@\@Z + * @vftbl 5 + * @symbol ?startServerDiscovery\@RakNetServerLocator\@\@UEAAXUPortPair\@\@\@Z */ virtual void startServerDiscovery(struct PortPair); /** - * @vftbl 6 - * @symbol ?stopServerDiscovery\@RakNetServerLocator\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?stopServerDiscovery\@RakNetServerLocator\@\@UEAAXXZ */ virtual void stopServerDiscovery(); /** - * @vftbl 7 - * @symbol ?addCustomServer\@RakNetServerLocator\@\@UEAAXAEBVAsynchronousIPResolver\@\@H\@Z + * @vftbl 7 + * @symbol ?addCustomServer\@RakNetServerLocator\@\@UEAAXAEBVAsynchronousIPResolver\@\@H\@Z */ virtual void addCustomServer(class AsynchronousIPResolver const &, int); /** - * @vftbl 8 - * @symbol ?addCustomServer\@RakNetServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 8 + * @symbol ?addCustomServer\@RakNetServerLocator\@\@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\@RakNetServerLocator\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?getServerList\@RakNetServerLocator\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getServerList() const; /** - * @vftbl 10 - * @symbol ?clearServerList\@RakNetServerLocator\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?clearServerList\@RakNetServerLocator\@\@UEAAXXZ */ virtual void clearServerList(); /** - * @vftbl 11 - * @symbol ?update\@RakNetServerLocator\@\@UEAAXXZ + * @vftbl 11 + * @symbol ?update\@RakNetServerLocator\@\@UEAAXXZ */ virtual void update(); /** - * @vftbl 12 - * @symbol ?isIPv4Supported\@RakNetServerLocator\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?isIPv4Supported\@RakNetServerLocator\@\@UEBA_NXZ */ virtual bool isIPv4Supported() const; /** - * @vftbl 13 - * @symbol ?isIPv6Supported\@RakNetServerLocator\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?isIPv6Supported\@RakNetServerLocator\@\@UEBA_NXZ */ virtual bool isIPv6Supported() const; /** - * @vftbl 14 - * @symbol ?getPingTimeForGUID\@RakNetServerLocator\@\@UEAAMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 14 + * @symbol ?getPingTimeForGUID\@RakNetServerLocator\@\@UEAAMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual float getPingTimeForGUID(std::string const &); /** - * @vftbl 15 - * @symbol ?checkCanConnectToCustomServerAsync\@RakNetServerLocator\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$function\@$$A6AX_N\@Z\@3\@\@Z + * @vftbl 15 + * @symbol ?checkCanConnectToCustomServerAsync\@RakNetServerLocator\@\@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); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKNETSERVERLOCATOR /** - * @symbol ??0RakNetServerLocator\@\@QEAA\@AEAVRakNetConnector\@\@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\@\@V?$function\@$$A6A?AV?$unique_ptr\@VRakPeerInterface\@RakNet\@\@P6AXPEAV12\@\@Z\@std\@\@XZ\@5\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RakNetServerLocator(); +#endif + /** + * @symbol ??0RakNetServerLocator\@\@QEAA\@AEAVRakNetConnector\@\@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\@\@V?$function\@$$A6A?AV?$unique_ptr\@VRakPeerInterface\@RakNet\@\@P6AXPEAV12\@\@Z\@std\@\@XZ\@5\@\@Z */ MCAPI RakNetServerLocator(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)>); /** - * @symbol ?parseUnconnectedPongPacketData\@RakNetServerLocator\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?parseUnconnectedPongPacketData\@RakNetServerLocator\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static bool parseUnconnectedPongPacketData(std::string const &, std::vector &); //private: /** - * @symbol ?_activate\@RakNetServerLocator\@\@AEAAXXZ + * @symbol ?_activate\@RakNetServerLocator\@\@AEAAXXZ */ MCAPI void _activate(); /** - * @symbol ?_addCustomServerFromIpResolver\@RakNetServerLocator\@\@AEAAXAEBVAsynchronousIPResolver\@\@H\@Z + * @symbol ?_addCustomServerFromIpResolver\@RakNetServerLocator\@\@AEAAXAEBVAsynchronousIPResolver\@\@H\@Z */ MCAPI void _addCustomServerFromIpResolver(class AsynchronousIPResolver const &, int); /** - * @symbol ?_addCustomServerV4\@RakNetServerLocator\@\@AEAA_NAEBVAsynchronousIPResolver\@\@H\@Z + * @symbol ?_addCustomServerV4\@RakNetServerLocator\@\@AEAA_NAEBVAsynchronousIPResolver\@\@H\@Z */ MCAPI bool _addCustomServerV4(class AsynchronousIPResolver const &, int); /** - * @symbol ?_addCustomServerV6\@RakNetServerLocator\@\@AEAA_NAEBVAsynchronousIPResolver\@\@H\@Z + * @symbol ?_addCustomServerV6\@RakNetServerLocator\@\@AEAA_NAEBVAsynchronousIPResolver\@\@H\@Z */ MCAPI bool _addCustomServerV6(class AsynchronousIPResolver const &, int); /** - * @symbol ?_announceServer\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z + * @symbol ?_announceServer\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z */ MCAPI void _announceServer(struct RakNetServerLocator::AnnounceServerData const &); /** - * @symbol ?_enqueueStateChangeRequest\@RakNetServerLocator\@\@AEAAXW4LocatorStateChangeRequest\@\@UAnnounceServerData\@1\@UPortPair\@\@\@Z + * @symbol ?_enqueueStateChangeRequest\@RakNetServerLocator\@\@AEAAXW4LocatorStateChangeRequest\@\@UAnnounceServerData\@1\@UPortPair\@\@\@Z */ MCAPI void _enqueueStateChangeRequest(enum class LocatorStateChangeRequest, struct RakNetServerLocator::AnnounceServerData, struct PortPair); /** - * @symbol ?_getHostGuid\@RakNetServerLocator\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@H\@Z + * @symbol ?_getHostGuid\@RakNetServerLocator\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@H\@Z */ MCAPI std::string _getHostGuid(std::string const &, int); /** - * @symbol ?_getServerOriginalAddress\@RakNetServerLocator\@\@AEAAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?_getServerOriginalAddress\@RakNetServerLocator\@\@AEAAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI void _getServerOriginalAddress(std::string &, std::string const &); /** - * @symbol ?_handleUnconnectedPong\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUPacket\@RakNet\@\@_N_K\@Z + * @symbol ?_handleUnconnectedPong\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBUPacket\@RakNet\@\@_N_K\@Z */ MCAPI bool _handleUnconnectedPong(std::string const &, struct RakNet::Packet const *, bool, unsigned __int64); /** - * @symbol ?_initializeBroadcastAddresses\@RakNetServerLocator\@\@AEAAXXZ + * @symbol ?_initializeBroadcastAddresses\@RakNetServerLocator\@\@AEAAXXZ */ MCAPI void _initializeBroadcastAddresses(); /** - * @symbol ?_onPongReceive\@RakNetServerLocator\@\@AEAA_NAEAMAEBURakNetGUID\@RakNet\@\@AEBIH\@Z + * @symbol ?_onPongReceive\@RakNetServerLocator\@\@AEAA_NAEAMAEBURakNetGUID\@RakNet\@\@AEBIH\@Z */ MCAPI bool _onPongReceive(float &, struct RakNet::RakNetGUID const &, unsigned int const &, int); /** - * @symbol ?_pingServerV4\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?_pingServerV4\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI bool _pingServerV4(std::string const &, int); /** - * @symbol ?_pingServerV6\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?_pingServerV6\@RakNetServerLocator\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI bool _pingServerV6(std::string const &, int); /** - * @symbol ?_setPingResponder\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z + * @symbol ?_setPingResponder\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z */ MCAPI void _setPingResponder(struct RakNetServerLocator::AnnounceServerData const &); /** - * @symbol ?_startAnnouncingServer\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z + * @symbol ?_startAnnouncingServer\@RakNetServerLocator\@\@AEAAXAEBUAnnounceServerData\@1\@\@Z */ MCAPI void _startAnnouncingServer(struct RakNetServerLocator::AnnounceServerData const &); /** - * @symbol ?_startServerDiscovery\@RakNetServerLocator\@\@AEAAXAEBUPortPair\@\@\@Z + * @symbol ?_startServerDiscovery\@RakNetServerLocator\@\@AEAAXAEBUPortPair\@\@\@Z */ MCAPI void _startServerDiscovery(struct PortPair const &); /** - * @symbol ?_stopAnnouncingServer\@RakNetServerLocator\@\@AEAAXXZ + * @symbol ?_stopAnnouncingServer\@RakNetServerLocator\@\@AEAAXXZ */ MCAPI void _stopAnnouncingServer(); /** - * @symbol ?_stopServerDiscovery\@RakNetServerLocator\@\@AEAAXXZ + * @symbol ?_stopServerDiscovery\@RakNetServerLocator\@\@AEAAXXZ */ MCAPI void _stopServerDiscovery(); /** - * @symbol ?_updateNetwork\@RakNetServerLocator\@\@AEAAXXZ + * @symbol ?_updateNetwork\@RakNetServerLocator\@\@AEAAXXZ */ MCAPI void _updateNetwork(); /** - * @symbol ?_updateQueuedPings\@RakNetServerLocator\@\@AEAA_NXZ + * @symbol ?_updateQueuedPings\@RakNetServerLocator\@\@AEAA_NXZ */ MCAPI bool _updateQueuedPings(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakPeerHelper.hpp b/LiteLoader/include/llapi/mc/RakPeerHelper.hpp index d1d61f750d..0490757d87 100644 --- a/LiteLoader/include/llapi/mc/RakPeerHelper.hpp +++ b/LiteLoader/include/llapi/mc/RakPeerHelper.hpp @@ -33,60 +33,60 @@ class RakPeerHelper { public: /** - * @symbol ??0RakPeerHelper\@\@QEAA\@AEAVIPSupportInterface\@0\@\@Z + * @symbol ??0RakPeerHelper\@\@QEAA\@AEAVIPSupportInterface\@0\@\@Z */ MCAPI RakPeerHelper(class RakPeerHelper::IPSupportInterface &); /** - * @symbol ?getConnectionIndex\@RakPeerHelper\@\@QEBAHAEBVGameConnectionInfo\@Social\@\@\@Z + * @symbol ?getConnectionIndex\@RakPeerHelper\@\@QEBAHAEBVGameConnectionInfo\@Social\@\@\@Z */ MCAPI int getConnectionIndex(class Social::GameConnectionInfo const &) const; /** - * @symbol ?getIPv4BoundPort\@RakPeerHelper\@\@QEBAGXZ + * @symbol ?getIPv4BoundPort\@RakPeerHelper\@\@QEBAGXZ */ MCAPI unsigned short getIPv4BoundPort() const; /** - * @symbol ?getIPv4ConnectionIndex\@RakPeerHelper\@\@QEBAHXZ + * @symbol ?getIPv4ConnectionIndex\@RakPeerHelper\@\@QEBAHXZ */ MCAPI int getIPv4ConnectionIndex() const; /** - * @symbol ?getIPv6BoundPort\@RakPeerHelper\@\@QEBAGXZ + * @symbol ?getIPv6BoundPort\@RakPeerHelper\@\@QEBAGXZ */ MCAPI unsigned short getIPv6BoundPort() const; /** - * @symbol ?getIPv6ConnectionIndex\@RakPeerHelper\@\@QEBAHXZ + * @symbol ?getIPv6ConnectionIndex\@RakPeerHelper\@\@QEBAHXZ */ MCAPI int getIPv6ConnectionIndex() const; /** - * @symbol ?isIPv4Supported\@RakPeerHelper\@\@QEBA_NXZ + * @symbol ?isIPv4Supported\@RakPeerHelper\@\@QEBA_NXZ */ MCAPI bool isIPv4Supported() const; /** - * @symbol ?isIPv6Supported\@RakPeerHelper\@\@QEBA_NXZ + * @symbol ?isIPv6Supported\@RakPeerHelper\@\@QEBA_NXZ */ MCAPI bool isIPv6Supported() const; /** - * @symbol ?peerStartup\@RakPeerHelper\@\@QEAA?AW4StartupResult\@RakNet\@\@PEAVRakPeerInterface\@3\@AEBUConnectionDefinition\@\@W4PeerPurpose\@1\@\@Z + * @symbol ?peerStartup\@RakPeerHelper\@\@QEAA?AW4StartupResult\@RakNet\@\@PEAVRakPeerInterface\@3\@AEBUConnectionDefinition\@\@W4PeerPurpose\@1\@\@Z */ MCAPI enum class RakNet::StartupResult peerStartup(class RakNet::RakPeerInterface *, struct ConnectionDefinition const &, enum class RakPeerHelper::PeerPurpose); /** - * @symbol ?reset\@RakPeerHelper\@\@QEAAXXZ + * @symbol ?reset\@RakPeerHelper\@\@QEAAXXZ */ MCAPI void reset(); //private: /** - * @symbol ?LogIPSupport\@RakPeerHelper\@\@AEAAXW4PeerPurpose\@1\@\@Z + * @symbol ?LogIPSupport\@RakPeerHelper\@\@AEAAXW4PeerPurpose\@1\@\@Z */ MCAPI void LogIPSupport(enum class RakPeerHelper::PeerPurpose); /** - * @symbol ?_resetToIPv6Only\@RakPeerHelper\@\@AEAAXV?$span\@USocketDescriptor\@RakNet\@\@$01\@gsl\@\@AEAH\@Z + * @symbol ?_resetToIPv6Only\@RakPeerHelper\@\@AEAAXV?$span\@USocketDescriptor\@RakNet\@\@$01\@gsl\@\@AEAH\@Z */ MCAPI void _resetToIPv6Only(class gsl::span, int &); /** - * @symbol ?_startupInternal\@RakPeerHelper\@\@AEAA?AW4StartupResult\@RakNet\@\@V?$not_null\@PEAVRakPeerInterface\@RakNet\@\@\@gsl\@\@AEBUConnectionDefinition\@\@PEAUSocketDescriptor\@3\@AEAHH\@Z + * @symbol ?_startupInternal\@RakPeerHelper\@\@AEAA?AW4StartupResult\@RakNet\@\@V?$not_null\@PEAVRakPeerInterface\@RakNet\@\@\@gsl\@\@AEBUConnectionDefinition\@\@PEAUSocketDescriptor\@3\@AEAHH\@Z */ MCAPI enum class RakNet::StartupResult _startupInternal(class gsl::not_null, struct ConnectionDefinition const &, struct RakNet::SocketDescriptor *, int &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakTcpProxy.hpp b/LiteLoader/include/llapi/mc/RakTcpProxy.hpp index f46aac6ee9..28f1c9d95f 100644 --- a/LiteLoader/include/llapi/mc/RakTcpProxy.hpp +++ b/LiteLoader/include/llapi/mc/RakTcpProxy.hpp @@ -30,63 +30,63 @@ class RakTcpProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RakTcpProxy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?start\@RakTcpProxy\@\@UEAA_NGGG\@Z + * @vftbl 1 + * @symbol ?start\@RakTcpProxy\@\@UEAA_NGGG\@Z */ virtual bool start(unsigned short, unsigned short, unsigned short); /** - * @vftbl 2 - * @symbol ?connect\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @vftbl 2 + * @symbol ?connect\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ virtual struct RakNet::SystemAddress connect(std::string const &, unsigned short); /** - * @vftbl 3 - * @symbol ?send\@RakTcpProxy\@\@UEAAXPEBDIUSystemAddress\@RakNet\@\@\@Z + * @vftbl 3 + * @symbol ?send\@RakTcpProxy\@\@UEAAXPEBDIUSystemAddress\@RakNet\@\@\@Z */ virtual void send(char const *, unsigned int, struct RakNet::SystemAddress); /** - * @vftbl 4 - * @symbol ?close\@RakTcpProxy\@\@UEAAXUSystemAddress\@RakNet\@\@\@Z + * @vftbl 4 + * @symbol ?close\@RakTcpProxy\@\@UEAAXUSystemAddress\@RakNet\@\@\@Z */ virtual void close(struct RakNet::SystemAddress); /** - * @vftbl 5 - * @symbol ?packetsAvailable\@RakTcpProxy\@\@UEAA_NXZ + * @vftbl 5 + * @symbol ?packetsAvailable\@RakTcpProxy\@\@UEAA_NXZ */ virtual bool packetsAvailable(); /** - * @vftbl 6 - * @symbol ?nextPacket\@RakTcpProxy\@\@UEAAPEAUPacket\@RakNet\@\@XZ + * @vftbl 6 + * @symbol ?nextPacket\@RakTcpProxy\@\@UEAAPEAUPacket\@RakNet\@\@XZ */ virtual struct RakNet::Packet * nextPacket(); /** - * @vftbl 7 - * @symbol ?deallocatePacket\@RakTcpProxy\@\@UEAAXPEAUPacket\@RakNet\@\@\@Z + * @vftbl 7 + * @symbol ?deallocatePacket\@RakTcpProxy\@\@UEAAXPEAUPacket\@RakNet\@\@\@Z */ virtual void deallocatePacket(struct RakNet::Packet *); /** - * @vftbl 8 - * @symbol ?nextCompletedConnectionAttempt\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ + * @vftbl 8 + * @symbol ?nextCompletedConnectionAttempt\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ */ virtual struct RakNet::SystemAddress nextCompletedConnectionAttempt(); /** - * @vftbl 9 - * @symbol ?nextFailedConnectionAttempt\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ + * @vftbl 9 + * @symbol ?nextFailedConnectionAttempt\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ */ virtual struct RakNet::SystemAddress nextFailedConnectionAttempt(); /** - * @vftbl 10 - * @symbol ?nextLostConnection\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ + * @vftbl 10 + * @symbol ?nextLostConnection\@RakTcpProxy\@\@UEAA?AUSystemAddress\@RakNet\@\@XZ */ virtual struct RakNet::SystemAddress nextLostConnection(); /** - * @symbol ??0RakTcpProxy\@\@QEAA\@XZ + * @symbol ??0RakTcpProxy\@\@QEAA\@XZ */ MCAPI RakTcpProxy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakWebSocket.hpp b/LiteLoader/include/llapi/mc/RakWebSocket.hpp index 923e7e8a02..2c277a029c 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocket.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocket.hpp @@ -31,154 +31,160 @@ class RakWebSocket { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RakWebSocket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?connect\@RakWebSocket\@\@UEAA?AW4WSConnectionResult\@\@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\@\@4\@\@Z + * @vftbl 1 + * @symbol ?connect\@RakWebSocket\@\@UEAA?AW4WSConnectionResult\@\@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\@\@4\@\@Z */ virtual enum class WSConnectionResult connect(std::string const &, std::vector const &); /** - * @vftbl 2 - * @symbol ?connect\@RakWebSocket\@\@UEAA?AW4WSConnectionResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?connect\@RakWebSocket\@\@UEAA?AW4WSConnectionResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual enum class WSConnectionResult connect(std::string const &); /** - * @vftbl 3 - * @symbol ?isReady\@RakWebSocket\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?isReady\@RakWebSocket\@\@UEBA_NXZ */ virtual bool isReady() const; /** - * @vftbl 4 - * @symbol ?setOnMessageReceivedHandler\@RakWebSocket\@\@UEAAXAEBV?$function\@$$A6AXAEBVRakWebSocketDataFrame\@\@\@Z\@std\@\@\@Z + * @vftbl 4 + * @symbol ?setOnMessageReceivedHandler\@RakWebSocket\@\@UEAAXAEBV?$function\@$$A6AXAEBVRakWebSocketDataFrame\@\@\@Z\@std\@\@\@Z */ virtual void setOnMessageReceivedHandler(class std::function const &); /** - * @vftbl 5 - * @symbol ?setOnCloseHandler\@RakWebSocket\@\@UEAAXAEBV?$function\@$$A6AXW4CloseStatusCode\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @vftbl 5 + * @symbol ?setOnCloseHandler\@RakWebSocket\@\@UEAAXAEBV?$function\@$$A6AXW4CloseStatusCode\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ virtual void setOnCloseHandler(class std::function const &); /** - * @vftbl 6 - * @symbol ?setOnConnectedHandler\@RakWebSocket\@\@UEAAXAEBV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z + * @vftbl 6 + * @symbol ?setOnConnectedHandler\@RakWebSocket\@\@UEAAXAEBV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z\@std\@\@\@Z */ virtual void setOnConnectedHandler(class std::function const &); /** - * @vftbl 7 - * @symbol ?tick\@RakWebSocket\@\@UEAAXXZ + * @vftbl 7 + * @symbol ?tick\@RakWebSocket\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 8 - * @symbol ?_updateState\@RakWebSocketClient\@\@MEAAXXZ + * @vftbl 8 + * @symbol ?_updateState\@RakWebSocketClient\@\@MEAAXXZ */ virtual void _updateState() = 0; /** - * @vftbl 9 - * @symbol ?_genMaskingKey\@RakWebSocketClient\@\@MEBAIXZ + * @vftbl 9 + * @symbol ?_genMaskingKey\@RakWebSocketClient\@\@MEBAIXZ */ virtual unsigned int _genMaskingKey() const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKWEBSOCKET /** - * @symbol ??0RakWebSocket\@\@QEAA\@V?$unique_ptr\@VTcpProxy\@\@U?$default_delete\@VTcpProxy\@\@\@std\@\@\@std\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RakWebSocket(); +#endif + /** + * @symbol ??0RakWebSocket\@\@QEAA\@V?$unique_ptr\@VTcpProxy\@\@U?$default_delete\@VTcpProxy\@\@\@std\@\@\@std\@\@_N\@Z */ MCAPI RakWebSocket(std::unique_ptr, bool); /** - * @symbol ?close\@RakWebSocket\@\@QEAAX_N0\@Z + * @symbol ?close\@RakWebSocket\@\@QEAAX_N0\@Z */ MCAPI void close(bool, bool); /** - * @symbol ?getUri\@RakWebSocket\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getUri\@RakWebSocket\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getUri() const; /** - * @symbol ?isDisconnected\@RakWebSocket\@\@QEBA_NXZ + * @symbol ?isDisconnected\@RakWebSocket\@\@QEBA_NXZ */ MCAPI bool isDisconnected() const; /** - * @symbol ?send\@RakWebSocket\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?send\@RakWebSocket\@\@QEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool send(std::string const &); /** - * @symbol ?sendBinary\@RakWebSocket\@\@QEAA_NPEBE_K\@Z + * @symbol ?sendBinary\@RakWebSocket\@\@QEAA_NPEBE_K\@Z */ MCAPI bool sendBinary(unsigned char const *, unsigned __int64); //protected: /** - * @symbol ?_close\@RakWebSocket\@\@IEAAXW4CloseStatusCode\@\@\@Z + * @symbol ?_close\@RakWebSocket\@\@IEAAXW4CloseStatusCode\@\@\@Z */ MCAPI void _close(enum class CloseStatusCode); /** - * @symbol ?_createWebSocketKey\@RakWebSocket\@\@IEAAXXZ + * @symbol ?_createWebSocketKey\@RakWebSocket\@\@IEAAXXZ */ MCAPI void _createWebSocketKey(); /** - * @symbol ?_fail\@RakWebSocket\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CloseStatusCode\@\@\@Z + * @symbol ?_fail\@RakWebSocket\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CloseStatusCode\@\@\@Z */ MCAPI void _fail(std::string const &, enum class CloseStatusCode); /** - * @symbol ?_generateBase64SHA1Key\@RakWebSocket\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?_generateBase64SHA1Key\@RakWebSocket\@\@IEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string _generateBase64SHA1Key(std::string const &); /** - * @symbol ?_invokeOnCloseHandler\@RakWebSocket\@\@IEAAXXZ + * @symbol ?_invokeOnCloseHandler\@RakWebSocket\@\@IEAAXXZ */ MCAPI void _invokeOnCloseHandler(); /** - * @symbol ?_processClosingFrames\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z + * @symbol ?_processClosingFrames\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z */ MCAPI void _processClosingFrames(class RakNet::BitStream &); /** - * @symbol ?_processClosingHandshake\@RakWebSocket\@\@IEAAX_N\@Z + * @symbol ?_processClosingHandshake\@RakWebSocket\@\@IEAAX_N\@Z */ MCAPI void _processClosingHandshake(bool); /** - * @symbol ?_processDataFrames\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z + * @symbol ?_processDataFrames\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z */ MCAPI void _processDataFrames(class RakNet::BitStream &); /** - * @symbol ?_processOpenHandshakePackets\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z + * @symbol ?_processOpenHandshakePackets\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z */ MCAPI void _processOpenHandshakePackets(class RakNet::BitStream &); /** - * @symbol ?_processPacket\@RakWebSocket\@\@IEAA_NAEBV?$function\@$$A6AXAEAVBitStream\@RakNet\@\@\@Z\@std\@\@_N\@Z + * @symbol ?_processPacket\@RakWebSocket\@\@IEAA_NAEBV?$function\@$$A6AXAEAVBitStream\@RakNet\@\@\@Z\@std\@\@_N\@Z */ MCAPI bool _processPacket(class std::function const &, bool); /** - * @symbol ?_reset\@RakWebSocket\@\@IEAAXXZ + * @symbol ?_reset\@RakWebSocket\@\@IEAAXXZ */ MCAPI void _reset(); /** - * @symbol ?_sendControlFrame\@RakWebSocket\@\@IEAA_NPEBE_KW4OpCode\@\@\@Z + * @symbol ?_sendControlFrame\@RakWebSocket\@\@IEAA_NPEBE_KW4OpCode\@\@\@Z */ MCAPI bool _sendControlFrame(unsigned char const *, unsigned __int64, enum class OpCode); /** - * @symbol ?_sendDataFrame\@RakWebSocket\@\@IEAA_NPEBEIW4OpCode\@\@_N\@Z + * @symbol ?_sendDataFrame\@RakWebSocket\@\@IEAA_NPEBEIW4OpCode\@\@_N\@Z */ MCAPI bool _sendDataFrame(unsigned char const *, unsigned int, enum class OpCode, bool); /** - * @symbol ?_sendNonControlFrame\@RakWebSocket\@\@IEAA_NPEBE_KW4OpCode\@\@\@Z + * @symbol ?_sendNonControlFrame\@RakWebSocket\@\@IEAA_NPEBE_KW4OpCode\@\@\@Z */ MCAPI bool _sendNonControlFrame(unsigned char const *, unsigned __int64, enum class OpCode); /** - * @symbol ?_splitWebSocketURI\@RakWebSocket\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@11\@Z + * @symbol ?_splitWebSocketURI\@RakWebSocket\@\@IEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@11\@Z */ MCAPI void _splitWebSocketURI(std::string const &, std::string &, std::string &, std::string &); /** - * @symbol ?_subProcessHttpResponse\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z + * @symbol ?_subProcessHttpResponse\@RakWebSocket\@\@IEAAXAEAVBitStream\@RakNet\@\@\@Z */ MCAPI void _subProcessHttpResponse(class RakNet::BitStream &); /** - * @symbol ?_validateFields\@RakWebSocket\@\@IEAAXXZ + * @symbol ?_validateFields\@RakWebSocket\@\@IEAAXXZ */ MCAPI void _validateFields(); /** - * @symbol ?_validateWebSocketURI\@RakWebSocket\@\@IEAA_NXZ + * @symbol ?_validateWebSocketURI\@RakWebSocket\@\@IEAA_NXZ */ MCAPI bool _validateWebSocketURI(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakWebSocketClient.hpp b/LiteLoader/include/llapi/mc/RakWebSocketClient.hpp index 6daa80a89f..afb0798d8d 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocketClient.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketClient.hpp @@ -31,23 +31,29 @@ class RakWebSocketClient : public RakWebSocket { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RakWebSocketClient(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?_updateState\@RakWebSocketClient\@\@MEAAXXZ + * @vftbl 8 + * @symbol ?_updateState\@RakWebSocketClient\@\@MEAAXXZ */ virtual void _updateState(); /** - * @vftbl 9 - * @symbol ?_genMaskingKey\@RakWebSocketClient\@\@MEBAIXZ + * @vftbl 9 + * @symbol ?_genMaskingKey\@RakWebSocketClient\@\@MEBAIXZ */ virtual unsigned int _genMaskingKey() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RAKWEBSOCKETCLIENT /** - * @symbol ??0RakWebSocketClient\@\@QEAA\@V?$unique_ptr\@VTcpProxy\@\@U?$default_delete\@VTcpProxy\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RakWebSocketClient(); +#endif + /** + * @symbol ??0RakWebSocketClient\@\@QEAA\@V?$unique_ptr\@VTcpProxy\@\@U?$default_delete\@VTcpProxy\@\@\@std\@\@\@std\@\@\@Z */ MCAPI RakWebSocketClient(std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp index a4b472dbea..1637fbe794 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrame.hpp @@ -30,64 +30,64 @@ class RakWebSocketDataFrame { public: /** - * @symbol ??0RakWebSocketDataFrame\@\@QEAA\@XZ + * @symbol ??0RakWebSocketDataFrame\@\@QEAA\@XZ */ MCAPI RakWebSocketDataFrame(); /** - * @symbol ?getCloseCode\@RakWebSocketDataFrame\@\@QEBA?AW4CloseStatusCode\@\@XZ + * @symbol ?getCloseCode\@RakWebSocketDataFrame\@\@QEBA?AW4CloseStatusCode\@\@XZ */ MCAPI enum class CloseStatusCode getCloseCode() const; /** - * @symbol ?getHeader\@RakWebSocketDataFrame\@\@QEBAAEBURakWebSocketDataFrameHeader\@\@XZ + * @symbol ?getHeader\@RakWebSocketDataFrame\@\@QEBAAEBURakWebSocketDataFrameHeader\@\@XZ */ MCAPI struct RakWebSocketDataFrameHeader const & getHeader() const; /** - * @symbol ?getMessageType\@RakWebSocketDataFrame\@\@QEBA?AW4WebSocketMessageType\@\@XZ + * @symbol ?getMessageType\@RakWebSocketDataFrame\@\@QEBA?AW4WebSocketMessageType\@\@XZ */ MCAPI enum class WebSocketMessageType getMessageType() const; /** - * @symbol ?getParseState\@RakWebSocketDataFrame\@\@QEBA?AW4ParseState\@1\@XZ + * @symbol ?getParseState\@RakWebSocketDataFrame\@\@QEBA?AW4ParseState\@1\@XZ */ MCAPI enum class RakWebSocketDataFrame::ParseState getParseState() const; /** - * @symbol ?getPayload\@RakWebSocketDataFrame\@\@QEBAAEBVBitStream\@RakNet\@\@XZ + * @symbol ?getPayload\@RakWebSocketDataFrame\@\@QEBAAEBVBitStream\@RakNet\@\@XZ */ MCAPI class RakNet::BitStream const & getPayload() const; /** - * @symbol ?getPayloadAsString\@RakWebSocketDataFrame\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPayloadAsString\@RakWebSocketDataFrame\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPayloadAsString() const; /** - * @symbol ??1RakWebSocketDataFrame\@\@QEAA\@XZ + * @symbol ??1RakWebSocketDataFrame\@\@QEAA\@XZ */ MCAPI ~RakWebSocketDataFrame(); /** - * @symbol ?writeFrameToStream\@RakWebSocketDataFrame\@\@SAXAEAVBitStream\@RakNet\@\@PEBEIW4OpCode\@\@_NI\@Z + * @symbol ?writeFrameToStream\@RakWebSocketDataFrame\@\@SAXAEAVBitStream\@RakNet\@\@PEBEIW4OpCode\@\@_NI\@Z */ MCAPI static void writeFrameToStream(class RakNet::BitStream &, unsigned char const *, unsigned int, enum class OpCode, bool, unsigned int); //private: /** - * @symbol ?_isContinuation\@RakWebSocketDataFrame\@\@CA_NE\@Z + * @symbol ?_isContinuation\@RakWebSocketDataFrame\@\@CA_NE\@Z */ MCAPI static bool _isContinuation(unsigned char); /** - * @symbol ?_isControl\@RakWebSocketDataFrame\@\@CA_NE\@Z + * @symbol ?_isControl\@RakWebSocketDataFrame\@\@CA_NE\@Z */ MCAPI static bool _isControl(unsigned char); /** - * @symbol ?_isNonControl\@RakWebSocketDataFrame\@\@CA_NE\@Z + * @symbol ?_isNonControl\@RakWebSocketDataFrame\@\@CA_NE\@Z */ MCAPI static bool _isNonControl(unsigned char); /** - * @symbol ?_isUnsupported\@RakWebSocketDataFrame\@\@CA_NE\@Z + * @symbol ?_isUnsupported\@RakWebSocketDataFrame\@\@CA_NE\@Z */ MCAPI static bool _isUnsupported(unsigned char); /** - * @symbol ?_maskUnmaskData\@RakWebSocketDataFrame\@\@CAXPEAEIII\@Z + * @symbol ?_maskUnmaskData\@RakWebSocketDataFrame\@\@CAXPEAEIII\@Z */ MCAPI static void _maskUnmaskData(unsigned char *, unsigned int, unsigned int, unsigned int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp index d35f8bbf98..12b03a49ad 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameHeader.hpp @@ -27,43 +27,43 @@ struct RakWebSocketDataFrameHeader { public: /** - * @symbol ??0RakWebSocketDataFrameHeader\@\@QEAA\@_N0000W4OpCode\@\@E\@Z + * @symbol ??0RakWebSocketDataFrameHeader\@\@QEAA\@_N0000W4OpCode\@\@E\@Z */ MCAPI RakWebSocketDataFrameHeader(bool, bool, bool, bool, bool, enum class OpCode, unsigned char); /** - * @symbol ??0RakWebSocketDataFrameHeader\@\@QEAA\@XZ + * @symbol ??0RakWebSocketDataFrameHeader\@\@QEAA\@XZ */ MCAPI RakWebSocketDataFrameHeader(); /** - * @symbol ?getFinBit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ + * @symbol ?getFinBit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ */ MCAPI int getFinBit() const; /** - * @symbol ?getMaskBit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ + * @symbol ?getMaskBit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ */ MCAPI int getMaskBit() const; /** - * @symbol ?getOpCode\@RakWebSocketDataFrameHeader\@\@QEBA?AW4OpCode\@\@XZ + * @symbol ?getOpCode\@RakWebSocketDataFrameHeader\@\@QEBA?AW4OpCode\@\@XZ */ MCAPI enum class OpCode getOpCode() const; /** - * @symbol ?getPayloadLength\@RakWebSocketDataFrameHeader\@\@QEBAEXZ + * @symbol ?getPayloadLength\@RakWebSocketDataFrameHeader\@\@QEBAEXZ */ MCAPI unsigned char getPayloadLength() const; /** - * @symbol ?getRSV1Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ + * @symbol ?getRSV1Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ */ MCAPI int getRSV1Bit() const; /** - * @symbol ?getRSV2Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ + * @symbol ?getRSV2Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ */ MCAPI int getRSV2Bit() const; /** - * @symbol ?getRSV3Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ + * @symbol ?getRSV3Bit\@RakWebSocketDataFrameHeader\@\@QEBAHXZ */ MCAPI int getRSV3Bit() const; /** - * @symbol ??1RakWebSocketDataFrameHeader\@\@QEAA\@XZ + * @symbol ??1RakWebSocketDataFrameHeader\@\@QEAA\@XZ */ MCAPI ~RakWebSocketDataFrameHeader(); diff --git a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp index b52034851e..42193185dc 100644 --- a/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp +++ b/LiteLoader/include/llapi/mc/RakWebSocketDataFrameParser.hpp @@ -31,28 +31,28 @@ class RakWebSocketDataFrameParser { public: /** - * @symbol ??0RakWebSocketDataFrameParser\@\@QEAA\@_N\@Z + * @symbol ??0RakWebSocketDataFrameParser\@\@QEAA\@_N\@Z */ MCAPI RakWebSocketDataFrameParser(bool); /** - * @symbol ?readFrame\@RakWebSocketDataFrameParser\@\@QEAA?AV?$shared_ptr\@VRakWebSocketDataFrame\@\@\@std\@\@AEAVBitStream\@RakNet\@\@\@Z + * @symbol ?readFrame\@RakWebSocketDataFrameParser\@\@QEAA?AV?$shared_ptr\@VRakWebSocketDataFrame\@\@\@std\@\@AEAVBitStream\@RakNet\@\@\@Z */ MCAPI class std::shared_ptr readFrame(class RakNet::BitStream &); /** - * @symbol ?setOnFailHandler\@RakWebSocketDataFrameParser\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CloseStatusCode\@\@\@Z\@std\@\@\@Z + * @symbol ?setOnFailHandler\@RakWebSocketDataFrameParser\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4CloseStatusCode\@\@\@Z\@std\@\@\@Z */ MCAPI void setOnFailHandler(class std::function); /** - * @symbol ??1RakWebSocketDataFrameParser\@\@QEAA\@XZ + * @symbol ??1RakWebSocketDataFrameParser\@\@QEAA\@XZ */ MCAPI ~RakWebSocketDataFrameParser(); //private: /** - * @symbol ?_failReadFrame\@RakWebSocketDataFrameParser\@\@AEAA?AV?$shared_ptr\@VRakWebSocketDataFrame\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4CloseStatusCode\@\@\@Z + * @symbol ?_failReadFrame\@RakWebSocketDataFrameParser\@\@AEAA?AV?$shared_ptr\@VRakWebSocketDataFrame\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4CloseStatusCode\@\@\@Z */ MCAPI class std::shared_ptr _failReadFrame(std::string const &, enum class CloseStatusCode); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RamAttackGoal.hpp b/LiteLoader/include/llapi/mc/RamAttackGoal.hpp index c23ec8780c..f997bd5328 100644 --- a/LiteLoader/include/llapi/mc/RamAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/RamAttackGoal.hpp @@ -30,75 +30,75 @@ class RamAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RamAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RamAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RamAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RamAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RamAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RamAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RamAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RamAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RamAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RamAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RamAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RamAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RamAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RamAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0RamAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI RamAttackGoal(class Mob &); //protected: /** - * @symbol ?_initiateRamAttack\@RamAttackGoal\@\@IEAA_NXZ + * @symbol ?_initiateRamAttack\@RamAttackGoal\@\@IEAA_NXZ */ MCAPI bool _initiateRamAttack(); //private: /** - * @symbol ?_hasChargePath\@RamAttackGoal\@\@AEAA_NXZ + * @symbol ?_hasChargePath\@RamAttackGoal\@\@AEAA_NXZ */ MCAPI bool _hasChargePath(); /** - * @symbol ?_pathablePos\@RamAttackGoal\@\@AEAA_NAEBVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_pathablePos\@RamAttackGoal\@\@AEAA_NAEBVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI bool _pathablePos(class BlockSource const &, class BlockPos); /** - * @symbol ?_resetCooldown\@RamAttackGoal\@\@AEAAXXZ + * @symbol ?_resetCooldown\@RamAttackGoal\@\@AEAAXXZ */ MCAPI void _resetCooldown(); /** - * @symbol ?_tryKnockbackTarget\@RamAttackGoal\@\@AEAAXXZ + * @symbol ?_tryKnockbackTarget\@RamAttackGoal\@\@AEAAXXZ */ MCAPI void _tryKnockbackTarget(); /** - * @symbol ?_verifyTargetStillInPositionAndPrepareForRamAttack\@RamAttackGoal\@\@AEAA_NXZ + * @symbol ?_verifyTargetStillInPositionAndPrepareForRamAttack\@RamAttackGoal\@\@AEAA_NXZ */ MCAPI bool _verifyTargetStillInPositionAndPrepareForRamAttack(); @@ -106,4 +106,4 @@ class RamAttackGoal { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Random.hpp b/LiteLoader/include/llapi/mc/Random.hpp index 6fbe7a6637..9d0c2e0c67 100644 --- a/LiteLoader/include/llapi/mc/Random.hpp +++ b/LiteLoader/include/llapi/mc/Random.hpp @@ -31,76 +31,76 @@ class Random { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANDOM /** - * @symbol ?consumeCount\@Random\@\@UEAAXI\@Z + * @symbol ?consumeCount\@Random\@\@UEAAXI\@Z */ MCVAPI void consumeCount(unsigned int); /** - * @symbol ?fork\@Random\@\@UEAA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@XZ + * @symbol ?fork\@Random\@\@UEAA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr fork(); /** - * @symbol ?nextBoolean\@Random\@\@UEAA_NXZ + * @symbol ?nextBoolean\@Random\@\@UEAA_NXZ */ MCVAPI bool nextBoolean(); /** - * @symbol ?nextDouble\@Random\@\@UEAANXZ + * @symbol ?nextDouble\@Random\@\@UEAANXZ */ MCVAPI double nextDouble(); /** - * @symbol ?nextFloat\@Random\@\@UEAAMXZ + * @symbol ?nextFloat\@Random\@\@UEAAMXZ */ MCVAPI float nextFloat(); /** - * @symbol ?nextGaussianDouble\@Random\@\@UEAANXZ + * @symbol ?nextGaussianDouble\@Random\@\@UEAANXZ */ MCVAPI double nextGaussianDouble(); /** - * @symbol ?nextInt\@Random\@\@UEAAHH\@Z + * @symbol ?nextInt\@Random\@\@UEAAHH\@Z */ MCVAPI int nextInt(int); /** - * @symbol ?nextInt\@Random\@\@UEAAHXZ + * @symbol ?nextInt\@Random\@\@UEAAHXZ */ MCVAPI int nextInt(); /** - * @symbol ?nextLong\@Random\@\@UEAA_JXZ + * @symbol ?nextLong\@Random\@\@UEAA_JXZ */ MCVAPI __int64 nextLong(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~Random(); #endif /** - * @symbol ??0Random\@\@QEAA\@XZ + * @symbol ??0Random\@\@QEAA\@XZ */ MCAPI Random(); /** - * @symbol ??0Random\@\@QEAA\@I_N\@Z + * @symbol ??0Random\@\@QEAA\@I_N\@Z */ MCAPI Random(unsigned int, bool); /** - * @symbol ?nextFloat\@Random\@\@QEAAMMM\@Z + * @symbol ?nextFloat\@Random\@\@QEAAMMM\@Z */ MCAPI float nextFloat(float, float); /** - * @symbol ?nextGaussianFloat\@Random\@\@QEAAMXZ + * @symbol ?nextGaussianFloat\@Random\@\@QEAAMXZ */ MCAPI float nextGaussianFloat(); /** - * @symbol ?nextGaussianInt\@Random\@\@QEAAHH\@Z + * @symbol ?nextGaussianInt\@Random\@\@QEAAHH\@Z */ MCAPI int nextGaussianInt(int); /** - * @symbol ?nextInt\@Random\@\@QEAAHHH\@Z + * @symbol ?nextInt\@Random\@\@QEAAHHH\@Z */ MCAPI int nextInt(int, int); /** - * @symbol ?nextIntInclusive\@Random\@\@QEAAHHH\@Z + * @symbol ?nextIntInclusive\@Random\@\@QEAAHHH\@Z */ MCAPI int nextIntInclusive(int, int); /** - * @symbol ?getThreadLocal\@Random\@\@SAAEAV1\@XZ + * @symbol ?getThreadLocal\@Random\@\@SAAEAV1\@XZ */ MCAPI static class Random & getThreadLocal(); @@ -108,8 +108,8 @@ class Random { private: /** - * @symbol ?mThreadLocalRandom\@Random\@\@0V?$ThreadLocalObject\@VRandom\@\@V?$allocator\@VRandom\@\@\@std\@\@\@Threading\@Bedrock\@\@A + * @symbol ?mThreadLocalRandom\@Random\@\@0V?$ThreadLocalObject\@VRandom\@\@V?$allocator\@VRandom\@\@\@std\@\@\@Threading\@Bedrock\@\@A */ MCAPI static class Bedrock::Threading::ThreadLocalObject> mThreadLocalRandom; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp b/LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp index 04af5c1697..cd363c44ab 100644 --- a/LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp +++ b/LiteLoader/include/llapi/mc/RandomBlockStateFunction.hpp @@ -32,39 +32,39 @@ class RandomBlockStateFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomBlockStateFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@RandomBlockStateFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@RandomBlockStateFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@RandomBlockStateFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@RandomBlockStateFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@RandomBlockStateFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@RandomBlockStateFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_remapComplexAliasBlock\@RandomBlockStateFunction\@\@AEAA?AW4RemapComplexAliasBlockResult\@1\@HAEAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_remapComplexAliasBlock\@RandomBlockStateFunction\@\@AEAA?AW4RemapComplexAliasBlockResult\@1\@HAEAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class RandomBlockStateFunction::RemapComplexAliasBlockResult _remapComplexAliasBlock(int, class Block const *&, std::string const &); /** - * @symbol ?_tryRemapComplexAliasBlock\@RandomBlockStateFunction\@\@AEAA?AW4RemapComplexAliasBlockResult\@1\@AEAVItemInstance\@\@HAEAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_tryRemapComplexAliasBlock\@RandomBlockStateFunction\@\@AEAA?AW4RemapComplexAliasBlockResult\@1\@AEAVItemStack\@\@HAEAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI enum class RandomBlockStateFunction::RemapComplexAliasBlockResult _tryRemapComplexAliasBlock(class ItemInstance &, int, class Block const *&, std::string const &); + MCAPI enum class RandomBlockStateFunction::RemapComplexAliasBlockResult _tryRemapComplexAliasBlock(class ItemStack &, int, class Block const *&, std::string const &); /** - * @symbol ?_tryRemapComplexAliasBlock\@RandomBlockStateFunction\@\@AEAA?AW4RemapComplexAliasBlockResult\@1\@AEAVItemStack\@\@HAEAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_tryRemapComplexAliasBlock\@RandomBlockStateFunction\@\@AEAA?AW4RemapComplexAliasBlockResult\@1\@AEAVItemInstance\@\@HAEAPEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI enum class RandomBlockStateFunction::RemapComplexAliasBlockResult _tryRemapComplexAliasBlock(class ItemStack &, int, class Block const *&, std::string const &); + MCAPI enum class RandomBlockStateFunction::RemapComplexAliasBlockResult _tryRemapComplexAliasBlock(class ItemInstance &, int, class Block const *&, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp b/LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp index e808fd3e0a..e83795ab9f 100644 --- a/LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomBreachingGoal.hpp @@ -31,58 +31,58 @@ class RandomBreachingGoal : public RandomStrollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomBreachingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomBreachingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomBreachingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomBreachingGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomBreachingGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@RandomBreachingGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@RandomBreachingGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@RandomBreachingGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RandomBreachingGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RandomBreachingGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RandomBreachingGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomBreachingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomBreachingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_setWantedPosition\@RandomBreachingGoal\@\@MEAA_NXZ + * @vftbl 10 + * @symbol ?_setWantedPosition\@RandomBreachingGoal\@\@MEAA_NXZ */ virtual bool _setWantedPosition(); /** - * @symbol ??0RandomBreachingGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z + * @symbol ??0RandomBreachingGoal\@\@QEAA\@AEAVMob\@\@MHHHM\@Z */ MCAPI RandomBreachingGoal(class Mob &, float, int, int, int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp b/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp index 0554110829..fd9cd27c2c 100644 --- a/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp +++ b/LiteLoader/include/llapi/mc/RandomDyeFunction.hpp @@ -32,39 +32,39 @@ class RandomDyeFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomDyeFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@RandomDyeFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@RandomDyeFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@RandomDyeFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_applyBase\@RandomDyeFunction\@\@AEBAXAEAVItemStackBase\@\@AEAVRandom\@\@\@Z + * @symbol ?_applyBase\@RandomDyeFunction\@\@AEBAXAEAVItemStackBase\@\@AEAVRandom\@\@\@Z */ MCAPI void _applyBase(class ItemStackBase &, class Random &) const; /** - * @symbol ?_getRandomArmorColor\@RandomDyeFunction\@\@AEBA?AVColor\@mce\@\@AEAVRandom\@\@\@Z + * @symbol ?_getRandomArmorColor\@RandomDyeFunction\@\@AEBA?AVColor\@mce\@\@AEAVRandom\@\@\@Z */ MCAPI class mce::Color _getRandomArmorColor(class Random &) const; /** - * @symbol ?_getRandomDyeColor\@RandomDyeFunction\@\@AEBA?AVColor\@mce\@\@AEAVRandom\@\@\@Z + * @symbol ?_getRandomDyeColor\@RandomDyeFunction\@\@AEBA?AVColor\@mce\@\@AEAVRandom\@\@\@Z */ MCAPI class mce::Color _getRandomDyeColor(class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp b/LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp index 97d568f52c..a713523c9d 100644 --- a/LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomFlyingGoal.hpp @@ -31,46 +31,46 @@ class RandomFlyingGoal : public RandomStrollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomFlyingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomFlyingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomFlyingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomFlyingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomFlyingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_setWantedPosition\@RandomFlyingGoal\@\@MEAA_NXZ + * @vftbl 10 + * @symbol ?_setWantedPosition\@RandomFlyingGoal\@\@MEAA_NXZ */ virtual bool _setWantedPosition(); /** - * @symbol ??0RandomFlyingGoal\@\@QEAA\@AEAVMob\@\@MHH_N\@Z + * @symbol ??0RandomFlyingGoal\@\@QEAA\@AEAVMob\@\@MHH_N\@Z */ MCAPI RandomFlyingGoal(class Mob &, float, int, int, bool); //private: /** - * @symbol ?_getTreePos\@RandomFlyingGoal\@\@AEBA_NAEAVVec3\@\@\@Z + * @symbol ?_getTreePos\@RandomFlyingGoal\@\@AEBA_NAEAVVec3\@\@\@Z */ MCAPI bool _getTreePos(class Vec3 &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp b/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp index 61901af90c..1a9183acab 100644 --- a/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomHoverGoal.hpp @@ -30,64 +30,64 @@ class RandomHoverGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomHoverGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomHoverGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomHoverGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomHoverGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomHoverGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RandomHoverGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RandomHoverGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@RandomHoverGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RandomHoverGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomHoverGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomHoverGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RandomHoverGoal\@\@QEAA\@AEAVMob\@\@MHMMMUIntRange\@\@\@Z + * @symbol ??0RandomHoverGoal\@\@QEAA\@AEAVMob\@\@MHMMMUIntRange\@\@\@Z */ MCAPI RandomHoverGoal(class Mob &, float, int, float, float, float, struct IntRange); //protected: /** - * @symbol ?_computeNewTarget\@RandomHoverGoal\@\@IEAA_NXZ + * @symbol ?_computeNewTarget\@RandomHoverGoal\@\@IEAA_NXZ */ MCAPI bool _computeNewTarget(); /** - * @symbol ?_mobMeetsPreconditions\@RandomHoverGoal\@\@IEBA_NXZ + * @symbol ?_mobMeetsPreconditions\@RandomHoverGoal\@\@IEBA_NXZ */ MCAPI bool _mobMeetsPreconditions() const; /** - * @symbol ?_moveToTarget\@RandomHoverGoal\@\@IEAAXXZ + * @symbol ?_moveToTarget\@RandomHoverGoal\@\@IEAAXXZ */ MCAPI void _moveToTarget(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp b/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp index 76127a5a9a..8084a51f2c 100644 --- a/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoal.hpp @@ -30,48 +30,48 @@ class RandomLookAroundAndSitGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomLookAroundAndSitGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomLookAroundAndSitGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomLookAroundAndSitGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomLookAroundAndSitGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomLookAroundAndSitGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RandomLookAroundAndSitGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RandomLookAroundAndSitGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RandomLookAroundAndSitGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RandomLookAroundAndSitGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RandomLookAroundAndSitGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RandomLookAroundAndSitGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomLookAroundAndSitGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomLookAroundAndSitGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RandomLookAroundAndSitGoal\@\@QEAA\@AEAVMob\@\@_NHHMMHHMH\@Z + * @symbol ??0RandomLookAroundAndSitGoal\@\@QEAA\@AEAVMob\@\@_NHHMMHHMH\@Z */ MCAPI RandomLookAroundAndSitGoal(class Mob &, bool, int, int, float, float, int, int, float, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoalUtil.hpp b/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoalUtil.hpp index 6fb1bc6c03..9ee3ba3153 100644 --- a/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoalUtil.hpp +++ b/LiteLoader/include/llapi/mc/RandomLookAroundAndSitGoalUtil.hpp @@ -17,7 +17,7 @@ namespace RandomLookAroundAndSitGoalUtil { #undef AFTER_EXTRA /** - * @symbol ?_isMobPulledByLeash\@RandomLookAroundAndSitGoalUtil\@\@YA_NAEBVMob\@\@\@Z + * @symbol ?_isMobPulledByLeash\@RandomLookAroundAndSitGoalUtil\@\@YA_NAEBVMob\@\@\@Z */ MCAPI bool _isMobPulledByLeash(class Mob const &); diff --git a/LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp b/LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp index e096ea518a..5e25601cbd 100644 --- a/LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomLookAroundGoal.hpp @@ -30,56 +30,56 @@ class RandomLookAroundGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomLookAroundGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomLookAroundGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomLookAroundGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomLookAroundGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomLookAroundGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RandomLookAroundGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RandomLookAroundGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@RandomLookAroundGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RandomLookAroundGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomLookAroundGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomLookAroundGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RandomLookAroundGoal\@\@QEAA\@AEAVMob\@\@HHMMM\@Z + * @symbol ??0RandomLookAroundGoal\@\@QEAA\@AEAVMob\@\@HHMMM\@Z */ MCAPI RandomLookAroundGoal(class Mob &, int, int, float, float, float); //protected: /** - * @symbol ?_setRandomLook\@RandomLookAroundGoal\@\@IEAAXXZ + * @symbol ?_setRandomLook\@RandomLookAroundGoal\@\@IEAAXXZ */ MCAPI void _setRandomLook(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomPos.hpp b/LiteLoader/include/llapi/mc/RandomPos.hpp index 09bd78ca71..31caa96e7b 100644 --- a/LiteLoader/include/llapi/mc/RandomPos.hpp +++ b/LiteLoader/include/llapi/mc/RandomPos.hpp @@ -30,56 +30,56 @@ class RandomPos { public: /** - * @symbol ?getPos\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHHW4SolidityCheckType\@\@\@Z + * @symbol ?getPos\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHHW4SolidityCheckType\@\@\@Z */ MCAPI static bool getPos(class Vec3 &, class Mob &, int, int, int, enum class SolidityCheckType); /** - * @symbol ?getPosAvoid\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@W4SolidityCheckType\@\@H\@Z + * @symbol ?getPosAvoid\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@W4SolidityCheckType\@\@H\@Z */ MCAPI static bool getPosAvoid(class Vec3 &, class Mob &, int, int, class Vec3 const &, enum class SolidityCheckType, int); /** - * @symbol ?getPosInDirection\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHH_N2PEAV2\@AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z + * @symbol ?getPosInDirection\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHH_N2PEAV2\@AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z */ MCAPI static bool getPosInDirection(class Vec3 &, class Mob &, int, int, int, bool, bool, class Vec3 *, struct IntRange const &, int, enum class SolidityCheckType); /** - * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVRandom\@\@AEAVVec3\@\@AEAVMob\@\@HHAEBV3\@\@Z + * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVRandom\@\@AEAVVec3\@\@AEAVMob\@\@HHAEBV3\@\@Z */ MCAPI static bool getPosTowards(class Random &, class Vec3 &, class Mob &, int, int, class Vec3 const &); /** - * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@\@Z + * @symbol ?getPosTowards\@RandomPos\@\@SA_NAEAVVec3\@\@AEAVMob\@\@HHAEBV2\@\@Z */ MCAPI static bool getPosTowards(class Vec3 &, class Mob &, int, int, class Vec3 const &); /** - * @symbol ?getSpawnPos\@RandomPos\@\@SA_NAEAVBlockSource\@\@AEAVRandom\@\@AEAVVec3\@\@HHH\@Z + * @symbol ?getSpawnPos\@RandomPos\@\@SA_NAEAVBlockSource\@\@AEAVRandom\@\@AEAVVec3\@\@HHH\@Z */ MCAPI static bool getSpawnPos(class BlockSource &, class Random &, class Vec3 &, int, int, int); //private: /** - * @symbol ?generateRandomPos\@RandomPos\@\@CA_NAEAVRandomize\@\@AEAVVec3\@\@AEAVMob\@\@HHHPEBV3\@_N4AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z - */ - MCAPI static bool generateRandomPos(class Randomize &, class Vec3 &, class Mob &, int, int, int, class Vec3 const *, bool, bool, struct IntRange const &, int, enum class SolidityCheckType); - /** - * @symbol ?generateRandomPos\@RandomPos\@\@CA_NAEAVVec3\@\@AEAVMob\@\@HHPEBV2\@_N3HW4SolidityCheckType\@\@\@Z + * @symbol ?generateRandomPos\@RandomPos\@\@CA_NAEAVVec3\@\@AEAVMob\@\@HHPEBV2\@_N3HW4SolidityCheckType\@\@\@Z */ MCAPI static bool generateRandomPos(class Vec3 &, class Mob &, int, int, class Vec3 const *, bool, bool, int, enum class SolidityCheckType); /** - * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@AEAVMob\@\@HAEBUIntRange\@\@W4SolidityCheckType\@\@\@Z + * @symbol ?generateRandomPos\@RandomPos\@\@CA_NAEAVRandomize\@\@AEAVVec3\@\@AEAVMob\@\@HHHPEBV3\@_N4AEBUIntRange\@\@HW4SolidityCheckType\@\@\@Z */ - MCAPI static bool snapToGround(class BlockPos &, class Mob &, int, struct IntRange const &, enum class SolidityCheckType); + MCAPI static bool generateRandomPos(class Randomize &, class Vec3 &, class Mob &, int, int, int, class Vec3 const *, bool, bool, struct IntRange const &, int, enum class SolidityCheckType); /** - * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z + * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z */ MCAPI static bool snapToGround(class BlockPos &, int, int, int, class std::function); /** - * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z + * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@AEAVMob\@\@HAEBUIntRange\@\@W4SolidityCheckType\@\@\@Z + */ + MCAPI static bool snapToGround(class BlockPos &, class Mob &, int, struct IntRange const &, enum class SolidityCheckType); + /** + * @symbol ?snapToGround\@RandomPos\@\@CA_NAEAVBlockPos\@\@HHV?$function\@$$A6A_NAEAVBlockPos\@\@\@Z\@std\@\@\@Z */ MCAPI static bool snapToGround(class BlockPos &, int, int, class std::function); /** - * @symbol ?spawnSnapToGround\@RandomPos\@\@CA_NAEAVBlockSource\@\@AEAVBlockPos\@\@MH\@Z + * @symbol ?spawnSnapToGround\@RandomPos\@\@CA_NAEAVBlockSource\@\@AEAVBlockPos\@\@MH\@Z */ MCAPI static bool spawnSnapToGround(class BlockSource &, class BlockPos &, float, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp b/LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp index 923e1a68bf..fafcd8225e 100644 --- a/LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp +++ b/LiteLoader/include/llapi/mc/RandomScatteredLargeFeature.hpp @@ -31,43 +31,43 @@ class RandomScatteredLargeFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomScatteredLargeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shouldAddHardcodedSpawnAreas\@RandomScatteredLargeFeature\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?shouldAddHardcodedSpawnAreas\@RandomScatteredLargeFeature\@\@UEBA_NXZ */ virtual bool shouldAddHardcodedSpawnAreas() const; /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@RandomScatteredLargeFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@RandomScatteredLargeFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@RandomScatteredLargeFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@RandomScatteredLargeFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 4 - * @symbol ?initMobSpawnTypes\@RandomScatteredLargeFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z + * @vftbl 4 + * @symbol ?initMobSpawnTypes\@RandomScatteredLargeFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z */ virtual void initMobSpawnTypes(class HardcodedSpawnAreaRegistry &); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@RandomScatteredLargeFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@RandomScatteredLargeFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@RandomScatteredLargeFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@RandomScatteredLargeFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0RandomScatteredLargeFeature\@\@QEAA\@I\@Z + * @symbol ??0RandomScatteredLargeFeature\@\@QEAA\@I\@Z */ MCAPI RandomScatteredLargeFeature(unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp b/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp new file mode 100644 index 0000000000..6d1211661a --- /dev/null +++ b/LiteLoader/include/llapi/mc/RandomSearchAndDigGoal.hpp @@ -0,0 +1,88 @@ +/** + * @file RandomSearchAndDigGoal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RandomSearchAndDigGoal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RANDOMSEARCHANDDIGGOAL +public: + class RandomSearchAndDigGoal& operator=(class RandomSearchAndDigGoal const &) = delete; + RandomSearchAndDigGoal(class RandomSearchAndDigGoal const &) = delete; + RandomSearchAndDigGoal() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?canUse\@RandomSearchAndDigGoal\@\@UEAA_NXZ + */ + virtual bool canUse(); + /** + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomSearchAndDigGoal\@\@UEAA_NXZ + */ + virtual bool canContinueToUse(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?start\@RandomSearchAndDigGoal\@\@UEAAXXZ + */ + virtual void start(); + /** + * @vftbl 5 + * @symbol ?stop\@RandomSearchAndDigGoal\@\@UEAAXXZ + */ + virtual void stop(); + /** + * @vftbl 6 + * @symbol ?tick\@RandomSearchAndDigGoal\@\@UEAAXXZ + */ + virtual void tick(); + /** + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomSearchAndDigGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + virtual void appendDebugInfo(std::string &) const; + /** + * @symbol ??0RandomSearchAndDigGoal\@\@QEAA\@AEAVMob\@\@\@Z + */ + MCAPI RandomSearchAndDigGoal(class Mob &); + /** + * @symbol ?_canUse\@RandomSearchAndDigGoal\@\@QEAA?AW4CanUseOutcome\@1\@XZ + */ + MCAPI enum class RandomSearchAndDigGoal::CanUseOutcome _canUse(); + +//private: + /** + * @symbol ?_triggerEvent\@RandomSearchAndDigGoal\@\@AEBAXAEBVActorDefinitionTrigger\@\@\@Z + */ + MCAPI void _triggerEvent(class ActorDefinitionTrigger const &) const; + /** + * @symbol ?_isValidTarget\@RandomSearchAndDigGoal\@\@CA_NAEBVBlockSource\@\@VBlockPos\@\@\@Z + */ + MCAPI static bool _isValidTarget(class BlockSource const &, class BlockPos); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/RandomSitGoal.hpp b/LiteLoader/include/llapi/mc/RandomSitGoal.hpp index 38503958f8..4eea09625a 100644 --- a/LiteLoader/include/llapi/mc/RandomSitGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomSitGoal.hpp @@ -30,48 +30,48 @@ class RandomSitGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomSitGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomSitGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomSitGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomSitGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomSitGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RandomSitGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RandomSitGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RandomSitGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RandomSitGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomSitGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomSitGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RandomSitGoal\@\@QEAA\@AEAVMob\@\@MMMM\@Z + * @symbol ??0RandomSitGoal\@\@QEAA\@AEAVMob\@\@MMMM\@Z */ MCAPI RandomSitGoal(class Mob &, float, float, float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomSpreadTreeCanopy.hpp b/LiteLoader/include/llapi/mc/RandomSpreadTreeCanopy.hpp index 5ce8ff13dc..7f0476d904 100644 --- a/LiteLoader/include/llapi/mc/RandomSpreadTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/RandomSpreadTreeCanopy.hpp @@ -30,18 +30,18 @@ class RandomSpreadTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomSpreadTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@RandomSpreadTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@RandomSpreadTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; /** - * @symbol ??0RandomSpreadTreeCanopy\@\@QEAA\@XZ + * @symbol ??0RandomSpreadTreeCanopy\@\@QEAA\@XZ */ MCAPI RandomSpreadTreeCanopy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomStrollGoal.hpp b/LiteLoader/include/llapi/mc/RandomStrollGoal.hpp index ea1f61f3f5..3702f99781 100644 --- a/LiteLoader/include/llapi/mc/RandomStrollGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomStrollGoal.hpp @@ -30,63 +30,69 @@ class RandomStrollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomStrollGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomStrollGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomStrollGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomStrollGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomStrollGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@RandomBreachingGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@RandomBreachingGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@RandomStrollGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RandomStrollGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RandomStrollGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RandomStrollGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RandomStrollGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RandomStrollGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomStrollGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomStrollGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_setWantedPosition\@RandomStrollGoal\@\@MEAA_NXZ + * @vftbl 10 + * @symbol ?_setWantedPosition\@RandomStrollGoal\@\@MEAA_NXZ */ virtual bool _setWantedPosition(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANDOMSTROLLGOAL /** - * @symbol ??0RandomStrollGoal\@\@QEAA\@AEAVMob\@\@MHHH\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RandomStrollGoal(); +#endif + /** + * @symbol ??0RandomStrollGoal\@\@QEAA\@AEAVMob\@\@MHHH\@Z */ MCAPI RandomStrollGoal(class Mob &, float, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp b/LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp index 983355c244..d8c01f28f7 100644 --- a/LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RandomSwimmingGoal.hpp @@ -31,51 +31,51 @@ class RandomSwimmingGoal : public RandomStrollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomSwimmingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RandomSwimmingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RandomSwimmingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RandomSwimmingGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RandomSwimmingGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RandomSwimmingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RandomSwimmingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_setWantedPosition\@RandomSwimmingGoal\@\@MEAA_NXZ + * @vftbl 10 + * @symbol ?_setWantedPosition\@RandomSwimmingGoal\@\@MEAA_NXZ */ virtual bool _setWantedPosition(); /** - * @symbol ??0RandomSwimmingGoal\@\@QEAA\@AEAVMob\@\@MHHH_N\@Z + * @symbol ??0RandomSwimmingGoal\@\@QEAA\@AEAVMob\@\@MHHH_N\@Z */ MCAPI RandomSwimmingGoal(class Mob &, float, int, int, int, bool); //protected: /** - * @symbol ?_getWaterHeights\@RandomSwimmingGoal\@\@IEAAXVBlockPos\@\@AEAFAEAM22\@Z + * @symbol ?_getWaterHeights\@RandomSwimmingGoal\@\@IEAAXVBlockPos\@\@AEAFAEAM22\@Z */ MCAPI void _getWaterHeights(class BlockPos, short &, float &, float &, float &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp b/LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp index c72a7cb21b..9a02c9d663 100644 --- a/LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp +++ b/LiteLoader/include/llapi/mc/RandomThreadCheckManager.hpp @@ -30,38 +30,38 @@ class RandomThreadCheckManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomThreadCheckManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?onAppResumed\@RandomThreadCheckManager\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?onAppResumed\@RandomThreadCheckManager\@\@UEAAXXZ */ virtual void onAppResumed(); @@ -69,12 +69,12 @@ class RandomThreadCheckManager { private: /** - * @symbol ?mInstance\@RandomThreadCheckManager\@\@0V?$unique_ptr\@VRandomThreadCheckManager\@\@U?$default_delete\@VRandomThreadCheckManager\@\@\@std\@\@\@std\@\@A + * @symbol ?mInstance\@RandomThreadCheckManager\@\@0V?$unique_ptr\@VRandomThreadCheckManager\@\@U?$default_delete\@VRandomThreadCheckManager\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mInstance; /** - * @symbol ?mMutex\@RandomThreadCheckManager\@\@0Vrecursive_mutex\@std\@\@A + * @symbol ?mMutex\@RandomThreadCheckManager\@\@0Vrecursive_mutex\@std\@\@A */ MCAPI static class std::recursive_mutex mMutex; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomValueBounds.hpp b/LiteLoader/include/llapi/mc/RandomValueBounds.hpp index 9af069231c..f50bf6e29d 100644 --- a/LiteLoader/include/llapi/mc/RandomValueBounds.hpp +++ b/LiteLoader/include/llapi/mc/RandomValueBounds.hpp @@ -31,24 +31,24 @@ class RandomValueBounds { public: /** - * @symbol ?deserialize\@RandomValueBounds\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol ?deserialize\@RandomValueBounds\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void deserialize(class Json::Value const &); /** - * @symbol ?getFloat\@RandomValueBounds\@\@QEBAMAEAVRandom\@\@\@Z + * @symbol ?getFloat\@RandomValueBounds\@\@QEBAMAEAVRandom\@\@\@Z */ MCAPI float getFloat(class Random &) const; /** - * @symbol ?getInt\@RandomValueBounds\@\@QEBAHAEAVRandom\@\@\@Z + * @symbol ?getInt\@RandomValueBounds\@\@QEBAHAEAVRandom\@\@\@Z */ MCAPI int getInt(class Random &) const; /** - * @symbol ?getMax\@RandomValueBounds\@\@QEBAMXZ + * @symbol ?getMax\@RandomValueBounds\@\@QEBAMXZ */ MCAPI float getMax() const; /** - * @symbol ?getMin\@RandomValueBounds\@\@QEBAMXZ + * @symbol ?getMin\@RandomValueBounds\@\@QEBAMXZ */ MCAPI float getMin() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp index dfc8a51a75..dbab4e9db7 100644 --- a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainer.hpp @@ -31,29 +31,29 @@ class RandomizableBlockActorContainer { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANDOMIZABLEBLOCKACTORCONTAINER /** - * @symbol ?dropContents\@RandomizableBlockActorContainer\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z + * @symbol ?dropContents\@RandomizableBlockActorContainer\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z */ MCVAPI void dropContents(class BlockSource &, class Vec3 const &, bool); /** - * @symbol ?initializeContainerContents\@RandomizableBlockActorContainer\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?initializeContainerContents\@RandomizableBlockActorContainer\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void initializeContainerContents(class BlockSource &); /** - * @symbol ?setContainerChanged\@RandomizableBlockActorContainer\@\@UEAAXH\@Z + * @symbol ?setContainerChanged\@RandomizableBlockActorContainer\@\@UEAAXH\@Z */ MCVAPI void setContainerChanged(int); /** - * @symbol ?startOpen\@RandomizableBlockActorContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@RandomizableBlockActorContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~RandomizableBlockActorContainer(); #endif /** - * @symbol ??0RandomizableBlockActorContainer\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@W4ContainerType\@\@\@Z + * @symbol ??0RandomizableBlockActorContainer\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@W4ContainerType\@\@\@Z */ MCAPI RandomizableBlockActorContainer(enum class BlockActorType, std::string const &, class BlockPos const &, enum class ContainerType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp index 0e832cfa7a..d0b009b237 100644 --- a/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorContainerBase.hpp @@ -31,67 +31,73 @@ class RandomizableBlockActorContainerBase : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RandomizableBlockActorContainerBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@RandomizableBlockActorContainerBase\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@RandomizableBlockActorContainerBase\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@RandomizableBlockActorContainerBase\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@RandomizableBlockActorContainerBase\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANDOMIZABLEBLOCKACTORCONTAINERBASE /** - * @symbol ?setLootTable\@RandomizableBlockActorContainerBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RandomizableBlockActorContainerBase(); +#endif + /** + * @symbol ?setLootTable\@RandomizableBlockActorContainerBase\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI void setLootTable(std::string const &, int); /** - * @symbol ?unPackLootTable\@RandomizableBlockActorContainerBase\@\@QEAAXAEAVLevel\@\@AEAVContainer\@\@V?$AutomaticID\@VDimension\@\@H\@\@PEAVActor\@\@\@Z + * @symbol ?unPackLootTable\@RandomizableBlockActorContainerBase\@\@QEAAXAEAVLevel\@\@AEAVContainer\@\@V?$AutomaticID\@VDimension\@\@H\@\@PEAVActor\@\@\@Z */ MCAPI void unPackLootTable(class Level &, class Container &, class AutomaticID, class Actor *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp b/LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp index 048cd125e5..9ed1f5398a 100644 --- a/LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp +++ b/LiteLoader/include/llapi/mc/RandomizableBlockActorFillingContainer.hpp @@ -31,29 +31,29 @@ class RandomizableBlockActorFillingContainer { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANDOMIZABLEBLOCKACTORFILLINGCONTAINER /** - * @symbol ?dropContents\@RandomizableBlockActorFillingContainer\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z + * @symbol ?dropContents\@RandomizableBlockActorFillingContainer\@\@UEAAXAEAVBlockSource\@\@AEBVVec3\@\@_N\@Z */ MCVAPI void dropContents(class BlockSource &, class Vec3 const &, bool); /** - * @symbol ?initializeContainerContents\@RandomizableBlockActorFillingContainer\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?initializeContainerContents\@RandomizableBlockActorFillingContainer\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void initializeContainerContents(class BlockSource &); /** - * @symbol ?setContainerChanged\@RandomizableBlockActorFillingContainer\@\@UEAAXH\@Z + * @symbol ?setContainerChanged\@RandomizableBlockActorFillingContainer\@\@UEAAXH\@Z */ MCVAPI void setContainerChanged(int); /** - * @symbol ?startOpen\@RandomizableBlockActorFillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@RandomizableBlockActorFillingContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~RandomizableBlockActorFillingContainer(); #endif /** - * @symbol ??0RandomizableBlockActorFillingContainer\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@HW4ContainerType\@\@\@Z + * @symbol ??0RandomizableBlockActorFillingContainer\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@HW4ContainerType\@\@\@Z */ MCAPI RandomizableBlockActorFillingContainer(enum class BlockActorType, std::string const &, class BlockPos const &, int, enum class ContainerType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Randomize.hpp b/LiteLoader/include/llapi/mc/Randomize.hpp index 1ac05371b4..228f4eafa6 100644 --- a/LiteLoader/include/llapi/mc/Randomize.hpp +++ b/LiteLoader/include/llapi/mc/Randomize.hpp @@ -30,48 +30,48 @@ class Randomize { public: /** - * @symbol ??0Randomize\@\@QEAA\@AEAVRandom\@\@\@Z + * @symbol ??0Randomize\@\@QEAA\@AEAVRandom\@\@\@Z */ MCAPI Randomize(class Random &); /** - * @symbol ?chance\@Randomize\@\@QEBA_NHH\@Z + * @symbol ?chance\@Randomize\@\@QEBA_NHH\@Z */ MCAPI bool chance(int, int) const; /** - * @symbol ?chanceAllButOneIn\@Randomize\@\@QEBA_NH\@Z + * @symbol ?chanceAllButOneIn\@Randomize\@\@QEBA_NH\@Z */ MCAPI bool chanceAllButOneIn(int) const; /** - * @symbol ?chanceFloatGreaterThan\@Randomize\@\@QEBA_NM\@Z + * @symbol ?chanceFloatGreaterThan\@Randomize\@\@QEBA_NM\@Z */ MCAPI bool chanceFloatGreaterThan(float) const; /** - * @symbol ?chanceFloatLessOrEqual\@Randomize\@\@QEBA_NM\@Z + * @symbol ?chanceFloatLessOrEqual\@Randomize\@\@QEBA_NM\@Z */ MCAPI bool chanceFloatLessOrEqual(float) const; /** - * @symbol ?chanceFloatLessThan\@Randomize\@\@QEBA_NM\@Z + * @symbol ?chanceFloatLessThan\@Randomize\@\@QEBA_NM\@Z */ MCAPI bool chanceFloatLessThan(float) const; /** - * @symbol ?chanceOneIn\@Randomize\@\@QEBA_NH\@Z + * @symbol ?chanceOneIn\@Randomize\@\@QEBA_NH\@Z */ MCAPI bool chanceOneIn(int) const; /** - * @symbol ?nextFloat\@Randomize\@\@QEBAMXZ + * @symbol ?nextFloat\@Randomize\@\@QEBAMXZ */ MCAPI float nextFloat() const; /** - * @symbol ?nextIntInclusive\@Randomize\@\@QEBAHHH\@Z + * @symbol ?nextIntInclusive\@Randomize\@\@QEBAHHH\@Z */ MCAPI int nextIntInclusive(int, int) const; /** - * @symbol ??1Randomize\@\@QEAA\@XZ + * @symbol ??1Randomize\@\@QEAA\@XZ */ MCAPI ~Randomize(); /** - * @symbol ?ChanceFloatGreaterThan_MinExcessiveImprobability\@Randomize\@\@2MB + * @symbol ?ChanceFloatGreaterThan_MinExcessiveImprobability\@Randomize\@\@2MB */ MCAPI static float const ChanceFloatGreaterThan_MinExcessiveImprobability; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp b/LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp index 06bfce1da4..04af5464de 100644 --- a/LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RangedAttackDefinition.hpp @@ -30,16 +30,16 @@ class RangedAttackDefinition { public: /** - * @symbol ??0RangedAttackDefinition\@\@QEAA\@XZ + * @symbol ??0RangedAttackDefinition\@\@QEAA\@XZ */ MCAPI RangedAttackDefinition(); /** - * @symbol ?initialize\@RangedAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVRangedAttackGoal\@\@\@Z + * @symbol ?initialize\@RangedAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVRangedAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class RangedAttackGoal &) const; /** - * @symbol ?buildSchema\@RangedAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRangedAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@RangedAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRangedAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp b/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp index e87148468c..c853fa0c5f 100644 --- a/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/RangedAttackGoal.hpp @@ -30,52 +30,60 @@ class RangedAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RangedAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RangedAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RangedAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RangedAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RangedAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RangedAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RangedAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RangedAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RangedAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RangedAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RangedAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RangedAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RangedAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RangedAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0RangedAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI RangedAttackGoal(class Mob &); /** - * @symbol ?handleAttackBehavior\@RangedAttackGoal\@\@QEAAXPEAVActor\@\@AEBVVec3\@\@M_N\@Z + * @symbol ?handleAttackBehavior\@RangedAttackGoal\@\@QEAAXPEAVActor\@\@AEBVVec3\@\@M_N\@Z */ MCAPI void handleAttackBehavior(class Actor *, class Vec3 const &, float, bool); -}; \ No newline at end of file +//private: + /** + * @symbol ?_dischargeCarriedItem\@RangedAttackGoal\@\@AEAAXXZ + */ + MCAPI void _dischargeCarriedItem(); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp index d7a2c350c7..43c63ff444 100644 --- a/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/RangedWeaponItem.hpp @@ -32,112 +32,118 @@ class RangedWeaponItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RangedWeaponItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 63 - * @symbol ?getEnchantValue\@RangedWeaponItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@RangedWeaponItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@RangedWeaponItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@RangedWeaponItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@RangedWeaponItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@RangedWeaponItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@RangedWeaponItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@RangedWeaponItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@RangedWeaponItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@RangedWeaponItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 120 - * @symbol ?getAnimationFrameFor\@RangedWeaponItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z + * @vftbl 120 + * @symbol ?getAnimationFrameFor\@RangedWeaponItem\@\@UEBAHPEAVMob\@\@_NPEBVItemStack\@\@_N\@Z */ virtual int getAnimationFrameFor(class Mob *, bool, class ItemStack const *, bool) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RANGEDWEAPONITEM /** - * @symbol ??0RangedWeaponItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RangedWeaponItem(); +#endif + /** + * @symbol ??0RangedWeaponItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RangedWeaponItem(std::string const &, int); /** - * @symbol ?getLaunchPower\@RangedWeaponItem\@\@QEBAMHHH\@Z + * @symbol ?getLaunchPower\@RangedWeaponItem\@\@QEBAMHHH\@Z */ MCAPI float getLaunchPower(int, int, int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp index 0a499c48b9..f8afc3740f 100644 --- a/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp +++ b/LiteLoader/include/llapi/mc/RapidFertilizerItem.hpp @@ -32,79 +32,79 @@ class RapidFertilizerItem : public FertilizerItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RapidFertilizerItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 105 - * @symbol ?fixupCommon\@RapidFertilizerItem\@\@UEBAXAEAVItemStackBase\@\@\@Z + * @vftbl 105 + * @symbol ?fixupCommon\@RapidFertilizerItem\@\@UEBAXAEAVItemStackBase\@\@\@Z */ virtual void fixupCommon(class ItemStackBase &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RapidJsonDataFixers.hpp b/LiteLoader/include/llapi/mc/RapidJsonDataFixers.hpp index f898fdd74b..d22fbc8820 100644 --- a/LiteLoader/include/llapi/mc/RapidJsonDataFixers.hpp +++ b/LiteLoader/include/llapi/mc/RapidJsonDataFixers.hpp @@ -20,11 +20,11 @@ namespace RapidJsonDataFixers { #undef AFTER_EXTRA /** - * @symbol ?applyLambdaToChild\@RapidJsonDataFixers\@\@YAXAEAV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AXV?$GenericMemberIterator\@$0A\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@\@Z\@5\@\@Z + * @symbol ?applyLambdaToChild\@RapidJsonDataFixers\@\@YAXAEAV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AXV?$GenericMemberIterator\@$0A\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@\@Z\@5\@\@Z */ MCAPI void applyLambdaToChild(class rapidjson::GenericValue, class rapidjson::MemoryPoolAllocator> &, std::string const &, class std::function, class rapidjson::MemoryPoolAllocator>)> const &); /** - * @symbol ?applyLambdaToChildObject\@RapidJsonDataFixers\@\@YAXAEAV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AXV?$GenericMemberIterator\@$0A\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@\@Z\@5\@\@Z + * @symbol ?applyLambdaToChildObject\@RapidJsonDataFixers\@\@YAXAEAV?$GenericValue\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AXV?$GenericMemberIterator\@$0A\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@\@rapidjson\@\@\@Z\@5\@\@Z */ MCAPI void applyLambdaToChildObject(class rapidjson::GenericValue, class rapidjson::MemoryPoolAllocator> &, std::string const &, class std::function, class rapidjson::MemoryPoolAllocator>)> const &); diff --git a/LiteLoader/include/llapi/mc/RayTracingOptions.hpp b/LiteLoader/include/llapi/mc/RayTracingOptions.hpp index 69101587ef..8e5b572c9a 100644 --- a/LiteLoader/include/llapi/mc/RayTracingOptions.hpp +++ b/LiteLoader/include/llapi/mc/RayTracingOptions.hpp @@ -31,12 +31,12 @@ class RayTracingOptions { public: /** - * @symbol ?RAY_TRACING_TAG\@RayTracingOptions\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?RAY_TRACING_TAG\@RayTracingOptions\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI static class std::basic_string_view> const RAY_TRACING_TAG; /** - * @symbol ?getPackCapability\@RayTracingOptions\@\@SA?AVPackCapability\@\@V?$NonOwnerPointer\@VIAdvancedGraphicsOptions\@\@\@Bedrock\@\@\@Z + * @symbol ?getPackCapability\@RayTracingOptions\@\@SA?AVPackCapability\@\@V?$NonOwnerPointer\@VIAdvancedGraphicsOptions\@\@\@Bedrock\@\@\@Z */ MCAPI static class PackCapability getPackCapability(class Bedrock::NonOwnerPointer); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RayTracingOptionsUtil.hpp b/LiteLoader/include/llapi/mc/RayTracingOptionsUtil.hpp deleted file mode 100644 index e437879b77..0000000000 --- a/LiteLoader/include/llapi/mc/RayTracingOptionsUtil.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file RayTracingOptionsUtil.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "PackManifest.hpp" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace RayTracingOptionsUtil. - * - */ -namespace RayTracingOptionsUtil { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA - /** - * @symbol ?rayTracingCapabilityRegister@RayTracingOptionsUtil@@3UCapabilityRegisterer@PackManifest@@A - * @hash -130035841 - */ - MCAPI extern struct PackManifest::CapabilityRegisterer rayTracingCapabilityRegister; - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp b/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp index 2d8dc1def2..6210b1a4a9 100644 --- a/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp +++ b/LiteLoader/include/llapi/mc/ReadOnlyBinaryStream.hpp @@ -70,106 +70,112 @@ class ReadOnlyBinaryStream { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReadOnlyBinaryStream(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?read\@ReadOnlyBinaryStream\@\@EEAA_NPEAX_K\@Z + * @vftbl 1 + * @symbol ?read\@ReadOnlyBinaryStream\@\@EEAA_NPEAX_K\@Z */ virtual bool read(void *, unsigned __int64); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_READONLYBINARYSTREAM /** - * @symbol ??0ReadOnlyBinaryStream\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ReadOnlyBinaryStream(std::string const &, bool); + MCVAPI ~ReadOnlyBinaryStream(); +#endif /** - * @symbol ??0ReadOnlyBinaryStream\@\@QEAA\@$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ReadOnlyBinaryStream\@\@QEAA\@$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ReadOnlyBinaryStream(std::string &&); /** - * @symbol ?canReadBool\@ReadOnlyBinaryStream\@\@QEBA_NXZ + * @symbol ??0ReadOnlyBinaryStream\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + */ + MCAPI ReadOnlyBinaryStream(std::string const &, bool); + /** + * @symbol ?canReadBool\@ReadOnlyBinaryStream\@\@QEBA_NXZ */ MCAPI bool canReadBool() const; /** - * @symbol ?getBool\@ReadOnlyBinaryStream\@\@QEAA_NXZ + * @symbol ?getBool\@ReadOnlyBinaryStream\@\@QEAA_NXZ */ MCAPI bool getBool(); /** - * @symbol ?getByte\@ReadOnlyBinaryStream\@\@QEAAEXZ + * @symbol ?getByte\@ReadOnlyBinaryStream\@\@QEAAEXZ */ MCAPI unsigned char getByte(); /** - * @symbol ?getDouble\@ReadOnlyBinaryStream\@\@QEAANXZ + * @symbol ?getDouble\@ReadOnlyBinaryStream\@\@QEAANXZ */ MCAPI double getDouble(); /** - * @symbol ?getFloat\@ReadOnlyBinaryStream\@\@QEAAMXZ + * @symbol ?getFloat\@ReadOnlyBinaryStream\@\@QEAAMXZ */ MCAPI float getFloat(); /** - * @symbol ?getReadCompleteResult\@ReadOnlyBinaryStream\@\@QEBA?AW4StreamReadResult\@\@XZ + * @symbol ?getReadCompleteResult\@ReadOnlyBinaryStream\@\@QEBA?AW4StreamReadResult\@\@XZ */ MCAPI enum class StreamReadResult getReadCompleteResult() const; /** - * @symbol ?getSignedBigEndianInt\@ReadOnlyBinaryStream\@\@QEAAHXZ + * @symbol ?getSignedBigEndianInt\@ReadOnlyBinaryStream\@\@QEAAHXZ */ MCAPI int getSignedBigEndianInt(); /** - * @symbol ?getSignedInt\@ReadOnlyBinaryStream\@\@QEAAHXZ + * @symbol ?getSignedInt\@ReadOnlyBinaryStream\@\@QEAAHXZ */ MCAPI int getSignedInt(); /** - * @symbol ?getSignedInt64\@ReadOnlyBinaryStream\@\@QEAA_JXZ + * @symbol ?getSignedInt64\@ReadOnlyBinaryStream\@\@QEAA_JXZ */ MCAPI __int64 getSignedInt64(); /** - * @symbol ?getSignedShort\@ReadOnlyBinaryStream\@\@QEAAFXZ + * @symbol ?getSignedShort\@ReadOnlyBinaryStream\@\@QEAAFXZ */ MCAPI short getSignedShort(); /** - * @symbol ?getString\@ReadOnlyBinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getString\@ReadOnlyBinaryStream\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getString(); /** - * @symbol ?getString\@ReadOnlyBinaryStream\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getString\@ReadOnlyBinaryStream\@\@QEAA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool getString(std::string &); /** - * @symbol ?getUnsignedChar\@ReadOnlyBinaryStream\@\@QEAAEXZ + * @symbol ?getUnsignedChar\@ReadOnlyBinaryStream\@\@QEAAEXZ */ MCAPI unsigned char getUnsignedChar(); /** - * @symbol ?getUnsignedInt\@ReadOnlyBinaryStream\@\@QEAAIXZ + * @symbol ?getUnsignedInt\@ReadOnlyBinaryStream\@\@QEAAIXZ */ MCAPI unsigned int getUnsignedInt(); /** - * @symbol ?getUnsignedInt64\@ReadOnlyBinaryStream\@\@QEAA_KXZ + * @symbol ?getUnsignedInt64\@ReadOnlyBinaryStream\@\@QEAA_KXZ */ MCAPI unsigned __int64 getUnsignedInt64(); /** - * @symbol ?getUnsignedShort\@ReadOnlyBinaryStream\@\@QEAAGXZ + * @symbol ?getUnsignedShort\@ReadOnlyBinaryStream\@\@QEAAGXZ */ MCAPI unsigned short getUnsignedShort(); /** - * @symbol ?getUnsignedVarInt\@ReadOnlyBinaryStream\@\@QEAAIXZ + * @symbol ?getUnsignedVarInt\@ReadOnlyBinaryStream\@\@QEAAIXZ */ MCAPI unsigned int getUnsignedVarInt(); /** - * @symbol ?getUnsignedVarInt64\@ReadOnlyBinaryStream\@\@QEAA_KXZ + * @symbol ?getUnsignedVarInt64\@ReadOnlyBinaryStream\@\@QEAA_KXZ */ MCAPI unsigned __int64 getUnsignedVarInt64(); /** - * @symbol ?getVarInt\@ReadOnlyBinaryStream\@\@QEAAHXZ + * @symbol ?getVarInt\@ReadOnlyBinaryStream\@\@QEAAHXZ */ MCAPI int getVarInt(); /** - * @symbol ?getVarInt64\@ReadOnlyBinaryStream\@\@QEAA_JXZ + * @symbol ?getVarInt64\@ReadOnlyBinaryStream\@\@QEAA_JXZ */ MCAPI __int64 getVarInt64(); /** - * @symbol ?hasOverflowed\@ReadOnlyBinaryStream\@\@QEBA_NXZ + * @symbol ?hasOverflowed\@ReadOnlyBinaryStream\@\@QEBA_NXZ */ MCAPI bool hasOverflowed() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp b/LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp index ff4e01afa1..1afc7d76ec 100644 --- a/LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp +++ b/LiteLoader/include/llapi/mc/RealmsUnknownPackSource.hpp @@ -31,48 +31,48 @@ class RealmsUnknownPackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RealmsUnknownPackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getPackOrigin\@RealmsUnknownPackSource\@\@UEBA?AW4PackOrigin\@\@XZ + * @vftbl 3 + * @symbol ?getPackOrigin\@RealmsUnknownPackSource\@\@UEBA?AW4PackOrigin\@\@XZ */ virtual enum class PackOrigin getPackOrigin() const; /** - * @vftbl 4 - * @symbol ?getPackType\@RealmsUnknownPackSource\@\@UEBA?AW4PackType\@\@XZ + * @vftbl 4 + * @symbol ?getPackType\@RealmsUnknownPackSource\@\@UEBA?AW4PackType\@\@XZ */ virtual enum class PackType getPackType() const; /** - * @vftbl 5 - * @symbol ?load\@RealmsUnknownPackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 5 + * @symbol ?load\@RealmsUnknownPackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual class PackSourceReport load(class IPackManifestFactory &, class gsl::not_null> const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REALMSUNKNOWNPACKSOURCE /** - * @symbol ?forEachPack\@RealmsUnknownPackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPack\@RealmsUnknownPackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPack(class std::function); /** - * @symbol ?forEachPackConst\@RealmsUnknownPackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPackConst\@RealmsUnknownPackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPackConst(class std::function) const; #endif /** - * @symbol ??0RealmsUnknownPackSource\@\@QEAA\@W4PackType\@\@W4PackOrigin\@\@\@Z + * @symbol ??0RealmsUnknownPackSource\@\@QEAA\@W4PackType\@\@W4PackOrigin\@\@\@Z */ MCAPI RealmsUnknownPackSource(enum class PackType, enum class PackOrigin); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp b/LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp index 8eb9b3a1f9..4f343fc229 100644 --- a/LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/ReceiveLoveGoal.hpp @@ -30,58 +30,58 @@ class ReceiveLoveGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReceiveLoveGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@ReceiveLoveGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ReceiveLoveGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ReceiveLoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ReceiveLoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RECEIVELOVEGOAL /** - * @symbol ?canContinueToUse\@ReceiveLoveGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@ReceiveLoveGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); /** - * @symbol ?canUse\@ReceiveLoveGoal\@\@UEAA_NXZ + * @symbol ?canUse\@ReceiveLoveGoal\@\@UEAA_NXZ */ MCVAPI bool canUse(); #endif /** - * @symbol ??0ReceiveLoveGoal\@\@QEAA\@AEAVVillagerBase\@\@\@Z + * @symbol ??0ReceiveLoveGoal\@\@QEAA\@AEAVVillagerBase\@\@\@Z */ MCAPI ReceiveLoveGoal(class VillagerBase &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Recipe.hpp b/LiteLoader/include/llapi/mc/Recipe.hpp index 5dbddefc6c..4804390dc1 100644 --- a/LiteLoader/include/llapi/mc/Recipe.hpp +++ b/LiteLoader/include/llapi/mc/Recipe.hpp @@ -30,127 +30,133 @@ class Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Recipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const = 0; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@ShapelessRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@BannerAddPatternRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const = 0; /** - * @vftbl 3 - * @symbol ?getIngredient\@ShapelessRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@ShapelessRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const = 0; /** - * @vftbl 4 - * @symbol ?getResultItem\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const = 0; /** - * @vftbl 5 - * @symbol ?isShapeless\@ShapelessRecipe\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isShapeless\@MultiRecipe\@\@EEBA_NXZ */ virtual bool isShapeless() const = 0; /** - * @vftbl 6 - * @symbol ?matches\@ShapelessRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const = 0; /** - * @vftbl 7 - * @symbol ?size\@ShapelessRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@BannerAddPatternRecipe\@\@UEBAHXZ */ virtual int size() const = 0; /** - * @vftbl 8 - * @symbol ?getId\@Recipe\@\@UEBAAEBVUUID\@mce\@\@XZ + * @vftbl 8 + * @symbol ?getId\@Recipe\@\@UEBAAEBVUUID\@mce\@\@XZ */ virtual class mce::UUID const & getId() const; /** - * @vftbl 9 - * @symbol ?isMultiRecipe\@Recipe\@\@UEBA_NXZ + * @vftbl 9 + * @symbol ?isMultiRecipe\@Recipe\@\@UEBA_NXZ */ virtual bool isMultiRecipe() const; /** - * @vftbl 10 - * @symbol ?itemValidForRecipe\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@AEBVItemStack\@\@\@Z + * @vftbl 10 + * @symbol ?itemValidForRecipe\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@AEBVItemStack\@\@\@Z */ virtual bool itemValidForRecipe(class ItemDescriptor const &, class ItemStack const &) const; /** - * @vftbl 11 - * @symbol ?itemsMatch\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@0\@Z + * @vftbl 11 + * @symbol ?itemsMatch\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@0\@Z */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &) const; /** - * @vftbl 12 - * @symbol ?itemsMatch\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@0PEBVCompoundTag\@\@\@Z + * @vftbl 12 + * @symbol ?itemsMatch\@Recipe\@\@UEBA_NAEBVItemDescriptor\@\@0PEBVCompoundTag\@\@\@Z */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 13 - * @symbol ?getIngredientsHash\@Recipe\@\@UEBA_KXZ + * @vftbl 13 + * @symbol ?getIngredientsHash\@Recipe\@\@UEBA_KXZ */ virtual unsigned __int64 getIngredientsHash() const; /** - * @vftbl 14 - * @symbol ?loadResultList\@Recipe\@\@UEBAXAEBVBlockPalette\@\@\@Z + * @vftbl 14 + * @symbol ?loadResultList\@Recipe\@\@UEBAXAEBVBlockPalette\@\@\@Z */ virtual void loadResultList(class BlockPalette const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RECIPE /** - * @symbol ?countQuantityOfIngredient\@Recipe\@\@QEBAHAEBVItemInstance\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Recipe(); +#endif + /** + * @symbol ?countQuantityOfIngredient\@Recipe\@\@QEBAHAEBVItemInstance\@\@\@Z */ MCAPI int countQuantityOfIngredient(class ItemInstance const &) const; /** - * @symbol ?getHeight\@Recipe\@\@QEBAHXZ + * @symbol ?getHeight\@Recipe\@\@QEBAHXZ */ MCAPI int getHeight() const; /** - * @symbol ?getIngredients\@Recipe\@\@QEBAAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getIngredients\@Recipe\@\@QEBAAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getIngredients() const; /** - * @symbol ?getNetId\@Recipe\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ + * @symbol ?getNetId\@Recipe\@\@QEBAAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@XZ */ MCAPI class TypedServerNetId const & getNetId() const; /** - * @symbol ?getPriority\@Recipe\@\@QEBAHXZ + * @symbol ?getPriority\@Recipe\@\@QEBAHXZ */ MCAPI int getPriority() const; /** - * @symbol ?getRecipeId\@Recipe\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRecipeId\@Recipe\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getRecipeId() const; /** - * @symbol ?getTag\@Recipe\@\@QEBAAEBVHashedString\@\@XZ + * @symbol ?getTag\@Recipe\@\@QEBAAEBVHashedString\@\@XZ */ MCAPI class HashedString const & getTag() const; /** - * @symbol ?getWidth\@Recipe\@\@QEBAHXZ + * @symbol ?getWidth\@Recipe\@\@QEBAHXZ */ MCAPI int getWidth() const; /** - * @symbol ?setNetId\@Recipe\@\@QEAAXAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?setNetId\@Recipe\@\@QEAAXAEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI void setNetId(class TypedServerNetId const &); /** - * @symbol ?isAnyAuxValue\@Recipe\@\@SA_NAEBVItemDescriptor\@\@\@Z + * @symbol ?isAnyAuxValue\@Recipe\@\@SA_NAEBVItemDescriptor\@\@\@Z */ MCAPI static bool isAnyAuxValue(class ItemDescriptor const &); //protected: /** - * @symbol ??0Recipe\@\@IEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@VHashedString\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0Recipe\@\@IEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@VHashedString\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z */ - MCAPI Recipe(class gsl::basic_string_span, class HashedString, std::vector const &); + MCAPI Recipe(class std::basic_string_view>, class HashedString, std::vector const &, class std::optional); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp b/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp index 73310008a9..71dff5394c 100644 --- a/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp +++ b/LiteLoader/include/llapi/mc/RecipeCraftInputs.hpp @@ -28,12 +28,12 @@ class RecipeCraftInputs { public: /** - * @symbol ??0RecipeCraftInputs\@\@QEAA\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ??0RecipeCraftInputs\@\@QEAA\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI RecipeCraftInputs(class TypedServerNetId const &); /** - * @symbol ??1RecipeCraftInputs\@\@QEAA\@XZ + * @symbol ??1RecipeCraftInputs\@\@QEAA\@XZ */ MCAPI ~RecipeCraftInputs(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp index 74239de974..2bce642890 100644 --- a/LiteLoader/include/llapi/mc/RecipeIngredient.hpp +++ b/LiteLoader/include/llapi/mc/RecipeIngredient.hpp @@ -34,49 +34,55 @@ class RecipeIngredient : public ItemDescriptorCount { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RecipeIngredient(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RECIPEINGREDIENT /** - * @symbol ??0RecipeIngredient\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI RecipeIngredient(); + MCVAPI ~RecipeIngredient(); +#endif /** - * @symbol ??0RecipeIngredient\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@HG\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z */ - MCAPI RecipeIngredient(class gsl::basic_string_span, int, unsigned short); + MCAPI RecipeIngredient(class Block const &, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItem\@\@HG\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z */ - MCAPI RecipeIngredient(class Item const &, int, unsigned short); + MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlockLegacy\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBV0\@\@Z */ - MCAPI RecipeIngredient(class BlockLegacy const &, unsigned short); + MCAPI RecipeIngredient(class RecipeIngredient const &); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVBlock\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@XZ */ - MCAPI RecipeIngredient(class Block const &, unsigned short); + MCAPI RecipeIngredient(); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBUItemTag\@\@G\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBUItemTag\@\@G\@Z */ MCAPI RecipeIngredient(struct ItemTag const &, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@AEBVItem\@\@HG\@Z */ - MCAPI RecipeIngredient(class ReadOnlyBinaryStream &); + MCAPI RecipeIngredient(class Item const &, int, unsigned short); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI RecipeIngredient(class RecipeIngredient &&); /** - * @symbol ??0RecipeIngredient\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0RecipeIngredient\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HG\@Z */ - MCAPI RecipeIngredient(class RecipeIngredient const &); + MCAPI RecipeIngredient(class std::basic_string_view>, int, unsigned short); + /** + * @symbol ??0RecipeIngredient\@\@QEAA\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + MCAPI RecipeIngredient(class ReadOnlyBinaryStream &); /** - * @symbol ?EMPTY_INGREDIENT\@RecipeIngredient\@\@2V1\@A + * @symbol ?EMPTY_INGREDIENT\@RecipeIngredient\@\@2V1\@A */ MCAPI static class RecipeIngredient EMPTY_INGREDIENT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp b/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp index f5ba71dcd1..46388d730d 100644 --- a/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp +++ b/LiteLoader/include/llapi/mc/RecipeOptionalCraftInputs.hpp @@ -11,22 +11,22 @@ #undef BEFORE_EXTRA -struct RecipeOptionalCraftInputs { +class RecipeOptionalCraftInputs { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RECIPEOPTIONALCRAFTINPUTS public: - struct RecipeOptionalCraftInputs& operator=(struct RecipeOptionalCraftInputs const &) = delete; - RecipeOptionalCraftInputs(struct RecipeOptionalCraftInputs const &) = delete; + class RecipeOptionalCraftInputs& operator=(class RecipeOptionalCraftInputs const &) = delete; + RecipeOptionalCraftInputs(class RecipeOptionalCraftInputs const &) = delete; RecipeOptionalCraftInputs() = delete; #endif public: /** - * @symbol ??0RecipeOptionalCraftInputs\@\@QEAA\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ??0RecipeOptionalCraftInputs\@\@QEAA\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI RecipeOptionalCraftInputs(class TypedServerNetId const &, std::string const &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp new file mode 100644 index 0000000000..54e4f077ad --- /dev/null +++ b/LiteLoader/include/llapi/mc/RecipeUnlockingRequirement.hpp @@ -0,0 +1,54 @@ +/** + * @file RecipeUnlockingRequirement.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RecipeUnlockingRequirement { + +#define AFTER_EXTRA + char filler[32]; + +public: + enum class UnlockingContext; +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RECIPEUNLOCKINGREQUIREMENT +public: + class RecipeUnlockingRequirement& operator=(class RecipeUnlockingRequirement const &) = delete; + RecipeUnlockingRequirement(class RecipeUnlockingRequirement const &) = delete; +#endif + +public: + /** + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@W4UnlockingContext\@0\@\@Z + */ + MCAPI RecipeUnlockingRequirement(enum class RecipeUnlockingRequirement::UnlockingContext); + /** + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@XZ + */ + MCAPI RecipeUnlockingRequirement(); + /** + * @symbol ??0RecipeUnlockingRequirement\@\@QEAA\@V?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI RecipeUnlockingRequirement(std::vector); + /** + * @symbol ?isValid\@RecipeUnlockingRequirement\@\@QEBA_NXZ + */ + MCAPI bool isValid() const; + /** + * @symbol ??1RecipeUnlockingRequirement\@\@QEAA\@XZ + */ + MCAPI ~RecipeUnlockingRequirement(); + /** + * @symbol ?unlockingContextFromString\@RecipeUnlockingRequirement\@\@SA?AW4UnlockingContext\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI static enum class RecipeUnlockingRequirement::UnlockingContext unlockingContextFromString(std::string const &); + +}; diff --git a/LiteLoader/include/llapi/mc/Recipes.hpp b/LiteLoader/include/llapi/mc/Recipes.hpp index 862606f0d2..c736dc2411 100644 --- a/LiteLoader/include/llapi/mc/Recipes.hpp +++ b/LiteLoader/include/llapi/mc/Recipes.hpp @@ -13,7 +13,7 @@ #include "Item.hpp" #include "Block.hpp" #include "HashedString.hpp" - +#include "RecipeUnlockingRequirement.hpp" #undef BEFORE_EXTRA /** @@ -25,7 +25,6 @@ class Recipes { #define AFTER_EXTRA // Add Member There public: -public: struct FurnaceRecipeKey { public: int mID; @@ -76,119 +75,123 @@ struct NormalizedRectangularRecipeResults { public: /** - * @symbol ??0Recipes\@\@QEAA\@PEAVLevel\@\@\@Z + * @symbol ??0Recipes\@\@QEAA\@PEAVLevel\@\@\@Z */ MCAPI Recipes(class Level *); /** - * @symbol ?addFurnaceRecipeAuxData\@Recipes\@\@QEAAXAEBVItemInstance\@\@0AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@std\@\@\@Z + * @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\@\@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\@\@\@Z\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@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)>); + MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional)>, class std::optional); /** - * @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\@\@\@Z\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@22AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@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)>); + 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\@\@\@Z\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@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)>); + 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\@\@\@Z\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@3\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@3\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z\@3\@V?$optional\@VRecipeUnlockingRequirement\@\@\@3\@\@Z */ - MCAPI void addShapedRecipe(std::string, class ItemInstance const &, std::string const &, std::vector const &, std::vector const &, int, class std::function (std::string, int, int, std::vector const &, std::vector const &, class HashedString)>); + 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\@\@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\@\@\@Z\@3\@\@Z + * @symbol ?addShapedRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV23\@2AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapedRecipe\@\@U?$default_delete\@VShapedRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@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)>); + 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\@\@\@Z\@3\@\@Z + * @symbol ?addShapelessRecipe\@Recipes\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemInstance\@\@AEBV?$vector\@VType\@Recipes\@\@V?$allocator\@VType\@Recipes\@\@\@std\@\@\@3\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@3\@HV?$function\@$$A6A?AV?$unique_ptr\@VShapelessRecipe\@\@U?$default_delete\@VShapelessRecipe\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@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)>); + 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\@\@Z */ MCAPI void addShulkerBoxRecipe(std::string &, class ItemInstance const &, std::vector const &, std::vector const &); /** - * @symbol ?clearRecipes\@Recipes\@\@QEAAXXZ + * @symbol ?clearRecipes\@Recipes\@\@QEAAXXZ */ MCAPI void clearRecipes(); /** - * @symbol ?extractRecipeObjInfo\@Recipes\@\@QEAA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?extractRecipeObjInfo\@Recipes\@\@QEAA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI struct std::pair extractRecipeObjInfo(class Json::Value const &); /** - * @symbol ?getFurnaceRecipeResult\@Recipes\@\@QEBA?AVItemInstance\@\@AEBVItemStackBase\@\@AEBVHashedString\@\@\@Z + * @symbol ?getFurnaceRecipeResult\@Recipes\@\@QEBA?AVItemInstance\@\@AEBVItemStackBase\@\@AEBVHashedString\@\@\@Z */ MCAPI class ItemInstance getFurnaceRecipeResult(class ItemStackBase const &, class HashedString const &) const; /** - * @symbol ?getRecipeByNetId\@Recipes\@\@QEBAPEBVRecipe\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z + * @symbol ?getRecipeByNetId\@Recipes\@\@QEBAPEBVRecipe\@\@AEBV?$TypedServerNetId\@URecipeNetIdTag\@\@I$0A\@\@\@\@Z */ MCAPI class Recipe const * getRecipeByNetId(class TypedServerNetId const &) const; /** - * @symbol ?getRecipeFor\@Recipes\@\@QEBAPEAVRecipe\@\@AEBVItemInstance\@\@AEBVHashedString\@\@\@Z + * @symbol ?getRecipeFor\@Recipes\@\@QEBAPEAVRecipe\@\@AEBVItemInstance\@\@AEBVHashedString\@\@\@Z */ MCAPI class Recipe * getRecipeFor(class ItemInstance const &, class HashedString const &) const; /** - * @symbol ?getRecipesAllTags\@Recipes\@\@QEBAAEBV?$map\@VHashedString\@\@V?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@VRecipe\@\@\@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\@\@V?$shared_ptr\@VRecipe\@\@\@2\@\@std\@\@\@2\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@VRecipe\@\@\@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\@\@V?$shared_ptr\@VRecipe\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + * @symbol ?getRecipesAllTags\@Recipes\@\@QEBAAEBV?$map\@VHashedString\@\@V?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@VRecipe\@\@\@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\@\@V?$shared_ptr\@VRecipe\@\@\@2\@\@std\@\@\@2\@\@std\@\@U?$less\@VHashedString\@\@\@3\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@V?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$shared_ptr\@VRecipe\@\@\@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\@\@V?$shared_ptr\@VRecipe\@\@\@2\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ */ MCAPI class std::map, struct std::less, class std::allocator>>>, struct std::less, class std::allocator, struct std::less, class std::allocator>>>>>> const & getRecipesAllTags() const; /** - * @symbol ?init\@Recipes\@\@QEAAXAEAVResourcePackManager\@\@AEAVExternalRecipeStore\@\@\@Z + * @symbol ?init\@Recipes\@\@QEAAXAEAVResourcePackManager\@\@AEAVExternalRecipeStore\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ - MCAPI void init(class ResourcePackManager &, class ExternalRecipeStore &); + MCAPI void init(class ResourcePackManager &, class ExternalRecipeStore &, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?loadRecipe\@Recipes\@\@QEAA_NAEBU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVSemVersion\@\@\@Z + * @symbol ?loadRecipe\@Recipes\@\@QEAA_NAEBU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool loadRecipe(struct std::pair const &, class SemVersion const &); /** - * @symbol ??1Recipes\@\@QEAA\@XZ + * @symbol ??1Recipes\@\@QEAA\@XZ */ MCAPI ~Recipes(); //protected: /** - * @symbol ?_loadDataDrivenRecipes\@Recipes\@\@IEAAXAEBV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_loadDataDrivenRecipes\@Recipes\@\@IEAAXAEBV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _loadDataDrivenRecipes(std::vector const &); /** - * @symbol ?_normalizeRectangularRecipe\@Recipes\@\@KA?AUNormalizedRectangularRecipeResults\@1\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_loadUnlockingRequirementFromJson\@Recipes\@\@IEBA?AV?$optional\@VRecipeUnlockingRequirement\@\@\@std\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + */ + MCAPI class std::optional _loadUnlockingRequirementFromJson(class Json::Value const &, class SemVersion const &, std::string const &) const; + /** + * @symbol ?_normalizeRectangularRecipe\@Recipes\@\@KA?AUNormalizedRectangularRecipeResults\@1\@AEBV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI static struct Recipes::NormalizedRectangularRecipeResults _normalizeRectangularRecipe(std::vector const &); //private: /** - * @symbol ?_addItemRecipe\@Recipes\@\@AEAAXV?$unique_ptr\@VRecipe\@\@U?$default_delete\@VRecipe\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_addItemRecipe\@Recipes\@\@AEAAXV?$unique_ptr\@VRecipe\@\@U?$default_delete\@VRecipe\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _addItemRecipe(std::unique_ptr); /** - * @symbol ?_addMapRecipes\@Recipes\@\@AEAAXXZ + * @symbol ?_addMapRecipes\@Recipes\@\@AEAAXXZ */ MCAPI void _addMapRecipes(); /** - * @symbol ?_isRecipeValidToAdd\@Recipes\@\@AEAA_NAEBVRecipe\@\@\@Z + * @symbol ?_isRecipeValidToAdd\@Recipes\@\@AEAA_NAEBVRecipe\@\@\@Z */ MCAPI bool _isRecipeValidToAdd(class Recipe const &); /** - * @symbol ?_loadBrewingMix\@Recipes\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_loadBrewingMix\@Recipes\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool _loadBrewingMix(class Json::Value const &, class SemVersion const &); /** - * @symbol ?_loadHardcodedRecipes\@Recipes\@\@AEAAXXZ + * @symbol ?_loadHardcodedRecipes\@Recipes\@\@AEAAXXZ */ MCAPI void _loadHardcodedRecipes(); /** - * @symbol ?_loadIngredientFromJson\@Recipes\@\@AEBA?BVRecipeIngredient\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@_N2\@Z + * @symbol ?_loadIngredientFromJson\@Recipes\@\@AEBA?BVRecipeIngredient\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@_N2\@Z */ MCAPI class RecipeIngredient const _loadIngredientFromJson(class Json::Value const &, class SemVersion const &, bool, bool) const; /** - * @symbol ?_loadInputIngredientFromJson\@Recipes\@\@AEBA?BVRecipeIngredient\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?_loadInputIngredientFromJson\@Recipes\@\@AEBA?BVRecipeIngredient\@\@AEBVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI class RecipeIngredient const _loadInputIngredientFromJson(class Json::Value const &, class SemVersion const &) const; /** - * @symbol ?_loadSmithingTransform\@Recipes\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@6\@\@Z + * @symbol ?_loadSmithingTransform\@Recipes\@\@AEAA_NAEBVValue\@Json\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@6\@\@Z */ MCAPI bool _loadSmithingTransform(class Json::Value const &, class SemVersion const &, std::string const &, std::vector const &); @@ -196,4 +199,4 @@ struct NormalizedRectangularRecipeResults { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecordItem.hpp b/LiteLoader/include/llapi/mc/RecordItem.hpp index f4108cb0c6..d7216f87e3 100644 --- a/LiteLoader/include/llapi/mc/RecordItem.hpp +++ b/LiteLoader/include/llapi/mc/RecordItem.hpp @@ -32,102 +32,102 @@ class RecordItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RecordItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@RecordItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@RecordItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@RecordItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @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 + * @symbol ?isMusicDisk\@RecordItem\@\@UEBA_NXZ */ MCVAPI bool isMusicDisk() const; #endif /** - * @symbol ??0RecordItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4LevelSoundEvent\@\@\@Z + * @symbol ??0RecordItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4LevelSoundEvent\@\@\@Z */ MCAPI RecordItem(std::string const &, int, enum class LevelSoundEvent); /** - * @symbol ?getDuration\@RecordItem\@\@QEBAMXZ + * @symbol ?getDuration\@RecordItem\@\@QEBAMXZ */ MCAPI float getDuration() const; /** - * @symbol ?getSound\@RecordItem\@\@QEBA?AW4LevelSoundEvent\@\@XZ + * @symbol ?getSound\@RecordItem\@\@QEBA?AW4LevelSoundEvent\@\@XZ */ MCAPI enum class LevelSoundEvent getSound() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecordItemComponent.hpp b/LiteLoader/include/llapi/mc/RecordItemComponent.hpp index aa2cb723e6..90daa2907b 100644 --- a/LiteLoader/include/llapi/mc/RecordItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RecordItemComponent.hpp @@ -30,63 +30,63 @@ class RecordItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RecordItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VRecordItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VRecordItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRecordItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @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 ?getAlias\@RecordItemComponent\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getAlias() const; /** - * @symbol ?getComparatorSignal\@RecordItemComponent\@\@QEBAHXZ + * @symbol ?getComparatorSignal\@RecordItemComponent\@\@QEBAHXZ */ MCAPI int getComparatorSignal() const; /** - * @symbol ?getDuration\@RecordItemComponent\@\@QEBAMXZ + * @symbol ?getDuration\@RecordItemComponent\@\@QEBAMXZ */ MCAPI float getDuration() const; /** - * @symbol ?getSound\@RecordItemComponent\@\@QEBA?AW4LevelSoundEvent\@\@XZ + * @symbol ?getSound\@RecordItemComponent\@\@QEBA?AW4LevelSoundEvent\@\@XZ */ MCAPI enum class LevelSoundEvent getSound() const; /** - * @symbol ?bindType\@RecordItemComponent\@\@SAXXZ + * @symbol ?bindType\@RecordItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@RecordItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@RecordItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp b/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp index 6c06572af8..6e0f06b341 100644 --- a/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp +++ b/LiteLoader/include/llapi/mc/RecoveryCompassItem.hpp @@ -30,78 +30,78 @@ class RecoveryCompassItem : public AbstractCompassItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RecoveryCompassItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @symbol ??0RecoveryCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0RecoveryCompassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RecoveryCompassItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RectLayoutFeature.hpp b/LiteLoader/include/llapi/mc/RectLayoutFeature.hpp index e58a48307d..a46a7d39e2 100644 --- a/LiteLoader/include/llapi/mc/RectLayoutFeature.hpp +++ b/LiteLoader/include/llapi/mc/RectLayoutFeature.hpp @@ -36,22 +36,22 @@ struct FeatureArea { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RectLayoutFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@RectLayoutFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@RectLayoutFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; //private: /** - * @symbol ?_tryPlaceFeature\@RectLayoutFeature\@\@AEBA?AV?$optional\@UFeatureArea\@RectLayoutFeature\@\@\@std\@\@AEBVVec2\@\@HAEBV?$array\@V?$array\@E$0BA\@\@std\@\@$0BA\@\@3\@\@Z + * @symbol ?_tryPlaceFeature\@RectLayoutFeature\@\@AEBA?AV?$optional\@UFeatureArea\@RectLayoutFeature\@\@\@std\@\@AEBVVec2\@\@HAEBV?$array\@V?$array\@E$0BA\@\@std\@\@$0BA\@\@3\@\@Z */ MCAPI class std::optional _tryPlaceFeature(class Vec2 const &, int, class std::array, 16> const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp index c41dc9dec2..21bd4be81d 100644 --- a/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneDustItem.hpp @@ -32,84 +32,84 @@ class RedStoneDustItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedStoneDustItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@RedStoneDustItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@RedStoneDustItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@RedStoneDustItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@RedStoneDustItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp index acb7c4e66a..c8d45cb8ff 100644 --- a/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneOreBlock.hpp @@ -31,256 +31,261 @@ class RedStoneOreBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedStoneOreBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@RedStoneOreBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@RedStoneOreBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 109 - * @symbol ?attack\@RedStoneOreBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@RedStoneOreBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 164 - * @symbol ?onStandOn\@RedStoneOreBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@RedStoneOreBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@RedStoneOreBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@RedStoneOreBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@RedStoneOreBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@RedStoneOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@RedStoneOreBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@RedStoneOreBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?_lightUpBlock\@RedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?_lightUpBlock\@RedStoneOreBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void _lightUpBlock(class BlockSource &, class BlockPos const &) const; /** - * @symbol ??0RedStoneOreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0RedStoneOreBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI RedStoneOreBlock(std::string const &, int, bool); //private: /** - * @symbol ?_poofParticles\@RedStoneOreBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_poofParticles\@RedStoneOreBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _poofParticles(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp index be98d4b043..5e80da5869 100644 --- a/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedStoneWireBlock.hpp @@ -31,284 +31,289 @@ class RedStoneWireBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedStoneWireBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@RedStoneWireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@RedStoneWireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@RedStoneWireBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@RedStoneWireBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@RedStoneWireBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@RedStoneWireBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@RedStoneWireBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 - * @symbol ?animateTick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@RedStoneWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@RedStoneWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@RedStoneWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REDSTONEWIREBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@RedStoneWireBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@RedStoneWireBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0RedStoneWireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0RedStoneWireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RedStoneWireBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp index b1b537c03e..bdbbdd0925 100644 --- a/LiteLoader/include/llapi/mc/RedstoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneBlock.hpp @@ -31,218 +31,223 @@ class RedstoneBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedstoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@RedstoneBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@RedstoneBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@RedstoneBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 147 - * @symbol ?canSpawnOn\@RedstoneBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@RedstoneBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@RedstoneBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0RedstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0RedstoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RedstoneBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp index 44587bf50a..add63de762 100644 --- a/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneLampBlock.hpp @@ -31,233 +31,238 @@ class RedstoneLampBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedstoneLampBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@RedstoneLampBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@RedstoneLampBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@RedstoneLampBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@RedstoneLampBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0RedstoneLampBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0RedstoneLampBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI RedstoneLampBlock(std::string const &, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp index 63da8a844e..9cc1879d3a 100644 --- a/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchBlock.hpp @@ -31,261 +31,271 @@ class RedstoneTorchBlock : public TorchBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedstoneTorchBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@RedstoneTorchBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@RedstoneTorchBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@RedstoneTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @symbol ?shouldConnectToRedstone\@RedstoneTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ virtual bool shouldConnectToRedstone(class BlockSource &, class BlockPos const &, int) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 147 - * @symbol ?canSpawnOn\@RedstoneTorchBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@RedstoneTorchBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 - * @symbol ?animateTick\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@RedstoneTorchBlock\@\@UEAAXXZ + */ + virtual void _addHardCodedBlockComponents(); + /** + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@RedstoneTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@RedstoneTorchBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getTickDelay\@RedstoneTorchBlock\@\@UEAAHXZ + * @vftbl 194 + * @symbol ?getTickDelay\@RedstoneTorchBlock\@\@UEAAHXZ */ virtual int getTickDelay(); /** - * @symbol ??0RedstoneTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0RedstoneTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI RedstoneTorchBlock(std::string const &, int, bool); //private: /** - * @symbol ?_installCircuit\@RedstoneTorchBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_installCircuit\@RedstoneTorchBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _installCircuit(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp b/LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp index dc5d56846d..818313bcb9 100644 --- a/LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/RedstoneTorchCapacitor.hpp @@ -30,89 +30,89 @@ class RedstoneTorchCapacitor : public ProducerComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RedstoneTorchCapacitor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getStrength\@RedstoneTorchCapacitor\@\@UEBAHXZ + * @vftbl 1 + * @symbol ?getStrength\@RedstoneTorchCapacitor\@\@UEBAHXZ */ virtual int getStrength() const; /** - * @vftbl 10 - * @symbol ?removeSource\@RedstoneTorchCapacitor\@\@UEAA_NAEBVBlockPos\@\@PEBVBaseCircuitComponent\@\@\@Z + * @vftbl 10 + * @symbol ?removeSource\@RedstoneTorchCapacitor\@\@UEAAXAEBVBlockPos\@\@PEBVBaseCircuitComponent\@\@\@Z */ - virtual bool removeSource(class BlockPos const &, class BaseCircuitComponent const *); + virtual void removeSource(class BlockPos const &, class BaseCircuitComponent const *); /** - * @vftbl 11 - * @symbol ?addSource\@RedstoneTorchCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@RedstoneTorchCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@RedstoneTorchCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@RedstoneTorchCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@RedstoneTorchCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@RedstoneTorchCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 15 - * @symbol ?cacheValues\@RedstoneTorchCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 15 + * @symbol ?cacheValues\@RedstoneTorchCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void cacheValues(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 16 - * @symbol ?updateDependencies\@RedstoneTorchCapacitor\@\@EEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?updateDependencies\@RedstoneTorchCapacitor\@\@EEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z */ virtual void updateDependencies(class CircuitSceneGraph &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol ?isHalfPulse\@RedstoneTorchCapacitor\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isHalfPulse\@RedstoneTorchCapacitor\@\@UEBA_NXZ */ virtual bool isHalfPulse() const; /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@RedstoneTorchCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@RedstoneTorchCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @vftbl 25 - * @symbol ?getPoweroutDirection\@RedstoneTorchCapacitor\@\@UEBAEXZ + * @vftbl 25 + * @symbol ?getPoweroutDirection\@RedstoneTorchCapacitor\@\@UEBAEXZ */ virtual unsigned char getPoweroutDirection() const; /** - * @symbol ??0RedstoneTorchCapacitor\@\@QEAA\@XZ + * @symbol ??0RedstoneTorchCapacitor\@\@QEAA\@XZ */ MCAPI RedstoneTorchCapacitor(); /** - * @symbol ?resetBurnOutCount\@RedstoneTorchCapacitor\@\@QEAAXXZ + * @symbol ?resetBurnOutCount\@RedstoneTorchCapacitor\@\@QEAAXXZ */ MCAPI void resetBurnOutCount(); /** - * @symbol ?setOn\@RedstoneTorchCapacitor\@\@QEAAX_N\@Z + * @symbol ?setOn\@RedstoneTorchCapacitor\@\@QEAAX_N\@Z */ MCAPI void setOn(bool); //private: /** - * @symbol ?FindStrongestStrength\@RedstoneTorchCapacitor\@\@AEAAHAEBVBlockPos\@\@AEAVCircuitSystem\@\@AEA_N\@Z + * @symbol ?FindStrongestStrength\@RedstoneTorchCapacitor\@\@AEAAHAEBVBlockPos\@\@AEAVCircuitSystem\@\@AEA_N\@Z */ MCAPI int FindStrongestStrength(class BlockPos const &, class CircuitSystem &, bool &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReedBlock.hpp b/LiteLoader/include/llapi/mc/ReedBlock.hpp index 95c1647475..70ebf2dc3b 100644 --- a/LiteLoader/include/llapi/mc/ReedBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReedBlock.hpp @@ -31,286 +31,291 @@ class ReedBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReedBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@ReedBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@ReedBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ReedBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ReedBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @symbol ?onFertilized\@ReedBlock\@\@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 88 + * @symbol ?canBeFertilized\@ReedBlock\@\@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 92 + * @symbol ?mayPlace\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@ReedBlock\@\@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 103 + * @symbol ?asItemInstance\@ReedBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@ReedBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@ReedBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColorAtPos\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 137 + * @symbol ?getColorAtPos\@ReedBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 140 - * @symbol ?onGraphicsModeChanged\@ReedBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z + * @vftbl 140 + * @symbol ?onGraphicsModeChanged\@ReedBlock\@\@UEAAXAEBUBlockGraphicsModeChangeContext\@\@\@Z */ virtual void onGraphicsModeChanged(struct BlockGraphicsModeChangeContext const &); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@ReedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@ReedBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@ReedBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@ReedBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REEDBLOCK /** - * @symbol ?canBeSilkTouched\@ReedBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@ReedBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@ReedBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@ReedBlock\@\@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 ??0ReedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ReedBlock(std::string const &, int); //private: /** - * @symbol ?checkAlive\@ReedBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?checkAlive\@ReedBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void checkAlive(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReedsFeature.hpp b/LiteLoader/include/llapi/mc/ReedsFeature.hpp index 3692b2132f..097f3cb911 100644 --- a/LiteLoader/include/llapi/mc/ReedsFeature.hpp +++ b/LiteLoader/include/llapi/mc/ReedsFeature.hpp @@ -31,14 +31,14 @@ class ReedsFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReedsFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@ReedsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@ReedsFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Ref.hpp b/LiteLoader/include/llapi/mc/Ref.hpp new file mode 100644 index 0000000000..ff3f846499 --- /dev/null +++ b/LiteLoader/include/llapi/mc/Ref.hpp @@ -0,0 +1,314 @@ +#pragma once +#include +#include + +template +class WeakStorageSharePtr { +public: + enum class VariadicInit : int { + NonAmbiguous = 0, + }; + enum class EmptyInit : int { + NoValue = 0, + }; + std::weak_ptr mHandle; + + T* get() const { + return mHandle.lock().get(); + } +}; + +template +class OwnerStorageSharePtr { +public: + enum class VariadicInit : int { + NonAmbiguous = 0, + }; + enum class EmptyInit : int { + NoValue = 0, + }; + std::shared_ptr mHandle; + + T* get() const { + return mHandle.get(); + } +}; + +template +class StackResultStorageSharePtr { +public: + std::shared_ptr mHandle; + + T* get() const { + return mHandle.get(); + } +}; + +template +struct SharePtrRefTraits { +public: + using StackRef = T; + using WeakStorage = WeakStorageSharePtr; + using OwnerStorage = OwnerStorageSharePtr; + using OwnerStackRef = StackRef; + using StackResultStorage = StackResultStorageSharePtr; +}; + +template +class WeakRefT : public T::WeakStorage {}; + +template +class OwnerPtrT : public T::OwnerStorage {}; + +template +class StackRefResultT : public T::StackResultStorage { +public: + using StackRef = typename T::StackRef; +}; + +template +class SharedCounter { +public: + SharedCounter(T* p = nullptr) : ptr(p), share_count(1), weak_count(0) {} + + void addShareCount() { + share_count++; + } + + void addWeakCount() { + weak_count++; + } + + int getShareCount() const { + return share_count.load(); + } + + int getWeakCount() const { + return weak_count.load(); + } + + T* get() const { + return ptr; + } + + void reset() { + ptr = nullptr; + share_count = 0; + weak_count = 0; + } + + void release() { + if (--share_count == 0) { + delete ptr; + ptr = nullptr; + releaseWeak(); + } + } + + void releaseWeak() { + if (--weak_count == 0) { + delete this; + } + } + +private: + T* ptr; + std::atomic share_count; + std::atomic weak_count; +}; + +template +class SharedPtr; + +template +class WeakPtr; + +template +class SharedPtr { +public: + SharedPtr() : counter(nullptr) {} + + SharedPtr(T* p) : counter(new SharedCounter(p)) {} + + template , int> = 0> + SharedPtr(const SharedPtr& other) { + counter = other.counter; + if (counter) { + counter->addShareCount(); + } + } + + template , int> = 0> + SharedPtr(SharedPtr&& other) { + counter = other.counter; + other.counter = nullptr; + } + + template , int> = 0> + SharedPtr(const WeakPtr& other) { + counter = other.counter; + if (other) { + counter->addShareCount(); + } + } + + ~SharedPtr() { + if (counter) { + counter->release(); + } + } + + template , int> = 0> + SharedPtr& operator=(const SharedPtr& other) { + if (counter != other.counter) { + counter = other.counter; + if (counter) { + counter->addShareCount(); + } + } + return *this; + } + + template , int> = 0> + SharedPtr& operator=(SharedPtr&& other) { + if (counter != other.counter) { + counter = other.counter; + other.counter = nullptr; + } + return *this; + } + + template , int> = 0> + SharedPtr& operator=(const WeakPtr& other) { + counter = other.counter; + if (other) { + counter->addShareCount(); + } + } + + T* operator->() const { + return counter->get(); + } + + T* get() const { + return counter->get(); + } + + T& operator*() const { + return *(counter->get()); + } + + operator bool() const { + return counter != nullptr; + } + + int use_count() const { + return counter ? counter->getShareCount() : 0; + } + + void reset() { + counter->release(); + counter = nullptr; + } + +private: + SharedCounter* counter; + + friend class WeakPtr; +}; + +template +class WeakPtr { +public: + WeakPtr() : counter(nullptr) {} + + template , int> = 0> + WeakPtr(const SharedPtr& other) { + counter = other.counter; + if (counter) { + counter->addWeakCount(); + } + } + + template , int> = 0> + WeakPtr(const WeakPtr& other) { + counter = other.counter; + if (counter) { + counter->addWeakCount(); + } + } + + template , int> = 0> + WeakPtr(WeakPtr&& other) { + counter = other.counter; + other.counter = nullptr; + } + + ~WeakPtr() { + if (counter) { + counter->releaseWeak(); + } + } + + template , int> = 0> + WeakPtr& operator=(const SharedPtr& other) { + if (counter != other.counter) { + counter = other.counter; + if (counter) { + counter->addWeakCount(); + } + } + return *this; + } + + template , int> = 0> + WeakPtr& operator=(const WeakPtr& other) { + if (counter != other.counter) { + counter = other.counter; + if (counter) { + counter->addWeakCount(); + } + } + return *this; + } + + template , int> = 0> + WeakPtr& operator=(WeakPtr&& other) { + if (counter != other.counter) { + counter = other.counter; + other.counter = nullptr; + } + return *this; + } + + int use_count() const { + return counter ? counter->getShareCount() : 0; + } + + bool expired() const { + return use_count() == 0; + } + + SharedPtr lock() const { + return expired() ? SharedPtr() : SharedPtr(*this); + } + + T* operator->() const { + return counter->get(); + } + + T* get() const { + return counter->get(); + } + + T& operator*() const { + return *(counter->get()); + } + + operator bool() const { + return expired(); + } + +private: + SharedCounter* counter; +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp b/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp index c43c4e4b25..ead4dd4e74 100644 --- a/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp +++ b/LiteLoader/include/llapi/mc/RefreshAABBSystem.hpp @@ -28,12 +28,12 @@ class RefreshAABBSystem { public: /** - * @symbol ?createRefreshAABBSystem\@RefreshAABBSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createRefreshAABBSystem\@RefreshAABBSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createRefreshAABBSystem(); /** - * @symbol ?refreshAABB\@RefreshAABBSystem\@\@SA?AVAABB\@\@MAEBVVec3\@\@AEBVVec2\@\@1\@Z + * @symbol ?refreshAABB\@RefreshAABBSystem\@\@SA?AVAABB\@\@MAEBVVec3\@\@AEBVVec2\@\@1\@Z */ MCAPI static class AABB refreshAABB(float, class Vec3 const &, class Vec2 const &, class Vec2 const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RegionFile.hpp b/LiteLoader/include/llapi/mc/RegionFile.hpp index 3433949339..5bfc856f4d 100644 --- a/LiteLoader/include/llapi/mc/RegionFile.hpp +++ b/LiteLoader/include/llapi/mc/RegionFile.hpp @@ -32,16 +32,16 @@ class RegionFile { public: /** - * @symbol ??0RegionFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z + * @symbol ??0RegionFile\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ MCAPI RegionFile(class Core::Path const &); /** - * @symbol ?open\@RegionFile\@\@QEAA_NXZ + * @symbol ?open\@RegionFile\@\@QEAA_NXZ */ MCAPI bool open(); /** - * @symbol ?readChunk\@RegionFile\@\@QEAA_NHHPEAPEAVBitStream\@RakNet\@\@\@Z + * @symbol ?readChunk\@RegionFile\@\@QEAA_NHHPEAPEAVBitStream\@RakNet\@\@\@Z */ MCAPI bool readChunk(int, int, class RakNet::BitStream **); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RegionHillsOperationNode.hpp b/LiteLoader/include/llapi/mc/RegionHillsOperationNode.hpp index 214b48d45a..493e88e1cd 100644 --- a/LiteLoader/include/llapi/mc/RegionHillsOperationNode.hpp +++ b/LiteLoader/include/llapi/mc/RegionHillsOperationNode.hpp @@ -30,23 +30,23 @@ class RegionHillsOperationNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RegionHillsOperationNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?_fillArea\@RegionHillsOperationNode\@\@MEBAXAEAV?$WorkingData\@PEAVBiome\@\@PEAV1\@\@OperationNodeDetails\@\@AEBVPos2d\@\@1H\@Z + * @vftbl 3 + * @symbol ?_fillArea\@RegionHillsOperationNode\@\@MEBAXAEAV?$WorkingData\@PEAVBiome\@\@PEAV1\@\@OperationNodeDetails\@\@AEBVPos2d\@\@1H\@Z */ virtual void _fillArea(class OperationNodeDetails::WorkingData &, class Pos2d const &, class Pos2d const &, int) const; /** - * @vftbl 4 - * @symbol ?_getAreaRead\@RegionHillsOperationNode\@\@MEBA?AV?$tuple\@VPos2d\@\@V1\@\@std\@\@AEBVPos2d\@\@0\@Z + * @vftbl 4 + * @symbol ?_getAreaRead\@RegionHillsOperationNode\@\@MEBA?AV?$tuple\@VPos2d\@\@V1\@\@std\@\@AEBVPos2d\@\@0\@Z */ virtual class std::tuple _getAreaRead(class Pos2d const &, class Pos2d const &) const; /** - * @symbol ??0RegionHillsOperationNode\@\@QEAA\@IAEAV?$shared_ptr\@V?$OperationNode\@PEAVBiome\@\@VPos2d\@\@\@\@\@std\@\@AEAV?$shared_ptr\@V?$OperationNode\@HVPos2d\@\@\@\@\@2\@AEBVBiomeRegistry\@\@\@Z + * @symbol ??0RegionHillsOperationNode\@\@QEAA\@IAEAV?$shared_ptr\@V?$OperationNode\@PEAVBiome\@\@VPos2d\@\@\@\@\@std\@\@AEAV?$shared_ptr\@V?$OperationNode\@HVPos2d\@\@\@\@\@2\@AEBVBiomeRegistry\@\@\@Z */ MCAPI RegionHillsOperationNode(unsigned int, class std::shared_ptr> &, class std::shared_ptr> &, class BiomeRegistry const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RegistryKey.hpp b/LiteLoader/include/llapi/mc/RegistryKey.hpp index d871143928..4dbbb16cc9 100644 --- a/LiteLoader/include/llapi/mc/RegistryKey.hpp +++ b/LiteLoader/include/llapi/mc/RegistryKey.hpp @@ -30,24 +30,24 @@ class RegistryKey { public: /** - * @symbol ??BRegistryKey\@\@QEBA_NXZ + * @symbol ??BRegistryKey\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ?readValue\@RegistryKey\@\@QEBA_NPEBDAEAK\@Z + * @symbol ?readValue\@RegistryKey\@\@QEBA_NPEBDAEAK\@Z */ MCAPI bool readValue(char const *, unsigned long &) const; /** - * @symbol ?readValue\@RegistryKey\@\@QEBA_NPEBDAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?readValue\@RegistryKey\@\@QEBA_NPEBDAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool readValue(char const *, std::string &) const; /** - * @symbol ??1RegistryKey\@\@QEAA\@XZ + * @symbol ??1RegistryKey\@\@QEAA\@XZ */ MCAPI ~RegistryKey(); /** - * @symbol ?open\@RegistryKey\@\@SA?AV1\@PEAUHKEY__\@\@PEBDK\@Z + * @symbol ?open\@RegistryKey\@\@SA?AV1\@PEAUHKEY__\@\@PEBDK\@Z */ MCAPI static class RegistryKey open(struct HKEY__*, char const *, unsigned long); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp index 066c2497ee..be39a54f99 100644 --- a/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp +++ b/LiteLoader/include/llapi/mc/ReinforcedDeepslateBlock.hpp @@ -29,204 +29,209 @@ class ReinforcedDeepslateBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReinforcedDeepslateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@ReinforcedDeepslateBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@ReinforcedDeepslateBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REINFORCEDDEEPSLATEBLOCK /** - * @symbol ?canBeSilkTouched\@ReinforcedDeepslateBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@ReinforcedDeepslateBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0ReinforcedDeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ReinforcedDeepslateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ReinforcedDeepslateBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RelativeFloat.hpp b/LiteLoader/include/llapi/mc/RelativeFloat.hpp index 36d4cf8004..ca659cfacf 100644 --- a/LiteLoader/include/llapi/mc/RelativeFloat.hpp +++ b/LiteLoader/include/llapi/mc/RelativeFloat.hpp @@ -42,16 +42,16 @@ class RelativeFloat { public: /** - * @symbol ??0RelativeFloat\@\@QEAA\@XZ + * @symbol ??0RelativeFloat\@\@QEAA\@M_N\@Z */ - MCAPI RelativeFloat(); + MCAPI RelativeFloat(float, bool); /** - * @symbol ??0RelativeFloat\@\@QEAA\@M_N\@Z + * @symbol ??0RelativeFloat\@\@QEAA\@XZ */ - MCAPI RelativeFloat(float, bool); + MCAPI RelativeFloat(); /** - * @symbol ?getValue\@RelativeFloat\@\@QEBAMM\@Z + * @symbol ?getValue\@RelativeFloat\@\@QEBAMM\@Z */ MCAPI float getValue(float) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReloadCommand.hpp b/LiteLoader/include/llapi/mc/ReloadCommand.hpp index cf44dbd42c..4a3d8afe8f 100644 --- a/LiteLoader/include/llapi/mc/ReloadCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReloadCommand.hpp @@ -31,18 +31,18 @@ class ReloadCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReloadCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ReloadCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ReloadCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ReloadCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ReloadCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoteConnector.hpp b/LiteLoader/include/llapi/mc/RemoteConnector.hpp index 812b791631..6e79e2f5ac 100644 --- a/LiteLoader/include/llapi/mc/RemoteConnector.hpp +++ b/LiteLoader/include/llapi/mc/RemoteConnector.hpp @@ -26,9 +26,9 @@ class RemoteConnector { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOTECONNECTOR /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~RemoteConnector(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp b/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp index b47101f729..d5015ab615 100644 --- a/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp +++ b/LiteLoader/include/llapi/mc/RemoteConnectorComposite.hpp @@ -5,9 +5,9 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "RakNetConnector.hpp" #include "RakPeerHelper.hpp" -#include "Bedrock.hpp" #define BEFORE_EXTRA @@ -27,52 +27,52 @@ class RemoteConnectorComposite { public: /** - * @symbol ??0RemoteConnectorComposite\@\@QEAA\@XZ + * @symbol ??0RemoteConnectorComposite\@\@QEAA\@XZ */ MCAPI RemoteConnectorComposite(); /** - * @symbol ?disable\@RemoteConnectorComposite\@\@QEAAXXZ + * @symbol ?disable\@RemoteConnectorComposite\@\@QEAAXXZ */ MCAPI void disable(); /** - * @symbol ?getActiveConnector\@RemoteConnectorComposite\@\@QEBA?AV?$shared_ptr\@VRemoteConnector\@\@\@std\@\@XZ + * @symbol ?getActiveConnector\@RemoteConnectorComposite\@\@QEBA?AV?$NonOwnerPointer\@VRemoteConnector\@\@\@Bedrock\@\@XZ */ - MCAPI class std::shared_ptr getActiveConnector() const; + MCAPI class Bedrock::NonOwnerPointer getActiveConnector() const; /** - * @symbol ?getNetherNetConnector\@RemoteConnectorComposite\@\@QEBA?AV?$shared_ptr\@UNetherNetConnector\@\@\@std\@\@XZ + * @symbol ?getNetherNetConnector\@RemoteConnectorComposite\@\@QEBA?AV?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@XZ */ - MCAPI class std::shared_ptr getNetherNetConnector() const; + MCAPI class Bedrock::NonOwnerPointer getNetherNetConnector() const; /** - * @symbol ?getRakNetConnector\@RemoteConnectorComposite\@\@QEBA?AV?$shared_ptr\@VRakNetConnector\@\@\@std\@\@XZ + * @symbol ?getRakNetConnector\@RemoteConnectorComposite\@\@QEBA?AV?$NonOwnerPointer\@VRakNetConnector\@\@\@Bedrock\@\@XZ */ - MCAPI class std::shared_ptr getRakNetConnector() const; + MCAPI class Bedrock::NonOwnerPointer getRakNetConnector() const; /** - * @symbol ?hasNetherNetConnector\@RemoteConnectorComposite\@\@QEBA_NXZ + * @symbol ?hasNetherNetConnector\@RemoteConnectorComposite\@\@QEBA_NXZ */ MCAPI bool hasNetherNetConnector() const; /** - * @symbol ?initializeRakNetConnector\@RemoteConnectorComposite\@\@QEAAXAEAUConnectionCallbacks\@RakNetConnector\@\@AEAVIPSupportInterface\@RakPeerHelper\@\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @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 + * @symbol ?isActiveConnectorSet\@RemoteConnectorComposite\@\@QEBA_NXZ */ MCAPI bool isActiveConnectorSet() const; /** - * @symbol ?setActiveTransportLayer\@RemoteConnectorComposite\@\@QEAAXW4TransportLayer\@\@\@Z + * @symbol ?setActiveTransportLayer\@RemoteConnectorComposite\@\@QEAAXW4TransportLayer\@\@\@Z */ MCAPI void setActiveTransportLayer(enum class TransportLayer); /** - * @symbol ?tryEnable\@RemoteConnectorComposite\@\@QEAAXXZ + * @symbol ?tryEnable\@RemoteConnectorComposite\@\@QEAAXXZ */ MCAPI void tryEnable(); /** - * @symbol ?update\@RemoteConnectorComposite\@\@QEAAXXZ + * @symbol ?update\@RemoteConnectorComposite\@\@QEAAXXZ */ MCAPI void update(); /** - * @symbol ??1RemoteConnectorComposite\@\@QEAA\@XZ + * @symbol ??1RemoteConnectorComposite\@\@QEAA\@XZ */ MCAPI ~RemoteConnectorComposite(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp index 93c427dbe4..b3e3cc315b 100644 --- a/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveActorPacket.hpp @@ -30,37 +30,43 @@ class RemoveActorPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RemoveActorPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RemoveActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RemoveActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RemoveActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RemoveActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RemoveActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RemoveActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RemoveActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEACTORPACKET /** - * @symbol ??0RemoveActorPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI RemoveActorPacket(); + MCVAPI ~RemoveActorPacket(); +#endif /** - * @symbol ??0RemoveActorPacket\@\@QEAA\@UActorUniqueID\@\@\@Z + * @symbol ??0RemoveActorPacket\@\@QEAA\@UActorUniqueID\@\@\@Z */ MCAPI RemoveActorPacket(struct ActorUniqueID); + /** + * @symbol ??0RemoveActorPacket\@\@QEAA\@XZ + */ + MCAPI RemoveActorPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp b/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp index b5dd64b793..d9a9ee1fed 100644 --- a/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp +++ b/LiteLoader/include/llapi/mc/RemoveAllPassengersSystem.hpp @@ -28,12 +28,12 @@ class RemoveAllPassengersSystem { public: /** - * @symbol ?createSystem\@RemoveAllPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@RemoveAllPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?removeAllPassengers\@RemoveAllPassengersSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUVehicleComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z + * @symbol ?removeAllPassengers\@RemoveAllPassengersSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUVehicleComponent\@\@V?$Optional\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z */ MCAPI static void removeAllPassengers(class StrictEntityContext &, struct VehicleComponent &, class Optional>, class EntityModifierT, class FlagComponent> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp index 5176ed9bbf..c8a1e24aa4 100644 --- a/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveEntityPacket.hpp @@ -30,27 +30,33 @@ class RemoveEntityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RemoveEntityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RemoveEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RemoveEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RemoveEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RemoveEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEENTITYPACKET /** - * @symbol ??0RemoveEntityPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI RemoveEntityPacket(); + MCVAPI ~RemoveEntityPacket(); +#endif /** - * @symbol ??0RemoveEntityPacket\@\@QEAA\@AEAVEntityContext\@\@\@Z + * @symbol ??0RemoveEntityPacket\@\@QEAA\@AEAVEntityContext\@\@\@Z */ MCAPI RemoveEntityPacket(class EntityContext &); + /** + * @symbol ??0RemoveEntityPacket\@\@QEAA\@XZ + */ + MCAPI RemoveEntityPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveMobEffectResponse.hpp b/LiteLoader/include/llapi/mc/RemoveMobEffectResponse.hpp index b4b55bc87f..180ccae25d 100644 --- a/LiteLoader/include/llapi/mc/RemoveMobEffectResponse.hpp +++ b/LiteLoader/include/llapi/mc/RemoveMobEffectResponse.hpp @@ -31,28 +31,28 @@ class RemoveMobEffectResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RemoveMobEffectResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@RemoveMobEffectResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@RemoveMobEffectResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@RemoveMobEffectResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@RemoveMobEffectResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@RemoveMobEffectResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@RemoveMobEffectResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@RemoveMobEffectResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@RemoveMobEffectResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp index 221198ef6b..06e06fa297 100644 --- a/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveObjectivePacket.hpp @@ -30,37 +30,43 @@ class RemoveObjectivePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RemoveObjectivePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RemoveObjectivePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RemoveObjectivePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RemoveObjectivePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RemoveObjectivePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RemoveObjectivePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RemoveObjectivePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RemoveObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEOBJECTIVEPACKET /** - * @symbol ??0RemoveObjectivePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI RemoveObjectivePacket(); + MCVAPI ~RemoveObjectivePacket(); +#endif /** - * @symbol ??0RemoveObjectivePacket\@\@QEAA\@AEBVObjective\@\@\@Z + * @symbol ??0RemoveObjectivePacket\@\@QEAA\@AEBVObjective\@\@\@Z */ MCAPI RemoveObjectivePacket(class Objective const &); + /** + * @symbol ??0RemoveObjectivePacket\@\@QEAA\@XZ + */ + MCAPI RemoveObjectivePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp b/LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp index 24d237a0bf..748cc9a8ae 100644 --- a/LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/RemoveOnHitSubcomponent.hpp @@ -29,43 +29,43 @@ class RemoveOnHitSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RemoveOnHitSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@RemoveOnHitSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@RemoveOnHitSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@RemoveOnHitSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@RemoveOnHitSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEONHITSUBCOMPONENT /** - * @symbol ?readfromJSON\@RemoveOnHitSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?readfromJSON\@RemoveOnHitSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCVAPI void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @symbol ?writetoJSON\@RemoveOnHitSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?writetoJSON\@RemoveOnHitSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ MCVAPI void writetoJSON(class Json::Value &) const; #endif /** - * @symbol ??0RemoveOnHitSubcomponent\@\@QEAA\@XZ + * @symbol ??0RemoveOnHitSubcomponent\@\@QEAA\@XZ */ MCAPI RemoveOnHitSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp b/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp index d72d05a837..94d1d5226b 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersComponent.hpp @@ -28,11 +28,11 @@ struct RemovePassengersComponent { public: /** - * @symbol ??4RemovePassengersComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4RemovePassengersComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct RemovePassengersComponent & operator=(struct RemovePassengersComponent &&); /** - * @symbol ??1RemovePassengersComponent\@\@QEAA\@XZ + * @symbol ??1RemovePassengersComponent\@\@QEAA\@XZ */ MCAPI ~RemovePassengersComponent(); diff --git a/LiteLoader/include/llapi/mc/RemovePassengersSystem.hpp b/LiteLoader/include/llapi/mc/RemovePassengersSystem.hpp index cf29d4fdc5..a580790877 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersSystem.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersSystem.hpp @@ -28,8 +28,8 @@ class RemovePassengersSystem { public: /** - * @symbol ?createRemovePassengersSystem\@RemovePassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createRemovePassengersSystem\@RemovePassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createRemovePassengersSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp b/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp index 04b1347deb..552ad08268 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersSystemImpl.hpp @@ -28,8 +28,8 @@ class RemovePassengersSystemImpl { public: /** - * @symbol ?_removePassengersSystem\@RemovePassengersSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEAURemovePassengersComponent\@\@AEAUVehicleComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z + * @symbol ?_removePassengersSystem\@RemovePassengersSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEAURemovePassengersComponent\@\@AEAUVehicleComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UVehicleComponent\@\@V?$FlagComponent\@URecalculateControlledByLocalInstanceRequestFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@Z */ MCAPI static void _removePassengersSystem(class StrictEntityContext &, struct RemovePassengersComponent &, struct VehicleComponent &, class EntityModifierT, class FlagComponent>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp b/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp index aa9258eef5..7cf0c6950d 100644 --- a/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp +++ b/LiteLoader/include/llapi/mc/RemovePassengersWithoutSeatSystem.hpp @@ -28,12 +28,12 @@ class RemovePassengersWithoutSeatSystem { public: /** - * @symbol ?createSystem\@RemovePassengersWithoutSeatSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@RemovePassengersWithoutSeatSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?removePassengersWithoutSeat\@RemovePassengersWithoutSeatSystem\@\@SAXAEAVStrictEntityContext\@\@AEBVRideableComponent\@\@AEAUVehicleComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z + * @symbol ?removePassengersWithoutSeat\@RemovePassengersWithoutSeatSystem\@\@SAXAEAVStrictEntityContext\@\@AEBVRideableComponent\@\@AEAUVehicleComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@\@\@\@Z */ MCAPI static void removePassengersWithoutSeat(class StrictEntityContext &, class RideableComponent const &, struct VehicleComponent &, class EntityModifierT> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp index 4eda21985d..dd0586cff9 100644 --- a/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RemoveVolumeEntityPacket.hpp @@ -31,33 +31,39 @@ class RemoveVolumeEntityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RemoveVolumeEntityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RemoveVolumeEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RemoveVolumeEntityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RemoveVolumeEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RemoveVolumeEntityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RemoveVolumeEntityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RemoveVolumeEntityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RemoveVolumeEntityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_REMOVEVOLUMEENTITYPACKET /** - * @symbol ??0RemoveVolumeEntityPacket\@\@QEAA\@AEAVEntityContext\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RemoveVolumeEntityPacket(); +#endif + /** + * @symbol ??0RemoveVolumeEntityPacket\@\@QEAA\@AEAVEntityContext\@\@\@Z */ MCAPI RemoveVolumeEntityPacket(class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp b/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp index ec6c24b462..e6c15d4105 100644 --- a/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RenderOffsetsItemComponent.hpp @@ -41,62 +41,62 @@ struct ItemTransforms { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RenderOffsetsItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VRenderOffsetsItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VRenderOffsetsItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @symbol ?_fromString\@RenderOffsetsItemComponent\@\@CAXAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_fromString\@RenderOffsetsItemComponent\@\@CAXAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void _fromString(class RenderOffsetsItemComponent &, std::string const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRenderOffsetsItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRenderOffsetsItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?bindType\@RenderOffsetsItemComponent\@\@SAXXZ + * @symbol ?bindType\@RenderOffsetsItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@RenderOffsetsItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@RenderOffsetsItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); //private: /** - * @symbol ?_fromString\@RenderOffsetsItemComponent\@\@CAXAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_fromString\@RenderOffsetsItemComponent\@\@CAXAEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void _fromString(class RenderOffsetsItemComponent &, std::string const &); private: /** - * @symbol ?Main_Hand_Defaults\@RenderOffsetsItemComponent\@\@0UItemTransforms\@1\@A + * @symbol ?Main_Hand_Defaults\@RenderOffsetsItemComponent\@\@0UItemTransforms\@1\@A */ MCAPI static struct RenderOffsetsItemComponent::ItemTransforms Main_Hand_Defaults; /** - * @symbol ?Off_Hand_Defaults\@RenderOffsetsItemComponent\@\@0UItemTransforms\@1\@A + * @symbol ?Off_Hand_Defaults\@RenderOffsetsItemComponent\@\@0UItemTransforms\@1\@A */ MCAPI static struct RenderOffsetsItemComponent::ItemTransforms Off_Hand_Defaults; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RenderParams.hpp b/LiteLoader/include/llapi/mc/RenderParams.hpp index b996db6f86..761bb2b953 100644 --- a/LiteLoader/include/llapi/mc/RenderParams.hpp +++ b/LiteLoader/include/llapi/mc/RenderParams.hpp @@ -28,40 +28,40 @@ class RenderParams { public: /** - * @symbol ??0RenderParams\@\@QEAA\@XZ + * @symbol ??0RenderParams\@\@QEAA\@AEBV0\@\@Z */ - MCAPI RenderParams(); + MCAPI RenderParams(class RenderParams const &); /** - * @symbol ??0RenderParams\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0RenderParams\@\@QEAA\@XZ */ - MCAPI RenderParams(class RenderParams &&); + MCAPI RenderParams(); /** - * @symbol ??0RenderParams\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0RenderParams\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI RenderParams(class RenderParams const &); + MCAPI RenderParams(class RenderParams &&); /** - * @symbol ?getActorTarget\@RenderParams\@\@QEBAPEAVActor\@\@W4FilterSubject\@\@\@Z + * @symbol ?getActorTarget\@RenderParams\@\@QEBAPEAVActor\@\@W4FilterSubject\@\@\@Z */ MCAPI class Actor * getActorTarget(enum class FilterSubject) const; /** - * @symbol ?init\@RenderParams\@\@QEAAAEAV1\@PEAVBaseActorRenderContext\@\@PEAVActor\@\@PEAVAnimationComponent\@\@PEAVMolangVariableMap\@\@V?$shared_ptr\@VDataDrivenModel\@\@\@std\@\@MM\@Z + * @symbol ?init\@RenderParams\@\@QEAAAEAV1\@PEAVBaseActorRenderContext\@\@PEAVActor\@\@PEAVAnimationComponent\@\@PEAVMolangVariableMap\@\@V?$shared_ptr\@VDataDrivenModel\@\@\@std\@\@MM\@Z */ MCAPI class RenderParams & init(class BaseActorRenderContext *, class Actor *, class AnimationComponent *, class MolangVariableMap *, class std::shared_ptr, float, float); /** - * @symbol ??4RenderParams\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4RenderParams\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class RenderParams & operator=(class RenderParams &&); /** - * @symbol ??ARenderParams\@\@QEAAAEAM_K\@Z + * @symbol ??ARenderParams\@\@QEAAAEAM_K\@Z */ MCAPI float & operator[](unsigned __int64); /** - * @symbol ??1RenderParams\@\@QEAA\@XZ + * @symbol ??1RenderParams\@\@QEAA\@XZ */ MCAPI ~RenderParams(); /** - * @symbol ?getRenderParams\@RenderParams\@\@SAAEAV1\@AEAVActor\@\@\@Z + * @symbol ?getRenderParams\@RenderParams\@\@SAAEAV1\@AEAVActor\@\@\@Z */ MCAPI static class RenderParams & getRenderParams(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp b/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp index ae07dfb4f9..60ddec2ece 100644 --- a/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp +++ b/LiteLoader/include/llapi/mc/RenderingRidingOffsetInfo.hpp @@ -11,26 +11,26 @@ #undef BEFORE_EXTRA -struct RenderingRidingOffsetInfo { +class RenderingRidingOffsetInfo { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_RENDERINGRIDINGOFFSETINFO public: - struct RenderingRidingOffsetInfo& operator=(struct RenderingRidingOffsetInfo const &) = delete; - RenderingRidingOffsetInfo(struct RenderingRidingOffsetInfo const &) = delete; + class RenderingRidingOffsetInfo& operator=(class RenderingRidingOffsetInfo const &) = delete; + RenderingRidingOffsetInfo(class RenderingRidingOffsetInfo const &) = delete; RenderingRidingOffsetInfo() = delete; #endif public: /** - * @symbol ??0RenderingRidingOffsetInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ??0RenderingRidingOffsetInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI RenderingRidingOffsetInfo(std::string const &, std::string const &); /** - * @symbol ??1RenderingRidingOffsetInfo\@\@QEAA\@XZ + * @symbol ??1RenderingRidingOffsetInfo\@\@QEAA\@XZ */ MCAPI ~RenderingRidingOffsetInfo(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepairItemEntry.hpp b/LiteLoader/include/llapi/mc/RepairItemEntry.hpp index d5731efe87..9263779e93 100644 --- a/LiteLoader/include/llapi/mc/RepairItemEntry.hpp +++ b/LiteLoader/include/llapi/mc/RepairItemEntry.hpp @@ -23,23 +23,23 @@ struct RepairItemEntry { #undef AFTER_EXTRA public: /** - * @symbol ??0RepairItemEntry\@\@QEAA\@XZ + * @symbol ??0RepairItemEntry\@\@QEAA\@AEBU0\@\@Z */ - MCAPI RepairItemEntry(); + MCAPI RepairItemEntry(struct RepairItemEntry const &); /** - * @symbol ??0RepairItemEntry\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0RepairItemEntry\@\@QEAA\@XZ */ - MCAPI RepairItemEntry(struct RepairItemEntry const &); + MCAPI RepairItemEntry(); /** - * @symbol ??4RepairItemEntry\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4RepairItemEntry\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct RepairItemEntry & operator=(struct RepairItemEntry &&); /** - * @symbol ??4RepairItemEntry\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4RepairItemEntry\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct RepairItemEntry & operator=(struct RepairItemEntry const &); /** - * @symbol ??1RepairItemEntry\@\@QEAA\@XZ + * @symbol ??1RepairItemEntry\@\@QEAA\@XZ */ MCAPI ~RepairItemEntry(); diff --git a/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp index eb24b1ffbe..0b7e992cf1 100644 --- a/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp +++ b/LiteLoader/include/llapi/mc/RepairItemRecipe.hpp @@ -31,47 +31,47 @@ class RepairItemRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepairItemRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@RepairItemRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@RepairItemRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@RepairItemRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@RepairItemRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@RepairItemRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 6 - * @symbol ?matches\@RepairItemRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@RepairItemRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@RepairItemRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@RepairItemRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @symbol ??0RepairItemRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@PEBVUUID\@mce\@\@\@Z + * @symbol ??0RepairItemRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEBVUUID\@mce\@\@\@Z */ - MCAPI RepairItemRecipe(class gsl::basic_string_span, class mce::UUID const *); + MCAPI RepairItemRecipe(class std::basic_string_view>, class mce::UUID const *); /** - * @symbol ?ID\@RepairItemRecipe\@\@2VUUID\@mce\@\@A + * @symbol ?ID\@RepairItemRecipe\@\@2VUUID\@mce\@\@A */ MCAPI static class mce::UUID ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp b/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp index 493edf7d72..b613e4234a 100644 --- a/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/RepairableItemComponent.hpp @@ -30,71 +30,71 @@ class RepairableItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepairableItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VRepairableItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VRepairableItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRepairableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VRepairableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?handleItemRepair\@RepairableItemComponent\@\@QEAAHAEAVItemStackBase\@\@0\@Z + * @symbol ?handleItemRepair\@RepairableItemComponent\@\@QEAAHAEAVItemStackBase\@\@0\@Z */ MCAPI int handleItemRepair(class ItemStackBase &, class ItemStackBase &); /** - * @symbol ?isValidRepairItem\@RepairableItemComponent\@\@QEBA_NAEBVItemStackBase\@\@\@Z + * @symbol ?isValidRepairItem\@RepairableItemComponent\@\@QEBA_NAEBVItemStackBase\@\@\@Z */ MCAPI bool isValidRepairItem(class ItemStackBase const &) const; /** - * @symbol ?bindType\@RepairableItemComponent\@\@SAXXZ + * @symbol ?bindType\@RepairableItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@RepairableItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@RepairableItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); /** - * @symbol ?registerVersionUpgrades\@RepairableItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z + * @symbol ?registerVersionUpgrades\@RepairableItemComponent\@\@SAXAEAVCerealSchemaUpgradeSet\@\@\@Z */ MCAPI static void registerVersionUpgrades(class CerealSchemaUpgradeSet &); //private: /** - * @symbol ?_getRepairItemEntry\@RepairableItemComponent\@\@AEBAPEBURepairItemEntry\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?_getRepairItemEntry\@RepairableItemComponent\@\@AEBAPEBURepairItemEntry\@\@AEBVItemStackBase\@\@\@Z */ MCAPI struct RepairItemEntry const * _getRepairItemEntry(class ItemStackBase const &) const; /** - * @symbol ?_repairItem\@RepairableItemComponent\@\@AEAAHAEAVItemStackBase\@\@0VExpressionNode\@\@\@Z + * @symbol ?_repairItem\@RepairableItemComponent\@\@AEAAHAEAVItemStackBase\@\@0VExpressionNode\@\@\@Z */ MCAPI int _repairItem(class ItemStackBase &, class ItemStackBase &, class ExpressionNode); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp b/LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp index 9e3d6207fc..3fac1d1563 100644 --- a/LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilFailureDefinition.hpp @@ -32,14 +32,14 @@ class RepeatUntilFailureDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepeatUntilFailureDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@RepeatUntilFailureDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@RepeatUntilFailureDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp b/LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp index 6e65829b6e..4e01715ae9 100644 --- a/LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilFailureNode.hpp @@ -29,23 +29,23 @@ class RepeatUntilFailureNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepeatUntilFailureNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@RepeatUntilFailureNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@RepeatUntilFailureNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@RepeatUntilFailureNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@RepeatUntilFailureNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0RepeatUntilFailureNode\@\@QEAA\@XZ + * @symbol ??0RepeatUntilFailureNode\@\@QEAA\@XZ */ MCAPI RepeatUntilFailureNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp b/LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp index 1ffcb37360..24b633e7e0 100644 --- a/LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilSuccessDefinition.hpp @@ -32,14 +32,14 @@ class RepeatUntilSuccessDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepeatUntilSuccessDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@RepeatUntilSuccessDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@RepeatUntilSuccessDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp b/LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp index 55c9f0b2aa..7a81440ea0 100644 --- a/LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp +++ b/LiteLoader/include/llapi/mc/RepeatUntilSuccessNode.hpp @@ -29,23 +29,23 @@ class RepeatUntilSuccessNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepeatUntilSuccessNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@RepeatUntilSuccessNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@RepeatUntilSuccessNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@RepeatUntilSuccessNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@RepeatUntilSuccessNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0RepeatUntilSuccessNode\@\@QEAA\@XZ + * @symbol ??0RepeatUntilSuccessNode\@\@QEAA\@XZ */ MCAPI RepeatUntilSuccessNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp index 389286e744..5a89ba2291 100644 --- a/LiteLoader/include/llapi/mc/RepeaterBlock.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterBlock.hpp @@ -31,295 +31,300 @@ class RepeaterBlock : public DiodeBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepeaterBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@RepeaterBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@RepeaterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@RepeaterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@RepeaterBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 194 - * @symbol ?isLocked\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 195 + * @symbol ?isLocked\@RepeaterBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isLocked(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 200 - * @symbol ?isAlternateInput\@RepeaterBlock\@\@MEBA_NAEBVBlock\@\@\@Z + * @vftbl 201 + * @symbol ?isAlternateInput\@RepeaterBlock\@\@MEBA_NAEBVBlock\@\@\@Z */ virtual bool isAlternateInput(class Block const &) const; /** - * @vftbl 204 - * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z + * @vftbl 205 + * @symbol ?getTurnOnDelay\@RepeaterBlock\@\@MEBAHAEBVBlock\@\@\@Z */ virtual int getTurnOnDelay(class Block const &) const; /** - * @vftbl 205 - * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z + * @vftbl 206 + * @symbol ?getOnBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOnBlock(class Block const *) const; /** - * @vftbl 206 - * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z + * @vftbl 207 + * @symbol ?getOffBlock\@RepeaterBlock\@\@MEBAPEBVBlock\@\@PEBV2\@\@Z */ virtual class Block const * getOffBlock(class Block const *) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_REPEATERBLOCK /** - * @symbol ?canBeSilkTouched\@RepeaterBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@RepeaterBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isInteractiveBlock\@RepeaterBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@RepeaterBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0RepeaterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0RepeaterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI RepeaterBlock(std::string const &, int, bool); /** - * @symbol ?updateDelay\@RepeaterBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?updateDelay\@RepeaterBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI void updateDelay(class BlockSource &, class BlockPos const &, bool) const; /** - * @symbol ?DELAY_RENDER_OFFSETS\@RepeaterBlock\@\@2QBMB + * @symbol ?DELAY_RENDER_OFFSETS\@RepeaterBlock\@\@2QBMB */ MCAPI static float const DELAY_RENDER_OFFSETS[]; @@ -327,8 +332,8 @@ class RepeaterBlock : public DiodeBlock { private: /** - * @symbol ?DELAYS\@RepeaterBlock\@\@0QBHB + * @symbol ?DELAYS\@RepeaterBlock\@\@0QBHB */ MCAPI static int const DELAYS[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp b/LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp index 8373bf0785..10b6442791 100644 --- a/LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp +++ b/LiteLoader/include/llapi/mc/RepeaterCapacitor.hpp @@ -30,67 +30,67 @@ class RepeaterCapacitor : public SidePoweredComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RepeaterCapacitor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getStrength\@RepeaterCapacitor\@\@UEBAHXZ + * @vftbl 1 + * @symbol ?getStrength\@RepeaterCapacitor\@\@UEBAHXZ */ virtual int getStrength() const; /** - * @vftbl 3 - * @symbol ?setStrength\@RepeaterCapacitor\@\@UEAAXH\@Z + * @vftbl 3 + * @symbol ?setStrength\@RepeaterCapacitor\@\@UEAAXH\@Z */ virtual void setStrength(int); /** - * @vftbl 11 - * @symbol ?addSource\@RepeaterCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@RepeaterCapacitor\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 13 - * @symbol ?checkLock\@RepeaterCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 13 + * @symbol ?checkLock\@RepeaterCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void checkLock(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 14 - * @symbol ?evaluate\@RepeaterCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@RepeaterCapacitor\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 15 - * @symbol ?cacheValues\@RepeaterCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 15 + * @symbol ?cacheValues\@RepeaterCapacitor\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void cacheValues(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 16 - * @symbol ?updateDependencies\@RepeaterCapacitor\@\@UEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z + * @vftbl 16 + * @symbol ?updateDependencies\@RepeaterCapacitor\@\@UEAAXAEAVCircuitSceneGraph\@\@AEBVBlockPos\@\@\@Z */ virtual void updateDependencies(class CircuitSceneGraph &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@RepeaterCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@RepeaterCapacitor\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @symbol ??0RepeaterCapacitor\@\@QEAA\@XZ + * @symbol ??0RepeaterCapacitor\@\@QEAA\@XZ */ MCAPI RepeaterCapacitor(); /** - * @symbol ?setDelay\@RepeaterCapacitor\@\@QEAAXH\@Z + * @symbol ?setDelay\@RepeaterCapacitor\@\@QEAAXH\@Z */ MCAPI void setDelay(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp index ff5d4d93cd..6541c4a74d 100644 --- a/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp +++ b/LiteLoader/include/llapi/mc/ReplaceItemCommand.hpp @@ -32,26 +32,26 @@ class ReplaceItemCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ReplaceItemCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ReplaceItemCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ReplaceItemCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ReplaceItemCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ReplaceItemCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_outputError\@ReplaceItemCommand\@\@AEBAXAEAVCommandOutput\@\@UReplacementResults\@Util\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_outputError\@ReplaceItemCommand\@\@AEBAXAEAVCommandOutput\@\@UReplacementResults\@Util\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _outputError(class CommandOutput &, struct Util::ReplacementResults, std::string const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReplaceRule.hpp b/LiteLoader/include/llapi/mc/ReplaceRule.hpp index 161eecfb1f..1db6ace5ad 100644 --- a/LiteLoader/include/llapi/mc/ReplaceRule.hpp +++ b/LiteLoader/include/llapi/mc/ReplaceRule.hpp @@ -28,11 +28,11 @@ struct ReplaceRule { public: /** - * @symbol ??0ReplaceRule\@\@QEAA\@VBlockDescriptor\@\@V?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0ReplaceRule\@\@QEAA\@VBlockDescriptor\@\@V?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI ReplaceRule(class BlockDescriptor, std::vector); /** - * @symbol ??1ReplaceRule\@\@QEAA\@XZ + * @symbol ??1ReplaceRule\@\@QEAA\@XZ */ MCAPI ~ReplaceRule(); diff --git a/LiteLoader/include/llapi/mc/ReplayStateComponent.hpp b/LiteLoader/include/llapi/mc/ReplayStateComponent.hpp index 6beaabade7..04b86411ca 100644 --- a/LiteLoader/include/llapi/mc/ReplayStateComponent.hpp +++ b/LiteLoader/include/llapi/mc/ReplayStateComponent.hpp @@ -30,32 +30,32 @@ class ReplayStateComponent { public: /** - * @symbol ??0ReplayStateComponent\@\@QEAA\@V?$unique_ptr\@VActorHistory\@\@U?$default_delete\@VActorHistory\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UIReplayStatePolicy\@\@U?$default_delete\@UIReplayStatePolicy\@\@\@std\@\@\@2\@\@Z + * @symbol ??0ReplayStateComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ReplayStateComponent(std::unique_ptr, std::unique_ptr); + MCAPI ReplayStateComponent(class ReplayStateComponent &&); /** - * @symbol ??0ReplayStateComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ReplayStateComponent\@\@QEAA\@V?$unique_ptr\@VActorHistory\@\@U?$default_delete\@VActorHistory\@\@\@std\@\@\@std\@\@V?$unique_ptr\@UIReplayStatePolicy\@\@U?$default_delete\@UIReplayStatePolicy\@\@\@std\@\@\@2\@\@Z */ - MCAPI ReplayStateComponent(class ReplayStateComponent &&); + MCAPI ReplayStateComponent(std::unique_ptr, std::unique_ptr); /** - * @symbol ?getCurrentTick\@ReplayStateComponent\@\@QEBA_KXZ + * @symbol ?getCurrentTick\@ReplayStateComponent\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCurrentTick() const; /** - * @symbol ??4ReplayStateComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ReplayStateComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ReplayStateComponent & operator=(class ReplayStateComponent &&); /** - * @symbol ?shouldSendCorrectionToClient\@ReplayStateComponent\@\@QEBA?AUMovementCorrection\@\@AEAUIActorMovementProxy\@\@AEBVPlayerAuthInputPacket\@\@\@Z + * @symbol ?shouldSendCorrectionToClient\@ReplayStateComponent\@\@QEBA?AUMovementCorrection\@\@AEAUIActorMovementProxy\@\@AEBVPlayerAuthInputPacket\@\@\@Z */ MCAPI struct MovementCorrection shouldSendCorrectionToClient(struct IActorMovementProxy &, class PlayerAuthInputPacket const &) const; /** - * @symbol ?tick\@ReplayStateComponent\@\@QEAAXPEAUIActorMovementProxy\@\@_KPEAVEntityRegistry\@\@\@Z + * @symbol ?tick\@ReplayStateComponent\@\@QEAAXPEAUIActorMovementProxy\@\@_KPEAVEntityRegistry\@\@\@Z */ MCAPI void tick(struct IActorMovementProxy *, unsigned __int64, class EntityRegistry *); /** - * @symbol ??1ReplayStateComponent\@\@QEAA\@XZ + * @symbol ??1ReplayStateComponent\@\@QEAA\@XZ */ MCAPI ~ReplayStateComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp b/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp index 7198d2582d..4a478234a0 100644 --- a/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp +++ b/LiteLoader/include/llapi/mc/ReplayStateConfig.hpp @@ -28,11 +28,11 @@ struct ReplayStateConfig { public: /** - * @symbol ??0ReplayStateConfig\@\@QEAA\@W4ReplayStateMode\@\@\@Z + * @symbol ??0ReplayStateConfig\@\@QEAA\@W4ReplayStateMode\@\@\@Z */ MCAPI ReplayStateConfig(enum class ReplayStateMode); /** - * @symbol ?usesUnsupportedThresholds\@ReplayStateConfig\@\@QEBA_NXZ + * @symbol ?usesUnsupportedThresholds\@ReplayStateConfig\@\@QEBA_NXZ */ MCAPI bool usesUnsupportedThresholds() const; diff --git a/LiteLoader/include/llapi/mc/ReplayStatePolicy.hpp b/LiteLoader/include/llapi/mc/ReplayStatePolicy.hpp index f94e648283..53f59ad7b5 100644 --- a/LiteLoader/include/llapi/mc/ReplayStatePolicy.hpp +++ b/LiteLoader/include/llapi/mc/ReplayStatePolicy.hpp @@ -22,7 +22,7 @@ namespace ReplayStatePolicy { #undef AFTER_EXTRA /** - * @symbol ?createServerContext\@ReplayStatePolicy\@\@YA?AV?$unique_ptr\@UIReplayStatePolicy\@\@U?$default_delete\@UIReplayStatePolicy\@\@\@std\@\@\@std\@\@AEBUReplayStateConfig\@\@\@Z + * @symbol ?createServerContext\@ReplayStatePolicy\@\@YA?AV?$unique_ptr\@UIReplayStatePolicy\@\@U?$default_delete\@UIReplayStatePolicy\@\@\@std\@\@\@std\@\@AEBUReplayStateConfig\@\@\@Z */ MCAPI std::unique_ptr createServerContext(struct ReplayStateConfig const &); diff --git a/LiteLoader/include/llapi/mc/ReplayStateSystem.hpp b/LiteLoader/include/llapi/mc/ReplayStateSystem.hpp index 059aff36db..388b1bac25 100644 --- a/LiteLoader/include/llapi/mc/ReplayStateSystem.hpp +++ b/LiteLoader/include/llapi/mc/ReplayStateSystem.hpp @@ -28,12 +28,12 @@ class ReplayStateSystem { public: /** - * @symbol ?createAddReplayStateComponentSystem\@ReplayStateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createAddReplayStateComponentSystem\@ReplayStateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createAddReplayStateComponentSystem(); /** - * @symbol ?createReplayStateSystem\@ReplayStateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createReplayStateSystem\@ReplayStateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createReplayStateSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp index 5b980dbfe1..baeaaea8fd 100644 --- a/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestAbilityPacket.hpp @@ -28,45 +28,51 @@ class RequestAbilityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RequestAbilityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RequestAbilityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RequestAbilityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RequestAbilityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RequestAbilityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RequestAbilityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RequestAbilityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RequestAbilityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_REQUESTABILITYPACKET /** - * @symbol ??0RequestAbilityPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI RequestAbilityPacket(); + MCVAPI ~RequestAbilityPacket(); +#endif /** - * @symbol ??0RequestAbilityPacket\@\@QEAA\@W4AbilitiesIndex\@\@_N\@Z + * @symbol ??0RequestAbilityPacket\@\@QEAA\@W4AbilitiesIndex\@\@_N\@Z */ MCAPI RequestAbilityPacket(enum class AbilitiesIndex, bool); /** - * @symbol ?getAbility\@RequestAbilityPacket\@\@QEBA?AW4AbilitiesIndex\@\@XZ + * @symbol ??0RequestAbilityPacket\@\@QEAA\@XZ + */ + MCAPI RequestAbilityPacket(); + /** + * @symbol ?getAbility\@RequestAbilityPacket\@\@QEBA?AW4AbilitiesIndex\@\@XZ */ MCAPI enum class AbilitiesIndex getAbility() const; /** - * @symbol ?tryGetBool\@RequestAbilityPacket\@\@QEBA_NAEA_N\@Z + * @symbol ?tryGetBool\@RequestAbilityPacket\@\@QEBA_NAEA_N\@Z */ MCAPI bool tryGetBool(bool &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RequestActionLoader.hpp b/LiteLoader/include/llapi/mc/RequestActionLoader.hpp index 1606c8dbf3..f0a459e9f9 100644 --- a/LiteLoader/include/llapi/mc/RequestActionLoader.hpp +++ b/LiteLoader/include/llapi/mc/RequestActionLoader.hpp @@ -31,12 +31,12 @@ class RequestActionLoader { public: /** - * @symbol ?isValidTag\@RequestActionLoader\@\@SA_NW4RequestActionType\@IRequestAction\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?isValidTag\@RequestActionLoader\@\@SA_NW4RequestActionType\@IRequestAction\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static bool isValidTag(enum class IRequestAction::RequestActionType, class CompoundTag const &); /** - * @symbol ?load\@RequestActionLoader\@\@SA?AV?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@W4RequestActionType\@IRequestAction\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?load\@RequestActionLoader\@\@SA?AV?$unique_ptr\@VIRequestAction\@\@U?$default_delete\@VIRequestAction\@\@\@std\@\@\@std\@\@W4RequestActionType\@IRequestAction\@\@AEBVCompoundTag\@\@AEAVICommandOriginLoader\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr load(enum class IRequestAction::RequestActionType, class CompoundTag const &, class ICommandOriginLoader &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp index 7c8a406ed1..d76da3ff20 100644 --- a/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestChunkRadiusPacket.hpp @@ -30,33 +30,33 @@ class RequestChunkRadiusPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RequestChunkRadiusPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RequestChunkRadiusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RequestChunkRadiusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RequestChunkRadiusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RequestChunkRadiusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RequestChunkRadiusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RequestChunkRadiusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RequestChunkRadiusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0RequestChunkRadiusPacket\@\@QEAA\@XZ + * @symbol ??0RequestChunkRadiusPacket\@\@QEAA\@XZ */ MCAPI RequestChunkRadiusPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp index 340243a2ea..44122d44ca 100644 --- a/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestNetworkSettingsPacket.hpp @@ -28,33 +28,33 @@ class RequestNetworkSettingsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RequestNetworkSettingsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RequestNetworkSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RequestNetworkSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RequestNetworkSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RequestNetworkSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RequestNetworkSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RequestNetworkSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RequestNetworkSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0RequestNetworkSettingsPacket\@\@QEAA\@XZ + * @symbol ??0RequestNetworkSettingsPacket\@\@QEAA\@XZ */ MCAPI RequestNetworkSettingsPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp index 3fd628aa2a..069c5280ff 100644 --- a/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp +++ b/LiteLoader/include/llapi/mc/RequestPermissionsPacket.hpp @@ -28,45 +28,45 @@ class RequestPermissionsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RequestPermissionsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RequestPermissionsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RequestPermissionsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RequestPermissionsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RequestPermissionsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RequestPermissionsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RequestPermissionsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RequestPermissionsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0RequestPermissionsPacket\@\@QEAA\@XZ + * @symbol ??0RequestPermissionsPacket\@\@QEAA\@XZ */ MCAPI RequestPermissionsPacket(); /** - * @symbol ?getCustomAbilityValue\@RequestPermissionsPacket\@\@QEBA_NW4AbilitiesIndex\@\@\@Z + * @symbol ?getCustomAbilityValue\@RequestPermissionsPacket\@\@QEBA_NW4AbilitiesIndex\@\@\@Z */ MCAPI bool getCustomAbilityValue(enum class AbilitiesIndex) const; /** - * @symbol ?getPlayerPermissions\@RequestPermissionsPacket\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ + * @symbol ?getPlayerPermissions\@RequestPermissionsPacket\@\@QEBA?AW4PlayerPermissionLevel\@\@XZ */ MCAPI enum class PlayerPermissionLevel getPlayerPermissions() const; /** - * @symbol ?getTargetPlayerId\@RequestPermissionsPacket\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getTargetPlayerId\@RequestPermissionsPacket\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getTargetPlayerId() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp b/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp index 23c8908ced..ba04b582e7 100644 --- a/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetActionStopSystem.hpp @@ -28,8 +28,8 @@ class ResetActionStopSystem { public: /** - * @symbol ?createResetActionStopSystem\@ResetActionStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createResetActionStopSystem\@ResetActionStopSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetActionStopSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResetEventObj.hpp b/LiteLoader/include/llapi/mc/ResetEventObj.hpp index 71fe1a7209..6078cac316 100644 --- a/LiteLoader/include/llapi/mc/ResetEventObj.hpp +++ b/LiteLoader/include/llapi/mc/ResetEventObj.hpp @@ -30,24 +30,24 @@ class ResetEventObj { public: /** - * @symbol ??0ResetEventObj\@\@QEAA\@_N0\@Z + * @symbol ??0ResetEventObj\@\@QEAA\@_N0\@Z */ MCAPI ResetEventObj(bool, bool); /** - * @symbol ?set\@ResetEventObj\@\@QEAAXXZ + * @symbol ?set\@ResetEventObj\@\@QEAAXXZ */ MCAPI void set(); /** - * @symbol ?wait\@ResetEventObj\@\@QEAAXXZ + * @symbol ?wait\@ResetEventObj\@\@QEAAXXZ */ MCAPI void wait(); /** - * @symbol ?wait_until\@ResetEventObj\@\@QEAA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z + * @symbol ?wait_until\@ResetEventObj\@\@QEAA_NV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@\@Z */ MCAPI bool wait_until(class std::chrono::time_point>>); /** - * @symbol ??1ResetEventObj\@\@QEAA\@XZ + * @symbol ??1ResetEventObj\@\@QEAA\@XZ */ MCAPI ~ResetEventObj(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp b/LiteLoader/include/llapi/mc/ResetFrictionModifierSystem.hpp index 2b9836c518..467d8655e4 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 ?createResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetFrictionModifierSystem(); /** - * @symbol ?tickResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@UVanillaClientGameplayComponent\@\@\@\@UFrictionModifierComponent\@\@\@\@\@Z + * @symbol ?tickResetFrictionModifierSystem\@ResetFrictionModifierSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@V?$FlagComponent\@ULocalPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@UVanillaClientGameplayComponent\@\@\@\@UFrictionModifierComponent\@\@\@\@\@Z */ MCAPI static void tickResetFrictionModifierSystem(class ViewT, class FlagComponent, class FlagComponent, struct PlayerInputRequestComponent, struct VanillaClientGameplayComponent>, struct FrictionModifierComponent>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResetJumpRidingScaleSystem.hpp b/LiteLoader/include/llapi/mc/ResetJumpRidingScaleSystem.hpp index e85e9e4306..a1fa038329 100644 --- a/LiteLoader/include/llapi/mc/ResetJumpRidingScaleSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetJumpRidingScaleSystem.hpp @@ -28,16 +28,16 @@ class ResetJumpRidingScaleSystem { public: /** - * @symbol ?createSystem\@ResetJumpRidingScaleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ResetJumpRidingScaleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doResetJumpRidingScaleSystem\@ResetJumpRidingScaleSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUJumpRidingScaleComponent\@\@AEAUVanillaClientGameplayComponent\@\@\@Z + * @symbol ?_doResetJumpRidingScaleSystem\@ResetJumpRidingScaleSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUJumpRidingScaleComponent\@\@AEAUVanillaClientGameplayComponent\@\@\@Z */ MCAPI static void _doResetJumpRidingScaleSystem(class StrictEntityContext const &, struct JumpRidingScaleComponent &, struct VanillaClientGameplayComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResetMoveDirectionJumpPendingSystem.hpp b/LiteLoader/include/llapi/mc/ResetMoveDirectionJumpPendingSystem.hpp new file mode 100644 index 0000000000..82a44c1f95 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ResetMoveDirectionJumpPendingSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file ResetMoveDirectionJumpPendingSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ResetMoveDirectionJumpPendingSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RESETMOVEDIRECTIONJUMPPENDINGSYSTEM +public: + class ResetMoveDirectionJumpPendingSystem& operator=(class ResetMoveDirectionJumpPendingSystem const &) = delete; + ResetMoveDirectionJumpPendingSystem(class ResetMoveDirectionJumpPendingSystem const &) = delete; + ResetMoveDirectionJumpPendingSystem() = delete; +#endif + +public: + /** + * @symbol ?createResetMoveDirectionJumpPendingSystem\@ResetMoveDirectionJumpPendingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createResetMoveDirectionJumpPendingSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp b/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp index 4d5605df6c..1e968b9617 100644 --- a/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetPositionModeSystem.hpp @@ -28,8 +28,8 @@ class ResetPositionModeSystem { public: /** - * @symbol ?createResetPositionModeSystem\@ResetPositionModeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createResetPositionModeSystem\@ResetPositionModeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetPositionModeSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp b/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp index a876658390..0128c321ec 100644 --- a/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp +++ b/LiteLoader/include/llapi/mc/ResetSlideOffSetSystem.hpp @@ -28,8 +28,8 @@ class ResetSlideOffSetSystem { public: /** - * @symbol ?createResetSlideOffSetSystem\@ResetSlideOffSetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createResetSlideOffSetSystem\@ResetSlideOffSetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createResetSlideOffSetSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp b/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp index 6c27bef914..bddcf887a2 100644 --- a/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp +++ b/LiteLoader/include/llapi/mc/ResolvedItemIconInfo.hpp @@ -27,23 +27,23 @@ struct ResolvedItemIconInfo { public: /** - * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@XZ + * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@IH\@Z */ - MCAPI ResolvedItemIconInfo(); + MCAPI ResolvedItemIconInfo(unsigned int, int); /** - * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@IH\@Z + * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemIconInfoType\@\@\@Z */ - MCAPI ResolvedItemIconInfo(unsigned int, int); + MCAPI ResolvedItemIconInfo(std::string const &, int, enum class ItemIconInfoType); /** - * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMGG\@Z + * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@XZ */ - MCAPI ResolvedItemIconInfo(std::string const &, float, float, float, float, unsigned short, unsigned short); + MCAPI ResolvedItemIconInfo(); /** - * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4ItemIconInfoType\@\@\@Z + * @symbol ??0ResolvedItemIconInfo\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMGG\@Z */ - MCAPI ResolvedItemIconInfo(std::string const &, int, enum class ItemIconInfoType); + MCAPI ResolvedItemIconInfo(std::string const &, float, float, float, float, unsigned short, unsigned short); /** - * @symbol ??1ResolvedItemIconInfo\@\@QEAA\@XZ + * @symbol ??1ResolvedItemIconInfo\@\@QEAA\@XZ */ MCAPI ~ResolvedItemIconInfo(); diff --git a/LiteLoader/include/llapi/mc/ResolvedTextObject.hpp b/LiteLoader/include/llapi/mc/ResolvedTextObject.hpp index d8e7239430..885e7866e3 100644 --- a/LiteLoader/include/llapi/mc/ResolvedTextObject.hpp +++ b/LiteLoader/include/llapi/mc/ResolvedTextObject.hpp @@ -30,12 +30,12 @@ class ResolvedTextObject { public: /** - * @symbol ?getAsJsonString\@ResolvedTextObject\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getAsJsonString\@ResolvedTextObject\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getAsJsonString() const; /** - * @symbol ??1ResolvedTextObject\@\@QEAA\@XZ + * @symbol ??1ResolvedTextObject\@\@QEAA\@XZ */ MCAPI ~ResolvedTextObject(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceDefinition.hpp b/LiteLoader/include/llapi/mc/ResourceDefinition.hpp index e54ace4045..e5ae48ca5d 100644 --- a/LiteLoader/include/llapi/mc/ResourceDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ResourceDefinition.hpp @@ -22,7 +22,7 @@ namespace ResourceDefinition { #undef AFTER_EXTRA /** - * @symbol ?VANILLA_NAMESPACE\@ResourceDefinition\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?VANILLA_NAMESPACE\@ResourceDefinition\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const VANILLA_NAMESPACE; diff --git a/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp b/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp index e87d80a69f..01b6514022 100644 --- a/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp +++ b/LiteLoader/include/llapi/mc/ResourceDropsContext.hpp @@ -28,11 +28,15 @@ struct ResourceDropsContext { public: /** - * @symbol ??0ResourceDropsContext\@\@QEAA\@MAEBVItemStack\@\@AEBVBlockSource\@\@\@Z + * @symbol ??0ResourceDropsContext\@\@QEAA\@MAEBVItemStack\@\@AEAVILevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI ResourceDropsContext(float, class ItemStack const &, class ILevel &, class AutomaticID); + /** + * @symbol ??0ResourceDropsContext\@\@QEAA\@MAEBVItemStack\@\@AEBVBlockSource\@\@\@Z */ MCAPI ResourceDropsContext(float, class ItemStack const &, class BlockSource const &); /** - * @symbol ?getRandom\@ResourceDropsContext\@\@QEBAAEAVRandom\@\@XZ + * @symbol ?getRandom\@ResourceDropsContext\@\@QEBAAEAVRandom\@\@XZ */ MCAPI class Random & getRandom() const; diff --git a/LiteLoader/include/llapi/mc/ResourceHelper.hpp b/LiteLoader/include/llapi/mc/ResourceHelper.hpp index c3b040c576..02d0248e2f 100644 --- a/LiteLoader/include/llapi/mc/ResourceHelper.hpp +++ b/LiteLoader/include/llapi/mc/ResourceHelper.hpp @@ -23,11 +23,11 @@ namespace ResourceHelper { #undef AFTER_EXTRA /** - * @symbol ?deserializePackStackEntry\@ResourceHelper\@\@YA_NAEBVValue\@Json\@\@AEAUPackInstanceId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?deserializePackStackEntry\@ResourceHelper\@\@YA_NAEBVValue\@Json\@\@AEAUPackInstanceId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool deserializePackStackEntry(class Json::Value const &, struct PackInstanceId &, std::string const &); /** - * @symbol ?stringifyResourceMetadataGeneratedWith\@ResourceHelper\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceMetadata\@\@\@Z + * @symbol ?stringifyResourceMetadataGeneratedWith\@ResourceHelper\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceMetadata\@\@\@Z */ MCAPI std::string stringifyResourceMetadataGeneratedWith(class ResourceMetadata const &); diff --git a/LiteLoader/include/llapi/mc/ResourceInformation.hpp b/LiteLoader/include/llapi/mc/ResourceInformation.hpp index d53b809704..78fa766afe 100644 --- a/LiteLoader/include/llapi/mc/ResourceInformation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceInformation.hpp @@ -31,32 +31,32 @@ enum class ResourceType; public: /** - * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z + * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, enum class ResourceInformation::ResourceType, std::string const &, std::string const &); + MCAPI ResourceInformation(class ResourceInformation const &); /** - * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@000\@Z + * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@000\@Z */ MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ??0ResourceInformation\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ResourceInformation\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@AEBVUUID\@mce\@\@W4ResourceType\@0\@00\@Z */ - MCAPI ResourceInformation(class ResourceInformation const &); + MCAPI ResourceInformation(std::string const &, class SemVersion const &, class mce::UUID const &, enum class ResourceInformation::ResourceType, std::string const &, std::string const &); /** - * @symbol ?satisfies\@ResourceInformation\@\@QEBA_NAEBUPackIdVersion\@\@\@Z + * @symbol ?satisfies\@ResourceInformation\@\@QEBA_NAEBUPackIdVersion\@\@\@Z */ MCAPI bool satisfies(struct PackIdVersion const &) const; /** - * @symbol ??1ResourceInformation\@\@QEAA\@XZ + * @symbol ??1ResourceInformation\@\@QEAA\@XZ */ MCAPI ~ResourceInformation(); /** - * @symbol ?ResourceTypeFromString\@ResourceInformation\@\@SA?AW4ResourceType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?ResourceTypeFromString\@ResourceInformation\@\@SA?AW4ResourceType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class ResourceInformation::ResourceType ResourceTypeFromString(std::string const &); /** - * @symbol ?StringFromResourceType\@ResourceInformation\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ResourceType\@1\@\@Z + * @symbol ?StringFromResourceType\@ResourceInformation\@\@SAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ResourceType\@1\@\@Z */ MCAPI static std::string const & StringFromResourceType(enum class ResourceInformation::ResourceType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceLoadManager.hpp b/LiteLoader/include/llapi/mc/ResourceLoadManager.hpp index eced76018c..3015dc003a 100644 --- a/LiteLoader/include/llapi/mc/ResourceLoadManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLoadManager.hpp @@ -28,8 +28,8 @@ class ResourceLoadManager { public: /** - * @symbol ?cancel\@ResourceLoadManager\@\@QEAAXW4ResourceLoadType\@\@\@Z + * @symbol ?cancel\@ResourceLoadManager\@\@QEAAXW4ResourceLoadType\@\@\@Z */ MCAPI void cancel(enum class ResourceLoadType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceLoader.hpp b/LiteLoader/include/llapi/mc/ResourceLoader.hpp index 11ab502cc3..3cd3b0a019 100644 --- a/LiteLoader/include/llapi/mc/ResourceLoader.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLoader.hpp @@ -31,74 +31,78 @@ class ResourceLoader { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourceLoader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ResourceLoader\@\@UEBA_NAEBVResourceLocationPair\@\@AEAV?$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\@\@4\@\@Z + * @vftbl 1 + * @symbol ?load\@ResourceLoader\@\@UEBA_NAEBVResourceLocationPair\@\@AEAV?$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\@\@4\@\@Z */ virtual bool load(class ResourceLocationPair const &, std::string &, std::vector const &) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4() = 0; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5() = 0; /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6() = 0; /** - * @vftbl 7 - * @symbol ?getPath\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z + * @vftbl 7 + * @symbol ?getPath\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z */ virtual class Core::PathBuffer getPath(class ResourceLocation const &) const; /** - * @vftbl 8 - * @symbol ?getPath\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 + * @vftbl 8 + * @symbol ?getPath\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 class Core::PathBuffer getPath(class ResourceLocation const &, std::vector const &) const; /** - * @vftbl 9 - * @symbol ?getPathContainingResource\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z + * @vftbl 9 + * @symbol ?getPathContainingResource\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z */ virtual class Core::PathBuffer getPathContainingResource(class ResourceLocation const &) const; /** - * @vftbl 10 - * @symbol ?getPathContainingResource\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 + * @vftbl 10 + * @symbol ?getPathContainingResource\@ResourceLoader\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 */ virtual class Core::PathBuffer getPathContainingResource(class ResourceLocation const &, std::vector) const; /** - * @vftbl 11 - * @symbol ?getPackStackIndexOfResource\@ResourceLoader\@\@UEBA?AU?$pair\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@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 + * @vftbl 11 + * @symbol ?getPackStackIndexOfResource\@ResourceLoader\@\@UEBA?AU?$pair\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@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 */ virtual struct std::pair getPackStackIndexOfResource(class ResourceLocation const &, std::vector const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCELOADER /** - * @symbol ?isInStreamableLocation\@ResourceLoader\@\@UEBA_NAEBVResourceLocation\@\@\@Z + * @symbol ?isInStreamableLocation\@ResourceLoader\@\@UEBA_NAEBVResourceLocation\@\@\@Z */ MCVAPI bool isInStreamableLocation(class ResourceLocation const &) const; /** - * @symbol ?isInStreamableLocation\@ResourceLoader\@\@UEBA_NAEBVResourceLocation\@\@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 ?isInStreamableLocation\@ResourceLoader\@\@UEBA_NAEBVResourceLocation\@\@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 */ MCVAPI bool isInStreamableLocation(class ResourceLocation const &, std::vector const &) const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourceLoader(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceLoaders.hpp b/LiteLoader/include/llapi/mc/ResourceLoaders.hpp index 776904fe51..7a2184d3a5 100644 --- a/LiteLoader/include/llapi/mc/ResourceLoaders.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLoaders.hpp @@ -22,39 +22,39 @@ namespace ResourceLoaders { #undef AFTER_EXTRA /** - * @symbol ?EMPTY_STRING\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EMPTY_STRING\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const EMPTY_STRING; /** - * @symbol ?IMGEXT_JPEG\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IMGEXT_JPEG\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const IMGEXT_JPEG; /** - * @symbol ?IMGEXT_JPG\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IMGEXT_JPG\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const IMGEXT_JPG; /** - * @symbol ?IMGEXT_PNG\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IMGEXT_PNG\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const IMGEXT_PNG; /** - * @symbol ?IMGEXT_TARGA\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IMGEXT_TARGA\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const IMGEXT_TARGA; /** - * @symbol ?IMGEXT_TEXTURESET\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?IMGEXT_TEXTURESET\@ResourceLoaders\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const IMGEXT_TEXTURESET; /** - * @symbol ?backCompatGroup\@ResourceLoaders\@\@3VBackwardsCompatTextureGroup\@\@A + * @symbol ?backCompatGroup\@ResourceLoaders\@\@3VBackwardsCompatTextureGroup\@\@A */ MCAPI extern class BackwardsCompatTextureGroup backCompatGroup; /** - * @symbol ?loaders\@ResourceLoaders\@\@3V?$map\@W4ResourceFileSystem\@\@V?$unique_ptr\@VResourceLoader\@\@U?$default_delete\@VResourceLoader\@\@\@std\@\@\@std\@\@U?$less\@W4ResourceFileSystem\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4ResourceFileSystem\@\@V?$unique_ptr\@VResourceLoader\@\@U?$default_delete\@VResourceLoader\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@A + * @symbol ?loaders\@ResourceLoaders\@\@3V?$map\@W4ResourceFileSystem\@\@V?$unique_ptr\@VResourceLoader\@\@U?$default_delete\@VResourceLoader\@\@\@std\@\@\@std\@\@U?$less\@W4ResourceFileSystem\@\@\@3\@V?$allocator\@U?$pair\@$$CBW4ResourceFileSystem\@\@V?$unique_ptr\@VResourceLoader\@\@U?$default_delete\@VResourceLoader\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@A */ MCAPI extern class std::map, struct std::less, class std::allocator>>> loaders; /** - * @symbol ?supportedImageExtensions\@ResourceLoaders\@\@3V?$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\@\@B + * @symbol ?supportedImageExtensions\@ResourceLoaders\@\@3V?$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\@\@B */ MCAPI extern std::vector const supportedImageExtensions; diff --git a/LiteLoader/include/llapi/mc/ResourceLocation.hpp b/LiteLoader/include/llapi/mc/ResourceLocation.hpp index d49f687481..76f8a77263 100644 --- a/LiteLoader/include/llapi/mc/ResourceLocation.hpp +++ b/LiteLoader/include/llapi/mc/ResourceLocation.hpp @@ -31,44 +31,44 @@ class ResourceLocation { public: /** - * @symbol ??0ResourceLocation\@\@QEAA\@XZ + * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@\@Z */ - MCAPI ResourceLocation(); + MCAPI ResourceLocation(class Core::Path const &); /** - * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z + * @symbol ??0ResourceLocation\@\@QEAA\@XZ */ - MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem); + MCAPI ResourceLocation(); /** - * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@\@Z + * @symbol ??0ResourceLocation\@\@QEAA\@AEBVPath\@Core\@\@W4ResourceFileSystem\@\@\@Z */ - MCAPI ResourceLocation(class Core::Path const &); + MCAPI ResourceLocation(class Core::Path const &, enum class ResourceFileSystem); /** - * @symbol ?getFullPath\@ResourceLocation\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getFullPath\@ResourceLocation\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getFullPath() const; /** - * @symbol ?getRelativePath\@ResourceLocation\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getRelativePath\@ResourceLocation\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer const & getRelativePath() const; /** - * @symbol ??8ResourceLocation\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8ResourceLocation\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class ResourceLocation const &) const; /** - * @symbol ?serialize\@ResourceLocation\@\@QEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?serialize\@ResourceLocation\@\@QEBAXAEAVValue\@Json\@\@\@Z */ MCAPI void serialize(class Json::Value &) const; /** - * @symbol ?setRelativePath\@ResourceLocation\@\@QEAAXAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @symbol ?setRelativePath\@ResourceLocation\@\@QEAAXAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ MCAPI void setRelativePath(class Core::PathBuffer const &); /** - * @symbol ??1ResourceLocation\@\@QEAA\@XZ + * @symbol ??1ResourceLocation\@\@QEAA\@XZ */ MCAPI ~ResourceLocation(); /** - * @symbol ?getEmptyLocation\@ResourceLocation\@\@SAAEBV1\@XZ + * @symbol ?getEmptyLocation\@ResourceLocation\@\@SAAEBV1\@XZ */ MCAPI static class ResourceLocation const & getEmptyLocation(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceMetadata.hpp b/LiteLoader/include/llapi/mc/ResourceMetadata.hpp index 15f3353b85..1b61bb79de 100644 --- a/LiteLoader/include/llapi/mc/ResourceMetadata.hpp +++ b/LiteLoader/include/llapi/mc/ResourceMetadata.hpp @@ -28,8 +28,8 @@ class ResourceMetadata { public: /** - * @symbol ??1ResourceMetadata\@\@QEAA\@XZ + * @symbol ??1ResourceMetadata\@\@QEAA\@XZ */ MCAPI ~ResourceMetadata(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePack.hpp b/LiteLoader/include/llapi/mc/ResourcePack.hpp index c06c4479eb..20e29a5231 100644 --- a/LiteLoader/include/llapi/mc/ResourcePack.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePack.hpp @@ -64,141 +64,147 @@ class ResourcePack { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACK /** - * @symbol ??0ResourcePack\@\@QEAA\@AEAVPack\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePack(); +#endif + /** + * @symbol ??0ResourcePack\@\@QEAA\@AEAVPack\@\@\@Z */ MCAPI ResourcePack(class Pack &); /** - * @symbol ?areKnownFilesValid\@ResourcePack\@\@QEAA_NXZ + * @symbol ?areKnownFilesValid\@ResourcePack\@\@QEAA_NXZ */ MCAPI bool areKnownFilesValid(); /** - * @symbol ?forEachIn\@ResourcePack\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@H_N\@Z + * @symbol ?forEachIn\@ResourcePack\@\@QEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@H_N\@Z */ MCAPI void forEachIn(class Core::Path const &, class std::function, int, bool) const; /** - * @symbol ?generateAssetSet\@ResourcePack\@\@QEAAXXZ + * @symbol ?generateAssetSet\@ResourcePack\@\@QEAAXXZ */ MCAPI void generateAssetSet(); /** - * @symbol ?getFolderName\@ResourcePack\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFolderName\@ResourcePack\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFolderName() const; /** - * @symbol ?getLoadTime\@ResourcePack\@\@QEBANXZ + * @symbol ?getLoadTime\@ResourcePack\@\@QEBANXZ */ MCAPI double getLoadTime() const; /** - * @symbol ?getManifest\@ResourcePack\@\@QEAAAEAVPackManifest\@\@XZ + * @symbol ?getManifest\@ResourcePack\@\@QEAAAEAVPackManifest\@\@XZ */ MCAPI class PackManifest & getManifest(); /** - * @symbol ?getPackCategory\@ResourcePack\@\@QEBA?AW4PackCategory\@\@XZ + * @symbol ?getPackCategory\@ResourcePack\@\@QEBA?AW4PackCategory\@\@XZ */ MCAPI enum class PackCategory getPackCategory() const; /** - * @symbol ?getPackId\@ResourcePack\@\@QEBAAEBVUUID\@mce\@\@XZ + * @symbol ?getPackId\@ResourcePack\@\@QEBAAEBVUUID\@mce\@\@XZ */ MCAPI class mce::UUID const & getPackId() const; /** - * @symbol ?getPackOrigin\@ResourcePack\@\@QEBA?AW4PackOrigin\@\@XZ + * @symbol ?getPackOrigin\@ResourcePack\@\@QEBA?AW4PackOrigin\@\@XZ */ MCAPI enum class PackOrigin getPackOrigin() const; /** - * @symbol ?getResource\@ResourcePack\@\@QEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getResource\@ResourcePack\@\@QEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI bool getResource(class Core::Path const &, std::string &, int) const; /** - * @symbol ?getResourceLocation\@ResourcePack\@\@QEBAAEBVResourceLocation\@\@XZ + * @symbol ?getResourceLocation\@ResourcePack\@\@QEBAAEBVResourceLocation\@\@XZ */ MCAPI class ResourceLocation const & getResourceLocation() const; /** - * @symbol ?getSubpackCount\@ResourcePack\@\@QEBAHXZ + * @symbol ?getSubpackCount\@ResourcePack\@\@QEBAHXZ */ MCAPI int getSubpackCount() const; /** - * @symbol ?getSubpackFolderName\@ResourcePack\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getSubpackFolderName\@ResourcePack\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI std::string const & getSubpackFolderName(int) const; /** - * @symbol ?getSubpackIndex\@ResourcePack\@\@QEBAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getSubpackIndex\@ResourcePack\@\@QEBAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI int getSubpackIndex(std::string const &) const; /** - * @symbol ?getSubpackInfoStack\@ResourcePack\@\@QEBAAEBVSubpackInfoCollection\@\@XZ + * @symbol ?getSubpackInfoStack\@ResourcePack\@\@QEBAAEBVSubpackInfoCollection\@\@XZ */ MCAPI class SubpackInfoCollection const & getSubpackInfoStack() const; /** - * @symbol ?getVersion\@ResourcePack\@\@QEBAAEBVSemVersion\@\@XZ + * @symbol ?getVersion\@ResourcePack\@\@QEBAAEBVSemVersion\@\@XZ */ MCAPI class SemVersion const & getVersion() const; /** - * @symbol ?hasResource\@ResourcePack\@\@QEBA_NAEBVPath\@Core\@\@H\@Z + * @symbol ?hasResource\@ResourcePack\@\@QEBA_NAEBVPath\@Core\@\@H\@Z */ MCAPI bool hasResource(class Core::Path const &, int) const; /** - * @symbol ?isBaseGamePack\@ResourcePack\@\@QEBA_NXZ + * @symbol ?isBaseGamePack\@ResourcePack\@\@QEBA_NXZ */ MCAPI bool isBaseGamePack() const; /** - * @symbol ?isSlicePack\@ResourcePack\@\@QEBA_NXZ + * @symbol ?isSlicePack\@ResourcePack\@\@QEBA_NXZ */ MCAPI bool isSlicePack() const; /** - * @symbol ?isType\@ResourcePack\@\@QEBA_NW4PackType\@\@\@Z + * @symbol ?isType\@ResourcePack\@\@QEBA_NW4PackType\@\@\@Z */ MCAPI bool isType(enum class PackType) const; /** - * @symbol ?isZipped\@ResourcePack\@\@QEBA_NXZ + * @symbol ?isZipped\@ResourcePack\@\@QEBA_NXZ */ MCAPI bool isZipped() const; /** - * @symbol ?setAsSlicePack\@ResourcePack\@\@QEAAXXZ + * @symbol ?setAsSlicePack\@ResourcePack\@\@QEAAXXZ */ MCAPI void setAsSlicePack(); /** - * @symbol ?setError\@ResourcePack\@\@QEAAXXZ + * @symbol ?setError\@ResourcePack\@\@QEAAXXZ */ MCAPI void setError(); /** - * @symbol ?setLoadTime\@ResourcePack\@\@QEAAXN\@Z + * @symbol ?setLoadTime\@ResourcePack\@\@QEAAXN\@Z */ MCAPI void setLoadTime(double); /** - * @symbol ?setLocale\@ResourcePack\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setLocale\@ResourcePack\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setLocale(std::string const &); /** - * @symbol ?unregisterDeleteCallback\@ResourcePack\@\@QEAAXPEAX\@Z + * @symbol ?unregisterDeleteCallback\@ResourcePack\@\@QEAAXPEAX\@Z */ MCAPI void unregisterDeleteCallback(void *); /** - * @symbol ?RESOURCE_PACK_BUG_ICON_PATH\@ResourcePack\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?RESOURCE_PACK_BUG_ICON_PATH\@ResourcePack\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const RESOURCE_PACK_BUG_ICON_PATH; /** - * @symbol ?RESOURCE_PACK_ICON_PATH\@ResourcePack\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?RESOURCE_PACK_ICON_PATH\@ResourcePack\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const RESOURCE_PACK_ICON_PATH; /** - * @symbol ?TEXTURES_LIST_PATH\@ResourcePack\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?TEXTURES_LIST_PATH\@ResourcePack\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const TEXTURES_LIST_PATH; //private: /** - * @symbol ?_createSubpack\@ResourcePack\@\@AEAAXAEBUSubpackInfo\@\@\@Z + * @symbol ?_createSubpack\@ResourcePack\@\@AEAAXAEBUSubpackInfo\@\@\@Z */ MCAPI void _createSubpack(struct SubpackInfo const &); /** - * @symbol ?_createSubpacks\@ResourcePack\@\@AEAAXXZ + * @symbol ?_createSubpacks\@ResourcePack\@\@AEAAXXZ */ MCAPI void _createSubpacks(); /** - * @symbol ?_generateIconPath\@ResourcePack\@\@AEAAXXZ + * @symbol ?_generateIconPath\@ResourcePack\@\@AEAAXXZ */ MCAPI void _generateIconPath(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp index 8302ab3af0..8ba21d97b9 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkDataPacket.hpp @@ -30,37 +30,43 @@ class ResourcePackChunkDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackChunkDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ResourcePackChunkDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ResourcePackChunkDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ResourcePackChunkDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ResourcePackChunkDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ResourcePackChunkDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ResourcePackChunkDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ResourcePackChunkDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKCHUNKDATAPACKET /** - * @symbol ??0ResourcePackChunkDataPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ResourcePackChunkDataPacket(); + MCVAPI ~ResourcePackChunkDataPacket(); +#endif /** - * @symbol ??0ResourcePackChunkDataPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_KAEBV?$vector\@EV?$allocator\@E\@std\@\@\@2\@\@Z + * @symbol ??0ResourcePackChunkDataPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_KAEBV?$vector\@EV?$allocator\@E\@std\@\@\@2\@\@Z */ MCAPI ResourcePackChunkDataPacket(std::string const &, int, unsigned __int64, std::vector const &); + /** + * @symbol ??0ResourcePackChunkDataPacket\@\@QEAA\@XZ + */ + MCAPI ResourcePackChunkDataPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp index 44a333b9a7..3a6ebb5452 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackChunkRequestPacket.hpp @@ -30,33 +30,33 @@ class ResourcePackChunkRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackChunkRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ResourcePackChunkRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ResourcePackChunkRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ResourcePackChunkRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ResourcePackChunkRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ResourcePackChunkRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ResourcePackChunkRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ResourcePackChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ResourcePackChunkRequestPacket\@\@QEAA\@XZ + * @symbol ??0ResourcePackChunkRequestPacket\@\@QEAA\@XZ */ MCAPI ResourcePackChunkRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp index 9b8fb3a449..3aa846822b 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackClientResponsePacket.hpp @@ -30,41 +30,41 @@ class ResourcePackClientResponsePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackClientResponsePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ResourcePackClientResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ResourcePackClientResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ResourcePackClientResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ResourcePackClientResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ResourcePackClientResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ResourcePackClientResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ResourcePackClientResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ResourcePackClientResponsePacket\@\@QEAA\@XZ + * @symbol ??0ResourcePackClientResponsePacket\@\@QEAA\@XZ */ MCAPI ResourcePackClientResponsePacket(); /** - * @symbol ?getDownloadingPacks\@ResourcePackClientResponsePacket\@\@QEBAAEBV?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getDownloadingPacks\@ResourcePackClientResponsePacket\@\@QEBAAEBV?$set\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$less\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::set, class std::allocator> const & getDownloadingPacks() const; /** - * @symbol ?isResponse\@ResourcePackClientResponsePacket\@\@QEBA_NW4ResourcePackResponse\@\@\@Z + * @symbol ?isResponse\@ResourcePackClientResponsePacket\@\@QEBA_NW4ResourcePackResponse\@\@\@Z */ MCAPI bool isResponse(enum class ResourcePackResponse) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp index 9bc07f110c..fd637be352 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackDataInfoPacket.hpp @@ -37,37 +37,43 @@ class ResourcePackDataInfoPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackDataInfoPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ResourcePackDataInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ResourcePackDataInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ResourcePackDataInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ResourcePackDataInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ResourcePackDataInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ResourcePackDataInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ResourcePackDataInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKDATAINFOPACKET /** - * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ResourcePackDataInfoPacket(); + MCVAPI ~ResourcePackDataInfoPacket(); +#endif /** - * @symbol ??0ResourcePackDataInfoPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IH_K0_NW4PackType\@\@\@Z + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackFileDownloaderManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackFileDownloaderManager.hpp index a8c2789084..ae82072681 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackFileDownloaderManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackFileDownloaderManager.hpp @@ -30,11 +30,11 @@ class ResourcePackFileDownloaderManager { public: /** - * @symbol ?cleanup\@ResourcePackFileDownloaderManager\@\@QEAAXXZ + * @symbol ?cleanup\@ResourcePackFileDownloaderManager\@\@QEAAXXZ */ MCAPI void cleanup(); /** - * @symbol ?update\@ResourcePackFileDownloaderManager\@\@QEAAXXZ + * @symbol ?update\@ResourcePackFileDownloaderManager\@\@QEAAXXZ */ MCAPI void update(); @@ -42,8 +42,8 @@ class ResourcePackFileDownloaderManager { private: /** - * @symbol ?MAX_CHUNK_ATTEMPTS\@ResourcePackFileDownloaderManager\@\@0HB + * @symbol ?MAX_CHUNK_ATTEMPTS\@ResourcePackFileDownloaderManager\@\@0HB */ MCAPI static int const MAX_CHUNK_ATTEMPTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp index 6e445d3e71..00aa6e33b1 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackFileUploadManager.hpp @@ -33,34 +33,40 @@ class ResourcePackFileUploadManager : public FileUploadManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackFileUploadManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?uploadFileToRealmStorage\@ResourcePackFileUploadManager\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@H0\@Z + * @vftbl 2 + * @symbol ?uploadFileToRealmStorage\@ResourcePackFileUploadManager\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@H0\@Z */ virtual void uploadFileToRealmStorage(std::string const &, class Core::Path const &, int, std::string const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKFILEUPLOADMANAGER /** - * @symbol ??0ResourcePackFileUploadManager\@\@QEAA\@AEAVTaskGroup\@\@V?$shared_ptr\@VIFileChunkUploader\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePackFileUploadManager(); +#endif + /** + * @symbol ??0ResourcePackFileUploadManager\@\@QEAA\@AEAVTaskGroup\@\@V?$shared_ptr\@VIFileChunkUploader\@\@\@std\@\@\@Z */ MCAPI ResourcePackFileUploadManager(class TaskGroup &, class std::shared_ptr); /** - * @symbol ?uploadResourcePack\@ResourcePackFileUploadManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceLocation\@\@_N2W4PackType\@\@\@Z + * @symbol ?uploadResourcePack\@ResourcePackFileUploadManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceLocation\@\@_N2W4PackType\@\@\@Z */ MCAPI void uploadResourcePack(std::string const &, class ResourceLocation const &, bool, bool, enum class PackType); //private: /** - * @symbol ?_uploadPackToRealmStorage\@ResourcePackFileUploadManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@H0\@Z + * @symbol ?_uploadPackToRealmStorage\@ResourcePackFileUploadManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPath\@Core\@\@H0\@Z */ MCAPI void _uploadPackToRealmStorage(std::string const &, class Core::Path const &, int, std::string const &); /** - * @symbol ?_uploadResourcePackFolder\@ResourcePackFileUploadManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceLocation\@\@AEBVPath\@Core\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_uploadResourcePackFolder\@ResourcePackFileUploadManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVResourceLocation\@\@AEBVPath\@Core\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void _uploadResourcePackFolder(std::string const &, class ResourceLocation const &, class Core::Path const &, class Json::Value const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackListener.hpp b/LiteLoader/include/llapi/mc/ResourcePackListener.hpp index 458f21973d..647afbf1fa 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackListener.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackListener.hpp @@ -31,21 +31,25 @@ class ResourcePackListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKLISTENER /** - * @symbol ?onBaseGamePackDownloadComplete\@ResourcePackListener\@\@UEAAXXZ + * @symbol ?onBaseGamePackDownloadComplete\@ResourcePackListener\@\@UEAAXXZ */ MCVAPI void onBaseGamePackDownloadComplete(); /** - * @symbol ?onFullPackStackInvalid\@ResourcePackListener\@\@UEAAXXZ + * @symbol ?onFullPackStackInvalid\@ResourcePackListener\@\@UEAAXXZ */ MCVAPI void onFullPackStackInvalid(); /** - * @symbol ?onLanguageSubpacksChanged\@ResourcePackListener\@\@UEAAXXZ + * @symbol ?onLanguageSubpacksChanged\@ResourcePackListener\@\@UEAAXXZ */ MCVAPI void onLanguageSubpacksChanged(); /** - * @symbol ?onResourceManagerDestroyed\@ResourcePackListener\@\@UEAAXAEAVResourcePackManager\@\@\@Z + * @symbol ?onResourceManagerDestroyed\@ResourcePackListener\@\@UEAAXAEAVResourcePackManager\@\@\@Z */ MCVAPI void onResourceManagerDestroyed(class ResourcePackManager &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePackListener(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp index 918b5d016c..1ca00ffb61 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackManager.hpp @@ -32,157 +32,163 @@ class ResourcePackManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool load(class ResourceLocation const &, std::string &) const; /** - * @vftbl 2 - * @symbol ?load\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@AEAV?$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\@\@4\@\@Z + * @vftbl 2 + * @symbol ?load\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@AEAV?$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\@\@4\@\@Z */ virtual bool load(class ResourceLocation const &, std::string &, std::vector const &) const; /** - * @vftbl 3 - * @symbol ?load\@ResourcePackManager\@\@UEBA_NAEBVResourceLocationPair\@\@AEAV?$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\@\@4\@\@Z + * @vftbl 3 + * @symbol ?load\@ResourcePackManager\@\@UEBA_NAEBVResourceLocationPair\@\@AEAV?$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\@\@4\@\@Z */ virtual bool load(class ResourceLocationPair const &, std::string &, std::vector const &) const; /** - * @vftbl 4 - * @symbol ?loadAllVersionsOf\@ResourcePackManager\@\@UEBA?AV?$vector\@VLoadedResourceData\@\@V?$allocator\@VLoadedResourceData\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@\@Z + * @vftbl 4 + * @symbol ?loadAllVersionsOf\@ResourcePackManager\@\@UEBA?AV?$vector\@VLoadedResourceData\@\@V?$allocator\@VLoadedResourceData\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@\@Z */ virtual std::vector loadAllVersionsOf(class ResourceLocation const &) const; /** - * @vftbl 5 - * @symbol ?isInStreamableLocation\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@\@Z + * @vftbl 5 + * @symbol ?isInStreamableLocation\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@\@Z */ virtual bool isInStreamableLocation(class ResourceLocation const &) const; /** - * @vftbl 6 - * @symbol ?isInStreamableLocation\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@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 + * @vftbl 6 + * @symbol ?isInStreamableLocation\@ResourcePackManager\@\@UEBA_NAEBVResourceLocation\@\@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 bool isInStreamableLocation(class ResourceLocation const &, std::vector const &) const; /** - * @vftbl 7 - * @symbol ?getPath\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z + * @vftbl 7 + * @symbol ?getPath\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z */ virtual class Core::PathBuffer getPath(class ResourceLocation const &) const; /** - * @vftbl 8 - * @symbol ?getPath\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 + * @vftbl 8 + * @symbol ?getPath\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 class Core::PathBuffer getPath(class ResourceLocation const &, std::vector const &) const; /** - * @vftbl 9 - * @symbol ?getPathContainingResource\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z + * @vftbl 9 + * @symbol ?getPathContainingResource\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@\@Z */ virtual class Core::PathBuffer getPathContainingResource(class ResourceLocation const &) const; /** - * @vftbl 10 - * @symbol ?getPathContainingResource\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 + * @vftbl 10 + * @symbol ?getPathContainingResource\@ResourcePackManager\@\@UEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVResourceLocation\@\@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 */ virtual class Core::PathBuffer getPathContainingResource(class ResourceLocation const &, std::vector) const; /** - * @vftbl 11 - * @symbol ?getPackStackIndexOfResource\@ResourcePackManager\@\@UEBA?AU?$pair\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@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 + * @vftbl 11 + * @symbol ?getPackStackIndexOfResource\@ResourcePackManager\@\@UEBA?AU?$pair\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@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 */ virtual struct std::pair getPackStackIndexOfResource(class ResourceLocation const &, std::vector const &) const; /** - * @vftbl 12 - * @symbol ?hasCapability\@ResourcePackManager\@\@UEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @vftbl 12 + * @symbol ?hasCapability\@ResourcePackManager\@\@UEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual bool hasCapability(class gsl::basic_string_span) const; + virtual bool hasCapability(class std::basic_string_view>) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKMANAGER /** - * @symbol ??0ResourcePackManager\@\@QEAA\@V?$function\@$$A6A?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ\@std\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePackManager(); +#endif + /** + * @symbol ??0ResourcePackManager\@\@QEAA\@V?$function\@$$A6A?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ\@std\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentTierManager\@\@\@Bedrock\@\@\@gsl\@\@_N\@Z */ MCAPI ResourcePackManager(class std::function (void)>, class gsl::not_null> const &, bool); /** - * @symbol ?clearStack\@ResourcePackManager\@\@QEAAXW4ResourcePackStackType\@\@_N\@Z + * @symbol ?clearStack\@ResourcePackManager\@\@QEAAXW4ResourcePackStackType\@\@_N\@Z */ MCAPI void clearStack(enum class ResourcePackStackType, bool); /** - * @symbol ?composeFullStack\@ResourcePackManager\@\@QEBAHAEAVResourcePackStack\@\@AEBV2\@11\@Z + * @symbol ?composeFullStack\@ResourcePackManager\@\@QEBAHAEAVResourcePackStack\@\@AEBV2\@11\@Z */ MCAPI int composeFullStack(class ResourcePackStack &, class ResourcePackStack const &, class ResourcePackStack const &, class ResourcePackStack const &) const; /** - * @symbol ?getFullStackMinEngineVersion\@ResourcePackManager\@\@QEBA?AVSemVersion\@\@XZ + * @symbol ?getFullStackMinEngineVersion\@ResourcePackManager\@\@QEBA?AVSemVersion\@\@XZ */ MCAPI class SemVersion getFullStackMinEngineVersion() const; /** - * @symbol ?getPackSourceReport\@ResourcePackManager\@\@QEBAPEBVPackSourceReport\@\@XZ + * @symbol ?getPackSourceReport\@ResourcePackManager\@\@QEBAPEBVPackSourceReport\@\@XZ */ MCAPI class PackSourceReport const * getPackSourceReport() const; /** - * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ - MCAPI std::vector> getResourcesOfGroup(std::string const &) const; + MCAPI std::vector> getResourcesOfGroup(class PackInstance const &, std::string const &) const; /** - * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getResourcesOfGroup\@ResourcePackManager\@\@QEBA?AV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ - MCAPI std::vector> getResourcesOfGroup(class PackInstance const &, std::string const &) const; + MCAPI std::vector> getResourcesOfGroup(std::string const &) const; /** - * @symbol ?getStack\@ResourcePackManager\@\@QEBAAEBVResourcePackStack\@\@W4ResourcePackStackType\@\@\@Z + * @symbol ?getStack\@ResourcePackManager\@\@QEBAAEBVResourcePackStack\@\@W4ResourcePackStackType\@\@\@Z */ MCAPI class ResourcePackStack const & getStack(enum class ResourcePackStackType) const; /** - * @symbol ?handlePendingStackChanges\@ResourcePackManager\@\@QEAAXXZ + * @symbol ?handlePendingStackChanges\@ResourcePackManager\@\@QEAAXXZ */ MCAPI void handlePendingStackChanges(); /** - * @symbol ?hasResource\@ResourcePackManager\@\@QEBA_NAEBVResourceLocation\@\@\@Z + * @symbol ?hasResource\@ResourcePackManager\@\@QEBA_NAEBVResourceLocation\@\@\@Z */ MCAPI bool hasResource(class ResourceLocation const &) const; /** - * @symbol ?iteratePacks\@ResourcePackManager\@\@QEBAXAEBV?$function\@$$A6AXAEBVPackInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?iteratePacks\@ResourcePackManager\@\@QEBAXAEBV?$function\@$$A6AXAEBVPackInstance\@\@\@Z\@std\@\@\@Z */ MCAPI void iteratePacks(class std::function const &) const; /** - * @symbol ?loadAllVersionsOf\@ResourcePackManager\@\@QEBA_NAEBVResourceLocation\@\@AEAVResourcePackMergeStrategy\@\@\@Z + * @symbol ?loadAllVersionsOf\@ResourcePackManager\@\@QEBA_NAEBVResourceLocation\@\@AEAVResourcePackMergeStrategy\@\@\@Z */ MCAPI bool loadAllVersionsOf(class ResourceLocation const &, class ResourcePackMergeStrategy &) const; /** - * @symbol ?registerResourcePackListener\@ResourcePackManager\@\@QEAAXAEAVResourcePackListener\@\@\@Z + * @symbol ?registerResourcePackListener\@ResourcePackManager\@\@QEAAXAEAVResourcePackListener\@\@\@Z */ MCAPI void registerResourcePackListener(class ResourcePackListener &); /** - * @symbol ?removeIf\@ResourcePackManager\@\@QEAAXAEBV?$function\@$$A6A_NAEBVPackInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?removeIf\@ResourcePackManager\@\@QEAAXAEBV?$function\@$$A6A_NAEBVPackInstance\@\@\@Z\@std\@\@\@Z */ MCAPI void removeIf(class std::function const &); /** - * @symbol ?setPackSourceReport\@ResourcePackManager\@\@QEAAX$$QEAVPackSourceReport\@\@\@Z + * @symbol ?setPackSourceReport\@ResourcePackManager\@\@QEAAX$$QEAVPackSourceReport\@\@\@Z */ MCAPI void setPackSourceReport(class PackSourceReport &&); /** - * @symbol ?setStack\@ResourcePackManager\@\@QEAA_NV?$unique_ptr\@VResourcePackStack\@\@U?$default_delete\@VResourcePackStack\@\@\@std\@\@\@std\@\@W4ResourcePackStackType\@\@_N\@Z + * @symbol ?setStack\@ResourcePackManager\@\@QEAA_NV?$unique_ptr\@VResourcePackStack\@\@U?$default_delete\@VResourcePackStack\@\@\@std\@\@\@std\@\@W4ResourcePackStackType\@\@_N\@Z */ MCAPI bool setStack(std::unique_ptr, enum class ResourcePackStackType, bool); /** - * @symbol ?unRegisterResourcePackListener\@ResourcePackManager\@\@QEAAXAEAVResourcePackListener\@\@\@Z + * @symbol ?unRegisterResourcePackListener\@ResourcePackManager\@\@QEAAXAEAVResourcePackListener\@\@\@Z */ MCAPI void unRegisterResourcePackListener(class ResourcePackListener &); //private: /** - * @symbol ?_calculateMinEngineVersionFromFullStack\@ResourcePackManager\@\@AEAAXXZ + * @symbol ?_calculateMinEngineVersionFromFullStack\@ResourcePackManager\@\@AEAAXXZ */ MCAPI void _calculateMinEngineVersionFromFullStack(); /** - * @symbol ?_composeFullStack\@ResourcePackManager\@\@AEAAXXZ + * @symbol ?_composeFullStack\@ResourcePackManager\@\@AEAAXXZ */ MCAPI void _composeFullStack(); /** - * @symbol ?_getResourcesOfGroup\@ResourcePackManager\@\@AEBAXAEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@4\@\@Z + * @symbol ?_getResourcesOfGroup\@ResourcePackManager\@\@AEBAXAEBVPackInstance\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$vector\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V?$allocator\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@\@4\@\@Z */ MCAPI void _getResourcesOfGroup(class PackInstance const &, std::string const &, std::vector> &) const; /** - * @symbol ?_updateLanguageSubpacks\@ResourcePackManager\@\@AEAAXXZ + * @symbol ?_updateLanguageSubpacks\@ResourcePackManager\@\@AEAAXXZ */ MCAPI void _updateLanguageSubpacks(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp b/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp index e6b2724f96..c8deb923a6 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackPaths.hpp @@ -23,75 +23,75 @@ namespace ResourcePackPaths { #undef AFTER_EXTRA /** - * @symbol ?BEHAVIOR_PACK_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BEHAVIOR_PACK_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BEHAVIOR_PACK_PATH; /** - * @symbol ?DEVELOPMENT_BEHAVIOR_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEVELOPMENT_BEHAVIOR_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DEVELOPMENT_BEHAVIOR_PACKS_PATH; /** - * @symbol ?DEVELOPMENT_RESOURCE_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEVELOPMENT_RESOURCE_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DEVELOPMENT_RESOURCE_PACKS_PATH; /** - * @symbol ?DEVELOPMENT_SKIN_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEVELOPMENT_SKIN_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DEVELOPMENT_SKIN_PACKS_PATH; /** - * @symbol ?GLOBAL_RESOURCE_PACKS_FILENAME\@ResourcePackPaths\@\@3V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?GLOBAL_RESOURCE_PACKS_FILENAME\@ResourcePackPaths\@\@3V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI extern class Core::PathBuffer const GLOBAL_RESOURCE_PACKS_FILENAME; /** - * @symbol ?KNOWN_INVALID_PACKS_FILE_NAME\@ResourcePackPaths\@\@3V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?KNOWN_INVALID_PACKS_FILE_NAME\@ResourcePackPaths\@\@3V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI extern class Core::PathBuffer const KNOWN_INVALID_PACKS_FILE_NAME; /** - * @symbol ?KNOWN_VALID_PACKS_FILE_NAME\@ResourcePackPaths\@\@3V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?KNOWN_VALID_PACKS_FILE_NAME\@ResourcePackPaths\@\@3V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI extern class Core::PathBuffer const KNOWN_VALID_PACKS_FILE_NAME; /** - * @symbol ?RESOURCE_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RESOURCE_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const RESOURCE_PACKS_PATH; /** - * @symbol ?SKIN_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SKIN_PACKS_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const SKIN_PACKS_PATH; /** - * @symbol ?TREATMENT_PACK_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TREATMENT_PACK_PATH\@ResourcePackPaths\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const TREATMENT_PACK_PATH; /** - * @symbol ?getCachedBehaviorPacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getCachedBehaviorPacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getCachedBehaviorPacksPath(); /** - * @symbol ?getCachedResourcePacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @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 + * @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 + * @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 + * @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 + * @symbol ?getPremiumWorldTemplatePath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getPremiumWorldTemplatePath(); /** - * @symbol ?getTemporaryPremiumBehaviorPacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getTemporaryPremiumBehaviorPacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getTemporaryPremiumBehaviorPacksPath(); /** - * @symbol ?getTemporaryPremiumResourcePacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getTemporaryPremiumResourcePacksPath\@ResourcePackPaths\@\@YA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getTemporaryPremiumResourcePacksPath(); diff --git a/LiteLoader/include/llapi/mc/ResourcePackRepository.hpp b/LiteLoader/include/llapi/mc/ResourcePackRepository.hpp index ebda81e03c..5ca66c6823 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackRepository.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackRepository.hpp @@ -39,332 +39,338 @@ LIAPI void setCustomResourcePackPath(PackType, const std::string& path); public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackRepository(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getResourcePacksByPackId\@ResourcePackRepository\@\@UEBAXAEBV?$vector\@UPackInstanceId\@\@V?$allocator\@UPackInstanceId\@\@\@std\@\@\@std\@\@AEAV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?getResourcePacksByPackId\@ResourcePackRepository\@\@UEBAXAEBV?$vector\@UPackInstanceId\@\@V?$allocator\@UPackInstanceId\@\@\@std\@\@\@std\@\@AEAV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@3\@\@Z */ virtual void getResourcePacksByPackId(std::vector const &, std::vector &) const; /** - * @vftbl 2 - * @symbol ?getResourcePackForPackId\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@\@Z + * @vftbl 2 + * @symbol ?getResourcePackForPackId\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@\@Z */ virtual class ResourcePack * getResourcePackForPackId(struct PackIdVersion const &) const; /** - * @vftbl 3 - * @symbol ?getResourcePackByUUID\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBVUUID\@mce\@\@\@Z + * @vftbl 3 + * @symbol ?getResourcePackByUUID\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBVUUID\@mce\@\@\@Z */ virtual class ResourcePack * getResourcePackByUUID(class mce::UUID const &) const; /** - * @vftbl 4 - * @symbol ?getResourcePackForPackIdOwned\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@\@Z + * @vftbl 4 + * @symbol ?getResourcePackForPackIdOwned\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@\@Z */ virtual class ResourcePack * getResourcePackForPackIdOwned(struct PackIdVersion const &) const; /** - * @vftbl 5 - * @symbol ?getResourcePackSatisfiesPackId\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@_N\@Z + * @vftbl 5 + * @symbol ?getResourcePackSatisfiesPackId\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@_N\@Z */ virtual class ResourcePack * getResourcePackSatisfiesPackId(struct PackIdVersion const &, bool) const; /** - * @vftbl 6 - * @symbol ?getResourcePackContainingModule\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@\@Z + * @vftbl 6 + * @symbol ?getResourcePackContainingModule\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBUPackIdVersion\@\@\@Z */ virtual class ResourcePack * getResourcePackContainingModule(struct PackIdVersion const &) const; /** - * @vftbl 7 - * @symbol ?getResourcePackInPath\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBVPath\@Core\@\@\@Z + * @vftbl 7 + * @symbol ?getResourcePackInPath\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@AEBVPath\@Core\@\@\@Z */ virtual class ResourcePack * getResourcePackInPath(class Core::Path const &) const; /** - * @vftbl 8 - * @symbol ?isResourcePackLoaded\@ResourcePackRepository\@\@UEAA_NAEBUPackIdVersion\@\@AEBW4PackOrigin\@\@\@Z + * @vftbl 8 + * @symbol ?isResourcePackLoaded\@ResourcePackRepository\@\@UEAA_NAEBUPackIdVersion\@\@AEBW4PackOrigin\@\@\@Z */ virtual bool isResourcePackLoaded(struct PackIdVersion const &, enum class PackOrigin const &); /** - * @vftbl 9 - * @symbol ?getPackLoadingReport\@ResourcePackRepository\@\@UEBAPEBVPackSourceReport\@\@XZ + * @vftbl 9 + * @symbol ?getPackLoadingReport\@ResourcePackRepository\@\@UEBAPEBVPackSourceReport\@\@XZ */ virtual class PackSourceReport const * getPackLoadingReport() const; /** - * @vftbl 10 - * @symbol ?getEditorPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ + * @vftbl 10 + * @symbol ?getEditorPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ */ virtual class ResourcePack * getEditorPack() const; /** - * @vftbl 11 - * @symbol ?getVanillaPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ + * @vftbl 11 + * @symbol ?getVanillaPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ */ virtual class ResourcePack * getVanillaPack() const; /** - * @vftbl 12 - * @symbol ?getChemistryPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ + * @vftbl 12 + * @symbol ?getChemistryPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ */ virtual class ResourcePack * getChemistryPack() const; /** - * @vftbl 13 - * @symbol ?getChemistryServerPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ + * @vftbl 13 + * @symbol ?getChemistryServerPack\@ResourcePackRepository\@\@UEBAPEAVResourcePack\@\@XZ */ virtual class ResourcePack * getChemistryServerPack() const; /** - * @vftbl 14 - * @symbol ?setServicePacks\@ResourcePackRepository\@\@UEAA_NV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 14 + * @symbol ?setServicePacks\@ResourcePackRepository\@\@UEAA_NV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@\@Z */ virtual bool setServicePacks(std::vector); /** - * @vftbl 15 - * @symbol ?addServicePacksToStack\@ResourcePackRepository\@\@UEBAXAEAVResourcePackStack\@\@\@Z + * @vftbl 15 + * @symbol ?addServicePacksToStack\@ResourcePackRepository\@\@UEBAXAEAVResourcePackStack\@\@\@Z */ virtual void addServicePacksToStack(class ResourcePackStack &) const; /** - * @vftbl 16 - * @symbol ?addCachedResourcePacks\@ResourcePackRepository\@\@UEAAXPEBV?$unordered_map\@VContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VContentIdentity\@\@\@3\@U?$equal_to\@VContentIdentity\@\@\@3\@V?$allocator\@U?$pair\@$$CBVContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?addCachedResourcePacks\@ResourcePackRepository\@\@UEAAXPEBV?$unordered_map\@VContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VContentIdentity\@\@\@3\@U?$equal_to\@VContentIdentity\@\@\@3\@V?$allocator\@U?$pair\@$$CBVContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual void addCachedResourcePacks(class std::unordered_map, struct std::equal_to, class std::allocator>> const *); /** - * @vftbl 17 - * @symbol ?addWorldResourcePacks\@ResourcePackRepository\@\@UEAAXAEBVPath\@Core\@\@\@Z + * @vftbl 17 + * @symbol ?addWorldResourcePacks\@ResourcePackRepository\@\@UEAAXAEBVPath\@Core\@\@\@Z */ virtual void addWorldResourcePacks(class Core::Path const &); /** - * @vftbl 18 - * @symbol ?addPremiumWorldTemplateResourcePacks\@ResourcePackRepository\@\@UEAAXAEBVPath\@Core\@\@AEBVContentIdentity\@\@\@Z + * @vftbl 18 + * @symbol ?addPremiumWorldTemplateResourcePacks\@ResourcePackRepository\@\@UEAAXAEBVPath\@Core\@\@AEBVContentIdentity\@\@\@Z */ virtual void addPremiumWorldTemplateResourcePacks(class Core::Path const &, class ContentIdentity const &); /** - * @vftbl 19 - * @symbol ?removePacksLoadedFromCache\@ResourcePackRepository\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?removePacksLoadedFromCache\@ResourcePackRepository\@\@UEAAXXZ */ virtual void removePacksLoadedFromCache(); /** - * @vftbl 20 - * @symbol ?removePacksLoadedFromWorld\@ResourcePackRepository\@\@UEAAXXZ + * @vftbl 20 + * @symbol ?removePacksLoadedFromWorld\@ResourcePackRepository\@\@UEAAXXZ */ virtual void removePacksLoadedFromWorld(); /** - * @vftbl 21 - * @symbol ?getResourcePacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 21 + * @symbol ?getResourcePacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getResourcePacksPath() const; /** - * @vftbl 22 - * @symbol ?getBehaviorPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 22 + * @symbol ?getBehaviorPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getBehaviorPacksPath() const; /** - * @vftbl 23 - * @symbol ?getSkinPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 23 + * @symbol ?getSkinPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getSkinPacksPath() const; /** - * @vftbl 24 - * @symbol ?getDevelopmentResourcePacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 24 + * @symbol ?getDevelopmentResourcePacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getDevelopmentResourcePacksPath() const; /** - * @vftbl 25 - * @symbol ?getDevelopmentBehaviorPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 25 + * @symbol ?getDevelopmentBehaviorPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getDevelopmentBehaviorPacksPath() const; /** - * @vftbl 26 - * @symbol ?getDevelopmentSkinPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 26 + * @symbol ?getDevelopmentSkinPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getDevelopmentSkinPacksPath() const; /** - * @vftbl 27 - * @symbol ?getTreatmentPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 27 + * @symbol ?getTreatmentPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getTreatmentPacksPath() const; /** - * @vftbl 28 - * @symbol ?getKnownPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@W4KnownPackType\@\@\@Z + * @vftbl 28 + * @symbol ?getKnownPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@W4KnownPackType\@\@\@Z */ virtual class Core::PathBuffer const getKnownPacksPath(enum class KnownPackType) const; /** - * @vftbl 29 - * @symbol ?getKnownValidPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 29 + * @symbol ?getKnownValidPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getKnownValidPacksPath() const; /** - * @vftbl 30 - * @symbol ?getKnownInvalidPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 30 + * @symbol ?getKnownInvalidPacksPath\@ResourcePackRepository\@\@UEBA?BV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ virtual class Core::PathBuffer const getKnownInvalidPacksPath() const; /** - * @vftbl 31 - * @symbol ?refreshPacks\@ResourcePackRepository\@\@UEAAXXZ + * @vftbl 31 + * @symbol ?refreshPacks\@ResourcePackRepository\@\@UEAAXXZ */ virtual void refreshPacks(); /** - * @vftbl 32 - * @symbol ?requestReloadUserPacks\@ResourcePackRepository\@\@UEAAXXZ + * @vftbl 32 + * @symbol ?requestReloadUserPacks\@ResourcePackRepository\@\@UEAAXXZ */ virtual void requestReloadUserPacks(); /** - * @vftbl 33 - * @symbol ?requestReloadDynamicPackagePacks\@ResourcePackRepository\@\@UEAAXXZ + * @vftbl 33 + * @symbol ?requestReloadDynamicPackagePacks\@ResourcePackRepository\@\@UEAAXXZ */ virtual void requestReloadDynamicPackagePacks(); /** - * @vftbl 34 - * @symbol ?getKeyProvider\@ResourcePackRepository\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@XZ + * @vftbl 34 + * @symbol ?getKeyProvider\@ResourcePackRepository\@\@UEBA?AV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@XZ */ virtual class gsl::not_null> getKeyProvider() const; /** - * @vftbl 35 - * @symbol ?getPackManifestFactory\@ResourcePackRepository\@\@UEAAAEAVPackManifestFactory\@\@XZ + * @vftbl 35 + * @symbol ?getPackManifestFactory\@ResourcePackRepository\@\@UEAAAEAVPackManifestFactory\@\@XZ */ virtual class PackManifestFactory & getPackManifestFactory(); /** - * @vftbl 36 - * @symbol ?getPackSettingsFactory\@ResourcePackRepository\@\@UEBAAEAVPackSettingsFactory\@\@XZ + * @vftbl 36 + * @symbol ?getPackSettingsFactory\@ResourcePackRepository\@\@UEBAAEAVPackSettingsFactory\@\@XZ */ virtual class PackSettingsFactory & getPackSettingsFactory() const; /** - * @vftbl 37 - * @symbol ?getPackSourceFactory\@ResourcePackRepository\@\@UEAAAEAVPackSourceFactory\@\@XZ + * @vftbl 37 + * @symbol ?getPackSourceFactory\@ResourcePackRepository\@\@UEAAAEAVPackSourceFactory\@\@XZ */ virtual class PackSourceFactory & getPackSourceFactory(); /** - * @vftbl 38 - * @symbol ?getWorldPackSource\@ResourcePackRepository\@\@UEBAPEBVCompositePackSource\@\@XZ + * @vftbl 38 + * @symbol ?getWorldPackSource\@ResourcePackRepository\@\@UEBAPEBVCompositePackSource\@\@XZ */ virtual class CompositePackSource const * getWorldPackSource() const; /** - * @vftbl 39 - * @symbol ?getPacksByResourceLocation\@ResourcePackRepository\@\@UEBA?AV?$vector\@PEAVResourcePack\@\@V?$allocator\@PEAVResourcePack\@\@\@std\@\@\@std\@\@W4PackOrigin\@\@\@Z + * @vftbl 39 + * @symbol ?getPacksByResourceLocation\@ResourcePackRepository\@\@UEBA?AV?$vector\@PEAVResourcePack\@\@V?$allocator\@PEAVResourcePack\@\@\@std\@\@\@std\@\@W4PackOrigin\@\@\@Z */ virtual std::vector getPacksByResourceLocation(enum class PackOrigin) const; /** - * @vftbl 40 - * @symbol ?getPacksByType\@ResourcePackRepository\@\@UEBA?AV?$vector\@PEAVResourcePack\@\@V?$allocator\@PEAVResourcePack\@\@\@std\@\@\@std\@\@W4PackType\@\@\@Z + * @vftbl 40 + * @symbol ?getPacksByType\@ResourcePackRepository\@\@UEBA?AV?$vector\@PEAVResourcePack\@\@V?$allocator\@PEAVResourcePack\@\@\@std\@\@\@std\@\@W4PackType\@\@\@Z */ virtual std::vector getPacksByType(enum class PackType) const; /** - * @vftbl 41 - * @symbol ?addKnownPackFromImport\@ResourcePackRepository\@\@UEAAXAEBVPackManifest\@\@\@Z + * @vftbl 41 + * @symbol ?addKnownPackFromImport\@ResourcePackRepository\@\@UEAAXAEBVPackManifest\@\@\@Z */ virtual void addKnownPackFromImport(class PackManifest const &); /** - * @vftbl 42 - * @symbol ?addInvalidPack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@W4PackType\@\@\@Z + * @vftbl 42 + * @symbol ?addInvalidPack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@W4PackType\@\@\@Z */ virtual void addInvalidPack(class ResourceLocation const &, enum class PackType); /** - * @vftbl 43 - * @symbol ?getInvalidPacks\@ResourcePackRepository\@\@UEBAAEBV?$vector\@VResourceLocation\@\@V?$allocator\@VResourceLocation\@\@\@std\@\@\@std\@\@W4PackType\@\@\@Z + * @vftbl 43 + * @symbol ?getInvalidPacks\@ResourcePackRepository\@\@UEBAAEBV?$vector\@VResourceLocation\@\@V?$allocator\@VResourceLocation\@\@\@std\@\@\@std\@\@W4PackType\@\@\@Z */ virtual std::vector const & getInvalidPacks(enum class PackType) const; /** - * @vftbl 44 - * @symbol ?getInvalidPacks\@ResourcePackRepository\@\@UEBA?AV?$vector\@VResourceLocation\@\@V?$allocator\@VResourceLocation\@\@\@std\@\@\@std\@\@AEBUInvalidPacksFilterGroup\@\@\@Z + * @vftbl 44 + * @symbol ?getInvalidPacks\@ResourcePackRepository\@\@UEBA?AV?$vector\@VResourceLocation\@\@V?$allocator\@VResourceLocation\@\@\@std\@\@\@std\@\@AEBUInvalidPacksFilterGroup\@\@\@Z */ virtual std::vector getInvalidPacks(struct InvalidPacksFilterGroup const &) const; /** - * @vftbl 45 - * @symbol ?deletePack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z + * @vftbl 45 + * @symbol ?deletePack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z */ virtual void deletePack(class ResourceLocation const &); /** - * @vftbl 46 - * @symbol ?deletePackFiles\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z + * @vftbl 46 + * @symbol ?deletePackFiles\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z */ virtual void deletePackFiles(class ResourceLocation const &); /** - * @vftbl 47 - * @symbol ?postDeletePack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z + * @vftbl 47 + * @symbol ?postDeletePack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z */ virtual void postDeletePack(class ResourceLocation const &); /** - * @vftbl 48 - * @symbol ?untrackInvalidPack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z + * @vftbl 48 + * @symbol ?untrackInvalidPack\@ResourcePackRepository\@\@UEAAXAEBVResourceLocation\@\@\@Z */ virtual void untrackInvalidPack(class ResourceLocation const &); /** - * @vftbl 49 - * @symbol ?registerResourcePackRemovedCallback\@ResourcePackRepository\@\@UEAAXPEAXV?$function\@$$A6AXPEAVResourcePack\@\@\@Z\@std\@\@\@Z + * @vftbl 49 + * @symbol ?registerResourcePackRemovedCallback\@ResourcePackRepository\@\@UEAAXPEAXV?$function\@$$A6AXPEAVResourcePack\@\@\@Z\@std\@\@\@Z */ virtual void registerResourcePackRemovedCallback(void *, class std::function); /** - * @vftbl 50 - * @symbol ?unregisterResourcePackRemovedCallback\@ResourcePackRepository\@\@UEAAXPEAX\@Z + * @vftbl 50 + * @symbol ?unregisterResourcePackRemovedCallback\@ResourcePackRepository\@\@UEAAXPEAX\@Z */ virtual void unregisterResourcePackRemovedCallback(void *); /** - * @vftbl 51 - * @symbol ?isInitialized\@ResourcePackRepository\@\@UEAA_NXZ + * @vftbl 51 + * @symbol ?isInitialized\@ResourcePackRepository\@\@UEAA_NXZ */ virtual bool isInitialized(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKREPOSITORY /** - * @symbol ??0ResourcePackRepository\@\@QEAA\@AEAVIMinecraftEventing\@\@AEAVPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIContentAccessibilityProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@4\@AEAVPackSourceFactory\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePackRepository(); +#endif + /** + * @symbol ??0ResourcePackRepository\@\@QEAA\@AEAVIMinecraftEventing\@\@AEAVPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VIContentAccessibilityProvider\@\@\@Bedrock\@\@\@gsl\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@4\@AEAVPackSourceFactory\@\@_N\@Z */ MCAPI ResourcePackRepository(class IMinecraftEventing &, class PackManifestFactory &, class gsl::not_null> const &, class gsl::not_null> const &, class PackSourceFactory &, bool); /** - * @symbol ?CHEMISTRY_PACK_UUID\@ResourcePackRepository\@\@2VUUID\@mce\@\@B + * @symbol ?CHEMISTRY_PACK_UUID\@ResourcePackRepository\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CHEMISTRY_PACK_UUID; /** - * @symbol ?CHEMISTRY_SERVER_PACK_UUID\@ResourcePackRepository\@\@2VUUID\@mce\@\@B + * @symbol ?CHEMISTRY_SERVER_PACK_UUID\@ResourcePackRepository\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const CHEMISTRY_SERVER_PACK_UUID; //private: /** - * @symbol ?_detectKnownPacksChange\@ResourcePackRepository\@\@AEAAXAEAUKnownPackContainer\@1\@AEBU21\@W4KnownPackType\@\@\@Z + * @symbol ?_detectKnownPacksChange\@ResourcePackRepository\@\@AEAAXAEAUKnownPackContainer\@1\@AEBU21\@W4KnownPackType\@\@\@Z */ MCAPI void _detectKnownPacksChange(struct ResourcePackRepository::KnownPackContainer &, struct ResourcePackRepository::KnownPackContainer const &, enum class KnownPackType); /** - * @symbol ?_findVanillaPacks\@ResourcePackRepository\@\@AEAAXXZ + * @symbol ?_findVanillaPacks\@ResourcePackRepository\@\@AEAAXXZ */ MCAPI void _findVanillaPacks(); /** - * @symbol ?_initialize\@ResourcePackRepository\@\@AEAAXXZ + * @symbol ?_initialize\@ResourcePackRepository\@\@AEAAXXZ */ MCAPI void _initialize(); /** - * @symbol ?_initializeCachedPackSource\@ResourcePackRepository\@\@AEAAXXZ + * @symbol ?_initializeCachedPackSource\@ResourcePackRepository\@\@AEAAXXZ */ MCAPI void _initializeCachedPackSource(); /** - * @symbol ?_initializePackSource\@ResourcePackRepository\@\@AEAAXXZ + * @symbol ?_initializePackSource\@ResourcePackRepository\@\@AEAAXXZ */ MCAPI void _initializePackSource(); /** - * @symbol ?_initializeWorldPackSource\@ResourcePackRepository\@\@AEAAXXZ + * @symbol ?_initializeWorldPackSource\@ResourcePackRepository\@\@AEAAXXZ */ MCAPI void _initializeWorldPackSource(); /** - * @symbol ?_loadLastKnownUserPacks\@ResourcePackRepository\@\@AEAAXAEAUKnownPackContainer\@1\@W4KnownPackType\@\@\@Z + * @symbol ?_loadLastKnownUserPacks\@ResourcePackRepository\@\@AEAAXAEAUKnownPackContainer\@1\@W4KnownPackType\@\@\@Z */ MCAPI void _loadLastKnownUserPacks(struct ResourcePackRepository::KnownPackContainer &, enum class KnownPackType); /** - * @symbol ?_loadPacks\@ResourcePackRepository\@\@AEAAX_N\@Z + * @symbol ?_loadPacks\@ResourcePackRepository\@\@AEAAX_N\@Z */ MCAPI void _loadPacks(bool); /** - * @symbol ?_packExists\@ResourcePackRepository\@\@AEBA_NAEBVUUID\@mce\@\@AEBVSemVersion\@\@W4PackOrigin\@\@\@Z + * @symbol ?_packExists\@ResourcePackRepository\@\@AEBA_NAEBVUUID\@mce\@\@AEBVSemVersion\@\@W4PackOrigin\@\@\@Z */ MCAPI bool _packExists(class mce::UUID const &, class SemVersion const &, enum class PackOrigin) const; /** - * @symbol ?_reloadUserPacks\@ResourcePackRepository\@\@AEAAXXZ + * @symbol ?_reloadUserPacks\@ResourcePackRepository\@\@AEAAXXZ */ MCAPI void _reloadUserPacks(); /** - * @symbol ?_removePack\@ResourcePackRepository\@\@AEAA_NAEBVResourceLocation\@\@_N\@Z + * @symbol ?_removePack\@ResourcePackRepository\@\@AEAA_NAEBVResourceLocation\@\@_N\@Z */ MCAPI bool _removePack(class ResourceLocation const &, bool); /** - * @symbol ?_saveKnownUserPacks\@ResourcePackRepository\@\@AEAAXAEAUKnownPackContainer\@1\@W4KnownPackType\@\@\@Z + * @symbol ?_saveKnownUserPacks\@ResourcePackRepository\@\@AEAAXAEAUKnownPackContainer\@1\@W4KnownPackType\@\@\@Z */ MCAPI void _saveKnownUserPacks(struct ResourcePackRepository::KnownPackContainer &, enum class KnownPackType); /** - * @symbol ?_triggerRemoveResourcePackCallback\@ResourcePackRepository\@\@AEAAXPEAVResourcePack\@\@\@Z + * @symbol ?_triggerRemoveResourcePackCallback\@ResourcePackRepository\@\@AEAAXPEAVResourcePack\@\@\@Z */ MCAPI void _triggerRemoveResourcePackCallback(class ResourcePack *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackStack.hpp b/LiteLoader/include/llapi/mc/ResourcePackStack.hpp index 165bac1b69..eac7ef7ecc 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackStack.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStack.hpp @@ -33,76 +33,82 @@ class ResourcePackStack { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackStack(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?loadAllVersionsOf\@ResourcePackStack\@\@UEBA?AV?$vector\@VLoadedResourceData\@\@V?$allocator\@VLoadedResourceData\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@\@Z + * @vftbl 1 + * @symbol ?loadAllVersionsOf\@ResourcePackStack\@\@UEBA?AV?$vector\@VLoadedResourceData\@\@V?$allocator\@VLoadedResourceData\@\@\@std\@\@\@std\@\@AEBVResourceLocation\@\@\@Z */ virtual std::vector loadAllVersionsOf(class ResourceLocation const &) const; /** - * @vftbl 2 - * @symbol ?loadAllVersionsOf\@ResourcePackStack\@\@UEBA_NAEBVResourceLocation\@\@AEAVResourcePackMergeStrategy\@\@\@Z + * @vftbl 2 + * @symbol ?loadAllVersionsOf\@ResourcePackStack\@\@UEBA_NAEBVResourceLocation\@\@AEAVResourcePackMergeStrategy\@\@\@Z */ virtual bool loadAllVersionsOf(class ResourceLocation const &, class ResourcePackMergeStrategy &) const; /** - * @vftbl 3 - * @symbol ?loadAllVersionsOf\@ResourcePackStack\@\@UEBA_NAEBVResourceLocation\@\@AEBV?$function\@$$A6A_NAEBVPackInstance\@\@\@Z\@std\@\@AEAVResourcePackMergeStrategy\@\@\@Z + * @vftbl 3 + * @symbol ?loadAllVersionsOf\@ResourcePackStack\@\@UEBA_NAEBVResourceLocation\@\@AEBV?$function\@$$A6A_NAEBVPackInstance\@\@\@Z\@std\@\@AEAVResourcePackMergeStrategy\@\@\@Z */ virtual bool loadAllVersionsOf(class ResourceLocation const &, class std::function const &, class ResourcePackMergeStrategy &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKSTACK /** - * @symbol ?add\@ResourcePackStack\@\@QEAAXVPackInstance\@\@AEBVIResourcePackRepository\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePackStack(); +#endif + /** + * @symbol ?add\@ResourcePackStack\@\@QEAAXVPackInstance\@\@AEBVIResourcePackRepository\@\@_N\@Z */ MCAPI void add(class PackInstance, class IResourcePackRepository const &, bool); /** - * @symbol ?generateAssetSet\@ResourcePackStack\@\@QEAAXXZ + * @symbol ?generateAssetSet\@ResourcePackStack\@\@QEAAXXZ */ MCAPI void generateAssetSet(); /** - * @symbol ?getSplitStacks\@ResourcePackStack\@\@QEBAXAEAV1\@0\@Z + * @symbol ?getSplitStacks\@ResourcePackStack\@\@QEBAXAEAV1\@0\@Z */ MCAPI void getSplitStacks(class ResourcePackStack &, class ResourcePackStack &) const; /** - * @symbol ?hasCapabilityInStack\@ResourcePackStack\@\@QEBA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?hasCapabilityInStack\@ResourcePackStack\@\@QEBA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI bool hasCapabilityInStack(class gsl::basic_string_span) const; + MCAPI bool hasCapabilityInStack(class std::basic_string_view>) const; /** - * @symbol ?hasPlatformLockedContent\@ResourcePackStack\@\@QEBA_NXZ + * @symbol ?hasPlatformLockedContent\@ResourcePackStack\@\@QEBA_NXZ */ MCAPI bool hasPlatformLockedContent() const; /** - * @symbol ?iteratePacks\@ResourcePackStack\@\@QEBAXAEBV?$function\@$$A6AXAEBVPackInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?iteratePacks\@ResourcePackStack\@\@QEBAXAEBV?$function\@$$A6AXAEBVPackInstance\@\@\@Z\@std\@\@\@Z */ MCAPI void iteratePacks(class std::function const &) const; /** - * @symbol ?removeDuplicates\@ResourcePackStack\@\@QEAAXXZ + * @symbol ?removeDuplicates\@ResourcePackStack\@\@QEAAXXZ */ MCAPI void removeDuplicates(); /** - * @symbol ?removeIf\@ResourcePackStack\@\@QEAAXAEBV?$function\@$$A6A_NAEBVPackInstance\@\@\@Z\@std\@\@\@Z + * @symbol ?removeIf\@ResourcePackStack\@\@QEAAXAEBV?$function\@$$A6A_NAEBVPackInstance\@\@\@Z\@std\@\@\@Z */ MCAPI void removeIf(class std::function const &); /** - * @symbol ?removeInvalidPacks\@ResourcePackStack\@\@QEAAXXZ + * @symbol ?removeInvalidPacks\@ResourcePackStack\@\@QEAAXXZ */ MCAPI void removeInvalidPacks(); /** - * @symbol ?deserialize\@ResourcePackStack\@\@SA?AV?$unique_ptr\@VResourcePackStack\@\@U?$default_delete\@VResourcePackStack\@\@\@std\@\@\@std\@\@AEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@3\@AEBVIResourcePackRepository\@\@\@Z + * @symbol ?deserialize\@ResourcePackStack\@\@SA?AV?$unique_ptr\@VResourcePackStack\@\@U?$default_delete\@VResourcePackStack\@\@\@std\@\@\@std\@\@AEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@3\@AEBVIResourcePackRepository\@\@\@Z */ MCAPI static std::unique_ptr deserialize(class std::basic_istream> &, class IResourcePackRepository const &); //private: /** - * @symbol ?_populateDependencies\@ResourcePackStack\@\@CAXAEAV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@std\@\@AEAVPackInstance\@\@AEBVIResourcePackRepository\@\@_N\@Z + * @symbol ?_populateDependencies\@ResourcePackStack\@\@CAXAEAV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@std\@\@AEAVPackInstance\@\@AEBVIResourcePackRepository\@\@_N\@Z */ MCAPI static void _populateDependencies(std::vector &, class PackInstance &, class IResourcePackRepository const &, bool); private: /** - * @symbol ?mUpgradePathMap\@ResourcePackStack\@\@0V?$map\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V12\@U?$less\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V12\@\@std\@\@\@4\@\@std\@\@A + * @symbol ?mUpgradePathMap\@ResourcePackStack\@\@0V?$map\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V12\@U?$less\@V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@std\@\@V?$allocator\@U?$pair\@$$CBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@V12\@\@std\@\@\@4\@\@std\@\@A */ MCAPI static class std::map, class Core::PathBuffer, struct std::less>, class std::allocator const, class Core::PathBuffer>>> mUpgradePathMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp index 16d3c26cdb..5674603c1a 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackStackPacket.hpp @@ -30,37 +30,43 @@ class ResourcePackStackPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePackStackPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ResourcePackStackPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ResourcePackStackPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ResourcePackStackPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ResourcePackStackPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ResourcePackStackPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ResourcePackStackPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ResourcePackStackPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKSTACKPACKET /** - * @symbol ??0ResourcePackStackPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePackStackPacket(); +#endif + /** + * @symbol ??0ResourcePackStackPacket\@\@QEAA\@XZ */ MCAPI ResourcePackStackPacket(); /** - * @symbol ??0ResourcePackStackPacket\@\@QEAA\@V?$vector\@UPackInstanceId\@\@V?$allocator\@UPackInstanceId\@\@\@std\@\@\@std\@\@0AEBVBaseGameVersion\@\@_NAEBVExperiments\@\@\@Z + * @symbol ??0ResourcePackStackPacket\@\@QEAA\@V?$vector\@UPackInstanceId\@\@V?$allocator\@UPackInstanceId\@\@\@std\@\@\@std\@\@0AEBVBaseGameVersion\@\@_NAEBVExperiments\@\@\@Z */ MCAPI ResourcePackStackPacket(std::vector, std::vector, class BaseGameVersion const &, bool, class Experiments const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp b/LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp index 724cc62a39..b9b4251f91 100644 --- a/LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePackTransmissionManager.hpp @@ -30,24 +30,24 @@ class ResourcePackTransmissionManager { public: /** - * @symbol ??0ResourcePackTransmissionManager\@\@QEAA\@AEAVScheduler\@\@\@Z + * @symbol ??0ResourcePackTransmissionManager\@\@QEAA\@AEAVScheduler\@\@\@Z */ MCAPI ResourcePackTransmissionManager(class Scheduler &); /** - * @symbol ?cleanupResourcePackManager\@ResourcePackTransmissionManager\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z + * @symbol ?cleanupResourcePackManager\@ResourcePackTransmissionManager\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z */ MCAPI void cleanupResourcePackManager(class NetworkIdentifier const &); /** - * @symbol ?getResourcePackUploadManager\@ResourcePackTransmissionManager\@\@QEAAAEAVResourcePackFileUploadManager\@\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getResourcePackUploadManager\@ResourcePackTransmissionManager\@\@QEAAAEAVResourcePackFileUploadManager\@\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class ResourcePackFileUploadManager & getResourcePackUploadManager(class PacketSender &, class NetworkIdentifier const &, std::string const &); /** - * @symbol ?update\@ResourcePackTransmissionManager\@\@QEAAXXZ + * @symbol ?update\@ResourcePackTransmissionManager\@\@QEAAXXZ */ MCAPI void update(); /** - * @symbol ??1ResourcePackTransmissionManager\@\@QEAA\@XZ + * @symbol ??1ResourcePackTransmissionManager\@\@QEAA\@XZ */ MCAPI ~ResourcePackTransmissionManager(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp index 24959f8b36..3f01e85b58 100644 --- a/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp +++ b/LiteLoader/include/llapi/mc/ResourcePacksInfoPacket.hpp @@ -37,37 +37,43 @@ class ResourcePacksInfoPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourcePacksInfoPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ResourcePacksInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ResourcePacksInfoPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ResourcePacksInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ResourcePacksInfoPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ResourcePacksInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ResourcePacksInfoPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ResourcePacksInfoPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESOURCEPACKSINFOPACKET /** - * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@_NAEAV?$vector\@UPackInfoData\@\@V?$allocator\@UPackInfoData\@\@\@std\@\@\@std\@\@10\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ResourcePacksInfoPacket(); +#endif + /** + * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@_NAEAV?$vector\@UPackInfoData\@\@V?$allocator\@UPackInfoData\@\@\@std\@\@\@std\@\@10\@Z */ MCAPI ResourcePacksInfoPacket(bool, std::vector &, std::vector &, bool); /** - * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@XZ + * @symbol ??0ResourcePacksInfoPacket\@\@QEAA\@XZ */ MCAPI ResourcePacksInfoPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceSignature.hpp b/LiteLoader/include/llapi/mc/ResourceSignature.hpp index b5459606c7..da18571f0d 100644 --- a/LiteLoader/include/llapi/mc/ResourceSignature.hpp +++ b/LiteLoader/include/llapi/mc/ResourceSignature.hpp @@ -31,32 +31,32 @@ class ResourceSignature { public: /** - * @symbol ?areKnownFilesValid\@ResourceSignature\@\@QEAA_NAEBVPackAccessStrategy\@\@\@Z + * @symbol ?areKnownFilesValid\@ResourceSignature\@\@QEAA_NAEBVPackAccessStrategy\@\@\@Z */ MCAPI bool areKnownFilesValid(class PackAccessStrategy const &); /** - * @symbol ??1ResourceSignature\@\@QEAA\@XZ + * @symbol ??1ResourceSignature\@\@QEAA\@XZ */ MCAPI ~ResourceSignature(); /** - * @symbol ?SIGNATURE_FILENAME\@ResourceSignature\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B + * @symbol ?SIGNATURE_FILENAME\@ResourceSignature\@\@2V?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@B */ MCAPI static class Core::PathBuffer const SIGNATURE_FILENAME; //private: /** - * @symbol ?_areKnownFilesValid\@ResourceSignature\@\@AEAA_NAEBVPackAccessStrategy\@\@_N\@Z + * @symbol ?_areKnownFilesValid\@ResourceSignature\@\@AEAA_NAEBVPackAccessStrategy\@\@_N\@Z */ MCAPI bool _areKnownFilesValid(class PackAccessStrategy const &, bool); /** - * @symbol ?_checkSignedFiles\@ResourceSignature\@\@AEBA_NAEBVPackAccessStrategy\@\@\@Z + * @symbol ?_checkSignedFiles\@ResourceSignature\@\@AEBA_NAEBVPackAccessStrategy\@\@\@Z */ MCAPI bool _checkSignedFiles(class PackAccessStrategy const &) const; /** - * @symbol ?_loadSignaturesFile\@ResourceSignature\@\@AEAAXAEBVPath\@Core\@\@AEBVPackAccessStrategy\@\@\@Z + * @symbol ?_loadSignaturesFile\@ResourceSignature\@\@AEAAXAEBVPath\@Core\@\@AEBVPackAccessStrategy\@\@\@Z */ MCAPI void _loadSignaturesFile(class Core::Path const &, class PackAccessStrategy const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp b/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp index f8ba811dff..999feef2b2 100644 --- a/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp +++ b/LiteLoader/include/llapi/mc/ResourceUriCommand.hpp @@ -31,34 +31,34 @@ class ResourceUriCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ResourceUriCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ResourceUriCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ResourceUriCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ResourceUriCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ResourceUriCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_executeClear\@ResourceUriCommand\@\@AEBAXAEAVLevel\@\@PEAVPlayer\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeClear\@ResourceUriCommand\@\@AEBAXAEAVLevel\@\@PEAVPlayer\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeClear(class Level &, class Player *, class CommandOutput &) const; /** - * @symbol ?_executeNamed\@ResourceUriCommand\@\@AEBAXAEAVLevel\@\@PEAVPlayer\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeNamed\@ResourceUriCommand\@\@AEBAXAEAVLevel\@\@PEAVPlayer\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeNamed(class Level &, class Player *, class CommandOutput &) const; /** - * @symbol ?_executeUriOnly\@ResourceUriCommand\@\@AEBAXAEAVLevel\@\@PEAVPlayer\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_executeUriOnly\@ResourceUriCommand\@\@AEBAXAEAVLevel\@\@PEAVPlayer\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _executeUriOnly(class Level &, class Player *, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ResourceUtil.hpp b/LiteLoader/include/llapi/mc/ResourceUtil.hpp index 65b3b7554c..5bc7b7b0d7 100644 --- a/LiteLoader/include/llapi/mc/ResourceUtil.hpp +++ b/LiteLoader/include/llapi/mc/ResourceUtil.hpp @@ -30,12 +30,12 @@ class ResourceUtil { public: /** - * @symbol ?pathFromString\@ResourceUtil\@\@SA?AW4ResourceFileSystem\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?pathFromString\@ResourceUtil\@\@SA?AW4ResourceFileSystem\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI static enum class ResourceFileSystem pathFromString(class gsl::basic_string_span); + MCAPI static enum class ResourceFileSystem pathFromString(class std::basic_string_view>); /** - * @symbol ?stringFromPath\@ResourceUtil\@\@SA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@W4ResourceFileSystem\@\@\@Z + * @symbol ?stringFromPath\@ResourceUtil\@\@SA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4ResourceFileSystem\@\@\@Z */ - MCAPI static class gsl::basic_string_span stringFromPath(enum class ResourceFileSystem); + MCAPI static class std::basic_string_view> stringFromPath(enum class ResourceFileSystem); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp index 500b01bd48..2842e7b1b2 100644 --- a/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp +++ b/LiteLoader/include/llapi/mc/RespawnAnchorBlock.hpp @@ -31,281 +31,286 @@ class RespawnAnchorBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RespawnAnchorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@RespawnAnchorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @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 ?canSpawnAt\@RespawnAnchorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 129 + * @symbol ?canSpawnAt\@RespawnAnchorBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSpawnAt(class BlockSource const &, class BlockPos const &) const; /** - * @vftbl 130 - * @symbol ?notifySpawnedAt\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 130 + * @symbol ?notifySpawnedAt\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void notifySpawnedAt(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@RespawnAnchorBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@RespawnAnchorBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 - * @symbol ?getLightEmission\@RespawnAnchorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@RespawnAnchorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@RespawnAnchorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@RespawnAnchorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@RespawnAnchorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@RespawnAnchorBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@RespawnAnchorBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@RespawnAnchorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@RespawnAnchorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESPAWNANCHORBLOCK /** - * @symbol ?canBeSilkTouched\@RespawnAnchorBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@RespawnAnchorBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasComparatorSignal\@RespawnAnchorBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@RespawnAnchorBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; /** - * @symbol ?isInteractiveBlock\@RespawnAnchorBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@RespawnAnchorBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0RespawnAnchorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0RespawnAnchorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RespawnAnchorBlock(std::string const &, int); /** - * @symbol ?addItem\@RespawnAnchorBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?addItem\@RespawnAnchorBlock\@\@SA_NAEAVContainer\@\@HAEAVItemStack\@\@AEAVBlockSource\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool addItem(class Container &, int, class ItemStack &, class BlockSource &, class Block const &, class BlockPos const &); /** - * @symbol ?getChargeLevel\@RespawnAnchorBlock\@\@SAHAEBVBlock\@\@\@Z + * @symbol ?getChargeLevel\@RespawnAnchorBlock\@\@SAHAEBVBlock\@\@\@Z */ MCAPI static int getChargeLevel(class Block const &); //private: /** - * @symbol ?bumpCharge\@RespawnAnchorBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@F\@Z + * @symbol ?bumpCharge\@RespawnAnchorBlock\@\@CA_NAEAVBlockSource\@\@AEBVBlockPos\@\@F\@Z */ MCAPI static bool bumpCharge(class BlockSource &, class BlockPos const &, short); /** - * @symbol ?explode\@RespawnAnchorBlock\@\@CAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z + * @symbol ?explode\@RespawnAnchorBlock\@\@CAXAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z */ MCAPI static void explode(class Player &, class BlockPos const &, class BlockSource &, class Level &); /** - * @symbol ?trySetSpawn\@RespawnAnchorBlock\@\@CA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z + * @symbol ?trySetSpawn\@RespawnAnchorBlock\@\@CA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVLevel\@\@\@Z */ MCAPI static bool trySetSpawn(class Player &, class BlockPos const &, class BlockSource &, class Level &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RespawnPacket.hpp b/LiteLoader/include/llapi/mc/RespawnPacket.hpp index e5787da4e9..cd8afc30da 100644 --- a/LiteLoader/include/llapi/mc/RespawnPacket.hpp +++ b/LiteLoader/include/llapi/mc/RespawnPacket.hpp @@ -9,6 +9,8 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "Vec3.hpp" + enum class PlayerRespawnState :char { SERVER_SEARCHING = 0, SERVER_READY, @@ -56,37 +58,43 @@ return #var; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RespawnPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@RespawnPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@RespawnPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@RespawnPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@RespawnPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@RespawnPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@RespawnPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@RespawnPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@RespawnPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RESPAWNPACKET /** - * @symbol ??0RespawnPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI RespawnPacket(); + MCVAPI ~RespawnPacket(); +#endif /** - * @symbol ??0RespawnPacket\@\@QEAA\@AEBVVec3\@\@AEBW4PlayerRespawnState\@\@\@Z + * @symbol ??0RespawnPacket\@\@QEAA\@AEBVVec3\@\@AEBW4PlayerRespawnState\@\@\@Z */ MCAPI RespawnPacket(class Vec3 const &, enum class PlayerRespawnState const &); + /** + * @symbol ??0RespawnPacket\@\@QEAA\@XZ + */ + MCAPI RespawnPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp b/LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp index dc681a2c35..35b49e8d3a 100644 --- a/LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp +++ b/LiteLoader/include/llapi/mc/RestrictOpenDoorGoal.hpp @@ -30,48 +30,48 @@ class RestrictOpenDoorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RestrictOpenDoorGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RestrictOpenDoorGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RestrictOpenDoorGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RestrictOpenDoorGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RestrictOpenDoorGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RestrictOpenDoorGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RestrictOpenDoorGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RestrictOpenDoorGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RestrictOpenDoorGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RestrictOpenDoorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RestrictOpenDoorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RestrictOpenDoorGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0RestrictOpenDoorGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI RestrictOpenDoorGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RestrictSunGoal.hpp b/LiteLoader/include/llapi/mc/RestrictSunGoal.hpp index c39331cc52..2e16289c13 100644 --- a/LiteLoader/include/llapi/mc/RestrictSunGoal.hpp +++ b/LiteLoader/include/llapi/mc/RestrictSunGoal.hpp @@ -30,48 +30,48 @@ class RestrictSunGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RestrictSunGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RestrictSunGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RestrictSunGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RestrictSunGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RestrictSunGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RestrictSunGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RestrictSunGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RestrictSunGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RestrictSunGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RestrictSunGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0RestrictSunGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI RestrictSunGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RideCommand.hpp b/LiteLoader/include/llapi/mc/RideCommand.hpp index ab3c913f08..2f764005d4 100644 --- a/LiteLoader/include/llapi/mc/RideCommand.hpp +++ b/LiteLoader/include/llapi/mc/RideCommand.hpp @@ -31,42 +31,42 @@ class RideCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RideCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@RideCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@RideCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@RideCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@RideCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?evictPassengers\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?evictPassengers\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void evictPassengers(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?startRiding\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?startRiding\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void startRiding(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?stopRiding\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?stopRiding\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void stopRiding(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?summonPassenger\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?summonPassenger\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void summonPassenger(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?summonVehicle\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?summonVehicle\@RideCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void summonVehicle(class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp b/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp index fb36702919..fc864b75f2 100644 --- a/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/RideJumpTriggerSystem.hpp @@ -28,16 +28,16 @@ class RideJumpTriggerSystem { public: /** - * @symbol ?createSystem\@RideJumpTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@RideJumpTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_tickRideJumpTriggerSystem\@RideJumpTriggerSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMoveInputComponent\@\@AEBUPassengerComponent\@\@AEAUJumpRidingScaleComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobOnPlayerJumpRequestComponent\@\@USendPacketsComponent\@\@\@\@\@Z + * @symbol ?_tickRideJumpTriggerSystem\@RideJumpTriggerSystem\@\@CAXAEAVStrictEntityContext\@\@AEBUMoveInputComponent\@\@AEBUPassengerComponent\@\@AEAUJumpRidingScaleComponent\@\@AEAUVanillaClientGameplayComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBUPassengerComponent\@\@\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UMobOnPlayerJumpRequestComponent\@\@USendPacketsComponent\@\@\@\@\@Z */ MCAPI static void _tickRideJumpTriggerSystem(class StrictEntityContext &, struct MoveInputComponent const &, struct PassengerComponent const &, struct JumpRidingScaleComponent &, struct VanillaClientGameplayComponent &, class ViewT const>, class Optional const>, class Optional>, class EntityModifierT &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RideableComponent.hpp b/LiteLoader/include/llapi/mc/RideableComponent.hpp index f10ad21bd6..4212607092 100644 --- a/LiteLoader/include/llapi/mc/RideableComponent.hpp +++ b/LiteLoader/include/llapi/mc/RideableComponent.hpp @@ -28,64 +28,64 @@ class RideableComponent { public: /** - * @symbol ??0RideableComponent\@\@QEAA\@XZ - */ - MCAPI RideableComponent(); - /** - * @symbol ??0RideableComponent\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0RideableComponent\@\@QEAA\@AEBV0\@\@Z */ MCAPI RideableComponent(class RideableComponent const &); /** - * @symbol ??0RideableComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0RideableComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI RideableComponent(class RideableComponent &&); /** - * @symbol ?areSeatsFull\@RideableComponent\@\@QEBA_NAEBVActor\@\@\@Z + * @symbol ??0RideableComponent\@\@QEAA\@XZ + */ + MCAPI RideableComponent(); + /** + * @symbol ?areSeatsFull\@RideableComponent\@\@QEBA_NAEBVActor\@\@\@Z */ MCAPI bool areSeatsFull(class Actor const &) const; /** - * @symbol ?canAddPassenger\@RideableComponent\@\@QEBA_NAEBVActor\@\@AEAV2\@\@Z + * @symbol ?canAddPassenger\@RideableComponent\@\@QEBA_NAEBVActor\@\@AEAV2\@\@Z */ MCAPI bool canAddPassenger(class Actor const &, class Actor &) const; /** - * @symbol ?getFirstAvailableSeatPosition\@RideableComponent\@\@QEBA_NAEBVActor\@\@AEAV2\@AEAVVec3\@\@\@Z + * @symbol ?getFirstAvailableSeatPosition\@RideableComponent\@\@QEBA_NAEBVActor\@\@AEAV2\@AEAVVec3\@\@\@Z */ MCAPI bool getFirstAvailableSeatPosition(class Actor const &, class Actor &, class Vec3 &) const; /** - * @symbol ?getInteraction\@RideableComponent\@\@QEBA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@RideableComponent\@\@QEBA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &) const; /** - * @symbol ?getSeatCount\@RideableComponent\@\@QEBAHXZ + * @symbol ?getSeatCount\@RideableComponent\@\@QEBAHXZ */ MCAPI int getSeatCount() const; /** - * @symbol ?getSeats\@RideableComponent\@\@QEBAAEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSeats\@RideableComponent\@\@QEBAAEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getSeats() const; /** - * @symbol ??4RideableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4RideableComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class RideableComponent & operator=(class RideableComponent &&); /** - * @symbol ?positionPassenger\@RideableComponent\@\@QEBAXAEAVActor\@\@0\@Z + * @symbol ?positionPassenger\@RideableComponent\@\@QEBAXAEAVActor\@\@0\@Z */ MCAPI void positionPassenger(class Actor &, class Actor &) const; /** - * @symbol ?pullInEntity\@RideableComponent\@\@QEBA_NAEAVActor\@\@0\@Z + * @symbol ?pullInEntity\@RideableComponent\@\@QEBA_NAEAVActor\@\@0\@Z */ MCAPI bool pullInEntity(class Actor &, class Actor &) const; /** - * @symbol ??1RideableComponent\@\@QEAA\@XZ + * @symbol ??1RideableComponent\@\@QEAA\@XZ */ MCAPI ~RideableComponent(); //private: /** - * @symbol ?_setCanPlayerRide\@RideableComponent\@\@AEBAXAEAVPlayer\@\@_N\@Z + * @symbol ?_setCanPlayerRide\@RideableComponent\@\@AEBAXAEAVPlayer\@\@_N\@Z */ MCAPI void _setCanPlayerRide(class Player &, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RideableComponentData.hpp b/LiteLoader/include/llapi/mc/RideableComponentData.hpp index 21d983fa75..ffde819c5c 100644 --- a/LiteLoader/include/llapi/mc/RideableComponentData.hpp +++ b/LiteLoader/include/llapi/mc/RideableComponentData.hpp @@ -25,7 +25,7 @@ struct RideableComponentData { public: /** - * @symbol ??1RideableComponentData\@\@QEAA\@XZ + * @symbol ??1RideableComponentData\@\@QEAA\@XZ */ MCAPI ~RideableComponentData(); diff --git a/LiteLoader/include/llapi/mc/RideableDefinition.hpp b/LiteLoader/include/llapi/mc/RideableDefinition.hpp index d29b4c960b..3319008fc4 100644 --- a/LiteLoader/include/llapi/mc/RideableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RideableDefinition.hpp @@ -31,16 +31,16 @@ class RideableDefinition { public: /** - * @symbol ?addFamilyTypeByName\@RideableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addFamilyTypeByName\@RideableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addFamilyTypeByName(std::string const &); /** - * @symbol ?initialize\@RideableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVRideableComponent\@\@\@Z + * @symbol ?initialize\@RideableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVRideableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class RideableComponent &) const; /** - * @symbol ?buildSchema\@RideableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRideableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@RideableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VRideableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp b/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp index c61d91429f..48640cabe6 100644 --- a/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp +++ b/LiteLoader/include/llapi/mc/RiseToLiquidLevelGoal.hpp @@ -30,56 +30,56 @@ class RiseToLiquidLevelGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RiseToLiquidLevelGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RiseToLiquidLevelGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RiseToLiquidLevelGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@RiseToLiquidLevelGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RiseToLiquidLevelGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RiseToLiquidLevelGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RiseToLiquidLevelGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RiseToLiquidLevelGoal\@\@QEAA\@AEAVMob\@\@MMM\@Z + * @symbol ??0RiseToLiquidLevelGoal\@\@QEAA\@AEAVMob\@\@MMM\@Z */ MCAPI RiseToLiquidLevelGoal(class Mob &, float, float, float); //private: /** - * @symbol ?findLiquidLevel\@RiseToLiquidLevelGoal\@\@AEAAMXZ + * @symbol ?findLiquidLevel\@RiseToLiquidLevelGoal\@\@AEAAMXZ */ MCAPI float findLiquidLevel(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RisingGoal.hpp b/LiteLoader/include/llapi/mc/RisingGoal.hpp new file mode 100644 index 0000000000..3e89ebe638 --- /dev/null +++ b/LiteLoader/include/llapi/mc/RisingGoal.hpp @@ -0,0 +1,43 @@ +/** + * @file RisingGoal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BaseTimedActorFlagGoal.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RisingGoal : public BaseTimedActorFlagGoal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_RISINGGOAL +public: + class RisingGoal& operator=(class RisingGoal const &) = delete; + RisingGoal(class RisingGoal const &) = delete; + RisingGoal() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @symbol ??0RisingGoal\@\@QEAA\@AEAVMob\@\@\@Z + */ + MCAPI RisingGoal(class Mob &); + +}; diff --git a/LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp b/LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp index 306407057f..9134cec4af 100644 --- a/LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp +++ b/LiteLoader/include/llapi/mc/RiverFollowingGoal.hpp @@ -30,56 +30,56 @@ class RiverFollowingGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RiverFollowingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RiverFollowingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RiverFollowingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RiverFollowingGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RiverFollowingGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RiverFollowingGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RiverFollowingGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RiverFollowingGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RiverFollowingGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RiverFollowingGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RiverFollowingGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RiverFollowingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RiverFollowingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RiverFollowingGoal\@\@QEAA\@AEAVMob\@\@MM\@Z + * @symbol ??0RiverFollowingGoal\@\@QEAA\@AEAVMob\@\@MM\@Z */ MCAPI RiverFollowingGoal(class Mob &, float, float); //protected: /** - * @symbol ?determineSteerDirection\@RiverFollowingGoal\@\@IEAAXXZ + * @symbol ?determineSteerDirection\@RiverFollowingGoal\@\@IEAAXXZ */ MCAPI void determineSteerDirection(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RoarGoal.hpp b/LiteLoader/include/llapi/mc/RoarGoal.hpp index ee42a367d7..819c5cf5cf 100644 --- a/LiteLoader/include/llapi/mc/RoarGoal.hpp +++ b/LiteLoader/include/llapi/mc/RoarGoal.hpp @@ -28,48 +28,48 @@ class RoarGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RoarGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RoarGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RoarGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RoarGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RoarGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RoarGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RoarGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RoarGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RoarGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RoarGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RoarGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RoarGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RoarGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RoarGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0RoarGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI RoarGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RoleChecker.hpp b/LiteLoader/include/llapi/mc/RoleChecker.hpp index 4ade83c3b2..f5972ce604 100644 --- a/LiteLoader/include/llapi/mc/RoleChecker.hpp +++ b/LiteLoader/include/llapi/mc/RoleChecker.hpp @@ -29,20 +29,20 @@ class RoleChecker { public: /** - * @symbol ??0RoleChecker\@\@QEAA\@XZ + * @symbol ??0RoleChecker\@\@QEAA\@XZ */ MCAPI RoleChecker(); /** - * @symbol ?checkRole\@RoleChecker\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXW4ADRole\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z\@3\@\@Z + * @symbol ?checkRole\@RoleChecker\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$function\@$$A6AXW4ADRole\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z\@3\@\@Z */ MCAPI void checkRole(std::string const &, class std::function); /** - * @symbol ?lookupInProgress\@RoleChecker\@\@QEBA_NXZ + * @symbol ?lookupInProgress\@RoleChecker\@\@QEBA_NXZ */ MCAPI bool lookupInProgress() const; /** - * @symbol ??1RoleChecker\@\@QEAA\@XZ + * @symbol ??1RoleChecker\@\@QEAA\@XZ */ MCAPI ~RoleChecker(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RoleCheckerCallback.hpp b/LiteLoader/include/llapi/mc/RoleCheckerCallback.hpp new file mode 100644 index 0000000000..6c2321ffce --- /dev/null +++ b/LiteLoader/include/llapi/mc/RoleCheckerCallback.hpp @@ -0,0 +1,32 @@ +/** + * @file RoleCheckerCallback.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class RoleCheckerCallback { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_ROLECHECKERCALLBACK +public: + class RoleCheckerCallback& operator=(class RoleCheckerCallback const &) = delete; + RoleCheckerCallback(class RoleCheckerCallback const &) = delete; + RoleCheckerCallback() = delete; +#endif + +public: + /** + * @symbol ??1RoleCheckerCallback\@\@QEAA\@XZ + */ + MCAPI ~RoleCheckerCallback(); + +}; diff --git a/LiteLoader/include/llapi/mc/RollGoal.hpp b/LiteLoader/include/llapi/mc/RollGoal.hpp index 01596569f6..f5300c5766 100644 --- a/LiteLoader/include/llapi/mc/RollGoal.hpp +++ b/LiteLoader/include/llapi/mc/RollGoal.hpp @@ -30,60 +30,60 @@ class RollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RollGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RollGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RollGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RollGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RollGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@RollGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@RollGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@RollGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RollGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@RollGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@RollGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@RollGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@RollGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RollGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RollGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RollGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0RollGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI RollGoal(class Mob &, float); //private: /** - * @symbol ?_checkForDamagingBlocks\@RollGoal\@\@AEBA_NXZ + * @symbol ?_checkForDamagingBlocks\@RollGoal\@\@AEBA_NXZ */ MCAPI bool _checkForDamagingBlocks() const; /** - * @symbol ?_handleRoll\@RollGoal\@\@AEBAXHAEAVVec3\@\@AEAM1\@Z + * @symbol ?_handleRoll\@RollGoal\@\@AEBAXHAEAVVec3\@\@AEAM1\@Z */ MCAPI void _handleRoll(int, class Vec3 &, float &, float &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp b/LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp index f8aac6a279..b7f758fbd5 100644 --- a/LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/RoofedTreeCanopy.hpp @@ -31,14 +31,14 @@ class RoofedTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RoofedTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@RoofedTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@RoofedTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RoomDefinition.hpp b/LiteLoader/include/llapi/mc/RoomDefinition.hpp index c09661a293..6bbebe4494 100644 --- a/LiteLoader/include/llapi/mc/RoomDefinition.hpp +++ b/LiteLoader/include/llapi/mc/RoomDefinition.hpp @@ -29,24 +29,24 @@ class RoomDefinition { public: /** - * @symbol ??0RoomDefinition\@\@QEAA\@H\@Z + * @symbol ??0RoomDefinition\@\@QEAA\@H\@Z */ MCAPI RoomDefinition(int); /** - * @symbol ??0RoomDefinition\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0RoomDefinition\@\@QEAA\@AEBV0\@\@Z */ MCAPI RoomDefinition(class RoomDefinition const &); /** - * @symbol ?findSource\@RoomDefinition\@\@QEAA_NH\@Z + * @symbol ?findSource\@RoomDefinition\@\@QEAA_NH\@Z */ MCAPI bool findSource(int); /** - * @symbol ?setConnection\@RoomDefinition\@\@QEAAXAEBEV?$shared_ptr\@VRoomDefinition\@\@\@std\@\@\@Z + * @symbol ?setConnection\@RoomDefinition\@\@QEAAXAEBEV?$shared_ptr\@VRoomDefinition\@\@\@std\@\@\@Z */ MCAPI void setConnection(unsigned char const &, class std::shared_ptr); /** - * @symbol ??1RoomDefinition\@\@QEAA\@XZ + * @symbol ??1RoomDefinition\@\@QEAA\@XZ */ MCAPI ~RoomDefinition(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp index 922f5033e6..3e28865d6f 100644 --- a/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp +++ b/LiteLoader/include/llapi/mc/RootedDirtBlock.hpp @@ -31,223 +31,223 @@ class RootedDirtBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RootedDirtBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@RootedDirtBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@RootedDirtBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 95 - * @symbol ?tryToTill\@RootedDirtBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@AEAVItemStack\@\@\@Z + * @vftbl 95 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@RootedDirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@RootedDirtBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RootedDirtBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @symbol ??0RootedDirtBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0RootedDirtBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI RootedDirtBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RopeAABB.hpp b/LiteLoader/include/llapi/mc/RopeAABB.hpp index d6337b6732..aa11bbbae2 100644 --- a/LiteLoader/include/llapi/mc/RopeAABB.hpp +++ b/LiteLoader/include/llapi/mc/RopeAABB.hpp @@ -27,7 +27,7 @@ struct RopeAABB { public: /** - * @symbol ?getContactPoint\@RopeAABB\@\@QEBA_NAEBVVec3\@\@MAEAUAABBContactPoint\@\@\@Z + * @symbol ?getContactPoint\@RopeAABB\@\@QEBA_NAEBVVec3\@\@MAEAUAABBContactPoint\@\@\@Z */ MCAPI bool getContactPoint(class Vec3 const &, float, struct AABBContactPoint &) const; diff --git a/LiteLoader/include/llapi/mc/RopeParams.hpp b/LiteLoader/include/llapi/mc/RopeParams.hpp index 44a5d8d228..cb4e652af6 100644 --- a/LiteLoader/include/llapi/mc/RopeParams.hpp +++ b/LiteLoader/include/llapi/mc/RopeParams.hpp @@ -29,15 +29,15 @@ struct RopeParams { public: /** - * @symbol ??0RopeParams\@\@QEAA\@XZ + * @symbol ??0RopeParams\@\@QEAA\@XZ */ MCAPI RopeParams(); /** - * @symbol ??0RopeParams\@\@QEAA\@AEBVVec3\@\@0M\@Z + * @symbol ??0RopeParams\@\@QEAA\@AEBVVec3\@\@0M\@Z */ MCAPI RopeParams(class Vec3 const &, class Vec3 const &, float); /** - * @symbol ?leadInit\@RopeParams\@\@QEAAXXZ + * @symbol ?leadInit\@RopeParams\@\@QEAAXXZ */ MCAPI void leadInit(); diff --git a/LiteLoader/include/llapi/mc/RopePoints.hpp b/LiteLoader/include/llapi/mc/RopePoints.hpp index 6b1b5c9452..c086a2317e 100644 --- a/LiteLoader/include/llapi/mc/RopePoints.hpp +++ b/LiteLoader/include/llapi/mc/RopePoints.hpp @@ -28,32 +28,32 @@ class RopePoints { public: /** - * @symbol ?beginRope\@RopePoints\@\@QEAAXXZ + * @symbol ?beginRope\@RopePoints\@\@QEAAXXZ */ MCAPI void beginRope(); /** - * @symbol ?endRope\@RopePoints\@\@QEAAXXZ + * @symbol ?endRope\@RopePoints\@\@QEAAXXZ */ MCAPI void endRope(); /** - * @symbol ?freezeInterpolation\@RopePoints\@\@QEAAXXZ + * @symbol ?freezeInterpolation\@RopePoints\@\@QEAAXXZ */ MCAPI void freezeInterpolation(); /** - * @symbol ?pushBack\@RopePoints\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?pushBack\@RopePoints\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void pushBack(class Vec3 const &); /** - * @symbol ?reserve\@RopePoints\@\@QEAAX_K\@Z + * @symbol ?reserve\@RopePoints\@\@QEAAX_K\@Z */ MCAPI void reserve(unsigned __int64); /** - * @symbol ?size\@RopePoints\@\@QEBA_KXZ + * @symbol ?size\@RopePoints\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; /** - * @symbol ??1RopePoints\@\@QEAA\@XZ + * @symbol ??1RopePoints\@\@QEAA\@XZ */ MCAPI ~RopePoints(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RopeSystem.hpp b/LiteLoader/include/llapi/mc/RopeSystem.hpp index 4410bdf722..9eeaa0e68a 100644 --- a/LiteLoader/include/llapi/mc/RopeSystem.hpp +++ b/LiteLoader/include/llapi/mc/RopeSystem.hpp @@ -29,112 +29,112 @@ class RopeSystem { public: /** - * @symbol ??0RopeSystem\@\@QEAA\@XZ + * @symbol ??0RopeSystem\@\@QEAA\@XZ */ MCAPI RopeSystem(); /** - * @symbol ?_initializePins\@RopeSystem\@\@QEAAXAEBVVec3\@\@0\@Z + * @symbol ?_initializePins\@RopeSystem\@\@QEAAXAEBVVec3\@\@0\@Z */ MCAPI void _initializePins(class Vec3 const &, class Vec3 const &); /** - * @symbol ?cutAtPercent\@RopeSystem\@\@QEAAXM\@Z + * @symbol ?cutAtPercent\@RopeSystem\@\@QEAAXM\@Z */ MCAPI void cutAtPercent(float); /** - * @symbol ?initialize\@RopeSystem\@\@QEAAXAEBURopeParams\@\@\@Z + * @symbol ?initialize\@RopeSystem\@\@QEAAXAEBURopeParams\@\@\@Z */ MCAPI void initialize(struct RopeParams const &); /** - * @symbol ?isCut\@RopeSystem\@\@QEBA_NXZ + * @symbol ?isCut\@RopeSystem\@\@QEBA_NXZ */ MCAPI bool isCut() const; /** - * @symbol ?isDestroyed\@RopeSystem\@\@QEBA_NXZ + * @symbol ?isDestroyed\@RopeSystem\@\@QEBA_NXZ */ MCAPI bool isDestroyed() const; /** - * @symbol ?queueTick\@RopeSystem\@\@QEAAXAEAVBlockSource\@\@AEAV?$shared_ptr\@VRopeSystem\@\@\@std\@\@\@Z + * @symbol ?queueTick\@RopeSystem\@\@QEAAXAEAVBlockSource\@\@AEAV?$shared_ptr\@VRopeSystem\@\@\@std\@\@\@Z */ MCAPI void queueTick(class BlockSource &, class std::shared_ptr &); /** - * @symbol ??1RopeSystem\@\@QEAA\@XZ + * @symbol ??1RopeSystem\@\@QEAA\@XZ */ MCAPI ~RopeSystem(); /** - * @symbol ?sBucketLength\@RopeSystem\@\@2MB + * @symbol ?sBucketLength\@RopeSystem\@\@2MB */ MCAPI static float const sBucketLength; /** - * @symbol ?sEnabled\@RopeSystem\@\@2_NA + * @symbol ?sEnabled\@RopeSystem\@\@2_NA */ MCAPI static bool sEnabled; /** - * @symbol ?sEpsilon\@RopeSystem\@\@2MB + * @symbol ?sEpsilon\@RopeSystem\@\@2MB */ MCAPI static float const sEpsilon; //private: /** - * @symbol ?_cacheColliders\@RopeSystem\@\@AEAA_NAEAVBlockSource\@\@\@Z + * @symbol ?_cacheColliders\@RopeSystem\@\@AEAA_NAEAVBlockSource\@\@\@Z */ MCAPI bool _cacheColliders(class BlockSource &); /** - * @symbol ?_finalizeBucket\@RopeSystem\@\@AEAAXAEAUAABBBucket\@\@\@Z + * @symbol ?_finalizeBucket\@RopeSystem\@\@AEAAXAEAUAABBBucket\@\@\@Z */ MCAPI void _finalizeBucket(struct AABBBucket &); /** - * @symbol ?_initializePins\@RopeSystem\@\@AEAAXXZ + * @symbol ?_initializePins\@RopeSystem\@\@AEAAXXZ */ MCAPI void _initializePins(); /** - * @symbol ?_integrate\@RopeSystem\@\@AEAAXXZ + * @symbol ?_integrate\@RopeSystem\@\@AEAAXXZ */ MCAPI void _integrate(); /** - * @symbol ?_prepareAABBBuckets\@RopeSystem\@\@AEAAXXZ + * @symbol ?_prepareAABBBuckets\@RopeSystem\@\@AEAAXXZ */ MCAPI void _prepareAABBBuckets(); /** - * @symbol ?_propagateDistanceConstraint\@RopeSystem\@\@AEAAMAEBVVec3\@\@AEAV2\@M\@Z + * @symbol ?_propagateDistanceConstraint\@RopeSystem\@\@AEAAMAEBVVec3\@\@AEAV2\@M\@Z */ MCAPI float _propagateDistanceConstraint(class Vec3 const &, class Vec3 &, float); /** - * @symbol ?_pruneDenyList\@RopeSystem\@\@AEAAXXZ + * @symbol ?_pruneDenyList\@RopeSystem\@\@AEAAXXZ */ MCAPI void _pruneDenyList(); /** - * @symbol ?_pushRange\@RopeSystem\@\@AEAAX_K0\@Z + * @symbol ?_pushRange\@RopeSystem\@\@AEAAX_K0\@Z */ MCAPI void _pushRange(unsigned __int64, unsigned __int64); /** - * @symbol ?_resizeRope\@RopeSystem\@\@AEAAXXZ + * @symbol ?_resizeRope\@RopeSystem\@\@AEAAXXZ */ MCAPI void _resizeRope(); /** - * @symbol ?_solveCollisions\@RopeSystem\@\@AEAAM_N\@Z + * @symbol ?_solveCollisions\@RopeSystem\@\@AEAAM_N\@Z */ MCAPI float _solveCollisions(bool); /** - * @symbol ?_solveDistanceConstraint\@RopeSystem\@\@AEAAMAEAVVec3\@\@0M\@Z + * @symbol ?_solveDistanceConstraint\@RopeSystem\@\@AEAAMAEAVVec3\@\@0M\@Z */ MCAPI float _solveDistanceConstraint(class Vec3 &, class Vec3 &, float); /** - * @symbol ?_solveDistanceConstraintBlock\@RopeSystem\@\@AEAAMAEAVVec3\@\@000M\@Z + * @symbol ?_solveDistanceConstraintBlock\@RopeSystem\@\@AEAAMAEAVVec3\@\@000M\@Z */ MCAPI float _solveDistanceConstraintBlock(class Vec3 &, class Vec3 &, class Vec3 &, class Vec3 &, float); /** - * @symbol ?_solveDistanceConstraints3\@RopeSystem\@\@AEAAMXZ + * @symbol ?_solveDistanceConstraints3\@RopeSystem\@\@AEAAMXZ */ MCAPI float _solveDistanceConstraints3(); /** - * @symbol ?_tick\@RopeSystem\@\@AEAAXXZ + * @symbol ?_tick\@RopeSystem\@\@AEAAXXZ */ MCAPI void _tick(); /** - * @symbol ?_tickWaves\@RopeSystem\@\@AEAAXXZ + * @symbol ?_tickWaves\@RopeSystem\@\@AEAAXXZ */ MCAPI void _tickWaves(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RotateState.hpp b/LiteLoader/include/llapi/mc/RotateState.hpp index 4c59a2e094..ba65bc471e 100644 --- a/LiteLoader/include/llapi/mc/RotateState.hpp +++ b/LiteLoader/include/llapi/mc/RotateState.hpp @@ -31,24 +31,24 @@ class RotateState : public PetSleepWithOwnerState { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RotateState(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@RotateState\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@RotateState\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol ?start\@PetSleepWithOwnerState\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?start\@PetSleepWithOwnerState\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 3 - * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ */ virtual void stop(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp index 342fec4392..229524742c 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarBlock.hpp @@ -31,212 +31,223 @@ class RotatedPillarBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RotatedPillarBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@RotatedPillarBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@RotatedPillarBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 149 - * @symbol ?getMappedFace\@RotatedPillarBlock\@\@UEBAEEAEBVBlock\@\@\@Z + * @vftbl 149 + * @symbol ?getMappedFace\@RotatedPillarBlock\@\@UEBAEEAEBVBlock\@\@\@Z */ virtual unsigned char getMappedFace(unsigned char, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@RotatedPillarBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ROTATEDPILLARBLOCK + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RotatedPillarBlock(); +#endif /** - * @symbol ??0RotatedPillarBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0RotatedPillarBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI RotatedPillarBlock(std::string const &, int, class Material const &); @@ -244,12 +255,12 @@ class RotatedPillarBlock : public BlockLegacy { private: /** - * @symbol ?mRotatedX\@RotatedPillarBlock\@\@0QBHB + * @symbol ?mRotatedX\@RotatedPillarBlock\@\@0QBHB */ MCAPI static int const mRotatedX[]; /** - * @symbol ?mRotatedZ\@RotatedPillarBlock\@\@0QBHB + * @symbol ?mRotatedZ\@RotatedPillarBlock\@\@0QBHB */ MCAPI static int const mRotatedZ[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp index 0eb47605ad..7bbb5b6386 100644 --- a/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp +++ b/LiteLoader/include/llapi/mc/RotatedPillarInfestedBlock.hpp @@ -31,208 +31,213 @@ class RotatedPillarInfestedBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RotatedPillarInfestedBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 102 - * @symbol ?spawnResources\@RotatedPillarInfestedBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@RotatedPillarInfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@RotatedPillarInfestedBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@RotatedPillarInfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@RotatedPillarInfestedBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0RotatedPillarInfestedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0RotatedPillarInfestedBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI RotatedPillarInfestedBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp b/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp index e1cc07ef5d..d97a8642c6 100644 --- a/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp +++ b/LiteLoader/include/llapi/mc/RotationCommandUtils.hpp @@ -7,6 +7,7 @@ #include "llapi/Global.h" #define BEFORE_EXTRA +#include "llapi/mc/RelativeFloat.hpp" #undef BEFORE_EXTRA @@ -31,19 +32,19 @@ class RotationData { #undef AFTER_EXTRA /** - * @symbol ?ComputeFacingRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@AEBVActor\@\@VVec3\@\@AEBV4\@H\@Z + * @symbol ?ComputeFacingRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@AEBVActor\@\@VVec3\@\@AEBV4\@H\@Z */ MCAPI class Vec2 ComputeFacingRotation(class Actor const &, class Vec3, class Vec3 const &, int); /** - * @symbol ?ComputeRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@AEBVActor\@\@AEBV?$optional\@VRotationData\@RotationCommandUtils\@\@\@std\@\@H\@Z + * @symbol ?ComputeRotation\@RotationCommandUtils\@\@YA?AVVec2\@\@AEBVActor\@\@AEBV?$optional\@VRotationData\@RotationCommandUtils\@\@\@std\@\@H\@Z */ MCAPI class Vec2 ComputeRotation(class Actor const &, class std::optional const &, int); /** - * @symbol ?getFacingDirectionFacingEntity\@RotationCommandUtils\@\@YA?AVVec3\@\@PEAVActor\@\@\@Z + * @symbol ?getFacingDirectionFacingEntity\@RotationCommandUtils\@\@YA?AVVec3\@\@PEAVActor\@\@\@Z */ MCAPI class Vec3 getFacingDirectionFacingEntity(class Actor *); /** - * @symbol ?getFacingDirectionFacingPosition\@RotationCommandUtils\@\@YA?AVVec3\@\@HAEBVCommandOrigin\@\@VCommandPositionFloat\@\@\@Z + * @symbol ?getFacingDirectionFacingPosition\@RotationCommandUtils\@\@YA?AVVec3\@\@HAEBVCommandOrigin\@\@VCommandPositionFloat\@\@\@Z */ MCAPI class Vec3 getFacingDirectionFacingPosition(int, class CommandOrigin const &, class CommandPositionFloat); diff --git a/LiteLoader/include/llapi/mc/RotationUtil.hpp b/LiteLoader/include/llapi/mc/RotationUtil.hpp index f7035d5d04..69b1aa0a1f 100644 --- a/LiteLoader/include/llapi/mc/RotationUtil.hpp +++ b/LiteLoader/include/llapi/mc/RotationUtil.hpp @@ -22,24 +22,24 @@ namespace RotationUtil { #undef AFTER_EXTRA /** - * @symbol ?getRandomRotation\@RotationUtil\@\@YA?AW4Rotation\@\@AEAVRandom\@\@\@Z + * @symbol ?getRandomRotation\@RotationUtil\@\@YA?AW4Rotation\@\@AEAVRandom\@\@\@Z */ MCAPI enum class Rotation getRandomRotation(class Random &); /** - * @symbol ?getRotated\@RotationUtil\@\@YA?AW4Rotation\@\@W42\@0\@Z + * @symbol ?getRotated\@RotationUtil\@\@YA?AW4Rotation\@\@W42\@0\@Z */ MCAPI enum class Rotation getRotated(enum class Rotation, enum class Rotation); /** - * @symbol ?getShuffledRotations\@RotationUtil\@\@YA?AV?$vector\@W4Rotation\@\@V?$allocator\@W4Rotation\@\@\@std\@\@\@std\@\@AEAVRandom\@\@\@Z + * @symbol ?getShuffledRotations\@RotationUtil\@\@YA?AV?$vector\@W4Rotation\@\@V?$allocator\@W4Rotation\@\@\@std\@\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI std::vector getShuffledRotations(class Random &); /** - * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z + * @symbol ?rotate\@RotationUtil\@\@YAEW4Rotation\@\@E\@Z */ - MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation); + MCAPI unsigned char rotate(enum class Rotation, unsigned char); /** - * @symbol ?rotate\@RotationUtil\@\@YAEW4Rotation\@\@E\@Z + * @symbol ?rotate\@RotationUtil\@\@YA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z */ - MCAPI unsigned char rotate(enum class Rotation, unsigned char); + MCAPI class BlockPos rotate(class BlockPos const &, enum class Rotation); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/RotationUtility.hpp b/LiteLoader/include/llapi/mc/RotationUtility.hpp index 4f5751828b..18908b126f 100644 --- a/LiteLoader/include/llapi/mc/RotationUtility.hpp +++ b/LiteLoader/include/llapi/mc/RotationUtility.hpp @@ -20,7 +20,7 @@ namespace RotationUtility { #undef AFTER_EXTRA /** - * @symbol ?setRot\@RotationUtility\@\@YAXAEBVVec2\@\@AEAV2\@1\@Z + * @symbol ?setRot\@RotationUtility\@\@YAXAEBVVec2\@\@AEAV2\@1\@Z */ MCAPI void setRot(class Vec2 const &, class Vec2 &, class Vec2 &); diff --git a/LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp b/LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp index 7c67cdb416..8f1e13b3a6 100644 --- a/LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp +++ b/LiteLoader/include/llapi/mc/RuinedPortalFeature.hpp @@ -31,28 +31,28 @@ class RuinedPortalFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RuinedPortalFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@RuinedPortalFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@RuinedPortalFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@RuinedPortalFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@RuinedPortalFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@RuinedPortalFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@RuinedPortalFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0RuinedPortalFeature\@\@QEAA\@I_N\@Z + * @symbol ??0RuinedPortalFeature\@\@QEAA\@I_N\@Z */ MCAPI RuinedPortalFeature(unsigned int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp b/LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp index 7c270c1ad3..198e00e22c 100644 --- a/LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp +++ b/LiteLoader/include/llapi/mc/RuinedPortalPiece.hpp @@ -31,63 +31,63 @@ class RuinedPortalPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RuinedPortalPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@RuinedPortalPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@RuinedPortalPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@RuinedPortalPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@RuinedPortalPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); //private: /** - * @symbol ?_addNetherrackDripColumn\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_addNetherrackDripColumn\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI void _addNetherrackDripColumn(class Random &, class BlockSource &, class BlockPos); /** - * @symbol ?_maybeReplaceBlock\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBUPortalEnvironmentModifiers\@\@\@Z + * @symbol ?_maybeReplaceBlock\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBUPortalEnvironmentModifiers\@\@\@Z */ MCAPI void _maybeReplaceBlock(class Random &, class BlockSource &, class BlockPos, struct PortalEnvironmentModifiers const &); /** - * @symbol ?_maybeReplaceFullStoneBlock\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBVBlock\@\@AEBUPortalEnvironmentModifiers\@\@\@Z + * @symbol ?_maybeReplaceFullStoneBlock\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBVBlock\@\@AEBUPortalEnvironmentModifiers\@\@\@Z */ MCAPI void _maybeReplaceFullStoneBlock(class Random &, class BlockSource &, class BlockPos, class Block const &, struct PortalEnvironmentModifiers const &); /** - * @symbol ?_maybeReplaceStairs\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBUPortalEnvironmentModifiers\@\@\@Z + * @symbol ?_maybeReplaceStairs\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBUPortalEnvironmentModifiers\@\@\@Z */ MCAPI void _maybeReplaceStairs(class Random &, class BlockSource &, class BlockPos, struct PortalEnvironmentModifiers const &); /** - * @symbol ?_maybeReplaceWall\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBUPortalEnvironmentModifiers\@\@\@Z + * @symbol ?_maybeReplaceWall\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@VBlockPos\@\@AEBUPortalEnvironmentModifiers\@\@\@Z */ MCAPI void _maybeReplaceWall(class Random &, class BlockSource &, class BlockPos, struct PortalEnvironmentModifiers const &); /** - * @symbol ?_moveStructureBoundsToSuitableY\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@AEBUPortalEnvironmentModifiers\@\@\@Z + * @symbol ?_moveStructureBoundsToSuitableY\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@AEBUPortalEnvironmentModifiers\@\@\@Z */ MCAPI void _moveStructureBoundsToSuitableY(class Random &, class BlockSource &, struct PortalEnvironmentModifiers const &); /** - * @symbol ?_spreadNetherrack\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@AEBUPortalEnvironmentModifiers\@\@\@Z + * @symbol ?_spreadNetherrack\@RuinedPortalPiece\@\@AEAAXAEAVRandom\@\@AEAVBlockSource\@\@AEBUPortalEnvironmentModifiers\@\@\@Z */ MCAPI void _spreadNetherrack(class Random &, class BlockSource &, struct PortalEnvironmentModifiers const &); /** - * @symbol ?_getRandomFacingStairs\@RuinedPortalPiece\@\@CAAEBVBlock\@\@AEAVRandom\@\@AEBV2\@\@Z + * @symbol ?_getRandomFacingStairs\@RuinedPortalPiece\@\@CAAEBVBlock\@\@AEAVRandom\@\@AEBV2\@\@Z */ MCAPI static class Block const & _getRandomFacingStairs(class Random &, class Block const &); /** - * @symbol ?_isLava\@RuinedPortalPiece\@\@CA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_isLava\@RuinedPortalPiece\@\@CA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI static bool _isLava(class BlockSource &, class BlockPos); /** - * @symbol ?_willLavaFlowIn\@RuinedPortalPiece\@\@CA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_willLavaFlowIn\@RuinedPortalPiece\@\@CA_NAEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI static bool _willLavaFlowIn(class BlockSource &, class BlockPos); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RuinedPortalStart.hpp b/LiteLoader/include/llapi/mc/RuinedPortalStart.hpp index f46d3e55d9..b3c9864cdc 100644 --- a/LiteLoader/include/llapi/mc/RuinedPortalStart.hpp +++ b/LiteLoader/include/llapi/mc/RuinedPortalStart.hpp @@ -31,13 +31,13 @@ class RuinedPortalStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RuinedPortalStart(); + virtual void __unk_vfn_0(); /** - * @symbol ??0RuinedPortalStart\@\@QEAA\@AEAVBiomeRegistry\@\@AEBVBiomeSource\@\@HHAEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ??0RuinedPortalStart\@\@QEAA\@AEAVBiomeRegistry\@\@AEBVBiomeSource\@\@HHAEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI RuinedPortalStart(class BiomeRegistry &, class BiomeSource const &, int, int, class IPreliminarySurfaceProvider const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp b/LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp index 96c027928d..dfb0875709 100644 --- a/LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp +++ b/LiteLoader/include/llapi/mc/RunAroundLikeCrazyGoal.hpp @@ -30,48 +30,48 @@ class RunAroundLikeCrazyGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RunAroundLikeCrazyGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@RunAroundLikeCrazyGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@RunAroundLikeCrazyGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@RunAroundLikeCrazyGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@RunAroundLikeCrazyGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@RunAroundLikeCrazyGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@RunAroundLikeCrazyGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@RunAroundLikeCrazyGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@RunAroundLikeCrazyGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0RunAroundLikeCrazyGoal\@\@QEAA\@AEAVMob\@\@M\@Z + * @symbol ??0RunAroundLikeCrazyGoal\@\@QEAA\@AEAVMob\@\@M\@Z */ MCAPI RunAroundLikeCrazyGoal(class Mob &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp b/LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp index 1aa5473ed1..839ecab80d 100644 --- a/LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp +++ b/LiteLoader/include/llapi/mc/RuntimeIdentifierDescription.hpp @@ -31,18 +31,24 @@ class RuntimeIdentifierDescription { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~RuntimeIdentifierDescription(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getJsonName\@RuntimeIdentifierDescription\@\@UEBAPEBDXZ + * @vftbl 1 + * @symbol ?getJsonName\@RuntimeIdentifierDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_RUNTIMEIDENTIFIERDESCRIPTION /** - * @symbol ?parse\@RuntimeIdentifierDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~RuntimeIdentifierDescription(); +#endif + /** + * @symbol ?parse\@RuntimeIdentifierDescription\@\@QEAAXAEBVValue\@Json\@\@\@Z */ MCAPI void parse(class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp b/LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp index 328c5eccbe..1c9e8d1bbf 100644 --- a/LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp +++ b/LiteLoader/include/llapi/mc/RuntimeLightingManager.hpp @@ -30,40 +30,40 @@ class RuntimeLightingManager { public: /** - * @symbol ??0RuntimeLightingManager\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0RuntimeLightingManager\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI RuntimeLightingManager(class Dimension &); /** - * @symbol ?flushRunTimeLighting\@RuntimeLightingManager\@\@QEAAXXZ + * @symbol ?flushRunTimeLighting\@RuntimeLightingManager\@\@QEAAXXZ */ MCAPI void flushRunTimeLighting(); /** - * @symbol ?updateBlockLight\@RuntimeLightingManager\@\@QEAAXAEBVBlockPos\@\@UBrightness\@\@111_N\@Z + * @symbol ?updateBlockLight\@RuntimeLightingManager\@\@QEAAXAEBVBlockPos\@\@UBrightness\@\@111_N\@Z */ MCAPI void updateBlockLight(class BlockPos const &, struct Brightness, struct Brightness, struct Brightness, struct Brightness, bool); /** - * @symbol ??1RuntimeLightingManager\@\@QEAA\@XZ + * @symbol ??1RuntimeLightingManager\@\@QEAA\@XZ */ MCAPI ~RuntimeLightingManager(); //private: /** - * @symbol ?_checkForRelightingTask\@RuntimeLightingManager\@\@AEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?_checkForRelightingTask\@RuntimeLightingManager\@\@AEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void _checkForRelightingTask(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); /** - * @symbol ?_getListOfChunksWithPlayerDistance\@RuntimeLightingManager\@\@AEAAXXZ + * @symbol ?_getListOfChunksWithPlayerDistance\@RuntimeLightingManager\@\@AEAAXXZ */ MCAPI void _getListOfChunksWithPlayerDistance(); /** - * @symbol ?_relightChunks\@RuntimeLightingManager\@\@AEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?_relightChunks\@RuntimeLightingManager\@\@AEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void _relightChunks(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); /** - * @symbol ?_removeProcessedSubchunks\@RuntimeLightingManager\@\@AEAAXXZ + * @symbol ?_removeProcessedSubchunks\@RuntimeLightingManager\@\@AEAAXXZ */ MCAPI void _removeProcessedSubchunks(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHChestCorridor.hpp b/LiteLoader/include/llapi/mc/SHChestCorridor.hpp index 802b52e435..9b2d28f0bf 100644 --- a/LiteLoader/include/llapi/mc/SHChestCorridor.hpp +++ b/LiteLoader/include/llapi/mc/SHChestCorridor.hpp @@ -31,24 +31,24 @@ class SHChestCorridor : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHChestCorridor(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHChestCorridor\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHChestCorridor\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHChestCorridor\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHChestCorridor\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHChestCorridor\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHChestCorridor\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHFillerCorridor.hpp b/LiteLoader/include/llapi/mc/SHFillerCorridor.hpp index d634406a03..bca5712f4d 100644 --- a/LiteLoader/include/llapi/mc/SHFillerCorridor.hpp +++ b/LiteLoader/include/llapi/mc/SHFillerCorridor.hpp @@ -31,23 +31,23 @@ class SHFillerCorridor : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHFillerCorridor(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHFillerCorridor\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHFillerCorridor\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@SHFillerCorridor\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHFillerCorridor\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?findPieceBox\@SHFillerCorridor\@\@SA?AVBoundingBox\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHH\@Z + * @symbol ?findPieceBox\@SHFillerCorridor\@\@SA?AVBoundingBox\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHH\@Z */ MCAPI static class BoundingBox findPieceBox(std::vector> &, class Random &, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHFiveCrossing.hpp b/LiteLoader/include/llapi/mc/SHFiveCrossing.hpp index 4b3bf30379..1b5f3efa73 100644 --- a/LiteLoader/include/llapi/mc/SHFiveCrossing.hpp +++ b/LiteLoader/include/llapi/mc/SHFiveCrossing.hpp @@ -31,24 +31,24 @@ class SHFiveCrossing : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHFiveCrossing(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHFiveCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHFiveCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHFiveCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHFiveCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHFiveCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHFiveCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHLeftTurn.hpp b/LiteLoader/include/llapi/mc/SHLeftTurn.hpp index fa4e968f77..fb1be90d35 100644 --- a/LiteLoader/include/llapi/mc/SHLeftTurn.hpp +++ b/LiteLoader/include/llapi/mc/SHLeftTurn.hpp @@ -31,24 +31,24 @@ class SHLeftTurn : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHLeftTurn(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHLeftTurn\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHLeftTurn\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHLeftTurn\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHLeftTurn\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHLeftTurn\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHLeftTurn\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHLibrary.hpp b/LiteLoader/include/llapi/mc/SHLibrary.hpp index 72167a1423..2358de9f2b 100644 --- a/LiteLoader/include/llapi/mc/SHLibrary.hpp +++ b/LiteLoader/include/llapi/mc/SHLibrary.hpp @@ -31,23 +31,23 @@ class SHLibrary : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHLibrary(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHLibrary\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHLibrary\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@SHLibrary\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHLibrary\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?createPiece\@SHLibrary\@\@SA?AV?$unique_ptr\@VStrongholdPiece\@\@U?$default_delete\@VStrongholdPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?createPiece\@SHLibrary\@\@SA?AV?$unique_ptr\@VStrongholdPiece\@\@U?$default_delete\@VStrongholdPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI static std::unique_ptr createPiece(std::vector> &, class Random &, int, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHPortalRoom.hpp b/LiteLoader/include/llapi/mc/SHPortalRoom.hpp index 6a1f6c9c08..013d225436 100644 --- a/LiteLoader/include/llapi/mc/SHPortalRoom.hpp +++ b/LiteLoader/include/llapi/mc/SHPortalRoom.hpp @@ -31,24 +31,24 @@ class SHPortalRoom : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHPortalRoom(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHPortalRoom\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHPortalRoom\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHPortalRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHPortalRoom\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHPortalRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHPortalRoom\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHPrisonHall.hpp b/LiteLoader/include/llapi/mc/SHPrisonHall.hpp index e58f6686fc..bedd07587d 100644 --- a/LiteLoader/include/llapi/mc/SHPrisonHall.hpp +++ b/LiteLoader/include/llapi/mc/SHPrisonHall.hpp @@ -31,24 +31,24 @@ class SHPrisonHall : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHPrisonHall(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHPrisonHall\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHPrisonHall\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHPrisonHall\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHPrisonHall\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHPrisonHall\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHPrisonHall\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHRightTurn.hpp b/LiteLoader/include/llapi/mc/SHRightTurn.hpp index 5df15c6d3d..334ed0e051 100644 --- a/LiteLoader/include/llapi/mc/SHRightTurn.hpp +++ b/LiteLoader/include/llapi/mc/SHRightTurn.hpp @@ -31,24 +31,24 @@ class SHRightTurn : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHRightTurn(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHRightTurn\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHRightTurn\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHRightTurn\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHRightTurn\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHRightTurn\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHRightTurn\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHRoomCrossing.hpp b/LiteLoader/include/llapi/mc/SHRoomCrossing.hpp index eda6b5d4e2..1dc91e5036 100644 --- a/LiteLoader/include/llapi/mc/SHRoomCrossing.hpp +++ b/LiteLoader/include/llapi/mc/SHRoomCrossing.hpp @@ -31,28 +31,28 @@ class SHRoomCrossing : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHRoomCrossing(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHRoomCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHRoomCrossing\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHRoomCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHRoomCrossing\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHRoomCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHRoomCrossing\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?createPiece\@SHRoomCrossing\@\@SA?AV?$unique_ptr\@VStrongholdPiece\@\@U?$default_delete\@VStrongholdPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?createPiece\@SHRoomCrossing\@\@SA?AV?$unique_ptr\@VStrongholdPiece\@\@U?$default_delete\@VStrongholdPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI static std::unique_ptr createPiece(std::vector> &, class Random &, int, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHStairsDown.hpp b/LiteLoader/include/llapi/mc/SHStairsDown.hpp index 99b51740c8..65e0c95dcb 100644 --- a/LiteLoader/include/llapi/mc/SHStairsDown.hpp +++ b/LiteLoader/include/llapi/mc/SHStairsDown.hpp @@ -31,24 +31,24 @@ class SHStairsDown : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHStairsDown(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHStairsDown\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHStairsDown\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHStairsDown\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHStairsDown\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHStairsDown\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHStairsDown\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHStartPiece.hpp b/LiteLoader/include/llapi/mc/SHStartPiece.hpp index d037b39c2c..75187852dd 100644 --- a/LiteLoader/include/llapi/mc/SHStartPiece.hpp +++ b/LiteLoader/include/llapi/mc/SHStartPiece.hpp @@ -31,18 +31,18 @@ class SHStartPiece : public SHStairsDown { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHStartPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHStartPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHStartPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @symbol ??0SHStartPiece\@\@QEAA\@HAEAVRandom\@\@HH\@Z + * @symbol ??0SHStartPiece\@\@QEAA\@HAEAVRandom\@\@HH\@Z */ MCAPI SHStartPiece(int, class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHStraight.hpp b/LiteLoader/include/llapi/mc/SHStraight.hpp index 2688ea2a33..b43a7141a5 100644 --- a/LiteLoader/include/llapi/mc/SHStraight.hpp +++ b/LiteLoader/include/llapi/mc/SHStraight.hpp @@ -31,28 +31,28 @@ class SHStraight : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHStraight(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHStraight\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHStraight\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHStraight\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHStraight\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHStraight\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHStraight\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @symbol ?createPiece\@SHStraight\@\@SA?AV?$unique_ptr\@VStrongholdPiece\@\@U?$default_delete\@VStrongholdPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?createPiece\@SHStraight\@\@SA?AV?$unique_ptr\@VStrongholdPiece\@\@U?$default_delete\@VStrongholdPiece\@\@\@std\@\@\@std\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI static std::unique_ptr createPiece(std::vector> &, class Random &, int, int, int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp b/LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp index 8c696c8aa2..af6c7a23bb 100644 --- a/LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp +++ b/LiteLoader/include/llapi/mc/SHStraightStairsDown.hpp @@ -31,24 +31,24 @@ class SHStraightStairsDown : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SHStraightStairsDown(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SHStraightStairsDown\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SHStraightStairsDown\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@SHStraightStairsDown\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@SHStraightStairsDown\@\@UEAAXAEAVStructurePiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@SHStraightStairsDown\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHStraightStairsDown\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SaddleItem.hpp b/LiteLoader/include/llapi/mc/SaddleItem.hpp index 63aa69c526..14bf1f5129 100644 --- a/LiteLoader/include/llapi/mc/SaddleItem.hpp +++ b/LiteLoader/include/llapi/mc/SaddleItem.hpp @@ -27,83 +27,83 @@ class SaddleItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SaddleItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@SaddleItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@SaddleItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @symbol ??0SaddleItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0SaddleItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI SaddleItem(std::string const &, short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Salmon.hpp b/LiteLoader/include/llapi/mc/Salmon.hpp index 63ba8246c3..67cf2dd499 100644 --- a/LiteLoader/include/llapi/mc/Salmon.hpp +++ b/LiteLoader/include/llapi/mc/Salmon.hpp @@ -32,143 +32,138 @@ class Salmon : public Fish { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Salmon(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 334 - * @symbol ?createAIGoals\@Salmon\@\@UEAA_NXZ + * @vftbl 331 + * @symbol ?createAIGoals\@Salmon\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Salmon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Salmon\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Salmon(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SandBlock.hpp b/LiteLoader/include/llapi/mc/SandBlock.hpp index 1e79944e9f..1a39901532 100644 --- a/LiteLoader/include/llapi/mc/SandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandBlock.hpp @@ -31,263 +31,268 @@ class SandBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SandBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@SandBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@SandBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?mayConsumeFertilizer\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z + * @vftbl 87 + * @symbol ?mayConsumeFertilizer\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@SandBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@SandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@SandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@SandBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@SandBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@SandBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@SandBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getDustColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@SandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@SandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @symbol ??0SandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SandBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SandFeature.hpp b/LiteLoader/include/llapi/mc/SandFeature.hpp index 3c1db1954f..1533219072 100644 --- a/LiteLoader/include/llapi/mc/SandFeature.hpp +++ b/LiteLoader/include/llapi/mc/SandFeature.hpp @@ -31,18 +31,18 @@ class SandFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SandFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@SandFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@SandFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0SandFeature\@\@QEAA\@AEBVBlock\@\@H\@Z + * @symbol ??0SandFeature\@\@QEAA\@AEBVBlock\@\@H\@Z */ MCAPI SandFeature(class Block const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp index 71740ed573..95859dbcc9 100644 --- a/LiteLoader/include/llapi/mc/SandStoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/SandStoneBlock.hpp @@ -31,223 +31,228 @@ class SandStoneBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SandStoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@SandStoneBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@SandStoneBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@SandStoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@SandStoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@SandStoneBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@SandStoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SandStoneBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Sapling.hpp b/LiteLoader/include/llapi/mc/Sapling.hpp index 75f7b61647..82fdd33454 100644 --- a/LiteLoader/include/llapi/mc/Sapling.hpp +++ b/LiteLoader/include/llapi/mc/Sapling.hpp @@ -31,293 +31,308 @@ class Sapling : public BushBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Sapling(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@Sapling\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@Sapling\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@Sapling\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @symbol ?onFertilized\@Sapling\@\@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 88 + * @symbol ?canBeFertilized\@Sapling\@\@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 92 + * @symbol ?mayPlace\@Sapling\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@Sapling\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@Sapling\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@Sapling\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@Sapling\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@Sapling\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@Sapling\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@Sapling\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@Sapling\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 179 - * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 180 + * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@Sapling\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@Sapling\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@Sapling\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@Sapling\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SAPLING /** - * @symbol ??0Sapling\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Sapling(); +#endif + /** + * @symbol ??0Sapling\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI Sapling(std::string const &, int); //protected: /** - * @symbol ?advanceTree\@Sapling\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@PEAVActor\@\@\@Z + * @symbol ?advanceTree\@Sapling\@\@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 ?_generateBirchTree\@Sapling\@\@AEBA?AV?$WeakRefT\@UFeatureRefTraits\@\@\@\@AEBVFeatureRegistry\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@_N\@Z + */ + MCAPI class WeakRefT _generateBirchTree(class FeatureRegistry const &, class BlockPos const &, class BlockSource &, class Random &, bool) const; + /** + * @symbol ?_generateJungleTree\@Sapling\@\@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\@Sapling\@\@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\@Sapling\@\@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\@Sapling\@\@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\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI bool _growTree(class BlockSource &, class BlockPos const &, class Random &, bool) const; /** - * @symbol ?_isNearFlowerBlock\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isNearFlowerBlock\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isNearFlowerBlock(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_shouldContainBeehive\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_shouldContainBeehive\@Sapling\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI bool _shouldContainBeehive(class BlockSource &, class BlockPos const &, class Random &) const; @@ -325,4 +340,4 @@ class Sapling : public BushBlock { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp index 9cc8b69263..4aada9a913 100644 --- a/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SaplingBlockItem.hpp @@ -32,84 +32,84 @@ class SaplingBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SaplingBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@SaplingBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@SaplingBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@SaplingBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @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; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SaveCommand.hpp b/LiteLoader/include/llapi/mc/SaveCommand.hpp index a9eb0791e4..27fd0106da 100644 --- a/LiteLoader/include/llapi/mc/SaveCommand.hpp +++ b/LiteLoader/include/llapi/mc/SaveCommand.hpp @@ -33,46 +33,46 @@ enum class State; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SaveCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SaveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SaveCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SaveCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SaveCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?saveHold\@SaveCommand\@\@CAXAEAVCommandOutput\@\@\@Z + * @symbol ?saveHold\@SaveCommand\@\@CAXAEAVCommandOutput\@\@\@Z */ MCAPI static void saveHold(class CommandOutput &); /** - * @symbol ?saveResume\@SaveCommand\@\@CAXAEAVCommandOutput\@\@\@Z + * @symbol ?saveResume\@SaveCommand\@\@CAXAEAVCommandOutput\@\@\@Z */ MCAPI static void saveResume(class CommandOutput &); /** - * @symbol ?saveState\@SaveCommand\@\@CAXAEAVCommandOutput\@\@\@Z + * @symbol ?saveState\@SaveCommand\@\@CAXAEAVCommandOutput\@\@\@Z */ MCAPI static void saveState(class CommandOutput &); private: /** - * @symbol ?mSaveAllFileList\@SaveCommand\@\@0V?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@A + * @symbol ?mSaveAllFileList\@SaveCommand\@\@0V?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@A */ MCAPI static std::vector mSaveAllFileList; /** - * @symbol ?mSaveAllMutex\@SaveCommand\@\@0Vmutex\@std\@\@A + * @symbol ?mSaveAllMutex\@SaveCommand\@\@0Vmutex\@std\@\@A */ MCAPI static class std::mutex mSaveAllMutex; /** - * @symbol ?mState\@SaveCommand\@\@0W4State\@1\@A + * @symbol ?mState\@SaveCommand\@\@0W4State\@1\@A */ MCAPI static enum class SaveCommand::State mState; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SaveSurroundingChunksSystem.hpp b/LiteLoader/include/llapi/mc/SaveSurroundingChunksSystem.hpp index 45c1e1c64a..e7256b5d6f 100644 --- a/LiteLoader/include/llapi/mc/SaveSurroundingChunksSystem.hpp +++ b/LiteLoader/include/llapi/mc/SaveSurroundingChunksSystem.hpp @@ -30,27 +30,27 @@ class SaveSurroundingChunksSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SaveSurroundingChunksSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@SaveSurroundingChunksSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@SaveSurroundingChunksSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickSaveSurroundingChunks\@SaveSurroundingChunksSystem\@\@CAXAEAVActorOwnerComponent\@\@\@Z + * @symbol ?_tickSaveSurroundingChunks\@SaveSurroundingChunksSystem\@\@CAXAEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tickSaveSurroundingChunks(class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SaveTransactionManager.hpp b/LiteLoader/include/llapi/mc/SaveTransactionManager.hpp index d4ba7b1368..69fba88629 100644 --- a/LiteLoader/include/llapi/mc/SaveTransactionManager.hpp +++ b/LiteLoader/include/llapi/mc/SaveTransactionManager.hpp @@ -30,28 +30,28 @@ class SaveTransactionManager { public: /** - * @symbol ??0SaveTransactionManager\@\@QEAA\@AEAVWorkerPool\@\@AEAVScheduler\@\@V?$function\@$$A6AX_N\@Z\@std\@\@\@Z + * @symbol ??0SaveTransactionManager\@\@QEAA\@AEAVWorkerPool\@\@AEAVScheduler\@\@V?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ MCAPI SaveTransactionManager(class WorkerPool &, class Scheduler &, class std::function); /** - * @symbol ?onBeginCompaction\@SaveTransactionManager\@\@QEAAXXZ + * @symbol ?onBeginCompaction\@SaveTransactionManager\@\@QEAAXXZ */ MCAPI void onBeginCompaction(); /** - * @symbol ?onEndCompaction\@SaveTransactionManager\@\@QEAAXXZ + * @symbol ?onEndCompaction\@SaveTransactionManager\@\@QEAAXXZ */ MCAPI void onEndCompaction(); //private: /** - * @symbol ?_hideGlobalSaveIcon\@SaveTransactionManager\@\@AEAAXXZ + * @symbol ?_hideGlobalSaveIcon\@SaveTransactionManager\@\@AEAAXXZ */ MCAPI void _hideGlobalSaveIcon(); /** - * @symbol ?_showGlobalSaveIcon\@SaveTransactionManager\@\@AEAAXXZ + * @symbol ?_showGlobalSaveIcon\@SaveTransactionManager\@\@AEAAXXZ */ MCAPI void _showGlobalSaveIcon(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SavedData.hpp b/LiteLoader/include/llapi/mc/SavedData.hpp index d895e1e482..fb79ed307b 100644 --- a/LiteLoader/include/llapi/mc/SavedData.hpp +++ b/LiteLoader/include/llapi/mc/SavedData.hpp @@ -29,5 +29,11 @@ class SavedData { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SAVEDDATA + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SavedData(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SavedDataStorage.hpp b/LiteLoader/include/llapi/mc/SavedDataStorage.hpp index c154a7b6e8..54e7b9c1cb 100644 --- a/LiteLoader/include/llapi/mc/SavedDataStorage.hpp +++ b/LiteLoader/include/llapi/mc/SavedDataStorage.hpp @@ -30,20 +30,20 @@ class SavedDataStorage { public: /** - * @symbol ??0SavedDataStorage\@\@QEAA\@PEAVLevelStorage\@\@\@Z + * @symbol ??0SavedDataStorage\@\@QEAA\@PEAVLevelStorage\@\@\@Z */ MCAPI SavedDataStorage(class LevelStorage *); /** - * @symbol ?loadAndSet\@SavedDataStorage\@\@QEAA_NAEAVSavedData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?loadAndSet\@SavedDataStorage\@\@QEAA_NAEAVSavedData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool loadAndSet(class SavedData &, std::string const &); /** - * @symbol ?save\@SavedDataStorage\@\@QEAAXXZ + * @symbol ?save\@SavedDataStorage\@\@QEAAXXZ */ MCAPI void save(); /** - * @symbol ?set\@SavedDataStorage\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVSavedData\@\@\@Z + * @symbol ?set\@SavedDataStorage\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVSavedData\@\@\@Z */ MCAPI void set(std::string const &, class SavedData &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SayCommand.hpp b/LiteLoader/include/llapi/mc/SayCommand.hpp index 64051cb9d6..056a35cd50 100644 --- a/LiteLoader/include/llapi/mc/SayCommand.hpp +++ b/LiteLoader/include/llapi/mc/SayCommand.hpp @@ -31,30 +31,30 @@ class SayCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SayCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SayCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SayCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SayCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SayCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_sendMessage\@SayCommand\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z + * @symbol ?_sendMessage\@SayCommand\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z */ MCAPI void _sendMessage(std::string const &, std::string const &, struct CommandOriginIdentity const &, class Level &) const; /** - * @symbol ?_trySendSayCommandEvent\@SayCommand\@\@AEBA_NAEBVPlayer\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_trySendSayCommandEvent\@SayCommand\@\@AEBA_NAEBVPlayer\@\@AEAVLevel\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _trySendSayCommandEvent(class Player const &, class Level &, std::string const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp index 7c8841d0b2..e312d97349 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlock.hpp @@ -31,304 +31,309 @@ class ScaffoldingBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScaffoldingBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@ScaffoldingBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@ScaffoldingBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@ScaffoldingBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@ScaffoldingBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@ScaffoldingBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@ScaffoldingBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 53 - * @symbol ?canBeAscendedByJumping\@ScaffoldingBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 53 + * @symbol ?canBeAscendedByJumping\@ScaffoldingBlock\@\@UEBA_NAEBVActor\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeAscendedByJumping(class Actor const &, class BlockPos const &) const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ScaffoldingBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ScaffoldingBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@ScaffoldingBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@ScaffoldingBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@ScaffoldingBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@ScaffoldingBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@ScaffoldingBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 128 - * @symbol ?canSlide\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 128 + * @symbol ?canSlide\@ScaffoldingBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSlide(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@ScaffoldingBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@ScaffoldingBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getDustColor\@ScaffoldingBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getDustColor\@ScaffoldingBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@ScaffoldingBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCAFFOLDINGBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@ScaffoldingBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@ScaffoldingBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0ScaffoldingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ScaffoldingBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ScaffoldingBlock(std::string const &, int); /** - * @symbol ?MAX_STABILITY\@ScaffoldingBlock\@\@2HB + * @symbol ?MAX_STABILITY\@ScaffoldingBlock\@\@2HB */ MCAPI static int const MAX_STABILITY; //protected: /** - * @symbol ?calculateStability\@ScaffoldingBlock\@\@IEBAHAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?calculateStability\@ScaffoldingBlock\@\@IEBAHAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI int calculateStability(class BlockSource const &, class BlockPos const &) const; //private: /** - * @symbol ?_updateBlockStability\@ScaffoldingBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_updateBlockStability\@ScaffoldingBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _updateBlockStability(class BlockSource &, class BlockPos const &) const; @@ -336,4 +341,4 @@ class ScaffoldingBlock : public HeavyBlock { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp index a4468d4359..c7c7808087 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingBlockItem.hpp @@ -32,83 +32,83 @@ class ScaffoldingBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScaffoldingBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@ScaffoldingBlockItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@ScaffoldingBlockItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0ScaffoldingBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ScaffoldingBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ScaffoldingBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp index 157b67afea..cadb814345 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingInputSystem.hpp @@ -28,8 +28,8 @@ class ScaffoldingInputSystem { public: /** - * @symbol ?createScaffoldingInputSystem\@ScaffoldingInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createScaffoldingInputSystem\@ScaffoldingInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createScaffoldingInputSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp b/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp index 5889687baf..e06cfe6519 100644 --- a/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/ScaffoldingSensingSystem.hpp @@ -28,8 +28,8 @@ class ScaffoldingSensingSystem { public: /** - * @symbol ?createScaffoldingSensingSystem\@ScaffoldingSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createScaffoldingSensingSystem\@ScaffoldingSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createScaffoldingSensingSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp b/LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp index ec1aa9840d..9f6589dd90 100644 --- a/LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp +++ b/LiteLoader/include/llapi/mc/ScaleByAgeComponent.hpp @@ -29,12 +29,12 @@ class ScaleByAgeComponent { public: /** - * @symbol ??0ScaleByAgeComponent\@\@QEAA\@XZ + * @symbol ??0ScaleByAgeComponent\@\@QEAA\@XZ */ MCAPI ScaleByAgeComponent(); /** - * @symbol ?_initializeScale\@ScaleByAgeComponent\@\@QEAAXAEAVEntityContext\@\@\@Z + * @symbol ?_initializeScale\@ScaleByAgeComponent\@\@QEAAXAEAVEntityContext\@\@\@Z */ MCAPI void _initializeScale(class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaleByAgeDefinition.hpp b/LiteLoader/include/llapi/mc/ScaleByAgeDefinition.hpp index f99f2e6545..6b74fc4345 100644 --- a/LiteLoader/include/llapi/mc/ScaleByAgeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ScaleByAgeDefinition.hpp @@ -30,16 +30,16 @@ class ScaleByAgeDefinition { public: /** - * @symbol ??0ScaleByAgeDefinition\@\@QEAA\@XZ + * @symbol ??0ScaleByAgeDefinition\@\@QEAA\@XZ */ MCAPI ScaleByAgeDefinition(); /** - * @symbol ?initialize\@ScaleByAgeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVScaleByAgeComponent\@\@\@Z + * @symbol ?initialize\@ScaleByAgeDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVScaleByAgeComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ScaleByAgeComponent &) const; /** - * @symbol ?buildSchema\@ScaleByAgeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VScaleByAgeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ScaleByAgeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VScaleByAgeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp b/LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp index b11d9273fc..93f215284e 100644 --- a/LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp +++ b/LiteLoader/include/llapi/mc/ScaleByAgeSystem.hpp @@ -30,19 +30,19 @@ class ScaleByAgeSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScaleByAgeSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@ScaleByAgeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@ScaleByAgeSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaleDefinition.hpp b/LiteLoader/include/llapi/mc/ScaleDefinition.hpp index 6a36016c53..389f4bba4c 100644 --- a/LiteLoader/include/llapi/mc/ScaleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ScaleDefinition.hpp @@ -31,7 +31,7 @@ struct ScaleDefinition { public: /** - * @symbol ?buildSchema\@ScaleDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UScaleDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ScaleDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UScaleDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/ScanSurfaceFeature.hpp b/LiteLoader/include/llapi/mc/ScanSurfaceFeature.hpp index 311b78183b..2a267c3aa3 100644 --- a/LiteLoader/include/llapi/mc/ScanSurfaceFeature.hpp +++ b/LiteLoader/include/llapi/mc/ScanSurfaceFeature.hpp @@ -30,14 +30,14 @@ class ScanSurfaceFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScanSurfaceFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@ScanSurfaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@ScanSurfaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScaredGoal.hpp b/LiteLoader/include/llapi/mc/ScaredGoal.hpp index 721ba067f3..11e7f4b1cc 100644 --- a/LiteLoader/include/llapi/mc/ScaredGoal.hpp +++ b/LiteLoader/include/llapi/mc/ScaredGoal.hpp @@ -30,48 +30,48 @@ class ScaredGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScaredGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ScaredGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ScaredGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@ScaredGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@ScaredGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ScaredGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ScaredGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ScaredGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ScaredGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ScaredGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ScaredGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ScaredGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ScaredGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ScaredGoal\@\@QEAA\@AEAVMob\@\@H\@Z + * @symbol ??0ScaredGoal\@\@QEAA\@AEAVMob\@\@H\@Z */ MCAPI ScaredGoal(class Mob &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScatterFeature.hpp b/LiteLoader/include/llapi/mc/ScatterFeature.hpp index 7d977d8ec3..d31c62b786 100644 --- a/LiteLoader/include/llapi/mc/ScatterFeature.hpp +++ b/LiteLoader/include/llapi/mc/ScatterFeature.hpp @@ -29,18 +29,18 @@ class ScatterFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScatterFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@ScatterFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@ScatterFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0ScatterFeature\@\@QEAA\@XZ + * @symbol ??0ScatterFeature\@\@QEAA\@XZ */ MCAPI ScatterFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScatterParams.hpp b/LiteLoader/include/llapi/mc/ScatterParams.hpp index fc5da221b4..f902c11fee 100644 --- a/LiteLoader/include/llapi/mc/ScatterParams.hpp +++ b/LiteLoader/include/llapi/mc/ScatterParams.hpp @@ -37,40 +37,40 @@ class ScatteredPositions { public: /** - * @symbol ?addAdditionalSaveData\@ScatterParams\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@ScatterParams\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?readAdditionalSaveData\@ScatterParams\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?readAdditionalSaveData\@ScatterParams\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void readAdditionalSaveData(class CompoundTag const &); /** - * @symbol ?scatter\@ScatterParams\@\@QEBA?AVScatteredPositions\@1\@AEAVRenderParams\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?scatter\@ScatterParams\@\@QEBA?AVScatteredPositions\@1\@AEAVRenderParams\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI class ScatterParams::ScatteredPositions scatter(class RenderParams &, class BlockPos const &, class Random &) const; /** - * @symbol ??1ScatterParams\@\@QEAA\@XZ + * @symbol ??1ScatterParams\@\@QEAA\@XZ */ MCAPI ~ScatterParams(); /** - * @symbol ?initMolangParams\@ScatterParams\@\@SAXAEAVRenderParams\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?initMolangParams\@ScatterParams\@\@SAXAEAVRenderParams\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI static void initMolangParams(class RenderParams &, class BlockPos const &, class Random &); /** - * @symbol ?initScatterParamIndices\@ScatterParams\@\@SAXXZ + * @symbol ?initScatterParamIndices\@ScatterParams\@\@SAXXZ */ MCAPI static void initScatterParamIndices(); //private: /** - * @symbol ?_getPos\@ScatterParams\@\@AEBA?AVBlockPos\@\@IAEBV2\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @symbol ?_getPos\@ScatterParams\@\@AEBA?AVBlockPos\@\@IAEBV2\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ MCAPI class BlockPos _getPos(unsigned int, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ?_parseExpressionNodeFloat\@ScatterParams\@\@AEAAXAEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEAVExpressionNode\@\@M\@Z + * @symbol ?_parseExpressionNodeFloat\@ScatterParams\@\@AEAAXAEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEAVExpressionNode\@\@M\@Z */ MCAPI void _parseExpressionNodeFloat(class CompoundTag const &, std::string const &, std::string const &, class ExpressionNode &, float); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScatterParamsMolangVariableIndices.hpp b/LiteLoader/include/llapi/mc/ScatterParamsMolangVariableIndices.hpp index 8f855ec0bb..4425149cfd 100644 --- a/LiteLoader/include/llapi/mc/ScatterParamsMolangVariableIndices.hpp +++ b/LiteLoader/include/llapi/mc/ScatterParamsMolangVariableIndices.hpp @@ -30,7 +30,7 @@ struct ScatterParamsMolangVariableIndices { public: /** - * @symbol ?initialize\@ScatterParamsMolangVariableIndices\@\@QEAAXXZ + * @symbol ?initialize\@ScatterParamsMolangVariableIndices\@\@QEAAXXZ */ MCAPI void initialize(); diff --git a/LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp b/LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp index 9605bc0960..e694d466cd 100644 --- a/LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp +++ b/LiteLoader/include/llapi/mc/ScatteredFeaturePiece.hpp @@ -31,25 +31,27 @@ class ScatteredFeaturePiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScatteredFeaturePiece(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCATTEREDFEATUREPIECE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScatteredFeaturePiece(); +#endif //protected: /** - * @symbol ??0ScatteredFeaturePiece\@\@IEAA\@HHHHHH\@Z + * @symbol ??0ScatteredFeaturePiece\@\@IEAA\@HHHHHH\@Z */ MCAPI ScatteredFeaturePiece(int, int, int, int, int, int); /** - * @symbol ?updateAverageGroundHeight\@ScatteredFeaturePiece\@\@IEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@H\@Z + * @symbol ?updateAverageGroundHeight\@ScatteredFeaturePiece\@\@IEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@H\@Z */ MCAPI bool updateAverageGroundHeight(class BlockSource &, class BoundingBox const &, int); - /** - * @symbol ?updateHeightPositionToLowestGroundHeight\@ScatteredFeaturePiece\@\@IEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@H\@Z - */ - MCAPI bool updateHeightPositionToLowestGroundHeight(class BlockSource &, class BoundingBox const &, int); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScentingGoal.hpp b/LiteLoader/include/llapi/mc/ScentingGoal.hpp new file mode 100644 index 0000000000..7848857e39 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ScentingGoal.hpp @@ -0,0 +1,43 @@ +/** + * @file ScentingGoal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "BaseTimedActorFlagGoal.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ScentingGoal : public BaseTimedActorFlagGoal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SCENTINGGOAL +public: + class ScentingGoal& operator=(class ScentingGoal const &) = delete; + ScentingGoal(class ScentingGoal const &) = delete; + ScentingGoal() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @symbol ??0ScentingGoal\@\@QEAA\@AEAVMob\@\@\@Z + */ + MCAPI ScentingGoal(class Mob &); + +}; diff --git a/LiteLoader/include/llapi/mc/ScheduleCommand.hpp b/LiteLoader/include/llapi/mc/ScheduleCommand.hpp index f4c8d4d5c3..d693a277f1 100644 --- a/LiteLoader/include/llapi/mc/ScheduleCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScheduleCommand.hpp @@ -37,34 +37,34 @@ struct FunctionInfo { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScheduleCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ScheduleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ScheduleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ScheduleCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ScheduleCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_delay\@ScheduleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_delay\@ScheduleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _delay(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_onAreaLoaded\@ScheduleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_onAreaLoaded\@ScheduleCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _onAreaLoaded(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_tryGetFunction\@ScheduleCommand\@\@AEBA?AUFunctionInfo\@1\@AEAVFunctionManager\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_tryGetFunction\@ScheduleCommand\@\@AEBA?AUFunctionInfo\@1\@AEAVFunctionManager\@\@AEAVCommandOutput\@\@\@Z */ MCAPI struct ScheduleCommand::FunctionInfo _tryGetFunction(class FunctionManager &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Scheduler.hpp b/LiteLoader/include/llapi/mc/Scheduler.hpp index 5a08262561..da38ce1b96 100644 --- a/LiteLoader/include/llapi/mc/Scheduler.hpp +++ b/LiteLoader/include/llapi/mc/Scheduler.hpp @@ -30,32 +30,32 @@ class Scheduler { public: /** - * @symbol ??0Scheduler\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@Z + * @symbol ??0Scheduler\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@I\@Z */ MCAPI Scheduler(std::string, unsigned int); /** - * @symbol ?changeThread\@Scheduler\@\@QEAAXVid\@thread\@std\@\@\@Z + * @symbol ?changeThread\@Scheduler\@\@QEAAXVid\@thread\@std\@\@\@Z */ MCAPI void changeThread(class std::thread::id); /** - * @symbol ?getCoroutinePool\@Scheduler\@\@QEAAAEAVWorkerPool\@\@XZ + * @symbol ?getCoroutinePool\@Scheduler\@\@QEAAAEAVWorkerPool\@\@XZ */ MCAPI class WorkerPool & getCoroutinePool(); /** - * @symbol ?processCoroutines\@Scheduler\@\@QEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@0\@Z + * @symbol ?processCoroutines\@Scheduler\@\@QEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@0\@Z */ MCAPI void processCoroutines(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>, class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); /** - * @symbol ?queueCallback\@Scheduler\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z + * @symbol ?queueCallback\@Scheduler\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ MCAPI void queueCallback(class std::shared_ptr); /** - * @symbol ?setTargetFPS\@Scheduler\@\@QEAAXI\@Z + * @symbol ?setTargetFPS\@Scheduler\@\@QEAAXI\@Z */ MCAPI void setTargetFPS(unsigned int); /** - * @symbol ?AVERAGE_TASK_TOLERANCE\@Scheduler\@\@2MB + * @symbol ?AVERAGE_TASK_TOLERANCE\@Scheduler\@\@2MB */ MCAPI static float const AVERAGE_TASK_TOLERANCE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SchedulerComponent.hpp b/LiteLoader/include/llapi/mc/SchedulerComponent.hpp index b72699d4d8..2df8a6984c 100644 --- a/LiteLoader/include/llapi/mc/SchedulerComponent.hpp +++ b/LiteLoader/include/llapi/mc/SchedulerComponent.hpp @@ -30,12 +30,12 @@ class SchedulerComponent { public: /** - * @symbol ?getCurrentEventIndex\@SchedulerComponent\@\@QEBAHXZ + * @symbol ?getCurrentEventIndex\@SchedulerComponent\@\@QEBAHXZ */ MCAPI int getCurrentEventIndex() const; /** - * @symbol ?setCurrentEventIndex\@SchedulerComponent\@\@QEAAXH\@Z + * @symbol ?setCurrentEventIndex\@SchedulerComponent\@\@QEAAXH\@Z */ MCAPI void setCurrentEventIndex(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SchedulerDefinition.hpp b/LiteLoader/include/llapi/mc/SchedulerDefinition.hpp index 8f02b7d51d..42bfda41e0 100644 --- a/LiteLoader/include/llapi/mc/SchedulerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SchedulerDefinition.hpp @@ -30,24 +30,24 @@ class SchedulerDefinition { public: /** - * @symbol ??0SchedulerDefinition\@\@QEAA\@XZ + * @symbol ??0SchedulerDefinition\@\@QEAA\@XZ */ MCAPI SchedulerDefinition(); /** - * @symbol ?initialize\@SchedulerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSchedulerComponent\@\@\@Z + * @symbol ?initialize\@SchedulerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSchedulerComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SchedulerComponent &) const; /** - * @symbol ?setMaxDelayTicks\@SchedulerDefinition\@\@QEAAXAEBM\@Z + * @symbol ?setMaxDelayTicks\@SchedulerDefinition\@\@QEAAXAEBM\@Z */ MCAPI void setMaxDelayTicks(float const &); /** - * @symbol ?setMinDelayTicks\@SchedulerDefinition\@\@QEAAXAEBM\@Z + * @symbol ?setMinDelayTicks\@SchedulerDefinition\@\@QEAAXAEBM\@Z */ MCAPI void setMinDelayTicks(float const &); /** - * @symbol ?buildSchema\@SchedulerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSchedulerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@SchedulerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSchedulerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SchedulerSystem.hpp b/LiteLoader/include/llapi/mc/SchedulerSystem.hpp index dd701b23b9..08de51e3cd 100644 --- a/LiteLoader/include/llapi/mc/SchedulerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SchedulerSystem.hpp @@ -30,19 +30,19 @@ class SchedulerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SchedulerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@SchedulerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@SchedulerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp b/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp index 6829411472..3a8b08c87f 100644 --- a/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp +++ b/LiteLoader/include/llapi/mc/ScopedAutoreleasePool.hpp @@ -29,24 +29,24 @@ class ScopedAutoreleasePool { public: /** - * @symbol ??0ScopedAutoreleasePool\@\@QEAA\@XZ + * @symbol ??0ScopedAutoreleasePool\@\@QEAA\@XZ */ MCAPI ScopedAutoreleasePool(); /** - * @symbol ?drain\@ScopedAutoreleasePool\@\@QEAAXXZ + * @symbol ?drain\@ScopedAutoreleasePool\@\@QEAAXXZ */ MCAPI void drain(); /** - * @symbol ?drainNow\@ScopedAutoreleasePool\@\@QEAAXXZ + * @symbol ?drainNow\@ScopedAutoreleasePool\@\@QEAAXXZ */ MCAPI void drainNow(); /** - * @symbol ?reset\@ScopedAutoreleasePool\@\@QEAAXXZ + * @symbol ?reset\@ScopedAutoreleasePool\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ??1ScopedAutoreleasePool\@\@QEAA\@XZ + * @symbol ??1ScopedAutoreleasePool\@\@QEAA\@XZ */ MCAPI ~ScopedAutoreleasePool(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScopedGameTestTickingArea.hpp b/LiteLoader/include/llapi/mc/ScopedGameTestTickingArea.hpp index 1986d83aec..c6560d9127 100644 --- a/LiteLoader/include/llapi/mc/ScopedGameTestTickingArea.hpp +++ b/LiteLoader/include/llapi/mc/ScopedGameTestTickingArea.hpp @@ -30,32 +30,32 @@ class ScopedGameTestTickingArea { public: /** - * @symbol ??0ScopedGameTestTickingArea\@\@QEAA\@AEAVDimension\@\@AEBVBoundingBox\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ScopedGameTestTickingArea\@\@QEAA\@AEAVDimension\@\@AEBVBoundingBox\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ScopedGameTestTickingArea(class Dimension &, class BoundingBox const &, std::string const &); /** - * @symbol ?areChunksLoaded\@ScopedGameTestTickingArea\@\@QEAA_NXZ + * @symbol ?areChunksLoaded\@ScopedGameTestTickingArea\@\@QEAA_NXZ */ MCAPI bool areChunksLoaded(); /** - * @symbol ?getTickingArea\@ScopedGameTestTickingArea\@\@QEBA?AV?$shared_ptr\@VITickingArea\@\@\@std\@\@XZ + * @symbol ?getTickingArea\@ScopedGameTestTickingArea\@\@QEBA?AV?$shared_ptr\@VITickingArea\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getTickingArea() const; /** - * @symbol ??1ScopedGameTestTickingArea\@\@QEAA\@XZ + * @symbol ??1ScopedGameTestTickingArea\@\@QEAA\@XZ */ MCAPI ~ScopedGameTestTickingArea(); /** - * @symbol ?TICKING_AREA_PREFIX\@ScopedGameTestTickingArea\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TICKING_AREA_PREFIX\@ScopedGameTestTickingArea\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TICKING_AREA_PREFIX; //private: /** - * @symbol ?_removeTickingArea\@ScopedGameTestTickingArea\@\@AEAAXXZ + * @symbol ?_removeTickingArea\@ScopedGameTestTickingArea\@\@AEAAXXZ */ MCAPI void _removeTickingArea(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp index 467f431e0f..cf2e9f76a3 100644 --- a/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp +++ b/LiteLoader/include/llapi/mc/ScopedSideBySideTrigger.hpp @@ -28,16 +28,16 @@ class ScopedSideBySideTrigger { public: /** - * @symbol ?end\@ScopedSideBySideTrigger\@\@QEAA_NXZ + * @symbol ?end\@ScopedSideBySideTrigger\@\@QEAA_NXZ */ MCAPI bool end(); /** - * @symbol ??1ScopedSideBySideTrigger\@\@QEAA\@XZ + * @symbol ??1ScopedSideBySideTrigger\@\@QEAA\@XZ */ MCAPI ~ScopedSideBySideTrigger(); /** - * @symbol ?tryTriggerIf\@ScopedSideBySideTrigger\@\@SA?AV1\@_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z + * @symbol ?tryTriggerIf\@ScopedSideBySideTrigger\@\@SA?AV1\@_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z */ MCAPI static class ScopedSideBySideTrigger tryTriggerIf(bool, struct IActorMovementProxy &, enum class SideBySideExtractionId); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp b/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp index 146819d58e..2483450528 100644 --- a/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp +++ b/LiteLoader/include/llapi/mc/ScorePacketInfo.hpp @@ -46,7 +46,7 @@ struct ScorePacketInfo { public: /** - * @symbol ??1ScorePacketInfo\@\@QEAA\@XZ + * @symbol ??1ScorePacketInfo\@\@QEAA\@XZ */ MCAPI ~ScorePacketInfo(); diff --git a/LiteLoader/include/llapi/mc/Scoreboard.hpp b/LiteLoader/include/llapi/mc/Scoreboard.hpp index daeaf3c3fc..fdbed1fc40 100644 --- a/LiteLoader/include/llapi/mc/Scoreboard.hpp +++ b/LiteLoader/include/llapi/mc/Scoreboard.hpp @@ -237,317 +237,321 @@ class Scoreboard { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Scoreboard(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setDisplayObjective\@Scoreboard\@\@UEAAPEBVDisplayObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z + * @vftbl 1 + * @symbol ?setDisplayObjective\@Scoreboard\@\@UEAAPEBVDisplayObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z */ virtual class DisplayObjective const * setDisplayObjective(std::string const &, class Objective const &, enum class ObjectiveSortOrder); /** - * @vftbl 2 - * @symbol ?clearDisplayObjective\@Scoreboard\@\@UEAAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?clearDisplayObjective\@Scoreboard\@\@UEAAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class Objective * clearDisplayObjective(std::string const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?onObjectiveAdded\@Scoreboard\@\@UEAAXAEBVObjective\@\@\@Z + * @vftbl 6 + * @symbol ?onObjectiveAdded\@Scoreboard\@\@UEAAXAEBVObjective\@\@\@Z */ virtual void onObjectiveAdded(class Objective const &); /** - * @vftbl 7 - * @symbol ?onObjectiveRemoved\@Scoreboard\@\@UEAAXAEAVObjective\@\@\@Z + * @vftbl 7 + * @symbol ?onObjectiveRemoved\@Scoreboard\@\@UEAAXAEAVObjective\@\@\@Z */ virtual void onObjectiveRemoved(class Objective &); /** - * @vftbl 8 - * @symbol ?onScoreChanged\@Scoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @vftbl 8 + * @symbol ?onScoreChanged\@Scoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ virtual void onScoreChanged(struct ScoreboardId const &, class Objective const &); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol ?isClientSide\@Scoreboard\@\@MEBA_NXZ + * @vftbl 15 + * @symbol ?isClientSide\@Scoreboard\@\@MEBA_NXZ */ virtual bool isClientSide() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCOREBOARD /** - * @symbol ?createScoreboardId\@Scoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVActor\@\@\@Z + * @symbol ?createScoreboardId\@Scoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVActor\@\@\@Z */ MCVAPI struct ScoreboardId const & createScoreboardId(class Actor const &); /** - * @symbol ?createScoreboardId\@Scoreboard\@\@UEAAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createScoreboardId\@Scoreboard\@\@UEAAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI struct ScoreboardId const & createScoreboardId(std::string const &); /** - * @symbol ?createScoreboardId\@Scoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z + * @symbol ?createScoreboardId\@Scoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z */ MCVAPI struct ScoreboardId const & createScoreboardId(class Player const &); /** - * @symbol ?onPlayerIdentityUpdated\@Scoreboard\@\@UEAAXAEBUPlayerScoreboardId\@\@\@Z + * @symbol ?onPlayerIdentityUpdated\@Scoreboard\@\@UEAAXAEBUPlayerScoreboardId\@\@\@Z */ MCVAPI void onPlayerIdentityUpdated(struct PlayerScoreboardId const &); /** - * @symbol ?onPlayerJoined\@Scoreboard\@\@UEAAXAEBVPlayer\@\@\@Z + * @symbol ?onPlayerJoined\@Scoreboard\@\@UEAAXAEBVPlayer\@\@\@Z */ MCVAPI void onPlayerJoined(class Player const &); /** - * @symbol ?onPlayerScoreRemoved\@Scoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @symbol ?onPlayerScoreRemoved\@Scoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ MCVAPI void onPlayerScoreRemoved(struct ScoreboardId const &, class Objective const &); /** - * @symbol ?setPacketSender\@Scoreboard\@\@UEAAXPEAVPacketSender\@\@\@Z + * @symbol ?setPacketSender\@Scoreboard\@\@UEAAXPEAVPacketSender\@\@\@Z */ MCVAPI void setPacketSender(class PacketSender *); /** - * @symbol ?tick\@Scoreboard\@\@UEAAXXZ + * @symbol ?tick\@Scoreboard\@\@UEAAXXZ */ MCVAPI void tick(); /** - * @symbol ?writeToLevelStorage\@Scoreboard\@\@UEAAXXZ + * @symbol ?writeToLevelStorage\@Scoreboard\@\@UEAAXXZ */ MCVAPI void writeToLevelStorage(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Scoreboard(); #endif /** - * @symbol ??0Scoreboard\@\@QEAA\@VCommandSoftEnumRegistry\@\@\@Z + * @symbol ??0Scoreboard\@\@QEAA\@VCommandSoftEnumRegistry\@\@\@Z */ MCAPI Scoreboard(class CommandSoftEnumRegistry); /** - * @symbol ?addObjective\@Scoreboard\@\@QEAAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBVObjectiveCriteria\@\@\@Z + * @symbol ?addObjective\@Scoreboard\@\@QEAAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEBVObjectiveCriteria\@\@\@Z */ MCAPI class Objective * addObjective(std::string const &, std::string const &, class ObjectiveCriteria const &); /** - * @symbol ?addScoreListener\@Scoreboard\@\@QEAAXAEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addScoreListener\@Scoreboard\@\@QEAAXAEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addScoreListener(class Player &, std::string const &); /** - * @symbol ?applyPlayerOperation\@Scoreboard\@\@QEAAHAEA_NAEAV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@AEBUScoreboardId\@\@AEAVObjective\@\@13W4CommandOperator\@\@\@Z + * @symbol ?applyPlayerOperation\@Scoreboard\@\@QEAAHAEA_NAEAV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@AEBUScoreboardId\@\@AEAVObjective\@\@13W4CommandOperator\@\@\@Z */ MCAPI int applyPlayerOperation(bool &, std::vector &, struct ScoreboardId const &, class Objective &, std::vector &, class Objective &, enum class CommandOperator); /** - * @symbol ?clearScoreboardIdentity\@Scoreboard\@\@QEAA_NAEBUScoreboardId\@\@\@Z + * @symbol ?clearScoreboardIdentity\@Scoreboard\@\@QEAA_NAEBUScoreboardId\@\@\@Z */ MCAPI bool clearScoreboardIdentity(struct ScoreboardId const &); /** - * @symbol ?forEachIdentityRef\@Scoreboard\@\@QEAAXV?$function\@$$A6AXAEAVScoreboardIdentityRef\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachIdentityRef\@Scoreboard\@\@QEAAXV?$function\@$$A6AXAEAVScoreboardIdentityRef\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachIdentityRef(class std::function); /** - * @symbol ?forEachObjective\@Scoreboard\@\@QEAAXV?$function\@$$A6AXAEAVObjective\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachObjective\@Scoreboard\@\@QEAAXV?$function\@$$A6AXAEAVObjective\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachObjective(class std::function); /** - * @symbol ?getCriteria\@Scoreboard\@\@QEBAPEAVObjectiveCriteria\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getCriteria\@Scoreboard\@\@QEBAPEAVObjectiveCriteria\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class ObjectiveCriteria * getCriteria(std::string const &) const; /** - * @symbol ?getCriteriaNames\@Scoreboard\@\@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 + * @symbol ?getCriteriaNames\@Scoreboard\@\@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 getCriteriaNames() const; /** - * @symbol ?getDisplayInfoFiltered\@Scoreboard\@\@QEBA?AV?$vector\@UPlayerScore\@\@V?$allocator\@UPlayerScore\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getDisplayInfoFiltered\@Scoreboard\@\@QEBA?AV?$vector\@UPlayerScore\@\@V?$allocator\@UPlayerScore\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector getDisplayInfoFiltered(std::string const &) const; /** - * @symbol ?getDisplayObjective\@Scoreboard\@\@QEBAPEBVDisplayObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getDisplayObjective\@Scoreboard\@\@QEBAPEBVDisplayObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class DisplayObjective const * getDisplayObjective(std::string const &) const; /** - * @symbol ?getDisplayObjectiveSlotNames\@Scoreboard\@\@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 + * @symbol ?getDisplayObjectiveSlotNames\@Scoreboard\@\@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 getDisplayObjectiveSlotNames() const; /** - * @symbol ?getIdScores\@Scoreboard\@\@QEBA?AV?$vector\@UScoreInfo\@\@V?$allocator\@UScoreInfo\@\@\@std\@\@\@std\@\@AEBUScoreboardId\@\@\@Z + * @symbol ?getIdScores\@Scoreboard\@\@QEBA?AV?$vector\@UScoreInfo\@\@V?$allocator\@UScoreInfo\@\@\@std\@\@\@std\@\@AEBUScoreboardId\@\@\@Z */ MCAPI std::vector getIdScores(struct ScoreboardId const &) const; /** - * @symbol ?getObjective\@Scoreboard\@\@QEBAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getObjective\@Scoreboard\@\@QEBAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class Objective * getObjective(std::string const &) const; /** - * @symbol ?getObjectiveNames\@Scoreboard\@\@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 + * @symbol ?getObjectiveNames\@Scoreboard\@\@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 getObjectiveNames() const; /** - * @symbol ?getObjectives\@Scoreboard\@\@QEBA?AV?$vector\@PEBVObjective\@\@V?$allocator\@PEBVObjective\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getObjectives\@Scoreboard\@\@QEBA?AV?$vector\@PEBVObjective\@\@V?$allocator\@PEBVObjective\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getObjectives() const; /** - * @symbol ?getScoreboardEventCoordinator\@Scoreboard\@\@QEAAAEAVScoreboardEventCoordinator\@\@XZ + * @symbol ?getScoreboardEventCoordinator\@Scoreboard\@\@QEAAAEAVScoreboardEventCoordinator\@\@XZ */ MCAPI class ScoreboardEventCoordinator & getScoreboardEventCoordinator(); /** - * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z - */ - MCAPI struct ScoreboardId const & getScoreboardId(struct PlayerScoreboardId const &) const; - /** - * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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\@\@AEBVActor\@\@\@Z + * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVActor\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(class Actor const &) const; /** - * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z + * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z */ MCAPI struct ScoreboardId const & getScoreboardId(class Player const &) const; /** - * @symbol ?getScoreboardIdentityRef\@Scoreboard\@\@QEAAPEAVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@\@Z + * @symbol ?getScoreboardId\@Scoreboard\@\@QEBAAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z + */ + MCAPI struct ScoreboardId const & getScoreboardId(struct PlayerScoreboardId const &) const; + /** + * @symbol ?getScoreboardIdentityRef\@Scoreboard\@\@QEAAPEAVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@\@Z */ MCAPI class ScoreboardIdentityRef * getScoreboardIdentityRef(struct ScoreboardId const &); /** - * @symbol ?getScoreboardIdentityRefs\@Scoreboard\@\@QEBA?AV?$vector\@VScoreboardIdentityRef\@\@V?$allocator\@VScoreboardIdentityRef\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getScoreboardIdentityRefs\@Scoreboard\@\@QEBA?AV?$vector\@VScoreboardIdentityRef\@\@V?$allocator\@VScoreboardIdentityRef\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getScoreboardIdentityRefs() const; /** - * @symbol ?getTrackedIds\@Scoreboard\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getTrackedIds\@Scoreboard\@\@QEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getTrackedIds() const; /** - * @symbol ?hasIdentityFor\@Scoreboard\@\@QEBA_NAEBUScoreboardId\@\@\@Z + * @symbol ?hasIdentityFor\@Scoreboard\@\@QEBA_NAEBUScoreboardId\@\@\@Z */ MCAPI bool hasIdentityFor(struct ScoreboardId const &) const; /** - * @symbol ?isObjectiveDisplayed\@Scoreboard\@\@QEBA_NAEBVObjective\@\@\@Z + * @symbol ?isObjectiveDisplayed\@Scoreboard\@\@QEBA_NAEBVObjective\@\@\@Z */ MCAPI bool isObjectiveDisplayed(class Objective const &) const; /** - * @symbol ?modifyPlayerScore\@Scoreboard\@\@QEAAHAEA_NAEBUScoreboardId\@\@AEAVObjective\@\@HW4PlayerScoreSetFunction\@\@\@Z + * @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 + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct ActorUniqueID const &); /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBVCompoundTag\@\@\@Z */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &); + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(class CompoundTag const &); /** - * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?registerScoreboardIdentity\@Scoreboard\@\@QEAAAEBVScoreboardIdentityRef\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(class CompoundTag const &); + MCAPI class ScoreboardIdentityRef const & registerScoreboardIdentity(struct ScoreboardId const &, std::string const &); /** - * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z + * @symbol ?removeObjective\@Scoreboard\@\@QEAA_NPEAVObjective\@\@\@Z */ MCAPI bool removeObjective(class Objective *); /** - * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@\@Z + * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@\@Z */ MCAPI void removeScoreListener(class Player const &); /** - * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeScoreListener\@Scoreboard\@\@QEAAXAEBVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeScoreListener(class Player const &, std::string const &); /** - * @symbol ?replaceFakePlayer\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol ?replaceFakePlayer\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI void replaceFakePlayer(struct ScoreboardId const &, struct PlayerScoreboardId const &); /** - * @symbol ?resetPlayerScore\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@\@Z + * @symbol ?resetPlayerScore\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEAVObjective\@\@\@Z */ - MCAPI void resetPlayerScore(struct ScoreboardId const &); + MCAPI void resetPlayerScore(struct ScoreboardId const &, class Objective &); /** - * @symbol ?resetPlayerScore\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@AEAVObjective\@\@\@Z + * @symbol ?resetPlayerScore\@Scoreboard\@\@QEAAXAEBUScoreboardId\@\@\@Z */ - MCAPI void resetPlayerScore(struct ScoreboardId const &, class Objective &); + MCAPI void resetPlayerScore(struct ScoreboardId const &); /** - * @symbol ?DEFAULT_CRITERIA\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEFAULT_CRITERIA\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DEFAULT_CRITERIA; /** - * @symbol ?DISPLAY_SLOT_BELOWNAME\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DISPLAY_SLOT_BELOWNAME\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DISPLAY_SLOT_BELOWNAME; /** - * @symbol ?DISPLAY_SLOT_LIST\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DISPLAY_SLOT_LIST\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DISPLAY_SLOT_LIST; /** - * @symbol ?DISPLAY_SLOT_SIDEBAR\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DISPLAY_SLOT_SIDEBAR\@Scoreboard\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DISPLAY_SLOT_SIDEBAR; /** - * @symbol ?OBJECTIVES_ENUM\@Scoreboard\@\@2PEBDEB + * @symbol ?OBJECTIVES_ENUM\@Scoreboard\@\@2PEBDEB */ MCAPI static char const * OBJECTIVES_ENUM; /** - * @symbol ?shouldClearScoresOnDeath\@Scoreboard\@\@SA_NAEBVActor\@\@\@Z + * @symbol ?shouldClearScoresOnDeath\@Scoreboard\@\@SA_NAEBVActor\@\@\@Z */ MCAPI static bool shouldClearScoresOnDeath(class Actor const &); //protected: /** - * @symbol ?_addLoadedCriteria\@Scoreboard\@\@IEAAXV?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_addLoadedCriteria\@Scoreboard\@\@IEAAXV?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _addLoadedCriteria(std::unique_ptr); /** - * @symbol ?_addLoadedObjective\@Scoreboard\@\@IEAAXV?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_addLoadedObjective\@Scoreboard\@\@IEAAXV?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _addLoadedObjective(std::unique_ptr); /** - * @symbol ?_getCriteriaMap\@Scoreboard\@\@IEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?_getCriteriaMap\@Scoreboard\@\@IEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjectiveCriteria\@\@U?$default_delete\@VObjectiveCriteria\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & _getCriteriaMap() const; /** - * @symbol ?_getObjectiveMap\@Scoreboard\@\@IEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?_getObjectiveMap\@Scoreboard\@\@IEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VObjective\@\@U?$default_delete\@VObjective\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const & _getObjectiveMap() const; //private: /** - * @symbol ?_init\@Scoreboard\@\@AEAAXXZ + * @symbol ?_init\@Scoreboard\@\@AEAAXXZ */ MCAPI void _init(); @@ -555,4 +559,4 @@ class Scoreboard { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp index 9865468db3..fd3c5e7399 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardCommand.hpp @@ -42,94 +42,100 @@ struct SetScoreOutput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScoreboardCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ScoreboardCommand\@\@EEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ScoreboardCommand\@\@EEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCOREBOARDCOMMAND /** - * @symbol ?setup\@ScoreboardCommand\@\@SAXAEAVCommandRegistry\@\@$$QEAUInitProxy\@1\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScoreboardCommand(); +#endif + /** + * @symbol ?setup\@ScoreboardCommand\@\@SAXAEAVCommandRegistry\@\@$$QEAUInitProxy\@1\@\@Z */ MCAPI static void setup(class CommandRegistry &, struct ScoreboardCommand::InitProxy &&); //private: /** - * @symbol ?_generateCumulativeOutput\@ScoreboardCommand\@\@AEBAXAEBUSetScoreOutput\@1\@AEBVObjective\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_generateCumulativeOutput\@ScoreboardCommand\@\@AEBAXAEBUSetScoreOutput\@1\@AEBVObjective\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _generateCumulativeOutput(struct ScoreboardCommand::SetScoreOutput const &, class Objective const &, class CommandOutput &) const; /** - * @symbol ?_getObjective\@ScoreboardCommand\@\@AEBAPEAVObjective\@\@AEBVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NAEAVCommandOutput\@\@\@Z + * @symbol ?_getObjective\@ScoreboardCommand\@\@AEBAPEAVObjective\@\@AEBVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NAEAVCommandOutput\@\@\@Z */ MCAPI class Objective * _getObjective(class Scoreboard const &, std::string const &, bool, class CommandOutput &) const; /** - * @symbol ?_getScoreboardIdsForSelector\@ScoreboardCommand\@\@AEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@AEAVScoreboard\@\@AEBV?$WildcardCommandSelector\@VActor\@\@\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@_N\@Z + * @symbol ?_getScoreboardIdsForSelector\@ScoreboardCommand\@\@AEBA?AV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@AEAVScoreboard\@\@AEBV?$WildcardCommandSelector\@VActor\@\@\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@_N\@Z */ MCAPI std::vector _getScoreboardIdsForSelector(class Scoreboard &, class WildcardCommandSelector const &, class CommandOrigin const &, class CommandOutput &, bool) const; /** - * @symbol ?_getSelectorResultsForObjective\@ScoreboardCommand\@\@AEBA_NAEAV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@AEAVScoreboard\@\@AEBV?$WildcardCommandSelector\@VActor\@\@\@\@AEAVObjective\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@_N\@Z + * @symbol ?_getSelectorResultsForObjective\@ScoreboardCommand\@\@AEBA_NAEAV?$vector\@UScoreboardId\@\@V?$allocator\@UScoreboardId\@\@\@std\@\@\@std\@\@AEAVScoreboard\@\@AEBV?$WildcardCommandSelector\@VActor\@\@\@\@AEAVObjective\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@_N\@Z */ MCAPI bool _getSelectorResultsForObjective(std::vector &, class Scoreboard &, class WildcardCommandSelector const &, class Objective &, class CommandOrigin const &, class CommandOutput &, bool) const; /** - * @symbol ?addObjective\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11AEAVCommandOutput\@\@\@Z + * @symbol ?addObjective\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11AEAVCommandOutput\@\@\@Z */ MCAPI void addObjective(class Scoreboard &, std::string const &, std::string const &, std::string const &, class CommandOutput &) const; /** - * @symbol ?addPlayerScore\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@W4PlayerScoreSetFunction\@\@AEBUScoreboardId\@\@AEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@AEAUSetScoreOutput\@1\@\@Z + * @symbol ?addPlayerScore\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@W4PlayerScoreSetFunction\@\@AEBUScoreboardId\@\@AEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@AEAUSetScoreOutput\@1\@\@Z */ MCAPI void addPlayerScore(class Scoreboard &, enum class PlayerScoreSetFunction, struct ScoreboardId const &, class Objective &, class std::function const &, class CommandOutput &, struct ScoreboardCommand::SetScoreOutput &) const; /** - * @symbol ?applyPlayerOperation\@ScoreboardCommand\@\@AEBA_NAEAVScoreboard\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEBUScoreboardId\@\@AEAVObjective\@\@3AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAUSetScoreOutput\@1\@\@Z + * @symbol ?applyPlayerOperation\@ScoreboardCommand\@\@AEBA_NAEAVScoreboard\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEBUScoreboardId\@\@AEAVObjective\@\@3AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAUSetScoreOutput\@1\@\@Z */ MCAPI bool applyPlayerOperation(class Scoreboard &, class std::function const &, struct ScoreboardId const &, class Objective &, class Objective &, class CommandOrigin const &, class CommandOutput &, struct ScoreboardCommand::SetScoreOutput &) const; /** - * @symbol ?listObjectives\@ScoreboardCommand\@\@AEBAXAEBVScoreboard\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?listObjectives\@ScoreboardCommand\@\@AEBAXAEBVScoreboard\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void listObjectives(class Scoreboard const &, class CommandOutput &) const; /** - * @symbol ?listPlayers\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBUScoreboardId\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?listPlayers\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBUScoreboardId\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void listPlayers(class Scoreboard &, struct ScoreboardId const &, class std::function const &, class CommandOutput &) const; /** - * @symbol ?objectives\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?objectives\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void objectives(class Scoreboard &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?players\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?players\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void players(class Scoreboard &, class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?removeObjective\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?removeObjective\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void removeObjective(class Scoreboard &, std::string const &, class CommandOutput &) const; /** - * @symbol ?resetPlayer\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBUScoreboardId\@\@PEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?resetPlayer\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBUScoreboardId\@\@PEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void resetPlayer(class Scoreboard &, struct ScoreboardId const &, class Objective *, class std::function const &, class CommandOutput &) const; /** - * @symbol ?setDisplayObjective\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4ObjectiveSortOrder\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?setDisplayObjective\@ScoreboardCommand\@\@AEBAXAEAVScoreboard\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1W4ObjectiveSortOrder\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void setDisplayObjective(class Scoreboard &, std::string const &, std::string const &, enum class ObjectiveSortOrder, class CommandOutput &) const; /** - * @symbol ?setPlayerRandomScore\@ScoreboardCommand\@\@AEBA_NAEAVScoreboard\@\@AEBUScoreboardId\@\@AEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@AEAUSetScoreOutput\@1\@\@Z + * @symbol ?setPlayerRandomScore\@ScoreboardCommand\@\@AEBA_NAEAVScoreboard\@\@AEBUScoreboardId\@\@AEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@AEAUSetScoreOutput\@1\@\@Z */ MCAPI bool setPlayerRandomScore(class Scoreboard &, struct ScoreboardId const &, class Objective &, class std::function const &, class CommandOutput &, struct ScoreboardCommand::SetScoreOutput &) const; /** - * @symbol ?testPlayerScore\@ScoreboardCommand\@\@AEBAXAEBUScoreboardId\@\@AEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?testPlayerScore\@ScoreboardCommand\@\@AEBAXAEBUScoreboardId\@\@AEAVObjective\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@std\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void testPlayerScore(struct ScoreboardId const &, class Objective &, class std::function const &, class CommandOutput &) const; /** - * @symbol ?_getNonSortableDisplaySlots\@ScoreboardCommand\@\@CA?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\@\@AEAVScoreboard\@\@\@Z + * @symbol ?_getNonSortableDisplaySlots\@ScoreboardCommand\@\@CA?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\@\@AEAVScoreboard\@\@\@Z */ MCAPI static std::vector _getNonSortableDisplaySlots(class Scoreboard &); /** - * @symbol ?_getSortableDisplaySlots\@ScoreboardCommand\@\@CA?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\@\@AEAVScoreboard\@\@\@Z + * @symbol ?_getSortableDisplaySlots\@ScoreboardCommand\@\@CA?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\@\@AEAVScoreboard\@\@\@Z */ MCAPI static std::vector _getSortableDisplaySlots(class Scoreboard &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScoreboardEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ScoreboardEventCoordinator.hpp index 646c8f3d26..ae445c8fb0 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardEventCoordinator.hpp @@ -29,21 +29,27 @@ class ScoreboardEventCoordinator { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCOREBOARDEVENTCOORDINATOR /** - * @symbol ?sendOnObjectiveAdded\@ScoreboardEventCoordinator\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScoreboardEventCoordinator(); +#endif + /** + * @symbol ?sendOnObjectiveAdded\@ScoreboardEventCoordinator\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void sendOnObjectiveAdded(std::string const &); /** - * @symbol ?sendOnObjectiveRemoved\@ScoreboardEventCoordinator\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?sendOnObjectiveRemoved\@ScoreboardEventCoordinator\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void sendOnObjectiveRemoved(std::string const &); /** - * @symbol ?sendOnScoreChanged\@ScoreboardEventCoordinator\@\@QEAAXAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?sendOnScoreChanged\@ScoreboardEventCoordinator\@\@QEAAXAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI void sendOnScoreChanged(struct ScoreboardId const &, std::string const &, int); /** - * @symbol ?sendOnScoreboardIdentityRemoved\@ScoreboardEventCoordinator\@\@QEAAXAEBUScoreboardId\@\@\@Z + * @symbol ?sendOnScoreboardIdentityRemoved\@ScoreboardEventCoordinator\@\@QEAAXAEBUScoreboardId\@\@\@Z */ MCAPI void sendOnScoreboardIdentityRemoved(struct ScoreboardId const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScoreboardEventListener.hpp b/LiteLoader/include/llapi/mc/ScoreboardEventListener.hpp index e51dbf1b68..d12a8c275d 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardEventListener.hpp @@ -31,21 +31,25 @@ class ScoreboardEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCOREBOARDEVENTLISTENER /** - * @symbol ?onObjectiveAdded\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onObjectiveAdded\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI enum class EventResult onObjectiveAdded(std::string const &); /** - * @symbol ?onObjectiveRemoved\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onObjectiveRemoved\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI enum class EventResult onObjectiveRemoved(std::string const &); /** - * @symbol ?onScoreChanged\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?onScoreChanged\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCVAPI enum class EventResult onScoreChanged(struct ScoreboardId const &, std::string const &, int); /** - * @symbol ?onScoreboardIdentityRemoved\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBUScoreboardId\@\@\@Z + * @symbol ?onScoreboardIdentityRemoved\@ScoreboardEventListener\@\@UEAA?AW4EventResult\@\@AEBUScoreboardId\@\@\@Z */ MCVAPI enum class EventResult onScoreboardIdentityRemoved(struct ScoreboardId const &); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScoreboardEventListener(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScoreboardId.hpp b/LiteLoader/include/llapi/mc/ScoreboardId.hpp index 2f1bdd552b..27995b0859 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardId.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardId.hpp @@ -25,51 +25,51 @@ struct ScoreboardId { #undef AFTER_EXTRA public: /** - * @symbol ??0ScoreboardId\@\@QEAA\@_J\@Z + * @symbol ??0ScoreboardId\@\@QEAA\@XZ */ - MCAPI ScoreboardId(__int64); + MCAPI ScoreboardId(); /** - * @symbol ??0ScoreboardId\@\@QEAA\@XZ + * @symbol ??0ScoreboardId\@\@QEAA\@_J\@Z */ - MCAPI ScoreboardId(); + MCAPI ScoreboardId(__int64); /** - * @symbol ??0ScoreboardId\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ScoreboardId\@\@QEAA\@AEBU0\@\@Z */ MCAPI ScoreboardId(struct ScoreboardId const &); /** - * @symbol ?getHash\@ScoreboardId\@\@QEBA_KXZ + * @symbol ?getHash\@ScoreboardId\@\@QEBA_KXZ */ MCAPI unsigned __int64 getHash() const; /** - * @symbol ?getIdentityDef\@ScoreboardId\@\@QEBAAEBVIdentityDefinition\@\@XZ + * @symbol ?getIdentityDef\@ScoreboardId\@\@QEBAAEBVIdentityDefinition\@\@XZ */ MCAPI class IdentityDefinition const & getIdentityDef() const; /** - * @symbol ?isValid\@ScoreboardId\@\@QEBA_NXZ + * @symbol ?isValid\@ScoreboardId\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??BScoreboardId\@\@QEBA_NXZ + * @symbol ??BScoreboardId\@\@QEBA_NXZ */ MCAPI operator bool() const; /** - * @symbol ??9ScoreboardId\@\@QEBA_NAEBU0\@\@Z + * @symbol ??9ScoreboardId\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator!=(struct ScoreboardId const &) const; /** - * @symbol ??EScoreboardId\@\@QEAAAEAU0\@XZ + * @symbol ??EScoreboardId\@\@QEAAAEAU0\@XZ */ MCAPI struct ScoreboardId & operator++(); /** - * @symbol ??4ScoreboardId\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ScoreboardId\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ScoreboardId & operator=(struct ScoreboardId const &); /** - * @symbol ??8ScoreboardId\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8ScoreboardId\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct ScoreboardId const &) const; /** - * @symbol ?INVALID\@ScoreboardId\@\@2U1\@A + * @symbol ?INVALID\@ScoreboardId\@\@2U1\@A */ MCAPI static struct ScoreboardId INVALID; diff --git a/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp b/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp index 427bed2718..bf7eae9dd3 100644 --- a/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp +++ b/LiteLoader/include/llapi/mc/ScoreboardIdentityRef.hpp @@ -30,56 +30,56 @@ class ScoreboardIdentityRef { public: /** - * @symbol ??0ScoreboardIdentityRef\@\@QEAA\@XZ + * @symbol ??0ScoreboardIdentityRef\@\@QEAA\@AEBUScoreboardId\@\@\@Z */ - MCAPI ScoreboardIdentityRef(); + MCAPI ScoreboardIdentityRef(struct ScoreboardId const &); /** - * @symbol ??0ScoreboardIdentityRef\@\@QEAA\@AEBUScoreboardId\@\@\@Z + * @symbol ??0ScoreboardIdentityRef\@\@QEAA\@XZ */ - MCAPI ScoreboardIdentityRef(struct ScoreboardId const &); + MCAPI ScoreboardIdentityRef(); /** - * @symbol ?getEntityId\@ScoreboardIdentityRef\@\@QEBAAEBUActorUniqueID\@\@XZ + * @symbol ?getEntityId\@ScoreboardIdentityRef\@\@QEBAAEBUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID const & getEntityId() const; /** - * @symbol ?getFakePlayerName\@ScoreboardIdentityRef\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFakePlayerName\@ScoreboardIdentityRef\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFakePlayerName() const; /** - * @symbol ?getIdentityType\@ScoreboardIdentityRef\@\@QEBA?AW4Type\@IdentityDefinition\@\@XZ + * @symbol ?getIdentityType\@ScoreboardIdentityRef\@\@QEBA?AW4Type\@IdentityDefinition\@\@XZ */ MCAPI enum class IdentityDefinition::Type getIdentityType() const; /** - * @symbol ?getName\@ScoreboardIdentityRef\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@3\@\@Z + * @symbol ?getName\@ScoreboardIdentityRef\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$function\@$$A6AAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@\@Z\@3\@\@Z */ MCAPI std::string const & getName(class std::function const &) const; /** - * @symbol ?getPlayerId\@ScoreboardIdentityRef\@\@QEBAAEBUPlayerScoreboardId\@\@XZ + * @symbol ?getPlayerId\@ScoreboardIdentityRef\@\@QEBAAEBUPlayerScoreboardId\@\@XZ */ MCAPI struct PlayerScoreboardId const & getPlayerId() const; /** - * @symbol ?getScoreboardId\@ScoreboardIdentityRef\@\@QEBAAEBUScoreboardId\@\@XZ + * @symbol ?getScoreboardId\@ScoreboardIdentityRef\@\@QEBAAEBUScoreboardId\@\@XZ */ MCAPI struct ScoreboardId const & getScoreboardId() const; /** - * @symbol ?isPlayerType\@ScoreboardIdentityRef\@\@QEBA_NXZ + * @symbol ?isPlayerType\@ScoreboardIdentityRef\@\@QEBA_NXZ */ MCAPI bool isPlayerType() const; /** - * @symbol ?modifyScoreInObjective\@ScoreboardIdentityRef\@\@QEAA_NAEAHAEAVObjective\@\@HW4PlayerScoreSetFunction\@\@\@Z + * @symbol ?modifyScoreInObjective\@ScoreboardIdentityRef\@\@QEAA_NAEAHAEAVObjective\@\@HW4PlayerScoreSetFunction\@\@\@Z */ MCAPI bool modifyScoreInObjective(int &, class Objective &, int, enum class PlayerScoreSetFunction); /** - * @symbol ?removeFromObjective\@ScoreboardIdentityRef\@\@QEAA_NAEAVScoreboard\@\@AEAVObjective\@\@\@Z + * @symbol ?removeFromObjective\@ScoreboardIdentityRef\@\@QEAA_NAEAVScoreboard\@\@AEAVObjective\@\@\@Z */ MCAPI bool removeFromObjective(class Scoreboard &, class Objective &); /** - * @symbol ?Undefined\@ScoreboardIdentityRef\@\@2V1\@B + * @symbol ?Undefined\@ScoreboardIdentityRef\@\@2V1\@B */ MCAPI static class ScoreboardIdentityRef const Undefined; /** - * @symbol ?serialize\@ScoreboardIdentityRef\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z + * @symbol ?serialize\@ScoreboardIdentityRef\@\@SA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBV1\@\@Z */ MCAPI static std::unique_ptr serialize(class ScoreboardIdentityRef const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp b/LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp index f747dbf9bd..30b2815f94 100644 --- a/LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp +++ b/LiteLoader/include/llapi/mc/ScreenCapabilitiesRepo.hpp @@ -29,12 +29,12 @@ class ScreenCapabilitiesRepo { public: /** - * @symbol ??0ScreenCapabilitiesRepo\@\@QEAA\@XZ + * @symbol ??0ScreenCapabilitiesRepo\@\@QEAA\@XZ */ MCAPI ScreenCapabilitiesRepo(); /** - * @symbol ?get\@ScreenCapabilitiesRepo\@\@QEBA?AV?$unique_ptr\@VIScreenCapabilities\@\@U?$default_delete\@VIScreenCapabilities\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?get\@ScreenCapabilitiesRepo\@\@QEBA?AV?$unique_ptr\@VIScreenCapabilities\@\@U?$default_delete\@VIScreenCapabilities\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::unique_ptr get(std::string const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp index d8216a3a41..b4579f0274 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBase.hpp @@ -30,41 +30,45 @@ class ScreenHandlerBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScreenHandlerBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleAction\@ScreenHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z + * @vftbl 1 + * @symbol ?handleAction\@ScreenHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z */ virtual enum class ItemStackNetResult handleAction(class ItemStackRequestAction const &); /** - * @vftbl 2 - * @symbol ?endRequest\@ScreenHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@XZ + * @vftbl 2 + * @symbol ?endRequest\@ScreenHandlerBase\@\@UEAA?AW4ItemStackNetResult\@\@XZ */ virtual enum class ItemStackNetResult endRequest(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCREENHANDLERBASE /** - * @symbol ?endRequestBatch\@ScreenHandlerBase\@\@UEAAXXZ + * @symbol ?endRequestBatch\@ScreenHandlerBase\@\@UEAAXXZ */ MCVAPI void endRequestBatch(); /** - * @symbol ?postRequest\@ScreenHandlerBase\@\@UEAAX_N\@Z + * @symbol ?postRequest\@ScreenHandlerBase\@\@UEAAX_N\@Z */ MCVAPI void postRequest(bool); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScreenHandlerBase(); #endif /** - * @symbol ??0ScreenHandlerBase\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@\@Z + * @symbol ??0ScreenHandlerBase\@\@QEAA\@AEAVItemStackRequestActionHandler\@\@\@Z */ MCAPI ScreenHandlerBase(class ItemStackRequestActionHandler &); //protected: /** - * @symbol ?_tryGetSparseContainer\@ScreenHandlerBase\@\@IEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z + * @symbol ?_tryGetSparseContainer\@ScreenHandlerBase\@\@IEAA?AV?$shared_ptr\@VSimpleSparseContainer\@\@\@std\@\@W4ContainerEnumName\@\@\@Z */ MCAPI class std::shared_ptr _tryGetSparseContainer(enum class ContainerEnumName); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp index ea99224bd6..faa61ee7b5 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerBeacon.hpp @@ -30,41 +30,41 @@ class ScreenHandlerBeacon { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScreenHandlerBeacon(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleAction\@ScreenHandlerBeacon\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z + * @vftbl 1 + * @symbol ?handleAction\@ScreenHandlerBeacon\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z */ virtual enum class ItemStackNetResult handleAction(class ItemStackRequestAction const &); /** - * @vftbl 2 - * @symbol ?endRequest\@ScreenHandlerBeacon\@\@MEAA?AW4ItemStackNetResult\@\@XZ + * @vftbl 2 + * @symbol ?endRequest\@ScreenHandlerBeacon\@\@MEAA?AW4ItemStackNetResult\@\@XZ */ virtual enum class ItemStackNetResult endRequest(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?postRequest\@ScreenHandlerBeacon\@\@MEAAX_N\@Z + * @vftbl 4 + * @symbol ?postRequest\@ScreenHandlerBeacon\@\@MEAAX_N\@Z */ virtual void postRequest(bool); /** - * @symbol ??0ScreenHandlerBeacon\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionHandler\@\@\@Z + * @symbol ??0ScreenHandlerBeacon\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionHandler\@\@\@Z */ MCAPI ScreenHandlerBeacon(class ContainerScreenContext const &, class ItemStackRequestActionHandler &); //private: /** - * @symbol ?_handleBeaconPaymentAction\@ScreenHandlerBeacon\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionBeaconPayment\@\@\@Z + * @symbol ?_handleBeaconPaymentAction\@ScreenHandlerBeacon\@\@AEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestActionBeaconPayment\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleBeaconPaymentAction(class ItemStackRequestActionBeaconPayment const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerHUD.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerHUD.hpp index 230c02ca07..3cc1eddbcf 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerHUD.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerHUD.hpp @@ -30,14 +30,14 @@ class ScreenHandlerHUD { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScreenHandlerHUD(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleAction\@ScreenHandlerHUD\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z + * @vftbl 1 + * @symbol ?handleAction\@ScreenHandlerHUD\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z */ virtual enum class ItemStackNetResult handleAction(class ItemStackRequestAction const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp b/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp index db8dc12ae9..25302eaacd 100644 --- a/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp +++ b/LiteLoader/include/llapi/mc/ScreenHandlerLabTable.hpp @@ -30,41 +30,41 @@ class ScreenHandlerLabTable { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScreenHandlerLabTable(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleAction\@ScreenHandlerLabTable\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z + * @vftbl 1 + * @symbol ?handleAction\@ScreenHandlerLabTable\@\@MEAA?AW4ItemStackNetResult\@\@AEBVItemStackRequestAction\@\@\@Z */ virtual enum class ItemStackNetResult handleAction(class ItemStackRequestAction const &); /** - * @vftbl 2 - * @symbol ?endRequest\@ScreenHandlerLabTable\@\@MEAA?AW4ItemStackNetResult\@\@XZ + * @vftbl 2 + * @symbol ?endRequest\@ScreenHandlerLabTable\@\@MEAA?AW4ItemStackNetResult\@\@XZ */ virtual enum class ItemStackNetResult endRequest(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?postRequest\@ScreenHandlerLabTable\@\@MEAAX_N\@Z + * @vftbl 4 + * @symbol ?postRequest\@ScreenHandlerLabTable\@\@MEAAX_N\@Z */ virtual void postRequest(bool); /** - * @symbol ??0ScreenHandlerLabTable\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionHandler\@\@\@Z + * @symbol ??0ScreenHandlerLabTable\@\@QEAA\@AEBVContainerScreenContext\@\@AEAVItemStackRequestActionHandler\@\@\@Z */ MCAPI ScreenHandlerLabTable(class ContainerScreenContext const &, class ItemStackRequestActionHandler &); //private: /** - * @symbol ?_handleLabTableCombine\@ScreenHandlerLabTable\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionDataless\@$08\@\@\@Z + * @symbol ?_handleLabTableCombine\@ScreenHandlerLabTable\@\@AEAA?AW4ItemStackNetResult\@\@AEBV?$ItemStackRequestActionDataless\@$08\@\@\@Z */ MCAPI enum class ItemStackNetResult _handleLabTableCombine(class ItemStackRequestActionDataless<9> const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp index ae883d296f..daad688d08 100644 --- a/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptActorGameplayHandler.hpp @@ -32,37 +32,37 @@ class ScriptActorGameplayHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptActorGameplayHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleEvent\@ScriptActorGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUActorDefinitionStartedEvent\@\@\@Z + * @vftbl 1 + * @symbol ?handleEvent\@ScriptActorGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUActorDefinitionStartedEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ActorDefinitionStartedEvent &); /** - * @vftbl 2 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ActorGameplayEvent\@X\@\@$$CBU?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VActorGameplayHandler\@\@\@Details\@\@MEAA?AW4HandlerResult\@\@AEBU?$ActorGameplayEvent\@X\@\@\@Z + * @vftbl 2 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ActorGameplayEvent\@X\@\@$$CBU?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VActorGameplayHandler\@\@\@Details\@\@MEAA?AW4HandlerResult\@\@AEBU?$ActorGameplayEvent\@X\@\@\@Z */ virtual enum class HandlerResult handleEvent(struct ActorGameplayEvent const &); /** - * @vftbl 3 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VActorGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBU?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VActorGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBU?$ActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ActorGameplayEvent const &); /** - * @vftbl 4 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VActorGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 4 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VActorGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableActorGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct MutableActorGameplayEvent &); //private: /** - * @symbol ?_handleActorDefinitionStartedEvent\@ScriptActorGameplayHandler\@\@AEBA_NAEAUActorDefinitionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleActorDefinitionStartedEvent\@ScriptActorGameplayHandler\@\@AEBA_NAEAUActorDefinitionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleActorDefinitionStartedEvent(struct ActorDefinitionStartedEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptBindingModuleUtils.hpp b/LiteLoader/include/llapi/mc/ScriptBindingModuleUtils.hpp deleted file mode 100644 index fabe35ae6d..0000000000 --- a/LiteLoader/include/llapi/mc/ScriptBindingModuleUtils.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file ScriptBindingModuleUtils.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "Scripting.hpp" -#include "Json.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace ScriptBindingModuleUtils. - * - */ -namespace ScriptBindingModuleUtils { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA - /** - * @symbol ?generateModuleDocumentation@ScriptBindingModuleUtils@@YA?AVValue@Json@@AEBUModuleBinding@Scripting@@AEBUSupportedBindingModule@5@AEBUModuleBindingBundle@5@@Z - * @hash -692427392 - */ - MCAPI class Json::Value generateModuleDocumentation(struct Scripting::ModuleBinding const &, struct Scripting::SupportedBindingModule const &, struct Scripting::ModuleBindingBundle const &); - /** - * @symbol ?getGameSemVersionAsString@ScriptBindingModuleUtils@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@XZ - * @hash -1580883543 - */ - MCAPI std::string getGameSemVersionAsString(); - /** - * @symbol ?scriptingVersionToString@ScriptBindingModuleUtils@@YA?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AEBUVersion@Scripting@@@Z - * @hash -1971947164 - */ - MCAPI std::string scriptingVersionToString(struct Scripting::Version const &); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp b/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp index ed5f6741b9..d657c7e03e 100644 --- a/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBindingReleaseList.hpp @@ -29,8 +29,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\@U?$pair\@PEBQEBDUVersion\@Scripting\@\@\@std\@\@V?$allocator\@U?$pair\@PEBQEBDUVersion\@Scripting\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI ScriptBindingReleaseList(std::vector>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp index 97283991a4..8aafe39b0a 100644 --- a/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptBlockGameplayHandler.hpp @@ -32,66 +32,66 @@ class ScriptBlockGameplayHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptBlockGameplayHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleEvent\@?$AddHandleEvent\@U?$Impl\@U?$type_list\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@U?$GameplayHandlerResult\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$type_list\@$$CBUCraftUISetResultNameEvent\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@UEAA?AU?$GameplayHandlerResult\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@AEBUCraftUISetResultNameEvent\@\@\@Z + * @vftbl 1 + * @symbol ?handleEvent\@?$AddHandleEvent\@U?$Impl\@U?$type_list\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@U?$GameplayHandlerResult\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$type_list\@$$CBUCraftUISetResultNameEvent\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@UEAA?AU?$GameplayHandlerResult\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@AEBUCraftUISetResultNameEvent\@\@\@Z */ virtual struct GameplayHandlerResult> handleEvent(struct CraftUISetResultNameEvent const &); /** - * @vftbl 2 - * @symbol ?handleEvent\@ScriptBlockGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUExplosionStartedEvent\@\@\@Z + * @vftbl 2 + * @symbol ?handleEvent\@ScriptBlockGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUExplosionStartedEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ExplosionStartedEvent &); /** - * @vftbl 3 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$BlockGameplayEvent\@X\@\@$$CBU?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@$$CBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AW4HandlerResult\@\@AEBU?$BlockGameplayEvent\@X\@\@\@Z + * @vftbl 3 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$BlockGameplayEvent\@X\@\@$$CBU?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@$$CBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AW4HandlerResult\@\@AEBU?$BlockGameplayEvent\@X\@\@\@Z */ virtual enum class HandlerResult handleEvent(struct BlockGameplayEvent const &); /** - * @vftbl 4 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@$$CBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBU?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 4 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@$$CBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBU?$BlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct BlockGameplayEvent const &); /** - * @vftbl 5 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@AEBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@AEBU?$BlockGameplayEvent\@V?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@\@\@Z */ virtual struct GameplayHandlerResult> handleEvent(struct BlockGameplayEvent> const &); /** - * @vftbl 6 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 6 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VBlockGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableBlockGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct MutableBlockGameplayEvent &); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?handleEvent\@ScriptBlockGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBUPistonActionEvent\@\@\@Z + * @vftbl 9 + * @symbol ?handleEvent\@ScriptBlockGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBUPistonActionEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct PistonActionEvent const &); //private: /** - * @symbol ?_handleExplosionStartedEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEAUExplosionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleExplosionStartedEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEAUExplosionStartedEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleExplosionStartedEvent(struct ExplosionStartedEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; /** - * @symbol ?_handlePistonActionEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEBUPistonActionEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handlePistonActionEvent\@ScriptBlockGameplayHandler\@\@AEBA_NAEBUPistonActionEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handlePistonActionEvent(struct PistonActionEvent const &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptCommand.hpp b/LiteLoader/include/llapi/mc/ScriptCommand.hpp index 1c83b13097..a321bc7323 100644 --- a/LiteLoader/include/llapi/mc/ScriptCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommand.hpp @@ -29,28 +29,28 @@ class ScriptCommand { public: /** - * @symbol ??0ScriptCommand\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ScriptCommand\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ScriptCommand(std::string const &); /** - * @symbol ?getMessages\@ScriptCommand\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getMessages\@ScriptCommand\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getMessages() const; /** - * @symbol ?getSuccessCount\@ScriptCommand\@\@QEBAHXZ + * @symbol ?getSuccessCount\@ScriptCommand\@\@QEBAHXZ */ MCAPI int getSuccessCount() const; /** - * @symbol ?serializeJsonOutput\@ScriptCommand\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?serializeJsonOutput\@ScriptCommand\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string serializeJsonOutput() const; /** - * @symbol ?setJsonOutput\@ScriptCommand\@\@QEAAX$$QEAVValue\@Json\@\@\@Z + * @symbol ?setJsonOutput\@ScriptCommand\@\@QEAAX$$QEAVValue\@Json\@\@\@Z */ MCAPI void setJsonOutput(class Json::Value &&); /** - * @symbol ?setOutput\@ScriptCommand\@\@QEAAXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setOutput\@ScriptCommand\@\@QEAAXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setOutput(int, std::string &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptCommandMessageEvent.hpp b/LiteLoader/include/llapi/mc/ScriptCommandMessageEvent.hpp index 21d6cb8ec9..80a2db15b2 100644 --- a/LiteLoader/include/llapi/mc/ScriptCommandMessageEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommandMessageEvent.hpp @@ -25,7 +25,7 @@ struct ScriptCommandMessageEvent { public: /** - * @symbol ??1ScriptCommandMessageEvent\@\@QEAA\@XZ + * @symbol ??1ScriptCommandMessageEvent\@\@QEAA\@XZ */ MCAPI ~ScriptCommandMessageEvent(); diff --git a/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp index fe2a0f6d94..cde23460d5 100644 --- a/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCommandOrigin.hpp @@ -30,88 +30,94 @@ class ScriptCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@ScriptCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@ScriptCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@ScriptCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ScriptCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@ScriptCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@ScriptCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@ScriptCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@ScriptCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@ScriptCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@ScriptCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@ScriptCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@ScriptCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@ScriptCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@ScriptCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@ScriptCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@ScriptCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@ScriptCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ScriptCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@ScriptCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ScriptCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@ScriptCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@ScriptCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@ScriptCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@ScriptCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@ScriptCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ScriptCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 26 - * @symbol ?handleCommandOutputCallback\@ScriptCommandOrigin\@\@UEBAXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z + * @vftbl 26 + * @symbol ?handleCommandOutputCallback\@ScriptCommandOrigin\@\@UEBAXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z */ virtual void handleCommandOutputCallback(int, std::string &&, class Json::Value &&) const; /** - * @vftbl 30 - * @symbol ?isValid\@ScriptCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@ScriptCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTCOMMANDORIGIN /** - * @symbol ??0ScriptCommandOrigin\@\@QEAA\@AEAVServerLevel\@\@PEAVDimension\@\@V?$function\@$$A6AXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScriptCommandOrigin(); +#endif + /** + * @symbol ??0ScriptCommandOrigin\@\@QEAA\@AEAVServerLevel\@\@PEAVDimension\@\@V?$function\@$$A6AXH$$QEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVValue\@Json\@\@\@Z\@std\@\@\@Z */ MCAPI ScriptCommandOrigin(class ServerLevel &, class Dimension *, class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp index 9c2c0ea7f4..7116dcf8f9 100644 --- a/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/ScriptCustomEventPacket.hpp @@ -30,33 +30,33 @@ class ScriptCustomEventPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptCustomEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ScriptCustomEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ScriptCustomEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ScriptCustomEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ScriptCustomEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ScriptCustomEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ScriptCustomEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ScriptCustomEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ScriptCustomEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ScriptCustomEventPacket\@\@QEAA\@XZ + * @symbol ??0ScriptCustomEventPacket\@\@QEAA\@XZ */ MCAPI ScriptCustomEventPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptDebugCommand.hpp b/LiteLoader/include/llapi/mc/ScriptDebugCommand.hpp index 43a1070e81..b80a64a6a8 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebugCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebugCommand.hpp @@ -30,29 +30,35 @@ class ScriptDebugCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptDebugCommand(); + virtual void __unk_vfn_0(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTDEBUGCOMMAND /** - * @symbol ??0ScriptDebugCommand\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScriptDebugCommand(); +#endif + /** + * @symbol ??0ScriptDebugCommand\@\@QEAA\@XZ */ MCAPI ScriptDebugCommand(); //protected: /** - * @symbol ?_handleDebuggerAttach\@ScriptDebugCommand\@\@IEBAXPEAVIScriptDebugger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DebuggerAction\@1\@1GAEAVCommandOutput\@\@\@Z + * @symbol ?_handleDebuggerAttach\@ScriptDebugCommand\@\@IEBAXPEAVIScriptDebugger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4DebuggerAction\@1\@1GAEAVCommandOutput\@\@\@Z */ MCAPI void _handleDebuggerAttach(class IScriptDebugger *, std::string const &, enum class ScriptDebugCommand::DebuggerAction, std::string const &, unsigned short, class CommandOutput &) const; /** - * @symbol ?_handleProfilerAction\@ScriptDebugCommand\@\@IEBAXPEAVIScriptDebugger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ProfilerAction\@1\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleProfilerAction\@ScriptDebugCommand\@\@IEBAXPEAVIScriptDebugger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ProfilerAction\@1\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleProfilerAction(class IScriptDebugger *, std::string const &, enum class ScriptDebugCommand::ProfilerAction, class CommandOutput &) const; /** - * @symbol ?_handleWatchdogAction\@ScriptDebugCommand\@\@IEBAXPEAVIScriptDebugger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4WatchdogAction\@1\@AEAVCommandOutput\@\@\@Z + * @symbol ?_handleWatchdogAction\@ScriptDebugCommand\@\@IEBAXPEAVIScriptDebugger\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4WatchdogAction\@1\@AEAVCommandOutput\@\@\@Z */ MCAPI void _handleWatchdogAction(class IScriptDebugger *, std::string const &, enum class ScriptDebugCommand::WatchdogAction, class CommandOutput &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptDebugger.hpp b/LiteLoader/include/llapi/mc/ScriptDebugger.hpp index 19471a23f6..4f5066eb2f 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebugger.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebugger.hpp @@ -31,54 +31,54 @@ class ScriptDebugger { public: /** - * @vftbl 0 - * @symbol ?listen\@ScriptDebugger\@\@UEAA_NG\@Z + * @vftbl 0 + * @symbol ?listen\@ScriptDebugger\@\@UEAA_NG\@Z */ virtual bool listen(unsigned short); /** - * @vftbl 1 - * @symbol ?connect\@ScriptDebugger\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @vftbl 1 + * @symbol ?connect\@ScriptDebugger\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ virtual bool connect(std::string const &, unsigned short); /** - * @vftbl 2 - * @symbol ?close\@ScriptDebugger\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?close\@ScriptDebugger\@\@UEAAXXZ */ virtual void close(); /** - * @vftbl 3 - * @symbol ?startProfiler\@ScriptDebugger\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?startProfiler\@ScriptDebugger\@\@UEAAXXZ */ virtual void startProfiler(); /** - * @vftbl 4 - * @symbol ?stopProfiler\@ScriptDebugger\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?stopProfiler\@ScriptDebugger\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void stopProfiler(std::string const &); /** - * @vftbl 5 - * @symbol ?getResourceStats\@ScriptDebugger\@\@UEBA?AUScriptResourceStats\@\@XZ + * @vftbl 5 + * @symbol ?getResourceStats\@ScriptDebugger\@\@UEBA?AUScriptResourceStats\@\@XZ */ virtual struct ScriptResourceStats getResourceStats() const; /** - * @symbol ??0ScriptDebugger\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptPluginManager\@\@AEAVIScriptDebuggerWatchdog\@\@V?$unique_ptr\@VIScriptTelemetryLogger\@\@U?$default_delete\@VIScriptTelemetryLogger\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0ScriptDebugger\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptPluginManager\@\@AEAVIScriptDebuggerWatchdog\@\@V?$unique_ptr\@VIScriptTelemetryLogger\@\@U?$default_delete\@VIScriptTelemetryLogger\@\@\@std\@\@\@std\@\@\@Z */ MCAPI ScriptDebugger(class Scripting::ScriptEngine &, class ScriptPluginManager &, class IScriptDebuggerWatchdog &, std::unique_ptr); /** - * @symbol ?checkConnections\@ScriptDebugger\@\@QEAAXXZ + * @symbol ?checkConnections\@ScriptDebugger\@\@QEAAXXZ */ MCAPI void checkConnections(); //private: /** - * @symbol ?_createController\@ScriptDebugger\@\@AEAAPEAVIDebuggerController\@Scripting\@\@XZ + * @symbol ?_createController\@ScriptDebugger\@\@AEAAPEAVIDebuggerController\@Scripting\@\@XZ */ MCAPI class Scripting::IDebuggerController * _createController(); /** - * @symbol ?_releaseController\@ScriptDebugger\@\@AEAAXXZ + * @symbol ?_releaseController\@ScriptDebugger\@\@AEAAXXZ */ MCAPI void _releaseController(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp b/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp index 93f3191064..eec2e99b8e 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebuggerTransport.hpp @@ -30,63 +30,63 @@ class ScriptDebuggerTransport { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptDebuggerTransport(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?listen\@ScriptDebuggerTransport\@\@UEAA_NG\@Z + * @vftbl 1 + * @symbol ?listen\@ScriptDebuggerTransport\@\@UEAA_NG\@Z */ virtual bool listen(unsigned short); /** - * @vftbl 2 - * @symbol ?connect\@ScriptDebuggerTransport\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @vftbl 2 + * @symbol ?connect\@ScriptDebuggerTransport\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ virtual bool connect(std::string const &, unsigned short); /** - * @vftbl 3 - * @symbol ?selectClient\@ScriptDebuggerTransport\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?selectClient\@ScriptDebuggerTransport\@\@UEAA_NXZ */ virtual bool selectClient(); /** - * @vftbl 4 - * @symbol ?connected\@ScriptDebuggerTransport\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?connected\@ScriptDebuggerTransport\@\@UEBA_NXZ */ virtual bool connected() const; /** - * @vftbl 5 - * @symbol ?lostConnection\@ScriptDebuggerTransport\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?lostConnection\@ScriptDebuggerTransport\@\@UEBA_NXZ */ virtual bool lostConnection() const; /** - * @vftbl 6 - * @symbol ?readyClose\@ScriptDebuggerTransport\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?readyClose\@ScriptDebuggerTransport\@\@UEBA_NXZ */ virtual bool readyClose() const; /** - * @vftbl 7 - * @symbol ?close\@ScriptDebuggerTransport\@\@UEAAXXZ + * @vftbl 7 + * @symbol ?close\@ScriptDebuggerTransport\@\@UEAAXXZ */ virtual void close(); /** - * @vftbl 8 - * @symbol ?peek\@ScriptDebuggerTransport\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?peek\@ScriptDebuggerTransport\@\@UEBA_NXZ */ virtual bool peek() const; /** - * @vftbl 9 - * @symbol ?receive\@ScriptDebuggerTransport\@\@UEAA_NPEAD_K\@Z + * @vftbl 9 + * @symbol ?receive\@ScriptDebuggerTransport\@\@UEAA_NPEAD_K\@Z */ virtual bool receive(char *, unsigned __int64); /** - * @vftbl 10 - * @symbol ?send\@ScriptDebuggerTransport\@\@UEAAXPEBD_K\@Z + * @vftbl 10 + * @symbol ?send\@ScriptDebuggerTransport\@\@UEAAXPEBD_K\@Z */ virtual void send(char const *, unsigned __int64); /** - * @symbol ??0ScriptDebuggerTransport\@\@QEAA\@AEAVIScriptDebuggerWatchdog\@\@\@Z + * @symbol ??0ScriptDebuggerTransport\@\@QEAA\@AEAVIScriptDebuggerWatchdog\@\@\@Z */ MCAPI ScriptDebuggerTransport(class IScriptDebuggerWatchdog &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp b/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp index 072301ac3f..0a23ceab1e 100644 --- a/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDebuggerWatchdog.hpp @@ -30,32 +30,32 @@ class ScriptDebuggerWatchdog { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptDebuggerWatchdog(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?requireClose\@ScriptDebuggerWatchdog\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?requireClose\@ScriptDebuggerWatchdog\@\@UEBA_NXZ */ virtual bool requireClose() const; /** - * @vftbl 2 - * @symbol ?startListenTimeout\@ScriptDebuggerWatchdog\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?startListenTimeout\@ScriptDebuggerWatchdog\@\@UEAAXXZ */ virtual void startListenTimeout(); /** - * @vftbl 3 - * @symbol ?listenTimeoutExpired\@ScriptDebuggerWatchdog\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?listenTimeoutExpired\@ScriptDebuggerWatchdog\@\@UEBA_NXZ */ virtual bool listenTimeoutExpired() const; /** - * @symbol ??0ScriptDebuggerWatchdog\@\@QEAA\@V?$duration\@HU?$ratio\@$0DM\@$00\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ??0ScriptDebuggerWatchdog\@\@QEAA\@V?$duration\@HU?$ratio\@$0DM\@$00\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI ScriptDebuggerWatchdog(class std::chrono::duration>); /** - * @symbol ?startLeaveGame\@ScriptDebuggerWatchdog\@\@QEAAXXZ + * @symbol ?startLeaveGame\@ScriptDebuggerWatchdog\@\@QEAAXXZ */ MCAPI void startLeaveGame(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp b/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp index 9b2ad06fb4..d4357e9e38 100644 --- a/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptDeferredActionManager.hpp @@ -28,16 +28,16 @@ class ScriptDeferredActionManager { public: /** - * @symbol ?executeActions\@ScriptDeferredActionManager\@\@QEAAXXZ + * @symbol ?executeActions\@ScriptDeferredActionManager\@\@QEAAXXZ */ MCAPI void executeActions(); /** - * @symbol ?rejectAll\@ScriptDeferredActionManager\@\@QEAAXXZ + * @symbol ?rejectAll\@ScriptDeferredActionManager\@\@QEAAXXZ */ MCAPI void rejectAll(); /** - * @symbol ??1ScriptDeferredActionManager\@\@QEAA\@XZ + * @symbol ??1ScriptDeferredActionManager\@\@QEAA\@XZ */ MCAPI ~ScriptDeferredActionManager(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp b/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp index 72ceeabda6..bea9a903f2 100644 --- a/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp +++ b/LiteLoader/include/llapi/mc/ScriptEventCommand.hpp @@ -26,18 +26,18 @@ class ScriptEventCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptEventCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ScriptEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ScriptEventCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ScriptEventCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ScriptEventCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp b/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp index 010882792b..e8ebb6afe7 100644 --- a/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp +++ b/LiteLoader/include/llapi/mc/ScriptFormPromiseTracker.hpp @@ -28,33 +28,33 @@ class ScriptFormPromiseTracker { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTFORMPROMISETRACKER /** - * @symbol ?onEvent\@ScriptFormPromiseTracker\@\@UEAA?AW4EventResult\@\@AEBUPlayerFormCloseEvent\@\@\@Z + * @symbol ?onEvent\@ScriptFormPromiseTracker\@\@UEAA?AW4EventResult\@\@AEBUPlayerFormResponseEvent\@\@\@Z */ - MCVAPI enum class EventResult onEvent(struct PlayerFormCloseEvent const &); + MCVAPI enum class EventResult onEvent(struct PlayerFormResponseEvent const &); /** - * @symbol ?onEvent\@ScriptFormPromiseTracker\@\@UEAA?AW4EventResult\@\@AEBUPlayerFormResponseEvent\@\@\@Z + * @symbol ?onEvent\@ScriptFormPromiseTracker\@\@UEAA?AW4EventResult\@\@AEBUPlayerFormCloseEvent\@\@\@Z */ - MCVAPI enum class EventResult onEvent(struct PlayerFormResponseEvent const &); + MCVAPI enum class EventResult onEvent(struct PlayerFormCloseEvent const &); #endif /** - * @symbol ??0ScriptFormPromiseTracker\@\@QEAA\@XZ + * @symbol ??0ScriptFormPromiseTracker\@\@QEAA\@XZ */ MCAPI ScriptFormPromiseTracker(); /** - * @symbol ?handleFormResponse\@ScriptFormPromiseTracker\@\@QEAAXIAEBVValue\@Json\@\@\@Z + * @symbol ?handleFormResponse\@ScriptFormPromiseTracker\@\@QEAAXIAEBVValue\@Json\@\@\@Z */ MCAPI void handleFormResponse(unsigned int, class Json::Value const &); /** - * @symbol ?handlePlayerQuit\@ScriptFormPromiseTracker\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z + * @symbol ?handlePlayerQuit\@ScriptFormPromiseTracker\@\@QEAAXAEBVNetworkIdentifier\@\@\@Z */ MCAPI void handlePlayerQuit(class NetworkIdentifier const &); /** - * @symbol ??4ScriptFormPromiseTracker\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4ScriptFormPromiseTracker\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class ScriptFormPromiseTracker & operator=(class ScriptFormPromiseTracker const &); /** - * @symbol ?rejectAllForShutdown\@ScriptFormPromiseTracker\@\@QEAAXXZ + * @symbol ?rejectAllForShutdown\@ScriptFormPromiseTracker\@\@QEAAXXZ */ MCAPI void rejectAllForShutdown(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp index 4247be6e2e..204a702be4 100644 --- a/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptGameTestModuleFactory.hpp @@ -31,67 +31,67 @@ class ScriptGameTestModuleFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptGameTestModuleFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 2 - * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ + * @vftbl 2 + * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ */ virtual struct Scripting::UUID getUUID() const; /** - * @vftbl 3 - * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasAlias(std::string const &) const; /** - * @vftbl 4 - * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSupportedVersions() const; /** - * @vftbl 5 - * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z + * @vftbl 5 + * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z */ virtual std::vector getDependencies(struct Scripting::Version) const; /** - * @vftbl 6 - * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@$$QEAV?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@4\@\@Z + * @vftbl 6 + * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@\@Z */ - virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &, std::vector &&); + virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &); /** - * @symbol ??0ScriptGameTestModuleFactory\@\@QEAA\@AEAVGameTestRegistry\@gametest\@\@\@Z + * @symbol ??0ScriptGameTestModuleFactory\@\@QEAA\@AEAVGameTestRegistry\@gametest\@\@\@Z */ MCAPI ScriptGameTestModuleFactory(class gametest::GameTestRegistry &); /** - * @symbol ?getModuleUUIDAsString\@ScriptGameTestModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModuleUUIDAsString\@ScriptGameTestModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getModuleUUIDAsString(); //private: /** - * @symbol ?_addVersions\@ScriptGameTestModuleFactory\@\@AEAAXXZ + * @symbol ?_addVersions\@ScriptGameTestModuleFactory\@\@AEAAXXZ */ MCAPI void _addVersions(); /** - * @symbol ?_generateBindings\@ScriptGameTestModuleFactory\@\@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\@ScriptGameTestModuleFactory\@\@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 ?ModuleName\@ScriptGameTestModuleFactory\@\@0PEBDEB + * @symbol ?ModuleName\@ScriptGameTestModuleFactory\@\@0PEBDEB */ MCAPI static char const * ModuleName; /** - * @symbol ?ModuleUUID\@ScriptGameTestModuleFactory\@\@0VUUID\@mce\@\@A + * @symbol ?ModuleUUID\@ScriptGameTestModuleFactory\@\@0VUUID\@mce\@\@A */ MCAPI static class mce::UUID ModuleUUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp b/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp index 94b3b3cf14..841eca5773 100644 --- a/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptItemGameplayHandler.hpp @@ -30,80 +30,80 @@ class ScriptItemGameplayHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptItemGameplayHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ItemGameplayEvent\@X\@\@U?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VItemGameplayHandler\@\@\@Details\@\@MEAA?AW4HandlerResult\@\@AEBU?$ItemGameplayEvent\@X\@\@\@Z + * @vftbl 1 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ItemGameplayEvent\@X\@\@U?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VItemGameplayHandler\@\@\@Details\@\@MEAA?AW4HandlerResult\@\@AEBU?$ItemGameplayEvent\@X\@\@\@Z */ virtual enum class HandlerResult handleEvent(struct ItemGameplayEvent const &); /** - * @vftbl 2 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VItemGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 2 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VItemGameplayHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableItemGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct MutableItemGameplayEvent &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemDefinitionEventTriggeredEvent\@\@\@Z + * @vftbl 9 + * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemDefinitionEventTriggeredEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ItemDefinitionEventTriggeredEvent &); /** - * @vftbl 10 - * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemUseOnEvent\@\@\@Z + * @vftbl 10 + * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemUseOnEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ItemUseOnEvent &); /** - * @vftbl 11 - * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemUseEvent\@\@\@Z + * @vftbl 11 + * @symbol ?handleEvent\@ScriptItemGameplayHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUItemUseEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ItemUseEvent &); //private: /** - * @symbol ?_handleItemDefinitionEventTriggered\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemDefinitionEventTriggeredEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleItemDefinitionEventTriggered\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemDefinitionEventTriggeredEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleItemDefinitionEventTriggered(struct ItemDefinitionEventTriggeredEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); /** - * @symbol ?_handleItemUseEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleItemUseEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleItemUseEvent(struct ItemUseEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); /** - * @symbol ?_handleItemUseOnEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseOnEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleItemUseOnEvent\@ScriptItemGameplayHandler\@\@AEAA_NAEAUItemUseOnEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleItemUseOnEvent(struct ItemUseOnEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptMemory.hpp b/LiteLoader/include/llapi/mc/ScriptMemory.hpp index 4e753316d9..473beb1bd6 100644 --- a/LiteLoader/include/llapi/mc/ScriptMemory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMemory.hpp @@ -21,7 +21,7 @@ namespace ScriptMemory { #undef AFTER_EXTRA /** - * @symbol ?getQuickJSMallocFunctions\@ScriptMemory\@\@YA?AV?$unique_ptr\@UMallocFunctions\@QuickJS\@Scripting\@\@U?$default_delete\@UMallocFunctions\@QuickJS\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getQuickJSMallocFunctions\@ScriptMemory\@\@YA?AV?$unique_ptr\@UMallocFunctions\@QuickJS\@Scripting\@\@U?$default_delete\@UMallocFunctions\@QuickJS\@Scripting\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr getQuickJSMallocFunctions(); diff --git a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp index 058da968f3..b060f77d27 100644 --- a/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMessagePacket.hpp @@ -28,45 +28,51 @@ class ScriptMessagePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptMessagePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ScriptMessagePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ScriptMessagePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ScriptMessagePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ScriptMessagePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ScriptMessagePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ScriptMessagePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ScriptMessagePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTMESSAGEPACKET /** - * @symbol ??0ScriptMessagePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ScriptMessagePacket(); + MCVAPI ~ScriptMessagePacket(); +#endif /** - * @symbol ??0ScriptMessagePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ??0ScriptMessagePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI ScriptMessagePacket(std::string const &, std::string const &); /** - * @symbol ?getMessageId\@ScriptMessagePacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ??0ScriptMessagePacket\@\@QEAA\@XZ + */ + MCAPI ScriptMessagePacket(); + /** + * @symbol ?getMessageId\@ScriptMessagePacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getMessageId() const; /** - * @symbol ?getMessageValue\@ScriptMessagePacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getMessageValue\@ScriptMessagePacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getMessageValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp index 5a2d7438ef..ffdb07eb77 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftCommonModuleFactory.hpp @@ -28,16 +28,16 @@ class ScriptMinecraftCommonModuleFactory { public: /** - * @symbol ??0ScriptMinecraftCommonModuleFactory\@\@QEAA\@XZ + * @symbol ??0ScriptMinecraftCommonModuleFactory\@\@QEAA\@XZ */ MCAPI ScriptMinecraftCommonModuleFactory(); /** - * @symbol ?addCommon\@ScriptMinecraftCommonModuleFactory\@\@QEAAXAEAVModuleBindingBuilder\@Scripting\@\@\@Z + * @symbol ?addCommon\@ScriptMinecraftCommonModuleFactory\@\@QEAAXAEAVModuleBindingBuilder\@Scripting\@\@\@Z */ MCAPI void addCommon(class Scripting::ModuleBindingBuilder &); /** - * @symbol ??1ScriptMinecraftCommonModuleFactory\@\@QEAA\@XZ + * @symbol ??1ScriptMinecraftCommonModuleFactory\@\@QEAA\@XZ */ MCAPI ~ScriptMinecraftCommonModuleFactory(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp index eca8f6200d..1be0e14de7 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftModuleFactory.hpp @@ -32,79 +32,79 @@ class ScriptMinecraftModuleFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptMinecraftModuleFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 2 - * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ + * @vftbl 2 + * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ */ virtual struct Scripting::UUID getUUID() const; /** - * @vftbl 3 - * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasAlias(std::string const &) const; /** - * @vftbl 4 - * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSupportedVersions() const; /** - * @vftbl 5 - * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z + * @vftbl 5 + * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z */ virtual std::vector getDependencies(struct Scripting::Version) const; /** - * @vftbl 6 - * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@$$QEAV?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@4\@\@Z + * @vftbl 6 + * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@\@Z */ - virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &, std::vector &&); + virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &); /** - * @symbol ??0ScriptMinecraftModuleFactory\@\@QEAA\@PEAVServerLevel\@\@\@Z + * @symbol ??0ScriptMinecraftModuleFactory\@\@QEAA\@PEAVServerLevel\@\@\@Z */ MCAPI ScriptMinecraftModuleFactory(class ServerLevel *); /** - * @symbol ?getActorComponentFactories\@ScriptMinecraftModuleFactory\@\@SAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIComponentFactory\@ScriptModuleMinecraft\@\@U?$default_delete\@VIComponentFactory\@ScriptModuleMinecraft\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIComponentFactory\@ScriptModuleMinecraft\@\@U?$default_delete\@VIComponentFactory\@ScriptModuleMinecraft\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getActorComponentFactories\@ScriptMinecraftModuleFactory\@\@SAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIComponentFactory\@ScriptModuleMinecraft\@\@U?$default_delete\@VIComponentFactory\@ScriptModuleMinecraft\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VIComponentFactory\@ScriptModuleMinecraft\@\@U?$default_delete\@VIComponentFactory\@ScriptModuleMinecraft\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI static class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> & getActorComponentFactories(); /** - * @symbol ?getModuleUUIDAsString\@ScriptMinecraftModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModuleUUIDAsString\@ScriptMinecraftModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getModuleUUIDAsString(); /** - * @symbol ?makeModuleDescriptorFor\@ScriptMinecraftModuleFactory\@\@SA?AUModuleDescriptor\@Scripting\@\@UVersion\@3\@\@Z + * @symbol ?makeModuleDescriptorFor\@ScriptMinecraftModuleFactory\@\@SA?AUModuleDescriptor\@Scripting\@\@UVersion\@3\@\@Z */ MCAPI static struct Scripting::ModuleDescriptor makeModuleDescriptorFor(struct Scripting::Version); //private: /** - * @symbol ?_addVersions\@ScriptMinecraftModuleFactory\@\@AEAAXXZ + * @symbol ?_addVersions\@ScriptMinecraftModuleFactory\@\@AEAAXXZ */ MCAPI void _addVersions(); /** - * @symbol ?_generateBindings\@ScriptMinecraftModuleFactory\@\@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\@ScriptMinecraftModuleFactory\@\@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\@ScriptMinecraftModuleFactory\@\@0PEBDEB + * @symbol ?LegacyModuleName\@ScriptMinecraftModuleFactory\@\@0PEBDEB */ MCAPI static char const * LegacyModuleName; /** - * @symbol ?ModuleName\@ScriptMinecraftModuleFactory\@\@0PEBDEB + * @symbol ?ModuleName\@ScriptMinecraftModuleFactory\@\@0PEBDEB */ MCAPI static char const * ModuleName; /** - * @symbol ?ModuleUUID\@ScriptMinecraftModuleFactory\@\@0VUUID\@mce\@\@B + * @symbol ?ModuleUUID\@ScriptMinecraftModuleFactory\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ModuleUUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp index b6e2365f45..18c07f1f5d 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftNetModuleFactory.hpp @@ -30,63 +30,63 @@ class ScriptMinecraftNetModuleFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptMinecraftNetModuleFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 2 - * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ + * @vftbl 2 + * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ */ virtual struct Scripting::UUID getUUID() const; /** - * @vftbl 3 - * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasAlias(std::string const &) const; /** - * @vftbl 4 - * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSupportedVersions() const; /** - * @vftbl 5 - * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z + * @vftbl 5 + * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z */ virtual std::vector getDependencies(struct Scripting::Version) const; /** - * @vftbl 6 - * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@$$QEAV?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@4\@\@Z + * @vftbl 6 + * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@\@Z */ - virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &, std::vector &&); + virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &); /** - * @symbol ??0ScriptMinecraftNetModuleFactory\@\@QEAA\@V?$NonOwnerPointer\@VScheduler\@\@\@Bedrock\@\@\@Z + * @symbol ??0ScriptMinecraftNetModuleFactory\@\@QEAA\@V?$NonOwnerPointer\@VScheduler\@\@\@Bedrock\@\@\@Z */ MCAPI ScriptMinecraftNetModuleFactory(class Bedrock::NonOwnerPointer); /** - * @symbol ?getModuleUUIDAsString\@ScriptMinecraftNetModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModuleUUIDAsString\@ScriptMinecraftNetModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getModuleUUIDAsString(); //private: /** - * @symbol ?_generateBindings\@ScriptMinecraftNetModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@V?$optional\@UContextConfig\@Scripting\@\@\@std\@\@_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\@\@6\@\@Z + * @symbol ?_generateBindings\@ScriptMinecraftNetModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@V?$optional\@UContextConfig\@Scripting\@\@\@std\@\@_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\@\@6\@\@Z */ MCAPI struct Scripting::ModuleBinding _generateBindings(class Scripting::ModuleBindingBuilder &, class std::optional, bool, std::vector const &); private: /** - * @symbol ?ModuleName\@ScriptMinecraftNetModuleFactory\@\@0PEBDEB + * @symbol ?ModuleName\@ScriptMinecraftNetModuleFactory\@\@0PEBDEB */ MCAPI static char const * ModuleName; /** - * @symbol ?ModuleUUID\@ScriptMinecraftNetModuleFactory\@\@0VUUID\@mce\@\@B + * @symbol ?ModuleUUID\@ScriptMinecraftNetModuleFactory\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ModuleUUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp index 48ac7d3612..4b4c8a88ea 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftServerAdminModuleFactory.hpp @@ -30,67 +30,67 @@ class ScriptMinecraftServerAdminModuleFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptMinecraftServerAdminModuleFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 2 - * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ + * @vftbl 2 + * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ */ virtual struct Scripting::UUID getUUID() const; /** - * @vftbl 3 - * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasAlias(std::string const &) const; /** - * @vftbl 4 - * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSupportedVersions() const; /** - * @vftbl 5 - * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z + * @vftbl 5 + * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z */ virtual std::vector getDependencies(struct Scripting::Version) const; /** - * @vftbl 6 - * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@$$QEAV?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@4\@\@Z + * @vftbl 6 + * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@\@Z */ - virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &, std::vector &&); + virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &); /** - * @symbol ??0ScriptMinecraftServerAdminModuleFactory\@\@QEAA\@V?$NonOwnerPointer\@VScriptPackConfigurationManager\@\@\@Bedrock\@\@\@Z + * @symbol ??0ScriptMinecraftServerAdminModuleFactory\@\@QEAA\@V?$NonOwnerPointer\@VScriptPackConfigurationManager\@\@\@Bedrock\@\@\@Z */ MCAPI ScriptMinecraftServerAdminModuleFactory(class Bedrock::NonOwnerPointer); /** - * @symbol ?getModuleUUIDAsString\@ScriptMinecraftServerAdminModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModuleUUIDAsString\@ScriptMinecraftServerAdminModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI static std::string getModuleUUIDAsString(); /** - * @symbol ?makeModuleDescriptorFor\@ScriptMinecraftServerAdminModuleFactory\@\@SA?AUModuleDescriptor\@Scripting\@\@UVersion\@3\@\@Z + * @symbol ?makeModuleDescriptorFor\@ScriptMinecraftServerAdminModuleFactory\@\@SA?AUModuleDescriptor\@Scripting\@\@UVersion\@3\@\@Z */ MCAPI static struct Scripting::ModuleDescriptor makeModuleDescriptorFor(struct Scripting::Version); //private: /** - * @symbol ?_generateBindings\@ScriptMinecraftServerAdminModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@V?$optional\@UContextConfig\@Scripting\@\@\@std\@\@_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\@\@6\@\@Z + * @symbol ?_generateBindings\@ScriptMinecraftServerAdminModuleFactory\@\@AEAA?AUModuleBinding\@Scripting\@\@AEAVModuleBindingBuilder\@3\@V?$optional\@UContextConfig\@Scripting\@\@\@std\@\@_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\@\@6\@\@Z */ MCAPI struct Scripting::ModuleBinding _generateBindings(class Scripting::ModuleBindingBuilder &, class std::optional, bool, std::vector const &); private: /** - * @symbol ?ModuleName\@ScriptMinecraftServerAdminModuleFactory\@\@0PEBDEB + * @symbol ?ModuleName\@ScriptMinecraftServerAdminModuleFactory\@\@0PEBDEB */ MCAPI static char const * ModuleName; /** - * @symbol ?ModuleUUID\@ScriptMinecraftServerAdminModuleFactory\@\@0VUUID\@mce\@\@B + * @symbol ?ModuleUUID\@ScriptMinecraftServerAdminModuleFactory\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ModuleUUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp b/LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp index 15e6574a67..0d0bd968bb 100644 --- a/LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp +++ b/LiteLoader/include/llapi/mc/ScriptMinecraftUIModuleFactory.hpp @@ -28,71 +28,71 @@ class ScriptMinecraftUIModuleFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptMinecraftUIModuleFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 2 - * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ + * @vftbl 2 + * @symbol ?getUUID\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AUUUID\@2\@XZ */ virtual struct Scripting::UUID getUUID() const; /** - * @vftbl 3 - * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?hasAlias\@GenericModuleBindingFactory\@Scripting\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasAlias(std::string const &) const; /** - * @vftbl 4 - * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getSupportedVersions\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UVersion\@Scripting\@\@V?$allocator\@UVersion\@Scripting\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getSupportedVersions() const; /** - * @vftbl 5 - * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z + * @vftbl 5 + * @symbol ?getDependencies\@GenericModuleBindingFactory\@Scripting\@\@UEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@UVersion\@2\@\@Z */ virtual std::vector getDependencies(struct Scripting::Version) const; /** - * @vftbl 6 - * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@$$QEAV?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@4\@\@Z + * @vftbl 6 + * @symbol ?createModuleBinding\@GenericModuleBindingFactory\@Scripting\@\@UEAA?AV?$optional\@UModuleBinding\@Scripting\@\@\@std\@\@UVersion\@2\@AEBV?$optional\@UContextConfig\@Scripting\@\@\@4\@\@Z */ - virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &, std::vector &&); + virtual class std::optional createModuleBinding(struct Scripting::Version, class std::optional const &); /** - * @symbol ??0ScriptMinecraftUIModuleFactory\@\@QEAA\@XZ + * @symbol ??0ScriptMinecraftUIModuleFactory\@\@QEAA\@XZ */ MCAPI ScriptMinecraftUIModuleFactory(); /** - * @symbol ?getModuleUUIDAsString\@ScriptMinecraftUIModuleFactory\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getModuleUUIDAsString\@ScriptMinecraftUIModuleFactory\@\@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\@ScriptMinecraftUIModuleFactory\@\@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\@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 */ MCAPI struct Scripting::ModuleBinding _generateBindings(class Scripting::ModuleBindingBuilder &, bool, std::vector const &); private: /** - * @symbol ?LegacyModuleName\@ScriptMinecraftUIModuleFactory\@\@0PEBDEB + * @symbol ?LegacyModuleName\@ScriptMinecraftUIModuleFactory\@\@0PEBDEB */ MCAPI static char const * LegacyModuleName; /** - * @symbol ?ModuleName\@ScriptMinecraftUIModuleFactory\@\@0PEBDEB + * @symbol ?ModuleName\@ScriptMinecraftUIModuleFactory\@\@0PEBDEB */ MCAPI static char const * ModuleName; /** - * @symbol ?ModuleUUID\@ScriptMinecraftUIModuleFactory\@\@0VUUID\@mce\@\@B + * @symbol ?ModuleUUID\@ScriptMinecraftUIModuleFactory\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ModuleUUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptModuleFilters.hpp b/LiteLoader/include/llapi/mc/ScriptModuleFilters.hpp index e09def13e5..a103efb284 100644 --- a/LiteLoader/include/llapi/mc/ScriptModuleFilters.hpp +++ b/LiteLoader/include/llapi/mc/ScriptModuleFilters.hpp @@ -21,15 +21,15 @@ namespace ScriptModuleFilters { #undef AFTER_EXTRA /** - * @symbol ?getEditorModuleFilter\@ScriptModuleFilters\@\@YA?AV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@_N\@Z + * @symbol ?getEditorModuleFilter\@ScriptModuleFilters\@\@YA?AV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@_N\@Z */ MCAPI class std::function getEditorModuleFilter(bool); /** - * @symbol ?getGameTestModuleFilter\@ScriptModuleFilters\@\@YA?AV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@_N\@Z + * @symbol ?getGameTestModuleFilter\@ScriptModuleFilters\@\@YA?AV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@_N\@Z */ MCAPI class std::function getGameTestModuleFilter(bool); /** - * @symbol ?getReleaseModuleFilter\@ScriptModuleFilters\@\@YA?AV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@_N0\@Z + * @symbol ?getReleaseModuleFilter\@ScriptModuleFilters\@\@YA?AV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@_N0\@Z */ MCAPI class std::function getReleaseModuleFilter(bool, bool); diff --git a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp index ff0ba1edf6..c1a89db8c3 100644 --- a/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp +++ b/LiteLoader/include/llapi/mc/ScriptModuleMinecraft.hpp @@ -60,31 +60,31 @@ struct ScriptNavigationResult { }; #undef AFTER_EXTRA /** - * @symbol ?INVALID_CONTAINER_SLOT_ERROR\@ScriptModuleMinecraft\@\@3PEBDEB - */ - MCAPI extern char const * INVALID_CONTAINER_SLOT_ERROR; - /** - * @symbol ?bindBlockLocation\@ScriptModuleMinecraft\@\@YA?AV?$ClassBindingBuilder\@VBlockPos\@\@\@Scripting\@\@XZ + * @symbol ?bindBlockLocation\@ScriptModuleMinecraft\@\@YA?AV?$ClassBindingBuilder\@VBlockPos\@\@\@Scripting\@\@XZ */ MCAPI class Scripting::ClassBindingBuilder bindBlockLocation(); /** - * @symbol ?bindFacingEnumV010\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptFacing\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ + * @symbol ?bindFacingEnumV010\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptFacing\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindFacingEnumV010(); /** - * @symbol ?bindFacingEnumV1\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ + * @symbol ?bindFacingEnumV1\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindFacingEnumV1(); /** - * @symbol ?bindMessageSourceTypeV010\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptMessageSourceType\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ + * @symbol ?bindItemLockMode\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ItemLockMode\@\@\@Scripting\@\@XZ + */ + MCAPI class Scripting::EnumBindingBuilder bindItemLockMode(); + /** + * @symbol ?bindMessageSourceTypeV010\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptMessageSourceType\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindMessageSourceTypeV010(); /** - * @symbol ?bindMessageSourceTypeV1\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptMessageSourceType\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ + * @symbol ?bindMessageSourceTypeV1\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ScriptMessageSourceType\@ScriptModuleMinecraft\@\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindMessageSourceTypeV1(); /** - * @symbol ?bindTimeOfDay\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptTimeOfDay\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ + * @symbol ?bindTimeOfDay\@ScriptModuleMinecraft\@\@YA?AV?$EnumBindingBuilder\@W4ScriptTimeOfDay\@ScriptModuleMinecraft\@\@W412\@\@Scripting\@\@XZ */ MCAPI class Scripting::EnumBindingBuilder bindTimeOfDay(); diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp index 67c3e482b8..bf69b94761 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfiguration.hpp @@ -27,48 +27,48 @@ class ScriptPackConfiguration { public: /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); + MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &); /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@XZ + * @symbol ??0ScriptPackConfiguration\@\@QEAA\@XZ */ MCAPI ScriptPackConfiguration(); /** - * @symbol ??0ScriptPackConfiguration\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ScriptPackConfiguration\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI ScriptPackConfiguration(class ScriptPackConfiguration const &); + MCAPI ScriptPackConfiguration(class ScriptPackConfiguration &&); /** - * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEAAAEAVScriptPackPermissions\@\@XZ + * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEAAAEAVScriptPackPermissions\@\@XZ */ MCAPI class ScriptPackPermissions & getPermissions(); /** - * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEBAAEBVScriptPackPermissions\@\@XZ + * @symbol ?getPermissions\@ScriptPackConfiguration\@\@QEBAAEBVScriptPackPermissions\@\@XZ */ MCAPI class ScriptPackPermissions const & getPermissions() const; /** - * @symbol ?getSecrets\@ScriptPackConfiguration\@\@QEAAAEAV?$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\@\@XZ + * @symbol ?getSecrets\@ScriptPackConfiguration\@\@QEAAAEAV?$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\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getSecrets(); /** - * @symbol ?getSecrets\@ScriptPackConfiguration\@\@QEBAAEBV?$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\@\@XZ + * @symbol ?getSecrets\@ScriptPackConfiguration\@\@QEBAAEBV?$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\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getSecrets() const; /** - * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEAAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEAAAEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> & getVariables(); /** - * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getVariables\@ScriptPackConfiguration\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VValue\@Json\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getVariables() const; /** - * @symbol ??4ScriptPackConfiguration\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ScriptPackConfiguration\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ScriptPackConfiguration & operator=(class ScriptPackConfiguration &&); /** - * @symbol ??1ScriptPackConfiguration\@\@QEAA\@XZ + * @symbol ??1ScriptPackConfiguration\@\@QEAA\@XZ */ MCAPI ~ScriptPackConfiguration(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp index 96ad959d12..39f4e45448 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackConfigurationManager.hpp @@ -27,19 +27,19 @@ class ScriptPackConfigurationManager { public: /** - * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ + * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ScriptPackConfigurationManager(); + MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &); /** - * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ScriptPackConfigurationManager\@\@QEAA\@XZ */ - MCAPI ScriptPackConfigurationManager(class ScriptPackConfigurationManager const &); + MCAPI ScriptPackConfigurationManager(); /** - * @symbol ?getPackConfiguration\@ScriptPackConfigurationManager\@\@QEBAAEBVScriptPackConfiguration\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPackConfiguration\@ScriptPackConfigurationManager\@\@QEBAAEBVScriptPackConfiguration\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class ScriptPackConfiguration const & getPackConfiguration(std::string const &) const; /** - * @symbol ?loadPackConfigs\@ScriptPackConfigurationManager\@\@QEAAXAEBVPath\@Core\@\@\@Z + * @symbol ?loadPackConfigs\@ScriptPackConfigurationManager\@\@QEAAXAEBVPath\@Core\@\@\@Z */ MCAPI void loadPackConfigs(class Core::Path const &); @@ -47,8 +47,8 @@ class ScriptPackConfigurationManager { private: /** - * @symbol ?sDefaultConfigurationName\@ScriptPackConfigurationManager\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?sDefaultConfigurationName\@ScriptPackConfigurationManager\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const sDefaultConfigurationName; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp index fef2129af9..2abc29464d 100644 --- a/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPackPermissions.hpp @@ -26,19 +26,19 @@ class ScriptPackPermissions { public: /** - * @symbol ??0ScriptPackPermissions\@\@QEAA\@XZ + * @symbol ??0ScriptPackPermissions\@\@QEAA\@XZ */ MCAPI ScriptPackPermissions(); /** - * @symbol ??0ScriptPackPermissions\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ScriptPackPermissions\@\@QEAA\@AEBV0\@\@Z */ MCAPI ScriptPackPermissions(class ScriptPackPermissions const &); /** - * @symbol ?isModuleAllowed\@ScriptPackPermissions\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isModuleAllowed\@ScriptPackPermissions\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isModuleAllowed(std::string const &) const; /** - * @symbol ??4ScriptPackPermissions\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ScriptPackPermissions\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ScriptPackPermissions & operator=(class ScriptPackPermissions &&); @@ -46,8 +46,8 @@ class ScriptPackPermissions { private: /** - * @symbol ?sWildCardModuleName\@ScriptPackPermissions\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?sWildCardModuleName\@ScriptPackPermissions\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const sWildCardModuleName; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp index b10bb4f04f..95d8eadf55 100644 --- a/LiteLoader/include/llapi/mc/ScriptPlugin.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPlugin.hpp @@ -31,74 +31,76 @@ class ScriptPlugin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptPlugin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onLoadScript\@ScriptPlugin\@\@UEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@V?$optional\@V?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?onLoadScript\@ScriptPlugin\@\@UEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@V?$optional\@V?$vector\@UModuleBinding\@Scripting\@\@V?$allocator\@UModuleBinding\@Scripting\@\@\@std\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional onLoadScript(std::string const &, class std::optional>); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPLUGIN /** - * @symbol ??0ScriptPlugin\@\@QEAA\@$$QEAUModuleDescriptor\@Scripting\@\@$$QEAV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@$$QEAUCapabilities\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@4\@33$$QEAV?$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\@\@4\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ScriptPlugin(struct Scripting::ModuleDescriptor &&, std::vector &&, struct Scripting::Capabilities &&, std::string const &, std::string const &, std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> &&); + MCVAPI ~ScriptPlugin(); +#endif /** - * @symbol ??0ScriptPlugin\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ScriptPlugin\@\@QEAA\@$$QEAUModuleDescriptor\@Scripting\@\@$$QEAV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@$$QEAUCapabilities\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@4\@33$$QEAV?$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\@\@4\@\@Z */ - MCAPI ScriptPlugin(class ScriptPlugin &&); + MCAPI ScriptPlugin(struct Scripting::ModuleDescriptor &&, std::vector &&, struct Scripting::Capabilities &&, std::string const &, std::string const &, std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> &&); /** - * @symbol ?getCapabilities\@ScriptPlugin\@\@QEBAAEBUCapabilities\@Scripting\@\@XZ + * @symbol ?getCapabilities\@ScriptPlugin\@\@QEBAAEBUCapabilities\@Scripting\@\@XZ */ MCAPI struct Scripting::Capabilities const & getCapabilities() const; /** - * @symbol ?getEngineVersion\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getEngineVersion\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getEngineVersion() const; /** - * @symbol ?getModuleDependencies\@ScriptPlugin\@\@QEBAAEBV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getModuleDependencies\@ScriptPlugin\@\@QEBAAEBV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getModuleDependencies() const; /** - * @symbol ?getModuleDescriptor\@ScriptPlugin\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ + * @symbol ?getModuleDescriptor\@ScriptPlugin\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ */ MCAPI struct Scripting::ModuleDescriptor const & getModuleDescriptor() const; /** - * @symbol ?getRuntimeName\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getRuntimeName\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getRuntimeName() const; /** - * @symbol ?getScriptContext\@ScriptPlugin\@\@QEAAAEAVScriptContext\@Scripting\@\@XZ + * @symbol ?getScriptContext\@ScriptPlugin\@\@QEAAAEAVScriptContext\@Scripting\@\@XZ */ MCAPI class Scripting::ScriptContext & getScriptContext(); /** - * @symbol ?getScriptMainName\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getScriptMainName\@ScriptPlugin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getScriptMainName() const; /** - * @symbol ?hasErrors\@ScriptPlugin\@\@QEBA_NXZ + * @symbol ?hasErrors\@ScriptPlugin\@\@QEBA_NXZ */ MCAPI bool hasErrors() const; /** - * @symbol ?loadScriptMain\@ScriptPlugin\@\@QEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@XZ + * @symbol ?loadScriptMain\@ScriptPlugin\@\@QEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@XZ */ MCAPI class std::optional loadScriptMain(); /** - * @symbol ?reportErrors\@ScriptPlugin\@\@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 + * @symbol ?reportErrors\@ScriptPlugin\@\@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 reportErrors() const; /** - * @symbol ?setScriptContext\@ScriptPlugin\@\@QEAAX$$QEAVScriptContext\@Scripting\@\@\@Z + * @symbol ?setScriptContext\@ScriptPlugin\@\@QEAAX$$QEAVScriptContext\@Scripting\@\@\@Z */ MCAPI void setScriptContext(class Scripting::ScriptContext &&); //private: /** - * @symbol ?_loadScript\@ScriptPlugin\@\@AEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?_loadScript\@ScriptPlugin\@\@AEAA?AV?$optional\@UScriptData\@Scripting\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::optional _loadScript(std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp index 7d058de906..af25622751 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleCounter.hpp @@ -29,67 +29,67 @@ class ScriptPluginHandleCounter { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptPluginHandleCounter(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onMakeObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @vftbl 1 + * @symbol ?onMakeObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z */ virtual void onMakeObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); /** - * @vftbl 2 - * @symbol ?onDestroyObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @vftbl 2 + * @symbol ?onDestroyObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z */ virtual void onDestroyObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); /** - * @vftbl 3 - * @symbol ?onTrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @vftbl 3 + * @symbol ?onTrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z */ virtual void onTrackObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); /** - * @vftbl 4 - * @symbol ?onUntrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z + * @vftbl 4 + * @symbol ?onUntrackObject\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@Vmeta_type\@entt\@\@I\@Z */ virtual void onUntrackObject(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle, class entt::meta_type, unsigned int); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPLUGINHANDLECOUNTER /** - * @symbol ?onObjectPromotedToMultipleOwners\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@\@Z + * @symbol ?onObjectPromotedToMultipleOwners\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@\@Z */ MCVAPI void onObjectPromotedToMultipleOwners(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle); /** - * @symbol ?onObjectReducedToSingleOwner\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@\@Z + * @symbol ?onObjectReducedToSingleOwner\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@UObjectHandle\@3\@\@Z */ MCVAPI void onObjectReducedToSingleOwner(class Scripting::LifetimeRegistry &, struct Scripting::ObjectHandle); /** - * @symbol ?onPostLifetimeScopeDestroy\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@\@Z + * @symbol ?onPostLifetimeScopeDestroy\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@\@Z */ MCVAPI void onPostLifetimeScopeDestroy(class Scripting::LifetimeRegistry &); /** - * @symbol ?onPreLifetimeScopeDestroy\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@\@Z + * @symbol ?onPreLifetimeScopeDestroy\@ScriptPluginHandleCounter\@\@UEAAXAEAVLifetimeRegistry\@Scripting\@\@\@Z */ MCVAPI void onPreLifetimeScopeDestroy(class Scripting::LifetimeRegistry &); #endif /** - * @symbol ??0ScriptPluginHandleCounter\@\@QEAA\@AEAVScriptPlugin\@\@\@Z + * @symbol ??0ScriptPluginHandleCounter\@\@QEAA\@AEAVScriptPlugin\@\@\@Z */ MCAPI ScriptPluginHandleCounter(class ScriptPlugin &); /** - * @symbol ?getName\@ScriptPluginHandleCounter\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ScriptPluginHandleCounter\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getName() const; /** - * @symbol ?getScriptPlugin\@ScriptPluginHandleCounter\@\@QEAAAEAVScriptPlugin\@\@XZ + * @symbol ?getScriptPlugin\@ScriptPluginHandleCounter\@\@QEAAAEAVScriptPlugin\@\@XZ */ MCAPI class ScriptPlugin & getScriptPlugin(); //private: /** - * @symbol ?_getOrMakeStats\@ScriptPluginHandleCounter\@\@AEAAPEAUTypeStats\@1\@Vmeta_type\@entt\@\@\@Z + * @symbol ?_getOrMakeStats\@ScriptPluginHandleCounter\@\@AEAAPEAUTypeStats\@1\@Vmeta_type\@entt\@\@\@Z */ MCAPI struct ScriptPluginHandleCounter::TypeStats * _getOrMakeStats(class entt::meta_type); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp index 74a3c6c5fd..16dd79f862 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginHandleStats.hpp @@ -27,15 +27,15 @@ struct ScriptPluginHandleStats { public: /** - * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats const &); /** - * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ScriptPluginHandleStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ScriptPluginHandleStats & operator=(struct ScriptPluginHandleStats &&); /** - * @symbol ??1ScriptPluginHandleStats\@\@QEAA\@XZ + * @symbol ??1ScriptPluginHandleStats\@\@QEAA\@XZ */ MCAPI ~ScriptPluginHandleStats(); diff --git a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp index 14664f4a39..bfa2cd4cf1 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginManager.hpp @@ -32,56 +32,56 @@ class ScriptPluginManager { public: /** - * @symbol ??0ScriptPluginManager\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@_NV?$unique_ptr\@VIScriptTelemetryLogger\@\@U?$default_delete\@VIScriptTelemetryLogger\@\@\@std\@\@\@std\@\@\@Z + * @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 + * @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 */ MCAPI class ScriptPluginManagerResult discoverPlugins(enum class ResourceInformation::ResourceType, class IScriptPluginSourceEnumerator const &, class ScriptPackConfigurationManager const &, std::vector> const &); /** - * @symbol ?getPluginStats\@ScriptPluginManager\@\@QEBA?AV?$vector\@UScriptPluginStats\@\@V?$allocator\@UScriptPluginStats\@\@\@std\@\@\@std\@\@XZ + * @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 + * @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 + * @symbol ?releaseAll\@ScriptPluginManager\@\@QEAAXXZ */ MCAPI void releaseAll(); /** - * @symbol ?releasePlugins\@ScriptPluginManager\@\@QEAAXXZ + * @symbol ?releasePlugins\@ScriptPluginManager\@\@QEAAXXZ */ MCAPI void releasePlugins(); /** - * @symbol ?runAll\@ScriptPluginManager\@\@QEAA?AVScriptPluginManagerResult\@\@XZ + * @symbol ?runAll\@ScriptPluginManager\@\@QEAA?AVScriptPluginManagerResult\@\@XZ */ MCAPI class ScriptPluginManagerResult runAll(); /** - * @symbol ??1ScriptPluginManager\@\@QEAA\@XZ + * @symbol ??1ScriptPluginManager\@\@QEAA\@XZ */ MCAPI ~ScriptPluginManager(); /** - * @symbol ?getPackCapability\@ScriptPluginManager\@\@SA?AVPackCapability\@\@XZ + * @symbol ?getPackCapability\@ScriptPluginManager\@\@SA?AVPackCapability\@\@XZ */ MCAPI static class PackCapability getPackCapability(); //private: /** - * @symbol ?_generateModuleDependencies\@ScriptPluginManager\@\@AEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@AEBV?$vector\@UModuleIdentifier\@\@V?$allocator\@UModuleIdentifier\@\@\@std\@\@\@3\@AEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@3\@1\@Z + * @symbol ?_generateModuleDependencies\@ScriptPluginManager\@\@AEBA?AV?$vector\@UModuleDescriptor\@Scripting\@\@V?$allocator\@UModuleDescriptor\@Scripting\@\@\@std\@\@\@std\@\@AEBV?$vector\@UModuleIdentifier\@\@V?$allocator\@UModuleIdentifier\@\@\@std\@\@\@3\@AEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@3\@1\@Z */ MCAPI std::vector _generateModuleDependencies(std::vector const &, std::vector const &, std::vector const &) const; /** - * @symbol ?_reportContextResults\@ScriptPluginManager\@\@AEAAXAEBUScriptContextResult\@Scripting\@\@AEAVScriptPluginResult\@\@\@Z + * @symbol ?_reportContextResults\@ScriptPluginManager\@\@AEAAXAEBUScriptContextResult\@Scripting\@\@AEAVScriptPluginResult\@\@\@Z */ MCAPI void _reportContextResults(struct Scripting::ScriptContextResult const &, class ScriptPluginResult &); /** - * @symbol ?_tryAddRuntime\@ScriptPluginManager\@\@AEAAXAEBVScriptPlugin\@\@AEAVScriptPluginResult\@\@\@Z + * @symbol ?_tryAddRuntime\@ScriptPluginManager\@\@AEAAXAEBVScriptPlugin\@\@AEAVScriptPluginResult\@\@\@Z */ MCAPI void _tryAddRuntime(class ScriptPlugin const &, class ScriptPluginResult &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginManagerResult.hpp b/LiteLoader/include/llapi/mc/ScriptPluginManagerResult.hpp index f9ee65bf57..e9fee376e3 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginManagerResult.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginManagerResult.hpp @@ -29,16 +29,16 @@ class ScriptPluginManagerResult { public: /** - * @symbol ?getOrCreatePluginResults\@ScriptPluginManagerResult\@\@QEAAAEAVScriptPluginResult\@\@AEBUModuleDescriptor\@Scripting\@\@\@Z + * @symbol ?getOrCreatePluginResults\@ScriptPluginManagerResult\@\@QEAAAEAVScriptPluginResult\@\@AEBUModuleDescriptor\@Scripting\@\@\@Z */ MCAPI class ScriptPluginResult & getOrCreatePluginResults(struct Scripting::ModuleDescriptor const &); /** - * @symbol ?writeToContentLog\@ScriptPluginManagerResult\@\@QEBAXXZ + * @symbol ?writeToContentLog\@ScriptPluginManagerResult\@\@QEBAXXZ */ MCAPI void writeToContentLog() const; /** - * @symbol ??1ScriptPluginManagerResult\@\@QEAA\@XZ + * @symbol ??1ScriptPluginManagerResult\@\@QEAA\@XZ */ MCAPI ~ScriptPluginManagerResult(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginPackSource.hpp b/LiteLoader/include/llapi/mc/ScriptPluginPackSource.hpp index a53939af9c..63e94ebacf 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginPackSource.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginPackSource.hpp @@ -29,32 +29,32 @@ class ScriptPluginPackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptPluginPackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getManifest\@ScriptPluginPackSource\@\@UEAAAEBVPackManifest\@\@XZ + * @vftbl 1 + * @symbol ?getManifest\@ScriptPluginPackSource\@\@UEAAAEBVPackManifest\@\@XZ */ virtual class PackManifest const & getManifest(); /** - * @vftbl 2 - * @symbol ?loadScripts\@ScriptPluginPackSource\@\@UEAA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 2 + * @symbol ?loadScripts\@ScriptPluginPackSource\@\@UEAA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual class std::unordered_map, struct std::equal_to, class std::allocator>> loadScripts(std::string const &); /** - * @vftbl 3 - * @symbol ?removeRootFromPath\@ScriptPluginPackSource\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @vftbl 3 + * @symbol ?removeRootFromPath\@ScriptPluginPackSource\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ virtual std::string removeRootFromPath(std::string const &); //private: /** - * @symbol ?_removeRootFromPath\@ScriptPluginPackSource\@\@AEAA?AVPath\@Core\@\@AEBV23\@\@Z + * @symbol ?_removeRootFromPath\@ScriptPluginPackSource\@\@AEAA?AVPath\@Core\@\@AEBV23\@\@Z */ MCAPI class Core::Path _removeRootFromPath(class Core::Path const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp index 677ada4b9f..edb00371ca 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginPackSourceEnumerator.hpp @@ -28,23 +28,29 @@ class ScriptPluginPackSourceEnumerator { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptPluginPackSourceEnumerator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getFullPackStack\@ScriptPluginPackSourceEnumerator\@\@UEBAAEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getFullPackStack\@ScriptPluginPackSourceEnumerator\@\@UEBAAEBV?$vector\@UPackIdVersion\@\@V?$allocator\@UPackIdVersion\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getFullPackStack() const; /** - * @vftbl 2 - * @symbol ?getPluginSources\@ScriptPluginPackSourceEnumerator\@\@UEBAAEBV?$vector\@V?$unique_ptr\@VIScriptPluginSource\@\@U?$default_delete\@VIScriptPluginSource\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIScriptPluginSource\@\@U?$default_delete\@VIScriptPluginSource\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getPluginSources\@ScriptPluginPackSourceEnumerator\@\@UEBAAEBV?$vector\@V?$unique_ptr\@VIScriptPluginSource\@\@U?$default_delete\@VIScriptPluginSource\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VIScriptPluginSource\@\@U?$default_delete\@VIScriptPluginSource\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ virtual std::vector> const & getPluginSources() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPLUGINPACKSOURCEENUMERATOR /** - * @symbol ??0ScriptPluginPackSourceEnumerator\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@VPackInstance\@\@V?$allocator\@VPackInstance\@\@\@std\@\@\@2\@1\@Z + * @symbol __unk_destructor_-1 + */ + 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\@1\@Z */ MCAPI ScriptPluginPackSourceEnumerator(std::string const &, std::vector const &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp b/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp index c0e3b8fb14..10d6decdea 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginResult.hpp @@ -30,52 +30,52 @@ class ScriptPluginResult { public: /** - * @symbol ??0ScriptPluginResult\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ScriptPluginResult\@\@QEAA\@AEBUModuleDescriptor\@Scripting\@\@\@Z */ - MCAPI ScriptPluginResult(class ScriptPluginResult const &); + MCAPI ScriptPluginResult(struct Scripting::ModuleDescriptor const &); /** - * @symbol ??0ScriptPluginResult\@\@QEAA\@AEBUModuleDescriptor\@Scripting\@\@\@Z + * @symbol ??0ScriptPluginResult\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ScriptPluginResult(struct Scripting::ModuleDescriptor const &); + MCAPI ScriptPluginResult(class ScriptPluginResult const &); /** - * @symbol ?addError\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addError\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addError(std::string const &); /** - * @symbol ?addErrors\@ScriptPluginResult\@\@QEAAXAEBV?$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 ?addErrors\@ScriptPluginResult\@\@QEAAXAEBV?$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 void addErrors(std::vector const &); /** - * @symbol ?addInfo\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addInfo\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addInfo(std::string const &); /** - * @symbol ?addWarning\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addWarning\@ScriptPluginResult\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addWarning(std::string const &); /** - * @symbol ?getErrors\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UError\@ScriptPluginResult\@\@V?$allocator\@UError\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getErrors\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UError\@ScriptPluginResult\@\@V?$allocator\@UError\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getErrors() const; /** - * @symbol ?getInfos\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UInfo\@ScriptPluginResult\@\@V?$allocator\@UInfo\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getInfos\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UInfo\@ScriptPluginResult\@\@V?$allocator\@UInfo\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getInfos() const; /** - * @symbol ?getModuleDescriptor\@ScriptPluginResult\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ + * @symbol ?getModuleDescriptor\@ScriptPluginResult\@\@QEBAAEBUModuleDescriptor\@Scripting\@\@XZ */ MCAPI struct Scripting::ModuleDescriptor const & getModuleDescriptor() const; /** - * @symbol ?getWarnings\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UWarning\@ScriptPluginResult\@\@V?$allocator\@UWarning\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getWarnings\@ScriptPluginResult\@\@QEBAAEBV?$vector\@UWarning\@ScriptPluginResult\@\@V?$allocator\@UWarning\@ScriptPluginResult\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getWarnings() const; /** - * @symbol ?hasErrors\@ScriptPluginResult\@\@QEBA_NXZ + * @symbol ?hasErrors\@ScriptPluginResult\@\@QEBA_NXZ */ MCAPI bool hasErrors() const; /** - * @symbol ??1ScriptPluginResult\@\@QEAA\@XZ + * @symbol ??1ScriptPluginResult\@\@QEAA\@XZ */ MCAPI ~ScriptPluginResult(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp b/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp index 97c6709d05..f109e71406 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginStats.hpp @@ -27,15 +27,15 @@ struct ScriptPluginStats { public: /** - * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct ScriptPluginStats & operator=(struct ScriptPluginStats const &); /** - * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4ScriptPluginStats\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct ScriptPluginStats & operator=(struct ScriptPluginStats &&); /** - * @symbol ??1ScriptPluginStats\@\@QEAA\@XZ + * @symbol ??1ScriptPluginStats\@\@QEAA\@XZ */ MCAPI ~ScriptPluginStats(); diff --git a/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp b/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp index f34045054d..12f2eed476 100644 --- a/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPluginUtils.hpp @@ -23,39 +23,39 @@ namespace ScriptPluginUtils { #undef AFTER_EXTRA /** - * @symbol ?BETA_RELEASE\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BETA_RELEASE\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BETA_RELEASE; /** - * @symbol ?CreateRuntimeByType\@ScriptPluginUtils\@\@YA?AV?$unique_ptr\@VIRuntime\@Scripting\@\@U?$default_delete\@VIRuntime\@Scripting\@\@\@std\@\@\@std\@\@W4ScriptRuntimeType\@\@AEAVRegistryManager\@Scripting\@\@PEAVDependencyLocator\@6\@\@Z + * @symbol ?CreateRuntimeByType\@ScriptPluginUtils\@\@YA?AV?$unique_ptr\@VIRuntime\@Scripting\@\@U?$default_delete\@VIRuntime\@Scripting\@\@\@std\@\@\@std\@\@W4ScriptRuntimeType\@\@AEAVRegistryManager\@Scripting\@\@PEAVDependencyLocator\@6\@\@Z */ MCAPI std::unique_ptr CreateRuntimeByType(enum class ScriptRuntimeType, class Scripting::RegistryManager &, class Scripting::DependencyLocator *); /** - * @symbol ?GetRuntimeType\@ScriptPluginUtils\@\@YA?AW4ScriptRuntimeType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?GetRuntimeType\@ScriptPluginUtils\@\@YA?AW4ScriptRuntimeType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class ScriptRuntimeType GetRuntimeType(std::string const &); /** - * @symbol ?GetRuntimeTypeFromFileExtension\@ScriptPluginUtils\@\@YA?AW4ScriptRuntimeType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?GetRuntimeTypeFromFileExtension\@ScriptPluginUtils\@\@YA?AW4ScriptRuntimeType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class ScriptRuntimeType GetRuntimeTypeFromFileExtension(std::string const &); /** - * @symbol ?INTERNAL_RELEASE\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?INTERNAL_RELEASE\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const INTERNAL_RELEASE; /** - * @symbol ?JAVA_SCRIPT_RUNTIME_EXTENSION\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?JAVA_SCRIPT_RUNTIME_EXTENSION\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const JAVA_SCRIPT_RUNTIME_EXTENSION; /** - * @symbol ?JAVA_SCRIPT_RUNTIME_NAME\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?JAVA_SCRIPT_RUNTIME_NAME\@ScriptPluginUtils\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const JAVA_SCRIPT_RUNTIME_NAME; /** - * @symbol ?JavaScriptModuleNameNormalizer\@ScriptPluginUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@AEBV23\@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 + * @symbol ?JavaScriptModuleNameNormalizer\@ScriptPluginUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@AEBV23\@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 */ MCAPI std::string JavaScriptModuleNameNormalizer(class std::basic_string_view> const &, std::string const &, std::vector const &); /** - * @symbol ?SanitizeRuntimeName\@ScriptPluginUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?SanitizeRuntimeName\@ScriptPluginUtils\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string SanitizeRuntimeName(std::string const &); diff --git a/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp b/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp index 38bd705384..ef3dc4b033 100644 --- a/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp +++ b/LiteLoader/include/llapi/mc/ScriptPrintLogger.hpp @@ -31,34 +31,40 @@ class ScriptPrintLogger { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptPrintLogger(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onInfo\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?onInfo\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ virtual void onInfo(struct Scripting::ContextId, class std::basic_string_view> const &) const; /** - * @vftbl 2 - * @symbol ?onWarn\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?onWarn\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ virtual void onWarn(struct Scripting::ContextId, class std::basic_string_view> const &) const; /** - * @vftbl 3 - * @symbol ?onError\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?onError\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ virtual void onError(struct Scripting::ContextId, class std::basic_string_view> const &) const; /** - * @vftbl 4 - * @symbol ?onException\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBUError\@3\@\@Z + * @vftbl 4 + * @symbol ?onException\@ScriptPrintLogger\@\@UEBAXUContextId\@Scripting\@\@AEBUError\@3\@\@Z */ virtual void onException(struct Scripting::ContextId, struct Scripting::Error const &) const; /** - * @vftbl 5 - * @symbol ?shouldPrintException\@ScriptPrintLogger\@\@UEBA_NAEBUError\@Scripting\@\@\@Z + * @vftbl 5 + * @symbol ?shouldPrintException\@ScriptPrintLogger\@\@UEBA_NAEBUError\@Scripting\@\@\@Z */ virtual bool shouldPrintException(struct Scripting::Error const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCRIPTPRINTLOGGER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ScriptPrintLogger(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptResourceStats.hpp b/LiteLoader/include/llapi/mc/ScriptResourceStats.hpp index f06410188f..f1cd502a23 100644 --- a/LiteLoader/include/llapi/mc/ScriptResourceStats.hpp +++ b/LiteLoader/include/llapi/mc/ScriptResourceStats.hpp @@ -28,15 +28,15 @@ struct ScriptResourceStats { public: /** - * @symbol ?serialize\@ScriptResourceStats\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?serialize\@ScriptResourceStats\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string serialize() const; /** - * @symbol ??1ScriptResourceStats\@\@QEAA\@XZ + * @symbol ??1ScriptResourceStats\@\@QEAA\@XZ */ MCAPI ~ScriptResourceStats(); /** - * @symbol ?bindType\@ScriptResourceStats\@\@SAXXZ + * @symbol ?bindType\@ScriptResourceStats\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp b/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp index e8a40ab589..61db3b1ca7 100644 --- a/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp +++ b/LiteLoader/include/llapi/mc/ScriptResultUtil.hpp @@ -23,7 +23,15 @@ namespace ScriptResultUtil { #undef AFTER_EXTRA /** - * @symbol ?ScriptingResultToGameTestResult\@ScriptResultUtil\@\@YA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVResultAny\@Scripting\@\@\@Z + * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VVec3\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z + */ + MCAPI class Scripting::Result> GametestResultToScriptingValueResult(class std::variant const &, class Scripting::WeakLifetimeScope const &); + /** + * @symbol ?GametestResultToScriptingValueResult\@ScriptResultUtil\@\@YA?AV?$Result\@V?$StrongTypedObjectHandle\@VVec3\@\@\@Scripting\@\@\@Scripting\@\@AEBV?$variant\@UGameTestError\@gametest\@\@VBlockPos\@\@\@std\@\@AEBVWeakLifetimeScope\@3\@\@Z + */ + MCAPI class Scripting::Result> GametestResultToScriptingValueResult(class std::variant const &, class Scripting::WeakLifetimeScope const &); + /** + * @symbol ?ScriptingResultToGameTestResult\@ScriptResultUtil\@\@YA?AV?$optional\@UGameTestError\@gametest\@\@\@std\@\@AEBVResultAny\@Scripting\@\@\@Z */ MCAPI class std::optional ScriptingResultToGameTestResult(class Scripting::ResultAny const &); diff --git a/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp b/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp index 8a3bbbadb4..1a16a71239 100644 --- a/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptScriptingEventHandler.hpp @@ -30,37 +30,37 @@ class ScriptScriptingEventHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptScriptingEventHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@$$CBU?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VScriptingEventHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@$$CBU?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VScriptingEventHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct MutableScriptingGameplayEvent &); /** - * @vftbl 2 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VScriptingEventHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBU?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 2 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@$$CBU?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VScriptingEventHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEBU?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ScriptingGameplayEvent const &); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?handleEvent\@ScriptScriptingEventHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUBeforeWatchdogTerminateEvent\@\@\@Z + * @vftbl 4 + * @symbol ?handleEvent\@ScriptScriptingEventHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUBeforeWatchdogTerminateEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct BeforeWatchdogTerminateEvent &); //private: /** - * @symbol ?_handleWatchdogTerminateEvent\@ScriptScriptingEventHandler\@\@AEBA_NAEAUBeforeWatchdogTerminateEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptSystemEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleWatchdogTerminateEvent\@ScriptScriptingEventHandler\@\@AEBA_NAEAUBeforeWatchdogTerminateEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptSystemEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleWatchdogTerminateEvent(struct BeforeWatchdogTerminateEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp b/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp index fac718fa8d..64ede2a5db 100644 --- a/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp +++ b/LiteLoader/include/llapi/mc/ScriptServerNetworkEventHandler.hpp @@ -32,27 +32,27 @@ class ScriptServerNetworkEventHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptServerNetworkEventHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleEvent\@ScriptServerNetworkEventHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUChatEvent\@\@\@Z + * @vftbl 1 + * @symbol ?handleEvent\@ScriptServerNetworkEventHandler\@\@UEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAUChatEvent\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct ChatEvent &); /** - * @vftbl 2 - * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableServerNetworkGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VServerNetworkEventHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableServerNetworkGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z + * @vftbl 2 + * @symbol ?handleEvent\@?$Impl\@U?$type_list\@U?$MutableServerNetworkGameplayEvent\@W4CoordinatorResult\@\@\@\@\@entt\@\@\@?$EventHandlerDispatcher\@VServerNetworkEventHandler\@\@\@Details\@\@MEAA?AU?$GameplayHandlerResult\@W4CoordinatorResult\@\@\@\@AEAU?$MutableServerNetworkGameplayEvent\@W4CoordinatorResult\@\@\@\@\@Z */ virtual struct GameplayHandlerResult handleEvent(struct MutableServerNetworkGameplayEvent &); //private: /** - * @symbol ?_handleChat\@ScriptServerNetworkEventHandler\@\@AEBA_NAEAUChatEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z + * @symbol ?_handleChat\@ScriptServerNetworkEventHandler\@\@AEBA_NAEAUChatEvent\@\@AEBVWeakLifetimeScope\@Scripting\@\@U?$TypedObjectHandle\@VScriptWorldEvents\@ScriptModuleMinecraft\@\@\@4\@\@Z */ MCAPI bool _handleChat(struct ChatEvent &, class Scripting::WeakLifetimeScope const &, struct Scripting::TypedObjectHandle) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptSettings.hpp b/LiteLoader/include/llapi/mc/ScriptSettings.hpp index 552db43ace..cdffe92092 100644 --- a/LiteLoader/include/llapi/mc/ScriptSettings.hpp +++ b/LiteLoader/include/llapi/mc/ScriptSettings.hpp @@ -27,15 +27,15 @@ struct ScriptSettings { public: /** - * @symbol ??0ScriptSettings\@\@QEAA\@XZ + * @symbol ??0ScriptSettings\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI ScriptSettings(); + MCAPI ScriptSettings(struct ScriptSettings &&); /** - * @symbol ??0ScriptSettings\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ScriptSettings\@\@QEAA\@XZ */ - MCAPI ScriptSettings(struct ScriptSettings &&); + MCAPI ScriptSettings(); /** - * @symbol ??1ScriptSettings\@\@QEAA\@XZ + * @symbol ??1ScriptSettings\@\@QEAA\@XZ */ MCAPI ~ScriptSettings(); diff --git a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp index 0ecf90d67a..56c465b863 100644 --- a/LiteLoader/include/llapi/mc/ScriptTickListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptTickListener.hpp @@ -29,48 +29,53 @@ class ScriptTickListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptTickListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?onLevelRemovedPlayer\@ScriptTickListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z + * @vftbl 4 + * @symbol ?onLevelRemovedPlayer\@ScriptTickListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z */ virtual enum class EventResult onLevelRemovedPlayer(class Level &, class Player &); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?onLevelScriptTick\@ScriptTickListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + * @vftbl 7 + * @symbol __unk_vfn_7 */ - virtual enum class EventResult onLevelScriptTick(class Level &); + virtual void __unk_vfn_7(); /** - * @symbol ??0ScriptTickListener\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptFormPromiseTracker\@\@AEAVScriptDeferredActionManager\@\@\@Z + * @vftbl 8 + * @symbol ?onLevelTickEnd\@ScriptTickListener\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@\@Z + */ + virtual enum class EventResult onLevelTickEnd(class Level &); + /** + * @symbol ??0ScriptTickListener\@\@QEAA\@AEAVScriptEngine\@Scripting\@\@AEAVScriptFormPromiseTracker\@\@AEAVScriptDeferredActionManager\@\@\@Z */ MCAPI ScriptTickListener(class Scripting::ScriptEngine &, class ScriptFormPromiseTracker &, class ScriptDeferredActionManager &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptUtils.hpp b/LiteLoader/include/llapi/mc/ScriptUtils.hpp index 9be7a4896d..7905cd0500 100644 --- a/LiteLoader/include/llapi/mc/ScriptUtils.hpp +++ b/LiteLoader/include/llapi/mc/ScriptUtils.hpp @@ -21,15 +21,15 @@ namespace ScriptUtils { #undef AFTER_EXTRA /** - * @symbol ?functionError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?functionError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct Scripting::Error functionError(std::string const &); /** - * @symbol ?getPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct Scripting::Error getPropertyError(std::string const &); /** - * @symbol ?setPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setPropertyError\@ScriptUtils\@\@YA?AUError\@Scripting\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct Scripting::Error setPropertyError(std::string const &); diff --git a/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp b/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp index 788dc8d1a8..5a2cdb2693 100644 --- a/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp +++ b/LiteLoader/include/llapi/mc/ScriptWatchdog.hpp @@ -21,7 +21,7 @@ namespace ScriptWatchdog { #undef AFTER_EXTRA /** - * @symbol ?initialize\@ScriptWatchdog\@\@YAXPEAVIWatchdog\@Scripting\@\@AEAVServerLevel\@\@PEAVScriptPluginManager\@\@VWeakLifetimeScope\@3\@PEAVServerInstance\@\@\@Z + * @symbol ?initialize\@ScriptWatchdog\@\@YAXPEAVIWatchdog\@Scripting\@\@AEAVServerLevel\@\@PEAVScriptPluginManager\@\@VWeakLifetimeScope\@3\@PEAVServerInstance\@\@\@Z */ MCAPI void initialize(class Scripting::IWatchdog *, class ServerLevel &, class ScriptPluginManager *, class Scripting::WeakLifetimeScope, class ServerInstance *); diff --git a/LiteLoader/include/llapi/mc/Scripting.hpp b/LiteLoader/include/llapi/mc/Scripting.hpp index 6fef5ea601..8d6d60eff2 100644 --- a/LiteLoader/include/llapi/mc/Scripting.hpp +++ b/LiteLoader/include/llapi/mc/Scripting.hpp @@ -20,7 +20,7 @@ namespace Scripting { #undef AFTER_EXTRA /** - * @symbol ?_versionSplit\@Scripting\@\@YA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@D\@Z + * @symbol ?_versionSplit\@Scripting\@\@YA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@D\@Z */ MCAPI std::vector _versionSplit(std::string const &, char); diff --git a/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp index cf9387c36a..8f59b315cf 100644 --- a/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ScriptingEventCoordinator.hpp @@ -28,20 +28,20 @@ class ScriptingEventCoordinator { public: /** - * @symbol ?getScriptingEventHandler\@ScriptingEventCoordinator\@\@QEAAAEAVScriptingEventHandler\@\@XZ + * @symbol ?getScriptingEventHandler\@ScriptingEventCoordinator\@\@QEAAAEAVScriptingEventHandler\@\@XZ */ MCAPI class ScriptingEventHandler & getScriptingEventHandler(); /** - * @symbol ?registerScriptingEventHandler\@ScriptingEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VScriptingEventHandler\@\@U?$default_delete\@VScriptingEventHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerScriptingEventHandler\@ScriptingEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VScriptingEventHandler\@\@U?$default_delete\@VScriptingEventHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerScriptingEventHandler(std::unique_ptr &&); /** - * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef>); /** - * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@ScriptingEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$ScriptingGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptingEventListener.hpp b/LiteLoader/include/llapi/mc/ScriptingEventListener.hpp index 25fffb57c1..59682a1295 100644 --- a/LiteLoader/include/llapi/mc/ScriptingEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ScriptingEventListener.hpp @@ -28,14 +28,14 @@ class ScriptingEventListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ScriptingEventListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onEvent\@ScriptingEventListener\@\@UEAA?AW4EventResult\@\@AEBUScriptingNotificationEvent\@\@\@Z + * @vftbl 1 + * @symbol ?onEvent\@ScriptingEventListener\@\@UEAA?AW4EventResult\@\@AEBUScriptingNotificationEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ScriptingNotificationEvent const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ScriptingInitializeEvent.hpp b/LiteLoader/include/llapi/mc/ScriptingInitializeEvent.hpp index 5943513533..21bc06b02b 100644 --- a/LiteLoader/include/llapi/mc/ScriptingInitializeEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptingInitializeEvent.hpp @@ -25,7 +25,7 @@ struct ScriptingInitializeEvent { public: /** - * @symbol ??1ScriptingInitializeEvent\@\@QEAA\@XZ + * @symbol ??1ScriptingInitializeEvent\@\@QEAA\@XZ */ MCAPI ~ScriptingInitializeEvent(); diff --git a/LiteLoader/include/llapi/mc/ScriptingNotificationEvent.hpp b/LiteLoader/include/llapi/mc/ScriptingNotificationEvent.hpp index 9d459a3124..acc807c1cd 100644 --- a/LiteLoader/include/llapi/mc/ScriptingNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ScriptingNotificationEvent.hpp @@ -28,7 +28,7 @@ struct ScriptingNotificationEvent { public: /** - * @symbol ??1ScriptingNotificationEvent\@\@QEAA\@XZ + * @symbol ??1ScriptingNotificationEvent\@\@QEAA\@XZ */ MCAPI ~ScriptingNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/SculkBlock.hpp b/LiteLoader/include/llapi/mc/SculkBlock.hpp index f3879fecf4..597ef8e47e 100644 --- a/LiteLoader/include/llapi/mc/SculkBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkBlock.hpp @@ -31,203 +31,208 @@ class SculkBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SculkBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SculkBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SculkBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SculkBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0SculkBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SculkBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SculkBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkBlockBehavior.hpp b/LiteLoader/include/llapi/mc/SculkBlockBehavior.hpp index a6b22f5c4b..537bff879b 100644 --- a/LiteLoader/include/llapi/mc/SculkBlockBehavior.hpp +++ b/LiteLoader/include/llapi/mc/SculkBlockBehavior.hpp @@ -28,42 +28,42 @@ class SculkBlockBehavior { public: /** - * @vftbl 0 - * @symbol ?updateDecayDelay\@SculkBlockBehavior\@\@UEBAHH\@Z + * @vftbl 0 + * @symbol ?updateDecayDelay\@SculkBlockBehavior\@\@UEBAHH\@Z */ virtual int updateDecayDelay(int) const; /** - * @vftbl 1 - * @symbol ?updateFacingData\@SculkBlockBehavior\@\@UEBAHHAEBVBlock\@\@\@Z + * @vftbl 1 + * @symbol ?updateFacingData\@SculkBlockBehavior\@\@UEBAHHAEBVBlock\@\@\@Z */ virtual int updateFacingData(int, class Block const &) const; /** - * @vftbl 2 - * @symbol ?canChangeBlockOnSpread\@SculkBlockBehavior\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?canChangeBlockOnSpread\@SculkBlockBehavior\@\@UEBA_NXZ */ virtual bool canChangeBlockOnSpread() const; /** - * @vftbl 3 - * @symbol ?attemptSpreadVeins\@SculkBlockBehavior\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@HAEAVSculkSpreader\@\@\@Z + * @vftbl 3 + * @symbol ?attemptSpreadVeins\@SculkBlockBehavior\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@HAEAVSculkSpreader\@\@\@Z */ virtual bool attemptSpreadVeins(class IBlockWorldGenAPI &, class BlockPos const &, class Block const &, int, class SculkSpreader &) const; /** - * @vftbl 4 - * @symbol ?attemptUseCharge\@SculkBlockBehavior\@\@UEBAHAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@2HHAEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z + * @vftbl 4 + * @symbol ?attemptUseCharge\@SculkBlockBehavior\@\@UEBAHAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@2HHAEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z */ virtual int attemptUseCharge(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class BlockPos const &, int, int, class Random &, class SculkSpreader &, bool) const; /** - * @vftbl 5 - * @symbol ?onDischarged\@SculkBlockBehavior\@\@UEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?onDischarged\@SculkBlockBehavior\@\@UEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onDischarged(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &) const; //private: /** - * @symbol ?_placeGrowthAt\@SculkBlockBehavior\@\@CAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVSculkSpreader\@\@\@Z + * @symbol ?_placeGrowthAt\@SculkBlockBehavior\@\@CAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVSculkSpreader\@\@\@Z */ MCAPI static void _placeGrowthAt(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class Random &, class SculkSpreader &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp index 076d5160ca..4b315c7ff3 100644 --- a/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkCatalystBlock.hpp @@ -31,228 +31,233 @@ class SculkCatalystBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkCatalystBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@SculkCatalystBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@SculkCatalystBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SculkCatalystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SculkCatalystBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SculkCatalystBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SculkCatalystBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SculkCatalystBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKCATALYSTBLOCK /** - * @symbol ?canBeSilkTouched\@SculkCatalystBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SculkCatalystBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0SculkCatalystBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SculkCatalystBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SculkCatalystBlock(std::string const &, int, class Material const &); /** - * @symbol ?bloom\@SculkCatalystBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandom\@\@\@Z + * @symbol ?bloom\@SculkCatalystBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandom\@\@\@Z */ MCAPI static void bloom(class BlockSource &, class BlockPos const &, class Block const &, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp index e265efb1da..80281aa344 100644 --- a/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkCatalystBlockActor.hpp @@ -31,61 +31,61 @@ class SculkCatalystBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKCATALYSTBLOCKACTOR /** - * @symbol ?getDeliveryMode\@SculkCatalystBlockActor\@\@UEBA?AW4DeliveryMode\@GameEventListener\@\@XZ + * @symbol ?getDeliveryMode\@SculkCatalystBlockActor\@\@UEBA?AW4DeliveryMode\@GameEventListener\@\@XZ */ MCVAPI enum class GameEventListener::DeliveryMode getDeliveryMode() const; /** - * @symbol ?getPositionSource\@SculkCatalystBlockActor\@\@UEBAAEBVPositionSource\@GameEvents\@\@XZ + * @symbol ?getPositionSource\@SculkCatalystBlockActor\@\@UEBAAEBVPositionSource\@GameEvents\@\@XZ */ MCVAPI class GameEvents::PositionSource const & getPositionSource() const; /** - * @symbol ?getRange\@SculkCatalystBlockActor\@\@UEBAIXZ + * @symbol ?getRange\@SculkCatalystBlockActor\@\@UEBAIXZ */ MCVAPI unsigned int getRange() const; /** - * @symbol ?handleGameEvent\@SculkCatalystBlockActor\@\@UEAAXAEBVGameEvent\@\@AEBUGameEventContext\@\@AEAVBlockSource\@\@\@Z + * @symbol ?handleGameEvent\@SculkCatalystBlockActor\@\@UEAAXAEBVGameEvent\@\@AEBUGameEventContext\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void handleGameEvent(class GameEvent const &, struct GameEventContext const &, class BlockSource &); /** - * @symbol ?load\@SculkCatalystBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@SculkCatalystBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onRemoved\@SculkCatalystBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onRemoved\@SculkCatalystBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onRemoved(class BlockSource &); /** - * @symbol ?save\@SculkCatalystBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@SculkCatalystBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?tick\@SculkCatalystBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@SculkCatalystBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0SculkCatalystBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SculkCatalystBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SculkCatalystBlockActor(class BlockPos const &); /** - * @symbol ?getSculkSpreader\@SculkCatalystBlockActor\@\@QEAAAEAVSculkSpreader\@\@XZ + * @symbol ?getSculkSpreader\@SculkCatalystBlockActor\@\@QEAAAEAVSculkSpreader\@\@XZ */ MCAPI class SculkSpreader & getSculkSpreader(); /** - * @symbol ?TypeId\@SculkCatalystBlockActor\@\@2W4BlockActorType\@\@B + * @symbol ?TypeId\@SculkCatalystBlockActor\@\@2W4BlockActorType\@\@B */ MCAPI static enum class BlockActorType const TypeId; /** - * @symbol ?TypeString\@SculkCatalystBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TypeString\@SculkCatalystBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TypeString; //private: /** - * @symbol ?_tryConsumeOnDeathExperience\@SculkCatalystBlockActor\@\@AEAAXAEAVLevel\@\@AEAVActor\@\@\@Z + * @symbol ?_trySendItSpreadsEventPacket\@SculkCatalystBlockActor\@\@CAXAEAVActor\@\@\@Z */ - MCAPI void _tryConsumeOnDeathExperience(class Level &, class Actor &); + MCAPI static void _trySendItSpreadsEventPacket(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp b/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp index 620173a917..1b865a1276 100644 --- a/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp +++ b/LiteLoader/include/llapi/mc/SculkChargeCursor.hpp @@ -28,56 +28,52 @@ class SculkChargeCursor { public: /** - * @symbol ??0SculkChargeCursor\@\@QEAA\@AEBVCompoundTag\@\@\@Z + * @symbol ??0SculkChargeCursor\@\@QEAA\@AEBVCompoundTag\@\@\@Z */ MCAPI SculkChargeCursor(class CompoundTag const &); /** - * @symbol ??0SculkChargeCursor\@\@QEAA\@AEBVBlockPos\@\@H\@Z + * @symbol ??0SculkChargeCursor\@\@QEAA\@AEBVBlockPos\@\@H\@Z */ MCAPI SculkChargeCursor(class BlockPos const &, int); /** - * @symbol ?addFrom\@SculkChargeCursor\@\@QEAAXAEBV1\@\@Z + * @symbol ?addFrom\@SculkChargeCursor\@\@QEAAXAEBV1\@\@Z */ MCAPI void addFrom(class SculkChargeCursor const &); /** - * @symbol ?load\@SculkChargeCursor\@\@QEAAXAEBVCompoundTag\@\@\@Z - */ - MCAPI void load(class CompoundTag const &); - /** - * @symbol ?save\@SculkChargeCursor\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@SculkChargeCursor\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; /** - * @symbol ?update\@SculkChargeCursor\@\@QEAAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z + * @symbol ?update\@SculkChargeCursor\@\@QEAAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z */ MCAPI void update(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class Random &, class SculkSpreader &, bool); //private: /** - * @symbol ?_getNonCornerNeighborsOffsets\@SculkChargeCursor\@\@CA?AV?$array\@VBlockPos\@\@$0BC\@\@std\@\@AEAVRandom\@\@\@Z + * @symbol ?_getNonCornerNeighborsOffsets\@SculkChargeCursor\@\@CA?AV?$array\@VBlockPos\@\@$0BC\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI static class std::array _getNonCornerNeighborsOffsets(class Random &); /** - * @symbol ?_getSculkBehavior\@SculkChargeCursor\@\@CAAEBVSculkBehavior\@\@AEBVBlock\@\@\@Z + * @symbol ?_getSculkBehavior\@SculkChargeCursor\@\@CAAEBVSculkBehavior\@\@AEBVBlock\@\@\@Z */ MCAPI static class SculkBehavior const & _getSculkBehavior(class Block const &); /** - * @symbol ?_isMovementUnobstructed\@SculkChargeCursor\@\@CA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?_isMovementUnobstructed\@SculkChargeCursor\@\@CA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@1\@Z */ MCAPI static bool _isMovementUnobstructed(class IBlockWorldGenAPI &, class BlockPos const &, class BlockPos const &); private: /** - * @symbol ?sDefaultSculkBehavior\@SculkChargeCursor\@\@0VDefaultSculkBehavior\@\@B + * @symbol ?sDefaultSculkBehavior\@SculkChargeCursor\@\@0VDefaultSculkBehavior\@\@B */ MCAPI static class DefaultSculkBehavior const sDefaultSculkBehavior; /** - * @symbol ?sSculkBlockBehavior\@SculkChargeCursor\@\@0VSculkBlockBehavior\@\@B + * @symbol ?sSculkBlockBehavior\@SculkChargeCursor\@\@0VSculkBlockBehavior\@\@B */ MCAPI static class SculkBlockBehavior const sSculkBlockBehavior; /** - * @symbol ?sSculkVeinBlockBehavior\@SculkChargeCursor\@\@0VSculkVeinBlockBehavior\@\@B + * @symbol ?sSculkVeinBlockBehavior\@SculkChargeCursor\@\@0VSculkVeinBlockBehavior\@\@B */ MCAPI static class SculkVeinBlockBehavior const sSculkVeinBlockBehavior; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkConsts.hpp b/LiteLoader/include/llapi/mc/SculkConsts.hpp index 034c11abda..56c8d6f787 100644 --- a/LiteLoader/include/llapi/mc/SculkConsts.hpp +++ b/LiteLoader/include/llapi/mc/SculkConsts.hpp @@ -20,35 +20,35 @@ namespace SculkConsts { #undef AFTER_EXTRA /** - * @symbol ?CHARGE_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?CHARGE_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const CHARGE_TAG; /** - * @symbol ?CURSORS_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?CURSORS_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const CURSORS_TAG; /** - * @symbol ?DECAY_DELAY_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DECAY_DELAY_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const DECAY_DELAY_TAG; /** - * @symbol ?FACING_DATA_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?FACING_DATA_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const FACING_DATA_TAG; /** - * @symbol ?POS_X_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?POS_X_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const POS_X_TAG; /** - * @symbol ?POS_Y_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?POS_Y_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const POS_Y_TAG; /** - * @symbol ?POS_Z_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?POS_Z_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const POS_Z_TAG; /** - * @symbol ?UPDATE_DELAY_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?UPDATE_DELAY_TAG\@SculkConsts\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const UPDATE_DELAY_TAG; diff --git a/LiteLoader/include/llapi/mc/SculkPatchFeature.hpp b/LiteLoader/include/llapi/mc/SculkPatchFeature.hpp index 7e1046c75c..bca8dffb4c 100644 --- a/LiteLoader/include/llapi/mc/SculkPatchFeature.hpp +++ b/LiteLoader/include/llapi/mc/SculkPatchFeature.hpp @@ -30,14 +30,14 @@ class SculkPatchFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkPatchFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@SculkPatchFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@SculkPatchFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp index 951b010bb7..c86908662e 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlock.hpp @@ -31,286 +31,291 @@ class SculkSensorBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkSensorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 17 - * @symbol ?liquidCanFlowIntoFromDirection\@SculkSensorBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 17 + * @symbol ?liquidCanFlowIntoFromDirection\@SculkSensorBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@SculkSensorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@SculkSensorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@SculkSensorBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@SculkSensorBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@SculkSensorBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 127 - * @symbol ?getComparatorSignal\@SculkSensorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z + * @vftbl 127 + * @symbol ?getComparatorSignal\@SculkSensorBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@E\@Z */ virtual int getComparatorSignal(class BlockSource &, class BlockPos const &, class Block const &, unsigned char) const; /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 153 - * @symbol ?getLightEmission\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 164 - * @symbol ?onStandOn\@SculkSensorBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@SculkSensorBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SculkSensorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 183 - * @symbol ?getEmissiveBrightness\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 184 + * @symbol ?getEmissiveBrightness\@SculkSensorBlock\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getEmissiveBrightness(class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SculkSensorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SculkSensorBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SculkSensorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKSENSORBLOCK /** - * @symbol ?canBeSilkTouched\@SculkSensorBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SculkSensorBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasComparatorSignal\@SculkSensorBlock\@\@UEBA_NXZ + * @symbol ?hasComparatorSignal\@SculkSensorBlock\@\@UEBA_NXZ */ MCVAPI bool hasComparatorSignal() const; #endif /** - * @symbol ??0SculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SculkSensorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SculkSensorBlock(std::string const &, int); /** - * @symbol ?activate\@SculkSensorBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@H\@Z + * @symbol ?activate\@SculkSensorBlock\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@H\@Z */ MCAPI static void activate(class BlockSource &, class BlockPos const &, class Actor *, int); /** - * @symbol ?isActive\@SculkSensorBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isActive\@SculkSensorBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isActive(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp index 3f3307770e..3627ab4b74 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorBlockActor.hpp @@ -31,93 +31,93 @@ class SculkSensorBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkSensorBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SculkSensorBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SculkSensorBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@SculkSensorBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@SculkSensorBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@SculkSensorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@SculkSensorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@SculkSensorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@SculkSensorBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0SculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SculkSensorBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SculkSensorBlockActor(class BlockPos const &); /** - * @symbol ?getLatestReceivedVibrationFrequency\@SculkSensorBlockActor\@\@QEBAHXZ + * @symbol ?getLatestReceivedVibrationFrequency\@SculkSensorBlockActor\@\@QEBAHXZ */ MCAPI int getLatestReceivedVibrationFrequency() const; /** - * @symbol ?onStepOn\@SculkSensorBlockActor\@\@QEAAXAEAVBlockSource\@\@AEAVActor\@\@\@Z + * @symbol ?onStepOn\@SculkSensorBlockActor\@\@QEAAXAEAVBlockSource\@\@AEAVActor\@\@\@Z */ MCAPI void onStepOn(class BlockSource &, class Actor &); /** - * @symbol ?TypeId\@SculkSensorBlockActor\@\@2W4BlockActorType\@\@B + * @symbol ?TypeId\@SculkSensorBlockActor\@\@2W4BlockActorType\@\@B */ MCAPI static enum class BlockActorType const TypeId; /** - * @symbol ?TypeString\@SculkSensorBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TypeString\@SculkSensorBlockActor\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TypeString; /** - * @symbol ?tryGet\@SculkSensorBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryGet\@SculkSensorBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class SculkSensorBlockActor * tryGet(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp b/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp index c63a157509..f2bb284c65 100644 --- a/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/SculkSensorVibrationConfig.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "VibrationListenerConfig.hpp" #define BEFORE_EXTRA @@ -15,7 +14,7 @@ * @brief MC class SculkSensorVibrationConfig. * */ -class SculkSensorVibrationConfig : public VibrationListenerConfig { +class SculkSensorVibrationConfig { #define AFTER_EXTRA @@ -29,24 +28,24 @@ class SculkSensorVibrationConfig : public VibrationListenerConfig { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkSensorVibrationConfig(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onSignalReceive\@SculkSensorVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @vftbl 1 + * @symbol ?onSignalReceive\@SculkSensorVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z */ virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); /** - * @vftbl 2 - * @symbol ?isValidVibration\@VibrationListenerConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z + * @vftbl 2 + * @symbol ?isValidVibration\@VibrationListenerConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z */ virtual bool isValidVibration(class GameEvent const &); /** - * @vftbl 3 - * @symbol ?shouldListen\@SculkSensorVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + * @vftbl 3 + * @symbol ?shouldListen\@SculkSensorVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp index 8f43f6b8a7..f62c7587e9 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlock.hpp @@ -31,254 +31,259 @@ class SculkShriekerBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkShriekerBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@SculkShriekerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@SculkShriekerBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@SculkShriekerBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@SculkShriekerBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 152 - * @symbol ?init\@SculkShriekerBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@SculkShriekerBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 164 - * @symbol ?onStandOn\@SculkShriekerBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@SculkShriekerBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SculkShriekerBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SculkShriekerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SculkShriekerBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SculkShriekerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKSHRIEKERBLOCK /** - * @symbol ?canBeSilkTouched\@SculkShriekerBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SculkShriekerBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; #endif /** - * @symbol ??0SculkShriekerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SculkShriekerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SculkShriekerBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp index fbbc0bac15..f822f9d54c 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlockActor.hpp @@ -29,97 +29,97 @@ class SculkShriekerBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkShriekerBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SculkShriekerBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SculkShriekerBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@SculkShriekerBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@SculkShriekerBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@SculkShriekerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@SculkShriekerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?onRemoved\@SculkShriekerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 13 + * @symbol ?onRemoved\@SculkShriekerBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onRemoved(class BlockSource &); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0SculkShriekerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SculkShriekerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SculkShriekerBlockActor(class BlockPos const &); /** - * @symbol ?tryRespond\@SculkShriekerBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryRespond\@SculkShriekerBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void tryRespond(class BlockSource &, class BlockPos const &); /** - * @symbol ?tryShriek\@SculkShriekerBlockActor\@\@QEAA_NAEAVBlockSource\@\@VBlockPos\@\@AEAVPlayer\@\@\@Z + * @symbol ?tryShriek\@SculkShriekerBlockActor\@\@QEAA_NAEAVBlockSource\@\@VBlockPos\@\@AEAVPlayer\@\@\@Z */ MCAPI bool tryShriek(class BlockSource &, class BlockPos, class Player &); /** - * @symbol ?tryGet\@SculkShriekerBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?tryGet\@SculkShriekerBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI static class SculkShriekerBlockActor * tryGet(class BlockSource &, class BlockPos); /** - * @symbol ?tryGetPlayerInHierarchy\@SculkShriekerBlockActor\@\@SAPEAVPlayer\@\@PEAVActor\@\@\@Z + * @symbol ?tryGetPlayerInHierarchy\@SculkShriekerBlockActor\@\@SAPEAVPlayer\@\@PEAVActor\@\@\@Z */ MCAPI static class Player * tryGetPlayerInHierarchy(class Actor *); //private: /** - * @symbol ?_canRespond\@SculkShriekerBlockActor\@\@CA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canRespond\@SculkShriekerBlockActor\@\@CA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool _canRespond(class BlockSource const &, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkShriekerBlockActorInternal.hpp b/LiteLoader/include/llapi/mc/SculkShriekerBlockActorInternal.hpp index 15497dd417..4ab1848eef 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerBlockActorInternal.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerBlockActorInternal.hpp @@ -20,7 +20,7 @@ namespace SculkShriekerBlockActorInternal { #undef AFTER_EXTRA /** - * @symbol ?_shriek\@SculkShriekerBlockActorInternal\@\@YAXAEAVBlockSource\@\@VBlockPos\@\@AEAVPlayer\@\@\@Z + * @symbol ?_shriek\@SculkShriekerBlockActorInternal\@\@YAXAEAVBlockSource\@\@VBlockPos\@\@AEAVPlayer\@\@\@Z */ MCAPI void _shriek(class BlockSource &, class BlockPos, class Player &); diff --git a/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp b/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp index 0867b407e5..0bd7e7e355 100644 --- a/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/SculkShriekerVibrationConfig.hpp @@ -28,24 +28,24 @@ class SculkShriekerVibrationConfig { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkShriekerVibrationConfig(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onSignalReceive\@SculkShriekerVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @vftbl 1 + * @symbol ?onSignalReceive\@SculkShriekerVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z */ virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); /** - * @vftbl 2 - * @symbol ?isValidVibration\@SculkShriekerVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z + * @vftbl 2 + * @symbol ?isValidVibration\@SculkShriekerVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z */ virtual bool isValidVibration(class GameEvent const &); /** - * @vftbl 3 - * @symbol ?shouldListen\@SculkShriekerVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + * @vftbl 3 + * @symbol ?shouldListen\@SculkShriekerVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkSpreader.hpp b/LiteLoader/include/llapi/mc/SculkSpreader.hpp index 1d0014b9e4..5557742a34 100644 --- a/LiteLoader/include/llapi/mc/SculkSpreader.hpp +++ b/LiteLoader/include/llapi/mc/SculkSpreader.hpp @@ -27,76 +27,76 @@ class SculkSpreader { public: /** - * @symbol ??0SculkSpreader\@\@QEAA\@_NHHHH\@Z + * @symbol ??0SculkSpreader\@\@QEAA\@_NHHHH\@Z */ MCAPI SculkSpreader(bool, int, int, int, int); /** - * @symbol ??0SculkSpreader\@\@QEAA\@XZ + * @symbol ??0SculkSpreader\@\@QEAA\@XZ */ MCAPI SculkSpreader(); /** - * @symbol ?addCursors\@SculkSpreader\@\@QEAAXAEBVBlockPos\@\@H\@Z + * @symbol ?addCursors\@SculkSpreader\@\@QEAAXAEBVBlockPos\@\@H\@Z */ MCAPI void addCursors(class BlockPos const &, int); /** - * @symbol ?clearCursors\@SculkSpreader\@\@QEAAXXZ + * @symbol ?clearCursors\@SculkSpreader\@\@QEAAXXZ */ MCAPI void clearCursors(); /** - * @symbol ?getAdditionalDecayRate\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getAdditionalDecayRate\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getAdditionalDecayRate() const; /** - * @symbol ?getChargeDecayRate\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getChargeDecayRate\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getChargeDecayRate() const; /** - * @symbol ?getCursorPosition\@SculkSpreader\@\@QEBA?AVBlockPos\@\@H\@Z + * @symbol ?getCursorPosition\@SculkSpreader\@\@QEBA?AVBlockPos\@\@H\@Z */ MCAPI class BlockPos getCursorPosition(int) const; /** - * @symbol ?getGrowthSpawnCost\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getGrowthSpawnCost\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getGrowthSpawnCost() const; /** - * @symbol ?getMaxCharge\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getMaxCharge\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getMaxCharge() const; /** - * @symbol ?getNoGrowthRadius\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getNoGrowthRadius\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getNoGrowthRadius() const; /** - * @symbol ?getNumberOfCursors\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getNumberOfCursors\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getNumberOfCursors() const; /** - * @symbol ?getSculkReplaceableBlocks\@SculkSpreader\@\@QEAAAEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ + * @symbol ?getSculkReplaceableBlocks\@SculkSpreader\@\@QEAAAEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ */ MCAPI class std::set, class std::allocator> const & getSculkReplaceableBlocks(); /** - * @symbol ?getTotalCharge\@SculkSpreader\@\@QEBAHXZ + * @symbol ?getTotalCharge\@SculkSpreader\@\@QEBAHXZ */ MCAPI int getTotalCharge() const; /** - * @symbol ?isWorldGen\@SculkSpreader\@\@QEBA_NXZ + * @symbol ?isWorldGen\@SculkSpreader\@\@QEBA_NXZ */ MCAPI bool isWorldGen() const; /** - * @symbol ?load\@SculkSpreader\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?load\@SculkSpreader\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void load(class CompoundTag const &); /** - * @symbol ?save\@SculkSpreader\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@SculkSpreader\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; /** - * @symbol ?updateCursors\@SculkSpreader\@\@QEAAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z + * @symbol ?updateCursors\@SculkSpreader\@\@QEAAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@_N\@Z */ MCAPI void updateCursors(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class Random &, bool); /** - * @symbol ??1SculkSpreader\@\@QEAA\@XZ + * @symbol ??1SculkSpreader\@\@QEAA\@XZ */ MCAPI ~SculkSpreader(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkUtils.hpp b/LiteLoader/include/llapi/mc/SculkUtils.hpp index 8daba745d4..d0ef28a7b6 100644 --- a/LiteLoader/include/llapi/mc/SculkUtils.hpp +++ b/LiteLoader/include/llapi/mc/SculkUtils.hpp @@ -20,47 +20,47 @@ namespace SculkUtils { #undef AFTER_EXTRA /** - * @symbol ?canSpreadIntoBlock\@SculkUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?canSpreadIntoBlock\@SculkUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool canSpreadIntoBlock(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &); /** - * @symbol ?generateSculkReplaceableBlocks\@SculkUtils\@\@YA?BV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ + * @symbol ?generateSculkReplaceableBlocks\@SculkUtils\@\@YA?BV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ */ MCAPI class std::set, class std::allocator> const generateSculkReplaceableBlocks(); /** - * @symbol ?generateSculkReplaceableBlocksWorldgen\@SculkUtils\@\@YA?BV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ + * @symbol ?generateSculkReplaceableBlocksWorldgen\@SculkUtils\@\@YA?BV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@XZ */ MCAPI class std::set, class std::allocator> const generateSculkReplaceableBlocksWorldgen(); /** - * @symbol ?isPosInTickingRange\@SculkUtils\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isPosInTickingRange\@SculkUtils\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isPosInTickingRange(class BlockSource &, class BlockPos const &); /** - * @symbol ?isSculk\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z + * @symbol ?isSculk\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z */ MCAPI bool isSculk(class Block const &); /** - * @symbol ?isSculkOrSculkVein\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z + * @symbol ?isSculkOrSculkVein\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z */ MCAPI bool isSculkOrSculkVein(class Block const &); /** - * @symbol ?isSculkReplaceable\@SculkUtils\@\@YA_NAEBVBlock\@\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@\@Z + * @symbol ?isSculkReplaceable\@SculkUtils\@\@YA_NAEBVBlock\@\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@\@Z */ MCAPI bool isSculkReplaceable(class Block const &, class std::set, class std::allocator> const &); /** - * @symbol ?isSculkVein\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z + * @symbol ?isSculkVein\@SculkUtils\@\@YA_NAEBVBlock\@\@\@Z */ MCAPI bool isSculkVein(class Block const &); /** - * @symbol ?isSculkVeinWithSubstrateAccess\@SculkUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVSculkSpreader\@\@\@Z + * @symbol ?isSculkVeinWithSubstrateAccess\@SculkUtils\@\@YA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVSculkSpreader\@\@\@Z */ MCAPI bool isSculkVeinWithSubstrateAccess(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &, class SculkSpreader &); /** - * @symbol ?requestChargeEffects\@SculkUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?requestChargeEffects\@SculkUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI void requestChargeEffects(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, int, int); /** - * @symbol ?requestChargePopEffects\@SculkUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?requestChargePopEffects\@SculkUtils\@\@YAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void requestChargePopEffects(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp index a6f324a8df..bca2c596ac 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinBlock.hpp @@ -31,228 +31,233 @@ class SculkVeinBlock : public MultifaceBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkVeinBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@SculkVeinBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SculkVeinBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SculkVeinBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SculkVeinBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @vftbl 193 - * @symbol ?getMultifaceBlock\@SculkVeinBlock\@\@UEBAAEBVBlock\@\@XZ + * @vftbl 194 + * @symbol ?getMultifaceBlock\@SculkVeinBlock\@\@UEBAAEBVBlock\@\@XZ */ virtual class Block const & getMultifaceBlock() const; /** - * @vftbl 194 - * @symbol ?getMultifaceSpreader\@SculkVeinBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ + * @vftbl 195 + * @symbol ?getMultifaceSpreader\@SculkVeinBlock\@\@UEBAAEBVMultifaceSpreader\@\@XZ */ virtual class MultifaceSpreader const & getMultifaceSpreader() const; /** - * @symbol ??0SculkVeinBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SculkVeinBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SculkVeinBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkVeinBlockBehavior.hpp b/LiteLoader/include/llapi/mc/SculkVeinBlockBehavior.hpp index 3a42cedf68..2f060c8990 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinBlockBehavior.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinBlockBehavior.hpp @@ -28,46 +28,46 @@ class SculkVeinBlockBehavior { public: /** - * @vftbl 0 - * @symbol ?updateDecayDelay\@SculkVeinBlockBehavior\@\@UEBAHH\@Z + * @vftbl 0 + * @symbol ?updateDecayDelay\@SculkVeinBlockBehavior\@\@UEBAHH\@Z */ virtual int updateDecayDelay(int) const; /** - * @vftbl 1 - * @symbol ?updateFacingData\@SculkVeinBlockBehavior\@\@UEBAHHAEBVBlock\@\@\@Z + * @vftbl 1 + * @symbol ?updateFacingData\@SculkVeinBlockBehavior\@\@UEBAHHAEBVBlock\@\@\@Z */ virtual int updateFacingData(int, class Block const &) const; /** - * @vftbl 2 - * @symbol ?canChangeBlockOnSpread\@SculkVeinBlockBehavior\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?canChangeBlockOnSpread\@SculkVeinBlockBehavior\@\@UEBA_NXZ */ virtual bool canChangeBlockOnSpread() const; /** - * @vftbl 3 - * @symbol ?attemptSpreadVeins\@SculkVeinBlockBehavior\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@HAEAVSculkSpreader\@\@\@Z + * @vftbl 3 + * @symbol ?attemptSpreadVeins\@SculkVeinBlockBehavior\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBVBlock\@\@HAEAVSculkSpreader\@\@\@Z */ virtual bool attemptSpreadVeins(class IBlockWorldGenAPI &, class BlockPos const &, class Block const &, int, class SculkSpreader &) const; /** - * @vftbl 4 - * @symbol ?attemptUseCharge\@SculkVeinBlockBehavior\@\@UEBAHAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@2HHAEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z + * @vftbl 4 + * @symbol ?attemptUseCharge\@SculkVeinBlockBehavior\@\@UEBAHAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@2HHAEAVRandom\@\@AEAVSculkSpreader\@\@_N\@Z */ virtual int attemptUseCharge(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class BlockPos const &, int, int, class Random &, class SculkSpreader &, bool) const; /** - * @vftbl 5 - * @symbol ?onDischarged\@SculkVeinBlockBehavior\@\@UEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?onDischarged\@SculkVeinBlockBehavior\@\@UEBAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onDischarged(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &) const; //private: /** - * @symbol ?_attemptPlaceSculk\@SculkVeinBlockBehavior\@\@CA_NAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVSculkSpreader\@\@AEAVRandom\@\@\@Z + * @symbol ?_attemptPlaceSculk\@SculkVeinBlockBehavior\@\@CA_NAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@AEAVSculkSpreader\@\@AEAVRandom\@\@\@Z */ MCAPI static bool _attemptPlaceSculk(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &, class SculkSpreader &, class Random &); /** - * @symbol ?_cleanUpVeinsWithSculkSubstrate\@SculkVeinBlockBehavior\@\@CAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_cleanUpVeinsWithSculkSubstrate\@SculkVeinBlockBehavior\@\@CAXAEAVIBlockWorldGenAPI\@\@PEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void _cleanUpVeinsWithSculkSubstrate(class IBlockWorldGenAPI &, class BlockSource *, class BlockPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp b/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp index de99dc993f..2ed8b43683 100644 --- a/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp +++ b/LiteLoader/include/llapi/mc/SculkVeinMultifaceSpreader.hpp @@ -29,28 +29,34 @@ class SculkVeinMultifaceSpreader { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SculkVeinMultifaceSpreader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?_canSpreadFrom\@SculkVeinMultifaceSpreader\@\@UEBA_NAEBVBlock\@\@E\@Z + * @vftbl 1 + * @symbol ?_canSpreadFrom\@SculkVeinMultifaceSpreader\@\@UEBA_NAEBVBlock\@\@E\@Z */ virtual bool _canSpreadFrom(class Block const &, unsigned char) const; /** - * @vftbl 2 - * @symbol ?_canSpreadInto\@SculkVeinMultifaceSpreader\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 2 + * @symbol ?_canSpreadInto\@SculkVeinMultifaceSpreader\@\@UEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlock\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canSpreadInto(class IBlockWorldGenAPI &, class Block const &, class BlockPos const &, unsigned char) const; /** - * @vftbl 3 - * @symbol ?_isOtherBlockValidAsSource\@SculkVeinMultifaceSpreader\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 3 + * @symbol ?_isOtherBlockValidAsSource\@SculkVeinMultifaceSpreader\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool _isOtherBlockValidAsSource(class Block const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SCULKVEINMULTIFACESPREADER /** - * @symbol ??0SculkVeinMultifaceSpreader\@\@QEAA\@AEBV?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SculkVeinMultifaceSpreader(); +#endif + /** + * @symbol ??0SculkVeinMultifaceSpreader\@\@QEAA\@AEBV?$vector\@W4SpreadType\@MultifaceSpreader\@\@V?$allocator\@W4SpreadType\@MultifaceSpreader\@\@\@std\@\@\@std\@\@\@Z */ MCAPI SculkVeinMultifaceSpreader(std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp b/LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp index c80a04b514..bf54a2bc0f 100644 --- a/LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp +++ b/LiteLoader/include/llapi/mc/SeaAnemoneFeature.hpp @@ -31,14 +31,14 @@ class SeaAnemoneFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeaAnemoneFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@SeaAnemoneFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@SeaAnemoneFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeaGrass.hpp b/LiteLoader/include/llapi/mc/SeaGrass.hpp index fa67bcc6c9..3bb711b725 100644 --- a/LiteLoader/include/llapi/mc/SeaGrass.hpp +++ b/LiteLoader/include/llapi/mc/SeaGrass.hpp @@ -31,287 +31,292 @@ class SeaGrass : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeaGrass(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@SeaGrass\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@SeaGrass\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@SeaGrass\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SeaGrass\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@SeaGrass\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@SeaGrass\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @symbol ?onFertilized\@SeaGrass\@\@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 87 + * @symbol ?mayConsumeFertilizer\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@SeaGrass\@\@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 92 + * @symbol ?mayPlace\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@SeaGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@SeaGrass\@\@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 ?getColor\@SeaGrass\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@SeaGrass\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@SeaGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@SeaGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SeaGrass\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@SeaGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@SeaGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@SeaGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SeaGrass\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SeaGrass\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEAGRASS /** - * @symbol ?canBeSilkTouched\@SeaGrass\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SeaGrass\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@SeaGrass\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SeaGrass\@\@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 ??0SeaGrass\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SeaGrass(std::string const &, int); /** - * @symbol ?trySpawnSeaGrass\@SeaGrass\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?trySpawnSeaGrass\@SeaGrass\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool trySpawnSeaGrass(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp index f7cf00695e..e119250c92 100644 --- a/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp +++ b/LiteLoader/include/llapi/mc/SeaLanternBlock.hpp @@ -31,203 +31,208 @@ class SeaLanternBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeaLanternBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SeaLanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SeaLanternBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SeaLanternBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SeaLanternBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @symbol ??0SeaLanternBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SeaLanternBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SeaLanternBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeaPickle.hpp b/LiteLoader/include/llapi/mc/SeaPickle.hpp index 01b8b575d9..7dd692bf09 100644 --- a/LiteLoader/include/llapi/mc/SeaPickle.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickle.hpp @@ -31,302 +31,307 @@ class SeaPickle : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeaPickle(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@SeaPickle\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SeaPickle\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@SeaPickle\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@SeaPickle\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SeaPickle\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@SeaPickle\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @symbol ?onFertilized\@SeaPickle\@\@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 87 + * @symbol ?mayConsumeFertilizer\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@SeaPickle\@\@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 93 + * @symbol ?mayPlaceOn\@SeaPickle\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@SeaPickle\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@SeaPickle\@\@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 ?getColor\@SeaPickle\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@SeaPickle\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@SeaPickle\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@SeaPickle\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 153 - * @symbol ?getLightEmission\@SeaPickle\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z + * @vftbl 153 + * @symbol ?getLightEmission\@SeaPickle\@\@UEBA?AUBrightness\@\@AEBVBlock\@\@\@Z */ virtual struct Brightness getLightEmission(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@SeaPickle\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@SeaPickle\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@SeaPickle\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@SeaPickle\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@SeaPickle\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SeaPickle\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?checkAlive\@SeaPickle\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 194 + * @symbol ?checkAlive\@SeaPickle\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void checkAlive(class BlockSource &, class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEAPICKLE /** - * @symbol ?canBeSilkTouched\@SeaPickle\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SeaPickle\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?hasVariableLighting\@SeaPickle\@\@UEBA_NXZ + * @symbol ?hasVariableLighting\@SeaPickle\@\@UEBA_NXZ */ MCVAPI bool hasVariableLighting() const; /** - * @symbol ?waterSpreadCausesSpawn\@SeaPickle\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SeaPickle\@\@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 ??0SeaPickle\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SeaPickle(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp index 1a928fe2a4..29a652c108 100644 --- a/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleBlockItem.hpp @@ -32,88 +32,88 @@ class SeaPickleBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeaPickleBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@SeaPickleBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@SeaPickleBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@SeaPickleBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@SeaPickleBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0SeaPickleBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SeaPickleBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SeaPickleBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeaPickleFeature.hpp b/LiteLoader/include/llapi/mc/SeaPickleFeature.hpp index de7647f0a1..5e3528c2e0 100644 --- a/LiteLoader/include/llapi/mc/SeaPickleFeature.hpp +++ b/LiteLoader/include/llapi/mc/SeaPickleFeature.hpp @@ -31,14 +31,14 @@ class SeaPickleFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeaPickleFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@SeaPickleFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@SeaPickleFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeagrassFeature.hpp b/LiteLoader/include/llapi/mc/SeagrassFeature.hpp index c82c79a557..cd40068bab 100644 --- a/LiteLoader/include/llapi/mc/SeagrassFeature.hpp +++ b/LiteLoader/include/llapi/mc/SeagrassFeature.hpp @@ -31,22 +31,22 @@ class SeagrassFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SeagrassFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@SeagrassFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@SeagrassFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_isNotIce\@SeagrassFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isNotIce\@SeagrassFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isNotIce(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeamlessChunkBlendingAttenuator.hpp b/LiteLoader/include/llapi/mc/SeamlessChunkBlendingAttenuator.hpp deleted file mode 100644 index 4354ebf796..0000000000 --- a/LiteLoader/include/llapi/mc/SeamlessChunkBlendingAttenuator.hpp +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @file SeamlessChunkBlendingAttenuator.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "OverworldGeneratorMultinoise.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SeamlessChunkBlendingAttenuator. - * - */ -class SeamlessChunkBlendingAttenuator { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SEAMLESSCHUNKBLENDINGATTENUATOR -public: - class SeamlessChunkBlendingAttenuator& operator=(class SeamlessChunkBlendingAttenuator const &) = delete; - SeamlessChunkBlendingAttenuator(class SeamlessChunkBlendingAttenuator const &) = delete; - SeamlessChunkBlendingAttenuator() = delete; -#endif - -public: - /** - * @symbol ??0SeamlessChunkBlendingAttenuator@@QEAA@VChunkPos@@$$QEAV?$vector@V?$array@UAttenuationData@SeamlessChunkBlendingAttenuatorUtil@@$03@std@@V?$allocator@V?$array@UAttenuationData@SeamlessChunkBlendingAttenuatorUtil@@$03@std@@@2@@std@@F@Z - * @hash 1356920711 - */ - MCAPI SeamlessChunkBlendingAttenuator(class ChunkPos, std::vector> &&, short); - /** - * @symbol ?attenuateDensity@SeamlessChunkBlendingAttenuator@@QEBAMAEBV?$DividedPos2d@$03@@HM@Z - * @hash -345409611 - */ - MCAPI float attenuateDensity(class DividedPos2d<4> const &, int, float) const; - /** - * @symbol ?attenuateTerrainInfo@SeamlessChunkBlendingAttenuator@@QEBA?AUTerrainInfo@@AEBV?$DividedPos2d@$03@@AEBU2@@Z - * @hash -1701713443 - */ - MCAPI struct TerrainInfo attenuateTerrainInfo(class DividedPos2d<4> const &, struct TerrainInfo const &) const; - /** - * @symbol ?tryGetAttenuatedBiome@SeamlessChunkBlendingAttenuator@@QEBAPEBVBiome@@AEBV?$DividedPos@$03@@AEBVBiomeRegistry@@AEBV?$NormalNoiseImpl@$0A@V?$MultiOctaveNoiseImpl@$0A@V?$ParityImprovedNoiseImpl@$0A@@@@@@@@Z - * @hash 1097437248 - */ - MCAPI class Biome const * tryGetAttenuatedBiome(class DividedPos<4> const &, class BiomeRegistry const &, class NormalNoiseImpl<0, class MultiOctaveNoiseImpl<0, class ParityImprovedNoiseImpl<0>>> const &) const; - /** - * @symbol ?tryMoveWaterEdges@SeamlessChunkBlendingAttenuator@@QEBA?BUBlockGenerationResult@OverworldGeneratorMultinoise@@AEBVBlockPos@@U23@@Z - * @hash 300603855 - */ - MCAPI struct OverworldGeneratorMultinoise::BlockGenerationResult const tryMoveWaterEdges(class BlockPos const &, struct OverworldGeneratorMultinoise::BlockGenerationResult) const; - /** - * @symbol ??1SeamlessChunkBlendingAttenuator@@QEAA@XZ - * @hash -116022604 - */ - MCAPI ~SeamlessChunkBlendingAttenuator(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SeamlessChunkBlendingAttenuatorFactory.hpp b/LiteLoader/include/llapi/mc/SeamlessChunkBlendingAttenuatorFactory.hpp deleted file mode 100644 index e1de3fdb68..0000000000 --- a/LiteLoader/include/llapi/mc/SeamlessChunkBlendingAttenuatorFactory.hpp +++ /dev/null @@ -1,71 +0,0 @@ -/** - * @file SeamlessChunkBlendingAttenuatorFactory.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SeamlessChunkBlendingAttenuatorFactory. - * - */ -class SeamlessChunkBlendingAttenuatorFactory { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SEAMLESSCHUNKBLENDINGATTENUATORFACTORY -public: - class SeamlessChunkBlendingAttenuatorFactory& operator=(class SeamlessChunkBlendingAttenuatorFactory const &) = delete; - SeamlessChunkBlendingAttenuatorFactory(class SeamlessChunkBlendingAttenuatorFactory const &) = delete; - SeamlessChunkBlendingAttenuatorFactory() = delete; -#endif - -public: - /** - * @symbol ??0SeamlessChunkBlendingAttenuatorFactory@@QEAA@AEAVDimension@@@Z - * @hash 681634943 - */ - MCAPI SeamlessChunkBlendingAttenuatorFactory(class Dimension &); - /** - * @symbol ?getOrCreateAttenuator@SeamlessChunkBlendingAttenuatorFactory@@QEAA?AV?$shared_ptr@VSeamlessChunkBlendingAttenuator@@@std@@AEBVChunkPos@@@Z - * @hash 1352666062 - */ - MCAPI class std::shared_ptr getOrCreateAttenuator(class ChunkPos const &); - /** - * @symbol ?isClientSide@SeamlessChunkBlendingAttenuatorFactory@@QEBA?B_NXZ - * @hash -550356148 - */ - MCAPI bool const isClientSide() const; - -//private: - /** - * @symbol ?_createChunkBlendingAttenuator@SeamlessChunkBlendingAttenuatorFactory@@AEBA?AV?$shared_ptr@VSeamlessChunkBlendingAttenuator@@@std@@AEBVChunkPos@@@Z - * @hash 107350813 - */ - MCAPI class std::shared_ptr _createChunkBlendingAttenuator(class ChunkPos const &) const; - /** - * @symbol ?_finalizeChunkAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@AEBA?AV?$vector@V?$array@UAttenuationData@SeamlessChunkBlendingAttenuatorUtil@@$03@std@@V?$allocator@V?$array@UAttenuationData@SeamlessChunkBlendingAttenuatorUtil@@$03@std@@@2@@std@@AEBV?$vector@V?$array@UIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@$03@std@@V?$allocator@V?$array@UIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@$03@std@@@2@@3@@Z - * @hash 719278253 - */ - MCAPI std::vector> _finalizeChunkAttenuationData(std::vector> const &) const; - /** - * @symbol ?_processDensityColumn@SeamlessChunkBlendingAttenuatorFactory@@AEBAXAEAV?$vector@V?$array@UIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@$03@std@@V?$allocator@V?$array@UIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@$03@std@@@2@@std@@AEBVBlendingData@@MU?$pair@HH@3@2_N@Z - * @hash 1101726513 - */ - MCAPI void _processDensityColumn(std::vector> &, class BlendingData const &, float, struct std::pair, struct std::pair, bool) const; - /** - * @symbol ?_updateIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@AEBAXAEAV?$vector@V?$array@UIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@$03@std@@V?$allocator@V?$array@UIntermediateAttenuationData@SeamlessChunkBlendingAttenuatorFactory@@$03@std@@@2@@std@@AEBVChunkPos@@1AEBVBlendingData@@_N@Z - * @hash -954146258 - */ - MCAPI void _updateIntermediateAttenuationData(std::vector> &, class ChunkPos const &, class ChunkPos const &, class BlendingData const &, bool) const; - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SearchFeature.hpp b/LiteLoader/include/llapi/mc/SearchFeature.hpp index e5d83d9c8c..e8dbca1df3 100644 --- a/LiteLoader/include/llapi/mc/SearchFeature.hpp +++ b/LiteLoader/include/llapi/mc/SearchFeature.hpp @@ -30,14 +30,14 @@ class SearchFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SearchFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@SearchFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@SearchFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Seasons.hpp b/LiteLoader/include/llapi/mc/Seasons.hpp index 49b3049798..08e37f4dd7 100644 --- a/LiteLoader/include/llapi/mc/Seasons.hpp +++ b/LiteLoader/include/llapi/mc/Seasons.hpp @@ -30,20 +30,20 @@ class Seasons { public: /** - * @symbol ??0Seasons\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0Seasons\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI Seasons(class Dimension &); /** - * @symbol ?postProcess\@Seasons\@\@QEAAXAEAVLevelChunk\@\@AEAVBlockSource\@\@AEBVChunkPos\@\@\@Z + * @symbol ?postProcess\@Seasons\@\@QEAAXAEAVLevelChunk\@\@AEAVBlockSource\@\@AEBVChunkPos\@\@\@Z */ MCAPI void postProcess(class LevelChunk &, class BlockSource &, class ChunkPos const &); /** - * @symbol ?tick\@Seasons\@\@QEAAXXZ + * @symbol ?tick\@Seasons\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ??1Seasons\@\@QEAA\@XZ + * @symbol ??1Seasons\@\@QEAA\@XZ */ MCAPI ~Seasons(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeatDescription.hpp b/LiteLoader/include/llapi/mc/SeatDescription.hpp index dd587f5d3f..dc179fc151 100644 --- a/LiteLoader/include/llapi/mc/SeatDescription.hpp +++ b/LiteLoader/include/llapi/mc/SeatDescription.hpp @@ -28,31 +28,31 @@ struct SeatDescription { public: /** - * @symbol ??0SeatDescription\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SeatDescription\@\@QEAA\@AEBU0\@\@Z */ MCAPI SeatDescription(struct SeatDescription const &); /** - * @symbol ?addRotationExpressionNode\@SeatDescription\@\@QEAAXAEBVExpressionNode\@\@\@Z + * @symbol ?addRotationExpressionNode\@SeatDescription\@\@QEAAXAEBVExpressionNode\@\@\@Z */ MCAPI void addRotationExpressionNode(class ExpressionNode const &); /** - * @symbol ??4SeatDescription\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4SeatDescription\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct SeatDescription & operator=(struct SeatDescription const &); /** - * @symbol ??4SeatDescription\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SeatDescription\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SeatDescription & operator=(struct SeatDescription &&); /** - * @symbol ??8SeatDescription\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8SeatDescription\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct SeatDescription const &) const; /** - * @symbol ??1SeatDescription\@\@QEAA\@XZ + * @symbol ??1SeatDescription\@\@QEAA\@XZ */ MCAPI ~SeatDescription(); /** - * @symbol ?EMPTY\@SeatDescription\@\@2U1\@B + * @symbol ?EMPTY\@SeatDescription\@\@2U1\@B */ MCAPI static struct SeatDescription const EMPTY; diff --git a/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp b/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp index d094e18b2f..a3aaaa28ef 100644 --- a/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp +++ b/LiteLoader/include/llapi/mc/SeatDescriptionUtility.hpp @@ -28,20 +28,20 @@ class SeatDescriptionUtility { public: /** - * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@AEBUVehicleComponent\@\@AEBVStrictEntityContext\@\@\@Z + * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@HH\@Z */ - MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, struct VehicleComponent const &, class StrictEntityContext const &); + MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, int, int); /** - * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@HH\@Z + * @symbol ?getSeatDescriptionOfPassenger\@SeatDescriptionUtility\@\@SAAEBUSeatDescription\@\@AEBV?$vector\@USeatDescription\@\@V?$allocator\@USeatDescription\@\@\@std\@\@\@std\@\@AEBUVehicleComponent\@\@AEBVStrictEntityContext\@\@\@Z */ - MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, int, int); + MCAPI static struct SeatDescription const & getSeatDescriptionOfPassenger(std::vector const &, struct VehicleComponent const &, class StrictEntityContext const &); /** - * @symbol ?getSeatRidingHeightOffset\@SeatDescriptionUtility\@\@SAMMMM\@Z + * @symbol ?getSeatRidingHeightOffset\@SeatDescriptionUtility\@\@SAMMMM\@Z */ MCAPI static float getSeatRidingHeightOffset(float, float, float); /** - * @symbol ?setValuesToSynchedActorData\@SeatDescriptionUtility\@\@SAXVSynchedActorDataWriter\@\@AEBVVec3\@\@AEBUSeatDescription\@\@M\@Z + * @symbol ?setValuesToSynchedActorData\@SeatDescriptionUtility\@\@SAXVSynchedActorDataWriter\@\@AEBVVec3\@\@AEBUSeatDescription\@\@M\@Z */ MCAPI static void setValuesToSynchedActorData(class SynchedActorDataWriter, class Vec3 const &, struct SeatDescription const &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SecureStorage.hpp b/LiteLoader/include/llapi/mc/SecureStorage.hpp index 6e848cb24c..859aa2301b 100644 --- a/LiteLoader/include/llapi/mc/SecureStorage.hpp +++ b/LiteLoader/include/llapi/mc/SecureStorage.hpp @@ -29,5 +29,11 @@ class SecureStorage { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SECURESTORAGE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SecureStorage(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SecureStorageKey.hpp b/LiteLoader/include/llapi/mc/SecureStorageKey.hpp index ad62f754f3..478520e15b 100644 --- a/LiteLoader/include/llapi/mc/SecureStorageKey.hpp +++ b/LiteLoader/include/llapi/mc/SecureStorageKey.hpp @@ -28,8 +28,8 @@ class SecureStorageKey { public: /** - * @symbol ??1SecureStorageKey\@\@QEAA\@XZ + * @symbol ??1SecureStorageKey\@\@QEAA\@XZ */ MCAPI ~SecureStorageKey(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SeedItemComponentLegacy.hpp b/LiteLoader/include/llapi/mc/SeedItemComponentLegacy.hpp index d89aaf8310..81efd3d0c8 100644 --- a/LiteLoader/include/llapi/mc/SeedItemComponentLegacy.hpp +++ b/LiteLoader/include/llapi/mc/SeedItemComponentLegacy.hpp @@ -31,32 +31,32 @@ class SeedItemComponentLegacy { public: /** - * @symbol ??0SeedItemComponentLegacy\@\@QEAA\@AEAVItem\@\@\@Z + * @symbol ??0SeedItemComponentLegacy\@\@QEAA\@AEAVItem\@\@\@Z */ MCAPI SeedItemComponentLegacy(class Item &); /** - * @symbol ?init\@SeedItemComponentLegacy\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?init\@SeedItemComponentLegacy\@\@QEAA_NAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCAPI bool init(class Json::Value &, class SemVersion const &); /** - * @symbol ?isPlanting\@SeedItemComponentLegacy\@\@QEBA_NXZ + * @symbol ?isPlanting\@SeedItemComponentLegacy\@\@QEBA_NXZ */ MCAPI bool isPlanting() const; /** - * @symbol ?setPlanting\@SeedItemComponentLegacy\@\@QEAAX_N\@Z + * @symbol ?setPlanting\@SeedItemComponentLegacy\@\@QEAAX_N\@Z */ MCAPI void setPlanting(bool); /** - * @symbol ?useOn\@SeedItemComponentLegacy\@\@QEAA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z + * @symbol ?useOn\@SeedItemComponentLegacy\@\@QEAA_NAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@\@Z */ MCAPI bool useOn(class ItemStack &, class Actor &, class BlockPos const &, unsigned char, class Vec3 const &); //private: /** - * @symbol ?_canPlant\@SeedItemComponentLegacy\@\@AEBA_NAEBVBlock\@\@\@Z + * @symbol ?_canPlant\@SeedItemComponentLegacy\@\@AEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _canPlant(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp b/LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp index 3732fba727..eeb3b0eb3a 100644 --- a/LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp +++ b/LiteLoader/include/llapi/mc/SelectorBehaviorNode.hpp @@ -29,23 +29,23 @@ class SelectorBehaviorNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SelectorBehaviorNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@SelectorBehaviorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@SelectorBehaviorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@SelectorBehaviorNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@SelectorBehaviorNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0SelectorBehaviorNode\@\@QEAA\@XZ + * @symbol ??0SelectorBehaviorNode\@\@QEAA\@XZ */ MCAPI SelectorBehaviorNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SelectorDefinition.hpp b/LiteLoader/include/llapi/mc/SelectorDefinition.hpp index 425dc36561..e0c2674a1c 100644 --- a/LiteLoader/include/llapi/mc/SelectorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SelectorDefinition.hpp @@ -32,14 +32,14 @@ class SelectorDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SelectorDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SelectorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SelectorDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SemVersion.hpp b/LiteLoader/include/llapi/mc/SemVersion.hpp index 2cc0b262ea..360b9b183e 100644 --- a/LiteLoader/include/llapi/mc/SemVersion.hpp +++ b/LiteLoader/include/llapi/mc/SemVersion.hpp @@ -42,108 +42,108 @@ bool mValidVersion, mAnyVersion; // 104, 105 #undef AFTER_EXTRA public: /** - * @symbol ??0SemVersion\@\@QEAA\@XZ + * @symbol ??0SemVersion\@\@QEAA\@GGGAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ - MCAPI SemVersion(); + MCAPI SemVersion(unsigned short, unsigned short, unsigned short, std::string const &, std::string const &); /** - * @symbol ??0SemVersion\@\@QEAA\@Uany_version_constructor\@0\@\@Z + * @symbol ??0SemVersion\@\@QEAA\@Uany_version_constructor\@0\@\@Z */ MCAPI SemVersion(struct SemVersion::any_version_constructor); /** - * @symbol ??0SemVersion\@\@QEAA\@GGGAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ??0SemVersion\@\@QEAA\@AEBV0\@\@Z */ - MCAPI SemVersion(unsigned short, unsigned short, unsigned short, std::string const &, std::string const &); + MCAPI SemVersion(class SemVersion const &); /** - * @symbol ??0SemVersion\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0SemVersion\@\@QEAA\@XZ */ - MCAPI SemVersion(class SemVersion const &); + MCAPI SemVersion(); /** - * @symbol ?asString\@SemVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?asString\@SemVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & asString() const; /** - * @symbol ?getMajor\@SemVersion\@\@QEBAGXZ + * @symbol ?getMajor\@SemVersion\@\@QEBAGXZ */ MCAPI unsigned short getMajor() const; /** - * @symbol ?getMinor\@SemVersion\@\@QEBAGXZ + * @symbol ?getMinor\@SemVersion\@\@QEBAGXZ */ MCAPI unsigned short getMinor() const; /** - * @symbol ?getPatch\@SemVersion\@\@QEBAGXZ + * @symbol ?getPatch\@SemVersion\@\@QEBAGXZ */ MCAPI unsigned short getPatch() const; /** - * @symbol ?getPreRelease\@SemVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPreRelease\@SemVersion\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getPreRelease() const; /** - * @symbol ?isAnyVersion\@SemVersion\@\@QEBA_NXZ + * @symbol ?isAnyVersion\@SemVersion\@\@QEBA_NXZ */ MCAPI bool isAnyVersion() const; /** - * @symbol ?isValid\@SemVersion\@\@QEBA_NXZ + * @symbol ?isValid\@SemVersion\@\@QEBA_NXZ */ MCAPI bool isValid() const; /** - * @symbol ??9SemVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9SemVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class SemVersion const &) const; /** - * @symbol ??MSemVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??MSemVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator<(class SemVersion const &) const; /** - * @symbol ??NSemVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??NSemVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator<=(class SemVersion const &) const; /** - * @symbol ??4SemVersion\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4SemVersion\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class SemVersion & operator=(class SemVersion const &); /** - * @symbol ??8SemVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8SemVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class SemVersion const &) const; /** - * @symbol ??OSemVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??OSemVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>(class SemVersion const &) const; /** - * @symbol ??PSemVersion\@\@QEBA_NAEBV0\@\@Z + * @symbol ??PSemVersion\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>=(class SemVersion const &) const; /** - * @symbol ?satisfies\@SemVersion\@\@QEBA_NAEBV1\@\@Z + * @symbol ?satisfies\@SemVersion\@\@QEBA_NAEBV1\@\@Z */ MCAPI bool satisfies(class SemVersion const &) const; /** - * @symbol ??1SemVersion\@\@QEAA\@XZ + * @symbol ??1SemVersion\@\@QEAA\@XZ */ MCAPI ~SemVersion(); /** - * @symbol ?AnyVersionConstructor\@SemVersion\@\@2Uany_version_constructor\@1\@B + * @symbol ?AnyVersionConstructor\@SemVersion\@\@2Uany_version_constructor\@1\@B */ MCAPI static struct SemVersion::any_version_constructor const AnyVersionConstructor; /** - * @symbol ?fromJson\@SemVersion\@\@SA?AW4MatchType\@1\@AEBVValue\@Json\@\@AEAV1\@W4ParseOption\@1\@\@Z + * @symbol ?fromJson\@SemVersion\@\@SA?AW4MatchType\@1\@AEBVValue\@Json\@\@AEAV1\@W4ParseOption\@1\@\@Z */ MCAPI static enum class SemVersion::MatchType fromJson(class Json::Value const &, class SemVersion &, enum class SemVersion::ParseOption); /** - * @symbol ?fromJsonArray\@SemVersion\@\@SA?AW4MatchType\@1\@AEBVValue\@Json\@\@AEAV1\@\@Z + * @symbol ?fromJsonArray\@SemVersion\@\@SA?AW4MatchType\@1\@AEBVValue\@Json\@\@AEAV1\@\@Z */ MCAPI static enum class SemVersion::MatchType fromJsonArray(class Json::Value const &, class SemVersion &); /** - * @symbol ?fromString\@SemVersion\@\@SA?AW4MatchType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV1\@W4ParseOption\@1\@\@Z + * @symbol ?fromString\@SemVersion\@\@SA?AW4MatchType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV1\@W4ParseOption\@1\@\@Z */ MCAPI static enum class SemVersion::MatchType fromString(std::string const &, class SemVersion &, enum class SemVersion::ParseOption); //private: /** - * @symbol ?_parseVersionToString\@SemVersion\@\@AEAAXXZ + * @symbol ?_parseVersionToString\@SemVersion\@\@AEAAXXZ */ MCAPI void _parseVersionToString(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp b/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp index b794ec2e9a..9734be2cd1 100644 --- a/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp +++ b/LiteLoader/include/llapi/mc/SemVersionConstraint.hpp @@ -28,13 +28,19 @@ class SemVersionConstraint { public: /** - * @vftbl 0 - * @symbol ?doValidate\@SemVersionConstraint\@\@EEBA_NAEBVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z + * @vftbl 0 + * @symbol ?doValidate\@SemVersionConstraint\@\@EEBA_NAEBVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z */ virtual bool doValidate(class entt::meta_any const &, class SerializerContext &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SEMVERSIONCONSTRAINT /** - * @symbol ?min\@SemVersionConstraint\@\@QEAAAEAV1\@AEBVSemVersion\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SemVersionConstraint(); +#endif + /** + * @symbol ?min\@SemVersionConstraint\@\@QEAAAEAV1\@AEBVSemVersion\@\@\@Z */ MCAPI class SemVersionConstraint & min(class SemVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SendEventData.hpp b/LiteLoader/include/llapi/mc/SendEventData.hpp index e671aacb98..a8dec5badb 100644 --- a/LiteLoader/include/llapi/mc/SendEventData.hpp +++ b/LiteLoader/include/llapi/mc/SendEventData.hpp @@ -21,17 +21,20 @@ struct SendEventData { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SENDEVENTDATA public: - struct SendEventData& operator=(struct SendEventData const &) = delete; SendEventData() = delete; #endif public: /** - * @symbol ??0SendEventData\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SendEventData\@\@QEAA\@AEBU0\@\@Z */ MCAPI SendEventData(struct SendEventData const &); /** - * @symbol ??1SendEventData\@\@QEAA\@XZ + * @symbol ??4SendEventData\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct SendEventData & operator=(struct SendEventData const &); + /** + * @symbol ??1SendEventData\@\@QEAA\@XZ */ MCAPI ~SendEventData(); diff --git a/LiteLoader/include/llapi/mc/SendEventGoal.hpp b/LiteLoader/include/llapi/mc/SendEventGoal.hpp index fab00e3da3..b0bb1df856 100644 --- a/LiteLoader/include/llapi/mc/SendEventGoal.hpp +++ b/LiteLoader/include/llapi/mc/SendEventGoal.hpp @@ -30,56 +30,56 @@ class SendEventGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SendEventGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SendEventGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SendEventGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SendEventGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SendEventGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SendEventGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SendEventGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SendEventGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SendEventGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SendEventGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SendEventGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SendEventGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SendEventGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SendEventGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@USendEventData\@\@V?$allocator\@USendEventData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0SendEventGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@USendEventData\@\@V?$allocator\@USendEventData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI SendEventGoal(class Mob &, std::vector const &); //private: /** - * @symbol ?_selectBestSpell\@SendEventGoal\@\@AEAAHXZ + * @symbol ?_selectBestSpell\@SendEventGoal\@\@AEAAHXZ */ MCAPI int _selectBestSpell(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SendEventStage.hpp b/LiteLoader/include/llapi/mc/SendEventStage.hpp index 3d0413e486..1e3b89f510 100644 --- a/LiteLoader/include/llapi/mc/SendEventStage.hpp +++ b/LiteLoader/include/llapi/mc/SendEventStage.hpp @@ -25,7 +25,7 @@ struct SendEventStage { public: /** - * @symbol ??1SendEventStage\@\@QEAA\@XZ + * @symbol ??1SendEventStage\@\@QEAA\@XZ */ MCAPI ~SendEventStage(); diff --git a/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp b/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp index 3f5a2c34b6..dce8f71d67 100644 --- a/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp +++ b/LiteLoader/include/llapi/mc/SendLinkPacketOfPassengersSystem.hpp @@ -28,20 +28,20 @@ class SendLinkPacketOfPassengersSystem { public: /** - * @symbol ?createSystem\@SendLinkPacketOfPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SendLinkPacketOfPassengersSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); /** - * @symbol ?sendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEAUVehicleComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@\@Z + * @symbol ?sendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEAUVehicleComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@\@Z */ MCAPI static void sendLinkPacketOfPassengers(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct VehicleComponent &, class EntityModifierT> &, class ViewT, struct ActorUniqueIDComponent const>); //private: /** - * @symbol ?_tickSendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@\@\@Z + * @symbol ?_tickSendLinkPacketOfPassengers\@SendLinkPacketOfPassengersSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@$$CBUActorUniqueIDComponent\@\@UVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UPassengerComponent\@\@\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPassengersChangedFlag\@\@\@\@\@\@\@\@\@Z */ MCAPI static void _tickSendLinkPacketOfPassengers(class ViewT, class FlagComponent>, struct ActorUniqueIDComponent const, struct VehicleComponent>, class EntityModifierT>, class ViewT, struct ActorUniqueIDComponent const>, class ViewT, class FlagComponent>>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp b/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp index a257f93e65..636b91ee83 100644 --- a/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp +++ b/LiteLoader/include/llapi/mc/SendPacketsComponent.hpp @@ -28,11 +28,11 @@ struct SendPacketsComponent { public: /** - * @symbol ??4SendPacketsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SendPacketsComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SendPacketsComponent & operator=(struct SendPacketsComponent &&); /** - * @symbol ??1SendPacketsComponent\@\@QEAA\@XZ + * @symbol ??1SendPacketsComponent\@\@QEAA\@XZ */ MCAPI ~SendPacketsComponent(); diff --git a/LiteLoader/include/llapi/mc/SendPacketsSystem.hpp b/LiteLoader/include/llapi/mc/SendPacketsSystem.hpp index c343fcf2a3..a4c0e7fe89 100644 --- a/LiteLoader/include/llapi/mc/SendPacketsSystem.hpp +++ b/LiteLoader/include/llapi/mc/SendPacketsSystem.hpp @@ -28,8 +28,8 @@ class SendPacketsSystem { public: /** - * @symbol ?createSendPacketsSystem\@SendPacketsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSendPacketsSystem\@SendPacketsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSendPacketsSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp b/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp index e9493ce75d..2ef8a1a753 100644 --- a/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SendPacketsSystemImpl.hpp @@ -28,8 +28,8 @@ class SendPacketsSystemImpl { public: /** - * @symbol ?_sendPacketsSystem\@SendPacketsSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBVActorOwnerComponent\@\@AEAUSendPacketsComponent\@\@\@Z + * @symbol ?_sendPacketsSystem\@SendPacketsSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBVActorOwnerComponent\@\@AEAUSendPacketsComponent\@\@\@Z */ MCAPI static void _sendPacketsSystem(class StrictEntityContext &, class ActorOwnerComponent const &, struct SendPacketsComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SensingComponent.hpp b/LiteLoader/include/llapi/mc/SensingComponent.hpp index eafb76cb49..3ce4d802a2 100644 --- a/LiteLoader/include/llapi/mc/SensingComponent.hpp +++ b/LiteLoader/include/llapi/mc/SensingComponent.hpp @@ -30,16 +30,16 @@ class SensingComponent { public: /** - * @symbol ?canSee\@SensingComponent\@\@QEAA_NAEAVMob\@\@AEBVActor\@\@\@Z + * @symbol ?canSee\@SensingComponent\@\@QEAA_NAEAVMob\@\@AEBVActor\@\@\@Z */ MCAPI bool canSee(class Mob &, class Actor const &); /** - * @symbol ?reset\@SensingComponent\@\@QEAAXXZ + * @symbol ?reset\@SensingComponent\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?withinFOV\@SensingComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z + * @symbol ?withinFOV\@SensingComponent\@\@QEAA_NAEAVMob\@\@AEBVVec3\@\@M\@Z */ MCAPI bool withinFOV(class Mob &, class Vec3 const &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SensingSystem.hpp b/LiteLoader/include/llapi/mc/SensingSystem.hpp index f420964fc7..2097699915 100644 --- a/LiteLoader/include/llapi/mc/SensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/SensingSystem.hpp @@ -30,19 +30,19 @@ class SensingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SensingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@SensingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@SensingSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp b/LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp index 1d966c7c51..efee8863b9 100644 --- a/LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp +++ b/LiteLoader/include/llapi/mc/SequenceBehaviorNode.hpp @@ -29,23 +29,23 @@ class SequenceBehaviorNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SequenceBehaviorNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@SequenceBehaviorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@SequenceBehaviorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@SequenceBehaviorNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@SequenceBehaviorNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0SequenceBehaviorNode\@\@QEAA\@XZ + * @symbol ??0SequenceBehaviorNode\@\@QEAA\@XZ */ MCAPI SequenceBehaviorNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SequenceDefinition.hpp b/LiteLoader/include/llapi/mc/SequenceDefinition.hpp index c17241a8f9..c6b982c974 100644 --- a/LiteLoader/include/llapi/mc/SequenceDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SequenceDefinition.hpp @@ -32,14 +32,14 @@ class SequenceDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SequenceDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SequenceDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SequenceDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp index e7079c6e15..974ae5f029 100644 --- a/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp +++ b/LiteLoader/include/llapi/mc/SerializedAbilitiesData.hpp @@ -28,23 +28,23 @@ struct SerializedAbilitiesData { public: /** - * @symbol ??0SerializedAbilitiesData\@\@QEAA\@XZ + * @symbol ??0SerializedAbilitiesData\@\@QEAA\@XZ */ MCAPI SerializedAbilitiesData(); /** - * @symbol ??0SerializedAbilitiesData\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z + * @symbol ??0SerializedAbilitiesData\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z */ MCAPI SerializedAbilitiesData(struct ActorUniqueID, class LayeredAbilities const &); /** - * @symbol ?fillIn\@SerializedAbilitiesData\@\@QEBAXAEAVLayeredAbilities\@\@\@Z + * @symbol ?fillIn\@SerializedAbilitiesData\@\@QEBAXAEAVLayeredAbilities\@\@\@Z */ MCAPI void fillIn(class LayeredAbilities &) const; /** - * @symbol ?getTargetPlayer\@SerializedAbilitiesData\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getTargetPlayer\@SerializedAbilitiesData\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getTargetPlayer() const; /** - * @symbol ??1SerializedAbilitiesData\@\@QEAA\@XZ + * @symbol ??1SerializedAbilitiesData\@\@QEAA\@XZ */ MCAPI ~SerializedAbilitiesData(); diff --git a/LiteLoader/include/llapi/mc/SerializedPersonaPieceHandle.hpp b/LiteLoader/include/llapi/mc/SerializedPersonaPieceHandle.hpp index 1f69ad846e..fdb63bc5d9 100644 --- a/LiteLoader/include/llapi/mc/SerializedPersonaPieceHandle.hpp +++ b/LiteLoader/include/llapi/mc/SerializedPersonaPieceHandle.hpp @@ -22,15 +22,18 @@ class SerializedPersonaPieceHandle { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERIALIZEDPERSONAPIECEHANDLE public: - class SerializedPersonaPieceHandle& operator=(class SerializedPersonaPieceHandle const &) = delete; SerializedPersonaPieceHandle(class SerializedPersonaPieceHandle const &) = delete; SerializedPersonaPieceHandle() = delete; #endif public: /** - * @symbol ??0SerializedPersonaPieceHandle\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PieceType\@persona\@\@VUUID\@mce\@\@_N0\@Z + * @symbol ??0SerializedPersonaPieceHandle\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PieceType\@persona\@\@VUUID\@mce\@\@_N0\@Z */ MCAPI SerializedPersonaPieceHandle(std::string const &, enum class persona::PieceType, class mce::UUID, bool, std::string const &); + /** + * @symbol ??4SerializedPersonaPieceHandle\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class SerializedPersonaPieceHandle & operator=(class SerializedPersonaPieceHandle const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SerializedSkin.hpp b/LiteLoader/include/llapi/mc/SerializedSkin.hpp index 2ecb0ad171..297151ac54 100644 --- a/LiteLoader/include/llapi/mc/SerializedSkin.hpp +++ b/LiteLoader/include/llapi/mc/SerializedSkin.hpp @@ -20,76 +20,76 @@ class SerializedSkin { #define AFTER_EXTRA // Add Member There - char filler[620]; + char filler[0x250]; #undef AFTER_EXTRA public: /** - * @symbol ??0SerializedSkin\@\@QEAA\@AEBVSubClientConnectionRequest\@\@\@Z + * @symbol ??0SerializedSkin\@\@QEAA\@AEBV0\@\@Z */ - MCAPI SerializedSkin(class SubClientConnectionRequest const &); + MCAPI SerializedSkin(class SerializedSkin const &); /** - * @symbol ??0SerializedSkin\@\@QEAA\@AEBVConnectionRequest\@\@\@Z + * @symbol ??0SerializedSkin\@\@QEAA\@AEBVSubClientConnectionRequest\@\@\@Z */ - MCAPI SerializedSkin(class ConnectionRequest const &); + MCAPI SerializedSkin(class SubClientConnectionRequest const &); /** - * @symbol ??0SerializedSkin\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0SerializedSkin\@\@QEAA\@XZ */ - MCAPI SerializedSkin(class SerializedSkin const &); + MCAPI SerializedSkin(); /** - * @symbol ??0SerializedSkin\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0SerializedSkin\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI SerializedSkin(class SerializedSkin &&); /** - * @symbol ??0SerializedSkin\@\@QEAA\@XZ + * @symbol ??0SerializedSkin\@\@QEAA\@AEBVConnectionRequest\@\@\@Z */ - MCAPI SerializedSkin(); + MCAPI SerializedSkin(class ConnectionRequest const &); /** - * @symbol ?getAnimationFrames\@SerializedSkin\@\@QEBAMW4AnimatedTextureType\@persona\@\@\@Z + * @symbol ?getAnimationFrames\@SerializedSkin\@\@QEBAMW4AnimatedTextureType\@persona\@\@\@Z */ MCAPI float getAnimationFrames(enum class persona::AnimatedTextureType) const; /** - * @symbol ?getName\@SerializedSkin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@SerializedSkin\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?isTrustedSkin\@SerializedSkin\@\@QEBA_NXZ + * @symbol ?isTrustedSkin\@SerializedSkin\@\@QEBA_NXZ */ MCAPI bool isTrustedSkin() const; /** - * @symbol ??4SerializedSkin\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4SerializedSkin\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class SerializedSkin & operator=(class SerializedSkin const &); /** - * @symbol ?read\@SerializedSkin\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z + * @symbol ?read\@SerializedSkin\@\@QEAA_NAEAVReadOnlyBinaryStream\@\@\@Z */ MCAPI bool read(class ReadOnlyBinaryStream &); /** - * @symbol ?setIsTrustedSkin\@SerializedSkin\@\@QEAAX_N\@Z + * @symbol ?setIsTrustedSkin\@SerializedSkin\@\@QEAAX_N\@Z */ MCAPI void setIsTrustedSkin(bool); /** - * @symbol ?updateGeometryName\@SerializedSkin\@\@QEAAXXZ + * @symbol ?updateGeometryName\@SerializedSkin\@\@QEAAXXZ */ MCAPI void updateGeometryName(); /** - * @symbol ?useBlinkingAnimation\@SerializedSkin\@\@QEBA_NXZ + * @symbol ?useBlinkingAnimation\@SerializedSkin\@\@QEBA_NXZ */ MCAPI bool useBlinkingAnimation() const; /** - * @symbol ?write\@SerializedSkin\@\@QEBAXAEAVBinaryStream\@\@\@Z + * @symbol ?write\@SerializedSkin\@\@QEBAXAEAVBinaryStream\@\@\@Z */ MCAPI void write(class BinaryStream &) const; /** - * @symbol ??1SerializedSkin\@\@QEAA\@XZ + * @symbol ??1SerializedSkin\@\@QEAA\@XZ */ MCAPI ~SerializedSkin(); /** - * @symbol ?createTrustedDefaultSerializedSkin\@SerializedSkin\@\@SA?AV1\@XZ + * @symbol ?createTrustedDefaultSerializedSkin\@SerializedSkin\@\@SA?AV1\@XZ */ MCAPI static class SerializedSkin createTrustedDefaultSerializedSkin(); /** - * @symbol ?isSkinDisabled\@SerializedSkin\@\@SA_NAEBV1\@AEBVLevelData\@\@\@Z + * @symbol ?isSkinDisabled\@SerializedSkin\@\@SA_NAEBV1\@AEBVLevelData\@\@\@Z */ MCAPI static bool isSkinDisabled(class SerializedSkin const &, class LevelData const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SerializerContext.hpp b/LiteLoader/include/llapi/mc/SerializerContext.hpp index 577948f850..a961565474 100644 --- a/LiteLoader/include/llapi/mc/SerializerContext.hpp +++ b/LiteLoader/include/llapi/mc/SerializerContext.hpp @@ -24,49 +24,52 @@ class SerializerContext { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERIALIZERCONTEXT public: class SerializerContext& operator=(class SerializerContext const &) = delete; - SerializerContext(class SerializerContext const &) = delete; #endif public: /** - * @symbol ??0SerializerContext\@\@QEAA\@XZ + * @symbol ??0SerializerContext\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI SerializerContext(class SerializerContext const &); + /** + * @symbol ??0SerializerContext\@\@QEAA\@XZ */ MCAPI SerializerContext(); /** - * @symbol ?clear\@SerializerContext\@\@QEAAXXZ + * @symbol ?clear\@SerializerContext\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?consumeContext\@SerializerContext\@\@QEAAX$$QEAV1\@\@Z + * @symbol ?consumeContext\@SerializerContext\@\@QEAAX$$QEAV1\@\@Z */ MCAPI void consumeContext(class SerializerContext &&); /** - * @symbol ?detachContext\@SerializerContext\@\@QEAA?AV1\@XZ + * @symbol ?detachContext\@SerializerContext\@\@QEAA?AV1\@XZ */ MCAPI class SerializerContext detachContext(); /** - * @symbol ?getErrors\@SerializerContext\@\@QEBA?AV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@std\@\@XZ + * @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 ?log\@SerializerContext\@\@QEAA?AW4ResultCode\@internal\@reflection\@\@W4234\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?log\@SerializerContext\@\@QEAA?AW4ResultCode\@internal\@reflection\@\@W4234\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class reflection::internal::ResultCode log(enum class reflection::internal::ResultCode, std::string); /** - * @symbol ?popContext\@SerializerContext\@\@QEAAXXZ + * @symbol ?popContext\@SerializerContext\@\@QEAAXXZ */ MCAPI void popContext(); /** - * @symbol ?pushContext\@SerializerContext\@\@QEAAAEAV1\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z + * @symbol ?pushContext\@SerializerContext\@\@QEAAAEAV1\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@Z */ MCAPI class SerializerContext & pushContext(struct std::pair); /** - * @symbol ??1SerializerContext\@\@QEAA\@XZ + * @symbol ??1SerializerContext\@\@QEAA\@XZ */ MCAPI ~SerializerContext(); /** - * @symbol ?contextString\@SerializerContext\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?contextString\@SerializerContext\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@V?$allocator\@U?$pair\@W4ContextType\@SerializerContext\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::string contextString(std::vector> const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp b/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp index 9db3c01407..e293a2e826 100644 --- a/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp +++ b/LiteLoader/include/llapi/mc/SerializerEnumMapping.hpp @@ -30,20 +30,20 @@ class SerializerEnumMapping { public: /** - * @symbol ?lookup\@SerializerEnumMapping\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_J\@Z + * @symbol ?lookup\@SerializerEnumMapping\@\@QEBA_N_JAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI bool lookup(std::string const &, __int64 &) const; + MCAPI bool lookup(__int64, std::string &) const; /** - * @symbol ?lookup\@SerializerEnumMapping\@\@QEBA_N_JAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?lookup\@SerializerEnumMapping\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_J\@Z */ - MCAPI bool lookup(__int64, std::string &) const; + MCAPI bool lookup(std::string const &, __int64 &) const; /** - * @symbol ??4SerializerEnumMapping\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4SerializerEnumMapping\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class SerializerEnumMapping & operator=(class SerializerEnumMapping &&); /** - * @symbol ?toString\@SerializerEnumMapping\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@SerializerEnumMapping\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SerializerTraits.hpp b/LiteLoader/include/llapi/mc/SerializerTraits.hpp index 97edfd4f0d..0008e88152 100644 --- a/LiteLoader/include/llapi/mc/SerializerTraits.hpp +++ b/LiteLoader/include/llapi/mc/SerializerTraits.hpp @@ -23,45 +23,41 @@ struct SerializerTraits { #undef AFTER_EXTRA public: /** - * @symbol ??0SerializerTraits\@\@QEAA\@XZ + * @symbol ??0SerializerTraits\@\@QEAA\@XZ */ MCAPI SerializerTraits(); /** - * @symbol ??0SerializerTraits\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SerializerTraits\@\@QEAA\@AEBU0\@\@Z */ MCAPI SerializerTraits(struct SerializerTraits const &); /** - * @symbol ??0SerializerTraits\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SerializerTraits\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SerializerTraits(struct SerializerTraits &&); /** - * @symbol ?help\@SerializerTraits\@\@QEAAAEAU1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI struct SerializerTraits & help(std::string const &); - /** - * @symbol ?name\@SerializerTraits\@\@QEAAAEAU1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?name\@SerializerTraits\@\@QEAAAEAU1\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct SerializerTraits & name(std::string); /** - * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ - MCAPI struct SerializerTraits & operator=(struct SerializerTraits const &); + MCAPI struct SerializerTraits & operator=(struct SerializerTraits &&); /** - * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SerializerTraits\@\@QEAAAEAU0\@AEBU0\@\@Z */ - MCAPI struct SerializerTraits & operator=(struct SerializerTraits &&); + MCAPI struct SerializerTraits & operator=(struct SerializerTraits const &); /** - * @symbol ?validate\@SerializerTraits\@\@QEAAAEAU1\@V?$function\@$$A6A_NAEAVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z\@std\@\@\@Z + * @symbol ?validate\@SerializerTraits\@\@QEAAAEAU1\@V?$function\@$$A6A_NAEAVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z\@std\@\@\@Z */ MCAPI struct SerializerTraits & validate(class std::function); /** - * @symbol ??1SerializerTraits\@\@QEAA\@XZ + * @symbol ??1SerializerTraits\@\@QEAA\@XZ */ MCAPI ~SerializerTraits(); //private: /** - * @symbol ?performValidation\@SerializerTraits\@\@AEBA_NVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z + * @symbol ?performValidation\@SerializerTraits\@\@AEBA_NVmeta_any\@entt\@\@AEAVSerializerContext\@\@\@Z */ MCAPI bool performValidation(class entt::meta_any, class SerializerContext &) const; diff --git a/LiteLoader/include/llapi/mc/ServerActorManagerProxy.hpp b/LiteLoader/include/llapi/mc/ServerActorManagerProxy.hpp index e7bf820cb0..8130c8996d 100644 --- a/LiteLoader/include/llapi/mc/ServerActorManagerProxy.hpp +++ b/LiteLoader/include/llapi/mc/ServerActorManagerProxy.hpp @@ -25,23 +25,33 @@ class ServerActorManagerProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerActorManagerProxy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeActor\@ServerActorManagerProxy\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?initializeActor\@ServerActorManagerProxy\@\@UEAAXAEAVActor\@\@\@Z */ virtual void initializeActor(class Actor &); /** - * @vftbl 2 - * @symbol ?validate\@ServerActorManagerProxy\@\@UEAA_NAEBVActor\@\@\@Z + * @vftbl 2 + * @symbol ?validate\@ServerActorManagerProxy\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool validate(class Actor const &); /** - * @symbol ??0ServerActorManagerProxy\@\@QEAA\@AEAVServerLevel\@\@\@Z + * @vftbl 3 + * @symbol ?removeActorInLevelChunk\@ServerActorManagerProxy\@\@UEAAXAEBVActor\@\@\@Z + */ + virtual void removeActorInLevelChunk(class Actor const &); + /** + * @vftbl 4 + * @symbol ?deleteActorFromWorldInLevelChunk\@ServerActorManagerProxy\@\@UEAAXAEBVActor\@\@\@Z + */ + virtual void deleteActorFromWorldInLevelChunk(class Actor const &); + /** + * @symbol ??0ServerActorManagerProxy\@\@QEAA\@AEAVServerLevel\@\@\@Z */ MCAPI ServerActorManagerProxy(class ServerLevel &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerAnimationSystem.hpp b/LiteLoader/include/llapi/mc/ServerAnimationSystem.hpp index 392f3dafd4..6992fe8719 100644 --- a/LiteLoader/include/llapi/mc/ServerAnimationSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerAnimationSystem.hpp @@ -28,8 +28,8 @@ class ServerAnimationSystem { public: /** - * @symbol ?createServerAnimationSystem\@ServerAnimationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerAnimationSystem\@ServerAnimationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createServerAnimationSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp index fca01ad41f..e6e0069077 100644 --- a/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerAutoStepSystem.hpp @@ -28,32 +28,32 @@ class ServerAutoStepSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerAutoStepSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@ServerAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 + * @vftbl 3 + * @symbol ?tick\@ServerAutoStepSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@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\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ virtual void tick(class StrictExecutionContext, class FlagComponent, 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 + * @symbol ?createServerAutoStepSystem\@ServerAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createServerAutoStepSystem(); /** - * @symbol ?createServerAutoStepSystemSideBySide\@ServerAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createServerAutoStepSystemSideBySide\@ServerAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createServerAutoStepSystemSideBySide(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerCommand.hpp b/LiteLoader/include/llapi/mc/ServerCommand.hpp index 309e8a61bb..854abac762 100644 --- a/LiteLoader/include/llapi/mc/ServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommand.hpp @@ -29,25 +29,25 @@ class ServerCommand { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERCOMMAND /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ServerCommand(); #endif /** - * @symbol ?setup\@ServerCommand\@\@SAXAEAVMinecraft\@\@\@Z + * @symbol ?setup\@ServerCommand\@\@SAXAEAVMinecraft\@\@\@Z */ MCAPI static void setup(class Minecraft &); //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\@\@0\@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; protected: /** - * @symbol ?mGame\@ServerCommand\@\@1PEAVMinecraft\@\@EA + * @symbol ?mGame\@ServerCommand\@\@1PEAVMinecraft\@\@EA */ MCAPI static class Minecraft * mGame; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp b/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp index 35b5dfe0f0..187e96a2a2 100644 --- a/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommandOrigin.hpp @@ -32,92 +32,98 @@ class ServerCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@ServerCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@ServerCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@ServerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ServerCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@ServerCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@ServerCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@ServerCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@ServerCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@ServerCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@ServerCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@ServerCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@ServerCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@ServerCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@ServerCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@ServerCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@ServerCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@ServerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@ServerCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@ServerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@ServerCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@ServerCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@ServerCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@ServerCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@ServerCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@ServerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@ServerCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 29 - * @symbol ?serialize\@ServerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@ServerCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@ServerCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@ServerCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERCOMMANDORIGIN /** - * @symbol ??0ServerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVServerLevel\@\@W4CommandPermissionLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerCommandOrigin(); +#endif + /** + * @symbol ??0ServerCommandOrigin\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVServerLevel\@\@W4CommandPermissionLevel\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI ServerCommandOrigin(std::string const &, class ServerLevel &, enum class CommandPermissionLevel, class AutomaticID); /** - * @symbol ?load\@ServerCommandOrigin\@\@SA?AV?$unique_ptr\@VServerCommandOrigin\@\@U?$default_delete\@VServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z + * @symbol ?load\@ServerCommandOrigin\@\@SA?AV?$unique_ptr\@VServerCommandOrigin\@\@U?$default_delete\@VServerCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class ServerLevel &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerCommands.hpp b/LiteLoader/include/llapi/mc/ServerCommands.hpp index c6216babb9..2e56079efb 100644 --- a/LiteLoader/include/llapi/mc/ServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommands.hpp @@ -22,11 +22,11 @@ namespace ServerCommands { #undef AFTER_EXTRA /** - * @symbol ?setupCommonEnums\@ServerCommands\@\@YAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setupCommonEnums\@ServerCommands\@\@YAXAEAVCommandRegistry\@\@\@Z */ MCAPI void setupCommonEnums(class CommandRegistry &); /** - * @symbol ?setupStandardServer\@ServerCommands\@\@YAXAEAVMinecraft\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1PEAVPermissionsFile\@\@\@Z + * @symbol ?setupStandardServer\@ServerCommands\@\@YAXAEAVMinecraft\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1PEAVPermissionsFile\@\@\@Z */ MCAPI void setupStandardServer(class Minecraft &, std::string const &, std::string const &, class PermissionsFile *); diff --git a/LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp b/LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp index e7a2e4ba5e..6cc94510af 100644 --- a/LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp +++ b/LiteLoader/include/llapi/mc/ServerCommunicationInterface.hpp @@ -31,36 +31,36 @@ class ServerCommunicationInterface { public: /** - * @symbol ?sendBandwidthMetric\@ServerCommunicationInterface\@\@QEAAX_K000AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?sendBandwidthMetric\@ServerCommunicationInterface\@\@QEAAX_K000AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void sendBandwidthMetric(unsigned __int64, unsigned __int64, unsigned __int64, unsigned __int64, std::string const &); /** - * @symbol ?sendChunkLoadTelemtryData\@ServerCommunicationInterface\@\@QEAAXAEBUChunkLoadTelemetryData\@\@\@Z + * @symbol ?sendChunkLoadTelemtryData\@ServerCommunicationInterface\@\@QEAAXAEBUChunkLoadTelemetryData\@\@\@Z */ MCAPI void sendChunkLoadTelemtryData(struct ChunkLoadTelemetryData const &); /** - * @symbol ?sendServerStarted\@ServerCommunicationInterface\@\@QEAAXXZ + * @symbol ?sendServerStarted\@ServerCommunicationInterface\@\@QEAAXXZ */ MCAPI void sendServerStarted(); /** - * @symbol ?sendServerTickTime\@ServerCommunicationInterface\@\@QEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?sendServerTickTime\@ServerCommunicationInterface\@\@QEAAXV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI void sendServerTickTime(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); /** - * @symbol ??1ServerCommunicationInterface\@\@QEAA\@XZ + * @symbol ??1ServerCommunicationInterface\@\@QEAA\@XZ */ MCAPI ~ServerCommunicationInterface(); /** - * @symbol ?create\@ServerCommunicationInterface\@\@SA?AV?$unique_ptr\@VServerCommunicationInterface\@\@U?$default_delete\@VServerCommunicationInterface\@\@\@std\@\@\@std\@\@AEBUNetworkAddress\@\@\@Z + * @symbol ?create\@ServerCommunicationInterface\@\@SA?AV?$unique_ptr\@VServerCommunicationInterface\@\@U?$default_delete\@VServerCommunicationInterface\@\@\@std\@\@\@std\@\@AEBUNetworkAddress\@\@\@Z */ MCAPI static std::unique_ptr create(struct NetworkAddress const &); //private: /** - * @symbol ?communicate\@ServerCommunicationInterface\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?communicate\@ServerCommunicationInterface\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void communicate(std::string const &, class Json::Value const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp b/LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp index 91485c82f0..e2808b20b3 100644 --- a/LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp +++ b/LiteLoader/include/llapi/mc/ServerContentKeyProvider.hpp @@ -30,49 +30,49 @@ class ServerContentKeyProvider { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerContentKeyProvider(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getContentKey\@ServerContentKeyProvider\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVContentIdentity\@\@\@Z + * @vftbl 1 + * @symbol ?getContentKey\@ServerContentKeyProvider\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVContentIdentity\@\@\@Z */ virtual std::string getContentKey(class ContentIdentity const &) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canAccess\@ServerContentKeyProvider\@\@UEBA_NAEBVContentIdentity\@\@\@Z + * @vftbl 6 + * @symbol ?canAccess\@ServerContentKeyProvider\@\@UEBA_NAEBVContentIdentity\@\@\@Z */ virtual bool canAccess(class ContentIdentity const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERCONTENTKEYPROVIDER /** - * @symbol ?clearTempContentKeys\@ServerContentKeyProvider\@\@UEAAXXZ + * @symbol ?clearTempContentKeys\@ServerContentKeyProvider\@\@UEAAXXZ */ MCVAPI void clearTempContentKeys(); /** - * @symbol ?setTempContentKeys\@ServerContentKeyProvider\@\@UEAAXAEBV?$unordered_map\@VContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VContentIdentity\@\@\@3\@U?$equal_to\@VContentIdentity\@\@\@3\@V?$allocator\@U?$pair\@$$CBVContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @symbol ?setTempContentKeys\@ServerContentKeyProvider\@\@UEAAXAEBV?$unordered_map\@VContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@VContentIdentity\@\@\@3\@U?$equal_to\@VContentIdentity\@\@\@3\@V?$allocator\@U?$pair\@$$CBVContentIdentity\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ MCVAPI void setTempContentKeys(class std::unordered_map, struct std::equal_to, class std::allocator>> const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerCorrectionPolicy.hpp b/LiteLoader/include/llapi/mc/ServerCorrectionPolicy.hpp index ed85890996..c28879a07d 100644 --- a/LiteLoader/include/llapi/mc/ServerCorrectionPolicy.hpp +++ b/LiteLoader/include/llapi/mc/ServerCorrectionPolicy.hpp @@ -31,14 +31,14 @@ class ServerCorrectionPolicy : public ClientReplayStatePolicy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerCorrectionPolicy(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?shouldCorrectMovement\@ServerCorrectionPolicy\@\@UEAA?AUMovementCorrection\@\@AEAUIActorMovementProxy\@\@AEBVPlayerAuthInputPacket\@\@_K\@Z + * @vftbl 3 + * @symbol ?shouldCorrectMovement\@ServerCorrectionPolicy\@\@UEAA?AUMovementCorrection\@\@AEAUIActorMovementProxy\@\@AEBVPlayerAuthInputPacket\@\@_K\@Z */ virtual struct MovementCorrection shouldCorrectMovement(struct IActorMovementProxy &, class PlayerAuthInputPacket const &, unsigned __int64); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp b/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp index d8327d0ca7..4e987522fb 100644 --- a/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp +++ b/LiteLoader/include/llapi/mc/ServerFileChunkUploader.hpp @@ -32,342 +32,77 @@ class ServerFileChunkUploader : public IFileChunkUploader { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerFileChunkUploader(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?initFileUploader\@ServerFileChunkUploader\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFileInfo\@\@HAEBVValue\@Json\@\@V?$function\@$$A6AX_N\@Z\@3\@\@Z + * @vftbl 2 + * @symbol ?initFileUploader\@ServerFileChunkUploader\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUFileInfo\@\@HAEBVValue\@Json\@\@V?$function\@$$A6AX_N\@Z\@3\@\@Z */ virtual void initFileUploader(std::string const &, struct FileInfo const &, int, class Json::Value const &, class std::function); /** - * @vftbl 3 - * @symbol ?getServerMissingChunks\@ServerFileChunkUploader\@\@UEBAXAEBUFileInfo\@\@V?$function\@$$A6AXV?$vector\@UFileChunkInfo\@\@V?$allocator\@UFileChunkInfo\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@Z + * @vftbl 3 + * @symbol ?getServerMissingChunks\@ServerFileChunkUploader\@\@UEBAXAEBUFileInfo\@\@V?$function\@$$A6AXV?$vector\@UFileChunkInfo\@\@V?$allocator\@UFileChunkInfo\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@Z */ virtual void getServerMissingChunks(struct FileInfo const &, class std::function)>) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?uploadChunk\@ServerFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@AEBV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@V?$function\@$$A6AX_N\@Z\@5\@\@Z + * @vftbl 5 + * @symbol ?uploadChunk\@ServerFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@AEBV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@V?$function\@$$A6AX_N\@Z\@5\@\@Z */ virtual void uploadChunk(struct FileInfo const &, struct FileChunkInfo const &, std::vector const &, class std::function); /** - * @vftbl 7 - * @symbol ?canCancelUpload\@ServerFileChunkUploader\@\@UEBA_NAEBUFileInfo\@\@\@Z + * @vftbl 7 + * @symbol ?canCancelUpload\@ServerFileChunkUploader\@\@UEBA_NAEBUFileInfo\@\@\@Z */ virtual bool canCancelUpload(struct FileInfo const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getInitErrorCode\@ServerFileChunkUploader\@\@UEBA?AW4UploadError\@\@XZ + * @vftbl 9 + * @symbol ?getInitErrorCode\@ServerFileChunkUploader\@\@UEBA?AW4UploadError\@\@XZ */ virtual enum class UploadError getInitErrorCode() const; /** - * @vftbl 10 - * @symbol ?getUploadProgress\@ServerFileChunkUploader\@\@UEBAMAEBUFileInfo\@\@\@Z + * @vftbl 10 + * @symbol ?getUploadProgress\@ServerFileChunkUploader\@\@UEBAMAEBUFileInfo\@\@\@Z */ virtual float getUploadProgress(struct FileInfo const &) const; /** - * @vftbl 11 - * @symbol ?getChunkInfo\@ServerFileChunkUploader\@\@UEBA?AUFileChunkInfo\@\@AEBUFileInfo\@\@H\@Z + * @vftbl 11 + * @symbol ?getChunkInfo\@ServerFileChunkUploader\@\@UEBA?AUFileChunkInfo\@\@AEBUFileInfo\@\@H\@Z */ virtual struct FileChunkInfo getChunkInfo(struct FileInfo const &, int) const; - /** - * @vftbl 12 - * @symbol __unk_vfn_12 - */ - virtual void __unk_vfn_12(); - /** - * @vftbl 13 - * @symbol __unk_vfn_13 - */ - virtual void __unk_vfn_13(); - /** - * @vftbl 14 - * @symbol __unk_vfn_14 - */ - virtual void __unk_vfn_14(); - /** - * @vftbl 15 - * @symbol __unk_vfn_15 - */ - virtual void __unk_vfn_15(); - /** - * @vftbl 16 - * @symbol __unk_vfn_16 - */ - virtual void __unk_vfn_16(); - /** - * @vftbl 17 - * @symbol __unk_vfn_17 - */ - virtual void __unk_vfn_17(); - /** - * @vftbl 18 - * @symbol __unk_vfn_18 - */ - virtual void __unk_vfn_18(); - /** - * @vftbl 19 - * @symbol __unk_vfn_19 - */ - virtual void __unk_vfn_19(); - /** - * @vftbl 20 - * @symbol __unk_vfn_20 - */ - virtual void __unk_vfn_20(); - /** - * @vftbl 21 - * @symbol __unk_vfn_21 - */ - virtual void __unk_vfn_21(); - /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 - */ - virtual void __unk_vfn_23(); - /** - * @vftbl 24 - * @symbol __unk_vfn_24 - */ - virtual void __unk_vfn_24(); - /** - * @vftbl 25 - * @symbol __unk_vfn_25 - */ - virtual void __unk_vfn_25(); - /** - * @vftbl 26 - * @symbol __unk_vfn_26 - */ - virtual void __unk_vfn_26(); - /** - * @vftbl 27 - * @symbol __unk_vfn_27 - */ - virtual void __unk_vfn_27(); - /** - * @vftbl 28 - * @symbol __unk_vfn_28 - */ - virtual void __unk_vfn_28(); - /** - * @vftbl 29 - * @symbol __unk_vfn_29 - */ - virtual void __unk_vfn_29(); - /** - * @vftbl 30 - * @symbol __unk_vfn_30 - */ - virtual void __unk_vfn_30(); - /** - * @vftbl 31 - * @symbol __unk_vfn_31 - */ - virtual void __unk_vfn_31(); - /** - * @vftbl 32 - * @symbol __unk_vfn_32 - */ - virtual void __unk_vfn_32(); - /** - * @vftbl 33 - * @symbol __unk_vfn_33 - */ - virtual void __unk_vfn_33(); - /** - * @vftbl 34 - * @symbol __unk_vfn_34 - */ - virtual void __unk_vfn_34(); - /** - * @vftbl 35 - * @symbol __unk_vfn_35 - */ - virtual void __unk_vfn_35(); - /** - * @vftbl 36 - * @symbol __unk_vfn_36 - */ - virtual void __unk_vfn_36(); - /** - * @vftbl 37 - * @symbol __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 ?_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); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERFILECHUNKUPLOADER /** - * @symbol ?cancelUpload\@ServerFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@\@Z + * @symbol ?cancelUpload\@ServerFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@\@Z */ MCVAPI void cancelUpload(struct FileInfo const &); /** - * @symbol ?confirmChunkReceived\@ServerFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@\@Z + * @symbol ?confirmChunkReceived\@ServerFileChunkUploader\@\@UEAAXAEBUFileInfo\@\@AEBUFileChunkInfo\@\@\@Z */ MCVAPI void confirmChunkReceived(struct FileInfo const &, struct FileChunkInfo const &); /** - * @symbol ?update\@ServerFileChunkUploader\@\@UEAAXXZ + * @symbol ?update\@ServerFileChunkUploader\@\@UEAAXXZ */ MCVAPI void update(); #endif /** - * @symbol ??0ServerFileChunkUploader\@\@QEAA\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ??0ServerFileChunkUploader\@\@QEAA\@AEAVPacketSender\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI ServerFileChunkUploader(class PacketSender &, class NetworkIdentifier const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerInstance.hpp b/LiteLoader/include/llapi/mc/ServerInstance.hpp index 54ed8272e1..2589f46e6e 100644 --- a/LiteLoader/include/llapi/mc/ServerInstance.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstance.hpp @@ -35,133 +35,137 @@ class ServerInstance { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERINSTANCE /** - * @symbol ?onAppResumed\@ServerInstance\@\@UEAAXXZ + * @symbol ?onAppResumed\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onAppResumed(); /** - * @symbol ?onAppSuspended\@ServerInstance\@\@UEAAXXZ + * @symbol ?onAppSuspended\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onAppSuspended(); /** - * @symbol ?onCriticalDiskError\@ServerInstance\@\@UEAAX_NAEBW4LevelStorageState\@Core\@\@\@Z + * @symbol ?onCriticalDiskError\@ServerInstance\@\@UEAAX_NAEBW4LevelStorageState\@Core\@\@\@Z */ MCVAPI void onCriticalDiskError(bool, enum class Core::LevelStorageState const &); /** - * @symbol ?onGameModeChanged\@ServerInstance\@\@UEAAXXZ + * @symbol ?onGameModeChanged\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onGameModeChanged(); /** - * @symbol ?onGameSessionReset\@ServerInstance\@\@UEAAXXZ + * @symbol ?onGameSessionReset\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onGameSessionReset(); /** - * @symbol ?onInternetUpdate\@ServerInstance\@\@UEAAXXZ + * @symbol ?onInternetUpdate\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onInternetUpdate(); /** - * @symbol ?onLevelCorrupt\@ServerInstance\@\@UEAAXXZ + * @symbol ?onLevelCorrupt\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onLevelCorrupt(); /** - * @symbol ?onLevelExit\@ServerInstance\@\@UEAAXXZ + * @symbol ?onLevelExit\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onLevelExit(); /** - * @symbol ?onLowDiskSpace\@ServerInstance\@\@UEAAX_N\@Z + * @symbol ?onLowDiskSpace\@ServerInstance\@\@UEAAX_N\@Z */ MCVAPI void onLowDiskSpace(bool); /** - * @symbol ?onLowMemory\@ServerInstance\@\@UEAAXXZ + * @symbol ?onLowMemory\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onLowMemory(); /** - * @symbol ?onOutOfDiskSpace\@ServerInstance\@\@UEAAX_N\@Z + * @symbol ?onOutOfDiskSpace\@ServerInstance\@\@UEAAX_N\@Z */ MCVAPI void onOutOfDiskSpace(bool); /** - * @symbol ?onRequestResourceReload\@ServerInstance\@\@UEAAXXZ + * @symbol ?onRequestResourceReload\@ServerInstance\@\@UEAAXXZ */ MCVAPI void onRequestResourceReload(); /** - * @symbol ?onTick\@ServerInstance\@\@UEAAXHH\@Z + * @symbol ?onTick\@ServerInstance\@\@UEAAXHH\@Z */ MCVAPI void onTick(int, int); /** - * @symbol ?updateScreens\@ServerInstance\@\@UEAAXXZ + * @symbol ?updateScreens\@ServerInstance\@\@UEAAXXZ */ MCVAPI void updateScreens(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ServerInstance(); #endif /** - * @symbol ??0ServerInstance\@\@QEAA\@AEAVIMinecraftApp\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VServerInstanceEventCoordinator\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0ServerInstance\@\@QEAA\@AEAVIMinecraftApp\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VServerInstanceEventCoordinator\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI ServerInstance(class IMinecraftApp &, class gsl::not_null> const &); /** - * @symbol ?disconnectAllClientsWithMessage\@ServerInstance\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?disconnectAllClientsWithMessage\@ServerInstance\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void disconnectAllClientsWithMessage(std::string); /** - * @symbol ?enableItemStackNetManager\@ServerInstance\@\@QEBA_NXZ + * @symbol ?enableItemStackNetManager\@ServerInstance\@\@QEBA_NXZ */ MCAPI bool enableItemStackNetManager() const; /** - * @symbol ?getEditorManager\@ServerInstance\@\@QEBA?AV?$NonOwnerPointer\@VIEditorManager\@Editor\@\@\@Bedrock\@\@XZ + * @symbol ?getEditorManager\@ServerInstance\@\@QEBA?AV?$NonOwnerPointer\@VIEditorManager\@Editor\@\@\@Bedrock\@\@XZ */ MCAPI class Bedrock::NonOwnerPointer getEditorManager() const; /** - * @symbol ?getScriptingEngineV2\@ServerInstance\@\@QEAAPEAVScriptEngine\@Scripting\@\@XZ + * @symbol ?getScriptingEngineV2\@ServerInstance\@\@QEAAPEAVScriptEngine\@Scripting\@\@XZ */ MCAPI class Scripting::ScriptEngine * getScriptingEngineV2(); /** - * @symbol ?getServerItemRegistry\@ServerInstance\@\@QEBA?AVItemRegistryRef\@\@XZ + * @symbol ?getServerItemRegistry\@ServerInstance\@\@QEBA?AVItemRegistryRef\@\@XZ */ 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\@\@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\@\@W4TransportLayer\@\@7MV?$optional\@_N\@9\@\@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); /** - * @symbol ?leaveGameSync\@ServerInstance\@\@QEAAXXZ + * @symbol ?leaveGameSync\@ServerInstance\@\@QEAAXXZ */ MCAPI void leaveGameSync(); /** - * @symbol ?queueForServerThread\@ServerInstance\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?queueForServerThread\@ServerInstance\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void queueForServerThread(class std::function); /** - * @symbol ?setLevelCorruptionCallback\@ServerInstance\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?setLevelCorruptionCallback\@ServerInstance\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void setLevelCorruptionCallback(class std::function); /** - * @symbol ?setWakeupFrequency\@ServerInstance\@\@QEAAXH\@Z + * @symbol ?setWakeupFrequency\@ServerInstance\@\@QEAAXH\@Z */ MCAPI void setWakeupFrequency(int); /** - * @symbol ?shutDownWithMessage\@ServerInstance\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?shutDownWithMessage\@ServerInstance\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void shutDownWithMessage(std::string); /** - * @symbol ?startServerThread\@ServerInstance\@\@QEAAXXZ + * @symbol ?startServerThread\@ServerInstance\@\@QEAAXXZ */ MCAPI void startServerThread(); /** - * @symbol ?SERVER_MAX_DELAY_BEFORE_SLOWDOWN\@ServerInstance\@\@2V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@B + * @symbol ?SERVER_MAX_DELAY_BEFORE_SLOWDOWN\@ServerInstance\@\@2V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@B */ MCAPI static class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const SERVER_MAX_DELAY_BEFORE_SLOWDOWN; //private: /** - * @symbol ?_threadSafeExecute\@ServerInstance\@\@AEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?_threadSafeExecute\@ServerInstance\@\@AEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void _threadSafeExecute(class std::function); /** - * @symbol ?_update\@ServerInstance\@\@AEAAXXZ + * @symbol ?_update\@ServerInstance\@\@AEAAXXZ */ MCAPI void _update(); + /** + * @symbol ?_useClientSideChunkGeneration\@ServerInstance\@\@AEBA_NPEAVLevelData\@\@\@Z + */ + MCAPI bool _useClientSideChunkGeneration(class LevelData *) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp index a4edee8a5c..4aeff12272 100644 --- a/LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceEventCoordinator.hpp @@ -31,48 +31,48 @@ class ServerInstanceEventCoordinator { public: /** - * @symbol ?registerServerInstanceEventHandler\@ServerInstanceEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VServerInstanceEventHandler\@\@U?$default_delete\@VServerInstanceEventHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerServerInstanceEventHandler\@ServerInstanceEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VServerInstanceEventHandler\@\@U?$default_delete\@VServerInstanceEventHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerServerInstanceEventHandler(std::unique_ptr &&); /** - * @symbol ?sendEvent\@ServerInstanceEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ServerInstanceGameplayEvent\@X\@\@\@\@\@Z + * @symbol ?sendEvent\@ServerInstanceEventCoordinator\@\@QEAAXAEBV?$EventRef\@U?$ServerInstanceGameplayEvent\@X\@\@\@\@\@Z */ MCAPI void sendEvent(class EventRef> const &); /** - * @symbol ?sendServerInitializeEnd\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendServerInitializeEnd\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendServerInitializeEnd(class ServerInstance &); /** - * @symbol ?sendServerInitializeStart\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendServerInitializeStart\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendServerInitializeStart(class ServerInstance &); /** - * @symbol ?sendServerLevelInitialized\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@AEAVLevel\@\@\@Z + * @symbol ?sendServerLevelInitialized\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@AEAVLevel\@\@\@Z */ MCAPI void sendServerLevelInitialized(class ServerInstance &, class Level &); /** - * @symbol ?sendServerMinecraftInitialized\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?sendServerMinecraftInitialized\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI void sendServerMinecraftInitialized(class ServerInstance &, class gsl::not_null> const &); /** - * @symbol ?sendServerThreadStarted\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendServerThreadStarted\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendServerThreadStarted(class ServerInstance &); /** - * @symbol ?sendServerThreadStopped\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendServerThreadStopped\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendServerThreadStopped(class ServerInstance &); /** - * @symbol ?sendServerUpdateEnd\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendServerUpdateEnd\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendServerUpdateEnd(class ServerInstance &); /** - * @symbol ?sendServerUpdateStart\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendServerUpdateStart\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendServerUpdateStart(class ServerInstance &); /** - * @symbol ?sendStartLeaveGame\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendStartLeaveGame\@ServerInstanceEventCoordinator\@\@QEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendStartLeaveGame(class ServerInstance &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp b/LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp index c6b220273b..c122915046 100644 --- a/LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceEventListener.hpp @@ -31,33 +31,33 @@ class ServerInstanceEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERINSTANCEEVENTLISTENER /** - * @symbol ?onServerInitializeEnd\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @symbol ?onServerInitializeEnd\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ MCVAPI enum class EventResult onServerInitializeEnd(class ServerInstance &); /** - * @symbol ?onServerInitializeStart\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @symbol ?onServerInitializeStart\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ MCVAPI enum class EventResult onServerInitializeStart(class ServerInstance &); /** - * @symbol ?onServerMinecraftInitialized\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ?onServerMinecraftInitialized\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VMinecraft\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCVAPI enum class EventResult onServerMinecraftInitialized(class ServerInstance &, class gsl::not_null> const &); /** - * @symbol ?onServerResume\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @symbol ?onServerResume\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ MCVAPI enum class EventResult onServerResume(class ServerInstance &); /** - * @symbol ?onServerSuspend\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @symbol ?onServerSuspend\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ MCVAPI enum class EventResult onServerSuspend(class ServerInstance &); /** - * @symbol ?onServerUpdateEnd\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @symbol ?onServerUpdateEnd\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ MCVAPI enum class EventResult onServerUpdateEnd(class ServerInstance &); /** - * @symbol ?onStartLeaveGame\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @symbol ?onStartLeaveGame\@ServerInstanceEventListener\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ MCVAPI enum class EventResult onStartLeaveGame(class ServerInstance &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerInstanceLeaveGameDoneEvent.hpp b/LiteLoader/include/llapi/mc/ServerInstanceLeaveGameDoneEvent.hpp index 03b3706afd..02df8058e2 100644 --- a/LiteLoader/include/llapi/mc/ServerInstanceLeaveGameDoneEvent.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceLeaveGameDoneEvent.hpp @@ -25,7 +25,7 @@ struct ServerInstanceLeaveGameDoneEvent { public: /** - * @symbol ??1ServerInstanceLeaveGameDoneEvent\@\@QEAA\@XZ + * @symbol ??1ServerInstanceLeaveGameDoneEvent\@\@QEAA\@XZ */ MCAPI ~ServerInstanceLeaveGameDoneEvent(); diff --git a/LiteLoader/include/llapi/mc/ServerInstanceNotificationEvent.hpp b/LiteLoader/include/llapi/mc/ServerInstanceNotificationEvent.hpp index 1869a6c788..58492d83f6 100644 --- a/LiteLoader/include/llapi/mc/ServerInstanceNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceNotificationEvent.hpp @@ -28,7 +28,7 @@ struct ServerInstanceNotificationEvent { public: /** - * @symbol ??1ServerInstanceNotificationEvent\@\@QEAA\@XZ + * @symbol ??1ServerInstanceNotificationEvent\@\@QEAA\@XZ */ MCAPI ~ServerInstanceNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/ServerInstanceRequestResourceReload.hpp b/LiteLoader/include/llapi/mc/ServerInstanceRequestResourceReload.hpp index 6b3550f25a..0eb75a0430 100644 --- a/LiteLoader/include/llapi/mc/ServerInstanceRequestResourceReload.hpp +++ b/LiteLoader/include/llapi/mc/ServerInstanceRequestResourceReload.hpp @@ -28,7 +28,7 @@ struct ServerInstanceRequestResourceReload { public: /** - * @symbol ??1ServerInstanceRequestResourceReload\@\@QEAA\@XZ + * @symbol ??1ServerInstanceRequestResourceReload\@\@QEAA\@XZ */ MCAPI ~ServerInstanceRequestResourceReload(); diff --git a/LiteLoader/include/llapi/mc/ServerLevel.hpp b/LiteLoader/include/llapi/mc/ServerLevel.hpp index a154fb9ed1..0f83255588 100644 --- a/LiteLoader/include/llapi/mc/ServerLevel.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevel.hpp @@ -32,185 +32,189 @@ class ServerLevel { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERLEVEL /** - * @symbol ?consolidateLevelChunkMetaData\@ServerLevel\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?_subTick\@ServerLevel\@\@MEAAXXZ + */ + MCVAPI void _subTick(); + /** + * @symbol ?consolidateLevelChunkMetaData\@ServerLevel\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void consolidateLevelChunkMetaData(class LevelChunk &); /** - * @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 + * @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 */ MCVAPI void decrementTagCache(std::string const &, class TagRegistry, struct IDType> &); /** - * @symbol ?getClientResourcePackManager\@ServerLevel\@\@UEBAPEAVResourcePackManager\@\@XZ + * @symbol ?getClientResourcePackManager\@ServerLevel\@\@UEBAPEAVResourcePackManager\@\@XZ */ MCVAPI class ResourcePackManager * getClientResourcePackManager() const; /** - * @symbol ?getLevelChunkMetaDataDictionary\@ServerLevel\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ + * @symbol ?getLevelChunkMetaDataDictionary\@ServerLevel\@\@UEBA?AV?$shared_ptr\@VLevelChunkMetaDataDictionary\@\@\@std\@\@XZ */ MCVAPI class std::shared_ptr getLevelChunkMetaDataDictionary() const; /** - * @symbol ?getLevelEventCoordinator\@ServerLevel\@\@UEAAAEAVLevelEventCoordinator\@\@XZ + * @symbol ?getLevelEventCoordinator\@ServerLevel\@\@UEAAAEAVLevelEventCoordinator\@\@XZ */ MCVAPI class LevelEventCoordinator & getLevelEventCoordinator(); /** - * @symbol ?getOrCreateDimension\@ServerLevel\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VDimension\@\@\@\@\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z - */ - MCVAPI class WeakRefT> getOrCreateDimension(class AutomaticID); - /** - * @symbol ?getPositionTrackerDBServer\@ServerLevel\@\@UEBAPEAVPositionTrackingDBServer\@PositionTrackingDB\@\@XZ + * @symbol ?getPositionTrackerDBServer\@ServerLevel\@\@UEBAPEAVPositionTrackingDBServer\@PositionTrackingDB\@\@XZ */ MCVAPI class PositionTrackingDB::PositionTrackingDBServer * getPositionTrackerDBServer() const; /** - * @symbol ?getServerResourcePackManager\@ServerLevel\@\@UEBAPEAVResourcePackManager\@\@XZ + * @symbol ?getServerResourcePackManager\@ServerLevel\@\@UEBAPEAVResourcePackManager\@\@XZ */ MCVAPI class ResourcePackManager * getServerResourcePackManager() const; /** - * @symbol ?getThreadRandom\@ServerLevel\@\@UEBAAEAVRandom\@\@XZ + * @symbol ?getThreadRandom\@ServerLevel\@\@UEBAAEAVRandom\@\@XZ */ MCVAPI class Random & getThreadRandom() const; /** - * @symbol ?getTradeTables\@ServerLevel\@\@UEAAPEAVTradeTables\@\@XZ + * @symbol ?getTradeTables\@ServerLevel\@\@UEAAPEAVTradeTables\@\@XZ */ MCVAPI class TradeTables * getTradeTables(); /** - * @symbol ?incrementTagCache\@ServerLevel\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z + * @symbol ?incrementTagCache\@ServerLevel\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$TagRegistry\@U?$IDType\@ULevelTagIDType\@\@\@\@U?$IDType\@ULevelTagSetIDType\@\@\@\@\@\@\@Z */ MCVAPI void incrementTagCache(std::string const &, class TagRegistry, struct IDType> &); /** - * @symbol ?initialize\@ServerLevel\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVLevelSettings\@\@PEAVLevelData\@\@AEBVExperiments\@\@PEBV23\@\@Z + * @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 + * @symbol ?initializeLevelChunkMetaData\@ServerLevel\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void initializeLevelChunkMetaData(class LevelChunk &); /** - * @symbol ?loadFunctionManager\@ServerLevel\@\@UEAAXXZ + * @symbol ?loadFunctionManager\@ServerLevel\@\@UEAAXXZ */ MCVAPI void loadFunctionManager(); /** - * @symbol ?onChunkLoaded\@ServerLevel\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?onChunkLoaded\@ServerLevel\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void onChunkLoaded(class ChunkSource &, class LevelChunk &); /** - * @symbol ?registerEventCoordinators\@ServerLevel\@\@UEAAXXZ + * @symbol ?registerEventCoordinators\@ServerLevel\@\@UEAAXXZ */ MCVAPI void registerEventCoordinators(); /** - * @symbol ?runCommand\@ServerLevel\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z + * @symbol ?runCommand\@ServerLevel\@\@UEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@W4CurrentCmdVersion\@\@\@Z */ - MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem); + MCVAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CommandOriginSystem, enum class CurrentCmdVersion); /** - * @symbol ?runCommand\@ServerLevel\@\@UEAAXAEBVHashedString\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@W4CurrentCmdVersion\@\@\@Z + * @symbol ?runCommand\@ServerLevel\@\@UEAAXAEAVCommand\@\@AEAVCommandOrigin\@\@W4CommandOriginSystem\@\@\@Z */ - MCVAPI void runCommand(class HashedString const &, class CommandOrigin &, enum class CommandOriginSystem, enum class CurrentCmdVersion); + MCVAPI void runCommand(class Command &, class CommandOrigin &, enum class CommandOriginSystem); /** - * @symbol ?saveAdditionalData\@ServerLevel\@\@UEAAXXZ + * @symbol ?saveAdditionalData\@ServerLevel\@\@UEAAXXZ */ MCVAPI void saveAdditionalData(); /** - * @symbol ?saveDynamicProperties\@ServerLevel\@\@UEAAXXZ + * @symbol ?saveDynamicProperties\@ServerLevel\@\@UEAAXXZ */ MCVAPI void saveDynamicProperties(); /** - * @symbol ?setCommandsEnabled\@ServerLevel\@\@UEAAX_N\@Z + * @symbol ?setCommandsEnabled\@ServerLevel\@\@UEAAX_N\@Z */ MCVAPI void setCommandsEnabled(bool); /** - * @symbol ?setServerTickOffset\@ServerLevel\@\@UEAAX_J\@Z + * @symbol ?setServerTickOffset\@ServerLevel\@\@UEAAX_J\@Z */ MCVAPI void setServerTickOffset(__int64); /** - * @symbol ?setWorldTemplateOptionsUnlocked\@ServerLevel\@\@UEAAXXZ + * @symbol ?setWorldTemplateOptionsUnlocked\@ServerLevel\@\@UEAAXXZ */ MCVAPI void setWorldTemplateOptionsUnlocked(); /** - * @symbol ?tick\@ServerLevel\@\@UEAAXXZ - */ - MCVAPI void tick(); - /** - * @symbol ?updateSleepingPlayerList\@ServerLevel\@\@UEAAXXZ + * @symbol ?updateSleepingPlayerList\@ServerLevel\@\@UEAAXXZ */ MCVAPI void updateSleepingPlayerList(); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ 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\@\@_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\@\@_NV?$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, class std::weak_ptr); /** - * @symbol ?addServerChunksToPacket\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEAVNetworkChunkPublisherUpdatePacket\@\@\@Z + * @symbol ?addServerChunksToPacket\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEAVNetworkChunkPublisherUpdatePacket\@\@\@Z */ MCAPI void addServerChunksToPacket(class NetworkIdentifier const &, enum class SubClientId, class NetworkChunkPublisherUpdatePacket &); /** - * @symbol ?clearAllGenerationRequests\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol ?clearAllGenerationRequests\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI void clearAllGenerationRequests(class NetworkIdentifier const &, enum class SubClientId); /** - * @symbol ?getCommands\@ServerLevel\@\@QEAAAEAVMinecraftCommands\@\@XZ + * @symbol ?getCommands\@ServerLevel\@\@QEAAAEAVMinecraftCommands\@\@XZ */ MCAPI class MinecraftCommands & getCommands(); /** - * @symbol ?getDynamicPropertiesDefinition\@ServerLevel\@\@QEAAAEAVDynamicPropertiesDefinition\@\@XZ + * @symbol ?getDynamicPropertiesDefinition\@ServerLevel\@\@QEAAAEAVDynamicPropertiesDefinition\@\@XZ */ MCAPI class DynamicPropertiesDefinition & getDynamicPropertiesDefinition(); /** - * @symbol ?getFunctionManager\@ServerLevel\@\@QEAAAEAVFunctionManager\@\@XZ + * @symbol ?getFunctionManager\@ServerLevel\@\@QEAAAEAVFunctionManager\@\@XZ */ MCAPI class FunctionManager & getFunctionManager(); /** - * @symbol ?getMobEvents\@ServerLevel\@\@QEAAAEAVMobEvents\@\@XZ + * @symbol ?getMobEvents\@ServerLevel\@\@QEAAAEAVMobEvents\@\@XZ */ MCAPI class MobEvents & getMobEvents(); /** - * @symbol ?getMobEvents\@ServerLevel\@\@QEBAAEBVMobEvents\@\@XZ + * @symbol ?getMobEvents\@ServerLevel\@\@QEBAAEBVMobEvents\@\@XZ */ MCAPI class MobEvents const & getMobEvents() const; /** - * @symbol ?getOrAddDynamicProperties\@ServerLevel\@\@QEAAAEAVDynamicProperties\@\@XZ + * @symbol ?getOrAddDynamicProperties\@ServerLevel\@\@QEAAAEAVDynamicProperties\@\@XZ */ MCAPI class DynamicProperties & getOrAddDynamicProperties(); /** - * @symbol ?hasPendingGenerationRequests\@ServerLevel\@\@QEAA_NAEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol ?hasPendingGenerationRequests\@ServerLevel\@\@QEAA_NAEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCAPI bool hasPendingGenerationRequests(class NetworkIdentifier const &, enum class SubClientId); /** - * @symbol ?queueChunkGenerationRequest\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBVChunkPos\@\@\@Z + * @symbol ?queueChunkGenerationRequest\@ServerLevel\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBVChunkPos\@\@\@Z */ MCAPI void queueChunkGenerationRequest(class NetworkIdentifier const &, enum class SubClientId, class ChunkPos const &); /** - * @symbol ?setShouldSendSleepMessage\@ServerLevel\@\@QEAAX_N\@Z + * @symbol ?setShouldSendSleepMessage\@ServerLevel\@\@QEAAX_N\@Z */ MCAPI void setShouldSendSleepMessage(bool); /** - * @symbol ?shouldSendSleepMessage\@ServerLevel\@\@QEBA_NXZ + * @symbol ?shouldSendSleepMessage\@ServerLevel\@\@QEBA_NXZ */ MCAPI bool shouldSendSleepMessage() const; /** - * @symbol ?tryGetVolumeEntityManager\@ServerLevel\@\@QEBA?AV?$NonOwnerPointer\@VVolumeEntityManagerServer\@\@\@Bedrock\@\@XZ + * @symbol ?tryGetVolumeEntityManager\@ServerLevel\@\@QEBA?AV?$NonOwnerPointer\@VVolumeEntityManagerServer\@\@\@Bedrock\@\@XZ */ MCAPI class Bedrock::NonOwnerPointer tryGetVolumeEntityManager() const; //private: /** - * @symbol ?_initializeActorManager\@ServerLevel\@\@AEAAXXZ + * @symbol ?_checkBlockPermutationCap\@ServerLevel\@\@AEAAXXZ + */ + MCAPI void _checkBlockPermutationCap(); + /** + * @symbol ?_initializeActorManager\@ServerLevel\@\@AEAAXXZ */ MCAPI void _initializeActorManager(); /** - * @symbol ?_onActorEntityAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_onActorEntityAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onActorEntityAdded(class Actor &); /** - * @symbol ?_onRemoveActorEntityReferences\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_onNewDimensionCreated\@ServerLevel\@\@AEAAXAEAVDimension\@\@\@Z + */ + MCAPI void _onNewDimensionCreated(class Dimension &); + /** + * @symbol ?_onRemoveActorEntityReferences\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _onRemoveActorEntityReferences(class Actor &); /** - * @symbol ?_postReloadActorAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_postReloadActorAdded\@ServerLevel\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _postReloadActorAdded(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp index c2a08a02a9..0d4a9de70c 100644 --- a/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ServerLevelEventCoordinator.hpp @@ -30,16 +30,16 @@ class ServerLevelEventCoordinator { public: /** - * @symbol ?sendLevelAddedPlayer\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVPlayer\@\@\@Z + * @symbol ?sendLevelAddedPlayer\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCAPI void sendLevelAddedPlayer(class Level &, class Player &); /** - * @symbol ?sendLevelRemovedPlayer\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVPlayer\@\@\@Z + * @symbol ?sendLevelRemovedPlayer\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCAPI void sendLevelRemovedPlayer(class Level &, class Player &); /** - * @symbol ?sendLevelSaveData\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?sendLevelSaveData\@ServerLevelEventCoordinator\@\@QEAAXAEAVLevel\@\@AEAVCompoundTag\@\@\@Z */ MCAPI void sendLevelSaveData(class Level &, class CompoundTag &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerLocator.hpp b/LiteLoader/include/llapi/mc/ServerLocator.hpp index 0f9078c1f3..d383bcc41c 100644 --- a/LiteLoader/include/llapi/mc/ServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/ServerLocator.hpp @@ -31,13 +31,17 @@ class ServerLocator { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERLOCATOR /** - * @symbol ?_onDisable\@ServerLocator\@\@EEAAXXZ + * @symbol ?_onDisable\@ServerLocator\@\@EEAAXXZ */ MCVAPI void _onDisable(); /** - * @symbol ?_onEnable\@ServerLocator\@\@EEAAXXZ + * @symbol ?_onEnable\@ServerLocator\@\@EEAAXXZ */ MCVAPI void _onEnable(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerLocator(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp b/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp index a4de23bda9..5569e485fe 100644 --- a/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp +++ b/LiteLoader/include/llapi/mc/ServerLocatorComposite.hpp @@ -30,100 +30,100 @@ class ServerLocatorComposite { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerLocatorComposite(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @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 + * @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 + * @vftbl 4 + * @symbol ?stopAnnouncingServer\@ServerLocatorComposite\@\@UEAAXXZ */ virtual void stopAnnouncingServer(); /** - * @vftbl 5 - * @symbol ?startServerDiscovery\@ServerLocatorComposite\@\@UEAAXUPortPair\@\@\@Z + * @vftbl 5 + * @symbol ?startServerDiscovery\@ServerLocatorComposite\@\@UEAAXUPortPair\@\@\@Z */ virtual void startServerDiscovery(struct PortPair); /** - * @vftbl 6 - * @symbol ?stopServerDiscovery\@ServerLocatorComposite\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?stopServerDiscovery\@ServerLocatorComposite\@\@UEAAXXZ */ virtual void stopServerDiscovery(); /** - * @vftbl 7 - * @symbol ?addCustomServer\@ServerLocatorComposite\@\@UEAAXAEBVAsynchronousIPResolver\@\@H\@Z + * @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 + * @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 + * @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 + * @vftbl 10 + * @symbol ?clearServerList\@ServerLocatorComposite\@\@UEAAXXZ */ virtual void clearServerList(); /** - * @vftbl 11 - * @symbol ?update\@ServerLocatorComposite\@\@UEAAXXZ + * @vftbl 11 + * @symbol ?update\@ServerLocatorComposite\@\@UEAAXXZ */ virtual void update(); /** - * @vftbl 12 - * @symbol ?isIPv4Supported\@ServerLocatorComposite\@\@UEBA_NXZ + * @vftbl 12 + * @symbol ?isIPv4Supported\@ServerLocatorComposite\@\@UEBA_NXZ */ virtual bool isIPv4Supported() const; /** - * @vftbl 13 - * @symbol ?isIPv6Supported\@ServerLocatorComposite\@\@UEBA_NXZ + * @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 + * @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 + * @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 + * @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 + * @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 + * @symbol ?setActiveTransportLayer\@ServerLocatorComposite\@\@QEAAXW4TransportLayer\@\@\@Z */ MCAPI void setActiveTransportLayer(enum class TransportLayer); /** - * @symbol ?setNetherNetServerLocator\@ServerLocatorComposite\@\@QEAAX$$QEAV?$shared_ptr\@UNetherNetConnector\@\@\@std\@\@\@Z + * @symbol ?setNetherNetServerLocator\@ServerLocatorComposite\@\@QEAAX$$QEAV?$NonOwnerPointer\@UNetherNetConnector\@\@\@Bedrock\@\@\@Z */ - MCAPI void setNetherNetServerLocator(class std::shared_ptr &&); + MCAPI void setNetherNetServerLocator(class Bedrock::NonOwnerPointer &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerMetrics.hpp b/LiteLoader/include/llapi/mc/ServerMetrics.hpp index c0b89ce9f9..33b3ddadbc 100644 --- a/LiteLoader/include/llapi/mc/ServerMetrics.hpp +++ b/LiteLoader/include/llapi/mc/ServerMetrics.hpp @@ -27,5 +27,11 @@ class ServerMetrics { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERMETRICS + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerMetrics(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp b/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp index 8630cb3d46..4e191e44e3 100644 --- a/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp +++ b/LiteLoader/include/llapi/mc/ServerMetricsImpl.hpp @@ -28,66 +28,66 @@ class ServerMetricsImpl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerMetricsImpl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?sendPeriodicMetrics\@ServerMetricsImpl\@\@UEAAXAEAVServerInstance\@\@\@Z + * @vftbl 1 + * @symbol ?sendPeriodicMetrics\@ServerMetricsImpl\@\@UEAAXAEAVServerInstance\@\@\@Z */ virtual void sendPeriodicMetrics(class ServerInstance &); /** - * @vftbl 2 - * @symbol ?sendServerTickTime\@ServerMetricsImpl\@\@UEAAXAEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @vftbl 2 + * @symbol ?sendServerTickTime\@ServerMetricsImpl\@\@UEAAXAEBV?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ virtual void sendServerTickTime(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>> const &); /** - * @vftbl 3 - * @symbol ?sendChunkLoadTelemetryData\@ServerMetricsImpl\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?sendChunkLoadTelemetryData\@ServerMetricsImpl\@\@UEAAXXZ */ virtual void sendChunkLoadTelemetryData(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @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 + * @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 + * @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 + * @symbol ??0ServerMetricsImpl\@\@QEAA\@PEAVServerCommunicationInterface\@\@\@Z */ MCAPI ServerMetricsImpl(class ServerCommunicationInterface *); //private: /** - * @symbol ?sendPeriodicMetricsInternal\@ServerMetricsImpl\@\@AEAAXAEAVServerInstance\@\@\@Z + * @symbol ?sendPeriodicMetricsInternal\@ServerMetricsImpl\@\@AEAAXAEAVServerInstance\@\@\@Z */ MCAPI void sendPeriodicMetricsInternal(class ServerInstance &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp b/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp index c897b71a73..b8a5c163f5 100644 --- a/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerMoveInputHandler.hpp @@ -30,43 +30,51 @@ class ServerMoveInputHandler : public MoveInputHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerMoveInputHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERMOVEINPUTHANDLER /** - * @symbol ?registerInputHandlers\@ServerMoveInputHandler\@\@UEAAXAEAVInputHandler\@\@\@Z + * @symbol ?registerInputHandlers\@ServerMoveInputHandler\@\@UEAAXAEAVInputHandler\@\@\@Z */ MCVAPI void registerInputHandlers(class InputHandler &); #endif /** - * @symbol ??0ServerMoveInputHandler\@\@QEAA\@XZ + * @symbol ??0ServerMoveInputHandler\@\@QEAA\@XZ */ MCAPI ServerMoveInputHandler(); /** - * @symbol ?digestPlayerInputPacket\@ServerMoveInputHandler\@\@QEAAXAEBVPlayerAuthInputPacket\@\@\@Z + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp b/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp new file mode 100644 index 0000000000..5a8874493f --- /dev/null +++ b/LiteLoader/include/llapi/mc/ServerMoveInputHandlerSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file ServerMoveInputHandlerSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ServerMoveInputHandlerSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERMOVEINPUTHANDLERSYSTEM +public: + class ServerMoveInputHandlerSystem& operator=(class ServerMoveInputHandlerSystem const &) = delete; + ServerMoveInputHandlerSystem(class ServerMoveInputHandlerSystem const &) = delete; + ServerMoveInputHandlerSystem() = delete; +#endif + +public: + /** + * @symbol ?create\@ServerMoveInputHandlerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo create(); + +}; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkController.hpp b/LiteLoader/include/llapi/mc/ServerNetworkController.hpp index 0d26f69162..46d5c325e2 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkController.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkController.hpp @@ -30,28 +30,28 @@ class ServerNetworkController { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerNetworkController(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isDedicatedServer\@ServerNetworkController\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isDedicatedServer\@ServerNetworkController\@\@UEBA_NXZ */ virtual bool isDedicatedServer() const; /** - * @vftbl 2 - * @symbol ?isHost\@ServerNetworkController\@\@UEBA_NAEBVUUID\@mce\@\@\@Z + * @vftbl 2 + * @symbol ?isHost\@ServerNetworkController\@\@UEBA_NAEBVUUID\@mce\@\@\@Z */ virtual bool isHost(class mce::UUID const &) const; /** - * @vftbl 3 - * @symbol ?canChangePermission\@ServerNetworkController\@\@UEBA_NAEBVUUID\@mce\@\@AEBVServerPlayer\@\@\@Z + * @vftbl 3 + * @symbol ?canChangePermission\@ServerNetworkController\@\@UEBA_NAEBVUUID\@mce\@\@AEBVServerPlayer\@\@\@Z */ virtual bool canChangePermission(class mce::UUID const &, class ServerPlayer const &) const; /** - * @symbol ??0ServerNetworkController\@\@QEAA\@_NAEBVUUID\@mce\@\@V?$function\@$$A6A_NAEBVServerPlayer\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@\@Z + * @symbol ??0ServerNetworkController\@\@QEAA\@_NAEBVUUID\@mce\@\@V?$function\@$$A6A_NAEBVServerPlayer\@\@W4AbilitiesIndex\@\@\@Z\@std\@\@\@Z */ MCAPI ServerNetworkController(bool, class mce::UUID const &, class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ServerNetworkEventCoordinator.hpp index c906e4d439..b51d7ca90a 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkEventCoordinator.hpp @@ -30,20 +30,20 @@ class ServerNetworkEventCoordinator { public: /** - * @symbol ?getServerNetworkEventHandler\@ServerNetworkEventCoordinator\@\@QEAAAEAVServerNetworkEventHandler\@\@XZ + * @symbol ?getServerNetworkEventHandler\@ServerNetworkEventCoordinator\@\@QEAAAEAVServerNetworkEventHandler\@\@XZ */ MCAPI class ServerNetworkEventHandler & getServerNetworkEventHandler(); /** - * @symbol ?registerServerNetworkEventHandler\@ServerNetworkEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VServerNetworkEventHandler\@\@U?$default_delete\@VServerNetworkEventHandler\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?registerServerNetworkEventHandler\@ServerNetworkEventCoordinator\@\@QEAAX$$QEAV?$unique_ptr\@VServerNetworkEventHandler\@\@U?$default_delete\@VServerNetworkEventHandler\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void registerServerNetworkEventHandler(std::unique_ptr &&); /** - * @symbol ?sendEvent\@ServerNetworkEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableServerNetworkGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z + * @symbol ?sendEvent\@ServerNetworkEventCoordinator\@\@QEAA?AW4CoordinatorResult\@\@V?$EventRef\@U?$MutableServerNetworkGameplayEvent\@W4CoordinatorResult\@\@\@\@\@\@\@Z */ MCAPI enum class CoordinatorResult sendEvent(class EventRef>); /** - * @symbol ?sendMessage\@ServerNetworkEventCoordinator\@\@QEAAXAEAUMessageEvent\@\@\@Z + * @symbol ?sendMessage\@ServerNetworkEventCoordinator\@\@QEAAXAEAUMessageEvent\@\@\@Z */ MCAPI void sendMessage(struct MessageEvent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkEventListener.hpp b/LiteLoader/include/llapi/mc/ServerNetworkEventListener.hpp index 8dd60b46e5..8cebc83bcf 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkEventListener.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkEventListener.hpp @@ -31,13 +31,13 @@ class ServerNetworkEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERNETWORKEVENTLISTENER /** - * @symbol ?onEvent\@ServerNetworkEventListener\@\@UEAA?AW4EventResult\@\@AEBUServerNetworkGameplayNotificationEvent\@\@\@Z + * @symbol ?onEvent\@ServerNetworkEventListener\@\@UEAA?AW4EventResult\@\@AEBUServerNetworkGameplayNotificationEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct ServerNetworkGameplayNotificationEvent const &); /** - * @symbol ?onMessage\@ServerNetworkEventListener\@\@UEAA?AW4EventResult\@\@AEBUMessageEvent\@\@\@Z + * @symbol ?onMessage\@ServerNetworkEventListener\@\@UEAA?AW4EventResult\@\@AEBUMessageEvent\@\@\@Z */ MCVAPI enum class EventResult onMessage(struct MessageEvent const &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkGameplayNotificationEvent.hpp b/LiteLoader/include/llapi/mc/ServerNetworkGameplayNotificationEvent.hpp index 31d092bd67..b2627a8b98 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkGameplayNotificationEvent.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkGameplayNotificationEvent.hpp @@ -28,7 +28,7 @@ struct ServerNetworkGameplayNotificationEvent { public: /** - * @symbol ??1ServerNetworkGameplayNotificationEvent\@\@QEAA\@XZ + * @symbol ??1ServerNetworkGameplayNotificationEvent\@\@QEAA\@XZ */ MCAPI ~ServerNetworkGameplayNotificationEvent(); diff --git a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp index 04e6cd9ab4..86459b5e87 100644 --- a/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerNetworkHandler.hpp @@ -11,6 +11,7 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "EntityRefTraits.hpp" #undef BEFORE_EXTRA @@ -50,521 +51,521 @@ class ServerNetworkHandler { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERNETWORKHANDLER /** - * @symbol ?_getServerPlayer\@ServerNetworkHandler\@\@EEAAPEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z + * @symbol ?_getServerPlayer\@ServerNetworkHandler\@\@EEAAPEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@\@Z */ MCVAPI class ServerPlayer * _getServerPlayer(class NetworkIdentifier const &, enum class SubClientId); /** - * @symbol ?allowIncomingPacketId\@ServerNetworkHandler\@\@UEAA_NAEBVNetworkIdentifier\@\@W4MinecraftPacketIds\@\@\@Z + * @symbol ?allowIncomingPacketId\@ServerNetworkHandler\@\@UEAA_NAEBVNetworkIdentifier\@\@W4MinecraftPacketIds\@\@\@Z */ MCVAPI bool allowIncomingPacketId(class NetworkIdentifier const &, enum class MinecraftPacketIds); /** - * @symbol ?getGameSpecificNetEventCallback\@ServerNetworkHandler\@\@UEAAPEAVGameSpecificNetEventCallback\@\@XZ + * @symbol ?getGameSpecificNetEventCallback\@ServerNetworkHandler\@\@UEAAPEAVGameSpecificNetEventCallback\@\@XZ */ MCVAPI class GameSpecificNetEventCallback * getGameSpecificNetEventCallback(); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z + */ + MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); + /** + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVChangeMobPropertyPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ChangeMobPropertyPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPhotoTransferPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPhotoTransferPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PhotoTransferPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCreatePhotoPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCreatePhotoPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CreatePhotoPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEditorNetworkPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEditorNetworkPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class EditorNetworkPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPurchaseReceiptPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPurchaseReceiptPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class PurchaseReceiptPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCompletedUsingItemPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCompletedUsingItemPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class CompletedUsingItemPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); + MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimatePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class AnimatePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheStatusPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheStatusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z - */ - MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); - /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCodeBuilderSourcePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CodeBuilderSourcePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBlockPickRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BlockPickRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBossEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class DisconnectPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BossEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class EmoteListPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class EmotePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFilterTextPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVUpdatePlayerGameTypePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class FilterTextPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class UpdatePlayerGameTypePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInventoryTransactionPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class InventoryTransactionPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemFrameDropItemPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ItemFrameDropItemPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVItemStackRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ItemStackRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLabTablePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmotePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LabTablePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class EmotePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLecternUpdatePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LecternUpdatePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientCacheBlobStatusPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ClientCacheBlobStatusPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV2\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV2 const &); + MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); + MCVAPI void handle(class NetworkIdentifier const &, class ActorEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapCreateLockedCopyPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCommandRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapCreateLockedCopyPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CommandRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMapInfoRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDisconnectPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MapInfoRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class DisconnectPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMobEquipmentPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MobEquipmentPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVContainerClosePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ContainerClosePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorAbsolutePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVEmoteListPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MoveActorAbsolutePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class EmoteListPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMovePlayerPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MovePlayerPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVModalFormResponsePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ModalFormResponsePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNpcRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@V?$shared_ptr\@VBlockActorDataPacket\@\@\@std\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class NpcRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class std::shared_ptr); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPassengerJumpPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PassengerJumpPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerActionPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerAuthInputPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVBookEditPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerAuthInputPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class BookEditPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerHotbarPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerActionPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerHotbarPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PlayerActionPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerInputPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVCraftingEventPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerInputPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class CraftingEventPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPlayerSkinPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PlayerSkinPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestAbilityPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnvilDamagePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestAbilityPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class AnvilDamagePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestChunkRadiusPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestChunkRadiusPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestNetworkSettingsPacket\@\@\@Z */ MCVAPI void handle(class NetworkIdentifier const &, class RequestNetworkSettingsPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRequestPermissionsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVNetworkStackLatencyPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RequestPermissionsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class NetworkStackLatencyPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackChunkRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVPositionTrackingDBClientRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ResourcePackChunkRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class PositionTrackingDBClientRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVRespawnPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVClientToServerHandshakePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class RespawnPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ClientToServerHandshakePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVScriptMessagePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ScriptMessagePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class TickSyncPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMoveActorAbsolutePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MoveActorAbsolutePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDifficultyPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVDebugInfoPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetDifficultyPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class DebugInfoPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetLocalPlayerAsInitializedPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLevelSoundEventPacketV1\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetLocalPlayerAsInitializedPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LevelSoundEventPacketV1 const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetPlayerGameTypePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVActorPickRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SetPlayerGameTypePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ActorPickRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSettingsCommandPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVFilterTextPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SettingsCommandPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class FilterTextPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLoginPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LoginPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSimpleEventPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVGameTestRequestPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SimpleEventPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class GameTestRequestPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSpawnExperienceOrbPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVMultiplayerSettingsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SpawnExperienceOrbPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class MultiplayerSettingsPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureBlockUpdatePacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class StructureBlockUpdatePacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVStructureTemplateDataRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVAnimatePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class StructureTemplateDataRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class AnimatePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubChunkRequestPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVInteractPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SubChunkRequestPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class InteractPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSubClientLoginPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVShowCreditsPacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class SubClientLoginPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class ShowCreditsPacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTextPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVLecternUpdatePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class TextPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class LecternUpdatePacket const &); /** - * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVTickSyncPacket\@\@\@Z + * @symbol ?handle\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVSetDefaultGameTypePacket\@\@\@Z */ - MCVAPI void handle(class NetworkIdentifier const &, class TickSyncPacket const &); + MCVAPI void handle(class NetworkIdentifier const &, class SetDefaultGameTypePacket const &); /** - * @symbol ?onDisconnect\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z + * @symbol ?onDisconnect\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N1\@Z */ MCVAPI void onDisconnect(class NetworkIdentifier const &, std::string const &, bool, std::string const &); /** - * @symbol ?onInvalidPlayerJoinedLobby\@ServerNetworkHandler\@\@UEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onInvalidPlayerJoinedLobby\@ServerNetworkHandler\@\@UEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onInvalidPlayerJoinedLobby(class mce::UUID const &, std::string const &); /** - * @symbol ?onPlayerReady\@ServerNetworkHandler\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?onPlayerReady\@ServerNetworkHandler\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void onPlayerReady(class Player &); /** - * @symbol ?onTextFilterSkipped\@ServerNetworkHandler\@\@EEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onTextFilterSkipped\@ServerNetworkHandler\@\@EEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onTextFilterSkipped(class NetworkIdentifier const &, enum class SubClientId, std::string const &); /** - * @symbol ?onTick\@ServerNetworkHandler\@\@UEAAXXZ + * @symbol ?onTick\@ServerNetworkHandler\@\@UEAAXXZ */ MCVAPI void onTick(); /** - * @symbol ?onTransferRequest\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?onTransferRequest\@ServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCVAPI void onTransferRequest(class NetworkIdentifier const &, std::string const &, int); /** - * @symbol ?onWebsocketRequest\@ServerNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?onWebsocketRequest\@ServerNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0V?$function\@$$A6AXXZ\@3\@\@Z */ MCVAPI void onWebsocketRequest(std::string const &, std::string const &, class std::function); /** - * @symbol ?onXboxUserBlocked\@ServerNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onXboxUserBlocked\@ServerNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onXboxUserBlocked(std::string const &); /** - * @symbol ?onXboxUserUnblocked\@ServerNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onXboxUserUnblocked\@ServerNetworkHandler\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onXboxUserUnblocked(std::string const &); /** - * @symbol ?sendServerLegacyParticle\@ServerNetworkHandler\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z + * @symbol ?sendServerLegacyParticle\@ServerNetworkHandler\@\@UEAAXW4ParticleType\@\@AEBVVec3\@\@1H\@Z */ MCVAPI void sendServerLegacyParticle(enum class ParticleType, class Vec3 const &, class Vec3 const &, int); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~ServerNetworkHandler(); #endif /** - * @symbol ??0ServerNetworkHandler\@\@QEAA\@AEAVGameCallbacks\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@AEAVNetworkHandler\@\@AEAVPrivateKeyManager\@\@AEAVServerLocator\@\@AEAVPacketSender\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBVUUID\@mce\@\@H_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\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVMinecraftCommands\@\@AEAVIMinecraftApp\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEAVScheduler\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@3\@V?$optional_ref\@VMinecraftGameTest\@\@\@\@V?$ServiceReference\@VAppConfigs\@\@\@\@V?$ServiceReference\@VMultiplayerServiceManager\@Social\@\@\@\@9\@Z + * @symbol ??0ServerNetworkHandler\@\@QEAA\@AEAVGameCallbacks\@\@AEBV?$NonOwnerPointer\@VILevel\@\@\@Bedrock\@\@AEAVNetworkSystem\@\@AEAVPrivateKeyManager\@\@AEAVServerLocator\@\@AEAVPacketSender\@\@AEAVAllowList\@\@PEAVPermissionsFile\@\@AEBVUUID\@mce\@\@H_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\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEAVMinecraftCommands\@\@AEAVIMinecraftApp\@\@AEBV?$unordered_map\@UPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@U?$hash\@UPackIdVersion\@\@\@3\@U?$equal_to\@UPackIdVersion\@\@\@3\@V?$allocator\@U?$pair\@$$CBUPackIdVersion\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@AEAVScheduler\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@3\@V?$optional_ref\@VMinecraftGameTest\@\@\@\@V?$ServiceReference\@VAppConfigs\@\@\@\@V?$ServiceReference\@VMultiplayerServiceManager\@Social\@\@\@\@9\@Z */ - MCAPI ServerNetworkHandler(class GameCallbacks &, class Bedrock::NonOwnerPointer const &, class NetworkHandler &, class PrivateKeyManager &, class ServerLocator &, class PacketSender &, class AllowList &, class PermissionsFile *, class mce::UUID const &, int, bool, std::vector const &, std::string, int, class MinecraftCommands &, class IMinecraftApp &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class Bedrock::NonOwnerPointer, class optional_ref, class ServiceReference, class ServiceReference, bool); + MCAPI ServerNetworkHandler(class GameCallbacks &, class Bedrock::NonOwnerPointer const &, class NetworkSystem &, class PrivateKeyManager &, class ServerLocator &, class PacketSender &, class AllowList &, class PermissionsFile *, class mce::UUID const &, int, bool, std::vector const &, std::string, int, class MinecraftCommands &, class IMinecraftApp &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class Scheduler &, class Bedrock::NonOwnerPointer, class optional_ref, class ServiceReference, class ServiceReference, bool); /** - * @symbol ?activateAllowList\@ServerNetworkHandler\@\@QEAAXXZ + * @symbol ?activateAllowList\@ServerNetworkHandler\@\@QEAAXXZ */ MCAPI void activateAllowList(); /** - * @symbol ?addToDenyList\@ServerNetworkHandler\@\@QEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addToDenyList\@ServerNetworkHandler\@\@QEAAXAEBVUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addToDenyList(class mce::UUID const &, std::string const &); /** - * @symbol ?allowIncomingConnections\@ServerNetworkHandler\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?allowIncomingConnections\@ServerNetworkHandler\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void allowIncomingConnections(std::string const &, bool); /** - * @symbol ?createNewPlayer\@ServerNetworkHandler\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBVNetworkIdentifier\@\@AEBVConnectionRequest\@\@\@Z + * @symbol ?createNewPlayer\@ServerNetworkHandler\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBVNetworkIdentifier\@\@AEBVConnectionRequest\@\@\@Z */ MCAPI class OwnerPtrT createNewPlayer(class NetworkIdentifier const &, class ConnectionRequest const &); /** - * @symbol ?createSimulatedPlayer\@ServerNetworkHandler\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?createSimulatedPlayer\@ServerNetworkHandler\@\@QEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI class OwnerPtrT createSimulatedPlayer(std::string const &, std::string const &); /** - * @symbol ?disallowIncomingConnections\@ServerNetworkHandler\@\@QEAAXXZ + * @symbol ?disallowIncomingConnections\@ServerNetworkHandler\@\@QEAAXXZ */ MCAPI void disallowIncomingConnections(); /** - * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCAPI void disconnectClient(class NetworkIdentifier const &, std::string const &, bool); + MCAPI void disconnectClient(class NetworkIdentifier const &, enum class SubClientId, std::string const &, bool); /** - * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@W4SubClientId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?disconnectClient\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ - MCAPI void disconnectClient(class NetworkIdentifier const &, enum class SubClientId, std::string const &, bool); + MCAPI void disconnectClient(class NetworkIdentifier const &, std::string const &, bool); /** - * @symbol ?engineCancelResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z + * @symbol ?engineCancelResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ MCAPI void engineCancelResponseHelper(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); /** - * @symbol ?engineDownloadingFinishedResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z + * @symbol ?engineDownloadingFinishedResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ MCAPI void engineDownloadingFinishedResponseHelper(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); /** - * @symbol ?engineDownloadingResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z + * @symbol ?engineDownloadingResponseHelper\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ MCAPI void engineDownloadingResponseHelper(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); /** - * @symbol ?fetchConnectionRequest\@ServerNetworkHandler\@\@QEAAAEBVConnectionRequest\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?fetchConnectionRequest\@ServerNetworkHandler\@\@QEAAAEBVConnectionRequest\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI class ConnectionRequest const & fetchConnectionRequest(class NetworkIdentifier const &); /** - * @symbol ?isDedicatedServer\@ServerNetworkHandler\@\@QEAA_NXZ + * @symbol ?isDedicatedServer\@ServerNetworkHandler\@\@QEAA_NXZ */ MCAPI bool isDedicatedServer(); /** - * @symbol ?isHost\@ServerNetworkHandler\@\@QEAA_NAEAVServerPlayer\@\@\@Z + * @symbol ?isHost\@ServerNetworkHandler\@\@QEAA_NAEAVServerPlayer\@\@\@Z */ MCAPI bool isHost(class ServerPlayer &); /** - * @symbol ?onReady_ClientGeneration\@ServerNetworkHandler\@\@QEAAXAEAVPlayer\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?onReady_ClientGeneration\@ServerNetworkHandler\@\@QEAAXAEAVPlayer\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI void onReady_ClientGeneration(class Player &, class NetworkIdentifier const &); /** - * @symbol ?onStartShutdown\@ServerNetworkHandler\@\@QEAAXXZ + * @symbol ?onStartShutdown\@ServerNetworkHandler\@\@QEAAXXZ */ MCAPI void onStartShutdown(); /** - * @symbol ?persistPlayerPermissionsToDisk\@ServerNetworkHandler\@\@QEAAXAEBVUserEntityIdentifierComponent\@\@W4PlayerPermissionLevel\@\@\@Z + * @symbol ?persistPlayerPermissionsToDisk\@ServerNetworkHandler\@\@QEAAXAEBVUserEntityIdentifierComponent\@\@W4PlayerPermissionLevel\@\@\@Z */ MCAPI void persistPlayerPermissionsToDisk(class UserEntityIdentifierComponent const &, enum class PlayerPermissionLevel); /** - * @symbol ?sendLoginMessageLocal\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVConnectionRequest\@\@AEAVServerPlayer\@\@\@Z + * @symbol ?sendLoginMessageLocal\@ServerNetworkHandler\@\@QEAAXAEBVNetworkIdentifier\@\@AEBVConnectionRequest\@\@AEAVServerPlayer\@\@\@Z */ MCAPI void sendLoginMessageLocal(class NetworkIdentifier const &, class ConnectionRequest const &, class ServerPlayer &); /** - * @symbol ?setAutomationClient\@ServerNetworkHandler\@\@QEAAXV?$NonOwnerPointer\@VAutomationClient\@Automation\@\@\@Bedrock\@\@\@Z + * @symbol ?setAutomationClient\@ServerNetworkHandler\@\@QEAAXV?$NonOwnerPointer\@VAutomationClient\@Automation\@\@\@Bedrock\@\@\@Z */ MCAPI void setAutomationClient(class Bedrock::NonOwnerPointer); /** - * @symbol ?setMaxNumPlayers\@ServerNetworkHandler\@\@QEAAHH\@Z + * @symbol ?setMaxNumPlayers\@ServerNetworkHandler\@\@QEAAHH\@Z */ MCAPI int setMaxNumPlayers(int); /** - * @symbol ?setNewPlayerPermissions\@ServerNetworkHandler\@\@QEAAXAEAVServerPlayer\@\@\@Z + * @symbol ?setNewPlayerPermissions\@ServerNetworkHandler\@\@QEAAXAEAVServerPlayer\@\@\@Z */ MCAPI void setNewPlayerPermissions(class ServerPlayer &); /** - * @symbol ?trytLoadPlayer\@ServerNetworkHandler\@\@QEAA_NAEAVServerPlayer\@\@AEBVConnectionRequest\@\@\@Z + * @symbol ?trytLoadPlayer\@ServerNetworkHandler\@\@QEAA_NAEAVServerPlayer\@\@AEBVConnectionRequest\@\@\@Z */ MCAPI bool trytLoadPlayer(class ServerPlayer &, class ConnectionRequest const &); /** - * @symbol ?updateServerAnnouncement\@ServerNetworkHandler\@\@QEAAXXZ + * @symbol ?updateServerAnnouncement\@ServerNetworkHandler\@\@QEAAXXZ */ MCAPI void updateServerAnnouncement(); //private: /** - * @symbol ?_buildSubChunkPacketData\@ServerNetworkHandler\@\@AEAAXAEBVNetworkIdentifier\@\@PEBVServerPlayer\@\@AEBVSubChunkRequestPacket\@\@AEAVSubChunkPacket\@\@I_N\@Z + * @symbol ?_buildSubChunkPacketData\@ServerNetworkHandler\@\@AEAAXAEBVNetworkIdentifier\@\@PEBVServerPlayer\@\@AEBVSubChunkRequestPacket\@\@AEAVSubChunkPacket\@\@I_N\@Z */ MCAPI void _buildSubChunkPacketData(class NetworkIdentifier const &, class ServerPlayer const *, class SubChunkRequestPacket const &, class SubChunkPacket &, unsigned int, bool); /** - * @symbol ?_createNewPlayer\@ServerNetworkHandler\@\@AEAAAEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@AEBVSubClientConnectionRequest\@\@W4SubClientId\@\@\@Z + * @symbol ?_createNewPlayer\@ServerNetworkHandler\@\@AEAAAEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@AEBVSubClientConnectionRequest\@\@W4SubClientId\@\@\@Z */ MCAPI class ServerPlayer & _createNewPlayer(class NetworkIdentifier const &, class SubClientConnectionRequest const &, enum class SubClientId); /** - * @symbol ?_displayGameMessage\@ServerNetworkHandler\@\@AEAAXAEBVPlayer\@\@AEAUChatEvent\@\@\@Z + * @symbol ?_displayGameMessage\@ServerNetworkHandler\@\@AEAAXAEBVPlayer\@\@AEAUChatEvent\@\@\@Z */ MCAPI void _displayGameMessage(class Player const &, struct ChatEvent &); /** - * @symbol ?_getActiveAndInProgressPlayerCount\@ServerNetworkHandler\@\@AEBAHVUUID\@mce\@\@\@Z + * @symbol ?_getActiveAndInProgressPlayerCount\@ServerNetworkHandler\@\@AEBAHVUUID\@mce\@\@\@Z */ MCAPI int _getActiveAndInProgressPlayerCount(class mce::UUID) const; /** - * @symbol ?_getDisplayName\@ServerNetworkHandler\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@_NAEBV23\@\@Z + * @symbol ?_getDisplayName\@ServerNetworkHandler\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCertificate\@\@_NAEBV23\@\@Z */ MCAPI std::string _getDisplayName(class Certificate const &, bool, std::string const &) const; /** - * @symbol ?_handleCommandBlockUpdatePacket\@ServerNetworkHandler\@\@AEAAXAEBVServerPlayer\@\@AEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z + * @symbol ?_handleCommandBlockUpdatePacket\@ServerNetworkHandler\@\@AEAAXAEBVServerPlayer\@\@AEBVNetworkIdentifier\@\@AEBVCommandBlockUpdatePacket\@\@\@Z */ MCAPI void _handleCommandBlockUpdatePacket(class ServerPlayer const &, class NetworkIdentifier const &, class CommandBlockUpdatePacket const &); /** - * @symbol ?_handleSetDifficulty\@ServerNetworkHandler\@\@AEBAXAEBVServerPlayer\@\@AEBVSetDifficultyPacket\@\@\@Z + * @symbol ?_handleSetDifficulty\@ServerNetworkHandler\@\@AEBAXAEBVServerPlayer\@\@AEBVSetDifficultyPacket\@\@\@Z */ MCAPI void _handleSetDifficulty(class ServerPlayer const &, class SetDifficultyPacket const &) const; /** - * @symbol ?_loadNewPlayer\@ServerNetworkHandler\@\@AEAA_NAEAVServerPlayer\@\@_N\@Z + * @symbol ?_loadNewPlayer\@ServerNetworkHandler\@\@AEAA_NAEAVServerPlayer\@\@_N\@Z */ MCAPI bool _loadNewPlayer(class ServerPlayer &, bool); /** - * @symbol ?_onClientAuthenticated\@ServerNetworkHandler\@\@AEAAXAEBVNetworkIdentifier\@\@AEBVCertificate\@\@\@Z + * @symbol ?_onClientAuthenticated\@ServerNetworkHandler\@\@AEAAXAEBVNetworkIdentifier\@\@AEBVCertificate\@\@\@Z */ MCAPI void _onClientAuthenticated(class NetworkIdentifier const &, class Certificate const &); /** - * @symbol ?_onPlayerLeft\@ServerNetworkHandler\@\@AEAAXPEAVServerPlayer\@\@_N\@Z + * @symbol ?_onPlayerLeft\@ServerNetworkHandler\@\@AEAAXPEAVServerPlayer\@\@_N\@Z */ MCAPI void _onPlayerLeft(class ServerPlayer *, bool); /** - * @symbol ?_onSubClientAuthenticated\@ServerNetworkHandler\@\@AEAAXAEBVNetworkIdentifier\@\@AEBVCertificate\@\@AEBVSubClientLoginPacket\@\@\@Z + * @symbol ?_onSubClientAuthenticated\@ServerNetworkHandler\@\@AEAAXAEBVNetworkIdentifier\@\@AEBVCertificate\@\@AEBVSubClientLoginPacket\@\@\@Z */ MCAPI void _onSubClientAuthenticated(class NetworkIdentifier const &, class Certificate const &, class SubClientLoginPacket const &); /** - * @symbol ?_sendAdditionalLevelData\@ServerNetworkHandler\@\@AEAAXAEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?_sendAdditionalLevelData\@ServerNetworkHandler\@\@AEAAXAEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI void _sendAdditionalLevelData(class ServerPlayer &, class NetworkIdentifier const &); /** - * @symbol ?_sendLevelData\@ServerNetworkHandler\@\@AEAAXAEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@\@Z + * @symbol ?_sendLevelData\@ServerNetworkHandler\@\@AEAAXAEAVServerPlayer\@\@AEBVNetworkIdentifier\@\@\@Z */ MCAPI void _sendLevelData(class ServerPlayer &, class NetworkIdentifier const &); /** - * @symbol ?_updatePermissions\@ServerNetworkHandler\@\@AEAA_NAEBVServerPlayer\@\@AEBVRequestPermissionsPacket\@\@AEAVAbilities\@\@AEAVPermissionsHandler\@\@PEAVPlayer\@\@\@Z + * @symbol ?_updatePermissions\@ServerNetworkHandler\@\@AEAA_NAEBVServerPlayer\@\@AEBVRequestPermissionsPacket\@\@AEAVAbilities\@\@AEAVPermissionsHandler\@\@PEAVPlayer\@\@\@Z */ MCAPI bool _updatePermissions(class ServerPlayer const &, class RequestPermissionsPacket const &, class Abilities &, class PermissionsHandler &, class Player *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp b/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp new file mode 100644 index 0000000000..5f348ea351 --- /dev/null +++ b/LiteLoader/include/llapi/mc/ServerNetworkSystem.hpp @@ -0,0 +1,33 @@ +/** + * @file ServerNetworkSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Bedrock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class ServerNetworkSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SERVERNETWORKSYSTEM +public: + class ServerNetworkSystem& operator=(class ServerNetworkSystem const &) = delete; + ServerNetworkSystem(class ServerNetworkSystem const &) = delete; + ServerNetworkSystem() = delete; +#endif + +public: + /** + * @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 + */ + MCAPI ServerNetworkSystem(class Scheduler &, std::vector const &, struct NetworkSystemToggles const &, class Bedrock::NonOwnerPointer const &, class ServiceReference); + +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayer.hpp b/LiteLoader/include/llapi/mc/ServerPlayer.hpp index b977164f2d..dd72a44b7a 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayer.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayer.hpp @@ -35,672 +35,671 @@ class ServerPlayer : public Player { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@ServerPlayer\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@ServerPlayer\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 14 - * @symbol ?_serverInitItemStackIds\@ServerPlayer\@\@EEAAXXZ + * @vftbl 14 + * @symbol ?_serverInitItemStackIds\@ServerPlayer\@\@EEAAXXZ */ virtual void _serverInitItemStackIds(); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ServerPlayer(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@ServerPlayer\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@ServerPlayer\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 116 - * @symbol ?isValidTarget\@ServerPlayer\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 115 + * @symbol ?isValidTarget\@ServerPlayer\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool isValidTarget(class Actor *) const; /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@ServerPlayer\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@ServerPlayer\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 151 - * @symbol ?setArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 150 + * @symbol ?setArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 161 - * @symbol ?setOffhandSlot\@ServerPlayer\@\@UEAAXAEBVItemStack\@\@\@Z + * @vftbl 160 + * @symbol ?setOffhandSlot\@ServerPlayer\@\@UEAAXAEBVItemStack\@\@\@Z */ virtual void setOffhandSlot(class ItemStack const &); /** - * @vftbl 166 - * @symbol ?load\@ServerPlayer\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 165 + * @symbol ?load\@ServerPlayer\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 178 - * @symbol ?canChangeDimensionsUsingPortal\@ServerPlayer\@\@UEBA_NXZ + * @vftbl 177 + * @symbol ?canChangeDimensionsUsingPortal\@ServerPlayer\@\@UEBA_NXZ */ virtual bool canChangeDimensionsUsingPortal() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 180 - * @symbol ?changeDimension\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @vftbl 179 + * @symbol ?changeDimension\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimension(class AutomaticID); /** - * @vftbl 181 - * @symbol ?getControllingPlayer\@ServerPlayer\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 180 + * @symbol ?getControllingPlayer\@ServerPlayer\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getControllingPlayer() const; /** - * @vftbl 182 - * @symbol ?checkFallDamage\@ServerPlayer\@\@UEAAXM_N\@Z + * @vftbl 181 + * @symbol ?checkFallDamage\@ServerPlayer\@\@UEAAXM_N\@Z */ virtual void checkFallDamage(float, bool); /** - * @vftbl 184 - * @symbol ?handleFallDistanceOnServer\@ServerPlayer\@\@UEAAXMM_N\@Z + * @vftbl 183 + * @symbol ?handleFallDistanceOnServer\@ServerPlayer\@\@UEAAXMM_N\@Z */ virtual void handleFallDistanceOnServer(float, float, bool); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 210 - * @symbol ?onEffectAdded\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z + * @vftbl 209 + * @symbol ?onEffectAdded\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectAdded(class MobEffectInstance &); /** - * @vftbl 211 - * @symbol ?onEffectUpdated\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z + * @vftbl 210 + * @symbol ?onEffectUpdated\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectUpdated(class MobEffectInstance &); /** - * @vftbl 212 - * @symbol ?onEffectRemoved\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z + * @vftbl 211 + * @symbol ?onEffectRemoved\@ServerPlayer\@\@MEAAXAEAVMobEffectInstance\@\@\@Z */ virtual void onEffectRemoved(class MobEffectInstance &); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?knockback\@ServerPlayer\@\@UEAAXPEAVActor\@\@HMMMMM\@Z + * @vftbl 276 + * @symbol ?knockback\@ServerPlayer\@\@UEAAXPEAVActor\@\@HMMMMM\@Z */ virtual void knockback(class Actor *, int, float, float, float, float, float); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 291 - * @symbol ?aiStep\@ServerPlayer\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@ServerPlayer\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 316 - * @symbol ?hurtArmorSlots\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z + * @vftbl 313 + * @symbol ?hurtArmorSlots\@ServerPlayer\@\@UEAAXAEBVActorDamageSource\@\@HV?$bitset\@$03\@std\@\@\@Z */ virtual void hurtArmorSlots(class ActorDamageSource const &, int, class std::bitset<4>); /** - * @vftbl 317 - * @symbol ?setDamagedArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z + * @vftbl 314 + * @symbol ?setDamagedArmor\@ServerPlayer\@\@UEAAXW4ArmorSlot\@\@AEBVItemStack\@\@\@Z */ virtual void setDamagedArmor(enum class ArmorSlot, class ItemStack const &); /** - * @vftbl 318 - * @symbol ?sendArmorDamage\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z + * @vftbl 315 + * @symbol ?sendArmorDamage\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmorDamage(class std::bitset<4>); /** - * @vftbl 319 - * @symbol ?sendArmor\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z + * @vftbl 316 + * @symbol ?sendArmor\@ServerPlayer\@\@UEAAXV?$bitset\@$03\@std\@\@\@Z */ virtual void sendArmor(class std::bitset<4>); /** - * @vftbl 329 - * @symbol ?clearVanishEnchantedItemsOnDeath\@ServerPlayer\@\@UEAAXXZ + * @vftbl 326 + * @symbol ?clearVanishEnchantedItemsOnDeath\@ServerPlayer\@\@UEAAXXZ */ virtual void clearVanishEnchantedItemsOnDeath(); /** - * @vftbl 330 - * @symbol ?sendInventory\@ServerPlayer\@\@UEAAX_N\@Z + * @vftbl 327 + * @symbol ?sendInventory\@ServerPlayer\@\@UEAAX_N\@Z */ virtual void sendInventory(bool); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?prepareRegion\@ServerPlayer\@\@UEAAXAEAVChunkSource\@\@\@Z + * @vftbl 353 + * @symbol ?prepareRegion\@ServerPlayer\@\@UEAAXAEAVChunkSource\@\@\@Z */ virtual void prepareRegion(class ChunkSource &); /** - * @vftbl 357 - * @symbol ?destroyRegion\@ServerPlayer\@\@UEAAXXZ + * @vftbl 354 + * @symbol ?destroyRegion\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyRegion(); /** - * @vftbl 362 - * @symbol ?changeDimensionWithCredits\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @vftbl 359 + * @symbol ?changeDimensionWithCredits\@ServerPlayer\@\@UEAAXV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void changeDimensionWithCredits(class AutomaticID); /** - * @vftbl 363 - * @symbol ?tickWorld\@ServerPlayer\@\@UEAAXAEBUTick\@\@\@Z + * @vftbl 360 + * @symbol ?tickWorld\@ServerPlayer\@\@UEAAXAEBUTick\@\@\@Z */ virtual void tickWorld(struct Tick const &); /** - * @vftbl 364 - * @symbol __unk_vfn_364 + * @vftbl 361 + * @symbol __unk_vfn_361 */ - virtual void __unk_vfn_364(); + virtual void __unk_vfn_361(); /** - * @vftbl 366 - * @symbol ?moveView\@ServerPlayer\@\@UEAAXXZ + * @vftbl 363 + * @symbol ?moveView\@ServerPlayer\@\@UEAAXXZ */ virtual void moveView(); /** - * @vftbl 367 - * @symbol ?moveSpawnView\@ServerPlayer\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @vftbl 364 + * @symbol ?moveSpawnView\@ServerPlayer\@\@UEAAXAEBVVec3\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ virtual void moveSpawnView(class Vec3 const &, class AutomaticID); /** - * @vftbl 370 - * @symbol ?checkMovementStats\@ServerPlayer\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 367 + * @symbol ?checkMovementStats\@ServerPlayer\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void checkMovementStats(class Vec3 const &); /** - * @vftbl 371 - * @symbol __unk_vfn_371 + * @vftbl 368 + * @symbol __unk_vfn_368 */ - virtual void __unk_vfn_371(); + virtual void __unk_vfn_368(); /** - * @vftbl 372 - * @symbol __unk_vfn_372 + * @vftbl 369 + * @symbol __unk_vfn_369 */ - virtual void __unk_vfn_372(); + virtual void __unk_vfn_369(); /** - * @vftbl 373 - * @symbol ?respawn\@ServerPlayer\@\@UEAAXXZ + * @vftbl 370 + * @symbol ?respawn\@ServerPlayer\@\@UEAAXXZ */ virtual void respawn(); /** - * @vftbl 374 - * @symbol __unk_vfn_374 + * @vftbl 371 + * @symbol __unk_vfn_371 */ - virtual void __unk_vfn_374(); + virtual void __unk_vfn_371(); /** - * @vftbl 375 - * @symbol __unk_vfn_375 + * @vftbl 372 + * @symbol __unk_vfn_372 */ - virtual void __unk_vfn_375(); + virtual void __unk_vfn_372(); /** - * @vftbl 380 - * @symbol __unk_vfn_380 + * @vftbl 377 + * @symbol __unk_vfn_377 */ - virtual void __unk_vfn_380(); + virtual void __unk_vfn_377(); /** - * @vftbl 381 - * @symbol __unk_vfn_381 + * @vftbl 378 + * @symbol __unk_vfn_378 */ - virtual void __unk_vfn_381(); + virtual void __unk_vfn_378(); /** - * @vftbl 382 - * @symbol ?openTrading\@ServerPlayer\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z + * @vftbl 379 + * @symbol ?openTrading\@ServerPlayer\@\@UEAAXAEBUActorUniqueID\@\@_N\@Z */ virtual void openTrading(struct ActorUniqueID const &, bool); /** - * @vftbl 384 - * @symbol __unk_vfn_384 + * @vftbl 381 + * @symbol __unk_vfn_381 */ - virtual void __unk_vfn_384(); + virtual void __unk_vfn_381(); /** - * @vftbl 385 - * @symbol ?openNpcInteractScreen\@ServerPlayer\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z + * @vftbl 382 + * @symbol ?openNpcInteractScreen\@ServerPlayer\@\@UEAAXV?$shared_ptr\@UINpcDialogueData\@\@\@std\@\@\@Z */ virtual void openNpcInteractScreen(class std::shared_ptr); /** - * @vftbl 386 - * @symbol ?openInventory\@ServerPlayer\@\@UEAAXXZ + * @vftbl 383 + * @symbol ?openInventory\@ServerPlayer\@\@UEAAXXZ */ virtual void openInventory(); /** - * @vftbl 387 - * @symbol __unk_vfn_387 + * @vftbl 384 + * @symbol __unk_vfn_384 */ - virtual void __unk_vfn_387(); + virtual void __unk_vfn_384(); /** - * @vftbl 388 - * @symbol __unk_vfn_388 + * @vftbl 385 + * @symbol __unk_vfn_385 */ - virtual void __unk_vfn_388(); + virtual void __unk_vfn_385(); /** - * @vftbl 389 - * @symbol ?displayTextObjectMessage\@ServerPlayer\@\@UEAAXAEBVTextObjectRoot\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @vftbl 386 + * @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 390 - * @symbol ?displayTextObjectWhisperMessage\@ServerPlayer\@\@UEAAXAEBVResolvedTextObject\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @vftbl 387 + * @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 391 - * @symbol ?displayTextObjectWhisperMessage\@ServerPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@00\@Z + * @vftbl 388 + * @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 392 - * @symbol ?displayWhisperMessage\@ServerPlayer\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @vftbl 389 + * @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 394 - * @symbol ?stopSleepInBed\@ServerPlayer\@\@UEAAX_N0\@Z + * @vftbl 391 + * @symbol ?stopSleepInBed\@ServerPlayer\@\@UEAAX_N0\@Z */ virtual void stopSleepInBed(bool, bool); /** - * @vftbl 398 - * @symbol __unk_vfn_398 + * @vftbl 395 + * @symbol __unk_vfn_395 */ - virtual void __unk_vfn_398(); + virtual void __unk_vfn_395(); /** - * @vftbl 399 - * @symbol __unk_vfn_399 + * @vftbl 396 + * @symbol __unk_vfn_396 */ - virtual void __unk_vfn_399(); + virtual void __unk_vfn_396(); /** - * @vftbl 400 - * @symbol ?isHostingPlayer\@ServerPlayer\@\@UEBA_NXZ + * @vftbl 397 + * @symbol ?isHostingPlayer\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 401 - * @symbol ?isLoading\@ServerPlayer\@\@UEBA_NXZ + * @vftbl 398 + * @symbol ?isLoading\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isLoading() const; /** - * @vftbl 402 - * @symbol ?isPlayerInitialized\@ServerPlayer\@\@UEBA_NXZ + * @vftbl 399 + * @symbol ?isPlayerInitialized\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isPlayerInitialized() const; /** - * @vftbl 403 - * @symbol __unk_vfn_403 + * @vftbl 400 + * @symbol __unk_vfn_400 */ - virtual void __unk_vfn_403(); + virtual void __unk_vfn_400(); /** - * @vftbl 406 - * @symbol ?setPlayerGameType\@ServerPlayer\@\@UEAAXW4GameType\@\@\@Z + * @vftbl 403 + * @symbol ?setPlayerGameType\@ServerPlayer\@\@UEAAXW4GameType\@\@\@Z */ virtual void setPlayerGameType(enum class GameType); /** - * @vftbl 410 - * @symbol __unk_vfn_410 + * @vftbl 407 + * @symbol __unk_vfn_407 */ - virtual void __unk_vfn_410(); + virtual void __unk_vfn_407(); /** - * @vftbl 414 - * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z + * @vftbl 411 + * @symbol ?setContainerData\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@HH\@Z */ virtual void setContainerData(class IContainerManager &, int, int); /** - * @vftbl 415 - * @symbol ?slotChanged\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@AEAVContainer\@\@HAEBVItemStack\@\@2_N\@Z + * @vftbl 412 + * @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 417 - * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z + * @vftbl 414 + * @symbol ?refreshContainer\@ServerPlayer\@\@UEAAXAEAVIContainerManager\@\@\@Z */ virtual void refreshContainer(class IContainerManager &); /** - * @vftbl 419 - * @symbol ?isActorRelevant\@ServerPlayer\@\@UEAA_NAEBVActor\@\@\@Z + * @vftbl 416 + * @symbol ?isActorRelevant\@ServerPlayer\@\@UEAA_NAEBVActor\@\@\@Z */ virtual bool isActorRelevant(class Actor const &); /** - * @vftbl 420 - * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ + * @vftbl 417 + * @symbol ?isTeacher\@ServerPlayer\@\@UEBA_NXZ */ virtual bool isTeacher() const; /** - * @vftbl 421 - * @symbol ?onSuspension\@ServerPlayer\@\@UEAAXXZ + * @vftbl 418 + * @symbol ?onSuspension\@ServerPlayer\@\@UEAAXXZ */ virtual void onSuspension(); /** - * @vftbl 422 - * @symbol ?onLinkedSlotsChanged\@ServerPlayer\@\@UEAAXXZ + * @vftbl 419 + * @symbol ?onLinkedSlotsChanged\@ServerPlayer\@\@UEAAXXZ */ virtual void onLinkedSlotsChanged(); /** - * @vftbl 428 - * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z + * @vftbl 425 + * @symbol ?sendInventoryTransaction\@ServerPlayer\@\@UEBAXAEBVInventoryTransaction\@\@\@Z */ virtual void sendInventoryTransaction(class InventoryTransaction const &) const; /** - * @vftbl 429 - * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 426 + * @symbol ?sendComplexInventoryTransaction\@ServerPlayer\@\@UEBAXV?$unique_ptr\@VComplexInventoryTransaction\@\@U?$default_delete\@VComplexInventoryTransaction\@\@\@std\@\@\@std\@\@\@Z */ virtual void sendComplexInventoryTransaction(std::unique_ptr) const; /** - * @vftbl 430 - * @symbol ?sendNetworkPacket\@ServerPlayer\@\@UEBAXAEAVPacket\@\@\@Z + * @vftbl 427 + * @symbol ?sendNetworkPacket\@ServerPlayer\@\@UEBAXAEAVPacket\@\@\@Z */ virtual void sendNetworkPacket(class Packet &) const; /** - * @vftbl 431 - * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ + * @vftbl 428 + * @symbol ?getPlayerEventCoordinator\@ServerPlayer\@\@UEAAAEAVPlayerEventCoordinator\@\@XZ */ virtual class PlayerEventCoordinator & getPlayerEventCoordinator(); /** - * @vftbl 432 - * @symbol ?tryGetMoveInputHandler\@ServerPlayer\@\@UEBAPEAVMoveInputHandler\@\@XZ + * @vftbl 429 + * @symbol ?tryGetMoveInputHandler\@ServerPlayer\@\@UEBAPEAVMoveInputHandler\@\@XZ */ virtual class MoveInputHandler * tryGetMoveInputHandler() const; /** - * @vftbl 433 - * @symbol ?getInputMode\@ServerPlayer\@\@UEBA?AW4InputMode\@\@XZ + * @vftbl 430 + * @symbol ?getInputMode\@ServerPlayer\@\@UEBA?AW4InputMode\@\@XZ */ virtual enum class InputMode getInputMode() const; /** - * @vftbl 434 - * @symbol ?getPlayMode\@ServerPlayer\@\@UEBA?AW4ClientPlayMode\@\@XZ + * @vftbl 431 + * @symbol ?getPlayMode\@ServerPlayer\@\@UEBA?AW4ClientPlayMode\@\@XZ */ virtual enum class ClientPlayMode getPlayMode() const; /** - * @vftbl 435 - * @symbol ?reportMovementTelemetry\@ServerPlayer\@\@UEAAXW4MovementEventType\@\@\@Z + * @vftbl 432 + * @symbol ?reportMovementTelemetry\@ServerPlayer\@\@UEAAXW4MovementEventType\@\@\@Z */ virtual void reportMovementTelemetry(enum class MovementEventType); /** - * @vftbl 436 - * @symbol __unk_vfn_436 + * @vftbl 433 + * @symbol __unk_vfn_433 */ - virtual void __unk_vfn_436(); + virtual void __unk_vfn_433(); /** - * @vftbl 439 - * @symbol __unk_vfn_439 + * @vftbl 436 + * @symbol __unk_vfn_436 */ - virtual void __unk_vfn_439(); + virtual void __unk_vfn_436(); /** - * @vftbl 443 - * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ + * @vftbl 440 + * @symbol ?getEditorPlayer\@ServerPlayer\@\@UEBA?AV?$NonOwnerPointer\@VIEditorPlayer\@Editor\@\@\@Bedrock\@\@XZ */ virtual class Bedrock::NonOwnerPointer getEditorPlayer() const; /** - * @vftbl 444 - * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ + * @vftbl 441 + * @symbol ?destroyEditorPlayer\@ServerPlayer\@\@UEAAXXZ */ virtual void destroyEditorPlayer(); /** - * @vftbl 445 - * @symbol ?_getSpawnChunkLimit\@ServerPlayer\@\@MEBAHXZ + * @vftbl 442 + * @symbol ?_getSpawnChunkLimit\@ServerPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 446 - * @symbol ?_updateChunkPublisherView\@ServerPlayer\@\@MEAAXAEBVVec3\@\@M\@Z + * @vftbl 443 + * @symbol ?_updateChunkPublisherView\@ServerPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERPLAYER /** - * @symbol ?frameUpdate\@ServerPlayer\@\@UEAAXAEAVFrameUpdateContextBase\@\@\@Z + * @symbol ?frameUpdate\@ServerPlayer\@\@UEAAXAEAVFrameUpdateContextBase\@\@\@Z */ MCVAPI void frameUpdate(class FrameUpdateContextBase &); /** - * @symbol ?openPortfolio\@ServerPlayer\@\@UEAAXXZ + * @symbol ?openPortfolio\@ServerPlayer\@\@UEAAXXZ */ MCVAPI void openPortfolio(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerPlayer(); #endif /** - * @symbol ??0ServerPlayer\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@AEAVNetworkHandler\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@V?$function\@$$A6AXAEAVServerPlayer\@\@\@Z\@std\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@9V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@H_NAEAVEntityContext\@\@\@Z + * @symbol ??0ServerPlayer\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@AEAVNetworkSystem\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@V?$function\@$$A6AXAEAVServerPlayer\@\@\@Z\@std\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@9V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@H_NAEAVEntityContext\@\@\@Z */ - MCAPI ServerPlayer(class Level &, class PacketSender &, class NetworkHandler &, class ClientBlobCache::Server::ActiveTransfersManager &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class std::function, class mce::UUID, std::string const &, std::string const &, std::unique_ptr, int, bool, class EntityContext &); + MCAPI ServerPlayer(class Level &, class PacketSender &, class NetworkSystem &, class ClientBlobCache::Server::ActiveTransfersManager &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class std::function, class mce::UUID, std::string const &, std::string const &, std::unique_ptr, int, bool, class EntityContext &); /** - * @symbol ?addActorToReplicationList\@ServerPlayer\@\@QEAAXV?$not_null\@PEAVActor\@\@\@gsl\@\@_N\@Z + * @symbol ?addActorToReplicationList\@ServerPlayer\@\@QEAAXV?$not_null\@PEAVActor\@\@\@gsl\@\@_N\@Z */ MCAPI void addActorToReplicationList(class gsl::not_null, bool); /** - * @symbol ?checkCheating\@ServerPlayer\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?checkCheating\@ServerPlayer\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void checkCheating(class Vec3 const &); /** - * @symbol ?disconnect\@ServerPlayer\@\@QEAAXXZ + * @symbol ?disconnect\@ServerPlayer\@\@QEAAXXZ */ MCAPI void disconnect(); /** - * @symbol ?doDeleteContainerManager\@ServerPlayer\@\@QEAAX_N\@Z + * @symbol ?doDeleteContainerManager\@ServerPlayer\@\@QEAAX_N\@Z */ MCAPI void doDeleteContainerManager(bool); /** - * @symbol ?doInitialSpawn\@ServerPlayer\@\@QEAAXXZ + * @symbol ?doInitialSpawn\@ServerPlayer\@\@QEAAXXZ */ MCAPI void doInitialSpawn(); /** - * @symbol ?getItemStackNetManagerServer\@ServerPlayer\@\@QEAAAEAVItemStackNetManagerServer\@\@XZ + * @symbol ?getItemStackNetManagerServer\@ServerPlayer\@\@QEAAAEAVItemStackNetManagerServer\@\@XZ */ MCAPI class ItemStackNetManagerServer & getItemStackNetManagerServer(); /** - * @symbol ?getServerMoveInputHandler\@ServerPlayer\@\@QEAAPEAVServerMoveInputHandler\@\@XZ + * @symbol ?getServerMoveInputHandler\@ServerPlayer\@\@QEAAPEAVServerMoveInputHandler\@\@XZ */ MCAPI class ServerMoveInputHandler * getServerMoveInputHandler(); /** - * @symbol ?handleActorPickRequestOnServer\@ServerPlayer\@\@QEAAXAEAVActor\@\@_N1\@Z + * @symbol ?handleActorPickRequestOnServer\@ServerPlayer\@\@QEAAXAEAVActor\@\@_N1\@Z */ MCAPI void handleActorPickRequestOnServer(class Actor &, bool, bool); /** - * @symbol ?handleBlockPickRequestOnServer\@ServerPlayer\@\@QEAAXAEBVBlockPos\@\@_N\@Z + * @symbol ?handleBlockPickRequestOnServer\@ServerPlayer\@\@QEAAXAEBVBlockPos\@\@_N\@Z */ MCAPI void handleBlockPickRequestOnServer(class BlockPos const &, bool); /** - * @symbol ?openUnmanagedContainer\@ServerPlayer\@\@QEAA?AW4ContainerID\@\@XZ + * @symbol ?openUnmanagedContainer\@ServerPlayer\@\@QEAA?AW4ContainerID\@\@XZ */ MCAPI enum class ContainerID openUnmanagedContainer(); /** - * @symbol ?postLoad\@ServerPlayer\@\@QEAAX_N\@Z + * @symbol ?postLoad\@ServerPlayer\@\@QEAAX_N\@Z */ MCAPI void postLoad(bool); /** - * @symbol ?postReplicationTick\@ServerPlayer\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?postReplicationTick\@ServerPlayer\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void postReplicationTick(struct Tick const &); /** - * @symbol ?preReplicationTick\@ServerPlayer\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?preReplicationTick\@ServerPlayer\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void preReplicationTick(struct Tick const &); /** - * @symbol ?selectItem\@ServerPlayer\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?selectItem\@ServerPlayer\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void selectItem(class ItemStack const &); /** - * @symbol ?sendMobEffectPackets\@ServerPlayer\@\@QEAAXXZ + * @symbol ?sendMobEffectPackets\@ServerPlayer\@\@QEAAXXZ */ MCAPI void sendMobEffectPackets(); /** - * @symbol ?sendPlayerOnGround\@ServerPlayer\@\@QEAAXXZ + * @symbol ?sendPlayerOnGround\@ServerPlayer\@\@QEAAXXZ */ MCAPI void sendPlayerOnGround(); /** - * @symbol ?setClientChunkRadius\@ServerPlayer\@\@QEAAXI\@Z + * @symbol ?setClientChunkRadius\@ServerPlayer\@\@QEAAXI\@Z */ MCAPI void setClientChunkRadius(unsigned int); /** - * @symbol ?setInputMode\@ServerPlayer\@\@QEAAXAEBW4InputMode\@\@\@Z + * @symbol ?setInputMode\@ServerPlayer\@\@QEAAXAEBW4InputMode\@\@\@Z */ MCAPI void setInputMode(enum class InputMode const &); /** - * @symbol ?setLocalPlayerAsInitialized\@ServerPlayer\@\@QEAAXXZ + * @symbol ?setLocalPlayerAsInitialized\@ServerPlayer\@\@QEAAXXZ */ MCAPI void setLocalPlayerAsInitialized(); /** - * @symbol ?setPlayMode\@ServerPlayer\@\@QEAAXAEBW4ClientPlayMode\@\@\@Z + * @symbol ?setPlayMode\@ServerPlayer\@\@QEAAXAEBW4ClientPlayMode\@\@\@Z */ MCAPI void setPlayMode(enum class ClientPlayMode const &); /** - * @symbol ?setPlayerInput\@ServerPlayer\@\@QEAAXMM_N0\@Z + * @symbol ?setPlayerInput\@ServerPlayer\@\@QEAAXMM_N0\@Z */ MCAPI void setPlayerInput(float, float, bool, bool); /** - * @symbol ?setSyncTimeIfClientServerPositionMatches\@ServerPlayer\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setSyncTimeIfClientServerPositionMatches\@ServerPlayer\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setSyncTimeIfClientServerPositionMatches(class Vec3 const &); /** - * @symbol ?triggerRespawnFromCompletingTheEnd\@ServerPlayer\@\@QEAAXXZ + * @symbol ?triggerRespawnFromCompletingTheEnd\@ServerPlayer\@\@QEAAXXZ */ MCAPI void triggerRespawnFromCompletingTheEnd(); /** - * @symbol ?tryGetFromEntity\@ServerPlayer\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@ServerPlayer\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class ServerPlayer * tryGetFromEntity(class EntityContext &, bool); //private: /** - * @symbol ?_logCDEvent\@ServerPlayer\@\@AEAAXW4CrashDumpLogStringID\@\@000\@Z + * @symbol ?_logCDEvent\@ServerPlayer\@\@AEAAXW4CrashDumpLogStringID\@\@000\@Z */ MCAPI void _logCDEvent(enum class CrashDumpLogStringID, enum class CrashDumpLogStringID, enum class CrashDumpLogStringID, enum class CrashDumpLogStringID); /** - * @symbol ?_nextContainerCounter\@ServerPlayer\@\@AEAA?AW4ContainerID\@\@XZ + * @symbol ?_nextContainerCounter\@ServerPlayer\@\@AEAA?AW4ContainerID\@\@XZ */ MCAPI enum class ContainerID _nextContainerCounter(); /** - * @symbol ?_removeNearbyEntities\@ServerPlayer\@\@AEAAXXZ + * @symbol ?_removeNearbyEntities\@ServerPlayer\@\@AEAAXXZ */ MCAPI void _removeNearbyEntities(); /** - * @symbol ?_scanForNearbyActors\@ServerPlayer\@\@AEAAXXZ + * @symbol ?_scanForNearbyActors\@ServerPlayer\@\@AEAAXXZ */ MCAPI void _scanForNearbyActors(); /** - * @symbol ?_setContainerManager\@ServerPlayer\@\@AEAAXV?$shared_ptr\@VIContainerManager\@\@\@std\@\@\@Z + * @symbol ?_setContainerManager\@ServerPlayer\@\@AEAAXV?$shared_ptr\@VIContainerManager\@\@\@std\@\@\@Z */ MCAPI void _setContainerManager(class std::shared_ptr); /** - * @symbol ?_updateNearbyActors\@ServerPlayer\@\@AEAAXXZ + * @symbol ?_updateNearbyActors\@ServerPlayer\@\@AEAAXXZ */ MCAPI void _updateNearbyActors(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerBlockUseHandler.hpp b/LiteLoader/include/llapi/mc/ServerPlayerBlockUseHandler.hpp index a101d31eda..b0e481f772 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerBlockUseHandler.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerBlockUseHandler.hpp @@ -24,35 +24,35 @@ enum class PredictionValidationError; #undef AFTER_EXTRA /** - * @symbol ?getErrorForRejectedRequest\@ServerPlayerBlockUseHandler\@\@YA?AW4PredictionValidationError\@1\@AEAVServerPlayer\@\@AEBVItemStackRequestActionMineBlock\@\@\@Z + * @symbol ?getErrorForRejectedRequest\@ServerPlayerBlockUseHandler\@\@YA?AW4PredictionValidationError\@1\@AEAVServerPlayer\@\@AEBVItemStackRequestActionMineBlock\@\@\@Z */ MCAPI enum class ServerPlayerBlockUseHandler::PredictionValidationError getErrorForRejectedRequest(class ServerPlayer &, class ItemStackRequestActionMineBlock const &); /** - * @symbol ?onAbortDestroyBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?onAbortDestroyBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void onAbortDestroyBlock(class ServerPlayer &, class BlockPos const &, int); /** - * @symbol ?onBeforeMovementSimulation\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVPlayerBlockActions\@\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@Bedrock\@\@\@Z + * @symbol ?onBeforeMovementSimulation\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVPlayerBlockActions\@\@V?$unique_ptr\@VItemStackRequestData\@\@U?$default_delete\@VItemStackRequestData\@\@\@std\@\@\@std\@\@V?$NonOwnerPointer\@VTextFilteringProcessor\@\@\@Bedrock\@\@\@Z */ MCAPI void onBeforeMovementSimulation(class ServerPlayer &, class PlayerBlockActions const &, std::unique_ptr, class Bedrock::NonOwnerPointer); /** - * @symbol ?onCrackBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?onCrackBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void onCrackBlock(class ServerPlayer &, class BlockPos const &, int); /** - * @symbol ?onStartDestroyBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?onStartDestroyBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void onStartDestroyBlock(class ServerPlayer &, class BlockPos const &, int); /** - * @symbol ?onStopDestroyBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@\@Z + * @symbol ?onStopDestroyBlock\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@\@Z */ MCAPI void onStopDestroyBlock(class ServerPlayer &); /** - * @symbol ?serverTickBlockBreaking\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?serverTickBlockBreaking\@ServerPlayerBlockUseHandler\@\@YAXAEAVServerPlayer\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void serverTickBlockBreaking(class ServerPlayer &, class BlockPos const &, int); /** - * @symbol ?validateClientBlockBreakPrediction\@ServerPlayerBlockUseHandler\@\@YA?AW4PredictionValidationError\@1\@AEAVServerPlayer\@\@PEBVItemStackRequestActionMineBlock\@\@AEBVBlockPos\@\@AEBVItemStack\@\@3PEBUPlayerBlockActionData\@\@\@Z + * @symbol ?validateClientBlockBreakPrediction\@ServerPlayerBlockUseHandler\@\@YA?AW4PredictionValidationError\@1\@AEAVServerPlayer\@\@PEBVItemStackRequestActionMineBlock\@\@AEBVBlockPos\@\@AEBVItemStack\@\@3PEBUPlayerBlockActionData\@\@\@Z */ MCAPI enum class ServerPlayerBlockUseHandler::PredictionValidationError validateClientBlockBreakPrediction(class ServerPlayer &, class ItemStackRequestActionMineBlock const *, class BlockPos const &, class ItemStack const &, class ItemStack const &, struct PlayerBlockActionData const *); diff --git a/LiteLoader/include/llapi/mc/ServerPlayerBroadcastMoveSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerBroadcastMoveSystem.hpp index 2f17b1c105..e6a1064302 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerBroadcastMoveSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerBroadcastMoveSystem.hpp @@ -28,8 +28,8 @@ class ServerPlayerBroadcastMoveSystem { public: /** - * @symbol ?create\@ServerPlayerBroadcastMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ServerPlayerBroadcastMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp b/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp index 842bc9a7e2..b7395e92ea 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerCurrentMovementComponent.hpp @@ -28,7 +28,7 @@ struct ServerPlayerCurrentMovementComponent { public: /** - * @symbol ??1ServerPlayerCurrentMovementComponent\@\@QEAA\@XZ + * @symbol ??1ServerPlayerCurrentMovementComponent\@\@QEAA\@XZ */ MCAPI ~ServerPlayerCurrentMovementComponent(); diff --git a/LiteLoader/include/llapi/mc/ServerPlayerEventCoordinator.hpp b/LiteLoader/include/llapi/mc/ServerPlayerEventCoordinator.hpp index 7b86ccddd9..e7e35c47fe 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerEventCoordinator.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerEventCoordinator.hpp @@ -30,24 +30,24 @@ class ServerPlayerEventCoordinator { public: /** - * @symbol ?sendPlayerAuthInputApplied\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerAuthInputApplied\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerAuthInputApplied(class Player &); /** - * @symbol ?sendPlayerAuthInputReceived\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerAuthInputReceived\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerAuthInputReceived(class Player &); /** - * @symbol ?sendPlayerMovementAnomaly\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVVec3\@\@MM\@Z + * @symbol ?sendPlayerMovementAnomaly\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVVec3\@\@MM\@Z */ MCAPI void sendPlayerMovementAnomaly(class Player &, class Vec3 const &, float, float); /** - * @symbol ?sendPlayerMovementCorrected\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVVec3\@\@MM\@Z + * @symbol ?sendPlayerMovementCorrected\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@AEBVVec3\@\@MM\@Z */ MCAPI void sendPlayerMovementCorrected(class Player &, class Vec3 const &, float, float); /** - * @symbol ?sendPlayerOnGround\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?sendPlayerOnGround\@ServerPlayerEventCoordinator\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void sendPlayerOnGround(class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp index dbd774b7f7..8641ad3004 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerFallDamageSystem.hpp @@ -28,12 +28,16 @@ class ServerPlayerFallDamageSystem { public: /** - * @symbol ?_doServerPlayerFallDamageSystem\@ServerPlayerFallDamageSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAbilitiesComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasTeleportedFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasTeleportedFlag\@\@\@\@V?$FlagComponent\@USendPlayerOnGroundRequestFlag\@\@\@\@UCheckFallDamageRequestComponent\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z + * @symbol ?_doServerPlayerFallDamageSystem\@ServerPlayerFallDamageSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAbilitiesComponent\@\@AEBUSynchedActorDataComponent\@\@AEBUStateVectorComponent\@\@AEAUFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasTeleportedFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasTeleportedFlag\@\@\@\@V?$FlagComponent\@USendPlayerOnGroundRequestFlag\@\@\@\@UCheckFallDamageRequestComponent\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z */ MCAPI static void _doServerPlayerFallDamageSystem(class StrictEntityContext const &, struct AbilitiesComponent const &, struct SynchedActorDataComponent const &, struct StateVectorComponent const &, struct FallDistanceComponent &, class Optional const>, class Optional const>, class Optional const>, class EntityModifierT, class FlagComponent, struct CheckFallDamageRequestComponent, class FlagComponent>); /** - * @symbol ?createSystem\@ServerPlayerFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?_tickServerPlayerFallDamageSystem\@ServerPlayerFallDamageSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UServerPlayerComponentFlag\@\@\@\@\@\@$$CBUAbilitiesComponent\@\@$$CBUSynchedActorDataComponent\@\@$$CBUStateVectorComponent\@\@UFallDistanceComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UHasTeleportedFlag\@\@\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UHasTeleportedFlag\@\@\@\@V?$FlagComponent\@USendPlayerOnGroundRequestFlag\@\@\@\@UCheckFallDamageRequestComponent\@\@V?$FlagComponent\@UWasOnGroundFlag\@\@\@\@\@\@\@Z + */ + MCAPI static void _tickServerPlayerFallDamageSystem(class ViewT, class FlagComponent>, struct AbilitiesComponent const, struct SynchedActorDataComponent const, struct StateVectorComponent const, struct FallDistanceComponent, class Optional const>, class Optional const>, class Optional const>>, class EntityModifierT, class FlagComponent, struct CheckFallDamageRequestComponent, class FlagComponent>); + /** + * @symbol ?createSystem\@ServerPlayerFallDamageSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerInputSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerInputSystem.hpp index 47871d91ba..4b500e1cf0 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerInputSystem.hpp @@ -28,8 +28,12 @@ class ServerPlayerInputSystem { public: /** - * @symbol ?create\@ServerPlayerInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ServerPlayerInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); + /** + * @symbol ?onPlayerAuthInputPacket\@ServerPlayerInputSystem\@\@SAXAEAUServerPlayerMovementComponent\@\@AEBVPlayerAuthInputPacket\@\@\@Z + */ + MCAPI static void onPlayerAuthInputPacket(struct ServerPlayerMovementComponent &, class PlayerAuthInputPacket const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerInputSystemUtils.hpp b/LiteLoader/include/llapi/mc/ServerPlayerInputSystemUtils.hpp index abd0a9cf43..0c17f4229d 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerInputSystemUtils.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerInputSystemUtils.hpp @@ -20,7 +20,7 @@ namespace ServerPlayerInputSystemUtils { #undef AFTER_EXTRA /** - * @symbol ?_tickPlayerMovement\@ServerPlayerInputSystemUtils\@\@YAXAEBUPlayerCurrentTickComponent\@\@AEAUServerPlayerMovementComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UServerPlayerCurrentMovementComponent\@\@\@\@AEAVStrictEntityContext\@\@\@Z + * @symbol ?_tickPlayerMovement\@ServerPlayerInputSystemUtils\@\@YAXAEBUPlayerCurrentTickComponent\@\@AEAUServerPlayerMovementComponent\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UServerPlayerCurrentMovementComponent\@\@\@\@AEAVStrictEntityContext\@\@\@Z */ MCAPI void _tickPlayerMovement(struct PlayerCurrentTickComponent const &, struct ServerPlayerMovementComponent &, class EntityModifierT &, class StrictEntityContext &); diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp index cb2769b0b7..1a613ba890 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementComponent.hpp @@ -28,15 +28,11 @@ struct ServerPlayerMovementComponent { public: /** - * @symbol ??0ServerPlayerMovementComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0ServerPlayerMovementComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI ServerPlayerMovementComponent(struct ServerPlayerMovementComponent &&); /** - * @symbol ??4ServerPlayerMovementComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct ServerPlayerMovementComponent & operator=(struct ServerPlayerMovementComponent &&); - /** - * @symbol ??1ServerPlayerMovementComponent\@\@QEAA\@XZ + * @symbol ??1ServerPlayerMovementComponent\@\@QEAA\@XZ */ MCAPI ~ServerPlayerMovementComponent(); diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementCorrectionSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementCorrectionSystem.hpp index 1b04110178..8a0dcae19b 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementCorrectionSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementCorrectionSystem.hpp @@ -28,12 +28,12 @@ class ServerPlayerMovementCorrectionSystem { public: /** - * @symbol ?_afterMovementSimulation\@ServerPlayerMovementCorrectionSystem\@\@SAXAEAVPlayer\@\@AEBVPlayerAuthInputPacket\@\@AEBVReplayStateComponent\@\@\@Z + * @symbol ?_afterMovementSimulation\@ServerPlayerMovementCorrectionSystem\@\@SAXAEAVPlayer\@\@AEBVPlayerAuthInputPacket\@\@AEBVReplayStateComponent\@\@\@Z */ MCAPI static void _afterMovementSimulation(class Player &, class PlayerAuthInputPacket const &, class ReplayStateComponent const &); /** - * @symbol ?create\@ServerPlayerMovementCorrectionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ServerPlayerMovementCorrectionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp index c077ac181b..6388cf5547 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystem.hpp @@ -30,16 +30,12 @@ class ServerPlayerMovementSystem { public: /** - * @symbol ?_foreachTransactionPacket\@ServerPlayerMovementSystem\@\@SAXAEBUPlayerActionComponent\@\@_NAEBV?$function\@$$A6AXAEAVInventoryTransactionPacket\@\@\@Z\@std\@\@\@Z + * @symbol ?_foreachTransactionPacket\@ServerPlayerMovementSystem\@\@SAXAEBUPlayerActionComponent\@\@_NAEBV?$function\@$$A6AXAEAVInventoryTransactionPacket\@\@\@Z\@std\@\@\@Z */ MCAPI static void _foreachTransactionPacket(struct PlayerActionComponent const &, bool, class std::function const &); /** - * @symbol ?create\@ServerPlayerMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@ServerPlayerMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); - /** - * @symbol ?onPlayerAuthInputPacket\@ServerPlayerMovementSystem\@\@SAXAEAUServerPlayerMovementComponent\@\@AEBVPlayerAuthInputPacket\@\@\@Z - */ - MCAPI static void onPlayerAuthInputPacket(struct ServerPlayerMovementComponent &, class PlayerAuthInputPacket const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp index 88798045f9..1cd433089c 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerMovementSystemUtils.hpp @@ -20,7 +20,7 @@ namespace ServerPlayerMovementSystemUtils { #undef AFTER_EXTRA /** - * @symbol ?_handlePlayerAuthInputPacket\@ServerPlayerMovementSystemUtils\@\@YAXAEBVPlayerAuthInputPacket\@\@V?$not_null\@PEAVServerPlayer\@\@\@gsl\@\@\@Z + * @symbol ?_handlePlayerAuthInputPacket\@ServerPlayerMovementSystemUtils\@\@YAXAEBVPlayerAuthInputPacket\@\@V?$not_null\@PEAVServerPlayer\@\@\@gsl\@\@\@Z */ MCAPI void _handlePlayerAuthInputPacket(class PlayerAuthInputPacket const &, class gsl::not_null); diff --git a/LiteLoader/include/llapi/mc/ServerPlayerSendPlayerOnGroundSystem.hpp b/LiteLoader/include/llapi/mc/ServerPlayerSendPlayerOnGroundSystem.hpp index cb879af5e6..02376ce700 100644 --- a/LiteLoader/include/llapi/mc/ServerPlayerSendPlayerOnGroundSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerPlayerSendPlayerOnGroundSystem.hpp @@ -28,12 +28,12 @@ class ServerPlayerSendPlayerOnGroundSystem { public: /** - * @symbol ?_sendPlayerOnGround\@ServerPlayerSendPlayerOnGroundSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_sendPlayerOnGround\@ServerPlayerSendPlayerOnGroundSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _sendPlayerOnGround(class StrictEntityContext &, class ActorOwnerComponent &); /** - * @symbol ?createSystem\@ServerPlayerSendPlayerOnGroundSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ServerPlayerSendPlayerOnGroundSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerScoreboard.hpp b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp index 5e88f87c5f..56e0ffda4c 100644 --- a/LiteLoader/include/llapi/mc/ServerScoreboard.hpp +++ b/LiteLoader/include/llapi/mc/ServerScoreboard.hpp @@ -31,128 +31,134 @@ class ServerScoreboard { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerScoreboard(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?setDisplayObjective\@ServerScoreboard\@\@UEAAPEBVDisplayObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z + * @vftbl 1 + * @symbol ?setDisplayObjective\@ServerScoreboard\@\@UEAAPEBVDisplayObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVObjective\@\@W4ObjectiveSortOrder\@\@\@Z */ virtual class DisplayObjective const * setDisplayObjective(std::string const &, class Objective const &, enum class ObjectiveSortOrder); /** - * @vftbl 2 - * @symbol ?clearDisplayObjective\@ServerScoreboard\@\@UEAAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?clearDisplayObjective\@ServerScoreboard\@\@UEAAPEAVObjective\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class Objective * clearDisplayObjective(std::string const &); /** - * @vftbl 3 - * @symbol ?createScoreboardId\@ServerScoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z + * @vftbl 3 + * @symbol ?createScoreboardId\@ServerScoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVPlayer\@\@\@Z */ virtual struct ScoreboardId const & createScoreboardId(class Player const &); /** - * @vftbl 4 - * @symbol ?createScoreboardId\@ServerScoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVActor\@\@\@Z + * @vftbl 4 + * @symbol ?createScoreboardId\@ServerScoreboard\@\@UEAAAEBUScoreboardId\@\@AEBVActor\@\@\@Z */ virtual struct ScoreboardId const & createScoreboardId(class Actor const &); /** - * @vftbl 5 - * @symbol ?createScoreboardId\@ServerScoreboard\@\@UEAAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?createScoreboardId\@ServerScoreboard\@\@UEAAAEBUScoreboardId\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual struct ScoreboardId const & createScoreboardId(std::string const &); /** - * @vftbl 6 - * @symbol ?onObjectiveAdded\@ServerScoreboard\@\@UEAAXAEBVObjective\@\@\@Z + * @vftbl 6 + * @symbol ?onObjectiveAdded\@ServerScoreboard\@\@UEAAXAEBVObjective\@\@\@Z */ virtual void onObjectiveAdded(class Objective const &); /** - * @vftbl 7 - * @symbol ?onObjectiveRemoved\@ServerScoreboard\@\@UEAAXAEAVObjective\@\@\@Z + * @vftbl 7 + * @symbol ?onObjectiveRemoved\@ServerScoreboard\@\@UEAAXAEAVObjective\@\@\@Z */ virtual void onObjectiveRemoved(class Objective &); /** - * @vftbl 8 - * @symbol ?onScoreChanged\@ServerScoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @vftbl 8 + * @symbol ?onScoreChanged\@ServerScoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ virtual void onScoreChanged(struct ScoreboardId const &, class Objective const &); /** - * @vftbl 9 - * @symbol ?onPlayerScoreRemoved\@ServerScoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @vftbl 9 + * @symbol ?onPlayerScoreRemoved\@ServerScoreboard\@\@UEAAXAEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ virtual void onPlayerScoreRemoved(struct ScoreboardId const &, class Objective const &); /** - * @vftbl 10 - * @symbol ?onPlayerJoined\@ServerScoreboard\@\@UEAAXAEBVPlayer\@\@\@Z + * @vftbl 10 + * @symbol ?onPlayerJoined\@ServerScoreboard\@\@UEAAXAEBVPlayer\@\@\@Z */ virtual void onPlayerJoined(class Player const &); /** - * @vftbl 11 - * @symbol ?onPlayerIdentityUpdated\@ServerScoreboard\@\@UEAAXAEBUPlayerScoreboardId\@\@\@Z + * @vftbl 11 + * @symbol ?onPlayerIdentityUpdated\@ServerScoreboard\@\@UEAAXAEBUPlayerScoreboardId\@\@\@Z */ virtual void onPlayerIdentityUpdated(struct PlayerScoreboardId const &); /** - * @vftbl 12 - * @symbol ?tick\@ServerScoreboard\@\@UEAAXXZ + * @vftbl 12 + * @symbol ?tick\@ServerScoreboard\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 13 - * @symbol ?setPacketSender\@ServerScoreboard\@\@UEAAXPEAVPacketSender\@\@\@Z + * @vftbl 13 + * @symbol ?setPacketSender\@ServerScoreboard\@\@UEAAXPEAVPacketSender\@\@\@Z */ virtual void setPacketSender(class PacketSender *); /** - * @vftbl 14 - * @symbol ?writeToLevelStorage\@ServerScoreboard\@\@UEAAXXZ + * @vftbl 14 + * @symbol ?writeToLevelStorage\@ServerScoreboard\@\@UEAAXXZ */ virtual void writeToLevelStorage(); /** - * @vftbl 15 - * @symbol ?isClientSide\@ServerScoreboard\@\@MEBA_NXZ + * @vftbl 15 + * @symbol ?isClientSide\@ServerScoreboard\@\@MEBA_NXZ */ virtual bool isClientSide() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERSCOREBOARD /** - * @symbol ??0ServerScoreboard\@\@QEAA\@VCommandSoftEnumRegistry\@\@PEAVLevelStorage\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerScoreboard(); +#endif + /** + * @symbol ??0ServerScoreboard\@\@QEAA\@VCommandSoftEnumRegistry\@\@PEAVLevelStorage\@\@\@Z */ MCAPI ServerScoreboard(class CommandSoftEnumRegistry, class LevelStorage *); /** - * @symbol ?deserialize\@ServerScoreboard\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?deserialize\@ServerScoreboard\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void deserialize(std::unique_ptr); /** - * @symbol ?serialize\@ServerScoreboard\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?serialize\@ServerScoreboard\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr serialize() const; /** - * @symbol ?setClearDisplayObjectiveCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVDisplayObjective\@\@\@Z\@std\@\@\@Z + * @symbol ?setClearDisplayObjectiveCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVDisplayObjective\@\@\@Z\@std\@\@\@Z */ MCAPI void setClearDisplayObjectiveCallback(class std::function); /** - * @symbol ?setIdentityUpdatedCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBUScoreboardId\@\@\@Z\@std\@\@\@Z + * @symbol ?setIdentityUpdatedCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBUScoreboardId\@\@\@Z\@std\@\@\@Z */ MCAPI void setIdentityUpdatedCallback(class std::function); /** - * @symbol ?setScoreChangedCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBUScoreboardId\@\@\@Z\@std\@\@\@Z + * @symbol ?setScoreChangedCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBUScoreboardId\@\@\@Z\@std\@\@\@Z */ MCAPI void setScoreChangedCallback(class std::function); /** - * @symbol ?setScoreRemovedCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBUScoreboardId\@\@\@Z\@std\@\@\@Z + * @symbol ?setScoreRemovedCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBUScoreboardId\@\@\@Z\@std\@\@\@Z */ MCAPI void setScoreRemovedCallback(class std::function); /** - * @symbol ?setSetDisplayObjectiveCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVDisplayObjective\@\@\@Z\@std\@\@\@Z + * @symbol ?setSetDisplayObjectiveCallback\@ServerScoreboard\@\@QEAAXV?$function\@$$A6AXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVDisplayObjective\@\@\@Z\@std\@\@\@Z */ MCAPI void setSetDisplayObjectiveCallback(class std::function); //private: /** - * @symbol ?_stopTrackingObjective\@ServerScoreboard\@\@AEAAXAEBVObjective\@\@\@Z + * @symbol ?_stopTrackingObjective\@ServerScoreboard\@\@AEAAXAEBVObjective\@\@\@Z */ MCAPI void _stopTrackingObjective(class Objective const &); /** - * @symbol ?_unpackIdentityDefToScorePacket\@ServerScoreboard\@\@AEAA?AUScorePacketInfo\@\@AEBVScoreboardIdentityRef\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?_unpackIdentityDefToScorePacket\@ServerScoreboard\@\@AEAA?AUScorePacketInfo\@\@AEBVScoreboardIdentityRef\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI struct ScorePacketInfo _unpackIdentityDefToScorePacket(class ScoreboardIdentityRef const &, std::string const &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp b/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp index de33718128..79b5da08b5 100644 --- a/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp +++ b/LiteLoader/include/llapi/mc/ServerScriptDebugCommand.hpp @@ -29,17 +29,17 @@ class ServerScriptDebugCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerScriptDebugCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ServerScriptDebugCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ServerScriptDebugCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ServerScriptDebugCommand\@\@SAXAEAVCommandRegistry\@\@PEAVIScriptDebugger\@\@AEBV?$optional\@UScriptSettings\@\@\@std\@\@\@Z + * @symbol ?setup\@ServerScriptDebugCommand\@\@SAXAEAVCommandRegistry\@\@PEAVIScriptDebugger\@\@AEBV?$optional\@UScriptSettings\@\@\@std\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class IScriptDebugger *, class std::optional const &); @@ -47,12 +47,12 @@ class ServerScriptDebugCommand : public Command { private: /** - * @symbol ?sForcedPort\@ServerScriptDebugCommand\@\@0V?$optional\@G\@std\@\@A + * @symbol ?sForcedPort\@ServerScriptDebugCommand\@\@0V?$optional\@G\@std\@\@A */ MCAPI static class std::optional sForcedPort; /** - * @symbol ?sServerScriptDebugger\@ServerScriptDebugCommand\@\@0PEAVIScriptDebugger\@\@EA + * @symbol ?sServerScriptDebugger\@ServerScriptDebugCommand\@\@0PEAVIScriptDebugger\@\@EA */ MCAPI static class IScriptDebugger * sServerScriptDebugger; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerScriptManager.hpp b/LiteLoader/include/llapi/mc/ServerScriptManager.hpp index d6805cb5b0..06c296475b 100644 --- a/LiteLoader/include/llapi/mc/ServerScriptManager.hpp +++ b/LiteLoader/include/llapi/mc/ServerScriptManager.hpp @@ -30,110 +30,116 @@ class ServerScriptManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerScriptManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onServerLevelInitialized\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@AEAVLevel\@\@\@Z + * @vftbl 1 + * @symbol ?onServerLevelInitialized\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@AEAVLevel\@\@\@Z */ virtual enum class EventResult onServerLevelInitialized(class ServerInstance &, class Level &); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?onServerUpdateStart\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @vftbl 5 + * @symbol ?onServerUpdateStart\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ virtual enum class EventResult onServerUpdateStart(class ServerInstance &); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?onServerThreadStarted\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @vftbl 9 + * @symbol ?onServerThreadStarted\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ virtual enum class EventResult onServerThreadStarted(class ServerInstance &); /** - * @vftbl 10 - * @symbol ?onServerThreadStopped\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z + * @vftbl 10 + * @symbol ?onServerThreadStopped\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEAVServerInstance\@\@\@Z */ virtual enum class EventResult onServerThreadStopped(class ServerInstance &); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?onEvent\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEBUServerInstanceRequestResourceReload\@\@\@Z + * @vftbl 12 + * @symbol ?onEvent\@ServerScriptManager\@\@UEAA?AW4EventResult\@\@AEBUServerInstanceRequestResourceReload\@\@\@Z */ virtual enum class EventResult onEvent(struct ServerInstanceRequestResourceReload const &); /** - * @vftbl 13 - * @symbol ?onEvent\@?$EventListenerDispatcher\@VServerInstanceEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUServerInstanceNotificationEvent\@\@\@Z + * @vftbl 13 + * @symbol ?onEvent\@?$EventListenerDispatcher\@VServerInstanceEventListener\@\@\@\@MEAA?AW4EventResult\@\@AEBUServerInstanceNotificationEvent\@\@\@Z */ virtual enum class EventResult onEvent(struct ServerInstanceNotificationEvent const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERSCRIPTMANAGER /** - * @symbol ??0ServerScriptManager\@\@QEAA\@UScriptSettings\@\@V?$NonOwnerPointer\@VScheduler\@\@\@Bedrock\@\@AEAVIMinecraftEventing\@\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerScriptManager(); +#endif + /** + * @symbol ??0ServerScriptManager\@\@QEAA\@UScriptSettings\@\@V?$NonOwnerPointer\@VScheduler\@\@\@Bedrock\@\@AEAVIMinecraftEventing\@\@_N\@Z */ MCAPI ServerScriptManager(struct ScriptSettings, class Bedrock::NonOwnerPointer, class IMinecraftEventing &, bool); /** - * @symbol ?addModuleFilter\@ServerScriptManager\@\@QEAAXAEBV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@\@Z + * @symbol ?addModuleFilter\@ServerScriptManager\@\@QEAAXAEBV?$function\@$$A6A_NAEBVPackManifest\@\@AEBUModuleDescriptor\@Scripting\@\@1AEAVScriptPluginResult\@\@\@Z\@std\@\@\@Z */ MCAPI void addModuleFilter(class std::function const &); /** - * @symbol ?getScriptEngine\@ServerScriptManager\@\@QEAAAEAVScriptEngine\@Scripting\@\@XZ + * @symbol ?getScriptEngine\@ServerScriptManager\@\@QEAAAEAVScriptEngine\@Scripting\@\@XZ */ MCAPI class Scripting::ScriptEngine & getScriptEngine(); /** - * @symbol ?onMainThreadStartLeaveGame\@ServerScriptManager\@\@QEAAXXZ + * @symbol ?onMainThreadStartLeaveGame\@ServerScriptManager\@\@QEAAXXZ */ MCAPI void onMainThreadStartLeaveGame(); //private: /** - * @symbol ?_loadAndRunAllPlugins\@ServerScriptManager\@\@AEAA_NAEAVServerInstance\@\@AEAVServerLevel\@\@\@Z + * @symbol ?_loadAndRunAllPlugins\@ServerScriptManager\@\@AEAA_NAEAVServerInstance\@\@AEAVServerLevel\@\@\@Z */ MCAPI bool _loadAndRunAllPlugins(class ServerInstance &, class ServerLevel &); /** - * @symbol ?_registerEventHandlers\@ServerScriptManager\@\@AEBAXAEAVLevel\@\@\@Z + * @symbol ?_registerEventHandlers\@ServerScriptManager\@\@AEBAXAEAVLevel\@\@\@Z */ MCAPI void _registerEventHandlers(class Level &) const; /** - * @symbol ?_unregisterEventHandlers\@ServerScriptManager\@\@AEBAXAEAVLevel\@\@\@Z + * @symbol ?_unregisterEventHandlers\@ServerScriptManager\@\@AEBAXAEAVLevel\@\@\@Z */ MCAPI void _unregisterEventHandlers(class Level &) const; /** - * @symbol ?_sendWorldInitializeEvent\@ServerScriptManager\@\@CAXAEAVServerLevel\@\@VWeakLifetimeScope\@Scripting\@\@\@Z + * @symbol ?_sendWorldInitializeEvent\@ServerScriptManager\@\@CAXAEAVServerLevel\@\@VWeakLifetimeScope\@Scripting\@\@\@Z */ MCAPI static void _sendWorldInitializeEvent(class ServerLevel &, class Scripting::WeakLifetimeScope); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp index 7ecbed9865..b1660c8353 100644 --- a/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsRequestPacket.hpp @@ -30,33 +30,33 @@ class ServerSettingsRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerSettingsRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ServerSettingsRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ServerSettingsRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ServerSettingsRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ServerSettingsRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ServerSettingsRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ServerSettingsRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ServerSettingsRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ServerSettingsRequestPacket\@\@QEAA\@XZ + * @symbol ??0ServerSettingsRequestPacket\@\@QEAA\@XZ */ MCAPI ServerSettingsRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp index ae85c70ace..2b94c8ca05 100644 --- a/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerSettingsResponsePacket.hpp @@ -30,33 +30,33 @@ class ServerSettingsResponsePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerSettingsResponsePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ServerSettingsResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ServerSettingsResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ServerSettingsResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ServerSettingsResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ServerSettingsResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ServerSettingsResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ServerSettingsResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ServerSettingsResponsePacket\@\@QEAA\@XZ + * @symbol ??0ServerSettingsResponsePacket\@\@QEAA\@XZ */ MCAPI ServerSettingsResponsePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp b/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp index 84c04bcb19..5d452f46b4 100644 --- a/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp +++ b/LiteLoader/include/llapi/mc/ServerStandInCauldronSystem.hpp @@ -28,12 +28,12 @@ class ServerStandInCauldronSystem { public: /** - * @symbol ?_checkInsideCauldron\@ServerStandInCauldronSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_checkInsideCauldron\@ServerStandInCauldronSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _checkInsideCauldron(class StrictEntityContext &, class ActorOwnerComponent &); /** - * @symbol ?createSystem\@ServerStandInCauldronSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ServerStandInCauldronSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp index f0ec0e0394..175b997f88 100644 --- a/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerStatsPacket.hpp @@ -29,29 +29,29 @@ class ServerStatsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerStatsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ServerStatsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ServerStatsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ServerStatsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ServerStatsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ServerStatsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ServerStatsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ServerStatsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp index 64c13e6a86..f09129c528 100644 --- a/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp +++ b/LiteLoader/include/llapi/mc/ServerToClientHandshakePacket.hpp @@ -30,37 +30,43 @@ class ServerToClientHandshakePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ServerToClientHandshakePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ServerToClientHandshakePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ServerToClientHandshakePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ServerToClientHandshakePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ServerToClientHandshakePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ServerToClientHandshakePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ServerToClientHandshakePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ServerToClientHandshakePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SERVERTOCLIENTHANDSHAKEPACKET /** - * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ServerToClientHandshakePacket(); +#endif + /** + * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@XZ */ MCAPI ServerToClientHandshakePacket(); /** - * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0ServerToClientHandshakePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI ServerToClientHandshakePacket(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp index 4512c4b071..1fda1340d7 100644 --- a/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorDataPacket.hpp @@ -30,37 +30,43 @@ class SetActorDataPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetActorDataPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetActorDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetActorDataPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetActorDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetActorDataPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetActorDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetActorDataPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetActorDataPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORDATAPACKET /** - * @symbol ??0SetActorDataPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetActorDataPacket(); +#endif + /** + * @symbol ??0SetActorDataPacket\@\@QEAA\@XZ */ MCAPI SetActorDataPacket(); /** - * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z + * @symbol ??0SetActorDataPacket\@\@QEAA\@VActorRuntimeID\@\@AEAVSynchedActorDataEntityWrapper\@\@PEAVPropertyComponent\@\@_K_N\@Z */ MCAPI SetActorDataPacket(class ActorRuntimeID, class SynchedActorDataEntityWrapper &, class PropertyComponent *, unsigned __int64, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp index f803dea5a4..9a3236fdb7 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacket.hpp @@ -30,37 +30,43 @@ class SetActorLinkPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetActorLinkPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetActorLinkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetActorLinkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetActorLinkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetActorLinkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetActorLinkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetActorLinkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetActorLinkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORLINKPACKET /** - * @symbol ??0SetActorLinkPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetActorLinkPacket(); +#endif + /** + * @symbol ??0SetActorLinkPacket\@\@QEAA\@XZ */ MCAPI SetActorLinkPacket(); /** - * @symbol ??0SetActorLinkPacket\@\@QEAA\@AEBUActorLink\@\@\@Z + * @symbol ??0SetActorLinkPacket\@\@QEAA\@AEBUActorLink\@\@\@Z */ MCAPI SetActorLinkPacket(struct ActorLink const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystem.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystem.hpp index 18b40d1397..1c4a3add38 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystem.hpp @@ -28,8 +28,8 @@ class SetActorLinkPacketSystem { public: /** - * @symbol ?createSetActorLinkPacketSystem\@SetActorLinkPacketSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSetActorLinkPacketSystem\@SetActorLinkPacketSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSetActorLinkPacketSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp index 5bdd816d48..250f623d44 100644 --- a/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SetActorLinkPacketSystemImpl.hpp @@ -28,8 +28,8 @@ class SetActorLinkPacketSystemImpl { public: /** - * @symbol ?_setActorLinkPacketSystem\@SetActorLinkPacketSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBURemovePassengersComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPassengerInitiatedFlag\@\@\@\@\@\@AEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z + * @symbol ?_setActorLinkPacketSystem\@SetActorLinkPacketSystemImpl\@\@SAXAEAVStrictEntityContext\@\@AEBUActorUniqueIDComponent\@\@AEBURemovePassengersComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorIsBeingDestroyedFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UPassengerInitiatedFlag\@\@\@\@\@\@AEAV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUActorUniqueIDComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USendPacketsComponent\@\@\@\@\@Z */ MCAPI static void _setActorLinkPacketSystem(class StrictEntityContext &, struct ActorUniqueIDComponent const &, struct RemovePassengersComponent const &, class Optional const>, class Optional const>, class ViewT &, class EntityModifierT); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp index 3eee4d507d..40fef1f17a 100644 --- a/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetActorMotionPacket.hpp @@ -30,37 +30,43 @@ class SetActorMotionPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetActorMotionPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetActorMotionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetActorMotionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetActorMotionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetActorMotionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetActorMotionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetActorMotionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetActorMotionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETACTORMOTIONPACKET /** - * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SetActorMotionPacket(); + MCVAPI ~SetActorMotionPacket(); +#endif /** - * @symbol ??0SetActorMotionPacket\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0SetActorMotionPacket\@\@QEAA\@AEBVActor\@\@\@Z */ MCAPI SetActorMotionPacket(class Actor const &); + /** + * @symbol ??0SetActorMotionPacket\@\@QEAA\@XZ + */ + MCAPI SetActorMotionPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp b/LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp index dbbb627fd2..de5ffe08a0 100644 --- a/LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetBannerDetailsFunction.hpp @@ -32,35 +32,35 @@ class SetBannerDetailsFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBannerDetailsFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetBannerDetailsFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetBannerDetailsFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetBannerDetailsFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetBannerDetailsFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetBannerDetailsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetBannerDetailsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_apply\@SetBannerDetailsFunction\@\@AEBAXAEAVItemStackBase\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @symbol ?_apply\@SetBannerDetailsFunction\@\@AEBAXAEAVItemStackBase\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ MCAPI void _apply(class ItemStackBase &, class Random &, class LootTableContext &) const; /** - * @symbol ?_parseBannerPattern\@SetBannerDetailsFunction\@\@CAXAEAV?$vector\@U?$pair\@EW4ItemColor\@\@\@std\@\@V?$allocator\@U?$pair\@EW4ItemColor\@\@\@std\@\@\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?_parseBannerPattern\@SetBannerDetailsFunction\@\@CAXAEAV?$vector\@U?$pair\@EW4ItemColor\@\@\@std\@\@V?$allocator\@U?$pair\@EW4ItemColor\@\@\@std\@\@\@2\@\@std\@\@AEBVValue\@Json\@\@\@Z */ MCAPI static void _parseBannerPattern(std::vector> &, class Json::Value const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBlock.hpp b/LiteLoader/include/llapi/mc/SetBlock.hpp index 9aa2294e75..9c8090c74e 100644 --- a/LiteLoader/include/llapi/mc/SetBlock.hpp +++ b/LiteLoader/include/llapi/mc/SetBlock.hpp @@ -31,28 +31,28 @@ class SetBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@SetBlock\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@SetBlock\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@SetBlock\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@SetBlock\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@SetBlock\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@SetBlock\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@SetBlock\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@SetBlock\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBlockAtPos.hpp b/LiteLoader/include/llapi/mc/SetBlockAtPos.hpp index 8ead1333d7..45891d6527 100644 --- a/LiteLoader/include/llapi/mc/SetBlockAtPos.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockAtPos.hpp @@ -31,28 +31,28 @@ class SetBlockAtPos { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBlockAtPos(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@SetBlockAtPos\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@SetBlockAtPos\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@SetBlockAtPos\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@SetBlockAtPos\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@SetBlockAtPos\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@SetBlockAtPos\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@SetBlockAtPos\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@SetBlockAtPos\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBlockCommand.hpp b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp index 1d031ca1cb..ec1c9b4cdb 100644 --- a/LiteLoader/include/llapi/mc/SetBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockCommand.hpp @@ -31,18 +31,18 @@ class SetBlockCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBlockCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SetBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SetBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SetBlockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SetBlockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBlockProperty.hpp b/LiteLoader/include/llapi/mc/SetBlockProperty.hpp index 7acbccc3b1..0876c874e6 100644 --- a/LiteLoader/include/llapi/mc/SetBlockProperty.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockProperty.hpp @@ -31,28 +31,28 @@ class SetBlockProperty { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBlockProperty(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@SetBlockProperty\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@SetBlockProperty\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@SetBlockProperty\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@SetBlockProperty\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@SetBlockProperty\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@SetBlockProperty\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@SetBlockProperty\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@SetBlockProperty\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp b/LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp index 37ded6794e..dda2869796 100644 --- a/LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/SetBlockReactionComponent.hpp @@ -30,24 +30,24 @@ class SetBlockReactionComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBlockReactionComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_onEnd\@SetBlockReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @vftbl 3 + * @symbol ?_onEnd\@SetBlockReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ virtual void _onEnd(class LabTableReaction &, class BlockSource &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp b/LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp index 5ee11a9f53..bbcd41c6a9 100644 --- a/LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetBookContentsFunction.hpp @@ -32,35 +32,35 @@ class SetBookContentsFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetBookContentsFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetBookContentsFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetBookContentsFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetBookContentsFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetBookContentsFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ??0SetBookContentsFunction\@\@QEAA\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1AEBV?$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\@\@2\@\@Z + * @symbol ??0SetBookContentsFunction\@\@QEAA\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1AEBV?$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\@\@2\@\@Z */ MCAPI SetBookContentsFunction(std::vector> &, std::string const &, std::string const &, std::vector const &); /** - * @symbol ?deserialize\@SetBookContentsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetBookContentsFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_fillUserData\@SetBookContentsFunction\@\@AEAAXAEAVCompoundTag\@\@\@Z + * @symbol ?_fillUserData\@SetBookContentsFunction\@\@AEAAXAEAVCompoundTag\@\@\@Z */ MCAPI void _fillUserData(class CompoundTag &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp index 2c0d508823..4368511a07 100644 --- a/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetCommandsEnabledPacket.hpp @@ -30,37 +30,43 @@ class SetCommandsEnabledPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetCommandsEnabledPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetCommandsEnabledPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetCommandsEnabledPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetCommandsEnabledPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetCommandsEnabledPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetCommandsEnabledPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetCommandsEnabledPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetCommandsEnabledPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETCOMMANDSENABLEDPACKET /** - * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetCommandsEnabledPacket(); +#endif + /** + * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@_N\@Z */ MCAPI SetCommandsEnabledPacket(bool); /** - * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@XZ + * @symbol ??0SetCommandsEnabledPacket\@\@QEAA\@XZ */ MCAPI SetCommandsEnabledPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp b/LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp index e0a98deb21..74e43a3e9d 100644 --- a/LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetDataFromColorIndexFunction.hpp @@ -31,27 +31,27 @@ class SetDataFromColorIndexFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetDataFromColorIndexFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetDataFromColorIndexFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetDataFromColorIndexFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetDataFromColorIndexFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetDataFromColorIndexFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); //private: /** - * @symbol ?_applyImpl\@SetDataFromColorIndexFunction\@\@AEAA_NPEBVItem\@\@PEBVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAH\@Z + * @symbol ?_applyImpl\@SetDataFromColorIndexFunction\@\@AEAA_NAEAPEBVItem\@\@PEBVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAH\@Z */ - MCAPI bool _applyImpl(class Item const *, class Actor const *, std::string const &, int &); + MCAPI bool _applyImpl(class Item const *&, class Actor const *, std::string const &, int &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp index d9359b16af..5254178fa9 100644 --- a/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDefaultGameTypePacket.hpp @@ -30,37 +30,37 @@ class SetDefaultGameTypePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetDefaultGameTypePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetDefaultGameTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetDefaultGameTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetDefaultGameTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetDefaultGameTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetDefaultGameTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetDefaultGameTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetDefaultGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SetDefaultGameTypePacket\@\@QEAA\@XZ + * @symbol ??0SetDefaultGameTypePacket\@\@QEAA\@XZ */ MCAPI SetDefaultGameTypePacket(); /** - * @symbol ??0SetDefaultGameTypePacket\@\@QEAA\@W4GameType\@\@\@Z + * @symbol ??0SetDefaultGameTypePacket\@\@QEAA\@W4GameType\@\@\@Z */ MCAPI SetDefaultGameTypePacket(enum class GameType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp index e9f60b972b..c4270961d5 100644 --- a/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDifficultyPacket.hpp @@ -30,41 +30,47 @@ class SetDifficultyPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetDifficultyPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetDifficultyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetDifficultyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetDifficultyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetDifficultyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetDifficultyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetDifficultyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetDifficultyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETDIFFICULTYPACKET /** - * @symbol ??0SetDifficultyPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SetDifficultyPacket(); + MCVAPI ~SetDifficultyPacket(); +#endif /** - * @symbol ??0SetDifficultyPacket\@\@QEAA\@W4Difficulty\@\@\@Z + * @symbol ??0SetDifficultyPacket\@\@QEAA\@W4Difficulty\@\@\@Z */ MCAPI SetDifficultyPacket(enum class Difficulty); /** - * @symbol ?getDifficulty\@SetDifficultyPacket\@\@QEBA?AW4Difficulty\@\@XZ + * @symbol ??0SetDifficultyPacket\@\@QEAA\@XZ + */ + MCAPI SetDifficultyPacket(); + /** + * @symbol ?getDifficulty\@SetDifficultyPacket\@\@QEBA?AW4Difficulty\@\@XZ */ MCAPI enum class Difficulty getDifficulty() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp index 3c3d65a864..c59d4b3010 100644 --- a/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetDisplayObjectivePacket.hpp @@ -31,37 +31,43 @@ class SetDisplayObjectivePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetDisplayObjectivePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetDisplayObjectivePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetDisplayObjectivePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetDisplayObjectivePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetDisplayObjectivePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetDisplayObjectivePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetDisplayObjectivePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetDisplayObjectivePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETDISPLAYOBJECTIVEPACKET /** - * @symbol ??0SetDisplayObjectivePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetDisplayObjectivePacket(); +#endif + /** + * @symbol ??0SetDisplayObjectivePacket\@\@QEAA\@XZ */ MCAPI SetDisplayObjectivePacket(); /** - * @symbol ??0SetDisplayObjectivePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4ObjectiveSortOrder\@\@\@Z + * @symbol ??0SetDisplayObjectivePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000W4ObjectiveSortOrder\@\@\@Z */ MCAPI SetDisplayObjectivePacket(std::string const &, std::string const &, std::string const &, std::string const &, enum class ObjectiveSortOrder); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp b/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp index 4af2f48100..92cd4080bf 100644 --- a/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetEntityInsideSystem.hpp @@ -28,16 +28,16 @@ class SetEntityInsideSystem { public: /** - * @symbol ?createCleanupSystem\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createCleanupSystem\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createCleanupSystem(); /** - * @symbol ?createSpectatorFilter\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSpectatorFilter\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSpectatorFilter(); /** - * @symbol ?createSystem\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SetEntityInsideSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetEntityInsideSystemImpl.hpp b/LiteLoader/include/llapi/mc/SetEntityInsideSystemImpl.hpp new file mode 100644 index 0000000000..85cccdb79c --- /dev/null +++ b/LiteLoader/include/llapi/mc/SetEntityInsideSystemImpl.hpp @@ -0,0 +1,36 @@ +/** + * @file SetEntityInsideSystemImpl.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SetEntityInsideSystemImpl { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SETENTITYINSIDESYSTEMIMPL +public: + class SetEntityInsideSystemImpl& operator=(class SetEntityInsideSystemImpl const &) = delete; + SetEntityInsideSystemImpl(class SetEntityInsideSystemImpl const &) = delete; + SetEntityInsideSystemImpl() = delete; +#endif + +public: + +//private: + /** + * @symbol ?_blockProcess\@SetEntityInsideSystemImpl\@\@CAXAEBVStrictEntityContext\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UInsideBubbleColumnBlockComponent\@\@U?$InsideBlockWithPosAndBlockComponent\@UCactusBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UEndPortalBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UGenericBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UHoneyBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@USweetBerryBushBlockFlag\@\@\@\@U?$InsideBlockWithPosAndBlockComponent\@UPowderSnowBlockFlag\@\@\@\@U?$InsideBlockWithPosComponent\@UWaterlilyBlockFlag\@\@\@\@V?$FlagComponent\@UWebBlockTag\@\@\@\@\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAU?$InsideBlockWithPosAndBlockComponent\@UGenericBlockFlag\@\@\@\@AEBVIConstBlockSource\@\@P6A_N2\@Z\@Z + */ + MCAPI static void _blockProcess(class StrictEntityContext const &, class EntityModifierT, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosAndBlockComponent, struct InsideBlockWithPosComponent, class FlagComponent>, class Block const &, class BlockPos const &, struct InsideBlockWithPosAndBlockComponent &, class IConstBlockSource const &, bool ( *)(class Block const &)); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp index 9a9a55933e..a3cc5e65bb 100644 --- a/LiteLoader/include/llapi/mc/SetHealthPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetHealthPacket.hpp @@ -31,37 +31,43 @@ class SetHealthPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetHealthPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetHealthPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetHealthPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetHealthPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetHealthPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetHealthPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetHealthPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetHealthPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetHealthPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETHEALTHPACKET /** - * @symbol ??0SetHealthPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetHealthPacket(); +#endif + /** + * @symbol ??0SetHealthPacket\@\@QEAA\@XZ */ MCAPI SetHealthPacket(); /** - * @symbol ??0SetHealthPacket\@\@QEAA\@H\@Z + * @symbol ??0SetHealthPacket\@\@QEAA\@H\@Z */ MCAPI SetHealthPacket(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp b/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp index ba2f9904eb..874f790362 100644 --- a/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemCountFunction.hpp @@ -32,23 +32,23 @@ class SetItemCountFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetItemCountFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetItemCountFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetItemCountFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetItemCountFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetItemCountFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetItemCountFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetItemCountFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp b/LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp index 70f948d6d7..11923af164 100644 --- a/LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemDamageFunction.hpp @@ -32,23 +32,23 @@ class SetItemDamageFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetItemDamageFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetItemDamageFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetItemDamageFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetItemDamageFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetItemDamageFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetItemDamageFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetItemDamageFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetItemDataFunction.hpp b/LiteLoader/include/llapi/mc/SetItemDataFunction.hpp index 89941318e2..636f9d8f6a 100644 --- a/LiteLoader/include/llapi/mc/SetItemDataFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemDataFunction.hpp @@ -32,39 +32,39 @@ class SetItemDataFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetItemDataFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetItemDataFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetItemDataFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetItemDataFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetItemDataFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetItemDataFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetItemDataFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_applyImplForComplexAliasBlock\@SetItemDataFunction\@\@AEAA?AW4ApplyForComplexAliasBlockResult\@1\@AEAPEBVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRandom\@\@AEAH\@Z + * @symbol ?_applyImplForComplexAliasBlock\@SetItemDataFunction\@\@AEAA?AW4ApplyForComplexAliasBlockResult\@1\@AEAPEBVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRandom\@\@AEAH\@Z */ MCAPI enum class SetItemDataFunction::ApplyForComplexAliasBlockResult _applyImplForComplexAliasBlock(class Item const *&, std::string const &, class Random &, int &); /** - * @symbol ?_applyImplForItem\@SetItemDataFunction\@\@AEAA?AW4ApplyForItemResult\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVRandom\@\@AEAHAEAV?$WeakPtr\@VItem\@\@\@\@\@Z + * @symbol ?_applyImplForItem\@SetItemDataFunction\@\@AEAA?AW4ApplyForItemResult\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAVRandom\@\@AEAHAEAV?$WeakPtr\@VItem\@\@\@\@\@Z */ MCAPI enum class SetItemDataFunction::ApplyForItemResult _applyImplForItem(std::string const &, std::string const &, class Random &, int &, class WeakPtr &); /** - * @symbol ?_applyImplForNormalBlock\@SetItemDataFunction\@\@AEAAXAEAPEBVBlock\@\@AEAVRandom\@\@\@Z + * @symbol ?_applyImplForNormalBlock\@SetItemDataFunction\@\@AEAAXAEAPEBVBlock\@\@AEAVRandom\@\@\@Z */ MCAPI void _applyImplForNormalBlock(class Block const *&, class Random &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp b/LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp index 5720f96c7a..6a308256d2 100644 --- a/LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemLoreFunction.hpp @@ -32,23 +32,23 @@ class SetItemLoreFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetItemLoreFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetItemLoreFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetItemLoreFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetItemLoreFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetItemLoreFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetItemLoreFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetItemLoreFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetItemNameFunction.hpp b/LiteLoader/include/llapi/mc/SetItemNameFunction.hpp index d7b0006963..5163090080 100644 --- a/LiteLoader/include/llapi/mc/SetItemNameFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetItemNameFunction.hpp @@ -32,23 +32,23 @@ class SetItemNameFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetItemNameFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetItemNameFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetItemNameFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetItemNameFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetItemNameFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetItemNameFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetItemNameFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp index 457704a88f..32782552fe 100644 --- a/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLastHurtByPacket.hpp @@ -30,37 +30,43 @@ class SetLastHurtByPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetLastHurtByPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetLastHurtByPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetLastHurtByPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetLastHurtByPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetLastHurtByPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetLastHurtByPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetLastHurtByPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetLastHurtByPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETLASTHURTBYPACKET /** - * @symbol ??0SetLastHurtByPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SetLastHurtByPacket(); + MCVAPI ~SetLastHurtByPacket(); +#endif /** - * @symbol ??0SetLastHurtByPacket\@\@QEAA\@W4ActorType\@\@\@Z + * @symbol ??0SetLastHurtByPacket\@\@QEAA\@W4ActorType\@\@\@Z */ MCAPI SetLastHurtByPacket(enum class ActorType); + /** + * @symbol ??0SetLastHurtByPacket\@\@QEAA\@XZ + */ + MCAPI SetLastHurtByPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp index f2631b37e6..c21267f12b 100644 --- a/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetLocalPlayerAsInitializedPacket.hpp @@ -30,33 +30,33 @@ class SetLocalPlayerAsInitializedPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetLocalPlayerAsInitializedPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetLocalPlayerAsInitializedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetLocalPlayerAsInitializedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetLocalPlayerAsInitializedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetLocalPlayerAsInitializedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetLocalPlayerAsInitializedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetLocalPlayerAsInitializedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetLocalPlayerAsInitializedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SetLocalPlayerAsInitializedPacket\@\@QEAA\@XZ + * @symbol ??0SetLocalPlayerAsInitializedPacket\@\@QEAA\@XZ */ MCAPI SetLocalPlayerAsInitializedPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp index 5e436e5353..5d824d84e9 100644 --- a/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetMaxPlayersCommand.hpp @@ -31,18 +31,18 @@ class SetMaxPlayersCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetMaxPlayersCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SetMaxPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SetMaxPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SetMaxPlayersCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SetMaxPlayersCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp index 13b75cfdf8..3922db046c 100644 --- a/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetPlayerGameTypePacket.hpp @@ -30,33 +30,33 @@ class SetPlayerGameTypePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetPlayerGameTypePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetPlayerGameTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetPlayerGameTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetPlayerGameTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetPlayerGameTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetPlayerGameTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetPlayerGameTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetPlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SetPlayerGameTypePacket\@\@QEAA\@XZ + * @symbol ??0SetPlayerGameTypePacket\@\@QEAA\@XZ */ MCAPI SetPlayerGameTypePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp index d99dda54e8..1bead958f9 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousPosRotSystem.hpp @@ -28,8 +28,8 @@ class SetPreviousPosRotSystem { public: /** - * @symbol ?_setPreviousPosRot\@SetPreviousPosRotSystem\@\@SAXAEAVStrictEntityContext\@\@AEAUStateVectorComponent\@\@AEAUActorRotationComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UPrevPosRotSetThisTickFlag\@\@\@\@\@\@\@Z + * @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>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp index 58b7642336..7578fa7ea5 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousPositionSystem.hpp @@ -28,16 +28,16 @@ class SetPreviousPositionSystem { public: /** - * @symbol ?createSystem\@SetPreviousPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SetPreviousPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSetPreviousPositionSystem\@SetPreviousPositionSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_doSetPreviousPositionSystem\@SetPreviousPositionSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _doSetPreviousPositionSystem(class StrictEntityContext const &, struct StateVectorComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp b/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp index 046e1a90e1..e47ba618d5 100644 --- a/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp +++ b/LiteLoader/include/llapi/mc/SetPreviousWalkDistSystem.hpp @@ -25,8 +25,8 @@ class SetPreviousWalkDistSystem { public: /** - * @symbol ?createSystem\@SetPreviousWalkDistSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SetPreviousWalkDistSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetPropertyResponse.hpp b/LiteLoader/include/llapi/mc/SetPropertyResponse.hpp index bfd07c50ae..70ad9ddb25 100644 --- a/LiteLoader/include/llapi/mc/SetPropertyResponse.hpp +++ b/LiteLoader/include/llapi/mc/SetPropertyResponse.hpp @@ -29,28 +29,28 @@ class SetPropertyResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetPropertyResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@SetPropertyResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@SetPropertyResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@SetPropertyResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@SetPropertyResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@SetPropertyResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@SetPropertyResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UActorEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VActorEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@SetPropertyResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@SetPropertyResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetScorePacket.hpp b/LiteLoader/include/llapi/mc/SetScorePacket.hpp index 6d87180cf9..a853fe7edf 100644 --- a/LiteLoader/include/llapi/mc/SetScorePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScorePacket.hpp @@ -31,49 +31,55 @@ class SetScorePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetScorePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetScorePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetScorePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetScorePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetScorePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetScorePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetScorePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetScorePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetScorePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSCOREPACKET /** - * @symbol ?change\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetScorePacket(); +#endif + /** + * @symbol ?change\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ MCAPI static class SetScorePacket change(struct ScoreboardId const &, class Objective const &); /** - * @symbol ?change\@SetScorePacket\@\@SA?AV1\@V?$vector\@UScorePacketInfo\@\@V?$allocator\@UScorePacketInfo\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?change\@SetScorePacket\@\@SA?AV1\@V?$vector\@UScorePacketInfo\@\@V?$allocator\@UScorePacketInfo\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static class SetScorePacket change(std::vector); /** - * @symbol ?remove\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @symbol ?remove\@SetScorePacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ MCAPI static class SetScorePacket remove(struct ScoreboardId const &, class Objective const &); //private: /** - * @symbol ??0SetScorePacket\@\@AEAA\@W4ScorePacketType\@\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z + * @symbol ??0SetScorePacket\@\@AEAA\@W4ScorePacketType\@\@AEBUScoreboardId\@\@AEBVObjective\@\@\@Z */ MCAPI SetScorePacket(enum class ScorePacketType, struct ScoreboardId const &, class Objective const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp index 5a01a86b29..73396824ca 100644 --- a/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetScoreboardIdentityPacket.hpp @@ -31,33 +31,39 @@ class SetScoreboardIdentityPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetScoreboardIdentityPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetScoreboardIdentityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetScoreboardIdentityPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetScoreboardIdentityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetScoreboardIdentityPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetScoreboardIdentityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetScoreboardIdentityPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetScoreboardIdentityPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSCOREBOARDIDENTITYPACKET /** - * @symbol ?change\@SetScoreboardIdentityPacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetScoreboardIdentityPacket(); +#endif + /** + * @symbol ?change\@SetScoreboardIdentityPacket\@\@SA?AV1\@AEBUScoreboardId\@\@AEBUPlayerScoreboardId\@\@\@Z */ MCAPI static class SetScoreboardIdentityPacket change(struct ScoreboardId const &, struct PlayerScoreboardId const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp b/LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp index 96ac69991a..535c48b8c1 100644 --- a/LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnEggFunction.hpp @@ -32,23 +32,23 @@ class SetSpawnEggFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetSpawnEggFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetSpawnEggFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetSpawnEggFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetSpawnEggFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetSpawnEggFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetSpawnEggFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetSpawnEggFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp index 4fe4c91e31..d685ae3552 100644 --- a/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp +++ b/LiteLoader/include/llapi/mc/SetSpawnPositionPacket.hpp @@ -30,41 +30,47 @@ class SetSpawnPositionPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetSpawnPositionPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetSpawnPositionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetSpawnPositionPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetSpawnPositionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetSpawnPositionPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetSpawnPositionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetSpawnPositionPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetSpawnPositionPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETSPAWNPOSITIONPACKET /** - * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SetSpawnPositionPacket(); + MCVAPI ~SetSpawnPositionPacket(); +#endif /** - * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@W4SpawnPositionType\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z + * @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 + * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@1\@Z */ MCAPI SetSpawnPositionPacket(class AutomaticID, class BlockPos const &, class BlockPos const &); + /** + * @symbol ??0SetSpawnPositionPacket\@\@QEAA\@XZ + */ + MCAPI SetSpawnPositionPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetStewEffectFunction.hpp b/LiteLoader/include/llapi/mc/SetStewEffectFunction.hpp index 08292c9323..dabfb73ad8 100644 --- a/LiteLoader/include/llapi/mc/SetStewEffectFunction.hpp +++ b/LiteLoader/include/llapi/mc/SetStewEffectFunction.hpp @@ -30,23 +30,23 @@ class SetStewEffectFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetStewEffectFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SetStewEffectFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SetStewEffectFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SetStewEffectFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SetStewEffectFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SetStewEffectFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SetStewEffectFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetTimePacket.hpp b/LiteLoader/include/llapi/mc/SetTimePacket.hpp index 734b41ebc8..a833adb12a 100644 --- a/LiteLoader/include/llapi/mc/SetTimePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTimePacket.hpp @@ -30,37 +30,43 @@ class SetTimePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetTimePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetTimePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetTimePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetTimePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetTimePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetTimePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetTimePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetTimePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetTimePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTIMEPACKET /** - * @symbol ??0SetTimePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetTimePacket(); +#endif + /** + * @symbol ??0SetTimePacket\@\@QEAA\@XZ */ MCAPI SetTimePacket(); /** - * @symbol ??0SetTimePacket\@\@QEAA\@H\@Z + * @symbol ??0SetTimePacket\@\@QEAA\@H\@Z */ MCAPI SetTimePacket(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp index 7fa41e0b97..2c7e7ef2de 100644 --- a/LiteLoader/include/llapi/mc/SetTitlePacket.hpp +++ b/LiteLoader/include/llapi/mc/SetTitlePacket.hpp @@ -31,57 +31,63 @@ enum class TitleType; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetTitlePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SetTitlePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SetTitlePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SetTitlePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SetTitlePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SetTitlePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SetTitlePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SetTitlePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SetTitlePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTITLEPACKET /** - * @symbol ??0SetTitlePacket\@\@QEAA\@AEBV0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SetTitlePacket(); +#endif + /** + * @symbol ??0SetTitlePacket\@\@QEAA\@AEBV0\@\@Z */ MCAPI SetTitlePacket(class SetTitlePacket const &); /** - * @symbol ??0SetTitlePacket\@\@QEAA\@XZ + * @symbol ??0SetTitlePacket\@\@QEAA\@XZ */ MCAPI SetTitlePacket(); /** - * @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 + * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z */ - MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, std::string const &); + MCAPI SetTitlePacket(int, int, int); /** - * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@\@Z + * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBVResolvedTextObject\@\@\@Z */ - MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType); + MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, class ResolvedTextObject const &); /** - * @symbol ??0SetTitlePacket\@\@QEAA\@HHH\@Z + * @symbol ??0SetTitlePacket\@\@QEAA\@W4TitleType\@0\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ - MCAPI SetTitlePacket(int, int, int); + MCAPI SetTitlePacket(enum class SetTitlePacket::TitleType, std::string const &); /** - * @symbol ??4SetTitlePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4SetTitlePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class SetTitlePacket & operator=(class SetTitlePacket &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp index 5fd296a80b..cb5178f9fc 100644 --- a/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp +++ b/LiteLoader/include/llapi/mc/SetWorldSpawnCommand.hpp @@ -31,18 +31,18 @@ class SetWorldSpawnCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SetWorldSpawnCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SetWorldSpawnCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SetWorldSpawnCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SetWorldSpawnCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SetWorldSpawnCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp index a0483adcb1..4b754b5932 100644 --- a/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp +++ b/LiteLoader/include/llapi/mc/SettingsCommandPacket.hpp @@ -30,41 +30,41 @@ class SettingsCommandPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SettingsCommandPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SettingsCommandPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SettingsCommandPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SettingsCommandPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SettingsCommandPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SettingsCommandPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SettingsCommandPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SettingsCommandPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SettingsCommandPacket\@\@QEAA\@XZ + * @symbol ??0SettingsCommandPacket\@\@QEAA\@XZ */ MCAPI SettingsCommandPacket(); /** - * @symbol ?getCommandString\@SettingsCommandPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCommandString\@SettingsCommandPacket\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getCommandString() const; /** - * @symbol ?getSupressOutput\@SettingsCommandPacket\@\@QEBA_NXZ + * @symbol ?getSupressOutput\@SettingsCommandPacket\@\@QEBA_NXZ */ MCAPI bool getSupressOutput() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp index d51c6ee0c6..5d1e0df428 100644 --- a/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/SettingsScreenCapabilities.hpp @@ -29,17 +29,23 @@ struct SettingsScreenCapabilities { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SettingsScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@USettingsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@USettingsScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SETTINGSSCREENCAPABILITIES /** - * @symbol ??0SettingsScreenCapabilities\@\@QEAA\@AEBU0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SettingsScreenCapabilities(); +#endif + /** + * @symbol ??0SettingsScreenCapabilities\@\@QEAA\@AEBU0\@\@Z */ MCAPI SettingsScreenCapabilities(struct SettingsScreenCapabilities const &); diff --git a/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp index d689e001cd..3442f517db 100644 --- a/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedChemistryRecipe.hpp @@ -31,23 +31,23 @@ class ShapedChemistryRecipe : public ShapedRecipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShapedChemistryRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@ShapedChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 8 - * @symbol ?getId\@ShapedChemistryRecipe\@\@UEBAAEBVUUID\@mce\@\@XZ + * @vftbl 8 + * @symbol ?getId\@ShapedChemistryRecipe\@\@UEBAAEBVUUID\@mce\@\@XZ */ virtual class mce::UUID const & getId() const; /** - * @symbol ?ID\@ShapedChemistryRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@ShapedChemistryRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp index eb4ea677ea..c623a700cf 100644 --- a/LiteLoader/include/llapi/mc/ShapedRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapedRecipe.hpp @@ -31,69 +31,75 @@ class ShapedRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShapedRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@ShapedRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@ShapedRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@ShapedRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@ShapedRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@ShapedRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 5 - * @symbol ?isShapeless\@ShapedRecipe\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isShapeless\@ShapedRecipe\@\@UEBA_NXZ */ virtual bool isShapeless() const; /** - * @vftbl 6 - * @symbol ?matches\@ShapedRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@ShapedRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@ShapedRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@ShapedRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @vftbl 14 - * @symbol ?loadResultList\@ShapedRecipe\@\@UEBAXAEBVBlockPalette\@\@\@Z + * @vftbl 14 + * @symbol ?loadResultList\@ShapedRecipe\@\@UEBAXAEBVBlockPalette\@\@\@Z */ virtual void loadResultList(class BlockPalette const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHAPEDRECIPE /** - * @symbol ??0ShapedRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@4\@VHashedString\@\@HPEBVUUID\@mce\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ShapedRecipe(class gsl::basic_string_span, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *); + MCVAPI ~ShapedRecipe(); +#endif + /** + * @symbol ??0ShapedRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@HHAEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z + */ + MCAPI ShapedRecipe(class std::basic_string_view>, int, int, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); /** - * @symbol ?generateUUID\@ShapedRecipe\@\@QEAAXXZ + * @symbol ?generateUUID\@ShapedRecipe\@\@QEAAXXZ */ MCAPI void generateUUID(); /** - * @symbol ?getIngredientsHashOffset\@ShapedRecipe\@\@QEBA_KHHHH\@Z + * @symbol ?getIngredientsHashOffset\@ShapedRecipe\@\@QEBA_KHHHH\@Z */ MCAPI unsigned __int64 getIngredientsHashOffset(int, int, int, int) const; //private: /** - * @symbol ?matches\@ShapedRecipe\@\@AEBA_NAEAVCraftingContainer\@\@HH_N\@Z + * @symbol ?matches\@ShapedRecipe\@\@AEBA_NAEAVCraftingContainer\@\@HH_N\@Z */ MCAPI bool matches(class CraftingContainer &, int, int, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp index 0854140c5e..09e3642932 100644 --- a/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessChemistryRecipe.hpp @@ -31,23 +31,23 @@ class ShapelessChemistryRecipe : public ShapelessRecipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShapelessChemistryRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?matches\@ShapelessChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@ShapelessChemistryRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 8 - * @symbol ?getId\@ShapelessChemistryRecipe\@\@UEBAAEBVUUID\@mce\@\@XZ + * @vftbl 8 + * @symbol ?getId\@ShapelessChemistryRecipe\@\@UEBAAEBVUUID\@mce\@\@XZ */ virtual class mce::UUID const & getId() const; /** - * @symbol ?ID\@ShapelessChemistryRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@ShapelessChemistryRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp index b851ca6726..3e4d0af16b 100644 --- a/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShapelessRecipe.hpp @@ -31,57 +31,63 @@ class ShapelessRecipe : public Recipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShapelessRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 2 - * @symbol ?getCraftingSize\@ShapelessRecipe\@\@UEBAHXZ + * @vftbl 2 + * @symbol ?getCraftingSize\@ShapelessRecipe\@\@UEBAHXZ */ virtual int getCraftingSize() const; /** - * @vftbl 3 - * @symbol ?getIngredient\@ShapelessRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z + * @vftbl 3 + * @symbol ?getIngredient\@ShapelessRecipe\@\@UEBAAEBVRecipeIngredient\@\@HH\@Z */ virtual class RecipeIngredient const & getIngredient(int, int) const; /** - * @vftbl 4 - * @symbol ?getResultItem\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?getResultItem\@ShapelessRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector const & getResultItem() const; /** - * @vftbl 5 - * @symbol ?isShapeless\@ShapelessRecipe\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isShapeless\@ShapelessRecipe\@\@UEBA_NXZ */ virtual bool isShapeless() const; /** - * @vftbl 6 - * @symbol ?matches\@ShapelessRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z + * @vftbl 6 + * @symbol ?matches\@ShapelessRecipe\@\@UEBA_NAEAVCraftingContainer\@\@AEAVLevel\@\@\@Z */ virtual bool matches(class CraftingContainer &, class Level &) const; /** - * @vftbl 7 - * @symbol ?size\@ShapelessRecipe\@\@UEBAHXZ + * @vftbl 7 + * @symbol ?size\@ShapelessRecipe\@\@UEBAHXZ */ virtual int size() const; /** - * @vftbl 14 - * @symbol ?loadResultList\@ShapelessRecipe\@\@UEBAXAEBVBlockPalette\@\@\@Z + * @vftbl 14 + * @symbol ?loadResultList\@ShapelessRecipe\@\@UEBAXAEBVBlockPalette\@\@\@Z */ virtual void loadResultList(class BlockPalette const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHAPELESSRECIPE /** - * @symbol ??0ShapelessRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@4\@VHashedString\@\@HPEBVUUID\@mce\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI ShapelessRecipe(class gsl::basic_string_span, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *); + MCVAPI ~ShapelessRecipe(); +#endif + /** + * @symbol ??0ShapelessRecipe\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@2\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@2\@VHashedString\@\@HPEBVUUID\@mce\@\@V?$optional\@VRecipeUnlockingRequirement\@\@\@2\@\@Z + */ + MCAPI ShapelessRecipe(class std::basic_string_view>, std::vector const &, std::vector const &, class HashedString, int, class mce::UUID const *, class std::optional); /** - * @symbol ?generateUUID\@ShapelessRecipe\@\@QEAAXXZ + * @symbol ?generateUUID\@ShapelessRecipe\@\@QEAAXXZ */ MCAPI void generateUUID(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShareItemsGoal.hpp b/LiteLoader/include/llapi/mc/ShareItemsGoal.hpp index b91d206a35..809d597f1e 100644 --- a/LiteLoader/include/llapi/mc/ShareItemsGoal.hpp +++ b/LiteLoader/include/llapi/mc/ShareItemsGoal.hpp @@ -30,56 +30,56 @@ class ShareItemsGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShareItemsGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ShareItemsGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ShareItemsGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@ShareItemsGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@ShareItemsGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ShareItemsGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ShareItemsGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ShareItemsGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ShareItemsGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ShareItemsGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ShareItemsGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ShareItemsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ShareItemsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ShareItemsGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@MHM\@Z + * @symbol ??0ShareItemsGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@MHM\@Z */ MCAPI ShareItemsGoal(class Mob &, std::vector const &, float, int, float); //protected: /** - * @symbol ?selectEntityToShareWith\@ShareItemsGoal\@\@IEAA?AU?$pair\@HVItemStack\@\@\@std\@\@AEBV?$vector\@U?$pair\@HVItemStack\@\@\@std\@\@V?$allocator\@U?$pair\@HVItemStack\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?selectEntityToShareWith\@ShareItemsGoal\@\@IEAA?AU?$pair\@HVItemStack\@\@\@std\@\@AEBV?$vector\@U?$pair\@HVItemStack\@\@\@std\@\@V?$allocator\@U?$pair\@HVItemStack\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI struct std::pair selectEntityToShareWith(std::vector> const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Shareable.hpp b/LiteLoader/include/llapi/mc/Shareable.hpp index 47e136be7e..7d129aed5b 100644 --- a/LiteLoader/include/llapi/mc/Shareable.hpp +++ b/LiteLoader/include/llapi/mc/Shareable.hpp @@ -30,11 +30,11 @@ struct Shareable { public: /** - * @symbol ?setCraftInto\@Shareable\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setCraftInto\@Shareable\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setCraftInto(std::string const &); /** - * @symbol ?setItem\@Shareable\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setItem\@Shareable\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setItem(std::string const &); diff --git a/LiteLoader/include/llapi/mc/ShareableComponent.hpp b/LiteLoader/include/llapi/mc/ShareableComponent.hpp index 49bccd7cde..2fbf255d43 100644 --- a/LiteLoader/include/llapi/mc/ShareableComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShareableComponent.hpp @@ -30,52 +30,52 @@ class ShareableComponent { public: /** - * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemActor\@\@\@Z + * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemActor\@\@\@Z */ MCAPI int getCountToPickUp(class Actor const &, class ItemActor const &) const; /** - * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z + * @symbol ?getCountToPickUp\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z */ MCAPI int getCountToPickUp(class Actor const &, class ItemStack const &) const; /** - * @symbol ?getSlotToSwap\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemActor\@\@\@Z + * @symbol ?getSlotToSwap\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemActor\@\@\@Z */ MCAPI int getSlotToSwap(class Actor &, class ItemActor const &) const; /** - * @symbol ?hasSurplus\@ShareableComponent\@\@QEBAHAEAVActor\@\@AEBVItemStack\@\@AEAV3\@_N\@Z + * @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 + * @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 + * @symbol ?itemBelongsInInventory\@ShareableComponent\@\@QEBA_NAEAVActor\@\@AEBVItemStack\@\@_N\@Z */ MCAPI bool itemBelongsInInventory(class Actor &, class ItemStack const &, bool) const; /** - * @symbol ?wantsMore\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z + * @symbol ?wantsMore\@ShareableComponent\@\@QEBAHAEBVActor\@\@AEBVItemStack\@\@\@Z */ MCAPI int wantsMore(class Actor const &, class ItemStack const &) const; /** - * @symbol ?willPickup\@ShareableComponent\@\@QEBA_NAEAVActor\@\@AEBVItemStack\@\@_N2\@Z + * @symbol ?willPickup\@ShareableComponent\@\@QEBA_NAEAVActor\@\@AEBVItemStack\@\@_N2\@Z */ MCAPI bool willPickup(class Actor &, class ItemStack const &, bool, bool) const; //private: /** - * @symbol ?_getItemPriority\@ShareableComponent\@\@AEBAHAEBVShareableDefinition\@\@AEBVItemStack\@\@\@Z + * @symbol ?_getItemPriority\@ShareableComponent\@\@AEBAHAEBVShareableDefinition\@\@AEBVItemStack\@\@\@Z */ MCAPI int _getItemPriority(class ShareableDefinition const &, class ItemStack const &) const; /** - * @symbol ?_shouldReplaceItem\@ShareableComponent\@\@AEBA_NAEBVItemStack\@\@0AEBVShareableDefinition\@\@_N\@Z + * @symbol ?_shouldReplaceItem\@ShareableComponent\@\@AEBA_NAEBVItemStack\@\@0AEBVShareableDefinition\@\@_N\@Z */ MCAPI bool _shouldReplaceItem(class ItemStack const &, class ItemStack const &, class ShareableDefinition const &, bool) const; /** - * @symbol ?_useLegacySurplusRules\@ShareableComponent\@\@CA_NAEBVLevel\@\@\@Z + * @symbol ?_useLegacySurplusRules\@ShareableComponent\@\@CA_NAEBVLevel\@\@\@Z */ MCAPI static bool _useLegacySurplusRules(class Level const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShareableDefinition.hpp b/LiteLoader/include/llapi/mc/ShareableDefinition.hpp index a53964071d..277883ba81 100644 --- a/LiteLoader/include/llapi/mc/ShareableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ShareableDefinition.hpp @@ -30,20 +30,20 @@ class ShareableDefinition { public: /** - * @symbol ??0ShareableDefinition\@\@QEAA\@XZ + * @symbol ??0ShareableDefinition\@\@QEAA\@XZ */ MCAPI ShareableDefinition(); /** - * @symbol ?addShareable\@ShareableDefinition\@\@QEAAXAEBUShareable\@\@\@Z + * @symbol ?addShareable\@ShareableDefinition\@\@QEAAXAEBUShareable\@\@\@Z */ MCAPI void addShareable(struct Shareable const &); /** - * @symbol ?addShareableByName\@ShareableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addShareableByName\@ShareableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addShareableByName(std::string const &); /** - * @symbol ?buildSchema\@ShareableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VShareableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ShareableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VShareableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SharedAmplifiers.hpp b/LiteLoader/include/llapi/mc/SharedAmplifiers.hpp index 81a805cbb8..85d915a71b 100644 --- a/LiteLoader/include/llapi/mc/SharedAmplifiers.hpp +++ b/LiteLoader/include/llapi/mc/SharedAmplifiers.hpp @@ -30,44 +30,44 @@ class SharedAmplifiers { public: /** - * @symbol ?ABSORPTION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?ABSORPTION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr ABSORPTION; /** - * @symbol ?FATAL_POISON\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?FATAL_POISON\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr FATAL_POISON; /** - * @symbol ?HARM\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?HARM\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HARM; /** - * @symbol ?HEAL\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?HEAL\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HEAL; /** - * @symbol ?HUNGER_DURATION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?HUNGER_DURATION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HUNGER_DURATION; /** - * @symbol ?HUNGER_VALUE\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?HUNGER_VALUE\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HUNGER_VALUE; /** - * @symbol ?POISON\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?POISON\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr POISON; /** - * @symbol ?REGENERATION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?REGENERATION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr REGENERATION; /** - * @symbol ?SATURATION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?SATURATION\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr SATURATION; /** - * @symbol ?WITHER\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A + * @symbol ?WITHER\@SharedAmplifiers\@\@2V?$shared_ptr\@VAmplifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr WITHER; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SharedAttributes.hpp b/LiteLoader/include/llapi/mc/SharedAttributes.hpp index 7698ebce2e..d52161ce3c 100644 --- a/LiteLoader/include/llapi/mc/SharedAttributes.hpp +++ b/LiteLoader/include/llapi/mc/SharedAttributes.hpp @@ -30,88 +30,84 @@ class SharedAttributes { public: /** - * @symbol ?ABSORPTION\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?ABSORPTION\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const ABSORPTION; /** - * @symbol ?ATTACK_DAMAGE\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?ATTACK_DAMAGE\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const ATTACK_DAMAGE; /** - * @symbol ?FOLLOW_RANGE\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?FOLLOW_RANGE\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const FOLLOW_RANGE; /** - * @symbol ?HEALTH\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?HEALTH\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const HEALTH; /** - * @symbol ?JUMP_STRENGTH\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?JUMP_STRENGTH\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const JUMP_STRENGTH; /** - * @symbol ?KNOCKBACK_RESISTANCE\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?KNOCKBACK_RESISTANCE\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const KNOCKBACK_RESISTANCE; /** - * @symbol ?LAVA_MOVEMENT_SPEED\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?LAVA_MOVEMENT_SPEED\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const LAVA_MOVEMENT_SPEED; /** - * @symbol ?LUCK\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?LUCK\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const LUCK; /** - * @symbol ?MOVEMENT_SPEED\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?MOVEMENT_SPEED\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const MOVEMENT_SPEED; /** - * @symbol ?UNDERWATER_MOVEMENT_SPEED\@SharedAttributes\@\@2VAttribute\@\@B + * @symbol ?UNDERWATER_MOVEMENT_SPEED\@SharedAttributes\@\@2VAttribute\@\@B */ MCAPI static class Attribute const UNDERWATER_MOVEMENT_SPEED; /** - * @symbol ?checkIsDeprecated\@SharedAttributes\@\@SA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?checkIsDeprecated\@SharedAttributes\@\@SA_NAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool checkIsDeprecated(std::string &); /** - * @symbol ?loadAttributeBuff\@SharedAttributes\@\@SA?AVTemporalAttributeBuff\@\@AEBVCompoundTag\@\@\@Z - */ - MCAPI static class TemporalAttributeBuff loadAttributeBuff(class CompoundTag const &); - /** - * @symbol ?loadAttributeModifier\@SharedAttributes\@\@SA?AV?$shared_ptr\@VAttributeModifier\@\@\@std\@\@AEBVCompoundTag\@\@\@Z - */ - MCAPI static class std::shared_ptr loadAttributeModifier(class CompoundTag const &); - /** - * @symbol ?loadAttributes\@SharedAttributes\@\@SAXPEAVBaseAttributeMap\@\@PEBVListTag\@\@\@Z + * @symbol ?loadAttributes\@SharedAttributes\@\@SAXPEAVBaseAttributeMap\@\@PEBVListTag\@\@\@Z */ MCAPI static void loadAttributes(class BaseAttributeMap *, class ListTag const *); /** - * @symbol ?saveAttributes\@SharedAttributes\@\@SA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@PEBVBaseAttributeMap\@\@\@Z + * @symbol ?saveAttributes\@SharedAttributes\@\@SA?AV?$unique_ptr\@VListTag\@\@U?$default_delete\@VListTag\@\@\@std\@\@\@std\@\@PEBVBaseAttributeMap\@\@\@Z */ MCAPI static std::unique_ptr saveAttributes(class BaseAttributeMap const *); //private: /** - * @symbol ?_legacyGetInstance\@SharedAttributes\@\@CAPEAVAttributeInstance\@\@AEAVBaseAttributeMap\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_legacyGetInstance\@SharedAttributes\@\@CAPEAVAttributeInstance\@\@AEAVBaseAttributeMap\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class AttributeInstance * _legacyGetInstance(class BaseAttributeMap &, std::string const &); /** - * @symbol ?_legacyGetName\@SharedAttributes\@\@CAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?_legacyGetName\@SharedAttributes\@\@CAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI static std::string const & _legacyGetName(std::string const &); /** - * @symbol ?_loadAttribute\@SharedAttributes\@\@CAXAEAVAttributeInstance\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?_loadAttribute\@SharedAttributes\@\@CAXAEAVAttributeInstance\@\@PEBVCompoundTag\@\@\@Z */ MCAPI static void _loadAttribute(class AttributeInstance &, class CompoundTag const *); /** - * @symbol ?_saveAttribute\@SharedAttributes\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVAttributeInstance\@\@\@Z + * @symbol ?_saveAttribute\@SharedAttributes\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVAttributeInstance\@\@\@Z */ MCAPI static std::unique_ptr _saveAttribute(class AttributeInstance const &); /** - * @symbol ?_saveAttributeModifier\@SharedAttributes\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVAttributeModifier\@\@\@Z + * @symbol ?_saveAttributeBuff\@SharedAttributes\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVTemporalAttributeBuff\@\@\@Z + */ + MCAPI static std::unique_ptr _saveAttributeBuff(class TemporalAttributeBuff const &); + /** + * @symbol ?_saveAttributeModifier\@SharedAttributes\@\@CA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@AEBVAttributeModifier\@\@\@Z */ MCAPI static std::unique_ptr _saveAttributeModifier(class AttributeModifier const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SharedBuffs.hpp b/LiteLoader/include/llapi/mc/SharedBuffs.hpp index 267af06b47..d2ab3d0660 100644 --- a/LiteLoader/include/llapi/mc/SharedBuffs.hpp +++ b/LiteLoader/include/llapi/mc/SharedBuffs.hpp @@ -30,44 +30,44 @@ class SharedBuffs { public: /** - * @symbol ?ABSORPTION\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?ABSORPTION\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr ABSORPTION; /** - * @symbol ?FATAL_POISON\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?FATAL_POISON\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr FATAL_POISON; /** - * @symbol ?FOOD_POSIONING\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?FOOD_POSIONING\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr FOOD_POSIONING; /** - * @symbol ?HARM\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?HARM\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HARM; /** - * @symbol ?HEAL\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?HEAL\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HEAL; /** - * @symbol ?POISON\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?POISON\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr POISON; /** - * @symbol ?PUFFER_POSIONING\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?PUFFER_POSIONING\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr PUFFER_POSIONING; /** - * @symbol ?REGENERATION\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?REGENERATION\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr REGENERATION; /** - * @symbol ?SATURATION\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?SATURATION\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr SATURATION; /** - * @symbol ?WITHER\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A + * @symbol ?WITHER\@SharedBuffs\@\@2V?$shared_ptr\@VAttributeBuff\@\@\@std\@\@A */ MCAPI static class std::shared_ptr WITHER; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SharedConstants.hpp b/LiteLoader/include/llapi/mc/SharedConstants.hpp index f81ae281f9..1f22a4abb9 100644 --- a/LiteLoader/include/llapi/mc/SharedConstants.hpp +++ b/LiteLoader/include/llapi/mc/SharedConstants.hpp @@ -23,115 +23,119 @@ namespace SharedConstants { #undef AFTER_EXTRA /** - * @symbol ?CodeBuilderProtocolVersion\@SharedConstants\@\@3W4ProtocolVersion\@CodeBuilder\@\@B + * @symbol ?CodeBuilderProtocolVersion\@SharedConstants\@\@3W4ProtocolVersion\@CodeBuilder\@\@B */ MCAPI extern enum class CodeBuilder::ProtocolVersion const CodeBuilderProtocolVersion; /** - * @symbol ?CurrentActorDigestFormat\@SharedConstants\@\@3W4ActorDigestFormat\@\@B + * @symbol ?CurrentActorDigestFormat\@SharedConstants\@\@3W4ActorDigestFormat\@\@B */ MCAPI extern enum class ActorDigestFormat const CurrentActorDigestFormat; /** - * @symbol ?CurrentBlendVersion\@SharedConstants\@\@3W4BlendVersion\@\@B + * @symbol ?CurrentBlendVersion\@SharedConstants\@\@3W4BlendVersion\@\@B */ MCAPI extern enum class BlendVersion const CurrentBlendVersion; /** - * @symbol ?CurrentGameSemVersion\@SharedConstants\@\@3VSemVersion\@\@B + * @symbol ?CurrentGameSemVersion\@SharedConstants\@\@3VSemVersion\@\@B */ MCAPI extern class SemVersion const CurrentGameSemVersion; /** - * @symbol ?CurrentLevelChunkFormat\@SharedConstants\@\@3W4LevelChunkFormat\@\@B + * @symbol ?CurrentLevelChunkFormat\@SharedConstants\@\@3W4LevelChunkFormat\@\@B */ MCAPI extern enum class LevelChunkFormat const CurrentLevelChunkFormat; /** - * @symbol ?CurrentStorageVersion\@SharedConstants\@\@3W4StorageVersion\@\@B + * @symbol ?CurrentStorageVersion\@SharedConstants\@\@3W4StorageVersion\@\@B */ MCAPI extern enum class StorageVersion const CurrentStorageVersion; /** - * @symbol ?CurrentSubChunkFormat\@SharedConstants\@\@3W4SubChunkFormat\@\@B + * @symbol ?CurrentSubChunkFormat\@SharedConstants\@\@3W4SubChunkFormat\@\@B */ MCAPI extern enum class SubChunkFormat const CurrentSubChunkFormat; /** - * @symbol ?DevInitiallyMuteMusic\@SharedConstants\@\@3_NB + * @symbol ?DevInitiallyMuteMusic\@SharedConstants\@\@3_NB */ MCAPI extern bool const DevInitiallyMuteMusic; /** - * @symbol ?EduDiscoveryProtocolVersion\@SharedConstants\@\@3HB + * @symbol ?EduDiscoveryProtocolVersion\@SharedConstants\@\@3HB */ MCAPI extern int const EduDiscoveryProtocolVersion; /** - * @symbol ?IsAnyBeta\@SharedConstants\@\@3_NB + * @symbol ?IsAnyBeta\@SharedConstants\@\@3_NB */ MCAPI extern bool const IsAnyBeta; /** - * @symbol ?IsBeta\@SharedConstants\@\@3_NB + * @symbol ?IsBeta\@SharedConstants\@\@3_NB */ MCAPI extern bool const IsBeta; /** - * @symbol ?IsDevBuild\@SharedConstants\@\@3_NB + * @symbol ?IsDevBuild\@SharedConstants\@\@3_NB */ MCAPI extern bool const IsDevBuild; /** - * @symbol ?IsPlaytest\@SharedConstants\@\@3_NB + * @symbol ?IsPlaytest\@SharedConstants\@\@3_NB */ MCAPI extern bool const IsPlaytest; /** - * @symbol ?IsPreviewApp\@SharedConstants\@\@3_NB + * @symbol ?IsPreviewApp\@SharedConstants\@\@3_NB */ MCAPI extern bool const IsPreviewApp; /** - * @symbol ?LevelDBCompressorID\@SharedConstants\@\@3HB + * @symbol ?IsWin32Platform\@SharedConstants\@\@3_NB + */ + MCAPI extern bool const IsWin32Platform; + /** + * @symbol ?LevelDBCompressorID\@SharedConstants\@\@3HB */ MCAPI extern int const LevelDBCompressorID; /** - * @symbol ?MajorVersion\@SharedConstants\@\@3HB + * @symbol ?MajorVersion\@SharedConstants\@\@3HB */ MCAPI extern int const MajorVersion; /** - * @symbol ?MaxChatLength\@SharedConstants\@\@3HB + * @symbol ?MaxChatLength\@SharedConstants\@\@3HB */ MCAPI extern int const MaxChatLength; /** - * @symbol ?MinTickingChunksRadius\@SharedConstants\@\@3IB + * @symbol ?MinTickingChunksRadius\@SharedConstants\@\@3IB */ MCAPI extern unsigned int const MinTickingChunksRadius; /** - * @symbol ?MinimumCompatibleGameVersionForLevelData\@SharedConstants\@\@3VGameVersion\@\@B + * @symbol ?MinimumCompatibleGameVersionForLevelData\@SharedConstants\@\@3VGameVersion\@\@B */ MCAPI extern class GameVersion const MinimumCompatibleGameVersionForLevelData; /** - * @symbol ?MinorVersion\@SharedConstants\@\@3HB + * @symbol ?MinorVersion\@SharedConstants\@\@3HB */ MCAPI extern int const MinorVersion; /** - * @symbol ?NetworkDefaultGamePort\@SharedConstants\@\@3GB + * @symbol ?NetworkDefaultGamePort\@SharedConstants\@\@3GB */ MCAPI extern unsigned short const NetworkDefaultGamePort; /** - * @symbol ?NetworkDefaultGamePortv6\@SharedConstants\@\@3GB + * @symbol ?NetworkDefaultGamePortv6\@SharedConstants\@\@3GB */ MCAPI extern unsigned short const NetworkDefaultGamePortv6; /** - * @symbol ?NetworkDefaultMaxConnections\@SharedConstants\@\@3HB + * @symbol ?NetworkDefaultMaxConnections\@SharedConstants\@\@3HB */ MCAPI extern int const NetworkDefaultMaxConnections; /** - * @symbol ?NetworkEphemeralPort\@SharedConstants\@\@3GB + * @symbol ?NetworkEphemeralPort\@SharedConstants\@\@3GB */ MCAPI extern unsigned short const NetworkEphemeralPort; /** - * @symbol ?NetworkProtocolVersion\@SharedConstants\@\@3HB + * @symbol ?NetworkProtocolVersion\@SharedConstants\@\@3HB */ MCAPI extern int const NetworkProtocolVersion; /** - * @symbol ?PatchVersion\@SharedConstants\@\@3HB + * @symbol ?PatchVersion\@SharedConstants\@\@3HB */ MCAPI extern int const PatchVersion; /** - * @symbol ?RevisionVersion\@SharedConstants\@\@3HB + * @symbol ?RevisionVersion\@SharedConstants\@\@3HB */ MCAPI extern int const RevisionVersion; /** - * @symbol ?StoreVersion\@SharedConstants\@\@3HB + * @symbol ?StoreVersion\@SharedConstants\@\@3HB */ MCAPI extern int const StoreVersion; diff --git a/LiteLoader/include/llapi/mc/SharedModifiers.hpp b/LiteLoader/include/llapi/mc/SharedModifiers.hpp index f8f1259457..cc69d972e9 100644 --- a/LiteLoader/include/llapi/mc/SharedModifiers.hpp +++ b/LiteLoader/include/llapi/mc/SharedModifiers.hpp @@ -30,28 +30,28 @@ class SharedModifiers { public: /** - * @symbol ?DAMAGE_BOOST\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?DAMAGE_BOOST\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr DAMAGE_BOOST; /** - * @symbol ?HEALTH_BOOST\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?HEALTH_BOOST\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr HEALTH_BOOST; /** - * @symbol ?MOVEMENT_SLOWDOWN\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?MOVEMENT_SLOWDOWN\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr MOVEMENT_SLOWDOWN; /** - * @symbol ?MOVEMENT_SPEED\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?MOVEMENT_SPEED\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr MOVEMENT_SPEED; /** - * @symbol ?SPRINTING_BOOST\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?SPRINTING_BOOST\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr SPRINTING_BOOST; /** - * @symbol ?WEAKNESS\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?WEAKNESS\@SharedModifiers\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr WEAKNESS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShearsItem.hpp b/LiteLoader/include/llapi/mc/ShearsItem.hpp index 7921106c24..47a8247c15 100644 --- a/LiteLoader/include/llapi/mc/ShearsItem.hpp +++ b/LiteLoader/include/llapi/mc/ShearsItem.hpp @@ -32,133 +32,133 @@ class ShearsItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShearsItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 44 - * @symbol ?canDestroySpecial\@ShearsItem\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 44 + * @symbol ?canDestroySpecial\@ShearsItem\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroySpecial(class Block const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@ShearsItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@ShearsItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@ShearsItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ShearsItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@ShearsItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@ShearsItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@ShearsItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@ShearsItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 93 - * @symbol ?mineBlock\@ShearsItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@ShearsItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @vftbl 132 - * @symbol ?_useOn\@ShearsItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@ShearsItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0ShearsItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ShearsItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ShearsItem(std::string const &, int); //private: /** - * @symbol ?_spawnLoot\@ShearsItem\@\@CAXAEAVLevel\@\@PEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_spawnLoot\@ShearsItem\@\@CAXAEAVLevel\@\@PEAVActor\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static void _spawnLoot(class Level &, class Actor *, std::string const &); /** - * @symbol ?_tryShearMooshroom\@ShearsItem\@\@CA_NAEAVLevel\@\@AEAVBlockSource\@\@PEAVActor\@\@\@Z + * @symbol ?_tryShearMooshroom\@ShearsItem\@\@CA_NAEAVLevel\@\@AEAVBlockSource\@\@PEAVActor\@\@\@Z */ MCAPI static bool _tryShearMooshroom(class Level &, class BlockSource &, class Actor *); /** - * @symbol ?_tryShearSheep\@ShearsItem\@\@CA_NAEAVLevel\@\@PEAVActor\@\@\@Z + * @symbol ?_tryShearSheep\@ShearsItem\@\@CA_NAEAVLevel\@\@PEAVActor\@\@\@Z */ MCAPI static bool _tryShearSheep(class Level &, class Actor *); /** - * @symbol ?_tryShearSnowGolem\@ShearsItem\@\@CA_NAEAVLevel\@\@PEAVActor\@\@\@Z + * @symbol ?_tryShearSnowGolem\@ShearsItem\@\@CA_NAEAVLevel\@\@PEAVActor\@\@\@Z */ MCAPI static bool _tryShearSnowGolem(class Level &, class Actor *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Sheep.hpp b/LiteLoader/include/llapi/mc/Sheep.hpp index 8057458a09..2f8ceb463f 100644 --- a/LiteLoader/include/llapi/mc/Sheep.hpp +++ b/LiteLoader/include/llapi/mc/Sheep.hpp @@ -32,160 +32,150 @@ class Sheep : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Sheep(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Sheep\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Sheep\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 - */ - virtual void __unk_vfn_179(); - /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); - /** - * @vftbl 219 - * @symbol __unk_vfn_219 - */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_192(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_217(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_218(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_240(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_243(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_260(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_268(); /** - * @vftbl 291 - * @symbol ?aiStep\@Sheep\@\@UEAAXXZ + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void aiStep(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 349 - * @symbol ?newServerAiStep\@Sheep\@\@MEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@Sheep\@\@MEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Sheep\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Sheep\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Sheep(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?isGrazing\@Sheep\@\@QEBA_NXZ + * @symbol ?isGrazing\@Sheep\@\@QEBA_NXZ */ MCAPI bool isGrazing() const; /** - * @symbol ?preAiStep\@Sheep\@\@QEAAXXZ + * @symbol ?preAiStep\@Sheep\@\@QEAAXXZ */ MCAPI void preAiStep(); @@ -193,8 +183,8 @@ class Sheep : public Animal { private: /** - * @symbol ?EAT_ANIMATION_TICKS\@Sheep\@\@0HB + * @symbol ?EAT_ANIMATION_TICKS\@Sheep\@\@0HB */ MCAPI static int const EAT_ANIMATION_TICKS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp index 51deeb5d49..86ffc20f60 100644 --- a/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SheepPreAIStepSystem.hpp @@ -28,16 +28,16 @@ class SheepPreAIStepSystem { public: /** - * @symbol ?createSystem\@SheepPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SheepPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSheepPreAIStepSystem\@SheepPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doSheepPreAIStepSystem\@SheepPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doSheepPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShieldItem.hpp b/LiteLoader/include/llapi/mc/ShieldItem.hpp index 8eb89a86fd..360dbf9114 100644 --- a/LiteLoader/include/llapi/mc/ShieldItem.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItem.hpp @@ -32,171 +32,171 @@ class ShieldItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShieldItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 49 - * @symbol ?isHandEquipped\@ShieldItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@ShieldItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@ShieldItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@ShieldItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@ShieldItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@ShieldItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@ShieldItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@ShieldItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@ShieldItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@ShieldItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@ShieldItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@ShieldItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @vftbl 98 - * @symbol ?readUserData\@ShieldItem\@\@UEBAXAEAVItemStackBase\@\@AEAVIDataInput\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 98 + * @symbol ?readUserData\@ShieldItem\@\@UEBAXAEAVItemStackBase\@\@AEAVIDataInput\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual void readUserData(class ItemStackBase &, class IDataInput &, class ReadOnlyBinaryStream &) const; /** - * @vftbl 99 - * @symbol ?writeUserData\@ShieldItem\@\@UEBAXAEBVItemStackBase\@\@AEAVIDataOutput\@\@\@Z + * @vftbl 99 + * @symbol ?writeUserData\@ShieldItem\@\@UEBAXAEBVItemStackBase\@\@AEAVIDataOutput\@\@\@Z */ virtual void writeUserData(class ItemStackBase const &, class IDataOutput &) const; /** - * @vftbl 101 - * @symbol ?inventoryTick\@ShieldItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z + * @vftbl 101 + * @symbol ?inventoryTick\@ShieldItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z */ virtual bool inventoryTick(class ItemStack &, class Level &, class Actor &, int, bool) const; /** - * @vftbl 103 - * @symbol ?getCooldownType\@ShieldItem\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 103 + * @symbol ?getCooldownType\@ShieldItem\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & getCooldownType() const; /** - * @vftbl 104 - * @symbol ?getCooldownTime\@ShieldItem\@\@UEBAHXZ + * @vftbl 104 + * @symbol ?getCooldownTime\@ShieldItem\@\@UEBAHXZ */ virtual int getCooldownTime() const; /** - * @vftbl 109 - * @symbol ?getInHandUpdateType\@ShieldItem\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemInstance\@\@1_N2\@Z + * @vftbl 109 + * @symbol ?getInHandUpdateType\@ShieldItem\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemInstance\@\@1_N2\@Z */ virtual enum class InHandUpdateType getInHandUpdateType(class Player const &, class ItemInstance const &, class ItemInstance const &, bool, bool) const; /** - * @vftbl 110 - * @symbol ?getInHandUpdateType\@ShieldItem\@\@UEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemStack\@\@1_N2\@Z + * @vftbl 110 + * @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; /** - * @symbol ??0ShieldItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ShieldItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ShieldItem(std::string const &, int); /** - * @symbol ?playBlockSound\@ShieldItem\@\@QEBAXPEAVPlayer\@\@\@Z + * @symbol ?playBlockSound\@ShieldItem\@\@QEBAXPEAVPlayer\@\@\@Z */ MCAPI void playBlockSound(class Player *) const; /** - * @symbol ?playBreakSound\@ShieldItem\@\@QEBAXPEAVPlayer\@\@\@Z + * @symbol ?playBreakSound\@ShieldItem\@\@QEBAXPEAVPlayer\@\@\@Z */ MCAPI void playBreakSound(class Player *) const; /** - * @symbol ?EFFECTIVE_BLOCK_DELAY\@ShieldItem\@\@2HB + * @symbol ?EFFECTIVE_BLOCK_DELAY\@ShieldItem\@\@2HB */ MCAPI static int const EFFECTIVE_BLOCK_DELAY; /** - * @symbol ?IN_HAND_BLOCK_DURATION\@ShieldItem\@\@2HB + * @symbol ?IN_HAND_BLOCK_DURATION\@ShieldItem\@\@2HB */ MCAPI static int const IN_HAND_BLOCK_DURATION; /** - * @symbol ?TIMESTAMP_TAG\@ShieldItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TIMESTAMP_TAG\@ShieldItem\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const TIMESTAMP_TAG; //private: /** - * @symbol ?_getInHandUpdateType\@ShieldItem\@\@AEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemStack\@\@1_N2\@Z + * @symbol ?_getInHandUpdateType\@ShieldItem\@\@AEBA?AW4InHandUpdateType\@\@AEBVPlayer\@\@AEBVItemStack\@\@1_N2\@Z */ MCAPI enum class InHandUpdateType _getInHandUpdateType(class Player const &, class ItemStack const &, class ItemStack const &, bool, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShieldItemUtils.hpp b/LiteLoader/include/llapi/mc/ShieldItemUtils.hpp index 752190435d..10f5dbcad5 100644 --- a/LiteLoader/include/llapi/mc/ShieldItemUtils.hpp +++ b/LiteLoader/include/llapi/mc/ShieldItemUtils.hpp @@ -30,7 +30,7 @@ class ShieldItemUtils { public: /** - * @symbol ?isBlockedDamageCause\@ShieldItemUtils\@\@SA_NAEBVActorDamageSource\@\@\@Z + * @symbol ?isBlockedDamageCause\@ShieldItemUtils\@\@SA_NAEBVActorDamageSource\@\@\@Z */ MCAPI static bool isBlockedDamageCause(class ActorDamageSource const &); @@ -38,8 +38,8 @@ class ShieldItemUtils { private: /** - * @symbol ?mAlwaysBlockableDamageCauses\@ShieldItemUtils\@\@0V?$vector\@W4ActorDamageCause\@\@V?$allocator\@W4ActorDamageCause\@\@\@std\@\@\@std\@\@B + * @symbol ?mAlwaysBlockableDamageCauses\@ShieldItemUtils\@\@0V?$vector\@W4ActorDamageCause\@\@V?$allocator\@W4ActorDamageCause\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const mAlwaysBlockableDamageCauses; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp b/LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp index 9b60ca1419..e6b599819d 100644 --- a/LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp +++ b/LiteLoader/include/llapi/mc/ShiftedDurationAmplifier.hpp @@ -30,28 +30,28 @@ class ShiftedDurationAmplifier { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShiftedDurationAmplifier(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?shouldBuff\@ShiftedDurationAmplifier\@\@UEBA_NHH\@Z + * @vftbl 2 + * @symbol ?shouldBuff\@ShiftedDurationAmplifier\@\@UEBA_NHH\@Z */ virtual bool shouldBuff(int, int) const; /** - * @vftbl 3 - * @symbol ?getTickInterval\@ShiftedDurationAmplifier\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getTickInterval\@ShiftedDurationAmplifier\@\@UEBAHH\@Z */ virtual int getTickInterval(int) const; /** - * @symbol ??0ShiftedDurationAmplifier\@\@QEAA\@H\@Z + * @symbol ??0ShiftedDurationAmplifier\@\@QEAA\@H\@Z */ MCAPI ShiftedDurationAmplifier(int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp b/LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp index 73fdccce9d..6bdde57fcd 100644 --- a/LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp +++ b/LiteLoader/include/llapi/mc/ShiftedValueAmplifier.hpp @@ -30,18 +30,18 @@ class ShiftedValueAmplifier { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShiftedValueAmplifier(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getAmount\@ShiftedValueAmplifier\@\@UEBAMHM\@Z + * @vftbl 1 + * @symbol ?getAmount\@ShiftedValueAmplifier\@\@UEBAMHM\@Z */ virtual float getAmount(int, float) const; /** - * @symbol ??0ShiftedValueAmplifier\@\@QEAA\@HM\@Z + * @symbol ??0ShiftedValueAmplifier\@\@QEAA\@HM\@Z */ MCAPI ShiftedValueAmplifier(int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShipwreckFeature.hpp b/LiteLoader/include/llapi/mc/ShipwreckFeature.hpp index cd8f99bb1f..362b7f4270 100644 --- a/LiteLoader/include/llapi/mc/ShipwreckFeature.hpp +++ b/LiteLoader/include/llapi/mc/ShipwreckFeature.hpp @@ -31,32 +31,32 @@ class ShipwreckFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShipwreckFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@ShipwreckFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@ShipwreckFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@ShipwreckFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@ShipwreckFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@ShipwreckFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@ShipwreckFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0ShipwreckFeature\@\@QEAA\@AEAVOceanMonumentFeature\@\@IAEBVBaseGameVersion\@\@\@Z + * @symbol ??0ShipwreckFeature\@\@QEAA\@AEAVOceanMonumentFeature\@\@IAEBVBaseGameVersion\@\@\@Z */ MCAPI ShipwreckFeature(class OceanMonumentFeature &, unsigned int, class BaseGameVersion const &); /** - * @symbol ?isShipwreckBeached\@ShipwreckFeature\@\@SA_NPEBVBiome\@\@\@Z + * @symbol ?isShipwreckBeached\@ShipwreckFeature\@\@SA_NPEBVBiome\@\@\@Z */ MCAPI static bool isShipwreckBeached(class Biome const *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShipwreckPiece.hpp b/LiteLoader/include/llapi/mc/ShipwreckPiece.hpp index 0fd377d303..cfb539267b 100644 --- a/LiteLoader/include/llapi/mc/ShipwreckPiece.hpp +++ b/LiteLoader/include/llapi/mc/ShipwreckPiece.hpp @@ -31,35 +31,35 @@ class ShipwreckPiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShipwreckPiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@ShipwreckPiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@ShipwreckPiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@ShipwreckPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@ShipwreckPiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); //private: /** - * @symbol ?_calculateTargetPos\@ShipwreckPiece\@\@CA?AVBlockPos\@\@AEAVBlockSource\@\@V2\@W4Rotation\@\@1\@Z + * @symbol ?_calculateTargetPos\@ShipwreckPiece\@\@CA?AVBlockPos\@\@AEAVBlockSource\@\@V2\@W4Rotation\@\@1\@Z */ MCAPI static class BlockPos _calculateTargetPos(class BlockSource &, class BlockPos, enum class Rotation, class BlockPos); /** - * @symbol ?_calculateTargetPosLegacy\@ShipwreckPiece\@\@CA?AVBlockPos\@\@AEAVBlockSource\@\@V2\@W4Rotation\@\@1\@Z + * @symbol ?_calculateTargetPosLegacy\@ShipwreckPiece\@\@CA?AVBlockPos\@\@AEAVBlockSource\@\@V2\@W4Rotation\@\@1\@Z */ MCAPI static class BlockPos _calculateTargetPosLegacy(class BlockSource &, class BlockPos, enum class Rotation, class BlockPos); private: /** - * @symbol ?STRUCTURE_SHIPWRECK_TYPES\@ShipwreckPiece\@\@0QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_SHIPWRECK_TYPES\@ShipwreckPiece\@\@0QBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STRUCTURE_SHIPWRECK_TYPES[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShipwreckStart.hpp b/LiteLoader/include/llapi/mc/ShipwreckStart.hpp index f682a1953b..330043ffbe 100644 --- a/LiteLoader/include/llapi/mc/ShipwreckStart.hpp +++ b/LiteLoader/include/llapi/mc/ShipwreckStart.hpp @@ -31,13 +31,13 @@ class ShipwreckStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShipwreckStart(); + virtual void __unk_vfn_0(); /** - * @symbol ??0ShipwreckStart\@\@QEAA\@AEBVBiomeSource\@\@AEAVRandom\@\@HHF\@Z + * @symbol ??0ShipwreckStart\@\@QEAA\@AEBVBiomeSource\@\@AEAVRandom\@\@HHF\@Z */ MCAPI ShipwreckStart(class BiomeSource const &, class Random &, int, int, short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShootBowDefinition.hpp b/LiteLoader/include/llapi/mc/ShootBowDefinition.hpp index 56959728d4..ff0c3da9c0 100644 --- a/LiteLoader/include/llapi/mc/ShootBowDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ShootBowDefinition.hpp @@ -32,14 +32,14 @@ class ShootBowDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShootBowDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@ShootBowDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@ShootBowDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShootBowNode.hpp b/LiteLoader/include/llapi/mc/ShootBowNode.hpp index 21a6ac9270..1d9081d7fb 100644 --- a/LiteLoader/include/llapi/mc/ShootBowNode.hpp +++ b/LiteLoader/include/llapi/mc/ShootBowNode.hpp @@ -29,23 +29,23 @@ class ShootBowNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShootBowNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@ShootBowNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@ShootBowNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@ShootBowNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@ShootBowNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0ShootBowNode\@\@QEAA\@XZ + * @symbol ??0ShootBowNode\@\@QEAA\@XZ */ MCAPI ShootBowNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShootEventResponse.hpp b/LiteLoader/include/llapi/mc/ShootEventResponse.hpp index 3deb39214b..239e39ecc4 100644 --- a/LiteLoader/include/llapi/mc/ShootEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/ShootEventResponse.hpp @@ -31,28 +31,28 @@ class ShootEventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShootEventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@ShootEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@ShootEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@ShootEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@ShootEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@ShootEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@ShootEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@ShootEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@ShootEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShooterComponent.hpp b/LiteLoader/include/llapi/mc/ShooterComponent.hpp index 31edccedd5..126563dd05 100644 --- a/LiteLoader/include/llapi/mc/ShooterComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShooterComponent.hpp @@ -30,32 +30,32 @@ class ShooterComponent { public: /** - * @symbol ??0ShooterComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0ShooterComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI ShooterComponent(class ShooterComponent &&); /** - * @symbol ?hasMagicAttacks\@ShooterComponent\@\@QEBA_NXZ + * @symbol ?hasMagicAttacks\@ShooterComponent\@\@QEBA_NXZ */ MCAPI bool hasMagicAttacks() const; /** - * @symbol ?onShoot\@ShooterComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?onShoot\@ShooterComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void onShoot(class Actor &); /** - * @symbol ??4ShooterComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4ShooterComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class ShooterComponent & operator=(class ShooterComponent &&); /** - * @symbol ??1ShooterComponent\@\@QEAA\@XZ + * @symbol ??1ShooterComponent\@\@QEAA\@XZ */ MCAPI ~ShooterComponent(); //private: /** - * @symbol ?_shootProjectile\@ShooterComponent\@\@AEAAXAEAVActor\@\@AEBUActorDefinitionIdentifier\@\@H\@Z + * @symbol ?_shootProjectile\@ShooterComponent\@\@AEAAXAEAVActor\@\@AEBUActorDefinitionIdentifier\@\@H\@Z */ MCAPI void _shootProjectile(class Actor &, struct ActorDefinitionIdentifier const &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShooterDefinition.hpp b/LiteLoader/include/llapi/mc/ShooterDefinition.hpp index cbbdc1ba59..09dfc72b17 100644 --- a/LiteLoader/include/llapi/mc/ShooterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/ShooterDefinition.hpp @@ -31,20 +31,20 @@ class ShooterDefinition { public: /** - * @symbol ?addSoundByName\@ShooterDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addSoundByName\@ShooterDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addSoundByName(std::string const &); /** - * @symbol ?initialize\@ShooterDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVShooterComponent\@\@\@Z + * @symbol ?initialize\@ShooterDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVShooterComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class ShooterComponent &) const; /** - * @symbol ?setActorDefByName\@ShooterDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setActorDefByName\@ShooterDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setActorDefByName(std::string const &); /** - * @symbol ?buildSchema\@ShooterDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VShooterDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@ShooterDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VShooterDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp b/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp index 19a1e71896..59c5544c0a 100644 --- a/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ShooterItemComponent.hpp @@ -30,71 +30,71 @@ class ShooterItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShooterItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?checkComponentDataForContentErrors\@ShooterItemComponent\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?checkComponentDataForContentErrors\@ShooterItemComponent\@\@UEBA_NXZ */ virtual bool checkComponentDataForContentErrors() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 5 - * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?buildNetworkTag\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr buildNetworkTag() const; /** - * @vftbl 6 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VShooterItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?releaseUsing\@ShooterItemComponent\@\@QEBA_NAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @symbol ?releaseUsing\@ShooterItemComponent\@\@QEBA_NAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ MCAPI bool releaseUsing(class ItemStack &, class Player *, int) const; /** - * @symbol ?use\@ShooterItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?use\@ShooterItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool use(class ItemStack &, class Player &) const; /** - * @symbol ?bindType\@ShooterItemComponent\@\@SAXXZ + * @symbol ?bindType\@ShooterItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@ShooterItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@ShooterItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); //private: /** - * @symbol ?_consumeAmmunition\@ShooterItemComponent\@\@AEBAXPEAVPlayer\@\@AEBVItemStack\@\@H_N2\@Z + * @symbol ?_consumeAmmunition\@ShooterItemComponent\@\@AEBAXPEAVPlayer\@\@AEBVItemStack\@\@H_N2\@Z */ MCAPI void _consumeAmmunition(class Player *, class ItemStack const &, int, bool, bool) const; /** - * @symbol ?_getAmmunition\@ShooterItemComponent\@\@AEBAHPEBVPlayer\@\@_NAEAVItemStack\@\@AEA_N\@Z + * @symbol ?_getAmmunition\@ShooterItemComponent\@\@AEBAHPEBVPlayer\@\@_NAEAVItemStack\@\@AEA_N\@Z */ MCAPI int _getAmmunition(class Player const *, bool, class ItemStack &, bool &) const; /** - * @symbol ?_shootProjectiles\@ShooterItemComponent\@\@AEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @symbol ?_shootProjectiles\@ShooterItemComponent\@\@AEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ MCAPI void _shootProjectiles(class ItemStack &, class Player *, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShooterProjectileData.hpp b/LiteLoader/include/llapi/mc/ShooterProjectileData.hpp index 51324b1207..9518a1b368 100644 --- a/LiteLoader/include/llapi/mc/ShooterProjectileData.hpp +++ b/LiteLoader/include/llapi/mc/ShooterProjectileData.hpp @@ -18,21 +18,24 @@ struct ShooterProjectileData { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SHOOTERPROJECTILEDATA public: - struct ShooterProjectileData& operator=(struct ShooterProjectileData const &) = delete; ShooterProjectileData() = delete; #endif public: /** - * @symbol ??0ShooterProjectileData\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0ShooterProjectileData\@\@QEAA\@AEBU0\@\@Z */ MCAPI ShooterProjectileData(struct ShooterProjectileData const &); /** - * @symbol ?setActorDefByName\@ShooterProjectileData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??4ShooterProjectileData\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct ShooterProjectileData & operator=(struct ShooterProjectileData const &); + /** + * @symbol ?setActorDefByName\@ShooterProjectileData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setActorDefByName(std::string const &); /** - * @symbol ??1ShooterProjectileData\@\@QEAA\@XZ + * @symbol ??1ShooterProjectileData\@\@QEAA\@XZ */ MCAPI ~ShooterProjectileData(); diff --git a/LiteLoader/include/llapi/mc/ShortTag.hpp b/LiteLoader/include/llapi/mc/ShortTag.hpp index 3279fb1d6f..ace2cf27df 100644 --- a/LiteLoader/include/llapi/mc/ShortTag.hpp +++ b/LiteLoader/include/llapi/mc/ShortTag.hpp @@ -39,52 +39,52 @@ short val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShortTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@ShortTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@ShortTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@ShortTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@ShortTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@ShortTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@ShortTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@ShortTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@ShortTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@ShortTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@ShortTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@ShortTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@ShortTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@ShortTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@ShortTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; /** - * @symbol ??0ShortTag\@\@QEAA\@XZ + * @symbol ??0ShortTag\@\@QEAA\@XZ */ MCAPI ShortTag(); /** - * @symbol ??0ShortTag\@\@QEAA\@F\@Z + * @symbol ??0ShortTag\@\@QEAA\@F\@Z */ MCAPI ShortTag(short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShovelItem.hpp b/LiteLoader/include/llapi/mc/ShovelItem.hpp index 47fa649037..c9ba430288 100644 --- a/LiteLoader/include/llapi/mc/ShovelItem.hpp +++ b/LiteLoader/include/llapi/mc/ShovelItem.hpp @@ -33,98 +33,98 @@ class ShovelItem : public DiggerItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShovelItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @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 + * @vftbl 10 + * @symbol ?executeEvent\@ShovelItem\@\@UEBAXAEAVItemStackBase\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVRenderParams\@\@\@Z */ virtual void executeEvent(class ItemStackBase &, std::string const &, class RenderParams &) const; /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 44 - * @symbol ?canDestroySpecial\@ShovelItem\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 44 + * @symbol ?canDestroySpecial\@ShovelItem\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroySpecial(class Block const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@ShovelItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@ShovelItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@ShovelItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@ShovelItem\@\@MEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0ShovelItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z + * @symbol ??0ShovelItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ MCAPI ShovelItem(std::string const &, int, class Item::Tier const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp index c950edeb87..cfc3b13602 100644 --- a/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowCreditsPacket.hpp @@ -43,37 +43,43 @@ class ShowCreditsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShowCreditsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ShowCreditsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ShowCreditsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ShowCreditsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ShowCreditsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ShowCreditsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ShowCreditsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ShowCreditsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHOWCREDITSPACKET /** - * @symbol ??0ShowCreditsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ShowCreditsPacket(); +#endif + /** + * @symbol ??0ShowCreditsPacket\@\@QEAA\@XZ */ MCAPI ShowCreditsPacket(); /** - * @symbol ??0ShowCreditsPacket\@\@QEAA\@VActorRuntimeID\@\@W4CreditsState\@0\@\@Z + * @symbol ??0ShowCreditsPacket\@\@QEAA\@VActorRuntimeID\@\@W4CreditsState\@0\@\@Z */ MCAPI ShowCreditsPacket(class ActorRuntimeID, enum class ShowCreditsPacket::CreditsState); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp index 370f371fee..77a27f179d 100644 --- a/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowProfilePacket.hpp @@ -30,33 +30,33 @@ class ShowProfilePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShowProfilePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ShowProfilePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ShowProfilePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ShowProfilePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ShowProfilePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ShowProfilePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ShowProfilePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ShowProfilePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ShowProfilePacket\@\@QEAA\@XZ + * @symbol ??0ShowProfilePacket\@\@QEAA\@XZ */ MCAPI ShowProfilePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp index 45fe4c9804..3eb7799642 100644 --- a/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp +++ b/LiteLoader/include/llapi/mc/ShowStoreOfferPacket.hpp @@ -30,33 +30,33 @@ class ShowStoreOfferPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShowStoreOfferPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ShowStoreOfferPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ShowStoreOfferPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ShowStoreOfferPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ShowStoreOfferPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ShowStoreOfferPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ShowStoreOfferPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ShowStoreOfferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0ShowStoreOfferPacket\@\@QEAA\@XZ + * @symbol ??0ShowStoreOfferPacket\@\@QEAA\@XZ */ MCAPI ShowStoreOfferPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Shulker.hpp b/LiteLoader/include/llapi/mc/Shulker.hpp index 7ee175eb5d..561b8e84f7 100644 --- a/LiteLoader/include/llapi/mc/Shulker.hpp +++ b/LiteLoader/include/llapi/mc/Shulker.hpp @@ -32,311 +32,301 @@ class Shulker : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Shulker\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Shulker\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Shulker(); + virtual void __unk_vfn_16(); /** - * @vftbl 20 - * @symbol ?setPos\@Shulker\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 20 + * @symbol ?setPos\@Shulker\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void setPos(class Vec3 const &); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Shulker\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 59 - * @symbol ?isInWall\@Shulker\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?isInWall\@Shulker\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Shulker\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Shulker\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 114 - * @symbol ?canAttack\@Shulker\@\@UEBA_NPEAVActor\@\@_N\@Z + * @vftbl 113 + * @symbol ?canAttack\@Shulker\@\@UEBA_NPEAVActor\@\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 132 - * @symbol ?shouldRender\@Shulker\@\@UEBA_NXZ + * @vftbl 131 + * @symbol ?shouldRender\@Shulker\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Shulker\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Shulker\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 143 - * @symbol ?getPickRadius\@Shulker\@\@UEAAMXZ + * @vftbl 142 + * @symbol ?getPickRadius\@Shulker\@\@UEAAMXZ */ virtual float getPickRadius(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Shulker\@\@MEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Shulker\@\@MEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Shulker\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Shulker\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Shulker\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Shulker\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Shulker\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Shulker\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Shulker\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Shulker\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 289 - * @symbol ?travel\@Shulker\@\@UEAAXMMM\@Z + * @vftbl 286 + * @symbol ?travel\@Shulker\@\@UEAAXMMM_N\@Z */ - virtual void travel(float, float, float); + virtual void travel(float, float, float, bool); /** - * @vftbl 291 - * @symbol ?aiStep\@Shulker\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Shulker\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Shulker\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Shulker\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 305 - * @symbol ?getMaxHeadXRot\@Shulker\@\@UEAAMXZ + * @vftbl 302 + * @symbol ?getMaxHeadXRot\@Shulker\@\@UEAAMXZ */ virtual float getMaxHeadXRot(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@Shulker\@\@UEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@Shulker\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 346 - * @symbol ?initBodyControl\@Shulker\@\@UEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ + * @vftbl 343 + * @symbol ?initBodyControl\@Shulker\@\@UEAA?AV?$unique_ptr\@VBodyControl\@\@U?$default_delete\@VBodyControl\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr initBodyControl(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHULKER /** - * @symbol ?breaksFallingBlocks\@Shulker\@\@UEBA_NXZ + * @symbol ?breaksFallingBlocks\@Shulker\@\@UEBA_NXZ */ MCVAPI bool breaksFallingBlocks() const; /** - * @symbol ?isLeashableType\@Shulker\@\@UEAA_NXZ + * @symbol ?isLeashableType\@Shulker\@\@UEAA_NXZ */ MCVAPI bool isLeashableType(); #endif /** - * @symbol ??0Shulker\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Shulker\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Shulker(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@Shulker\@\@QEAAXXZ + * @symbol ?postNormalTick\@Shulker\@\@QEAAXXZ */ MCAPI void postNormalTick(); /** - * @symbol ?COVERED_ARMOR_MODIFIER\@Shulker\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A + * @symbol ?COVERED_ARMOR_MODIFIER\@Shulker\@\@2V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A */ MCAPI static class std::shared_ptr COVERED_ARMOR_MODIFIER; /** - * @symbol ?COVERED_ARMOR_MODIFIER_UUID\@Shulker\@\@2VUUID\@mce\@\@B + * @symbol ?COVERED_ARMOR_MODIFIER_UUID\@Shulker\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const COVERED_ARMOR_MODIFIER_UUID; /** - * @symbol ?postSetPosSetShulkerAttachPosAndPeekAmount\@Shulker\@\@SAXVSynchedActorDataWriter\@\@AEBVBlockPos\@\@\@Z + * @symbol ?postSetPosSetShulkerAttachPosAndPeekAmount\@Shulker\@\@SAXVSynchedActorDataWriter\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void postSetPosSetShulkerAttachPosAndPeekAmount(class SynchedActorDataWriter, class BlockPos const &); /** - * @symbol ?setShulkerAttachPos\@Shulker\@\@SAXVSynchedActorDataWriter\@\@AEBVBlockPos\@\@\@Z + * @symbol ?setShulkerAttachPos\@Shulker\@\@SAXVSynchedActorDataWriter\@\@AEBVBlockPos\@\@\@Z */ MCAPI static void setShulkerAttachPos(class SynchedActorDataWriter, class BlockPos const &); //protected: /** - * @symbol ?_canOpenLidAt\@Shulker\@\@IEBA_NVBlockPos\@\@E\@Z + * @symbol ?_canOpenLidAt\@Shulker\@\@IEBA_NVBlockPos\@\@E\@Z */ MCAPI bool _canOpenLidAt(class BlockPos, unsigned char) const; /** - * @symbol ?_setPeekAmount\@Shulker\@\@KAXVSynchedActorDataWriter\@\@H\@Z + * @symbol ?_setPeekAmount\@Shulker\@\@KAXVSynchedActorDataWriter\@\@H\@Z */ MCAPI static void _setPeekAmount(class SynchedActorDataWriter, int); //private: /** - * @symbol ?_calculateBB\@Shulker\@\@AEAAXXZ + * @symbol ?_calculateBB\@Shulker\@\@AEAAXXZ */ MCAPI void _calculateBB(); /** - * @symbol ?_isPosOccupiedByOtherShulker\@Shulker\@\@AEBA_NVBlockPos\@\@\@Z + * @symbol ?_isPosOccupiedByOtherShulker\@Shulker\@\@AEBA_NVBlockPos\@\@\@Z */ MCAPI bool _isPosOccupiedByOtherShulker(class BlockPos) const; /** - * @symbol ?_isValidAttach\@Shulker\@\@AEAA_NVBlockPos\@\@E\@Z + * @symbol ?_isValidAttach\@Shulker\@\@AEAA_NVBlockPos\@\@E\@Z */ MCAPI bool _isValidAttach(class BlockPos, unsigned char); /** - * @symbol ?_peekAmountTick\@Shulker\@\@AEAAXXZ + * @symbol ?_peekAmountTick\@Shulker\@\@AEAAXXZ */ MCAPI void _peekAmountTick(); /** - * @symbol ?_setAttachFace\@Shulker\@\@AEAAXE\@Z + * @symbol ?_setAttachFace\@Shulker\@\@AEAAXE\@Z */ MCAPI void _setAttachFace(unsigned char); /** - * @symbol ?_tryAttachingToNeighbouringFaces\@Shulker\@\@AEAA_NVBlockPos\@\@\@Z + * @symbol ?_tryAttachingToNeighbouringFaces\@Shulker\@\@AEAA_NVBlockPos\@\@\@Z */ MCAPI bool _tryAttachingToNeighbouringFaces(class BlockPos); /** - * @symbol ?_trySpawnShulker\@Shulker\@\@AEAAXXZ + * @symbol ?_trySpawnShulker\@Shulker\@\@AEAAXXZ */ MCAPI void _trySpawnShulker(); /** - * @symbol ?_tryTeleportSomewhere\@Shulker\@\@AEAA_NXZ + * @symbol ?_tryTeleportSomewhere\@Shulker\@\@AEAA_NXZ */ MCAPI bool _tryTeleportSomewhere(); @@ -344,4 +334,4 @@ class Shulker : public Mob { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp index b022af0118..53301bbc09 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlock.hpp @@ -31,213 +31,218 @@ class ShulkerBoxBlock : public UndyedShulkerBoxBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShulkerBoxBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@ShulkerBoxBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@ShulkerBoxBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 - * @symbol ?getColor\@ShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@ShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 138 - * @symbol ?getColorForParticle\@ShulkerBoxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 138 + * @symbol ?getColorForParticle\@ShulkerBoxBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColorForParticle(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@ShulkerBoxBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0ShulkerBoxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0ShulkerBoxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI ShulkerBoxBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp index cb8fa47041..3f3d964e6d 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockActor.hpp @@ -31,93 +31,93 @@ class ShulkerBoxBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SHULKERBOXBLOCKACTOR /** - * @symbol ?_detectEntityObstruction\@ShulkerBoxBlockActor\@\@MEBA_NAEAVBlockSource\@\@\@Z + * @symbol ?_detectEntityObstruction\@ShulkerBoxBlockActor\@\@MEBA_NAEAVBlockSource\@\@\@Z */ MCVAPI bool _detectEntityObstruction(class BlockSource &) const; /** - * @symbol ?_getUpdatePacket\@ShulkerBoxBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getUpdatePacket\@ShulkerBoxBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); /** - * @symbol ?_onUpdatePacket\@ShulkerBoxBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_onUpdatePacket\@ShulkerBoxBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ?canPushInItem\@ShulkerBoxBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z + * @symbol ?canPushInItem\@ShulkerBoxBlockActor\@\@UEBA_NHHAEBVItemStack\@\@\@Z */ MCVAPI bool canPushInItem(int, int, class ItemStack const &) const; /** - * @symbol ?getMaxStackSize\@ShulkerBoxBlockActor\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@ShulkerBoxBlockActor\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?getName\@ShulkerBoxBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@ShulkerBoxBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; /** - * @symbol ?getObstructionAABB\@ShulkerBoxBlockActor\@\@MEBA?AVAABB\@\@XZ + * @symbol ?getObstructionAABB\@ShulkerBoxBlockActor\@\@MEBA?AVAABB\@\@XZ */ MCVAPI class AABB getObstructionAABB() const; /** - * @symbol ?load\@ShulkerBoxBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@ShulkerBoxBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?onPlace\@ShulkerBoxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?onPlace\@ShulkerBoxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void onPlace(class BlockSource &); /** - * @symbol ?playCloseSound\@ShulkerBoxBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playCloseSound\@ShulkerBoxBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playCloseSound(class BlockSource &); /** - * @symbol ?playOpenSound\@ShulkerBoxBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z + * @symbol ?playOpenSound\@ShulkerBoxBlockActor\@\@MEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void playOpenSound(class BlockSource &); /** - * @symbol ?save\@ShulkerBoxBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @symbol ?save\@ShulkerBoxBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ MCVAPI bool save(class CompoundTag &) const; /** - * @symbol ?tick\@ShulkerBoxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@ShulkerBoxBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ MCVAPI void tick(class BlockSource &); #endif /** - * @symbol ??0ShulkerBoxBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorRendererId\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0ShulkerBoxBlockActor\@\@QEAA\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4BlockActorRendererId\@\@AEBVBlockPos\@\@\@Z */ MCAPI ShulkerBoxBlockActor(enum class BlockActorType, std::string const &, enum class BlockActorRendererId, class BlockPos const &); /** - * @symbol ?setFacingDir\@ShulkerBoxBlockActor\@\@QEAAXE\@Z + * @symbol ?setFacingDir\@ShulkerBoxBlockActor\@\@QEAAXE\@Z */ MCAPI void setFacingDir(unsigned char); /** - * @symbol ?itemAllowed\@ShulkerBoxBlockActor\@\@SA_NAEBVItemStackBase\@\@\@Z + * @symbol ?itemAllowed\@ShulkerBoxBlockActor\@\@SA_NAEBVItemStackBase\@\@\@Z */ MCAPI static bool itemAllowed(class ItemStackBase const &); /** - * @symbol ?itemAllowedInSlot\@ShulkerBoxBlockActor\@\@SA_NHAEBVItemStackBase\@\@H\@Z + * @symbol ?itemAllowedInSlot\@ShulkerBoxBlockActor\@\@SA_NHAEBVItemStackBase\@\@H\@Z */ MCAPI static bool itemAllowedInSlot(int, class ItemStackBase const &, int); //private: /** - * @symbol ?_calculateBB\@ShulkerBoxBlockActor\@\@AEAAXXZ + * @symbol ?_calculateBB\@ShulkerBoxBlockActor\@\@AEAAXXZ */ MCAPI void _calculateBB(); /** - * @symbol ?_calculateMovementWithCollisions\@ShulkerBoxBlockActor\@\@AEBA?AVVec3\@\@AEAVBlockSource\@\@PEAVActor\@\@\@Z + * @symbol ?_calculateMovementWithCollisions\@ShulkerBoxBlockActor\@\@AEBA?AVVec3\@\@AEAVBlockSource\@\@PEAVActor\@\@\@Z */ MCAPI class Vec3 _calculateMovementWithCollisions(class BlockSource &, class Actor *) const; /** - * @symbol ?_moveCollidedEntities\@ShulkerBoxBlockActor\@\@AEBAXAEAVBlockSource\@\@\@Z + * @symbol ?_moveCollidedEntities\@ShulkerBoxBlockActor\@\@AEBAXAEAVBlockSource\@\@\@Z */ MCAPI void _moveCollidedEntities(class BlockSource &) const; private: /** - * @symbol ?ITEMS_SIZE\@ShulkerBoxBlockActor\@\@0HB + * @symbol ?ITEMS_SIZE\@ShulkerBoxBlockActor\@\@0HB */ MCAPI static int const ITEMS_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp index 139b24a9a0..d23e7fd41d 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxBlockItem.hpp @@ -32,106 +32,106 @@ class ShulkerBoxBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShulkerBoxBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@ShulkerBoxBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@ShulkerBoxBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@ShulkerBoxBlockItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@ShulkerBoxBlockItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@ShulkerBoxBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@ShulkerBoxBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 96 - * @symbol ?buildEffectDescriptionName\@ShulkerBoxBlockItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemStackBase\@\@\@Z + * @vftbl 96 + * @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; /** - * @symbol ??0ShulkerBoxBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z + * @symbol ??0ShulkerBoxBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HPEBVBlock\@\@\@Z */ MCAPI ShulkerBoxBlockItem(std::string const &, int, class Block const *); //private: /** - * @symbol ?buildContainedItemList\@ShulkerBoxBlockItem\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?buildContainedItemList\@ShulkerBoxBlockItem\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCompoundTag\@\@\@Z */ MCAPI std::string buildContainedItemList(class CompoundTag const *) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxContainerScreenValidator.hpp index cdda21ef3f..f3bef4dde9 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class ShulkerBoxContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShulkerBoxContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0ShulkerBoxContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0ShulkerBoxContainerScreenValidator\@\@QEAA\@XZ */ MCAPI ShulkerBoxContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxContainerValidation.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxContainerValidation.hpp index 7d0aefc182..26965d4c2d 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxContainerValidation.hpp @@ -31,54 +31,54 @@ class ShulkerBoxContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShulkerBoxContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@ShulkerBoxContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@ShulkerBoxContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getContainerSize\@ShulkerBoxContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ShulkerBoxContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp index 4d7d2edeaa..97783b34c8 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBoxRecipe.hpp @@ -31,27 +31,27 @@ class ShulkerBoxRecipe : public ShapelessRecipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShulkerBoxRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@ShulkerBoxRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @vftbl 11 - * @symbol ?itemsMatch\@ShulkerBoxRecipe\@\@UEBA_NAEBVItemDescriptor\@\@0\@Z + * @vftbl 11 + * @symbol ?itemsMatch\@ShulkerBoxRecipe\@\@UEBA_NAEBVItemDescriptor\@\@0\@Z */ virtual bool itemsMatch(class ItemDescriptor const &, class ItemDescriptor const &) const; /** - * @symbol ??0ShulkerBoxRecipe\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEBV?$vector\@VRecipeIngredient\@\@V?$allocator\@VRecipeIngredient\@\@\@std\@\@\@std\@\@AEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@4\@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\@\@\@Z */ - MCAPI ShulkerBoxRecipe(class gsl::basic_string_span, 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 *); /** - * @symbol ?ID\@ShulkerBoxRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@ShulkerBoxRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerBullet.hpp b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp index f33dd7c465..e15cfb949f 100644 --- a/LiteLoader/include/llapi/mc/ShulkerBullet.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerBullet.hpp @@ -32,148 +32,148 @@ class ShulkerBullet : public PredictableProjectile { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ShulkerBullet\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ShulkerBullet\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ShulkerBullet(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@ShulkerBullet\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@ShulkerBullet\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@ShulkerBullet\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@ShulkerBullet\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 105 - * @symbol ?isOnFire\@ShulkerBullet\@\@UEBA_NXZ + * @vftbl 104 + * @symbol ?isOnFire\@ShulkerBullet\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@ShulkerBullet\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@ShulkerBullet\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ShulkerBullet\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ShulkerBullet\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ShulkerBullet\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ShulkerBullet\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @symbol ??0ShulkerBullet\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ShulkerBullet\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ShulkerBullet(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp b/LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp index 206929410b..78e4d541a2 100644 --- a/LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerPeekGoal.hpp @@ -30,48 +30,48 @@ class ShulkerPeekGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ShulkerPeekGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@ShulkerPeekGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@ShulkerPeekGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@ShulkerPeekGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@ShulkerPeekGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@ShulkerPeekGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@ShulkerPeekGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@ShulkerPeekGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@ShulkerPeekGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@ShulkerPeekGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@ShulkerPeekGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@ShulkerPeekGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@ShulkerPeekGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0ShulkerPeekGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0ShulkerPeekGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI ShulkerPeekGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp b/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp index 9238115705..00401c956a 100644 --- a/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerPostAiStepSystem.hpp @@ -28,16 +28,16 @@ class ShulkerPostAiStepSystem { public: /** - * @symbol ?createSystem\@ShulkerPostAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ShulkerPostAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doShulkerPostAiStepSystem\@ShulkerPostAiStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUActorRotationComponent\@\@AEAUMobBodyRotationComponent\@\@AEAUStateVectorComponent\@\@\@Z + * @symbol ?_doShulkerPostAiStepSystem\@ShulkerPostAiStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAUActorRotationComponent\@\@AEAUMobBodyRotationComponent\@\@AEAUStateVectorComponent\@\@\@Z */ MCAPI static void _doShulkerPostAiStepSystem(class StrictEntityContext const &, struct ActorRotationComponent &, struct MobBodyRotationComponent &, struct StateVectorComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ShulkerPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/ShulkerPostNormalTickSystem.hpp deleted file mode 100644 index 3d9de484b1..0000000000 --- a/LiteLoader/include/llapi/mc/ShulkerPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file ShulkerPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class ShulkerPostNormalTickSystem. - * - */ -class ShulkerPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SHULKERPOSTNORMALTICKSYSTEM -public: - class ShulkerPostNormalTickSystem& operator=(class ShulkerPostNormalTickSystem const &) = delete; - ShulkerPostNormalTickSystem(class ShulkerPostNormalTickSystem const &) = delete; - ShulkerPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@ShulkerPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doShulkerPostNormalTickSystem\@ShulkerPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doShulkerPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp b/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp index 97b2ec02bd..1d65cbb99b 100644 --- a/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/ShulkerUpdatePositionSystem.hpp @@ -28,8 +28,8 @@ class ShulkerUpdatePositionSystem { public: /** - * @symbol ?createShulkerUpdatePositionSystem\@ShulkerUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createShulkerUpdatePositionSystem\@ShulkerUpdatePositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createShulkerUpdatePositionSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySide.hpp b/LiteLoader/include/llapi/mc/SideBySide.hpp index 092f679685..1293d0ccb6 100644 --- a/LiteLoader/include/llapi/mc/SideBySide.hpp +++ b/LiteLoader/include/llapi/mc/SideBySide.hpp @@ -21,24 +21,24 @@ namespace SideBySide { #undef AFTER_EXTRA /** - * @symbol ?GLOBAL_MODE\@SideBySide\@\@3W4GlobalMode\@SideBySideTrigger\@\@A + * @symbol ?GLOBAL_MODE\@SideBySide\@\@3W4GlobalMode\@SideBySideTrigger\@\@A */ MCAPI extern enum class SideBySideTrigger::GlobalMode GLOBAL_MODE; /** - * @symbol ?_collectVehiclesAndPassengersNotInView\@SideBySide\@\@YAXAEBVStrictEntityContext\@\@AEBUSideBySideValidationExceptionComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@AEAV?$vector\@U?$pair\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@\@std\@\@V?$allocator\@U?$pair\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_collectVehiclesAndPassengersNotInView\@SideBySide\@\@YAXAEBVStrictEntityContext\@\@AEBUSideBySideValidationExceptionComponent\@\@AEBV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@AEAV?$vector\@U?$pair\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@\@std\@\@V?$allocator\@U?$pair\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void _collectVehiclesAndPassengersNotInView(class StrictEntityContext const &, struct SideBySideValidationExceptionComponent const &, class ViewT> const &, class ViewT, class ViewT, std::vector> &); /** - * @symbol ?_tryAddFailureComponent\@SideBySide\@\@YAXAEBVStrictEntityContext\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USideBySideValidationFailureComponent\@\@\@\@AEBUSideBySideValidationFailure\@\@\@Z + * @symbol ?_tryAddFailureComponent\@SideBySide\@\@YAXAEBVStrictEntityContext\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USideBySideValidationFailureComponent\@\@\@\@AEBUSideBySideValidationFailure\@\@\@Z */ MCAPI void _tryAddFailureComponent(class StrictEntityContext const &, class EntityModifierT &, struct SideBySideValidationFailure const &); /** - * @symbol ?combineComparison\@SideBySide\@\@YA?AUSideBySidePartialComparison\@\@AEBU2\@0\@Z + * @symbol ?combineComparison\@SideBySide\@\@YA?AUSideBySidePartialComparison\@\@AEBU2\@0\@Z */ MCAPI struct SideBySidePartialComparison combineComparison(struct SideBySidePartialComparison const &, struct SideBySidePartialComparison const &); /** - * @symbol ?tickExceptions\@SideBySide\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@\@\@$$CBUSideBySideValidationExceptionComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideCopyComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideValidationExceptionComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSideBySideCopyComponent\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@V?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + * @symbol ?tickExceptions\@SideBySide\@\@YAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@\@\@$$CBUSideBySideValidationExceptionComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@UUsesSideBySideComparisonComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideCopyComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUPassengerComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideValidationExceptionComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUSideBySideCopyComponent\@\@$$CBUVehicleComponent\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@USideBySideValidationExceptionComponent\@\@USideBySideExceptionVisitedFlagComponent\@\@\@\@V?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z */ - MCAPI void tickExceptions(class ViewT, struct SideBySideValidationExceptionComponent const>, class ViewT>>, class ViewT>, class ViewT, class ViewT, class ViewT, class ViewT, class ViewT, class EntityModifierT, class OptionalGlobalT); + MCAPI void tickExceptions(class ViewT, struct SideBySideValidationExceptionComponent const>, class ViewT>, class ViewT, class ViewT, class ViewT, class ViewT, class ViewT, class EntityModifierT, class OptionalGlobalT); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp index 8e05090669..c05814d8be 100644 --- a/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideComparisonRateSystem.hpp @@ -28,16 +28,16 @@ class SideBySideComparisonRateSystem { public: /** - * @symbol ?createSystem\@SideBySideComparisonRateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SideBySideComparisonRateSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?tick\@SideBySideComparisonRateSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@VActorOwnerComponent\@\@VActorTickNeededComponent\@\@\@\@\@\@V?$OptionalGlobalT\@USideBySideComparisonRateTickComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UUsesSideBySideComparisonComponent\@\@\@\@\@Z + * @symbol ?tick\@SideBySideComparisonRateSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@VActorOwnerComponent\@\@VActorTickNeededComponent\@\@\@\@\@\@V?$OptionalGlobalT\@USideBySideComparisonRateTickComponent\@\@VEntityRegistryBase\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UUsesSideBySideComparisonComponent\@\@\@\@\@Z */ MCAPI static void tick(class ViewT>, class OptionalGlobalT, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp index 8b1a8c6971..802ac1dd7d 100644 --- a/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideComparisonSystem.hpp @@ -28,12 +28,12 @@ class SideBySideComparisonSystem { public: /** - * @symbol ?createSideBySideComparisonSystem\@SideBySideComparisonSystem\@\@SA?AUTickingSystemWithInfo\@\@W4SideBySideExtractionId\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z + * @symbol ?createSideBySideComparisonSystem\@SideBySideComparisonSystem\@\@SA?AUTickingSystemWithInfo\@\@W4SideBySideExtractionId\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z */ MCAPI static struct TickingSystemWithInfo createSideBySideComparisonSystem(enum class SideBySideExtractionId, std::vector const &); /** - * @symbol ?createSideBySideExceptionSystems\@SideBySideComparisonSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$01\@std\@\@XZ + * @symbol ?createSideBySideExceptionSystems\@SideBySideComparisonSystem\@\@SA?AV?$array\@UTickingSystemWithInfo\@\@$01\@std\@\@XZ */ MCAPI static class std::array createSideBySideExceptionSystems(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp b/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp index 0f0e5ecd01..df10643f8b 100644 --- a/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideConstBlockSource.hpp @@ -28,126 +28,126 @@ class SideBySideConstBlockSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SideBySideConstBlockSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z + * @vftbl 1 + * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@HHH\@Z */ virtual class Block const & getBlock(int, int, int) const; /** - * @vftbl 2 - * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 2 + * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlock(class BlockPos const &) const; /** - * @vftbl 3 - * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z + * @vftbl 3 + * @symbol ?getBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@I\@Z */ virtual class Block const & getBlock(class BlockPos const &, unsigned int) const; /** - * @vftbl 4 - * @symbol ?getBlockEntity\@SideBySideConstBlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?getBlockEntity\@SideBySideConstBlockSource\@\@UEBAPEBVBlockActor\@\@AEBVBlockPos\@\@\@Z */ virtual class BlockActor const * getBlockEntity(class BlockPos const &) const; /** - * @vftbl 5 - * @symbol ?getExtraBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?getExtraBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getExtraBlock(class BlockPos const &) const; /** - * @vftbl 6 - * @symbol ?getLiquidBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 6 + * @symbol ?getLiquidBlock\@SideBySideConstBlockSource\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getLiquidBlock(class BlockPos const &) const; /** - * @vftbl 7 - * @symbol ?hasBlock\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z + * @vftbl 7 + * @symbol ?hasBlock\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@\@Z */ virtual bool hasBlock(class BlockPos const &) const; /** - * @vftbl 8 - * @symbol ?containsAnyLiquid\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@\@Z + * @vftbl 8 + * @symbol ?containsAnyLiquid\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@\@Z */ virtual bool containsAnyLiquid(class AABB const &) const; /** - * @vftbl 9 - * @symbol ?containsMaterial\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z + * @vftbl 9 + * @symbol ?containsMaterial\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@W4MaterialType\@\@\@Z */ virtual bool containsMaterial(class AABB const &, enum class MaterialType) const; /** - * @vftbl 10 - * @symbol ?getMaterial\@SideBySideConstBlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z + * @vftbl 10 + * @symbol ?getMaterial\@SideBySideConstBlockSource\@\@UEBAAEBVMaterial\@\@AEBVBlockPos\@\@\@Z */ virtual class Material const & getMaterial(class BlockPos const &) const; /** - * @vftbl 11 - * @symbol ?getMaterial\@SideBySideConstBlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z + * @vftbl 11 + * @symbol ?getMaterial\@SideBySideConstBlockSource\@\@UEBAAEBVMaterial\@\@HHH\@Z */ virtual class Material const & getMaterial(int, int, int) const; /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol ?getDimensionId\@SideBySideConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @vftbl 15 + * @symbol ?getDimensionId\@SideBySideConstBlockSource\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ virtual class AutomaticID getDimensionId() const; /** - * @vftbl 16 - * @symbol ?fetchAABBs\@SideBySideConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z + * @vftbl 16 + * @symbol ?fetchAABBs\@SideBySideConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@_N\@Z */ virtual void fetchAABBs(std::vector &, class AABB const &, bool) const; /** - * @vftbl 17 - * @symbol ?fetchCollisionShapes\@SideBySideConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 17 + * @symbol ?fetchCollisionShapes\@SideBySideConstBlockSource\@\@UEBAXAEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@AEBVAABB\@\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual void fetchCollisionShapes(std::vector &, class AABB const &, float *, bool, class optional_ref) const; /** - * @vftbl 18 - * @symbol ?getTallestCollisionShape\@SideBySideConstBlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 18 + * @symbol ?getTallestCollisionShape\@SideBySideConstBlockSource\@\@UEBA?AVAABB\@\@AEBV2\@PEAM_NV?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual class AABB getTallestCollisionShape(class AABB const &, float *, bool, class optional_ref) const; /** - * @vftbl 19 - * @symbol ?getBrightness\@SideBySideConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z + * @vftbl 19 + * @symbol ?getBrightness\@SideBySideConstBlockSource\@\@UEBAMAEBVBlockPos\@\@\@Z */ virtual float getBrightness(class BlockPos const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIDEBYSIDECONSTBLOCKSOURCE /** - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z + * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBUBounds\@\@_N\@Z */ MCVAPI bool hasChunksAt(struct Bounds const &, bool) const; /** - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z + * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVAABB\@\@_N\@Z */ MCVAPI bool hasChunksAt(class AABB const &, bool) const; /** - * @symbol ?hasChunksAt\@SideBySideConstBlockSource\@\@UEBA_NAEBVBlockPos\@\@H_N\@Z + * @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 + * @symbol ??0SideBySideConstBlockSource\@\@QEAA\@V?$not_null\@PEBUAccessedBlockSourceBlocks\@\@\@gsl\@\@_K\@Z */ MCAPI SideBySideConstBlockSource(class gsl::not_null, unsigned __int64); /** - * @symbol ?getCurrentIndex\@SideBySideConstBlockSource\@\@QEBA_KXZ + * @symbol ?getCurrentIndex\@SideBySideConstBlockSource\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCurrentIndex() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp index 83d4d90d1c..490823fd16 100644 --- a/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideCopyComponent.hpp @@ -28,15 +28,15 @@ struct SideBySideCopyComponent { public: /** - * @symbol ??0SideBySideCopyComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SideBySideCopyComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SideBySideCopyComponent(struct SideBySideCopyComponent &&); /** - * @symbol ??4SideBySideCopyComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SideBySideCopyComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SideBySideCopyComponent & operator=(struct SideBySideCopyComponent &&); /** - * @symbol ??1SideBySideCopyComponent\@\@QEAA\@XZ + * @symbol ??1SideBySideCopyComponent\@\@QEAA\@XZ */ MCAPI ~SideBySideCopyComponent(); diff --git a/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp index e1ded6ad85..1cdd23c402 100644 --- a/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideCrossEntityRemapSystem.hpp @@ -28,16 +28,16 @@ class SideBySideCrossEntityRemapSystem { public: /** - * @symbol ?_remapContext\@SideBySideCrossEntityRemapSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUSideBySideRemappingComponent\@\@\@Z + * @symbol ?_remapContext\@SideBySideCrossEntityRemapSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUSideBySideRemappingComponent\@\@\@Z */ MCAPI static void _remapContext(class StrictEntityContext &, struct SideBySideRemappingComponent const &); //private: /** - * @symbol ?_removeNullStrictActorIDEntityContextPairs\@SideBySideCrossEntityRemapSystem\@\@CAXAEAV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_removeNullStrictActorIDEntityContextPairs\@SideBySideCrossEntityRemapSystem\@\@CAXAEAV?$vector\@UStrictActorIDEntityContextPair\@\@V?$allocator\@UStrictActorIDEntityContextPair\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void _removeNullStrictActorIDEntityContextPairs(std::vector &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideEntityInsideBlocksComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideEntityInsideBlocksComponent.hpp deleted file mode 100644 index ca6a0a108e..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideEntityInsideBlocksComponent.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file SideBySideEntityInsideBlocksComponent.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideEntityInsideBlocksComponent. - * - */ -struct SideBySideEntityInsideBlocksComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEENTITYINSIDEBLOCKSCOMPONENT -public: - struct SideBySideEntityInsideBlocksComponent& operator=(struct SideBySideEntityInsideBlocksComponent const &) = delete; - SideBySideEntityInsideBlocksComponent() = delete; -#endif - -public: - /** - * @symbol ??0SideBySideEntityInsideBlocksComponent@@QEAA@AEBU0@@Z - * @hash 289887125 - */ - MCAPI SideBySideEntityInsideBlocksComponent(struct SideBySideEntityInsideBlocksComponent const &); - /** - * @symbol ??4SideBySideEntityInsideBlocksComponent@@QEAAAEAU0@$$QEAU0@@Z - * @hash 666152134 - */ - MCAPI struct SideBySideEntityInsideBlocksComponent & operator=(struct SideBySideEntityInsideBlocksComponent &&); - /** - * @symbol ??1SideBySideEntityInsideBlocksComponent@@QEAA@XZ - * @hash -972922705 - */ - MCAPI ~SideBySideEntityInsideBlocksComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp b/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp index 2ae964001f..29d98fcbd8 100644 --- a/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideErrorHandling.hpp @@ -20,7 +20,7 @@ namespace SideBySideErrorHandling { #undef AFTER_EXTRA /** - * @symbol ?createSideBySideErrorHandlingSystem\@SideBySideErrorHandling\@\@YA?AUTickingSystemWithInfo\@\@W4ErrorLevel\@1\@_N\@Z + * @symbol ?createSideBySideErrorHandlingSystem\@SideBySideErrorHandling\@\@YA?AUTickingSystemWithInfo\@\@W4ErrorLevel\@1\@_N\@Z */ MCAPI struct TickingSystemWithInfo createSideBySideErrorHandlingSystem(enum class SideBySideErrorHandling::ErrorLevel, bool); diff --git a/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp b/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp index 65434f0f97..2324fdd4c4 100644 --- a/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideExtractionIdExt.hpp @@ -20,15 +20,11 @@ namespace SideBySideExtractionIdExt { #undef AFTER_EXTRA /** - * @symbol ?isIdOutOfOrder\@SideBySideExtractionIdExt\@\@YA_NAEBW4SideBySideExtractionId\@\@\@Z - */ - MCAPI bool isIdOutOfOrder(enum class SideBySideExtractionId const &); - /** - * @symbol ?shouldReportErrorsForId\@SideBySideExtractionIdExt\@\@YA_NAEBW4SideBySideExtractionId\@\@\@Z + * @symbol ?shouldReportErrorsForId\@SideBySideExtractionIdExt\@\@YA_NAEBW4SideBySideExtractionId\@\@\@Z */ MCAPI bool shouldReportErrorsForId(enum class SideBySideExtractionId const &); /** - * @symbol ?toString\@SideBySideExtractionIdExt\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4SideBySideExtractionId\@\@\@Z + * @symbol ?toString\@SideBySideExtractionIdExt\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBW4SideBySideExtractionId\@\@\@Z */ MCAPI std::string toString(enum class SideBySideExtractionId const &); diff --git a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp index 406e5edf55..4fd190fa4e 100644 --- a/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideExtractionSystem.hpp @@ -29,26 +29,26 @@ class SideBySideExtractionSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SideBySideExtractionSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?registerEvents\@SideBySideExtractionSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z + * @vftbl 1 + * @symbol ?registerEvents\@SideBySideExtractionSystem\@\@UEAAXAEAV?$basic_dispatcher\@V?$allocator\@X\@std\@\@\@entt\@\@\@Z */ virtual void registerEvents(class entt::basic_dispatcher> &); /** - * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0BI\@\@std\@\@\@Z + * @symbol ??0SideBySideExtractionSystem\@\@QEAA\@AEBV?$array\@V?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@$0BJ\@\@std\@\@\@Z */ - MCAPI SideBySideExtractionSystem(class std::array, 24> const &); + MCAPI SideBySideExtractionSystem(class std::array, 25> const &); /** - * @symbol ?_onSideBySideExtractionRequest\@SideBySideExtractionSystem\@\@SAXAEBUExtractMethods\@SideBySide\@\@AEBUOnExtractSideBySide\@\@\@Z + * @symbol ?_onSideBySideExtractionRequest\@SideBySideExtractionSystem\@\@SAXAEBUExtractMethods\@SideBySide\@\@AEBUOnExtractSideBySide\@\@\@Z */ MCAPI static void _onSideBySideExtractionRequest(struct SideBySide::ExtractMethods const &, struct OnExtractSideBySide const &); /** - * @symbol ?onStoreSideBySideResult\@SideBySideExtractionSystem\@\@SAXAEBUOnStoreSideBySideResult\@\@\@Z + * @symbol ?onStoreSideBySideResult\@SideBySideExtractionSystem\@\@SAXAEBUOnStoreSideBySideResult\@\@\@Z */ MCAPI static void onStoreSideBySideResult(struct OnStoreSideBySideResult const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp index 6cf3ebc177..f35e1d6434 100644 --- a/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideFetchCollisionShapesComponent.hpp @@ -28,7 +28,7 @@ struct SideBySideFetchCollisionShapesComponent { public: /** - * @symbol ??1SideBySideFetchCollisionShapesComponent\@\@QEAA\@XZ + * @symbol ??1SideBySideFetchCollisionShapesComponent\@\@QEAA\@XZ */ MCAPI ~SideBySideFetchCollisionShapesComponent(); diff --git a/LiteLoader/include/llapi/mc/SideBySideLiquidSensingComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideLiquidSensingComponent.hpp deleted file mode 100644 index 7faec4ae3f..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideLiquidSensingComponent.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file SideBySideLiquidSensingComponent.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure SideBySideLiquidSensingComponent. - * - */ -struct SideBySideLiquidSensingComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDELIQUIDSENSINGCOMPONENT -public: - struct SideBySideLiquidSensingComponent& operator=(struct SideBySideLiquidSensingComponent const &) = delete; - SideBySideLiquidSensingComponent() = delete; -#endif - -public: - /** - * @symbol ??0SideBySideLiquidSensingComponent@@QEAA@AEBU0@@Z - * @hash -451273521 - */ - MCAPI SideBySideLiquidSensingComponent(struct SideBySideLiquidSensingComponent const &); - /** - * @symbol ??4SideBySideLiquidSensingComponent@@QEAAAEAU0@$$QEAU0@@Z - * @hash 1079175194 - */ - MCAPI struct SideBySideLiquidSensingComponent & operator=(struct SideBySideLiquidSensingComponent &&); - /** - * @symbol ??1SideBySideLiquidSensingComponent@@QEAA@XZ - * @hash -413561859 - */ - MCAPI ~SideBySideLiquidSensingComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp b/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp index 98b1c6ea65..1d6b1ae2d2 100644 --- a/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideMigrationSystemImpl.hpp @@ -28,4 +28,4 @@ class SideBySideMigrationSystemImpl { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideMoveSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideMoveSystem.hpp deleted file mode 100644 index f9b47656ee..0000000000 --- a/LiteLoader/include/llapi/mc/SideBySideMoveSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SideBySideMoveSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SideBySideMoveSystem. - * - */ -class SideBySideMoveSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SIDEBYSIDEMOVESYSTEM -public: - class SideBySideMoveSystem& operator=(class SideBySideMoveSystem const &) = delete; - SideBySideMoveSystem(class SideBySideMoveSystem const &) = delete; - SideBySideMoveSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@SideBySideMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp b/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp index 33675c15b3..fa77db5745 100644 --- a/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp +++ b/LiteLoader/include/llapi/mc/SideBySidePartialComparison.hpp @@ -27,19 +27,19 @@ struct SideBySidePartialComparison { public: /** - * @symbol ??0SideBySidePartialComparison\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SideBySidePartialComparison\@\@QEAA\@AEBU0\@\@Z */ MCAPI SideBySidePartialComparison(struct SideBySidePartialComparison const &); /** - * @symbol ??4SideBySidePartialComparison\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SideBySidePartialComparison\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SideBySidePartialComparison & operator=(struct SideBySidePartialComparison &&); /** - * @symbol ?combine\@SideBySidePartialComparison\@\@SA?AV?$optional\@V?$tuple\@P6A_NAEBUAABBShapeComponent\@\@0\@ZP6A_NAEBUActorRotationComponent\@\@1\@ZP6A_NAEBUInsideBlockComponent\@\@2\@ZP6A_NAEBUPassengerComponent\@\@3\@ZP6A_NAEBUPendingRemovePassengersComponent\@\@4\@ZP6A_NAEBUPostTickPositionDeltaComponent\@\@5\@ZP6A_NAEBURenderPositionComponent\@\@6\@ZP6A_NAEBURidingPrevIDComponent\@\@7\@ZP6A_NAEBUStateVectorComponent\@\@8\@ZP6A_NAEBUVehicleComponent\@\@9\@Z\@std\@\@\@std\@\@AEBV23\@0_N\@Z + * @symbol ?combine\@SideBySidePartialComparison\@\@SA?AV?$optional\@V?$tuple\@P6A_NAEBUAABBShapeComponent\@\@0\@ZP6A_NAEBUActorRotationComponent\@\@1\@ZP6A_NAEBUInsideBlockComponent\@\@2\@ZP6A_NAEBUPassengerComponent\@\@3\@ZP6A_NAEBUPendingRemovePassengersComponent\@\@4\@ZP6A_NAEBUPostTickPositionDeltaComponent\@\@5\@ZP6A_NAEBURenderPositionComponent\@\@6\@ZP6A_NAEBURidingPrevIDComponent\@\@7\@ZP6A_NAEBUStateVectorComponent\@\@8\@ZP6A_NAEBUVehicleComponent\@\@9\@Z\@std\@\@\@std\@\@AEBV23\@0_N\@Z */ MCAPI static class std::optional> combine(class std::optional> const &, class std::optional> const &, bool); /** - * @symbol ?createPartialVehicleComparison\@SideBySidePartialComparison\@\@SA?AU1\@XZ + * @symbol ?createPartialVehicleComparison\@SideBySidePartialComparison\@\@SA?AU1\@XZ */ MCAPI static struct SideBySidePartialComparison createPartialVehicleComparison(); diff --git a/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp b/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp index da82ae3dfd..b736af7605 100644 --- a/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySidePlaybackBlocksComponent.hpp @@ -22,20 +22,17 @@ 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 + * @symbol ??4SideBySidePlaybackBlocksComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SideBySidePlaybackBlocksComponent & operator=(struct SideBySidePlaybackBlocksComponent &&); /** - * @symbol ??1SideBySidePlaybackBlocksComponent\@\@QEAA\@XZ + * @symbol ??1SideBySidePlaybackBlocksComponent\@\@QEAA\@XZ */ MCAPI ~SideBySidePlaybackBlocksComponent(); diff --git a/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp b/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp index a7096d1af1..fad477ce16 100644 --- a/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySidePostComparisonSystem.hpp @@ -28,8 +28,8 @@ class SideBySidePostComparisonSystem { public: /** - * @symbol ?createSideBySideCleanupCopyComponentSystem\@SideBySidePostComparisonSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySideCleanupCopyComponentSystem\@SideBySidePostComparisonSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySideCleanupCopyComponentSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideResult.hpp b/LiteLoader/include/llapi/mc/SideBySideResult.hpp index 6ee56d0ccf..336951fabc 100644 --- a/LiteLoader/include/llapi/mc/SideBySideResult.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideResult.hpp @@ -28,11 +28,11 @@ struct SideBySideResult { public: /** - * @symbol ??0SideBySideResult\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SideBySideResult\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SideBySideResult(struct SideBySideResult &&); /** - * @symbol ??1SideBySideResult\@\@QEAA\@XZ + * @symbol ??1SideBySideResult\@\@QEAA\@XZ */ MCAPI ~SideBySideResult(); diff --git a/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp index ef7ef13e8c..a68dc219a1 100644 --- a/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideResultComponent.hpp @@ -28,11 +28,11 @@ struct SideBySideResultComponent { public: /** - * @symbol ??4SideBySideResultComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SideBySideResultComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SideBySideResultComponent & operator=(struct SideBySideResultComponent &&); /** - * @symbol ??1SideBySideResultComponent\@\@QEAA\@XZ + * @symbol ??1SideBySideResultComponent\@\@QEAA\@XZ */ MCAPI ~SideBySideResultComponent(); diff --git a/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp index 9f8418279a..f724dc09fb 100644 --- a/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideSimulatorComponent.hpp @@ -28,7 +28,7 @@ struct SideBySideSimulatorComponent { public: /** - * @symbol ??1SideBySideSimulatorComponent\@\@QEAA\@XZ + * @symbol ??1SideBySideSimulatorComponent\@\@QEAA\@XZ */ MCAPI ~SideBySideSimulatorComponent(); diff --git a/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp b/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp index d7929aa010..f47239ef0b 100644 --- a/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideSimulatorSystem.hpp @@ -28,36 +28,36 @@ class SideBySideSimulatorSystem { public: /** - * @symbol ?_clearRemappings\@SideBySideSimulatorSystem\@\@SAXV?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + * @symbol ?_clearRemappings\@SideBySideSimulatorSystem\@\@SAXV?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z */ MCAPI static void _clearRemappings(class OptionalGlobalT); /** - * @symbol ?createBegin\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createBegin\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createBegin(); /** - * @symbol ?createClearRemappingsSystem\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createClearRemappingsSystem\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createClearRemappingsSystem(); /** - * @symbol ?createEnd\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createEnd\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createEnd(); /** - * @symbol ?createMigrator\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@W4SideBySideExtractionId\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z + * @symbol ?createMigrator\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@W4SideBySideExtractionId\@\@AEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@\@Z */ MCAPI static struct TickingSystemWithInfo createMigrator(enum class SideBySideExtractionId, std::vector const &); /** - * @symbol ?createSideBySideResultMigratorSystem\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySideResultMigratorSystem\@SideBySideSimulatorSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySideResultMigratorSystem(); /** - * @symbol ?tickBegin\@SideBySideSimulatorSystem\@\@SAXVEntityFactory\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@USideBySideSimulatorComponent\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@V?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + * @symbol ?tickBegin\@SideBySideSimulatorSystem\@\@SAXVEntityFactory\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@USideBySideSimulatorComponent\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@V?$OptionalGlobalT\@USideBySideRemappingComponent\@\@VEntityRegistryBase\@\@\@\@\@Z */ MCAPI static void tickBegin(class EntityFactory, class EntityModifierT, struct SideBySideSimulatorComponent, class FlagComponent>, class OptionalGlobalT); /** - * @symbol ?tickEnd\@SideBySideSimulatorSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideSimulatorComponent\@\@\@\@VEntityFactory\@\@\@Z + * @symbol ?tickEnd\@SideBySideSimulatorSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@USideBySideSimulatorComponent\@\@\@\@VEntityFactory\@\@\@Z */ MCAPI static void tickEnd(class ViewT, class EntityFactory); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp index f3ec192e56..9059c66465 100644 --- a/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideTrigger.hpp @@ -28,64 +28,56 @@ class SideBySideTrigger { public: /** - * @symbol ?flagUnsupportedComparisonFrame\@SideBySideTrigger\@\@SAXAEAUIActorMovementProxy\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEAUSideBySidePartialComparison\@\@\@Z + * @symbol ?flagUnsupportedComparisonFrame\@SideBySideTrigger\@\@SAXAEAVActor\@\@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 *); + MCAPI static void flagUnsupportedComparisonFrame(class Actor &, class std::basic_string_view>, struct SideBySidePartialComparison *); /** - * @symbol ?flagUnsupportedComparisonFrame\@SideBySideTrigger\@\@SAXAEAVActor\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEAUSideBySidePartialComparison\@\@\@Z + * @symbol ?flagUnsupportedComparisonFrame\@SideBySideTrigger\@\@SAXAEAUIActorMovementProxy\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@PEAUSideBySidePartialComparison\@\@\@Z */ - MCAPI static void flagUnsupportedComparisonFrame(class Actor &, class std::basic_string_view>, struct SideBySidePartialComparison *); + MCAPI static void flagUnsupportedComparisonFrame(struct IActorMovementProxy &, class std::basic_string_view>, struct SideBySidePartialComparison *); /** - * @symbol ?isTriggered\@SideBySideTrigger\@\@SA_NAEAVActor\@\@W4SideBySideExtractionId\@\@\@Z + * @symbol ?isTriggered\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z */ - MCAPI static bool isTriggered(class Actor &, enum class SideBySideExtractionId); + MCAPI static bool isTriggered(struct IActorMovementProxy &, enum class SideBySideExtractionId); /** - * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z + * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@\@Z */ MCAPI static bool shouldSimulateLegacy(struct IActorMovementProxy const &, enum class SideBySideExtractionId); /** - * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBVActor\@\@W4SideBySideExtractionId\@\@\@Z + * @symbol ?shouldSimulateLegacy\@SideBySideTrigger\@\@SA_NAEBVActor\@\@W4SideBySideExtractionId\@\@\@Z */ MCAPI static bool shouldSimulateLegacy(class Actor const &, enum class SideBySideExtractionId); /** - * @symbol ?storeSideBySideResult\@SideBySideTrigger\@\@SAXAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@USideBySideResult\@\@\@Z + * @symbol ?storeSideBySideResult\@SideBySideTrigger\@\@SAXAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@USideBySideResult\@\@\@Z */ MCAPI static void storeSideBySideResult(struct IActorMovementProxy &, enum class SideBySideExtractionId, struct SideBySideResult); /** - * @symbol ?storeSideBySideResult\@SideBySideTrigger\@\@SAXAEAVActor\@\@W4SideBySideExtractionId\@\@USideBySideResult\@\@\@Z + * @symbol ?storeSideBySideResult\@SideBySideTrigger\@\@SAXAEAVActor\@\@W4SideBySideExtractionId\@\@USideBySideResult\@\@\@Z */ MCAPI static void storeSideBySideResult(class Actor &, enum class SideBySideExtractionId, struct SideBySideResult); /** - * @symbol ?tryRecordBlockSource\@SideBySideTrigger\@\@SA?AVConditionalRecordingConstBlockSource\@\@_NV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z + * @symbol ?tryRecordBlockSource\@SideBySideTrigger\@\@SA?AVConditionalRecordingConstBlockSource\@\@_NV?$not_null\@PEBVIConstBlockSource\@\@\@gsl\@\@\@Z */ MCAPI static class ConditionalRecordingConstBlockSource tryRecordBlockSource(bool, class gsl::not_null); /** - * @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 + * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAVActor\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z */ MCAPI static bool tryTrigger(class Actor &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); /** - * @symbol ?tryTriggerCurrentPostSimulation\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@\@Z - */ - MCAPI static bool tryTriggerCurrentPostSimulation(struct IActorMovementProxy &, class std::optional); - /** - * @symbol ?tryTriggerCurrentPostSimulation\@SideBySideTrigger\@\@SA_NAEAVActor\@\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@\@Z + * @symbol ?tryTrigger\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@W4SideBySideExtractionId\@\@W4SideBySideExtractionStep\@\@\@Z */ - MCAPI static bool tryTriggerCurrentPostSimulation(class Actor &, class std::optional); + MCAPI static bool tryTrigger(struct IActorMovementProxy &, enum class SideBySideExtractionId, enum class SideBySideExtractionStep); /** - * @symbol ?usesEcsMovement\@SideBySideTrigger\@\@SA_NAEBUIActorMovementProxy\@\@\@Z + * @symbol ?tryTriggerCurrentPostSimulation\@SideBySideTrigger\@\@SA_NAEAUIActorMovementProxy\@\@V?$optional\@W4SideBySideExtractionId\@\@\@std\@\@\@Z */ - MCAPI static bool usesEcsMovement(struct IActorMovementProxy const &); + MCAPI static bool tryTriggerCurrentPostSimulation(struct IActorMovementProxy &, class std::optional); //private: /** - * @symbol ?_setGlobalMode\@SideBySideTrigger\@\@CAXW4GlobalMode\@1\@\@Z + * @symbol ?_setGlobalMode\@SideBySideTrigger\@\@CAXW4GlobalMode\@1\@\@Z */ MCAPI static void _setGlobalMode(enum class SideBySideTrigger::GlobalMode); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp index 43c990e82a..8d9e44f2c0 100644 --- a/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideValidationExceptionComponent.hpp @@ -27,11 +27,11 @@ struct SideBySideValidationExceptionComponent { public: /** - * @symbol ??0SideBySideValidationExceptionComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SideBySideValidationExceptionComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SideBySideValidationExceptionComponent(struct SideBySideValidationExceptionComponent &&); /** - * @symbol ??0SideBySideValidationExceptionComponent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SideBySideValidationExceptionComponent\@\@QEAA\@AEBU0\@\@Z */ MCAPI SideBySideValidationExceptionComponent(struct SideBySideValidationExceptionComponent const &); diff --git a/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp b/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp index de4a79d1d3..2b139254cf 100644 --- a/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideValidationFailure.hpp @@ -28,15 +28,15 @@ struct SideBySideValidationFailure { public: /** - * @symbol ?generateMessage\@SideBySideValidationFailure\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N00AEBV23\@AEBVVec3\@\@\@Z + * @symbol ?generateMessage\@SideBySideValidationFailure\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N00AEBV23\@AEBVVec3\@\@\@Z */ MCAPI std::string generateMessage(bool, bool, bool, std::string const &, class Vec3 const &) const; /** - * @symbol ??1SideBySideValidationFailure\@\@QEAA\@XZ + * @symbol ??1SideBySideValidationFailure\@\@QEAA\@XZ */ MCAPI ~SideBySideValidationFailure(); /** - * @symbol ?toString\@SideBySideValidationFailure\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4FailureReason\@1\@\@Z + * @symbol ?toString\@SideBySideValidationFailure\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4FailureReason\@1\@\@Z */ MCAPI static std::string toString(enum class SideBySideValidationFailure::FailureReason); diff --git a/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp b/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp index 76b7388829..7b219547c6 100644 --- a/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp +++ b/LiteLoader/include/llapi/mc/SideBySideValidationFailureComponent.hpp @@ -28,7 +28,7 @@ struct SideBySideValidationFailureComponent { public: /** - * @symbol ??1SideBySideValidationFailureComponent\@\@QEAA\@XZ + * @symbol ??1SideBySideValidationFailureComponent\@\@QEAA\@XZ */ MCAPI ~SideBySideValidationFailureComponent(); diff --git a/LiteLoader/include/llapi/mc/SidePoweredComponent.hpp b/LiteLoader/include/llapi/mc/SidePoweredComponent.hpp index 8537905ac7..beb8d59079 100644 --- a/LiteLoader/include/llapi/mc/SidePoweredComponent.hpp +++ b/LiteLoader/include/llapi/mc/SidePoweredComponent.hpp @@ -30,53 +30,59 @@ class SidePoweredComponent : public ProducerComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SidePoweredComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?canConsumePowerAnyDirection\@SidePoweredComponent\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?canConsumePowerAnyDirection\@SidePoweredComponent\@\@UEBA_NXZ */ virtual bool canConsumePowerAnyDirection() const; /** - * @vftbl 7 - * @symbol ?canConsumerPower\@SidePoweredComponent\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?canConsumerPower\@SidePoweredComponent\@\@UEBA_NXZ */ virtual bool canConsumerPower() const; /** - * @vftbl 10 - * @symbol ?removeSource\@SidePoweredComponent\@\@UEAA_NAEBVBlockPos\@\@PEBVBaseCircuitComponent\@\@\@Z + * @vftbl 10 + * @symbol ?removeSource\@SidePoweredComponent\@\@UEAAXAEBVBlockPos\@\@PEBVBaseCircuitComponent\@\@\@Z */ - virtual bool removeSource(class BlockPos const &, class BaseCircuitComponent const *); + virtual void removeSource(class BlockPos const &, class BaseCircuitComponent const *); /** - * @vftbl 12 - * @symbol ?allowConnection\@SidePoweredComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@SidePoweredComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 22 - * @symbol ?removeFromAnySourceList\@SidePoweredComponent\@\@MEAA_NPEBVBaseCircuitComponent\@\@\@Z + * @vftbl 22 + * @symbol ?removeFromAnySourceList\@SidePoweredComponent\@\@MEAAXPEBVBaseCircuitComponent\@\@\@Z */ - virtual bool removeFromAnySourceList(class BaseCircuitComponent const *); + virtual void removeFromAnySourceList(class BaseCircuitComponent const *); /** - * @vftbl 25 - * @symbol ?getPoweroutDirection\@SidePoweredComponent\@\@UEBAEXZ + * @vftbl 25 + * @symbol ?getPoweroutDirection\@SidePoweredComponent\@\@UEBAEXZ */ virtual unsigned char getPoweroutDirection() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIDEPOWEREDCOMPONENT /** - * @symbol ?addToSideComponents\@SidePoweredComponent\@\@QEAAXAEAV?$_Vector_iterator\@V?$_Vector_val\@U?$_Simple_types\@VItem\@CircuitComponentList\@\@\@std\@\@\@std\@\@\@std\@\@PEAVBaseCircuitComponent\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SidePoweredComponent(); +#endif + /** + * @symbol ?addToSideComponents\@SidePoweredComponent\@\@QEAAXAEAV?$_Vector_iterator\@V?$_Vector_val\@U?$_Simple_types\@VItem\@CircuitComponentList\@\@\@std\@\@\@std\@\@\@std\@\@PEAVBaseCircuitComponent\@\@\@Z */ MCAPI void addToSideComponents(class std::_Vector_iterator>> &, class BaseCircuitComponent *); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SignBlock.hpp b/LiteLoader/include/llapi/mc/SignBlock.hpp index 8cd1396dc8..9145e87a81 100644 --- a/LiteLoader/include/llapi/mc/SignBlock.hpp +++ b/LiteLoader/include/llapi/mc/SignBlock.hpp @@ -32,258 +32,263 @@ class SignBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SignBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@SignBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@SignBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@SignBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SignBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@SignBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@SignBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@SignBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 194 + * @symbol ?getEntityResourceItem\@SignBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; /** - * @vftbl 194 - * @symbol ?_canSurvive\@SignBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 195 + * @symbol ?_canSurvive\@SignBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool _canSurvive(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 195 - * @symbol ?_getItemInstance\@SignBlock\@\@MEBA?AVItemInstance\@\@XZ + * @vftbl 196 + * @symbol ?_getItemInstance\@SignBlock\@\@MEBA?AVItemInstance\@\@XZ */ virtual class ItemInstance _getItemInstance() const; /** - * @vftbl 196 - * @symbol ?_getShape\@SignBlock\@\@MEBAXHAEAVAABB\@\@\@Z + * @vftbl 197 + * @symbol ?_getShape\@SignBlock\@\@MEBAXHAEAVAABB\@\@\@Z */ virtual void _getShape(int, class AABB &) const; /** - * @symbol ??0SignBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4SignType\@SignBlockActor\@\@\@Z + * @symbol ??0SignBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NW4SignType\@SignBlockActor\@\@\@Z */ MCAPI SignBlock(std::string const &, int, bool, enum class SignBlockActor::SignType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SignBlockActor.hpp b/LiteLoader/include/llapi/mc/SignBlockActor.hpp index 7f609015dc..607b92149b 100644 --- a/LiteLoader/include/llapi/mc/SignBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SignBlockActor.hpp @@ -33,120 +33,146 @@ enum class SignType; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SignBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SignBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SignBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@SignBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@SignBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 8 - * @symbol ?onChanged\@SignBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@SignBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getShadowRadius\@SignBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z + * @vftbl 19 + * @symbol ?getShadowRadius\@SignBlockActor\@\@UEBAMAEAVBlockSource\@\@\@Z */ virtual float getShadowRadius(class BlockSource &) const; /** - * @vftbl 28 - * @symbol ?getImmersiveReaderText\@SignBlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 28 + * @symbol ?getImmersiveReaderText\@SignBlockActor\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVBlockSource\@\@\@Z */ virtual std::string getImmersiveReaderText(class BlockSource &); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@SignBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@SignBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@SignBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNBLOCKACTOR /** - * @symbol ??0SignBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SignBlockActor(); +#endif + /** + * @symbol ??0SignBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4BlockActorType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI SignBlockActor(class BlockPos const &, enum class BlockActorType, std::string const &); /** - * @symbol ?getMessage\@SignBlockActor\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getMessage\@SignBlockActor\@\@QEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getMessage(); /** - * @symbol ?getSignTextColor\@SignBlockActor\@\@QEBAAEBVColor\@mce\@\@XZ + * @symbol ?getSignTextColor\@SignBlockActor\@\@QEBAAEBVColor\@mce\@\@XZ */ MCAPI class mce::Color const & getSignTextColor() const; /** - * @symbol ?isBug471852Resolved\@SignBlockActor\@\@QEBA_NXZ + * @symbol ?isBug471852Resolved\@SignBlockActor\@\@QEBA_NXZ */ MCAPI bool isBug471852Resolved() const; /** - * @symbol ?resolveBug471852\@SignBlockActor\@\@QEAAXXZ + * @symbol ?load\@SignBlockActor\@\@QEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@_N\@Z */ - MCAPI void resolveBug471852(); + MCAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &, bool); /** - * @symbol ?setMessage\@SignBlockActor\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?resolveBug471852\@SignBlockActor\@\@QEAAXXZ */ - MCAPI void setMessage(std::string, std::string); + MCAPI void resolveBug471852(); /** - * @symbol ?setMessage\@SignBlockActor\@\@QEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setMessage\@SignBlockActor\@\@QEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setMessage(class TextObjectRoot, std::string); /** - * @symbol ?setSignTextColor\@SignBlockActor\@\@QEAAXAEBVColor\@mce\@\@\@Z + * @symbol ?setMessage\@SignBlockActor\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + */ + MCAPI void setMessage(std::string, std::string); + /** + * @symbol ?setSignTextColor\@SignBlockActor\@\@QEAAXAEBVColor\@mce\@\@\@Z */ MCAPI void setSignTextColor(class mce::Color const &); /** - * @symbol ?setType\@SignBlockActor\@\@QEAAXW4SignType\@1\@\@Z + * @symbol ?setTextLocked\@SignBlockActor\@\@QEAAX_N\@Z + */ + MCAPI void setTextLocked(bool); + /** + * @symbol ?setType\@SignBlockActor\@\@QEAAXW4SignType\@1\@\@Z */ MCAPI void setType(enum class SignBlockActor::SignType); -}; \ No newline at end of file +//private: + /** + * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + */ + MCAPI void _setMessage(std::string, std::string); + /** + * @symbol ?_setMessage\@SignBlockActor\@\@AEAAXVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + */ + MCAPI void _setMessage(class TextObjectRoot, std::string); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/SignItem.hpp b/LiteLoader/include/llapi/mc/SignItem.hpp index 0aa87acb52..67dfe158d7 100644 --- a/LiteLoader/include/llapi/mc/SignItem.hpp +++ b/LiteLoader/include/llapi/mc/SignItem.hpp @@ -33,98 +33,104 @@ class SignItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SignItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@SignItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@SignItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@SignItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@SignItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @vftbl 133 - * @symbol ?getBlockToPlace\@SignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z + * @vftbl 133 + * @symbol ?getBlockToPlace\@SignItem\@\@MEBAPEBVBlock\@\@EAEBVActor\@\@VBlockPos\@\@\@Z */ virtual class Block const * getBlockToPlace(unsigned char, class Actor const &, class BlockPos) const; /** - * @vftbl 134 - * @symbol ?_initializeTags\@SignItem\@\@EEAAXXZ + * @vftbl 134 + * @symbol ?_initializeTags\@SignItem\@\@EEAAXXZ */ virtual void _initializeTags(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIGNITEM /** - * @symbol ??0SignItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4SignType\@SignBlockActor\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SignItem(); +#endif + /** + * @symbol ??0SignItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4SignType\@SignBlockActor\@\@\@Z */ MCAPI SignItem(std::string const &, int, enum class SignBlockActor::SignType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Silverfish.hpp b/LiteLoader/include/llapi/mc/Silverfish.hpp index 10fa824c44..c077bd4bba 100644 --- a/LiteLoader/include/llapi/mc/Silverfish.hpp +++ b/LiteLoader/include/llapi/mc/Silverfish.hpp @@ -32,168 +32,163 @@ class Silverfish : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Silverfish(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Silverfish\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Silverfish\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Silverfish\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Silverfish\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol ?spawnAnim\@Silverfish\@\@UEAAXXZ + * @vftbl 277 + * @symbol ?spawnAnim\@Silverfish\@\@UEAAXXZ */ virtual void spawnAnim(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Silverfish\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Silverfish\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Silverfish\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Silverfish\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?isDarkEnoughToSpawn\@Silverfish\@\@UEBA_NXZ + * @vftbl 353 + * @symbol ?isDarkEnoughToSpawn\@Silverfish\@\@UEBA_NXZ */ virtual bool isDarkEnoughToSpawn() const; /** - * @symbol ??0Silverfish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Silverfish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Silverfish(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp b/LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp index e036ed435f..d519cf4ff8 100644 --- a/LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp +++ b/LiteLoader/include/llapi/mc/SilverfishMergeWithStoneGoal.hpp @@ -31,43 +31,43 @@ class SilverfishMergeWithStoneGoal : public RandomStrollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SilverfishMergeWithStoneGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SilverfishMergeWithStoneGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SilverfishMergeWithStoneGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SilverfishMergeWithStoneGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SilverfishMergeWithStoneGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 4 - * @symbol ?start\@SilverfishMergeWithStoneGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SilverfishMergeWithStoneGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SilverfishMergeWithStoneGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SilverfishMergeWithStoneGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0SilverfishMergeWithStoneGoal\@\@QEAA\@AEAVSilverfish\@\@\@Z + * @symbol ??0SilverfishMergeWithStoneGoal\@\@QEAA\@AEAVSilverfish\@\@\@Z */ MCAPI SilverfishMergeWithStoneGoal(class Silverfish &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp b/LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp index e6aa38951a..9c2ab68b64 100644 --- a/LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp +++ b/LiteLoader/include/llapi/mc/SilverfishWakeUpFriendsGoal.hpp @@ -30,48 +30,48 @@ class SilverfishWakeUpFriendsGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SilverfishWakeUpFriendsGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SilverfishWakeUpFriendsGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SilverfishWakeUpFriendsGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SilverfishWakeUpFriendsGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SilverfishWakeUpFriendsGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SilverfishWakeUpFriendsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SilverfishWakeUpFriendsGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SilverfishWakeUpFriendsGoal\@\@QEAA\@AEAVSilverfish\@\@\@Z + * @symbol ??0SilverfishWakeUpFriendsGoal\@\@QEAA\@AEAVSilverfish\@\@\@Z */ MCAPI SilverfishWakeUpFriendsGoal(class Silverfish &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimpleContainer.hpp b/LiteLoader/include/llapi/mc/SimpleContainer.hpp index ad80d8b6d6..78fca46942 100644 --- a/LiteLoader/include/llapi/mc/SimpleContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimpleContainer.hpp @@ -31,58 +31,64 @@ class SimpleContainer : public Container { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimpleContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?serverInitItemStackIds\@SimpleContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @vftbl 2 + * @symbol ?serverInitItemStackIds\@SimpleContainer\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ virtual void serverInitItemStackIds(int, int, class std::function); /** - * @vftbl 5 - * @symbol ?getItem\@SimpleContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 5 + * @symbol ?getItem\@SimpleContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getItem(int) const; /** - * @vftbl 9 - * @symbol ?setItem\@SimpleContainer\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 9 + * @symbol ?setItem\@SimpleContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 14 - * @symbol ?getContainerSize\@SimpleContainer\@\@UEBAHXZ + * @vftbl 14 + * @symbol ?getContainerSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getContainerSize() const; /** - * @vftbl 15 - * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ + * @vftbl 15 + * @symbol ?getMaxStackSize\@SimpleContainer\@\@UEBAHXZ */ virtual int getMaxStackSize() const; /** - * @vftbl 16 - * @symbol ?startOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 16 + * @symbol ?startOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void startOpen(class Player &); /** - * @vftbl 17 - * @symbol ?stopOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 17 + * @symbol ?stopOpen\@SimpleContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void stopOpen(class Player &); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 23 + * @symbol __unk_vfn_23 */ - virtual void __unk_vfn_22(); + virtual void __unk_vfn_23(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_23(); + virtual void __unk_vfn_24(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLECONTAINER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SimpleContainer(); +#endif /** - * @symbol ??0SimpleContainer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z + * @symbol ??0SimpleContainer\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z */ MCAPI SimpleContainer(std::string const &, bool, int, enum class ContainerType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp index aa74cde499..11ad5fa9c2 100644 --- a/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp +++ b/LiteLoader/include/llapi/mc/SimpleEventPacket.hpp @@ -32,41 +32,47 @@ enum class Subtype; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimpleEventPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SimpleEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SimpleEventPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SimpleEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SimpleEventPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SimpleEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SimpleEventPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SimpleEventPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLEEVENTPACKET /** - * @symbol ??0SimpleEventPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SimpleEventPacket(); +#endif + /** + * @symbol ??0SimpleEventPacket\@\@QEAA\@XZ */ MCAPI SimpleEventPacket(); /** - * @symbol ??0SimpleEventPacket\@\@QEAA\@AEBW4Subtype\@0\@\@Z + * @symbol ??0SimpleEventPacket\@\@QEAA\@AEBW4Subtype\@0\@\@Z */ MCAPI SimpleEventPacket(enum class SimpleEventPacket::Subtype const &); /** - * @symbol ?getSubtype\@SimpleEventPacket\@\@QEBAAEBW4Subtype\@1\@XZ + * @symbol ?getSubtype\@SimpleEventPacket\@\@QEBAAEBW4Subtype\@1\@XZ */ MCAPI enum class SimpleEventPacket::Subtype const & getSubtype() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp index 250556ab81..f28ff10870 100644 --- a/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimplePlayerContainer.hpp @@ -31,53 +31,53 @@ class SimplePlayerContainer : public SimpleContainer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimplePlayerContainer(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?setItem\@SimplePlayerContainer\@\@UEAAXHAEBVItemStack\@\@\@Z + * @vftbl 9 + * @symbol ?setItem\@SimplePlayerContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ virtual void setItem(int, class ItemStack const &); /** - * @vftbl 22 - * @symbol __unk_vfn_22 - */ - virtual void __unk_vfn_22(); - /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 24 + * @symbol __unk_vfn_24 */ - virtual void __unk_vfn_33(); + virtual void __unk_vfn_24(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 37 + * @symbol __unk_vfn_37 + */ + virtual void __unk_vfn_37(); + /** + * @vftbl 38 + * @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 ??0SimplePlayerContainer\@\@QEAA\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z + * @symbol ??0SimplePlayerContainer\@\@QEAA\@AEAVPlayer\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_NHW4ContainerType\@\@\@Z */ MCAPI SimplePlayerContainer(class Player &, std::string const &, bool, int, enum class ContainerType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimplePositionalRandomFactory.hpp b/LiteLoader/include/llapi/mc/SimplePositionalRandomFactory.hpp index 2cf3d87be1..aa5c327420 100644 --- a/LiteLoader/include/llapi/mc/SimplePositionalRandomFactory.hpp +++ b/LiteLoader/include/llapi/mc/SimplePositionalRandomFactory.hpp @@ -30,27 +30,27 @@ class SimplePositionalRandomFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimplePositionalRandomFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?forBlockPos\@SimplePositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 1 + * @symbol ?forBlockPos\@SimplePositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual std::unique_ptr forBlockPos(class BlockPos const &) const; /** - * @vftbl 2 - * @symbol ?forString\@SimplePositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 2 + * @symbol ?forString\@SimplePositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual std::unique_ptr forString(std::string const &) const; /** - * @symbol ??0SimplePositionalRandomFactory\@\@QEAA\@_J\@Z + * @symbol ??0SimplePositionalRandomFactory\@\@QEAA\@_J\@Z */ MCAPI SimplePositionalRandomFactory(__int64); /** - * @symbol ?forBlockPosImpl\@SimplePositionalRandomFactory\@\@QEBA?AVSimpleRandom\@\@AEBVBlockPos\@\@\@Z + * @symbol ?forBlockPosImpl\@SimplePositionalRandomFactory\@\@QEBA?AVSimpleRandom\@\@AEBVBlockPos\@\@\@Z */ MCAPI class SimpleRandom forBlockPosImpl(class BlockPos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimpleRandom.hpp b/LiteLoader/include/llapi/mc/SimpleRandom.hpp index bf97860de0..4def119ba0 100644 --- a/LiteLoader/include/llapi/mc/SimpleRandom.hpp +++ b/LiteLoader/include/llapi/mc/SimpleRandom.hpp @@ -30,59 +30,65 @@ class SimpleRandom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimpleRandom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?nextInt\@SimpleRandom\@\@UEAAHXZ + * @vftbl 1 + * @symbol ?nextInt\@SimpleRandom\@\@UEAAHXZ */ virtual int nextInt(); /** - * @vftbl 2 - * @symbol ?nextInt\@SimpleRandom\@\@UEAAHH\@Z + * @vftbl 2 + * @symbol ?nextInt\@SimpleRandom\@\@UEAAHH\@Z */ virtual int nextInt(int); /** - * @vftbl 3 - * @symbol ?nextLong\@SimpleRandom\@\@UEAA_JXZ + * @vftbl 3 + * @symbol ?nextLong\@SimpleRandom\@\@UEAA_JXZ */ virtual __int64 nextLong(); /** - * @vftbl 4 - * @symbol ?nextBoolean\@SimpleRandom\@\@UEAA_NXZ + * @vftbl 4 + * @symbol ?nextBoolean\@SimpleRandom\@\@UEAA_NXZ */ virtual bool nextBoolean(); /** - * @vftbl 5 - * @symbol ?nextFloat\@SimpleRandom\@\@UEAAMXZ + * @vftbl 5 + * @symbol ?nextFloat\@SimpleRandom\@\@UEAAMXZ */ virtual float nextFloat(); /** - * @vftbl 6 - * @symbol ?nextDouble\@SimpleRandom\@\@UEAANXZ + * @vftbl 6 + * @symbol ?nextDouble\@SimpleRandom\@\@UEAANXZ */ virtual double nextDouble(); /** - * @vftbl 7 - * @symbol ?nextGaussianDouble\@SimpleRandom\@\@UEAANXZ + * @vftbl 7 + * @symbol ?nextGaussianDouble\@SimpleRandom\@\@UEAANXZ */ virtual double nextGaussianDouble(); /** - * @vftbl 8 - * @symbol ?consumeCount\@SimpleRandom\@\@UEAAXI\@Z + * @vftbl 8 + * @symbol ?consumeCount\@SimpleRandom\@\@UEAAXI\@Z */ virtual void consumeCount(unsigned int); /** - * @vftbl 9 - * @symbol ?fork\@SimpleRandom\@\@UEAA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?fork\@SimpleRandom\@\@UEAA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr fork(); /** - * @vftbl 10 - * @symbol ?forkPositional\@SimpleRandom\@\@UEAA?AV?$unique_ptr\@VIPositionalRandomFactory\@\@U?$default_delete\@VIPositionalRandomFactory\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?forkPositional\@SimpleRandom\@\@UEAA?AV?$unique_ptr\@VIPositionalRandomFactory\@\@U?$default_delete\@VIPositionalRandomFactory\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr forkPositional(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLERANDOM + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SimpleRandom(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimpleSparseContainer.hpp b/LiteLoader/include/llapi/mc/SimpleSparseContainer.hpp index 7e4e59129f..331e9885ea 100644 --- a/LiteLoader/include/llapi/mc/SimpleSparseContainer.hpp +++ b/LiteLoader/include/llapi/mc/SimpleSparseContainer.hpp @@ -37,57 +37,57 @@ inline class ItemStack const& getItem(int a0) const public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMPLESPARSECONTAINER /** - * @symbol ?containerContentChanged\@SimpleSparseContainer\@\@EEAAXH\@Z + * @symbol ?containerContentChanged\@SimpleSparseContainer\@\@EEAAXH\@Z */ MCVAPI void containerContentChanged(int); /** - * @symbol ?getContainerSize\@SimpleSparseContainer\@\@UEBAHXZ + * @symbol ?getContainerSize\@SimpleSparseContainer\@\@UEBAHXZ */ MCVAPI int getContainerSize() const; /** - * @symbol ?getItem\@SimpleSparseContainer\@\@UEBAAEBVItemStack\@\@H\@Z + * @symbol ?getItem\@SimpleSparseContainer\@\@UEBAAEBVItemStack\@\@H\@Z */ MCVAPI class ItemStack const & getItem(int) const; /** - * @symbol ?getMaxStackSize\@SimpleSparseContainer\@\@UEBAHXZ + * @symbol ?getMaxStackSize\@SimpleSparseContainer\@\@UEBAHXZ */ MCVAPI int getMaxStackSize() const; /** - * @symbol ?serverInitItemStackIds\@SimpleSparseContainer\@\@EEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + * @symbol ?serverInitItemStackIds\@SimpleSparseContainer\@\@EEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z */ MCVAPI void serverInitItemStackIds(int, int, class std::function); /** - * @symbol ?setItem\@SimpleSparseContainer\@\@UEAAXHAEBVItemStack\@\@\@Z + * @symbol ?setItem\@SimpleSparseContainer\@\@UEAAXHAEBVItemStack\@\@\@Z */ MCVAPI void setItem(int, class ItemStack const &); /** - * @symbol ?startOpen\@SimpleSparseContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?startOpen\@SimpleSparseContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void startOpen(class Player &); /** - * @symbol ?stopOpen\@SimpleSparseContainer\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?stopOpen\@SimpleSparseContainer\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void stopOpen(class Player &); #endif /** - * @symbol ??0SimpleSparseContainer\@\@QEAA\@AEAVContainer\@\@W4SparseContainerBackingSetType\@\@V?$unique_ptr\@VISparseContainerSetListener\@\@U?$default_delete\@VISparseContainerSetListener\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VIPlayerContainerSetter\@\@U?$default_delete\@VIPlayerContainerSetter\@\@\@std\@\@\@4\@\@Z + * @symbol ??0SimpleSparseContainer\@\@QEAA\@AEAVContainer\@\@W4SparseContainerBackingSetType\@\@V?$unique_ptr\@VISparseContainerSetListener\@\@U?$default_delete\@VISparseContainerSetListener\@\@\@std\@\@\@std\@\@V?$unique_ptr\@VIPlayerContainerSetter\@\@U?$default_delete\@VIPlayerContainerSetter\@\@\@std\@\@\@4\@\@Z */ MCAPI SimpleSparseContainer(class Container &, enum class SparseContainerBackingSetType, std::unique_ptr, std::unique_ptr); /** - * @symbol ?clearItem\@SimpleSparseContainer\@\@QEAAXH\@Z + * @symbol ?clearItem\@SimpleSparseContainer\@\@QEAAXH\@Z */ MCAPI void clearItem(int); /** - * @symbol ?pushAllToBackingContainer\@SimpleSparseContainer\@\@QEAAXXZ + * @symbol ?pushAllToBackingContainer\@SimpleSparseContainer\@\@QEAAXXZ */ MCAPI void pushAllToBackingContainer(); //private: /** - * @symbol ?_setBackingContainerSlot\@SimpleSparseContainer\@\@AEAAXHAEBVItemStack\@\@\@Z + * @symbol ?_setBackingContainerSlot\@SimpleSparseContainer\@\@AEAAXHAEBVItemStack\@\@\@Z */ MCAPI void _setBackingContainerSlot(int, class ItemStack const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp b/LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp index 4c26efb8c0..ca64af193d 100644 --- a/LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/SimpleTreeCanopy.hpp @@ -31,14 +31,14 @@ class SimpleTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimpleTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@SimpleTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@SimpleTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp b/LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp index d469fb689a..b39d45164d 100644 --- a/LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp +++ b/LiteLoader/include/llapi/mc/SimpleTreeTrunk.hpp @@ -31,19 +31,19 @@ class SimpleTreeTrunk { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimpleTreeTrunk(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeTrunk\@SimpleTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z + * @vftbl 1 + * @symbol ?placeTrunk\@SimpleTreeTrunk\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@HAEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@PEBVITreeCanopy\@\@\@Z */ virtual class std::optional placeTrunk(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, int, class RenderParams &, struct TreeHelper::TreeParams const &, class ITreeCanopy const *) const; /** - * @vftbl 2 - * @symbol ?getTreeHeight\@SimpleTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z + * @vftbl 2 + * @symbol ?getTreeHeight\@SimpleTreeTrunk\@\@UEBAHAEAVRandom\@\@\@Z */ virtual int getTreeHeight(class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimplexNoise.hpp b/LiteLoader/include/llapi/mc/SimplexNoise.hpp index 4b7d1ddc70..80f9289749 100644 --- a/LiteLoader/include/llapi/mc/SimplexNoise.hpp +++ b/LiteLoader/include/llapi/mc/SimplexNoise.hpp @@ -30,20 +30,20 @@ class SimplexNoise { public: /** - * @symbol ??0SimplexNoise\@\@QEAA\@AEAVIRandom\@\@_N\@Z + * @symbol ??0SimplexNoise\@\@QEAA\@AEAVIRandom\@\@_N\@Z */ MCAPI SimplexNoise(class IRandom &, bool); /** - * @symbol ?_add\@SimplexNoise\@\@QEBAXPEAMMMHHMMM\@Z + * @symbol ?_add\@SimplexNoise\@\@QEBAXPEAMMMHHMMM\@Z */ MCAPI void _add(float *, float, float, int, int, float, float, float) const; /** - * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec2\@\@\@Z + * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec2\@\@\@Z */ MCAPI float _getValue(class Vec2 const &) const; /** - * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z + * @symbol ?_getValue\@SimplexNoise\@\@QEBAMAEBVVec3\@\@\@Z */ MCAPI float _getValue(class Vec3 const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp index 9efdedf9eb..4d37424370 100644 --- a/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp +++ b/LiteLoader/include/llapi/mc/SimulatedPlayer.hpp @@ -45,441 +45,436 @@ class SimulatedPlayer : public ServerPlayer { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@SimulatedPlayer\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@SimulatedPlayer\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~SimulatedPlayer(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 44 - * @symbol ?teleportTo\@SimulatedPlayer\@\@UEAAXAEBVVec3\@\@_NHH1\@Z + * @vftbl 44 + * @symbol ?teleportTo\@SimulatedPlayer\@\@UEAAXAEBVVec3\@\@_NHH1\@Z */ virtual void teleportTo(class Vec3 const &, bool, int, int, bool); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_275(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 288 + * @symbol ?aiStep\@SimulatedPlayer\@\@UEAAXXZ */ - virtual void __unk_vfn_277(); + virtual void aiStep(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_301(); /** - * @vftbl 291 - * @symbol ?aiStep\@SimulatedPlayer\@\@UEAAXXZ + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void aiStep(); + virtual void __unk_vfn_305(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_351(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 361 + * @symbol __unk_vfn_361 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_361(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 368 + * @symbol __unk_vfn_368 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_368(); /** - * @vftbl 364 - * @symbol __unk_vfn_364 + * @vftbl 369 + * @symbol __unk_vfn_369 */ - virtual void __unk_vfn_364(); + virtual void __unk_vfn_369(); /** - * @vftbl 371 - * @symbol __unk_vfn_371 + * @vftbl 371 + * @symbol __unk_vfn_371 */ virtual void __unk_vfn_371(); /** - * @vftbl 372 - * @symbol __unk_vfn_372 + * @vftbl 372 + * @symbol __unk_vfn_372 */ virtual void __unk_vfn_372(); /** - * @vftbl 374 - * @symbol __unk_vfn_374 + * @vftbl 377 + * @symbol __unk_vfn_377 */ - virtual void __unk_vfn_374(); + virtual void __unk_vfn_377(); /** - * @vftbl 375 - * @symbol __unk_vfn_375 + * @vftbl 378 + * @symbol __unk_vfn_378 */ - virtual void __unk_vfn_375(); + virtual void __unk_vfn_378(); /** - * @vftbl 380 - * @symbol __unk_vfn_380 - */ - virtual void __unk_vfn_380(); - /** - * @vftbl 381 - * @symbol __unk_vfn_381 + * @vftbl 381 + * @symbol __unk_vfn_381 */ virtual void __unk_vfn_381(); /** - * @vftbl 384 - * @symbol __unk_vfn_384 + * @vftbl 384 + * @symbol __unk_vfn_384 */ virtual void __unk_vfn_384(); /** - * @vftbl 387 - * @symbol __unk_vfn_387 - */ - virtual void __unk_vfn_387(); - /** - * @vftbl 388 - * @symbol __unk_vfn_388 + * @vftbl 385 + * @symbol __unk_vfn_385 */ - virtual void __unk_vfn_388(); + virtual void __unk_vfn_385(); /** - * @vftbl 398 - * @symbol __unk_vfn_398 + * @vftbl 395 + * @symbol __unk_vfn_395 */ - virtual void __unk_vfn_398(); + virtual void __unk_vfn_395(); /** - * @vftbl 399 - * @symbol __unk_vfn_399 + * @vftbl 396 + * @symbol __unk_vfn_396 */ - virtual void __unk_vfn_399(); + virtual void __unk_vfn_396(); /** - * @vftbl 400 - * @symbol ?isHostingPlayer\@SimulatedPlayer\@\@UEBA_NXZ + * @vftbl 397 + * @symbol ?isHostingPlayer\@SimulatedPlayer\@\@UEBA_NXZ */ virtual bool isHostingPlayer() const; /** - * @vftbl 403 - * @symbol __unk_vfn_403 + * @vftbl 400 + * @symbol __unk_vfn_400 */ - virtual void __unk_vfn_403(); + virtual void __unk_vfn_400(); /** - * @vftbl 410 - * @symbol __unk_vfn_410 + * @vftbl 407 + * @symbol __unk_vfn_407 */ - virtual void __unk_vfn_410(); + virtual void __unk_vfn_407(); /** - * @vftbl 436 - * @symbol __unk_vfn_436 + * @vftbl 433 + * @symbol __unk_vfn_433 */ - virtual void __unk_vfn_436(); + virtual void __unk_vfn_433(); /** - * @vftbl 437 - * @symbol ?getXuid\@SimulatedPlayer\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 434 + * @symbol ?getXuid\@SimulatedPlayer\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getXuid() const; /** - * @vftbl 438 - * @symbol ?getMovementSettings\@SimulatedPlayer\@\@UEBAAEBUPlayerMovementSettings\@\@XZ + * @vftbl 435 + * @symbol ?getMovementSettings\@SimulatedPlayer\@\@UEBAAEBUPlayerMovementSettings\@\@XZ */ virtual struct PlayerMovementSettings const & getMovementSettings() const; /** - * @vftbl 439 - * @symbol __unk_vfn_439 + * @vftbl 436 + * @symbol __unk_vfn_436 */ - virtual void __unk_vfn_439(); + virtual void __unk_vfn_436(); /** - * @vftbl 441 - * @symbol ?_createChunkSource\@SimulatedPlayer\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z + * @vftbl 438 + * @symbol ?_createChunkSource\@SimulatedPlayer\@\@MEAA?AV?$shared_ptr\@VChunkViewSource\@\@\@std\@\@AEAVChunkSource\@\@\@Z */ virtual class std::shared_ptr _createChunkSource(class ChunkSource &); /** - * @vftbl 445 - * @symbol ?_getSpawnChunkLimit\@SimulatedPlayer\@\@MEBAHXZ + * @vftbl 442 + * @symbol ?_getSpawnChunkLimit\@SimulatedPlayer\@\@MEBAHXZ */ virtual int _getSpawnChunkLimit() const; /** - * @vftbl 446 - * @symbol ?_updateChunkPublisherView\@SimulatedPlayer\@\@MEAAXAEBVVec3\@\@M\@Z + * @vftbl 443 + * @symbol ?_updateChunkPublisherView\@SimulatedPlayer\@\@MEAAXAEBVVec3\@\@M\@Z */ virtual void _updateChunkPublisherView(class Vec3 const &, float); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SIMULATEDPLAYER /** - * @symbol ?isSimulated\@SimulatedPlayer\@\@UEBA_NXZ + * @symbol ?isSimulated\@SimulatedPlayer\@\@UEBA_NXZ */ MCVAPI bool isSimulated() const; #endif /** - * @symbol ??0SimulatedPlayer\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@AEAVNetworkHandler\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@V?$function\@$$A6AXAEAVServerPlayer\@\@\@Z\@std\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@H_NAEAVEntityContext\@\@\@Z + * @symbol ??0SimulatedPlayer\@\@QEAA\@AEAVLevel\@\@AEAVPacketSender\@\@AEAVNetworkSystem\@\@AEAVActiveTransfersManager\@Server\@ClientBlobCache\@\@W4GameType\@\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@V?$function\@$$A6AXAEAVServerPlayer\@\@\@Z\@std\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@std\@\@H_NAEAVEntityContext\@\@\@Z */ - MCAPI SimulatedPlayer(class Level &, class PacketSender &, class NetworkHandler &, class ClientBlobCache::Server::ActiveTransfersManager &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class std::function, class mce::UUID, std::string const &, std::unique_ptr, int, bool, class EntityContext &); + MCAPI SimulatedPlayer(class Level &, class PacketSender &, class NetworkSystem &, class ClientBlobCache::Server::ActiveTransfersManager &, enum class GameType, class NetworkIdentifier const &, enum class SubClientId, class std::function, class mce::UUID, std::string const &, std::unique_ptr, int, bool, class EntityContext &); /** - * @symbol ?getGameTestHelper\@SimulatedPlayer\@\@QEBA?AV?$NonOwnerPointer\@VBaseGameTestHelper\@gametest\@\@\@Bedrock\@\@XZ + * @symbol ?getGameTestHelper\@SimulatedPlayer\@\@QEBA?AV?$NonOwnerPointer\@VBaseGameTestHelper\@gametest\@\@\@Bedrock\@\@XZ */ MCAPI class Bedrock::NonOwnerPointer getGameTestHelper() const; /** - * @symbol ?postAiStep\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?postAiStep\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void postAiStep(); /** - * @symbol ?preAiStep\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?preAiStep\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void preAiStep(); /** - * @symbol ?setGameTestHelper\@SimulatedPlayer\@\@QEAAXV?$NonOwnerPointer\@VBaseGameTestHelper\@gametest\@\@\@Bedrock\@\@\@Z + * @symbol ?setGameTestHelper\@SimulatedPlayer\@\@QEAAXV?$NonOwnerPointer\@VBaseGameTestHelper\@gametest\@\@\@Bedrock\@\@\@Z */ MCAPI void setGameTestHelper(class Bedrock::NonOwnerPointer); /** - * @symbol ?setXuid\@SimulatedPlayer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setXuid\@SimulatedPlayer\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setXuid(std::string const &); /** - * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NPEAVActor\@\@\@Z + * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NXZ */ - MCAPI bool simulateAttack(class Actor *); + MCAPI bool simulateAttack(); /** - * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NXZ + * @symbol ?simulateAttack\@SimulatedPlayer\@\@QEAA_NPEAVActor\@\@\@Z */ - MCAPI bool simulateAttack(); + MCAPI bool simulateAttack(class Actor *); /** - * @symbol ?simulateDestroyBlock\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z + * @symbol ?simulateDestroyBlock\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z */ MCAPI bool simulateDestroyBlock(class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing); /** - * @symbol ?simulateDisconnect\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?simulateDisconnect\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void simulateDisconnect(); /** - * @symbol ?simulateGiveItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@_N\@Z + * @symbol ?simulateGiveItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@_N\@Z */ MCAPI bool simulateGiveItem(class ItemStack &, bool); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEAVActor\@\@\@Z */ MCAPI bool simulateInteract(class Actor &); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@\@Z */ MCAPI bool simulateInteract(class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing); /** - * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ + * @symbol ?simulateInteract\@SimulatedPlayer\@\@QEAA_NXZ */ MCAPI bool simulateInteract(); /** - * @symbol ?simulateJump\@SimulatedPlayer\@\@QEAA_NXZ + * @symbol ?simulateJump\@SimulatedPlayer\@\@QEAA_NXZ */ MCAPI bool simulateJump(); /** - * @symbol ?simulateLocalMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z + * @symbol ?simulateLocalMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ MCAPI void simulateLocalMove(class Vec3 const &, float); /** - * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z */ - MCAPI void simulateLookAt(class Actor &); + MCAPI void simulateLookAt(class BlockPos const &); /** - * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEAVActor\@\@\@Z */ - MCAPI void simulateLookAt(class BlockPos const &); + MCAPI void simulateLookAt(class Actor &); /** - * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?simulateLookAt\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void simulateLookAt(class Vec3 const &); /** - * @symbol ?simulateMoveToLocation\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z + * @symbol ?simulateMoveToLocation\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ MCAPI void simulateMoveToLocation(class Vec3 const &, float); /** - * @symbol ?simulateNavigateToEntity\@SimulatedPlayer\@\@QEAA?AUScriptNavigationResult\@ScriptModuleMinecraft\@\@AEAVActor\@\@M\@Z + * @symbol ?simulateNavigateToEntity\@SimulatedPlayer\@\@QEAA?AUScriptNavigationResult\@ScriptModuleMinecraft\@\@AEAVActor\@\@M\@Z */ MCAPI struct ScriptModuleMinecraft::ScriptNavigationResult simulateNavigateToEntity(class Actor &, float); /** - * @symbol ?simulateNavigateToLocation\@SimulatedPlayer\@\@QEAA?AUScriptNavigationResult\@ScriptModuleMinecraft\@\@AEBVVec3\@\@M\@Z + * @symbol ?simulateNavigateToLocation\@SimulatedPlayer\@\@QEAA?AUScriptNavigationResult\@ScriptModuleMinecraft\@\@AEBVVec3\@\@M\@Z */ MCAPI struct ScriptModuleMinecraft::ScriptNavigationResult simulateNavigateToLocation(class Vec3 const &, float); /** - * @symbol ?simulateNavigateToLocations\@SimulatedPlayer\@\@QEAAX$$QEAV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@M\@Z + * @symbol ?simulateNavigateToLocations\@SimulatedPlayer\@\@QEAAX$$QEAV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@M\@Z */ MCAPI void simulateNavigateToLocations(std::vector &&, float); /** - * @symbol ?simulateRespawn\@SimulatedPlayer\@\@QEAA_NXZ + * @symbol ?simulateRespawn\@SimulatedPlayer\@\@QEAA_NXZ */ MCAPI bool simulateRespawn(); /** - * @symbol ?simulateSetBodyRotation\@SimulatedPlayer\@\@QEAAXM\@Z + * @symbol ?simulateSetBodyRotation\@SimulatedPlayer\@\@QEAAXM\@Z */ MCAPI void simulateSetBodyRotation(float); /** - * @symbol ?simulateSetItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@_NH\@Z + * @symbol ?simulateSetItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@_NH\@Z */ MCAPI bool simulateSetItem(class ItemStack &, bool, int); /** - * @symbol ?simulateStopDestroyingBlock\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?simulateStopDestroyingBlock\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void simulateStopDestroyingBlock(); /** - * @symbol ?simulateStopInteracting\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?simulateStopInteracting\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void simulateStopInteracting(); /** - * @symbol ?simulateStopMoving\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?simulateStopMoving\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void simulateStopMoving(); /** - * @symbol ?simulateStopUsingItem\@SimulatedPlayer\@\@QEAAXXZ + * @symbol ?simulateStopUsingItem\@SimulatedPlayer\@\@QEAAXXZ */ MCAPI void simulateStopUsingItem(); /** - * @symbol ?simulateUseItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@\@Z + * @symbol ?simulateUseItem\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@\@Z */ MCAPI bool simulateUseItem(class ItemStack &); /** - * @symbol ?simulateUseItemInSlot\@SimulatedPlayer\@\@QEAA_NH\@Z + * @symbol ?simulateUseItemInSlot\@SimulatedPlayer\@\@QEAA_NH\@Z */ MCAPI bool simulateUseItemInSlot(int); /** - * @symbol ?simulateUseItemInSlotOnBlock\@SimulatedPlayer\@\@QEAA_NHAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@AEBVVec3\@\@\@Z + * @symbol ?simulateUseItemInSlotOnBlock\@SimulatedPlayer\@\@QEAA_NHAEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@AEBVVec3\@\@\@Z */ MCAPI bool simulateUseItemInSlotOnBlock(int, class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing, class Vec3 const &); /** - * @symbol ?simulateUseItemOnBlock\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@AEBVVec3\@\@\@Z + * @symbol ?simulateUseItemOnBlock\@SimulatedPlayer\@\@QEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@W4ScriptFacing\@ScriptModuleMinecraft\@\@AEBVVec3\@\@\@Z */ MCAPI bool simulateUseItemOnBlock(class ItemStack &, class BlockPos const &, enum class ScriptModuleMinecraft::ScriptFacing, class Vec3 const &); /** - * @symbol ?simulateWorldMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z + * @symbol ?simulateWorldMove\@SimulatedPlayer\@\@QEAAXAEBVVec3\@\@M\@Z */ MCAPI void simulateWorldMove(class Vec3 const &, float); /** - * @symbol ?create\@SimulatedPlayer\@\@SAPEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@0\@Z + * @symbol ?create\@SimulatedPlayer\@\@SAPEAV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@0\@Z */ MCAPI static class SimulatedPlayer * create(std::string const &, class BlockPos const &, class AutomaticID, class gsl::not_null>, std::string const &); /** - * @symbol ?tryGetFromEntity\@SimulatedPlayer\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z + * @symbol ?tryGetFromEntity\@SimulatedPlayer\@\@SAPEAV1\@AEAVEntityContext\@\@_N\@Z */ MCAPI static class SimulatedPlayer * tryGetFromEntity(class EntityContext &, bool); //private: /** - * @symbol ?_addMoveComponent\@SimulatedPlayer\@\@AEAAXXZ + * @symbol ?_addMoveComponent\@SimulatedPlayer\@\@AEAAXXZ */ MCAPI void _addMoveComponent(); /** - * @symbol ?_createNavigationResult\@SimulatedPlayer\@\@AEBA?AUScriptNavigationResult\@ScriptModuleMinecraft\@\@PEAVNavigationComponent\@\@\@Z + * @symbol ?_createNavigationResult\@SimulatedPlayer\@\@AEBA?AUScriptNavigationResult\@ScriptModuleMinecraft\@\@PEAVNavigationComponent\@\@\@Z */ MCAPI struct ScriptModuleMinecraft::ScriptNavigationResult _createNavigationResult(class NavigationComponent *) const; /** - * @symbol ?_getInputSpeed\@SimulatedPlayer\@\@AEAAMXZ + * @symbol ?_getInputSpeed\@SimulatedPlayer\@\@AEAAMXZ */ MCAPI float _getInputSpeed(); /** - * @symbol ?_startCooldown\@SimulatedPlayer\@\@AEAAXXZ + * @symbol ?_startCooldown\@SimulatedPlayer\@\@AEAAXXZ */ MCAPI void _startCooldown(); /** - * @symbol ?_trySwing\@SimulatedPlayer\@\@AEAA_NXZ + * @symbol ?_trySwing\@SimulatedPlayer\@\@AEAA_NXZ */ MCAPI bool _trySwing(); /** - * @symbol ?_updateMovement\@SimulatedPlayer\@\@AEAAXXZ + * @symbol ?_updateMovement\@SimulatedPlayer\@\@AEAAXXZ */ MCAPI void _updateMovement(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayerPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayerPostAIStepSystem.hpp index c379dd9eea..6638e0684d 100644 --- a/LiteLoader/include/llapi/mc/SimulatedPlayerPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SimulatedPlayerPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class SimulatedPlayerPostAIStepSystem { public: /** - * @symbol ?createSystem\@SimulatedPlayerPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SimulatedPlayerPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSimulatedPlayerPostAIStepSystem\@SimulatedPlayerPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doSimulatedPlayerPostAIStepSystem\@SimulatedPlayerPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doSimulatedPlayerPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimulatedPlayerPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SimulatedPlayerPreAIStepSystem.hpp index f4760657ff..96d2c69d10 100644 --- a/LiteLoader/include/llapi/mc/SimulatedPlayerPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SimulatedPlayerPreAIStepSystem.hpp @@ -28,16 +28,16 @@ class SimulatedPlayerPreAIStepSystem { public: /** - * @symbol ?createSystem\@SimulatedPlayerPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SimulatedPlayerPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSimulatedPlayerPreAIStepSystem\@SimulatedPlayerPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doSimulatedPlayerPreAIStepSystem\@SimulatedPlayerPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doSimulatedPlayerPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp index e885972edb..31ec27f3b6 100644 --- a/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/SimulationTypePacket.hpp @@ -30,33 +30,33 @@ class SimulationTypePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SimulationTypePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SimulationTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SimulationTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SimulationTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SimulationTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SimulationTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SimulationTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SimulationTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SimulationTypePacket\@\@QEAA\@XZ + * @symbol ??0SimulationTypePacket\@\@QEAA\@XZ */ MCAPI SimulationTypePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SingleBlockFeature.hpp b/LiteLoader/include/llapi/mc/SingleBlockFeature.hpp index f4fa17be1d..1f6dcaabac 100644 --- a/LiteLoader/include/llapi/mc/SingleBlockFeature.hpp +++ b/LiteLoader/include/llapi/mc/SingleBlockFeature.hpp @@ -30,22 +30,22 @@ class SingleBlockFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SingleBlockFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@SingleBlockFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@SingleBlockFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; //private: /** - * @symbol ?_mayAttach\@SingleBlockFeature\@\@AEBAPEBVBlock\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_mayAttach\@SingleBlockFeature\@\@AEBAPEBVBlock\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Block const * _mayAttach(class IBlockWorldGenAPI &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SitComponent.hpp b/LiteLoader/include/llapi/mc/SitComponent.hpp index 927672325e..4cb8368b52 100644 --- a/LiteLoader/include/llapi/mc/SitComponent.hpp +++ b/LiteLoader/include/llapi/mc/SitComponent.hpp @@ -30,8 +30,8 @@ class SitComponent { public: /** - * @symbol ?getInteraction\@SitComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@SitComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SitGoal.hpp b/LiteLoader/include/llapi/mc/SitGoal.hpp index ce6c3e6c95..ed15bd5569 100644 --- a/LiteLoader/include/llapi/mc/SitGoal.hpp +++ b/LiteLoader/include/llapi/mc/SitGoal.hpp @@ -30,48 +30,48 @@ class SitGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SitGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SitGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SitGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SitGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SitGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SitGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SitGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SitGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SitGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SitGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SitGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SitGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SittableDefinition.hpp b/LiteLoader/include/llapi/mc/SittableDefinition.hpp index 560caf0674..b49b647543 100644 --- a/LiteLoader/include/llapi/mc/SittableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SittableDefinition.hpp @@ -31,12 +31,12 @@ class SittableDefinition { public: /** - * @symbol ?uninitialize\@SittableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSitComponent\@\@\@Z + * @symbol ?uninitialize\@SittableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSitComponent\@\@\@Z */ MCAPI void uninitialize(class EntityContext &, class SitComponent &) const; /** - * @symbol ?buildSchema\@SittableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSittableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@SittableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSittableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Skeleton.hpp b/LiteLoader/include/llapi/mc/Skeleton.hpp index fea5ceca3c..a4ed1ad8bc 100644 --- a/LiteLoader/include/llapi/mc/Skeleton.hpp +++ b/LiteLoader/include/llapi/mc/Skeleton.hpp @@ -32,176 +32,171 @@ class Skeleton : public HumanoidMonster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Skeleton(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Skeleton\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Skeleton\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 115 - * @symbol ?setTarget\@Skeleton\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 114 + * @symbol ?setTarget\@Skeleton\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 172 - * @symbol ?canFreeze\@Skeleton\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@Skeleton\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 208 - * @symbol ?canBeAffected\@Skeleton\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@Skeleton\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 220 - * @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 + * @vftbl 219 + * @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 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@Skeleton\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Skeleton\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 307 - * @symbol ?doHurtTarget\@Skeleton\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 304 + * @symbol ?doHurtTarget\@Skeleton\@\@UEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Skeleton\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Skeleton\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Skeleton(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?setWitherParent\@Skeleton\@\@QEAAXPEAVWitherBoss\@\@\@Z + * @symbol ?setWitherParent\@Skeleton\@\@QEAAXPEAVWitherBoss\@\@\@Z */ MCAPI void setWitherParent(class WitherBoss *); @@ -209,8 +204,8 @@ class Skeleton : public HumanoidMonster { private: /** - * @symbol ?SPEED_MODIFIER_ATTACK_UUID\@Skeleton\@\@0VUUID\@mce\@\@B + * @symbol ?SPEED_MODIFIER_ATTACK_UUID\@Skeleton\@\@0VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SPEED_MODIFIER_ATTACK_UUID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp b/LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp index d7e8df996f..63dcced27c 100644 --- a/LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp +++ b/LiteLoader/include/llapi/mc/SkeletonHorseTrapGoal.hpp @@ -30,60 +30,60 @@ class SkeletonHorseTrapGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SkeletonHorseTrapGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SkeletonHorseTrapGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SkeletonHorseTrapGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SkeletonHorseTrapGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SkeletonHorseTrapGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SkeletonHorseTrapGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SkeletonHorseTrapGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SkeletonHorseTrapGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SkeletonHorseTrapGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SkeletonHorseTrapGoal\@\@QEAA\@AEAVHorse\@\@HM\@Z + * @symbol ??0SkeletonHorseTrapGoal\@\@QEAA\@AEAVHorse\@\@HM\@Z */ MCAPI SkeletonHorseTrapGoal(class Horse &, int, float); //private: /** - * @symbol ?_createHorse\@SkeletonHorseTrapGoal\@\@AEAAPEAVHorse\@\@AEBW4Difficulty\@\@\@Z + * @symbol ?_createHorse\@SkeletonHorseTrapGoal\@\@AEAAPEAVHorse\@\@AEBW4Difficulty\@\@\@Z */ MCAPI class Horse * _createHorse(enum class Difficulty const &); /** - * @symbol ?_createSkeleton\@SkeletonHorseTrapGoal\@\@AEAAPEAVSkeleton\@\@AEBW4Difficulty\@\@AEBVHorse\@\@\@Z + * @symbol ?_createSkeleton\@SkeletonHorseTrapGoal\@\@AEAAPEAVSkeleton\@\@AEBW4Difficulty\@\@AEBVHorse\@\@\@Z */ MCAPI class Skeleton * _createSkeleton(enum class Difficulty const &, class Horse const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystem.hpp b/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystem.hpp index 7c38919ad5..ab3235ca8d 100644 --- a/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystem.hpp +++ b/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystem.hpp @@ -28,8 +28,8 @@ class SkeletonPassengerRotationSystem { public: /** - * @symbol ?createSkeletonPassengerRotationSystem\@SkeletonPassengerRotationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSkeletonPassengerRotationSystem\@SkeletonPassengerRotationSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSkeletonPassengerRotationSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystemImpl.hpp b/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystemImpl.hpp index 9cfb3f34ed..885f0c85bd 100644 --- a/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystemImpl.hpp +++ b/LiteLoader/include/llapi/mc/SkeletonPassengerRotationSystemImpl.hpp @@ -30,10 +30,10 @@ class SkeletonPassengerRotationSystemImpl { //private: /** - * @symbol ?_tickSkeletonView\@SkeletonPassengerRotationSystemImpl\@\@CAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEBV?$FlagComponent\@USkeletonFlag\@\@\@\@AEAUMobBodyRotationComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUMobBodyRotationComponent\@\@\@\@\@Z + * @symbol ?_tickSkeletonView\@SkeletonPassengerRotationSystemImpl\@\@CAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEBV?$FlagComponent\@USkeletonFlag\@\@\@\@AEAUMobBodyRotationComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUVehicleComponent\@\@$$CBUMobBodyRotationComponent\@\@\@\@\@Z */ MCAPI static void _tickSkeletonView(class StrictEntityContext &, struct PassengerComponent const &, class FlagComponent const &, struct MobBodyRotationComponent &, class ViewT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkinAdjustments.hpp b/LiteLoader/include/llapi/mc/SkinAdjustments.hpp index 49ec1a7897..7ccbedad47 100644 --- a/LiteLoader/include/llapi/mc/SkinAdjustments.hpp +++ b/LiteLoader/include/llapi/mc/SkinAdjustments.hpp @@ -27,8 +27,8 @@ class SkinAdjustments { public: /** - * @symbol ??0SkinAdjustments\@\@QEAA\@XZ + * @symbol ??0SkinAdjustments\@\@QEAA\@XZ */ MCAPI SkinAdjustments(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkinData.hpp b/LiteLoader/include/llapi/mc/SkinData.hpp index 66f00e3cce..bea97b9a86 100644 --- a/LiteLoader/include/llapi/mc/SkinData.hpp +++ b/LiteLoader/include/llapi/mc/SkinData.hpp @@ -31,19 +31,19 @@ struct SkinData { public: /** - * @symbol ??0SkinData\@\@QEAA\@AEBVValue\@Json\@\@\@Z + * @symbol ??0SkinData\@\@QEAA\@AEBVActor\@\@\@Z */ - MCAPI SkinData(class Json::Value const &); + MCAPI SkinData(class Actor const &); /** - * @symbol ??0SkinData\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0SkinData\@\@QEAA\@AEBVValue\@Json\@\@\@Z */ - MCAPI SkinData(class Actor const &); + MCAPI SkinData(class Json::Value const &); /** - * @symbol ?applyToActor\@SkinData\@\@QEBAXAEAVActor\@\@\@Z + * @symbol ?applyToActor\@SkinData\@\@QEBAXAEAVActor\@\@\@Z */ MCAPI void applyToActor(class Actor &) const; /** - * @symbol ?softMatch\@SkinData\@\@QEBA_NAEBU1\@AEA_N\@Z + * @symbol ?softMatch\@SkinData\@\@QEBA_NAEBU1\@AEA_N\@Z */ MCAPI bool softMatch(struct SkinData const &, bool &) const; diff --git a/LiteLoader/include/llapi/mc/SkinIDDefinition.hpp b/LiteLoader/include/llapi/mc/SkinIDDefinition.hpp index e82644b63f..c93983683f 100644 --- a/LiteLoader/include/llapi/mc/SkinIDDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SkinIDDefinition.hpp @@ -31,7 +31,7 @@ struct SkinIDDefinition { public: /** - * @symbol ?buildSchema\@SkinIDDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@USkinIDDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@SkinIDDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@USkinIDDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/SkinInfoData.hpp b/LiteLoader/include/llapi/mc/SkinInfoData.hpp index eb96754e37..5e49007984 100644 --- a/LiteLoader/include/llapi/mc/SkinInfoData.hpp +++ b/LiteLoader/include/llapi/mc/SkinInfoData.hpp @@ -30,8 +30,8 @@ class SkinInfoData { public: /** - * @symbol ?isValidSize\@SkinInfoData\@\@SA_N_K\@Z + * @symbol ?isValidSize\@SkinInfoData\@\@SA_N_K\@Z */ MCAPI static bool isValidSize(unsigned __int64); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkullBlock.hpp b/LiteLoader/include/llapi/mc/SkullBlock.hpp index 29ac8016e7..45295897e4 100644 --- a/LiteLoader/include/llapi/mc/SkullBlock.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlock.hpp @@ -31,265 +31,270 @@ class SkullBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SkullBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@SkullBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@SkullBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SkullBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@SkullBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@SkullBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@SkullBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@SkullBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@SkullBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@SkullBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@SkullBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 143 - * @symbol ?getVisualShape\@SkullBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@SkullBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SkullBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getEntityResourceItem\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getEntityResourceItem\@SkullBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlockActor\@\@H\@Z */ virtual class ItemInstance getEntityResourceItem(class Randomize &, class BlockActor const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SKULLBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@SkullBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SkullBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0SkullBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SkullBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SkullBlock(std::string const &, int); /** - * @symbol ?checkMobSpawn\@SkullBlock\@\@QEBA_NAEAVLevel\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAVSkullBlockActor\@\@\@Z + * @symbol ?checkMobSpawn\@SkullBlock\@\@QEBA_NAEAVLevel\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAVSkullBlockActor\@\@\@Z */ MCAPI bool checkMobSpawn(class Level &, class BlockSource &, class BlockPos const &, class SkullBlockActor &) const; /** - * @symbol ?getTypeDescriptionId\@SkullBlock\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getTypeDescriptionId\@SkullBlock\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI static std::string getTypeDescriptionId(int); //private: /** - * @symbol ?_updatedDragonCircuit\@SkullBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_updatedDragonCircuit\@SkullBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _updatedDragonCircuit(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkullBlockActor.hpp b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp index 31c53d1111..3653bd8958 100644 --- a/LiteLoader/include/llapi/mc/SkullBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SkullBlockActor.hpp @@ -33,99 +33,99 @@ enum class SkullType; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SkullBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SkullBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SkullBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@SkullBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@SkullBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 7 - * @symbol ?tick\@SkullBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@SkullBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 8 - * @symbol ?onChanged\@SkullBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@SkullBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@SkullBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@SkullBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@SkullBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0SkullBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SkullBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SkullBlockActor(class BlockPos const &); /** - * @symbol ?getSkullType\@SkullBlockActor\@\@QEBA?AW4SkullType\@1\@XZ + * @symbol ?getSkullType\@SkullBlockActor\@\@QEBA?AW4SkullType\@1\@XZ */ MCAPI enum class SkullBlockActor::SkullType getSkullType() const; /** - * @symbol ?setRotation\@SkullBlockActor\@\@QEAAXM\@Z + * @symbol ?setRotation\@SkullBlockActor\@\@QEAAXM\@Z */ MCAPI void setRotation(float); /** - * @symbol ?setSkullType\@SkullBlockActor\@\@QEAAXH\@Z + * @symbol ?setSkullType\@SkullBlockActor\@\@QEAAXH\@Z */ MCAPI void setSkullType(int); /** - * @symbol ?getSkullType\@SkullBlockActor\@\@SA?AV?$optional\@W4SkullType\@SkullBlockActor\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getSkullType\@SkullBlockActor\@\@SA?AV?$optional\@W4SkullType\@SkullBlockActor\@\@\@std\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional getSkullType(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SkullItem.hpp b/LiteLoader/include/llapi/mc/SkullItem.hpp index dd03ed1d32..f29fb56677 100644 --- a/LiteLoader/include/llapi/mc/SkullItem.hpp +++ b/LiteLoader/include/llapi/mc/SkullItem.hpp @@ -32,138 +32,138 @@ class SkullItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SkullItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 42 - * @symbol ?getBlockShape\@SkullItem\@\@UEBA?AW4BlockShape\@\@XZ + * @vftbl 42 + * @symbol ?getBlockShape\@SkullItem\@\@UEBA?AW4BlockShape\@\@XZ */ virtual enum class BlockShape getBlockShape() const; /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@SkullItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@SkullItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@SkullItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@SkullItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 67 - * @symbol ?isValidAuxValue\@SkullItem\@\@UEBA_NH\@Z + * @vftbl 67 + * @symbol ?isValidAuxValue\@SkullItem\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 85 - * @symbol ?dispense\@SkullItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@SkullItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@SkullItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@SkullItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 113 - * @symbol ?getEquipLocation\@SkullItem\@\@UEBA?AW4ActorLocation\@\@XZ + * @vftbl 113 + * @symbol ?getEquipLocation\@SkullItem\@\@UEBA?AW4ActorLocation\@\@XZ */ virtual enum class ActorLocation getEquipLocation() const; /** - * @vftbl 114 - * @symbol ?getEquipSound\@SkullItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 114 + * @symbol ?getEquipSound\@SkullItem\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getEquipSound() const; /** - * @vftbl 118 - * @symbol ?getIconInfo\@SkullItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@SkullItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 129 - * @symbol ?getAuxValuesDescription\@SkullItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 129 + * @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 - * @symbol ?_calculatePlacePos\@SkullItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@SkullItem\@\@EEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@SkullItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@SkullItem\@\@EEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0SkullItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SkullItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SkullItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlabBlock.hpp b/LiteLoader/include/llapi/mc/SlabBlock.hpp index 52b4214c61..fa3f21857e 100644 --- a/LiteLoader/include/llapi/mc/SlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlock.hpp @@ -31,268 +31,277 @@ class SlabBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlabBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?isObstructingChests\@SlabBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 6 + * @symbol ?isObstructingChests\@SlabBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool isObstructingChests(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 17 - * @symbol ?liquidCanFlowIntoFromDirection\@SlabBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 17 + * @symbol ?liquidCanFlowIntoFromDirection\@SlabBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 43 - * @symbol ?isDoubleSlabBlock\@SlabBlock\@\@UEBA_NXZ + * @vftbl 43 + * @symbol ?isDoubleSlabBlock\@SlabBlock\@\@UEBA_NXZ */ virtual bool isDoubleSlabBlock() const; /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@SlabBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 80 - * @symbol ?getRedstoneProperty\@SlabBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 80 + * @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 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@SlabBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@SlabBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@SlabBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@SlabBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 121 - * @symbol ?getMobToSpawn\@SlabBlock\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z + * @vftbl 121 + * @symbol ?getMobToSpawn\@SlabBlock\@\@UEBAPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ virtual class MobSpawnerData const * getMobToSpawn(class SpawnConditions const &, class BlockSource &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@SlabBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SlabBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SlabBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLABBLOCK /** - * @symbol ?canBeSilkTouched\@SlabBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SlabBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isSlabBlock\@SlabBlock\@\@UEBA_NXZ + * @symbol ?isSlabBlock\@SlabBlock\@\@UEBA_NXZ */ MCVAPI bool isSlabBlock() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SlabBlock(); #endif /** - * @symbol ??0SlabBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVMaterial\@\@V?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0SlabBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NAEBVMaterial\@\@V?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI SlabBlock(std::string const &, int, bool, class Material const &, class WeakPtr); //protected: /** - * @symbol ?getBaseSlab\@SlabBlock\@\@IEBAAEBVBlock\@\@XZ + * @symbol ?getBaseSlab\@SlabBlock\@\@IEBAAEBVBlock\@\@XZ */ MCAPI class Block const & getBaseSlab() const; @@ -302,8 +311,8 @@ class SlabBlock : public BlockLegacy { private: /** - * @symbol ?TOP_SLAB_DOESNT_BREAK_FALLING_BLOCK_VERSION\@SlabBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?TOP_SLAB_DOESNT_BREAK_FALLING_BLOCK_VERSION\@SlabBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const TOP_SLAB_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp index 5d2ee32cc4..16a2924604 100644 --- a/LiteLoader/include/llapi/mc/SlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlockItem.hpp @@ -32,96 +32,96 @@ class SlabBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlabBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@SlabBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@SlabBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@SlabBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@SlabBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0SlabBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SlabBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SlabBlockItem(std::string const &, int); //private: /** - * @symbol ?_canConvertToDoubleBlock\@SlabBlockItem\@\@AEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEBVBlock\@\@\@Z + * @symbol ?_canConvertToDoubleBlock\@SlabBlockItem\@\@AEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEBVBlock\@\@\@Z */ MCAPI bool _canConvertToDoubleBlock(class ItemStackBase &, class Actor &, unsigned char &, class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlabBlockItemUtil.hpp b/LiteLoader/include/llapi/mc/SlabBlockItemUtil.hpp index ed040874a6..66da5de539 100644 --- a/LiteLoader/include/llapi/mc/SlabBlockItemUtil.hpp +++ b/LiteLoader/include/llapi/mc/SlabBlockItemUtil.hpp @@ -22,7 +22,7 @@ namespace SlabBlockItemUtil { #undef AFTER_EXTRA /** - * @symbol ?convertToDoubleBlock\@SlabBlockItemUtil\@\@YAXAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?convertToDoubleBlock\@SlabBlockItemUtil\@\@YAXAEAVItemStack\@\@AEAVActor\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void convertToDoubleBlock(class ItemStack &, class Actor &, class BlockPos const &, class Block const &); diff --git a/LiteLoader/include/llapi/mc/SleepGoal.hpp b/LiteLoader/include/llapi/mc/SleepGoal.hpp index df89fb1ffd..31a24f5704 100644 --- a/LiteLoader/include/llapi/mc/SleepGoal.hpp +++ b/LiteLoader/include/llapi/mc/SleepGoal.hpp @@ -31,75 +31,75 @@ class SleepGoal : public MoveToPOIGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SleepGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SleepGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SleepGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SleepGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SleepGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SleepGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SleepGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SleepGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SleepGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SleepGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SleepGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SleepGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SleepGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 16 - * @symbol ?_getRepathTime\@SleepGoal\@\@EEBA_KXZ + * @vftbl 16 + * @symbol ?_getRepathTime\@SleepGoal\@\@EEBA_KXZ */ virtual unsigned __int64 _getRepathTime() const; /** - * @symbol ??0SleepGoal\@\@QEAA\@AEAVMob\@\@MMM_NMHM\@Z + * @symbol ??0SleepGoal\@\@QEAA\@AEAVMob\@\@MMM_NMHM\@Z */ MCAPI SleepGoal(class Mob &, float, float, float, bool, float, int, float); //private: /** - * @symbol ?_lockPosToBedPos\@SleepGoal\@\@AEAAXXZ + * @symbol ?_lockPosToBedPos\@SleepGoal\@\@AEAAXXZ */ MCAPI void _lockPosToBedPos(); /** - * @symbol ?_wakeUp\@SleepGoal\@\@AEAAXXZ + * @symbol ?_wakeUp\@SleepGoal\@\@AEAAXXZ */ MCAPI void _wakeUp(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SleepState.hpp b/LiteLoader/include/llapi/mc/SleepState.hpp index 73d9a4e692..b989afe012 100644 --- a/LiteLoader/include/llapi/mc/SleepState.hpp +++ b/LiteLoader/include/llapi/mc/SleepState.hpp @@ -30,24 +30,24 @@ class SleepState { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SleepState(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@SleepState\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@SleepState\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?stop\@SleepState\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?stop\@SleepState\@\@UEAAXXZ */ virtual void stop(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Slime.hpp b/LiteLoader/include/llapi/mc/Slime.hpp index 25e3f9071d..83ed5647f9 100644 --- a/LiteLoader/include/llapi/mc/Slime.hpp +++ b/LiteLoader/include/llapi/mc/Slime.hpp @@ -32,264 +32,260 @@ class Slime : public Monster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Slime\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Slime\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Slime(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@Slime\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@Slime\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Slime\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Slime\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Slime\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Slime\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Slime\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Slime\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Slime\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Slime\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Slime\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 291 - * @symbol ?aiStep\@Slime\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Slime\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Slime\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Slime\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Slime\@\@MEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Slime\@\@MEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 357 - * @symbol ?getSquishSound\@Slime\@\@UEAA?AW4LevelSoundEvent\@\@XZ + * @vftbl 354 + * @symbol ?getSquishSound\@Slime\@\@UEAA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getSquishSound(); /** - * @vftbl 358 - * @symbol ?setSlimeSize\@Slime\@\@MEAAXH\@Z + * @vftbl 355 + * @symbol ?setSlimeSize\@Slime\@\@MEAAXH\@Z */ virtual void setSlimeSize(int); /** - * @vftbl 359 - * @symbol ?doPlayJumpSound\@Slime\@\@MEAA_NXZ + * @vftbl 356 + * @symbol ?doPlayJumpSound\@Slime\@\@MEAA_NXZ */ virtual bool doPlayJumpSound(); /** - * @vftbl 360 - * @symbol ?doPlayLandSound\@Slime\@\@MEAA_NXZ + * @vftbl 357 + * @symbol ?doPlayLandSound\@Slime\@\@MEAA_NXZ */ virtual bool doPlayLandSound(); /** - * @vftbl 361 - * @symbol ?playJumpSound\@Slime\@\@MEAAXXZ + * @vftbl 358 + * @symbol ?playJumpSound\@Slime\@\@MEAAXXZ */ virtual void playJumpSound(); /** - * @vftbl 362 - * @symbol ?playLandSound\@Slime\@\@MEAAXXZ + * @vftbl 359 + * @symbol ?playLandSound\@Slime\@\@MEAAXXZ */ virtual void playLandSound(); /** - * @vftbl 363 - * @symbol ?decreaseSquish\@Slime\@\@MEAAXXZ + * @vftbl 360 + * @symbol ?decreaseSquish\@Slime\@\@MEAAXXZ */ virtual void decreaseSquish(); /** - * @vftbl 364 - * @symbol ?createChild\@Slime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z + * @vftbl 361 + * @symbol ?createChild\@Slime\@\@MEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@H\@Z */ virtual class OwnerPtrT createChild(int); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLIME + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Slime(); +#endif /** - * @symbol ??0Slime\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Slime\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Slime(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getOldSquishValue\@Slime\@\@QEBAMXZ + * @symbol ?getOldSquishValue\@Slime\@\@QEBAMXZ */ MCAPI float getOldSquishValue() const; /** - * @symbol ?getSlimeSize\@Slime\@\@QEBAHXZ + * @symbol ?getSlimeSize\@Slime\@\@QEBAHXZ */ MCAPI int getSlimeSize() const; /** - * @symbol ?getSquishValue\@Slime\@\@QEBAMXZ + * @symbol ?getSquishValue\@Slime\@\@QEBAMXZ */ MCAPI float getSquishValue() const; /** - * @symbol ?postNormalTick\@Slime\@\@QEAAX_N\@Z + * @symbol ?postNormalTick\@Slime\@\@QEAAX_N\@Z */ MCAPI void postNormalTick(bool); /** - * @symbol ?preNormalTick\@Slime\@\@QEAAXXZ + * @symbol ?preNormalTick\@Slime\@\@QEAAXXZ */ MCAPI void preNormalTick(); /** - * @symbol ?getSpawnRulesCallback\@Slime\@\@SA?AV?$function\@$$A6A_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z\@std\@\@XZ + * @symbol ?getSpawnRulesCallback\@Slime\@\@SA?AV?$function\@$$A6A_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z\@std\@\@XZ */ MCAPI static class std::function getSpawnRulesCallback(); //protected: /** - * @symbol ?justJumped\@Slime\@\@IEAAXXZ + * @symbol ?justJumped\@Slime\@\@IEAAXXZ */ MCAPI void justJumped(); /** - * @symbol ?justLanded\@Slime\@\@IEAAXXZ + * @symbol ?justLanded\@Slime\@\@IEAAXXZ */ MCAPI void justLanded(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp index 86ee2a5cf2..cc3ba0d645 100644 --- a/LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeAttackDefinition.hpp @@ -30,16 +30,16 @@ class SlimeAttackDefinition { public: /** - * @symbol ??0SlimeAttackDefinition\@\@QEAA\@XZ + * @symbol ??0SlimeAttackDefinition\@\@QEAA\@XZ */ MCAPI SlimeAttackDefinition(); /** - * @symbol ?initialize\@SlimeAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeAttackGoal\@\@\@Z + * @symbol ?initialize\@SlimeAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SlimeAttackGoal &) const; /** - * @symbol ?buildSchema\@SlimeAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SlimeAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp b/LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp index 4bcd2612a9..b4588254ee 100644 --- a/LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeAttackGoal.hpp @@ -30,48 +30,48 @@ class SlimeAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlimeAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SlimeAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SlimeAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SlimeAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SlimeAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SlimeAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SlimeAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SlimeAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SlimeAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SlimeAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SlimeAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SlimeAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SlimeAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SlimeAttackGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeBlock.hpp b/LiteLoader/include/llapi/mc/SlimeBlock.hpp index 894a145104..150f1bba51 100644 --- a/LiteLoader/include/llapi/mc/SlimeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SlimeBlock.hpp @@ -31,219 +31,224 @@ class SlimeBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlimeBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 81 - * @symbol ?updateEntityAfterFallOn\@SlimeBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z + * @vftbl 81 + * @symbol ?updateEntityAfterFallOn\@SlimeBlock\@\@UEBAXAEBVBlockPos\@\@AEAUUpdateEntityAfterFallOnInterface\@\@\@Z */ virtual void updateEntityAfterFallOn(class BlockPos const &, struct UpdateEntityAfterFallOnInterface &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 164 - * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@SlimeBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 169 - * @symbol ?onFallOn\@SlimeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z + * @vftbl 169 + * @symbol ?onFallOn\@SlimeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@M\@Z */ virtual void onFallOn(class BlockSource &, class BlockPos const &, class Actor &, float) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 181 - * @symbol ?getExtraRenderLayers\@SlimeBlock\@\@UEBAHXZ + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 182 + * @symbol ?getExtraRenderLayers\@SlimeBlock\@\@UEBAHXZ */ virtual int getExtraRenderLayers() const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLIMEBLOCK /** - * @symbol ?isBounceBlock\@SlimeBlock\@\@UEBA_NXZ + * @symbol ?isBounceBlock\@SlimeBlock\@\@UEBA_NXZ */ MCVAPI bool isBounceBlock() const; #endif /** - * @symbol ??0SlimeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SlimeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SlimeBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp index 7e6bff144e..8ab0e917c4 100644 --- a/LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeFloatDefinition.hpp @@ -30,16 +30,16 @@ class SlimeFloatDefinition { public: /** - * @symbol ??0SlimeFloatDefinition\@\@QEAA\@XZ + * @symbol ??0SlimeFloatDefinition\@\@QEAA\@XZ */ MCAPI SlimeFloatDefinition(); /** - * @symbol ?initialize\@SlimeFloatDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeFloatGoal\@\@\@Z + * @symbol ?initialize\@SlimeFloatDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeFloatGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SlimeFloatGoal &) const; /** - * @symbol ?buildSchema\@SlimeFloatDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeFloatDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SlimeFloatDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeFloatDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp b/LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp index 151626ee78..381b93138e 100644 --- a/LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeFloatGoal.hpp @@ -30,48 +30,48 @@ class SlimeFloatGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlimeFloatGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SlimeFloatGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SlimeFloatGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SlimeFloatGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SlimeFloatGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SlimeFloatGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SlimeFloatGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SlimeFloatGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SlimeFloatGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SlimeFloatGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp index d7c0090eda..e6761d187c 100644 --- a/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingDefinition.hpp @@ -30,16 +30,16 @@ class SlimeKeepOnJumpingDefinition { public: /** - * @symbol ??0SlimeKeepOnJumpingDefinition\@\@QEAA\@XZ + * @symbol ??0SlimeKeepOnJumpingDefinition\@\@QEAA\@XZ */ MCAPI SlimeKeepOnJumpingDefinition(); /** - * @symbol ?initialize\@SlimeKeepOnJumpingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeKeepOnJumpingGoal\@\@\@Z + * @symbol ?initialize\@SlimeKeepOnJumpingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeKeepOnJumpingGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SlimeKeepOnJumpingGoal &) const; /** - * @symbol ?buildSchema\@SlimeKeepOnJumpingDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeKeepOnJumpingDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SlimeKeepOnJumpingDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeKeepOnJumpingDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp index cbab9ae453..3651c82f22 100644 --- a/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeKeepOnJumpingGoal.hpp @@ -30,48 +30,48 @@ class SlimeKeepOnJumpingGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlimeKeepOnJumpingGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SlimeKeepOnJumpingGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SlimeKeepOnJumpingGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SlimeKeepOnJumpingGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SlimeKeepOnJumpingGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SlimeKeepOnJumpingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SlimeKeepOnJumpingGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SlimeKeepOnJumpingGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SlimeKeepOnJumpingGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SlimeKeepOnJumpingGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeMoveControl.hpp b/LiteLoader/include/llapi/mc/SlimeMoveControl.hpp index 9620e7747b..b72b6d547e 100644 --- a/LiteLoader/include/llapi/mc/SlimeMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/SlimeMoveControl.hpp @@ -30,18 +30,18 @@ class SlimeMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlimeMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@SlimeMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@SlimeMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0SlimeMoveControl\@\@QEAA\@XZ + * @symbol ??0SlimeMoveControl\@\@QEAA\@XZ */ MCAPI SlimeMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp b/LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp index ef20b1733e..4601a6733b 100644 --- a/LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp +++ b/LiteLoader/include/llapi/mc/SlimeMoveControlDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class SlimeMoveControlDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@SlimeMoveControlDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@SlimeMoveControlDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~SlimeMoveControlDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@SlimeMoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@SlimeMoveControlDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SLIMEMOVECONTROLDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@SlimeMoveControlDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~SlimeMoveControlDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimePostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/SlimePostNormalTickSystem.hpp deleted file mode 100644 index 32bc7ab53e..0000000000 --- a/LiteLoader/include/llapi/mc/SlimePostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file SlimePostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SlimePostNormalTickSystem. - * - */ -class SlimePostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SLIMEPOSTNORMALTICKSYSTEM -public: - class SlimePostNormalTickSystem& operator=(class SlimePostNormalTickSystem const &) = delete; - SlimePostNormalTickSystem(class SlimePostNormalTickSystem const &) = delete; - SlimePostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@SlimePostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doSlimePostNormalTickSystem\@SlimePostNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doSlimePostNormalTickSystem(class StrictEntityContext &, class Optional const>, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp index 3a5f9a69cb..12ddb8d3b0 100644 --- a/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/SlimePreNormalTickSystem.hpp @@ -28,16 +28,16 @@ class SlimePreNormalTickSystem { public: /** - * @symbol ?createSystem\@SlimePreNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SlimePreNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSlimePreNormalTickSystem\@SlimePreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@Z + * @symbol ?_doSlimePreNormalTickSystem\@SlimePreNormalTickSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USlimeWasOnGroundPreNormalTick\@\@\@\@\@\@\@Z */ MCAPI static void _doSlimePreNormalTickSystem(class StrictEntityContext &, class ActorOwnerComponent &, class Optional const>, class EntityModifierT>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp b/LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp index cae1d13930..b038b90ea4 100644 --- a/LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SlimeRandomDirectionDefinition.hpp @@ -30,16 +30,16 @@ class SlimeRandomDirectionDefinition { public: /** - * @symbol ??0SlimeRandomDirectionDefinition\@\@QEAA\@XZ + * @symbol ??0SlimeRandomDirectionDefinition\@\@QEAA\@XZ */ MCAPI SlimeRandomDirectionDefinition(); /** - * @symbol ?initialize\@SlimeRandomDirectionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeRandomDirectionGoal\@\@\@Z + * @symbol ?initialize\@SlimeRandomDirectionDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSlimeRandomDirectionGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SlimeRandomDirectionGoal &) const; /** - * @symbol ?buildSchema\@SlimeRandomDirectionDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeRandomDirectionDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SlimeRandomDirectionDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSlimeRandomDirectionDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp b/LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp index aa02f2c7cf..b25937cace 100644 --- a/LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp +++ b/LiteLoader/include/llapi/mc/SlimeRandomDirectionGoal.hpp @@ -30,48 +30,48 @@ class SlimeRandomDirectionGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SlimeRandomDirectionGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SlimeRandomDirectionGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SlimeRandomDirectionGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SlimeRandomDirectionGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SlimeRandomDirectionGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SlimeRandomDirectionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SlimeRandomDirectionGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SlimeRandomDirectionGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SlimeRandomDirectionGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SlimeRandomDirectionGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SlimeSpawnRules.hpp b/LiteLoader/include/llapi/mc/SlimeSpawnRules.hpp index fae097e3e4..974f718cb4 100644 --- a/LiteLoader/include/llapi/mc/SlimeSpawnRules.hpp +++ b/LiteLoader/include/llapi/mc/SlimeSpawnRules.hpp @@ -20,7 +20,7 @@ namespace SlimeSpawnRules { #undef AFTER_EXTRA /** - * @symbol ?checkSpawnRulesCallback\@SlimeSpawnRules\@\@YA_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z + * @symbol ?checkSpawnRulesCallback\@SlimeSpawnRules\@\@YA_NAEBVSpawnConditions\@\@AEAVBlockSource\@\@\@Z */ MCAPI bool checkSpawnRulesCallback(class SpawnConditions const &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/SlotData.hpp b/LiteLoader/include/llapi/mc/SlotData.hpp index e95e26de47..6c1517381b 100644 --- a/LiteLoader/include/llapi/mc/SlotData.hpp +++ b/LiteLoader/include/llapi/mc/SlotData.hpp @@ -29,15 +29,15 @@ struct SlotData { public: /** - * @symbol ??0SlotData\@\@QEAA\@XZ + * @symbol ??0SlotData\@\@QEAA\@XZ */ MCAPI SlotData(); /** - * @symbol ??1SlotData\@\@QEAA\@XZ + * @symbol ??1SlotData\@\@QEAA\@XZ */ MCAPI ~SlotData(); /** - * @symbol ?UNKNOWN_LOCATION\@SlotData\@\@2U1\@A + * @symbol ?UNKNOWN_LOCATION\@SlotData\@\@2U1\@A */ MCAPI static struct SlotData UNKNOWN_LOCATION; diff --git a/LiteLoader/include/llapi/mc/SlotDescriptor.hpp b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp index 8117fecaef..c235c0f277 100644 --- a/LiteLoader/include/llapi/mc/SlotDescriptor.hpp +++ b/LiteLoader/include/llapi/mc/SlotDescriptor.hpp @@ -21,26 +21,25 @@ struct SlotDescriptor { // Add Member There #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SLOTDESCRIPTOR -public: - struct SlotDescriptor& operator=(struct SlotDescriptor const &) = delete; -#endif - public: /** - * @symbol ??0SlotDescriptor\@\@QEAA\@XZ + * @symbol ??0SlotDescriptor\@\@QEAA\@AEBU0\@\@Z */ - MCAPI SlotDescriptor(); + MCAPI SlotDescriptor(struct SlotDescriptor const &); /** - * @symbol ??0SlotDescriptor\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SlotDescriptor\@\@QEAA\@XZ */ - MCAPI SlotDescriptor(struct SlotDescriptor const &); + MCAPI SlotDescriptor(); /** - * @symbol ?addAcceptedItem\@SlotDescriptor\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?addAcceptedItem\@SlotDescriptor\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void addAcceptedItem(class ItemDescriptor const &); /** - * @symbol ??1SlotDescriptor\@\@QEAA\@XZ + * @symbol ??4SlotDescriptor\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct SlotDescriptor & operator=(struct SlotDescriptor const &); + /** + * @symbol ??1SlotDescriptor\@\@QEAA\@XZ */ MCAPI ~SlotDescriptor(); diff --git a/LiteLoader/include/llapi/mc/SlotDropChance.hpp b/LiteLoader/include/llapi/mc/SlotDropChance.hpp index 9a448d14bf..fc5bb50ca9 100644 --- a/LiteLoader/include/llapi/mc/SlotDropChance.hpp +++ b/LiteLoader/include/llapi/mc/SlotDropChance.hpp @@ -27,7 +27,7 @@ struct SlotDropChance { public: /** - * @symbol ?setEquipmentSlot\@SlotDropChance\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setEquipmentSlot\@SlotDropChance\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setEquipmentSlot(std::string const &); diff --git a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp index b3f003bf47..c01cb2d84c 100644 --- a/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmallDripleafBlock.hpp @@ -31,294 +31,299 @@ class SmallDripleafBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmallDripleafBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@SmallDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SmallDripleafBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@SmallDripleafBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@SmallDripleafBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SmallDripleafBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@SmallDripleafBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@SmallDripleafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@SmallDripleafBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 152 - * @symbol ?init\@SmallDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + * @vftbl 152 + * @symbol ?init\@SmallDripleafBlock\@\@UEAAAEAVBlockLegacy\@\@XZ */ virtual class BlockLegacy & init(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SmallDripleafBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@SmallDripleafBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@SmallDripleafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@SmallDripleafBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@SmallDripleafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@SmallDripleafBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SMALLDRIPLEAFBLOCK /** - * @symbol ?canBeSilkTouched\@SmallDripleafBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SmallDripleafBlock\@\@UEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@SmallDripleafBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SmallDripleafBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0SmallDripleafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SmallDripleafBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SmallDripleafBlock(std::string const &, int); /** - * @symbol ?tryPlaceSmallDripleaf\@SmallDripleafBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?tryPlaceSmallDripleaf\@SmallDripleafBlock\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI static bool tryPlaceSmallDripleaf(class BlockSource &, class BlockPos const &, int, int); //private: /** - * @symbol ?_isViablePlacePos\@SmallDripleafBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isViablePlacePos\@SmallDripleafBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isViablePlacePos(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?placeUpperBlock\@SmallDripleafBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?placeUpperBlock\@SmallDripleafBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI static void placeUpperBlock(class BlockSource &, class BlockPos const &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmallFireball.hpp b/LiteLoader/include/llapi/mc/SmallFireball.hpp index 9844a0a0d6..2e786c854a 100644 --- a/LiteLoader/include/llapi/mc/SmallFireball.hpp +++ b/LiteLoader/include/llapi/mc/SmallFireball.hpp @@ -32,133 +32,133 @@ class SmallFireball : public Fireball { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~SmallFireball(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@SmallFireball\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@SmallFireball\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@SmallFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@SmallFireball\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); /** - * @symbol ??0SmallFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0SmallFireball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI SmallFireball(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmeltItemFunction.hpp b/LiteLoader/include/llapi/mc/SmeltItemFunction.hpp index 1c64251320..ca630d788f 100644 --- a/LiteLoader/include/llapi/mc/SmeltItemFunction.hpp +++ b/LiteLoader/include/llapi/mc/SmeltItemFunction.hpp @@ -32,23 +32,23 @@ class SmeltItemFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmeltItemFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SmeltItemFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SmeltItemFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SmeltItemFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SmeltItemFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SmeltItemFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SmeltItemFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp index 2d0c27cf36..f9995a6a05 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableBlock.hpp @@ -31,208 +31,213 @@ class SmithingTableBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmithingTableBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@SmithingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@SmithingTableBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SMITHINGTABLEBLOCK /** - * @symbol ?isCraftingBlock\@SmithingTableBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@SmithingTableBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@SmithingTableBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@SmithingTableBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0SmithingTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SmithingTableBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SmithingTableBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp index 10fe1b6414..1b0577bb68 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableContainerManagerModel.hpp @@ -31,60 +31,60 @@ class SmithingTableContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmithingTableContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@SmithingTableContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@SmithingTableContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@SmithingTableContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@SmithingTableContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@SmithingTableContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@SmithingTableContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@SmithingTableContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@SmithingTableContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@SmithingTableContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@SmithingTableContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@SmithingTableContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@SmithingTableContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@SmithingTableContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@SmithingTableContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0SmithingTableContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0SmithingTableContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI SmithingTableContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); /** - * @symbol ?INPUT_SLOT\@SmithingTableContainerManagerModel\@\@2HB + * @symbol ?INPUT_SLOT\@SmithingTableContainerManagerModel\@\@2HB */ MCAPI static int const INPUT_SLOT; /** - * @symbol ?MATERIAL_SLOT\@SmithingTableContainerManagerModel\@\@2HB + * @symbol ?MATERIAL_SLOT\@SmithingTableContainerManagerModel\@\@2HB */ MCAPI static int const MATERIAL_SLOT; /** - * @symbol ?RESULT_SLOT\@SmithingTableContainerManagerModel\@\@2HB + * @symbol ?RESULT_SLOT\@SmithingTableContainerManagerModel\@\@2HB */ MCAPI static int const RESULT_SLOT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTableContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/SmithingTableContainerScreenValidator.hpp index 2bf9de2856..53238728ce 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class SmithingTableContainerScreenValidator : public ContainerScreenValidatorBas public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmithingTableContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0SmithingTableContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0SmithingTableContainerScreenValidator\@\@QEAA\@XZ */ MCAPI SmithingTableContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp index ad952d2693..386392c2f4 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableInputContainerValidation.hpp @@ -31,54 +31,54 @@ class SmithingTableInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmithingTableInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@SmithingTableInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@SmithingTableInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp b/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp index 749eb1be33..5bc0a3e1d6 100644 --- a/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTableMaterialContainerValidation.hpp @@ -31,54 +31,54 @@ class SmithingTableMaterialContainerValidation : public ContainerValidationBase public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmithingTableMaterialContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@SmithingTableMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@SmithingTableMaterialContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp b/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp index 8792afd0d7..d6f321eced 100644 --- a/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp +++ b/LiteLoader/include/llapi/mc/SmithingTransformRecipe.hpp @@ -26,34 +26,34 @@ class SmithingTransformRecipe : public ShapelessRecipe { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmithingTransformRecipe(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z + * @vftbl 1 + * @symbol ?assemble\@SmithingTransformRecipe\@\@UEBAAEBV?$vector\@VItemInstance\@\@V?$allocator\@VItemInstance\@\@\@std\@\@\@std\@\@AEAVCraftingContainer\@\@\@Z */ virtual std::vector const & assemble(class CraftingContainer &) const; /** - * @symbol ??0SmithingTransformRecipe\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRecipeIngredient\@\@1AEBVItemInstance\@\@AEBVHashedString\@\@\@Z + * @symbol ??0SmithingTransformRecipe\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVRecipeIngredient\@\@1AEBVItemInstance\@\@AEBVHashedString\@\@\@Z */ MCAPI SmithingTransformRecipe(std::string const &, class RecipeIngredient const &, class RecipeIngredient const &, class ItemInstance const &, class HashedString const &); /** - * @symbol ?getAddition\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + * @symbol ?getAddition\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ */ MCAPI class RecipeIngredient const & getAddition() const; /** - * @symbol ?getBase\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ + * @symbol ?getBase\@SmithingTransformRecipe\@\@QEBAAEBVRecipeIngredient\@\@XZ */ MCAPI class RecipeIngredient const & getBase() const; /** - * @symbol ?getResult\@SmithingTransformRecipe\@\@QEBAAEBVItemInstance\@\@XZ + * @symbol ?getResult\@SmithingTransformRecipe\@\@QEBAAEBVItemInstance\@\@XZ */ MCAPI class ItemInstance const & getResult() const; /** - * @symbol ?ID\@SmithingTransformRecipe\@\@2VUUID\@mce\@\@B + * @symbol ?ID\@SmithingTransformRecipe\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const ID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmokerBlock.hpp b/LiteLoader/include/llapi/mc/SmokerBlock.hpp index 0b2ce74eac..2de43bf00d 100644 --- a/LiteLoader/include/llapi/mc/SmokerBlock.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlock.hpp @@ -31,213 +31,218 @@ class SmokerBlock : public FurnaceBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmokerBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@SmokerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@SmokerBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SmokerBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0SmokerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z + * @symbol ??0SmokerBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_N\@Z */ MCAPI SmokerBlock(std::string const &, int, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmokerBlockActor.hpp b/LiteLoader/include/llapi/mc/SmokerBlockActor.hpp index 1a409cbb39..ebf87ab059 100644 --- a/LiteLoader/include/llapi/mc/SmokerBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SmokerBlockActor.hpp @@ -31,13 +31,13 @@ class SmokerBlockActor { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SMOKERBLOCKACTOR /** - * @symbol ?getName\@SmokerBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@SmokerBlockActor\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string getName() const; #endif /** - * @symbol ??0SmokerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SmokerBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SmokerBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp index 920323fd33..13f75cbf4c 100644 --- a/LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/SmokerContainerManagerModel.hpp @@ -31,13 +31,13 @@ class SmokerContainerManagerModel : public FurnaceContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmokerContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @symbol ??0SmokerContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0SmokerContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI SmokerContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmokerContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/SmokerContainerScreenValidator.hpp index 2052d897a7..0439f58822 100644 --- a/LiteLoader/include/llapi/mc/SmokerContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/SmokerContainerScreenValidator.hpp @@ -30,13 +30,13 @@ class SmokerContainerScreenValidator : public FurnaceContainerScreenValidator { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmokerContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0SmokerContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0SmokerContainerScreenValidator\@\@QEAA\@XZ */ MCAPI SmokerContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp b/LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp index 56feb5aa13..6ce2d04e91 100644 --- a/LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp +++ b/LiteLoader/include/llapi/mc/SmoothStoneSelector.hpp @@ -30,14 +30,20 @@ class SmoothStoneSelector { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SmoothStoneSelector(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?next\@SmoothStoneSelector\@\@UEBAAEBVBlock\@\@AEAVRandom\@\@HHH_N\@Z + * @vftbl 1 + * @symbol ?next\@SmoothStoneSelector\@\@UEBAAEBVBlock\@\@AEAVRandom\@\@HHH_N\@Z */ virtual class Block const & next(class Random &, int, int, int, bool) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SMOOTHSTONESELECTOR + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SmoothStoneSelector(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SnackGoal.hpp b/LiteLoader/include/llapi/mc/SnackGoal.hpp index f426499ee8..70ca62de6e 100644 --- a/LiteLoader/include/llapi/mc/SnackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SnackGoal.hpp @@ -30,107 +30,107 @@ class SnackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SnackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SnackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SnackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SnackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SnackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SnackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SnackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SnackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SnackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SnackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SnackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SnackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SnackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?getRandomEatingEnd\@SnackGoal\@\@MEBAHXZ + * @vftbl 10 + * @symbol ?getRandomEatingEnd\@SnackGoal\@\@MEBAHXZ */ virtual int getRandomEatingEnd() const; /** - * @symbol ??0SnackGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@MMM\@Z + * @symbol ??0SnackGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@MMM\@Z */ MCAPI SnackGoal(class Mob &, std::vector const &, float, float, float); //private: /** - * @symbol ?_hasSnackableItems\@SnackGoal\@\@AEAA_NXZ + * @symbol ?_hasSnackableItems\@SnackGoal\@\@AEAA_NXZ */ MCAPI bool _hasSnackableItems(); /** - * @symbol ?_isSnackableItem\@SnackGoal\@\@AEBA_NAEBVItemStack\@\@\@Z + * @symbol ?_isSnackableItem\@SnackGoal\@\@AEBA_NAEBVItemStack\@\@\@Z */ MCAPI bool _isSnackableItem(class ItemStack const &) const; /** - * @symbol ?_updateHand\@SnackGoal\@\@AEAAXAEBVItemStack\@\@\@Z + * @symbol ?_updateHand\@SnackGoal\@\@AEAAXAEBVItemStack\@\@\@Z */ MCAPI void _updateHand(class ItemStack const &); private: /** - * @symbol ?CHEW_CHANCE\@SnackGoal\@\@0HB + * @symbol ?CHEW_CHANCE\@SnackGoal\@\@0HB */ MCAPI static int const CHEW_CHANCE; /** - * @symbol ?EATING_TIME\@SnackGoal\@\@0HB + * @symbol ?EATING_TIME\@SnackGoal\@\@0HB */ MCAPI static int const EATING_TIME; /** - * @symbol ?PATH_RANGE\@SnackGoal\@\@0MB + * @symbol ?PATH_RANGE\@SnackGoal\@\@0MB */ MCAPI static float const PATH_RANGE; /** - * @symbol ?RANDOM_EATING_END\@SnackGoal\@\@0HB + * @symbol ?RANDOM_EATING_END\@SnackGoal\@\@0HB */ MCAPI static int const RANDOM_EATING_END; /** - * @symbol ?RANDOM_EATING_START\@SnackGoal\@\@0HB + * @symbol ?RANDOM_EATING_START\@SnackGoal\@\@0HB */ MCAPI static int const RANDOM_EATING_START; /** - * @symbol ?SEARCH_SIZE\@SnackGoal\@\@0MB + * @symbol ?SEARCH_SIZE\@SnackGoal\@\@0MB */ MCAPI static float const SEARCH_SIZE; /** - * @symbol ?STOP_DIST_SQRD\@SnackGoal\@\@0MB + * @symbol ?STOP_DIST_SQRD\@SnackGoal\@\@0MB */ MCAPI static float const STOP_DIST_SQRD; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SnapToSurfaceFeature.hpp b/LiteLoader/include/llapi/mc/SnapToSurfaceFeature.hpp index 72a498e28a..b4f7ff217e 100644 --- a/LiteLoader/include/llapi/mc/SnapToSurfaceFeature.hpp +++ b/LiteLoader/include/llapi/mc/SnapToSurfaceFeature.hpp @@ -31,26 +31,26 @@ enum class Surface; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SnapToSurfaceFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@SnapToSurfaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@SnapToSurfaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0SnapToSurfaceFeature\@\@QEAA\@XZ + * @symbol ??0SnapToSurfaceFeature\@\@QEAA\@XZ */ MCAPI SnapToSurfaceFeature(); //private: /** - * @symbol ?_findSnapPos\@SnapToSurfaceFeature\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@W4Surface\@1\@\@Z + * @symbol ?_findSnapPos\@SnapToSurfaceFeature\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@W4Surface\@1\@\@Z */ MCAPI class std::optional _findSnapPos(class IBlockWorldGenAPI &, class BlockPos const &, enum class SnapToSurfaceFeature::Surface) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SnapshotEnv.hpp b/LiteLoader/include/llapi/mc/SnapshotEnv.hpp index f7bb603cb1..5a95820c00 100644 --- a/LiteLoader/include/llapi/mc/SnapshotEnv.hpp +++ b/LiteLoader/include/llapi/mc/SnapshotEnv.hpp @@ -31,124 +31,124 @@ class SnapshotEnv { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SnapshotEnv(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?NewSequentialFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z + * @vftbl 1 + * @symbol ?NewSequentialFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVSequentialFile\@3\@\@Z */ virtual class leveldb::Status NewSequentialFile(std::string const &, class leveldb::SequentialFile **); /** - * @vftbl 2 - * @symbol ?NewRandomAccessFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z + * @vftbl 2 + * @symbol ?NewRandomAccessFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVRandomAccessFile\@3\@\@Z */ virtual class leveldb::Status NewRandomAccessFile(std::string const &, class leveldb::RandomAccessFile **); /** - * @vftbl 3 - * @symbol ?NewWritableFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @vftbl 3 + * @symbol ?NewWritableFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ virtual class leveldb::Status NewWritableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 4 - * @symbol ?NewAppendableFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z + * @vftbl 4 + * @symbol ?NewAppendableFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVWritableFile\@3\@\@Z */ virtual class leveldb::Status NewAppendableFile(std::string const &, class leveldb::WritableFile **); /** - * @vftbl 5 - * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 5 + * @symbol ?FileExists\@EnvWrapper\@leveldb\@\@UEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool FileExists(std::string const &); /** - * @vftbl 6 - * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z + * @vftbl 6 + * @symbol ?GetChildren\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAV?$vector\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$allocator\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@\@5\@\@Z */ virtual class leveldb::Status GetChildren(std::string const &, std::vector *); /** - * @vftbl 7 - * @symbol ?DeleteFileA\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?DeleteFileA\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteFileA(std::string const &); /** - * @vftbl 8 - * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 8 + * @symbol ?CreateDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status CreateDir(std::string const &); /** - * @vftbl 9 - * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?DeleteDir\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status DeleteDir(std::string const &); /** - * @vftbl 10 - * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z + * @vftbl 10 + * @symbol ?GetFileSize\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEA_K\@Z */ virtual class leveldb::Status GetFileSize(std::string const &, unsigned __int64 *); /** - * @vftbl 11 - * @symbol ?RenameFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @vftbl 11 + * @symbol ?RenameFile\@SnapshotEnv\@\@UEAA?AVStatus\@leveldb\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ virtual class leveldb::Status RenameFile(std::string const &, std::string const &); /** - * @vftbl 12 - * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z + * @vftbl 12 + * @symbol ?LockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVFileLock\@2\@\@Z */ virtual class leveldb::Status LockFile(std::string const &, class leveldb::FileLock **); /** - * @vftbl 13 - * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z + * @vftbl 13 + * @symbol ?UnlockFile\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAVFileLock\@2\@\@Z */ virtual class leveldb::Status UnlockFile(class leveldb::FileLock *); /** - * @vftbl 14 - * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 14 + * @symbol ?Schedule\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void Schedule(void ( *)(void *), void *); /** - * @vftbl 15 - * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z + * @vftbl 15 + * @symbol ?StartThread\@EnvWrapper\@leveldb\@\@UEAAXP6AXPEAX\@Z0\@Z */ virtual void StartThread(void ( *)(void *), void *); /** - * @vftbl 16 - * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 16 + * @symbol ?GetTestDirectory\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@PEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual class leveldb::Status GetTestDirectory(std::string *); /** - * @vftbl 17 - * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z + * @vftbl 17 + * @symbol ?NewLogger\@EnvWrapper\@leveldb\@\@UEAA?AVStatus\@2\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAPEAVLogger\@2\@\@Z */ virtual class leveldb::Status NewLogger(std::string const &, class leveldb::Logger **); /** - * @vftbl 18 - * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ + * @vftbl 18 + * @symbol ?NowMicros\@EnvWrapper\@leveldb\@\@UEAA_KXZ */ virtual unsigned __int64 NowMicros(); /** - * @vftbl 19 - * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z + * @vftbl 19 + * @symbol ?SleepForMicroseconds\@EnvWrapper\@leveldb\@\@UEAAXH\@Z */ virtual void SleepForMicroseconds(int); /** - * @symbol ??0SnapshotEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z + * @symbol ??0SnapshotEnv\@\@QEAA\@PEAVEnv\@leveldb\@\@\@Z */ MCAPI SnapshotEnv(class leveldb::Env *); /** - * @symbol ?createSnapshot\@SnapshotEnv\@\@QEAA?AV?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?createSnapshot\@SnapshotEnv\@\@QEAA?AV?$vector\@USnapshotFilenameAndLength\@\@V?$allocator\@USnapshotFilenameAndLength\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ MCAPI std::vector createSnapshot(class Core::Path const &); /** - * @symbol ?releaseSnapshot\@SnapshotEnv\@\@QEAAXXZ + * @symbol ?releaseSnapshot\@SnapshotEnv\@\@QEAAXXZ */ MCAPI void releaseSnapshot(); //private: /** - * @symbol ?_isQueuedForRemoval\@SnapshotEnv\@\@AEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @symbol ?_isQueuedForRemoval\@SnapshotEnv\@\@AEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ MCAPI bool _isQueuedForRemoval(class Core::PathBuffer const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp b/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp index 033b740e18..85be869672 100644 --- a/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp +++ b/LiteLoader/include/llapi/mc/SnapshotWritableFile.hpp @@ -30,33 +30,33 @@ class SnapshotWritableFile { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SnapshotWritableFile(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?Append\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z + * @vftbl 1 + * @symbol ?Append\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@AEBVSlice\@3\@\@Z */ virtual class leveldb::Status Append(class leveldb::Slice const &); /** - * @vftbl 2 - * @symbol ?Close\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 2 + * @symbol ?Close\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Close(); /** - * @vftbl 3 - * @symbol ?Flush\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 3 + * @symbol ?Flush\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Flush(); /** - * @vftbl 4 - * @symbol ?Sync\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ + * @vftbl 4 + * @symbol ?Sync\@SnapshotWritableFile\@\@UEAA?AVStatus\@leveldb\@\@XZ */ virtual class leveldb::Status Sync(); /** - * @symbol ??0SnapshotWritableFile\@\@QEAA\@$$QEAPEAVWritableFile\@leveldb\@\@AEAVshared_mutex\@std\@\@\@Z + * @symbol ??0SnapshotWritableFile\@\@QEAA\@$$QEAPEAVWritableFile\@leveldb\@\@AEAVshared_mutex\@std\@\@\@Z */ MCAPI SnapshotWritableFile(class leveldb::WritableFile *&&, class std::shared_mutex &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SneakInputSystem.hpp b/LiteLoader/include/llapi/mc/SneakInputSystem.hpp deleted file mode 100644 index 4a9406ced1..0000000000 --- a/LiteLoader/include/llapi/mc/SneakInputSystem.hpp +++ /dev/null @@ -1,35 +0,0 @@ -/** - * @file SneakInputSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class SneakInputSystem. - * - */ -class SneakInputSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SNEAKINPUTSYSTEM -public: - class SneakInputSystem& operator=(class SneakInputSystem const &) = delete; - SneakInputSystem(class SneakInputSystem const &) = delete; - SneakInputSystem() = delete; -#endif - -public: - /** - * @symbol ?createSneakInputSystem\@SneakInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSneakInputSystem(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp index b684d34458..f0602752b9 100644 --- a/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakMovementSystem.hpp @@ -11,54 +11,54 @@ #undef BEFORE_EXTRA -struct SneakMovementSystem { +class SneakMovementSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SNEAKMOVEMENTSYSTEM public: - struct SneakMovementSystem& operator=(struct SneakMovementSystem const &) = delete; - SneakMovementSystem(struct SneakMovementSystem const &) = delete; + class SneakMovementSystem& operator=(class SneakMovementSystem const &) = delete; + SneakMovementSystem(class SneakMovementSystem const &) = delete; SneakMovementSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SneakMovementSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@SneakMovementSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@UMoveRequestComponent\@\@UStateVectorComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@ULocalSpatialEntityFetcherFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@SneakMovementSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, 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, 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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ - 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, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, 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, 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 + * @symbol ?create\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createSideBySide\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySide\@SneakMovementSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySide(); /** - * @symbol ?tickSneakMovementSystem\@SneakMovementSystem\@\@SAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@AEBUAABBShapeComponent\@\@AEBUDimensionTypeComponent\@\@AEBUMaxAutoStepComponent\@\@AEBUSynchedActorDataComponent\@\@AEAUMoveRequestComponent\@\@AEAUStateVectorComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@V?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@UDimensionTypeComponent\@\@UMaxAutoStepComponent\@\@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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ - MCAPI static void tickSneakMovementSystem(class StrictEntityContext const &, class Optional const>, class Optional const>, 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, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent>, struct Read, struct DimensionTypeComponent, struct MaxAutoStepComponent, 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, 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 new file mode 100644 index 0000000000..a5b1b0ceb2 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SneakTriggerSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file SneakTriggerSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SneakTriggerSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SNEAKTRIGGERSYSTEM +public: + class SneakTriggerSystem& operator=(class SneakTriggerSystem const &) = delete; + SneakTriggerSystem(class SneakTriggerSystem const &) = delete; + SneakTriggerSystem() = delete; +#endif + +public: + /** + * @symbol ?createTriggerSideBySideSystem\@SneakTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createTriggerSideBySideSystem(); + /** + * @symbol ?createTriggerSystem\@SneakTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createTriggerSystem(); + /** + * @symbol ?updatePlayerState\@SneakTriggerSystem\@\@SA?AV?$optional\@_N\@std\@\@AEBVGetCollisionShapeInterface\@\@AEBVAABB\@\@AEBVVec2\@\@_N33MPEAUPlayerActionComponent\@\@AEBVIConstBlockSource\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@3\@\@Z + */ + MCAPI static class std::optional updatePlayerState(class GetCollisionShapeInterface const &, class AABB const &, class Vec2 const &, bool, bool, bool, float, struct PlayerActionComponent *, class IConstBlockSource const &, std::vector &); + +}; diff --git a/LiteLoader/include/llapi/mc/SneakingSystem.hpp b/LiteLoader/include/llapi/mc/SneakingSystem.hpp index 73b97852f3..4a6ad95a47 100644 --- a/LiteLoader/include/llapi/mc/SneakingSystem.hpp +++ b/LiteLoader/include/llapi/mc/SneakingSystem.hpp @@ -28,28 +28,28 @@ class SneakingSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SneakingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@SneakingSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorTickedFlag\@\@\@\@\@\@U?$Read\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Write\@USneakingComponent\@\@VActorOwnerComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@SneakingSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorTickedFlag\@\@\@\@\@\@U?$Read\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Write\@USneakingComponent\@\@VActorOwnerComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@$$V\@\@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 ?_tickSneakingSystem\@SneakingSystem\@\@SAXAEAVStrictEntityContext\@\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAUSneakingComponent\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_tickSneakingSystem\@SneakingSystem\@\@SAXAEAVStrictEntityContext\@\@AEBV?$FlagComponent\@UPlayerComponentFlag\@\@\@\@AEAUSneakingComponent\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tickSneakingSystem(class StrictEntityContext &, class FlagComponent const &, struct SneakingComponent &, class ActorOwnerComponent &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SneezeGoal.hpp b/LiteLoader/include/llapi/mc/SneezeGoal.hpp index aaa5d86414..181703261c 100644 --- a/LiteLoader/include/llapi/mc/SneezeGoal.hpp +++ b/LiteLoader/include/llapi/mc/SneezeGoal.hpp @@ -30,48 +30,48 @@ class SneezeGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SneezeGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SneezeGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SneezeGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SneezeGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SneezeGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SneezeGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SneezeGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SneezeGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SneezeGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SneezeGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SneezeGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SneezeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SneezeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SneezeGoal\@\@QEAA\@AEAVMob\@\@MMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11MAEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@3\@M\@Z + * @symbol ??0SneezeGoal\@\@QEAA\@AEAVMob\@\@MMMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11MAEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@3\@M\@Z */ MCAPI SneezeGoal(class Mob &, float, float, float, std::string const &, std::string const &, std::string const &, float, std::vector const &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SniffGoal.hpp b/LiteLoader/include/llapi/mc/SniffGoal.hpp index c35c985ac8..2fa3670d3d 100644 --- a/LiteLoader/include/llapi/mc/SniffGoal.hpp +++ b/LiteLoader/include/llapi/mc/SniffGoal.hpp @@ -28,60 +28,60 @@ class SniffGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SniffGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SniffGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SniffGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SniffGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SniffGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SniffGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SniffGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SniffGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SniffGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SniffGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SniffGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SniffGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SniffGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SniffGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SniffGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SniffGoal(class Mob &); //private: /** - * @symbol ?_fetchNearbySniffableActors\@SniffGoal\@\@AEBA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@W4ActorType\@\@\@Z + * @symbol ?_fetchNearbySniffableActors\@SniffGoal\@\@AEBA?AV?$vector\@UDistanceSortedActor\@\@V?$allocator\@UDistanceSortedActor\@\@\@std\@\@\@std\@\@W4ActorType\@\@\@Z */ MCAPI std::vector _fetchNearbySniffableActors(enum class ActorType) const; /** - * @symbol ?_fetchNearestSniffableActor\@SniffGoal\@\@AEBA?AV?$optional\@UDistanceSortedActor\@\@\@std\@\@XZ + * @symbol ?_fetchNearestSniffableActor\@SniffGoal\@\@AEBA?AV?$optional\@UDistanceSortedActor\@\@\@std\@\@XZ */ MCAPI class std::optional _fetchNearestSniffableActor() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Sniffer.hpp b/LiteLoader/include/llapi/mc/Sniffer.hpp index 1f5b2d4602..b62349420e 100644 --- a/LiteLoader/include/llapi/mc/Sniffer.hpp +++ b/LiteLoader/include/llapi/mc/Sniffer.hpp @@ -27,138 +27,138 @@ class Sniffer : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Sniffer(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 133 + * @symbol ?getAmbientSound\@Sniffer\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ - virtual void __unk_vfn_179(); + virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Sniffer\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Sniffer\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Sniffer(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SnowBlock.hpp b/LiteLoader/include/llapi/mc/SnowBlock.hpp index a0a8c783fc..b84abb4fb7 100644 --- a/LiteLoader/include/llapi/mc/SnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/SnowBlock.hpp @@ -31,219 +31,224 @@ class SnowBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SnowBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@SnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@SnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 124 - * @symbol ?calcGroundFriction\@SnowBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @vftbl 124 + * @symbol ?calcGroundFriction\@SnowBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z */ virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@SnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SNOWBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@SnowBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@SnowBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0SnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SnowBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Snowball.hpp b/LiteLoader/include/llapi/mc/Snowball.hpp index bbc05bc2fb..abf8cb3152 100644 --- a/LiteLoader/include/llapi/mc/Snowball.hpp +++ b/LiteLoader/include/llapi/mc/Snowball.hpp @@ -32,128 +32,128 @@ class Snowball : public Throwable { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Snowball\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Snowball\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Snowball(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_275(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 277 + * @symbol __unk_vfn_277 */ virtual void __unk_vfn_277(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 - */ - virtual void __unk_vfn_279(); - /** - * @symbol ??0Snowball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Snowball\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Snowball(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SnowballItem.hpp b/LiteLoader/include/llapi/mc/SnowballItem.hpp index 95b0bed04e..5cf2ae1924 100644 --- a/LiteLoader/include/llapi/mc/SnowballItem.hpp +++ b/LiteLoader/include/llapi/mc/SnowballItem.hpp @@ -32,89 +32,89 @@ class SnowballItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SnowballItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@SnowballItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@SnowballItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@SnowballItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@SnowballItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@SnowballItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@SnowballItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Social.hpp b/LiteLoader/include/llapi/mc/Social.hpp index 71880fef79..a769f1bc25 100644 --- a/LiteLoader/include/llapi/mc/Social.hpp +++ b/LiteLoader/include/llapi/mc/Social.hpp @@ -78,7 +78,7 @@ class IUserManager { #undef AFTER_EXTRA /** - * @symbol ?INVALID_CONNECTION\@Social\@\@3VGameConnectionInfo\@1\@B + * @symbol ?INVALID_CONNECTION\@Social\@\@3VGameConnectionInfo\@1\@B */ MCAPI extern class Social::GameConnectionInfo const INVALID_CONNECTION; diff --git a/LiteLoader/include/llapi/mc/SonicBoomGoal.hpp b/LiteLoader/include/llapi/mc/SonicBoomGoal.hpp index aef2cab5fc..b3efaf48e1 100644 --- a/LiteLoader/include/llapi/mc/SonicBoomGoal.hpp +++ b/LiteLoader/include/llapi/mc/SonicBoomGoal.hpp @@ -28,48 +28,48 @@ class SonicBoomGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SonicBoomGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SonicBoomGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SonicBoomGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SonicBoomGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SonicBoomGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SonicBoomGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SonicBoomGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SonicBoomGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SonicBoomGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SonicBoomGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SonicBoomGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SonicBoomGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SonicBoomGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SonicBoomGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SonicBoomGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SonicBoomGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp b/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp index f126301e18..c9364862e6 100644 --- a/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp +++ b/LiteLoader/include/llapi/mc/SortItemInstanceIdAux.hpp @@ -12,7 +12,7 @@ #undef BEFORE_EXTRA -struct SortItemInstanceIdAux { +class SortItemInstanceIdAux { #define AFTER_EXTRA // Add Member There @@ -20,15 +20,15 @@ struct SortItemInstanceIdAux { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SORTITEMINSTANCEIDAUX public: - struct SortItemInstanceIdAux& operator=(struct SortItemInstanceIdAux const &) = delete; - SortItemInstanceIdAux(struct SortItemInstanceIdAux const &) = delete; + class SortItemInstanceIdAux& operator=(class SortItemInstanceIdAux const &) = delete; + SortItemInstanceIdAux(class SortItemInstanceIdAux const &) = delete; SortItemInstanceIdAux() = delete; #endif public: /** - * @symbol ??RSortItemInstanceIdAux\@\@QEBA_NAEBVItemInstance\@\@0\@Z + * @symbol ??RSortItemInstanceIdAux\@\@QEBA_NAEBVItemInstance\@\@0\@Z */ MCAPI bool operator()(class ItemInstance const &, class ItemInstance const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp index b14444110d..2db09a146a 100644 --- a/LiteLoader/include/llapi/mc/SoulSandBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulSandBlock.hpp @@ -31,236 +31,241 @@ class SoulSandBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SoulSandBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@SoulSandBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@SoulSandBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@SoulSandBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SoulSandBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@SoulSandBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@SoulSandBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 124 - * @symbol ?calcGroundFriction\@SoulSandBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @vftbl 124 + * @symbol ?calcGroundFriction\@SoulSandBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z */ virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@SoulSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0SoulSandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0SoulSandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SoulSandBlock(std::string const &, int); /** - * @symbol ?BLOCK_AABB\@SoulSandBlock\@\@2VAABB\@\@A + * @symbol ?BLOCK_AABB\@SoulSandBlock\@\@2VAABB\@\@A */ MCAPI static class AABB BLOCK_AABB; @@ -268,8 +273,8 @@ class SoulSandBlock : public BlockLegacy { private: /** - * @symbol ?SOUL_SAND_BREAKS_FALLING_BLOCK_VERSION\@SoulSandBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?SOUL_SAND_BREAKS_FALLING_BLOCK_VERSION\@SoulSandBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const SOUL_SAND_BREAKS_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp b/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp index ea583641f3..86ef7d93cf 100644 --- a/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp +++ b/LiteLoader/include/llapi/mc/SoulSpeedAttributeSystem.hpp @@ -28,12 +28,12 @@ class SoulSpeedAttributeSystem { public: /** - * @symbol ?_tryProcessSoulSpeed\@SoulSpeedAttributeSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_tryProcessSoulSpeed\@SoulSpeedAttributeSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _tryProcessSoulSpeed(class StrictEntityContext &, class ActorOwnerComponent &); /** - * @symbol ?createSystem\@SoulSpeedAttributeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SoulSpeedAttributeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp b/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp index 3310a0b2ad..d5ce678844 100644 --- a/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp +++ b/LiteLoader/include/llapi/mc/SoulSpeedEnchant.hpp @@ -31,78 +31,78 @@ class SoulSpeedEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SoulSpeedEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@SoulSpeedEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@SoulSpeedEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@SoulSpeedEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@SoulSpeedEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@SoulSpeedEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@SoulSpeedEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SOULSPEEDENCHANT /** - * @symbol ?isDiscoverable\@SoulSpeedEnchant\@\@UEBA_NXZ + * @symbol ?isDiscoverable\@SoulSpeedEnchant\@\@UEBA_NXZ */ MCVAPI bool isDiscoverable() const; /** - * @symbol ?isTreasureOnly\@SoulSpeedEnchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@SoulSpeedEnchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; #endif /** - * @symbol ??0SoulSpeedEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0SoulSpeedEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI SoulSpeedEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI SoulSpeedEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); /** - * @symbol ?SOUL_SPEED_BOOST_UUID\@SoulSpeedEnchant\@\@2VUUID\@mce\@\@B + * @symbol ?SOUL_SPEED_BOOST_UUID\@SoulSpeedEnchant\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SOUL_SPEED_BOOST_UUID; /** - * @symbol ?getLevel\@SoulSpeedEnchant\@\@SAHAEBVActor\@\@\@Z + * @symbol ?getLevel\@SoulSpeedEnchant\@\@SAHAEBVActor\@\@\@Z */ MCAPI static int getLevel(class Actor const &); /** - * @symbol ?getSpeedBoost\@SoulSpeedEnchant\@\@SAMH\@Z + * @symbol ?getSpeedBoost\@SoulSpeedEnchant\@\@SAMH\@Z */ MCAPI static float getSpeedBoost(int); /** - * @symbol ?isActive\@SoulSpeedEnchant\@\@SA_NAEBVActor\@\@\@Z + * @symbol ?isActive\@SoulSpeedEnchant\@\@SA_NAEBVActor\@\@\@Z */ MCAPI static bool isActive(class Actor const &); /** - * @symbol ?shouldSpawnParticles\@SoulSpeedEnchant\@\@SA_NAEBVActor\@\@\@Z + * @symbol ?shouldSpawnParticles\@SoulSpeedEnchant\@\@SA_NAEBVActor\@\@\@Z */ MCAPI static bool shouldSpawnParticles(class Actor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp index 8eb42d9308..8bee0269ea 100644 --- a/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/SoulTorchBlock.hpp @@ -31,203 +31,208 @@ class SoulTorchBlock : public TorchBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SoulTorchBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@SoulTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@SoulTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@SoulTorchBlock\@\@UEAAXXZ + */ + virtual void _addHardCodedBlockComponents(); + /** + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SoulTorchBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @symbol ??0SoulTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SoulTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SoulTorchBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoundDefinition.hpp b/LiteLoader/include/llapi/mc/SoundDefinition.hpp index 0f3644eeb3..59d656925e 100644 --- a/LiteLoader/include/llapi/mc/SoundDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SoundDefinition.hpp @@ -28,8 +28,8 @@ class SoundDefinition { public: /** - * @symbol ??1SoundDefinition\@\@QEAA\@XZ + * @symbol ??1SoundDefinition\@\@QEAA\@XZ */ MCAPI ~SoundDefinition(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoundEventRequest.hpp b/LiteLoader/include/llapi/mc/SoundEventRequest.hpp new file mode 100644 index 0000000000..b3984e0e1f --- /dev/null +++ b/LiteLoader/include/llapi/mc/SoundEventRequest.hpp @@ -0,0 +1,40 @@ +/** + * @file SoundEventRequest.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +struct SoundEventRequest { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SOUNDEVENTREQUEST +public: + struct SoundEventRequest& operator=(struct SoundEventRequest const &) = delete; + SoundEventRequest(struct SoundEventRequest const &) = delete; + SoundEventRequest() = delete; +#endif + +public: + /** + * @symbol ??0SoundEventRequest\@\@QEAA\@$$QEAU0\@\@Z + */ + MCAPI SoundEventRequest(struct SoundEventRequest &&); + /** + * @symbol ??1SoundEventRequest\@\@QEAA\@XZ + */ + MCAPI ~SoundEventRequest(); + /** + * @symbol ?tryPlaySound\@SoundEventRequest\@\@SA?AV?$optional\@USoundEventRequest\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVSynchedActorData\@\@AEBUActorDefinitionIdentifier\@\@W4LevelSoundEvent\@\@AEBVVec3\@\@H\@Z + */ + MCAPI static class std::optional tryPlaySound(class AutomaticID, class SynchedActorData const &, struct ActorDefinitionIdentifier const &, enum class LevelSoundEvent, class Vec3 const &, int); + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp b/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp index add55fe3de..cac4e9811a 100644 --- a/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp +++ b/LiteLoader/include/llapi/mc/SoundEventRequestQueueComponent.hpp @@ -28,11 +28,11 @@ struct SoundEventRequestQueueComponent { public: /** - * @symbol ??0SoundEventRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SoundEventRequestQueueComponent\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SoundEventRequestQueueComponent(struct SoundEventRequestQueueComponent &&); /** - * @symbol ??1SoundEventRequestQueueComponent\@\@QEAA\@XZ + * @symbol ??1SoundEventRequestQueueComponent\@\@QEAA\@XZ */ MCAPI ~SoundEventRequestQueueComponent(); diff --git a/LiteLoader/include/llapi/mc/SoundEventSystem.hpp b/LiteLoader/include/llapi/mc/SoundEventSystem.hpp index 799da81407..d25bb55286 100644 --- a/LiteLoader/include/llapi/mc/SoundEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/SoundEventSystem.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "SoundEventRequest.hpp" #define BEFORE_EXTRA @@ -28,16 +29,16 @@ class SoundEventSystem { public: /** - * @symbol ?_playSound\@SoundEventSystem\@\@SAXAEAVILevel\@\@AEBUSoundEventRequest\@\@AEBUSynchronizedPlainData\@3\@\@Z + * @symbol ?_playSound\@SoundEventSystem\@\@SAXAEAVILevel\@\@AEBUSoundEventRequest\@\@AEBUSynchronizedPlainData\@3\@\@Z */ MCAPI static void _playSound(class ILevel &, struct SoundEventRequest const &, struct SoundEventRequest::SynchronizedPlainData const &); /** - * @symbol ?_tick\@SoundEventSystem\@\@SAXAEBVStrictEntityContext\@\@AEAVLevelComponent\@\@AEAUSoundEventRequestQueueComponent\@\@\@Z + * @symbol ?_tick\@SoundEventSystem\@\@SAXAEBVStrictEntityContext\@\@AEAVLevelComponent\@\@AEAUSoundEventRequestQueueComponent\@\@\@Z */ MCAPI static void _tick(class StrictEntityContext const &, class LevelComponent &, struct SoundEventRequestQueueComponent &); /** - * @symbol ?create\@SoundEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@SoundEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp b/LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp index aa60867c36..8e53a84e6c 100644 --- a/LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp +++ b/LiteLoader/include/llapi/mc/SoundPlayerInterface.hpp @@ -30,4 +30,4 @@ class SoundPlayerInterface { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SoundVolumeDefinition.hpp b/LiteLoader/include/llapi/mc/SoundVolumeDefinition.hpp index b2577cb09b..3ab5e44e09 100644 --- a/LiteLoader/include/llapi/mc/SoundVolumeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SoundVolumeDefinition.hpp @@ -31,11 +31,11 @@ struct SoundVolumeDefinition { public: /** - * @symbol ?initialize\@SoundVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@SoundVolumeDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@SoundVolumeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@USoundVolumeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@SoundVolumeDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@USoundVolumeDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/SparklerItem.hpp b/LiteLoader/include/llapi/mc/SparklerItem.hpp index 72d8011769..4ae6712783 100644 --- a/LiteLoader/include/llapi/mc/SparklerItem.hpp +++ b/LiteLoader/include/llapi/mc/SparklerItem.hpp @@ -38,116 +38,116 @@ struct ColorInfo { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SparklerItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 49 - * @symbol ?isHandEquipped\@SparklerItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@SparklerItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@SparklerItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@SparklerItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 101 - * @symbol ?inventoryTick\@SparklerItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z + * @vftbl 101 + * @symbol ?inventoryTick\@SparklerItem\@\@UEBA_NAEAVItemStack\@\@AEAVLevel\@\@AEAVActor\@\@H_N\@Z */ virtual bool inventoryTick(class ItemStack &, class Level &, class Actor &, int, bool) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@SparklerItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@SparklerItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@SparklerItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 122 - * @symbol ?getLightEmission\@SparklerItem\@\@UEBA?AUBrightness\@\@H\@Z + * @vftbl 122 + * @symbol ?getLightEmission\@SparklerItem\@\@UEBA?AUBrightness\@\@H\@Z */ virtual struct Brightness getLightEmission(int) const; /** - * @symbol ??0SparklerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SparklerItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SparklerItem(std::string const &, int); /** - * @symbol ?COLORS\@SparklerItem\@\@2QBUColorInfo\@1\@B + * @symbol ?COLORS\@SparklerItem\@\@2QBUColorInfo\@1\@B */ MCAPI static struct SparklerItem::ColorInfo const COLORS[]; /** - * @symbol ?MAX_ACTIVE_TICKS\@SparklerItem\@\@2HB + * @symbol ?MAX_ACTIVE_TICKS\@SparklerItem\@\@2HB */ MCAPI static int const MAX_ACTIVE_TICKS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SparseContainer.hpp b/LiteLoader/include/llapi/mc/SparseContainer.hpp index 340f085d50..73fce48a03 100644 --- a/LiteLoader/include/llapi/mc/SparseContainer.hpp +++ b/LiteLoader/include/llapi/mc/SparseContainer.hpp @@ -30,32 +30,32 @@ class SparseContainer { public: /** - * @symbol ?_isSlotInRange\@SparseContainer\@\@QEBA_NH\@Z + * @symbol ?_isSlotInRange\@SparseContainer\@\@QEBA_NH\@Z */ MCAPI bool _isSlotInRange(int) const; /** - * @symbol ?addItemNetworkChangedCallback\@SparseContainer\@\@QEAAXW4ContainerEnumName\@\@V?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z + * @symbol ?addItemNetworkChangedCallback\@SparseContainer\@\@QEAAXW4ContainerEnumName\@\@V?$function\@$$A6AXHAEBVItemStack\@\@0\@Z\@std\@\@\@Z */ MCAPI void addItemNetworkChangedCallback(enum class ContainerEnumName, class std::function); /** - * @symbol ?isUsingLegacyScreenTransactions\@SparseContainer\@\@QEBA_NXZ + * @symbol ?isUsingLegacyScreenTransactions\@SparseContainer\@\@QEBA_NXZ */ MCAPI bool isUsingLegacyScreenTransactions() const; /** - * @symbol ?removeItemNetworkChangedCallback\@SparseContainer\@\@QEAAXW4ContainerEnumName\@\@\@Z + * @symbol ?removeItemNetworkChangedCallback\@SparseContainer\@\@QEAAXW4ContainerEnumName\@\@\@Z */ MCAPI void removeItemNetworkChangedCallback(enum class ContainerEnumName); //protected: /** - * @symbol ?_onItemNetworkChanged\@SparseContainer\@\@IEAAXHAEBVItemStack\@\@0\@Z + * @symbol ?_onItemNetworkChanged\@SparseContainer\@\@IEAAXHAEBVItemStack\@\@0\@Z */ MCAPI void _onItemNetworkChanged(int, class ItemStack const &, class ItemStack const &); /** - * @symbol ?_setBackingContainerSlot\@SparseContainer\@\@IEAAXHAEBVItemStack\@\@\@Z + * @symbol ?_setBackingContainerSlot\@SparseContainer\@\@IEAAXHAEBVItemStack\@\@\@Z */ MCAPI void _setBackingContainerSlot(int, class ItemStack const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SparseContainerClient.hpp b/LiteLoader/include/llapi/mc/SparseContainerClient.hpp index dbe737c23d..ad288a5f94 100644 --- a/LiteLoader/include/llapi/mc/SparseContainerClient.hpp +++ b/LiteLoader/include/llapi/mc/SparseContainerClient.hpp @@ -32,7 +32,7 @@ enum class PushSlotPredictionResult; public: /** - * @symbol ?_networkUpdateItem\@SparseContainerClient\@\@QEAAXHAEBVItemStack\@\@\@Z + * @symbol ?_networkUpdateItem\@SparseContainerClient\@\@QEAAXHAEBVItemStack\@\@\@Z */ MCAPI void _networkUpdateItem(int, class ItemStack const &); @@ -40,8 +40,8 @@ enum class PushSlotPredictionResult; private: /** - * @symbol ?pushSlotPredictionResultMap\@SparseContainerClient\@\@0V?$BidirectionalUnorderedMap\@W4PushSlotPredictionResult\@SparseContainerClient\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B + * @symbol ?pushSlotPredictionResultMap\@SparseContainerClient\@\@0V?$BidirectionalUnorderedMap\@W4PushSlotPredictionResult\@SparseContainerClient\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap const pushSlotPredictionResultMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp b/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp index 58a1611af6..f90553beca 100644 --- a/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp +++ b/LiteLoader/include/llapi/mc/SpatialActorNetworkData.hpp @@ -41,84 +41,84 @@ struct DebugSendRateModifiers { public: /** - * @symbol ??0SpatialActorNetworkData\@\@QEAA\@AEAVActor\@\@\@Z + * @symbol ??0SpatialActorNetworkData\@\@QEAA\@AEAVActor\@\@\@Z */ MCAPI SpatialActorNetworkData(class Actor &); /** - * @symbol ?enableAutoSend\@SpatialActorNetworkData\@\@QEAAX_N\@Z + * @symbol ?enableAutoSend\@SpatialActorNetworkData\@\@QEAAX_N\@Z */ MCAPI void enableAutoSend(bool); /** - * @symbol ?getLastSentPositionForAddingEntity\@SpatialActorNetworkData\@\@QEAA?AVVec3\@\@XZ + * @symbol ?getLastSentPositionForAddingEntity\@SpatialActorNetworkData\@\@QEAA?AVVec3\@\@XZ */ MCAPI class Vec3 getLastSentPositionForAddingEntity(); /** - * @symbol ?getLastSentRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAA?AVVec2\@\@XZ + * @symbol ?getLastSentRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAA?AVVec2\@\@XZ */ MCAPI class Vec2 getLastSentRotationForAddingEntity(); /** - * @symbol ?getLastSentYBodyRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAAMXZ + * @symbol ?getLastSentYBodyRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAAMXZ */ MCAPI float getLastSentYBodyRotationForAddingEntity(); /** - * @symbol ?getLastSentYHeadRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAAMXZ + * @symbol ?getLastSentYHeadRotationForAddingEntity\@SpatialActorNetworkData\@\@QEAAMXZ */ MCAPI float getLastSentYHeadRotationForAddingEntity(); /** - * @symbol ?handleClientData\@SpatialActorNetworkData\@\@QEAAXAEBVMoveActorAbsoluteData\@\@\@Z + * @symbol ?handleClientData\@SpatialActorNetworkData\@\@QEAAXAEBVMoveActorAbsoluteData\@\@\@Z */ MCAPI void handleClientData(class MoveActorAbsoluteData const &); /** - * @symbol ?isAutoSendEnabled\@SpatialActorNetworkData\@\@QEBA_NXZ + * @symbol ?isAutoSendEnabled\@SpatialActorNetworkData\@\@QEBA_NXZ */ MCAPI bool isAutoSendEnabled() const; /** - * @symbol ?sendUpdate\@SpatialActorNetworkData\@\@QEAAX_N00\@Z + * @symbol ?sendUpdate\@SpatialActorNetworkData\@\@QEAAX_N00\@Z */ MCAPI void sendUpdate(bool, bool, bool); /** - * @symbol ?shouldSendMotionPredictionHintsPacket\@SpatialActorNetworkData\@\@QEBA_NXZ + * @symbol ?shouldSendMotionPredictionHintsPacket\@SpatialActorNetworkData\@\@QEBA_NXZ */ MCAPI bool shouldSendMotionPredictionHintsPacket() const; /** - * @symbol ?shouldSendUpdate\@SpatialActorNetworkData\@\@QEBA_N_N0\@Z + * @symbol ?shouldSendUpdate\@SpatialActorNetworkData\@\@QEBA_N_N0\@Z */ MCAPI bool shouldSendUpdate(bool, bool) const; /** - * @symbol ?teleportEntity\@SpatialActorNetworkData\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z + * @symbol ?teleportEntity\@SpatialActorNetworkData\@\@QEAAXAEBVVec3\@\@AEBVVec2\@\@M\@Z */ MCAPI void teleportEntity(class Vec3 const &, class Vec2 const &, float); /** - * @symbol ?getDebugSpatialPacketModifiers\@SpatialActorNetworkData\@\@SAAEAUDebugSpatialPacketModifiers\@1\@XZ + * @symbol ?getDebugSpatialPacketModifiers\@SpatialActorNetworkData\@\@SAAEAUDebugSpatialPacketModifiers\@1\@XZ */ MCAPI static struct SpatialActorNetworkData::DebugSpatialPacketModifiers & getDebugSpatialPacketModifiers(); //private: /** - * @symbol ?_findRelevantPlayersToSendUpdate\@SpatialActorNetworkData\@\@AEAA?AV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@XZ + * @symbol ?_findRelevantPlayersToSendUpdate\@SpatialActorNetworkData\@\@AEAA?AV?$vector\@UNetworkIdentifierWithSubId\@\@V?$allocator\@UNetworkIdentifierWithSubId\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector _findRelevantPlayersToSendUpdate(); /** - * @symbol ?_getOptimizationScore\@SpatialActorNetworkData\@\@AEBA_KAEAVPlayer\@\@\@Z + * @symbol ?_getOptimizationScore\@SpatialActorNetworkData\@\@AEBA_KAEAVPlayer\@\@\@Z */ MCAPI unsigned __int64 _getOptimizationScore(class Player &) const; /** - * @symbol ?_initializeLastSentValues\@SpatialActorNetworkData\@\@AEAAXXZ + * @symbol ?_initializeLastSentValues\@SpatialActorNetworkData\@\@AEAAXXZ */ MCAPI void _initializeLastSentValues(); /** - * @symbol ?_shouldUpdateBasedOptimizationOnScore\@SpatialActorNetworkData\@\@AEBA_NAEAVPlayer\@\@\@Z + * @symbol ?_shouldUpdateBasedOptimizationOnScore\@SpatialActorNetworkData\@\@AEBA_NAEAVPlayer\@\@\@Z */ MCAPI bool _shouldUpdateBasedOptimizationOnScore(class Player &) const; private: /** - * @symbol ?mDebugSendRateModifiers\@SpatialActorNetworkData\@\@0UDebugSendRateModifiers\@1\@A + * @symbol ?mDebugSendRateModifiers\@SpatialActorNetworkData\@\@0UDebugSendRateModifiers\@1\@A */ MCAPI static struct SpatialActorNetworkData::DebugSendRateModifiers mDebugSendRateModifiers; /** - * @symbol ?mDebugSpatialPacketModifiers\@SpatialActorNetworkData\@\@0UDebugSpatialPacketModifiers\@1\@A + * @symbol ?mDebugSpatialPacketModifiers\@SpatialActorNetworkData\@\@0UDebugSpatialPacketModifiers\@1\@A */ MCAPI static struct SpatialActorNetworkData::DebugSpatialPacketModifiers mDebugSpatialPacketModifiers; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp b/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp index 0f905a9e5d..094a2a0e58 100644 --- a/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp +++ b/LiteLoader/include/llapi/mc/SpatialQueryUtility.hpp @@ -28,16 +28,16 @@ class SpatialQueryUtility { public: /** - * @symbol ?forEachBlockInAABB\@SpatialQueryUtility\@\@SAXAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBV?$function\@$$A6AXAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachBlockInAABB\@SpatialQueryUtility\@\@SAXAEBVIConstBlockSource\@\@AEBVAABB\@\@AEBV?$function\@$$A6AXAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@\@Z */ MCAPI static void forEachBlockInAABB(class IConstBlockSource const &, class AABB const &, class std::function const &); /** - * @symbol ?testForCollidableMobs\@SpatialQueryUtility\@\@SAXAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?testForCollidableMobs\@SpatialQueryUtility\@\@SAXAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@2V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void testForCollidableMobs(class StrictEntityContext const &, class LocalSpatialEntityFetcher &, class AABB const &, class AABB const &, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, std::vector &); /** - * @symbol ?testForEntityStacking\@SpatialQueryUtility\@\@SAXAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?testForEntityStacking\@SpatialQueryUtility\@\@SAXAEBVStrictEntityContext\@\@AEAVLocalSpatialEntityFetcher\@\@AEBVAABB\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static void testForEntityStacking(class StrictEntityContext const &, class LocalSpatialEntityFetcher &, class AABB const &, class ViewT, std::vector &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnActorComponent.hpp b/LiteLoader/include/llapi/mc/SpawnActorComponent.hpp index f8d8d67eef..e2ff393998 100644 --- a/LiteLoader/include/llapi/mc/SpawnActorComponent.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorComponent.hpp @@ -30,16 +30,16 @@ class SpawnActorComponent { public: /** - * @symbol ?addAdditionalSaveData\@SpawnActorComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@SpawnActorComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getSpawnEntries\@SpawnActorComponent\@\@QEAAAEAV?$vector\@USpawnActorEntry\@\@V?$allocator\@USpawnActorEntry\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSpawnEntries\@SpawnActorComponent\@\@QEAAAEAV?$vector\@USpawnActorEntry\@\@V?$allocator\@USpawnActorEntry\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector & getSpawnEntries(); /** - * @symbol ?readAdditionalSaveData\@SpawnActorComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@SpawnActorComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp b/LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp index c960752142..435397d229 100644 --- a/LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorDefinition.hpp @@ -31,12 +31,12 @@ class SpawnActorDefinition { public: /** - * @symbol ?initialize\@SpawnActorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSpawnActorComponent\@\@\@Z + * @symbol ?initialize\@SpawnActorDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSpawnActorComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SpawnActorComponent &) const; /** - * @symbol ?buildSchema\@SpawnActorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSpawnActorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@SpawnActorDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSpawnActorDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnActorEntry.hpp b/LiteLoader/include/llapi/mc/SpawnActorEntry.hpp index 53170b5706..3d312fd0da 100644 --- a/LiteLoader/include/llapi/mc/SpawnActorEntry.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorEntry.hpp @@ -28,7 +28,7 @@ struct SpawnActorEntry { public: /** - * @symbol ??1SpawnActorEntry\@\@QEAA\@XZ + * @symbol ??1SpawnActorEntry\@\@QEAA\@XZ */ MCAPI ~SpawnActorEntry(); diff --git a/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp index 596f20e51a..d4137d6339 100644 --- a/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorParameters.hpp @@ -28,47 +28,47 @@ struct SpawnActorParameters { public: /** - * @symbol ??0SpawnActorParameters\@\@QEAA\@XZ + * @symbol ??0SpawnActorParameters\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI SpawnActorParameters(); + MCAPI SpawnActorParameters(struct SpawnActorParameters &&); /** - * @symbol ??0SpawnActorParameters\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SpawnActorParameters\@\@QEAA\@AEBU0\@\@Z */ MCAPI SpawnActorParameters(struct SpawnActorParameters const &); /** - * @symbol ??0SpawnActorParameters\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SpawnActorParameters\@\@QEAA\@XZ */ - MCAPI SpawnActorParameters(struct SpawnActorParameters &&); + MCAPI SpawnActorParameters(); /** - * @symbol ?setItem\@SpawnActorParameters\@\@QEAAXAEBVItemDescriptor\@\@\@Z + * @symbol ?setItem\@SpawnActorParameters\@\@QEAAXAEBVItemDescriptor\@\@\@Z */ MCAPI void setItem(class ItemDescriptor const &); /** - * @symbol ?setSpawnEntity\@SpawnActorParameters\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setSpawnEntity\@SpawnActorParameters\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setSpawnEntity(std::string const &); /** - * @symbol ?setSpawnEvent\@SpawnActorParameters\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setSpawnEvent\@SpawnActorParameters\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setSpawnEvent(std::string const &); /** - * @symbol ?setSpawnSound\@SpawnActorParameters\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setSpawnSound\@SpawnActorParameters\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setSpawnSound(std::string const &); /** - * @symbol ?setSpawnTimeMax\@SpawnActorParameters\@\@QEAAXAEBH\@Z + * @symbol ?setSpawnTimeMax\@SpawnActorParameters\@\@QEAAXAEBH\@Z */ MCAPI void setSpawnTimeMax(int const &); /** - * @symbol ?setSpawnTimeMin\@SpawnActorParameters\@\@QEAAXAEBH\@Z + * @symbol ?setSpawnTimeMin\@SpawnActorParameters\@\@QEAAXAEBH\@Z */ MCAPI void setSpawnTimeMin(int const &); /** - * @symbol ?spawnsItemStack\@SpawnActorParameters\@\@QEBA_NXZ + * @symbol ?spawnsItemStack\@SpawnActorParameters\@\@QEBA_NXZ */ MCAPI bool spawnsItemStack() const; /** - * @symbol ??1SpawnActorParameters\@\@QEAA\@XZ + * @symbol ??1SpawnActorParameters\@\@QEAA\@XZ */ MCAPI ~SpawnActorParameters(); diff --git a/LiteLoader/include/llapi/mc/SpawnActorSystem.hpp b/LiteLoader/include/llapi/mc/SpawnActorSystem.hpp index b04b4439d2..2413707e74 100644 --- a/LiteLoader/include/llapi/mc/SpawnActorSystem.hpp +++ b/LiteLoader/include/llapi/mc/SpawnActorSystem.hpp @@ -30,19 +30,19 @@ class SpawnActorSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnActorSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@SpawnActorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@SpawnActorSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp b/LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp index 47bd720f3a..acdc5e2179 100644 --- a/LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/SpawnAoECloudSubcomponent.hpp @@ -30,33 +30,33 @@ class SpawnAoECloudSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnAoECloudSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@SpawnAoECloudSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@SpawnAoECloudSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@SpawnAoECloudSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@SpawnAoECloudSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@SpawnAoECloudSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@SpawnAoECloudSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@SpawnAoECloudSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@SpawnAoECloudSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0SpawnAoECloudSubcomponent\@\@QEAA\@XZ + * @symbol ??0SpawnAoECloudSubcomponent\@\@QEAA\@XZ */ MCAPI SpawnAoECloudSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp b/LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp index c408d62293..b0f7c87d87 100644 --- a/LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/SpawnChanceSubcomponent.hpp @@ -30,33 +30,33 @@ class SpawnChanceSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnChanceSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@SpawnChanceSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@SpawnChanceSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@SpawnChanceSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@SpawnChanceSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@SpawnChanceSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@SpawnChanceSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@SpawnChanceSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@SpawnChanceSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0SpawnChanceSubcomponent\@\@QEAA\@XZ + * @symbol ??0SpawnChanceSubcomponent\@\@QEAA\@XZ */ MCAPI SpawnChanceSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnChecks.hpp b/LiteLoader/include/llapi/mc/SpawnChecks.hpp index a27971e573..da3b12958d 100644 --- a/LiteLoader/include/llapi/mc/SpawnChecks.hpp +++ b/LiteLoader/include/llapi/mc/SpawnChecks.hpp @@ -28,72 +28,72 @@ class SpawnChecks { public: /** - * @symbol ?canHatchTurtle\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canHatchTurtle\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canHatchTurtle(class ILevel const &); /** - * @symbol ?canRespawnEnderDragon\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canRespawnEnderDragon\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canRespawnEnderDragon(class ILevel const &); /** - * @symbol ?canReviveBees\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canReviveBees\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canReviveBees(class ILevel const &); /** - * @symbol ?canSpawnBees\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnBees\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnBees(class ILevel const &); /** - * @symbol ?canSpawnEnderDragon\@SpawnChecks\@\@SA_NAEBVServerLevel\@\@\@Z + * @symbol ?canSpawnEnderDragon\@SpawnChecks\@\@SA_NAEBVServerLevel\@\@\@Z */ MCAPI static bool canSpawnEnderDragon(class ServerLevel const &); /** - * @symbol ?canSpawnFromMobSpawnerBlock\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnFromMobSpawnerBlock\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnFromMobSpawnerBlock(class ILevel const &); /** - * @symbol ?canSpawnNaturally\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnNaturally\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnNaturally(class ILevel const &); /** - * @symbol ?canSpawnPigZombieFromPortal\@SpawnChecks\@\@SA_NAEBVDimension\@\@AEBVRandomize\@\@\@Z + * @symbol ?canSpawnPigZombieFromPortal\@SpawnChecks\@\@SA_NAEBVDimension\@\@AEBVRandomize\@\@\@Z */ MCAPI static bool canSpawnPigZombieFromPortal(class Dimension const &, class Randomize const &); /** - * @symbol ?canSpawnSkeletonTrap\@SpawnChecks\@\@SA_NAEBVILevel\@\@AEBVRandomize\@\@\@Z + * @symbol ?canSpawnSkeletonTrap\@SpawnChecks\@\@SA_NAEBVILevel\@\@AEBVRandomize\@\@\@Z */ MCAPI static bool canSpawnSkeletonTrap(class ILevel const &, class Randomize const &); /** - * @symbol ?canSpawnTadpoles\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnTadpoles\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnTadpoles(class ILevel const &); /** - * @symbol ?canSpawnVillageDwellers\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnVillageDwellers\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnVillageDwellers(class ILevel const &); /** - * @symbol ?canSpawnWanderingTrader\@SpawnChecks\@\@SA_NAEBVServerLevel\@\@\@Z + * @symbol ?canSpawnWanderingTrader\@SpawnChecks\@\@SA_NAEBVServerLevel\@\@\@Z */ MCAPI static bool canSpawnWanderingTrader(class ServerLevel const &); /** - * @symbol ?canSpawnWarden\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnWarden\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnWarden(class ILevel const &); /** - * @symbol ?canSpawnWithWorldGeneration\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canSpawnWithWorldGeneration\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canSpawnWithWorldGeneration(class ILevel const &); /** - * @symbol ?canTriggerRaid\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?canTriggerRaid\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool canTriggerRaid(class ILevel const &); /** - * @symbol ?shouldAbortRaid\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?shouldAbortRaid\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool shouldAbortRaid(class ILevel const &); /** - * @symbol ?shouldPauseRaid\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z + * @symbol ?shouldPauseRaid\@SpawnChecks\@\@SA_NAEBVILevel\@\@\@Z */ MCAPI static bool shouldPauseRaid(class ILevel const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp b/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp index 62539a0cc5..ef7c980002 100644 --- a/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp +++ b/LiteLoader/include/llapi/mc/SpawnClimateFinder.hpp @@ -36,28 +36,28 @@ struct ResultDetails { public: /** - * @symbol ??0SpawnClimateFinder\@\@QEAA\@V?$vector\@UClimateParameters\@\@V?$allocator\@UClimateParameters\@\@\@std\@\@\@std\@\@AEBUOverworldNoises3d\@\@AEBVDimensionHeightRange\@\@\@Z + * @symbol ??0SpawnClimateFinder\@\@QEAA\@V?$vector\@UClimateParameters\@\@V?$allocator\@UClimateParameters\@\@\@std\@\@\@std\@\@AEBUOverworldNoises3d\@\@AEBVDimensionHeightRange\@\@\@Z */ MCAPI SpawnClimateFinder(std::vector, struct OverworldNoises3d const &, class DimensionHeightRange const &); /** - * @symbol ?findSpawnPosition\@SpawnClimateFinder\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ?findSpawnPosition\@SpawnClimateFinder\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI class BlockPos findSpawnPosition() const; /** - * @symbol ??1SpawnClimateFinder\@\@QEAA\@XZ + * @symbol ??1SpawnClimateFinder\@\@QEAA\@XZ */ MCAPI ~SpawnClimateFinder(); //private: /** - * @symbol ?_getSpawnPositionAndFitness\@SpawnClimateFinder\@\@AEBA?AU?$pair\@VBlockPos\@\@_J\@std\@\@VBlockPos\@\@\@Z + * @symbol ?_getSpawnPositionAndFitness\@SpawnClimateFinder\@\@AEBA?AU?$pair\@VBlockPos\@\@_J\@std\@\@VBlockPos\@\@\@Z */ MCAPI struct std::pair _getSpawnPositionAndFitness(class BlockPos) const; /** - * @symbol ?_radialSearch\@SpawnClimateFinder\@\@AEBA?AUResultDetails\@1\@U21\@HH\@Z + * @symbol ?_radialSearch\@SpawnClimateFinder\@\@AEBA?AUResultDetails\@1\@U21\@HH\@Z */ MCAPI struct SpawnClimateFinder::ResultDetails _radialSearch(struct SpawnClimateFinder::ResultDetails, int, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnConditions.hpp b/LiteLoader/include/llapi/mc/SpawnConditions.hpp index 35d055f554..c0a56d50c2 100644 --- a/LiteLoader/include/llapi/mc/SpawnConditions.hpp +++ b/LiteLoader/include/llapi/mc/SpawnConditions.hpp @@ -28,8 +28,8 @@ class SpawnConditions { public: /** - * @symbol ?createSpawnConditionsWithSpawnRules\@SpawnConditions\@\@SA?AV1\@AEBV1\@AEBVMobSpawnRules\@\@\@Z + * @symbol ?createSpawnConditionsWithSpawnRules\@SpawnConditions\@\@SA?AV1\@AEBV1\@AEBVMobSpawnRules\@\@\@Z */ MCAPI static class SpawnConditions createSpawnConditionsWithSpawnRules(class SpawnConditions const &, class MobSpawnRules const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnData.hpp b/LiteLoader/include/llapi/mc/SpawnData.hpp index 08285bb31b..452d919dbe 100644 --- a/LiteLoader/include/llapi/mc/SpawnData.hpp +++ b/LiteLoader/include/llapi/mc/SpawnData.hpp @@ -29,16 +29,16 @@ class SpawnData { public: /** - * @symbol ??0SpawnData\@\@QEAA\@AEBVCompoundTag\@\@\@Z + * @symbol ??0SpawnData\@\@QEAA\@AEBV0\@\@Z */ - MCAPI SpawnData(class CompoundTag const &); + MCAPI SpawnData(class SpawnData const &); /** - * @symbol ??0SpawnData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0SpawnData\@\@QEAA\@AEBVCompoundTag\@\@\@Z */ - MCAPI SpawnData(class SpawnData const &); + MCAPI SpawnData(class CompoundTag const &); /** - * @symbol ?save\@SpawnData\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@SpawnData\@\@QEAA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp index 18c2e201d2..3b04fca433 100644 --- a/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnExperienceOrbPacket.hpp @@ -30,37 +30,43 @@ class SpawnExperienceOrbPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnExperienceOrbPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SpawnExperienceOrbPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SpawnExperienceOrbPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SpawnExperienceOrbPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SpawnExperienceOrbPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SpawnExperienceOrbPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SpawnExperienceOrbPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SpawnExperienceOrbPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPAWNEXPERIENCEORBPACKET /** - * @symbol ??0SpawnExperienceOrbPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SpawnExperienceOrbPacket(); + MCVAPI ~SpawnExperienceOrbPacket(); +#endif /** - * @symbol ??0SpawnExperienceOrbPacket\@\@QEAA\@AEBVVec3\@\@H\@Z + * @symbol ??0SpawnExperienceOrbPacket\@\@QEAA\@AEBVVec3\@\@H\@Z */ MCAPI SpawnExperienceOrbPacket(class Vec3 const &, int); + /** + * @symbol ??0SpawnExperienceOrbPacket\@\@QEAA\@XZ + */ + MCAPI SpawnExperienceOrbPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnFinder.hpp b/LiteLoader/include/llapi/mc/SpawnFinder.hpp index 316c87dbd2..196dd52a3f 100644 --- a/LiteLoader/include/llapi/mc/SpawnFinder.hpp +++ b/LiteLoader/include/llapi/mc/SpawnFinder.hpp @@ -30,12 +30,12 @@ class SpawnFinder { public: /** - * @symbol ?findStandupPosition\@SpawnFinder\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlockSource\@\@\@Z + * @symbol ?findStandupPosition\@SpawnFinder\@\@SA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlockSource\@\@\@Z */ MCAPI static class std::optional findStandupPosition(class BlockPos const &, class BlockSource const &); /** - * @symbol ?isStandupPosition\@SpawnFinder\@\@SA_NAEBVBlockPos\@\@AEBVBlockSource\@\@\@Z + * @symbol ?isStandupPosition\@SpawnFinder\@\@SA_NAEBVBlockPos\@\@AEBVBlockSource\@\@\@Z */ MCAPI static bool isStandupPosition(class BlockPos const &, class BlockSource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnGroupData.hpp b/LiteLoader/include/llapi/mc/SpawnGroupData.hpp index 5e6385d0d2..8658786fef 100644 --- a/LiteLoader/include/llapi/mc/SpawnGroupData.hpp +++ b/LiteLoader/include/llapi/mc/SpawnGroupData.hpp @@ -32,20 +32,20 @@ std::vector mSpawnRules; public: /** - * @symbol ??0SpawnGroupData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVMobSpawnRules\@\@\@Z + * @symbol ??0SpawnGroupData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVMobSpawnRules\@\@\@Z */ MCAPI SpawnGroupData(std::string const &, class MobSpawnRules &); /** - * @symbol ?addSpawnRules\@SpawnGroupData\@\@QEAAXAEAVMobSpawnRules\@\@\@Z + * @symbol ?addSpawnRules\@SpawnGroupData\@\@QEAAXAEAVMobSpawnRules\@\@\@Z */ MCAPI void addSpawnRules(class MobSpawnRules &); /** - * @symbol ?getIdentifier\@SpawnGroupData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getIdentifier\@SpawnGroupData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getIdentifier() const; /** - * @symbol ?getSpawnRules\@SpawnGroupData\@\@QEBAAEBV?$vector\@VMobSpawnRules\@\@V?$allocator\@VMobSpawnRules\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSpawnRules\@SpawnGroupData\@\@QEBAAEBV?$vector\@VMobSpawnRules\@\@V?$allocator\@VMobSpawnRules\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getSpawnRules() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp b/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp index 5b8bf91b12..a71ad3c14a 100644 --- a/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp +++ b/LiteLoader/include/llapi/mc/SpawnGroupRegistry.hpp @@ -33,37 +33,92 @@ class SpawnGroupRegistry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnGroupRegistry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRootKey\@SpawnGroupRegistry\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRootKey\@SpawnGroupRegistry\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRootKey(); /** - * @vftbl 2 - * @symbol ?getFileType\@SpawnGroupRegistry\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getFileType\@SpawnGroupRegistry\@\@MEAAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getFileType(); /** - * @vftbl 3 - * @symbol ?processPopulationControl\@SpawnGroupRegistry\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@\@Z + * @vftbl 3 + * @symbol ?processPopulationControl\@SpawnGroupRegistry\@\@MEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValue\@Json\@\@\@Z */ virtual bool processPopulationControl(std::string const &, class Json::Value &); /** - * @vftbl 4 - * @symbol ?readResourceFiles\@SpawnGroupRegistry\@\@MEAAXAEAVResourcePackManager\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@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\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?readResourceFiles\@SpawnGroupRegistry\@\@MEAAXAEAVResourcePackManager\@\@AEAV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorSpawnRuleDefinition\@\@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\@\@UActorSpawnRuleDefinition\@\@\@std\@\@\@2\@\@std\@\@\@Z */ virtual void readResourceFiles(class ResourcePackManager &, class std::unordered_map, struct std::equal_to, class std::allocator>> &); /** - * @symbol ??0SpawnGroupRegistry\@\@QEAA\@AEAVResourcePackManager\@\@\@Z + * @vftbl 5 + * @symbol __unk_vfn_5 + */ + virtual void __unk_vfn_5(); + /** + * @vftbl 6 + * @symbol __unk_vfn_6 + */ + virtual void __unk_vfn_6(); + /** + * @vftbl 7 + * @symbol __unk_vfn_7 + */ + virtual void __unk_vfn_7(); + /** + * @vftbl 8 + * @symbol __unk_vfn_8 + */ + virtual void __unk_vfn_8(); + /** + * @vftbl 9 + * @symbol __unk_vfn_9 + */ + virtual void __unk_vfn_9(); + /** + * @vftbl 10 + * @symbol ?_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 11 + * @symbol __unk_vfn_11 + */ + virtual void __unk_vfn_11(); + /** + * @vftbl 12 + * @symbol __unk_vfn_12 + */ + virtual void __unk_vfn_12(); + /** + * @vftbl 13 + * @symbol __unk_vfn_13 + */ + virtual void __unk_vfn_13(); + /** + * @vftbl 14 + * @symbol __unk_vfn_14 + */ + virtual void __unk_vfn_14(); + /** + * @vftbl 15 + * @symbol ?_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 ??0SpawnGroupRegistry\@\@QEAA\@AEAVResourcePackManager\@\@\@Z */ MCAPI SpawnGroupRegistry(class ResourcePackManager &); /** - * @symbol ?getSpawnGroup\@SpawnGroupRegistry\@\@QEBAPEBVSpawnGroupData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getSpawnGroup\@SpawnGroupRegistry\@\@QEBAPEBVSpawnGroupData\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class SpawnGroupData const * getSpawnGroup(std::string const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnLootEventResponse.hpp b/LiteLoader/include/llapi/mc/SpawnLootEventResponse.hpp index ec0f96e7ce..12d8b3c623 100644 --- a/LiteLoader/include/llapi/mc/SpawnLootEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/SpawnLootEventResponse.hpp @@ -31,28 +31,28 @@ class SpawnLootEventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnLootEventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@SpawnLootEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@SpawnLootEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@SpawnLootEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@SpawnLootEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@SpawnLootEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@SpawnLootEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@SpawnLootEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@SpawnLootEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp index dc00d2615d..a58c89b8ed 100644 --- a/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp +++ b/LiteLoader/include/llapi/mc/SpawnParticleEffectPacket.hpp @@ -30,37 +30,43 @@ class SpawnParticleEffectPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnParticleEffectPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SpawnParticleEffectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SpawnParticleEffectPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SpawnParticleEffectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SpawnParticleEffectPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SpawnParticleEffectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SpawnParticleEffectPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SpawnParticleEffectPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPAWNPARTICLEEFFECTPACKET /** - * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SpawnParticleEffectPacket(); + MCVAPI ~SpawnParticleEffectPacket(); +#endif /** - * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@AEBVVec3\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@EV?$optional\@VMolangVariableMap\@\@\@3\@\@Z + * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@AEBVVec3\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@EV?$optional\@VMolangVariableMap\@\@\@3\@\@Z */ MCAPI SpawnParticleEffectPacket(class Vec3 const &, std::string const &, unsigned char, class std::optional); + /** + * @symbol ??0SpawnParticleEffectPacket\@\@QEAA\@XZ + */ + MCAPI SpawnParticleEffectPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp index 79d67e093a..a974e0b390 100644 --- a/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpawnPointCommand.hpp @@ -31,18 +31,18 @@ class SpawnPointCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpawnPointCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SpawnPointCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SpawnPointCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SpawnPointCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpawnSettings.hpp b/LiteLoader/include/llapi/mc/SpawnSettings.hpp index 6cd094ae97..b5c3a34aa5 100644 --- a/LiteLoader/include/llapi/mc/SpawnSettings.hpp +++ b/LiteLoader/include/llapi/mc/SpawnSettings.hpp @@ -28,7 +28,7 @@ struct SpawnSettings { public: /** - * @symbol ??1SpawnSettings\@\@QEAA\@XZ + * @symbol ??1SpawnSettings\@\@QEAA\@XZ */ MCAPI ~SpawnSettings(); diff --git a/LiteLoader/include/llapi/mc/Spawner.hpp b/LiteLoader/include/llapi/mc/Spawner.hpp index a808ea9536..6eb4d59059 100644 --- a/LiteLoader/include/llapi/mc/Spawner.hpp +++ b/LiteLoader/include/llapi/mc/Spawner.hpp @@ -37,91 +37,115 @@ class Spawner { public: /** - * @symbol ??0Spawner\@\@QEAA\@AEAVLevel\@\@\@Z + * @symbol ??0Spawner\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI Spawner(class Level &); /** - * @symbol ?postProcessSpawnMobs\@Spawner\@\@QEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z + * @symbol ?getSpawnRules\@Spawner\@\@QEBAPEBVActorSpawnRuleGroup\@\@XZ + */ + MCAPI class ActorSpawnRuleGroup const * getSpawnRules() const; + /** + * @symbol ?getSpawnRulesMutable\@Spawner\@\@QEBAPEAVActorSpawnRuleGroup\@\@XZ + */ + MCAPI class ActorSpawnRuleGroup * getSpawnRulesMutable() const; + /** + * @symbol ?getSpawnSettings\@Spawner\@\@QEBAAEBUSpawnSettings\@\@XZ + */ + MCAPI struct SpawnSettings const & getSpawnSettings() const; + /** + * @symbol ?initializeServerSide\@Spawner\@\@QEAAXAEAVResourcePackManager\@\@AEAVIWorldRegistriesProvider\@\@\@Z + */ + MCAPI void initializeServerSide(class ResourcePackManager &, class IWorldRegistriesProvider &); + /** + * @symbol ?postProcessSpawnMobs\@Spawner\@\@QEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z */ MCAPI void postProcessSpawnMobs(class BlockSource &, int, int, class Random &); /** - * @symbol ?spawnItem\@Spawner\@\@QEAAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVItemStack\@\@PEAVActor\@\@AEBVVec3\@\@H\@Z + * @symbol ?setSpawnSettings\@Spawner\@\@QEAAXAEBUSpawnSettings\@\@\@Z + */ + MCAPI void setSpawnSettings(struct SpawnSettings const &); + /** + * @symbol ?spawnItem\@Spawner\@\@QEAAPEAVItemActor\@\@AEAVBlockSource\@\@AEBVItemStack\@\@PEAVActor\@\@AEBVVec3\@\@H\@Z */ MCAPI class ItemActor * spawnItem(class BlockSource &, class ItemStack const &, class Actor *, class Vec3 const &, int); /** - * @symbol ?spawnMob\@Spawner\@\@QEAAPEAVMob\@\@AEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@_N44\@Z + * @symbol ?spawnMob\@Spawner\@\@QEAAPEAVMob\@\@AEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@PEAVActor\@\@AEBVVec3\@\@_N44\@Z */ MCAPI class Mob * spawnMob(class BlockSource &, struct ActorDefinitionIdentifier const &, class Actor *, class Vec3 const &, bool, bool, bool); /** - * @symbol ?spawnMobGroup\@Spawner\@\@QEAA?AV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@AEAVBlockSource\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVVec3\@\@_N3$$QEAV?$function\@$$A6AXAEAVMob\@\@\@Z\@3\@\@Z + * @symbol ?spawnMobGroup\@Spawner\@\@QEAA?AV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@AEAVBlockSource\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVVec3\@\@_N3$$QEAV?$function\@$$A6AXAEAVMob\@\@\@Z\@3\@\@Z */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> spawnMobGroup(class BlockSource &, std::string const &, class Vec3 const &, bool, bool, class std::function &&); /** - * @symbol ?spawnProjectile\@Spawner\@\@QEAAPEAVActor\@\@AEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@PEAV2\@AEBVVec3\@\@3\@Z + * @symbol ?spawnProjectile\@Spawner\@\@QEAAPEAVActor\@\@AEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@PEAV2\@AEBVVec3\@\@3\@Z */ MCAPI class Actor * spawnProjectile(class BlockSource &, struct ActorDefinitionIdentifier const &, class Actor *, class Vec3 const &, class Vec3 const &); /** - * @symbol ?tick\@Spawner\@\@QEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@\@Z + * @symbol ?tick\@Spawner\@\@QEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@\@Z */ MCAPI void tick(class BlockSource &, class LevelChunk const &); /** - * @symbol ?findNextSpawnBlockUnder\@Spawner\@\@SA_NAEBVBlockSource\@\@AEAVBlockPos\@\@W4MaterialType\@\@W4SpawnBlockRequirements\@\@\@Z + * @symbol ??1Spawner\@\@QEAA\@XZ + */ + MCAPI ~Spawner(); + /** + * @symbol ?findNextSpawnBlockUnder\@Spawner\@\@SA_NAEBVBlockSource\@\@AEAVBlockPos\@\@W4MaterialType\@\@W4SpawnBlockRequirements\@\@\@Z */ MCAPI static bool findNextSpawnBlockUnder(class BlockSource const &, class BlockPos &, enum class MaterialType, enum class SpawnBlockRequirements); /** - * @symbol ?isSpawnPositionOk\@Spawner\@\@SA_NAEBVMobSpawnRules\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?isSpawnPositionOk\@Spawner\@\@SA_NAEBVMobSpawnRules\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI static bool isSpawnPositionOk(class MobSpawnRules const &, class BlockSource &, class BlockPos const &, bool); //protected: /** - * @symbol ?_postProcessSpawnMobs\@Spawner\@\@IEAAXAEAVBlockSource\@\@HHAEAVRandomize\@\@_NAEBV?$function\@$$A6AXAEBVBlockPos\@\@AEAVSpawnConditions\@\@\@Z\@std\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@VBlockPos\@\@\@Z\@5\@\@Z + * @symbol ?_postProcessSpawnMobs\@Spawner\@\@IEAAXAEAVBlockSource\@\@HHAEAVRandomize\@\@_NAEBV?$function\@$$A6AXAEBVBlockPos\@\@AEAVSpawnConditions\@\@\@Z\@std\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@VBlockPos\@\@\@Z\@5\@\@Z */ MCAPI void _postProcessSpawnMobs(class BlockSource &, int, int, class Randomize &, bool, class std::function const &, class std::function const &); /** - * @symbol ?_spawnStructureMob\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBUHardcodedSpawningArea\@LevelChunk\@\@AEBVSpawnConditions\@\@\@Z + * @symbol ?_spawnStructureMob\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBUHardcodedSpawningArea\@LevelChunk\@\@AEBVSpawnConditions\@\@\@Z */ MCAPI void _spawnStructureMob(class BlockSource &, class BlockPos const &, struct LevelChunk::HardcodedSpawningArea const &, class SpawnConditions const &); /** - * @symbol ?_tickSpawnMobClusters\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@VBlockPos\@\@AEBV?$function\@$$A6AXAEBVBlockPos\@\@AEAVSpawnConditions\@\@\@Z\@std\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@VBlockPos\@\@\@Z\@6\@\@Z + * @symbol ?_tickSpawnMobClusters\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@VBlockPos\@\@AEBV?$function\@$$A6AXAEBVBlockPos\@\@AEAVSpawnConditions\@\@\@Z\@std\@\@AEBV?$function\@$$A6A_NAEBVBlockSource\@\@VBlockPos\@\@\@Z\@6\@\@Z */ MCAPI void _tickSpawnMobClusters(class BlockSource &, class LevelChunk const &, class BlockPos, class std::function const &, class std::function const &); /** - * @symbol ?_tickSpawnStructureMobs\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@VBlockPos\@\@AEBV?$function\@$$A6AXAEBVBlockPos\@\@AEBUHardcodedSpawningArea\@LevelChunk\@\@AEBVSpawnConditions\@\@\@Z\@std\@\@AEBV?$function\@$$A6A?AV?$span\@$$CBUHardcodedSpawningArea\@LevelChunk\@\@$0?0\@gsl\@\@AEBVLevelChunk\@\@\@Z\@6\@\@Z + * @symbol ?_tickSpawnStructureMobs\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVLevelChunk\@\@VBlockPos\@\@AEBV?$function\@$$A6AXAEBVBlockPos\@\@AEBUHardcodedSpawningArea\@LevelChunk\@\@AEBVSpawnConditions\@\@\@Z\@std\@\@AEBV?$function\@$$A6A?AV?$span\@$$CBUHardcodedSpawningArea\@LevelChunk\@\@$0?0\@gsl\@\@AEBVLevelChunk\@\@\@Z\@6\@\@Z */ MCAPI void _tickSpawnStructureMobs(class BlockSource &, class LevelChunk const &, class BlockPos, class std::function const &, class std::function (class LevelChunk const &)> const &); /** - * @symbol ?_updateBaseTypeCount\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVChunkPos\@\@\@Z + * @symbol ?_updateBaseTypeCount\@Spawner\@\@IEAAXAEAVBlockSource\@\@AEBVChunkPos\@\@\@Z */ MCAPI void _updateBaseTypeCount(class BlockSource &, class ChunkPos const &); //private: /** - * @symbol ?_handlePopulationCap\@Spawner\@\@AEAAHPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@H\@Z + * @symbol ?_handlePopulationCap\@Spawner\@\@AEAAHPEBVMobSpawnerData\@\@AEBVSpawnConditions\@\@H\@Z */ MCAPI int _handlePopulationCap(class MobSpawnerData const *, class SpawnConditions const &, int); /** - * @symbol ?_permuteId\@Spawner\@\@AEBAXAEAUActorDefinitionIdentifier\@\@AEBVMobSpawnRules\@\@AEAVRandom\@\@\@Z + * @symbol ?_permuteId\@Spawner\@\@AEBAXAEAUActorDefinitionIdentifier\@\@AEBVMobSpawnRules\@\@AEAVRandom\@\@\@Z */ MCAPI void _permuteId(struct ActorDefinitionIdentifier &, class MobSpawnRules const &, class Random &) const; /** - * @symbol ?_sendHerdEvents\@Spawner\@\@AEBAXAEBUMobSpawnHerdInfo\@\@AEAV?$vector\@PEAVMob\@\@V?$allocator\@PEAVMob\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_sendHerdEvents\@Spawner\@\@AEBAXAEBUMobSpawnHerdInfo\@\@AEAV?$vector\@PEAVMob\@\@V?$allocator\@PEAVMob\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _sendHerdEvents(struct MobSpawnHerdInfo const &, std::vector &) const; /** - * @symbol ?_spawnMobCluster\@Spawner\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVSpawnConditions\@\@\@Z + * @symbol ?_spawnMobCluster\@Spawner\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVSpawnConditions\@\@\@Z */ MCAPI void _spawnMobCluster(class BlockSource &, class BlockPos const &, class SpawnConditions &); /** - * @symbol ?_spawnMobInCluster\@Spawner\@\@AEAAXAEAVBlockSource\@\@UActorDefinitionIdentifier\@\@AEBVBlockPos\@\@AEBVSpawnConditions\@\@AEAV?$vector\@PEAVMob\@\@V?$allocator\@PEAVMob\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_spawnMobInCluster\@Spawner\@\@AEAAXAEAVBlockSource\@\@UActorDefinitionIdentifier\@\@AEBVBlockPos\@\@AEBVSpawnConditions\@\@AEAV?$vector\@PEAVMob\@\@V?$allocator\@PEAVMob\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void _spawnMobInCluster(class BlockSource &, struct ActorDefinitionIdentifier, class BlockPos const &, class SpawnConditions const &, std::vector &); /** - * @symbol ?_updateMobCounts\@Spawner\@\@AEAAXAEAVBlockSource\@\@AEBUActorDefinitionIdentifier\@\@AEBVSpawnConditions\@\@\@Z + * @symbol ?_updateMobCounts\@Spawner\@\@AEAAXAEBUActorDefinitionIdentifier\@\@AEBVSpawnConditions\@\@\@Z */ - MCAPI void _updateMobCounts(class BlockSource &, struct ActorDefinitionIdentifier const &, class SpawnConditions const &); + MCAPI void _updateMobCounts(struct ActorDefinitionIdentifier const &, class SpawnConditions const &); /** - * @symbol ?_isInsideAncientCity\@Spawner\@\@CA_NAEBVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?_isInsideAncientCity\@Spawner\@\@CA_NAEBVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI static bool _isInsideAncientCity(class BlockSource const &, class BlockPos); @@ -129,8 +153,8 @@ class Spawner { private: /** - * @symbol ?SPAWN_RING_OFFSETS\@Spawner\@\@0V?$unordered_set\@VChunkPos\@\@U?$hash\@VChunkPos\@\@\@std\@\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@VChunkPos\@\@\@3\@\@std\@\@B + * @symbol ?SPAWN_RING_OFFSETS\@Spawner\@\@0V?$unordered_set\@VChunkPos\@\@U?$hash\@VChunkPos\@\@\@std\@\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@VChunkPos\@\@\@3\@\@std\@\@B */ MCAPI static class std::unordered_set, struct std::equal_to, class std::allocator> const SPAWN_RING_OFFSETS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp b/LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp index 4be7700bf1..9c051a72d4 100644 --- a/LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp +++ b/LiteLoader/include/llapi/mc/SpecificEnchantFunction.hpp @@ -32,31 +32,31 @@ class SpecificEnchantFunction : public LootItemFunction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpecificEnchantFunction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?apply\@SpecificEnchantFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 1 + * @symbol ?apply\@SpecificEnchantFunction\@\@UEAAXAEAVItemStack\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemStack &, class Random &, class LootTableContext &); /** - * @vftbl 3 - * @symbol ?apply\@SpecificEnchantFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z + * @vftbl 3 + * @symbol ?apply\@SpecificEnchantFunction\@\@UEAAXAEAVItemInstance\@\@AEAVRandom\@\@AEAVLootTableContext\@\@\@Z */ virtual void apply(class ItemInstance &, class Random &, class LootTableContext &); /** - * @symbol ?deserialize\@SpecificEnchantFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z + * @symbol ?deserialize\@SpecificEnchantFunction\@\@SA?AV?$unique_ptr\@VLootItemFunction\@\@U?$default_delete\@VLootItemFunction\@\@\@std\@\@\@std\@\@VValue\@Json\@\@AEAV?$vector\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VLootItemCondition\@\@U?$default_delete\@VLootItemCondition\@\@\@std\@\@\@std\@\@\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr deserialize(class Json::Value, std::vector> &); //private: /** - * @symbol ?_applyInner\@SpecificEnchantFunction\@\@AEAAXAEAVItemStackBase\@\@AEAVRandom\@\@AEAVLootTableContext\@\@_N\@Z + * @symbol ?_applyInner\@SpecificEnchantFunction\@\@AEAAXAEAVItemStackBase\@\@AEAVRandom\@\@AEAVLootTableContext\@\@_N\@Z */ MCAPI void _applyInner(class ItemStackBase &, class Random &, class LootTableContext &, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Spider.hpp b/LiteLoader/include/llapi/mc/Spider.hpp index b045138901..6e0475817a 100644 --- a/LiteLoader/include/llapi/mc/Spider.hpp +++ b/LiteLoader/include/llapi/mc/Spider.hpp @@ -34,173 +34,168 @@ enum class Type; public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Spider(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 77 - * @symbol ?setBlockMovementSlowdownMultiplier\@Spider\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z + * @vftbl 76 + * @symbol ?setBlockMovementSlowdownMultiplier\@Spider\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Spider\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Spider\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 132 - * @symbol ?shouldRender\@Spider\@\@UEBA_NXZ + * @vftbl 131 + * @symbol ?shouldRender\@Spider\@\@UEBA_NXZ */ virtual bool shouldRender() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 208 - * @symbol ?canBeAffected\@Spider\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@Spider\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Spider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Spider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 357 - * @symbol ?getModelScale\@Spider\@\@UEBAMXZ + * @vftbl 354 + * @symbol ?getModelScale\@Spider\@\@UEBAMXZ */ virtual float getModelScale() const; /** - * @vftbl 358 - * @symbol ?getSpiderType\@Spider\@\@UEBA?AW4Type\@1\@XZ + * @vftbl 355 + * @symbol ?getSpiderType\@Spider\@\@UEBA?AW4Type\@1\@XZ */ virtual enum class Spider::Type getSpiderType() const; /** - * @symbol ??0Spider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Spider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Spider(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpikeFeature.hpp b/LiteLoader/include/llapi/mc/SpikeFeature.hpp index e8965fdfb0..c77492c1d9 100644 --- a/LiteLoader/include/llapi/mc/SpikeFeature.hpp +++ b/LiteLoader/include/llapi/mc/SpikeFeature.hpp @@ -38,34 +38,40 @@ class EndSpike { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpikeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@SpikeFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@SpikeFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPIKEFEATURE /** - * @symbol ??0SpikeFeature\@\@QEAA\@AEBVEndSpike\@0\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SpikeFeature(); +#endif + /** + * @symbol ??0SpikeFeature\@\@QEAA\@AEBVEndSpike\@0\@\@Z */ MCAPI SpikeFeature(class SpikeFeature::EndSpike const &); /** - * @symbol ?placeManually\@SpikeFeature\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@PEAVActor\@\@\@Z + * @symbol ?placeManually\@SpikeFeature\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@PEAVActor\@\@\@Z */ MCAPI bool placeManually(class BlockSource &, class BlockPos const &, class Random &, class Actor *); /** - * @symbol ?postProcessMobsAt\@SpikeFeature\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?postProcessMobsAt\@SpikeFeature\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void postProcessMobsAt(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?setCrystalBeamTarget\@SpikeFeature\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setCrystalBeamTarget\@SpikeFeature\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setCrystalBeamTarget(class BlockPos const &); /** - * @symbol ?setCrystalInvulnerable\@SpikeFeature\@\@QEAAX_N\@Z + * @symbol ?setCrystalInvulnerable\@SpikeFeature\@\@QEAAX_N\@Z */ MCAPI void setCrystalInvulnerable(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp b/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp index 55ba51119a..ecb234244a 100644 --- a/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp +++ b/LiteLoader/include/llapi/mc/SpinAttackSystem.hpp @@ -28,12 +28,12 @@ class SpinAttackSystem { public: /** - * @symbol ?_spinAttack\@SpinAttackSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_spinAttack\@SpinAttackSystem\@\@SAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _spinAttack(class StrictEntityContext &, class ActorOwnerComponent &); /** - * @symbol ?createSystem\@SpinAttackSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SpinAttackSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpinLock.hpp b/LiteLoader/include/llapi/mc/SpinLock.hpp index d443a376f5..6825f6ae8e 100644 --- a/LiteLoader/include/llapi/mc/SpinLock.hpp +++ b/LiteLoader/include/llapi/mc/SpinLock.hpp @@ -29,32 +29,32 @@ class SpinLock { public: /** - * @symbol ??0SpinLock\@\@QEAA\@XZ + * @symbol ??0SpinLock\@\@QEAA\@XZ */ MCAPI SpinLock(); /** - * @symbol ?lock\@SpinLock\@\@QEAAXXZ + * @symbol ?lock\@SpinLock\@\@QEAAXXZ */ MCAPI void lock(); /** - * @symbol ?try_lock\@SpinLock\@\@QEAA_NXZ + * @symbol ?try_lock\@SpinLock\@\@QEAA_NXZ */ MCAPI bool try_lock(); /** - * @symbol ?unlock\@SpinLock\@\@QEAAXXZ + * @symbol ?unlock\@SpinLock\@\@QEAAXXZ */ MCAPI void unlock(); /** - * @symbol ??1SpinLock\@\@QEAA\@XZ + * @symbol ??1SpinLock\@\@QEAA\@XZ */ MCAPI ~SpinLock(); //private: /** - * @symbol ?_getThreadId\@SpinLock\@\@AEAA_KXZ + * @symbol ?_getThreadId\@SpinLock\@\@AEAA_KXZ */ MCAPI unsigned __int64 _getThreadId(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp index b4367e18a2..66bd0d1a65 100644 --- a/LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/SplashPotionEffectSubcomponent.hpp @@ -30,37 +30,43 @@ class SplashPotionEffectSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SplashPotionEffectSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@SplashPotionEffectSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@SplashPotionEffectSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@SplashPotionEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@SplashPotionEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@SplashPotionEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@SplashPotionEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@SplashPotionEffectSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@SplashPotionEffectSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPLASHPOTIONEFFECTSUBCOMPONENT /** - * @symbol ??0SplashPotionEffectSubcomponent\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SplashPotionEffectSubcomponent(); +#endif + /** + * @symbol ??0SplashPotionEffectSubcomponent\@\@QEAA\@XZ */ MCAPI SplashPotionEffectSubcomponent(); /** - * @symbol ?applyMobEffects\@SplashPotionEffectSubcomponent\@\@QEAAXAEBVMobEffectInstance\@\@AEBV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@AEAVActor\@\@AEBV?$shared_ptr\@$$CBVPotion\@\@\@4\@MPEAVMobEffect\@\@AEAVHitResult\@\@H\@Z + * @symbol ?applyMobEffects\@SplashPotionEffectSubcomponent\@\@QEAAXAEBVMobEffectInstance\@\@AEBV?$vector\@PEAVActor\@\@V?$allocator\@PEAVActor\@\@\@std\@\@\@std\@\@AEAVActor\@\@AEBV?$shared_ptr\@$$CBVPotion\@\@\@4\@MPEAVMobEffect\@\@AEAVHitResult\@\@H\@Z */ MCAPI void applyMobEffects(class MobEffectInstance const &, std::vector const &, class Actor &, class std::shared_ptr const &, float, class MobEffect *, class HitResult &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SplashPotionItem.hpp b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp index 4202d41ff7..e9b4f542d3 100644 --- a/LiteLoader/include/llapi/mc/SplashPotionItem.hpp +++ b/LiteLoader/include/llapi/mc/SplashPotionItem.hpp @@ -33,118 +33,118 @@ class SplashPotionItem : public PotionItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SplashPotionItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@SplashPotionItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@SplashPotionItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@SplashPotionItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@SplashPotionItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@SplashPotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@SplashPotionItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@SplashPotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@SplashPotionItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@SplashPotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@SplashPotionItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 117 - * @symbol ?setIconInfo\@SplashPotionItem\@\@UEAAAEAVItem\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 117 + * @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 - * @symbol ?getIconInfo\@SplashPotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z + * @vftbl 118 + * @symbol ?getIconInfo\@SplashPotionItem\@\@UEBA?AUResolvedItemIconInfo\@\@AEBVItemStackBase\@\@H_N\@Z */ virtual struct ResolvedItemIconInfo getIconInfo(class ItemStackBase const &, int, bool) const; /** - * @vftbl 133 - * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ + * @vftbl 133 + * @symbol ?getPotionType\@SplashPotionItem\@\@UEBA?AW4PotionType\@Potion\@\@XZ */ virtual enum class Potion::PotionType getPotionType() const; /** - * @symbol ??0SplashPotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SplashPotionItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SplashPotionItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SplitBlockIds.hpp b/LiteLoader/include/llapi/mc/SplitBlockIds.hpp new file mode 100644 index 0000000000..771c905ff3 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SplitBlockIds.hpp @@ -0,0 +1,28 @@ +/** + * @file SplitBlockIds.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace SplitBlockIds { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?LegacyWool\@SplitBlockIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LegacyWool; + /** + * @symbol ?NewWoolBlockIds\@SplitBlockIds\@\@3V?$array\@V?$reference_wrapper\@$$CBVHashedString\@\@\@std\@\@$0BA\@\@std\@\@B + */ + MCAPI extern class std::array, 16> const NewWoolBlockIds; + +}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/SpongeBlock.hpp b/LiteLoader/include/llapi/mc/SpongeBlock.hpp index d04f00e8c3..805f779673 100644 --- a/LiteLoader/include/llapi/mc/SpongeBlock.hpp +++ b/LiteLoader/include/llapi/mc/SpongeBlock.hpp @@ -31,267 +31,272 @@ class SpongeBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpongeBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@SpongeBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@SpongeBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 99 - * @symbol ?neighborChanged\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@SpongeBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@SpongeBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@SpongeBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@SpongeBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 151 - * @symbol ?animateTick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SpongeBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SpongeBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0SpongeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0SpongeBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI SpongeBlock(std::string const &, int, class Material const &); //private: /** - * @symbol ?_attemptAbsorbWater\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_attemptAbsorbWater\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _attemptAbsorbWater(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_evaporateWater\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_evaporateWater\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _evaporateWater(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_performAbsorbWater\@SpongeBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_performAbsorbWater\@SpongeBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _performAbsorbWater(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_setShouldDry\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_setShouldDry\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _setShouldDry(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_spawnAbsorbParticles\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_spawnAbsorbParticles\@SpongeBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _spawnAbsorbParticles(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SporeBlossom.hpp b/LiteLoader/include/llapi/mc/SporeBlossom.hpp index cefbdf873c..8da3dcf49c 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossom.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossom.hpp @@ -31,234 +31,239 @@ class SporeBlossom : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SporeBlossom(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@SporeBlossom\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SporeBlossom\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SporeBlossom\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@SporeBlossom\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@SporeBlossom\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@SporeBlossom\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SPOREBLOSSOM /** - * @symbol ?canBeSilkTouched\@SporeBlossom\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@SporeBlossom\@\@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 ??0SporeBlossom\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SporeBlossom(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp b/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp index f4a6a1b61c..6aa0ecbae2 100644 --- a/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/SporeBlossomBlockActor.hpp @@ -31,58 +31,58 @@ class SporeBlossomBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SporeBlossomBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol ?tick\@SporeBlossomBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 7 + * @symbol ?tick\@SporeBlossomBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void tick(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @symbol ??0SporeBlossomBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SporeBlossomBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SporeBlossomBlockActor(class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp index 203fd21ead..12b645288f 100644 --- a/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp +++ b/LiteLoader/include/llapi/mc/SpreadPlayersCommand.hpp @@ -31,50 +31,50 @@ class SpreadPlayersCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpreadPlayersCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SpreadPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SpreadPlayersCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?createInitialPositions\@SpreadPlayersCommand\@\@SA?AV?$vector\@VVec2\@\@V?$allocator\@VVec2\@\@\@std\@\@\@std\@\@AEAVRandom\@\@HAEBVVec2\@\@1\@Z + * @symbol ?createInitialPositions\@SpreadPlayersCommand\@\@SA?AV?$vector\@VVec2\@\@V?$allocator\@VVec2\@\@\@std\@\@\@std\@\@AEAVRandom\@\@HAEBVVec2\@\@1\@Z */ MCAPI static std::vector createInitialPositions(class Random &, int, class Vec2 const &, class Vec2 const &); /** - * @symbol ?isDangerousSpawn\@SpreadPlayersCommand\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@FH\@Z + * @symbol ?isDangerousSpawn\@SpreadPlayersCommand\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@FH\@Z */ MCAPI static bool isDangerousSpawn(class BlockSource &, class BlockPos const &, short, int); /** - * @symbol ?setup\@SpreadPlayersCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SpreadPlayersCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); /** - * @symbol ?spreadPositions\@SpreadPlayersCommand\@\@SA_NAEAVCommandOutput\@\@AEAVRandom\@\@AEBVCommandOrigin\@\@AEBVVec2\@\@M33AEAV?$vector\@VVec2\@\@V?$allocator\@VVec2\@\@\@std\@\@\@std\@\@AEAV?$map\@VChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@7\@H\@Z + * @symbol ?spreadPositions\@SpreadPlayersCommand\@\@SA_NAEAVCommandOutput\@\@AEAVRandom\@\@AEBVCommandOrigin\@\@AEBVVec2\@\@M33AEAV?$vector\@VVec2\@\@V?$allocator\@VVec2\@\@\@std\@\@\@std\@\@AEAV?$map\@VChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@7\@H\@Z */ MCAPI static bool spreadPositions(class CommandOutput &, class Random &, class CommandOrigin const &, class Vec2 const &, float, class Vec2 const &, class Vec2 const &, std::vector &, class std::map, struct std::less, class std::allocator>>> &, int); //private: /** - * @symbol ?_checkPositionValid\@SpreadPlayersCommand\@\@CA_NAEBVCommandOrigin\@\@AEBVBlockPos\@\@AEAV?$map\@VChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@H\@Z + * @symbol ?_checkPositionValid\@SpreadPlayersCommand\@\@CA_NAEBVCommandOrigin\@\@AEBVBlockPos\@\@AEAV?$map\@VChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@H\@Z */ MCAPI static bool _checkPositionValid(class CommandOrigin const &, class BlockPos const &, class std::map, struct std::less, class std::allocator>>> &, int); /** - * @symbol ?_getTeleportHeight\@SpreadPlayersCommand\@\@CAFAEAVBlockSource\@\@HH\@Z + * @symbol ?_getTeleportHeight\@SpreadPlayersCommand\@\@CAFAEAVBlockSource\@\@HH\@Z */ MCAPI static short _getTeleportHeight(class BlockSource &, int, int); /** - * @symbol ?_setPlayerPositions\@SpreadPlayersCommand\@\@CAMAEAV?$CommandSelectorResults\@VActor\@\@\@\@AEAV?$vector\@VVec2\@\@V?$allocator\@VVec2\@\@\@std\@\@\@std\@\@AEAV?$map\@VChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@4\@\@Z + * @symbol ?_setPlayerPositions\@SpreadPlayersCommand\@\@CAMAEAV?$CommandSelectorResults\@VActor\@\@\@\@AEAV?$vector\@VVec2\@\@V?$allocator\@VVec2\@\@\@std\@\@\@std\@\@AEAV?$map\@VChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@U?$less\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@std\@\@\@3\@\@4\@\@Z */ MCAPI static float _setPlayerPositions(class CommandSelectorResults &, std::vector &, class std::map, struct std::less, class std::allocator>>> &); /** - * @symbol ?_spreadEntities\@SpreadPlayersCommand\@\@CA_NAEAVCommandOutput\@\@AEAV?$CommandSelectorResults\@VActor\@\@\@\@AEBVCommandOrigin\@\@AEBVVec2\@\@MMH\@Z + * @symbol ?_spreadEntities\@SpreadPlayersCommand\@\@CA_NAEAVCommandOutput\@\@AEAV?$CommandSelectorResults\@VActor\@\@\@\@AEBVCommandOrigin\@\@AEBVVec2\@\@MMH\@Z */ MCAPI static bool _spreadEntities(class CommandOutput &, class CommandSelectorResults &, class CommandOrigin const &, class Vec2 const &, float, float, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpringFeature.hpp b/LiteLoader/include/llapi/mc/SpringFeature.hpp index 5a0e3e4a32..6937768871 100644 --- a/LiteLoader/include/llapi/mc/SpringFeature.hpp +++ b/LiteLoader/include/llapi/mc/SpringFeature.hpp @@ -31,26 +31,26 @@ class SpringFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpringFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@SpringFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@SpringFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ??0SpringFeature\@\@QEAA\@AEBVBlock\@\@\@Z + * @symbol ??0SpringFeature\@\@QEAA\@AEBVBlock\@\@\@Z */ MCAPI SpringFeature(class Block const &); //private: /** - * @symbol ?isValidSpringBorderBlock\@SpringFeature\@\@AEBA_NAEBVBlockLegacy\@\@AEAVBlockSource\@\@\@Z + * @symbol ?isValidSpringBorderBlock\@SpringFeature\@\@AEBA_NAEBVBlockLegacy\@\@AEAVBlockSource\@\@\@Z */ MCAPI bool isValidSpringBorderBlock(class BlockLegacy const &, class BlockSource &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp b/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp index b4d7c5845b..55385bc504 100644 --- a/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SprintTimerSystem.hpp @@ -28,8 +28,8 @@ class SprintTimerSystem { public: /** - * @symbol ?createSprintTimerSystem\@SprintTimerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSprintTimerSystem\@SprintTimerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSprintTimerSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp index c4b26cc31c..afa436fe8b 100644 --- a/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SprintTriggerSystem.hpp @@ -28,8 +28,8 @@ class SprintTriggerSystem { public: /** - * @symbol ?create\@SprintTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@SprintTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp b/LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp index ecaa8d82d3..78df387edc 100644 --- a/LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp +++ b/LiteLoader/include/llapi/mc/SpruceTreeCanopy.hpp @@ -31,14 +31,14 @@ class SpruceTreeCanopy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpruceTreeCanopy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?placeCanopy\@SpruceTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z + * @vftbl 1 + * @symbol ?placeCanopy\@SpruceTreeCanopy\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@AEBUTreeParams\@TreeHelper\@\@AEBV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@3\@\@Z */ virtual class std::optional placeCanopy(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &, struct TreeHelper::TreeParams const &, std::vector const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SpyglassItem.hpp b/LiteLoader/include/llapi/mc/SpyglassItem.hpp index e833376344..373100ced3 100644 --- a/LiteLoader/include/llapi/mc/SpyglassItem.hpp +++ b/LiteLoader/include/llapi/mc/SpyglassItem.hpp @@ -32,98 +32,98 @@ class SpyglassItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SpyglassItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 69 - * @symbol ?getViewDamping\@SpyglassItem\@\@UEBAMXZ + * @vftbl 69 + * @symbol ?getViewDamping\@SpyglassItem\@\@UEBAMXZ */ virtual float getViewDamping() const; /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@SpyglassItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@SpyglassItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@SpyglassItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@SpyglassItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@SpyglassItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@SpyglassItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @symbol ??0SpyglassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0SpyglassItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI SpyglassItem(std::string const &, short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Squid.hpp b/LiteLoader/include/llapi/mc/Squid.hpp index b2c447e104..a5b5d8bcf3 100644 --- a/LiteLoader/include/llapi/mc/Squid.hpp +++ b/LiteLoader/include/llapi/mc/Squid.hpp @@ -32,194 +32,195 @@ class Squid : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Squid\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Squid\@\@MEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Squid(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Squid\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Squid\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Squid\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Squid\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Squid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Squid\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 291 - * @symbol ?aiStep\@Squid\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@Squid\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Squid\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Squid\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 297 - * @symbol ?checkSpawnObstruction\@Squid\@\@UEBA_NXZ + * @vftbl 294 + * @symbol ?checkSpawnObstruction\@Squid\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?_getInkSquirtSoundEvent\@Squid\@\@MEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 353 + * @symbol ?_getInkSquirtSoundEvent\@Squid\@\@MEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent _getInkSquirtSoundEvent() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SQUID + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Squid(); +#endif /** - * @symbol ??0Squid\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@AEBVColor\@mce\@\@\@Z + * @symbol ??0Squid\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@AEBVColor\@mce\@\@\@Z */ MCAPI Squid(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &, class mce::Color const &); /** - * @symbol ?postAiStep\@Squid\@\@QEAAXXZ + * @symbol ?postAiStep\@Squid\@\@QEAAXXZ */ MCAPI void postAiStep(); /** - * @symbol ?spawnInkParticles\@Squid\@\@QEAAXXZ + * @symbol ?spawnInkParticles\@Squid\@\@QEAAXXZ */ MCAPI void spawnInkParticles(); //private: /** - * @symbol ?_randomInkDir\@Squid\@\@AEAA?AVVec3\@\@XZ + * @symbol ?_randomInkDir\@Squid\@\@AEAA?AVVec3\@\@XZ */ MCAPI class Vec3 _randomInkDir(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidDiveGoal.hpp b/LiteLoader/include/llapi/mc/SquidDiveGoal.hpp index 009d02f25b..894d337c24 100644 --- a/LiteLoader/include/llapi/mc/SquidDiveGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidDiveGoal.hpp @@ -30,54 +30,54 @@ class SquidDiveGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SquidDiveGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SquidDiveGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SquidDiveGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SquidDiveGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SquidDiveGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SquidDiveGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SquidDiveGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SquidDiveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SquidDiveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SQUIDDIVEGOAL /** - * @symbol ?stop\@SquidDiveGoal\@\@UEAAXXZ + * @symbol ?stop\@SquidDiveGoal\@\@UEAAXXZ */ MCVAPI void stop(); /** - * @symbol ?tick\@SquidDiveGoal\@\@UEAAXXZ + * @symbol ?tick\@SquidDiveGoal\@\@UEAAXXZ */ MCVAPI void tick(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidFleeGoal.hpp b/LiteLoader/include/llapi/mc/SquidFleeGoal.hpp index eb1ef05484..2e12f5e27a 100644 --- a/LiteLoader/include/llapi/mc/SquidFleeGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidFleeGoal.hpp @@ -30,44 +30,44 @@ class SquidFleeGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SquidFleeGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SquidFleeGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SquidFleeGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SquidFleeGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SquidFleeGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SquidFleeGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SquidFleeGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SquidFleeGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SquidFleeGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SquidFleeGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SquidFleeGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SquidFleeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SquidFleeGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidIdleGoal.hpp b/LiteLoader/include/llapi/mc/SquidIdleGoal.hpp index 80821142ee..56a512abdd 100644 --- a/LiteLoader/include/llapi/mc/SquidIdleGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidIdleGoal.hpp @@ -30,44 +30,44 @@ class SquidIdleGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SquidIdleGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SquidIdleGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SquidIdleGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SquidIdleGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SquidIdleGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SquidIdleGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SquidIdleGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SquidIdleGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SquidIdleGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SquidIdleGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SquidIdleGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SquidIdleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SquidIdleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp b/LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp index f5e675aec8..9e8e1406bc 100644 --- a/LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidMoveAwayFromGroundGoal.hpp @@ -30,62 +30,62 @@ class SquidMoveAwayFromGroundGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SquidMoveAwayFromGroundGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SquidMoveAwayFromGroundGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SquidMoveAwayFromGroundGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SquidMoveAwayFromGroundGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SquidMoveAwayFromGroundGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SQUIDMOVEAWAYFROMGROUNDGOAL /** - * @symbol ?canContinueToUse\@SquidMoveAwayFromGroundGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@SquidMoveAwayFromGroundGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); /** - * @symbol ?canUse\@SquidMoveAwayFromGroundGoal\@\@UEAA_NXZ + * @symbol ?canUse\@SquidMoveAwayFromGroundGoal\@\@UEAA_NXZ */ MCVAPI bool canUse(); /** - * @symbol ?stop\@SquidMoveAwayFromGroundGoal\@\@UEAAXXZ + * @symbol ?stop\@SquidMoveAwayFromGroundGoal\@\@UEAAXXZ */ MCVAPI void stop(); /** - * @symbol ?tick\@SquidMoveAwayFromGroundGoal\@\@UEAAXXZ + * @symbol ?tick\@SquidMoveAwayFromGroundGoal\@\@UEAAXXZ */ MCVAPI void tick(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp b/LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp index b7d23e732a..21cab335d9 100644 --- a/LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp +++ b/LiteLoader/include/llapi/mc/SquidOutOfWaterGoal.hpp @@ -30,62 +30,62 @@ class SquidOutOfWaterGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SquidOutOfWaterGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SquidOutOfWaterGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SquidOutOfWaterGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SquidOutOfWaterGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SquidOutOfWaterGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SQUIDOUTOFWATERGOAL /** - * @symbol ?canContinueToUse\@SquidOutOfWaterGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@SquidOutOfWaterGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); /** - * @symbol ?canUse\@SquidOutOfWaterGoal\@\@UEAA_NXZ + * @symbol ?canUse\@SquidOutOfWaterGoal\@\@UEAA_NXZ */ MCVAPI bool canUse(); /** - * @symbol ?stop\@SquidOutOfWaterGoal\@\@UEAAXXZ + * @symbol ?stop\@SquidOutOfWaterGoal\@\@UEAAXXZ */ MCVAPI void stop(); /** - * @symbol ?tick\@SquidOutOfWaterGoal\@\@UEAAXXZ + * @symbol ?tick\@SquidOutOfWaterGoal\@\@UEAAXXZ */ MCVAPI void tick(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp index 3f8ec3f244..65c2354040 100644 --- a/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SquidPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class SquidPostAIStepSystem { public: /** - * @symbol ?createSystem\@SquidPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SquidPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSquidPostAIStepSystem\@SquidPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doSquidPostAIStepSystem\@SquidPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doSquidPostAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp b/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp index 90bb5bf442..10d6bb16de 100644 --- a/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/SquidPreAiStepSystem.hpp @@ -28,16 +28,16 @@ class SquidPreAiStepSystem { public: /** - * @symbol ?createSystem\@SquidPreAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@SquidPreAiStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doSquidPreAiStepSystem\@SquidPreAiStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAULocalMoveVelocityComponent\@\@\@Z + * @symbol ?_doSquidPreAiStepSystem\@SquidPreAiStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAULocalMoveVelocityComponent\@\@\@Z */ MCAPI static void _doSquidPreAiStepSystem(class StrictEntityContext const &, struct LocalMoveVelocityComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp index c906b9ff18..cd0aab2176 100644 --- a/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/StackResultStorageEntity.hpp @@ -20,10 +20,15 @@ class StackResultStorageEntity { #define AFTER_EXTRA // Add Member There public: + std::optional mContext; -inline class EntityContext& getStackRef() { - return _getStackRef(); -} + template + inline Entity* tryUnwrap() { + if (_hasValue()) { + return Entity::tryGetFromEntity(_getStackRef(), Unknown); + } + return nullptr; + } #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_STACKRESULTSTORAGEENTITY @@ -37,26 +42,26 @@ inline class EntityContext& getStackRef() { //protected: /** - * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z + * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z */ - MCAPI StackResultStorageEntity(class WeakStorageEntity const &); + MCAPI StackResultStorageEntity(class StackResultStorageEntity &&); /** - * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z + * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z */ MCAPI StackResultStorageEntity(class OwnerStorageEntity const &); /** - * @symbol ??0StackResultStorageEntity\@\@IEAA\@$$QEAV0\@\@Z + * @symbol ??0StackResultStorageEntity\@\@IEAA\@AEBVWeakStorageEntity\@\@\@Z */ - MCAPI StackResultStorageEntity(class StackResultStorageEntity &&); + MCAPI StackResultStorageEntity(class WeakStorageEntity const &); /** - * @symbol ?_getStackRef\@StackResultStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ + * @symbol ?_getStackRef\@StackResultStorageEntity\@\@IEBAAEAVEntityContext\@\@XZ */ MCAPI class EntityContext & _getStackRef() const; /** - * @symbol ?_hasValue\@StackResultStorageEntity\@\@IEBA_NXZ + * @symbol ?_hasValue\@StackResultStorageEntity\@\@IEBA_NXZ */ MCAPI bool _hasValue() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp b/LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp index 1b2931057e..bbf7a74c21 100644 --- a/LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp +++ b/LiteLoader/include/llapi/mc/StackResultStorageFeature.hpp @@ -32,18 +32,18 @@ class StackResultStorageFeature { //protected: /** - * @symbol ??0StackResultStorageFeature\@\@IEAA\@AEBVWeakStorageFeature\@\@\@Z + * @symbol ??0StackResultStorageFeature\@\@IEAA\@AEBVWeakStorageFeature\@\@\@Z */ MCAPI StackResultStorageFeature(class WeakStorageFeature const &); /** - * @symbol ?_getStackRef\@StackResultStorageFeature\@\@IEBAAEAVIFeature\@\@XZ + * @symbol ?_getStackRef\@StackResultStorageFeature\@\@IEBAAEAVIFeature\@\@XZ */ MCAPI class IFeature & _getStackRef() const; /** - * @symbol ?_hasValue\@StackResultStorageFeature\@\@IEBA_NXZ + * @symbol ?_hasValue\@StackResultStorageFeature\@\@IEBA_NXZ */ MCAPI bool _hasValue() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp b/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp index 7b870a6027..2ffe5a875f 100644 --- a/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/StackableAndMobNearCollisionSystem.hpp @@ -28,12 +28,12 @@ class StackableAndMobNearCollisionSystem { public: /** - * @symbol ?create\@StackableAndMobNearCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@StackableAndMobNearCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?tick\@StackableAndMobNearCollisionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@$$CBUDimensionTypeComponent\@\@$$CBUSynchedActorDataComponent\@\@UMoveRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$OptionalGlobalT\@ULocalSpatialEntityFetcherFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + * @symbol ?tick\@StackableAndMobNearCollisionSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@V?$Optional\@$$CBV?$FlagComponent\@UCollidableMobNearFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@$$CBUDimensionTypeComponent\@\@$$CBUSynchedActorDataComponent\@\@UMoveRequestComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAABBShapeComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UCollidableMobFlag\@\@\@\@\@\@$$CBUAABBShapeComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UFallingBlockFlag\@\@\@\@\@\@\@\@V?$OptionalGlobalT\@ULocalSpatialEntityFetcherFactoryComponent\@\@VEntityRegistryBase\@\@\@\@\@Z */ MCAPI static void tick(class ViewT const>, struct AABBShapeComponent const, struct DimensionTypeComponent const, struct SynchedActorDataComponent const, struct MoveRequestComponent>, class ViewT, class ViewT>, struct AABBShapeComponent const>, class ViewT>>, class OptionalGlobalT); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp index 5438811f5e..8b036b9923 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassBlock.hpp @@ -31,237 +31,242 @@ class StainedGlassBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StainedGlassBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 25 - * @symbol ?canConnect\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@StainedGlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@StainedGlassBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@StainedGlassBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StainedGlassBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StainedGlassBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StainedGlassBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StainedGlassBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@StainedGlassBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@StainedGlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@StainedGlassBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StainedGlassBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StainedGlassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N2\@Z + * @symbol ??0StainedGlassBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N2\@Z */ MCAPI StainedGlassBlock(std::string const &, int, class Material const &, bool, bool); @@ -269,8 +274,8 @@ class StainedGlassBlock : public BlockLegacy { private: /** - * @symbol ?STAINED_GLASS_DOESNT_BREAK_FALLING_BLOCK_VERSION\@StainedGlassBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?STAINED_GLASS_DOESNT_BREAK_FALLING_BLOCK_VERSION\@StainedGlassBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const STAINED_GLASS_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp index fc0c0e46d3..68d5ea7bd6 100644 --- a/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StainedGlassPaneBlock.hpp @@ -31,213 +31,218 @@ class StainedGlassPaneBlock : public ThinFenceBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StainedGlassPaneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StainedGlassPaneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StainedGlassPaneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StainedGlassPaneBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StainedGlassPaneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StainedGlassPaneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StainedGlassPaneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N22\@Z + * @symbol ??0StainedGlassPaneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N22\@Z */ MCAPI StainedGlassPaneBlock(std::string const &, int, class Material const &, bool, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StairBlock.hpp b/LiteLoader/include/llapi/mc/StairBlock.hpp index 0bd29e04cf..b9d8fc7cb2 100644 --- a/LiteLoader/include/llapi/mc/StairBlock.hpp +++ b/LiteLoader/include/llapi/mc/StairBlock.hpp @@ -31,358 +31,357 @@ class StairBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StairBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@StairBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@StairBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@StairBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@StairBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 13 - * @symbol ?getOutline\@StairBlock\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z + * @vftbl 13 + * @symbol ?getOutline\@StairBlock\@\@UEBAAEBVAABB\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEAV2\@\@Z */ virtual class AABB const & getOutline(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@StairBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@StairBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 17 - * @symbol ?liquidCanFlowIntoFromDirection\@StairBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 17 + * @symbol ?liquidCanFlowIntoFromDirection\@StairBlock\@\@UEBA_NEAEBV?$function\@$$A6AAEBVBlock\@\@AEBVBlockPos\@\@\@Z\@std\@\@AEBVBlockPos\@\@\@Z */ virtual bool liquidCanFlowIntoFromDirection(unsigned char, class std::function const &, class BlockPos const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@StairBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@StairBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@StairBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@StairBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 80 - * @symbol ?getRedstoneProperty\@StairBlock\@\@UEBA?AW4BlockProperty\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 80 + * @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 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 89 - * @symbol ?mayPick\@StairBlock\@\@UEBA_NXZ + * @vftbl 89 + * @symbol ?mayPick\@StairBlock\@\@UEBA_NXZ */ virtual bool mayPick() const; /** - * @vftbl 90 - * @symbol ?mayPick\@StairBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z + * @vftbl 90 + * @symbol ?mayPick\@StairBlock\@\@UEBA_NAEBVBlockSource\@\@AEBVBlock\@\@_N\@Z */ virtual bool mayPick(class BlockSource const &, class Block const &, bool) const; /** - * @vftbl 91 - * @symbol ?mayPlace\@StairBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@StairBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@StairBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@StairBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 97 - * @symbol ?destroy\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @vftbl 97 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@StairBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@StairBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 109 - * @symbol ?attack\@StairBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@StairBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 110 - * @symbol ?handleEntityInside\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z + * @vftbl 110 + * @symbol ?handleEntityInside\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@AEAVVec3\@\@\@Z */ virtual void handleEntityInside(class BlockSource &, class BlockPos const &, class Actor *, class Vec3 &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@StairBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@StairBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 151 - * @symbol ?animateTick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 163 - * @symbol ?onExploded\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 163 + * @symbol ?onExploded\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 164 - * @symbol ?onStandOn\@StairBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z + * @vftbl 164 + * @symbol ?onStandOn\@StairBlock\@\@UEBAXAEAVEntityContext\@\@AEBVBlockPos\@\@\@Z */ virtual void onStandOn(class EntityContext &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@StairBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 175 - * @symbol ?clip\@StairBlock\@\@UEBA?AVHitResult\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEBVVec3\@\@2_N\@Z + * @vftbl 175 + * @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 177 - * @symbol ?use\@StairBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@StairBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StairBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; - /** - * @vftbl 188 - * @symbol ?getResourceCount\@StairBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z - */ - virtual int getResourceCount(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STAIRBLOCK /** - * @symbol ?canBeSilkTouched\@StairBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@StairBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isStairBlock\@StairBlock\@\@UEBA_NXZ + * @symbol ?isStairBlock\@StairBlock\@\@UEBA_NXZ */ MCVAPI bool isStairBlock() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StairBlock(); #endif /** - * @symbol ??0StairBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@H\@Z + * @symbol ??0StairBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@H\@Z */ MCAPI StairBlock(std::string const &, int, class BlockLegacy const &, int); /** - * @symbol ?setInnerPieceShape\@StairBlock\@\@QEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@_N\@Z + * @symbol ?setInnerPieceShape\@StairBlock\@\@QEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@_N\@Z */ MCAPI bool setInnerPieceShape(class Block const &, class BlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @symbol ?setStepShape\@StairBlock\@\@QEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@_N\@Z + * @symbol ?setStepShape\@StairBlock\@\@QEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@_N\@Z */ MCAPI bool setStepShape(class Block const &, class BlockSource const &, class BlockPos const &, class AABB &, bool) const; /** - * @symbol ?stairDirectionToFacing\@StairBlock\@\@SAEH\@Z + * @symbol ?stairDirectionToFacing\@StairBlock\@\@SAEH\@Z */ MCAPI static unsigned char stairDirectionToFacing(int); //protected: /** - * @symbol ?shapeZFightShrink\@StairBlock\@\@IEBAXAEAVAABB\@\@\@Z + * @symbol ?shapeZFightShrink\@StairBlock\@\@IEBAXAEAVAABB\@\@\@Z */ MCAPI void shapeZFightShrink(class AABB &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp b/LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp index 2a21f42151..6cecdeeeca 100644 --- a/LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/StalkAndPounceOnTargetGoal.hpp @@ -30,60 +30,60 @@ class StalkAndPounceOnTargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StalkAndPounceOnTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@StalkAndPounceOnTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@StalkAndPounceOnTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@StalkAndPounceOnTargetGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@StalkAndPounceOnTargetGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@StalkAndPounceOnTargetGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@StalkAndPounceOnTargetGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@StalkAndPounceOnTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@StalkAndPounceOnTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@StalkAndPounceOnTargetGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@StalkAndPounceOnTargetGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@StalkAndPounceOnTargetGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@StalkAndPounceOnTargetGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@StalkAndPounceOnTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@StalkAndPounceOnTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0StalkAndPounceOnTargetGoal\@\@QEAA\@AEAVMob\@\@AEBVActorFilterGroup\@\@MMMMMMMM_N\@Z + * @symbol ??0StalkAndPounceOnTargetGoal\@\@QEAA\@AEAVMob\@\@AEBVActorFilterGroup\@\@MMMMMMMM_N\@Z */ MCAPI StalkAndPounceOnTargetGoal(class Mob &, class ActorFilterGroup const &, float, float, float, float, float, float, float, float, bool); //private: /** - * @symbol ?_isStuckBlock\@StalkAndPounceOnTargetGoal\@\@AEBA_NVBlockPos\@\@\@Z + * @symbol ?_isStuckBlock\@StalkAndPounceOnTargetGoal\@\@AEBA_NVBlockPos\@\@\@Z */ MCAPI bool _isStuckBlock(class BlockPos) const; /** - * @symbol ?_preparePounce\@StalkAndPounceOnTargetGoal\@\@AEAAXAEBVVec3\@\@0\@Z + * @symbol ?_preparePounce\@StalkAndPounceOnTargetGoal\@\@AEAAXAEBVVec3\@\@0\@Z */ MCAPI void _preparePounce(class Vec3 const &, class Vec3 const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp index 3575c2407c..7c277633d1 100644 --- a/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/StandingVehiclePostPositionPassengerSystem.hpp @@ -28,12 +28,12 @@ class StandingVehiclePostPositionPassengerSystem { public: /** - * @symbol ?_impl\@StandingVehiclePostPositionPassengerSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUActorSetPositionRequestComponent\@\@V?$Optional\@UMobBodyRotationComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@$$CBURenderRotationComponent\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURenderPositionComponent\@\@\@\@\@Z + * @symbol ?_impl\@StandingVehiclePostPositionPassengerSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAUActorSetPositionRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UHorseFlag\@\@\@\@\@\@$$CBUStandAnimationComponent\@\@$$CBURenderRotationComponent\@\@U?$Include\@UVehicleComponent\@\@\@\@$$CBURenderPositionComponent\@\@\@\@\@Z */ - MCAPI static void _impl(class StrictEntityContext &, struct PassengerComponent const &, struct ActorSetPositionRequestComponent &, class Optional, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); + MCAPI static void _impl(class StrictEntityContext &, struct PassengerComponent const &, struct ActorSetPositionRequestComponent &, class ViewT>, struct StandAnimationComponent const, struct RenderRotationComponent const, struct Include, struct RenderPositionComponent const>); /** - * @symbol ?createSystem\@StandingVehiclePostPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@StandingVehiclePostPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StartGamePacket.hpp b/LiteLoader/include/llapi/mc/StartGamePacket.hpp index 6da52ad641..24de339611 100644 --- a/LiteLoader/include/llapi/mc/StartGamePacket.hpp +++ b/LiteLoader/include/llapi/mc/StartGamePacket.hpp @@ -30,37 +30,43 @@ class StartGamePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StartGamePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@StartGamePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@StartGamePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@StartGamePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@StartGamePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@StartGamePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@StartGamePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@StartGamePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@StartGamePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STARTGAMEPACKET /** - * @symbol ??0StartGamePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI StartGamePacket(); + MCVAPI ~StartGamePacket(); +#endif /** - * @symbol ??0StartGamePacket\@\@QEAA\@VItemRegistryRef\@\@AEBVLevelSettings\@\@UActorUniqueID\@\@VActorRuntimeID\@\@W4GameType\@\@_NAEBVVec3\@\@AEBVVec2\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@8AEBVContentIdentity\@\@8AEBVBlockDefinitionGroup\@\@5VCompoundTag\@\@AEBUPlayerMovementSettings\@\@8AEBVUUID\@mce\@\@_KH_K\@Z + * @symbol ??0StartGamePacket\@\@QEAA\@VItemRegistryRef\@\@AEBVLevelSettings\@\@UActorUniqueID\@\@VActorRuntimeID\@\@W4GameType\@\@_NAEBVVec3\@\@AEBVVec2\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@8AEBVContentIdentity\@\@8AEBVBlockDefinitionGroup\@\@5VCompoundTag\@\@AEBUPlayerMovementSettings\@\@8AEBVUUID\@mce\@\@_KH_K\@Z */ MCAPI StartGamePacket(class ItemRegistryRef, class LevelSettings const &, struct ActorUniqueID, class ActorRuntimeID, enum class GameType, bool, class Vec3 const &, class Vec2 const &, std::string const &, std::string const &, class ContentIdentity const &, std::string const &, class BlockDefinitionGroup const &, bool, class CompoundTag, struct PlayerMovementSettings const &, std::string const &, class mce::UUID const &, unsigned __int64, int, unsigned __int64); + /** + * @symbol ??0StartGamePacket\@\@QEAA\@XZ + */ + MCAPI StartGamePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp b/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp index 431a638ed7..cae04bd087 100644 --- a/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp +++ b/LiteLoader/include/llapi/mc/StartGlidingSystem.hpp @@ -11,42 +11,42 @@ #undef BEFORE_EXTRA -struct StartGlidingSystem { +class StartGlidingSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_STARTGLIDINGSYSTEM public: - struct StartGlidingSystem& operator=(struct StartGlidingSystem const &) = delete; - StartGlidingSystem(struct StartGlidingSystem const &) = delete; + class StartGlidingSystem& operator=(class StartGlidingSystem const &) = delete; + StartGlidingSystem(class StartGlidingSystem const &) = delete; StartGlidingSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StartGlidingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@StartGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@V?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@UCollisionBoxDefinitionComponent\@\@UMoveInputComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@UPassengerComponent\@\@UStateVectorComponent\@\@UVanillaClientGameplayComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@UOffsetsComponent\@\@UPlayerActionComponent\@\@USynchedActorDataComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@StartGlidingSystem\@\@UEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@V?$FlagComponent\@UUsesECSMovementFlag\@\@\@\@UPlayerInputRequestComponent\@\@V?$FlagComponent\@UArmorFlyEnabledFlag\@\@\@\@UPassengerComponent\@\@V?$FlagComponent\@UOnGroundFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UAbilitiesComponent\@\@UMoveInputComponent\@\@UStateVectorComponent\@\@UVanillaClientGameplayComponent\@\@UCollisionBoxDefinitionComponent\@\@\@\@U?$Write\@UAABBShapeComponent\@\@USynchedActorDataComponent\@\@UPlayerActionComponent\@\@UOffsetsComponent\@\@\@\@U?$AddRemove\@V?$FlagComponent\@UWasPenetratingLastFrameFlag\@\@\@\@\@\@U?$GlobalRead\@$$V\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, struct PlayerInputRequestComponent, class FlagComponent>, struct Read, struct CollisionBoxDefinitionComponent, struct MoveInputComponent, class FlagComponent, struct PassengerComponent, struct StateVectorComponent, struct VanillaClientGameplayComponent>, struct Write, struct AddRemove>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, struct PlayerInputRequestComponent, class FlagComponent, struct PassengerComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove>, struct GlobalRead<>, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?createStartGlidingSystem\@StartGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@StartGlidingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ - MCAPI static struct TickingSystemWithInfo createStartGlidingSystem(); + MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp b/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp index ba9c16060a..234c2ea10a 100644 --- a/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp +++ b/LiteLoader/include/llapi/mc/StartScreenCapabilities.hpp @@ -11,11 +11,8 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure StartScreenCapabilities. - * - */ -struct StartScreenCapabilities { + +class StartScreenCapabilities { #define AFTER_EXTRA // Add Member There @@ -23,21 +20,21 @@ struct StartScreenCapabilities { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_STARTSCREENCAPABILITIES public: - struct StartScreenCapabilities& operator=(struct StartScreenCapabilities const &) = delete; - StartScreenCapabilities(struct StartScreenCapabilities const &) = delete; + class StartScreenCapabilities& operator=(class StartScreenCapabilities const &) = delete; + StartScreenCapabilities(class StartScreenCapabilities const &) = delete; StartScreenCapabilities() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StartScreenCapabilities(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isOfType\@?$TypedScreenCapabilities\@UStartScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z + * @vftbl 1 + * @symbol ?isOfType\@?$TypedScreenCapabilities\@UStartScreenCapabilities\@\@\@\@UEBA_NV?$typeid_t\@VIScreenCapabilities\@\@\@\@\@Z */ virtual bool isOfType(class typeid_t) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp b/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp index 89e6ea6095..f0a13c1dde 100644 --- a/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp +++ b/LiteLoader/include/llapi/mc/StateAnimationVariable.hpp @@ -28,8 +28,8 @@ class StateAnimationVariable { public: /** - * @symbol ?addKeyFrame\@StateAnimationVariable\@\@QEAAXMM\@Z + * @symbol ?addKeyFrame\@StateAnimationVariable\@\@QEAAXMM\@Z */ MCAPI void addKeyFrame(float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StateSerializationUtils.hpp b/LiteLoader/include/llapi/mc/StateSerializationUtils.hpp index cee15144ae..a811acd750 100644 --- a/LiteLoader/include/llapi/mc/StateSerializationUtils.hpp +++ b/LiteLoader/include/llapi/mc/StateSerializationUtils.hpp @@ -22,7 +22,7 @@ namespace StateSerializationUtils { #undef AFTER_EXTRA /** - * @symbol ?fromJavaNbtString\@StateSerializationUtils\@\@YA?AW4WallConnectionType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromJavaNbtString\@StateSerializationUtils\@\@YA?AW4WallConnectionType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class WallConnectionType fromJavaNbtString(std::string const &); diff --git a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp index 1b0d83389f..f0cd1f528c 100644 --- a/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/StaticVanillaBlocks.hpp @@ -5,624 +5,672 @@ namespace StaticVanillaBlocks { - LIAPI extern class Block const* mAcaciaButton; - LIAPI extern class Block const* mAcaciaDoor; - LIAPI extern class Block const* mAcaciaFenceGate; - LIAPI extern class Block const* mAcaciaPressurePlate; - LIAPI extern class Block const* mAcaciaStairs; - LIAPI extern class Block const* mAcaciaStandingSign; - LIAPI extern class Block const* mAcaciaTrapdoor; - LIAPI extern class Block const* mAcaciaWallSign; - LIAPI extern class Block const* mActivatorRail; - LIAPI extern class Block const* mAllow; - LIAPI extern class Block const* mAmethystBlock; - LIAPI extern class Block const* mAmethystCluster; - LIAPI extern class Block const* mAncientDebris; - LIAPI extern class Block const* mAndesiteStairs; - LIAPI extern class Block const* mAnvil; - LIAPI extern class Block const* mAzalea; - LIAPI extern class Block const* mAzaleaLeaves; - LIAPI extern class Block const* mAzaleaLeavesFlowered; - LIAPI extern class Block const* mBamboo; - LIAPI extern class Block const* mBambooSapling; - LIAPI extern class Block const* mBarrel; - LIAPI extern class Block const* mBarrier; - LIAPI extern class Block const* mBasalt; - LIAPI extern class Block const* mBeacon; - LIAPI extern class Block const* mBed; - LIAPI extern class Block const* mBedrock; - LIAPI extern class Block const* mBeeNest; - LIAPI extern class Block const* mBeehive; - LIAPI extern class Block const* mBeetroot; - LIAPI extern class Block const* mBell; - LIAPI extern class Block const* mBigDripleaf; - LIAPI extern class Block const* mBirchButton; - LIAPI extern class Block const* mBirchDoor; - LIAPI extern class Block const* mBirchFenceGate; - LIAPI extern class Block const* mBirchPressurePlate; - LIAPI extern class Block const* mBirchStairs; - LIAPI extern class Block const* mBirchStandingSign; - 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* mBlackGlazedTerracotta; - LIAPI extern class Block const* mBlackstone; - LIAPI extern class Block const* mBlackstoneDoubleSlab; - LIAPI extern class Block const* mBlackstoneSlab; - LIAPI extern class Block const* mBlackstoneStairs; - 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* mBlueGlazedTerracotta; - LIAPI extern class Block const* mBlueIce; - LIAPI extern class Block const* mBoneBlock; - LIAPI extern class Block const* mBookshelf; - LIAPI extern class Block const* mBorderBlock; - 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* mBrownGlazedTerracotta; - LIAPI extern class Block const* mBrownMushroom; - LIAPI extern class Block const* mBrownMushroomBlock; - LIAPI extern class Block const* mBubbleColumn; - LIAPI extern class Block const* mBuddingAmethyst; - LIAPI extern class Block const* mCactus; - LIAPI extern class Block const* mCake; - LIAPI extern class Block const* mCalcite; - 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; - LIAPI extern class Block const* mCauldron; - LIAPI extern class Block const* mCaveVines; - LIAPI extern class Block const* mCaveVinesBodyWithBerries; - LIAPI extern class Block const* mCaveVinesHeadWithBerries; - LIAPI extern class Block const* mChain; - LIAPI extern class Block const* mChainCommandBlock; - LIAPI extern class Block const* mChalkboard; - LIAPI extern class Block const* mChemicalHeat; - LIAPI extern class Block const* mChemistryTable; - LIAPI extern class Block const* mChest; - LIAPI extern class Block const* mChiseledDeepslate; - LIAPI extern class Block const* mChiseledNetherBricks; - LIAPI extern class Block const* mChiseledPolishedBlackstone; - LIAPI extern class Block const* mChorusFlower; - LIAPI extern class Block const* mChorusPlant; - LIAPI extern class Block const* mClay; - LIAPI extern class Block const* mClientRequestPlaceholderBlock; - LIAPI extern class Block const* mCoalBlock; - LIAPI extern class Block const* mCoalOre; - LIAPI extern class Block const* mCobbledDeepslate; - LIAPI extern class Block const* mCobbledDeepslateDoubleSlab; - LIAPI extern class Block const* mCobbledDeepslateSlab; - LIAPI extern class Block const* mCobbledDeepslateStairs; - LIAPI extern class Block const* mCobbledDeepslateWall; - LIAPI extern class Block const* mCobblestone; - LIAPI extern class Block const* mCobblestoneWall; - LIAPI extern class Block const* mCocoa; - LIAPI extern class Block const* mColoredTorchBp; - LIAPI extern class Block const* mColoredTorchRg; - LIAPI extern class Block const* mCommandBlock; - LIAPI extern class Block const* mComposter; - LIAPI extern class Block const* mConcrete; - LIAPI extern class Block const* mConcretePowder; - LIAPI extern class Block const* mConduit; - LIAPI extern class Block const* mCopperBlock; - 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; - LIAPI extern class Block const* mCoralFanHang; - LIAPI extern class Block const* mCoralFanHang2; - LIAPI extern class Block const* mCoralFanHang3; - LIAPI extern class Block const* mCrackedDeepslateBricks; - LIAPI extern class Block const* mCrackedDeepslateTiles; - LIAPI extern class Block const* mCrackedNetherBricks; - LIAPI extern class Block const* mCrackedPolishedBlackstoneBricks; - LIAPI extern class Block const* mCraftingTable; - LIAPI extern class Block const* mCrimsonButton; - LIAPI extern class Block const* mCrimsonDoor; - LIAPI extern class Block const* mCrimsonDoubleSlab; - LIAPI extern class Block const* mCrimsonFence; - LIAPI extern class Block const* mCrimsonFenceGate; - LIAPI extern class Block const* mCrimsonFungus; - LIAPI extern class Block const* mCrimsonHyphae; - LIAPI extern class Block const* mCrimsonNylium; - LIAPI extern class Block const* mCrimsonPlanks; - LIAPI extern class Block const* mCrimsonPressurePlate; - LIAPI extern class Block const* mCrimsonRoots; - LIAPI extern class Block const* mCrimsonSlab; - LIAPI extern class Block const* mCrimsonStairs; - LIAPI extern class Block const* mCrimsonStandingSign; - LIAPI extern class Block const* mCrimsonStem; - LIAPI extern class Block const* mCrimsonTrapdoor; - LIAPI extern class Block const* mCrimsonWallSign; - LIAPI extern class Block const* mCryingObsidian; - LIAPI extern class Block const* mCutCopper; - 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* mCyanGlazedTerracotta; - LIAPI extern class Block const* mDarkOakButton; - LIAPI extern class Block const* mDarkOakDoor; - LIAPI extern class Block const* mDarkOakFenceGate; - LIAPI extern class Block const* mDarkOakPressurePlate; - LIAPI extern class Block const* mDarkOakStairs; - LIAPI extern class Block const* mDarkOakTrapdoor; - LIAPI extern class Block const* mDarkPrismarineStairs; - 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* mDeadbush; - LIAPI extern class Block const* mDeepslate; - LIAPI extern class Block const* mDeepslateBrickDoubleSlab; - LIAPI extern class Block const* mDeepslateBrickSlab; - LIAPI extern class Block const* mDeepslateBrickStairs; - LIAPI extern class Block const* mDeepslateBrickWall; - LIAPI extern class Block const* mDeepslateBricks; - LIAPI extern class Block const* mDeepslateCoalOre; - LIAPI extern class Block const* mDeepslateCopperOre; - LIAPI extern class Block const* mDeepslateDiamondOre; - LIAPI extern class Block const* mDeepslateEmeraldOre; - LIAPI extern class Block const* mDeepslateGoldOre; - LIAPI extern class Block const* mDeepslateIronOre; - LIAPI extern class Block const* mDeepslateLapisOre; - LIAPI extern class Block const* mDeepslateRedstoneOre; - LIAPI extern class Block const* mDeepslateTileDoubleSlab; - LIAPI extern class Block const* mDeepslateTileSlab; - LIAPI extern class Block const* mDeepslateTileStairs; - LIAPI extern class Block const* mDeepslateTileWall; - LIAPI extern class Block const* mDeepslateTiles; - LIAPI extern class Block const* mDeny; - LIAPI extern class Block const* mDetectorRail; - LIAPI extern class Block const* mDiamondBlock; - LIAPI extern class Block const* mDiamondOre; - LIAPI extern class Block const* mDioriteStairs; - LIAPI extern class Block const* mDirt; - LIAPI extern class Block const* mDirtWithRoots; - LIAPI extern class Block const* mDispenser; - LIAPI extern class Block const* mDoubleCutCopperSlab; - LIAPI extern class Block const* mDoublePlant; - LIAPI extern class Block const* mDoubleStoneSlab; - LIAPI extern class Block const* mDoubleStoneSlab2; - LIAPI extern class Block const* mDoubleStoneSlab3; - LIAPI extern class Block const* mDoubleStoneSlab4; - LIAPI extern class Block const* mDoubleWoodenSlab; - LIAPI extern class Block const* mDragonEgg; - LIAPI extern class Block const* mDriedKelpBlock; - LIAPI extern class Block const* mDripstone; - LIAPI extern class Block const* mDropper; - LIAPI extern class Block const* mElements[119]; - LIAPI extern class Block const* mEmeraldBlock; - LIAPI extern class Block const* mEmeraldOre; - LIAPI extern class Block const* mEnchantingTable; - LIAPI extern class Block const* mEndBrickStairs; - LIAPI extern class Block const* mEndBricks; - LIAPI extern class Block const* mEndGateway; - LIAPI extern class Block const* mEndPortal; - LIAPI extern class Block const* mEndPortalFrame; - LIAPI extern class Block const* mEndRod; - LIAPI extern class Block const* mEndStone; - LIAPI extern class Block const* mEnderChest; - LIAPI extern class Block const* mExposedCopper; - LIAPI extern class Block const* mExposedCutCopper; - LIAPI extern class Block const* mExposedCutCopperSlab; - LIAPI extern class Block const* mExposedCutCopperStairs; - LIAPI extern class Block const* mExposedDoubleCutCopperSlab; - LIAPI extern class Block const* mFarmlandBlock; - LIAPI extern class Block const* mFence; - LIAPI extern class Block const* mFenceGate; - LIAPI extern class Block const* mFire; - LIAPI extern class Block const* mFletchingTable; - LIAPI extern class Block const* mFlowerPot; - LIAPI extern class Block const* mFloweringAzalea; - LIAPI extern class Block const* mFlowingLava; - LIAPI extern class Block const* mFlowingWater; - LIAPI extern class Block const* mFrogSpawn; - LIAPI extern class Block const* mFrostedIce; - LIAPI extern class Block const* mFurnace; - LIAPI extern class Block const* mGildedBlackstone; - LIAPI extern class Block const* mGlass; - LIAPI extern class Block const* mGlassPane; - LIAPI extern class Block const* mGlowItemFrame; - LIAPI extern class Block const* mGlowLichen; - LIAPI extern class Block const* mGlowingobsidian; - LIAPI extern class Block const* mGlowstone; - LIAPI extern class Block const* mGoldBlock; - LIAPI extern class Block const* mGoldOre; - LIAPI extern class Block const* mGoldenRail; - LIAPI extern class Block const* mGraniteStairs; - LIAPI extern class Block const* mGrass; - 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* mGrayGlazedTerracotta; - LIAPI extern class Block const* mGreenCandle; - LIAPI extern class Block const* mGreenCandleCake; - LIAPI extern class Block const* mGreenGlazedTerracotta; - LIAPI extern class Block const* mGrindstone; - LIAPI extern class Block const* mHangingRoots; - LIAPI extern class Block const* mHardGlass; - LIAPI extern class Block const* mHardGlassPane; - LIAPI extern class Block const* mHardStainedGlass; - LIAPI extern class Block const* mHardStainedGlassPane; - LIAPI extern class Block const* mHardenedClay; - LIAPI extern class Block const* mHayBlock; - 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* mIce; - LIAPI extern class Block const* mInfestedDeepslate; - LIAPI extern class Block const* mInfoUpdate; - LIAPI extern class Block const* mInfoUpdate2; - LIAPI extern class Block const* mInvisibleBedrock; - LIAPI extern class Block const* mIronBars; - LIAPI extern class Block const* mIronBlock; - LIAPI extern class Block const* mIronDoor; - LIAPI extern class Block const* mIronOre; - LIAPI extern class Block const* mIronTrapdoor; - LIAPI extern class Block const* mItemFrame; - LIAPI extern class Block const* mJigsaw; - LIAPI extern class Block const* mJukebox; - LIAPI extern class Block const* mJungleButton; - LIAPI extern class Block const* mJungleDoor; - LIAPI extern class Block const* mJungleFenceGate; - LIAPI extern class Block const* mJunglePressurePlate; - LIAPI extern class Block const* mJungleStairs; - LIAPI extern class Block const* mJungleStandingSign; - LIAPI extern class Block const* mJungleTrapdoor; - LIAPI extern class Block const* mJungleWallSign; - LIAPI extern class Block const* mKelp; - LIAPI extern class Block const* mLadder; - LIAPI extern class Block const* mLantern; - 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; - 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* mLightBlueGlazedTerracotta; - LIAPI extern class Block const* mLightGrayCandle; - LIAPI extern class Block const* mLightGrayCandleCake; - 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* mLimeGlazedTerracotta; - LIAPI extern class Block const* mLitBlastFurnace; - LIAPI extern class Block const* mLitDeepslateRedstoneOre; - LIAPI extern class Block const* mLitFurnace; - LIAPI extern class Block const* mLitPumpkin; - LIAPI extern class Block const* mLitRedstoneLamp; - LIAPI extern class Block const* mLitRedstoneOre; - LIAPI extern class Block const* mLitSmoker; - LIAPI extern class Block const* mLodestone; - LIAPI extern class Block const* mLog; - LIAPI extern class Block const* mLog2; - LIAPI extern class Block const* mLoom; - LIAPI extern class Block const* mMagentaCandle; - LIAPI extern class Block const* mMagentaCandleCake; - LIAPI extern class Block const* mMagentaGlazedTerracotta; - LIAPI extern class Block const* mMagma; - LIAPI extern class Block const* mMangroveButton; - LIAPI extern class Block const* mMangroveDoor; - LIAPI extern class Block const* mMangroveDoubleSlab; - LIAPI extern class Block const* mMangroveFence; - LIAPI extern class Block const* mMangroveFenceGate; - LIAPI extern class Block const* mMangroveLeaves; - LIAPI extern class Block const* mMangroveLog; - LIAPI extern class Block const* mMangrovePlanks; - LIAPI extern class Block const* mMangrovePressurePlate; - LIAPI extern class Block const* mMangrovePropagule; - LIAPI extern class Block const* mMangroveRoots; - LIAPI extern class Block const* mMangroveSlab; - LIAPI extern class Block const* mMangroveStairs; - LIAPI extern class Block const* mMangroveStandingSign; - LIAPI extern class Block const* mMangroveTrapdoor; - LIAPI extern class Block const* mMangroveWallSign; - LIAPI extern class Block const* mMangroveWood; - LIAPI extern class Block const* mMediumAmethystBud; - LIAPI extern class Block const* mMelonBlock; - LIAPI extern class Block const* mMelonStem; - LIAPI extern class Block const* mMobSpawner; - LIAPI extern class Block const* mMonsterEgg; - LIAPI extern class Block const* mMossBlock; - LIAPI extern class Block const* mMossCarpet; - LIAPI extern class Block const* mMossyCobblestone; - LIAPI extern class Block const* mMossyCobblestoneStairs; - LIAPI extern class Block const* mMossyStoneBrickStairs; - LIAPI extern class Block const* mMovingBlock; - LIAPI extern class Block const* mMud; - LIAPI extern class Block const* mMudBrickDoubleSlab; - LIAPI extern class Block const* mMudBrickSlab; - LIAPI extern class Block const* mMudBrickStairs; - LIAPI extern class Block const* mMudBrickWall; - LIAPI extern class Block const* mMudBricks; - LIAPI extern class Block const* mMuddyMangroveRoots; - LIAPI extern class Block const* mMycelium; - LIAPI extern class Block const* mMysteriousFrame; - LIAPI extern class Block const* mMysteriousFrameSlot; - LIAPI extern class Block const* mNetherBrickBlockName; - LIAPI extern class Block const* mNetherBrickFence; - LIAPI extern class Block const* mNetherBrickStairs; - LIAPI extern class Block const* mNetherGoldOre; - LIAPI extern class Block const* mNetherSprouts; - LIAPI extern class Block const* mNetherWart; - LIAPI extern class Block const* mNetherWartBlock; - LIAPI extern class Block const* mNetheriteBlock; - LIAPI extern class Block const* mNetherrack; - LIAPI extern class Block const* mNetherreactor; - LIAPI extern class Block const* mNormalStoneStairs; - LIAPI extern class Block const* mNoteblock; - LIAPI extern class Block const* mOakStairs; - LIAPI extern class Block const* mObserver; - 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* mOrangeGlazedTerracotta; - LIAPI extern class Block const* mOxidizedCopper; - LIAPI extern class Block const* mOxidizedCutCopper; - LIAPI extern class Block const* mOxidizedCutCopperSlab; - LIAPI extern class Block const* mOxidizedCutCopperStairs; - LIAPI extern class Block const* mOxidizedDoubleCutCopperSlab; - LIAPI extern class Block const* mPackedIce; - 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* mPinkGlazedTerracotta; - LIAPI extern class Block const* mPiston; - LIAPI extern class Block const* mPistonArmCollision; - LIAPI extern class Block const* mPlanks; - LIAPI extern class Block const* mPodzol; - LIAPI extern class Block const* mPointedDripstone; - LIAPI extern class Block const* mPolishedAndesiteStairs; - LIAPI extern class Block const* mPolishedBasalt; - LIAPI extern class Block const* mPolishedBlackstone; - LIAPI extern class Block const* mPolishedBlackstoneBrickDoubleSlab; - LIAPI extern class Block const* mPolishedBlackstoneBrickSlab; - LIAPI extern class Block const* mPolishedBlackstoneBrickStairs; - LIAPI extern class Block const* mPolishedBlackstoneBrickWall; - LIAPI extern class Block const* mPolishedBlackstoneBricks; - LIAPI extern class Block const* mPolishedBlackstoneButton; - LIAPI extern class Block const* mPolishedBlackstoneDoubleSlab; - LIAPI extern class Block const* mPolishedBlackstonePressurePlate; - LIAPI extern class Block const* mPolishedBlackstoneSlab; - LIAPI extern class Block const* mPolishedBlackstoneStairs; - LIAPI extern class Block const* mPolishedBlackstoneWall; - LIAPI extern class Block const* mPolishedDeepslate; - LIAPI extern class Block const* mPolishedDeepslateDoubleSlab; - LIAPI extern class Block const* mPolishedDeepslateSlab; - LIAPI extern class Block const* mPolishedDeepslateStairs; - LIAPI extern class Block const* mPolishedDeepslateWall; - LIAPI extern class Block const* mPolishedDioriteStairs; - LIAPI extern class Block const* mPolishedGraniteStairs; - LIAPI extern class Block const* mPortal; - LIAPI extern class Block const* mPotatoes; - LIAPI extern class Block const* mPowderSnow; - LIAPI extern class Block const* mPoweredComparator; - LIAPI extern class Block const* mPoweredRepeater; - LIAPI extern class Block const* mPrismarine; - LIAPI extern class Block const* mPrismarineBricksStairs; - LIAPI extern class Block const* mPrismarineStairs; - 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* mPurpleGlazedTerracotta; - LIAPI extern class Block const* mPurpurBlock; - LIAPI extern class Block const* mPurpurStairs; - LIAPI extern class Block const* mQuartzBlock; - LIAPI extern class Block const* mQuartzBricks; - LIAPI extern class Block const* mQuartzOre; - LIAPI extern class Block const* mQuartzStairs; - LIAPI extern class Block const* mRail; - LIAPI extern class Block const* mRawCopperBlock; - 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* mRedFlower; - LIAPI extern class Block const* mRedGlazedTerracotta; - LIAPI extern class Block const* mRedMushroom; - LIAPI extern class Block const* mRedMushroomBlock; - LIAPI extern class Block const* mRedNetherBrick; - LIAPI extern class Block const* mRedNetherBrickStairs; - LIAPI extern class Block const* mRedSandstone; - LIAPI extern class Block const* mRedSandstoneStairs; - LIAPI extern class Block const* mRedstoneBlock; - LIAPI extern class Block const* mRedstoneLamp; - LIAPI extern class Block const* mRedstoneOre; - LIAPI extern class Block const* mRedstoneTorch; - LIAPI extern class Block const* mRedstoneWire; - LIAPI extern class Block const* mReeds; - LIAPI extern class Block const* mReinforcedDeepslate; - LIAPI extern class Block const* mRepeatingCommandBlock; - LIAPI extern class Block const* mReserved6; - LIAPI extern class Block const* mRespawnAnchor; - LIAPI extern class Block const* mSand; - LIAPI extern class Block const* mSandstone; - LIAPI extern class Block const* mSandstoneStairs; - LIAPI extern class Block const* mSapling; - LIAPI extern class Block const* mScaffolding; - LIAPI extern class Block const* mSculk; - LIAPI extern class Block const* mSculkCatalyst; - LIAPI extern class Block const* mSculkSensor; - LIAPI extern class Block const* mSculkShrieker; - LIAPI extern class Block const* mSculkVein; - LIAPI extern class Block const* mSeaLantern; - LIAPI extern class Block const* mSeaPickle; - LIAPI extern class Block const* mSeagrass; - LIAPI extern class Block const* mShroomlight; - LIAPI extern class Block const* mShulkerBox; - LIAPI extern class Block const* mSilverGlazedTerracotta; - LIAPI extern class Block const* mSkull; - LIAPI extern class Block const* mSlimeBlock; - LIAPI extern class Block const* mSmallAmethystBud; - LIAPI extern class Block const* mSmallDripleaf; - LIAPI extern class Block const* mSmithingTable; - LIAPI extern class Block const* mSmoker; - LIAPI extern class Block const* mSmoothBasalt; - 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* mSnow; - LIAPI extern class Block const* mSnowLayer; - LIAPI extern class Block const* mSoulCampfire; - LIAPI extern class Block const* mSoulFire; - LIAPI extern class Block const* mSoulLantern; - LIAPI extern class Block const* mSoulSand; - LIAPI extern class Block const* mSoulSoil; - LIAPI extern class Block const* mSoulTorch; - LIAPI extern class Block const* mSponge; - LIAPI extern class Block const* mSporeBlossom; - LIAPI extern class Block const* mSpruceButton; - LIAPI extern class Block const* mSpruceDoor; - LIAPI extern class Block const* mSpruceFenceGate; - LIAPI extern class Block const* mSprucePressurePlate; - LIAPI extern class Block const* mSpruceStairs; - LIAPI extern class Block const* mSpruceStandingSign; - LIAPI extern class Block const* mSpruceTrapdoor; - LIAPI extern class Block const* mSpruceWallSign; - LIAPI extern class Block const* mStainedGlass; - LIAPI extern class Block const* mStainedGlassPane; - LIAPI extern class Block const* mStainedHardenedClay; - LIAPI extern class Block const* mStandingBanner; - LIAPI extern class Block const* mStandingSign; - LIAPI extern class Block const* mStickyPiston; - LIAPI extern class Block const* mStickyPistonArmCollision; - LIAPI extern class Block const* mStone; - LIAPI extern class Block const* mStoneBrickStairs; - LIAPI extern class Block const* mStoneBricks; - LIAPI extern class Block const* mStoneButton; - LIAPI extern class Block const* mStonePressurePlate; - LIAPI extern class Block const* mStoneSlab; - LIAPI extern class Block const* mStoneSlab2; - LIAPI extern class Block const* mStoneSlab3; - LIAPI extern class Block const* mStoneSlab4; - LIAPI extern class Block const* mStoneStairs; - LIAPI extern class Block const* mStonecutter; - LIAPI extern class Block const* mStonecutterBlock; - LIAPI extern class Block const* mStrippedAcaciaLog; - LIAPI extern class Block const* mStrippedBirchLog; - LIAPI extern class Block const* mStrippedCrimsonHyphae; - LIAPI extern class Block const* mStrippedCrimsonStem; - LIAPI extern class Block const* mStrippedDarkOakLog; - LIAPI extern class Block const* mStrippedJungleLog; - LIAPI extern class Block const* mStrippedMangroveLog; - LIAPI extern class Block const* mStrippedMangroveWood; - LIAPI extern class Block const* mStrippedOakLog; - LIAPI extern class Block const* mStrippedSpruceLog; - LIAPI extern class Block const* mStrippedWarpedHyphae; - LIAPI extern class Block const* mStrippedWarpedStem; - LIAPI extern class Block const* mStructureBlock; - LIAPI extern class Block const* mStructureVoid; - LIAPI extern class Block const* mSweetBerryBush; - LIAPI extern class Block const* mTallGrass; - LIAPI extern class Block const* mTarget; - LIAPI extern class Block const* mTintedGlass; - LIAPI extern class Block const* mTnt; - LIAPI extern class Block const* mTorch; - 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* mTuff; - LIAPI extern class Block const* mTurtleEgg; - LIAPI extern class Block const* mTwistingVines; - LIAPI extern class Block const* mUnderwaterTorch; - LIAPI extern class Block const* mUndyedShulkerBox; - LIAPI extern class Block const* mUnlitRedstoneTorch; - LIAPI extern class Block const* mUnpoweredComparator; - LIAPI extern class Block const* mUnpoweredRepeater; - LIAPI extern class Block const* mVerdantFroglight; - LIAPI extern class Block const* mVine; - LIAPI extern class Block const* mWallBanner; - LIAPI extern class Block const* mWallSign; - LIAPI extern class Block const* mWarpedButton; - LIAPI extern class Block const* mWarpedDoor; - LIAPI extern class Block const* mWarpedDoubleSlab; - LIAPI extern class Block const* mWarpedFence; - LIAPI extern class Block const* mWarpedFenceGate; - LIAPI extern class Block const* mWarpedFungus; - LIAPI extern class Block const* mWarpedHyphae; - LIAPI extern class Block const* mWarpedNylium; - LIAPI extern class Block const* mWarpedPlanks; - LIAPI extern class Block const* mWarpedPressurePlate; - LIAPI extern class Block const* mWarpedRoots; - LIAPI extern class Block const* mWarpedSlab; - LIAPI extern class Block const* mWarpedStairs; - LIAPI extern class Block const* mWarpedStandingSign; - LIAPI extern class Block const* mWarpedStem; - LIAPI extern class Block const* mWarpedTrapdoor; - LIAPI extern class Block const* mWarpedWallSign; - LIAPI extern class Block const* mWarpedWartBlock; - LIAPI extern class Block const* mWater; - LIAPI extern class Block const* mWaterLily; - LIAPI extern class Block const* mWaxedCopper; - LIAPI extern class Block const* mWaxedCutCopper; - LIAPI extern class Block const* mWaxedCutCopperSlab; - LIAPI extern class Block const* mWaxedCutCopperStairs; - LIAPI extern class Block const* mWaxedDoubleCutCopperSlab; - LIAPI extern class Block const* mWaxedExposedCopper; - LIAPI extern class Block const* mWaxedExposedCutCopper; - LIAPI extern class Block const* mWaxedExposedCutCopperSlab; - LIAPI extern class Block const* mWaxedExposedCutCopperStairs; - LIAPI extern class Block const* mWaxedExposedDoubleCutCopperSlab; - LIAPI extern class Block const* mWaxedOxidizedCopper; - LIAPI extern class Block const* mWaxedOxidizedCutCopper; - LIAPI extern class Block const* mWaxedOxidizedCutCopperSlab; - LIAPI extern class Block const* mWaxedOxidizedCutCopperStairs; - LIAPI extern class Block const* mWaxedOxidizedDoubleCutCopperSlab; - LIAPI extern class Block const* mWaxedWeatheredCopper; - LIAPI extern class Block const* mWaxedWeatheredCutCopper; - LIAPI extern class Block const* mWaxedWeatheredCutCopperSlab; - LIAPI extern class Block const* mWaxedWeatheredCutCopperStairs; - LIAPI extern class Block const* mWaxedWeatheredDoubleCutCopperSlab; - LIAPI extern class Block const* mWeatheredCopper; - LIAPI extern class Block const* mWeatheredCutCopper; - LIAPI extern class Block const* mWeatheredCutCopperSlab; - LIAPI extern class Block const* mWeatheredCutCopperStairs; - LIAPI extern class Block const* mWeatheredDoubleCutCopperSlab; - LIAPI extern class Block const* mWeb; - 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* mWhiteGlazedTerracotta; - LIAPI extern class Block const* mWitherRose; - LIAPI extern class Block const* mWood; - LIAPI extern class Block const* mWoodenButton; - LIAPI extern class Block const* mWoodenDoor; - LIAPI extern class Block const* mWoodenPressurePlate; - LIAPI extern class Block const* mWoodenSlab; - LIAPI extern class Block const* mWool; - LIAPI extern class Block const* mYellowCandle; - LIAPI extern class Block const* mYellowCandleCake; - LIAPI extern class Block const* mYellowFlower; - LIAPI extern class Block const* mYellowGlazedTerracotta; +LIAPI void assignBlocks(); - LIAPI void assignBlocks(); +LIAPI extern class Block const* mElements[119]; -}; +LIAPI extern class Block const* mAcaciaButton; +LIAPI extern class Block const* mAcaciaDoor; +LIAPI extern class Block const* mAcaciaFenceGate; +LIAPI extern class Block const* mAcaciaHangingSign; +LIAPI extern class Block const* mAcaciaPressurePlate; +LIAPI extern class Block const* mAcaciaStairs; +LIAPI extern class Block const* mAcaciaStandingSign; +LIAPI extern class Block const* mAcaciaTrapdoor; +LIAPI extern class Block const* mAcaciaWallSign; +LIAPI extern class Block const* mActivatorRail; +LIAPI extern class Block const* mAllow; +LIAPI extern class Block const* mAmethystBlock; +LIAPI extern class Block const* mAmethystCluster; +LIAPI extern class Block const* mAncientDebris; +LIAPI extern class Block const* mAndesiteStairs; +LIAPI extern class Block const* mAnvil; +LIAPI extern class Block const* mAzalea; +LIAPI extern class Block const* mAzaleaLeaves; +LIAPI extern class Block const* mAzaleaLeavesFlowered; +LIAPI extern class Block const* mBamboo; +LIAPI extern class Block const* mBambooBlock; +LIAPI extern class Block const* mBambooButton; +LIAPI extern class Block const* mBambooDoor; +LIAPI extern class Block const* mBambooDoubleSlab; +LIAPI extern class Block const* mBambooFence; +LIAPI extern class Block const* mBambooFenceGate; +LIAPI extern class Block const* mBambooHangingSign; +LIAPI extern class Block const* mBambooMosaic; +LIAPI extern class Block const* mBambooMosaicDoubleSlab; +LIAPI extern class Block const* mBambooMosaicSlab; +LIAPI extern class Block const* mBambooMosaicStairs; +LIAPI extern class Block const* mBambooPlanks; +LIAPI extern class Block const* mBambooPressurePlate; +LIAPI extern class Block const* mBambooSapling; +LIAPI extern class Block const* mBambooSlab; +LIAPI extern class Block const* mBambooStairs; +LIAPI extern class Block const* mBambooStandingSign; +LIAPI extern class Block const* mBambooTrapdoor; +LIAPI extern class Block const* mBambooWallSign; +LIAPI extern class Block const* mBarrel; +LIAPI extern class Block const* mBarrier; +LIAPI extern class Block const* mBasalt; +LIAPI extern class Block const* mBeacon; +LIAPI extern class Block const* mBed; +LIAPI extern class Block const* mBedrock; +LIAPI extern class Block const* mBeeNest; +LIAPI extern class Block const* mBeehive; +LIAPI extern class Block const* mBeetroot; +LIAPI extern class Block const* mBell; +LIAPI extern class Block const* mBigDripleaf; +LIAPI extern class Block const* mBirchButton; +LIAPI extern class Block const* mBirchDoor; +LIAPI extern class Block const* mBirchFenceGate; +LIAPI extern class Block const* mBirchHangingSign; +LIAPI extern class Block const* mBirchPressurePlate; +LIAPI extern class Block const* mBirchStairs; +LIAPI extern class Block const* mBirchStandingSign; +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* mBlackGlazedTerracotta; +LIAPI extern class Block const* mBlackWool; +LIAPI extern class Block const* mBlackstone; +LIAPI extern class Block const* mBlackstoneDoubleSlab; +LIAPI extern class Block const* mBlackstoneSlab; +LIAPI extern class Block const* mBlackstoneStairs; +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* 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* 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* 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* mBuddingAmethyst; +LIAPI extern class Block const* mCactus; +LIAPI extern class Block const* mCake; +LIAPI extern class Block const* mCalcite; +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; +LIAPI extern class Block const* mCauldron; +LIAPI extern class Block const* mCaveVines; +LIAPI extern class Block const* mCaveVinesBodyWithBerries; +LIAPI extern class Block const* mCaveVinesHeadWithBerries; +LIAPI extern class Block const* mChain; +LIAPI extern class Block const* mChainCommandBlock; +LIAPI extern class Block const* mChalkboard; +LIAPI extern class Block const* mChemicalHeat; +LIAPI extern class Block const* mChemistryTable; +LIAPI extern class Block const* mChest; +LIAPI extern class Block const* mChiseledBookshelf; +LIAPI extern class Block const* mChiseledDeepslate; +LIAPI extern class Block const* mChiseledNetherBricks; +LIAPI extern class Block const* mChiseledPolishedBlackstone; +LIAPI extern class Block const* mChorusFlower; +LIAPI extern class Block const* mChorusPlant; +LIAPI extern class Block const* mClay; +LIAPI extern class Block const* mClientRequestPlaceholderBlock; +LIAPI extern class Block const* mCoalBlock; +LIAPI extern class Block const* mCoalOre; +LIAPI extern class Block const* mCobbledDeepslate; +LIAPI extern class Block const* mCobbledDeepslateDoubleSlab; +LIAPI extern class Block const* mCobbledDeepslateSlab; +LIAPI extern class Block const* mCobbledDeepslateStairs; +LIAPI extern class Block const* mCobbledDeepslateWall; +LIAPI extern class Block const* mCobblestone; +LIAPI extern class Block const* mCobblestoneWall; +LIAPI extern class Block const* mCocoa; +LIAPI extern class Block const* mColoredTorchBp; +LIAPI extern class Block const* mColoredTorchRg; +LIAPI extern class Block const* mCommandBlock; +LIAPI extern class Block const* mComposter; +LIAPI extern class Block const* mConcrete; +LIAPI extern class Block const* mConcretePowder; +LIAPI extern class Block const* mConduit; +LIAPI extern class Block const* mCopperBlock; +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; +LIAPI extern class Block const* mCoralFanHang; +LIAPI extern class Block const* mCoralFanHang2; +LIAPI extern class Block const* mCoralFanHang3; +LIAPI extern class Block const* mCrackedDeepslateBricks; +LIAPI extern class Block const* mCrackedDeepslateTiles; +LIAPI extern class Block const* mCrackedNetherBricks; +LIAPI extern class Block const* mCrackedPolishedBlackstoneBricks; +LIAPI extern class Block const* mCraftingTable; +LIAPI extern class Block const* mCrimsonButton; +LIAPI extern class Block const* mCrimsonDoor; +LIAPI extern class Block const* mCrimsonDoubleSlab; +LIAPI extern class Block const* mCrimsonFence; +LIAPI extern class Block const* mCrimsonFenceGate; +LIAPI extern class Block const* mCrimsonFungus; +LIAPI extern class Block const* mCrimsonHangingSign; +LIAPI extern class Block const* mCrimsonHyphae; +LIAPI extern class Block const* mCrimsonNylium; +LIAPI extern class Block const* mCrimsonPlanks; +LIAPI extern class Block const* mCrimsonPressurePlate; +LIAPI extern class Block const* mCrimsonRoots; +LIAPI extern class Block const* mCrimsonSlab; +LIAPI extern class Block const* mCrimsonStairs; +LIAPI extern class Block const* mCrimsonStandingSign; +LIAPI extern class Block const* mCrimsonStem; +LIAPI extern class Block const* mCrimsonTrapdoor; +LIAPI extern class Block const* mCrimsonWallSign; +LIAPI extern class Block const* mCryingObsidian; +LIAPI extern class Block const* mCutCopper; +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* mCyanGlazedTerracotta; +LIAPI extern class Block const* mCyanWool; +LIAPI extern class Block const* mDarkOakButton; +LIAPI extern class Block const* mDarkOakDoor; +LIAPI extern class Block const* mDarkOakFenceGate; +LIAPI extern class Block const* mDarkOakPressurePlate; +LIAPI extern class Block const* mDarkOakStairs; +LIAPI extern class Block const* mDarkOakTrapdoor; +LIAPI extern class Block const* mDarkPrismarineStairs; +LIAPI extern class Block const* mDarkoakHangingSign; +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* mDeadbush; +LIAPI extern class Block const* mDecoratedPot; +LIAPI extern class Block const* mDeepslate; +LIAPI extern class Block const* mDeepslateBrickDoubleSlab; +LIAPI extern class Block const* mDeepslateBrickSlab; +LIAPI extern class Block const* mDeepslateBrickStairs; +LIAPI extern class Block const* mDeepslateBrickWall; +LIAPI extern class Block const* mDeepslateBricks; +LIAPI extern class Block const* mDeepslateCoalOre; +LIAPI extern class Block const* mDeepslateCopperOre; +LIAPI extern class Block const* mDeepslateDiamondOre; +LIAPI extern class Block const* mDeepslateEmeraldOre; +LIAPI extern class Block const* mDeepslateGoldOre; +LIAPI extern class Block const* mDeepslateIronOre; +LIAPI extern class Block const* mDeepslateLapisOre; +LIAPI extern class Block const* mDeepslateRedstoneOre; +LIAPI extern class Block const* mDeepslateTileDoubleSlab; +LIAPI extern class Block const* mDeepslateTileSlab; +LIAPI extern class Block const* mDeepslateTileStairs; +LIAPI extern class Block const* mDeepslateTileWall; +LIAPI extern class Block const* mDeepslateTiles; +LIAPI extern class Block const* mDeny; +LIAPI extern class Block const* mDetectorRail; +LIAPI extern class Block const* mDiamondBlock; +LIAPI extern class Block const* mDiamondOre; +LIAPI extern class Block const* mDioriteStairs; +LIAPI extern class Block const* mDirt; +LIAPI extern class Block const* mDirtWithRoots; +LIAPI extern class Block const* mDispenser; +LIAPI extern class Block const* mDoubleCutCopperSlab; +LIAPI extern class Block const* mDoublePlant; +LIAPI extern class Block const* mDoubleStoneSlab; +LIAPI extern class Block const* mDoubleStoneSlab2; +LIAPI extern class Block const* mDoubleStoneSlab3; +LIAPI extern class Block const* mDoubleStoneSlab4; +LIAPI extern class Block const* mDoubleWoodenSlab; +LIAPI extern class Block const* mDragonEgg; +LIAPI extern class Block const* mDriedKelpBlock; +LIAPI extern class Block const* mDripstone; +LIAPI extern class Block const* mDropper; +LIAPI extern class Block const* mEmeraldBlock; +LIAPI extern class Block const* mEmeraldOre; +LIAPI extern class Block const* mEnchantingTable; +LIAPI extern class Block const* mEndBrickStairs; +LIAPI extern class Block const* mEndBricks; +LIAPI extern class Block const* mEndGateway; +LIAPI extern class Block const* mEndPortal; +LIAPI extern class Block const* mEndPortalFrame; +LIAPI extern class Block const* mEndRod; +LIAPI extern class Block const* mEndStone; +LIAPI extern class Block const* mEnderChest; +LIAPI extern class Block const* mExposedCopper; +LIAPI extern class Block const* mExposedCutCopper; +LIAPI extern class Block const* mExposedCutCopperSlab; +LIAPI extern class Block const* mExposedCutCopperStairs; +LIAPI extern class Block const* mExposedDoubleCutCopperSlab; +LIAPI extern class Block const* mFarmlandBlock; +LIAPI extern class Block const* mFence; +LIAPI extern class Block const* mFenceGate; +LIAPI extern class Block const* mFire; +LIAPI extern class Block const* mFletchingTable; +LIAPI extern class Block const* mFlowerPot; +LIAPI extern class Block const* mFloweringAzalea; +LIAPI extern class Block const* mFlowingLava; +LIAPI extern class Block const* mFlowingWater; +LIAPI extern class Block const* mFrogSpawn; +LIAPI extern class Block const* mFrostedIce; +LIAPI extern class Block const* mFurnace; +LIAPI extern class Block const* mGildedBlackstone; +LIAPI extern class Block const* mGlass; +LIAPI extern class Block const* mGlassPane; +LIAPI extern class Block const* mGlowItemFrame; +LIAPI extern class Block const* mGlowLichen; +LIAPI extern class Block const* mGlowingObsidian; +LIAPI extern class Block const* mGlowstone; +LIAPI extern class Block const* mGoldBlock; +LIAPI extern class Block const* mGoldOre; +LIAPI extern class Block const* mGoldenRail; +LIAPI extern class Block const* mGraniteStairs; +LIAPI extern class Block const* mGrass; +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* mGrayGlazedTerracotta; +LIAPI extern class Block const* mGrayWool; +LIAPI extern class Block const* mGreenCandle; +LIAPI extern class Block const* mGreenCandleCake; +LIAPI extern class Block const* mGreenGlazedTerracotta; +LIAPI extern class Block const* mGreenWool; +LIAPI extern class Block const* mGrindstone; +LIAPI extern class Block const* mHangingRoots; +LIAPI extern class Block const* mHardGlass; +LIAPI extern class Block const* mHardGlassPane; +LIAPI extern class Block const* mHardStainedGlass; +LIAPI extern class Block const* mHardStainedGlassPane; +LIAPI extern class Block const* mHardenedClay; +LIAPI extern class Block const* mHayBlock; +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* mIce; +LIAPI extern class Block const* mInfestedDeepslate; +LIAPI extern class Block const* mInfoUpdate; +LIAPI extern class Block const* mInfoUpdate2; +LIAPI extern class Block const* mInvisibleBedrock; +LIAPI extern class Block const* mIronBars; +LIAPI extern class Block const* mIronBlock; +LIAPI extern class Block const* mIronDoor; +LIAPI extern class Block const* mIronOre; +LIAPI extern class Block const* mIronTrapdoor; +LIAPI extern class Block const* mItemFrame; +LIAPI extern class Block const* mJigsaw; +LIAPI extern class Block const* mJukebox; +LIAPI extern class Block const* mJungleButton; +LIAPI extern class Block const* mJungleDoor; +LIAPI extern class Block const* mJungleFenceGate; +LIAPI extern class Block const* mJungleHangingSign; +LIAPI extern class Block const* mJunglePressurePlate; +LIAPI extern class Block const* mJungleStairs; +LIAPI extern class Block const* mJungleStandingSign; +LIAPI extern class Block const* mJungleTrapdoor; +LIAPI extern class Block const* mJungleWallSign; +LIAPI extern class Block const* mKelp; +LIAPI extern class Block const* mLadder; +LIAPI extern class Block const* mLantern; +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; +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* mLightBlueGlazedTerracotta; +LIAPI extern class Block const* mLightBlueWool; +LIAPI extern class Block const* mLightGrayCandle; +LIAPI extern class Block const* mLightGrayCandleCake; +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* mLimeGlazedTerracotta; +LIAPI extern class Block const* mLimeWool; +LIAPI extern class Block const* mLitBlastFurnace; +LIAPI extern class Block const* mLitDeepslateRedstoneOre; +LIAPI extern class Block const* mLitFurnace; +LIAPI extern class Block const* mLitPumpkin; +LIAPI extern class Block const* mLitRedstoneLamp; +LIAPI extern class Block const* mLitRedstoneOre; +LIAPI extern class Block const* mLitSmoker; +LIAPI extern class Block const* mLodestone; +LIAPI extern class Block const* mLog; +LIAPI extern class Block const* mLog2; +LIAPI extern class Block const* mLoom; +LIAPI extern class Block const* mMagentaCandle; +LIAPI extern class Block const* mMagentaCandleCake; +LIAPI extern class Block const* mMagentaGlazedTerracotta; +LIAPI extern class Block const* mMagentaWool; +LIAPI extern class Block const* mMagma; +LIAPI extern class Block const* mMangroveButton; +LIAPI extern class Block const* mMangroveDoor; +LIAPI extern class Block const* mMangroveDoubleSlab; +LIAPI extern class Block const* mMangroveFence; +LIAPI extern class Block const* mMangroveFenceGate; +LIAPI extern class Block const* mMangroveHangingSign; +LIAPI extern class Block const* mMangroveLeaves; +LIAPI extern class Block const* mMangroveLog; +LIAPI extern class Block const* mMangrovePlanks; +LIAPI extern class Block const* mMangrovePressurePlate; +LIAPI extern class Block const* mMangrovePropagule; +LIAPI extern class Block const* mMangroveRoots; +LIAPI extern class Block const* mMangroveSlab; +LIAPI extern class Block const* mMangroveStairs; +LIAPI extern class Block const* mMangroveStandingSign; +LIAPI extern class Block const* mMangroveTrapdoor; +LIAPI extern class Block const* mMangroveWallSign; +LIAPI extern class Block const* mMangroveWood; +LIAPI extern class Block const* mMediumAmethystBud; +LIAPI extern class Block const* mMelonBlock; +LIAPI extern class Block const* mMelonStem; +LIAPI extern class Block const* mMobSpawner; +LIAPI extern class Block const* mMonsterEgg; +LIAPI extern class Block const* mMossBlock; +LIAPI extern class Block const* mMossCarpet; +LIAPI extern class Block const* mMossyCobblestone; +LIAPI extern class Block const* mMossyCobblestoneStairs; +LIAPI extern class Block const* mMossyStoneBrickStairs; +LIAPI extern class Block const* mMovingBlock; +LIAPI extern class Block const* mMud; +LIAPI extern class Block const* mMudBrickDoubleSlab; +LIAPI extern class Block const* mMudBrickSlab; +LIAPI extern class Block const* mMudBrickStairs; +LIAPI extern class Block const* mMudBrickWall; +LIAPI extern class Block const* mMudBricks; +LIAPI extern class Block const* mMuddyMangroveRoots; +LIAPI extern class Block const* mMycelium; +LIAPI extern class Block const* mMysteriousFrame; +LIAPI extern class Block const* mMysteriousFrameSlot; +LIAPI extern class Block const* mNetherBrickBlockName; +LIAPI extern class Block const* mNetherBrickFence; +LIAPI extern class Block const* mNetherBrickStairs; +LIAPI extern class Block const* mNetherGoldOre; +LIAPI extern class Block const* mNetherSprouts; +LIAPI extern class Block const* mNetherWart; +LIAPI extern class Block const* mNetherWartBlock; +LIAPI extern class Block const* mNetheriteBlock; +LIAPI extern class Block const* mNetherrack; +LIAPI extern class Block const* mNetherreactor; +LIAPI extern class Block const* mNormalStoneStairs; +LIAPI extern class Block const* mNoteblock; +LIAPI extern class Block const* mOakHangingSign; +LIAPI extern class Block const* mOakStairs; +LIAPI extern class Block const* mObserver; +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* mOrangeGlazedTerracotta; +LIAPI extern class Block const* mOrangeWool; +LIAPI extern class Block const* mOxidizedCopper; +LIAPI extern class Block const* mOxidizedCutCopper; +LIAPI extern class Block const* mOxidizedCutCopperSlab; +LIAPI extern class Block const* mOxidizedCutCopperStairs; +LIAPI extern class Block const* mOxidizedDoubleCutCopperSlab; +LIAPI extern class Block const* mPackedIce; +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* mPinkGlazedTerracotta; +LIAPI extern class Block const* mPinkWool; +LIAPI extern class Block const* mPiston; +LIAPI extern class Block const* mPistonArmCollision; +LIAPI extern class Block const* mPlanks; +LIAPI extern class Block const* mPodzol; +LIAPI extern class Block const* mPointedDripstone; +LIAPI extern class Block const* mPolishedAndesiteStairs; +LIAPI extern class Block const* mPolishedBasalt; +LIAPI extern class Block const* mPolishedBlackstone; +LIAPI extern class Block const* mPolishedBlackstoneBrickDoubleSlab; +LIAPI extern class Block const* mPolishedBlackstoneBrickSlab; +LIAPI extern class Block const* mPolishedBlackstoneBrickStairs; +LIAPI extern class Block const* mPolishedBlackstoneBrickWall; +LIAPI extern class Block const* mPolishedBlackstoneBricks; +LIAPI extern class Block const* mPolishedBlackstoneButton; +LIAPI extern class Block const* mPolishedBlackstoneDoubleSlab; +LIAPI extern class Block const* mPolishedBlackstonePressurePlate; +LIAPI extern class Block const* mPolishedBlackstoneSlab; +LIAPI extern class Block const* mPolishedBlackstoneStairs; +LIAPI extern class Block const* mPolishedBlackstoneWall; +LIAPI extern class Block const* mPolishedDeepslate; +LIAPI extern class Block const* mPolishedDeepslateDoubleSlab; +LIAPI extern class Block const* mPolishedDeepslateSlab; +LIAPI extern class Block const* mPolishedDeepslateStairs; +LIAPI extern class Block const* mPolishedDeepslateWall; +LIAPI extern class Block const* mPolishedDioriteStairs; +LIAPI extern class Block const* mPolishedGraniteStairs; +LIAPI extern class Block const* mPortal; +LIAPI extern class Block const* mPotatoes; +LIAPI extern class Block const* mPowderSnow; +LIAPI extern class Block const* mPoweredComparator; +LIAPI extern class Block const* mPoweredRepeater; +LIAPI extern class Block const* mPrismarine; +LIAPI extern class Block const* mPrismarineBricksStairs; +LIAPI extern class Block const* mPrismarineStairs; +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* mPurpleGlazedTerracotta; +LIAPI extern class Block const* mPurpleWool; +LIAPI extern class Block const* mPurpurBlock; +LIAPI extern class Block const* mPurpurStairs; +LIAPI extern class Block const* mQuartzBlock; +LIAPI extern class Block const* mQuartzBricks; +LIAPI extern class Block const* mQuartzOre; +LIAPI extern class Block const* mQuartzStairs; +LIAPI extern class Block const* mRail; +LIAPI extern class Block const* mRawCopperBlock; +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* mRedFlower; +LIAPI extern class Block const* mRedGlazedTerracotta; +LIAPI extern class Block const* mRedMushroom; +LIAPI extern class Block const* mRedMushroomBlock; +LIAPI extern class Block const* mRedNetherBrick; +LIAPI extern class Block const* mRedNetherBrickStairs; +LIAPI extern class Block const* mRedSandstone; +LIAPI extern class Block const* mRedSandstoneStairs; +LIAPI extern class Block const* mRedWool; +LIAPI extern class Block const* mRedstoneBlock; +LIAPI extern class Block const* mRedstoneLamp; +LIAPI extern class Block const* mRedstoneOre; +LIAPI extern class Block const* mRedstoneTorch; +LIAPI extern class Block const* mRedstoneWire; +LIAPI extern class Block const* mReeds; +LIAPI extern class Block const* mReinforcedDeepslate; +LIAPI extern class Block const* mRepeatingCommandBlock; +LIAPI extern class Block const* mReserved6; +LIAPI extern class Block const* mRespawnAnchor; +LIAPI extern class Block const* mSand; +LIAPI extern class Block const* mSandstone; +LIAPI extern class Block const* mSandstoneStairs; +LIAPI extern class Block const* mSapling; +LIAPI extern class Block const* mScaffolding; +LIAPI extern class Block const* mSculk; +LIAPI extern class Block const* mSculkCatalyst; +LIAPI extern class Block const* mSculkSensor; +LIAPI extern class Block const* mSculkShrieker; +LIAPI extern class Block const* mSculkVein; +LIAPI extern class Block const* mSeaLantern; +LIAPI extern class Block const* mSeaPickle; +LIAPI extern class Block const* mSeagrass; +LIAPI extern class Block const* mShroomlight; +LIAPI extern class Block const* mShulkerBox; +LIAPI extern class Block const* mSilverGlazedTerracotta; +LIAPI extern class Block const* mSkull; +LIAPI extern class Block const* mSlimeBlock; +LIAPI extern class Block const* mSmallAmethystBud; +LIAPI extern class Block const* mSmallDripleaf; +LIAPI extern class Block const* mSmithingTable; +LIAPI extern class Block const* mSmoker; +LIAPI extern class Block const* mSmoothBasalt; +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* mSnow; +LIAPI extern class Block const* mSnowLayer; +LIAPI extern class Block const* mSoulCampfire; +LIAPI extern class Block const* mSoulFire; +LIAPI extern class Block const* mSoulLantern; +LIAPI extern class Block const* mSoulSand; +LIAPI extern class Block const* mSoulSoil; +LIAPI extern class Block const* mSoulTorch; +LIAPI extern class Block const* mSponge; +LIAPI extern class Block const* mSporeBlossom; +LIAPI extern class Block const* mSpruceButton; +LIAPI extern class Block const* mSpruceDoor; +LIAPI extern class Block const* mSpruceFenceGate; +LIAPI extern class Block const* mSpruceHangingSign; +LIAPI extern class Block const* mSprucePressurePlate; +LIAPI extern class Block const* mSpruceStairs; +LIAPI extern class Block const* mSpruceStandingSign; +LIAPI extern class Block const* mSpruceTrapdoor; +LIAPI extern class Block const* mSpruceWallSign; +LIAPI extern class Block const* mStainedGlass; +LIAPI extern class Block const* mStainedGlassPane; +LIAPI extern class Block const* mStainedHardenedClay; +LIAPI extern class Block const* mStandingBanner; +LIAPI extern class Block const* mStandingSign; +LIAPI extern class Block const* mStickyPiston; +LIAPI extern class Block const* mStickyPistonArmCollision; +LIAPI extern class Block const* mStone; +LIAPI extern class Block const* mStoneBrickStairs; +LIAPI extern class Block const* mStoneBricks; +LIAPI extern class Block const* mStoneButton; +LIAPI extern class Block const* mStonePressurePlate; +LIAPI extern class Block const* mStoneSlab; +LIAPI extern class Block const* mStoneSlab2; +LIAPI extern class Block const* mStoneSlab3; +LIAPI extern class Block const* mStoneSlab4; +LIAPI extern class Block const* mStoneStairs; +LIAPI extern class Block const* mStonecutter; +LIAPI extern class Block const* mStonecutterBlock; +LIAPI extern class Block const* mStrippedAcaciaLog; +LIAPI extern class Block const* mStrippedBambooBlock; +LIAPI extern class Block const* mStrippedBirchLog; +LIAPI extern class Block const* mStrippedCrimsonHyphae; +LIAPI extern class Block const* mStrippedCrimsonStem; +LIAPI extern class Block const* mStrippedDarkOakLog; +LIAPI extern class Block const* mStrippedJungleLog; +LIAPI extern class Block const* mStrippedMangroveLog; +LIAPI extern class Block const* mStrippedMangroveWood; +LIAPI extern class Block const* mStrippedOakLog; +LIAPI extern class Block const* mStrippedSpruceLog; +LIAPI extern class Block const* mStrippedWarpedHyphae; +LIAPI extern class Block const* mStrippedWarpedStem; +LIAPI extern class Block const* mStructureBlock; +LIAPI extern class Block const* mStructureVoid; +LIAPI extern class Block const* mSuspiciousSand; +LIAPI extern class Block const* mSweetBerryBush; +LIAPI extern class Block const* mTallGrass; +LIAPI extern class Block const* mTarget; +LIAPI extern class Block const* mTintedGlass; +LIAPI extern class Block const* mTnt; +LIAPI extern class Block const* mTorch; +LIAPI extern class Block const* mTorchflower; +LIAPI extern class Block const* mTorchflowerCrop; +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* mTuff; +LIAPI extern class Block const* mTurtleEgg; +LIAPI extern class Block const* mTwistingVines; +LIAPI extern class Block const* mUnderwaterTorch; +LIAPI extern class Block const* mUndyedShulkerBox; +LIAPI extern class Block const* mUnlitRedstoneTorch; +LIAPI extern class Block const* mUnpoweredComparator; +LIAPI extern class Block const* mUnpoweredRepeater; +LIAPI extern class Block const* mVerdantFroglight; +LIAPI extern class Block const* mVine; +LIAPI extern class Block const* mWallBanner; +LIAPI extern class Block const* mWallSign; +LIAPI extern class Block const* mWarpedButton; +LIAPI extern class Block const* mWarpedDoor; +LIAPI extern class Block const* mWarpedDoubleSlab; +LIAPI extern class Block const* mWarpedFence; +LIAPI extern class Block const* mWarpedFenceGate; +LIAPI extern class Block const* mWarpedFungus; +LIAPI extern class Block const* mWarpedHangingSign; +LIAPI extern class Block const* mWarpedHyphae; +LIAPI extern class Block const* mWarpedNylium; +LIAPI extern class Block const* mWarpedPlanks; +LIAPI extern class Block const* mWarpedPressurePlate; +LIAPI extern class Block const* mWarpedRoots; +LIAPI extern class Block const* mWarpedSlab; +LIAPI extern class Block const* mWarpedStairs; +LIAPI extern class Block const* mWarpedStandingSign; +LIAPI extern class Block const* mWarpedStem; +LIAPI extern class Block const* mWarpedTrapdoor; +LIAPI extern class Block const* mWarpedWallSign; +LIAPI extern class Block const* mWarpedWartBlock; +LIAPI extern class Block const* mWater; +LIAPI extern class Block const* mWaterLily; +LIAPI extern class Block const* mWaxedCopper; +LIAPI extern class Block const* mWaxedCutCopper; +LIAPI extern class Block const* mWaxedCutCopperSlab; +LIAPI extern class Block const* mWaxedCutCopperStairs; +LIAPI extern class Block const* mWaxedDoubleCutCopperSlab; +LIAPI extern class Block const* mWaxedExposedCopper; +LIAPI extern class Block const* mWaxedExposedCutCopper; +LIAPI extern class Block const* mWaxedExposedCutCopperSlab; +LIAPI extern class Block const* mWaxedExposedCutCopperStairs; +LIAPI extern class Block const* mWaxedExposedDoubleCutCopperSlab; +LIAPI extern class Block const* mWaxedOxidizedCopper; +LIAPI extern class Block const* mWaxedOxidizedCutCopper; +LIAPI extern class Block const* mWaxedOxidizedCutCopperSlab; +LIAPI extern class Block const* mWaxedOxidizedCutCopperStairs; +LIAPI extern class Block const* mWaxedOxidizedDoubleCutCopperSlab; +LIAPI extern class Block const* mWaxedWeatheredCopper; +LIAPI extern class Block const* mWaxedWeatheredCutCopper; +LIAPI extern class Block const* mWaxedWeatheredCutCopperSlab; +LIAPI extern class Block const* mWaxedWeatheredCutCopperStairs; +LIAPI extern class Block const* mWaxedWeatheredDoubleCutCopperSlab; +LIAPI extern class Block const* mWeatheredCopper; +LIAPI extern class Block const* mWeatheredCutCopper; +LIAPI extern class Block const* mWeatheredCutCopperSlab; +LIAPI extern class Block const* mWeatheredCutCopperStairs; +LIAPI extern class Block const* mWeatheredDoubleCutCopperSlab; +LIAPI extern class Block const* mWeb; +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* mWhiteGlazedTerracotta; +LIAPI extern class Block const* mWhiteWool; +LIAPI extern class Block const* mWitherRose; +LIAPI extern class Block const* mWood; +LIAPI extern class Block const* mWoodenButton; +LIAPI extern class Block const* mWoodenDoor; +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* mYellowFlower; +LIAPI extern class Block const* mYellowGlazedTerracotta; +LIAPI extern class Block const* mYellowWool; +}; // namespace StaticVanillaBlocks diff --git a/LiteLoader/include/llapi/mc/StayNearNoteblockGoal.hpp b/LiteLoader/include/llapi/mc/StayNearNoteblockGoal.hpp index a74eae4747..3e381c5931 100644 --- a/LiteLoader/include/llapi/mc/StayNearNoteblockGoal.hpp +++ b/LiteLoader/include/llapi/mc/StayNearNoteblockGoal.hpp @@ -28,56 +28,56 @@ class StayNearNoteblockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StayNearNoteblockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@StayNearNoteblockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@StayNearNoteblockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@StayNearNoteblockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@StayNearNoteblockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@StayNearNoteblockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@StayNearNoteblockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@StayNearNoteblockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@StayNearNoteblockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@StayNearNoteblockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@StayNearNoteblockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@StayNearNoteblockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@StayNearNoteblockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0StayNearNoteblockGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0StayNearNoteblockGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI StayNearNoteblockGoal(class Mob &); //private: /** - * @symbol ?_hasLastVibrationAtNoteblock\@StayNearNoteblockGoal\@\@AEAA?BV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @symbol ?_hasLastVibrationAtNoteblock\@StayNearNoteblockGoal\@\@AEAA?BV?$optional\@VBlockPos\@\@\@std\@\@XZ */ MCAPI class std::optional const _hasLastVibrationAtNoteblock(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StemBlock.hpp b/LiteLoader/include/llapi/mc/StemBlock.hpp index 7f9e334691..96621d715a 100644 --- a/LiteLoader/include/llapi/mc/StemBlock.hpp +++ b/LiteLoader/include/llapi/mc/StemBlock.hpp @@ -31,280 +31,285 @@ class StemBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StemBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@StemBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@StemBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@StemBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@StemBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@StemBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@StemBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColorAtPos\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 137 + * @symbol ?getColorAtPos\@StemBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 143 - * @symbol ?getVisualShape\@StemBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@StemBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@StemBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@StemBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@StemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@StemBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STEMBLOCK /** - * @symbol ?canBeSilkTouched\@StemBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@StemBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isStemBlock\@StemBlock\@\@UEBA_NXZ + * @symbol ?isStemBlock\@StemBlock\@\@UEBA_NXZ */ MCVAPI bool isStemBlock() const; #endif /** - * @symbol ??0StemBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z + * @symbol ??0StemBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z */ MCAPI StemBlock(std::string const &, int, class BlockLegacy const &); /** - * @symbol ?getFruitBlock\@StemBlock\@\@QEBAAEBVBlockLegacy\@\@XZ + * @symbol ?getFruitBlock\@StemBlock\@\@QEBAAEBVBlockLegacy\@\@XZ */ MCAPI class BlockLegacy const & getFruitBlock() const; //private: /** - * @symbol ?getGrowthSpeed\@StemBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getGrowthSpeed\@StemBlock\@\@AEBAMAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI float getGrowthSpeed(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp b/LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp index 41883153e7..10519f546a 100644 --- a/LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/StickInGroundSubcomponent.hpp @@ -30,33 +30,33 @@ class StickInGroundSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StickInGroundSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readfromJSON\@StickInGroundSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @vftbl 1 + * @symbol ?readfromJSON\@StickInGroundSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ virtual void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @vftbl 2 - * @symbol ?writetoJSON\@StickInGroundSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@StickInGroundSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@StickInGroundSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@StickInGroundSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@StickInGroundSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@StickInGroundSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); /** - * @symbol ??0StickInGroundSubcomponent\@\@QEAA\@XZ + * @symbol ??0StickInGroundSubcomponent\@\@QEAA\@XZ */ MCAPI StickInGroundSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StompAttackDefinition.hpp b/LiteLoader/include/llapi/mc/StompAttackDefinition.hpp index 06ba540147..2cfa1d5745 100644 --- a/LiteLoader/include/llapi/mc/StompAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/StompAttackDefinition.hpp @@ -30,16 +30,16 @@ class StompAttackDefinition { public: /** - * @symbol ??0StompAttackDefinition\@\@QEAA\@XZ + * @symbol ??0StompAttackDefinition\@\@QEAA\@XZ */ MCAPI StompAttackDefinition(); /** - * @symbol ?initialize\@StompAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVStompAttackGoal\@\@\@Z + * @symbol ?initialize\@StompAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVStompAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class StompAttackGoal &) const; /** - * @symbol ?buildSchema\@StompAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VStompAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@StompAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VStompAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StompAttackGoal.hpp b/LiteLoader/include/llapi/mc/StompAttackGoal.hpp index 0bab66cfbd..93f64bcfd9 100644 --- a/LiteLoader/include/llapi/mc/StompAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompAttackGoal.hpp @@ -31,66 +31,66 @@ class StompAttackGoal : public MeleeAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StompAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@StompAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@StompAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@StompAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@StompAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@StompAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@StompAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@StompAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@StompAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@StompAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@StompAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@StompAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@StompAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0StompAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0StompAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI StompAttackGoal(class Mob &); //protected: /** - * @symbol ?_attemptAttack\@StompAttackGoal\@\@IEAAXAEAVActor\@\@\@Z + * @symbol ?_attemptAttack\@StompAttackGoal\@\@IEAAXAEAVActor\@\@\@Z */ MCAPI void _attemptAttack(class Actor &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StompBlockGoal.hpp b/LiteLoader/include/llapi/mc/StompBlockGoal.hpp index a1737ec7b0..ff81ce2c6d 100644 --- a/LiteLoader/include/llapi/mc/StompBlockGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompBlockGoal.hpp @@ -31,98 +31,98 @@ class StompBlockGoal : public BaseMoveToGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StompBlockGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@StompBlockGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@StompBlockGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@StompBlockGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@StompBlockGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@StompBlockGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@StompBlockGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@StompBlockGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@StompBlockGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@StompBlockGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@StompBlockGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@StompBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@StompBlockGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 11 - * @symbol ?isValidTarget\@StompBlockGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 11 + * @symbol ?isValidTarget\@StompBlockGoal\@\@UEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isValidTarget(class BlockSource &, class BlockPos const &); /** - * @vftbl 13 - * @symbol ?_canReach\@StompBlockGoal\@\@MEAA_NAEBVBlockPos\@\@\@Z + * @vftbl 13 + * @symbol ?_canReach\@StompBlockGoal\@\@MEAA_NAEBVBlockPos\@\@\@Z */ virtual bool _canReach(class BlockPos const &); /** - * @vftbl 14 - * @symbol ?_moveToBlock\@StompBlockGoal\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?_moveToBlock\@StompBlockGoal\@\@MEAAXXZ */ virtual void _moveToBlock(); /** - * @vftbl 17 - * @symbol ?findTargetBlock\@StompBlockGoal\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?findTargetBlock\@StompBlockGoal\@\@UEAA_NXZ */ virtual bool findTargetBlock(); /** - * @vftbl 18 - * @symbol ?_createBreakProgressParticles\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 18 + * @symbol ?_createBreakProgressParticles\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _createBreakProgressParticles(class Level &, class BlockSource &, class BlockPos); /** - * @vftbl 19 - * @symbol ?_createDestroyParticles\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 19 + * @symbol ?_createDestroyParticles\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _createDestroyParticles(class Level &, class BlockSource &, class BlockPos); /** - * @vftbl 20 - * @symbol ?_playBreakProgressSound\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 20 + * @symbol ?_playBreakProgressSound\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _playBreakProgressSound(class Level &, class BlockSource &, class BlockPos); /** - * @vftbl 21 - * @symbol ?_playDestroySound\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?_playDestroySound\@StompBlockGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _playDestroySound(class Level &, class BlockSource &, class BlockPos); /** - * @symbol ??0StompBlockGoal\@\@QEAA\@PEBVBlock\@\@AEAVMob\@\@MHHMH\@Z + * @symbol ??0StompBlockGoal\@\@QEAA\@PEBVBlock\@\@AEAVMob\@\@MHHMH\@Z */ MCAPI StompBlockGoal(class Block const *, class Mob &, float, int, int, float, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StompEggGoal.hpp b/LiteLoader/include/llapi/mc/StompEggGoal.hpp index 06897c249a..fe4215e15f 100644 --- a/LiteLoader/include/llapi/mc/StompEggGoal.hpp +++ b/LiteLoader/include/llapi/mc/StompEggGoal.hpp @@ -31,53 +31,53 @@ class StompEggGoal : public StompBlockGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StompEggGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@StompEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@StompEggGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 18 - * @symbol ?_createBreakProgressParticles\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 18 + * @symbol ?_createBreakProgressParticles\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _createBreakProgressParticles(class Level &, class BlockSource &, class BlockPos); /** - * @vftbl 19 - * @symbol ?_createDestroyParticles\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 19 + * @symbol ?_createDestroyParticles\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _createDestroyParticles(class Level &, class BlockSource &, class BlockPos); /** - * @vftbl 20 - * @symbol ?_playBreakProgressSound\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 20 + * @symbol ?_playBreakProgressSound\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _playBreakProgressSound(class Level &, class BlockSource &, class BlockPos); /** - * @vftbl 21 - * @symbol ?_playDestroySound\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?_playDestroySound\@StompEggGoal\@\@MEAAXAEAVLevel\@\@AEAVBlockSource\@\@VBlockPos\@\@\@Z */ virtual void _playDestroySound(class Level &, class BlockSource &, class BlockPos); /** - * @symbol ??0StompEggGoal\@\@QEAA\@AEAVMob\@\@MHHMH\@Z + * @symbol ??0StompEggGoal\@\@QEAA\@AEAVMob\@\@MHHMH\@Z */ MCAPI StompEggGoal(class Mob &, float, int, int, float, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneBlock.hpp b/LiteLoader/include/llapi/mc/StoneBlock.hpp index 3b08673a71..5ce1497337 100644 --- a/LiteLoader/include/llapi/mc/StoneBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBlock.hpp @@ -31,233 +31,238 @@ class StoneBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 52 - * @symbol ?canBeOriginalSurface\@StoneBlock\@\@UEBA_NXZ + * @vftbl 52 + * @symbol ?canBeOriginalSurface\@StoneBlock\@\@UEBA_NXZ */ virtual bool canBeOriginalSurface() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StoneBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StoneBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StoneBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 159 - * @symbol ?tryGetInfested\@StoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 159 + * @symbol ?tryGetInfested\@StoneBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@StoneBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@StoneBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@StoneBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@StoneBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0StoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StoneBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StoneBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp b/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp index e3b80b12c5..ad4895d910 100644 --- a/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneBrickBlock.hpp @@ -31,223 +31,228 @@ class StoneBrickBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneBrickBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StoneBrickBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StoneBrickBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StoneBrickBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StoneBrickBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 159 - * @symbol ?tryGetInfested\@StoneBrickBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z + * @vftbl 159 + * @symbol ?tryGetInfested\@StoneBrickBlock\@\@UEBAPEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const * tryGetInfested(class Block const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StoneBrickBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StoneBrickBlock\@\@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 ??0StoneBrickBlock\@\@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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp index 3323251ea0..6976d8e4e0 100644 --- a/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneButtonBlock.hpp @@ -31,193 +31,198 @@ class StoneButtonBlock : public ButtonBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneButtonBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0StoneButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0StoneButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StoneButtonBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp index 23ee7ea2a6..b55bcb6fa9 100644 --- a/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/StoneCutterContainerScreenValidator.hpp @@ -29,28 +29,28 @@ class StoneCutterContainerScreenValidator { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneCutterContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?isCraftingImplemented\@StoneCutterContainerScreenValidator\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?isCraftingImplemented\@StoneCutterContainerScreenValidator\@\@UEAA_NXZ */ virtual bool isCraftingImplemented(); /** - * @vftbl 3 - * @symbol ?getCraftResult\@StoneCutterContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?getCraftResult\@StoneCutterContainerScreenValidator\@\@UEAA?AUContainerValidationCraftResult\@\@AEBVContainerScreenContext\@\@AEAVContainerScreenValidation\@\@V?$unique_ptr\@UContainerValidationCraftInputs\@\@U?$default_delete\@UContainerValidationCraftInputs\@\@\@std\@\@\@std\@\@\@Z */ virtual struct ContainerValidationCraftResult getCraftResult(class ContainerScreenContext const &, class ContainerScreenValidation &, std::unique_ptr); /** - * @symbol ??0StoneCutterContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0StoneCutterContainerScreenValidator\@\@QEAA\@XZ */ MCAPI StoneCutterContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneCutterInputContainerValidation.hpp b/LiteLoader/include/llapi/mc/StoneCutterInputContainerValidation.hpp index be14f2a58a..022a1fee3e 100644 --- a/LiteLoader/include/llapi/mc/StoneCutterInputContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/StoneCutterInputContainerValidation.hpp @@ -31,54 +31,54 @@ class StoneCutterInputContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneCutterInputContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@StoneCutterInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@StoneCutterInputContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp index be829db93d..201235e186 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock.hpp @@ -31,237 +31,242 @@ class StoneSlabBlock : public SlabBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneSlabBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@StoneSlabBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@StoneSlabBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StoneSlabBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StoneSlabBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@StoneSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@StoneSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@StoneSlabBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StoneSlabBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0StoneSlabBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI StoneSlabBlock(std::string const &, int, bool, class WeakPtr); /** - * @symbol ?SLAB_NAMES\@StoneSlabBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B + * @symbol ?SLAB_NAMES\@StoneSlabBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B */ MCAPI static class std::array const SLAB_NAMES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp index dac58819c2..2db6fe7c5c 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock2.hpp @@ -31,237 +31,242 @@ class StoneSlabBlock2 : public SlabBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneSlabBlock2(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@StoneSlabBlock2\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@StoneSlabBlock2\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StoneSlabBlock2\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StoneSlabBlock2\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock2\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock2\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@StoneSlabBlock2\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@StoneSlabBlock2\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@StoneSlabBlock2\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock2\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StoneSlabBlock2\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0StoneSlabBlock2\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI StoneSlabBlock2(std::string const &, int, bool, class WeakPtr); /** - * @symbol ?SLAB_NAMES\@StoneSlabBlock2\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B + * @symbol ?SLAB_NAMES\@StoneSlabBlock2\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B */ MCAPI static class std::array const SLAB_NAMES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp index 3f1c854dcf..3dda653942 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock3.hpp @@ -31,237 +31,242 @@ class StoneSlabBlock3 : public SlabBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneSlabBlock3(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@StoneSlabBlock3\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@StoneSlabBlock3\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StoneSlabBlock3\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StoneSlabBlock3\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock3\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock3\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@StoneSlabBlock3\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@StoneSlabBlock3\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@StoneSlabBlock3\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock3\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StoneSlabBlock3\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0StoneSlabBlock3\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI StoneSlabBlock3(std::string const &, int, bool, class WeakPtr); /** - * @symbol ?SLAB_NAMES\@StoneSlabBlock3\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B + * @symbol ?SLAB_NAMES\@StoneSlabBlock3\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$07\@std\@\@B */ MCAPI static class std::array const SLAB_NAMES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp index eb7ade7a27..0a418a3b1e 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlock4.hpp @@ -31,237 +31,242 @@ class StoneSlabBlock4 : public SlabBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneSlabBlock4(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@StoneSlabBlock4\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@StoneSlabBlock4\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@StoneSlabBlock4\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@StoneSlabBlock4\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock4\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@StoneSlabBlock4\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@StoneSlabBlock4\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@StoneSlabBlock4\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@StoneSlabBlock4\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StoneSlabBlock4\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StoneSlabBlock4\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0StoneSlabBlock4\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI StoneSlabBlock4(std::string const &, int, bool, class WeakPtr); /** - * @symbol ?SLAB_NAMES\@StoneSlabBlock4\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$04\@std\@\@B + * @symbol ?SLAB_NAMES\@StoneSlabBlock4\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$04\@std\@\@B */ MCAPI static class std::array const SLAB_NAMES; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp index ba37188998..97f5fc577f 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabBlockItem.hpp @@ -32,83 +32,83 @@ class StoneSlabBlockItem : public DeprecatedSlabBlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StoneSlabBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@StoneSlabBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@StoneSlabBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @symbol ??0StoneSlabBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StoneSlabBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StoneSlabBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoneSlabDescriptionId.hpp b/LiteLoader/include/llapi/mc/StoneSlabDescriptionId.hpp index 58830b68b7..079efc33d4 100644 --- a/LiteLoader/include/llapi/mc/StoneSlabDescriptionId.hpp +++ b/LiteLoader/include/llapi/mc/StoneSlabDescriptionId.hpp @@ -20,35 +20,35 @@ namespace StoneSlabDescriptionId { #undef AFTER_EXTRA /** - * @symbol ?OldDoubleStoneSlab\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldDoubleStoneSlab\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldDoubleStoneSlab; /** - * @symbol ?OldDoubleStoneSlab2\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldDoubleStoneSlab2\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldDoubleStoneSlab2; /** - * @symbol ?OldDoubleStoneSlab3\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldDoubleStoneSlab3\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldDoubleStoneSlab3; /** - * @symbol ?OldDoubleStoneSlab4\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldDoubleStoneSlab4\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldDoubleStoneSlab4; /** - * @symbol ?OldStoneSlab\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldStoneSlab\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldStoneSlab; /** - * @symbol ?OldStoneSlab2\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldStoneSlab2\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldStoneSlab2; /** - * @symbol ?OldStoneSlab3\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldStoneSlab3\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldStoneSlab3; /** - * @symbol ?OldStoneSlab4\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?OldStoneSlab4\@StoneSlabDescriptionId\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const OldStoneSlab4; diff --git a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp index 3934bbdb22..acc1f3a54f 100644 --- a/LiteLoader/include/llapi/mc/StonecutterBlock.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterBlock.hpp @@ -31,243 +31,248 @@ class StonecutterBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StonecutterBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@StonecutterBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@StonecutterBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@StonecutterBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@StonecutterBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@StonecutterBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@StonecutterBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@StonecutterBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@StonecutterBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StonecutterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StonecutterBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STONECUTTERBLOCK /** - * @symbol ?isCraftingBlock\@StonecutterBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@StonecutterBlock\@\@UEBA_NXZ */ MCVAPI bool isCraftingBlock() const; /** - * @symbol ?isInteractiveBlock\@StonecutterBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@StonecutterBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0StonecutterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StonecutterBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StonecutterBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp index eb2a484cad..8993b3bd1d 100644 --- a/LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/StonecutterContainerManagerModel.hpp @@ -31,48 +31,48 @@ class StonecutterContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StonecutterContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@StonecutterContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@StonecutterContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@StonecutterContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@StonecutterContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@StonecutterContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@StonecutterContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 9 - * @symbol ?setData\@StonecutterContainerManagerModel\@\@UEAAXHH\@Z + * @vftbl 9 + * @symbol ?setData\@StonecutterContainerManagerModel\@\@UEAAXHH\@Z */ virtual void setData(int, int); /** - * @vftbl 10 - * @symbol ?broadcastChanges\@StonecutterContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@StonecutterContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@StonecutterContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@StonecutterContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@StonecutterContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@StonecutterContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0StonecutterContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0StonecutterContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI StonecutterContainerManagerModel(enum class ContainerID, class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StopCommand.hpp b/LiteLoader/include/llapi/mc/StopCommand.hpp index e4fac99c03..4dffbff29e 100644 --- a/LiteLoader/include/llapi/mc/StopCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopCommand.hpp @@ -31,17 +31,17 @@ class StopCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StopCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@StopCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@StopCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@StopCommand\@\@SAXAEAVCommandRegistry\@\@AEAVDedicatedServer\@\@\@Z + * @symbol ?setup\@StopCommand\@\@SAXAEAVCommandRegistry\@\@AEAVDedicatedServer\@\@\@Z */ MCAPI static void setup(class CommandRegistry &, class DedicatedServer &); @@ -49,8 +49,8 @@ class StopCommand : public Command { private: /** - * @symbol ?mServer\@StopCommand\@\@0PEAVDedicatedServer\@\@EA + * @symbol ?mServer\@StopCommand\@\@0PEAVDedicatedServer\@\@EA */ MCAPI static class DedicatedServer * mServer; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StopSoundCommand.hpp b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp index 5e20b6ebad..0719c25148 100644 --- a/LiteLoader/include/llapi/mc/StopSoundCommand.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundCommand.hpp @@ -31,18 +31,18 @@ class StopSoundCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StopSoundCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@StopSoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@StopSoundCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@StopSoundCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@StopSoundCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp index fe7a8d21c9..70126da795 100644 --- a/LiteLoader/include/llapi/mc/StopSoundPacket.hpp +++ b/LiteLoader/include/llapi/mc/StopSoundPacket.hpp @@ -30,37 +30,43 @@ class StopSoundPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StopSoundPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@StopSoundPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@StopSoundPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@StopSoundPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@StopSoundPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@StopSoundPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@StopSoundPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@StopSoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@StopSoundPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STOPSOUNDPACKET /** - * @symbol ??0StopSoundPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI StopSoundPacket(); + MCVAPI ~StopSoundPacket(); +#endif /** - * @symbol ??0StopSoundPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ??0StopSoundPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI StopSoundPacket(std::string const &, bool); + /** + * @symbol ??0StopSoundPacket\@\@QEAA\@XZ + */ + MCAPI StopSoundPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Stopwatch.hpp b/LiteLoader/include/llapi/mc/Stopwatch.hpp index 7d897a8abc..6bd2b33e8a 100644 --- a/LiteLoader/include/llapi/mc/Stopwatch.hpp +++ b/LiteLoader/include/llapi/mc/Stopwatch.hpp @@ -29,36 +29,42 @@ class Stopwatch { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Stopwatch(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?stop\@Stopwatch\@\@UEAANXZ + * @vftbl 1 + * @symbol ?stop\@Stopwatch\@\@UEAANXZ */ virtual double stop(); /** - * @vftbl 2 - * @symbol ?stopContinue\@Stopwatch\@\@UEAANXZ + * @vftbl 2 + * @symbol ?stopContinue\@Stopwatch\@\@UEAANXZ */ virtual double stopContinue(); /** - * @vftbl 3 - * @symbol ?print\@Stopwatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?print\@Stopwatch\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void print(std::string const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STOPWATCH /** - * @symbol ??0Stopwatch\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Stopwatch(); +#endif + /** + * @symbol ??0Stopwatch\@\@QEAA\@XZ */ MCAPI Stopwatch(); /** - * @symbol ?reset\@Stopwatch\@\@QEAAXXZ + * @symbol ?reset\@Stopwatch\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?start\@Stopwatch\@\@QEAAXXZ + * @symbol ?start\@Stopwatch\@\@QEAAXXZ */ MCAPI void start(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StorageItemComponent.hpp b/LiteLoader/include/llapi/mc/StorageItemComponent.hpp index c759f962a0..e439b95891 100644 --- a/LiteLoader/include/llapi/mc/StorageItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/StorageItemComponent.hpp @@ -28,64 +28,60 @@ class StorageItemComponent { public: /** - * @symbol ?calculateAddableCount\@StorageItemComponent\@\@QEBAIAEBVItemStack\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?calculateAddableCount\@StorageItemComponent\@\@QEBAIAEBVItemStack\@\@AEBVItemStackBase\@\@\@Z */ MCAPI unsigned int calculateAddableCount(class ItemStack const &, class ItemStackBase const &) const; /** - * @symbol ?tryAddItemStack\@StorageItemComponent\@\@QEBA_NAEAVItemStack\@\@0\@Z + * @symbol ?tryAddItemStack\@StorageItemComponent\@\@QEBA_NAEAVItemStack\@\@0\@Z */ MCAPI bool tryAddItemStack(class ItemStack &, class ItemStack &) const; /** - * @symbol ?tryGenerateUserData\@StorageItemComponent\@\@QEBAXAEAVItemStack\@\@\@Z + * @symbol ?tryGenerateUserData\@StorageItemComponent\@\@QEBAXAEAVItemStack\@\@\@Z */ MCAPI void tryGenerateUserData(class ItemStack &) const; /** - * @symbol ?tryRemoveItemStack\@StorageItemComponent\@\@QEBA?AVItemStack\@\@AEAV2\@\@Z + * @symbol ?tryRemoveItemStack\@StorageItemComponent\@\@QEBA?AVItemStack\@\@AEAV2\@\@Z */ MCAPI class ItemStack tryRemoveItemStack(class ItemStack &) const; /** - * @symbol ?tryRemoveOneFromItemStack\@StorageItemComponent\@\@QEBA?AVItemStack\@\@AEAV2\@\@Z + * @symbol ?tryRemoveOneFromItemStack\@StorageItemComponent\@\@QEBA?AVItemStack\@\@AEAV2\@\@Z */ MCAPI class ItemStack tryRemoveOneFromItemStack(class ItemStack &) const; /** - * @symbol ?use\@StorageItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?use\@StorageItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool use(class ItemStack &, class Player &) const; /** - * @symbol ?DEFAULT_MAX_CARRY_WEIGHT\@StorageItemComponent\@\@2IB + * @symbol ?DEFAULT_MAX_CARRY_WEIGHT\@StorageItemComponent\@\@2IB */ MCAPI static unsigned int const DEFAULT_MAX_CARRY_WEIGHT; /** - * @symbol ?bindType\@StorageItemComponent\@\@SAXXZ - */ - MCAPI static void bindType(); - /** - * @symbol ?getIdentifier\@StorageItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@StorageItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); //private: /** - * @symbol ?_calculateAddableCountForBasicStorage\@StorageItemComponent\@\@AEBAIAEBVItemStack\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?_calculateAddableCountForBasicStorage\@StorageItemComponent\@\@AEBAIAEBVItemStack\@\@AEBVItemStackBase\@\@\@Z */ MCAPI unsigned int _calculateAddableCountForBasicStorage(class ItemStack const &, class ItemStackBase const &) const; /** - * @symbol ?_getItemListSize\@StorageItemComponent\@\@AEBAIAEAVItemStack\@\@\@Z + * @symbol ?_getItemListSize\@StorageItemComponent\@\@AEBAIAEAVItemStack\@\@\@Z */ MCAPI unsigned int _getItemListSize(class ItemStack &) const; /** - * @symbol ?_getPerItemCost\@StorageItemComponent\@\@AEBAIAEBVItemStack\@\@AEBVItemStackBase\@\@\@Z + * @symbol ?_getPerItemCost\@StorageItemComponent\@\@AEBAIAEBVItemStack\@\@AEBVItemStackBase\@\@\@Z */ MCAPI unsigned int _getPerItemCost(class ItemStack const &, class ItemStackBase const &) const; /** - * @symbol ?_storeItemInNewOrExistingSlot\@StorageItemComponent\@\@AEBAXAEAVItemStack\@\@0I\@Z + * @symbol ?_storeItemInNewOrExistingSlot\@StorageItemComponent\@\@AEBAXAEAVItemStack\@\@0I\@Z */ MCAPI void _storeItemInNewOrExistingSlot(class ItemStack &, class ItemStack &, unsigned int) const; /** - * @symbol ?_updateRemainingWeight\@StorageItemComponent\@\@AEBAXAEAVItemStack\@\@AEBV2\@H\@Z + * @symbol ?_updateRemainingWeight\@StorageItemComponent\@\@AEBAXAEAVItemStack\@\@AEBV2\@H\@Z */ MCAPI void _updateRemainingWeight(class ItemStack &, class ItemStack const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp new file mode 100644 index 0000000000..df3699941a --- /dev/null +++ b/LiteLoader/include/llapi/mc/StoreLocalMovementVelocitySystem.hpp @@ -0,0 +1,36 @@ +/** + * @file StoreLocalMovementVelocitySystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class StoreLocalMovementVelocitySystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_STORELOCALMOVEMENTVELOCITYSYSTEM +public: + class StoreLocalMovementVelocitySystem& operator=(class StoreLocalMovementVelocitySystem const &) = delete; + StoreLocalMovementVelocitySystem(class StoreLocalMovementVelocitySystem const &) = delete; + StoreLocalMovementVelocitySystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@StoreLocalMovementVelocitySystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?tickEntity\@StoreLocalMovementVelocitySystem\@\@SAXAEAVStrictEntityContext\@\@AEBUMobTravelComponent\@\@AEAUCurrentLocalMoveVelocityComponent\@\@\@Z + */ + MCAPI static void tickEntity(class StrictEntityContext &, struct MobTravelComponent const &, struct CurrentLocalMoveVelocityComponent &); + +}; diff --git a/LiteLoader/include/llapi/mc/StorePreviousClientInputSystem.hpp b/LiteLoader/include/llapi/mc/StorePreviousClientInputSystem.hpp index afc1d12cbc..b08726902a 100644 --- a/LiteLoader/include/llapi/mc/StorePreviousClientInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/StorePreviousClientInputSystem.hpp @@ -28,8 +28,8 @@ class StorePreviousClientInputSystem { public: /** - * @symbol ?createStorePreviousClientInputSystem\@StorePreviousClientInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createStorePreviousClientInputSystem\@StorePreviousClientInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createStorePreviousClientInputSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp b/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp index 42615c630d..d4867b9af7 100644 --- a/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp +++ b/LiteLoader/include/llapi/mc/StorePreviousRideStatsSystem.hpp @@ -28,12 +28,12 @@ class StorePreviousRideStatsSystem { public: /** - * @symbol ?_storePreviousRideStats\@StorePreviousRideStatsSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUVanillaClientGameplayComponent\@\@\@Z + * @symbol ?_storePreviousRideStats\@StorePreviousRideStatsSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAUVanillaClientGameplayComponent\@\@\@Z */ MCAPI static void _storePreviousRideStats(class StrictEntityContext const &, struct StateVectorComponent const &, struct VanillaClientGameplayComponent &); /** - * @symbol ?createSystem\@StorePreviousRideStatsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@StorePreviousRideStatsSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp b/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp index 8839fd5722..1b59ce1ad1 100644 --- a/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp +++ b/LiteLoader/include/llapi/mc/StoreWasAutoJumpingClientSystem.hpp @@ -28,8 +28,8 @@ class StoreWasAutoJumpingClientSystem { public: /** - * @symbol ?createStoreWasAutoJumpingClientSystem\@StoreWasAutoJumpingClientSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createStoreWasAutoJumpingClientSystem\@StoreWasAutoJumpingClientSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createStoreWasAutoJumpingClientSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrengthDescription.hpp b/LiteLoader/include/llapi/mc/StrengthDescription.hpp index d3373d0eb6..536a0a4a94 100644 --- a/LiteLoader/include/llapi/mc/StrengthDescription.hpp +++ b/LiteLoader/include/llapi/mc/StrengthDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,24 +30,25 @@ class StrengthDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@StrengthDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@StrengthDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~StrengthDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@StrengthDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@StrengthDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRENGTHDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@StrengthDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~StrengthDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrictEntityContext.hpp b/LiteLoader/include/llapi/mc/StrictEntityContext.hpp index 31c58c74ad..0510f8103a 100644 --- a/LiteLoader/include/llapi/mc/StrictEntityContext.hpp +++ b/LiteLoader/include/llapi/mc/StrictEntityContext.hpp @@ -28,44 +28,44 @@ class StrictEntityContext { public: /** - * @symbol ??0StrictEntityContext\@\@QEAA\@AEBVEntityContextBase\@\@\@Z - */ - MCAPI StrictEntityContext(class EntityContextBase const &); - /** - * @symbol ??0StrictEntityContext\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z + * @symbol ??0StrictEntityContext\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z */ MCAPI StrictEntityContext(class EntityRegistryBase &, class EntityId); /** - * @symbol ??0StrictEntityContext\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0StrictEntityContext\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI StrictEntityContext(class StrictEntityContext &&); /** - * @symbol ?isNull\@StrictEntityContext\@\@QEBA_NXZ + * @symbol ??0StrictEntityContext\@\@QEAA\@AEBVEntityContextBase\@\@\@Z + */ + MCAPI StrictEntityContext(class EntityContextBase const &); + /** + * @symbol ?isNull\@StrictEntityContext\@\@QEBA_NXZ */ MCAPI bool isNull() const; /** - * @symbol ??9StrictEntityContext\@\@QEBA_NAEBV0\@\@Z + * @symbol ??9StrictEntityContext\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator!=(class StrictEntityContext const &) const; /** - * @symbol ??4StrictEntityContext\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4StrictEntityContext\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class StrictEntityContext & operator=(class StrictEntityContext &&); /** - * @symbol ??8StrictEntityContext\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8StrictEntityContext\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class StrictEntityContext const &) const; //protected: /** - * @symbol ?_getEntityId\@StrictEntityContext\@\@IEBA?AVEntityId\@\@XZ + * @symbol ?_getEntityId\@StrictEntityContext\@\@IEBA?AVEntityId\@\@XZ */ MCAPI class EntityId _getEntityId() const; /** - * @symbol ?_getRegistryId\@StrictEntityContext\@\@IEBAIXZ + * @symbol ?_getRegistryId\@StrictEntityContext\@\@IEBAIXZ */ MCAPI unsigned int _getRegistryId() const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp index dae82a2188..c1ed998a1b 100644 --- a/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp +++ b/LiteLoader/include/llapi/mc/StrictEntityContextOwner.hpp @@ -28,24 +28,24 @@ class StrictEntityContextOwner { public: /** - * @symbol ??0StrictEntityContextOwner\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z + * @symbol ??0StrictEntityContextOwner\@\@QEAA\@AEAVEntityRegistryBase\@\@VEntityId\@\@\@Z */ MCAPI StrictEntityContextOwner(class EntityRegistryBase &, class EntityId); /** - * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0StrictEntityContextOwner\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI StrictEntityContextOwner(class StrictEntityContextOwner &&); /** - * @symbol ?getStrictContext\@StrictEntityContextOwner\@\@QEBA?AVStrictEntityContext\@\@XZ + * @symbol ?getStrictContext\@StrictEntityContextOwner\@\@QEBA?AVStrictEntityContext\@\@XZ */ MCAPI class StrictEntityContext getStrictContext() const; /** - * @symbol ??4StrictEntityContextOwner\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4StrictEntityContextOwner\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class StrictEntityContextOwner & operator=(class StrictEntityContextOwner &&); /** - * @symbol ??1StrictEntityContextOwner\@\@QEAA\@XZ + * @symbol ??1StrictEntityContextOwner\@\@QEAA\@XZ */ MCAPI ~StrictEntityContextOwner(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Strider.hpp b/LiteLoader/include/llapi/mc/Strider.hpp index 1c7b218ee5..8f90d662a5 100644 --- a/LiteLoader/include/llapi/mc/Strider.hpp +++ b/LiteLoader/include/llapi/mc/Strider.hpp @@ -32,163 +32,158 @@ class Strider : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Strider(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Strider\@\@MEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Strider\@\@MEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 250 - * @symbol ?getNextStep\@Strider\@\@MEAAMM\@Z + * @vftbl 249 + * @symbol ?getNextStep\@Strider\@\@MEAAMM\@Z */ virtual float getNextStep(float); /** - * @vftbl 261 - * @symbol ?shouldTryMakeStepSound\@Strider\@\@MEAA_NXZ + * @vftbl 259 + * @symbol ?shouldTryMakeStepSound\@Strider\@\@MEAA_NXZ */ virtual bool shouldTryMakeStepSound(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 268 - * @symbol ?_playStepSound\@Strider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 266 + * @symbol ?_playStepSound\@Strider\@\@MEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void _playStepSound(class BlockPos const &, class Block const &); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Strider\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Strider\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Strider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Strider\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Strider(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StringByteInput.hpp b/LiteLoader/include/llapi/mc/StringByteInput.hpp index 9fddd030a5..d0e6fea187 100644 --- a/LiteLoader/include/llapi/mc/StringByteInput.hpp +++ b/LiteLoader/include/llapi/mc/StringByteInput.hpp @@ -30,59 +30,65 @@ class StringByteInput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StringByteInput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?readString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?readString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string readString(); /** - * @vftbl 2 - * @symbol ?readLongString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?readLongString\@BytesDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string readLongString(); /** - * @vftbl 3 - * @symbol ?readFloat\@BigEndianStringByteInput\@\@UEAAMXZ + * @vftbl 3 + * @symbol ?readFloat\@BigEndianStringByteInput\@\@UEAAMXZ */ virtual float readFloat(); /** - * @vftbl 4 - * @symbol ?readDouble\@BigEndianStringByteInput\@\@UEAANXZ + * @vftbl 4 + * @symbol ?readDouble\@BigEndianStringByteInput\@\@UEAANXZ */ virtual double readDouble(); /** - * @vftbl 5 - * @symbol ?readByte\@BytesDataInput\@\@UEAADXZ + * @vftbl 5 + * @symbol ?readByte\@BytesDataInput\@\@UEAADXZ */ virtual char readByte(); /** - * @vftbl 6 - * @symbol ?readShort\@BigEndianStringByteInput\@\@UEAAFXZ + * @vftbl 6 + * @symbol ?readShort\@BigEndianStringByteInput\@\@UEAAFXZ */ virtual short readShort(); /** - * @vftbl 7 - * @symbol ?readInt\@BigEndianStringByteInput\@\@UEAAHXZ + * @vftbl 7 + * @symbol ?readInt\@BigEndianStringByteInput\@\@UEAAHXZ */ virtual int readInt(); /** - * @vftbl 8 - * @symbol ?readLongLong\@BigEndianStringByteInput\@\@UEAA_JXZ + * @vftbl 8 + * @symbol ?readLongLong\@BigEndianStringByteInput\@\@UEAA_JXZ */ virtual __int64 readLongLong(); /** - * @vftbl 9 - * @symbol ?readBytes\@StringByteInput\@\@UEAA_NPEAX_K\@Z + * @vftbl 9 + * @symbol ?readBytes\@StringByteInput\@\@UEAA_NPEAX_K\@Z */ virtual bool readBytes(void *, unsigned __int64); /** - * @vftbl 10 - * @symbol ?numBytesLeft\@StringByteInput\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?numBytesLeft\@StringByteInput\@\@UEBA_KXZ */ virtual unsigned __int64 numBytesLeft() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRINGBYTEINPUT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StringByteInput(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StringByteOutput.hpp b/LiteLoader/include/llapi/mc/StringByteOutput.hpp index 72728b4ea1..5843b58288 100644 --- a/LiteLoader/include/llapi/mc/StringByteOutput.hpp +++ b/LiteLoader/include/llapi/mc/StringByteOutput.hpp @@ -30,54 +30,60 @@ class StringByteOutput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StringByteOutput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?writeString\@BytesDataOutput\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @vftbl 1 + * @symbol ?writeString\@BytesDataOutput\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual void writeString(class gsl::basic_string_span); + virtual void writeString(class std::basic_string_view>); /** - * @vftbl 2 - * @symbol ?writeLongString\@BytesDataOutput\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @vftbl 2 + * @symbol ?writeLongString\@BytesDataOutput\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - virtual void writeLongString(class gsl::basic_string_span); + virtual void writeLongString(class std::basic_string_view>); /** - * @vftbl 3 - * @symbol ?writeFloat\@BigEndianStringByteOutput\@\@UEAAXM\@Z + * @vftbl 3 + * @symbol ?writeFloat\@BigEndianStringByteOutput\@\@UEAAXM\@Z */ virtual void writeFloat(float); /** - * @vftbl 4 - * @symbol ?writeDouble\@BigEndianStringByteOutput\@\@UEAAXN\@Z + * @vftbl 4 + * @symbol ?writeDouble\@BigEndianStringByteOutput\@\@UEAAXN\@Z */ virtual void writeDouble(double); /** - * @vftbl 5 - * @symbol ?writeByte\@BytesDataOutput\@\@UEAAXD\@Z + * @vftbl 5 + * @symbol ?writeByte\@BytesDataOutput\@\@UEAAXD\@Z */ virtual void writeByte(char); /** - * @vftbl 6 - * @symbol ?writeShort\@BigEndianStringByteOutput\@\@UEAAXF\@Z + * @vftbl 6 + * @symbol ?writeShort\@BigEndianStringByteOutput\@\@UEAAXF\@Z */ virtual void writeShort(short); /** - * @vftbl 7 - * @symbol ?writeInt\@BigEndianStringByteOutput\@\@UEAAXH\@Z + * @vftbl 7 + * @symbol ?writeInt\@BigEndianStringByteOutput\@\@UEAAXH\@Z */ virtual void writeInt(int); /** - * @vftbl 8 - * @symbol ?writeLongLong\@BigEndianStringByteOutput\@\@UEAAX_J\@Z + * @vftbl 8 + * @symbol ?writeLongLong\@BigEndianStringByteOutput\@\@UEAAX_J\@Z */ virtual void writeLongLong(__int64); /** - * @vftbl 9 - * @symbol ?writeBytes\@StringByteOutput\@\@UEAAXPEBX_K\@Z + * @vftbl 9 + * @symbol ?writeBytes\@StringByteOutput\@\@UEAAXPEBX_K\@Z */ virtual void writeBytes(void const *, unsigned __int64); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRINGBYTEOUTPUT + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StringByteOutput(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StringTag.hpp b/LiteLoader/include/llapi/mc/StringTag.hpp index 56a8fa4e7b..b20dbda142 100644 --- a/LiteLoader/include/llapi/mc/StringTag.hpp +++ b/LiteLoader/include/llapi/mc/StringTag.hpp @@ -39,52 +39,58 @@ string val; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StringTag(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const; /** - * @vftbl 3 - * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z */ virtual void load(class IDataInput &); /** - * @vftbl 4 - * @symbol ?toString\@StringTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 4 + * @symbol ?toString\@StringTag\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string toString() const; /** - * @vftbl 5 - * @symbol ?getId\@StringTag\@\@UEBA?AW4Type\@Tag\@\@XZ + * @vftbl 5 + * @symbol ?getId\@StringTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const; /** - * @vftbl 6 - * @symbol ?equals\@StringTag\@\@UEBA_NAEBVTag\@\@\@Z + * @vftbl 6 + * @symbol ?equals\@StringTag\@\@UEBA_NAEBVTag\@\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 9 - * @symbol ?copy\@StringTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?copy\@StringTag\@\@UEBA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr copy() const; /** - * @vftbl 10 - * @symbol ?hash\@StringTag\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?hash\@StringTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRINGTAG /** - * @symbol ??0StringTag\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StringTag(); +#endif + /** + * @symbol ??0StringTag\@\@QEAA\@XZ */ MCAPI StringTag(); /** - * @symbol ??0StringTag\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0StringTag\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI StringTag(std::string); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp index 43fa0375be..175733a3c6 100644 --- a/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp +++ b/LiteLoader/include/llapi/mc/StrippedLogBlock.hpp @@ -31,208 +31,208 @@ class StrippedLogBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StrippedLogBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 146 - * @symbol ?getVariant\@StrippedLogBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@StrippedLogBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@StrippedLogBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@StrippedLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@StrippedLogBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0StrippedLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StrippedLogBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StrippedLogBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp b/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp index 6124b918e1..e6e7d871e2 100644 --- a/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp +++ b/LiteLoader/include/llapi/mc/StrollTowardsVillageGoal.hpp @@ -31,43 +31,43 @@ class StrollTowardsVillageGoal : public MoveToVillageGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StrollTowardsVillageGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@StrollTowardsVillageGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@StrollTowardsVillageGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@StrollTowardsVillageGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@StrollTowardsVillageGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 17 - * @symbol ?_selectRandomPosInVillage\@StrollTowardsVillageGoal\@\@MEAA?AVBlockPos\@\@XZ + * @vftbl 17 + * @symbol ?_selectRandomPosInVillage\@StrollTowardsVillageGoal\@\@MEAA?AVBlockPos\@\@XZ */ virtual class BlockPos _selectRandomPosInVillage(); /** - * @symbol ??0StrollTowardsVillageGoal\@\@QEAA\@AEAVMob\@\@MMMHM\@Z + * @symbol ??0StrollTowardsVillageGoal\@\@QEAA\@AEAVMob\@\@MMMHM\@Z */ MCAPI StrollTowardsVillageGoal(class Mob &, float, float, float, int, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrongholdFeature.hpp b/LiteLoader/include/llapi/mc/StrongholdFeature.hpp index d3168471b8..2d7b622827 100644 --- a/LiteLoader/include/llapi/mc/StrongholdFeature.hpp +++ b/LiteLoader/include/llapi/mc/StrongholdFeature.hpp @@ -37,47 +37,47 @@ struct StrongholdResult { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StrongholdFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@StrongholdFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@StrongholdFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@StrongholdFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@StrongholdFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@StrongholdFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@StrongholdFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0StrongholdFeature\@\@QEAA\@PEAVVillageFeature\@\@I\@Z + * @symbol ??0StrongholdFeature\@\@QEAA\@PEAVVillageFeature\@\@I\@Z */ MCAPI StrongholdFeature(class VillageFeature *, unsigned int); /** - * @symbol ?START_OFFSET\@StrongholdFeature\@\@2VBlockPos\@\@B + * @symbol ?START_OFFSET\@StrongholdFeature\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const START_OFFSET; //protected: /** - * @symbol ?generatePositions\@StrongholdFeature\@\@IEAAXAEAVRandom\@\@AEBVBiomeSource\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @symbol ?generatePositions\@StrongholdFeature\@\@IEAAXAEAVRandom\@\@AEBVBiomeSource\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ MCAPI void generatePositions(class Random &, class BiomeSource const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); //private: /** - * @symbol ?_generateStronghold\@StrongholdFeature\@\@AEAA?BUStrongholdResult\@1\@IAEBVChunkPos\@\@\@Z + * @symbol ?_generateStronghold\@StrongholdFeature\@\@AEAA?BUStrongholdResult\@1\@IAEBVChunkPos\@\@\@Z */ MCAPI struct StrongholdFeature::StrongholdResult const _generateStronghold(unsigned int, class ChunkPos const &); /** - * @symbol ?_getNearestStronghold\@StrongholdFeature\@\@AEAA_NAEBVDimension\@\@IAEBVBlockPos\@\@AEAV3\@_N\@Z + * @symbol ?_getNearestStronghold\@StrongholdFeature\@\@AEAA_NAEBVDimension\@\@IAEBVBlockPos\@\@AEAV3\@_N\@Z */ MCAPI bool _getNearestStronghold(class Dimension const &, unsigned int, class BlockPos const &, class BlockPos &, bool); @@ -85,4 +85,4 @@ struct StrongholdResult { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrongholdPiece.hpp b/LiteLoader/include/llapi/mc/StrongholdPiece.hpp index dc5a4204d9..f2a590167f 100644 --- a/LiteLoader/include/llapi/mc/StrongholdPiece.hpp +++ b/LiteLoader/include/llapi/mc/StrongholdPiece.hpp @@ -33,37 +33,37 @@ enum class SmallDoorType; public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRONGHOLDPIECE /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~StrongholdPiece(); #endif /** - * @symbol ?findAndCreatePieceFactory\@StrongholdPiece\@\@QEAA?AV?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?findAndCreatePieceFactory\@StrongholdPiece\@\@QEAA?AV?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEAVRandom\@\@HHHHH\@Z */ MCAPI std::unique_ptr findAndCreatePieceFactory(std::string const &, std::vector> &, class Random &, int, int, int, int, int); /** - * @symbol ?generateAndAddPiece\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHHH\@Z + * @symbol ?generateAndAddPiece\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HHHHH\@Z */ MCAPI class StructurePiece * generateAndAddPiece(class SHStartPiece &, std::vector> &, class Random &, int, int, int, int, int); /** - * @symbol ?generatePieceFromSmallDoor\@StrongholdPiece\@\@QEAA?AV?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEBVRandom\@\@HHHHH\@Z + * @symbol ?generatePieceFromSmallDoor\@StrongholdPiece\@\@QEAA?AV?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@3\@AEBVRandom\@\@HHHHH\@Z */ MCAPI std::unique_ptr generatePieceFromSmallDoor(class SHStartPiece &, std::vector> &, class Random const &, int, int, int, int, int); /** - * @symbol ?generateSmallDoor\@StrongholdPiece\@\@QEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@W4SmallDoorType\@1\@HHH\@Z + * @symbol ?generateSmallDoor\@StrongholdPiece\@\@QEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@W4SmallDoorType\@1\@HHH\@Z */ MCAPI void generateSmallDoor(class BlockSource &, class Random &, class BoundingBox const &, enum class StrongholdPiece::SmallDoorType, int, int, int); /** - * @symbol ?generateSmallDoorChildForward\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH\@Z + * @symbol ?generateSmallDoorChildForward\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH\@Z */ MCAPI class StructurePiece * generateSmallDoorChildForward(class SHStartPiece &, std::vector> &, class Random &, int, int); /** - * @symbol ?generateSmallDoorChildLeft\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH\@Z + * @symbol ?generateSmallDoorChildLeft\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH\@Z */ MCAPI class StructurePiece * generateSmallDoorChildLeft(class SHStartPiece &, std::vector> &, class Random &, int, int); /** - * @symbol ?generateSmallDoorChildRight\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH\@Z + * @symbol ?generateSmallDoorChildRight\@StrongholdPiece\@\@QEAAPEAVStructurePiece\@\@AEAVSHStartPiece\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@HH\@Z */ MCAPI class StructurePiece * generateSmallDoorChildRight(class SHStartPiece &, std::vector> &, class Random &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StrongholdStart.hpp b/LiteLoader/include/llapi/mc/StrongholdStart.hpp index 631e186220..0874dac547 100644 --- a/LiteLoader/include/llapi/mc/StrongholdStart.hpp +++ b/LiteLoader/include/llapi/mc/StrongholdStart.hpp @@ -31,26 +31,26 @@ class StrongholdStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StrongholdStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?isValid\@StrongholdStart\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isValid\@StrongholdStart\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0StrongholdStart\@\@QEAA\@AEAVDimension\@\@AEAVRandom\@\@HH\@Z + * @symbol ??0StrongholdStart\@\@QEAA\@AEAVDimension\@\@AEAVRandom\@\@HH\@Z */ MCAPI StrongholdStart(class Dimension &, class Random &, int, int); //private: /** - * @symbol ?_initializePieceSet\@StrongholdStart\@\@AEAAXAEAVRandom\@\@\@Z + * @symbol ?_initializePieceSet\@StrongholdStart\@\@AEAAXAEAVRandom\@\@\@Z */ MCAPI void _initializePieceSet(class Random &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp b/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp index 1754d3fa32..02fe40689c 100644 --- a/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp +++ b/LiteLoader/include/llapi/mc/StructureAnimationAction.hpp @@ -30,40 +30,40 @@ class StructureAnimationAction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureAnimationAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@StructureAnimationAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@StructureAnimationAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ virtual void execute(class ServerLevel &, class Dimension &); /** - * @vftbl 2 - * @symbol ?serialize\@StructureAnimationAction\@\@UEAAXAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?serialize\@StructureAnimationAction\@\@UEAAXAEAVCompoundTag\@\@\@Z */ virtual void serialize(class CompoundTag &); /** - * @vftbl 3 - * @symbol ??8StructureAnimationAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z + * @vftbl 3 + * @symbol ??8StructureAnimationAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z */ virtual bool operator==(class IRequestAction &) const; /** - * @symbol ??0StructureAnimationAction\@\@QEAA\@V?$unique_ptr\@VStructureAnimationData\@\@U?$default_delete\@VStructureAnimationData\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ??0StructureAnimationAction\@\@QEAA\@V?$unique_ptr\@VStructureAnimationData\@\@U?$default_delete\@VStructureAnimationData\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI StructureAnimationAction(std::unique_ptr, class AutomaticID); /** - * @symbol ??0StructureAnimationAction\@\@QEAA\@AEBVStructureSettings\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0StructureAnimationAction\@\@QEAA\@AEBVStructureSettings\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI StructureAnimationAction(class StructureSettings const &, class AutomaticID, class BlockPos const &, std::string const &); /** - * @symbol ?isValidTag\@StructureAnimationAction\@\@SA_NAEBVCompoundTag\@\@\@Z + * @symbol ?isValidTag\@StructureAnimationAction\@\@SA_NAEBVCompoundTag\@\@\@Z */ MCAPI static bool isValidTag(class CompoundTag const &); /** - * @symbol ?load\@StructureAnimationAction\@\@SA?AV?$unique_ptr\@VStructureAnimationAction\@\@U?$default_delete\@VStructureAnimationAction\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?load\@StructureAnimationAction\@\@SA?AV?$unique_ptr\@VStructureAnimationAction\@\@U?$default_delete\@VStructureAnimationAction\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureAnimationData.hpp b/LiteLoader/include/llapi/mc/StructureAnimationData.hpp index 0e642da714..071823b07f 100644 --- a/LiteLoader/include/llapi/mc/StructureAnimationData.hpp +++ b/LiteLoader/include/llapi/mc/StructureAnimationData.hpp @@ -30,80 +30,80 @@ class StructureAnimationData { public: /** - * @symbol ??0StructureAnimationData\@\@QEAA\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBVStructureSettings\@\@EAEBVBlockPos\@\@\@Z + * @symbol ??0StructureAnimationData\@\@QEAA\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@_KAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@AEBVStructureSettings\@\@EAEBVBlockPos\@\@\@Z */ MCAPI StructureAnimationData(std::unique_ptr, unsigned __int64, std::string const &, class StructureSettings const &, unsigned char, class BlockPos const &); /** - * @symbol ?allBlocksPlaced\@StructureAnimationData\@\@QEBA_NXZ + * @symbol ?allBlocksPlaced\@StructureAnimationData\@\@QEBA_NXZ */ MCAPI bool allBlocksPlaced() const; /** - * @symbol ?getBlocksExpectedToPlace\@StructureAnimationData\@\@QEBAI_K\@Z + * @symbol ?getBlocksExpectedToPlace\@StructureAnimationData\@\@QEBAI_K\@Z */ MCAPI unsigned int getBlocksExpectedToPlace(unsigned __int64) const; /** - * @symbol ?getBlocksPlaced\@StructureAnimationData\@\@QEBAIXZ + * @symbol ?getBlocksPlaced\@StructureAnimationData\@\@QEBAIXZ */ MCAPI unsigned int getBlocksPlaced() const; /** - * @symbol ?getDimensionBlockSource\@StructureAnimationData\@\@QEBAAEAVBlockSource\@\@XZ + * @symbol ?getDimensionBlockSource\@StructureAnimationData\@\@QEBAAEAVBlockSource\@\@XZ */ MCAPI class BlockSource & getDimensionBlockSource() const; /** - * @symbol ?getPosition\@StructureAnimationData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getPosition\@StructureAnimationData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getPosition() const; /** - * @symbol ?getQueueID\@StructureAnimationData\@\@QEBAIXZ + * @symbol ?getQueueID\@StructureAnimationData\@\@QEBAIXZ */ MCAPI unsigned int getQueueID() const; /** - * @symbol ?getStructureName\@StructureAnimationData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getStructureName\@StructureAnimationData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getStructureName() const; /** - * @symbol ?getStructureSettings\@StructureAnimationData\@\@QEBAAEBVStructureSettings\@\@XZ + * @symbol ?getStructureSettings\@StructureAnimationData\@\@QEBAAEBVStructureSettings\@\@XZ */ MCAPI class StructureSettings const & getStructureSettings() const; /** - * @symbol ?getStructureVersion\@StructureAnimationData\@\@QEBAEXZ + * @symbol ?getStructureVersion\@StructureAnimationData\@\@QEBAEXZ */ MCAPI unsigned char getStructureVersion() const; /** - * @symbol ?getTargetDimension\@StructureAnimationData\@\@QEBAAEBV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @symbol ?getTargetDimension\@StructureAnimationData\@\@QEBAAEBV?$AutomaticID\@VDimension\@\@H\@\@XZ */ MCAPI class AutomaticID const & getTargetDimension() const; /** - * @symbol ?getTotalBlocks\@StructureAnimationData\@\@QEBAIXZ + * @symbol ?getTotalBlocks\@StructureAnimationData\@\@QEBAIXZ */ MCAPI unsigned int getTotalBlocks() const; /** - * @symbol ?serialize\@StructureAnimationData\@\@QEAAAEAVCompoundTag\@\@AEAV2\@\@Z + * @symbol ?serialize\@StructureAnimationData\@\@QEAAAEAVCompoundTag\@\@AEAV2\@\@Z */ MCAPI class CompoundTag & serialize(class CompoundTag &); /** - * @symbol ?setBlocksPlaced\@StructureAnimationData\@\@QEAAXI\@Z + * @symbol ?setBlocksPlaced\@StructureAnimationData\@\@QEAAXI\@Z */ MCAPI void setBlocksPlaced(unsigned int); /** - * @symbol ?setCmdArea\@StructureAnimationData\@\@QEAAXV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?setCmdArea\@StructureAnimationData\@\@QEAAXV?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void setCmdArea(std::unique_ptr); /** - * @symbol ?setQueueID\@StructureAnimationData\@\@QEAAXI\@Z + * @symbol ?setQueueID\@StructureAnimationData\@\@QEAAXI\@Z */ MCAPI void setQueueID(unsigned int); /** - * @symbol ?setTargetDimension\@StructureAnimationData\@\@QEAAXAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?setTargetDimension\@StructureAnimationData\@\@QEAAXAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI void setTargetDimension(class AutomaticID const &); /** - * @symbol ??1StructureAnimationData\@\@QEAA\@XZ + * @symbol ??1StructureAnimationData\@\@QEAA\@XZ */ MCAPI ~StructureAnimationData(); /** - * @symbol ?load\@StructureAnimationData\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?load\@StructureAnimationData\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ MCAPI static class StructureAnimationData load(std::string const &, class CompoundTag const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureBlock.hpp b/LiteLoader/include/llapi/mc/StructureBlock.hpp index 6e7c5f9570..fceb85f778 100644 --- a/LiteLoader/include/llapi/mc/StructureBlock.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlock.hpp @@ -31,229 +31,234 @@ class StructureBlock : public ActorBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@StructureBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@StructureBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@StructureBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@StructureBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@StructureBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@StructureBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@StructureBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREBLOCK /** - * @symbol ?isInteractiveBlock\@StructureBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@StructureBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0StructureBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0StructureBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StructureBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureBlockActor.hpp b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp index 4f6a7425c8..b88597122e 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockActor.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockActor.hpp @@ -31,126 +31,126 @@ class StructureBlockActor : public BlockActor { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureBlockActor(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@StructureBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 1 + * @symbol ?load\@StructureBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void load(class Level &, class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 2 - * @symbol ?save\@StructureBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + * @vftbl 2 + * @symbol ?save\@StructureBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z */ virtual bool save(class CompoundTag &) const; /** - * @vftbl 8 - * @symbol ?onChanged\@StructureBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + * @vftbl 8 + * @symbol ?onChanged\@StructureBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z */ virtual void onChanged(class BlockSource &); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol __unk_vfn_35 + * @vftbl 35 + * @symbol __unk_vfn_35 */ virtual void __unk_vfn_35(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol ?_getUpdatePacket\@StructureBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @vftbl 37 + * @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 - * @symbol ?_onUpdatePacket\@StructureBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @vftbl 38 + * @symbol ?_onUpdatePacket\@StructureBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ virtual void _onUpdatePacket(class CompoundTag const &, class BlockSource &); /** - * @symbol ??0StructureBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0StructureBlockActor\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI StructureBlockActor(class BlockPos const &); /** - * @symbol ?getStructureData\@StructureBlockActor\@\@QEBAAEBVStructureEditorData\@\@XZ + * @symbol ?getStructureData\@StructureBlockActor\@\@QEBAAEBVStructureEditorData\@\@XZ */ MCAPI class StructureEditorData const & getStructureData() const; /** - * @symbol ?setIsWaterlogged\@StructureBlockActor\@\@QEAAX_N\@Z + * @symbol ?setIsWaterlogged\@StructureBlockActor\@\@QEAAX_N\@Z */ MCAPI void setIsWaterlogged(bool); /** - * @symbol ?setPowered\@StructureBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N2\@Z + * @symbol ?setPowered\@StructureBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N2\@Z */ MCAPI void setPowered(class BlockSource &, class BlockPos const &, bool, bool); /** - * @symbol ?setStructureData\@StructureBlockActor\@\@QEAAXAEBVStructureEditorData\@\@\@Z + * @symbol ?setStructureData\@StructureBlockActor\@\@QEAAXAEBVStructureEditorData\@\@\@Z */ MCAPI void setStructureData(class StructureEditorData const &); /** - * @symbol ?MAX_WIREFRAME_RENDER_DISTANCE\@StructureBlockActor\@\@2MB + * @symbol ?MAX_WIREFRAME_RENDER_DISTANCE\@StructureBlockActor\@\@2MB */ MCAPI static float const MAX_WIREFRAME_RENDER_DISTANCE; /** - * @symbol ?X_AXIS_COLOR\@StructureBlockActor\@\@2VColor\@mce\@\@B + * @symbol ?X_AXIS_COLOR\@StructureBlockActor\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const X_AXIS_COLOR; /** - * @symbol ?Y_AXIS_COLOR\@StructureBlockActor\@\@2VColor\@mce\@\@B + * @symbol ?Y_AXIS_COLOR\@StructureBlockActor\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const Y_AXIS_COLOR; /** - * @symbol ?Z_AXIS_COLOR\@StructureBlockActor\@\@2VColor\@mce\@\@B + * @symbol ?Z_AXIS_COLOR\@StructureBlockActor\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const Z_AXIS_COLOR; //private: /** - * @symbol ?_loadStructure\@StructureBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?_loadStructure\@StructureBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI bool _loadStructure(class BlockSource &, class BlockPos const &, class BaseGameVersion const &); /** - * @symbol ?_saveStructure\@StructureBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?_saveStructure\@StructureBlockActor\@\@AEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI bool _saveStructure(class BlockSource &, class BlockPos const &, bool); /** - * @symbol ?_trigger\@StructureBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBaseGameVersion\@\@_N\@Z + * @symbol ?_trigger\@StructureBlockActor\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBaseGameVersion\@\@_N\@Z */ MCAPI void _trigger(class BlockSource &, class BlockPos const &, class BaseGameVersion const &, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureBlockPalette.hpp b/LiteLoader/include/llapi/mc/StructureBlockPalette.hpp index b460e48789..9bca26eebd 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockPalette.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockPalette.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 @@ -35,75 +36,71 @@ struct BlockPositionData { public: /** - * @symbol ??0StructureBlockPalette\@\@QEAA\@XZ + * @symbol ??0StructureBlockPalette\@\@QEAA\@XZ */ MCAPI StructureBlockPalette(); /** - * @symbol ??0StructureBlockPalette\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0StructureBlockPalette\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI StructureBlockPalette(class StructureBlockPalette &&); /** - * @symbol ?addBlockPositionData\@StructureBlockPalette\@\@QEAAX_KUBlockPositionData\@1\@\@Z + * @symbol ?addBlockPositionData\@StructureBlockPalette\@\@QEAAX_KUBlockPositionData\@1\@\@Z */ MCAPI void addBlockPositionData(unsigned __int64, struct StructureBlockPalette::BlockPositionData); /** - * @symbol ?addMapping\@StructureBlockPalette\@\@QEAA_KV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addMapping\@StructureBlockPalette\@\@QEAA_KV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI unsigned __int64 addMapping(std::unique_ptr); /** - * @symbol ?getAllBlockPositionData\@StructureBlockPalette\@\@QEBAAEBV?$unordered_map\@_KUBlockPositionData\@StructureBlockPalette\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@4\@V?$allocator\@U?$pair\@$$CB_KUBlockPositionData\@StructureBlockPalette\@\@\@std\@\@\@4\@\@std\@\@XZ + * @symbol ?getAllBlockPositionData\@StructureBlockPalette\@\@QEBAAEBV?$unordered_map\@_KUBlockPositionData\@StructureBlockPalette\@\@U?$hash\@_K\@std\@\@U?$equal_to\@_K\@4\@V?$allocator\@U?$pair\@$$CB_KUBlockPositionData\@StructureBlockPalette\@\@\@std\@\@\@4\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getAllBlockPositionData() const; /** - * @symbol ?getBlock\@StructureBlockPalette\@\@QEBAAEBVBlock\@\@AEBVBlockPalette\@\@_K\@Z + * @symbol ?getBlock\@StructureBlockPalette\@\@QEBAAEBVBlock\@\@AEBVBlockPalette\@\@_KV?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@\@Z */ - MCAPI class Block const & getBlock(class BlockPalette const &, unsigned __int64) const; + MCAPI class Block const & getBlock(class BlockPalette const &, unsigned __int64, class Bedrock::NonOwnerPointer) const; /** - * @symbol ?getBlock\@StructureBlockPalette\@\@QEBAAEBVBlock\@\@_K\@Z - */ - MCAPI class Block const & getBlock(unsigned __int64) const; - /** - * @symbol ?getBlockPositionData\@StructureBlockPalette\@\@QEBAPEBUBlockPositionData\@1\@_K\@Z + * @symbol ?getBlockPositionData\@StructureBlockPalette\@\@QEBAPEBUBlockPositionData\@1\@_K\@Z */ MCAPI struct StructureBlockPalette::BlockPositionData const * getBlockPositionData(unsigned __int64) const; /** - * @symbol ?getSize\@StructureBlockPalette\@\@QEBA_KXZ + * @symbol ?getSize\@StructureBlockPalette\@\@QEBA_KXZ */ MCAPI unsigned __int64 getSize() const; /** - * @symbol ?load\@StructureBlockPalette\@\@QEAA_NAEBVCompoundTag\@\@H\@Z + * @symbol ?load\@StructureBlockPalette\@\@QEAA_NAEBVCompoundTag\@\@H\@Z */ MCAPI bool load(class CompoundTag const &, int); /** - * @symbol ?save\@StructureBlockPalette\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@StructureBlockPalette\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ??1StructureBlockPalette\@\@QEAA\@XZ + * @symbol ??1StructureBlockPalette\@\@QEAA\@XZ */ MCAPI ~StructureBlockPalette(); //protected: /** - * @symbol ?_parseBlockPalette\@StructureBlockPalette\@\@IEAA?AW4StructureBlockPaletteLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parseBlockPalette\@StructureBlockPalette\@\@IEAA?AW4StructureBlockPaletteLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureBlockPaletteLoadResult _parseBlockPalette(class CompoundTag const &); /** - * @symbol ?_parseBlockPositionData\@StructureBlockPalette\@\@IEAA?AW4StructureBlockPaletteLoadResult\@\@AEBVCompoundTag\@\@H\@Z + * @symbol ?_parseBlockPositionData\@StructureBlockPalette\@\@IEAA?AW4StructureBlockPaletteLoadResult\@\@AEBVCompoundTag\@\@H\@Z */ MCAPI enum class StructureBlockPaletteLoadResult _parseBlockPositionData(class CompoundTag const &, int); /** - * @symbol ?_parseBlockPositionDataList\@StructureBlockPalette\@\@IEAA?AW4StructureBlockPaletteLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parseBlockPositionDataList\@StructureBlockPalette\@\@IEAA?AW4StructureBlockPaletteLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureBlockPaletteLoadResult _parseBlockPositionDataList(class CompoundTag const &); /** - * @symbol ?_saveBlockPositionDataList\@StructureBlockPalette\@\@IEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?_saveBlockPositionDataList\@StructureBlockPalette\@\@IEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void _saveBlockPositionDataList(class CompoundTag &) const; //private: /** - * @symbol ?_contentErrorMissingField\@StructureBlockPalette\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_contentErrorMissingField\@StructureBlockPalette\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _contentErrorMissingField(std::string const &) const; @@ -111,4 +108,4 @@ struct BlockPositionData { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp index f124fdeee9..1fb97b7c8a 100644 --- a/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureBlockUpdatePacket.hpp @@ -29,37 +29,37 @@ class StructureBlockUpdatePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureBlockUpdatePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@StructureBlockUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@StructureBlockUpdatePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@StructureBlockUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@StructureBlockUpdatePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@StructureBlockUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@StructureBlockUpdatePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@StructureBlockUpdatePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@XZ + * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@XZ */ MCAPI StructureBlockUpdatePacket(); /** - * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0StructureBlockUpdatePacket\@\@QEAA\@AEBV0\@\@Z */ MCAPI StructureBlockUpdatePacket(class StructureBlockUpdatePacket const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureCommand.hpp b/LiteLoader/include/llapi/mc/StructureCommand.hpp index ede9aea3d3..623399ca64 100644 --- a/LiteLoader/include/llapi/mc/StructureCommand.hpp +++ b/LiteLoader/include/llapi/mc/StructureCommand.hpp @@ -31,42 +31,42 @@ class StructureCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@StructureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@StructureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@StructureCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@StructureCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_delete\@StructureCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_delete\@StructureCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _delete(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_getFullName\@StructureCommand\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_getFullName\@StructureCommand\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string _getFullName() const; /** - * @symbol ?_isValidSize\@StructureCommand\@\@AEBA_NAEBVBlockPos\@\@AEBVDimensionHeightRange\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_isValidSize\@StructureCommand\@\@AEBA_NAEBVBlockPos\@\@AEBVDimensionHeightRange\@\@AEAVCommandOutput\@\@\@Z */ MCAPI bool _isValidSize(class BlockPos const &, class DimensionHeightRange const &, class CommandOutput &) const; /** - * @symbol ?_load\@StructureCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_load\@StructureCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _load(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_save\@StructureCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_save\@StructureCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI void _save(class CommandOrigin const &, class CommandOutput &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp b/LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp index ccc0c825fc..0a4d068424 100644 --- a/LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp +++ b/LiteLoader/include/llapi/mc/StructureDataLoadHelper.hpp @@ -32,113 +32,117 @@ class StructureDataLoadHelper { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureDataLoadHelper(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?loadPosition\@StructureDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + * @vftbl 1 + * @symbol ?loadPosition\@StructureDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ virtual class Vec3 loadPosition(class Vec3 const &); /** - * @vftbl 2 - * @symbol ?loadBlockPosition\@StructureDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z + * @vftbl 2 + * @symbol ?loadBlockPosition\@StructureDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ virtual class BlockPos loadBlockPosition(class BlockPos const &); /** - * @vftbl 3 - * @symbol ?loadBlockPositionOffset\@StructureDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z + * @vftbl 3 + * @symbol ?loadBlockPositionOffset\@StructureDataLoadHelper\@\@UEAA?AVBlockPos\@\@AEBV2\@\@Z */ virtual class BlockPos loadBlockPositionOffset(class BlockPos const &); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?loadRotationDegreesY\@StructureDataLoadHelper\@\@UEAAMM\@Z + * @vftbl 5 + * @symbol ?loadRotationDegreesY\@StructureDataLoadHelper\@\@UEAAMM\@Z */ virtual float loadRotationDegreesY(float); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?loadRotationRadiansY\@StructureDataLoadHelper\@\@UEAAMM\@Z + * @vftbl 7 + * @symbol ?loadRotationRadiansY\@StructureDataLoadHelper\@\@UEAAMM\@Z */ virtual float loadRotationRadiansY(float); /** - * @vftbl 8 - * @symbol ?loadFacingID\@StructureDataLoadHelper\@\@UEAAEE\@Z + * @vftbl 8 + * @symbol ?loadFacingID\@StructureDataLoadHelper\@\@UEAAEE\@Z */ virtual unsigned char loadFacingID(unsigned char); /** - * @vftbl 9 - * @symbol ?loadDirection\@StructureDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z + * @vftbl 9 + * @symbol ?loadDirection\@StructureDataLoadHelper\@\@UEAA?AVVec3\@\@AEBV2\@\@Z */ virtual class Vec3 loadDirection(class Vec3 const &); /** - * @vftbl 10 - * @symbol ?loadDirection\@StructureDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z + * @vftbl 10 + * @symbol ?loadDirection\@StructureDataLoadHelper\@\@UEAA?AW4Type\@Direction\@\@W423\@\@Z */ virtual enum class Direction::Type loadDirection(enum class Direction::Type); /** - * @vftbl 11 - * @symbol ?loadRotation\@StructureDataLoadHelper\@\@UEAA?AW4Rotation\@\@W42\@\@Z + * @vftbl 11 + * @symbol ?loadRotation\@StructureDataLoadHelper\@\@UEAA?AW4Rotation\@\@W42\@\@Z */ virtual enum class Rotation loadRotation(enum class Rotation); /** - * @vftbl 12 - * @symbol ?loadMirror\@StructureDataLoadHelper\@\@UEAA?AW4Mirror\@\@W42\@\@Z + * @vftbl 12 + * @symbol ?loadMirror\@StructureDataLoadHelper\@\@UEAA?AW4Mirror\@\@W42\@\@Z */ virtual enum class Mirror loadMirror(enum class Mirror); /** - * @vftbl 13 - * @symbol ?loadActorUniqueID\@StructureDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z + * @vftbl 13 + * @symbol ?loadActorUniqueID\@StructureDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z */ virtual struct ActorUniqueID loadActorUniqueID(struct ActorUniqueID); /** - * @vftbl 14 - * @symbol ?loadOwnerID\@StructureDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z + * @vftbl 14 + * @symbol ?loadOwnerID\@StructureDataLoadHelper\@\@UEAA?AUActorUniqueID\@\@U2\@\@Z */ virtual struct ActorUniqueID loadOwnerID(struct ActorUniqueID); /** - * @vftbl 15 - * @symbol ?loadActorInternalComponentInfo\@StructureDataLoadHelper\@\@UEAAPEBUComponentInfo\@InternalComponentRegistry\@\@AEBV?$unordered_map\@VHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@\@std\@\@\@5\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z + * @vftbl 15 + * @symbol ?loadActorInternalComponentInfo\@StructureDataLoadHelper\@\@UEAAPEBUComponentInfo\@InternalComponentRegistry\@\@AEBV?$unordered_map\@VHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@U?$hash\@VHashedString\@\@\@std\@\@U?$equal_to\@VHashedString\@\@\@5\@V?$allocator\@U?$pair\@$$CBVHashedString\@\@UComponentInfo\@InternalComponentRegistry\@\@\@std\@\@\@5\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@5\@\@Z */ virtual struct InternalComponentRegistry::ComponentInfo const * loadActorInternalComponentInfo(class std::unordered_map, struct std::equal_to, class std::allocator>> const &, std::string const &); /** - * @vftbl 16 - * @symbol ?getType\@StructureDataLoadHelper\@\@UEBA?AW4DataLoadHelperType\@\@XZ + * @vftbl 16 + * @symbol ?getType\@StructureDataLoadHelper\@\@UEBA?AW4DataLoadHelperType\@\@XZ */ virtual enum class DataLoadHelperType getType() const; /** - * @vftbl 17 - * @symbol ?shouldResetTime\@StructureDataLoadHelper\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?shouldResetTime\@StructureDataLoadHelper\@\@UEAA_NXZ */ virtual bool shouldResetTime(); /** - * @vftbl 18 - * @symbol ?_generateNewID\@StructureDataLoadHelper\@\@MEAA?AUActorUniqueID\@\@XZ + * @vftbl 18 + * @symbol ?_generateNewID\@StructureDataLoadHelper\@\@MEAA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID _generateNewID(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREDATALOADHELPER /** - * @symbol ?loadRotationDegreesX\@StructureDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationDegreesX\@StructureDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationDegreesX(float); /** - * @symbol ?loadRotationRadiansX\@StructureDataLoadHelper\@\@UEAAMM\@Z + * @symbol ?loadRotationRadiansX\@StructureDataLoadHelper\@\@UEAAMM\@Z */ MCVAPI float loadRotationRadiansX(float); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructureDataLoadHelper(); #endif /** - * @symbol ??0StructureDataLoadHelper\@\@QEAA\@AEBVBlockPos\@\@0AEBVVec3\@\@UActorUniqueID\@\@W4Rotation\@\@W4Mirror\@\@AEAVLevel\@\@\@Z + * @symbol ??0StructureDataLoadHelper\@\@QEAA\@AEBVBlockPos\@\@0AEBVVec3\@\@UActorUniqueID\@\@W4Rotation\@\@W4Mirror\@\@AEAVLevel\@\@\@Z */ MCAPI StructureDataLoadHelper(class BlockPos const &, class BlockPos const &, class Vec3 const &, struct ActorUniqueID, enum class Rotation, enum class Mirror, class Level &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureEditorData.hpp b/LiteLoader/include/llapi/mc/StructureEditorData.hpp index 0b7349579c..c0124ae164 100644 --- a/LiteLoader/include/llapi/mc/StructureEditorData.hpp +++ b/LiteLoader/include/llapi/mc/StructureEditorData.hpp @@ -28,204 +28,204 @@ class StructureEditorData { public: /** - * @symbol ??0StructureEditorData\@\@QEAA\@XZ + * @symbol ??0StructureEditorData\@\@QEAA\@AEBV0\@\@Z */ - MCAPI StructureEditorData(); + MCAPI StructureEditorData(class StructureEditorData const &); /** - * @symbol ??0StructureEditorData\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0StructureEditorData\@\@QEAA\@XZ */ - MCAPI StructureEditorData(class StructureEditorData const &); + MCAPI StructureEditorData(); /** - * @symbol ?getAnimationModeAsString\@StructureEditorData\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getAnimationModeAsString\@StructureEditorData\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getAnimationModeAsString() const; /** - * @symbol ?getAnimationSeconds\@StructureEditorData\@\@QEBAMXZ + * @symbol ?getAnimationSeconds\@StructureEditorData\@\@QEBAMXZ */ MCAPI float getAnimationSeconds() const; /** - * @symbol ?getIgnoreBlocks\@StructureEditorData\@\@QEBA_NXZ + * @symbol ?getIgnoreBlocks\@StructureEditorData\@\@QEBA_NXZ */ MCAPI bool getIgnoreBlocks() const; /** - * @symbol ?getIgnoreEntities\@StructureEditorData\@\@QEBA_NXZ + * @symbol ?getIgnoreEntities\@StructureEditorData\@\@QEBA_NXZ */ MCAPI bool getIgnoreEntities() const; /** - * @symbol ?getIncludePlayers\@StructureEditorData\@\@QEBA_NXZ + * @symbol ?getIncludePlayers\@StructureEditorData\@\@QEBA_NXZ */ MCAPI bool getIncludePlayers() const; /** - * @symbol ?getIntegritySeed\@StructureEditorData\@\@QEBAIXZ + * @symbol ?getIntegritySeed\@StructureEditorData\@\@QEBAIXZ */ MCAPI unsigned int getIntegritySeed() const; /** - * @symbol ?getIntegrityValue\@StructureEditorData\@\@QEBAMXZ + * @symbol ?getIntegrityValue\@StructureEditorData\@\@QEBAMXZ */ MCAPI float getIntegrityValue() const; /** - * @symbol ?getIsWaterLogged\@StructureEditorData\@\@QEBA_NXZ + * @symbol ?getIsWaterLogged\@StructureEditorData\@\@QEBA_NXZ */ MCAPI bool getIsWaterLogged() const; /** - * @symbol ?getMirror\@StructureEditorData\@\@QEBA?AW4Mirror\@\@XZ + * @symbol ?getMirror\@StructureEditorData\@\@QEBA?AW4Mirror\@\@XZ */ MCAPI enum class Mirror getMirror() const; /** - * @symbol ?getPivot\@StructureEditorData\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getPivot\@StructureEditorData\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getPivot() const; /** - * @symbol ?getRedstoneSaveMode\@StructureEditorData\@\@QEBA?AW4StructureRedstoneSaveMode\@\@XZ + * @symbol ?getRedstoneSaveMode\@StructureEditorData\@\@QEBA?AW4StructureRedstoneSaveMode\@\@XZ */ MCAPI enum class StructureRedstoneSaveMode getRedstoneSaveMode() const; /** - * @symbol ?getRotation\@StructureEditorData\@\@QEBA?AW4Rotation\@\@XZ + * @symbol ?getRotation\@StructureEditorData\@\@QEBA?AW4Rotation\@\@XZ */ MCAPI enum class Rotation getRotation() const; /** - * @symbol ?getShowBoundingBox\@StructureEditorData\@\@QEBA_NXZ + * @symbol ?getShowBoundingBox\@StructureEditorData\@\@QEBA_NXZ */ MCAPI bool getShowBoundingBox() const; /** - * @symbol ?getStructureBlockType\@StructureEditorData\@\@QEBA?AW4StructureBlockType\@\@XZ + * @symbol ?getStructureBlockType\@StructureEditorData\@\@QEBA?AW4StructureBlockType\@\@XZ */ MCAPI enum class StructureBlockType getStructureBlockType() const; /** - * @symbol ?getStructureName\@StructureEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getStructureName\@StructureEditorData\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getStructureName() const; /** - * @symbol ?getStructureOffset\@StructureEditorData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getStructureOffset\@StructureEditorData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getStructureOffset() const; /** - * @symbol ?getStructureSettings\@StructureEditorData\@\@QEBAAEBVStructureSettings\@\@XZ + * @symbol ?getStructureSettings\@StructureEditorData\@\@QEBAAEBVStructureSettings\@\@XZ */ MCAPI class StructureSettings const & getStructureSettings() const; /** - * @symbol ?getStructureSize\@StructureEditorData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getStructureSize\@StructureEditorData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getStructureSize() const; /** - * @symbol ?load\@StructureEditorData\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@StructureEditorData\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?save\@StructureEditorData\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@StructureEditorData\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; /** - * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureEditorData\@\@QEAAX_N\@Z + * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureEditorData\@\@QEAAX_N\@Z */ MCAPI void setAllowNonTickingPlayerAndTickingAreaChunks(bool); /** - * @symbol ?setAnimationMode\@StructureEditorData\@\@QEAAXW4AnimationMode\@\@\@Z + * @symbol ?setAnimationMode\@StructureEditorData\@\@QEAAXW4AnimationMode\@\@\@Z */ MCAPI void setAnimationMode(enum class AnimationMode); /** - * @symbol ?setAnimationSeconds\@StructureEditorData\@\@QEAAXM\@Z + * @symbol ?setAnimationSeconds\@StructureEditorData\@\@QEAAXM\@Z */ MCAPI void setAnimationSeconds(float); /** - * @symbol ?setAnimationTicks\@StructureEditorData\@\@QEAAXI\@Z + * @symbol ?setAnimationTicks\@StructureEditorData\@\@QEAAXI\@Z */ MCAPI void setAnimationTicks(unsigned int); /** - * @symbol ?setIgnoreBlocks\@StructureEditorData\@\@QEAAX_N\@Z + * @symbol ?setIgnoreBlocks\@StructureEditorData\@\@QEAAX_N\@Z */ MCAPI void setIgnoreBlocks(bool); /** - * @symbol ?setIgnoreEntities\@StructureEditorData\@\@QEAAX_N\@Z + * @symbol ?setIgnoreEntities\@StructureEditorData\@\@QEAAX_N\@Z */ MCAPI void setIgnoreEntities(bool); /** - * @symbol ?setIntegritySeed\@StructureEditorData\@\@QEAAXI\@Z + * @symbol ?setIntegritySeed\@StructureEditorData\@\@QEAAXI\@Z */ MCAPI void setIntegritySeed(unsigned int); /** - * @symbol ?setIntegrityValue\@StructureEditorData\@\@QEAAXM\@Z + * @symbol ?setIntegrityValue\@StructureEditorData\@\@QEAAXM\@Z */ MCAPI void setIntegrityValue(float); /** - * @symbol ?setIsWaterLogged\@StructureEditorData\@\@QEAAX_N\@Z + * @symbol ?setIsWaterLogged\@StructureEditorData\@\@QEAAX_N\@Z */ MCAPI void setIsWaterLogged(bool); /** - * @symbol ?setLastTouchedByPlayerID\@StructureEditorData\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setLastTouchedByPlayerID\@StructureEditorData\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setLastTouchedByPlayerID(struct ActorUniqueID); /** - * @symbol ?setMirror\@StructureEditorData\@\@QEAAXW4Mirror\@\@\@Z + * @symbol ?setMirror\@StructureEditorData\@\@QEAAXW4Mirror\@\@\@Z */ MCAPI void setMirror(enum class Mirror); /** - * @symbol ?setRotation\@StructureEditorData\@\@QEAAXW4Rotation\@\@\@Z + * @symbol ?setRotation\@StructureEditorData\@\@QEAAXW4Rotation\@\@\@Z */ MCAPI void setRotation(enum class Rotation); /** - * @symbol ?setShowBoundingBox\@StructureEditorData\@\@QEAAX_N\@Z + * @symbol ?setShowBoundingBox\@StructureEditorData\@\@QEAAX_N\@Z */ MCAPI void setShowBoundingBox(bool); /** - * @symbol ?setStructureBlockType\@StructureEditorData\@\@QEAAXW4StructureBlockType\@\@\@Z + * @symbol ?setStructureBlockType\@StructureEditorData\@\@QEAAXW4StructureBlockType\@\@\@Z */ MCAPI void setStructureBlockType(enum class StructureBlockType); /** - * @symbol ?setStructureName\@StructureEditorData\@\@QEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?setStructureName\@StructureEditorData\@\@QEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCAPI void setStructureName(class gsl::basic_string_span); + MCAPI void setStructureName(class std::basic_string_view>); /** - * @symbol ?setStructureOffset\@StructureEditorData\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setStructureOffset\@StructureEditorData\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setStructureOffset(class BlockPos const &); /** - * @symbol ?setStructureSize\@StructureEditorData\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setStructureSize\@StructureEditorData\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setStructureSize(class BlockPos const &); /** - * @symbol ??1StructureEditorData\@\@QEAA\@XZ + * @symbol ??1StructureEditorData\@\@QEAA\@XZ */ MCAPI ~StructureEditorData(); /** - * @symbol ?DEFAULT_EXPORT_NAME\@StructureEditorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEFAULT_EXPORT_NAME\@StructureEditorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DEFAULT_EXPORT_NAME; /** - * @symbol ?DEFAULT_STRUCTURE_NAMESPACE\@StructureEditorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEFAULT_STRUCTURE_NAMESPACE\@StructureEditorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DEFAULT_STRUCTURE_NAMESPACE; /** - * @symbol ?MAX_STRUCTURE_OFFSET\@StructureEditorData\@\@2VBlockPos\@\@B + * @symbol ?MAX_STRUCTURE_OFFSET\@StructureEditorData\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const MAX_STRUCTURE_OFFSET; /** - * @symbol ?MIN_STRUCTURE_OFFSET\@StructureEditorData\@\@2VBlockPos\@\@B + * @symbol ?MIN_STRUCTURE_OFFSET\@StructureEditorData\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const MIN_STRUCTURE_OFFSET; /** - * @symbol ?MIN_STRUCTURE_SIZE\@StructureEditorData\@\@2VBlockPos\@\@B + * @symbol ?MIN_STRUCTURE_SIZE\@StructureEditorData\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const MIN_STRUCTURE_SIZE; /** - * @symbol ?NAMESPACE_DELIMITER\@StructureEditorData\@\@2DB + * @symbol ?NAMESPACE_DELIMITER\@StructureEditorData\@\@2DB */ MCAPI static char const NAMESPACE_DELIMITER; /** - * @symbol ?getOrientedBounds\@StructureEditorData\@\@SA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z + * @symbol ?getOrientedBounds\@StructureEditorData\@\@SA?AVBlockPos\@\@AEBV2\@W4Rotation\@\@\@Z */ MCAPI static class BlockPos getOrientedBounds(class BlockPos const &, enum class Rotation); //private: /** - * @symbol ?_setPivotFromStructureSize\@StructureEditorData\@\@AEAAXXZ + * @symbol ?_setPivotFromStructureSize\@StructureEditorData\@\@AEAAXXZ */ MCAPI void _setPivotFromStructureSize(); private: /** - * @symbol ?DEFAULT_STRUCTURE_TYPE\@StructureEditorData\@\@0W4StructureBlockType\@\@B + * @symbol ?DEFAULT_STRUCTURE_TYPE\@StructureEditorData\@\@0W4StructureBlockType\@\@B */ MCAPI static enum class StructureBlockType const DEFAULT_STRUCTURE_TYPE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureEditorDataHelper.hpp b/LiteLoader/include/llapi/mc/StructureEditorDataHelper.hpp index 5673354405..4c89942ac1 100644 --- a/LiteLoader/include/llapi/mc/StructureEditorDataHelper.hpp +++ b/LiteLoader/include/llapi/mc/StructureEditorDataHelper.hpp @@ -22,7 +22,7 @@ namespace StructureEditorDataHelper { #undef AFTER_EXTRA /** - * @symbol ?calculateMaxStructureSize\@StructureEditorDataHelper\@\@YA?AVBlockPos\@\@FF\@Z + * @symbol ?calculateMaxStructureSize\@StructureEditorDataHelper\@\@YA?AVBlockPos\@\@FF\@Z */ MCAPI class BlockPos calculateMaxStructureSize(short, short); diff --git a/LiteLoader/include/llapi/mc/StructureFeature.hpp b/LiteLoader/include/llapi/mc/StructureFeature.hpp index 69a55a6135..54a9123758 100644 --- a/LiteLoader/include/llapi/mc/StructureFeature.hpp +++ b/LiteLoader/include/llapi/mc/StructureFeature.hpp @@ -30,171 +30,177 @@ class StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shouldAddHardcodedSpawnAreas\@StructureFeature\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?shouldAddHardcodedSpawnAreas\@StructureFeature\@\@UEBA_NXZ */ virtual bool shouldAddHardcodedSpawnAreas() const; /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@StructureFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@StructureFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@StructureFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@StructureFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 4 - * @symbol ?initMobSpawnTypes\@StructureFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z + * @vftbl 4 + * @symbol ?initMobSpawnTypes\@StructureFeature\@\@UEAAXAEAVHardcodedSpawnAreaRegistry\@\@\@Z */ virtual void initMobSpawnTypes(class HardcodedSpawnAreaRegistry &); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@WoodlandMansionFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@AncientCityFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &) = 0; /** - * @vftbl 6 - * @symbol ?createStructureStart\@WoodlandMansionFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@AncientCityFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &) = 0; /** - * @vftbl 7 - * @symbol ?getStructureAt\@StructureFeature\@\@MEAAPEAVStructureStart\@\@HHH\@Z + * @vftbl 7 + * @symbol ?getStructureAt\@StructureFeature\@\@MEAAPEAVStructureStart\@\@HHH\@Z */ virtual class StructureStart * getStructureAt(int, int, int); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol ?_Get\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEBAPEBXXZ + * @vftbl 13 + * @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 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 18 + * @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); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREFEATURE /** - * @symbol ??0StructureFeature\@\@QEAA\@IW4StructureFeatureType\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructureFeature(); +#endif + /** + * @symbol ??0StructureFeature\@\@QEAA\@IW4StructureFeatureType\@\@\@Z */ MCAPI StructureFeature(unsigned int, enum class StructureFeatureType); /** - * @symbol ?addHardcodedSpawnAreas\@StructureFeature\@\@QEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?addHardcodedSpawnAreas\@StructureFeature\@\@QEAAXAEAVLevelChunk\@\@\@Z */ MCAPI void addHardcodedSpawnAreas(class LevelChunk &); /** - * @symbol ?chunkStartAtSurfaceLevel\@StructureFeature\@\@QEAA?AVBlockPos\@\@AEBVIPreliminarySurfaceProvider\@\@VChunkPos\@\@H\@Z + * @symbol ?chunkStartAtSurfaceLevel\@StructureFeature\@\@QEAA?AVBlockPos\@\@AEBVIPreliminarySurfaceProvider\@\@VChunkPos\@\@H\@Z */ MCAPI class BlockPos chunkStartAtSurfaceLevel(class IPreliminarySurfaceProvider const &, class ChunkPos, int); /** - * @symbol ?createBlueprints\@StructureFeature\@\@QEAAXAEAVDimension\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ?createBlueprints\@StructureFeature\@\@QEAAXAEAVDimension\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI void createBlueprints(class Dimension &, class ChunkPos const &, class BiomeSource const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ?debugRender\@StructureFeature\@\@QEAAXXZ + * @symbol ?debugRender\@StructureFeature\@\@QEAAXXZ */ MCAPI void debugRender(); /** - * @symbol ?findFarAwayStructures\@StructureFeature\@\@QEAA?AV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@V?$buffer_span\@VChunkPos\@\@\@\@I\@Z + * @symbol ?findFarAwayStructures\@StructureFeature\@\@QEAA?AV?$vector\@VChunkPos\@\@V?$allocator\@VChunkPos\@\@\@std\@\@\@std\@\@V?$buffer_span\@VChunkPos\@\@\@\@I\@Z */ MCAPI std::vector findFarAwayStructures(class buffer_span, unsigned int); /** - * @symbol ?foreachIntersectingStructureStart\@StructureFeature\@\@QEAAXAEBVBoundingBox\@\@V?$function\@$$A6AXAEAVStructureStart\@\@\@Z\@std\@\@\@Z + * @symbol ?foreachIntersectingStructureStart\@StructureFeature\@\@QEAAXAEBVBoundingBox\@\@V?$function\@$$A6AXAEAVStructureStart\@\@\@Z\@std\@\@\@Z */ MCAPI void foreachIntersectingStructureStart(class BoundingBox const &, class std::function); /** - * @symbol ?garbageCollectBlueprints\@StructureFeature\@\@QEAAXV?$buffer_span\@VChunkPos\@\@\@\@I\@Z + * @symbol ?garbageCollectBlueprints\@StructureFeature\@\@QEAAXV?$buffer_span\@VChunkPos\@\@\@\@I\@Z */ MCAPI void garbageCollectBlueprints(class buffer_span, unsigned int); /** - * @symbol ?getType\@StructureFeature\@\@QEBA?AW4StructureFeatureType\@\@XZ + * @symbol ?getType\@StructureFeature\@\@QEBA?AW4StructureFeatureType\@\@XZ */ MCAPI enum class StructureFeatureType getType() const; /** - * @symbol ?isInsideBoundingFeature\@StructureFeature\@\@QEAA_NHHH\@Z + * @symbol ?isInsideBoundingFeature\@StructureFeature\@\@QEAA_NHHH\@Z */ MCAPI bool isInsideBoundingFeature(int, int, int); /** - * @symbol ?postProcess\@StructureFeature\@\@QEAA_NAEAVBlockSource\@\@AEAVRandom\@\@HH\@Z + * @symbol ?postProcess\@StructureFeature\@\@QEAA_NAEAVBlockSource\@\@AEAVRandom\@\@HH\@Z */ MCAPI bool postProcess(class BlockSource &, class Random &, int, int); /** - * @symbol ?postProcessMobsAt\@StructureFeature\@\@QEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z + * @symbol ?postProcessMobsAt\@StructureFeature\@\@QEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z */ MCAPI void postProcessMobsAt(class BlockSource &, int, int, class Random &); /** - * @symbol ?waitForFeatureBlueprints\@StructureFeature\@\@QEAAXXZ + * @symbol ?waitForFeatureBlueprints\@StructureFeature\@\@QEAAXXZ */ MCAPI void waitForFeatureBlueprints(); /** - * @symbol ?findNearestFeaturePositionBySpacing\@StructureFeature\@\@SA_NAEAVDimension\@\@AEBVIPreliminarySurfaceProvider\@\@AEAV1\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV5\@HHH_NH6\@Z + * @symbol ?findNearestFeaturePositionBySpacing\@StructureFeature\@\@SA_NAEAVDimension\@\@AEBVIPreliminarySurfaceProvider\@\@AEAV1\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV5\@HHH_NH6\@Z */ MCAPI static bool findNearestFeaturePositionBySpacing(class Dimension &, class IPreliminarySurfaceProvider const &, class StructureFeature &, class BiomeSource const &, class BlockPos const &, class BlockPos &, int, int, int, bool, int, bool); /** - * @symbol ?getChunkPosInSpace\@StructureFeature\@\@SA?AVChunkPos\@\@AEBV2\@AEAVRandom\@\@IHHH_N\@Z + * @symbol ?getChunkPosInSpace\@StructureFeature\@\@SA?AVChunkPos\@\@AEBV2\@AEAVRandom\@\@IHHH_N\@Z */ MCAPI static class ChunkPos getChunkPosInSpace(class ChunkPos const &, class Random &, unsigned int, int, int, int, bool); /** - * @symbol ?setRandomSeedFor\@StructureFeature\@\@SAXAEAVRandom\@\@HHHI\@Z + * @symbol ?setRandomSeedFor\@StructureFeature\@\@SAXAEAVRandom\@\@HHHI\@Z */ MCAPI static void setRandomSeedFor(class Random &, int, int, int, unsigned int); //protected: /** - * @symbol ?addFeature\@StructureFeature\@\@IEAAXAEAVDimension\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ?addFeature\@StructureFeature\@\@IEAAXAEAVDimension\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI void addFeature(class Dimension &, class Random &, class ChunkPos const &, class BiomeSource const &, class IPreliminarySurfaceProvider const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureFeatureRegistry.hpp b/LiteLoader/include/llapi/mc/StructureFeatureRegistry.hpp index 07cb89abca..31299e5cd9 100644 --- a/LiteLoader/include/llapi/mc/StructureFeatureRegistry.hpp +++ b/LiteLoader/include/llapi/mc/StructureFeatureRegistry.hpp @@ -27,28 +27,28 @@ class StructureFeatureRegistry { public: /** - * @symbol ??0StructureFeatureRegistry\@\@QEAA\@XZ + * @symbol ??0StructureFeatureRegistry\@\@QEAA\@XZ */ MCAPI StructureFeatureRegistry(); /** - * @symbol ?findNearestStructureFeature\@StructureFeatureRegistry\@\@QEAA_NAEAVDimension\@\@AEAVIPreliminarySurfaceProvider\@\@W4StructureFeatureType\@\@AEBVBlockPos\@\@AEAV5\@AEBVBiomeSource\@\@_N\@Z + * @symbol ?findNearestStructureFeature\@StructureFeatureRegistry\@\@QEAA_NAEAVDimension\@\@AEAVIPreliminarySurfaceProvider\@\@W4StructureFeatureType\@\@AEBVBlockPos\@\@AEAV5\@AEBVBiomeSource\@\@_N\@Z */ MCAPI bool findNearestStructureFeature(class Dimension &, class IPreliminarySurfaceProvider &, enum class StructureFeatureType, class BlockPos const &, class BlockPos &, class BiomeSource const &, bool); /** - * @symbol ?findStructureFeatureTypeAt\@StructureFeatureRegistry\@\@QEAA?AW4StructureFeatureType\@\@AEBVBlockPos\@\@\@Z + * @symbol ?findStructureFeatureTypeAt\@StructureFeatureRegistry\@\@QEAA?AW4StructureFeatureType\@\@AEBVBlockPos\@\@\@Z */ MCAPI enum class StructureFeatureType findStructureFeatureTypeAt(class BlockPos const &); /** - * @symbol ?getStructureFeatureOfType\@StructureFeatureRegistry\@\@QEBAPEAVStructureFeature\@\@W4StructureFeatureType\@\@\@Z + * @symbol ?getStructureFeatureOfType\@StructureFeatureRegistry\@\@QEBAPEAVStructureFeature\@\@W4StructureFeatureType\@\@\@Z */ MCAPI class StructureFeature * getStructureFeatureOfType(enum class StructureFeatureType) const; /** - * @symbol ?isStructureFeatureTypeAt\@StructureFeatureRegistry\@\@QEBA_NAEBVBlockPos\@\@W4StructureFeatureType\@\@\@Z + * @symbol ?isStructureFeatureTypeAt\@StructureFeatureRegistry\@\@QEBA_NAEBVBlockPos\@\@W4StructureFeatureType\@\@\@Z */ MCAPI bool isStructureFeatureTypeAt(class BlockPos const &, enum class StructureFeatureType) const; /** - * @symbol ??1StructureFeatureRegistry\@\@QEAA\@XZ + * @symbol ??1StructureFeatureRegistry\@\@QEAA\@XZ */ MCAPI ~StructureFeatureRegistry(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureFeatureTypeNames.hpp b/LiteLoader/include/llapi/mc/StructureFeatureTypeNames.hpp index c351259626..ceda8be336 100644 --- a/LiteLoader/include/llapi/mc/StructureFeatureTypeNames.hpp +++ b/LiteLoader/include/llapi/mc/StructureFeatureTypeNames.hpp @@ -20,15 +20,15 @@ namespace StructureFeatureTypeNames { #undef AFTER_EXTRA /** - * @symbol ?getFeatureName\@StructureFeatureTypeNames\@\@YA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4StructureFeatureType\@\@\@Z + * @symbol ?getFeatureName\@StructureFeatureTypeNames\@\@YA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@W4StructureFeatureType\@\@\@Z */ MCAPI class std::basic_string_view> getFeatureName(enum class StructureFeatureType); /** - * @symbol ?getFeatureType\@StructureFeatureTypeNames\@\@YA?AW4StructureFeatureType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getFeatureType\@StructureFeatureTypeNames\@\@YA?AW4StructureFeatureType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class StructureFeatureType getFeatureType(std::string const &); /** - * @symbol ?getFeatureTypeAliasesMap\@StructureFeatureTypeNames\@\@YAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4StructureFeatureType\@\@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\@\@W4StructureFeatureType\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getFeatureTypeAliasesMap\@StructureFeatureTypeNames\@\@YAAEBV?$map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4StructureFeatureType\@\@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\@\@W4StructureFeatureType\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::map, class std::allocator>> const & getFeatureTypeAliasesMap(); diff --git a/LiteLoader/include/llapi/mc/StructureHelpers.hpp b/LiteLoader/include/llapi/mc/StructureHelpers.hpp index e6e97b4222..346dc351d0 100644 --- a/LiteLoader/include/llapi/mc/StructureHelpers.hpp +++ b/LiteLoader/include/llapi/mc/StructureHelpers.hpp @@ -30,44 +30,44 @@ class StructureHelpers { public: /** - * @symbol ?createChest\@StructureHelpers\@\@SA_NAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@HHHEAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createChest\@StructureHelpers\@\@SA_NAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@HHHEAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool createChest(class StructurePiece &, class BlockSource &, class BoundingBox const &, class Random &, int, int, int, unsigned char, std::string const &); /** - * @symbol ?createDispenser\@StructureHelpers\@\@SA_NAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@HHHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createDispenser\@StructureHelpers\@\@SA_NAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@HHHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool createDispenser(class StructurePiece &, class BlockSource &, class BoundingBox const &, class Random &, int, int, int, int, std::string const &); /** - * @symbol ?createMinecartChest\@StructureHelpers\@\@SA_NAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@HHHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createMinecartChest\@StructureHelpers\@\@SA_NAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@HHHHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static bool createMinecartChest(class StructurePiece &, class BlockSource &, class BoundingBox const &, class Random &, int, int, int, int, std::string const &); /** - * @symbol ?fillColumnDown\@StructureHelpers\@\@SAXAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBlock\@\@HHHAEBVBoundingBox\@\@\@Z + * @symbol ?fillColumnDown\@StructureHelpers\@\@SAXAEAVStructurePiece\@\@AEAVBlockSource\@\@AEBVBlock\@\@HHHAEBVBoundingBox\@\@\@Z */ MCAPI static void fillColumnDown(class StructurePiece &, class BlockSource &, class Block const &, int, int, int, class BoundingBox const &); /** - * @symbol ?getDirectionRotation\@StructureHelpers\@\@SAHHG\@Z + * @symbol ?getDirectionRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getDirectionRotation(int, unsigned short); /** - * @symbol ?getDoorRotation\@StructureHelpers\@\@SAHHG\@Z + * @symbol ?getDoorRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getDoorRotation(int, unsigned short); /** - * @symbol ?getFacingDirectionRotation\@StructureHelpers\@\@SAHHG\@Z + * @symbol ?getFacingDirectionRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getFacingDirectionRotation(int, unsigned short); /** - * @symbol ?getRailRotation\@StructureHelpers\@\@SAHHG\@Z + * @symbol ?getRailRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getRailRotation(int, unsigned short); /** - * @symbol ?getTorchRotation\@StructureHelpers\@\@SAHHG\@Z + * @symbol ?getTorchRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getTorchRotation(int, unsigned short); /** - * @symbol ?getWeirdoDirectionRotation\@StructureHelpers\@\@SAHHG\@Z + * @symbol ?getWeirdoDirectionRotation\@StructureHelpers\@\@SAHHG\@Z */ MCAPI static int getWeirdoDirectionRotation(int, unsigned short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp b/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp index 5100d4c13f..a1542d49b1 100644 --- a/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp +++ b/LiteLoader/include/llapi/mc/StructureIntegrityProcessor.hpp @@ -30,12 +30,12 @@ class StructureIntegrityProcessor { public: /** - * @symbol ??0StructureIntegrityProcessor\@\@QEAA\@MI\@Z + * @symbol ??0StructureIntegrityProcessor\@\@QEAA\@MI\@Z */ MCAPI StructureIntegrityProcessor(float, unsigned int); /** - * @symbol ?generateFlagsForIndices\@StructureIntegrityProcessor\@\@QEBA?AV?$vector\@_NV?$allocator\@_N\@std\@\@\@std\@\@HH\@Z + * @symbol ?generateFlagsForIndices\@StructureIntegrityProcessor\@\@QEBA?AV?$vector\@_NV?$allocator\@_N\@std\@\@\@std\@\@HH\@Z */ MCAPI std::vector generateFlagsForIndices(int, int) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureManager.hpp b/LiteLoader/include/llapi/mc/StructureManager.hpp index bb2fa15d15..0395b5c6e2 100644 --- a/LiteLoader/include/llapi/mc/StructureManager.hpp +++ b/LiteLoader/include/llapi/mc/StructureManager.hpp @@ -5,6 +5,7 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" +#include "Bedrock.hpp" #include "Core.hpp" #define BEFORE_EXTRA @@ -31,124 +32,132 @@ class StructureManager { public: /** - * @symbol ??0StructureManager\@\@QEAA\@AEAVResourcePackManager\@\@\@Z + * @symbol ??0StructureManager\@\@QEAA\@AEAVResourcePackManager\@\@\@Z */ MCAPI StructureManager(class ResourcePackManager &); /** - * @symbol ?clearAndShutdownStructurePlacement\@StructureManager\@\@QEAAXXZ + * @symbol ?clearAndShutdownStructurePlacement\@StructureManager\@\@QEAAXXZ */ MCAPI void clearAndShutdownStructurePlacement(); /** - * @symbol ?createStructureDataExportPacket\@StructureManager\@\@QEAA?AVStructureTemplateDataResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVResourcePackManager\@\@PEAVLevelStorage\@\@W4StructureTemplateResponseType\@\@\@Z + * @symbol ?createStructureDataExportPacket\@StructureManager\@\@QEAA?AVStructureTemplateDataResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVResourcePackManager\@\@PEAVLevelStorage\@\@W4StructureTemplateResponseType\@\@\@Z */ MCAPI class StructureTemplateDataResponsePacket createStructureDataExportPacket(std::string const &, class ResourcePackManager const *, class LevelStorage *, enum class StructureTemplateResponseType); /** - * @symbol ?createStructureDataImportPacket\@StructureManager\@\@QEAA?AVStructureTemplateDataResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4StructureTemplateResponseType\@\@\@Z + * @symbol ?createStructureDataImportPacket\@StructureManager\@\@QEAA?AVStructureTemplateDataResponsePacket\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4StructureTemplateResponseType\@\@\@Z */ MCAPI class StructureTemplateDataResponsePacket createStructureDataImportPacket(std::string const &, enum class StructureTemplateResponseType); /** - * @symbol ?deleteStructure\@StructureManager\@\@QEAA?AW4StructureDeleteResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?deleteStructure\@StructureManager\@\@QEAA?AW4StructureDeleteResult\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVLevelStorage\@\@\@Z */ MCAPI enum class StructureDeleteResult deleteStructure(std::string const &, class LevelStorage &); /** - * @symbol ?getOrCreate\@StructureManager\@\@QEAAAEAVStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getOrCreate\@StructureManager\@\@QEAAAEAVStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructureTemplate & getOrCreate(std::string const &); /** - * @symbol ?getOrCreateLegacy\@StructureManager\@\@QEAAAEAVLegacyStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getOrCreateLegacy\@StructureManager\@\@QEAAAEAVLegacyStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class LegacyStructureTemplate & getOrCreateLegacy(std::string const &); /** - * @symbol ?getStructure\@StructureManager\@\@QEBAPEAVStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getStructure\@StructureManager\@\@QEBAPEAVStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructureTemplate * getStructure(std::string const &) const; /** - * @symbol ?importStructureFromTemplate\@StructureManager\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVStructureTemplate\@\@\@Z + * @symbol ?importStructureFromTemplate\@StructureManager\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVStructureTemplate\@\@\@Z */ MCAPI void importStructureFromTemplate(std::string, class StructureTemplate const &); /** - * @symbol ?load\@StructureManager\@\@QEAA_NAEAVStructureTemplate\@\@PEBVResourcePackManager\@\@PEAVLevelStorage\@\@\@Z + * @symbol ?load\@StructureManager\@\@QEAA_NAEAVStructureTemplate\@\@PEBVResourcePackManager\@\@PEAVLevelStorage\@\@\@Z */ MCAPI bool load(class StructureTemplate &, class ResourcePackManager const *, class LevelStorage *); /** - * @symbol ?loadPlacementQueue\@StructureManager\@\@QEAAXAEAVLevelStorage\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?loadPlacementQueue\@StructureManager\@\@QEAAXAEAVLevelStorage\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void loadPlacementQueue(class LevelStorage &, class Level &, class Dimension &); /** - * @symbol ?loadPlacementQueueItem\@StructureManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?loadPlacementQueueItem\@StructureManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void loadPlacementQueueItem(std::string const &, class CompoundTag const &, class Level &, class Dimension &); /** - * @symbol ?queueLoad\@StructureManager\@\@QEAAXV?$unique_ptr\@VStructureAnimationData\@\@U?$default_delete\@VStructureAnimationData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?queueLoad\@StructureManager\@\@QEAAXV?$unique_ptr\@VStructureAnimationData\@\@U?$default_delete\@VStructureAnimationData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void queueLoad(std::unique_ptr); /** - * @symbol ?readStructure\@StructureManager\@\@QEAA_NAEAVStructureTemplate\@\@\@Z + * @symbol ?readStructure\@StructureManager\@\@QEAA_NAEAVStructureTemplate\@\@\@Z */ MCAPI bool readStructure(class StructureTemplate &); /** - * @symbol ?saveToLevel\@StructureManager\@\@QEAAXAEBVStructureTemplate\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?reset\@StructureManager\@\@QEAAXXZ + */ + MCAPI void reset(); + /** + * @symbol ?saveToLevel\@StructureManager\@\@QEAAXAEBVStructureTemplate\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void saveToLevel(class StructureTemplate const &, class LevelStorage &); /** - * @symbol ?tick\@StructureManager\@\@QEAAXAEBVDimension\@\@\@Z + * @symbol ?setUnknownBlockRegistry\@StructureManager\@\@QEAAXV?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@\@Z + */ + MCAPI void setUnknownBlockRegistry(class Bedrock::NonOwnerPointer); + /** + * @symbol ?tick\@StructureManager\@\@QEAAXAEBVDimension\@\@\@Z */ MCAPI void tick(class Dimension const &); /** - * @symbol ?tryPlaceStructureInWorld\@StructureManager\@\@QEAA?AW4QueueRequestResult\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEAVServerLevel\@\@AEAVDimension\@\@AEBVBoundingBox\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@AEBVStructureTemplate\@\@V?$unique_ptr\@VStructureAnimationData\@\@U?$default_delete\@VStructureAnimationData\@\@\@std\@\@\@4\@\@Z + * @symbol ?tryPlaceStructureInWorld\@StructureManager\@\@QEAA?AW4QueueRequestResult\@\@V?$unique_ptr\@VCommandArea\@\@U?$default_delete\@VCommandArea\@\@\@std\@\@\@std\@\@AEAVServerLevel\@\@AEAVDimension\@\@AEBVBoundingBox\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@AEBVStructureTemplate\@\@V?$unique_ptr\@VStructureAnimationData\@\@U?$default_delete\@VStructureAnimationData\@\@\@std\@\@\@4\@\@Z */ MCAPI enum class QueueRequestResult tryPlaceStructureInWorld(std::unique_ptr, class ServerLevel &, class Dimension &, class BoundingBox const &, class BlockPos const &, class StructureSettings const &, class StructureTemplate const &, std::unique_ptr); /** - * @symbol ?getStructurePath\@StructureManager\@\@SA?AV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?getStructurePath\@StructureManager\@\@SA?AV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI static class Core::PathBuffer> getStructurePath(std::string const &, std::string const &); /** - * @symbol ?getStructurePath\@StructureManager\@\@SA?AV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getStructurePath\@StructureManager\@\@SA?AV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Core::PathBuffer> getStructurePath(std::string const &); //private: /** - * @symbol ?_createLevelStorageId\@StructureManager\@\@AEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + * @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 + * @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 + * @symbol ?_findResource\@StructureManager\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$PathBuffer\@V?$StackString\@D$0EAA\@\@Core\@\@\@Core\@\@1AEBVPackInstance\@\@AEAV23\@\@Z */ MCAPI bool _findResource(std::string const &, class Core::PathBuffer> const &, class Core::PathBuffer> const &, class PackInstance const &, std::string &); /** - * @symbol ?_placeSegment\@StructureManager\@\@AEAA_NAEAVDimension\@\@AEAVStructureAnimationData\@\@AEAVChunkLoadActionList\@\@AEBVBoundingBox\@\@AEBV?$function\@$$A6A?AW4ChunksLoadedStatus\@\@UTick\@\@\@Z\@std\@\@\@Z + * @symbol ?_placeSegment\@StructureManager\@\@AEAA_NAEAVStructureAnimationData\@\@\@Z */ - MCAPI bool _placeSegment(class Dimension &, class StructureAnimationData &, class ChunkLoadActionList &, class BoundingBox const &, class std::function const &); + MCAPI bool _placeSegment(class StructureAnimationData &); /** - * @symbol ?_placeSegment\@StructureManager\@\@AEAA_NAEAVStructureAnimationData\@\@\@Z + * @symbol ?_placeSegment\@StructureManager\@\@AEAA_NAEAVDimension\@\@AEAVStructureAnimationData\@\@AEAVChunkLoadActionList\@\@AEBVBoundingBox\@\@AEBV?$function\@$$A6A?AW4ChunksLoadedStatus\@\@UTick\@\@\@Z\@std\@\@\@Z */ - MCAPI bool _placeSegment(class StructureAnimationData &); + MCAPI bool _placeSegment(class Dimension &, class StructureAnimationData &, class ChunkLoadActionList &, class BoundingBox const &, class std::function const &); /** - * @symbol ?_readLegacyStructure\@StructureManager\@\@AEAAPEAVLegacyStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_readLegacyStructure\@StructureManager\@\@AEAAPEAVLegacyStructureTemplate\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class LegacyStructureTemplate * _readLegacyStructure(std::string const &); /** - * @symbol ?_removePlacementQueueItem\@StructureManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVStructureAnimationData\@\@\@Z + * @symbol ?_removePlacementQueueItem\@StructureManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVStructureAnimationData\@\@\@Z */ MCAPI void _removePlacementQueueItem(std::string const &, class StructureAnimationData &); /** - * @symbol ?_savePlacementQueueItem\@StructureManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVStructureAnimationData\@\@\@Z + * @symbol ?_savePlacementQueueItem\@StructureManager\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVStructureAnimationData\@\@\@Z */ MCAPI void _savePlacementQueueItem(std::string const &, class StructureAnimationData &); private: /** - * @symbol ?BEHAVIOR_PACK_STRUCTURES_FOLDER\@StructureManager\@\@0PEBDEB + * @symbol ?BEHAVIOR_PACK_STRUCTURES_FOLDER\@StructureManager\@\@0PEBDEB */ MCAPI static char const * BEHAVIOR_PACK_STRUCTURES_FOLDER; /** - * @symbol ?LEVEL_STORAGE_STRUCTURE_TEMPLATE_PREFIX\@StructureManager\@\@0PEBDEB + * @symbol ?LEVEL_STORAGE_STRUCTURE_TEMPLATE_PREFIX\@StructureManager\@\@0PEBDEB */ MCAPI static char const * LEVEL_STORAGE_STRUCTURE_TEMPLATE_PREFIX; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePiece.hpp b/LiteLoader/include/llapi/mc/StructurePiece.hpp index b6e5ba0108..89acf788d9 100644 --- a/LiteLoader/include/llapi/mc/StructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/StructurePiece.hpp @@ -30,133 +30,139 @@ class StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?moveBoundingBox\@StructurePiece\@\@UEAAXHHH\@Z + * @vftbl 1 + * @symbol ?moveBoundingBox\@StructurePiece\@\@UEAAXHHH\@Z */ virtual void moveBoundingBox(int, int, int); /** - * @vftbl 2 - * @symbol ?getType\@StructurePiece\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@StructurePiece\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 3 - * @symbol ?addChildren\@StructurePiece\@\@UEAAXAEAV1\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?addChildren\@StructurePiece\@\@UEAAXAEAV1\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ virtual void addChildren(class StructurePiece &, std::vector> &, class Random &); /** - * @vftbl 4 - * @symbol ?postProcess\@TemplateStructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SHLeftTurn\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &) = 0; /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@StructurePiece\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@StructurePiece\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 6 - * @symbol ?isInInvalidLocation\@StructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 6 + * @symbol ?isInInvalidLocation\@StructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEBVBoundingBox\@\@\@Z */ virtual bool isInInvalidLocation(class BlockSource &, class BoundingBox const &); /** - * @vftbl 7 - * @symbol ?getWorldX\@StructurePiece\@\@UEAAHHH\@Z + * @vftbl 7 + * @symbol ?getWorldX\@StructurePiece\@\@UEAAHHH\@Z */ virtual int getWorldX(int, int); /** - * @vftbl 8 - * @symbol ?getWorldZ\@StructurePiece\@\@UEAAHHH\@Z + * @vftbl 8 + * @symbol ?getWorldZ\@StructurePiece\@\@UEAAHHH\@Z */ virtual int getWorldZ(int, int); /** - * @vftbl 9 - * @symbol ?placeBlock\@StructurePiece\@\@UEAAXAEAVBlockSource\@\@AEBVBlock\@\@HHHAEBVBoundingBox\@\@\@Z + * @vftbl 9 + * @symbol ?placeBlock\@StructurePiece\@\@UEAAXAEAVBlockSource\@\@AEBVBlock\@\@HHHAEBVBoundingBox\@\@\@Z */ virtual void placeBlock(class BlockSource &, class Block const &, int, int, int, class BoundingBox const &); /** - * @vftbl 10 - * @symbol ?canBeReplaced\@StructurePiece\@\@UEAA_NAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z + * @vftbl 10 + * @symbol ?canBeReplaced\@StructurePiece\@\@UEAA_NAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z */ virtual bool canBeReplaced(class BlockSource &, int, int, int, class BoundingBox const &); /** - * @vftbl 11 - * @symbol ?generateBox\@StructurePiece\@\@UEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHHAEBVBlock\@\@2_N\@Z + * @vftbl 11 + * @symbol ?generateBox\@StructurePiece\@\@UEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHHAEBVBlock\@\@2_N\@Z */ virtual void generateBox(class BlockSource &, class BoundingBox const &, int, int, int, int, int, int, class Block const &, class Block const &, bool); /** - * @vftbl 12 - * @symbol ?addHardcodedSpawnAreas\@StructurePiece\@\@UEBAXAEAVLevelChunk\@\@\@Z + * @vftbl 12 + * @symbol ?addHardcodedSpawnAreas\@StructurePiece\@\@UEBAXAEAVLevelChunk\@\@\@Z */ virtual void addHardcodedSpawnAreas(class LevelChunk &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREPIECE /** - * @symbol ?_getWorldPos\@StructurePiece\@\@QEAA?AVBlockPos\@\@HHH\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructurePiece(); +#endif + /** + * @symbol ?_getWorldPos\@StructurePiece\@\@QEAA?AVBlockPos\@\@HHH\@Z */ MCAPI class BlockPos _getWorldPos(int, int, int); /** - * @symbol ?addTerrainAdjustmentToken\@StructurePiece\@\@QEAAXV?$shared_ptr\@_N\@std\@\@\@Z + * @symbol ?addTerrainAdjustmentToken\@StructurePiece\@\@QEAAXV?$shared_ptr\@_N\@std\@\@\@Z */ MCAPI void addTerrainAdjustmentToken(class std::shared_ptr); /** - * @symbol ?generateAirBox\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHH\@Z + * @symbol ?generateAirBox\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHH\@Z */ MCAPI void generateAirBox(class BlockSource &, class BoundingBox const &, int, int, int, int, int, int); /** - * @symbol ?generateBox\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHH_NAEAVRandom\@\@AEBVBlockSelector\@\@\@Z + * @symbol ?generateBox\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHH_NAEAVRandom\@\@AEBVBlockSelector\@\@\@Z */ MCAPI void generateBox(class BlockSource &, class BoundingBox const &, int, int, int, int, int, int, bool, class Random &, class BlockSelector const &); /** - * @symbol ?generateMaybeBox\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHHHHHAEBVBlock\@\@3_N4\@Z + * @symbol ?generateMaybeBox\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHHHHHAEBVBlock\@\@3_N4\@Z */ MCAPI void generateMaybeBox(class BlockSource &, class BoundingBox const &, class Random &, float, int, int, int, int, int, int, class Block const &, class Block const &, bool, bool); /** - * @symbol ?generateUpperHalfSphere\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHHAEBVBlock\@\@_N\@Z + * @symbol ?generateUpperHalfSphere\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@HHHHHHAEBVBlock\@\@_N\@Z */ MCAPI void generateUpperHalfSphere(class BlockSource &, class BoundingBox const &, int, int, int, int, int, int, class Block const &, bool); /** - * @symbol ?getBlock\@StructurePiece\@\@QEAAAEBVBlock\@\@AEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z + * @symbol ?getBlock\@StructurePiece\@\@QEAAAEBVBlock\@\@AEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z */ MCAPI class Block const & getBlock(class BlockSource &, int, int, int, class BoundingBox const &); /** - * @symbol ?getOrientationData\@StructurePiece\@\@QEAAGPEBVBlock\@\@G\@Z + * @symbol ?getOrientationData\@StructurePiece\@\@QEAAGPEBVBlock\@\@G\@Z */ MCAPI unsigned short getOrientationData(class Block const *, unsigned short); /** - * @symbol ?getWorldY\@StructurePiece\@\@QEAAHH\@Z + * @symbol ?getWorldY\@StructurePiece\@\@QEAAHH\@Z */ MCAPI int getWorldY(int); /** - * @symbol ?isAboveGround\@StructurePiece\@\@QEAA_NHHHAEAVBlockSource\@\@\@Z + * @symbol ?isAboveGround\@StructurePiece\@\@QEAA_NHHHAEAVBlockSource\@\@\@Z */ MCAPI bool isAboveGround(int, int, int, class BlockSource &); /** - * @symbol ?isAir\@StructurePiece\@\@QEAA_NAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z + * @symbol ?isAir\@StructurePiece\@\@QEAA_NAEAVBlockSource\@\@HHHAEBVBoundingBox\@\@\@Z */ MCAPI bool isAir(class BlockSource &, int, int, int, class BoundingBox const &); /** - * @symbol ?isReplaceableBlock\@StructurePiece\@\@QEAA_NAEBVBlock\@\@\@Z + * @symbol ?isReplaceableBlock\@StructurePiece\@\@QEAA_NAEBVBlock\@\@\@Z */ MCAPI bool isReplaceableBlock(class Block const &); /** - * @symbol ?maybeGenerateBlock\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHHAEBVBlock\@\@\@Z + * @symbol ?maybeGenerateBlock\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHHAEBVBlock\@\@\@Z */ MCAPI void maybeGenerateBlock(class BlockSource &, class BoundingBox const &, class Random &, float, int, int, int, class Block const &); /** - * @symbol ?maybeGenerateBlockIfNotFloating\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHHAEBVBlock\@\@\@Z + * @symbol ?maybeGenerateBlockIfNotFloating\@StructurePiece\@\@QEAAXAEAVBlockSource\@\@AEBVBoundingBox\@\@AEAVRandom\@\@MHHHAEBVBlock\@\@\@Z */ MCAPI void maybeGenerateBlockIfNotFloating(class BlockSource &, class BoundingBox const &, class Random &, float, int, int, int, class Block const &); /** - * @symbol ?findCollisionPiece\@StructurePiece\@\@SAPEAV1\@AEBV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?findCollisionPiece\@StructurePiece\@\@SAPEAV1\@AEBV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEBVBoundingBox\@\@\@Z */ MCAPI static class StructurePiece * findCollisionPiece(std::vector> const &, class BoundingBox const &); /** - * @symbol ?getTotalWeight\@StructurePiece\@\@SAHAEBV?$vector\@VPieceWeight\@\@V?$allocator\@VPieceWeight\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getTotalWeight\@StructurePiece\@\@SAHAEBV?$vector\@VPieceWeight\@\@V?$allocator\@VPieceWeight\@\@\@std\@\@\@std\@\@\@Z */ MCAPI static int getTotalWeight(std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp b/LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp index fc5fb56f5c..98e8e325c2 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolActorPredicateActorMatch.hpp @@ -30,18 +30,18 @@ class StructurePoolActorPredicateActorMatch { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolActorPredicateActorMatch(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolActorPredicateActorMatch\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolActorPredicateActorMatch\@\@UEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool test(std::string const &) const; /** - * @symbol ??0StructurePoolActorPredicateActorMatch\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0StructurePoolActorPredicateActorMatch\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI StructurePoolActorPredicateActorMatch(std::string); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp index 1df45411cc..3535993014 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolActorRule.hpp @@ -28,12 +28,12 @@ class StructurePoolActorRule { public: /** - * @symbol ??0StructurePoolActorRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolActorPredicate\@\@U?$default_delete\@VIStructurePoolActorPredicate\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z + * @symbol ??0StructurePoolActorRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolActorPredicate\@\@U?$default_delete\@VIStructurePoolActorPredicate\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ MCAPI StructurePoolActorRule(std::unique_ptr &&, std::string); /** - * @symbol ?processRule\@StructurePoolActorRule\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z + * @symbol ?processRule\@StructurePoolActorRule\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ MCAPI bool processRule(std::string const &, std::string &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp index 005bb44bf9..29ea44ecd4 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrue.hpp @@ -30,17 +30,17 @@ class StructurePoolBlockPredicateAlwaysTrue { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREPOOLBLOCKPREDICATEALWAYSTRUE /** - * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrue\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrue\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ MCVAPI bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; /** - * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrue\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrue\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z */ MCVAPI bool test(class Block const &, class Randomize &) const; #endif /** - * @symbol ??0StructurePoolBlockPredicateAlwaysTrue\@\@QEAA\@XZ + * @symbol ??0StructurePoolBlockPredicateAlwaysTrue\@\@QEAA\@XZ */ MCAPI StructurePoolBlockPredicateAlwaysTrue(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrueExcept.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrueExcept.hpp index 659ce79886..5927b4175b 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrueExcept.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAlwaysTrueExcept.hpp @@ -28,23 +28,23 @@ class StructurePoolBlockPredicateAlwaysTrueExcept { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolBlockPredicateAlwaysTrueExcept(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrueExcept\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrueExcept\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z */ virtual bool test(class Block const &, class Randomize &) const; /** - * @vftbl 2 - * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrueExcept\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + * @vftbl 2 + * @symbol ?test\@StructurePoolBlockPredicateAlwaysTrueExcept\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; /** - * @symbol ??0StructurePoolBlockPredicateAlwaysTrueExcept\@\@QEAA\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@M\@Z + * @symbol ??0StructurePoolBlockPredicateAlwaysTrueExcept\@\@QEAA\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@M\@Z */ MCAPI StructurePoolBlockPredicateAlwaysTrueExcept(class std::set, class std::allocator> const &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp index ae7fc0d789..d800280afc 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateAxisAlignedPosition.hpp @@ -30,23 +30,23 @@ class StructurePoolBlockPredicateAxisAlignedPosition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolBlockPredicateAxisAlignedPosition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolBlockPredicateAxisAlignedPosition\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockPredicateAxisAlignedPosition\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z */ virtual bool test(class Block const &, class Randomize &) const; /** - * @vftbl 2 - * @symbol ?test\@StructurePoolBlockPredicateAxisAlignedPosition\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + * @vftbl 2 + * @symbol ?test\@StructurePoolBlockPredicateAxisAlignedPosition\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; /** - * @symbol ??0StructurePoolBlockPredicateAxisAlignedPosition\@\@QEAA\@MMHHE\@Z + * @symbol ??0StructurePoolBlockPredicateAxisAlignedPosition\@\@QEAA\@MMHHE\@Z */ MCAPI StructurePoolBlockPredicateAxisAlignedPosition(float, float, int, int, unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp index 12b9c04eb7..29b8345c9c 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatch.hpp @@ -30,23 +30,23 @@ class StructurePoolBlockPredicateBlockMatch { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolBlockPredicateBlockMatch(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolBlockPredicateBlockMatch\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockPredicateBlockMatch\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z */ virtual bool test(class Block const &, class Randomize &) const; /** - * @vftbl 2 - * @symbol ?test\@StructurePoolBlockPredicateBlockMatch\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + * @vftbl 2 + * @symbol ?test\@StructurePoolBlockPredicateBlockMatch\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; /** - * @symbol ??0StructurePoolBlockPredicateBlockMatch\@\@QEAA\@AEBVBlock\@\@\@Z + * @symbol ??0StructurePoolBlockPredicateBlockMatch\@\@QEAA\@AEBVBlock\@\@\@Z */ MCAPI StructurePoolBlockPredicateBlockMatch(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp index 899d39b970..9e81dd27cc 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateBlockMatchRandom.hpp @@ -30,23 +30,23 @@ class StructurePoolBlockPredicateBlockMatchRandom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolBlockPredicateBlockMatchRandom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolBlockPredicateBlockMatchRandom\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockPredicateBlockMatchRandom\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z */ virtual bool test(class Block const &, class Randomize &) const; /** - * @vftbl 2 - * @symbol ?test\@StructurePoolBlockPredicateBlockMatchRandom\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + * @vftbl 2 + * @symbol ?test\@StructurePoolBlockPredicateBlockMatchRandom\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; /** - * @symbol ??0StructurePoolBlockPredicateBlockMatchRandom\@\@QEAA\@AEBVBlock\@\@M\@Z + * @symbol ??0StructurePoolBlockPredicateBlockMatchRandom\@\@QEAA\@AEBVBlock\@\@M\@Z */ MCAPI StructurePoolBlockPredicateBlockMatchRandom(class Block const &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateTrueIfFound.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateTrueIfFound.hpp index 4fe97c827c..ff4d77b245 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateTrueIfFound.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockPredicateTrueIfFound.hpp @@ -28,23 +28,23 @@ class StructurePoolBlockPredicateTrueIfFound { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolBlockPredicateTrueIfFound(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolBlockPredicateTrueIfFound\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockPredicateTrueIfFound\@\@UEBA_NAEBVBlock\@\@AEAVRandomize\@\@\@Z */ virtual bool test(class Block const &, class Randomize &) const; /** - * @vftbl 2 - * @symbol ?test\@StructurePoolBlockPredicateTrueIfFound\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z + * @vftbl 2 + * @symbol ?test\@StructurePoolBlockPredicateTrueIfFound\@\@UEBA_NAEBVBlockPos\@\@0AEAVRandomize\@\@\@Z */ virtual bool test(class BlockPos const &, class BlockPos const &, class Randomize &) const; /** - * @symbol ??0StructurePoolBlockPredicateTrueIfFound\@\@QEAA\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@M\@Z + * @symbol ??0StructurePoolBlockPredicateTrueIfFound\@\@QEAA\@AEBV?$set\@PEBVBlock\@\@U?$less\@PEBVBlock\@\@\@std\@\@V?$allocator\@PEBVBlock\@\@\@3\@\@std\@\@M\@Z */ MCAPI StructurePoolBlockPredicateTrueIfFound(class std::set, class std::allocator> const &, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp index 16a949c865..0e0b995c8b 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockRule.hpp @@ -30,16 +30,16 @@ class StructurePoolBlockRule { public: /** - * @symbol ??0StructurePoolBlockRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockPredicate\@\@U?$default_delete\@VIStructurePoolBlockPredicate\@\@\@std\@\@\@std\@\@0PEBVBlock\@\@\@Z + * @symbol ??0StructurePoolBlockRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockPredicate\@\@U?$default_delete\@VIStructurePoolBlockPredicate\@\@\@std\@\@\@std\@\@0PEBVBlock\@\@\@Z */ MCAPI StructurePoolBlockRule(std::unique_ptr &&, std::unique_ptr &&, class Block const *); /** - * @symbol ??0StructurePoolBlockRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockPredicate\@\@U?$default_delete\@VIStructurePoolBlockPredicate\@\@\@std\@\@\@std\@\@00PEBVBlock\@\@\@Z + * @symbol ??0StructurePoolBlockRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockPredicate\@\@U?$default_delete\@VIStructurePoolBlockPredicate\@\@\@std\@\@\@std\@\@00PEBVBlock\@\@\@Z */ MCAPI StructurePoolBlockRule(std::unique_ptr &&, std::unique_ptr &&, std::unique_ptr &&, class Block const *); /** - * @symbol ?processRule\@StructurePoolBlockRule\@\@QEBA_NAEBVBlock\@\@0AEAVRandom\@\@AEAPEBV2\@AEBVBlockPos\@\@3\@Z + * @symbol ?processRule\@StructurePoolBlockRule\@\@QEBA_NAEBVBlock\@\@0AEAVRandom\@\@AEAPEBV2\@AEBVBlockPos\@\@3\@Z */ MCAPI bool processRule(class Block const &, class Block const &, class Random &, class Block const *&, class BlockPos const &, class BlockPos const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp index d6f1f59485..47d15717ad 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockTagPredicateBlockTagStringMatches.hpp @@ -30,18 +30,18 @@ class StructurePoolBlockTagPredicateBlockTagStringMatches { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructurePoolBlockTagPredicateBlockTagStringMatches(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?test\@StructurePoolBlockTagPredicateBlockTagStringMatches\@\@UEBA_NAEBVBlock\@\@AEBVCompoundTag\@\@\@Z + * @vftbl 1 + * @symbol ?test\@StructurePoolBlockTagPredicateBlockTagStringMatches\@\@UEBA_NAEBVBlock\@\@AEBVCompoundTag\@\@\@Z */ virtual bool test(class Block const &, class CompoundTag const &) const; /** - * @symbol ??0StructurePoolBlockTagPredicateBlockTagStringMatches\@\@QEAA\@AEBVBlock\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @symbol ??0StructurePoolBlockTagPredicateBlockTagStringMatches\@\@QEAA\@AEBVBlock\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z */ MCAPI StructurePoolBlockTagPredicateBlockTagStringMatches(class Block const &, std::string, std::string); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp b/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp index c6f1125f40..02027a1988 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolBlockTagRule.hpp @@ -28,12 +28,12 @@ class StructurePoolBlockTagRule { public: /** - * @symbol ??0StructurePoolBlockTagRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockTagPredicate\@\@U?$default_delete\@VIStructurePoolBlockTagPredicate\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1\@Z + * @symbol ??0StructurePoolBlockTagRule\@\@QEAA\@$$QEAV?$unique_ptr\@VIStructurePoolBlockTagPredicate\@\@U?$default_delete\@VIStructurePoolBlockTagPredicate\@\@\@std\@\@\@std\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@1\@Z */ MCAPI StructurePoolBlockTagRule(std::unique_ptr &&, std::string, std::string); /** - * @symbol ?processRule\@StructurePoolBlockTagRule\@\@QEBA_NAEBVBlock\@\@AEAVCompoundTag\@\@\@Z + * @symbol ?processRule\@StructurePoolBlockTagRule\@\@QEBA_NAEBVBlock\@\@AEAVCompoundTag\@\@\@Z */ MCAPI bool processRule(class Block const &, class CompoundTag &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructurePoolElement.hpp b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp index 72b89ac8f1..992d0dac5a 100644 --- a/LiteLoader/include/llapi/mc/StructurePoolElement.hpp +++ b/LiteLoader/include/llapi/mc/StructurePoolElement.hpp @@ -38,84 +38,90 @@ class LazyTemplate { public: /** - * @vftbl 0 - * @symbol ?getSize\@StructurePoolElement\@\@UEBA?AVBlockPos\@\@W4Rotation\@\@\@Z + * @vftbl 0 + * @symbol ?getSize\@StructurePoolElement\@\@UEBA?AVBlockPos\@\@W4Rotation\@\@\@Z */ virtual class BlockPos getSize(enum class Rotation) const; /** - * @vftbl 1 - * @symbol ?getJigsawMarkers\@StructurePoolElement\@\@UEBA?AV?$vector\@VJigsawBlockInfo\@\@V?$allocator\@VJigsawBlockInfo\@\@\@std\@\@\@std\@\@VBlockPos\@\@W4Rotation\@\@\@Z + * @vftbl 1 + * @symbol ?getJigsawMarkers\@StructurePoolElement\@\@UEBA?AV?$vector\@VJigsawBlockInfo\@\@V?$allocator\@VJigsawBlockInfo\@\@\@std\@\@\@std\@\@VBlockPos\@\@W4Rotation\@\@\@Z */ virtual std::vector getJigsawMarkers(class BlockPos, enum class Rotation) const; /** - * @vftbl 2 - * @symbol ?getJigsawMarkers\@StructurePoolElement\@\@UEBA?AV?$vector\@VJigsawBlockInfo\@\@V?$allocator\@VJigsawBlockInfo\@\@\@std\@\@\@std\@\@VBlockPos\@\@AEAVLegacyStructureSettings\@\@PEAVBlockSource\@\@\@Z + * @vftbl 2 + * @symbol ?getJigsawMarkers\@StructurePoolElement\@\@UEBA?AV?$vector\@VJigsawBlockInfo\@\@V?$allocator\@VJigsawBlockInfo\@\@\@std\@\@\@std\@\@VBlockPos\@\@AEAVLegacyStructureSettings\@\@PEAVBlockSource\@\@\@Z */ virtual std::vector getJigsawMarkers(class BlockPos, class LegacyStructureSettings &, class BlockSource *) const; /** - * @vftbl 3 - * @symbol ?getBoundingBox\@StructurePoolElement\@\@UEBA?AVBoundingBox\@\@VBlockPos\@\@W4Rotation\@\@\@Z + * @vftbl 3 + * @symbol ?getBoundingBox\@StructurePoolElement\@\@UEBA?AVBoundingBox\@\@VBlockPos\@\@W4Rotation\@\@\@Z */ virtual class BoundingBox getBoundingBox(class BlockPos, enum class Rotation) const; /** - * @vftbl 4 - * @symbol ?setProjection\@StructurePoolElement\@\@UEAAXW4Projection\@\@\@Z + * @vftbl 4 + * @symbol ?setProjection\@StructurePoolElement\@\@UEAAXW4Projection\@\@\@Z */ virtual void setProjection(enum class Projection); /** - * @vftbl 5 - * @symbol ?getProjection\@StructurePoolElement\@\@UEBA?AW4Projection\@\@XZ + * @vftbl 5 + * @symbol ?getProjection\@StructurePoolElement\@\@UEBA?AW4Projection\@\@XZ */ virtual enum class Projection getProjection() const; /** - * @vftbl 6 - * @symbol ?getPostProcessSettings\@StructurePoolElement\@\@UEBA?AW4PostProcessSettings\@\@XZ + * @vftbl 6 + * @symbol ?getPostProcessSettings\@StructurePoolElement\@\@UEBA?AW4PostProcessSettings\@\@XZ */ virtual enum class PostProcessSettings getPostProcessSettings() const; /** - * @vftbl 7 - * @symbol ?place\@StructurePoolElement\@\@UEBA_NAEAVBlockSource\@\@VBlockPos\@\@W4Rotation\@\@VBoundingBox\@\@AEAVRandom\@\@AEAV?$unordered_map\@VBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@1\@Z + * @vftbl 7 + * @symbol ?place\@StructurePoolElement\@\@UEBA_NAEAVBlockSource\@\@VBlockPos\@\@W4Rotation\@\@VBoundingBox\@\@AEAVRandom\@\@AEAV?$unordered_map\@VBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@1\@Z */ virtual bool place(class BlockSource &, class BlockPos, enum class Rotation, class BoundingBox, class Random &, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &, class BlockPos) const; /** - * @vftbl 8 - * @symbol ?placeActors\@StructurePoolElement\@\@UEBAXAEAVBlockSource\@\@VBlockPos\@\@W4Rotation\@\@AEAVRandom\@\@\@Z + * @vftbl 8 + * @symbol ?placeActors\@StructurePoolElement\@\@UEBAXAEAVBlockSource\@\@VBlockPos\@\@W4Rotation\@\@AEAVRandom\@\@\@Z */ virtual void placeActors(class BlockSource &, class BlockPos, enum class Rotation, class Random &) const; /** - * @vftbl 9 - * @symbol ?handleJigsawBlock\@StructurePoolElement\@\@UEBAXAEAVBlockSource\@\@AEAVJigsawBlockInfo\@\@AEAVLegacyStructureSettings\@\@\@Z + * @vftbl 9 + * @symbol ?handleJigsawBlock\@StructurePoolElement\@\@UEBAXAEAVBlockSource\@\@AEAVJigsawBlockInfo\@\@AEAVLegacyStructureSettings\@\@\@Z */ virtual void handleJigsawBlock(class BlockSource &, class JigsawBlockInfo &, class LegacyStructureSettings &) const; /** - * @vftbl 10 - * @symbol ?handleDataMarker\@StructurePoolElement\@\@UEBAXAEAVBlockSource\@\@VBlockPos\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$unordered_map\@VBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@\@std\@\@\@3\@\@5\@\@Z + * @vftbl 10 + * @symbol ?handleDataMarker\@StructurePoolElement\@\@UEBAXAEAVBlockSource\@\@VBlockPos\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$unordered_map\@VBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@U?$hash\@VBlockPos\@\@\@3\@U?$equal_to\@VBlockPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVBlockPos\@\@V?$optional\@UActorDefinitionIdentifier\@\@\@std\@\@\@std\@\@\@3\@\@5\@\@Z */ virtual void handleDataMarker(class BlockSource &, class BlockPos, std::string, class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> &) const; /** - * @vftbl 11 - * @symbol ?isValid\@StructurePoolElement\@\@UEBA_NXZ + * @vftbl 11 + * @symbol ?isValid\@StructurePoolElement\@\@UEBA_NXZ */ virtual bool isValid() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREPOOLELEMENT /** - * @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 + * @symbol __unk_destructor_-1 + */ + 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\@\@W4Projection\@\@W4PostProcessSettings\@\@\@Z */ MCAPI StructurePoolElement(class gsl::not_null>, std::string 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\@\@UStructurePoolElementSettings\@\@\@Z + * @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 + * @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); //private: /** - * @symbol ?_getTemplate\@StructurePoolElement\@\@AEBAAEBVLazyTemplate\@1\@XZ + * @symbol ?_getTemplate\@StructurePoolElement\@\@AEBAAEBVLazyTemplate\@1\@XZ */ MCAPI class StructurePoolElement::LazyTemplate const & _getTemplate() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureSettings.hpp b/LiteLoader/include/llapi/mc/StructureSettings.hpp index 2a078c056c..230d61e2d0 100644 --- a/LiteLoader/include/llapi/mc/StructureSettings.hpp +++ b/LiteLoader/include/llapi/mc/StructureSettings.hpp @@ -39,180 +39,180 @@ inline StructureSettings(BlockPos const& size, bool ignoreEntities, bool ignoreB public: /** - * @symbol ??0StructureSettings\@\@QEAA\@XZ + * @symbol ??0StructureSettings\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI StructureSettings(); + MCAPI StructureSettings(class StructureSettings &&); /** - * @symbol ??0StructureSettings\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0StructureSettings\@\@QEAA\@XZ */ - MCAPI StructureSettings(class StructureSettings &&); + MCAPI StructureSettings(); /** - * @symbol ?getAnimationMode\@StructureSettings\@\@QEBA?AW4AnimationMode\@\@XZ + * @symbol ?getAnimationMode\@StructureSettings\@\@QEBA?AW4AnimationMode\@\@XZ */ MCAPI enum class AnimationMode getAnimationMode() const; /** - * @symbol ?getAnimationSeconds\@StructureSettings\@\@QEBAMXZ + * @symbol ?getAnimationSeconds\@StructureSettings\@\@QEBAMXZ */ MCAPI float getAnimationSeconds() const; /** - * @symbol ?getAnimationTicks\@StructureSettings\@\@QEBAIXZ + * @symbol ?getAnimationTicks\@StructureSettings\@\@QEBAIXZ */ MCAPI unsigned int getAnimationTicks() const; /** - * @symbol ?getIgnoreBlocks\@StructureSettings\@\@QEBA_NXZ + * @symbol ?getIgnoreBlocks\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool getIgnoreBlocks() const; /** - * @symbol ?getIgnoreEntities\@StructureSettings\@\@QEBA_NXZ + * @symbol ?getIgnoreEntities\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool getIgnoreEntities() const; /** - * @symbol ?getIgnoreJigsawBlocks\@StructureSettings\@\@QEBA_NXZ + * @symbol ?getIgnoreJigsawBlocks\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool getIgnoreJigsawBlocks() const; /** - * @symbol ?getIntegritySeed\@StructureSettings\@\@QEBAIXZ + * @symbol ?getIntegritySeed\@StructureSettings\@\@QEBAIXZ */ MCAPI unsigned int getIntegritySeed() const; /** - * @symbol ?getIntegrityValue\@StructureSettings\@\@QEBAMXZ + * @symbol ?getIntegrityValue\@StructureSettings\@\@QEBAMXZ */ MCAPI float getIntegrityValue() const; /** - * @symbol ?getIsWaterLogged\@StructureSettings\@\@QEBA_NXZ + * @symbol ?getIsWaterLogged\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool getIsWaterLogged() const; /** - * @symbol ?getLastTouchedByPlayerID\@StructureSettings\@\@QEBA?AUActorUniqueID\@\@XZ + * @symbol ?getLastTouchedByPlayerID\@StructureSettings\@\@QEBA?AUActorUniqueID\@\@XZ */ MCAPI struct ActorUniqueID getLastTouchedByPlayerID() const; /** - * @symbol ?getMirror\@StructureSettings\@\@QEBA?AW4Mirror\@\@XZ + * @symbol ?getMirror\@StructureSettings\@\@QEBA?AW4Mirror\@\@XZ */ MCAPI enum class Mirror getMirror() const; /** - * @symbol ?getPaletteName\@StructureSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPaletteName\@StructureSettings\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getPaletteName() const; /** - * @symbol ?getPivot\@StructureSettings\@\@QEBAAEBVVec3\@\@XZ + * @symbol ?getPivot\@StructureSettings\@\@QEBAAEBVVec3\@\@XZ */ MCAPI class Vec3 const & getPivot() const; /** - * @symbol ?getReloadActorEquipment\@StructureSettings\@\@QEBA_NXZ + * @symbol ?getReloadActorEquipment\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool getReloadActorEquipment() const; /** - * @symbol ?getRotation\@StructureSettings\@\@QEBA?AW4Rotation\@\@XZ + * @symbol ?getRotation\@StructureSettings\@\@QEBA?AW4Rotation\@\@XZ */ MCAPI enum class Rotation getRotation() const; /** - * @symbol ?getStructureOffset\@StructureSettings\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getStructureOffset\@StructureSettings\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getStructureOffset() const; /** - * @symbol ?getStructureSize\@StructureSettings\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getStructureSize\@StructureSettings\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getStructureSize() const; /** - * @symbol ?isAnimated\@StructureSettings\@\@QEBA_NXZ + * @symbol ?isAnimated\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool isAnimated() const; /** - * @symbol ??4StructureSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4StructureSettings\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class StructureSettings & operator=(class StructureSettings &&); /** - * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z + * @symbol ??4StructureSettings\@\@QEAAAEAV0\@AEBV0\@\@Z */ MCAPI class StructureSettings & operator=(class StructureSettings const &); /** - * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEAAX_N\@Z + * @symbol ?setAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEAAX_N\@Z */ MCAPI void setAllowNonTickingPlayerAndTickingAreaChunks(bool); /** - * @symbol ?setAnimationMode\@StructureSettings\@\@QEAAXW4AnimationMode\@\@\@Z + * @symbol ?setAnimationMode\@StructureSettings\@\@QEAAXW4AnimationMode\@\@\@Z */ MCAPI void setAnimationMode(enum class AnimationMode); /** - * @symbol ?setAnimationSeconds\@StructureSettings\@\@QEAAXM\@Z + * @symbol ?setAnimationSeconds\@StructureSettings\@\@QEAAXM\@Z */ MCAPI void setAnimationSeconds(float); /** - * @symbol ?setAnimationTicks\@StructureSettings\@\@QEAAXI\@Z + * @symbol ?setAnimationTicks\@StructureSettings\@\@QEAAXI\@Z */ MCAPI void setAnimationTicks(unsigned int); /** - * @symbol ?setIgnoreBlocks\@StructureSettings\@\@QEAAX_N\@Z + * @symbol ?setIgnoreBlocks\@StructureSettings\@\@QEAAX_N\@Z */ MCAPI void setIgnoreBlocks(bool); /** - * @symbol ?setIgnoreEntities\@StructureSettings\@\@QEAAX_N\@Z + * @symbol ?setIgnoreEntities\@StructureSettings\@\@QEAAX_N\@Z */ MCAPI void setIgnoreEntities(bool); /** - * @symbol ?setIgnoreJigsawBlocks\@StructureSettings\@\@QEAAX_N\@Z + * @symbol ?setIgnoreJigsawBlocks\@StructureSettings\@\@QEAAX_N\@Z */ MCAPI void setIgnoreJigsawBlocks(bool); /** - * @symbol ?setIntegritySeed\@StructureSettings\@\@QEAAXI\@Z + * @symbol ?setIntegritySeed\@StructureSettings\@\@QEAAXI\@Z */ MCAPI void setIntegritySeed(unsigned int); /** - * @symbol ?setIntegrityValue\@StructureSettings\@\@QEAAXM\@Z + * @symbol ?setIntegrityValue\@StructureSettings\@\@QEAAXM\@Z */ MCAPI void setIntegrityValue(float); /** - * @symbol ?setIsWaterLogged\@StructureSettings\@\@QEAAX_N\@Z + * @symbol ?setIsWaterLogged\@StructureSettings\@\@QEAAX_N\@Z */ MCAPI void setIsWaterLogged(bool); /** - * @symbol ?setLastTouchedByPlayerID\@StructureSettings\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?setLastTouchedByPlayerID\@StructureSettings\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void setLastTouchedByPlayerID(struct ActorUniqueID); /** - * @symbol ?setMirror\@StructureSettings\@\@QEAAXW4Mirror\@\@\@Z + * @symbol ?setMirror\@StructureSettings\@\@QEAAXW4Mirror\@\@\@Z */ MCAPI void setMirror(enum class Mirror); /** - * @symbol ?setPaletteName\@StructureSettings\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setPaletteName\@StructureSettings\@\@QEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setPaletteName(std::string); /** - * @symbol ?setPivot\@StructureSettings\@\@QEAAXAEBVVec3\@\@\@Z + * @symbol ?setPivot\@StructureSettings\@\@QEAAXAEBVVec3\@\@\@Z */ MCAPI void setPivot(class Vec3 const &); /** - * @symbol ?setReloadActorEquipment\@StructureSettings\@\@QEAAX_N\@Z + * @symbol ?setReloadActorEquipment\@StructureSettings\@\@QEAAX_N\@Z */ MCAPI void setReloadActorEquipment(bool); /** - * @symbol ?setRotation\@StructureSettings\@\@QEAAXW4Rotation\@\@\@Z + * @symbol ?setRotation\@StructureSettings\@\@QEAAXW4Rotation\@\@\@Z */ MCAPI void setRotation(enum class Rotation); /** - * @symbol ?setStructureOffset\@StructureSettings\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setStructureOffset\@StructureSettings\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setStructureOffset(class BlockPos const &); /** - * @symbol ?setStructureSize\@StructureSettings\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setStructureSize\@StructureSettings\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setStructureSize(class BlockPos const &); /** - * @symbol ?shouldAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEBA_NXZ + * @symbol ?shouldAllowNonTickingPlayerAndTickingAreaChunks\@StructureSettings\@\@QEBA_NXZ */ MCAPI bool shouldAllowNonTickingPlayerAndTickingAreaChunks() const; /** - * @symbol ??1StructureSettings\@\@QEAA\@XZ + * @symbol ??1StructureSettings\@\@QEAA\@XZ */ MCAPI ~StructureSettings(); /** - * @symbol ?DEFAULT_STRUCTURE_OFFSET\@StructureSettings\@\@2VBlockPos\@\@B + * @symbol ?DEFAULT_STRUCTURE_OFFSET\@StructureSettings\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const DEFAULT_STRUCTURE_OFFSET; /** - * @symbol ?DEFAULT_STRUCTURE_SIZE\@StructureSettings\@\@2VBlockPos\@\@B + * @symbol ?DEFAULT_STRUCTURE_SIZE\@StructureSettings\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const DEFAULT_STRUCTURE_SIZE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureStart.hpp b/LiteLoader/include/llapi/mc/StructureStart.hpp index 6c10589ea8..a54eafc156 100644 --- a/LiteLoader/include/llapi/mc/StructureStart.hpp +++ b/LiteLoader/include/llapi/mc/StructureStart.hpp @@ -30,43 +30,49 @@ class StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?postProcess\@StructureStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 1 + * @symbol ?postProcess\@StructureStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 2 - * @symbol ?isValid\@StructureStart\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isValid\@StructureStart\@\@UEBA_NXZ */ virtual bool isValid() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURESTART /** - * @symbol ?postProcessMobsAt\@StructureStart\@\@QEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructureStart(); +#endif + /** + * @symbol ?postProcessMobsAt\@StructureStart\@\@QEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); //protected: /** - * @symbol ?calculateBoundingBox\@StructureStart\@\@IEAAXXZ + * @symbol ?calculateBoundingBox\@StructureStart\@\@IEAAXXZ */ MCAPI void calculateBoundingBox(); /** - * @symbol ?moveBoundingBoxes\@StructureStart\@\@IEAAXH\@Z + * @symbol ?moveBoundingBoxes\@StructureStart\@\@IEAAXH\@Z */ MCAPI void moveBoundingBoxes(int); /** - * @symbol ?moveInsideHeights\@StructureStart\@\@IEAAXAEAVRandom\@\@FF\@Z + * @symbol ?moveInsideHeights\@StructureStart\@\@IEAAXAEAVRandom\@\@FF\@Z */ MCAPI void moveInsideHeights(class Random &, short, short); /** - * @symbol ?moveToBelowSeaLevel\@StructureStart\@\@IEAAXFFAEAVRandom\@\@H\@Z + * @symbol ?moveToBelowSeaLevel\@StructureStart\@\@IEAAXFFAEAVRandom\@\@H\@Z */ MCAPI void moveToBelowSeaLevel(short, short, class Random &, int); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTag.hpp b/LiteLoader/include/llapi/mc/StructureTag.hpp index 94cef2d6cf..8db802d781 100644 --- a/LiteLoader/include/llapi/mc/StructureTag.hpp +++ b/LiteLoader/include/llapi/mc/StructureTag.hpp @@ -22,51 +22,51 @@ namespace StructureTag { #undef AFTER_EXTRA /** - * @symbol ?BLOCK_ENTITY_DATA\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_ENTITY_DATA\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BLOCK_ENTITY_DATA; /** - * @symbol ?BLOCK_INDICES\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_INDICES\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BLOCK_INDICES; /** - * @symbol ?BLOCK_PALETTE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_PALETTE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BLOCK_PALETTE; /** - * @symbol ?BLOCK_POSITION_DATA\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?BLOCK_POSITION_DATA\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const BLOCK_POSITION_DATA; /** - * @symbol ?ENTITIES\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ENTITIES\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ENTITIES; /** - * @symbol ?FORMAT_VERSION\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?FORMAT_VERSION\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const FORMAT_VERSION; /** - * @symbol ?PALETTE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?PALETTE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const PALETTE; /** - * @symbol ?SIZE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?SIZE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const SIZE; /** - * @symbol ?STRUCTURE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const STRUCTURE; /** - * @symbol ?STRUCTURE_WORLD_ORIGIN\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STRUCTURE_WORLD_ORIGIN\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const STRUCTURE_WORLD_ORIGIN; /** - * @symbol ?TICK_DELAY\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TICK_DELAY\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const TICK_DELAY; /** - * @symbol ?TICK_QUEUE_DATA\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?TICK_QUEUE_DATA\@StructureTag\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const TICK_QUEUE_DATA; diff --git a/LiteLoader/include/llapi/mc/StructureTelemetryClientData.hpp b/LiteLoader/include/llapi/mc/StructureTelemetryClientData.hpp index 7d8bc2d049..61d3b6d2bd 100644 --- a/LiteLoader/include/llapi/mc/StructureTelemetryClientData.hpp +++ b/LiteLoader/include/llapi/mc/StructureTelemetryClientData.hpp @@ -30,20 +30,20 @@ class StructureTelemetryClientData { public: /** - * @symbol ?getMirrorEditCount\@StructureTelemetryClientData\@\@QEBAIXZ + * @symbol ?getMirrorEditCount\@StructureTelemetryClientData\@\@QEBAIXZ */ MCAPI unsigned int getMirrorEditCount() const; /** - * @symbol ?getOffsetEditCount\@StructureTelemetryClientData\@\@QEBAIXZ + * @symbol ?getOffsetEditCount\@StructureTelemetryClientData\@\@QEBAIXZ */ MCAPI unsigned int getOffsetEditCount() const; /** - * @symbol ?getRotationEditCount\@StructureTelemetryClientData\@\@QEBAIXZ + * @symbol ?getRotationEditCount\@StructureTelemetryClientData\@\@QEBAIXZ */ MCAPI unsigned int getRotationEditCount() const; /** - * @symbol ?getSizeEditCount\@StructureTelemetryClientData\@\@QEBAIXZ + * @symbol ?getSizeEditCount\@StructureTelemetryClientData\@\@QEBAIXZ */ MCAPI unsigned int getSizeEditCount() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTelemetryServerData.hpp b/LiteLoader/include/llapi/mc/StructureTelemetryServerData.hpp index a2c296aa7e..4e84f6b8ac 100644 --- a/LiteLoader/include/llapi/mc/StructureTelemetryServerData.hpp +++ b/LiteLoader/include/llapi/mc/StructureTelemetryServerData.hpp @@ -29,16 +29,16 @@ class StructureTelemetryServerData { public: /** - * @symbol ??0StructureTelemetryServerData\@\@QEAA\@XZ + * @symbol ??0StructureTelemetryServerData\@\@QEAA\@XZ */ MCAPI StructureTelemetryServerData(); /** - * @symbol ?hasBeenActivatedByRedstone\@StructureTelemetryServerData\@\@QEAA_NXZ + * @symbol ?hasBeenActivatedByRedstone\@StructureTelemetryServerData\@\@QEAA_NXZ */ MCAPI bool hasBeenActivatedByRedstone(); /** - * @symbol ?setHasBeenActivedByRedstone\@StructureTelemetryServerData\@\@QEAAXXZ + * @symbol ?setHasBeenActivedByRedstone\@StructureTelemetryServerData\@\@QEAAXXZ */ MCAPI void setHasBeenActivedByRedstone(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTemplate.hpp b/LiteLoader/include/llapi/mc/StructureTemplate.hpp index 4f0eb4f7ca..963813096c 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplate.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplate.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 @@ -25,7 +26,7 @@ class StructureTemplate { string mName; StructureTemplateData mStructureTemplateData; unsigned __int8 mStructureVersion; - //char filler[224]; // IDA StructureTemplate::StructureTemplate + Bedrock::NonOwnerPointer mUnknownBlockType; public: #define DISABLE_CONSTRUCTOR_PREVENTION_STRUCTURETEMPLATE @@ -40,138 +41,146 @@ class StructureTemplate { #ifndef DISABLE_CONSTRUCTOR_PREVENTION_STRUCTURETEMPLATE public: class StructureTemplate& operator=(class StructureTemplate const &) = delete; + StructureTemplate(class StructureTemplate const &) = delete; StructureTemplate() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureTemplate(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?clear\@StructureTemplate\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?clear\@StructureTemplate\@\@UEAAXXZ */ virtual void clear(); /** - * @vftbl 2 - * @symbol ?_allowReadBlock\@StructureTemplate\@\@MEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 2 + * @symbol ?_allowReadBlock\@StructureTemplate\@\@MEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool _allowReadBlock(class BlockPos const &, class Block const &) const; /** - * @vftbl 3 - * @symbol ?_allowReadActor\@StructureTemplate\@\@MEBA_NAEBVActor\@\@\@Z + * @vftbl 3 + * @symbol ?_allowReadActor\@StructureTemplate\@\@MEBA_NAEBVActor\@\@\@Z */ virtual bool _allowReadActor(class Actor const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); + +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATE /** - * @symbol ?getName\@StructureTemplate\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI std::string const & getName() const; + MCVAPI ~StructureTemplate(); +#endif /** - * @symbol ??0StructureTemplate\@\@QEAA\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ??0StructureTemplate\@\@QEAA\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@\@Z */ - MCAPI StructureTemplate(class gsl::basic_string_span); + MCAPI StructureTemplate(class std::basic_string_view>, class Bedrock::NonOwnerPointer); /** - * @symbol ??0StructureTemplate\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0StructureTemplate\@\@QEAA\@AEBV0\@V?$NonOwnerPointer\@VIUnknownBlockTypeRegistry\@\@\@Bedrock\@\@\@Z */ - MCAPI StructureTemplate(class StructureTemplate const &); + MCAPI StructureTemplate(class StructureTemplate const &, class Bedrock::NonOwnerPointer); /** - * @symbol ?fillFromWorld\@StructureTemplate\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@\@Z + * @symbol ?fillFromWorld\@StructureTemplate\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@\@Z */ MCAPI void fillFromWorld(class BlockSource &, class BlockPos const &, class StructureSettings const &); /** - * @symbol ?getBlockAtPos\@StructureTemplate\@\@QEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlockAtPos\@StructureTemplate\@\@QEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Block const & getBlockAtPos(class BlockPos const &) const; /** - * @symbol ?getJigsawMarkers\@StructureTemplate\@\@QEBA?AV?$vector\@VJigsawStructureBlockInfo\@\@V?$allocator\@VJigsawStructureBlockInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getJigsawMarkers\@StructureTemplate\@\@QEBA?AV?$vector\@VJigsawStructureBlockInfo\@\@V?$allocator\@VJigsawStructureBlockInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getJigsawMarkers() const; /** - * @symbol ?getSize\@StructureTemplate\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getName\@StructureTemplate\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + MCAPI std::string const & getName() const; + /** + * @symbol ?getSize\@StructureTemplate\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSize() const; /** - * @symbol ?getStructureVersion\@StructureTemplate\@\@QEBAEXZ + * @symbol ?getStructureVersion\@StructureTemplate\@\@QEBAEXZ */ MCAPI unsigned char getStructureVersion() const; /** - * @symbol ?getTransformedBounds\@StructureTemplate\@\@QEBA?AVBoundingBox\@\@VBlockPos\@\@AEBVStructureSettings\@\@\@Z + * @symbol ?getTransformedBounds\@StructureTemplate\@\@QEBA?AVBoundingBox\@\@VBlockPos\@\@AEBVStructureSettings\@\@\@Z */ MCAPI class BoundingBox getTransformedBounds(class BlockPos, class StructureSettings const &) const; /** - * @symbol ?isLoaded\@StructureTemplate\@\@QEBA_NXZ + * @symbol ?isLoaded\@StructureTemplate\@\@QEBA_NXZ */ MCAPI bool isLoaded() const; /** - * @symbol ?load\@StructureTemplate\@\@QEAA_NAEBVCompoundTag\@\@\@Z + * @symbol ?load\@StructureTemplate\@\@QEAA_NAEBVCompoundTag\@\@\@Z */ MCAPI bool load(class CompoundTag const &); /** - * @symbol ?placeInWorld\@StructureTemplate\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPalette\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@PEAVStructureTelemetryServerData\@\@_N\@Z + * @symbol ?placeInWorld\@StructureTemplate\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPalette\@\@AEBVBlockPos\@\@AEBVStructureSettings\@\@PEAVStructureTelemetryServerData\@\@_N\@Z */ MCAPI void placeInWorld(class BlockSource &, class BlockPalette const &, class BlockPos const &, class StructureSettings const &, class StructureTelemetryServerData *, bool) const; /** - * @symbol ?placeNextSegmentInWorld\@StructureTemplate\@\@QEBAXAEAVStructureAnimationData\@\@AEBVBlockPalette\@\@\@Z + * @symbol ?placeNextSegmentInWorld\@StructureTemplate\@\@QEBAXAEAVStructureAnimationData\@\@AEBVBlockPalette\@\@\@Z */ MCAPI void placeNextSegmentInWorld(class StructureAnimationData &, class BlockPalette const &) const; /** - * @symbol ?save\@StructureTemplate\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@StructureTemplate\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ?setStructureTemplateData\@StructureTemplate\@\@QEAAXAEBVStructureTemplateData\@\@\@Z + * @symbol ?setStructureTemplateData\@StructureTemplate\@\@QEAAXAEBVStructureTemplateData\@\@\@Z */ MCAPI void setStructureTemplateData(class StructureTemplateData const &); /** - * @symbol ?INVALID_POSITION\@StructureTemplate\@\@2VBlockPos\@\@B + * @symbol ?INVALID_POSITION\@StructureTemplate\@\@2VBlockPos\@\@B */ MCAPI static class BlockPos const INVALID_POSITION; //private: /** - * @symbol ?_fillBlockInfo\@StructureTemplate\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@11\@Z + * @symbol ?_fillBlockInfo\@StructureTemplate\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@11\@Z */ MCAPI void _fillBlockInfo(class BlockSource &, class BlockPos const &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?_fillEntityList\@StructureTemplate\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @symbol ?_fillEntityList\@StructureTemplate\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ MCAPI void _fillEntityList(class BlockSource &, class BlockPos const &, class BlockPos const &); /** - * @symbol ?_placeEntitiesInWorld\@StructureTemplate\@\@AEBAXAEAVBlockSource\@\@AEAVDataLoadHelper\@\@_N\@Z + * @symbol ?_placeEntitiesInWorld\@StructureTemplate\@\@AEBAXAEAVBlockSource\@\@AEAVDataLoadHelper\@\@_N\@Z */ MCAPI void _placeEntitiesInWorld(class BlockSource &, class DataLoadHelper &, bool) const; /** - * @symbol ?_placeNextBlockSegmentInWorld\@StructureTemplate\@\@AEBAXAEAVBlockSource\@\@_K1AEBVStructureSettings\@\@AEAVDataLoadHelper\@\@AEBVStructureBlockPalette\@\@AEBVBlockPalette\@\@VBlockPos\@\@AEBV7\@AEBVVec3\@\@W4Rotation\@\@W4Mirror\@\@MIPEAVStructureTelemetryServerData\@\@_N_N\@Z + * @symbol ?_placeNextBlockSegmentInWorld\@StructureTemplate\@\@AEBAXAEAVBlockSource\@\@_K1AEBVStructureSettings\@\@AEAVDataLoadHelper\@\@AEBVStructureBlockPalette\@\@AEBVBlockPalette\@\@VBlockPos\@\@AEBV7\@AEBVVec3\@\@W4Rotation\@\@W4Mirror\@\@MIPEAVStructureTelemetryServerData\@\@_N_N\@Z */ MCAPI void _placeNextBlockSegmentInWorld(class BlockSource &, unsigned __int64, unsigned __int64, class StructureSettings const &, class DataLoadHelper &, class StructureBlockPalette const &, class BlockPalette const &, class BlockPos, class BlockPos const &, class Vec3 const &, enum class Rotation, enum class Mirror, float, unsigned int, class StructureTelemetryServerData *, bool, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTemplateData.hpp b/LiteLoader/include/llapi/mc/StructureTemplateData.hpp index 0bbcc33710..45fad06bc4 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateData.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateData.hpp @@ -37,116 +37,122 @@ class StructureTemplateData { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATEDATA /** - * @symbol ??0StructureTemplateData\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructureTemplateData(); +#endif + /** + * @symbol ??0StructureTemplateData\@\@QEAA\@XZ */ MCAPI StructureTemplateData(); /** - * @symbol ?addEntityData\@StructureTemplateData\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addEntityData\@StructureTemplateData\@\@QEAAXV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void addEntityData(std::unique_ptr); /** - * @symbol ?addPalette\@StructureTemplateData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@\@Z + * @symbol ?addPalette\@StructureTemplateData\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@\@Z */ MCAPI void addPalette(std::string const &, class StructureBlockPalette); /** - * @symbol ?clear\@StructureTemplateData\@\@QEAAXXZ + * @symbol ?clear\@StructureTemplateData\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?getAllPalettes\@StructureTemplateData\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@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\@\@VStructureBlockPalette\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getAllPalettes\@StructureTemplateData\@\@QEBAAEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@VStructureBlockPalette\@\@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\@\@VStructureBlockPalette\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getAllPalettes() const; /** - * @symbol ?getBlockIndices\@StructureTemplateData\@\@QEBAAEBV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ + * @symbol ?getBlockIndices\@StructureTemplateData\@\@QEBAAEBV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getBlockIndices() const; /** - * @symbol ?getEntityData\@StructureTemplateData\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getEntityData\@StructureTemplateData\@\@QEBAAEBV?$vector\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getEntityData() const; /** - * @symbol ?getExtraBlockIndices\@StructureTemplateData\@\@QEBAAEBV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ + * @symbol ?getExtraBlockIndices\@StructureTemplateData\@\@QEBAAEBV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getExtraBlockIndices() const; /** - * @symbol ?getPalette\@StructureTemplateData\@\@QEBAPEBVStructureBlockPalette\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getPalette\@StructureTemplateData\@\@QEBAPEBVStructureBlockPalette\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class StructureBlockPalette const * getPalette(std::string const &) const; /** - * @symbol ?getSize\@StructureTemplateData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getSize\@StructureTemplateData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getSize() const; /** - * @symbol ?getStructureWorldOrigin\@StructureTemplateData\@\@QEBAAEBVBlockPos\@\@XZ + * @symbol ?getStructureWorldOrigin\@StructureTemplateData\@\@QEBAAEBVBlockPos\@\@XZ */ MCAPI class BlockPos const & getStructureWorldOrigin() const; /** - * @symbol ?load\@StructureTemplateData\@\@QEAA_NAEBVCompoundTag\@\@\@Z + * @symbol ?load\@StructureTemplateData\@\@QEAA_NAEBVCompoundTag\@\@\@Z */ MCAPI bool load(class CompoundTag const &); /** - * @symbol ?save\@StructureTemplateData\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ + * @symbol ?save\@StructureTemplateData\@\@QEBA?AV?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::unique_ptr save() const; /** - * @symbol ?setBlockIndices\@StructureTemplateData\@\@QEAAXV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@\@Z + * @symbol ?setBlockIndices\@StructureTemplateData\@\@QEAAXV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@\@Z */ MCAPI void setBlockIndices(std::vector); /** - * @symbol ?setExtraBlockIndices\@StructureTemplateData\@\@QEAAXV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@\@Z + * @symbol ?setExtraBlockIndices\@StructureTemplateData\@\@QEAAXV?$vector\@HV?$allocator\@H\@std\@\@\@std\@\@\@Z */ MCAPI void setExtraBlockIndices(std::vector); /** - * @symbol ?setSize\@StructureTemplateData\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setSize\@StructureTemplateData\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setSize(class BlockPos const &); /** - * @symbol ?setStructureWorldOrigin\@StructureTemplateData\@\@QEAAXAEBVBlockPos\@\@\@Z + * @symbol ?setStructureWorldOrigin\@StructureTemplateData\@\@QEAAXAEBVBlockPos\@\@\@Z */ MCAPI void setStructureWorldOrigin(class BlockPos const &); /** - * @symbol ?DEFAULT_PALETTE_NAME\@StructureTemplateData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DEFAULT_PALETTE_NAME\@StructureTemplateData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DEFAULT_PALETTE_NAME; //protected: /** - * @symbol ?_parseBlockIndices\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parseBlockIndices\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureLoadResult _parseBlockIndices(class CompoundTag const &); /** - * @symbol ?_parseEntities\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parseEntities\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureLoadResult _parseEntities(class CompoundTag const &); /** - * @symbol ?_parseFormatVersion\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parseFormatVersion\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureLoadResult _parseFormatVersion(class CompoundTag const &); /** - * @symbol ?_parsePalettes\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parsePalettes\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureLoadResult _parsePalettes(class CompoundTag const &); /** - * @symbol ?_parseSize\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?_parseSize\@StructureTemplateData\@\@IEAA?AW4StructureLoadResult\@\@AEBVCompoundTag\@\@\@Z */ MCAPI enum class StructureLoadResult _parseSize(class CompoundTag const &); /** - * @symbol ?_saveBlockIndices\@StructureTemplateData\@\@IEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?_saveBlockIndices\@StructureTemplateData\@\@IEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void _saveBlockIndices(class CompoundTag &) const; /** - * @symbol ?_savePalettes\@StructureTemplateData\@\@IEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?_savePalettes\@StructureTemplateData\@\@IEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void _savePalettes(class CompoundTag &) const; /** - * @symbol ?_saveStructureTag\@StructureTemplateData\@\@IEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?_saveStructureTag\@StructureTemplateData\@\@IEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void _saveStructureTag(class CompoundTag &) const; //private: /** - * @symbol ?_contentErrorMissingField\@StructureTemplateData\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_contentErrorMissingField\@StructureTemplateData\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _contentErrorMissingField(std::string const &) const; @@ -154,4 +160,4 @@ class StructureTemplateData { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp index 137b090fed..c9820f2a9a 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataRequestPacket.hpp @@ -30,33 +30,33 @@ class StructureTemplateDataRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureTemplateDataRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@StructureTemplateDataRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@StructureTemplateDataRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@StructureTemplateDataRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@StructureTemplateDataRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@StructureTemplateDataRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@StructureTemplateDataRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@StructureTemplateDataRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0StructureTemplateDataRequestPacket\@\@QEAA\@XZ + * @symbol ??0StructureTemplateDataRequestPacket\@\@QEAA\@XZ */ MCAPI StructureTemplateDataRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp index ca79cd0589..32452090ab 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateDataResponsePacket.hpp @@ -30,41 +30,47 @@ class StructureTemplateDataResponsePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureTemplateDataResponsePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@StructureTemplateDataResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@StructureTemplateDataResponsePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@StructureTemplateDataResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@StructureTemplateDataResponsePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@StructureTemplateDataResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@StructureTemplateDataResponsePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@StructureTemplateDataResponsePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTURETEMPLATEDATARESPONSEPACKET /** - * @symbol ??0StructureTemplateDataResponsePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StructureTemplateDataResponsePacket(); +#endif + /** + * @symbol ??0StructureTemplateDataResponsePacket\@\@QEAA\@XZ */ MCAPI StructureTemplateDataResponsePacket(); /** - * @symbol ??0StructureTemplateDataResponsePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@2\@W4StructureTemplateResponseType\@\@\@Z + * @symbol ??0StructureTemplateDataResponsePacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@2\@W4StructureTemplateResponseType\@\@\@Z */ MCAPI StructureTemplateDataResponsePacket(std::string const &, std::unique_ptr, enum class StructureTemplateResponseType); /** - * @symbol ??4StructureTemplateDataResponsePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4StructureTemplateDataResponsePacket\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class StructureTemplateDataResponsePacket & operator=(class StructureTemplateDataResponsePacket &&); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp b/LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp index 9dafb46e80..52b8d88a8b 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplateFeature.hpp @@ -29,18 +29,18 @@ class StructureTemplateFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureTemplateFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@StructureTemplateFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@StructureTemplateFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0StructureTemplateFeature\@\@QEAA\@XZ + * @symbol ??0StructureTemplateFeature\@\@QEAA\@XZ */ MCAPI StructureTemplateFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureTemplatePool.hpp b/LiteLoader/include/llapi/mc/StructureTemplatePool.hpp index cee0148338..30ff8e70a4 100644 --- a/LiteLoader/include/llapi/mc/StructureTemplatePool.hpp +++ b/LiteLoader/include/llapi/mc/StructureTemplatePool.hpp @@ -30,32 +30,32 @@ class StructureTemplatePool { public: /** - * @symbol ??0StructureTemplatePool\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAV?$vector\@U?$pair\@PEBVStructurePoolElement\@\@H\@std\@\@V?$allocator\@U?$pair\@PEBVStructurePoolElement\@\@H\@std\@\@\@2\@\@2\@\@Z + * @symbol ??0StructureTemplatePool\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0AEAV?$vector\@U?$pair\@PEBVStructurePoolElement\@\@H\@std\@\@V?$allocator\@U?$pair\@PEBVStructurePoolElement\@\@H\@std\@\@\@2\@\@2\@\@Z */ MCAPI StructureTemplatePool(std::string, std::string, std::vector> &); /** - * @symbol ?getFallback\@StructureTemplatePool\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getFallback\@StructureTemplatePool\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getFallback() const; /** - * @symbol ?getName\@StructureTemplatePool\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getName\@StructureTemplatePool\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getName() const; /** - * @symbol ?getRandomTemplate\@StructureTemplatePool\@\@QEBAPEBVStructurePoolElement\@\@AEAVRandom\@\@\@Z + * @symbol ?getRandomTemplate\@StructureTemplatePool\@\@QEBAPEBVStructurePoolElement\@\@AEAVRandom\@\@\@Z */ MCAPI class StructurePoolElement const * getRandomTemplate(class Random &) const; /** - * @symbol ?getShuffledTemplateIndexes\@StructureTemplatePool\@\@QEBA?AV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@AEAVRandom\@\@\@Z + * @symbol ?getShuffledTemplateIndexes\@StructureTemplatePool\@\@QEBA?AV?$vector\@_KV?$allocator\@_K\@std\@\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI std::vector getShuffledTemplateIndexes(class Random &) const; /** - * @symbol ?getTemplate\@StructureTemplatePool\@\@QEBAPEBVStructurePoolElement\@\@_K\@Z + * @symbol ?getTemplate\@StructureTemplatePool\@\@QEBAPEBVStructurePoolElement\@\@_K\@Z */ MCAPI class StructurePoolElement const * getTemplate(unsigned __int64) const; /** - * @symbol ?isValid\@StructureTemplatePool\@\@QEBA_NXZ + * @symbol ?isValid\@StructureTemplatePool\@\@QEBA_NXZ */ MCAPI bool isValid() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StructureVoid.hpp b/LiteLoader/include/llapi/mc/StructureVoid.hpp index 88e56de040..7fc0ea791f 100644 --- a/LiteLoader/include/llapi/mc/StructureVoid.hpp +++ b/LiteLoader/include/llapi/mc/StructureVoid.hpp @@ -31,228 +31,233 @@ class StructureVoid : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StructureVoid(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@StructureVoid\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@StructureVoid\@\@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 + * @vftbl 6 + * @symbol ?isObstructingChests\@StructureVoid\@\@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 + * @vftbl 10 + * @symbol ?getAABB\@StructureVoid\@\@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 + * @vftbl 11 + * @symbol ?addCollisionShapes\@StructureVoid\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@StructureVoid\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@StructureVoid\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STRUCTUREVOID /** - * @symbol ?canBeSilkTouched\@StructureVoid\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@StructureVoid\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?canHaveExtraData\@StructureVoid\@\@UEBA_NXZ + * @symbol ?canHaveExtraData\@StructureVoid\@\@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 ??0StructureVoid\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI StructureVoid(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/StubServerLocator.hpp b/LiteLoader/include/llapi/mc/StubServerLocator.hpp index 26c99b838b..44b3d27ea3 100644 --- a/LiteLoader/include/llapi/mc/StubServerLocator.hpp +++ b/LiteLoader/include/llapi/mc/StubServerLocator.hpp @@ -29,106 +29,110 @@ class StubServerLocator { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~StubServerLocator(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ 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 + * @vftbl 3 + * @symbol ?startAnnouncingServer\@StubServerLocator\@\@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\@StubServerLocator\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?stopAnnouncingServer\@StubServerLocator\@\@UEAAXXZ */ virtual void stopAnnouncingServer(); /** - * @vftbl 5 - * @symbol ?startServerDiscovery\@StubServerLocator\@\@UEAAXUPortPair\@\@\@Z + * @vftbl 5 + * @symbol ?startServerDiscovery\@StubServerLocator\@\@UEAAXUPortPair\@\@\@Z */ virtual void startServerDiscovery(struct PortPair); /** - * @vftbl 6 - * @symbol ?stopServerDiscovery\@StubServerLocator\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?stopServerDiscovery\@StubServerLocator\@\@UEAAXXZ */ virtual void stopServerDiscovery(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol ?getServerList\@StubServerLocator\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?getServerList\@StubServerLocator\@\@UEBA?AV?$vector\@UPingedCompatibleServer\@\@V?$allocator\@UPingedCompatibleServer\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getServerList() const; /** - * @vftbl 10 - * @symbol ?clearServerList\@StubServerLocator\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?clearServerList\@StubServerLocator\@\@UEAAXXZ */ virtual void clearServerList(); /** - * @vftbl 11 - * @symbol ?update\@StubServerLocator\@\@UEAAXXZ + * @vftbl 11 + * @symbol ?update\@StubServerLocator\@\@UEAAXXZ */ virtual void update(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?getPingTimeForGUID\@StubServerLocator\@\@UEAAMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 14 + * @symbol ?getPingTimeForGUID\@StubServerLocator\@\@UEAAMAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual float getPingTimeForGUID(std::string const &); /** - * @vftbl 15 - * @symbol ?checkCanConnectToCustomServerAsync\@StubServerLocator\@\@UEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HV?$function\@$$A6AX_N\@Z\@3\@\@Z + * @vftbl 15 + * @symbol ?checkCanConnectToCustomServerAsync\@StubServerLocator\@\@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); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_STUBSERVERLOCATOR /** - * @symbol ?addCustomServer\@StubServerLocator\@\@UEAAXAEBVAsynchronousIPResolver\@\@H\@Z + * @symbol ?addCustomServer\@StubServerLocator\@\@UEAAXAEBVAsynchronousIPResolver\@\@H\@Z */ MCVAPI void addCustomServer(class AsynchronousIPResolver const &, int); /** - * @symbol ?addCustomServer\@StubServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?addCustomServer\@StubServerLocator\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCVAPI void addCustomServer(std::string const &, int); /** - * @symbol ?isIPv4Supported\@StubServerLocator\@\@UEBA_NXZ + * @symbol ?isIPv4Supported\@StubServerLocator\@\@UEBA_NXZ */ MCVAPI bool isIPv4Supported() const; /** - * @symbol ?isIPv6Supported\@StubServerLocator\@\@UEBA_NXZ + * @symbol ?isIPv6Supported\@StubServerLocator\@\@UEBA_NXZ */ MCVAPI bool isIPv6Supported() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~StubServerLocator(); #endif /** - * @symbol ??0StubServerLocator\@\@QEAA\@XZ + * @symbol ??0StubServerLocator\@\@QEAA\@XZ */ MCAPI StubServerLocator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp index e0c11446cf..e9a15e32e5 100644 --- a/LiteLoader/include/llapi/mc/SubBBsComponent.hpp +++ b/LiteLoader/include/llapi/mc/SubBBsComponent.hpp @@ -28,7 +28,7 @@ struct SubBBsComponent { public: /** - * @symbol ??1SubBBsComponent\@\@QEAA\@XZ + * @symbol ??1SubBBsComponent\@\@QEAA\@XZ */ MCAPI ~SubBBsComponent(); diff --git a/LiteLoader/include/llapi/mc/SubChunk.hpp b/LiteLoader/include/llapi/mc/SubChunk.hpp index 713deb35e8..75bc365a14 100644 --- a/LiteLoader/include/llapi/mc/SubChunk.hpp +++ b/LiteLoader/include/llapi/mc/SubChunk.hpp @@ -31,153 +31,153 @@ struct SubChunk { public: /** - * @symbol ??0SubChunk\@\@QEAA\@XZ + * @symbol ??0SubChunk\@\@QEAA\@PEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z */ - MCAPI SubChunk(); + MCAPI SubChunk(class Block const *, bool, bool, class SpinLock &, signed char); /** - * @symbol ??0SubChunk\@\@QEAA\@PEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z + * @symbol ??0SubChunk\@\@QEAA\@XZ */ - MCAPI SubChunk(class Block const *, bool, bool, class SpinLock &, signed char); + MCAPI SubChunk(); /** - * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SubChunk\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI SubChunk(struct SubChunk &&); /** - * @symbol ?deserialize\@SubChunk\@\@QEAAXAEAVIDataInput\@\@AEBVBlockPalette\@\@AEBVSubChunkPos\@\@V?$optional\@PEAUDeserializationChanges\@\@\@std\@\@\@Z + * @symbol ?deserialize\@SubChunk\@\@QEAAXAEAVIDataInput\@\@AEBVBlockPalette\@\@AEBVSubChunkPos\@\@V?$optional\@PEAUDeserializationChanges\@\@\@std\@\@\@Z */ MCAPI void deserialize(class IDataInput &, class BlockPalette const &, class SubChunkPos const &, class std::optional); /** - * @symbol ?fetchBlocks\@SubChunk\@\@QEBAXAEBVBlockPos\@\@0FAEAVBlockVolume\@\@\@Z + * @symbol ?fetchBlocks\@SubChunk\@\@QEBAXAEBVBlockPos\@\@0FAEAVBlockVolume\@\@\@Z */ MCAPI void fetchBlocks(class BlockPos const &, class BlockPos const &, short, class BlockVolume &) const; /** - * @symbol ?fetchBlocksInBox\@SubChunk\@\@QEBAXAEBVBlockPos\@\@AEBVBoundingBox\@\@AEBV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@AEAV?$vector\@V?$BlockDataFetchResult\@VBlock\@\@\@\@V?$allocator\@V?$BlockDataFetchResult\@VBlock\@\@\@\@\@std\@\@\@5\@\@Z + * @symbol ?fetchBlocksInBox\@SubChunk\@\@QEBAXAEBVBlockPos\@\@AEBVBoundingBox\@\@AEBV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@AEAV?$vector\@V?$BlockDataFetchResult\@VBlock\@\@\@\@V?$allocator\@V?$BlockDataFetchResult\@VBlock\@\@\@\@\@std\@\@\@5\@\@Z */ MCAPI void fetchBlocksInBox(class BlockPos const &, class BoundingBox const &, class std::function const &, std::vector> &) const; /** - * @symbol ?fetchBlocksInCylinder\@SubChunk\@\@QEBAXAEBVBlockPos\@\@0IIAEBV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@AEAV?$vector\@V?$BlockDataFetchResult\@VBlock\@\@\@\@V?$allocator\@V?$BlockDataFetchResult\@VBlock\@\@\@\@\@std\@\@\@4\@\@Z + * @symbol ?fetchBlocksInCylinder\@SubChunk\@\@QEBAXAEBVBlockPos\@\@0IIAEBV?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@AEAV?$vector\@V?$BlockDataFetchResult\@VBlock\@\@\@\@V?$allocator\@V?$BlockDataFetchResult\@VBlock\@\@\@\@\@std\@\@\@4\@\@Z */ MCAPI void fetchBlocksInCylinder(class BlockPos const &, class BlockPos const &, unsigned int, unsigned int, class std::function const &, std::vector> &) const; /** - * @symbol ?getLight\@SubChunk\@\@QEBA?AULightPair\@SubChunkBrightnessStorage\@\@G\@Z + * @symbol ?getLight\@SubChunk\@\@QEBA?AULightPair\@SubChunkBrightnessStorage\@\@G\@Z */ MCAPI struct SubChunkBrightnessStorage::LightPair getLight(unsigned short) const; /** - * @symbol ?getSubChunkState\@SubChunk\@\@QEBA?AW4SubChunkState\@1\@XZ + * @symbol ?getSubChunkState\@SubChunk\@\@QEBA?AW4SubChunkState\@1\@XZ */ MCAPI enum class SubChunk::SubChunkState getSubChunkState() const; /** - * @symbol ?initialize\@SubChunk\@\@QEAAXPEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z + * @symbol ?initialize\@SubChunk\@\@QEAAXPEBVBlock\@\@_N1AEAVSpinLock\@\@C\@Z */ MCAPI void initialize(class Block const *, bool, bool, class SpinLock &, signed char); /** - * @symbol ?isPaletteUniform\@SubChunk\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?isPaletteUniform\@SubChunk\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool isPaletteUniform(class Block const &) const; /** - * @symbol ?isUniform\@SubChunk\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?isUniform\@SubChunk\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool isUniform(class Block const &) const; /** - * @symbol ?likelyHasNonUniformBlockLight\@SubChunk\@\@QEBA_NXZ + * @symbol ?likelyHasNonUniformBlockLight\@SubChunk\@\@QEBA_NXZ */ MCAPI bool likelyHasNonUniformBlockLight() const; /** - * @symbol ?needsInitLighting\@SubChunk\@\@QEBA_NXZ + * @symbol ?needsInitLighting\@SubChunk\@\@QEBA_NXZ */ MCAPI bool needsInitLighting() const; /** - * @symbol ??4SubChunk\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SubChunk\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SubChunk & operator=(struct SubChunk &&); /** - * @symbol ?prune\@SubChunk\@\@QEAAXW4PruneType\@SubChunkStorageUnit\@\@\@Z + * @symbol ?prune\@SubChunk\@\@QEAAXW4PruneType\@SubChunkStorageUnit\@\@\@Z */ MCAPI void prune(enum class SubChunkStorageUnit::PruneType); /** - * @symbol ?recalculateHash\@SubChunk\@\@QEAAX_N\@Z + * @symbol ?recalculateHash\@SubChunk\@\@QEAAX_N\@Z */ MCAPI void recalculateHash(bool); /** - * @symbol ?recalculateHashAndSerialize\@SubChunk\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?recalculateHashAndSerialize\@SubChunk\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI std::string recalculateHashAndSerialize(bool); /** - * @symbol ?reset\@SubChunk\@\@QEAAXPEBVBlock\@\@_N1\@Z + * @symbol ?reset\@SubChunk\@\@QEAAXPEBVBlock\@\@_N1\@Z */ MCAPI void reset(class Block const *, bool, bool); /** - * @symbol ?safeToModify\@SubChunk\@\@QEBA_NXZ + * @symbol ?safeToModify\@SubChunk\@\@QEBA_NXZ */ MCAPI bool safeToModify() const; /** - * @symbol ?serialize\@SubChunk\@\@QEBAXAEAVIDataOutput\@\@_N\@Z + * @symbol ?serialize\@SubChunk\@\@QEBAXAEAVIDataOutput\@\@_N\@Z */ MCAPI void serialize(class IDataOutput &, bool) const; /** - * @symbol ?setAllIsMaxSkyLight\@SubChunk\@\@QEAAXXZ + * @symbol ?setAllIsMaxSkyLight\@SubChunk\@\@QEAAXXZ */ MCAPI void setAllIsMaxSkyLight(); /** - * @symbol ?setAllIsNoSkyLight\@SubChunk\@\@QEAAXXZ + * @symbol ?setAllIsNoSkyLight\@SubChunk\@\@QEAAXXZ */ MCAPI void setAllIsNoSkyLight(); /** - * @symbol ?setBlockLight\@SubChunk\@\@QEAAXGE\@Z + * @symbol ?setBlockLight\@SubChunk\@\@QEAAXGE\@Z */ MCAPI void setBlockLight(unsigned short, unsigned char); /** - * @symbol ?setFromBlockVolume\@SubChunk\@\@QEAAXAEBVBlockVolume\@\@F\@Z + * @symbol ?setFromBlockVolume\@SubChunk\@\@QEAAXAEBVBlockVolume\@\@F\@Z */ MCAPI void setFromBlockVolume(class BlockVolume const &, short); /** - * @symbol ?setNeedsClientLighting\@SubChunk\@\@QEAAX_N\@Z + * @symbol ?setNeedsClientLighting\@SubChunk\@\@QEAAX_N\@Z */ MCAPI void setNeedsClientLighting(bool); /** - * @symbol ?setNeedsInitLighting\@SubChunk\@\@QEAAX_N\@Z + * @symbol ?setNeedsInitLighting\@SubChunk\@\@QEAAX_N\@Z */ MCAPI void setNeedsInitLighting(bool); /** - * @symbol ?setSkyLight\@SubChunk\@\@QEAAXGE\@Z + * @symbol ?setSkyLight\@SubChunk\@\@QEAAXGE\@Z */ MCAPI void setSkyLight(unsigned short, unsigned char); /** - * @symbol ?setSubChunkState\@SubChunk\@\@QEAAXW4SubChunkState\@1\@\@Z + * @symbol ?setSubChunkState\@SubChunk\@\@QEAAXW4SubChunkState\@1\@\@Z */ MCAPI void setSubChunkState(enum class SubChunk::SubChunkState); /** - * @symbol ?shutdown\@SubChunk\@\@QEAAXXZ + * @symbol ?shutdown\@SubChunk\@\@QEAAXXZ */ MCAPI void shutdown(); /** - * @symbol ??1SubChunk\@\@QEAA\@XZ + * @symbol ??1SubChunk\@\@QEAA\@XZ */ MCAPI ~SubChunk(); /** - * @symbol ?flushGarbageCollectors\@SubChunk\@\@SAXXZ + * @symbol ?flushGarbageCollectors\@SubChunk\@\@SAXXZ */ MCAPI static void flushGarbageCollectors(); //protected: /** - * @symbol ?_createBlockLightStorage\@SubChunk\@\@IEAAXXZ + * @symbol ?_createBlockLightStorage\@SubChunk\@\@IEAAXXZ */ MCAPI void _createBlockLightStorage(); /** - * @symbol ?_createSkyLightStorage\@SubChunk\@\@IEAAXXZ + * @symbol ?_createSkyLightStorage\@SubChunk\@\@IEAAXXZ */ MCAPI void _createSkyLightStorage(); /** - * @symbol ?_replaceBlocks\@SubChunk\@\@IEAAXEV?$unique_ptr\@V?$SubChunkStorage\@VBlock\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBlock\@\@\@\@\@std\@\@\@std\@\@AEAV?$LockGuard\@VSpinLock\@\@\@Threading\@Bedrock\@\@\@Z + * @symbol ?_replaceBlocks\@SubChunk\@\@IEAAXEV?$unique_ptr\@V?$SubChunkStorage\@VBlock\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBlock\@\@\@\@\@std\@\@\@std\@\@AEAV?$LockGuard\@VSpinLock\@\@\@Threading\@Bedrock\@\@\@Z */ MCAPI void _replaceBlocks(unsigned char, std::unique_ptr>, class Bedrock::Threading::LockGuard &); /** - * @symbol ?_resetLight\@SubChunk\@\@IEAAX_N0\@Z + * @symbol ?_resetLight\@SubChunk\@\@IEAAX_N0\@Z */ MCAPI void _resetLight(bool, bool); /** - * @symbol ?_setBlock\@SubChunk\@\@IEAAXEGAEBVBlock\@\@\@Z + * @symbol ?_setBlock\@SubChunk\@\@IEAAXEGAEBVBlock\@\@\@Z */ MCAPI void _setBlock(unsigned char, unsigned short, class Block const &); diff --git a/LiteLoader/include/llapi/mc/SubChunkBlockStorageUtil.hpp b/LiteLoader/include/llapi/mc/SubChunkBlockStorageUtil.hpp index 9a85877bf0..3e1321dada 100644 --- a/LiteLoader/include/llapi/mc/SubChunkBlockStorageUtil.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkBlockStorageUtil.hpp @@ -22,7 +22,7 @@ namespace SubChunkBlockStorageUtil { #undef AFTER_EXTRA /** - * @symbol ?makeDeserialized\@SubChunkBlockStorageUtil\@\@YA?AV?$unique_ptr\@V?$SubChunkStorage\@VBlock\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBlock\@\@\@\@\@std\@\@\@std\@\@AEAVIDataInput\@\@AEBVBlockPalette\@\@AEBV?$function\@$$A6APEBVBlock\@\@_K\@Z\@3\@AEBV?$function\@$$A6APEBVBlock\@\@AEBVCompoundTag\@\@\@Z\@3\@W4SubChunkFormat\@\@\@Z + * @symbol ?makeDeserialized\@SubChunkBlockStorageUtil\@\@YA?AV?$unique_ptr\@V?$SubChunkStorage\@VBlock\@\@\@\@U?$default_delete\@V?$SubChunkStorage\@VBlock\@\@\@\@\@std\@\@\@std\@\@AEAVIDataInput\@\@AEBVBlockPalette\@\@AEBV?$function\@$$A6APEBVBlock\@\@_K\@Z\@3\@AEBV?$function\@$$A6APEBVBlock\@\@AEBVCompoundTag\@\@\@Z\@3\@W4SubChunkFormat\@\@\@Z */ MCAPI std::unique_ptr> makeDeserialized(class IDataInput &, class BlockPalette const &, class std::function const &, class std::function const &, enum class SubChunkFormat); diff --git a/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp b/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp index 9b315600a3..670f95ed65 100644 --- a/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkBrightnessStorage.hpp @@ -29,12 +29,12 @@ class SubChunkBrightnessStorage { public: /** - * @symbol ??0SubChunkBrightnessStorage\@\@QEAA\@XZ + * @symbol ??0SubChunkBrightnessStorage\@\@QEAA\@XZ */ MCAPI SubChunkBrightnessStorage(); /** - * @symbol ?reset\@SubChunkBrightnessStorage\@\@QEAAX_N\@Z + * @symbol ?reset\@SubChunkBrightnessStorage\@\@QEAAX_N\@Z */ MCAPI void reset(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubChunkInterlocker.hpp b/LiteLoader/include/llapi/mc/SubChunkInterlocker.hpp index f2e7894dac..0cda6ba57f 100644 --- a/LiteLoader/include/llapi/mc/SubChunkInterlocker.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkInterlocker.hpp @@ -28,12 +28,12 @@ class SubChunkInterlocker { public: /** - * @symbol ?tryLock3x3xN\@SubChunkInterlocker\@\@QEAA_NAEBVSubChunkPos\@\@H\@Z + * @symbol ?tryLock3x3xN\@SubChunkInterlocker\@\@QEAA_NAEBVSubChunkPos\@\@H\@Z */ MCAPI bool tryLock3x3xN(class SubChunkPos const &, int); /** - * @symbol ?unlock3x3xN\@SubChunkInterlocker\@\@QEAAXAEBVSubChunkPos\@\@H\@Z + * @symbol ?unlock3x3xN\@SubChunkInterlocker\@\@QEAAXAEBVSubChunkPos\@\@H\@Z */ MCAPI void unlock3x3xN(class SubChunkPos const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp index 0e676e0dd4..8600ffb399 100644 --- a/LiteLoader/include/llapi/mc/SubChunkPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkPacket.hpp @@ -32,37 +32,43 @@ class SubChunkPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SubChunkPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SubChunkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SubChunkPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SubChunkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SubChunkPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SubChunkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SubChunkPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SubChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SubChunkPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUBCHUNKPACKET /** - * @symbol ??0SubChunkPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SubChunkPacket(); + MCVAPI ~SubChunkPacket(); +#endif /** - * @symbol ??0SubChunkPacket\@\@QEAA\@AEBV?$AutomaticID\@VDimension\@\@H\@\@AEBVSubChunkPos\@\@_N\@Z + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubChunkPos.hpp b/LiteLoader/include/llapi/mc/SubChunkPos.hpp index 6633744d8e..4ea6c24d96 100644 --- a/LiteLoader/include/llapi/mc/SubChunkPos.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkPos.hpp @@ -28,7 +28,7 @@ class SubChunkPos { inline SubChunkPos(int ix, int iy, int iz) : x(ix), y(iy), z(iz) {} - constexpr int& operator[](size_t index) { + [[nodiscard]] constexpr int& operator[](size_t index) { switch (index) { case 1: return y; @@ -39,7 +39,7 @@ class SubChunkPos { } } - constexpr int operator[](size_t index) const { + [[nodiscard]] constexpr int operator[](size_t index) const { switch (index) { case 1: return y; @@ -63,28 +63,28 @@ class SubChunkPos { public: /** - * @symbol ??0SubChunkPos\@\@QEAA\@AEBVBlockPos\@\@\@Z + * @symbol ??0SubChunkPos\@\@QEAA\@AEBVBlockPos\@\@\@Z */ MCAPI SubChunkPos(class BlockPos const &); /** - * @symbol ??BSubChunkPos\@\@QEBA?AVBlockPos\@\@XZ + * @symbol ??BSubChunkPos\@\@QEBA?AVBlockPos\@\@XZ */ MCAPI operator class BlockPos() const; /** - * @symbol ?MAX\@SubChunkPos\@\@2V1\@B + * @symbol ?MAX\@SubChunkPos\@\@2V1\@B */ MCAPI static class SubChunkPos const MAX; /** - * @symbol ?MIN\@SubChunkPos\@\@2V1\@B + * @symbol ?MIN\@SubChunkPos\@\@2V1\@B */ MCAPI static class SubChunkPos const MIN; /** - * @symbol ?ONE\@SubChunkPos\@\@2V1\@B + * @symbol ?ONE\@SubChunkPos\@\@2V1\@B */ MCAPI static class SubChunkPos const ONE; /** - * @symbol ?ZERO\@SubChunkPos\@\@2V1\@B + * @symbol ?ZERO\@SubChunkPos\@\@2V1\@B */ MCAPI static class SubChunkPos const ZERO; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp index 76d607412b..3d8472b3eb 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRelighter.hpp @@ -31,156 +31,156 @@ class SubChunkRelighter { public: /** - * @symbol ??0SubChunkRelighter\@\@QEAA\@AEAVBlockSource\@\@_KAEBVChunkPos\@\@_N3\@Z + * @symbol ??0SubChunkRelighter\@\@QEAA\@AEAVBlockSource\@\@_KAEBVChunkPos\@\@_N3\@Z */ MCAPI SubChunkRelighter(class BlockSource &, unsigned __int64, class ChunkPos const &, bool, bool); /** - * @symbol ?_getAbsorption\@SubChunkRelighter\@\@QEBAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAE\@Z + * @symbol ?_getAbsorption\@SubChunkRelighter\@\@QEBAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAE\@Z */ MCAPI struct SubChunk * _getAbsorption(struct SubChunkLightIndex, unsigned char &) const; /** - * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z - */ - MCAPI void _propagateBlockLight(struct SubChunkLightIndex, unsigned char); - /** - * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXXZ + * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXXZ */ MCAPI void _propagateBlockLight(); /** - * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + * @symbol ?_propagateBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ - MCAPI void _propagateSkyLight(struct SubChunkLightIndex, unsigned char); + MCAPI void _propagateBlockLight(struct SubChunkLightIndex, unsigned char); /** - * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXXZ + * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXXZ */ MCAPI void _propagateSkyLight(); /** - * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + * @symbol ?_propagateSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + */ + MCAPI void _propagateSkyLight(struct SubChunkLightIndex, unsigned char); + /** + * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _propagateSubtractiveBlockLight(struct SubChunkLightIndex, unsigned char); /** - * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXXZ + * @symbol ?_propagateSubtractiveBlockLight\@SubChunkRelighter\@\@QEAAXXZ */ MCAPI void _propagateSubtractiveBlockLight(); /** - * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXXZ */ - MCAPI void _propagateSubtractiveSkyLight(struct SubChunkLightIndex, unsigned char); + MCAPI void _propagateSubtractiveSkyLight(); /** - * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXXZ + * @symbol ?_propagateSubtractiveSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ - MCAPI void _propagateSubtractiveSkyLight(); + MCAPI void _propagateSubtractiveSkyLight(struct SubChunkLightIndex, unsigned char); /** - * @symbol ?_setLightHelper\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@UBrightness\@\@111II\@Z + * @symbol ?_setLightHelper\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@UBrightness\@\@111II\@Z */ MCAPI void _setLightHelper(struct SubChunkLightIndex, struct Brightness, struct Brightness, struct Brightness, struct Brightness, unsigned int, unsigned int); /** - * @symbol ?_setPropagatedBlockLightValue\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + * @symbol ?_setPropagatedBlockLightValue\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _setPropagatedBlockLightValue(struct SubChunkLightIndex, unsigned char); /** - * @symbol ?_setPropagatedSkyLightValue\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z + * @symbol ?_setPropagatedSkyLightValue\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@E\@Z */ MCAPI void _setPropagatedSkyLightValue(struct SubChunkLightIndex, unsigned char); /** - * @symbol ?_setSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@UBrightness\@\@111\@Z + * @symbol ?_setSkyLight\@SubChunkRelighter\@\@QEAAXUSubChunkLightIndex\@\@UBrightness\@\@111\@Z */ MCAPI void _setSkyLight(struct SubChunkLightIndex, struct Brightness, struct Brightness, struct Brightness, struct Brightness); /** - * @symbol ?getBlock\@SubChunkRelighter\@\@QEAAXAEBVPos\@\@AEAPEBVBlock\@\@1\@Z + * @symbol ?getBlock\@SubChunkRelighter\@\@QEAAXAEBVPos\@\@AEAPEBVBlock\@\@1\@Z */ MCAPI void getBlock(class Pos const &, class Block const *&, class Block const *&); /** - * @symbol ?getCentralSubchunkOrigin\@SubChunkRelighter\@\@QEAA?AVPos\@\@XZ + * @symbol ?getCentralSubchunkOrigin\@SubChunkRelighter\@\@QEAA?AVPos\@\@XZ */ MCAPI class Pos getCentralSubchunkOrigin(); /** - * @symbol ?getLightPair\@SubChunkRelighter\@\@QEBA?AULightPair\@SubChunkBrightnessStorage\@\@AEBVPos\@\@\@Z + * @symbol ?getLightPair\@SubChunkRelighter\@\@QEBA?AULightPair\@SubChunkBrightnessStorage\@\@AEBVPos\@\@\@Z */ MCAPI struct SubChunkBrightnessStorage::LightPair getLightPair(class Pos const &) const; /** - * @symbol ?getLightPairWithPlaceholderCheck\@SubChunkRelighter\@\@QEBA?AULightPair\@SubChunkBrightnessStorage\@\@AEBVPos\@\@AEBU23\@\@Z + * @symbol ?getLightPairWithPlaceholderCheck\@SubChunkRelighter\@\@QEBA?AULightPair\@SubChunkBrightnessStorage\@\@AEBVPos\@\@AEBU23\@\@Z */ MCAPI struct SubChunkBrightnessStorage::LightPair getLightPairWithPlaceholderCheck(class Pos const &, struct SubChunkBrightnessStorage::LightPair const &) const; /** - * @symbol ?getTouchedSubChunks\@SubChunkRelighter\@\@QEAAXAEAV?$vector\@VPos\@\@V?$allocator\@VPos\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?getTouchedSubChunks\@SubChunkRelighter\@\@QEAAXAEAV?$vector\@VPos\@\@V?$allocator\@VPos\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void getTouchedSubChunks(std::vector &); /** - * @symbol ?setBlockLight\@SubChunkRelighter\@\@QEAAXAEBVPos\@\@UBrightness\@\@111\@Z + * @symbol ?setBlockLight\@SubChunkRelighter\@\@QEAAXAEBVPos\@\@UBrightness\@\@111\@Z */ MCAPI void setBlockLight(class Pos const &, struct Brightness, struct Brightness, struct Brightness, struct Brightness); /** - * @symbol ?setSkyLight\@SubChunkRelighter\@\@QEAAXAEBVPos\@\@UBrightness\@\@111\@Z + * @symbol ?setSkyLight\@SubChunkRelighter\@\@QEAAXAEBVPos\@\@UBrightness\@\@111\@Z */ MCAPI void setSkyLight(class Pos const &, struct Brightness, struct Brightness, struct Brightness, struct Brightness); /** - * @symbol ?update\@SubChunkRelighter\@\@QEAAXAEBVBlockPos\@\@_K\@Z + * @symbol ?update\@SubChunkRelighter\@\@QEAAXAEBVBlockPos\@\@_K\@Z */ MCAPI void update(class BlockPos const &, unsigned __int64); /** - * @symbol ??1SubChunkRelighter\@\@QEAA\@XZ + * @symbol ??1SubChunkRelighter\@\@QEAA\@XZ */ MCAPI ~SubChunkRelighter(); /** - * @symbol ?computeAllSubChunkBorderBitsExceptTheOuterEdgeOfComputationBits\@SubChunkRelighter\@\@SA?AV?$bitset\@$0DAAAA\@\@std\@\@XZ + * @symbol ?computeAllSubChunkBorderBitsExceptTheOuterEdgeOfComputationBits\@SubChunkRelighter\@\@SA?AV?$bitset\@$0DAAAA\@\@std\@\@XZ */ MCAPI static class std::bitset<196608> computeAllSubChunkBorderBitsExceptTheOuterEdgeOfComputationBits(); /** - * @symbol ?computeOuterEdgeOfComputationBits\@SubChunkRelighter\@\@SA?AV?$bitset\@$0DAAAA\@\@std\@\@XZ + * @symbol ?computeOuterEdgeOfComputationBits\@SubChunkRelighter\@\@SA?AV?$bitset\@$0DAAAA\@\@std\@\@XZ */ MCAPI static class std::bitset<196608> computeOuterEdgeOfComputationBits(); /** - * @symbol ?initializeStatics\@SubChunkRelighter\@\@SAXXZ + * @symbol ?initializeStatics\@SubChunkRelighter\@\@SAXXZ */ MCAPI static void initializeStatics(); /** - * @symbol ?shutdownStatics\@SubChunkRelighter\@\@SAXXZ + * @symbol ?shutdownStatics\@SubChunkRelighter\@\@SAXXZ */ MCAPI static void shutdownStatics(); //private: /** - * @symbol ?_dirtySubChunk\@SubChunkRelighter\@\@AEAAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAI\@Z + * @symbol ?_dirtySubChunk\@SubChunkRelighter\@\@AEAAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAI\@Z */ MCAPI struct SubChunk * _dirtySubChunk(struct SubChunkLightIndex, unsigned int &); /** - * @symbol ?_getBlock\@SubChunkRelighter\@\@AEBAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAPEBVBlock\@\@1\@Z + * @symbol ?_getBlock\@SubChunkRelighter\@\@AEBAPEAUSubChunk\@\@USubChunkLightIndex\@\@AEAPEBVBlock\@\@1\@Z */ MCAPI struct SubChunk * _getBlock(struct SubChunkLightIndex, class Block const *&, class Block const *&) const; /** - * @symbol ?_getLight\@SubChunkRelighter\@\@AEAAEUSubChunkLightIndex\@\@\@Z + * @symbol ?_getLight\@SubChunkRelighter\@\@AEAAEUSubChunkLightIndex\@\@\@Z */ MCAPI unsigned char _getLight(struct SubChunkLightIndex); /** - * @symbol ?_getLightPair\@SubChunkRelighter\@\@AEBA?AULightPair\@SubChunkBrightnessStorage\@\@USubChunkLightIndex\@\@\@Z + * @symbol ?_getLightPair\@SubChunkRelighter\@\@AEBA?AULightPair\@SubChunkBrightnessStorage\@\@USubChunkLightIndex\@\@\@Z */ MCAPI struct SubChunkBrightnessStorage::LightPair _getLightPair(struct SubChunkLightIndex) const; private: /** - * @symbol ?mAllSubChunkBorderBitsExceptTheOuterEdgeOfComputationBits\@SubChunkRelighter\@\@0V?$bitset\@$0DAAAA\@\@std\@\@A + * @symbol ?mAllSubChunkBorderBitsExceptTheOuterEdgeOfComputationBits\@SubChunkRelighter\@\@0V?$bitset\@$0DAAAA\@\@std\@\@A */ MCAPI static class std::bitset<196608> mAllSubChunkBorderBitsExceptTheOuterEdgeOfComputationBits; /** - * @symbol ?mOuterEdgeOfComputationBits\@SubChunkRelighter\@\@0V?$bitset\@$0DAAAA\@\@std\@\@A + * @symbol ?mOuterEdgeOfComputationBits\@SubChunkRelighter\@\@0V?$bitset\@$0DAAAA\@\@std\@\@A */ MCAPI static class std::bitset<196608> mOuterEdgeOfComputationBits; /** - * @symbol ?sDarkSpinLock\@SubChunkRelighter\@\@0VSpinLock\@\@A + * @symbol ?sDarkSpinLock\@SubChunkRelighter\@\@0VSpinLock\@\@A */ MCAPI static class SpinLock sDarkSpinLock; /** - * @symbol ?sFullyDarkSubChunk\@SubChunkRelighter\@\@0USubChunk\@\@A + * @symbol ?sFullyDarkSubChunk\@SubChunkRelighter\@\@0USubChunk\@\@A */ MCAPI static struct SubChunk sFullyDarkSubChunk; /** - * @symbol ?sFullyLitSubChunk\@SubChunkRelighter\@\@0USubChunk\@\@A + * @symbol ?sFullyLitSubChunk\@SubChunkRelighter\@\@0USubChunk\@\@A */ MCAPI static struct SubChunk sFullyLitSubChunk; /** - * @symbol ?sLitSpinLock\@SubChunkRelighter\@\@0VSpinLock\@\@A + * @symbol ?sLitSpinLock\@SubChunkRelighter\@\@0VSpinLock\@\@A */ MCAPI static class SpinLock sLitSpinLock; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp index a6a6884aa3..5704be4e23 100644 --- a/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubChunkRequestPacket.hpp @@ -30,33 +30,33 @@ class SubChunkRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SubChunkRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SubChunkRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SubChunkRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SubChunkRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SubChunkRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SubChunkRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SubChunkRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SubChunkRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SubChunkRequestPacket\@\@QEAA\@XZ + * @symbol ??0SubChunkRequestPacket\@\@QEAA\@XZ */ MCAPI SubChunkRequestPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp index 9ef51ac7ac..c02b138bfe 100644 --- a/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp +++ b/LiteLoader/include/llapi/mc/SubClientConnectionRequest.hpp @@ -30,176 +30,176 @@ class SubClientConnectionRequest { public: /** - * @symbol ??0SubClientConnectionRequest\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0SubClientConnectionRequest\@\@QEAA\@AEBV0\@\@Z */ MCAPI SubClientConnectionRequest(class SubClientConnectionRequest const &); /** - * @symbol ?getAnimatedImageData\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@VAnimatedImageData\@\@V?$allocator\@VAnimatedImageData\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getAnimatedImageData\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@VAnimatedImageData\@\@V?$allocator\@VAnimatedImageData\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getAnimatedImageData() const; /** - * @symbol ?getArmSize\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getArmSize\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getArmSize() const; /** - * @symbol ?getCapeData\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ + * @symbol ?getCapeData\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ */ MCAPI std::vector getCapeData() const; /** - * @symbol ?getCapeId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getCapeId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getCapeId() const; /** - * @symbol ?getCapeImageHeight\@SubClientConnectionRequest\@\@QEBAGXZ + * @symbol ?getCapeImageHeight\@SubClientConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getCapeImageHeight() const; /** - * @symbol ?getCapeImageWidth\@SubClientConnectionRequest\@\@QEBAGXZ + * @symbol ?getCapeImageWidth\@SubClientConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getCapeImageWidth() const; /** - * @symbol ?getCertificate\@SubClientConnectionRequest\@\@QEBAPEBVCertificate\@\@XZ + * @symbol ?getCertificate\@SubClientConnectionRequest\@\@QEBAPEBVCertificate\@\@XZ */ MCAPI class Certificate const * getCertificate() const; /** - * @symbol ?getClientRandomId\@SubClientConnectionRequest\@\@QEBA_KXZ + * @symbol ?getClientRandomId\@SubClientConnectionRequest\@\@QEBA_KXZ */ MCAPI unsigned __int64 getClientRandomId() const; /** - * @symbol ?getDeviceId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getDeviceId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getDeviceId() const; /** - * @symbol ?getDeviceOS\@SubClientConnectionRequest\@\@QEBA?AW4BuildPlatform\@\@XZ + * @symbol ?getDeviceOS\@SubClientConnectionRequest\@\@QEBA?AW4BuildPlatform\@\@XZ */ MCAPI enum class BuildPlatform getDeviceOS() const; /** - * @symbol ?getPersonaPieces\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@VSerializedPersonaPieceHandle\@\@V?$allocator\@VSerializedPersonaPieceHandle\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getPersonaPieces\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@VSerializedPersonaPieceHandle\@\@V?$allocator\@VSerializedPersonaPieceHandle\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getPersonaPieces() const; /** - * @symbol ?getPieceTintColors\@SubClientConnectionRequest\@\@QEBA?AV?$unordered_map\@W4PieceType\@persona\@\@VTintMapColor\@\@U?$hash\@W4PieceType\@persona\@\@\@std\@\@U?$equal_to\@W4PieceType\@persona\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4PieceType\@persona\@\@VTintMapColor\@\@\@std\@\@\@5\@\@std\@\@XZ + * @symbol ?getPieceTintColors\@SubClientConnectionRequest\@\@QEBA?AV?$unordered_map\@W4PieceType\@persona\@\@VTintMapColor\@\@U?$hash\@W4PieceType\@persona\@\@\@std\@\@U?$equal_to\@W4PieceType\@persona\@\@\@5\@V?$allocator\@U?$pair\@$$CBW4PieceType\@persona\@\@VTintMapColor\@\@\@std\@\@\@5\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> getPieceTintColors() const; /** - * @symbol ?getPlatformId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlatformId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPlatformId() const; /** - * @symbol ?getPlatformOfflineId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlatformOfflineId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPlatformOfflineId() const; /** - * @symbol ?getPlatformOnlineId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlatformOnlineId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPlatformOnlineId() const; /** - * @symbol ?getPlayFabId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getPlayFabId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getPlayFabId() const; /** - * @symbol ?getSelfSignedId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSelfSignedId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSelfSignedId() const; /** - * @symbol ?getSkinAnimationData\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinAnimationData\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinAnimationData() const; /** - * @symbol ?getSkinColor\@SubClientConnectionRequest\@\@QEBA?AVColor\@mce\@\@XZ + * @symbol ?getSkinColor\@SubClientConnectionRequest\@\@QEBA?AVColor\@mce\@\@XZ */ MCAPI class mce::Color getSkinColor() const; /** - * @symbol ?getSkinData\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ + * @symbol ?getSkinData\@SubClientConnectionRequest\@\@QEBA?AV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@XZ */ MCAPI std::vector getSkinData() const; /** - * @symbol ?getSkinGeometry\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinGeometry\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinGeometry() const; /** - * @symbol ?getSkinGeometryEngineVersion\@SubClientConnectionRequest\@\@QEBA?AVSemVersion\@\@XZ + * @symbol ?getSkinGeometryEngineVersion\@SubClientConnectionRequest\@\@QEBA?AVSemVersion\@\@XZ */ MCAPI class SemVersion getSkinGeometryEngineVersion() const; /** - * @symbol ?getSkinId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinId\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinId() const; /** - * @symbol ?getSkinImageHeight\@SubClientConnectionRequest\@\@QEBAGXZ + * @symbol ?getSkinImageHeight\@SubClientConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getSkinImageHeight() const; /** - * @symbol ?getSkinImageWidth\@SubClientConnectionRequest\@\@QEBAGXZ + * @symbol ?getSkinImageWidth\@SubClientConnectionRequest\@\@QEBAGXZ */ MCAPI unsigned short getSkinImageWidth() const; /** - * @symbol ?getSkinResourcePatch\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getSkinResourcePatch\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getSkinResourcePatch() const; /** - * @symbol ?getThirdPartyName\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getThirdPartyName\@SubClientConnectionRequest\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getThirdPartyName() const; /** - * @symbol ?isCapeOnClassicSkin\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isCapeOnClassicSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isCapeOnClassicSkin() const; /** - * @symbol ?isOverrideSkin\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isOverrideSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isOverrideSkin() const; /** - * @symbol ?isPersonaSkin\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isPersonaSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isPersonaSkin() const; /** - * @symbol ?isPremiumSkin\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isPremiumSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isPremiumSkin() const; /** - * @symbol ?isPrimaryUser\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isPrimaryUser\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isPrimaryUser() const; /** - * @symbol ?isThirdPartyNameOnly\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isThirdPartyNameOnly\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isThirdPartyNameOnly() const; /** - * @symbol ?isTrustedSkin\@SubClientConnectionRequest\@\@QEBA_NXZ + * @symbol ?isTrustedSkin\@SubClientConnectionRequest\@\@QEBA_NXZ */ MCAPI bool isTrustedSkin() const; /** - * @symbol ?toString\@SubClientConnectionRequest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@SubClientConnectionRequest\@\@QEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString(); /** - * @symbol ?verify\@SubClientConnectionRequest\@\@QEAA_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\@\@_J\@Z + * @symbol ?verify\@SubClientConnectionRequest\@\@QEAA_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\@\@_J\@Z */ MCAPI bool verify(std::vector const &, __int64); /** - * @symbol ?verifySelfSigned\@SubClientConnectionRequest\@\@QEAA_NXZ + * @symbol ?verifySelfSigned\@SubClientConnectionRequest\@\@QEAA_NXZ */ MCAPI bool verifySelfSigned(); /** - * @symbol ??1SubClientConnectionRequest\@\@QEAA\@XZ + * @symbol ??1SubClientConnectionRequest\@\@QEAA\@XZ */ MCAPI ~SubClientConnectionRequest(); /** - * @symbol ?fromString\@SubClientConnectionRequest\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@SubClientConnectionRequest\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class SubClientConnectionRequest fromString(std::string const &); //private: /** - * @symbol ??0SubClientConnectionRequest\@\@AEAA\@V?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z + * @symbol ??0SubClientConnectionRequest\@\@AEAA\@V?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@2\@\@Z */ 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\@Z */ MCAPI std::unique_ptr validate(std::unique_ptr, __int64) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp index b897561d51..967a0fe6c7 100644 --- a/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp +++ b/LiteLoader/include/llapi/mc/SubClientLoginPacket.hpp @@ -30,38 +30,38 @@ class SubClientLoginPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SubClientLoginPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SubClientLoginPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SubClientLoginPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SubClientLoginPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SubClientLoginPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SubClientLoginPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SubClientLoginPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 5 - * @symbol ?disallowBatching\@SubClientLoginPacket\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?disallowBatching\@SubClientLoginPacket\@\@UEBA_NXZ */ virtual bool disallowBatching() const; /** - * @vftbl 6 - * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SubClientLoginPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0SubClientLoginPacket\@\@QEAA\@XZ + * @symbol ??0SubClientLoginPacket\@\@QEAA\@XZ */ MCAPI SubClientLoginPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubmitCallback.hpp b/LiteLoader/include/llapi/mc/SubmitCallback.hpp index 7a48dec54a..0131a478a6 100644 --- a/LiteLoader/include/llapi/mc/SubmitCallback.hpp +++ b/LiteLoader/include/llapi/mc/SubmitCallback.hpp @@ -28,12 +28,12 @@ class SubmitCallback { public: /** - * @symbol ?Register\@SubmitCallback\@\@QEAAJPEAXP6AX0PEAUXTaskQueueObject\@\@W4XTaskQueuePort\@\@\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z + * @symbol ?Register\@SubmitCallback\@\@QEAAJPEAXP6AX0PEAUXTaskQueueObject\@\@W4XTaskQueuePort\@\@\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z */ MCAPI long Register(void *, void ( *)(void *, struct XTaskQueueObject *, enum class XTaskQueuePort), struct XTaskQueueRegistrationToken *); /** - * @symbol ?Unregister\@SubmitCallback\@\@QEAAXUXTaskQueueRegistrationToken\@\@\@Z + * @symbol ?Unregister\@SubmitCallback\@\@QEAAXUXTaskQueueRegistrationToken\@\@\@Z */ MCAPI void Unregister(struct XTaskQueueRegistrationToken); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubpackInfo.hpp b/LiteLoader/include/llapi/mc/SubpackInfo.hpp index 3dacba69be..28155e6096 100644 --- a/LiteLoader/include/llapi/mc/SubpackInfo.hpp +++ b/LiteLoader/include/llapi/mc/SubpackInfo.hpp @@ -28,7 +28,7 @@ struct SubpackInfo { public: /** - * @symbol ??1SubpackInfo\@\@QEAA\@XZ + * @symbol ??1SubpackInfo\@\@QEAA\@XZ */ MCAPI ~SubpackInfo(); diff --git a/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp b/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp index 171a61c832..8aae0ef8f1 100644 --- a/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp +++ b/LiteLoader/include/llapi/mc/SubpackInfoCollection.hpp @@ -28,24 +28,24 @@ class SubpackInfoCollection { public: /** - * @symbol ?addSubpackInfo\@SubpackInfoCollection\@\@QEAAX$$QEAUSubpackInfo\@\@\@Z + * @symbol ?addSubpackInfo\@SubpackInfoCollection\@\@QEAAX$$QEAUSubpackInfo\@\@\@Z */ MCAPI void addSubpackInfo(struct SubpackInfo &&); /** - * @symbol ?getSubpackContentTier\@SubpackInfoCollection\@\@QEBA?AVContentTierInfo\@\@H\@Z + * @symbol ?getSubpackContentTier\@SubpackInfoCollection\@\@QEBA?AVContentTierInfo\@\@H\@Z */ MCAPI class ContentTierInfo getSubpackContentTier(int) const; /** - * @symbol ?getSubpackFolderName\@SubpackInfoCollection\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ?getSubpackFolderName\@SubpackInfoCollection\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI std::string const & getSubpackFolderName(int) const; /** - * @symbol ?getSubpackInfo\@SubpackInfoCollection\@\@QEBAAEBV?$vector\@USubpackInfo\@\@V?$allocator\@USubpackInfo\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getSubpackInfo\@SubpackInfoCollection\@\@QEBAAEBV?$vector\@USubpackInfo\@\@V?$allocator\@USubpackInfo\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getSubpackInfo() const; /** - * @symbol ?hasSubpacks\@SubpackInfoCollection\@\@QEBA_NXZ + * @symbol ?hasSubpacks\@SubpackInfoCollection\@\@QEBA_NXZ */ MCAPI bool hasSubpacks() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp b/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp index eb52463b17..660cd179f5 100644 --- a/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp +++ b/LiteLoader/include/llapi/mc/SubscribedObjectives.hpp @@ -30,12 +30,12 @@ class SubscribedObjectives { public: /** - * @symbol ?addObjective\@SubscribedObjectives\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addObjective\@SubscribedObjectives\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addObjective(std::string const &); /** - * @symbol ?removeObjective\@SubscribedObjectives\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?removeObjective\@SubscribedObjectives\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void removeObjective(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubtreeDefinition.hpp b/LiteLoader/include/llapi/mc/SubtreeDefinition.hpp index dd9eb71876..5c8eb0025d 100644 --- a/LiteLoader/include/llapi/mc/SubtreeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SubtreeDefinition.hpp @@ -32,14 +32,14 @@ class SubtreeDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SubtreeDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@SubtreeDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@SubtreeDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SubtreeNode.hpp b/LiteLoader/include/llapi/mc/SubtreeNode.hpp index 871f00fe25..50f80a882f 100644 --- a/LiteLoader/include/llapi/mc/SubtreeNode.hpp +++ b/LiteLoader/include/llapi/mc/SubtreeNode.hpp @@ -29,23 +29,23 @@ class SubtreeNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SubtreeNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@SubtreeNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@SubtreeNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@SubtreeNode\@\@MEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@SubtreeNode\@\@MEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0SubtreeNode\@\@QEAA\@XZ + * @symbol ??0SubtreeNode\@\@QEAA\@XZ */ MCAPI SubtreeNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SummonActorGoal.hpp b/LiteLoader/include/llapi/mc/SummonActorGoal.hpp index 3ec62a720c..ceca0a0e90 100644 --- a/LiteLoader/include/llapi/mc/SummonActorGoal.hpp +++ b/LiteLoader/include/llapi/mc/SummonActorGoal.hpp @@ -30,60 +30,60 @@ class SummonActorGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SummonActorGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SummonActorGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SummonActorGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SummonActorGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SummonActorGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SummonActorGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SummonActorGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SummonActorGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SummonActorGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SummonActorGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SummonActorGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SummonActorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SummonActorGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SummonActorGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@USummonSpellData\@\@V?$allocator\@USummonSpellData\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0SummonActorGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@USummonSpellData\@\@V?$allocator\@USummonSpellData\@\@\@std\@\@\@std\@\@\@Z */ MCAPI SummonActorGoal(class Mob &, std::vector const &); //private: /** - * @symbol ?_createSpellEntity\@SummonActorGoal\@\@AEBAXMMMMMHUActorDefinitionIdentifier\@\@\@Z + * @symbol ?_createSpellEntity\@SummonActorGoal\@\@AEBAXMMMMMHUActorDefinitionIdentifier\@\@\@Z */ MCAPI void _createSpellEntity(float, float, float, float, float, int, struct ActorDefinitionIdentifier) const; /** - * @symbol ?_selectBestSpell\@SummonActorGoal\@\@AEBAHAEAVActor\@\@\@Z + * @symbol ?_selectBestSpell\@SummonActorGoal\@\@AEBAHAEAVActor\@\@\@Z */ MCAPI int _selectBestSpell(class Actor &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SummonCommand.hpp b/LiteLoader/include/llapi/mc/SummonCommand.hpp index 5a821c1e85..9f5c20b069 100644 --- a/LiteLoader/include/llapi/mc/SummonCommand.hpp +++ b/LiteLoader/include/llapi/mc/SummonCommand.hpp @@ -31,18 +31,18 @@ class SummonCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SummonCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@SummonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@SummonCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@SummonCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@SummonCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SummonSpellData.hpp b/LiteLoader/include/llapi/mc/SummonSpellData.hpp index b4334ccb77..3b29a29765 100644 --- a/LiteLoader/include/llapi/mc/SummonSpellData.hpp +++ b/LiteLoader/include/llapi/mc/SummonSpellData.hpp @@ -21,17 +21,20 @@ struct SummonSpellData { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUMMONSPELLDATA public: - struct SummonSpellData& operator=(struct SummonSpellData const &) = delete; SummonSpellData() = delete; #endif public: /** - * @symbol ??0SummonSpellData\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SummonSpellData\@\@QEAA\@AEBU0\@\@Z */ MCAPI SummonSpellData(struct SummonSpellData const &); /** - * @symbol ??1SummonSpellData\@\@QEAA\@XZ + * @symbol ??4SummonSpellData\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct SummonSpellData & operator=(struct SummonSpellData const &); + /** + * @symbol ??1SummonSpellData\@\@QEAA\@XZ */ MCAPI ~SummonSpellData(); diff --git a/LiteLoader/include/llapi/mc/SummonSpellStage.hpp b/LiteLoader/include/llapi/mc/SummonSpellStage.hpp index 47d2181b6b..859d852cde 100644 --- a/LiteLoader/include/llapi/mc/SummonSpellStage.hpp +++ b/LiteLoader/include/llapi/mc/SummonSpellStage.hpp @@ -18,14 +18,17 @@ struct SummonSpellStage { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUMMONSPELLSTAGE public: - struct SummonSpellStage& operator=(struct SummonSpellStage const &) = delete; SummonSpellStage(struct SummonSpellStage const &) = delete; SummonSpellStage() = delete; #endif public: /** - * @symbol ??1SummonSpellStage\@\@QEAA\@XZ + * @symbol ??4SummonSpellStage\@\@QEAAAEAU0\@AEBU0\@\@Z + */ + MCAPI struct SummonSpellStage & operator=(struct SummonSpellStage const &); + /** + * @symbol ??1SummonSpellStage\@\@QEAA\@XZ */ MCAPI ~SummonSpellStage(); diff --git a/LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp b/LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp index 712cebd874..73a2c0c29c 100644 --- a/LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceBuilderRegistry.hpp @@ -30,8 +30,8 @@ class SurfaceBuilderRegistry { public: /** - * @symbol ?lookupForEntity\@SurfaceBuilderRegistry\@\@QEBAPEAVISurfaceBuilder\@\@AEAVEntityContext\@\@\@Z + * @symbol ?lookupForEntity\@SurfaceBuilderRegistry\@\@QEBAPEAVISurfaceBuilder\@\@AEAVEntityContext\@\@\@Z */ MCAPI class ISurfaceBuilder * lookupForEntity(class EntityContext &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SurfaceLevelCache.hpp b/LiteLoader/include/llapi/mc/SurfaceLevelCache.hpp index dbf48b85fd..d847f9dc79 100644 --- a/LiteLoader/include/llapi/mc/SurfaceLevelCache.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceLevelCache.hpp @@ -30,18 +30,24 @@ class SurfaceLevelCache { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SurfaceLevelCache(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPreliminarySurfaceLevel\@SurfaceLevelCache\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z + * @vftbl 1 + * @symbol ?getPreliminarySurfaceLevel\@SurfaceLevelCache\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z */ virtual class std::optional getPreliminarySurfaceLevel(class DividedPos2d<4>) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SURFACELEVELCACHE /** - * @symbol ??0SurfaceLevelCache\@\@QEAA\@V?$DividedPos2d\@$03\@\@AEBVIPreliminarySurfaceProvider\@\@_K\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~SurfaceLevelCache(); +#endif + /** + * @symbol ??0SurfaceLevelCache\@\@QEAA\@V?$DividedPos2d\@$03\@\@AEBVIPreliminarySurfaceProvider\@\@_K\@Z */ MCAPI SurfaceLevelCache(class DividedPos2d<4>, class IPreliminarySurfaceProvider const &, unsigned __int64); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp index 9448bc171f..1da193b9f7 100644 --- a/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentAttributes.hpp @@ -30,19 +30,19 @@ struct SurfaceMaterialAdjustmentAttributes { public: /** - * @symbol ?evaluateAdjustments\@SurfaceMaterialAdjustmentAttributes\@\@QEBA?AUSurfaceMaterialAdjustmentEvaluated\@\@AEAVRenderParams\@\@V?$not_null\@PEAVPerlinSimplexNoise\@\@\@gsl\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?evaluateAdjustments\@SurfaceMaterialAdjustmentAttributes\@\@QEBA?AUSurfaceMaterialAdjustmentEvaluated\@\@AEAVRenderParams\@\@V?$not_null\@PEAVPerlinSimplexNoise\@\@\@gsl\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI struct SurfaceMaterialAdjustmentEvaluated evaluateAdjustments(class RenderParams &, class gsl::not_null, class BlockPos const &, int, int) const; /** - * @symbol ??4SurfaceMaterialAdjustmentAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SurfaceMaterialAdjustmentAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SurfaceMaterialAdjustmentAttributes & operator=(struct SurfaceMaterialAdjustmentAttributes &&); /** - * @symbol ?parseExpressionNodeFloat\@SurfaceMaterialAdjustmentAttributes\@\@QEAAXAEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEAVExpressionNode\@\@M\@Z + * @symbol ?parseExpressionNodeFloat\@SurfaceMaterialAdjustmentAttributes\@\@QEAAXAEBVCompoundTag\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEAVExpressionNode\@\@M\@Z */ MCAPI void parseExpressionNodeFloat(class CompoundTag const &, std::string const &, std::string const &, class ExpressionNode &, float); /** - * @symbol ??1SurfaceMaterialAdjustmentAttributes\@\@QEAA\@XZ + * @symbol ??1SurfaceMaterialAdjustmentAttributes\@\@QEAA\@XZ */ MCAPI ~SurfaceMaterialAdjustmentAttributes(); diff --git a/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp index a86dc7aea4..f008bc73f5 100644 --- a/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceMaterialAdjustmentEvaluated.hpp @@ -30,15 +30,15 @@ struct SurfaceMaterialAdjustmentEvaluated { public: /** - * @symbol ?empty\@SurfaceMaterialAdjustmentEvaluated\@\@QEBA_NXZ + * @symbol ?empty\@SurfaceMaterialAdjustmentEvaluated\@\@QEBA_NXZ */ MCAPI bool empty() const; /** - * @symbol ?makeAdjustments\@SurfaceMaterialAdjustmentEvaluated\@\@QEBAXAEAUSurfaceMaterialBlocks\@\@H\@Z + * @symbol ?makeAdjustments\@SurfaceMaterialAdjustmentEvaluated\@\@QEBAXAEAUSurfaceMaterialBlocks\@\@H\@Z */ MCAPI void makeAdjustments(struct SurfaceMaterialBlocks &, int) const; /** - * @symbol ??1SurfaceMaterialAdjustmentEvaluated\@\@QEAA\@XZ + * @symbol ??1SurfaceMaterialAdjustmentEvaluated\@\@QEAA\@XZ */ MCAPI ~SurfaceMaterialAdjustmentEvaluated(); diff --git a/LiteLoader/include/llapi/mc/SurfaceMaterialAttributes.hpp b/LiteLoader/include/llapi/mc/SurfaceMaterialAttributes.hpp index bcac8b0656..f332098d65 100644 --- a/LiteLoader/include/llapi/mc/SurfaceMaterialAttributes.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceMaterialAttributes.hpp @@ -29,19 +29,19 @@ struct SurfaceMaterialAttributes { public: /** - * @symbol ??0SurfaceMaterialAttributes\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SurfaceMaterialAttributes\@\@QEAA\@$$QEAU0\@\@Z */ - MCAPI SurfaceMaterialAttributes(struct SurfaceMaterialAttributes const &); + MCAPI SurfaceMaterialAttributes(struct SurfaceMaterialAttributes &&); /** - * @symbol ??0SurfaceMaterialAttributes\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0SurfaceMaterialAttributes\@\@QEAA\@AEBU0\@\@Z */ - MCAPI SurfaceMaterialAttributes(struct SurfaceMaterialAttributes &&); + MCAPI SurfaceMaterialAttributes(struct SurfaceMaterialAttributes const &); /** - * @symbol ??4SurfaceMaterialAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SurfaceMaterialAttributes\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SurfaceMaterialAttributes & operator=(struct SurfaceMaterialAttributes &&); /** - * @symbol ??1SurfaceMaterialAttributes\@\@QEAA\@XZ + * @symbol ??1SurfaceMaterialAttributes\@\@QEAA\@XZ */ MCAPI ~SurfaceMaterialAttributes(); diff --git a/LiteLoader/include/llapi/mc/SurfaceRelativeThresholdFeature.hpp b/LiteLoader/include/llapi/mc/SurfaceRelativeThresholdFeature.hpp index 1541050d2d..7cee7346fb 100644 --- a/LiteLoader/include/llapi/mc/SurfaceRelativeThresholdFeature.hpp +++ b/LiteLoader/include/llapi/mc/SurfaceRelativeThresholdFeature.hpp @@ -29,18 +29,18 @@ class SurfaceRelativeThresholdFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SurfaceRelativeThresholdFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@SurfaceRelativeThresholdFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@SurfaceRelativeThresholdFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0SurfaceRelativeThresholdFeature\@\@QEAA\@XZ + * @symbol ??0SurfaceRelativeThresholdFeature\@\@QEAA\@XZ */ MCAPI SurfaceRelativeThresholdFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SurvivalMode.hpp b/LiteLoader/include/llapi/mc/SurvivalMode.hpp index ac14284c5d..406d7669fb 100644 --- a/LiteLoader/include/llapi/mc/SurvivalMode.hpp +++ b/LiteLoader/include/llapi/mc/SurvivalMode.hpp @@ -31,89 +31,89 @@ class SurvivalMode : public GameMode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SurvivalMode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?startDestroyBlock\@SurvivalMode\@\@UEAA_NAEBVBlockPos\@\@EAEA_N\@Z + * @vftbl 1 + * @symbol ?startDestroyBlock\@SurvivalMode\@\@UEAA_NAEBVBlockPos\@\@EAEA_N\@Z */ virtual bool startDestroyBlock(class BlockPos const &, unsigned char, bool &); /** - * @vftbl 2 - * @symbol ?destroyBlock\@SurvivalMode\@\@UEAA_NAEBVBlockPos\@\@E\@Z + * @vftbl 2 + * @symbol ?destroyBlock\@SurvivalMode\@\@UEAA_NAEBVBlockPos\@\@E\@Z */ virtual bool destroyBlock(class BlockPos const &, unsigned char); /** - * @vftbl 5 - * @symbol ?startBuildBlock\@SurvivalMode\@\@UEAAXAEBVBlockPos\@\@E\@Z + * @vftbl 5 + * @symbol ?startBuildBlock\@SurvivalMode\@\@UEAAXAEBVBlockPos\@\@E\@Z */ virtual void startBuildBlock(class BlockPos const &, unsigned char); /** - * @vftbl 6 - * @symbol ?buildBlock\@SurvivalMode\@\@UEAA_NAEBVBlockPos\@\@E_N\@Z + * @vftbl 6 + * @symbol ?buildBlock\@SurvivalMode\@\@UEAA_NAEBVBlockPos\@\@E_N\@Z */ virtual bool buildBlock(class BlockPos const &, unsigned char, bool); /** - * @vftbl 9 - * @symbol ?tick\@SurvivalMode\@\@UEAAXXZ + * @vftbl 9 + * @symbol ?tick\@SurvivalMode\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 11 - * @symbol ?useItem\@SurvivalMode\@\@UEAA_NAEAVItemStack\@\@\@Z + * @vftbl 11 + * @symbol ?useItem\@SurvivalMode\@\@UEAA_NAEAVItemStack\@\@\@Z */ virtual bool useItem(class ItemStack &); /** - * @vftbl 12 - * @symbol ?useItemOn\@SurvivalMode\@\@UEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z + * @vftbl 12 + * @symbol ?useItemOn\@SurvivalMode\@\@UEAA_NAEAVItemStack\@\@AEBVBlockPos\@\@EAEBVVec3\@\@PEBVBlock\@\@\@Z */ virtual bool useItemOn(class ItemStack &, class BlockPos const &, unsigned char, class Vec3 const &, class Block const *); /** - * @vftbl 13 - * @symbol ?interact\@SurvivalMode\@\@UEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z + * @vftbl 13 + * @symbol ?interact\@SurvivalMode\@\@UEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z */ virtual bool interact(class Actor &, class Vec3 const &); /** - * @vftbl 14 - * @symbol ?attack\@SurvivalMode\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 14 + * @symbol ?attack\@SurvivalMode\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool attack(class Actor &); /** - * @vftbl 16 - * @symbol ?setTrialMode\@SurvivalMode\@\@UEAAX_N\@Z + * @vftbl 16 + * @symbol ?setTrialMode\@SurvivalMode\@\@UEAAX_N\@Z */ virtual void setTrialMode(bool); /** - * @vftbl 17 - * @symbol ?isInTrialMode\@SurvivalMode\@\@UEAA_NXZ + * @vftbl 17 + * @symbol ?isInTrialMode\@SurvivalMode\@\@UEAA_NXZ */ virtual bool isInTrialMode(); /** - * @vftbl 18 - * @symbol ?registerUpsellScreenCallback\@SurvivalMode\@\@UEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z + * @vftbl 18 + * @symbol ?registerUpsellScreenCallback\@SurvivalMode\@\@UEAAXV?$function\@$$A6AX_N\@Z\@std\@\@\@Z */ virtual void registerUpsellScreenCallback(class std::function); /** - * @symbol ??0SurvivalMode\@\@QEAA\@AEAVPlayer\@\@\@Z + * @symbol ??0SurvivalMode\@\@QEAA\@AEAVPlayer\@\@\@Z */ MCAPI SurvivalMode(class Player &); //private: /** - * @symbol ?_messagePlayers\@SurvivalMode\@\@AEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_messagePlayers\@SurvivalMode\@\@AEAAXV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _messagePlayers(std::string); /** - * @symbol ?_showTrialReminder\@SurvivalMode\@\@AEAAX_N\@Z + * @symbol ?_showTrialReminder\@SurvivalMode\@\@AEAAX_N\@Z */ MCAPI void _showTrialReminder(bool); private: /** - * @symbol ?mTrialHasEnded\@SurvivalMode\@\@0_NA + * @symbol ?mTrialHasEnded\@SurvivalMode\@\@0_NA */ MCAPI static bool mTrialHasEnded; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SuspectTrackingComponent.hpp b/LiteLoader/include/llapi/mc/SuspectTrackingComponent.hpp index b67314c2d1..18040bd3e2 100644 --- a/LiteLoader/include/llapi/mc/SuspectTrackingComponent.hpp +++ b/LiteLoader/include/llapi/mc/SuspectTrackingComponent.hpp @@ -28,20 +28,20 @@ class SuspectTrackingComponent { public: /** - * @symbol ?clearSuspiciousPos\@SuspectTrackingComponent\@\@QEAAXXZ + * @symbol ?clearSuspiciousPos\@SuspectTrackingComponent\@\@QEAAXXZ */ MCAPI void clearSuspiciousPos(); /** - * @symbol ?getSuspiciousPos\@SuspectTrackingComponent\@\@QEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @symbol ?getSuspiciousPos\@SuspectTrackingComponent\@\@QEBA?AV?$optional\@VBlockPos\@\@\@std\@\@XZ */ MCAPI class std::optional getSuspiciousPos() const; /** - * @symbol ?getTicksSinceLastSuspect\@SuspectTrackingComponent\@\@QEBA?AV?$optional\@_K\@std\@\@AEBVILevel\@\@\@Z + * @symbol ?getTicksSinceLastSuspect\@SuspectTrackingComponent\@\@QEBA?AV?$optional\@_K\@std\@\@AEBVILevel\@\@\@Z */ MCAPI class std::optional getTicksSinceLastSuspect(class ILevel const &) const; /** - * @symbol ?setSuspiciousPos\@SuspectTrackingComponent\@\@QEAAXV?$optional\@VBlockPos\@\@\@std\@\@UTick\@\@\@Z + * @symbol ?setSuspiciousPos\@SuspectTrackingComponent\@\@QEAAXV?$optional\@VBlockPos\@\@\@std\@\@UTick\@\@\@Z */ MCAPI void setSuspiciousPos(class std::optional, struct Tick); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SuspectTrackingDefinition.hpp b/LiteLoader/include/llapi/mc/SuspectTrackingDefinition.hpp index 02e6478c98..dd1a2e85cb 100644 --- a/LiteLoader/include/llapi/mc/SuspectTrackingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SuspectTrackingDefinition.hpp @@ -29,12 +29,12 @@ class SuspectTrackingDefinition { public: /** - * @symbol ?initialize\@SuspectTrackingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSuspectTrackingComponent\@\@\@Z + * @symbol ?initialize\@SuspectTrackingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSuspectTrackingComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SuspectTrackingComponent &) const; /** - * @symbol ?buildSchema\@SuspectTrackingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSuspectTrackingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@SuspectTrackingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSuspectTrackingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SuspiciousSandBlock.hpp b/LiteLoader/include/llapi/mc/SuspiciousSandBlock.hpp new file mode 100644 index 0000000000..35de32bbc6 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SuspiciousSandBlock.hpp @@ -0,0 +1,273 @@ +/** + * @file SuspiciousSandBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "HeavyBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SuspiciousSandBlock : public HeavyBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUSPICIOUSSANDBLOCK +public: + class SuspiciousSandBlock& operator=(class SuspiciousSandBlock const &) = delete; + SuspiciousSandBlock(class SuspiciousSandBlock const &) = delete; + SuspiciousSandBlock() = 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\@SuspiciousSandBlock\@\@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 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 146 + * @symbol ?getVariant\@SuspiciousSandBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 152 + * @symbol ?init\@SuspiciousSandBlock\@\@UEAAAEAVBlockLegacy\@\@XZ + */ + virtual class BlockLegacy & init(); + /** + * @vftbl 156 + * @symbol __unk_vfn_156 + */ + virtual void __unk_vfn_156(); + /** + * @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 170 + * @symbol __unk_vfn_170 + */ + virtual void __unk_vfn_170(); + /** + * @vftbl 171 + * @symbol ?tick\@SuspiciousSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + */ + virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; + /** + * @vftbl 174 + * @symbol __unk_vfn_174 + */ + virtual void __unk_vfn_174(); + /** + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@SuspiciousSandBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + */ + virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + /** + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@SuspiciousSandBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + */ + virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; + /** + * @vftbl 194 + * @symbol ?getDustColor\@SuspiciousSandBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + */ + virtual class mce::Color getDustColor(class Block const &) const; + /** + * @vftbl 195 + * @symbol ?getDustParticleName\@SuspiciousSandBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + */ + virtual std::string getDustParticleName(class Block const &) const; + /** + * @vftbl 196 + * @symbol __unk_vfn_196 + */ + virtual void __unk_vfn_196(); + /** + * @vftbl 197 + * @symbol ?onLand\@SuspiciousSandBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + virtual void onLand(class BlockSource &, class BlockPos const &) const; + /** + * @symbol ??0SuspiciousSandBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI SuspiciousSandBlock(std::string const &, int); + +}; diff --git a/LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp b/LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp new file mode 100644 index 0000000000..1432dc58c1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SuspiciousSandBlockActor.hpp @@ -0,0 +1,110 @@ +/** + * @file SuspiciousSandBlockActor.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SuspiciousSandBlockActor { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SUSPICIOUSSANDBLOCKACTOR +public: + class SuspiciousSandBlockActor& operator=(class SuspiciousSandBlockActor const &) = delete; + SuspiciousSandBlockActor(class SuspiciousSandBlockActor const &) = delete; + SuspiciousSandBlockActor() = delete; +#endif + +public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUSPICIOUSSANDBLOCKACTOR + /** + * @symbol ?_getUpdatePacket\@SuspiciousSandBlockActor\@\@MEAA?AV?$unique_ptr\@VBlockActorDataPacket\@\@U?$default_delete\@VBlockActorDataPacket\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI std::unique_ptr _getUpdatePacket(class BlockSource &); + /** + * @symbol ?_onUpdatePacket\@SuspiciousSandBlockActor\@\@MEAAXAEBVCompoundTag\@\@AEAVBlockSource\@\@\@Z + */ + MCVAPI void _onUpdatePacket(class CompoundTag const &, class BlockSource &); + /** + * @symbol ?getContainerSize\@SuspiciousSandBlockActor\@\@UEBAHXZ + */ + MCVAPI int getContainerSize() const; + /** + * @symbol ?getItem\@SuspiciousSandBlockActor\@\@UEBAAEBVItemStack\@\@H\@Z + */ + MCVAPI class ItemStack const & getItem(int) const; + /** + * @symbol ?getMaxStackSize\@SuspiciousSandBlockActor\@\@UEBAHXZ + */ + MCVAPI int getMaxStackSize() const; + /** + * @symbol ?load\@SuspiciousSandBlockActor\@\@UEAAXAEAVLevel\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + */ + MCVAPI void load(class Level &, class CompoundTag const &, class DataLoadHelper &); + /** + * @symbol ?onChanged\@SuspiciousSandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + MCVAPI void onChanged(class BlockSource &); + /** + * @symbol ?onRemoved\@SuspiciousSandBlockActor\@\@UEAAXAEAVBlockSource\@\@\@Z + */ + MCVAPI void onRemoved(class BlockSource &); + /** + * @symbol ?save\@SuspiciousSandBlockActor\@\@UEBA_NAEAVCompoundTag\@\@\@Z + */ + MCVAPI bool save(class CompoundTag &) const; + /** + * @symbol ?serverInitItemStackIds\@SuspiciousSandBlockActor\@\@UEAAXHHV?$function\@$$A6AXHAEBVItemStack\@\@\@Z\@std\@\@\@Z + */ + MCVAPI void serverInitItemStackIds(int, int, class std::function); + /** + * @symbol ?setItem\@SuspiciousSandBlockActor\@\@UEAAXHAEBVItemStack\@\@\@Z + */ + MCVAPI void setItem(int, class ItemStack const &); + /** + * @symbol ?stopOpen\@SuspiciousSandBlockActor\@\@UEAAXAEAVPlayer\@\@\@Z + */ + MCVAPI void stopOpen(class Player &); +#endif + /** + * @symbol ??0SuspiciousSandBlockActor\@\@QEAA\@AEBVBlockPos\@\@W4Placement\@0\@\@Z + */ + MCAPI SuspiciousSandBlockActor(class BlockPos const &, enum class SuspiciousSandBlockActor::Placement); + /** + * @symbol ?brush\@SuspiciousSandBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + */ + MCAPI void brush(class BlockSource &, class BlockPos const &, unsigned char); + /** + * @symbol ?update\@SuspiciousSandBlockActor\@\@QEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI void update(class BlockSource &, class BlockPos const &); + /** + * @symbol ?getLootTableFromVariant\@SuspiciousSandBlockActor\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Placement\@1\@\@Z + */ + MCAPI static std::string getLootTableFromVariant(enum class SuspiciousSandBlockActor::Placement); + /** + * @symbol ?tryGet\@SuspiciousSandBlockActor\@\@SAPEAV1\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + */ + MCAPI static class SuspiciousSandBlockActor * tryGet(class BlockSource &, class BlockPos const &); + +//private: + /** + * @symbol ?_brushingCompleted\@SuspiciousSandBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + */ + MCAPI void _brushingCompleted(class BlockSource &); + /** + * @symbol ?_removeDisplayEntity\@SuspiciousSandBlockActor\@\@AEAAXAEAVBlockSource\@\@\@Z + */ + MCAPI void _removeDisplayEntity(class BlockSource &); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp index 6e050acfcf..ab9d479a40 100644 --- a/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp +++ b/LiteLoader/include/llapi/mc/SuspiciousStewItem.hpp @@ -32,93 +32,93 @@ class SuspiciousStewItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SuspiciousStewItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 86 - * @symbol ?useTimeDepleted\@SuspiciousStewItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z + * @vftbl 86 + * @symbol ?useTimeDepleted\@SuspiciousStewItem\@\@UEBA?AW4ItemUseMethod\@\@AEAVItemStack\@\@PEAVLevel\@\@PEAVPlayer\@\@\@Z */ virtual enum class ItemUseMethod useTimeDepleted(class ItemStack &, class Level *, class Player *) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SUSPICIOUSSTEWITEM /** - * @symbol ?uniqueAuxValues\@SuspiciousStewItem\@\@UEBA_NXZ + * @symbol ?uniqueAuxValues\@SuspiciousStewItem\@\@UEBA_NXZ */ MCVAPI bool uniqueAuxValues() const; #endif /** - * @symbol ??0SuspiciousStewItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z + * @symbol ??0SuspiciousStewItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@F\@Z */ MCAPI SuspiciousStewItem(std::string const &, short); /** - * @symbol ?applyStewEffect\@SuspiciousStewItem\@\@SAXAEBVItemStack\@\@AEAVActor\@\@\@Z + * @symbol ?applyStewEffect\@SuspiciousStewItem\@\@SAXAEBVItemStack\@\@AEAVActor\@\@\@Z */ MCAPI static void applyStewEffect(class ItemStack const &, class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwamplandHut.hpp b/LiteLoader/include/llapi/mc/SwamplandHut.hpp index a737fe4ddb..d74a311d3f 100644 --- a/LiteLoader/include/llapi/mc/SwamplandHut.hpp +++ b/LiteLoader/include/llapi/mc/SwamplandHut.hpp @@ -31,41 +31,41 @@ class SwamplandHut : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwamplandHut(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getType\@SwamplandHut\@\@UEBA?AW4StructurePieceType\@\@XZ + * @vftbl 2 + * @symbol ?getType\@SwamplandHut\@\@UEBA?AW4StructurePieceType\@\@XZ */ virtual enum class StructurePieceType getType() const; /** - * @vftbl 4 - * @symbol ?postProcess\@SwamplandHut\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@SwamplandHut\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 5 - * @symbol ?postProcessMobsAt\@SwamplandHut\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 5 + * @symbol ?postProcessMobsAt\@SwamplandHut\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual void postProcessMobsAt(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 12 - * @symbol ?addHardcodedSpawnAreas\@SwamplandHut\@\@UEBAXAEAVLevelChunk\@\@\@Z + * @vftbl 12 + * @symbol ?addHardcodedSpawnAreas\@SwamplandHut\@\@UEBAXAEAVLevelChunk\@\@\@Z */ virtual void addHardcodedSpawnAreas(class LevelChunk &) const; /** - * @symbol ??0SwamplandHut\@\@QEAA\@FHH\@Z + * @symbol ??0SwamplandHut\@\@QEAA\@FHH\@Z */ MCAPI SwamplandHut(short, int, int); //protected: /** - * @symbol ?placeCauldron\@SwamplandHut\@\@IEAAXAEAVBlockSource\@\@AEAVRandom\@\@HHHAEBVBoundingBox\@\@\@Z + * @symbol ?placeCauldron\@SwamplandHut\@\@IEAAXAEAVBlockSource\@\@AEAVRandom\@\@HHHAEBVBoundingBox\@\@\@Z */ MCAPI void placeCauldron(class BlockSource &, class Random &, int, int, int, class BoundingBox const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp index 23bd3fd94d..3787bd3caa 100644 --- a/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp +++ b/LiteLoader/include/llapi/mc/SweetBerryBushBlock.hpp @@ -31,333 +31,338 @@ class SweetBerryBushBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SweetBerryBushBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 4 - * @symbol ?hasTag\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 4 + * @symbol ?hasTag\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool hasTag(class BlockSource &, class BlockPos const &, class Block const &, std::string const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@SweetBerryBushBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@SweetBerryBushBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@SweetBerryBushBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@SweetBerryBushBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@SweetBerryBushBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 109 - * @symbol ?attack\@SweetBerryBushBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @vftbl 109 + * @symbol ?attack\@SweetBerryBushBlock\@\@UEBA_NPEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ virtual bool attack(class Player *, class BlockPos const &) const; /** - * @vftbl 113 - * @symbol ?entityInside\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 118 - * @symbol ?executeEvent\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z + * @vftbl 118 + * @symbol ?executeEvent\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVActor\@\@\@Z */ virtual void executeEvent(class BlockSource &, class BlockPos const &, class Block const &, std::string const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@SweetBerryBushBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 146 - * @symbol ?getVariant\@SweetBerryBushBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@SweetBerryBushBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 158 - * @symbol ?dealsContactDamage\@SweetBerryBushBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z + * @vftbl 158 + * @symbol ?dealsContactDamage\@SweetBerryBushBlock\@\@UEBA_NAEBVActor\@\@AEBVBlock\@\@_N\@Z */ virtual bool dealsContactDamage(class Actor const &, class Block const &, bool) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 172 - * @symbol ?randomTick\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@SweetBerryBushBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@SweetBerryBushBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@SweetBerryBushBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 178 - * @symbol ?canSurvive\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@SweetBerryBushBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 - * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 180 + * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@SweetBerryBushBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@SweetBerryBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@SweetBerryBushBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SWEETBERRYBUSHBLOCK /** - * @symbol ?canBeSilkTouched\@SweetBerryBushBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@SweetBerryBushBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isInteractiveBlock\@SweetBerryBushBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@SweetBerryBushBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0SweetBerryBushBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0SweetBerryBushBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI SweetBerryBushBlock(std::string const &, int); /** - * @symbol ?SLOWDOWN_MULTIPLIER\@SweetBerryBushBlock\@\@2VVec3\@\@B + * @symbol ?SLOWDOWN_MULTIPLIER\@SweetBerryBushBlock\@\@2VVec3\@\@B */ MCAPI static class Vec3 const SLOWDOWN_MULTIPLIER; //private: /** - * @symbol ?_growBush\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_growBush\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _growBush(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_pickBerries\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?_pickBerries\@SweetBerryBushBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool _pickBerries(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?_popBerries\@SweetBerryBushBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBH\@Z + * @symbol ?_popBerries\@SweetBerryBushBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBH\@Z */ MCAPI void _popBerries(class BlockSource &, class BlockPos const &, int const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwellGoal.hpp b/LiteLoader/include/llapi/mc/SwellGoal.hpp index 239c4efc5f..92a883d048 100644 --- a/LiteLoader/include/llapi/mc/SwellGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwellGoal.hpp @@ -30,48 +30,48 @@ class SwellGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwellGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SwellGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SwellGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SwellGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SwellGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SwellGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SwellGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SwellGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SwellGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SwellGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SwellGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SwellGoal\@\@QEAA\@PEAVCreeper\@\@MM\@Z + * @symbol ??0SwellGoal\@\@QEAA\@PEAVCreeper\@\@MM\@Z */ MCAPI SwellGoal(class Creeper *, float, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwiftSneakEnchant.hpp b/LiteLoader/include/llapi/mc/SwiftSneakEnchant.hpp index ab0ce75737..79de42cd28 100644 --- a/LiteLoader/include/llapi/mc/SwiftSneakEnchant.hpp +++ b/LiteLoader/include/llapi/mc/SwiftSneakEnchant.hpp @@ -29,66 +29,66 @@ class SwiftSneakEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwiftSneakEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@SwiftSneakEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@SwiftSneakEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@SwiftSneakEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@SwiftSneakEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@SwiftSneakEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@SwiftSneakEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_SWIFTSNEAKENCHANT /** - * @symbol ?isDiscoverable\@SwiftSneakEnchant\@\@UEBA_NXZ + * @symbol ?isDiscoverable\@SwiftSneakEnchant\@\@UEBA_NXZ */ MCVAPI bool isDiscoverable() const; /** - * @symbol ?isTreasureOnly\@SwiftSneakEnchant\@\@UEBA_NXZ + * @symbol ?isTreasureOnly\@SwiftSneakEnchant\@\@UEBA_NXZ */ MCVAPI bool isTreasureOnly() const; #endif /** - * @symbol ??0SwiftSneakEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0SwiftSneakEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI SwiftSneakEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI SwiftSneakEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); /** - * @symbol ?getExtraSneakingMovementFactor\@SwiftSneakEnchant\@\@SAMAEBVActor\@\@\@Z + * @symbol ?getExtraSneakingMovementFactor\@SwiftSneakEnchant\@\@SAMAEBVActor\@\@\@Z */ MCAPI static float getExtraSneakingMovementFactor(class Actor const &); /** - * @symbol ?getLevel\@SwiftSneakEnchant\@\@SAHAEBVActor\@\@\@Z + * @symbol ?getLevel\@SwiftSneakEnchant\@\@SAHAEBVActor\@\@\@Z */ MCAPI static int getLevel(class Actor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimControlSystem.hpp b/LiteLoader/include/llapi/mc/SwimControlSystem.hpp new file mode 100644 index 0000000000..a920645bd1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/SwimControlSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file SwimControlSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class SwimControlSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_SWIMCONTROLSYSTEM +public: + class SwimControlSystem& operator=(class SwimControlSystem const &) = delete; + SwimControlSystem(class SwimControlSystem const &) = delete; + SwimControlSystem() = delete; +#endif + +public: + /** + * @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 + */ + MCAPI static void tick(class StrictEntityContext const &, struct SynchedActorDataComponent const &, struct AbilitiesComponent const &, struct ActorRotationComponent const &, struct MoveInputComponent const &, struct StateVectorComponent &, class IConstBlockSource const &); + +}; diff --git a/LiteLoader/include/llapi/mc/SwimEnchant.hpp b/LiteLoader/include/llapi/mc/SwimEnchant.hpp index c677cf8430..eabb8e481a 100644 --- a/LiteLoader/include/llapi/mc/SwimEnchant.hpp +++ b/LiteLoader/include/llapi/mc/SwimEnchant.hpp @@ -31,61 +31,61 @@ class SwimEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwimEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@SwimEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@SwimEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@SwimEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@SwimEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@SwimEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@SwimEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol ?_isValidEnchantmentTypeForCategory\@SwimEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 14 + * @symbol ?_isValidEnchantmentTypeForCategory\@SwimEnchant\@\@EEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool _isValidEnchantmentTypeForCategory(enum class Enchant::Type) const; /** - * @symbol ??0SwimEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2HH\@Z + * @symbol ??0SwimEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2HH\@Z */ - MCAPI SwimEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, int); + MCAPI SwimEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, int); //private: private: /** - * @symbol ?VALID_ENCHANTMENTS\@SwimEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B + * @symbol ?VALID_ENCHANTMENTS\@SwimEnchant\@\@0V?$vector\@W4Type\@Enchant\@\@V?$allocator\@W4Type\@Enchant\@\@\@std\@\@\@std\@\@B */ MCAPI static std::vector const VALID_ENCHANTMENTS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp b/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp index 7823314093..0832145b13 100644 --- a/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimIdleDefinition.hpp @@ -30,16 +30,16 @@ class SwimIdleDefinition { public: /** - * @symbol ??0SwimIdleDefinition\@\@QEAA\@XZ + * @symbol ??0SwimIdleDefinition\@\@QEAA\@XZ */ MCAPI SwimIdleDefinition(); /** - * @symbol ?initialize\@SwimIdleDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimIdleGoal\@\@\@Z + * @symbol ?initialize\@SwimIdleDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimIdleGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SwimIdleGoal &) const; /** - * @symbol ?buildSchema\@SwimIdleDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimIdleDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SwimIdleDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimIdleDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp b/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp index d80d8ccaea..32cd9db293 100644 --- a/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimIdleGoal.hpp @@ -30,48 +30,48 @@ class SwimIdleGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwimIdleGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SwimIdleGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SwimIdleGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SwimIdleGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SwimIdleGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SwimIdleGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SwimIdleGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SwimIdleGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SwimIdleGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SwimIdleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SwimIdleGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SwimIdleGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SwimIdleGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SwimIdleGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimMoveControl.hpp b/LiteLoader/include/llapi/mc/SwimMoveControl.hpp index c927ac55de..d547e1ea63 100644 --- a/LiteLoader/include/llapi/mc/SwimMoveControl.hpp +++ b/LiteLoader/include/llapi/mc/SwimMoveControl.hpp @@ -30,23 +30,23 @@ class SwimMoveControl : public MoveControl { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwimMoveControl(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@SwimMoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@SwimMoveControl\@\@UEAAXAEAVMob\@\@PEAUMoveControlDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct MoveControlDescription *); /** - * @vftbl 2 - * @symbol ?tick\@SwimMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@SwimMoveControl\@\@MEAAXAEAVMoveControlComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class MoveControlComponent &, class Mob &); /** - * @symbol ??0SwimMoveControl\@\@QEAA\@XZ + * @symbol ??0SwimMoveControl\@\@QEAA\@XZ */ MCAPI SwimMoveControl(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp index e8269cad86..29fadc2042 100644 --- a/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp +++ b/LiteLoader/include/llapi/mc/SwimTriggerSystem.hpp @@ -28,36 +28,36 @@ class SwimTriggerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwimTriggerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@SwimTriggerSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UPlayerInputRequestComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@$$V\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@SwimTriggerSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct PlayerInputRequestComponent, 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, 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 + * @symbol ?create\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createSideBySide\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySide\@SwimTriggerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySide(); /** - * @symbol ?tickSwimTriggerSystem\@SwimTriggerSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEBUActorRotationComponent\@\@AEBUMoveInputComponent\@\@AEBUPlayerInputRequestComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@V?$Optional\@UPlayerActionComponent\@\@\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UCanStandOnSnowFlag\@\@\@\@V?$FlagComponent\@UHasLightweightFamilyFlag\@\@\@\@V?$FlagComponent\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@UVehicleComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UOffsetsComponent\@\@UAABBShapeComponent\@\@UAbilitiesComponent\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@UActorRotationComponent\@\@UDimensionTypeComponent\@\@UMoveInputComponent\@\@UPlayerInputRequestComponent\@\@UStateVectorComponent\@\@USynchedActorDataComponent\@\@V?$FlagComponent\@UInWaterFlag\@\@\@\@\@\@U?$Write\@UPlayerActionComponent\@\@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\@UIsWorldBuilderFlag\@\@\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UActorTypeComponent\@\@UFallDistanceComponent\@\@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 */ - MCAPI static void tickSwimTriggerSystem(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent const &, struct ActorRotationComponent const &, struct MoveInputComponent const &, struct PlayerInputRequestComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class Optional const>, class Optional const>, class Optional, class StrictExecutionContext, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct ActorRotationComponent, struct DimensionTypeComponent, struct MoveInputComponent, struct PlayerInputRequestComponent, 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, 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 &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp b/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp index 69d798b390..5ac6eee11a 100644 --- a/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimWanderDefinition.hpp @@ -30,16 +30,16 @@ class SwimWanderDefinition { public: /** - * @symbol ??0SwimWanderDefinition\@\@QEAA\@XZ + * @symbol ??0SwimWanderDefinition\@\@QEAA\@XZ */ MCAPI SwimWanderDefinition(); /** - * @symbol ?initialize\@SwimWanderDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimWanderGoal\@\@\@Z + * @symbol ?initialize\@SwimWanderDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimWanderGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SwimWanderGoal &) const; /** - * @symbol ?buildSchema\@SwimWanderDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimWanderDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SwimWanderDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimWanderDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp b/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp index a33cd6654e..da6446be37 100644 --- a/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimWanderGoal.hpp @@ -30,56 +30,56 @@ class SwimWanderGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwimWanderGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SwimWanderGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SwimWanderGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SwimWanderGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SwimWanderGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SwimWanderGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SwimWanderGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@SwimWanderGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SwimWanderGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SwimWanderGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SwimWanderGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SwimWanderGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SwimWanderGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SwimWanderGoal(class Mob &); //protected: /** - * @symbol ?_setWantedPosition\@SwimWanderGoal\@\@IEAA_NXZ + * @symbol ?_setWantedPosition\@SwimWanderGoal\@\@IEAA_NXZ */ MCAPI bool _setWantedPosition(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp b/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp index c22897e36b..390b48edb3 100644 --- a/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwimWithEntityDefinition.hpp @@ -30,16 +30,16 @@ class SwimWithEntityDefinition { public: /** - * @symbol ??0SwimWithEntityDefinition\@\@QEAA\@XZ + * @symbol ??0SwimWithEntityDefinition\@\@QEAA\@XZ */ MCAPI SwimWithEntityDefinition(); /** - * @symbol ?initialize\@SwimWithEntityDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimWithEntityGoal\@\@\@Z + * @symbol ?initialize\@SwimWithEntityDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwimWithEntityGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SwimWithEntityGoal &) const; /** - * @symbol ?buildSchema\@SwimWithEntityDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimWithEntityDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SwimWithEntityDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwimWithEntityDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp b/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp index 5e7e7b32d8..9df47de693 100644 --- a/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwimWithEntityGoal.hpp @@ -30,56 +30,56 @@ class SwimWithEntityGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwimWithEntityGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SwimWithEntityGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SwimWithEntityGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SwimWithEntityGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SwimWithEntityGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?canBeInterrupted\@SwimWithEntityGoal\@\@UEAA_NXZ + * @vftbl 3 + * @symbol ?canBeInterrupted\@SwimWithEntityGoal\@\@UEAA_NXZ */ virtual bool canBeInterrupted(); /** - * @vftbl 4 - * @symbol ?start\@SwimWithEntityGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SwimWithEntityGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SwimWithEntityGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SwimWithEntityGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SwimWithEntityGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SwimWithEntityGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SwimWithEntityGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SwimWithEntityGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SwimWithEntityGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SwimWithEntityGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SwimWithEntityGoal(class Mob &); //private: /** - * @symbol ?_setWantedMob\@SwimWithEntityGoal\@\@AEAA_NXZ + * @symbol ?_setWantedMob\@SwimWithEntityGoal\@\@AEAA_NXZ */ MCAPI bool _setWantedMob(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwingEventResponse.hpp b/LiteLoader/include/llapi/mc/SwingEventResponse.hpp index ee1e98dcb5..06ae7ff427 100644 --- a/LiteLoader/include/llapi/mc/SwingEventResponse.hpp +++ b/LiteLoader/include/llapi/mc/SwingEventResponse.hpp @@ -31,28 +31,28 @@ class SwingEventResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwingEventResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@SwingEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@SwingEventResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@SwingEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@SwingEventResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@SwingEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@SwingEventResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@SwingEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@SwingEventResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp b/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp index 8a023b890e..20d86fb1ea 100644 --- a/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp +++ b/LiteLoader/include/llapi/mc/SwoopAttackDefinition.hpp @@ -30,16 +30,16 @@ class SwoopAttackDefinition { public: /** - * @symbol ??0SwoopAttackDefinition\@\@QEAA\@XZ + * @symbol ??0SwoopAttackDefinition\@\@QEAA\@XZ */ MCAPI SwoopAttackDefinition(); /** - * @symbol ?initialize\@SwoopAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwoopAttackGoal\@\@\@Z + * @symbol ?initialize\@SwoopAttackDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVSwoopAttackGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class SwoopAttackGoal &) const; /** - * @symbol ?buildSchema\@SwoopAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwoopAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@SwoopAttackDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VSwoopAttackDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp b/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp index 8dfc9cfded..d1fcb4d1c0 100644 --- a/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp +++ b/LiteLoader/include/llapi/mc/SwoopAttackGoal.hpp @@ -30,48 +30,48 @@ class SwoopAttackGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SwoopAttackGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@SwoopAttackGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@SwoopAttackGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@SwoopAttackGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@SwoopAttackGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@SwoopAttackGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@SwoopAttackGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@SwoopAttackGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@SwoopAttackGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@SwoopAttackGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@SwoopAttackGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@SwoopAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@SwoopAttackGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0SwoopAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0SwoopAttackGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI SwoopAttackGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp index 23e45669cc..2a8af818c5 100644 --- a/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp +++ b/LiteLoader/include/llapi/mc/SyncActorPropertyPacket.hpp @@ -30,42 +30,48 @@ class SyncActorPropertyPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SyncActorPropertyPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@SyncActorPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@SyncActorPropertyPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@SyncActorPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@SyncActorPropertyPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@SyncActorPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@SyncActorPropertyPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 4 - * @symbol ?readExtended\@SyncActorPropertyPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 4 + * @symbol ?readExtended\@SyncActorPropertyPacket\@\@UEAA?AUExtendedStreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual struct ExtendedStreamReadResult readExtended(class ReadOnlyBinaryStream &); /** - * @vftbl 6 - * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@SyncActorPropertyPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_SYNCACTORPROPERTYPACKET /** - * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI SyncActorPropertyPacket(); + MCVAPI ~SyncActorPropertyPacket(); +#endif /** - * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVActor\@\@\@Z + * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@AEBVHashedString\@\@AEBVPropertyGroupManager\@\@\@Z */ - MCAPI SyncActorPropertyPacket(class Actor const &); + MCAPI SyncActorPropertyPacket(class HashedString const &, class PropertyGroupManager const &); + /** + * @symbol ??0SyncActorPropertyPacket\@\@QEAA\@XZ + */ + MCAPI SyncActorPropertyPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SyncedAttribute.hpp b/LiteLoader/include/llapi/mc/SyncedAttribute.hpp index 9083dde3a9..c47b35c323 100644 --- a/LiteLoader/include/llapi/mc/SyncedAttribute.hpp +++ b/LiteLoader/include/llapi/mc/SyncedAttribute.hpp @@ -25,7 +25,7 @@ struct SyncedAttribute { public: /** - * @symbol ??1SyncedAttribute\@\@QEAA\@XZ + * @symbol ??1SyncedAttribute\@\@QEAA\@XZ */ MCAPI ~SyncedAttribute(); diff --git a/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp b/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp index bd6533287e..8edbc4612a 100644 --- a/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp +++ b/LiteLoader/include/llapi/mc/SyncedPlayerMovementSettings.hpp @@ -27,12 +27,12 @@ class SyncedPlayerMovementSettings { public: /** - * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@XZ + * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@AEBUPlayerMovementSettings\@\@\@Z */ - MCAPI SyncedPlayerMovementSettings(); + MCAPI SyncedPlayerMovementSettings(struct PlayerMovementSettings const &); /** - * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@AEBUPlayerMovementSettings\@\@\@Z + * @symbol ??0SyncedPlayerMovementSettings\@\@QEAA\@XZ */ - MCAPI SyncedPlayerMovementSettings(struct PlayerMovementSettings const &); + MCAPI SyncedPlayerMovementSettings(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SynchedActorData.hpp b/LiteLoader/include/llapi/mc/SynchedActorData.hpp index 335628c5b4..242a4b64c5 100644 --- a/LiteLoader/include/llapi/mc/SynchedActorData.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorData.hpp @@ -166,100 +166,104 @@ class SynchedActorData { public: /** - * @symbol ??0SynchedActorData\@\@QEAA\@XZ + * @symbol ??0SynchedActorData\@\@QEAA\@XZ */ MCAPI SynchedActorData(); /** - * @symbol ??0SynchedActorData\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0SynchedActorData\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI SynchedActorData(class SynchedActorData &&); /** - * @symbol ?_clone\@SynchedActorData\@\@QEBA?AV1\@XZ + * @symbol ?_clone\@SynchedActorData\@\@QEBA?AV1\@XZ */ MCAPI class SynchedActorData _clone() const; /** - * @symbol ?assignValues\@SynchedActorData\@\@QEAA_NAEBV?$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\@\@PEAVActor\@\@\@Z + * @symbol ?assignValues\@SynchedActorData\@\@QEAA_NAEBV?$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\@\@PEAVActor\@\@\@Z */ MCAPI bool assignValues(std::vector> const &, class Actor *); /** - * @symbol ?forEachDataItem\@SynchedActorData\@\@QEBAXAEBV?$function\@$$A6AXAEBV?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachDataItem\@SynchedActorData\@\@QEBAXAEBV?$function\@$$A6AXAEBV?$unique_ptr\@VDataItem\@\@U?$default_delete\@VDataItem\@\@\@std\@\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI void forEachDataItem(class std::function const &)> const &) const; /** - * @symbol ?getFloat\@SynchedActorData\@\@QEBAMG\@Z + * @symbol ?getFloat\@SynchedActorData\@\@QEBAMG\@Z */ MCAPI float getFloat(unsigned short) const; /** - * @symbol ?getInt64\@SynchedActorData\@\@QEBA_JG\@Z + * @symbol ?getInt\@SynchedActorData\@\@QEBAHG\@Z + */ + MCAPI int getInt(unsigned short) const; + /** + * @symbol ?getInt64\@SynchedActorData\@\@QEBA_JG\@Z */ MCAPI __int64 getInt64(unsigned short) const; /** - * @symbol ?getInt8\@SynchedActorData\@\@QEBACG\@Z + * @symbol ?getInt8\@SynchedActorData\@\@QEBACG\@Z */ MCAPI signed char getInt8(unsigned short) const; /** - * @symbol ?getStatusFlag\@SynchedActorData\@\@QEBA_NW4ActorFlags\@\@\@Z + * @symbol ?getStatusFlag\@SynchedActorData\@\@QEBA_NW4ActorFlags\@\@\@Z */ MCAPI bool getStatusFlag(enum class ActorFlags) const; /** - * @symbol ?getValidDataItemCount\@SynchedActorData\@\@QEBA_KXZ + * @symbol ?getValidDataItemCount\@SynchedActorData\@\@QEBA_KXZ */ MCAPI unsigned __int64 getValidDataItemCount() const; /** - * @symbol ?getVec3\@SynchedActorData\@\@QEBA?AVVec3\@\@G\@Z + * @symbol ?getVec3\@SynchedActorData\@\@QEBA?AVVec3\@\@G\@Z */ MCAPI class Vec3 getVec3(unsigned short) const; /** - * @symbol ?markDirty\@SynchedActorData\@\@QEAAXAEAVDataItem\@\@\@Z + * @symbol ?markDirty\@SynchedActorData\@\@QEAAXAEAVDataItem\@\@\@Z */ MCAPI void markDirty(class DataItem &); /** - * @symbol ?markDirty\@SynchedActorData\@\@QEAAXG\@Z + * @symbol ?markDirty\@SynchedActorData\@\@QEAAXG\@Z */ MCAPI void markDirty(unsigned short); /** - * @symbol ??4SynchedActorData\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4SynchedActorData\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class SynchedActorData & operator=(class SynchedActorData &&); /** - * @symbol ?setStatusFlag\@SynchedActorData\@\@QEAAXW4ActorFlags\@\@_N\@Z + * @symbol ?setStatusFlag\@SynchedActorData\@\@QEAAXW4ActorFlags\@\@_N\@Z */ MCAPI void setStatusFlag(enum class ActorFlags, bool); /** - * @symbol ??1SynchedActorData\@\@QEAA\@XZ + * @symbol ??1SynchedActorData\@\@QEAA\@XZ */ MCAPI ~SynchedActorData(); /** - * @symbol ?DIFF_ITEM\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_ITEM\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ITEM; /** - * @symbol ?DIFF_ITEMS_SIZE\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_ITEMS_SIZE\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ITEMS_SIZE; /** - * @symbol ?DIFF_ITEM_NULL\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?DIFF_ITEM_NULL\@SynchedActorData\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const DIFF_ITEM_NULL; /** - * @symbol ?getDiff\@SynchedActorData\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z + * @symbol ?getDiff\@SynchedActorData\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBV1\@0\@Z */ MCAPI static class std::optional getDiff(class SynchedActorData const &, class SynchedActorData const &); //private: /** - * @symbol ?_find\@SynchedActorData\@\@AEBAPEAVDataItem\@\@G\@Z + * @symbol ?_find\@SynchedActorData\@\@AEBAPEAVDataItem\@\@G\@Z */ MCAPI class DataItem * _find(unsigned short) const; /** - * @symbol ?_get\@SynchedActorData\@\@AEAAAEAVDataItem\@\@G\@Z + * @symbol ?_get\@SynchedActorData\@\@AEAAAEAVDataItem\@\@G\@Z */ MCAPI class DataItem & _get(unsigned short); /** - * @symbol ?_resizeToContain\@SynchedActorData\@\@AEAAXG\@Z + * @symbol ?_resizeToContain\@SynchedActorData\@\@AEAAXG\@Z */ MCAPI void _resizeToContain(unsigned short); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SynchedActorDataComponent.hpp b/LiteLoader/include/llapi/mc/SynchedActorDataComponent.hpp index 6d0521283c..84d4d8b686 100644 --- a/LiteLoader/include/llapi/mc/SynchedActorDataComponent.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorDataComponent.hpp @@ -28,7 +28,7 @@ struct SynchedActorDataComponent { public: /** - * @symbol ??1SynchedActorDataComponent\@\@QEAA\@XZ + * @symbol ??1SynchedActorDataComponent\@\@QEAA\@XZ */ MCAPI ~SynchedActorDataComponent(); diff --git a/LiteLoader/include/llapi/mc/SynchedActorDataEntityWrapper.hpp b/LiteLoader/include/llapi/mc/SynchedActorDataEntityWrapper.hpp index ff20b89b6b..bb7362298e 100644 --- a/LiteLoader/include/llapi/mc/SynchedActorDataEntityWrapper.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorDataEntityWrapper.hpp @@ -32,96 +32,96 @@ class SynchedActorDataEntityWrapper { public: /** - * @symbol ??0SynchedActorDataEntityWrapper\@\@QEAA\@AEAVEntityContext\@\@\@Z + * @symbol ??0SynchedActorDataEntityWrapper\@\@QEAA\@AEAVEntityContext\@\@\@Z */ MCAPI SynchedActorDataEntityWrapper(class EntityContext &); /** - * @symbol ?getCompoundTag\@SynchedActorDataEntityWrapper\@\@QEBAAEBVCompoundTag\@\@G\@Z + * @symbol ?getCompoundTag\@SynchedActorDataEntityWrapper\@\@QEBAAEBVCompoundTag\@\@G\@Z */ MCAPI class CompoundTag const & getCompoundTag(unsigned short) const; /** - * @symbol ?getFloat\@SynchedActorDataEntityWrapper\@\@QEBAMG\@Z + * @symbol ?getFloat\@SynchedActorDataEntityWrapper\@\@QEBAMG\@Z */ MCAPI float getFloat(unsigned short) const; /** - * @symbol ?getInt\@SynchedActorDataEntityWrapper\@\@QEBAHG\@Z + * @symbol ?getInt\@SynchedActorDataEntityWrapper\@\@QEBAHG\@Z */ MCAPI int getInt(unsigned short) const; /** - * @symbol ?getInt64\@SynchedActorDataEntityWrapper\@\@QEBA_JG\@Z + * @symbol ?getInt64\@SynchedActorDataEntityWrapper\@\@QEBA_JG\@Z */ MCAPI __int64 getInt64(unsigned short) const; /** - * @symbol ?getInt8\@SynchedActorDataEntityWrapper\@\@QEBACG\@Z + * @symbol ?getInt8\@SynchedActorDataEntityWrapper\@\@QEBACG\@Z */ MCAPI signed char getInt8(unsigned short) const; /** - * @symbol ?getPosition\@SynchedActorDataEntityWrapper\@\@QEBA?AVBlockPos\@\@G\@Z + * @symbol ?getPosition\@SynchedActorDataEntityWrapper\@\@QEBA?AVBlockPos\@\@G\@Z */ MCAPI class BlockPos getPosition(unsigned short) const; /** - * @symbol ?getShort\@SynchedActorDataEntityWrapper\@\@QEBAFG\@Z + * @symbol ?getShort\@SynchedActorDataEntityWrapper\@\@QEBAFG\@Z */ MCAPI short getShort(unsigned short) const; /** - * @symbol ?getStatusFlag\@SynchedActorDataEntityWrapper\@\@QEBA_NW4ActorFlags\@\@\@Z + * @symbol ?getStatusFlag\@SynchedActorDataEntityWrapper\@\@QEBA_NW4ActorFlags\@\@\@Z */ MCAPI bool getStatusFlag(enum class ActorFlags) const; /** - * @symbol ?getString\@SynchedActorDataEntityWrapper\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z + * @symbol ?getString\@SynchedActorDataEntityWrapper\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@G\@Z */ MCAPI std::string const & getString(unsigned short) const; /** - * @symbol ?getVec3\@SynchedActorDataEntityWrapper\@\@QEBA?AVVec3\@\@G\@Z + * @symbol ?getVec3\@SynchedActorDataEntityWrapper\@\@QEBA?AVVec3\@\@G\@Z */ MCAPI class Vec3 getVec3(unsigned short) const; /** - * @symbol ?hasData\@SynchedActorDataEntityWrapper\@\@QEBA_NG\@Z + * @symbol ?hasData\@SynchedActorDataEntityWrapper\@\@QEBA_NG\@Z */ MCAPI bool hasData(unsigned short) const; /** - * @symbol ?isDirty\@SynchedActorDataEntityWrapper\@\@QEBA_NXZ + * @symbol ?isDirty\@SynchedActorDataEntityWrapper\@\@QEBA_NXZ */ MCAPI bool isDirty() const; /** - * @symbol ?markDirty\@SynchedActorDataEntityWrapper\@\@QEAAXG\@Z + * @symbol ?markDirty\@SynchedActorDataEntityWrapper\@\@QEAAXG\@Z */ MCAPI void markDirty(unsigned short); /** - * @symbol ?packAll\@SynchedActorDataEntityWrapper\@\@QEBA?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\@\@XZ + * @symbol ?packAll\@SynchedActorDataEntityWrapper\@\@QEBA?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\@\@XZ */ MCAPI std::vector> packAll() const; /** - * @symbol ?packDirty\@SynchedActorDataEntityWrapper\@\@QEAA?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\@\@XZ + * @symbol ?packDirty\@SynchedActorDataEntityWrapper\@\@QEAA?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\@\@XZ */ MCAPI std::vector> packDirty(); /** - * @symbol ?reader\@SynchedActorDataEntityWrapper\@\@QEBA?AVSynchedActorDataReader\@\@XZ + * @symbol ?reader\@SynchedActorDataEntityWrapper\@\@QEBA?AVSynchedActorDataReader\@\@XZ */ MCAPI class SynchedActorDataReader reader() const; /** - * @symbol ?setStatusFlag\@SynchedActorDataEntityWrapper\@\@QEAAXW4ActorFlags\@\@_N\@Z + * @symbol ?setStatusFlag\@SynchedActorDataEntityWrapper\@\@QEAAXW4ActorFlags\@\@_N\@Z */ MCAPI void setStatusFlag(enum class ActorFlags, bool); /** - * @symbol ?writer\@SynchedActorDataEntityWrapper\@\@QEAA?AVSynchedActorDataWriter\@\@XZ + * @symbol ?writer\@SynchedActorDataEntityWrapper\@\@QEAA?AVSynchedActorDataWriter\@\@XZ */ MCAPI class SynchedActorDataWriter writer(); /** - * @symbol ??1SynchedActorDataEntityWrapper\@\@QEAA\@XZ + * @symbol ??1SynchedActorDataEntityWrapper\@\@QEAA\@XZ */ MCAPI ~SynchedActorDataEntityWrapper(); //private: /** - * @symbol ?_get\@SynchedActorDataEntityWrapper\@\@AEAA?AV?$not_null\@PEAVSynchedActorData\@\@\@gsl\@\@XZ + * @symbol ?_get\@SynchedActorDataEntityWrapper\@\@AEAA?AV?$not_null\@PEAVSynchedActorData\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null _get(); /** - * @symbol ?_get\@SynchedActorDataEntityWrapper\@\@AEBA?AV?$not_null\@PEBVSynchedActorData\@\@\@gsl\@\@XZ + * @symbol ?_get\@SynchedActorDataEntityWrapper\@\@AEBA?AV?$not_null\@PEBVSynchedActorData\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null _get() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SynchedActorDataReader.hpp b/LiteLoader/include/llapi/mc/SynchedActorDataReader.hpp index 4b9c69dd96..f8ef750a51 100644 --- a/LiteLoader/include/llapi/mc/SynchedActorDataReader.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorDataReader.hpp @@ -28,20 +28,20 @@ class SynchedActorDataReader { public: /** - * @symbol ?getInt\@SynchedActorDataReader\@\@QEBAHG\@Z + * @symbol ?getInt\@SynchedActorDataReader\@\@QEBAHG\@Z */ MCAPI int getInt(unsigned short) const; /** - * @symbol ?getPosition\@SynchedActorDataReader\@\@QEBA?AVBlockPos\@\@G\@Z + * @symbol ?getPosition\@SynchedActorDataReader\@\@QEBA?AVBlockPos\@\@G\@Z */ MCAPI class BlockPos getPosition(unsigned short) const; /** - * @symbol ?getStatusFlag\@SynchedActorDataReader\@\@QEBA_NW4ActorFlags\@\@\@Z + * @symbol ?getStatusFlag\@SynchedActorDataReader\@\@QEBA_NW4ActorFlags\@\@\@Z */ MCAPI bool getStatusFlag(enum class ActorFlags) const; /** - * @symbol ?getVec3\@SynchedActorDataReader\@\@QEBA?AVVec3\@\@G\@Z + * @symbol ?getVec3\@SynchedActorDataReader\@\@QEBA?AVVec3\@\@G\@Z */ MCAPI class Vec3 getVec3(unsigned short) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SynchedActorDataWriter.hpp b/LiteLoader/include/llapi/mc/SynchedActorDataWriter.hpp index bf686a50cf..80f6428910 100644 --- a/LiteLoader/include/llapi/mc/SynchedActorDataWriter.hpp +++ b/LiteLoader/include/llapi/mc/SynchedActorDataWriter.hpp @@ -28,20 +28,20 @@ class SynchedActorDataWriter { public: /** - * @symbol ?reader\@SynchedActorDataWriter\@\@QEBA?AVSynchedActorDataReader\@\@XZ + * @symbol ?reader\@SynchedActorDataWriter\@\@QEBA?AVSynchedActorDataReader\@\@XZ */ MCAPI class SynchedActorDataReader reader() const; /** - * @symbol ?setStatusFlag\@SynchedActorDataWriter\@\@QEAAXW4ActorFlags\@\@_N\@Z + * @symbol ?setStatusFlag\@SynchedActorDataWriter\@\@QEAAXW4ActorFlags\@\@_N\@Z */ MCAPI void setStatusFlag(enum class ActorFlags, bool); //private: /** - * @symbol ?_get\@SynchedActorDataWriter\@\@AEAA?AV?$not_null\@PEAVSynchedActorData\@\@\@gsl\@\@XZ + * @symbol ?_get\@SynchedActorDataWriter\@\@AEAA?AV?$not_null\@PEAVSynchedActorData\@\@\@gsl\@\@XZ */ MCAPI class gsl::not_null _get(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SystemFilePicker.hpp b/LiteLoader/include/llapi/mc/SystemFilePicker.hpp index 12d7ba75e9..44e0d860fd 100644 --- a/LiteLoader/include/llapi/mc/SystemFilePicker.hpp +++ b/LiteLoader/include/llapi/mc/SystemFilePicker.hpp @@ -30,36 +30,36 @@ class SystemFilePicker { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~SystemFilePicker(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initFilePick\@SystemFilePicker\@\@UEAAXAEBVPath\@Core\@\@V?$function\@$$A6AX_NUFileInfo\@\@\@Z\@std\@\@\@Z + * @vftbl 1 + * @symbol ?initFilePick\@SystemFilePicker\@\@UEAAXAEBVPath\@Core\@\@V?$function\@$$A6AX_NUFileInfo\@\@\@Z\@std\@\@\@Z */ virtual void initFilePick(class Core::Path const &, class std::function); /** - * @vftbl 2 - * @symbol ?readBytes\@SystemFilePicker\@\@UEAA_KAEBUFileInfo\@\@_K1AEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z + * @vftbl 2 + * @symbol ?readBytes\@SystemFilePicker\@\@UEAA_KAEBUFileInfo\@\@_K1AEAV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z */ virtual unsigned __int64 readBytes(struct FileInfo const &, unsigned __int64, unsigned __int64, std::vector &); /** - * @vftbl 3 - * @symbol ?writeBytes\@SystemFilePicker\@\@UEAA_NAEBUFileInfo\@\@_K1AEBV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?writeBytes\@SystemFilePicker\@\@UEAA_NAEBUFileInfo\@\@_K1AEBV?$vector\@EV?$allocator\@E\@std\@\@\@std\@\@\@Z */ virtual bool writeBytes(struct FileInfo const &, unsigned __int64, unsigned __int64, std::vector const &); /** - * @symbol ??0SystemFilePicker\@\@QEAA\@XZ + * @symbol ??0SystemFilePicker\@\@QEAA\@XZ */ MCAPI SystemFilePicker(); //protected: /** - * @symbol ?_fillFileInfo\@SystemFilePicker\@\@IEAA?AUFileInfo\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?_fillFileInfo\@SystemFilePicker\@\@IEAA?AUFileInfo\@\@AEBVPath\@Core\@\@\@Z */ MCAPI struct FileInfo _fillFileInfo(class Core::Path const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/SystemInfo.hpp b/LiteLoader/include/llapi/mc/SystemInfo.hpp index d26aebca9f..e5f5484ad0 100644 --- a/LiteLoader/include/llapi/mc/SystemInfo.hpp +++ b/LiteLoader/include/llapi/mc/SystemInfo.hpp @@ -21,27 +21,27 @@ struct SystemInfo { #undef AFTER_EXTRA public: /** - * @symbol ??0SystemInfo\@\@QEAA\@XZ + * @symbol ??0SystemInfo\@\@QEAA\@AEBU0\@\@Z */ - MCAPI SystemInfo(); + MCAPI SystemInfo(struct SystemInfo const &); /** - * @symbol ??0SystemInfo\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0SystemInfo\@\@QEAA\@XZ */ - MCAPI SystemInfo(struct SystemInfo const &); + MCAPI SystemInfo(); /** - * @symbol ??4SystemInfo\@\@QEAAAEAU0\@AEBU0\@\@Z + * @symbol ??4SystemInfo\@\@QEAAAEAU0\@AEBU0\@\@Z */ MCAPI struct SystemInfo & operator=(struct SystemInfo const &); /** - * @symbol ??4SystemInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4SystemInfo\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct SystemInfo & operator=(struct SystemInfo &&); /** - * @symbol ??1SystemInfo\@\@QEAA\@XZ + * @symbol ??1SystemInfo\@\@QEAA\@XZ */ MCAPI ~SystemInfo(); /** - * @symbol ?bindType\@SystemInfo\@\@SAXXZ + * @symbol ?bindType\@SystemInfo\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/SystemTiming.hpp b/LiteLoader/include/llapi/mc/SystemTiming.hpp index e670451501..edd500a6b4 100644 --- a/LiteLoader/include/llapi/mc/SystemTiming.hpp +++ b/LiteLoader/include/llapi/mc/SystemTiming.hpp @@ -25,7 +25,7 @@ struct SystemTiming { public: /** - * @symbol ??1SystemTiming\@\@QEAA\@XZ + * @symbol ??1SystemTiming\@\@QEAA\@XZ */ MCAPI ~SystemTiming(); diff --git a/LiteLoader/include/llapi/mc/Tadpole.hpp b/LiteLoader/include/llapi/mc/Tadpole.hpp index a509032bc2..b81c47d3d9 100644 --- a/LiteLoader/include/llapi/mc/Tadpole.hpp +++ b/LiteLoader/include/llapi/mc/Tadpole.hpp @@ -30,153 +30,148 @@ class Tadpole : public WaterAnimal { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Tadpole\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Tadpole\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Tadpole(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?getFlopVerticalVelocityFactor\@Tadpole\@\@UEBAMXZ + * @vftbl 353 + * @symbol ?getFlopVerticalVelocityFactor\@Tadpole\@\@UEBAMXZ */ virtual float getFlopVerticalVelocityFactor() const; /** - * @vftbl 357 - * @symbol ?getFlopHorizontalVelocityFactor\@Tadpole\@\@UEBAMXZ + * @vftbl 354 + * @symbol ?getFlopHorizontalVelocityFactor\@Tadpole\@\@UEBAMXZ */ virtual float getFlopHorizontalVelocityFactor() const; /** - * @symbol ??0Tadpole\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Tadpole\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Tadpole(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Tag.hpp b/LiteLoader/include/llapi/mc/Tag.hpp index 46c173e191..1821974eb2 100644 --- a/LiteLoader/include/llapi/mc/Tag.hpp +++ b/LiteLoader/include/llapi/mc/Tag.hpp @@ -113,87 +113,93 @@ class Tag { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Tag(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?deleteChildren\@Tag\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?deleteChildren\@Tag\@\@UEAAXXZ */ virtual void deleteChildren(); /** - * @vftbl 2 - * @symbol ?write\@StringTag\@\@UEBAXAEAVIDataOutput\@\@\@Z + * @vftbl 2 + * @symbol ?write\@DoubleTag\@\@UEBAXAEAVIDataOutput\@\@\@Z */ virtual void write(class IDataOutput &) const = 0; /** - * @vftbl 3 - * @symbol ?load\@StringTag\@\@UEAAXAEAVIDataInput\@\@\@Z + * @vftbl 3 + * @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 + * @vftbl 4 + * @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 + * @vftbl 5 + * @symbol ?getId\@DoubleTag\@\@UEBA?AW4Type\@Tag\@\@XZ */ virtual enum class Tag::Type getId() const = 0; /** - * @vftbl 6 - * @symbol ?equals\@Tag\@\@UEBA_NAEBV1\@\@Z + * @vftbl 6 + * @symbol ?equals\@Tag\@\@UEBA_NAEBV1\@\@Z */ virtual bool equals(class Tag const &) const; /** - * @vftbl 7 - * @symbol ?print\@Tag\@\@UEBAXAEAVPrintStream\@\@\@Z + * @vftbl 7 + * @symbol ?print\@Tag\@\@UEBAXAEAVPrintStream\@\@\@Z */ virtual void print(class PrintStream &) const; /** - * @vftbl 8 - * @symbol ?print\@Tag\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPrintStream\@\@\@Z + * @vftbl 8 + * @symbol ?print\@Tag\@\@UEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVPrintStream\@\@\@Z */ 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 + * @vftbl 9 + * @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 + * @vftbl 10 + * @symbol ?hash\@DoubleTag\@\@UEBA_KXZ */ virtual unsigned __int64 hash() const = 0; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAG /** - * @symbol ?NullString\@Tag\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Tag(); +#endif + /** + * @symbol ?NullString\@Tag\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NullString; /** - * @symbol ?getTagName\@Tag\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@1\@\@Z + * @symbol ?getTagName\@Tag\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4Type\@1\@\@Z */ MCAPI static std::string getTagName(enum class Tag::Type); /** - * @symbol ?newTag\@Tag\@\@SA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@W4Type\@1\@\@Z + * @symbol ?newTag\@Tag\@\@SA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@W4Type\@1\@\@Z */ MCAPI static std::unique_ptr newTag(enum class Tag::Type); /** - * @symbol ?readNamedTag\@Tag\@\@SA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@AEAVIDataInput\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?readNamedTag\@Tag\@\@SA?AV?$unique_ptr\@VTag\@\@U?$default_delete\@VTag\@\@\@std\@\@\@std\@\@AEAVIDataInput\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static std::unique_ptr readNamedTag(class IDataInput &, std::string &); /** - * @symbol ?writeNamedTag\@Tag\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV1\@AEAVIDataOutput\@\@\@Z + * @symbol ?writeNamedTag\@Tag\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV1\@AEAVIDataOutput\@\@\@Z */ MCAPI static void writeNamedTag(std::string const &, class Tag const &, class IDataOutput &); //protected: /** - * @symbol ??0Tag\@\@IEAA\@XZ + * @symbol ??0Tag\@\@IEAA\@XZ */ MCAPI Tag(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TagCommand.hpp b/LiteLoader/include/llapi/mc/TagCommand.hpp index 18f869ac54..bb857a4373 100644 --- a/LiteLoader/include/llapi/mc/TagCommand.hpp +++ b/LiteLoader/include/llapi/mc/TagCommand.hpp @@ -31,38 +31,38 @@ class TagCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TagCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TagCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TagCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TagCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TagCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_addTag\@TagCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_addTag\@TagCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void _addTag(class CommandOutput &, std::vector> const &) const; /** - * @symbol ?_getSelectorResults\@TagCommand\@\@AEBA?AV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @symbol ?_getSelectorResults\@TagCommand\@\@AEBA?AV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ MCAPI std::vector> _getSelectorResults(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?_listTags\@TagCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_listTags\@TagCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void _listTags(class CommandOutput &, std::vector> const &) const; /** - * @symbol ?_removeTag\@TagCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_removeTag\@TagCommand\@\@AEBAXAEAVCommandOutput\@\@AEBV?$vector\@V?$reference_wrapper\@VActor\@\@\@std\@\@V?$allocator\@V?$reference_wrapper\@VActor\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void _removeTag(class CommandOutput &, std::vector> const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TagMemoryChunk.hpp b/LiteLoader/include/llapi/mc/TagMemoryChunk.hpp index bcb0542d53..984ad61dfe 100644 --- a/LiteLoader/include/llapi/mc/TagMemoryChunk.hpp +++ b/LiteLoader/include/llapi/mc/TagMemoryChunk.hpp @@ -45,15 +45,15 @@ struct TagMemoryChunk { public: /** - * @symbol ?copy\@TagMemoryChunk\@\@QEBA?AU1\@XZ + * @symbol ?copy\@TagMemoryChunk\@\@QEBA?AU1\@XZ */ MCAPI struct TagMemoryChunk copy() const; /** - * @symbol ??9TagMemoryChunk\@\@QEBA_NAEBU0\@\@Z + * @symbol ??9TagMemoryChunk\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator!=(struct TagMemoryChunk const &) const; /** - * @symbol ??1TagMemoryChunk\@\@QEAA\@XZ + * @symbol ??1TagMemoryChunk\@\@QEAA\@XZ */ MCAPI ~TagMemoryChunk(); diff --git a/LiteLoader/include/llapi/mc/TagUpdateToken.hpp b/LiteLoader/include/llapi/mc/TagUpdateToken.hpp index c81d8fbd91..830c6fe57b 100644 --- a/LiteLoader/include/llapi/mc/TagUpdateToken.hpp +++ b/LiteLoader/include/llapi/mc/TagUpdateToken.hpp @@ -28,8 +28,8 @@ class TagUpdateToken { public: /** - * @symbol ??1TagUpdateToken\@\@QEAA\@XZ + * @symbol ??1TagUpdateToken\@\@QEAA\@XZ */ MCAPI ~TagUpdateToken(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp b/LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp index 0b91e428bb..c41477af79 100644 --- a/LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp +++ b/LiteLoader/include/llapi/mc/TakeFlowerGoal.hpp @@ -30,48 +30,48 @@ class TakeFlowerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TakeFlowerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@TakeFlowerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@TakeFlowerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@TakeFlowerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@TakeFlowerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@TakeFlowerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@TakeFlowerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@TakeFlowerGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@TakeFlowerGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@TakeFlowerGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@TakeFlowerGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@TakeFlowerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@TakeFlowerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0TakeFlowerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0TakeFlowerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI TakeFlowerGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp index 48cb934553..e7dcf70716 100644 --- a/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp +++ b/LiteLoader/include/llapi/mc/TakeItemActorPacket.hpp @@ -30,37 +30,43 @@ class TakeItemActorPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TakeItemActorPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@TakeItemActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@TakeItemActorPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@TakeItemActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@TakeItemActorPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@TakeItemActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@TakeItemActorPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@TakeItemActorPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TAKEITEMACTORPACKET /** - * @symbol ??0TakeItemActorPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TakeItemActorPacket(); +#endif + /** + * @symbol ??0TakeItemActorPacket\@\@QEAA\@XZ */ MCAPI TakeItemActorPacket(); /** - * @symbol ??0TakeItemActorPacket\@\@QEAA\@VActorRuntimeID\@\@0\@Z + * @symbol ??0TakeItemActorPacket\@\@QEAA\@VActorRuntimeID\@\@0\@Z */ MCAPI TakeItemActorPacket(class ActorRuntimeID, class ActorRuntimeID); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TakePictureCommand.hpp b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp index 1e051a2f20..54dd09f25c 100644 --- a/LiteLoader/include/llapi/mc/TakePictureCommand.hpp +++ b/LiteLoader/include/llapi/mc/TakePictureCommand.hpp @@ -31,18 +31,18 @@ class TakePictureCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TakePictureCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TakePictureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TakePictureCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TakePictureCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TakePictureCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TallGrass.hpp b/LiteLoader/include/llapi/mc/TallGrass.hpp index d53f71fedc..16a4fbf68f 100644 --- a/LiteLoader/include/llapi/mc/TallGrass.hpp +++ b/LiteLoader/include/llapi/mc/TallGrass.hpp @@ -31,294 +31,299 @@ class TallGrass : public BushBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TallGrass(); + virtual void __unk_vfn_0(); /** - * @vftbl 8 - * @symbol ?randomlyModifyPosition\@TallGrass\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?randomlyModifyPosition\@TallGrass\@\@UEBA?AVVec3\@\@AEBVBlockPos\@\@\@Z */ virtual class Vec3 randomlyModifyPosition(class BlockPos const &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@TallGrass\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TallGrass\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@TallGrass\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@TallGrass\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @symbol ?onFertilized\@TallGrass\@\@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 87 + * @symbol ?mayConsumeFertilizer\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@\@Z */ virtual bool mayConsumeFertilizer(class BlockSource &) const; /** - * @vftbl 88 - * @symbol ?canBeFertilized\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@TallGrass\@\@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 92 + * @symbol ?mayPlace\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@TallGrass\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @symbol ?asItemInstance\@TallGrass\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z */ virtual class ItemInstance asItemInstance(class Block const &, class BlockActor const *) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@TallGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@TallGrass\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@TallGrass\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@TallGrass\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 135 - * @symbol ?getColor\@TallGrass\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@TallGrass\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@TallGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@TallGrass\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@TallGrass\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@TallGrass\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@TallGrass\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 179 - * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@XZ + * @vftbl 180 + * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@XZ */ virtual enum class BlockRenderLayer getRenderLayer() const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@TallGrass\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@TallGrass\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 185 + * @symbol ?getMapColor\@TallGrass\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getMapColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@TallGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@TallGrass\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@TallGrass\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@TallGrass\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TALLGRASS /** - * @symbol ?canBeSilkTouched\@TallGrass\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@TallGrass\@\@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 ??0TallGrass\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TallGrass(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TameableComponent.hpp b/LiteLoader/include/llapi/mc/TameableComponent.hpp index 6e23f7875b..06a6c8a5fd 100644 --- a/LiteLoader/include/llapi/mc/TameableComponent.hpp +++ b/LiteLoader/include/llapi/mc/TameableComponent.hpp @@ -29,32 +29,32 @@ class TameableComponent { public: /** - * @symbol ??0TameableComponent\@\@QEAA\@XZ + * @symbol ??0TameableComponent\@\@QEAA\@XZ */ MCAPI TameableComponent(); /** - * @symbol ?getInteraction\@TameableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@TameableComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); /** - * @symbol ?tame\@TameableComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?tame\@TameableComponent\@\@QEAAXAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI void tame(class Actor &, class Player &); //private: /** - * @symbol ?_attemptToTame\@TameableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?_attemptToTame\@TameableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI bool _attemptToTame(class Actor &, class Player &); /** - * @symbol ?_canTame\@TameableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z + * @symbol ?_canTame\@TameableComponent\@\@AEAA_NAEAVActor\@\@AEAVPlayer\@\@\@Z */ MCAPI bool _canTame(class Actor &, class Player &); /** - * @symbol ?_becomeTame\@TameableComponent\@\@CAXAEAVActor\@\@\@Z + * @symbol ?_becomeTame\@TameableComponent\@\@CAXAEAVActor\@\@\@Z */ MCAPI static void _becomeTame(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TameableDefinition.hpp b/LiteLoader/include/llapi/mc/TameableDefinition.hpp index d9a5787d1b..075be2e711 100644 --- a/LiteLoader/include/llapi/mc/TameableDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TameableDefinition.hpp @@ -30,20 +30,20 @@ class TameableDefinition { public: /** - * @symbol ??0TameableDefinition\@\@QEAA\@XZ + * @symbol ??0TameableDefinition\@\@QEAA\@XZ */ MCAPI TameableDefinition(); /** - * @symbol ?addTamingItemByName\@TameableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addTamingItemByName\@TameableDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addTamingItemByName(std::string const &); /** - * @symbol ?initialize\@TameableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTameableComponent\@\@\@Z + * @symbol ?initialize\@TameableDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTameableComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class TameableComponent &) const; /** - * @symbol ?buildSchema\@TameableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTameableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@TameableDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTameableDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetBlock.hpp b/LiteLoader/include/llapi/mc/TargetBlock.hpp index 8d60354b6e..db3db6364d 100644 --- a/LiteLoader/include/llapi/mc/TargetBlock.hpp +++ b/LiteLoader/include/llapi/mc/TargetBlock.hpp @@ -31,231 +31,236 @@ class TargetBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TargetBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 15 - * @symbol ?onProjectileHit\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @vftbl 15 + * @symbol ?onProjectileHit\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ virtual void onProjectileHit(class BlockSource &, class BlockPos const &, class Actor const &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 51 - * @symbol ?isSignalSource\@TargetBlock\@\@UEBA_NXZ + * @vftbl 51 + * @symbol ?isSignalSource\@TargetBlock\@\@UEBA_NXZ */ virtual bool isSignalSource() const; /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@TargetBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TargetBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0TargetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0TargetBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TargetBlock(std::string const &, int); //private: /** - * @symbol ?_processHitByProjectileAtPos\@TargetBlock\@\@AEBAXAEBVVec3\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z + * @symbol ?_processHitByProjectileAtPos\@TargetBlock\@\@AEBAXAEBVVec3\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVActor\@\@\@Z */ MCAPI void _processHitByProjectileAtPos(class Vec3 const &, class BlockSource &, class BlockPos const &, class Actor const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetBlock_Internal.hpp b/LiteLoader/include/llapi/mc/TargetBlock_Internal.hpp index e4dd19579e..549e089cb0 100644 --- a/LiteLoader/include/llapi/mc/TargetBlock_Internal.hpp +++ b/LiteLoader/include/llapi/mc/TargetBlock_Internal.hpp @@ -22,8 +22,12 @@ namespace TargetBlock_Internal { #undef AFTER_EXTRA /** - * @symbol ?createPoweredBlockComponentAtPos\@TargetBlock_Internal\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?createPoweredBlockComponentAtPos\@TargetBlock_Internal\@\@YAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void createPoweredBlockComponentAtPos(class BlockSource &, class BlockPos const &); + /** + * @symbol ?sendTargetBlockHitTelemetryEvent\@TargetBlock_Internal\@\@YAXAEAVBlockSource\@\@AEBVActor\@\@H\@Z + */ + MCAPI void sendTargetBlockHitTelemetryEvent(class BlockSource &, class Actor const &, int); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TargetDistanceTest.hpp b/LiteLoader/include/llapi/mc/TargetDistanceTest.hpp index 7b4681901b..5839b436f9 100644 --- a/LiteLoader/include/llapi/mc/TargetDistanceTest.hpp +++ b/LiteLoader/include/llapi/mc/TargetDistanceTest.hpp @@ -13,7 +13,7 @@ #undef BEFORE_EXTRA -class TargetDistanceTest : public FilterTest { +class TargetDistanceTest { #define AFTER_EXTRA @@ -27,19 +27,39 @@ class TargetDistanceTest : public FilterTest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TargetDistanceTest(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?evaluate\@TargetDistanceTest\@\@UEBA_NAEBUFilterContext\@\@\@Z + * @vftbl 1 + * @symbol ?setup\@SimpleFloatFilterTest\@\@UEAA_NAEBUDefinition\@FilterTest\@\@AEBUFilterInputs\@\@\@Z + */ + virtual bool setup(struct FilterTest::Definition const &, struct FilterInputs const &); + /** + * @vftbl 2 + * @symbol ?evaluate\@TargetDistanceTest\@\@UEBA_NAEBUFilterContext\@\@\@Z */ virtual bool evaluate(struct FilterContext const &) const; /** - * @vftbl 4 - * @symbol ?getName\@TargetDistanceTest\@\@UEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @vftbl 3 + * @symbol __unk_vfn_3 + */ + virtual void __unk_vfn_3(); + /** + * @vftbl 4 + * @symbol ?getName\@TargetDistanceTest\@\@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\@SimpleFloatFilterTest\@\@MEBA?AVValue\@Json\@\@XZ */ - virtual class gsl::basic_string_span getName() const; + virtual class Json::Value _serializeValue() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetGoal.hpp b/LiteLoader/include/llapi/mc/TargetGoal.hpp index ebed25407e..302962fa93 100644 --- a/LiteLoader/include/llapi/mc/TargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoal.hpp @@ -30,87 +30,93 @@ class TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@WitherTargetHighestDamage\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@DefendVillageTargetGoal\@\@UEAA_NXZ */ virtual bool canUse() = 0; /** - * @vftbl 2 - * @symbol ?canContinueToUse\@TargetGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@TargetGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol ?isTargetGoal\@TargetGoal\@\@UEBA_NXZ + * @vftbl 3 + * @symbol ?isTargetGoal\@TargetGoal\@\@UEBA_NXZ */ virtual bool isTargetGoal() const; /** - * @vftbl 4 - * @symbol ?start\@TargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@TargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@TargetGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@TargetGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@TargetGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@TargetGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@TargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@TargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_canAttack\@TargetGoal\@\@MEAA_NPEAVMob\@\@PEAVActor\@\@_N2PEAPEBUMobDescriptor\@\@\@Z + * @vftbl 10 + * @symbol ?_canAttack\@TargetGoal\@\@MEAA_NPEAVMob\@\@PEAVActor\@\@_N2PEAPEBUMobDescriptor\@\@\@Z */ virtual bool _canAttack(class Mob *, class Actor *, bool, bool, struct MobDescriptor const **); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TARGETGOAL /** - * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@_NH1M1H\@Z + * @symbol __unk_destructor_-1 */ - MCAPI TargetGoal(class Mob &, bool, int, bool, float, bool, int); + MCVAPI ~TargetGoal(); +#endif /** - * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@_NH2M2H\@Z + * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@_NH2M2H\@Z */ MCAPI TargetGoal(class Mob &, std::vector const &, bool, int, bool, float, bool, int); + /** + * @symbol ??0TargetGoal\@\@QEAA\@AEAVMob\@\@_NH1M1H\@Z + */ + MCAPI TargetGoal(class Mob &, bool, int, bool, float, bool, int); //protected: /** - * @symbol ?_canAttack\@TargetGoal\@\@IEAA_NPEAVActor\@\@_NPEAPEBUMobDescriptor\@\@\@Z + * @symbol ?_canAttack\@TargetGoal\@\@IEAA_NPEAVActor\@\@_NPEAPEBUMobDescriptor\@\@\@Z */ MCAPI bool _canAttack(class Actor *, bool, struct MobDescriptor const **); /** - * @symbol ?_canReachAfterDelay\@TargetGoal\@\@IEAA_NAEAVActor\@\@\@Z + * @symbol ?_canReachAfterDelay\@TargetGoal\@\@IEAA_NAEAVActor\@\@\@Z */ MCAPI bool _canReachAfterDelay(class Actor &); /** - * @symbol ?_matchesTargetTypes\@TargetGoal\@\@IEAA_NPEAVMob\@\@PEAVActor\@\@_NPEAPEBUMobDescriptor\@\@\@Z + * @symbol ?_matchesTargetTypes\@TargetGoal\@\@IEAA_NPEAVMob\@\@PEAVActor\@\@_NPEAPEBUMobDescriptor\@\@\@Z */ MCAPI bool _matchesTargetTypes(class Mob *, class Actor *, bool, struct MobDescriptor const **); /** - * @symbol ?_withinRange\@TargetGoal\@\@IEAA_NAEBVActor\@\@\@Z + * @symbol ?_withinRange\@TargetGoal\@\@IEAA_NAEBVActor\@\@\@Z */ MCAPI bool _withinRange(class Actor const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp b/LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp index 31f32c6e95..579842b7c4 100644 --- a/LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TargetGoalDefinition.hpp @@ -29,9 +29,15 @@ class TargetGoalDefinition { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TARGETGOALDEFINITION /** - * @symbol ?initialize\@TargetGoalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTargetGoal\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TargetGoalDefinition(); +#endif + /** + * @symbol ?initialize\@TargetGoalDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTargetGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class TargetGoal &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetNearbyComponent.hpp b/LiteLoader/include/llapi/mc/TargetNearbyComponent.hpp index 16a04df174..52ce980a96 100644 --- a/LiteLoader/include/llapi/mc/TargetNearbyComponent.hpp +++ b/LiteLoader/include/llapi/mc/TargetNearbyComponent.hpp @@ -30,32 +30,32 @@ class TargetNearbyComponent { public: /** - * @symbol ?getWasInsideRange\@TargetNearbyComponent\@\@QEBA_NXZ + * @symbol ?getWasInsideRange\@TargetNearbyComponent\@\@QEBA_NXZ */ MCAPI bool getWasInsideRange() const; /** - * @symbol ?getWasOutsideRange\@TargetNearbyComponent\@\@QEBA_NXZ + * @symbol ?getWasOutsideRange\@TargetNearbyComponent\@\@QEBA_NXZ */ MCAPI bool getWasOutsideRange() const; /** - * @symbol ?getWasSeenLastTick\@TargetNearbyComponent\@\@QEBA_NXZ + * @symbol ?getWasSeenLastTick\@TargetNearbyComponent\@\@QEBA_NXZ */ MCAPI bool getWasSeenLastTick() const; /** - * @symbol ?setPreviousDistance\@TargetNearbyComponent\@\@QEAAXM\@Z + * @symbol ?setPreviousDistance\@TargetNearbyComponent\@\@QEAAXM\@Z */ MCAPI void setPreviousDistance(float); /** - * @symbol ?setWasInsideRange\@TargetNearbyComponent\@\@QEAAX_N\@Z + * @symbol ?setWasInsideRange\@TargetNearbyComponent\@\@QEAAX_N\@Z */ MCAPI void setWasInsideRange(bool); /** - * @symbol ?setWasOutsideRange\@TargetNearbyComponent\@\@QEAAX_N\@Z + * @symbol ?setWasOutsideRange\@TargetNearbyComponent\@\@QEAAX_N\@Z */ MCAPI void setWasOutsideRange(bool); /** - * @symbol ?setWasSeenLastTick\@TargetNearbyComponent\@\@QEAAX_N\@Z + * @symbol ?setWasSeenLastTick\@TargetNearbyComponent\@\@QEAAX_N\@Z */ MCAPI void setWasSeenLastTick(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetNearbyDefinition.hpp b/LiteLoader/include/llapi/mc/TargetNearbyDefinition.hpp index 0f7915df95..149711d398 100644 --- a/LiteLoader/include/llapi/mc/TargetNearbyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TargetNearbyDefinition.hpp @@ -31,8 +31,8 @@ class TargetNearbyDefinition { public: /** - * @symbol ?buildSchema\@TargetNearbyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTargetNearbyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@TargetNearbyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTargetNearbyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetNearbyProperties.hpp b/LiteLoader/include/llapi/mc/TargetNearbyProperties.hpp index 6a2b3113d9..187f3119c5 100644 --- a/LiteLoader/include/llapi/mc/TargetNearbyProperties.hpp +++ b/LiteLoader/include/llapi/mc/TargetNearbyProperties.hpp @@ -20,27 +20,27 @@ namespace TargetNearbyProperties { #undef AFTER_EXTRA /** - * @symbol ?INSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?INSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI extern class std::basic_string_view> const INSIDE_RANGE; /** - * @symbol ?MUST_SEE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?MUST_SEE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI extern class std::basic_string_view> const MUST_SEE; /** - * @symbol ?ON_INSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?ON_INSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI extern class std::basic_string_view> const ON_INSIDE_RANGE; /** - * @symbol ?ON_OUTSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?ON_OUTSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI extern class std::basic_string_view> const ON_OUTSIDE_RANGE; /** - * @symbol ?ON_VIS_LOST_INSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?ON_VIS_LOST_INSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI extern class std::basic_string_view> const ON_VIS_LOST_INSIDE_RANGE; /** - * @symbol ?OUTSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B + * @symbol ?OUTSIDE_RANGE\@TargetNearbyProperties\@\@3V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ MCAPI extern class std::basic_string_view> const OUTSIDE_RANGE; diff --git a/LiteLoader/include/llapi/mc/TargetNearbySystem.hpp b/LiteLoader/include/llapi/mc/TargetNearbySystem.hpp index 21f0759bd1..d9a9b46d5d 100644 --- a/LiteLoader/include/llapi/mc/TargetNearbySystem.hpp +++ b/LiteLoader/include/llapi/mc/TargetNearbySystem.hpp @@ -30,19 +30,19 @@ class TargetNearbySystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TargetNearbySystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@TargetNearbySystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@TargetNearbySystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TargetPoint.hpp b/LiteLoader/include/llapi/mc/TargetPoint.hpp index 9ff685b2d1..5281ffb04e 100644 --- a/LiteLoader/include/llapi/mc/TargetPoint.hpp +++ b/LiteLoader/include/llapi/mc/TargetPoint.hpp @@ -28,7 +28,7 @@ struct TargetPoint { public: /** - * @symbol ??0TargetPoint\@\@QEAA\@MMMMMM\@Z + * @symbol ??0TargetPoint\@\@QEAA\@MMMMMM\@Z */ MCAPI TargetPoint(float, float, float, float, float, float); diff --git a/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp b/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp index dd235a4292..93ff725cea 100644 --- a/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp +++ b/LiteLoader/include/llapi/mc/TargetWhenPushedGoal.hpp @@ -30,53 +30,53 @@ class TargetWhenPushedGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TargetWhenPushedGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@TargetWhenPushedGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@TargetWhenPushedGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@TargetWhenPushedGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@TargetWhenPushedGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@TargetWhenPushedGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@TargetWhenPushedGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?appendDebugInfo\@TargetWhenPushedGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 6 + * @symbol ?appendDebugInfo\@TargetWhenPushedGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TARGETWHENPUSHEDGOAL /** - * @symbol ?canBeInterrupted\@TargetWhenPushedGoal\@\@UEAA_NXZ + * @symbol ?canBeInterrupted\@TargetWhenPushedGoal\@\@UEAA_NXZ */ MCVAPI bool canBeInterrupted(); /** - * @symbol ?canContinueToUse\@TargetWhenPushedGoal\@\@UEAA_NXZ + * @symbol ?canContinueToUse\@TargetWhenPushedGoal\@\@UEAA_NXZ */ MCVAPI bool canContinueToUse(); #endif /** - * @symbol ??0TargetWhenPushedGoal\@\@QEAA\@AEAVMob\@\@V?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@M\@Z + * @symbol ??0TargetWhenPushedGoal\@\@QEAA\@AEAVMob\@\@V?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@M\@Z */ MCAPI TargetWhenPushedGoal(class Mob &, std::vector, float); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TaskGroup.hpp b/LiteLoader/include/llapi/mc/TaskGroup.hpp index 9e12c4b8bb..cc0bda2bcf 100644 --- a/LiteLoader/include/llapi/mc/TaskGroup.hpp +++ b/LiteLoader/include/llapi/mc/TaskGroup.hpp @@ -31,112 +31,118 @@ class TaskGroup { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TaskGroup(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?queue\@TaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z + * @vftbl 1 + * @symbol ?queue\@TaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z */ virtual class std::shared_ptr> queue(struct TaskStartInfoEx const &, class std::function &&, class std::function &&); /** - * @vftbl 2 - * @symbol ?queueSync\@TaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z + * @vftbl 2 + * @symbol ?queueSync\@TaskGroup\@\@UEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z */ virtual class std::shared_ptr> queueSync(struct TaskStartInfoEx const &, class std::function &&); /** - * @vftbl 3 - * @symbol ?taskRegister\@TaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?taskRegister\@TaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ virtual void taskRegister(class std::shared_ptr); /** - * @vftbl 4 - * @symbol ?requeueTask\@TaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z + * @vftbl 4 + * @symbol ?requeueTask\@TaskGroup\@\@UEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z */ virtual void requeueTask(class std::shared_ptr, bool); /** - * @vftbl 5 - * @symbol ?getState\@TaskGroup\@\@UEBA?AW4TaskGroupState\@\@XZ + * @vftbl 5 + * @symbol ?getState\@TaskGroup\@\@UEBA?AW4TaskGroupState\@\@XZ */ virtual enum class TaskGroupState getState() const; /** - * @vftbl 6 - * @symbol ?processCoroutines\@TaskGroup\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?processCoroutines\@TaskGroup\@\@UEAAXXZ */ virtual void processCoroutines(); /** - * @vftbl 7 - * @symbol ?taskComplete\@TaskGroup\@\@UEAAXV?$not_null\@PEAVBackgroundTaskBase\@\@\@gsl\@\@\@Z + * @vftbl 7 + * @symbol ?taskComplete\@TaskGroup\@\@UEAAXV?$not_null\@PEAVBackgroundTaskBase\@\@\@gsl\@\@\@Z */ virtual void taskComplete(class gsl::not_null); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TASKGROUP /** - * @symbol ??0TaskGroup\@\@QEAA\@AEAVWorkerPool\@\@AEAVScheduler\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TaskGroup(); +#endif + /** + * @symbol ??0TaskGroup\@\@QEAA\@AEAVWorkerPool\@\@AEAVScheduler\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI TaskGroup(class WorkerPool &, class Scheduler &, std::string); /** - * @symbol ?disableOwnerThreadChecks\@TaskGroup\@\@QEAAXXZ + * @symbol ?disableOwnerThreadChecks\@TaskGroup\@\@QEAAXXZ */ MCAPI void disableOwnerThreadChecks(); /** - * @symbol ?flush\@TaskGroup\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?flush\@TaskGroup\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void flush(class std::function); /** - * @symbol ?getName\@TaskGroup\@\@QEBA?AV?$basic_string_span\@$$CBD$0?0\@gsl\@\@XZ + * @symbol ?getName\@TaskGroup\@\@QEBA?AV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@XZ */ - MCAPI class gsl::basic_string_span getName() const; + MCAPI class std::basic_string_view> getName() const; /** - * @symbol ?getScheduler\@TaskGroup\@\@QEAAAEAVScheduler\@\@XZ + * @symbol ?getScheduler\@TaskGroup\@\@QEAAAEAVScheduler\@\@XZ */ MCAPI class Scheduler & getScheduler(); /** - * @symbol ?isEmpty\@TaskGroup\@\@QEBA_NXZ + * @symbol ?isEmpty\@TaskGroup\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?pause\@TaskGroup\@\@QEAAXXZ + * @symbol ?pause\@TaskGroup\@\@QEAAXXZ */ MCAPI void pause(); /** - * @symbol ?queue\@TaskGroup\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?queue\@TaskGroup\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z */ - MCAPI class std::shared_ptr> queue(class gsl::basic_string_span, class std::function &&, class std::function &&); + MCAPI class std::shared_ptr> queue(class std::basic_string_view>, class std::function &&, class std::function &&); /** - * @symbol ?queueSync\@TaskGroup\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z + * @symbol ?queueSync\@TaskGroup\@\@QEAA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z */ - MCAPI class std::shared_ptr> queueSync(class gsl::basic_string_span, class std::function &&); + MCAPI class std::shared_ptr> queueSync(class std::basic_string_view>, class std::function &&); /** - * @symbol ?sync_DEPRECATED_ASK_TOMMO\@TaskGroup\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z + * @symbol ?sync_DEPRECATED_ASK_TOMMO\@TaskGroup\@\@QEAAXV?$function\@$$A6AXXZ\@std\@\@\@Z */ MCAPI void sync_DEPRECATED_ASK_TOMMO(class std::function); /** - * @symbol ?queueChildSync_DEPRECATED\@TaskGroup\@\@SA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z + * @symbol ?queueChildSync_DEPRECATED\@TaskGroup\@\@SA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@\@Z */ MCAPI static class std::shared_ptr> queueChildSync_DEPRECATED(struct TaskStartInfoEx const &, class std::function &&); /** - * @symbol ?queueChild_DEPRECATED\@TaskGroup\@\@SA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z + * @symbol ?queueChild_DEPRECATED\@TaskGroup\@\@SA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@AEBU?$TaskStartInfoEx\@X\@\@$$QEAV?$function\@$$A6A?AVTaskResult\@\@XZ\@3\@$$QEAV?$function\@$$A6AXXZ\@3\@\@Z */ MCAPI static class std::shared_ptr> queueChild_DEPRECATED(struct TaskStartInfoEx const &, class std::function &&, class std::function &&); //private: /** - * @symbol ?_forAllTasks\@TaskGroup\@\@AEAAXAEAV?$UniqueLock\@Vmutex\@std\@\@\@Threading\@Bedrock\@\@V?$function\@$$A6AXAEBV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z\@std\@\@\@Z + * @symbol ?_forAllTasks\@TaskGroup\@\@AEAAXAEAV?$UniqueLock\@Vmutex\@std\@\@\@Threading\@Bedrock\@\@V?$function\@$$A6AXAEBV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z\@std\@\@\@Z */ MCAPI void _forAllTasks(class Bedrock::Threading::UniqueLock &, class std::function const &)>); /** - * @symbol ?_isEmptyInternal\@TaskGroup\@\@AEBA_NXZ + * @symbol ?_isEmptyInternal\@TaskGroup\@\@AEBA_NXZ */ MCAPI bool _isEmptyInternal() const; /** - * @symbol ?_queueInternal\@TaskGroup\@\@AEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z + * @symbol ?_queueInternal\@TaskGroup\@\@AEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@\@Z */ MCAPI void _queueInternal(class std::shared_ptr); /** - * @symbol ?getCurrentTaskGroup\@TaskGroup\@\@CAPEAVIBackgroundTaskOwner\@\@XZ + * @symbol ?getCurrentTaskGroup\@TaskGroup\@\@CAPEAVIBackgroundTaskOwner\@\@XZ */ MCAPI static class IBackgroundTaskOwner * getCurrentTaskGroup(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp b/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp index 92f301188e..46d9546e2f 100644 --- a/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp +++ b/LiteLoader/include/llapi/mc/TaskQueueImpl.hpp @@ -27,79 +27,79 @@ class TaskQueueImpl { public: /** - * @vftbl 3 - * @symbol ?GetHandle\@TaskQueueImpl\@\@UEAAPEAUXTaskQueueObject\@\@XZ + * @vftbl 3 + * @symbol ?GetHandle\@TaskQueueImpl\@\@UEAAPEAUXTaskQueueObject\@\@XZ */ virtual struct XTaskQueueObject * GetHandle(); /** - * @vftbl 4 - * @symbol ?GetPortContext\@TaskQueueImpl\@\@UEAAJW4XTaskQueuePort\@\@PEAPEAUITaskQueuePortContext\@\@\@Z + * @vftbl 4 + * @symbol ?GetPortContext\@TaskQueueImpl\@\@UEAAJW4XTaskQueuePort\@\@PEAPEAUITaskQueuePortContext\@\@\@Z */ virtual long GetPortContext(enum class XTaskQueuePort, struct ITaskQueuePortContext **); /** - * @vftbl 5 - * @symbol ?RegisterWaitHandle\@TaskQueueImpl\@\@UEAAJW4XTaskQueuePort\@\@PEAX1P6AX1_N\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z + * @vftbl 5 + * @symbol ?RegisterWaitHandle\@TaskQueueImpl\@\@UEAAJW4XTaskQueuePort\@\@PEAX1P6AX1_N\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z */ virtual long RegisterWaitHandle(enum class XTaskQueuePort, void *, void *, void ( *)(void *, bool), struct XTaskQueueRegistrationToken *); /** - * @vftbl 6 - * @symbol ?UnregisterWaitHandle\@TaskQueueImpl\@\@UEAAXUXTaskQueueRegistrationToken\@\@\@Z + * @vftbl 6 + * @symbol ?UnregisterWaitHandle\@TaskQueueImpl\@\@UEAAXUXTaskQueueRegistrationToken\@\@\@Z */ virtual void UnregisterWaitHandle(struct XTaskQueueRegistrationToken); /** - * @vftbl 7 - * @symbol ?RegisterSubmitCallback\@TaskQueueImpl\@\@UEAAJPEAXP6AX0PEAUXTaskQueueObject\@\@W4XTaskQueuePort\@\@\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z + * @vftbl 7 + * @symbol ?RegisterSubmitCallback\@TaskQueueImpl\@\@UEAAJPEAXP6AX0PEAUXTaskQueueObject\@\@W4XTaskQueuePort\@\@\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z */ virtual long RegisterSubmitCallback(void *, void ( *)(void *, struct XTaskQueueObject *, enum class XTaskQueuePort), struct XTaskQueueRegistrationToken *); /** - * @vftbl 8 - * @symbol ?UnregisterSubmitCallback\@TaskQueueImpl\@\@UEAAXUXTaskQueueRegistrationToken\@\@\@Z + * @vftbl 8 + * @symbol ?UnregisterSubmitCallback\@TaskQueueImpl\@\@UEAAXUXTaskQueueRegistrationToken\@\@\@Z */ virtual void UnregisterSubmitCallback(struct XTaskQueueRegistrationToken); /** - * @vftbl 9 - * @symbol ?CanTerminate\@TaskQueueImpl\@\@UEAA_NXZ + * @vftbl 9 + * @symbol ?CanTerminate\@TaskQueueImpl\@\@UEAA_NXZ */ virtual bool CanTerminate(); /** - * @vftbl 10 - * @symbol ?CanClose\@TaskQueueImpl\@\@UEAA_NXZ + * @vftbl 10 + * @symbol ?CanClose\@TaskQueueImpl\@\@UEAA_NXZ */ virtual bool CanClose(); /** - * @vftbl 11 - * @symbol ?Terminate\@TaskQueueImpl\@\@UEAAJ_NPEAXP6AX1\@Z\@Z + * @vftbl 11 + * @symbol ?Terminate\@TaskQueueImpl\@\@UEAAJ_NPEAXP6AX1\@Z\@Z */ virtual long Terminate(bool, void *, void ( *)(void *)); /** - * @vftbl 12 - * @symbol __unk_destructor_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ - virtual ~TaskQueueImpl(); + virtual void __unk_vfn_12(); /** - * @vftbl 14 - * @symbol ?RundownObject\@TaskQueueImpl\@\@MEAAXXZ + * @vftbl 14 + * @symbol ?RundownObject\@TaskQueueImpl\@\@MEAAXXZ */ virtual void RundownObject(); /** - * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJPEAUXTaskQueuePortObject\@\@0\@Z + * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJPEAUXTaskQueuePortObject\@\@0\@Z */ MCAPI long Initialize(struct XTaskQueuePortObject *, struct XTaskQueuePortObject *); /** - * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJW4XTaskQueueDispatchMode\@\@0_N1\@Z + * @symbol ?Initialize\@TaskQueueImpl\@\@QEAAJW4XTaskQueueDispatchMode\@\@0_N1\@Z */ MCAPI long Initialize(enum class XTaskQueueDispatchMode, enum class XTaskQueueDispatchMode, bool, bool); /** - * @symbol ??0TaskQueueImpl\@\@QEAA\@XZ + * @symbol ??0TaskQueueImpl\@\@QEAA\@XZ */ MCAPI TaskQueueImpl(); //private: /** - * @symbol ?OnTerminationCallback\@TaskQueueImpl\@\@CAXPEAX\@Z + * @symbol ?OnTerminationCallback\@TaskQueueImpl\@\@CAXPEAX\@Z */ MCAPI static void OnTerminationCallback(void *); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TaskQueuePortContextImpl.hpp b/LiteLoader/include/llapi/mc/TaskQueuePortContextImpl.hpp index 2c8c5b3ad0..b28eeb8b8b 100644 --- a/LiteLoader/include/llapi/mc/TaskQueuePortContextImpl.hpp +++ b/LiteLoader/include/llapi/mc/TaskQueuePortContextImpl.hpp @@ -28,64 +28,64 @@ class TaskQueuePortContextImpl { public: /** - * @vftbl 0 - * @symbol ?AddRef\@TaskQueuePortContextImpl\@\@UEAAIXZ + * @vftbl 0 + * @symbol ?AddRef\@TaskQueuePortContextImpl\@\@UEAAIXZ */ virtual unsigned int AddRef(); /** - * @vftbl 1 - * @symbol ?Release\@TaskQueuePortContextImpl\@\@UEAAIXZ + * @vftbl 1 + * @symbol ?Release\@TaskQueuePortContextImpl\@\@UEAAIXZ */ virtual unsigned int Release(); /** - * @vftbl 2 - * @symbol ?QueryApi\@TaskQueuePortContextImpl\@\@UEAAJW4ApiId\@\@PEAPEAX\@Z + * @vftbl 2 + * @symbol ?QueryApi\@TaskQueuePortContextImpl\@\@UEAAJW4ApiId\@\@PEAPEAX\@Z */ virtual long QueryApi(enum class ApiId, void **); /** - * @vftbl 3 - * @symbol ?GetType\@TaskQueuePortContextImpl\@\@UEAA?AW4XTaskQueuePort\@\@XZ + * @vftbl 3 + * @symbol ?GetType\@TaskQueuePortContextImpl\@\@UEAA?AW4XTaskQueuePort\@\@XZ */ virtual enum class XTaskQueuePort GetType(); /** - * @vftbl 4 - * @symbol ?GetStatus\@TaskQueuePortContextImpl\@\@UEAA?AW4TaskQueuePortStatus\@\@XZ + * @vftbl 4 + * @symbol ?GetStatus\@TaskQueuePortContextImpl\@\@UEAA?AW4TaskQueuePortStatus\@\@XZ */ virtual enum class TaskQueuePortStatus GetStatus(); /** - * @vftbl 5 - * @symbol ?GetQueue\@TaskQueuePortContextImpl\@\@UEAAPEAUITaskQueue\@\@XZ + * @vftbl 5 + * @symbol ?GetQueue\@TaskQueuePortContextImpl\@\@UEAAPEAUITaskQueue\@\@XZ */ virtual struct ITaskQueue * GetQueue(); /** - * @vftbl 6 - * @symbol ?GetPort\@TaskQueuePortContextImpl\@\@UEAAPEAUITaskQueuePort\@\@XZ + * @vftbl 6 + * @symbol ?GetPort\@TaskQueuePortContextImpl\@\@UEAAPEAUITaskQueuePort\@\@XZ */ virtual struct ITaskQueuePort * GetPort(); /** - * @vftbl 7 - * @symbol ?TrySetStatus\@TaskQueuePortContextImpl\@\@UEAA_NW4TaskQueuePortStatus\@\@0\@Z + * @vftbl 7 + * @symbol ?TrySetStatus\@TaskQueuePortContextImpl\@\@UEAA_NW4TaskQueuePortStatus\@\@0\@Z */ virtual bool TrySetStatus(enum class TaskQueuePortStatus, enum class TaskQueuePortStatus); /** - * @vftbl 8 - * @symbol ?SetStatus\@TaskQueuePortContextImpl\@\@UEAAXW4TaskQueuePortStatus\@\@\@Z + * @vftbl 8 + * @symbol ?SetStatus\@TaskQueuePortContextImpl\@\@UEAAXW4TaskQueuePortStatus\@\@\@Z */ virtual void SetStatus(enum class TaskQueuePortStatus); /** - * @vftbl 9 - * @symbol ?ItemQueued\@TaskQueuePortContextImpl\@\@UEAAXXZ + * @vftbl 9 + * @symbol ?ItemQueued\@TaskQueuePortContextImpl\@\@UEAAXXZ */ virtual void ItemQueued(); /** - * @vftbl 10 - * @symbol ?AddSuspend\@TaskQueuePortContextImpl\@\@UEAA_NXZ + * @vftbl 10 + * @symbol ?AddSuspend\@TaskQueuePortContextImpl\@\@UEAA_NXZ */ virtual bool AddSuspend(); /** - * @vftbl 11 - * @symbol ?RemoveSuspend\@TaskQueuePortContextImpl\@\@UEAA_NXZ + * @vftbl 11 + * @symbol ?RemoveSuspend\@TaskQueuePortContextImpl\@\@UEAA_NXZ */ virtual bool RemoveSuspend(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp b/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp index dffa06bb6d..abfd297d49 100644 --- a/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp +++ b/LiteLoader/include/llapi/mc/TaskQueuePortImpl.hpp @@ -27,123 +27,129 @@ class TaskQueuePortImpl { public: /** - * @vftbl 3 - * @symbol ?GetHandle\@TaskQueuePortImpl\@\@UEAAPEAUXTaskQueuePortObject\@\@XZ + * @vftbl 3 + * @symbol ?GetHandle\@TaskQueuePortImpl\@\@UEAAPEAUXTaskQueuePortObject\@\@XZ */ virtual struct XTaskQueuePortObject * GetHandle(); /** - * @vftbl 4 - * @symbol ?QueueItem\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@IPEAXP6AX1_N\@Z\@Z + * @vftbl 4 + * @symbol ?QueueItem\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@IPEAXP6AX1_N\@Z\@Z */ virtual long QueueItem(struct ITaskQueuePortContext *, unsigned int, void *, void ( *)(void *, bool)); /** - * @vftbl 5 - * @symbol ?RegisterWaitHandle\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@PEAX1P6AX1_N\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z + * @vftbl 5 + * @symbol ?RegisterWaitHandle\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@PEAX1P6AX1_N\@ZPEAUXTaskQueueRegistrationToken\@\@\@Z */ virtual long RegisterWaitHandle(struct ITaskQueuePortContext *, void *, void *, void ( *)(void *, bool), struct XTaskQueueRegistrationToken *); /** - * @vftbl 6 - * @symbol ?UnregisterWaitHandle\@TaskQueuePortImpl\@\@UEAAXUXTaskQueueRegistrationToken\@\@\@Z + * @vftbl 6 + * @symbol ?UnregisterWaitHandle\@TaskQueuePortImpl\@\@UEAAXUXTaskQueueRegistrationToken\@\@\@Z */ virtual void UnregisterWaitHandle(struct XTaskQueueRegistrationToken); /** - * @vftbl 7 - * @symbol ?PrepareTerminate\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@PEAXP6AX1\@ZPEAPEAX\@Z + * @vftbl 7 + * @symbol ?PrepareTerminate\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@PEAXP6AX1\@ZPEAPEAX\@Z */ virtual long PrepareTerminate(struct ITaskQueuePortContext *, void *, void ( *)(void *), void **); /** - * @vftbl 8 - * @symbol ?CancelTermination\@TaskQueuePortImpl\@\@UEAAXPEAX\@Z + * @vftbl 8 + * @symbol ?CancelTermination\@TaskQueuePortImpl\@\@UEAAXPEAX\@Z */ virtual void CancelTermination(void *); /** - * @vftbl 9 - * @symbol ?Terminate\@TaskQueuePortImpl\@\@UEAAXPEAX\@Z + * @vftbl 9 + * @symbol ?Terminate\@TaskQueuePortImpl\@\@UEAAXPEAX\@Z */ virtual void Terminate(void *); /** - * @vftbl 10 - * @symbol ?Attach\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@\@Z + * @vftbl 10 + * @symbol ?Attach\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@\@Z */ virtual long Attach(struct ITaskQueuePortContext *); /** - * @vftbl 11 - * @symbol ?Detach\@TaskQueuePortImpl\@\@UEAAXPEAUITaskQueuePortContext\@\@\@Z + * @vftbl 11 + * @symbol ?Detach\@TaskQueuePortImpl\@\@UEAAXPEAUITaskQueuePortContext\@\@\@Z */ virtual void Detach(struct ITaskQueuePortContext *); /** - * @vftbl 12 - * @symbol ?DrainOneItem\@TaskQueuePortImpl\@\@UEAA_NXZ + * @vftbl 12 + * @symbol ?DrainOneItem\@TaskQueuePortImpl\@\@UEAA_NXZ */ virtual bool DrainOneItem(); /** - * @vftbl 13 - * @symbol ?Wait\@TaskQueuePortImpl\@\@UEAA_NPEAUITaskQueuePortContext\@\@I\@Z + * @vftbl 13 + * @symbol ?Wait\@TaskQueuePortImpl\@\@UEAA_NPEAUITaskQueuePortContext\@\@I\@Z */ virtual bool Wait(struct ITaskQueuePortContext *, unsigned int); /** - * @vftbl 14 - * @symbol ?IsEmpty\@TaskQueuePortImpl\@\@UEAA_NXZ + * @vftbl 14 + * @symbol ?IsEmpty\@TaskQueuePortImpl\@\@UEAA_NXZ */ virtual bool IsEmpty(); /** - * @vftbl 15 - * @symbol ?SuspendTermination\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@\@Z + * @vftbl 15 + * @symbol ?SuspendTermination\@TaskQueuePortImpl\@\@UEAAJPEAUITaskQueuePortContext\@\@\@Z */ virtual long SuspendTermination(struct ITaskQueuePortContext *); /** - * @vftbl 16 - * @symbol ?ResumeTermination\@TaskQueuePortImpl\@\@UEAAXPEAUITaskQueuePortContext\@\@\@Z + * @vftbl 16 + * @symbol ?ResumeTermination\@TaskQueuePortImpl\@\@UEAAXPEAUITaskQueuePortContext\@\@\@Z */ virtual void ResumeTermination(struct ITaskQueuePortContext *); /** - * @vftbl 17 - * @symbol __unk_destructor_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ - virtual ~TaskQueuePortImpl(); + virtual void __unk_vfn_17(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TASKQUEUEPORTIMPL /** - * @symbol ?Initialize\@TaskQueuePortImpl\@\@QEAAJW4XTaskQueueDispatchMode\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TaskQueuePortImpl(); +#endif + /** + * @symbol ?Initialize\@TaskQueuePortImpl\@\@QEAAJW4XTaskQueueDispatchMode\@\@\@Z */ MCAPI long Initialize(enum class XTaskQueueDispatchMode); /** - * @symbol ??0TaskQueuePortImpl\@\@QEAA\@XZ + * @symbol ??0TaskQueuePortImpl\@\@QEAA\@XZ */ MCAPI TaskQueuePortImpl(); //private: /** - * @symbol ?AppendEntry\@TaskQueuePortImpl\@\@AEAA_NAEBUQueueEntry\@1\@_K_N\@Z + * @symbol ?AppendEntry\@TaskQueuePortImpl\@\@AEAA_NAEBUQueueEntry\@1\@_K_N\@Z */ MCAPI bool AppendEntry(struct TaskQueuePortImpl::QueueEntry const &, unsigned __int64, bool); /** - * @symbol ?AppendWaitRegistrationEntry\@TaskQueuePortImpl\@\@AEAA_NPEAUWaitRegistration\@1\@_N\@Z + * @symbol ?AppendWaitRegistrationEntry\@TaskQueuePortImpl\@\@AEAA_NPEAUWaitRegistration\@1\@_N\@Z */ MCAPI bool AppendWaitRegistrationEntry(struct TaskQueuePortImpl::WaitRegistration *, bool); /** - * @symbol ?CancelPendingEntries\@TaskQueuePortImpl\@\@AEAAXPEAUITaskQueuePortContext\@\@_N\@Z + * @symbol ?CancelPendingEntries\@TaskQueuePortImpl\@\@AEAAXPEAUITaskQueuePortContext\@\@_N\@Z */ MCAPI void CancelPendingEntries(struct ITaskQueuePortContext *, bool); /** - * @symbol ?InitializeWaitRegistration\@TaskQueuePortImpl\@\@AEAAJPEAUWaitRegistration\@1\@\@Z + * @symbol ?InitializeWaitRegistration\@TaskQueuePortImpl\@\@AEAAJPEAUWaitRegistration\@1\@\@Z */ MCAPI long InitializeWaitRegistration(struct TaskQueuePortImpl::WaitRegistration *); /** - * @symbol ?ScheduleTermination\@TaskQueuePortImpl\@\@AEAAXPEAUTerminationEntry\@1\@\@Z + * @symbol ?ScheduleTermination\@TaskQueuePortImpl\@\@AEAAXPEAUTerminationEntry\@1\@\@Z */ MCAPI void ScheduleTermination(struct TaskQueuePortImpl::TerminationEntry *); /** - * @symbol ?SubmitPendingCallback\@TaskQueuePortImpl\@\@AEAAXXZ + * @symbol ?SubmitPendingCallback\@TaskQueuePortImpl\@\@AEAAXXZ */ MCAPI void SubmitPendingCallback(); /** - * @symbol ?EraseQueue\@TaskQueuePortImpl\@\@CAXPEAV?$LocklessQueue\@UQueueEntry\@TaskQueuePortImpl\@\@\@\@\@Z + * @symbol ?EraseQueue\@TaskQueuePortImpl\@\@CAXPEAV?$LocklessQueue\@UQueueEntry\@TaskQueuePortImpl\@\@\@\@\@Z */ MCAPI static void EraseQueue(class LocklessQueue *); /** - * @symbol ?WaitCallback\@TaskQueuePortImpl\@\@CAXPEAU_TP_CALLBACK_INSTANCE\@\@PEAXPEAU_TP_WAIT\@\@K\@Z + * @symbol ?WaitCallback\@TaskQueuePortImpl\@\@CAXPEAU_TP_CALLBACK_INSTANCE\@\@PEAXPEAU_TP_WAIT\@\@K\@Z */ MCAPI static void WaitCallback(struct _TP_CALLBACK_INSTANCE *, void *, struct _TP_WAIT *, unsigned long); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TaskResult.hpp b/LiteLoader/include/llapi/mc/TaskResult.hpp index e35cbeacdb..b196d364f8 100644 --- a/LiteLoader/include/llapi/mc/TaskResult.hpp +++ b/LiteLoader/include/llapi/mc/TaskResult.hpp @@ -30,48 +30,48 @@ class TaskResult { public: /** - * @symbol ??0TaskResult\@\@QEAA\@XZ + * @symbol ??0TaskResult\@\@QEAA\@XZ */ MCAPI TaskResult(); /** - * @symbol ?getRunAtTime\@TaskResult\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ + * @symbol ?getRunAtTime\@TaskResult\@\@QEBA?AV?$time_point\@Usteady_clock\@chrono\@std\@\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@23\@\@chrono\@std\@\@XZ */ MCAPI class std::chrono::time_point>> getRunAtTime() const; /** - * @symbol ?getWaitingOperation\@TaskResult\@\@QEBA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@XZ + * @symbol ?getWaitingOperation\@TaskResult\@\@QEBA?AV?$shared_ptr\@V?$IAsyncResult\@X\@Threading\@Bedrock\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr> getWaitingOperation() const; /** - * @symbol ?hasDelay\@TaskResult\@\@QEBA_NXZ + * @symbol ?hasDelay\@TaskResult\@\@QEBA_NXZ */ MCAPI bool hasDelay() const; /** - * @symbol ?isDone\@TaskResult\@\@QEBA_NXZ + * @symbol ?isDone\@TaskResult\@\@QEBA_NXZ */ MCAPI bool isDone() const; /** - * @symbol ?isWaiting\@TaskResult\@\@QEBA_NXZ + * @symbol ?isWaiting\@TaskResult\@\@QEBA_NXZ */ MCAPI bool isWaiting() const; /** - * @symbol ?isWaitingOperationLinked\@TaskResult\@\@QEBA_NXZ + * @symbol ?isWaitingOperationLinked\@TaskResult\@\@QEBA_NXZ */ MCAPI bool isWaitingOperationLinked() const; /** - * @symbol ??1TaskResult\@\@QEAA\@XZ + * @symbol ??1TaskResult\@\@QEAA\@XZ */ MCAPI ~TaskResult(); /** - * @symbol ?Done\@TaskResult\@\@2V1\@B + * @symbol ?Done\@TaskResult\@\@2V1\@B */ MCAPI static class TaskResult const Done; /** - * @symbol ?Requeue\@TaskResult\@\@2V1\@B + * @symbol ?Requeue\@TaskResult\@\@2V1\@B */ MCAPI static class TaskResult const Requeue; /** - * @symbol ?requeueAfter\@TaskResult\@\@SA?AV1\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z + * @symbol ?requeueAfter\@TaskResult\@\@SA?AV1\@V?$duration\@_JU?$ratio\@$00$0DLJKMKAA\@\@std\@\@\@chrono\@std\@\@\@Z */ MCAPI static class TaskResult requeueAfter(class std::chrono::duration<__int64, struct std::ratio<1, 1000000000>>); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TaskStartInfoBase.hpp b/LiteLoader/include/llapi/mc/TaskStartInfoBase.hpp index 8ca4a10cb2..9ff8705a40 100644 --- a/LiteLoader/include/llapi/mc/TaskStartInfoBase.hpp +++ b/LiteLoader/include/llapi/mc/TaskStartInfoBase.hpp @@ -30,7 +30,7 @@ struct TaskStartInfoBase { public: /** - * @symbol ?NoAffinity\@TaskStartInfoBase\@\@2Vid\@thread\@std\@\@B + * @symbol ?NoAffinity\@TaskStartInfoBase\@\@2Vid\@thread\@std\@\@B */ MCAPI static class std::thread::id const NoAffinity; diff --git a/LiteLoader/include/llapi/mc/TaskStatus.hpp b/LiteLoader/include/llapi/mc/TaskStatus.hpp index 2055d7c249..a658386c59 100644 --- a/LiteLoader/include/llapi/mc/TaskStatus.hpp +++ b/LiteLoader/include/llapi/mc/TaskStatus.hpp @@ -30,24 +30,24 @@ class TaskStatus { public: /** - * @symbol ??0TaskStatus\@\@QEAA\@XZ + * @symbol ??0TaskStatus\@\@QEAA\@XZ */ MCAPI TaskStatus(); /** - * @symbol ?isComplete\@TaskStatus\@\@QEBA_NXZ + * @symbol ?isComplete\@TaskStatus\@\@QEBA_NXZ */ MCAPI bool isComplete() const; /** - * @symbol ??BTaskStatus\@\@QEBA?AW4Value\@0\@XZ + * @symbol ??BTaskStatus\@\@QEBA?AW4Value\@0\@XZ */ MCAPI operator enum TaskStatus::Value() const; /** - * @symbol ?toAsyncStatus\@TaskStatus\@\@QEBA?AW4AsyncStatus\@Threading\@Bedrock\@\@XZ + * @symbol ?toAsyncStatus\@TaskStatus\@\@QEBA?AW4AsyncStatus\@Threading\@Bedrock\@\@XZ */ MCAPI enum class Bedrock::Threading::AsyncStatus toAsyncStatus() const; /** - * @symbol ?toErrorCode\@TaskStatus\@\@QEBA?AVerror_code\@std\@\@XZ + * @symbol ?toErrorCode\@TaskStatus\@\@QEBA?AVerror_code\@std\@\@XZ */ MCAPI class std::error_code toErrorCode() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TcpProxy.hpp b/LiteLoader/include/llapi/mc/TcpProxy.hpp index 3fa0dbfc7f..3e877c1258 100644 --- a/LiteLoader/include/llapi/mc/TcpProxy.hpp +++ b/LiteLoader/include/llapi/mc/TcpProxy.hpp @@ -29,5 +29,11 @@ class TcpProxy { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TCPPROXY + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TcpProxy(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportCommand.hpp b/LiteLoader/include/llapi/mc/TeleportCommand.hpp index 135e2e2061..129299a291 100644 --- a/LiteLoader/include/llapi/mc/TeleportCommand.hpp +++ b/LiteLoader/include/llapi/mc/TeleportCommand.hpp @@ -35,46 +35,46 @@ enum class TeleportAnalysis; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TeleportCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TeleportCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TeleportCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?applyTarget\@TeleportCommand\@\@SAXAEAVActor\@\@VTeleportTarget\@\@_N\@Z + * @symbol ?applyTarget\@TeleportCommand\@\@SAXAEAVActor\@\@VTeleportTarget\@\@_N\@Z */ MCAPI static void applyTarget(class Actor &, class TeleportTarget, bool); /** - * @symbol ?computeTarget\@TeleportCommand\@\@SA?AVTeleportTarget\@\@AEAVActor\@\@VVec3\@\@PEAV4\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$optional\@VRotationData\@RotationCommandUtils\@\@\@std\@\@H\@Z + * @symbol ?computeTarget\@TeleportCommand\@\@SA?AVTeleportTarget\@\@AEAVActor\@\@VVec3\@\@PEAV4\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$optional\@VRotationData\@RotationCommandUtils\@\@\@std\@\@H\@Z */ MCAPI static class TeleportTarget computeTarget(class Actor &, class Vec3, class Vec3 *, class AutomaticID, class std::optional const &, int); /** - * @symbol ?setup\@TeleportCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TeleportCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?getFacingDirection\@TeleportCommand\@\@AEBA?AW4FacingResult\@RotationCommandUtils\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVVec3\@\@PEAVActor\@\@\@Z + * @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 + * @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 + * @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 + * @symbol ?getSafetyAABB\@TeleportCommand\@\@CA?AVAABB\@\@AEBVActor\@\@VVec3\@\@\@Z */ MCAPI static class AABB getSafetyAABB(class Actor const &, class Vec3); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportComponent.hpp b/LiteLoader/include/llapi/mc/TeleportComponent.hpp index b15f58d1bb..d0b1866770 100644 --- a/LiteLoader/include/llapi/mc/TeleportComponent.hpp +++ b/LiteLoader/include/llapi/mc/TeleportComponent.hpp @@ -29,60 +29,60 @@ class TeleportComponent { public: /** - * @symbol ??0TeleportComponent\@\@QEAA\@XZ + * @symbol ??0TeleportComponent\@\@QEAA\@XZ */ MCAPI TeleportComponent(); /** - * @symbol ?getDarkTeleportChance\@TeleportComponent\@\@QEAAMXZ + * @symbol ?getDarkTeleportChance\@TeleportComponent\@\@QEAAMXZ */ MCAPI float getDarkTeleportChance(); /** - * @symbol ?getLightTeleportChance\@TeleportComponent\@\@QEAAMXZ + * @symbol ?getLightTeleportChance\@TeleportComponent\@\@QEAAMXZ */ MCAPI float getLightTeleportChance(); /** - * @symbol ?getMaxTeleportTime\@TeleportComponent\@\@QEAAHXZ + * @symbol ?getMaxTeleportTime\@TeleportComponent\@\@QEAAHXZ */ MCAPI int getMaxTeleportTime(); /** - * @symbol ?getMinTeleportTime\@TeleportComponent\@\@QEAAHXZ + * @symbol ?getMinTeleportTime\@TeleportComponent\@\@QEAAHXZ */ MCAPI int getMinTeleportTime(); /** - * @symbol ?getRandomTeleports\@TeleportComponent\@\@QEAA_NXZ + * @symbol ?getRandomTeleports\@TeleportComponent\@\@QEAA_NXZ */ MCAPI bool getRandomTeleports(); /** - * @symbol ?getTargetDistance\@TeleportComponent\@\@QEAAMXZ + * @symbol ?getTargetDistance\@TeleportComponent\@\@QEAAMXZ */ MCAPI float getTargetDistance(); /** - * @symbol ?getTargetTeleportChance\@TeleportComponent\@\@QEAAMXZ + * @symbol ?getTargetTeleportChance\@TeleportComponent\@\@QEAAMXZ */ MCAPI float getTargetTeleportChance(); /** - * @symbol ?getTeleportTime\@TeleportComponent\@\@QEAAHXZ + * @symbol ?getTeleportTime\@TeleportComponent\@\@QEAAHXZ */ MCAPI int getTeleportTime(); /** - * @symbol ?initFromDefinition\@TeleportComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@TeleportComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?randomTeleport\@TeleportComponent\@\@QEAA_NAEAVActor\@\@\@Z + * @symbol ?randomTeleport\@TeleportComponent\@\@QEAA_NAEAVActor\@\@\@Z */ MCAPI bool randomTeleport(class Actor &); /** - * @symbol ?setTeleportTime\@TeleportComponent\@\@QEAAXH\@Z + * @symbol ?setTeleportTime\@TeleportComponent\@\@QEAAXH\@Z */ MCAPI void setTeleportTime(int); /** - * @symbol ?teleport\@TeleportComponent\@\@QEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z + * @symbol ?teleport\@TeleportComponent\@\@QEAA_NAEAVActor\@\@AEBVVec3\@\@\@Z */ MCAPI bool teleport(class Actor &, class Vec3 const &); /** - * @symbol ?teleportTowards\@TeleportComponent\@\@QEAA_NAEAVActor\@\@AEBV2\@\@Z + * @symbol ?teleportTowards\@TeleportComponent\@\@QEAA_NAEAVActor\@\@AEBV2\@\@Z */ MCAPI bool teleportTowards(class Actor &, class Actor const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportDescription.hpp b/LiteLoader/include/llapi/mc/TeleportDescription.hpp index df95d67291..4833808159 100644 --- a/LiteLoader/include/llapi/mc/TeleportDescription.hpp +++ b/LiteLoader/include/llapi/mc/TeleportDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,28 +29,29 @@ class TeleportDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TeleportDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TeleportDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TeleportDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@TeleportDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@TeleportDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TELEPORTDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TeleportDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TeleportDescription(); +#endif /** - * @symbol ??0TeleportDescription\@\@QEAA\@XZ + * @symbol ??0TeleportDescription\@\@QEAA\@XZ */ MCAPI TeleportDescription(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp b/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp index bf1e026c3f..9cf1eac3b2 100644 --- a/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp +++ b/LiteLoader/include/llapi/mc/TeleportInterpolatorResetSystem.hpp @@ -28,8 +28,8 @@ class TeleportInterpolatorResetSystem { public: /** - * @symbol ?createTeleportInterpolatorResetSystem\@TeleportInterpolatorResetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createTeleportInterpolatorResetSystem\@TeleportInterpolatorResetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createTeleportInterpolatorResetSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportPositionModeEventSystem.hpp b/LiteLoader/include/llapi/mc/TeleportPositionModeEventSystem.hpp index 30a43cfa3b..b2e7b13b85 100644 --- a/LiteLoader/include/llapi/mc/TeleportPositionModeEventSystem.hpp +++ b/LiteLoader/include/llapi/mc/TeleportPositionModeEventSystem.hpp @@ -28,8 +28,8 @@ class TeleportPositionModeEventSystem { public: /** - * @symbol ?createTeleportPositionModeEventSystem\@TeleportPositionModeEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createTeleportPositionModeEventSystem\@TeleportPositionModeEventSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createTeleportPositionModeEventSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportResponse.hpp b/LiteLoader/include/llapi/mc/TeleportResponse.hpp index 65e9a7b6c9..f30a9ab65e 100644 --- a/LiteLoader/include/llapi/mc/TeleportResponse.hpp +++ b/LiteLoader/include/llapi/mc/TeleportResponse.hpp @@ -31,28 +31,28 @@ class TeleportResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TeleportResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@TeleportResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@TeleportResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@TeleportResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@TeleportResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@TeleportResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@TeleportResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@TeleportResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@TeleportResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportSystem.hpp b/LiteLoader/include/llapi/mc/TeleportSystem.hpp index 4b165a9e87..48e2d28b5a 100644 --- a/LiteLoader/include/llapi/mc/TeleportSystem.hpp +++ b/LiteLoader/include/llapi/mc/TeleportSystem.hpp @@ -30,19 +30,19 @@ class TeleportSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TeleportSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@TeleportSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@TeleportSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp b/LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp index ffaf10caaf..cb53696cba 100644 --- a/LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/TeleportToSubcomponent.hpp @@ -29,43 +29,43 @@ class TeleportToSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TeleportToSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@TeleportToSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@TeleportToSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@TeleportToSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@TeleportToSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TELEPORTTOSUBCOMPONENT /** - * @symbol ?readfromJSON\@TeleportToSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z + * @symbol ?readfromJSON\@TeleportToSubcomponent\@\@UEAAXAEAVValue\@Json\@\@AEBVSemVersion\@\@\@Z */ MCVAPI void readfromJSON(class Json::Value &, class SemVersion const &); /** - * @symbol ?writetoJSON\@TeleportToSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?writetoJSON\@TeleportToSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ MCVAPI void writetoJSON(class Json::Value &) const; #endif /** - * @symbol ??0TeleportToSubcomponent\@\@QEAA\@XZ + * @symbol ??0TeleportToSubcomponent\@\@QEAA\@XZ */ MCAPI TeleportToSubcomponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TellCommand.hpp b/LiteLoader/include/llapi/mc/TellCommand.hpp index be1507c2ad..f7ecf3fe6b 100644 --- a/LiteLoader/include/llapi/mc/TellCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellCommand.hpp @@ -31,26 +31,26 @@ class TellCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TellCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TellCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TellCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TellCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TellCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_sendMessageToPlayers\@TellCommand\@\@AEBAXAEBV?$CommandSelectorResults\@VPlayer\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z + * @symbol ?_sendMessageToPlayers\@TellCommand\@\@AEBAXAEBV?$CommandSelectorResults\@VPlayer\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBUCommandOriginIdentity\@\@AEAVLevel\@\@\@Z */ MCAPI void _sendMessageToPlayers(class CommandSelectorResults const &, std::string const &, std::string const &, struct CommandOriginIdentity const &, class Level &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TellRawCommand.hpp b/LiteLoader/include/llapi/mc/TellRawCommand.hpp index 37d0ca8c28..e5bbcf841b 100644 --- a/LiteLoader/include/llapi/mc/TellRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TellRawCommand.hpp @@ -31,18 +31,18 @@ class TellRawCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TellRawCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TellRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TellRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TellRawCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TellRawCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TempEPtrBase.hpp b/LiteLoader/include/llapi/mc/TempEPtrBase.hpp new file mode 100644 index 0000000000..4ea8ce36fd --- /dev/null +++ b/LiteLoader/include/llapi/mc/TempEPtrBase.hpp @@ -0,0 +1,65 @@ +/** + * @file TempEPtrBase.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TempEPtrBase { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TEMPEPTRBASE +public: + TempEPtrBase() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol ?invalidate\@TempEPtrBase\@\@EEAAXXZ + */ + virtual void invalidate(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEMPEPTRBASE + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TempEPtrBase(); +#endif + /** + * @symbol ??0TempEPtrBase\@\@QEAA\@AEBV0\@\@Z + */ + MCAPI TempEPtrBase(class TempEPtrBase const &); + /** + * @symbol ?isValid\@TempEPtrBase\@\@QEBA_NXZ + */ + MCAPI bool isValid() const; + /** + * @symbol ??4TempEPtrBase\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class TempEPtrBase & operator=(class TempEPtrBase const &); + /** + * @symbol ?unset\@TempEPtrBase\@\@QEAAXXZ + */ + MCAPI void unset(); + +//protected: + /** + * @symbol ?_lock\@TempEPtrBase\@\@IEBAPEAVActor\@\@XZ + */ + MCAPI class Actor * _lock() const; + /** + * @symbol ?_set\@TempEPtrBase\@\@IEAAXPEAVActor\@\@\@Z + */ + MCAPI void _set(class Actor *); + +protected: + +}; diff --git a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp index 5f1772106b..74a82536c0 100644 --- a/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp +++ b/LiteLoader/include/llapi/mc/TemplateStructurePiece.hpp @@ -31,39 +31,45 @@ class TemplateStructurePiece : public StructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TemplateStructurePiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?moveBoundingBox\@TemplateStructurePiece\@\@UEAAXHHH\@Z + * @vftbl 1 + * @symbol ?moveBoundingBox\@TemplateStructurePiece\@\@UEAAXHHH\@Z */ virtual void moveBoundingBox(int, int, int); /** - * @vftbl 4 - * @symbol ?postProcess\@TemplateStructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 4 + * @symbol ?postProcess\@TemplateStructurePiece\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); /** - * @vftbl 13 - * @symbol ?_handleDataMarker\@WoodlandMansionPiece\@WoodlandMansionPieces\@\@MEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 13 + * @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 /** - * @symbol ??0TemplateStructurePiece\@\@QEAA\@H\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TemplateStructurePiece(); +#endif + /** + * @symbol ??0TemplateStructurePiece\@\@QEAA\@H\@Z */ MCAPI TemplateStructurePiece(int); //protected: /** - * @symbol ?_setup\@TemplateStructurePiece\@\@IEAAXAEAVLegacyStructureTemplate\@\@AEBVLegacyStructureSettings\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_setup\@TemplateStructurePiece\@\@IEAAXAEAVLegacyStructureTemplate\@\@AEBVLegacyStructureSettings\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _setup(class LegacyStructureTemplate &, class LegacyStructureSettings const &, class BlockPos const &); //private: /** - * @symbol ?_setBoundingBoxFromTemplate\@TemplateStructurePiece\@\@AEAAXXZ + * @symbol ?_setBoundingBoxFromTemplate\@TemplateStructurePiece\@\@AEAAXXZ */ MCAPI void _setBoundingBoxFromTemplate(); @@ -71,4 +77,4 @@ class TemplateStructurePiece : public StructurePiece { private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp index 0b4ec004a0..f547f3b96f 100644 --- a/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp +++ b/LiteLoader/include/llapi/mc/TemporalAttributeBuff.hpp @@ -23,68 +23,77 @@ class TemporalAttributeBuff { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_TEMPORALATTRIBUTEBUFF public: - class TemporalAttributeBuff& operator=(class TemporalAttributeBuff const &) = delete; TemporalAttributeBuff() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TemporalAttributeBuff(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isInstantaneous\@TemporalAttributeBuff\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isInstantaneous\@TemporalAttributeBuff\@\@UEBA_NXZ */ virtual bool isInstantaneous() const; /** - * @vftbl 2 - * @symbol ?isSerializable\@TemporalAttributeBuff\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isSerializable\@TemporalAttributeBuff\@\@UEBA_NXZ */ virtual bool isSerializable() const; /** - * @vftbl 3 - * @symbol ?setDurationAmplifier\@TemporalAttributeBuff\@\@UEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z + * @vftbl 3 + * @symbol ?setDurationAmplifier\@TemporalAttributeBuff\@\@UEAAXV?$shared_ptr\@VAmplifier\@\@\@std\@\@\@Z */ virtual void setDurationAmplifier(class std::shared_ptr); /** - * @vftbl 4 - * @symbol ?shouldBuff\@TemporalAttributeBuff\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?shouldBuff\@TemporalAttributeBuff\@\@UEBA_NXZ */ virtual bool shouldBuff() const; /** - * @vftbl 5 - * @symbol ?isComplete\@TemporalAttributeBuff\@\@UEBA_NXZ + * @vftbl 5 + * @symbol ?isComplete\@TemporalAttributeBuff\@\@UEBA_NXZ */ virtual bool isComplete() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEMPORALATTRIBUTEBUFF /** - * @symbol ??0TemporalAttributeBuff\@\@QEAA\@MHW4AttributeBuffType\@\@_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TemporalAttributeBuff(); +#endif + /** + * @symbol ??0TemporalAttributeBuff\@\@QEAA\@MHW4AttributeBuffType\@\@_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI TemporalAttributeBuff(float, int, enum class AttributeBuffType, bool, std::string const &); /** - * @symbol ??0TemporalAttributeBuff\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0TemporalAttributeBuff\@\@QEAA\@AEBV0\@\@Z */ MCAPI TemporalAttributeBuff(class TemporalAttributeBuff const &); /** - * @symbol ?getBaseAmount\@TemporalAttributeBuff\@\@QEBAMXZ + * @symbol ?getBaseAmount\@TemporalAttributeBuff\@\@QEBAMXZ */ MCAPI float getBaseAmount() const; /** - * @symbol ?getDuration\@TemporalAttributeBuff\@\@QEBAHXZ + * @symbol ?getDuration\@TemporalAttributeBuff\@\@QEBAHXZ */ MCAPI int getDuration() const; /** - * @symbol ?getLifeTimer\@TemporalAttributeBuff\@\@QEBAHXZ + * @symbol ?getLifeTimer\@TemporalAttributeBuff\@\@QEBAHXZ */ MCAPI int getLifeTimer() const; /** - * @symbol ?serializationSetLifeTime\@TemporalAttributeBuff\@\@QEAAXH\@Z + * @symbol ??4TemporalAttributeBuff\@\@QEAAAEAV0\@AEBV0\@\@Z + */ + MCAPI class TemporalAttributeBuff & operator=(class TemporalAttributeBuff const &); + /** + * @symbol ?serializationSetLifeTime\@TemporalAttributeBuff\@\@QEAAXH\@Z */ MCAPI void serializationSetLifeTime(int); /** - * @symbol ?tick\@TemporalAttributeBuff\@\@QEAAXXZ + * @symbol ?tick\@TemporalAttributeBuff\@\@QEAAXXZ */ MCAPI void tick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TemptGoal.hpp b/LiteLoader/include/llapi/mc/TemptGoal.hpp index afd7b2a039..32a6dcaf86 100644 --- a/LiteLoader/include/llapi/mc/TemptGoal.hpp +++ b/LiteLoader/include/llapi/mc/TemptGoal.hpp @@ -29,52 +29,52 @@ class TemptGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TemptGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@TemptGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@TemptGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@TemptGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@TemptGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@TemptGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@TemptGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@TemptGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@TemptGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@TemptGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@TemptGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@TemptGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@TemptGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0TemptGoal\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0TemptGoal\@\@QEAA\@AEBV0\@\@Z */ MCAPI TemptGoal(class TemptGoal const &); /** - * @symbol ??0TemptGoal\@\@QEAA\@AEAVMob\@\@MAEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@W4LevelSoundEvent\@\@UFloatRange\@\@_NM44\@Z + * @symbol ??0TemptGoal\@\@QEAA\@AEAVMob\@\@MAEBV?$vector\@VItemDescriptor\@\@V?$allocator\@VItemDescriptor\@\@\@std\@\@\@std\@\@W4LevelSoundEvent\@\@UFloatRange\@\@_NM44\@Z */ MCAPI TemptGoal(class Mob &, float, std::vector const &, enum class LevelSoundEvent, struct FloatRange, bool, float, bool, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp b/LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp index da22549d0a..98d6d3bb65 100644 --- a/LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp +++ b/LiteLoader/include/llapi/mc/TerrainBurstReactionComponent.hpp @@ -30,24 +30,24 @@ class TerrainBurstReactionComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TerrainBurstReactionComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?_onEnd\@TerrainBurstReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z + * @vftbl 3 + * @symbol ?_onEnd\@TerrainBurstReactionComponent\@\@UEAAXAEAVLabTableReaction\@\@AEAVBlockSource\@\@\@Z */ virtual void _onEnd(class LabTableReaction &, class BlockSource &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TerrainShaper.hpp b/LiteLoader/include/llapi/mc/TerrainShaper.hpp index 9847af5c0a..bb755d1d1f 100644 --- a/LiteLoader/include/llapi/mc/TerrainShaper.hpp +++ b/LiteLoader/include/llapi/mc/TerrainShaper.hpp @@ -36,52 +36,52 @@ struct Point { public: /** - * @symbol ?factor\@TerrainShaper\@\@QEBAMMMM\@Z + * @symbol ?factor\@TerrainShaper\@\@QEBAMMMM\@Z */ MCAPI float factor(float, float, float) const; /** - * @symbol ?jaggedness\@TerrainShaper\@\@QEBAMMMM\@Z + * @symbol ?jaggedness\@TerrainShaper\@\@QEBAMMMM\@Z */ MCAPI float jaggedness(float, float, float) const; /** - * @symbol ?offset\@TerrainShaper\@\@QEBAMMMM\@Z + * @symbol ?offset\@TerrainShaper\@\@QEBAMMMM\@Z */ MCAPI float offset(float, float, float) const; /** - * @symbol ?buildOverworld\@TerrainShaper\@\@SA?AV1\@XZ + * @symbol ?buildOverworld\@TerrainShaper\@\@SA?AV1\@XZ */ MCAPI static class TerrainShaper buildOverworld(); //private: /** - * @symbol ?buildErosionJaggednessSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@MMMM\@Z + * @symbol ?buildErosionJaggednessSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@MMMM\@Z */ MCAPI static class ToFloatFunction buildErosionJaggednessSpline(float, float, float, float); /** - * @symbol ?buildErosionOffsetSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMMM_N1\@Z + * @symbol ?buildErosionOffsetSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMMM_N1\@Z */ MCAPI static class ToFloatFunction buildErosionOffsetSpline(std::string const &, float, float, float, float, float, float, bool, bool); /** - * @symbol ?buildMountainRidgeSplineWithPoints\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@M_N\@Z + * @symbol ?buildMountainRidgeSplineWithPoints\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@M_N\@Z */ MCAPI static class ToFloatFunction buildMountainRidgeSplineWithPoints(float, bool); /** - * @symbol ?buildRidgeJaggednessSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@MM\@Z + * @symbol ?buildRidgeJaggednessSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@MM\@Z */ MCAPI static class ToFloatFunction buildRidgeJaggednessSpline(float, float); /** - * @symbol ?buildWeirdnessJaggednessSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@M\@Z + * @symbol ?buildWeirdnessJaggednessSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@M\@Z */ MCAPI static class ToFloatFunction buildWeirdnessJaggednessSpline(float); /** - * @symbol ?getErosionFactor\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@M_N\@Z + * @symbol ?getErosionFactor\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@M_N\@Z */ MCAPI static class ToFloatFunction getErosionFactor(float, bool); /** - * @symbol ?ridgeSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMMM\@Z + * @symbol ?ridgeSpline\@TerrainShaper\@\@CA?AV?$ToFloatFunction\@UPoint\@TerrainShaper\@\@\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MMMMMM\@Z */ MCAPI static class ToFloatFunction ridgeSpline(std::string const &, float, float, float, float, float, float); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TestAction.hpp b/LiteLoader/include/llapi/mc/TestAction.hpp index 608c15fc17..4032833b18 100644 --- a/LiteLoader/include/llapi/mc/TestAction.hpp +++ b/LiteLoader/include/llapi/mc/TestAction.hpp @@ -30,23 +30,23 @@ class TestAction : public IRequestAction { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TestAction(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TestAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TestAction\@\@UEAAXAEAVServerLevel\@\@AEAVDimension\@\@\@Z */ virtual void execute(class ServerLevel &, class Dimension &); /** - * @vftbl 3 - * @symbol ??8TestAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z + * @vftbl 3 + * @symbol ??8TestAction\@\@UEBA_NAEAVIRequestAction\@\@\@Z */ virtual bool operator==(class IRequestAction &) const; /** - * @symbol ??0TestAction\@\@QEAA\@XZ + * @symbol ??0TestAction\@\@QEAA\@XZ */ MCAPI TestAction(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TestConfig.hpp b/LiteLoader/include/llapi/mc/TestConfig.hpp index 1bc18c5ce5..a5429cd348 100644 --- a/LiteLoader/include/llapi/mc/TestConfig.hpp +++ b/LiteLoader/include/llapi/mc/TestConfig.hpp @@ -30,28 +30,28 @@ class TestConfig { public: /** - * @symbol ??0TestConfig\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0TestConfig\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI TestConfig(std::string const &); /** - * @symbol ?isLoaded\@TestConfig\@\@QEBA_NXZ + * @symbol ?isLoaded\@TestConfig\@\@QEBA_NXZ */ MCAPI bool isLoaded() const; /** - * @symbol ??1TestConfig\@\@QEAA\@XZ + * @symbol ??1TestConfig\@\@QEAA\@XZ */ MCAPI ~TestConfig(); /** - * @symbol ?bindType\@TestConfig\@\@SAXXZ + * @symbol ?bindType\@TestConfig\@\@SAXXZ */ MCAPI static void bindType(); //private: /** - * @symbol ?_readFile\@TestConfig\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?_readFile\@TestConfig\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string _readFile(std::string const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp index 8dba4ca7cd..1f0ec611ee 100644 --- a/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlockCommand.hpp @@ -31,18 +31,18 @@ class TestForBlockCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TestForBlockCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TestForBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TestForBlockCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TestForBlockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TestForBlockCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp index 7ea2f6f7ae..2633b72a59 100644 --- a/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForBlocksCommand.hpp @@ -31,18 +31,18 @@ class TestForBlocksCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TestForBlocksCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TestForBlocksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TestForBlocksCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TestForBlocksCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TestForBlocksCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TestForCommand.hpp b/LiteLoader/include/llapi/mc/TestForCommand.hpp index c668146795..e961b4d176 100644 --- a/LiteLoader/include/llapi/mc/TestForCommand.hpp +++ b/LiteLoader/include/llapi/mc/TestForCommand.hpp @@ -31,18 +31,18 @@ class TestForCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TestForCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TestForCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TestForCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TestForCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TestForCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp b/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp index cbc40e90aa..bf09be41a1 100644 --- a/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp +++ b/LiteLoader/include/llapi/mc/TestSummaryDisplayer.hpp @@ -31,29 +31,29 @@ class TestSummaryDisplayer { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TESTSUMMARYDISPLAYER /** - * @symbol ?onTestFailed\@TestSummaryDisplayer\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @symbol ?onTestFailed\@TestSummaryDisplayer\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ MCVAPI void onTestFailed(class gametest::BaseGameTestInstance &); /** - * @symbol ?onTestPassed\@TestSummaryDisplayer\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z + * @symbol ?onTestPassed\@TestSummaryDisplayer\@\@UEAAXAEAVBaseGameTestInstance\@gametest\@\@\@Z */ MCVAPI void onTestPassed(class gametest::BaseGameTestInstance &); #endif /** - * @symbol ??0TestSummaryDisplayer\@\@QEAA\@AEAVLevel\@\@AEAVMultipleTestTracker\@gametest\@\@\@Z + * @symbol ??0TestSummaryDisplayer\@\@QEAA\@AEAVLevel\@\@AEAVMultipleTestTracker\@gametest\@\@\@Z */ MCAPI TestSummaryDisplayer(class Level &, class gametest::MultipleTestTracker &); //private: /** - * @symbol ?_say\@TestSummaryDisplayer\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?_say\@TestSummaryDisplayer\@\@AEBAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI void _say(std::string const &, std::string const &) const; /** - * @symbol ?_showTestSummaryIfAllDone\@TestSummaryDisplayer\@\@AEBAXXZ + * @symbol ?_showTestSummaryIfAllDone\@TestSummaryDisplayer\@\@AEBAXXZ */ MCAPI void _showTestSummaryIfAllDone() const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextFilteringProcessor.hpp b/LiteLoader/include/llapi/mc/TextFilteringProcessor.hpp index 6316ead0e8..3c85e4f536 100644 --- a/LiteLoader/include/llapi/mc/TextFilteringProcessor.hpp +++ b/LiteLoader/include/llapi/mc/TextFilteringProcessor.hpp @@ -27,5 +27,11 @@ class TextFilteringProcessor { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEXTFILTERINGPROCESSOR + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TextFilteringProcessor(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp b/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp index a3e7922875..b5423dc470 100644 --- a/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp +++ b/LiteLoader/include/llapi/mc/TextFilteringUtils.hpp @@ -28,8 +28,8 @@ 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\@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 */ MCAPI static void checkChatFilteringEventsAndSendToastIfClientWasMuted(std::vector const &, class gsl::not_null, class NetworkIdentifier const &, enum class SubClientId const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp b/LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp index b6b1f43ebe..bd70b40cb6 100644 --- a/LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectLocalizedText.hpp @@ -31,28 +31,28 @@ class TextObjectLocalizedText { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextObjectLocalizedText(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?asString\@TextObjectLocalizedText\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?asString\@TextObjectLocalizedText\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 2 - * @symbol ?asJsonValue\@TextObjectLocalizedText\@\@UEBA?AVValue\@Json\@\@XZ + * @vftbl 2 + * @symbol ?asJsonValue\@TextObjectLocalizedText\@\@UEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value asJsonValue() const; /** - * @vftbl 3 - * @symbol ?resolve\@TextObjectLocalizedText\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z + * @vftbl 3 + * @symbol ?resolve\@TextObjectLocalizedText\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; /** - * @symbol ??0TextObjectLocalizedText\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0TextObjectLocalizedText\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI TextObjectLocalizedText(std::string); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp b/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp index 56a96362af..861d55f5fc 100644 --- a/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectLocalizedTextWithParams.hpp @@ -31,32 +31,32 @@ class TextObjectLocalizedTextWithParams { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextObjectLocalizedTextWithParams(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?asString\@TextObjectLocalizedTextWithParams\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?asString\@TextObjectLocalizedTextWithParams\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 2 - * @symbol ?asJsonValue\@TextObjectLocalizedTextWithParams\@\@UEBA?AVValue\@Json\@\@XZ + * @vftbl 2 + * @symbol ?asJsonValue\@TextObjectLocalizedTextWithParams\@\@UEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value asJsonValue() const; /** - * @vftbl 3 - * @symbol ?resolve\@TextObjectLocalizedTextWithParams\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z + * @vftbl 3 + * @symbol ?resolve\@TextObjectLocalizedTextWithParams\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; /** - * @symbol ??0TextObjectLocalizedTextWithParams\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTextObjectRoot\@\@U?$default_delete\@VTextObjectRoot\@\@\@std\@\@\@2\@\@Z + * @symbol ??0TextObjectLocalizedTextWithParams\@\@QEAA\@V?$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\@\@2\@\@Z */ - MCAPI TextObjectLocalizedTextWithParams(std::string, std::unique_ptr); + MCAPI TextObjectLocalizedTextWithParams(std::string, std::vector const &); /** - * @symbol ??0TextObjectLocalizedTextWithParams\@\@QEAA\@V?$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\@\@2\@\@Z + * @symbol ??0TextObjectLocalizedTextWithParams\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VTextObjectRoot\@\@U?$default_delete\@VTextObjectRoot\@\@\@std\@\@\@2\@\@Z */ - MCAPI TextObjectLocalizedTextWithParams(std::string, std::vector const &); + MCAPI TextObjectLocalizedTextWithParams(std::string, std::unique_ptr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectParser.hpp b/LiteLoader/include/llapi/mc/TextObjectParser.hpp index 86b529851c..b92e246bfd 100644 --- a/LiteLoader/include/llapi/mc/TextObjectParser.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectParser.hpp @@ -42,80 +42,80 @@ struct ServerData { public: /** - * @symbol ?RAW_TEXT_ERROR_NOT_ARRAY\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_NOT_ARRAY\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_NOT_ARRAY; /** - * @symbol ?RAW_TEXT_ERROR_NOT_OBJECT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_NOT_OBJECT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_NOT_OBJECT; /** - * @symbol ?RAW_TEXT_ERROR_NO_DATA\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_NO_DATA\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_NO_DATA; /** - * @symbol ?RAW_TEXT_ERROR_PARSE_FAILED\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_PARSE_FAILED\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_PARSE_FAILED; /** - * @symbol ?RAW_TEXT_ERROR_SCORE_NAME_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_SCORE_NAME_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_SCORE_NAME_NOT_STRING; /** - * @symbol ?RAW_TEXT_ERROR_SCORE_NOT_OBJECT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_SCORE_NOT_OBJECT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_SCORE_NOT_OBJECT; /** - * @symbol ?RAW_TEXT_ERROR_SCORE_OBJECTIVE_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_SCORE_OBJECTIVE_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_SCORE_OBJECTIVE_NOT_STRING; /** - * @symbol ?RAW_TEXT_ERROR_SELECTOR_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_SELECTOR_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_SELECTOR_NOT_STRING; /** - * @symbol ?RAW_TEXT_ERROR_TEXT_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_TEXT_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_TEXT_NOT_STRING; /** - * @symbol ?RAW_TEXT_ERROR_TRANSLATE_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_TRANSLATE_NOT_STRING\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_TRANSLATE_NOT_STRING; /** - * @symbol ?RAW_TEXT_ERROR_WITH_NOT_ARRAY_OR_RAW_TEXT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_ERROR_WITH_NOT_ARRAY_OR_RAW_TEXT\@TextObjectParser\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_ERROR_WITH_NOT_ARRAY_OR_RAW_TEXT; /** - * @symbol ?textObjectFromJsonServer\@TextObjectParser\@\@SA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@UServerData\@1\@AEAUErrorLocalization\@1\@\@Z + * @symbol ?textObjectFromJsonServer\@TextObjectParser\@\@SA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@UServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ MCAPI static bool textObjectFromJsonServer(class Json::Value const &, class TextObjectRoot &, struct TextObjectParser::ServerData, struct TextObjectParser::ErrorLocalization &); /** - * @symbol ?textObjectFromJsonString\@TextObjectParser\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVTextObjectRoot\@\@AEAV23\@\@Z + * @symbol ?textObjectFromJsonString\@TextObjectParser\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVTextObjectRoot\@\@AEAV23\@\@Z */ MCAPI static bool textObjectFromJsonString(std::string const &, class TextObjectRoot &, std::string &); //private: /** - * @symbol ?_getObjectsFromTextObject\@TextObjectParser\@\@CA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z + * @symbol ?_getObjectsFromTextObject\@TextObjectParser\@\@CA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ MCAPI static bool _getObjectsFromTextObject(class Json::Value const &, class TextObjectRoot &, struct TextObjectParser::ServerData *, struct TextObjectParser::ErrorLocalization &); /** - * @symbol ?_parseScoreTextObject\@TextObjectParser\@\@CA_NAEAVTextObjectRoot\@\@AEBVValue\@Json\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z + * @symbol ?_parseScoreTextObject\@TextObjectParser\@\@CA_NAEAVTextObjectRoot\@\@AEBVValue\@Json\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ MCAPI static bool _parseScoreTextObject(class TextObjectRoot &, class Json::Value const &, struct TextObjectParser::ServerData *, struct TextObjectParser::ErrorLocalization &); /** - * @symbol ?_parseSelectorTextObject\@TextObjectParser\@\@CA_NAEAVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z + * @symbol ?_parseSelectorTextObject\@TextObjectParser\@\@CA_NAEAVTextObjectRoot\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ MCAPI static bool _parseSelectorTextObject(class TextObjectRoot &, std::string, struct TextObjectParser::ServerData *, struct TextObjectParser::ErrorLocalization &); /** - * @symbol ?_textObjectFromJson\@TextObjectParser\@\@CA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z + * @symbol ?_textObjectFromJson\@TextObjectParser\@\@CA_NAEBVValue\@Json\@\@AEAVTextObjectRoot\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ MCAPI static bool _textObjectFromJson(class Json::Value const &, class TextObjectRoot &, struct TextObjectParser::ServerData *, struct TextObjectParser::ErrorLocalization &); /** - * @symbol ?_textObjectFromString\@TextObjectParser\@\@CA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVTextObjectRoot\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z + * @symbol ?_textObjectFromString\@TextObjectParser\@\@CA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVTextObjectRoot\@\@PEAUServerData\@1\@AEAUErrorLocalization\@1\@\@Z */ MCAPI static bool _textObjectFromString(std::string const &, class TextObjectRoot &, struct TextObjectParser::ServerData *, struct TextObjectParser::ErrorLocalization &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectRoot.hpp b/LiteLoader/include/llapi/mc/TextObjectRoot.hpp index 7a381e3f46..cf5cea2472 100644 --- a/LiteLoader/include/llapi/mc/TextObjectRoot.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectRoot.hpp @@ -30,48 +30,54 @@ class TextObjectRoot { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextObjectRoot(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?asString\@TextObjectRoot\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?asString\@TextObjectRoot\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 2 - * @symbol ?asJsonValue\@TextObjectRoot\@\@UEBA?AVValue\@Json\@\@XZ + * @vftbl 2 + * @symbol ?asJsonValue\@TextObjectRoot\@\@UEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value asJsonValue() const; /** - * @vftbl 3 - * @symbol ?resolve\@TextObjectRoot\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z + * @vftbl 3 + * @symbol ?resolve\@TextObjectRoot\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEXTOBJECTROOT /** - * @symbol ??0TextObjectRoot\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TextObjectRoot(); +#endif + /** + * @symbol ??0TextObjectRoot\@\@QEAA\@XZ */ MCAPI TextObjectRoot(); /** - * @symbol ?addChild\@TextObjectRoot\@\@QEAAXV?$unique_ptr\@VITextObject\@\@U?$default_delete\@VITextObject\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?addChild\@TextObjectRoot\@\@QEAAXV?$unique_ptr\@VITextObject\@\@U?$default_delete\@VITextObject\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void addChild(std::unique_ptr); /** - * @symbol ?asStringVector\@TextObjectRoot\@\@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 + * @symbol ?asStringVector\@TextObjectRoot\@\@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 asStringVector() const; /** - * @symbol ?clear\@TextObjectRoot\@\@QEAAXXZ + * @symbol ?clear\@TextObjectRoot\@\@QEAAXXZ */ MCAPI void clear(); /** - * @symbol ?isEmpty\@TextObjectRoot\@\@QEBA_NXZ + * @symbol ?isEmpty\@TextObjectRoot\@\@QEBA_NXZ */ MCAPI bool isEmpty() const; /** - * @symbol ?resolveRoot\@TextObjectRoot\@\@QEBA?AVResolvedTextObject\@\@AEBVActor\@\@AEBVScoreboard\@\@\@Z + * @symbol ?resolveRoot\@TextObjectRoot\@\@QEBA?AVResolvedTextObject\@\@AEBVActor\@\@AEBVScoreboard\@\@\@Z */ MCAPI class ResolvedTextObject resolveRoot(class Actor const &, class Scoreboard const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectScore.hpp b/LiteLoader/include/llapi/mc/TextObjectScore.hpp index 0ee5b3eb19..adb5025aa4 100644 --- a/LiteLoader/include/llapi/mc/TextObjectScore.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectScore.hpp @@ -31,44 +31,44 @@ class TextObjectScore { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextObjectScore(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?asString\@TextObjectScore\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?asString\@TextObjectScore\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 2 - * @symbol ?asJsonValue\@TextObjectScore\@\@UEBA?AVValue\@Json\@\@XZ + * @vftbl 2 + * @symbol ?asJsonValue\@TextObjectScore\@\@UEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value asJsonValue() const; /** - * @vftbl 3 - * @symbol ?resolve\@TextObjectScore\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z + * @vftbl 3 + * @symbol ?resolve\@TextObjectScore\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; /** - * @symbol ??0TextObjectScore\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ??0TextObjectScore\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI TextObjectScore(std::string, std::string); /** - * @symbol ?RAW_TEXT_SCORE_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_SCORE_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_SCORE_KEY; /** - * @symbol ?RAW_TEXT_SCORE_NAME_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_SCORE_NAME_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_SCORE_NAME_KEY; /** - * @symbol ?RAW_TEXT_SCORE_OBJECTIVE_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_SCORE_OBJECTIVE_KEY\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_SCORE_OBJECTIVE_KEY; /** - * @symbol ?RAW_TEXT_SCORE_STAR\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_SCORE_STAR\@TextObjectScore\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_SCORE_STAR; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectSelector.hpp b/LiteLoader/include/llapi/mc/TextObjectSelector.hpp index 82aa82a496..b5d329d1e7 100644 --- a/LiteLoader/include/llapi/mc/TextObjectSelector.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectSelector.hpp @@ -31,36 +31,36 @@ class TextObjectSelector { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextObjectSelector(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?asString\@TextObjectSelector\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?asString\@TextObjectSelector\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 2 - * @symbol ?asJsonValue\@TextObjectSelector\@\@UEBA?AVValue\@Json\@\@XZ + * @vftbl 2 + * @symbol ?asJsonValue\@TextObjectSelector\@\@UEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value asJsonValue() const; /** - * @vftbl 3 - * @symbol ?resolve\@TextObjectSelector\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z + * @vftbl 3 + * @symbol ?resolve\@TextObjectSelector\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; /** - * @symbol ??0TextObjectSelector\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0TextObjectSelector\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI TextObjectSelector(std::string); /** - * @symbol ?RAW_TEXT_SELECTOR_KEY\@TextObjectSelector\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_SELECTOR_KEY\@TextObjectSelector\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_SELECTOR_KEY; /** - * @symbol ?RAW_TEXT_SELECTOR_STAR\@TextObjectSelector\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAW_TEXT_SELECTOR_STAR\@TextObjectSelector\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAW_TEXT_SELECTOR_STAR; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextObjectText.hpp b/LiteLoader/include/llapi/mc/TextObjectText.hpp index 55a39e5117..2aae40d3df 100644 --- a/LiteLoader/include/llapi/mc/TextObjectText.hpp +++ b/LiteLoader/include/llapi/mc/TextObjectText.hpp @@ -31,32 +31,32 @@ class TextObjectText { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextObjectText(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?asString\@TextObjectText\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?asString\@TextObjectText\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string asString() const; /** - * @vftbl 2 - * @symbol ?asJsonValue\@TextObjectText\@\@UEBA?AVValue\@Json\@\@XZ + * @vftbl 2 + * @symbol ?asJsonValue\@TextObjectText\@\@UEBA?AVValue\@Json\@\@XZ */ virtual class Json::Value asJsonValue() const; /** - * @vftbl 3 - * @symbol ?resolve\@TextObjectText\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z + * @vftbl 3 + * @symbol ?resolve\@TextObjectText\@\@UEBA?AVValue\@Json\@\@AEBUResolveData\@\@\@Z */ virtual class Json::Value resolve(struct ResolveData const &) const; /** - * @symbol ??0TextObjectText\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0TextObjectText\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI TextObjectText(std::string); /** - * @symbol ?asJsonValue\@TextObjectText\@\@SA?AVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?asJsonValue\@TextObjectText\@\@SA?AVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class Json::Value asJsonValue(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TextPacket.hpp b/LiteLoader/include/llapi/mc/TextPacket.hpp index 0c986fc43a..4aea0ae5de 100644 --- a/LiteLoader/include/llapi/mc/TextPacket.hpp +++ b/LiteLoader/include/llapi/mc/TextPacket.hpp @@ -31,89 +31,91 @@ class TextPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TextPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@TextPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@TextPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@TextPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@TextPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@TextPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@TextPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@TextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@TextPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TEXTPACKET /** - * @symbol ??0TextPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TextPacket(); +#endif + /** + * @symbol ??0TextPacket\@\@QEAA\@XZ */ MCAPI TextPacket(); /** - * @symbol ?createAnnouncement\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?createAnnouncement\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCAPI static class TextPacket createAnnouncement(std::string const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ?createChat\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?createChat\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCAPI static class TextPacket createChat(std::string const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ?createJukeboxPopup\@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 + * @symbol ?createJukeboxPopup\@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 */ MCAPI static class TextPacket createJukeboxPopup(std::string const &, std::vector const &); /** - * @symbol ?createRawJsonObjectAnnouncement\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z - */ - MCAPI static class TextPacket createRawJsonObjectAnnouncement(std::string const &); - /** - * @symbol ?createRawJsonObjectMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createRawJsonObjectMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class TextPacket createRawJsonObjectMessage(std::string const &); /** - * @symbol ?createSystemMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?createSystemMessage\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class TextPacket createSystemMessage(std::string const &); /** - * @symbol ?createTextObjectMessage\@TextPacket\@\@SA?AV1\@AEBVResolvedTextObject\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1\@Z + * @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 + * @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(std::string const &, std::string const &, std::string const &); + MCAPI static class TextPacket createTextObjectWhisperMessage(class ResolvedTextObject 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 + * @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(class ResolvedTextObject const &, std::string const &, std::string const &); + 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 + * @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 */ MCAPI static class TextPacket createTranslated(std::string const &, std::vector const &); /** - * @symbol ?createTranslatedAnnouncement\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?createTranslatedAnnouncement\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCAPI static class TextPacket createTranslatedAnnouncement(std::string const &, std::string const &, std::string const &, std::string const &); /** - * @symbol ?createWhisper\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z + * @symbol ?createWhisper\@TextPacket\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@000\@Z */ MCAPI static class TextPacket createWhisper(std::string const &, std::string const &, std::string const &, std::string const &); //private: /** - * @symbol ??0TextPacket\@\@AEAA\@W4TextPacketType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBV?$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\@_N11\@Z + * @symbol ??0TextPacket\@\@AEAA\@W4TextPacketType\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@1AEBV?$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\@_N11\@Z */ MCAPI TextPacket(enum class TextPacketType, std::string const &, std::string const &, std::vector const &, bool, std::string const &, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TheEndDimension.hpp b/LiteLoader/include/llapi/mc/TheEndDimension.hpp index df15c33e4b..8fa509a851 100644 --- a/LiteLoader/include/llapi/mc/TheEndDimension.hpp +++ b/LiteLoader/include/llapi/mc/TheEndDimension.hpp @@ -31,117 +31,117 @@ class TheEndDimension { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_THEENDDIMENSION /** - * @symbol ?_upgradeOldLimboEntity\@TheEndDimension\@\@EEAAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@\@Z + * @symbol ?_upgradeOldLimboEntity\@TheEndDimension\@\@EEAAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@\@Z */ MCVAPI void _upgradeOldLimboEntity(class CompoundTag &, enum class LimboEntitiesVersion); /** - * @symbol ?_wrapStorageForVersionCompatibility\@TheEndDimension\@\@EEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z + * @symbol ?_wrapStorageForVersionCompatibility\@TheEndDimension\@\@EEAA?AV?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@V23\@W4StorageVersion\@\@\@Z */ MCVAPI std::unique_ptr _wrapStorageForVersionCompatibility(std::unique_ptr, enum class StorageVersion); /** - * @symbol ?createGenerator\@TheEndDimension\@\@UEAA?AV?$unique_ptr\@VWorldGenerator\@\@U?$default_delete\@VWorldGenerator\@\@\@std\@\@\@std\@\@XZ + * @symbol ?createGenerator\@TheEndDimension\@\@UEAA?AV?$unique_ptr\@VWorldGenerator\@\@U?$default_delete\@VWorldGenerator\@\@\@std\@\@\@std\@\@XZ */ MCVAPI std::unique_ptr createGenerator(); /** - * @symbol ?deserialize\@TheEndDimension\@\@UEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?deserialize\@TheEndDimension\@\@UEAAXAEBVCompoundTag\@\@\@Z */ MCVAPI void deserialize(class CompoundTag const &); /** - * @symbol ?fixWallChunk\@TheEndDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?fixWallChunk\@TheEndDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@\@Z */ MCVAPI void fixWallChunk(class ChunkSource &, class LevelChunk &); /** - * @symbol ?getCloudHeight\@TheEndDimension\@\@UEBAFXZ + * @symbol ?getCloudHeight\@TheEndDimension\@\@UEBAFXZ */ MCVAPI short getCloudHeight() const; /** - * @symbol ?getDefaultBiome\@TheEndDimension\@\@UEBA?AVHashedString\@\@XZ + * @symbol ?getDefaultBiome\@TheEndDimension\@\@UEBA?AVHashedString\@\@XZ */ MCVAPI class HashedString getDefaultBiome() const; /** - * @symbol ?getSpawnPos\@TheEndDimension\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?getSpawnPos\@TheEndDimension\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos getSpawnPos() const; /** - * @symbol ?getSpawnYPosition\@TheEndDimension\@\@UEBAHXZ + * @symbol ?getSpawnYPosition\@TheEndDimension\@\@UEBAHXZ */ MCVAPI int getSpawnYPosition() const; /** - * @symbol ?getSunIntensity\@TheEndDimension\@\@UEBAMMAEBVVec3\@\@M\@Z + * @symbol ?getSunIntensity\@TheEndDimension\@\@UEBAMMAEBVVec3\@\@M\@Z */ MCVAPI float getSunIntensity(float, class Vec3 const &, float) const; /** - * @symbol ?getTimeOfDay\@TheEndDimension\@\@UEBAMHM\@Z + * @symbol ?getTimeOfDay\@TheEndDimension\@\@UEBAMHM\@Z */ MCVAPI float getTimeOfDay(int, float) const; /** - * @symbol ?hasGround\@TheEndDimension\@\@UEBA_NXZ + * @symbol ?hasGround\@TheEndDimension\@\@UEBA_NXZ */ MCVAPI bool hasGround() const; /** - * @symbol ?init\@TheEndDimension\@\@UEAAXXZ + * @symbol ?init\@TheEndDimension\@\@UEAAXXZ */ MCVAPI void init(); /** - * @symbol ?isDay\@TheEndDimension\@\@UEBA_NXZ + * @symbol ?isDay\@TheEndDimension\@\@UEBA_NXZ */ MCVAPI bool isDay() const; /** - * @symbol ?isFoggyAt\@TheEndDimension\@\@UEBA_NHH\@Z + * @symbol ?isFoggyAt\@TheEndDimension\@\@UEBA_NHH\@Z */ MCVAPI bool isFoggyAt(int, int) const; /** - * @symbol ?isNaturalDimension\@TheEndDimension\@\@UEBA_NXZ + * @symbol ?isNaturalDimension\@TheEndDimension\@\@UEBA_NXZ */ MCVAPI bool isNaturalDimension() const; /** - * @symbol ?isValidSpawn\@TheEndDimension\@\@UEBA_NHH\@Z + * @symbol ?isValidSpawn\@TheEndDimension\@\@UEBA_NHH\@Z */ MCVAPI bool isValidSpawn(int, int) const; /** - * @symbol ?levelChunkNeedsUpgrade\@TheEndDimension\@\@UEBA_NAEBVLevelChunk\@\@\@Z + * @symbol ?levelChunkNeedsUpgrade\@TheEndDimension\@\@UEBA_NAEBVLevelChunk\@\@\@Z */ MCVAPI bool levelChunkNeedsUpgrade(class LevelChunk const &) const; /** - * @symbol ?mayRespawnViaBed\@TheEndDimension\@\@UEBA_NXZ + * @symbol ?mayRespawnViaBed\@TheEndDimension\@\@UEBA_NXZ */ MCVAPI bool mayRespawnViaBed() const; /** - * @symbol ?serialize\@TheEndDimension\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?serialize\@TheEndDimension\@\@UEBAXAEAVCompoundTag\@\@\@Z */ MCVAPI void serialize(class CompoundTag &) const; /** - * @symbol ?startLeaveGame\@TheEndDimension\@\@UEAAXXZ + * @symbol ?startLeaveGame\@TheEndDimension\@\@UEAAXXZ */ MCVAPI void startLeaveGame(); /** - * @symbol ?tick\@TheEndDimension\@\@UEAAXXZ + * @symbol ?tick\@TheEndDimension\@\@UEAAXXZ */ MCVAPI void tick(); /** - * @symbol ?translatePosAcrossDimension\@TheEndDimension\@\@UEBA?AVVec3\@\@AEBV2\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?translatePosAcrossDimension\@TheEndDimension\@\@UEBA?AVVec3\@\@AEBV2\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCVAPI class Vec3 translatePosAcrossDimension(class Vec3 const &, class AutomaticID) const; /** - * @symbol ?upgradeLevelChunk\@TheEndDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@1\@Z + * @symbol ?upgradeLevelChunk\@TheEndDimension\@\@UEAAXAEAVChunkSource\@\@AEAVLevelChunk\@\@1\@Z */ MCVAPI void upgradeLevelChunk(class ChunkSource &, class LevelChunk &, class LevelChunk &); #endif /** - * @symbol ??0TheEndDimension\@\@QEAA\@AEAVLevel\@\@AEAVScheduler\@\@\@Z + * @symbol ??0TheEndDimension\@\@QEAA\@AEAVILevel\@\@AEAVScheduler\@\@\@Z */ - MCAPI TheEndDimension(class Level &, class Scheduler &); + MCAPI TheEndDimension(class ILevel &, class Scheduler &); /** - * @symbol ?AMBIENT_MULTIPLIER\@TheEndDimension\@\@2MB + * @symbol ?AMBIENT_MULTIPLIER\@TheEndDimension\@\@2MB */ MCAPI static float const AMBIENT_MULTIPLIER; //private: /** - * @symbol ?makeStructureFeatures\@TheEndDimension\@\@CA?AV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@AEAVDimension\@\@I\@Z + * @symbol ?makeStructureFeatures\@TheEndDimension\@\@CA?AV?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@AEAVDimension\@\@I\@Z */ MCAPI static std::unique_ptr makeStructureFeatures(class Dimension &, unsigned int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TheEndGenerator.hpp b/LiteLoader/include/llapi/mc/TheEndGenerator.hpp index d06082db77..f954300631 100644 --- a/LiteLoader/include/llapi/mc/TheEndGenerator.hpp +++ b/LiteLoader/include/llapi/mc/TheEndGenerator.hpp @@ -32,81 +32,81 @@ class TheEndGenerator { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_THEENDGENERATOR /** - * @symbol ?decorateWorldGenLoadChunk\@TheEndGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z + * @symbol ?decorateWorldGenLoadChunk\@TheEndGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockVolumeTarget\@\@AEAVRandom\@\@AEBVChunkPos\@\@\@Z */ MCVAPI void decorateWorldGenLoadChunk(class Biome &, class LevelChunk &, class BlockVolumeTarget &, class Random &, class ChunkPos const &) const; /** - * @symbol ?decorateWorldGenPostProcess\@TheEndGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @symbol ?decorateWorldGenPostProcess\@TheEndGenerator\@\@MEBAXAEAVBiome\@\@AEAVLevelChunk\@\@AEAVBlockSource\@\@AEAVRandom\@\@\@Z */ MCVAPI void decorateWorldGenPostProcess(class Biome &, class LevelChunk &, class BlockSource &, class Random &) const; /** - * @symbol ?findSpawnPosition\@TheEndGenerator\@\@UEBA?AVBlockPos\@\@XZ + * @symbol ?findSpawnPosition\@TheEndGenerator\@\@UEBA?AVBlockPos\@\@XZ */ MCVAPI class BlockPos findSpawnPosition() const; /** - * @symbol ?getBiomeArea\@TheEndGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z + * @symbol ?getBiomeArea\@TheEndGenerator\@\@UEBA?AVBiomeArea\@\@AEBVBoundingBox\@\@I\@Z */ MCVAPI class BiomeArea getBiomeArea(class BoundingBox const &, unsigned int) const; /** - * @symbol ?getBiomeSource\@TheEndGenerator\@\@UEBAAEBVBiomeSource\@\@XZ + * @symbol ?getBiomeSource\@TheEndGenerator\@\@UEBAAEBVBiomeSource\@\@XZ */ MCVAPI class BiomeSource const & getBiomeSource() const; /** - * @symbol ?getBlockVolumeDimensions\@TheEndGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ + * @symbol ?getBlockVolumeDimensions\@TheEndGenerator\@\@UEBA?AUBlockVolumeDimensions\@WorldGenerator\@\@XZ */ MCVAPI struct WorldGenerator::BlockVolumeDimensions getBlockVolumeDimensions() const; /** - * @symbol ?getPreliminarySurfaceLevel\@TheEndGenerator\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z + * @symbol ?getPreliminarySurfaceLevel\@TheEndGenerator\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z */ MCVAPI class std::optional getPreliminarySurfaceLevel(class DividedPos2d<4>) const; /** - * @symbol ?loadChunk\@TheEndGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z + * @symbol ?loadChunk\@TheEndGenerator\@\@UEAAXAEAVLevelChunk\@\@_N\@Z */ MCVAPI void loadChunk(class LevelChunk &, bool); /** - * @symbol ?postProcess\@TheEndGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z + * @symbol ?postProcess\@TheEndGenerator\@\@UEAA_NAEAVChunkViewSource\@\@\@Z */ MCVAPI bool postProcess(class ChunkViewSource &); /** - * @symbol ?postProcessMobsAt\@TheEndGenerator\@\@UEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z + * @symbol ?postProcessMobsAt\@TheEndGenerator\@\@UEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z */ MCVAPI void postProcessMobsAt(class BlockSource &, int, int, class Random &); /** - * @symbol ?prepareAndComputeHeights\@TheEndGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@_NH\@Z + * @symbol ?prepareAndComputeHeights\@TheEndGenerator\@\@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\@TheEndGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z + * @symbol ?prepareHeights\@TheEndGenerator\@\@UEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_N\@Z */ MCVAPI void prepareHeights(class BlockVolume &, class ChunkPos const &, bool); #endif /** - * @symbol ??0TheEndGenerator\@\@QEAA\@AEAVDimension\@\@IPEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0TheEndGenerator\@\@QEAA\@AEAVDimension\@\@IPEBVBiome\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ MCAPI TheEndGenerator(class Dimension &, unsigned int, class Biome const *, std::unique_ptr); /** - * @symbol ?buildSurfaces\@TheEndGenerator\@\@QEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAVLevelChunk\@\@\@Z + * @symbol ?buildSurfaces\@TheEndGenerator\@\@QEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@AEAVLevelChunk\@\@\@Z */ MCAPI void buildSurfaces(class BlockVolume &, class ChunkPos const &, class LevelChunk &); /** - * @symbol ?generateDensityCellsForChunk\@TheEndGenerator\@\@QEBA?AV?$MultidimensionalArray\@M$02$02$0CB\@\@Util\@\@AEBVChunkPos\@\@\@Z + * @symbol ?generateDensityCellsForChunk\@TheEndGenerator\@\@QEBA?AV?$MultidimensionalArray\@M$02$02$0CB\@\@Util\@\@AEBVChunkPos\@\@\@Z */ MCAPI class Util::MultidimensionalArray generateDensityCellsForChunk(class ChunkPos const &) const; /** - * @symbol ?isOutsideCentralIslandArea\@TheEndGenerator\@\@SA_NAEBVChunkPos\@\@\@Z + * @symbol ?isOutsideCentralIslandArea\@TheEndGenerator\@\@SA_NAEBVChunkPos\@\@\@Z */ MCAPI static bool isOutsideCentralIslandArea(class ChunkPos const &); //private: /** - * @symbol ?_prepareHeights\@TheEndGenerator\@\@AEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@H\@Z + * @symbol ?_prepareHeights\@TheEndGenerator\@\@AEAAXAEAVBlockVolume\@\@AEBVChunkPos\@\@_NPEAV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@H\@Z */ MCAPI void _prepareHeights(class BlockVolume &, class ChunkPos const &, bool, std::vector *, int); /** - * @symbol ?getIslandHeightValue\@TheEndGenerator\@\@AEBAMHHHH\@Z + * @symbol ?getIslandHeightValue\@TheEndGenerator\@\@AEBAMHHHH\@Z */ MCAPI float getIslandHeightValue(int, int, int, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp b/LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp index fa4e90b138..6a991ed2d9 100644 --- a/LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp +++ b/LiteLoader/include/llapi/mc/TheEndSpikeHelper.hpp @@ -23,7 +23,7 @@ namespace TheEndSpikeHelper { #undef AFTER_EXTRA /** - * @symbol ?getSpikesForLevel\@TheEndSpikeHelper\@\@YA?AV?$vector\@VEndSpike\@SpikeFeature\@\@V?$allocator\@VEndSpike\@SpikeFeature\@\@\@std\@\@\@std\@\@AEAVLevel\@\@\@Z + * @symbol ?getSpikesForLevel\@TheEndSpikeHelper\@\@YA?AV?$vector\@VEndSpike\@SpikeFeature\@\@V?$allocator\@VEndSpike\@SpikeFeature\@\@\@std\@\@\@std\@\@AEAVLevel\@\@\@Z */ MCAPI std::vector getSpikesForLevel(class Level &); diff --git a/LiteLoader/include/llapi/mc/ThermalMonitorInterface.hpp b/LiteLoader/include/llapi/mc/ThermalMonitorInterface.hpp index 94ba75855e..6db838a17c 100644 --- a/LiteLoader/include/llapi/mc/ThermalMonitorInterface.hpp +++ b/LiteLoader/include/llapi/mc/ThermalMonitorInterface.hpp @@ -30,4 +30,4 @@ class ThermalMonitorInterface { public: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp index 7d10cbcc34..0bf4fb55f1 100644 --- a/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp +++ b/LiteLoader/include/llapi/mc/ThinFenceBlock.hpp @@ -31,253 +31,258 @@ class ThinFenceBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ThinFenceBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 9 - * @symbol ?addAABBs\@ThinFenceBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 9 + * @symbol ?addAABBs\@ThinFenceBlock\@\@UEBAXAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@\@Z */ virtual void addAABBs(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &) const; /** - * @vftbl 10 - * @symbol ?getAABB\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 11 - * @symbol ?addCollisionShapes\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 11 + * @symbol ?addCollisionShapes\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@PEBVAABB\@\@AEAV?$vector\@VAABB\@\@V?$allocator\@VAABB\@\@\@std\@\@\@std\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool addCollisionShapes(class Block const &, class BlockSource const &, class BlockPos const &, class AABB const *, std::vector &, class optional_ref) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@ThinFenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@ThinFenceBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@ThinFenceBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@ThinFenceBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@ThinFenceBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@ThinFenceBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@ThinFenceBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@ThinFenceBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?getResourceCount\@ThinFenceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 189 + * @symbol ?getResourceCount\@ThinFenceBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_THINFENCEBLOCK /** - * @symbol ?isThinFenceBlock\@ThinFenceBlock\@\@UEBA_NXZ + * @symbol ?isThinFenceBlock\@ThinFenceBlock\@\@UEBA_NXZ */ MCVAPI bool isThinFenceBlock() const; #endif /** - * @symbol ??0ThinFenceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N22\@Z + * @symbol ??0ThinFenceBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@_N22\@Z */ MCAPI ThinFenceBlock(std::string const &, int, class Material const &, bool, bool, bool); @@ -285,8 +290,8 @@ class ThinFenceBlock : public BlockLegacy { private: /** - * @symbol ?THIN_FENCE_DOESNT_BREAK_FALLING_BLOCK_VERSION\@ThinFenceBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?THIN_FENCE_DOESNT_BREAK_FALLING_BLOCK_VERSION\@ThinFenceBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const THIN_FENCE_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp index 0f05f91cff..f5bf8343b7 100644 --- a/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp +++ b/LiteLoader/include/llapi/mc/ThirdPartyInfo.hpp @@ -26,16 +26,16 @@ class ThirdPartyInfo { public: /** - * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0ThirdPartyInfo\@\@QEAA\@XZ */ - MCAPI ThirdPartyInfo(class ThirdPartyInfo const &); + MCAPI ThirdPartyInfo(); /** - * @symbol ??0ThirdPartyInfo\@\@QEAA\@XZ + * @symbol ??0ThirdPartyInfo\@\@QEAA\@AEBV0\@\@Z */ - MCAPI ThirdPartyInfo(); + MCAPI ThirdPartyInfo(class ThirdPartyInfo const &); /** - * @symbol ??1ThirdPartyInfo\@\@QEAA\@XZ + * @symbol ??1ThirdPartyInfo\@\@QEAA\@XZ */ MCAPI ~ThirdPartyInfo(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Throwable.hpp b/LiteLoader/include/llapi/mc/Throwable.hpp index 3726192f29..e6e0c8ea6c 100644 --- a/LiteLoader/include/llapi/mc/Throwable.hpp +++ b/LiteLoader/include/llapi/mc/Throwable.hpp @@ -32,195 +32,203 @@ class Throwable : public PredictableProjectile { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@Throwable\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Throwable\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Throwable(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 47 - * @symbol ?lerpMotion\@Throwable\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 47 + * @symbol ?lerpMotion\@Throwable\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void lerpMotion(class Vec3 const &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@Throwable\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@Throwable\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 170 - * @symbol ?getSourceUniqueID\@Throwable\@\@UEBA?AUActorUniqueID\@\@XZ + * @vftbl 169 + * @symbol ?getSourceUniqueID\@Throwable\@\@UEBA?AUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID getSourceUniqueID() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Throwable\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Throwable\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Throwable\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Throwable\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?getThrowPower\@Throwable\@\@UEAAMXZ + * @vftbl 276 + * @symbol ?getThrowPower\@Throwable\@\@UEAAMXZ */ virtual float getThrowPower(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); /** - * @vftbl 280 - * @symbol ?getThrowUpAngleOffset\@Throwable\@\@MEAAMXZ + * @vftbl 278 + * @symbol ?getThrowUpAngleOffset\@Throwable\@\@MEAAMXZ */ virtual float getThrowUpAngleOffset(); /** - * @vftbl 281 - * @symbol ?getGravity\@Throwable\@\@MEAAMXZ + * @vftbl 279 + * @symbol ?getGravity\@Throwable\@\@MEAAMXZ */ virtual float getGravity(); /** - * @vftbl 282 - * @symbol ?getParticleType\@Throwable\@\@MEAA?AW4ParticleType\@\@XZ + * @vftbl 280 + * @symbol ?getParticleType\@Throwable\@\@MEAA?AW4ParticleType\@\@XZ */ virtual enum class ParticleType getParticleType(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_THROWABLE /** - * @symbol ?canMakeStepSound\@Throwable\@\@MEBA_NXZ + * @symbol ?canMakeStepSound\@Throwable\@\@MEBA_NXZ */ MCVAPI bool canMakeStepSound() const; /** - * @symbol ?onHit\@Throwable\@\@MEAAXAEBVHitResult\@\@\@Z + * @symbol ?onHit\@Throwable\@\@MEAAXAEBVHitResult\@\@\@Z */ MCVAPI void onHit(class HitResult const &); /** - * @symbol ?stopUponGroundCollision\@Throwable\@\@UEBA_NXZ + * @symbol ?stopUponGroundCollision\@Throwable\@\@UEBA_NXZ */ MCVAPI bool stopUponGroundCollision() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~Throwable(); #endif /** - * @symbol ??0Throwable\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Throwable\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Throwable(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?shoot\@Throwable\@\@QEAAXAEAVMob\@\@\@Z + * @symbol ?shoot\@Throwable\@\@QEAAXAEAVMob\@\@\@Z */ MCAPI void shoot(class Mob &); /** - * @symbol ?shoot\@Throwable\@\@QEAAXAEBVVec3\@\@MM0\@Z + * @symbol ?shoot\@Throwable\@\@QEAAXAEBVVec3\@\@MM0\@Z */ MCAPI void shoot(class Vec3 const &, float, float, class Vec3 const &); + /** + * @symbol ?spawnPlayerProjectile\@Throwable\@\@SAPEAVActor\@\@AEBUActorDefinitionIdentifier\@\@AEAVPlayer\@\@\@Z + */ + MCAPI static class Actor * spawnPlayerProjectile(struct ActorDefinitionIdentifier const &, class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp b/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp index 047a8d823f..685a9b4d6f 100644 --- a/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/ThrowableItemComponent.hpp @@ -30,63 +30,63 @@ class ThrowableItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ThrowableItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VThrowableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?releaseUsing\@ThrowableItemComponent\@\@QEBA_NAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @symbol ?releaseUsing\@ThrowableItemComponent\@\@QEBA_NAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ MCAPI bool releaseUsing(class ItemStack &, class Player *, int) const; /** - * @symbol ?use\@ThrowableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?use\@ThrowableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool use(class ItemStack &, class Player &) const; /** - * @symbol ?bindType\@ThrowableItemComponent\@\@SAXXZ + * @symbol ?bindType\@ThrowableItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@ThrowableItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@ThrowableItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); //private: /** - * @symbol ?_getLaunchPower\@ThrowableItemComponent\@\@AEBAMHHH\@Z + * @symbol ?_getLaunchPower\@ThrowableItemComponent\@\@AEBAMHHH\@Z */ MCAPI float _getLaunchPower(int, int, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownEgg.hpp b/LiteLoader/include/llapi/mc/ThrownEgg.hpp index 03f71490c7..23593aa08a 100644 --- a/LiteLoader/include/llapi/mc/ThrownEgg.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEgg.hpp @@ -32,128 +32,128 @@ class ThrownEgg : public Throwable { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ThrownEgg\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ThrownEgg\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ThrownEgg(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_275(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 277 + * @symbol __unk_vfn_277 */ virtual void __unk_vfn_277(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 - */ - virtual void __unk_vfn_279(); - /** - * @symbol ??0ThrownEgg\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ThrownEgg\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ThrownEgg(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp index 2d6a5edeba..87ccd2ddf0 100644 --- a/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp +++ b/LiteLoader/include/llapi/mc/ThrownEnderpearl.hpp @@ -32,128 +32,128 @@ class ThrownEnderpearl : public Throwable { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ThrownEnderpearl\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ThrownEnderpearl\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ThrownEnderpearl(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_275(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 277 + * @symbol __unk_vfn_277 */ virtual void __unk_vfn_277(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 - */ - virtual void __unk_vfn_279(); - /** - * @symbol ??0ThrownEnderpearl\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ThrownEnderpearl\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ThrownEnderpearl(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp index f5b26ebd45..3636c0ea17 100644 --- a/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp +++ b/LiteLoader/include/llapi/mc/ThrownIceBomb.hpp @@ -32,128 +32,128 @@ class ThrownIceBomb : public Throwable { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ThrownIceBomb\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ThrownIceBomb\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ThrownIceBomb(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 + */ + virtual void __unk_vfn_108(); + /** + * @vftbl 109 + * @symbol __unk_vfn_109 */ virtual void __unk_vfn_109(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_111(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_178(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_192(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_217(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 218 + * @symbol __unk_vfn_218 */ virtual void __unk_vfn_218(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_240(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_243(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_260(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_268(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_275(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 277 + * @symbol __unk_vfn_277 */ virtual void __unk_vfn_277(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 - */ - virtual void __unk_vfn_279(); - /** - * @symbol ??0ThrownIceBomb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ThrownIceBomb\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ThrownIceBomb(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownPotion.hpp b/LiteLoader/include/llapi/mc/ThrownPotion.hpp index 5faf10e309..e9a68eab97 100644 --- a/LiteLoader/include/llapi/mc/ThrownPotion.hpp +++ b/LiteLoader/include/llapi/mc/ThrownPotion.hpp @@ -32,160 +32,160 @@ class ThrownPotion : public Throwable { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@ThrownPotion\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@ThrownPotion\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ThrownPotion(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 169 - * @symbol ?queryEntityRenderer\@ThrownPotion\@\@UEBAAEBVHashedString\@\@XZ + * @vftbl 168 + * @symbol ?queryEntityRenderer\@ThrownPotion\@\@UEBAAEBVHashedString\@\@XZ */ virtual class HashedString const & queryEntityRenderer() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 233 - * @symbol ?setAuxValue\@ThrownPotion\@\@UEAAXH\@Z + * @vftbl 232 + * @symbol ?setAuxValue\@ThrownPotion\@\@UEAAXH\@Z */ virtual void setAuxValue(int); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ThrownPotion\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ThrownPotion\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ThrownPotion\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ThrownPotion\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); /** - * @symbol ??0ThrownPotion\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ThrownPotion\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ThrownPotion(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getPotionId\@ThrownPotion\@\@QEBAFXZ + * @symbol ?getPotionId\@ThrownPotion\@\@QEBAFXZ */ MCAPI short getPotionId() const; /** - * @symbol ?setLinger\@ThrownPotion\@\@QEAAX_N\@Z + * @symbol ?setLinger\@ThrownPotion\@\@QEAAX_N\@Z */ MCAPI void setLinger(bool); /** - * @symbol ?SPLASH_RANGE\@ThrownPotion\@\@2MB + * @symbol ?SPLASH_RANGE\@ThrownPotion\@\@2MB */ MCAPI static float const SPLASH_RANGE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp b/LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp index 99a0aee802..f4f588bbc1 100644 --- a/LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp +++ b/LiteLoader/include/llapi/mc/ThrownPotionEffectSubcomponent.hpp @@ -32,24 +32,24 @@ class ThrownPotionEffectSubcomponent : public SplashPotionEffectSubcomponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ThrownPotionEffectSubcomponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?writetoJSON\@ThrownPotionEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @vftbl 2 + * @symbol ?writetoJSON\@ThrownPotionEffectSubcomponent\@\@UEBAXAEAVValue\@Json\@\@\@Z */ virtual void writetoJSON(class Json::Value &) const; /** - * @vftbl 3 - * @symbol ?doOnHitEffect\@ThrownPotionEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z + * @vftbl 3 + * @symbol ?doOnHitEffect\@ThrownPotionEffectSubcomponent\@\@UEAAXAEAVActor\@\@AEAVProjectileComponent\@\@\@Z */ virtual void doOnHitEffect(class Actor &, class ProjectileComponent &); /** - * @vftbl 4 - * @symbol ?getName\@ThrownPotionEffectSubcomponent\@\@UEAAPEBDXZ + * @vftbl 4 + * @symbol ?getName\@ThrownPotionEffectSubcomponent\@\@UEAAPEBDXZ */ virtual char const * getName(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownTrident.hpp b/LiteLoader/include/llapi/mc/ThrownTrident.hpp index e01db9723b..84ce2694ef 100644 --- a/LiteLoader/include/llapi/mc/ThrownTrident.hpp +++ b/LiteLoader/include/llapi/mc/ThrownTrident.hpp @@ -32,184 +32,184 @@ class ThrownTrident : public AbstractArrow { public: /** - * @vftbl 9 - * @symbol ?outOfWorld\@ThrownTrident\@\@UEAAXXZ + * @vftbl 9 + * @symbol ?outOfWorld\@ThrownTrident\@\@UEAAXXZ */ virtual void outOfWorld(); /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ThrownTrident\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ThrownTrident\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ThrownTrident(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 90 - * @symbol ?playerTouch\@ThrownTrident\@\@UEAAXAEAVPlayer\@\@\@Z + * @vftbl 89 + * @symbol ?playerTouch\@ThrownTrident\@\@UEAAXAEAVPlayer\@\@\@Z */ virtual void playerTouch(class Player &); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 130 - * @symbol ?isEnchanted\@ThrownTrident\@\@UEBA_NXZ + * @vftbl 129 + * @symbol ?isEnchanted\@ThrownTrident\@\@UEBA_NXZ */ virtual bool isEnchanted() const; /** - * @vftbl 148 - * @symbol ?despawn\@ThrownTrident\@\@UEAAXXZ + * @vftbl 147 + * @symbol ?despawn\@ThrownTrident\@\@UEAAXXZ */ virtual void despawn(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@ThrownTrident\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@ThrownTrident\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ThrownTrident\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ThrownTrident\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ThrownTrident\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ThrownTrident\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?shoot\@ThrownTrident\@\@UEAAXAEBVVec3\@\@MM0\@Z + * @vftbl 276 + * @symbol ?shoot\@ThrownTrident\@\@UEAAXAEBVVec3\@\@MM0\@Z */ virtual void shoot(class Vec3 const &, float, float, class Vec3 const &); /** - * @vftbl 280 - * @symbol ?_getPickupItem\@ThrownTrident\@\@MEBA?AVItemStack\@\@XZ + * @vftbl 278 + * @symbol ?_getPickupItem\@ThrownTrident\@\@MEBA?AVItemStack\@\@XZ */ virtual class ItemStack _getPickupItem() const; /** - * @symbol ??0ThrownTrident\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ThrownTrident\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ThrownTrident(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?doNormalTick\@ThrownTrident\@\@QEAAXXZ + * @symbol ?doNormalTick\@ThrownTrident\@\@QEAAXXZ */ MCAPI void doNormalTick(); /** - * @symbol ?getPickupItem\@ThrownTrident\@\@QEBA?AVItemStack\@\@XZ + * @symbol ?getPickupItem\@ThrownTrident\@\@QEBA?AVItemStack\@\@XZ */ MCAPI class ItemStack getPickupItem() const; /** - * @symbol ?returnWithLoyalty\@ThrownTrident\@\@QEAAXH\@Z + * @symbol ?returnWithLoyalty\@ThrownTrident\@\@QEAAXH\@Z */ MCAPI void returnWithLoyalty(int); /** - * @symbol ?setTridentItem\@ThrownTrident\@\@QEAAXAEBVItemStack\@\@\@Z + * @symbol ?setTridentItem\@ThrownTrident\@\@QEAAXAEBVItemStack\@\@\@Z */ MCAPI void setTridentItem(class ItemStack const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ThrownTridentNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/ThrownTridentNormalTickSystem.hpp index 7e8101884f..9bd4f27947 100644 --- a/LiteLoader/include/llapi/mc/ThrownTridentNormalTickSystem.hpp +++ b/LiteLoader/include/llapi/mc/ThrownTridentNormalTickSystem.hpp @@ -25,8 +25,8 @@ class ThrownTridentNormalTickSystem { public: /** - * @symbol ?createSystem\@ThrownTridentNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@ThrownTridentNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickEndResetSystem.hpp b/LiteLoader/include/llapi/mc/TickEndResetSystem.hpp index 563fa40b80..883de4bfb1 100644 --- a/LiteLoader/include/llapi/mc/TickEndResetSystem.hpp +++ b/LiteLoader/include/llapi/mc/TickEndResetSystem.hpp @@ -28,8 +28,8 @@ class TickEndResetSystem { public: /** - * @symbol ?createSystem\@TickEndResetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@TickEndResetSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickNextTickData.hpp b/LiteLoader/include/llapi/mc/TickNextTickData.hpp index 2b731ae677..70dcd9279d 100644 --- a/LiteLoader/include/llapi/mc/TickNextTickData.hpp +++ b/LiteLoader/include/llapi/mc/TickNextTickData.hpp @@ -30,16 +30,16 @@ class TickNextTickData { public: /** - * @symbol ??0TickNextTickData\@\@QEAA\@AEBVBlockPos\@\@AEBVBlock\@\@AEBUTick\@\@H\@Z + * @symbol ??0TickNextTickData\@\@QEAA\@AEBVBlockPos\@\@AEBVBlock\@\@AEBUTick\@\@H\@Z */ MCAPI TickNextTickData(class BlockPos const &, class Block const &, struct Tick const &, int); /** - * @symbol ??8TickNextTickData\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8TickNextTickData\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class TickNextTickData const &) const; /** - * @symbol ??OTickNextTickData\@\@QEBA_NAEBV0\@\@Z + * @symbol ??OTickNextTickData\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator>(class TickNextTickData const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp index 1dff640277..0c273c50c9 100644 --- a/LiteLoader/include/llapi/mc/TickSyncPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickSyncPacket.hpp @@ -31,29 +31,35 @@ class TickSyncPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickSyncPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@TickSyncPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@TickSyncPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@TickSyncPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@TickSyncPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@TickSyncPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@TickSyncPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@TickSyncPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@TickSyncPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKSYNCPACKET + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TickSyncPacket(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickUtil.hpp b/LiteLoader/include/llapi/mc/TickUtil.hpp index 235a5cad34..5ae819ccce 100644 --- a/LiteLoader/include/llapi/mc/TickUtil.hpp +++ b/LiteLoader/include/llapi/mc/TickUtil.hpp @@ -22,27 +22,27 @@ namespace TickUtil { #undef AFTER_EXTRA /** - * @symbol ?chunkBoundsToGridBounds\@TickUtil\@\@YA?AU?$pair\@VBlockPos\@\@V1\@\@std\@\@AEBVPos\@\@0\@Z + * @symbol ?chunkBoundsToGridBounds\@TickUtil\@\@YA?AU?$pair\@VBlockPos\@\@V1\@\@std\@\@AEBVPos\@\@0\@Z */ MCAPI struct std::pair chunkBoundsToGridBounds(class Pos const &, class Pos const &); /** - * @symbol ?forRandomOffset\@TickUtil\@\@YAXEEAEAVRandom\@\@V?$function\@$$A6AXAEBVPos\@\@\@Z\@std\@\@\@Z + * @symbol ?forRandomOffset\@TickUtil\@\@YAXEEAEAVRandom\@\@V?$function\@$$A6AXAEBVPos\@\@\@Z\@std\@\@\@Z */ MCAPI void forRandomOffset(unsigned char, unsigned char, class Random &, class std::function); /** - * @symbol ?getDeterministicBounds\@TickUtil\@\@YA?AUBounds\@\@AEBU2\@\@Z + * @symbol ?getDeterministicBounds\@TickUtil\@\@YA?AUBounds\@\@AEBU2\@\@Z */ MCAPI struct Bounds getDeterministicBounds(struct Bounds const &); /** - * @symbol ?getLoadedChunkNeighborBounds\@TickUtil\@\@YA?AUBounds\@\@AEBU2\@\@Z + * @symbol ?getLoadedChunkNeighborBounds\@TickUtil\@\@YA?AUBounds\@\@AEBU2\@\@Z */ MCAPI struct Bounds getLoadedChunkNeighborBounds(struct Bounds const &); /** - * @symbol ?getLoadedChunkNeighborPos\@TickUtil\@\@YA?AVChunkPos\@\@AEBVPos\@\@_N1\@Z + * @symbol ?getLoadedChunkNeighborPos\@TickUtil\@\@YA?AVChunkPos\@\@AEBVPos\@\@_N1\@Z */ MCAPI class ChunkPos getLoadedChunkNeighborPos(class Pos const &, bool, bool); /** - * @symbol ?getRandomInBounds\@TickUtil\@\@YA?AVChunkPos\@\@AEBUBounds\@\@AEAVRandom\@\@\@Z + * @symbol ?getRandomInBounds\@TickUtil\@\@YA?AVChunkPos\@\@AEBUBounds\@\@AEAVRandom\@\@\@Z */ MCAPI class ChunkPos getRandomInBounds(struct Bounds const &, class Random &); diff --git a/LiteLoader/include/llapi/mc/TickWorldComponent.hpp b/LiteLoader/include/llapi/mc/TickWorldComponent.hpp index b39d45be9b..d86d8c1190 100644 --- a/LiteLoader/include/llapi/mc/TickWorldComponent.hpp +++ b/LiteLoader/include/llapi/mc/TickWorldComponent.hpp @@ -29,56 +29,56 @@ class TickWorldComponent { public: /** - * @symbol ??0TickWorldComponent\@\@QEAA\@XZ + * @symbol ??0TickWorldComponent\@\@QEAA\@XZ */ MCAPI TickWorldComponent(); /** - * @symbol ??0TickWorldComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0TickWorldComponent\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI TickWorldComponent(class TickWorldComponent &&); /** - * @symbol ?getChunkRadius\@TickWorldComponent\@\@QEBAIXZ + * @symbol ?getChunkRadius\@TickWorldComponent\@\@QEBAIXZ */ MCAPI unsigned int getChunkRadius() const; /** - * @symbol ?getMaxDistToPlayers\@TickWorldComponent\@\@QEBAMXZ + * @symbol ?getMaxDistToPlayers\@TickWorldComponent\@\@QEBAMXZ */ MCAPI float getMaxDistToPlayers() const; /** - * @symbol ?getTickingArea\@TickWorldComponent\@\@QEAA?AV?$shared_ptr\@VITickingArea\@\@\@std\@\@XZ + * @symbol ?getTickingArea\@TickWorldComponent\@\@QEAA?AV?$shared_ptr\@VITickingArea\@\@\@std\@\@XZ */ MCAPI class std::shared_ptr getTickingArea(); /** - * @symbol ?hasTickingArea\@TickWorldComponent\@\@QEBA_NXZ + * @symbol ?hasTickingArea\@TickWorldComponent\@\@QEBA_NXZ */ MCAPI bool hasTickingArea() const; /** - * @symbol ?initFromDefinition\@TickWorldComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@TickWorldComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?isAlwaysActive\@TickWorldComponent\@\@QEBA_NXZ + * @symbol ?isAlwaysActive\@TickWorldComponent\@\@QEBA_NXZ */ MCAPI bool isAlwaysActive() const; /** - * @symbol ??4TickWorldComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4TickWorldComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class TickWorldComponent & operator=(class TickWorldComponent &&); /** - * @symbol ?removeArea\@TickWorldComponent\@\@QEAAXXZ + * @symbol ?removeArea\@TickWorldComponent\@\@QEAAXXZ */ MCAPI void removeArea(); /** - * @symbol ?setTickingArea\@TickWorldComponent\@\@QEAAXAEAVActor\@\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@Z + * @symbol ?setTickingArea\@TickWorldComponent\@\@QEAAXAEAVActor\@\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@Z */ MCAPI void setTickingArea(class Actor &, class std::shared_ptr); /** - * @symbol ?updateArea\@TickWorldComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?updateArea\@TickWorldComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void updateArea(class Actor &); /** - * @symbol ??1TickWorldComponent\@\@QEAA\@XZ + * @symbol ??1TickWorldComponent\@\@QEAA\@XZ */ MCAPI ~TickWorldComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickWorldDescription.hpp b/LiteLoader/include/llapi/mc/TickWorldDescription.hpp index ab5d92e8ee..794b7389a7 100644 --- a/LiteLoader/include/llapi/mc/TickWorldDescription.hpp +++ b/LiteLoader/include/llapi/mc/TickWorldDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,28 +29,29 @@ class TickWorldDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TickWorldDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TickWorldDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TickWorldDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@TickWorldDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@TickWorldDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKWORLDDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TickWorldDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TickWorldDescription(); +#endif /** - * @symbol ??0TickWorldDescription\@\@QEAA\@XZ + * @symbol ??0TickWorldDescription\@\@QEAA\@XZ */ MCAPI TickWorldDescription(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingArea.hpp b/LiteLoader/include/llapi/mc/TickingArea.hpp index 372c8c36d8..de50c4c86e 100644 --- a/LiteLoader/include/llapi/mc/TickingArea.hpp +++ b/LiteLoader/include/llapi/mc/TickingArea.hpp @@ -30,185 +30,189 @@ class TickingArea { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickingArea(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@TickingArea\@\@UEBAAEBVUUID\@mce\@\@XZ + * @vftbl 1 + * @symbol ?getId\@TickingArea\@\@UEBAAEBVUUID\@mce\@\@XZ */ virtual class mce::UUID const & getId() const; /** - * @vftbl 2 - * @symbol ?getName\@TickingArea\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@TickingArea\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 3 - * @symbol ?getEntityId\@TickingArea\@\@UEBAAEBUActorUniqueID\@\@XZ + * @vftbl 3 + * @symbol ?getEntityId\@TickingArea\@\@UEBAAEBUActorUniqueID\@\@XZ */ virtual struct ActorUniqueID const & getEntityId() const; /** - * @vftbl 4 - * @symbol ?isEntityOwned\@TickingArea\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isEntityOwned\@TickingArea\@\@UEBA_NXZ */ virtual bool isEntityOwned() const; /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?getBounds\@TickingArea\@\@UEBAAEBUBounds\@\@XZ + * @vftbl 7 + * @symbol ?getBounds\@TickingArea\@\@UEBAAEBUBounds\@\@XZ */ virtual struct Bounds const & getBounds() const; /** - * @vftbl 8 - * @symbol ?isAlwaysActive\@TickingArea\@\@UEBA_NXZ + * @vftbl 8 + * @symbol ?isAlwaysActive\@TickingArea\@\@UEBA_NXZ */ virtual bool isAlwaysActive() const; /** - * @vftbl 9 - * @symbol ?getMaxDistToPlayers\@TickingArea\@\@UEBAMXZ + * @vftbl 9 + * @symbol ?getMaxDistToPlayers\@TickingArea\@\@UEBAMXZ */ virtual float getMaxDistToPlayers() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?getDescription\@TickingArea\@\@UEBA?AUTickingAreaDescription\@\@XZ + * @vftbl 12 + * @symbol ?getDescription\@TickingArea\@\@UEBA?AUTickingAreaDescription\@\@XZ */ virtual struct TickingAreaDescription getDescription() const; /** - * @vftbl 13 - * @symbol ?getLoadMode\@TickingArea\@\@UEBA?AW4TickingAreaLoadMode\@\@XZ + * @vftbl 13 + * @symbol ?getLoadMode\@TickingArea\@\@UEBA?AW4TickingAreaLoadMode\@\@XZ */ virtual enum class TickingAreaLoadMode getLoadMode() const; /** - * @vftbl 14 - * @symbol ?setLoadMode\@TickingArea\@\@UEAAXW4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z + * @vftbl 14 + * @symbol ?setLoadMode\@TickingArea\@\@UEAAXW4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z */ virtual void setLoadMode(enum class TickingAreaLoadMode, class LevelStorage &); /** - * @vftbl 15 - * @symbol ?isPreloadDone\@TickingArea\@\@UEBA_NXZ + * @vftbl 15 + * @symbol ?isPreloadDone\@TickingArea\@\@UEBA_NXZ */ virtual bool isPreloadDone() const; /** - * @vftbl 16 - * @symbol ?tick\@TickingArea\@\@UEAAXAEBUTick\@\@_N\@Z + * @vftbl 16 + * @symbol ?tick\@TickingArea\@\@UEAAXAEBUTick\@\@_N\@Z */ virtual void tick(struct Tick const &, bool); /** - * @vftbl 17 - * @symbol ?tickSeasons\@TickingArea\@\@UEAAXAEAVRandom\@\@\@Z + * @vftbl 17 + * @symbol ?tickSeasons\@TickingArea\@\@UEAAXAEAVRandom\@\@\@Z */ virtual void tickSeasons(class Random &); /** - * @vftbl 18 - * @symbol ?updatePosition\@TickingArea\@\@UEAAXAEBVVec3\@\@\@Z + * @vftbl 18 + * @symbol ?updatePosition\@TickingArea\@\@UEAAXAEBVVec3\@\@\@Z */ virtual void updatePosition(class Vec3 const &); /** - * @vftbl 19 - * @symbol ?updateAndCenter\@TickingArea\@\@UEAAXAEAVLevelStorage\@\@UTick\@\@\@Z + * @vftbl 19 + * @symbol ?updateAndCenter\@TickingArea\@\@UEAAXAEAVLevelStorage\@\@UTick\@\@\@Z */ virtual void updateAndCenter(class LevelStorage &, struct Tick); /** - * @vftbl 20 - * @symbol ?findOwner\@TickingArea\@\@UEAAPEAVActor\@\@AEAE\@Z + * @vftbl 20 + * @symbol ?findOwner\@TickingArea\@\@UEAAPEAVActor\@\@AEAE\@Z */ virtual class Actor * findOwner(unsigned char &); /** - * @vftbl 21 - * @symbol ?entityHasBeenFound\@TickingArea\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?entityHasBeenFound\@TickingArea\@\@UEBA_NXZ */ virtual bool entityHasBeenFound() const; /** - * @vftbl 22 - * @symbol ?setEntityFound\@TickingArea\@\@UEAAXXZ + * @vftbl 22 + * @symbol ?setEntityFound\@TickingArea\@\@UEAAXXZ */ virtual void setEntityFound(); /** - * @vftbl 23 - * @symbol ?isRemoved\@TickingArea\@\@UEAA_NXZ + * @vftbl 23 + * @symbol ?isRemoved\@TickingArea\@\@UEAA_NXZ */ virtual bool isRemoved(); /** - * @vftbl 24 - * @symbol ?remove\@TickingArea\@\@UEAAXAEAVLevelStorage\@\@\@Z + * @vftbl 24 + * @symbol ?remove\@TickingArea\@\@UEAAXAEAVLevelStorage\@\@\@Z */ virtual void remove(class LevelStorage &); /** - * @vftbl 25 - * @symbol ?onComponentChanged\@TickingArea\@\@UEAAXIM_NAEAVLevelStorage\@\@\@Z + * @vftbl 25 + * @symbol ?onComponentChanged\@TickingArea\@\@UEAAXIM_NAEAVLevelStorage\@\@\@Z */ virtual void onComponentChanged(unsigned int, float, bool, class LevelStorage &); /** - * @vftbl 26 - * @symbol ?updateBlockSourceCurrentTick\@TickingArea\@\@UEAAXAEBUTick\@\@\@Z + * @vftbl 26 + * @symbol ?updateBlockSourceCurrentTick\@TickingArea\@\@UEAAXAEBUTick\@\@\@Z */ virtual void updateBlockSourceCurrentTick(struct Tick const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREA /** - * @symbol ?getBlockSource\@TickingArea\@\@UEBA?BV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ + * @symbol ?getBlockSource\@TickingArea\@\@UEBA?BV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ */ MCVAPI class WeakRefT> const getBlockSource() const; /** - * @symbol ?getBlockSource\@TickingArea\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ + * @symbol ?getBlockSource\@TickingArea\@\@UEAA?AV?$WeakRefT\@U?$SharePtrRefTraits\@VBlockSource\@\@\@\@\@\@XZ */ MCVAPI class WeakRefT> getBlockSource(); /** - * @symbol ?getView\@TickingArea\@\@UEAAAEAVITickingAreaView\@\@XZ + * @symbol ?getView\@TickingArea\@\@UEAAAEAVITickingAreaView\@\@XZ */ MCVAPI class ITickingAreaView & getView(); /** - * @symbol ?getView\@TickingArea\@\@UEBAAEBVITickingAreaView\@\@XZ + * @symbol ?getView\@TickingArea\@\@UEBAAEBVITickingAreaView\@\@XZ */ MCVAPI class ITickingAreaView const & getView() const; -#endif /** - * @symbol ??0TickingArea\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUBounds\@\@_NW4TickingAreaLoadMode\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI TickingArea(class Dimension &, class mce::UUID, std::string const &, struct Bounds const &, bool, enum class TickingAreaLoadMode); + MCVAPI ~TickingArea(); +#endif /** - * @symbol ??0TickingArea\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBUBounds\@\@UActorUniqueID\@\@M\@Z + * @symbol ??0TickingArea\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBUBounds\@\@UActorUniqueID\@\@M\@Z */ MCAPI TickingArea(class Dimension &, class mce::UUID, struct Bounds const &, struct ActorUniqueID, float); /** - * @symbol ??0TickingArea\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBUBounds\@\@UActorUniqueID\@\@\@Z + * @symbol ??0TickingArea\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUBounds\@\@_NW4TickingAreaLoadMode\@\@\@Z + */ + MCAPI TickingArea(class Dimension &, class mce::UUID, std::string const &, struct Bounds const &, bool, enum class TickingAreaLoadMode); + /** + * @symbol ??0TickingArea\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBUBounds\@\@UActorUniqueID\@\@\@Z */ MCAPI TickingArea(class Dimension &, class mce::UUID, struct Bounds const &, struct ActorUniqueID); //private: /** - * @symbol ??0TickingArea\@\@AEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@AEBUBounds\@\@_NM5W4TickingAreaLoadMode\@\@\@Z + * @symbol ??0TickingArea\@\@AEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@UActorUniqueID\@\@AEBUBounds\@\@_NM5W4TickingAreaLoadMode\@\@\@Z */ MCAPI TickingArea(class Dimension &, class mce::UUID, std::string const &, struct ActorUniqueID, struct Bounds const &, bool, float, bool, enum class TickingAreaLoadMode); /** - * @symbol ?_center\@TickingArea\@\@AEAAXAEAVLevelStorage\@\@\@Z + * @symbol ?_center\@TickingArea\@\@AEAAXAEAVLevelStorage\@\@\@Z */ MCAPI void _center(class LevelStorage &); /** - * @symbol ?_save\@TickingArea\@\@AEAAXAEAVLevelStorage\@\@\@Z + * @symbol ?_save\@TickingArea\@\@AEAAXAEAVLevelStorage\@\@\@Z */ MCAPI void _save(class LevelStorage &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp index f563818bd5..75161af6b3 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaCommand.hpp @@ -31,46 +31,46 @@ class TickingAreaCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickingAreaCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TickingAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TickingAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?formatTickingAreaList\@TickingAreaCommand\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@3\@\@Z + * @symbol ?formatTickingAreaList\@TickingAreaCommand\@\@SA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@3\@\@Z */ MCAPI static std::string formatTickingAreaList(std::vector const &); /** - * @symbol ?setup\@TickingAreaCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TickingAreaCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_add\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?_add\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void _add(class CommandOrigin const &, class CommandOutput &, class Level &, class Dimension &) const; /** - * @symbol ?_list\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?_list\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void _list(class CommandOrigin const &, class CommandOutput &, class Level &, class Dimension &) const; /** - * @symbol ?_preload\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?_preload\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void _preload(class CommandOrigin const &, class CommandOutput &, class Level &, class Dimension &) const; /** - * @symbol ?_remove\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?_remove\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void _remove(class CommandOrigin const &, class CommandOutput &, class Level &, class Dimension &) const; /** - * @symbol ?_removeAll\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z + * @symbol ?_removeAll\@TickingAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEAVLevel\@\@AEAVDimension\@\@\@Z */ MCAPI void _removeAll(class CommandOrigin const &, class CommandOutput &, class Level &, class Dimension &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingAreaDescription.hpp b/LiteLoader/include/llapi/mc/TickingAreaDescription.hpp index d6b97e92cb..b4963fe659 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaDescription.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaDescription.hpp @@ -30,11 +30,11 @@ struct TickingAreaDescription { public: /** - * @symbol ?asString\@TickingAreaDescription\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?asString\@TickingAreaDescription\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string asString() const; /** - * @symbol ??1TickingAreaDescription\@\@QEAA\@XZ + * @symbol ??1TickingAreaDescription\@\@QEAA\@XZ */ MCAPI ~TickingAreaDescription(); diff --git a/LiteLoader/include/llapi/mc/TickingAreaList.hpp b/LiteLoader/include/llapi/mc/TickingAreaList.hpp index 3e207bac63..c2c839388f 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaList.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaList.hpp @@ -30,14 +30,20 @@ class TickingAreaList { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickingAreaList(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?removeDistantEntityAreasAndCheckForRemoved\@TickingAreaList\@\@UEAA_NAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@V?$function\@$$A6AXAEBVITickingArea\@\@\@Z\@3\@AEAVLevelStorage\@\@\@Z + * @vftbl 1 + * @symbol ?removeDistantEntityAreasAndCheckForRemoved\@TickingAreaList\@\@UEAA_NAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@V?$function\@$$A6AXAEBVITickingArea\@\@\@Z\@3\@AEAVLevelStorage\@\@\@Z */ virtual bool removeDistantEntityAreasAndCheckForRemoved(std::vector const &, class std::function, class LevelStorage &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREALIST + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TickingAreaList(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp b/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp index 94ed40932c..8ec6a5381e 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaListBase.hpp @@ -30,98 +30,104 @@ class TickingAreaListBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickingAreaListBase(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?removeDistantEntityAreasAndCheckForRemoved\@TickingAreaListBase\@\@UEAA_NAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@V?$function\@$$A6AXAEBVITickingArea\@\@\@Z\@3\@AEAVLevelStorage\@\@\@Z + * @vftbl 1 + * @symbol ?removeDistantEntityAreasAndCheckForRemoved\@TickingAreaListBase\@\@UEAA_NAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@V?$function\@$$A6AXAEBVITickingArea\@\@\@Z\@3\@AEAVLevelStorage\@\@\@Z */ virtual bool removeDistantEntityAreasAndCheckForRemoved(std::vector const &, class std::function, class LevelStorage &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREALISTBASE /** - * @symbol ?add\@TickingAreaListBase\@\@QEAAXV?$unique_ptr\@VITickingArea\@\@U?$default_delete\@VITickingArea\@\@\@std\@\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TickingAreaListBase(); +#endif + /** + * @symbol ?add\@TickingAreaListBase\@\@QEAAXV?$unique_ptr\@VITickingArea\@\@U?$default_delete\@VITickingArea\@\@\@std\@\@\@std\@\@\@Z */ MCAPI void add(std::unique_ptr); /** - * @symbol ?countEntityTickingAreas\@TickingAreaListBase\@\@QEBAIXZ + * @symbol ?countEntityTickingAreas\@TickingAreaListBase\@\@QEBAIXZ */ MCAPI unsigned int countEntityTickingAreas() const; /** - * @symbol ?countStandaloneTickingAreas\@TickingAreaListBase\@\@QEBAIXZ + * @symbol ?countStandaloneTickingAreas\@TickingAreaListBase\@\@QEBAIXZ */ MCAPI unsigned int countStandaloneTickingAreas() const; /** - * @symbol ?destroyAreas\@TickingAreaListBase\@\@QEAAXXZ + * @symbol ?destroyAreas\@TickingAreaListBase\@\@QEAAXXZ */ MCAPI void destroyAreas(); /** - * @symbol ?empty\@TickingAreaListBase\@\@QEBA_NXZ + * @symbol ?empty\@TickingAreaListBase\@\@QEBA_NXZ */ MCAPI bool empty() const; /** - * @symbol ?findStandaloneAreasContaining\@TickingAreaListBase\@\@QEAA?AV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?findStandaloneAreasContaining\@TickingAreaListBase\@\@QEAA?AV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI std::vector> findStandaloneAreasContaining(class BlockPos const &); /** - * @symbol ?findStandaloneAreasNamed\@TickingAreaListBase\@\@QEBA?AV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?findStandaloneAreasNamed\@TickingAreaListBase\@\@QEBA?AV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector> findStandaloneAreasNamed(std::string const &) const; /** - * @symbol ?getAreaFor\@TickingAreaListBase\@\@QEBA?AV?$shared_ptr\@VITickingArea\@\@\@std\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?getAreaFor\@TickingAreaListBase\@\@QEBA?AV?$shared_ptr\@VITickingArea\@\@\@std\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class std::shared_ptr getAreaFor(struct ActorUniqueID const &) const; /** - * @symbol ?getAreas\@TickingAreaListBase\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@XZ + * @symbol ?getAreas\@TickingAreaListBase\@\@QEBAAEBV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@std\@\@XZ */ MCAPI std::vector> const & getAreas() const; /** - * @symbol ?getStandaloneTickingAreaDescriptions\@TickingAreaListBase\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getStandaloneTickingAreaDescriptions\@TickingAreaListBase\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector getStandaloneTickingAreaDescriptions() const; /** - * @symbol ?hasTickingAreaNamed\@TickingAreaListBase\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?hasTickingAreaNamed\@TickingAreaListBase\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool hasTickingAreaNamed(std::string const &) const; /** - * @symbol ?isPreloadDone\@TickingAreaListBase\@\@QEBA_NXZ + * @symbol ?isPreloadDone\@TickingAreaListBase\@\@QEBA_NXZ */ MCAPI bool isPreloadDone() const; /** - * @symbol ?processRemoves\@TickingAreaListBase\@\@QEAAXXZ + * @symbol ?processRemoves\@TickingAreaListBase\@\@QEAAXXZ */ MCAPI void processRemoves(); /** - * @symbol ?processUpdates\@TickingAreaListBase\@\@QEAAXAEAVLevelStorage\@\@UTick\@\@\@Z + * @symbol ?processUpdates\@TickingAreaListBase\@\@QEAAXAEAVLevelStorage\@\@UTick\@\@\@Z */ MCAPI void processUpdates(class LevelStorage &, struct Tick); /** - * @symbol ?removeAllStandaloneAreas\@TickingAreaListBase\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?removeAllStandaloneAreas\@TickingAreaListBase\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector removeAllStandaloneAreas(class LevelStorage &); /** - * @symbol ?removeAreas\@TickingAreaListBase\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@AEBV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@3\@AEAVLevelStorage\@\@\@Z + * @symbol ?removeAreas\@TickingAreaListBase\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@AEBV?$vector\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@V?$allocator\@V?$shared_ptr\@VITickingArea\@\@\@std\@\@\@2\@\@3\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector removeAreas(std::vector> const &, class LevelStorage &); /** - * @symbol ?tick\@TickingAreaListBase\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?tick\@TickingAreaListBase\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void tick(struct Tick const &); /** - * @symbol ?tickSeasons\@TickingAreaListBase\@\@QEAAXAEAVRandom\@\@\@Z + * @symbol ?tickSeasons\@TickingAreaListBase\@\@QEAAXAEAVRandom\@\@\@Z */ MCAPI void tickSeasons(class Random &); /** - * @symbol ?updateBlockSourceCurrentTick\@TickingAreaListBase\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?updateBlockSourceCurrentTick\@TickingAreaListBase\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void updateBlockSourceCurrentTick(struct Tick const &); //protected: /** - * @symbol ?_shouldRemoveArea\@TickingAreaListBase\@\@IEBA_NIAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@\@Z + * @symbol ?_shouldRemoveArea\@TickingAreaListBase\@\@IEBA_NIAEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@\@Z */ MCAPI bool _shouldRemoveArea(unsigned int, std::vector const &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingAreaView.hpp b/LiteLoader/include/llapi/mc/TickingAreaView.hpp index d571aad8fe..9479a427ce 100644 --- a/LiteLoader/include/llapi/mc/TickingAreaView.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreaView.hpp @@ -30,85 +30,91 @@ class TickingAreaView { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickingAreaView(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?init\@TickingAreaView\@\@UEAAXAEBUBounds\@\@_N\@Z + * @vftbl 1 + * @symbol ?init\@TickingAreaView\@\@UEAAXAEBUBounds\@\@_N\@Z */ virtual void init(struct Bounds const &, bool); /** - * @vftbl 2 - * @symbol ?tick\@TickingAreaView\@\@UEAAXAEBUTick\@\@AEAVBlockSource\@\@_N2\@Z + * @vftbl 2 + * @symbol ?tick\@TickingAreaView\@\@UEAAXAEBUTick\@\@AEAVBlockSource\@\@_N2\@Z */ virtual void tick(struct Tick const &, class BlockSource &, bool, bool); /** - * @vftbl 3 - * @symbol ?tickSeasons\@TickingAreaView\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?tickSeasons\@TickingAreaView\@\@UEAAXAEAVBlockSource\@\@AEAVRandom\@\@\@Z */ virtual void tickSeasons(class BlockSource &, class Random &); /** - * @vftbl 4 - * @symbol ?getDimensionId\@TickingAreaView\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ + * @vftbl 4 + * @symbol ?getDimensionId\@TickingAreaView\@\@UEBA?AV?$AutomaticID\@VDimension\@\@H\@\@XZ */ virtual class AutomaticID getDimensionId() const; /** - * @vftbl 5 - * @symbol ?getBounds\@TickingAreaView\@\@UEBAAEBUBounds\@\@XZ + * @vftbl 5 + * @symbol ?getBounds\@TickingAreaView\@\@UEBAAEBUBounds\@\@XZ */ virtual struct Bounds const & getBounds() const; /** - * @vftbl 6 - * @symbol ?isCircle\@TickingAreaView\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isCircle\@TickingAreaView\@\@UEBA_NXZ */ virtual bool isCircle() const; /** - * @vftbl 7 - * @symbol ?isDoneLoading\@TickingAreaView\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?isDoneLoading\@TickingAreaView\@\@UEBA_NXZ */ virtual bool isDoneLoading() const; /** - * @vftbl 8 - * @symbol ?checkInitialLoadDone\@TickingAreaView\@\@UEAA_NUTick\@\@\@Z + * @vftbl 8 + * @symbol ?checkInitialLoadDone\@TickingAreaView\@\@UEAA_NUTick\@\@\@Z */ virtual bool checkInitialLoadDone(struct Tick); /** - * @vftbl 9 - * @symbol ?checkLoadedChunkNeighborsDone\@TickingAreaView\@\@UEBA_NAEBVBlockSource\@\@_N\@Z + * @vftbl 9 + * @symbol ?checkLoadedChunkNeighborsDone\@TickingAreaView\@\@UEBA_NAEBVBlockSource\@\@_N\@Z */ virtual bool checkLoadedChunkNeighborsDone(class BlockSource const &, bool) const; /** - * @vftbl 10 - * @symbol ?move\@TickingAreaView\@\@UEAAXAEBUBounds\@\@\@Z + * @vftbl 10 + * @symbol ?move\@TickingAreaView\@\@UEAAXAEBUBounds\@\@\@Z */ virtual void move(struct Bounds const &); /** - * @vftbl 11 - * @symbol ?createChildSource\@TickingAreaView\@\@UEAA?AV?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@XZ + * @vftbl 11 + * @symbol ?createChildSource\@TickingAreaView\@\@UEAA?AV?$unique_ptr\@VChunkViewSource\@\@U?$default_delete\@VChunkViewSource\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr createChildSource(); /** - * @vftbl 12 - * @symbol ?getAvailableChunk\@TickingAreaView\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @vftbl 12 + * @symbol ?getAvailableChunk\@TickingAreaView\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ virtual class std::shared_ptr getAvailableChunk(class ChunkPos const &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREAVIEW /** - * @symbol ??0TickingAreaView\@\@QEAA\@AEAVChunkSource\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TickingAreaView(); +#endif + /** + * @symbol ??0TickingAreaView\@\@QEAA\@AEAVChunkSource\@\@\@Z */ MCAPI TickingAreaView(class ChunkSource &); /** - * @symbol ?unregisterChunkBuildOrderPolicy\@TickingAreaView\@\@QEAAXAEAVChunkBuildOrderPolicyBase\@\@\@Z + * @symbol ?unregisterChunkBuildOrderPolicy\@TickingAreaView\@\@QEAAXAEAVChunkBuildOrderPolicyBase\@\@\@Z */ MCAPI void unregisterChunkBuildOrderPolicy(class ChunkBuildOrderPolicyBase &); //private: /** - * @symbol ?_tickChunk\@TickingAreaView\@\@AEAA_NAEBUTick\@\@AEAVBlockSource\@\@AEAVLevel\@\@AEBVChunkPos\@\@\@Z + * @symbol ?_tickChunk\@TickingAreaView\@\@AEAA_NAEBUTick\@\@AEAVBlockSource\@\@AEAVLevel\@\@AEBVChunkPos\@\@\@Z */ MCAPI bool _tickChunk(struct Tick const &, class BlockSource &, class Level &, class ChunkPos const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp index 4009dfe5c0..8c404a1788 100644 --- a/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasLoadStatusPacket.hpp @@ -28,37 +28,43 @@ class TickingAreasLoadStatusPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TickingAreasLoadStatusPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@TickingAreasLoadStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@TickingAreasLoadStatusPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@TickingAreasLoadStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@TickingAreasLoadStatusPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@TickingAreasLoadStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@TickingAreasLoadStatusPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@TickingAreasLoadStatusPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TICKINGAREASLOADSTATUSPACKET /** - * @symbol ??0TickingAreasLoadStatusPacket\@\@QEAA\@_N\@Z + * @symbol __unk_destructor_-1 */ - MCAPI TickingAreasLoadStatusPacket(bool); + MCVAPI ~TickingAreasLoadStatusPacket(); +#endif /** - * @symbol ??0TickingAreasLoadStatusPacket\@\@QEAA\@XZ + * @symbol ??0TickingAreasLoadStatusPacket\@\@QEAA\@XZ */ MCAPI TickingAreasLoadStatusPacket(); + /** + * @symbol ??0TickingAreasLoadStatusPacket\@\@QEAA\@_N\@Z + */ + MCAPI TickingAreasLoadStatusPacket(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingAreasManager.hpp b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp index f31b762550..74a62f4ef5 100644 --- a/LiteLoader/include/llapi/mc/TickingAreasManager.hpp +++ b/LiteLoader/include/llapi/mc/TickingAreasManager.hpp @@ -29,124 +29,124 @@ class TickingAreasManager { public: /** - * @symbol ??0TickingAreasManager\@\@QEAA\@XZ + * @symbol ??0TickingAreasManager\@\@QEAA\@XZ */ MCAPI TickingAreasManager(); /** - * @symbol ?addArea\@TickingAreasManager\@\@QEAA?AW4AddTickingAreaStatus\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@2W4AreaLimitCheck\@1\@_NW4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z - */ - MCAPI enum class AddTickingAreaStatus addArea(class AutomaticID, std::string const &, class BlockPos const &, class BlockPos const &, enum class TickingAreasManager::AreaLimitCheck, bool, enum class TickingAreaLoadMode, class LevelStorage &); - /** - * @symbol ?addArea\@TickingAreasManager\@\@QEAA?AW4AddTickingAreaStatus\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@HW4AreaLimitCheck\@1\@_NW4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?addArea\@TickingAreasManager\@\@QEAA?AW4AddTickingAreaStatus\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@HW4AreaLimitCheck\@1\@_NW4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z */ MCAPI enum class AddTickingAreaStatus addArea(class AutomaticID, std::string const &, class BlockPos const &, int, enum class TickingAreasManager::AreaLimitCheck, bool, enum class TickingAreaLoadMode, class LevelStorage &); /** - * @symbol ?addEntityArea\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBUActorUniqueID\@\@AEBUBounds\@\@_NMAEAVLevelStorage\@\@\@Z + * @symbol ?addArea\@TickingAreasManager\@\@QEAA?AW4AddTickingAreaStatus\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlockPos\@\@2W4AreaLimitCheck\@1\@_NW4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z */ - MCAPI void addEntityArea(class AutomaticID, struct ActorUniqueID const &, struct Bounds const &, bool, float, class LevelStorage &); + MCAPI enum class AddTickingAreaStatus addArea(class AutomaticID, std::string const &, class BlockPos const &, class BlockPos const &, enum class TickingAreasManager::AreaLimitCheck, bool, enum class TickingAreaLoadMode, class LevelStorage &); /** - * @symbol ?addEntityArea\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBVActor\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?addEntityArea\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBVActor\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void addEntityArea(class AutomaticID, class Actor const &, class LevelStorage &); /** - * @symbol ?addTickingAreaListForDimension\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$shared_ptr\@VTickingAreaList\@\@\@std\@\@\@Z + * @symbol ?addEntityArea\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBUActorUniqueID\@\@AEBUBounds\@\@_NMAEAVLevelStorage\@\@\@Z + */ + MCAPI void addEntityArea(class AutomaticID, struct ActorUniqueID const &, struct Bounds const &, bool, float, class LevelStorage &); + /** + * @symbol ?addTickingAreaListForDimension\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$shared_ptr\@VTickingAreaList\@\@\@std\@\@\@Z */ MCAPI void addTickingAreaListForDimension(class AutomaticID, class std::shared_ptr const &); /** - * @symbol ?countActiveStandaloneTickingAreas\@TickingAreasManager\@\@QEBAIXZ + * @symbol ?countActiveStandaloneTickingAreas\@TickingAreasManager\@\@QEBAIXZ */ MCAPI unsigned int countActiveStandaloneTickingAreas() const; /** - * @symbol ?countStandaloneTickingAreas\@TickingAreasManager\@\@QEBAIXZ + * @symbol ?countStandaloneTickingAreas\@TickingAreasManager\@\@QEBAIXZ */ MCAPI unsigned int countStandaloneTickingAreas() const; /** - * @symbol ?getPendingStandaloneAreaDescriptions\@TickingAreasManager\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getPendingStandaloneAreaDescriptions\@TickingAreasManager\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI std::vector getPendingStandaloneAreaDescriptions(class AutomaticID) const; /** - * @symbol ?getPendingStandaloneAreaDescriptionsByName\@TickingAreasManager\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getPendingStandaloneAreaDescriptionsByName\@TickingAreasManager\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI std::vector getPendingStandaloneAreaDescriptionsByName(class AutomaticID, std::string const &) const; /** - * @symbol ?getPendingStandaloneAreaDescriptionsByPosition\@TickingAreasManager\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getPendingStandaloneAreaDescriptionsByPosition\@TickingAreasManager\@\@QEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@\@Z */ MCAPI std::vector getPendingStandaloneAreaDescriptionsByPosition(class AutomaticID, class BlockPos const &) const; /** - * @symbol ?hasActiveAreas\@TickingAreasManager\@\@QEBA_NXZ + * @symbol ?hasActiveAreas\@TickingAreasManager\@\@QEBA_NXZ */ MCAPI bool hasActiveAreas() const; /** - * @symbol ?isPreloadDone\@TickingAreasManager\@\@QEBA_NXZ + * @symbol ?isPreloadDone\@TickingAreasManager\@\@QEBA_NXZ */ MCAPI bool isPreloadDone() const; /** - * @symbol ?loadArea\@TickingAreasManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCompoundTag\@\@\@Z + * @symbol ?loadArea\@TickingAreasManager\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVCompoundTag\@\@\@Z */ MCAPI void loadArea(std::string const &, class CompoundTag const *); /** - * @symbol ?onTickingEntityAdded\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEAVActor\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?onTickingEntityAdded\@TickingAreasManager\@\@QEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEAVActor\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void onTickingEntityAdded(class AutomaticID, class Actor &, class LevelStorage &); /** - * @symbol ?removePendingAreaByName\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAVLevelStorage\@\@\@Z + * @symbol ?removePendingAreaByName\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector removePendingAreaByName(class AutomaticID, std::string const &, class LevelStorage &); /** - * @symbol ?removePendingAreaByPosition\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?removePendingAreaByPosition\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector removePendingAreaByPosition(class AutomaticID, class BlockPos const &, class LevelStorage &); /** - * @symbol ?setPendingAreaLoadModeByName\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?setPendingAreaLoadModeByName\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@W4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector setPendingAreaLoadModeByName(class AutomaticID, std::string const &, enum class TickingAreaLoadMode, class LevelStorage &); /** - * @symbol ?setPendingAreaLoadModeByPosition\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@W4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?setPendingAreaLoadModeByPosition\@TickingAreasManager\@\@QEAA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBVBlockPos\@\@W4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z */ MCAPI std::vector setPendingAreaLoadModeByPosition(class AutomaticID, class BlockPos const &, enum class TickingAreaLoadMode, class LevelStorage &); /** - * @symbol ?tick\@TickingAreasManager\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?tick\@TickingAreasManager\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void tick(struct Tick const &); /** - * @symbol ?update\@TickingAreasManager\@\@QEAAXAEAVLevel\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?update\@TickingAreasManager\@\@QEAAXAEAVLevel\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void update(class Level &, class LevelStorage &); /** - * @symbol ?getLimitCheck\@TickingAreasManager\@\@SA?AW4AreaLimitCheck\@1\@AEBVLevel\@\@_N\@Z + * @symbol ?getLimitCheck\@TickingAreasManager\@\@SA?AW4AreaLimitCheck\@1\@AEBVLevel\@\@_N\@Z */ MCAPI static enum class TickingAreasManager::AreaLimitCheck getLimitCheck(class Level const &, bool); //private: /** - * @symbol ?_addArea\@TickingAreasManager\@\@AEAA?AW4AddTickingAreaStatus\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUBounds\@\@_NW4AreaLimitCheck\@1\@3W4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?_addArea\@TickingAreasManager\@\@AEAA?AW4AddTickingAreaStatus\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBUBounds\@\@_NW4AreaLimitCheck\@1\@3W4TickingAreaLoadMode\@\@AEAVLevelStorage\@\@\@Z */ MCAPI enum class AddTickingAreaStatus _addArea(class AutomaticID, std::string const &, struct Bounds const &, bool, enum class TickingAreasManager::AreaLimitCheck, bool, enum class TickingAreaLoadMode, class LevelStorage &); /** - * @symbol ?_deletePendingArea\@TickingAreasManager\@\@AEAAXAEAVLevelStorage\@\@AEBUPendingArea\@\@\@Z + * @symbol ?_deletePendingArea\@TickingAreasManager\@\@AEAAXAEAVLevelStorage\@\@AEBUPendingArea\@\@\@Z */ MCAPI void _deletePendingArea(class LevelStorage &, struct PendingArea const &); /** - * @symbol ?_getPendingAreaDescriptionsFiltered\@TickingAreasManager\@\@AEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$function\@$$A6A_NAEBUPendingArea\@\@\@Z\@3\@\@Z + * @symbol ?_getPendingAreaDescriptionsFiltered\@TickingAreasManager\@\@AEBA?AV?$vector\@UTickingAreaDescription\@\@V?$allocator\@UTickingAreaDescription\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@V?$function\@$$A6A_NAEBUPendingArea\@\@\@Z\@3\@\@Z */ MCAPI std::vector _getPendingAreaDescriptionsFiltered(class AutomaticID, class std::function) const; /** - * @symbol ?_hasPendingTickingAreaNamed\@TickingAreasManager\@\@AEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UPendingArea\@\@V?$allocator\@UPendingArea\@\@\@std\@\@\@3\@\@Z + * @symbol ?_hasPendingTickingAreaNamed\@TickingAreasManager\@\@AEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@UPendingArea\@\@V?$allocator\@UPendingArea\@\@\@std\@\@\@3\@\@Z */ MCAPI bool _hasPendingTickingAreaNamed(std::string const &, std::vector const &) const; /** - * @symbol ?_processAdds\@TickingAreasManager\@\@AEAAXAEAVLevel\@\@\@Z + * @symbol ?_processAdds\@TickingAreasManager\@\@AEAAXAEAVLevel\@\@\@Z */ MCAPI void _processAdds(class Level &); /** - * @symbol ?_processRemoves\@TickingAreasManager\@\@AEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEAVTickingAreaList\@\@AEAVLevel\@\@AEAVLevelStorage\@\@\@Z + * @symbol ?_processRemoves\@TickingAreasManager\@\@AEAAXV?$AutomaticID\@VDimension\@\@H\@\@AEAVTickingAreaList\@\@AEAVLevel\@\@AEAVLevelStorage\@\@\@Z */ MCAPI void _processRemoves(class AutomaticID, class TickingAreaList &, class Level &, class LevelStorage &); /** - * @symbol ?_savePendingArea\@TickingAreasManager\@\@AEAAXAEAVLevelStorage\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBUPendingArea\@\@\@Z + * @symbol ?_savePendingArea\@TickingAreasManager\@\@AEAAXAEAVLevelStorage\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEBUPendingArea\@\@\@Z */ MCAPI void _savePendingArea(class LevelStorage &, class AutomaticID, struct PendingArea const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TickingSystemWithInfo.hpp b/LiteLoader/include/llapi/mc/TickingSystemWithInfo.hpp index b3b8831c2c..331d373010 100644 --- a/LiteLoader/include/llapi/mc/TickingSystemWithInfo.hpp +++ b/LiteLoader/include/llapi/mc/TickingSystemWithInfo.hpp @@ -28,11 +28,11 @@ struct TickingSystemWithInfo { public: /** - * @symbol ??0TickingSystemWithInfo\@\@QEAA\@$$QEAU0\@\@Z + * @symbol ??0TickingSystemWithInfo\@\@QEAA\@$$QEAU0\@\@Z */ MCAPI TickingSystemWithInfo(struct TickingSystemWithInfo &&); /** - * @symbol ??1TickingSystemWithInfo\@\@QEAA\@XZ + * @symbol ??1TickingSystemWithInfo\@\@QEAA\@XZ */ MCAPI ~TickingSystemWithInfo(); diff --git a/LiteLoader/include/llapi/mc/TimeAccumulator.hpp b/LiteLoader/include/llapi/mc/TimeAccumulator.hpp index 55de08c184..4853aab8fa 100644 --- a/LiteLoader/include/llapi/mc/TimeAccumulator.hpp +++ b/LiteLoader/include/llapi/mc/TimeAccumulator.hpp @@ -27,24 +27,24 @@ class TimeAccumulator { public: /** - * @symbol ??0TimeAccumulator\@\@QEAA\@XZ + * @symbol ??0TimeAccumulator\@\@QEAA\@XZ */ MCAPI TimeAccumulator(); /** - * @symbol ?getCount\@TimeAccumulator\@\@QEBA_KXZ + * @symbol ?getCount\@TimeAccumulator\@\@QEBA_KXZ */ MCAPI unsigned __int64 getCount() const; /** - * @symbol ?getTimeSumAverageMS\@TimeAccumulator\@\@QEBAMXZ + * @symbol ?getTimeSumAverageMS\@TimeAccumulator\@\@QEBAMXZ */ MCAPI float getTimeSumAverageMS() const; /** - * @symbol ?getTimeSumAverageSeconds\@TimeAccumulator\@\@QEBAMXZ + * @symbol ?getTimeSumAverageSeconds\@TimeAccumulator\@\@QEBAMXZ */ MCAPI float getTimeSumAverageSeconds() const; /** - * @symbol ?getTimeSumSeconds\@TimeAccumulator\@\@QEBAMXZ + * @symbol ?getTimeSumSeconds\@TimeAccumulator\@\@QEBAMXZ */ MCAPI float getTimeSumSeconds() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TimeCommand.hpp b/LiteLoader/include/llapi/mc/TimeCommand.hpp index 8f0cbbfc64..7ff75936e8 100644 --- a/LiteLoader/include/llapi/mc/TimeCommand.hpp +++ b/LiteLoader/include/llapi/mc/TimeCommand.hpp @@ -31,18 +31,18 @@ class TimeCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TimeCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TimeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TimeCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TimeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TimeCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Timer.hpp b/LiteLoader/include/llapi/mc/Timer.hpp index 3e7e3f3694..ae7331fef8 100644 --- a/LiteLoader/include/llapi/mc/Timer.hpp +++ b/LiteLoader/include/llapi/mc/Timer.hpp @@ -30,36 +30,36 @@ class Timer { public: /** - * @symbol ??0Timer\@\@QEAA\@MV?$function\@$$A6A_JXZ\@std\@\@\@Z + * @symbol ??0Timer\@\@QEAA\@MV?$function\@$$A6A_JXZ\@std\@\@\@Z */ MCAPI Timer(float, class std::function<__int64 (void)>); /** - * @symbol ?advanceTime\@Timer\@\@QEAAXM\@Z + * @symbol ?advanceTime\@Timer\@\@QEAAXM\@Z */ MCAPI void advanceTime(float); /** - * @symbol ?getTicks\@Timer\@\@QEBA_KXZ + * @symbol ?getTicks\@Timer\@\@QEBA_KXZ */ MCAPI unsigned __int64 getTicks() const; /** - * @symbol ?getTimeScale\@Timer\@\@QEBAMXZ + * @symbol ?getTimeScale\@Timer\@\@QEBAMXZ */ MCAPI float getTimeScale() const; /** - * @symbol ?resetTimePassed\@Timer\@\@QEAAXXZ + * @symbol ?resetTimePassed\@Timer\@\@QEAAXXZ */ MCAPI void resetTimePassed(); /** - * @symbol ?setTimeScale\@Timer\@\@QEAAXM\@Z + * @symbol ?setTimeScale\@Timer\@\@QEAAXM\@Z */ MCAPI void setTimeScale(float); /** - * @symbol ?stepTick\@Timer\@\@QEAAXH\@Z + * @symbol ?stepTick\@Timer\@\@QEAAXH\@Z */ MCAPI void stepTick(int); /** - * @symbol ?stepping\@Timer\@\@QEBA_NXZ + * @symbol ?stepping\@Timer\@\@QEBA_NXZ */ MCAPI bool stepping() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TimerComponent.hpp b/LiteLoader/include/llapi/mc/TimerComponent.hpp index 1999b429a3..a7a4195d52 100644 --- a/LiteLoader/include/llapi/mc/TimerComponent.hpp +++ b/LiteLoader/include/llapi/mc/TimerComponent.hpp @@ -29,48 +29,48 @@ class TimerComponent { public: /** - * @symbol ??0TimerComponent\@\@QEAA\@XZ + * @symbol ??0TimerComponent\@\@QEAA\@XZ */ MCAPI TimerComponent(); /** - * @symbol ?addAdditionalSaveData\@TimerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@TimerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?getHasExecuted\@TimerComponent\@\@QEBA_NXZ + * @symbol ?getHasExecuted\@TimerComponent\@\@QEBA_NXZ */ MCAPI bool getHasExecuted() const; /** - * @symbol ?getLooping\@TimerComponent\@\@QEBA_NXZ + * @symbol ?getLooping\@TimerComponent\@\@QEBA_NXZ */ MCAPI bool getLooping() const; /** - * @symbol ?getTimeStamp\@TimerComponent\@\@QEAA_KAEBVLevel\@\@\@Z + * @symbol ?getTimeStamp\@TimerComponent\@\@QEAA_KAEBVLevel\@\@\@Z */ MCAPI unsigned __int64 getTimeStamp(class Level const &); /** - * @symbol ??4TimerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4TimerComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class TimerComponent & operator=(class TimerComponent &&); /** - * @symbol ?readAdditionalSaveData\@TimerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@TimerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?restartTimer\@TimerComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?restartTimer\@TimerComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void restartTimer(class Actor &); /** - * @symbol ?setHasExecuted\@TimerComponent\@\@QEAAX_N\@Z + * @symbol ?setHasExecuted\@TimerComponent\@\@QEAAX_N\@Z */ MCAPI void setHasExecuted(bool); //private: /** - * @symbol ?getRandomTime\@TimerComponent\@\@AEAAHAEAVActor\@\@\@Z + * @symbol ?getRandomTime\@TimerComponent\@\@AEAAHAEAVActor\@\@\@Z */ MCAPI int getRandomTime(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TimerDefinition.hpp b/LiteLoader/include/llapi/mc/TimerDefinition.hpp index a8cea2d309..02ae926d0e 100644 --- a/LiteLoader/include/llapi/mc/TimerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TimerDefinition.hpp @@ -30,20 +30,20 @@ class TimerDefinition { public: /** - * @symbol ??0TimerDefinition\@\@QEAA\@XZ + * @symbol ??0TimerDefinition\@\@QEAA\@XZ */ MCAPI TimerDefinition(); /** - * @symbol ?addWeightedChoiceEntry\@TimerDefinition\@\@QEAAXAEBUWeightChoiceEntry\@\@\@Z + * @symbol ?addWeightedChoiceEntry\@TimerDefinition\@\@QEAAXAEBUWeightChoiceEntry\@\@\@Z */ MCAPI void addWeightedChoiceEntry(struct WeightChoiceEntry const &); /** - * @symbol ?initialize\@TimerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTimerComponent\@\@\@Z + * @symbol ?initialize\@TimerDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTimerComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class TimerComponent &) const; /** - * @symbol ?buildSchema\@TimerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTimerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@TimerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTimerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TimerSystem.hpp b/LiteLoader/include/llapi/mc/TimerSystem.hpp index 077510da7e..f082f16ed4 100644 --- a/LiteLoader/include/llapi/mc/TimerSystem.hpp +++ b/LiteLoader/include/llapi/mc/TimerSystem.hpp @@ -30,19 +30,19 @@ class TimerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TimerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@TimerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@TimerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TitleCommand.hpp b/LiteLoader/include/llapi/mc/TitleCommand.hpp index 07f614f8bb..f716c7b443 100644 --- a/LiteLoader/include/llapi/mc/TitleCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleCommand.hpp @@ -31,18 +31,18 @@ class TitleCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TitleCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TitleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TitleCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TitleCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TitleCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TitleRawCommand.hpp b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp index 091f092f88..fa2c24da34 100644 --- a/LiteLoader/include/llapi/mc/TitleRawCommand.hpp +++ b/LiteLoader/include/llapi/mc/TitleRawCommand.hpp @@ -32,26 +32,26 @@ class TitleRawCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TitleRawCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@TitleRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@TitleRawCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@TitleRawCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@TitleRawCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_sendTitlePacketTextObject\@TitleRawCommand\@\@AEBA_NW4TitleType\@SetTitlePacket\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z + * @symbol ?_sendTitlePacketTextObject\@TitleRawCommand\@\@AEBA_NW4TitleType\@SetTitlePacket\@\@AEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBV?$CommandSelectorResults\@VPlayer\@\@\@\@\@Z */ MCAPI bool _sendTitlePacketTextObject(enum class SetTitlePacket::TitleType, class CommandOrigin const &, class CommandOutput &, class CommandSelectorResults const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TntBlock.hpp b/LiteLoader/include/llapi/mc/TntBlock.hpp index dd4aa05117..665eb7eaf8 100644 --- a/LiteLoader/include/llapi/mc/TntBlock.hpp +++ b/LiteLoader/include/llapi/mc/TntBlock.hpp @@ -31,270 +31,275 @@ class TntBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TntBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 70 - * @symbol ?shouldDispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z + * @vftbl 70 + * @symbol ?shouldDispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@\@Z */ virtual bool shouldDispense(class BlockSource &, class Container &) const; /** - * @vftbl 71 - * @symbol ?dispense\@TntBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @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 - * @symbol ?onRedstoneUpdate\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 97 - * @symbol ?destroy\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z + * @vftbl 97 + * @symbol ?destroy\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEAVActor\@\@\@Z */ virtual void destroy(class BlockSource &, class BlockPos const &, class Block const &, class Actor *) const; /** - * @vftbl 104 - * @symbol ?trySpawnResourcesOnExplosion\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@M\@Z + * @vftbl 104 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@TntBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@TntBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@TntBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@TntBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@TntBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@TntBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 163 - * @symbol ?onExploded\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 163 + * @symbol ?onExploded\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TntBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@TntBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@TntBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@TntBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@TntBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0TntBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TntBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TntBlock(std::string const &, int); /** - * @symbol ?_setAllowUnderwater\@TntBlock\@\@QEBAXPEAVActor\@\@\@Z + * @symbol ?_setAllowUnderwater\@TntBlock\@\@QEBAXPEAVActor\@\@\@Z */ MCAPI void _setAllowUnderwater(class Actor *) const; /** - * @symbol ?_shouldAllowUnderwater\@TntBlock\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?_shouldAllowUnderwater\@TntBlock\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool _shouldAllowUnderwater(class Block const &) const; /** - * @symbol ?tryLightTnt\@TntBlock\@\@SA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?tryLightTnt\@TntBlock\@\@SA_NAEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool tryLightTnt(class Player &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp index 914992ba0e..19f24d7ad2 100644 --- a/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp +++ b/LiteLoader/include/llapi/mc/ToastRequestPacket.hpp @@ -30,37 +30,43 @@ class ToastRequestPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ToastRequestPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@ToastRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@ToastRequestPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@ToastRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@ToastRequestPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@ToastRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@ToastRequestPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@ToastRequestPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TOASTREQUESTPACKET /** - * @symbol ??0ToastRequestPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI ToastRequestPacket(); + MCVAPI ~ToastRequestPacket(); +#endif /** - * @symbol ??0ToastRequestPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @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(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp index b257d87cad..e03c387a9e 100644 --- a/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp +++ b/LiteLoader/include/llapi/mc/ToggleDownfallCommand.hpp @@ -31,18 +31,18 @@ class ToggleDownfallCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ToggleDownfallCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@ToggleDownfallCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@ToggleDownfallCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@ToggleDownfallCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@ToggleDownfallCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Token.hpp b/LiteLoader/include/llapi/mc/Token.hpp index e73399bdfb..4f995493b8 100644 --- a/LiteLoader/include/llapi/mc/Token.hpp +++ b/LiteLoader/include/llapi/mc/Token.hpp @@ -30,25 +30,25 @@ struct Token { public: /** - * @symbol ??0Token\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0Token\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI Token(std::string const &); /** - * @symbol ?getText\@Token\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getText\@Token\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string const & getText(std::string const &) const; /** - * @symbol ??1Token\@\@QEAA\@XZ + * @symbol ??1Token\@\@QEAA\@XZ */ MCAPI ~Token(); /** - * @symbol ?tokenize\@Token\@\@SA?AV?$vector\@UToken\@\@V?$allocator\@UToken\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?tokenize\@Token\@\@SA?AV?$vector\@UToken\@\@V?$allocator\@UToken\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI static std::vector tokenize(std::string const &); //protected: /** - * @symbol ?_parseRandom\@Token\@\@IEAA_NXZ + * @symbol ?_parseRandom\@Token\@\@IEAA_NXZ */ MCAPI bool _parseRandom(); diff --git a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp index 5b2d92c638..5643d0bc85 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlock.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlock.hpp @@ -31,392 +31,397 @@ class TopSnowBlock : public HeavyBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TopSnowBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?getCollisionShape\@TopSnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z + * @vftbl 5 + * @symbol ?getCollisionShape\@TopSnowBlock\@\@UEBA_NAEAVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@V?$optional_ref\@$$CBVGetCollisionShapeInterface\@\@\@\@\@Z */ virtual bool getCollisionShape(class AABB &, class Block const &, class IConstBlockSource const &, class BlockPos const &, class optional_ref) const; /** - * @vftbl 10 - * @symbol ?getAABB\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@TopSnowBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@TopSnowBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@TopSnowBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@TopSnowBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@TopSnowBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 84 - * @symbol ?isPreservingMediumWhenPlaced\@TopSnowBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z + * @vftbl 84 + * @symbol ?isPreservingMediumWhenPlaced\@TopSnowBlock\@\@UEBA_NPEBVBlockLegacy\@\@\@Z */ virtual bool isPreservingMediumWhenPlaced(class BlockLegacy const *) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 94 - * @symbol ?tryToPlace\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@PEBUActorBlockSyncMessage\@\@\@Z + * @vftbl 94 + * @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 - * @symbol ?breaksFallingBlocks\@TopSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@TopSnowBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@TopSnowBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@TopSnowBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@TopSnowBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 114 - * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z + * @vftbl 114 + * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlockItem\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const &) const; /** - * @vftbl 115 - * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 115 + * @symbol ?canBeBuiltOver\@TopSnowBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canBeBuiltOver(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 122 - * @symbol ?shouldStopFalling\@TopSnowBlock\@\@UEBA_NAEAVActor\@\@\@Z + * @vftbl 122 + * @symbol ?shouldStopFalling\@TopSnowBlock\@\@UEBA_NAEAVActor\@\@\@Z */ virtual bool shouldStopFalling(class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 124 - * @symbol ?calcGroundFriction\@TopSnowBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z + * @vftbl 124 + * @symbol ?calcGroundFriction\@TopSnowBlock\@\@UEBAMAEBUIMobMovementProxy\@\@AEBVBlockPos\@\@\@Z */ virtual float calcGroundFriction(struct IMobMovementProxy const &, class BlockPos const &) const; /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@TopSnowBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 163 - * @symbol ?onExploded\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z + * @vftbl 163 + * @symbol ?onExploded\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@\@Z */ virtual void onExploded(class BlockSource &, class BlockPos const &, class Actor *) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@TopSnowBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@TopSnowBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@TopSnowBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@TopSnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@TopSnowBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@TopSnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@TopSnowBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 193 - * @symbol ?getDustColor\@TopSnowBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z + * @vftbl 194 + * @symbol ?getDustColor\@TopSnowBlock\@\@UEBA?AVColor\@mce\@\@AEBVBlock\@\@\@Z */ virtual class mce::Color getDustColor(class Block const &) const; /** - * @vftbl 194 - * @symbol ?getDustParticleName\@TopSnowBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @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 195 - * @symbol __unk_vfn_195 + * @vftbl 196 + * @symbol __unk_vfn_196 */ - virtual void __unk_vfn_195(); + virtual void __unk_vfn_196(); /** - * @vftbl 197 - * @symbol ?isFreeToFall\@TopSnowBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 198 + * @symbol ?isFreeToFall\@TopSnowBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool isFreeToFall(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 198 - * @symbol ?startFalling\@TopSnowBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z + * @vftbl 199 + * @symbol ?startFalling\@TopSnowBlock\@\@MEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@_N\@Z */ virtual void startFalling(class BlockSource &, class BlockPos const &, class Block const &, bool) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TOPSNOWBLOCK /** - * @symbol ?canBeDestroyedByWaterSpread\@TopSnowBlock\@\@UEBA_NXZ + * @symbol ?canBeDestroyedByWaterSpread\@TopSnowBlock\@\@UEBA_NXZ */ MCVAPI bool canBeDestroyedByWaterSpread() const; /** - * @symbol ?canBeSilkTouched\@TopSnowBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@TopSnowBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?canHaveExtraData\@TopSnowBlock\@\@UEBA_NXZ + * @symbol ?canHaveExtraData\@TopSnowBlock\@\@UEBA_NXZ */ MCVAPI bool canHaveExtraData() const; /** - * @symbol ?waterSpreadCausesSpawn\@TopSnowBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@TopSnowBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0TopSnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TopSnowBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TopSnowBlock(std::string const &, int); /** - * @symbol ?getResourceItemFromFalling\@TopSnowBlock\@\@QEBA?AVItemInstance\@\@XZ + * @symbol ?getResourceItemFromFalling\@TopSnowBlock\@\@QEBA?AVItemInstance\@\@XZ */ MCAPI class ItemInstance getResourceItemFromFalling() const; /** - * @symbol ?melt\@TopSnowBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?melt\@TopSnowBlock\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI bool melt(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?startFallingIfLostSupport\@TopSnowBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?startFallingIfLostSupport\@TopSnowBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void startFallingIfLostSupport(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?buildSnowBlock\@TopSnowBlock\@\@SAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @symbol ?buildSnowBlock\@TopSnowBlock\@\@SAAEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ MCAPI static class Block const & buildSnowBlock(class BlockSource &, class BlockPos const &, int, bool); /** - * @symbol ?getCoveredBlock\@TopSnowBlock\@\@SAAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getCoveredBlock\@TopSnowBlock\@\@SAAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class Block const & getCoveredBlock(class BlockSource const &, class BlockPos const &); /** - * @symbol ?getSnowBlockToBuild\@TopSnowBlock\@\@SAAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @symbol ?getSnowBlockToBuild\@TopSnowBlock\@\@SAAEBVBlock\@\@AEBVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z */ MCAPI static class Block const & getSnowBlockToBuild(class BlockSource const &, class BlockPos const &, int, bool); //private: /** - * @symbol ?_canBeBuiltOver\@TopSnowBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEBVBlockItem\@\@\@Z + * @symbol ?_canBeBuiltOver\@TopSnowBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEBVBlockItem\@\@\@Z */ MCAPI bool _canBeBuiltOver(class BlockSource &, class BlockPos const &, class BlockItem const *) const; /** - * @symbol ?_canSurvive\@TopSnowBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canSurvive\@TopSnowBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canSurvive(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp index 11bce915df..a3d86e04ac 100644 --- a/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/TopSnowBlockItem.hpp @@ -32,88 +32,88 @@ class TopSnowBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TopSnowBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@TopSnowBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@TopSnowBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 132 - * @symbol ?_useOn\@TopSnowBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@TopSnowBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0TopSnowBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TopSnowBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TopSnowBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TorchBlock.hpp b/LiteLoader/include/llapi/mc/TorchBlock.hpp index a3d97300ea..1249d57571 100644 --- a/LiteLoader/include/llapi/mc/TorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/TorchBlock.hpp @@ -31,272 +31,282 @@ class TorchBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TorchBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@TorchBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@TorchBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@TorchBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@TorchBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 132 - * @symbol ?getIconYOffset\@TorchBlock\@\@UEBAHXZ + * @vftbl 132 + * @symbol ?getIconYOffset\@TorchBlock\@\@UEBAHXZ */ virtual int getIconYOffset() const; /** - * @vftbl 143 - * @symbol ?getVisualShape\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@TorchBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 151 - * @symbol ?animateTick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@TorchBlock\@\@UEAAXXZ + */ + virtual void _addHardCodedBlockComponents(); + /** + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@TorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 180 - * @symbol ?getRenderLayer\@TorchBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 181 + * @symbol ?getRenderLayer\@TorchBlock\@\@UEBA?AW4BlockRenderLayer\@\@AEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual enum class BlockRenderLayer getRenderLayer(class Block const &, class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TORCHBLOCK /** - * @symbol ?canBeSilkTouched\@TorchBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@TorchBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?waterSpreadCausesSpawn\@TorchBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@TorchBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0TorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4MaterialType\@\@\@Z + * @symbol ??0TorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HW4MaterialType\@\@\@Z */ MCAPI TorchBlock(std::string const &, int, enum class MaterialType); //protected: /** - * @symbol ?_flameParticlePos\@TorchBlock\@\@IEBA?AVVec3\@\@AEBVBlockPos\@\@W4TorchFacing\@\@\@Z + * @symbol ?_flameParticlePos\@TorchBlock\@\@IEBA?AVVec3\@\@AEBVBlockPos\@\@W4TorchFacing\@\@\@Z */ MCAPI class Vec3 _flameParticlePos(class BlockPos const &, enum class TorchFacing) const; /** - * @symbol ?canBePlacedOn\@TorchBlock\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?canBePlacedOn\@TorchBlock\@\@IEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool canBePlacedOn(class BlockSource &, class BlockPos const &, unsigned char) const; @@ -306,12 +316,12 @@ class TorchBlock : public BlockLegacy { private: /** - * @symbol ?DATA_FROM_FACING\@TorchBlock\@\@0QBW4TorchFacing\@\@B + * @symbol ?DATA_FROM_FACING\@TorchBlock\@\@0QBW4TorchFacing\@\@B */ MCAPI static enum class TorchFacing const DATA_FROM_FACING[]; /** - * @symbol ?FACING_FROM_DATA\@TorchBlock\@\@0QBGB + * @symbol ?FACING_FROM_DATA\@TorchBlock\@\@0QBGB */ MCAPI static unsigned short const FACING_FROM_DATA[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp new file mode 100644 index 0000000000..cbec7ec848 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TorchflowerCropBlock.hpp @@ -0,0 +1,253 @@ +/** + * @file TorchflowerCropBlock.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "CropBlock.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TorchflowerCropBlock : public CropBlock { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TORCHFLOWERCROPBLOCK +public: + class TorchflowerCropBlock& operator=(class TorchflowerCropBlock const &) = delete; + TorchflowerCropBlock(class TorchflowerCropBlock const &) = delete; + TorchflowerCropBlock() = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 10 + * @symbol ?getAABB\@TorchflowerCropBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + */ + virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; + /** + * @vftbl 19 + * @symbol __unk_vfn_19 + */ + 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 131 + * @symbol __unk_vfn_131 + */ + virtual void __unk_vfn_131(); + /** + * @vftbl 146 + * @symbol ?getVariant\@TorchflowerCropBlock\@\@UEBAHAEBVBlock\@\@\@Z + */ + virtual int getVariant(class Block const &) const; + /** + * @vftbl 156 + * @symbol __unk_vfn_156 + */ + virtual void __unk_vfn_156(); + /** + * @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 170 + * @symbol __unk_vfn_170 + */ + virtual void __unk_vfn_170(); + /** + * @vftbl 174 + * @symbol __unk_vfn_174 + */ + virtual void __unk_vfn_174(); + /** + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 ?getBaseSeed\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ + */ + virtual class ItemInstance const getBaseSeed() const; + /** + * @vftbl 196 + * @symbol ?getBaseCrop\@TorchflowerCropBlock\@\@UEBA?BVItemInstance\@\@XZ + */ + virtual class ItemInstance const getBaseCrop() const; + /** + * @vftbl 197 + * @symbol ?getSeedNum\@TorchflowerCropBlock\@\@UEBAHAEAVRandomize\@\@HH\@Z + */ + virtual int getSeedNum(class Randomize &, int, int) const; + /** + * @symbol ??0TorchflowerCropBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + */ + MCAPI TorchflowerCropBlock(std::string const &, int); + +}; diff --git a/LiteLoader/include/llapi/mc/Trade.hpp b/LiteLoader/include/llapi/mc/Trade.hpp index 88d01e078b..f243fe7771 100644 --- a/LiteLoader/include/llapi/mc/Trade.hpp +++ b/LiteLoader/include/llapi/mc/Trade.hpp @@ -30,11 +30,11 @@ struct Trade { public: /** - * @symbol ??4Trade\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4Trade\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct Trade & operator=(struct Trade &&); /** - * @symbol ??1Trade\@\@QEAA\@XZ + * @symbol ??1Trade\@\@QEAA\@XZ */ MCAPI ~Trade(); diff --git a/LiteLoader/include/llapi/mc/Trade1ContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/Trade1ContainerScreenValidator.hpp index 54f1c79daa..d7d17f2b00 100644 --- a/LiteLoader/include/llapi/mc/Trade1ContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/Trade1ContainerScreenValidator.hpp @@ -28,13 +28,13 @@ class Trade1ContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade1ContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0Trade1ContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0Trade1ContainerScreenValidator\@\@QEAA\@XZ */ MCAPI Trade1ContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Trade1Ingredient1ContainerValidation.hpp b/LiteLoader/include/llapi/mc/Trade1Ingredient1ContainerValidation.hpp index e9c7439954..88b1a6bf12 100644 --- a/LiteLoader/include/llapi/mc/Trade1Ingredient1ContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/Trade1Ingredient1ContainerValidation.hpp @@ -29,58 +29,58 @@ class Trade1Ingredient1ContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade1Ingredient1ContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@Trade1Ingredient1ContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@Trade1Ingredient1ContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@Trade1Ingredient1ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@Trade1Ingredient1ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; /** - * @symbol ??0Trade1Ingredient1ContainerValidation\@\@QEAA\@_N\@Z + * @symbol ??0Trade1Ingredient1ContainerValidation\@\@QEAA\@_N\@Z */ MCAPI Trade1Ingredient1ContainerValidation(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Trade1Ingredient2ContainerValidation.hpp b/LiteLoader/include/llapi/mc/Trade1Ingredient2ContainerValidation.hpp index 12dfc4a4d7..4aa08d5a69 100644 --- a/LiteLoader/include/llapi/mc/Trade1Ingredient2ContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/Trade1Ingredient2ContainerValidation.hpp @@ -29,58 +29,58 @@ class Trade1Ingredient2ContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade1Ingredient2ContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol ?isItemAllowedInSlot\@Trade1Ingredient2ContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z + * @vftbl 2 + * @symbol ?isItemAllowedInSlot\@Trade1Ingredient2ContainerValidation\@\@UEBA_NAEBVContainerScreenContext\@\@HAEBVItemStackBase\@\@H\@Z */ virtual bool isItemAllowedInSlot(class ContainerScreenContext const &, int, class ItemStackBase const &, int) const; /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@Trade1Ingredient2ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@Trade1Ingredient2ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; /** - * @symbol ??0Trade1Ingredient2ContainerValidation\@\@QEAA\@_N\@Z + * @symbol ??0Trade1Ingredient2ContainerValidation\@\@QEAA\@_N\@Z */ MCAPI Trade1Ingredient2ContainerValidation(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp index cb3648c1e1..a2f32b4b89 100644 --- a/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/Trade2ContainerManagerModel.hpp @@ -31,47 +31,47 @@ class Trade2ContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade2ContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@Trade2ContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@Trade2ContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@Trade2ContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@Trade2ContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@Trade2ContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@Trade2ContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 10 - * @symbol ?broadcastChanges\@Trade2ContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@Trade2ContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@Trade2ContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@Trade2ContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@Trade2ContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@Trade2ContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @symbol ??0Trade2ContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0Trade2ContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI Trade2ContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); /** - * @symbol ?getEntity\@Trade2ContainerManagerModel\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getEntity\@Trade2ContainerManagerModel\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getEntity() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Trade2ContainerScreenValidator.hpp b/LiteLoader/include/llapi/mc/Trade2ContainerScreenValidator.hpp index 70c64aa8e8..820a8a7e61 100644 --- a/LiteLoader/include/llapi/mc/Trade2ContainerScreenValidator.hpp +++ b/LiteLoader/include/llapi/mc/Trade2ContainerScreenValidator.hpp @@ -28,13 +28,13 @@ class Trade2ContainerScreenValidator : public ContainerScreenValidatorBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade2ContainerScreenValidator(); + virtual void __unk_vfn_0(); /** - * @symbol ??0Trade2ContainerScreenValidator\@\@QEAA\@XZ + * @symbol ??0Trade2ContainerScreenValidator\@\@QEAA\@XZ */ MCAPI Trade2ContainerScreenValidator(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Trade2Ingredient1ContainerValidation.hpp b/LiteLoader/include/llapi/mc/Trade2Ingredient1ContainerValidation.hpp index 589ee5e1db..46d2ba3198 100644 --- a/LiteLoader/include/llapi/mc/Trade2Ingredient1ContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/Trade2Ingredient1ContainerValidation.hpp @@ -31,54 +31,54 @@ class Trade2Ingredient1ContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade2Ingredient1ContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@Trade2Ingredient1ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@Trade2Ingredient1ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Trade2Ingredient2ContainerValidation.hpp b/LiteLoader/include/llapi/mc/Trade2Ingredient2ContainerValidation.hpp index dcdb894a5e..7919e18ddb 100644 --- a/LiteLoader/include/llapi/mc/Trade2Ingredient2ContainerValidation.hpp +++ b/LiteLoader/include/llapi/mc/Trade2Ingredient2ContainerValidation.hpp @@ -31,54 +31,54 @@ class Trade2Ingredient2ContainerValidation : public ContainerValidationBase { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Trade2Ingredient2ContainerValidation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z + * @vftbl 1 + * @symbol ?isValidSlotForContainer\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@AEBVContainer\@\@H\@Z */ virtual bool isValidSlotForContainer(class ContainerScreenContext const &, class Container const &, int) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z + * @vftbl 3 + * @symbol ?getAvailableSetCount\@ContainerValidationBase\@\@UEBAHHAEBVItemStackBase\@\@\@Z */ virtual int getAvailableSetCount(int, class ItemStackBase const &) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 6 + * @symbol ?canItemMoveToContainer\@ContainerValidationBase\@\@UEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool canItemMoveToContainer(class ItemStackBase const &) const; /** - * @vftbl 7 - * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z + * @vftbl 7 + * @symbol ?canDestroy\@ContainerValidationBase\@\@UEBA_NAEBVContainerScreenContext\@\@\@Z */ virtual bool canDestroy(class ContainerScreenContext const &) const; /** - * @vftbl 8 - * @symbol ?getContainerOffset\@Trade2Ingredient2ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z + * @vftbl 8 + * @symbol ?getContainerOffset\@Trade2Ingredient2ContainerValidation\@\@UEBAHAEBVContainerScreenContext\@\@\@Z */ virtual int getContainerOffset(class ContainerScreenContext const &) const; /** - * @vftbl 9 - * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z + * @vftbl 9 + * @symbol ?getContainerSize\@ContainerValidationBase\@\@UEBAHAEBVContainerScreenContext\@\@AEBVContainer\@\@\@Z */ virtual int getContainerSize(class ContainerScreenContext const &, class Container const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp b/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp index 9090228edd..4db47a476e 100644 --- a/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp +++ b/LiteLoader/include/llapi/mc/TradeContainerManagerModel.hpp @@ -31,102 +31,102 @@ class TradeContainerManagerModel : public ContainerManagerModel { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TradeContainerManagerModel(); + virtual void __unk_vfn_0(); /** - * @vftbl 6 - * @symbol ?getItemCopies\@TradeContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ + * @vftbl 6 + * @symbol ?getItemCopies\@TradeContainerManagerModel\@\@UEBA?AV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@XZ */ virtual std::vector getItemCopies() const; /** - * @vftbl 7 - * @symbol ?setSlot\@TradeContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z + * @vftbl 7 + * @symbol ?setSlot\@TradeContainerManagerModel\@\@UEAAXHAEBVItemStack\@\@_N\@Z */ virtual void setSlot(int, class ItemStack const &, bool); /** - * @vftbl 8 - * @symbol ?getSlot\@TradeContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z + * @vftbl 8 + * @symbol ?getSlot\@TradeContainerManagerModel\@\@UEBAAEBVItemStack\@\@H\@Z */ virtual class ItemStack const & getSlot(int) const; /** - * @vftbl 10 - * @symbol ?broadcastChanges\@TradeContainerManagerModel\@\@UEAAXXZ + * @vftbl 10 + * @symbol ?broadcastChanges\@TradeContainerManagerModel\@\@UEAAXXZ */ virtual void broadcastChanges(); /** - * @vftbl 16 - * @symbol ?isValid\@TradeContainerManagerModel\@\@UEAA_NM\@Z + * @vftbl 16 + * @symbol ?isValid\@TradeContainerManagerModel\@\@UEAA_NM\@Z */ virtual bool isValid(float); /** - * @vftbl 17 - * @symbol ?_postInit\@TradeContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ + * @vftbl 17 + * @symbol ?_postInit\@TradeContainerManagerModel\@\@MEAA?AVContainerScreenContext\@\@XZ */ virtual class ContainerScreenContext _postInit(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol __unk_vfn_26 + * @vftbl 26 + * @symbol __unk_vfn_26 */ virtual void __unk_vfn_26(); /** - * @vftbl 27 - * @symbol __unk_vfn_27 + * @vftbl 27 + * @symbol __unk_vfn_27 */ virtual void __unk_vfn_27(); /** - * @vftbl 28 - * @symbol ?_Delete_this\@?$_Func_impl_no_alloc\@V?$_Fake_no_copy_callable_adapter\@P8thread\@std\@\@EAAXXZPEAV12\@\@std\@\@X$$V\@std\@\@EEAAX_N\@Z + * @vftbl 28 + * @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 ??0TradeContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0TradeContainerManagerModel\@\@QEAA\@W4ContainerID\@\@AEAVPlayer\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI TradeContainerManagerModel(enum class ContainerID, class Player &, struct ActorUniqueID const &); /** - * @symbol ?getEntity\@TradeContainerManagerModel\@\@QEBAPEAVActor\@\@XZ + * @symbol ?getEntity\@TradeContainerManagerModel\@\@QEBAPEAVActor\@\@XZ */ MCAPI class Actor * getEntity() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeGroup.hpp b/LiteLoader/include/llapi/mc/TradeGroup.hpp index 8dec9b7308..1562a48fdb 100644 --- a/LiteLoader/include/llapi/mc/TradeGroup.hpp +++ b/LiteLoader/include/llapi/mc/TradeGroup.hpp @@ -28,7 +28,7 @@ struct TradeGroup { public: /** - * @symbol ??1TradeGroup\@\@QEAA\@XZ + * @symbol ??1TradeGroup\@\@QEAA\@XZ */ MCAPI ~TradeGroup(); diff --git a/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp index 22d64cb385..711e4e502d 100644 --- a/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeInterestGoal.hpp @@ -30,56 +30,56 @@ class TradeInterestGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TradeInterestGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@TradeInterestGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@TradeInterestGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@TradeInterestGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@TradeInterestGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@TradeInterestGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@TradeInterestGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@TradeInterestGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@TradeInterestGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@TradeInterestGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@TradeInterestGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@TradeInterestGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@TradeInterestGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0TradeInterestGoal\@\@QEAA\@AEAVMob\@\@MMMMM\@Z + * @symbol ??0TradeInterestGoal\@\@QEAA\@AEAVMob\@\@MMMMM\@Z */ MCAPI TradeInterestGoal(class Mob &, float, float, float, float, float); //private: /** - * @symbol ?_isLookingAtMe\@TradeInterestGoal\@\@AEBA_NAEBVPlayer\@\@\@Z + * @symbol ?_isLookingAtMe\@TradeInterestGoal\@\@AEBA_NAEBVPlayer\@\@\@Z */ MCAPI bool _isLookingAtMe(class Player const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeItem.hpp b/LiteLoader/include/llapi/mc/TradeItem.hpp index a6657f9224..039b795393 100644 --- a/LiteLoader/include/llapi/mc/TradeItem.hpp +++ b/LiteLoader/include/llapi/mc/TradeItem.hpp @@ -28,11 +28,11 @@ struct TradeItem { public: /** - * @symbol ??4TradeItem\@\@QEAAAEAU0\@$$QEAU0\@\@Z + * @symbol ??4TradeItem\@\@QEAAAEAU0\@$$QEAU0\@\@Z */ MCAPI struct TradeItem & operator=(struct TradeItem &&); /** - * @symbol ??1TradeItem\@\@QEAA\@XZ + * @symbol ??1TradeItem\@\@QEAA\@XZ */ MCAPI ~TradeItem(); diff --git a/LiteLoader/include/llapi/mc/TradeResupplyComponent.hpp b/LiteLoader/include/llapi/mc/TradeResupplyComponent.hpp index c7271e3578..505a55d4a8 100644 --- a/LiteLoader/include/llapi/mc/TradeResupplyComponent.hpp +++ b/LiteLoader/include/llapi/mc/TradeResupplyComponent.hpp @@ -29,24 +29,24 @@ class TradeResupplyComponent { public: /** - * @symbol ??0TradeResupplyComponent\@\@QEAA\@XZ + * @symbol ??0TradeResupplyComponent\@\@QEAA\@XZ */ MCAPI TradeResupplyComponent(); /** - * @symbol ?addAdditionalSaveData\@TradeResupplyComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@TradeResupplyComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?initFromDefinition\@TradeResupplyComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@TradeResupplyComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?readAdditionalSaveData\@TradeResupplyComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@TradeResupplyComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?reloadComponent\@TradeResupplyComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?reloadComponent\@TradeResupplyComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void reloadComponent(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp b/LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp index 0fb0a9e7dd..ade4af3a5e 100644 --- a/LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp +++ b/LiteLoader/include/llapi/mc/TradeResupplyDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class TradeResupplyDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TradeResupplyDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TradeResupplyDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TradeResupplyDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRADERESUPPLYDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TradeResupplyDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TradeResupplyDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeTables.hpp b/LiteLoader/include/llapi/mc/TradeTables.hpp index 1520abf266..668c5ad6d8 100644 --- a/LiteLoader/include/llapi/mc/TradeTables.hpp +++ b/LiteLoader/include/llapi/mc/TradeTables.hpp @@ -31,24 +31,24 @@ class TradeTables { public: /** - * @symbol ?fetchTable\@TradeTables\@\@QEAAPEAUTradeTable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fetchTable\@TradeTables\@\@QEAAPEAUTradeTable\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct TradeTable * fetchTable(std::string const &); /** - * @symbol ?reload\@TradeTables\@\@QEAAXAEAVLevel\@\@\@Z + * @symbol ?reload\@TradeTables\@\@QEAAXAEAVLevel\@\@\@Z */ MCAPI void reload(class Level &); /** - * @symbol ??1TradeTables\@\@QEAA\@XZ + * @symbol ??1TradeTables\@\@QEAA\@XZ */ MCAPI ~TradeTables(); //private: /** - * @symbol ?_parseAndStoreTradeTable\@TradeTables\@\@AEAAXVItemRegistryRef\@\@PEAVResourcePackManager\@\@AEBVPath\@Core\@\@\@Z + * @symbol ?_parseAndStoreTradeTable\@TradeTables\@\@AEAAXVItemRegistryRef\@\@PEAVResourcePackManager\@\@AEBVPath\@Core\@\@\@Z */ MCAPI void _parseAndStoreTradeTable(class ItemRegistryRef, class ResourcePackManager *, class Core::Path const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeTier.hpp b/LiteLoader/include/llapi/mc/TradeTier.hpp index 3735dd2503..f864e92c3b 100644 --- a/LiteLoader/include/llapi/mc/TradeTier.hpp +++ b/LiteLoader/include/llapi/mc/TradeTier.hpp @@ -28,7 +28,7 @@ struct TradeTier { public: /** - * @symbol ??1TradeTier\@\@QEAA\@XZ + * @symbol ??1TradeTier\@\@QEAA\@XZ */ MCAPI ~TradeTier(); diff --git a/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp b/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp index 765ecc47db..312a3cacae 100644 --- a/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp +++ b/LiteLoader/include/llapi/mc/TradeWithPlayerGoal.hpp @@ -30,48 +30,48 @@ class TradeWithPlayerGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TradeWithPlayerGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@TradeWithPlayerGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@TradeWithPlayerGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@TradeWithPlayerGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@TradeWithPlayerGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@TradeWithPlayerGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@TradeWithPlayerGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@TradeWithPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@TradeWithPlayerGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0TradeWithPlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0TradeWithPlayerGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI TradeWithPlayerGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TradeableSystem.hpp b/LiteLoader/include/llapi/mc/TradeableSystem.hpp index b1c35d539f..9ba16e3b93 100644 --- a/LiteLoader/include/llapi/mc/TradeableSystem.hpp +++ b/LiteLoader/include/llapi/mc/TradeableSystem.hpp @@ -30,19 +30,19 @@ class TradeableSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TradeableSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@TradeableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@TradeableSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrailComponent.hpp b/LiteLoader/include/llapi/mc/TrailComponent.hpp index 4643f37536..a9116874a0 100644 --- a/LiteLoader/include/llapi/mc/TrailComponent.hpp +++ b/LiteLoader/include/llapi/mc/TrailComponent.hpp @@ -29,12 +29,12 @@ class TrailComponent { public: /** - * @symbol ??0TrailComponent\@\@QEAA\@XZ + * @symbol ??0TrailComponent\@\@QEAA\@XZ */ MCAPI TrailComponent(); /** - * @symbol ?initFromDefinition\@TrailComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@TrailComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrailDescription.hpp b/LiteLoader/include/llapi/mc/TrailDescription.hpp index bcdb8a7f02..fd90fb589a 100644 --- a/LiteLoader/include/llapi/mc/TrailDescription.hpp +++ b/LiteLoader/include/llapi/mc/TrailDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,28 +29,29 @@ class TrailDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TrailDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TrailDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TrailDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@TrailDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@TrailDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRAILDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TrailDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TrailDescription(); +#endif /** - * @symbol ??0TrailDescription\@\@QEAA\@XZ + * @symbol ??0TrailDescription\@\@QEAA\@XZ */ MCAPI TrailDescription(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrailSystem.hpp b/LiteLoader/include/llapi/mc/TrailSystem.hpp index 25da8da26f..a553980029 100644 --- a/LiteLoader/include/llapi/mc/TrailSystem.hpp +++ b/LiteLoader/include/llapi/mc/TrailSystem.hpp @@ -30,27 +30,27 @@ class TrailSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TrailSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@TrailSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@TrailSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); //private: /** - * @symbol ?_tickComponent\@TrailSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVTrailComponent\@\@\@Z + * @symbol ?_tickComponent\@TrailSystem\@\@CAXAEAVActorOwnerComponent\@\@AEAVTrailComponent\@\@\@Z */ MCAPI static void _tickComponent(class ActorOwnerComponent &, class TrailComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp b/LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp index 47aa318de7..78ae8f968a 100644 --- a/LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp +++ b/LiteLoader/include/llapi/mc/TransactionalWorldBlockTarget.hpp @@ -30,143 +30,149 @@ class TransactionalWorldBlockTarget { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TransactionalWorldBlockTarget(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?shimPlaceForOldFeatures\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVFeature\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 1 + * @symbol ?shimPlaceForOldFeatures\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVFeature\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool shimPlaceForOldFeatures(class Feature const &, class BlockPos const &, class Random &) const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tryGetLiquidBlock\@TransactionalWorldBlockTarget\@\@UEBAPEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 3 + * @symbol ?tryGetLiquidBlock\@TransactionalWorldBlockTarget\@\@UEBAPEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const * tryGetLiquidBlock(class BlockPos const &) const; /** - * @vftbl 4 - * @symbol ?getBlock\@TransactionalWorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?getBlock\@TransactionalWorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlock(class BlockPos const &) const; /** - * @vftbl 5 - * @symbol ?getBlockNoBoundsCheck\@TransactionalWorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?getBlockNoBoundsCheck\@TransactionalWorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlockNoBoundsCheck(class BlockPos const &) const; /** - * @vftbl 6 - * @symbol ?getExtraBlock\@TransactionalWorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 6 + * @symbol ?getExtraBlock\@TransactionalWorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getExtraBlock(class BlockPos const &) const; /** - * @vftbl 7 - * @symbol ?fetchBlocksInBox\@TransactionalWorldBlockTarget\@\@UEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @vftbl 7 + * @symbol ?fetchBlocksInBox\@TransactionalWorldBlockTarget\@\@UEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ virtual class gsl::span const, -1> fetchBlocksInBox(class BoundingBox const &, class std::function); /** - * @vftbl 8 - * @symbol ?hasBiomeTag\@TransactionalWorldBlockTarget\@\@UEBA_N_KAEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?hasBiomeTag\@TransactionalWorldBlockTarget\@\@UEBA_N_KAEBVBlockPos\@\@\@Z */ virtual bool hasBiomeTag(unsigned __int64, class BlockPos const &) const; /** - * @vftbl 9 - * @symbol ?setBlock\@TransactionalWorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @vftbl 9 + * @symbol ?setBlock\@TransactionalWorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ virtual bool setBlock(class BlockPos const &, class Block const &, int); /** - * @vftbl 10 - * @symbol ?setBlockSimple\@TransactionalWorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 10 + * @symbol ?setBlockSimple\@TransactionalWorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool setBlockSimple(class BlockPos const &, class Block const &); /** - * @vftbl 11 - * @symbol ?apply\@TransactionalWorldBlockTarget\@\@UEBA_NXZ + * @vftbl 11 + * @symbol ?apply\@TransactionalWorldBlockTarget\@\@UEBA_NXZ */ virtual bool apply() const; /** - * @vftbl 12 - * @symbol ?placeStructure\@TransactionalWorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEAVStructureTemplate\@\@AEAVStructureSettings\@\@\@Z + * @vftbl 12 + * @symbol ?placeStructure\@TransactionalWorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEAVStructureTemplate\@\@AEAVStructureSettings\@\@\@Z */ virtual bool placeStructure(class BlockPos const &, class StructureTemplate &, class StructureSettings &); /** - * @vftbl 13 - * @symbol ?mayPlace\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 13 + * @symbol ?mayPlace\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool mayPlace(class BlockPos const &, class Block const &) const; /** - * @vftbl 14 - * @symbol ?canSurvive\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 14 + * @symbol ?canSurvive\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canSurvive(class BlockPos const &, class Block const &) const; /** - * @vftbl 15 - * @symbol ?canBeBuiltOver\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 15 + * @symbol ?canBeBuiltOver\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeBuiltOver(class BlockPos const &, class Block const &) const; /** - * @vftbl 16 - * @symbol ?getMaxHeight\@TransactionalWorldBlockTarget\@\@UEBAFXZ + * @vftbl 16 + * @symbol ?getMaxHeight\@TransactionalWorldBlockTarget\@\@UEBAFXZ */ virtual short getMaxHeight() const; /** - * @vftbl 17 - * @symbol ?getMinHeight\@TransactionalWorldBlockTarget\@\@UEBAFXZ + * @vftbl 17 + * @symbol ?getMinHeight\@TransactionalWorldBlockTarget\@\@UEBAFXZ */ virtual short getMinHeight() const; /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol ?getHeightmap\@TransactionalWorldBlockTarget\@\@UEAAFHH\@Z + * @vftbl 19 + * @symbol ?getHeightmap\@TransactionalWorldBlockTarget\@\@UEAAFHH\@Z */ virtual short getHeightmap(int, int); /** - * @vftbl 20 - * @symbol ?isLegacyLevel\@TransactionalWorldBlockTarget\@\@UEAA_NXZ + * @vftbl 20 + * @symbol ?isLegacyLevel\@TransactionalWorldBlockTarget\@\@UEAA_NXZ */ virtual bool isLegacyLevel(); /** - * @vftbl 21 - * @symbol ?getBiome\@TransactionalWorldBlockTarget\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?getBiome\@TransactionalWorldBlockTarget\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z */ virtual class Biome const * getBiome(class BlockPos const &) const; /** - * @vftbl 22 - * @symbol ?isInBounds\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVPos\@\@\@Z + * @vftbl 22 + * @symbol ?isInBounds\@TransactionalWorldBlockTarget\@\@UEBA_NAEBVPos\@\@\@Z */ virtual bool isInBounds(class Pos const &) const; /** - * @vftbl 23 - * @symbol ?getLocalWaterLevel\@TransactionalWorldBlockTarget\@\@UEBAFAEBVBlockPos\@\@\@Z + * @vftbl 23 + * @symbol ?getLocalWaterLevel\@TransactionalWorldBlockTarget\@\@UEBAFAEBVBlockPos\@\@\@Z */ virtual short getLocalWaterLevel(class BlockPos const &) const; /** - * @vftbl 24 - * @symbol ?getLevelData\@TransactionalWorldBlockTarget\@\@UEBAAEBVLevelData\@\@XZ + * @vftbl 24 + * @symbol ?getLevelData\@TransactionalWorldBlockTarget\@\@UEBAAEBVLevelData\@\@XZ */ virtual class LevelData const & getLevelData() const; /** - * @vftbl 25 - * @symbol ?getContext\@TransactionalWorldBlockTarget\@\@UEAAAEBUWorldGenContext\@\@XZ + * @vftbl 25 + * @symbol ?getContext\@TransactionalWorldBlockTarget\@\@UEAAAEBUWorldGenContext\@\@XZ */ virtual struct WorldGenContext const & getContext(); /** - * @vftbl 26 - * @symbol ?disableBlockSimple\@TransactionalWorldBlockTarget\@\@UEAAXXZ + * @vftbl 26 + * @symbol ?disableBlockSimple\@TransactionalWorldBlockTarget\@\@UEAAXXZ */ virtual void disableBlockSimple(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRANSACTIONALWORLDBLOCKTARGET /** - * @symbol ??0TransactionalWorldBlockTarget\@\@QEAA\@AEAVIBlockWorldGenAPI\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TransactionalWorldBlockTarget(); +#endif + /** + * @symbol ??0TransactionalWorldBlockTarget\@\@QEAA\@AEAVIBlockWorldGenAPI\@\@\@Z */ MCAPI TransactionalWorldBlockTarget(class IBlockWorldGenAPI &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TransferPacket.hpp b/LiteLoader/include/llapi/mc/TransferPacket.hpp index 8842922f14..e68a6a4112 100644 --- a/LiteLoader/include/llapi/mc/TransferPacket.hpp +++ b/LiteLoader/include/llapi/mc/TransferPacket.hpp @@ -31,37 +31,43 @@ class TransferPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TransferPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@TransferPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@TransferPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@TransferPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@TransferPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@TransferPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@TransferPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@TransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@TransferPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRANSFERPACKET /** - * @symbol ??0TransferPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~TransferPacket(); +#endif + /** + * @symbol ??0TransferPacket\@\@QEAA\@XZ */ MCAPI TransferPacket(); /** - * @symbol ??0TransferPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TransferPacket\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TransferPacket(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TransformItemResponse.hpp b/LiteLoader/include/llapi/mc/TransformItemResponse.hpp index 4910c06ac9..7aebd7a411 100644 --- a/LiteLoader/include/llapi/mc/TransformItemResponse.hpp +++ b/LiteLoader/include/llapi/mc/TransformItemResponse.hpp @@ -31,28 +31,28 @@ class TransformItemResponse { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TransformItemResponse(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getName\@TransformItemResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getName\@TransformItemResponse\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getName() const; /** - * @vftbl 2 - * @symbol ?executeAction\@TransformItemResponse\@\@UEBAXAEAVRenderParams\@\@\@Z + * @vftbl 2 + * @symbol ?executeAction\@TransformItemResponse\@\@UEBAXAEAVRenderParams\@\@\@Z */ virtual void executeAction(class RenderParams &) const; /** - * @vftbl 3 - * @symbol ?buildSchema\@TransformItemResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z + * @vftbl 3 + * @symbol ?buildSchema\@TransformItemResponse\@\@UEBAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UEventResponseCollection\@\@\@JsonUtil\@\@\@std\@\@AEBV?$Factory\@VEventResponse\@\@$$V\@\@\@Z */ virtual void buildSchema(class std::shared_ptr> &, class Factory const &) const; /** - * @symbol ?NameID\@TransformItemResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NameID\@TransformItemResponse\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NameID; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TransformationComponent.hpp b/LiteLoader/include/llapi/mc/TransformationComponent.hpp index cf8163fe8c..4e17b9c371 100644 --- a/LiteLoader/include/llapi/mc/TransformationComponent.hpp +++ b/LiteLoader/include/llapi/mc/TransformationComponent.hpp @@ -29,32 +29,32 @@ class TransformationComponent { public: /** - * @symbol ??0TransformationComponent\@\@QEAA\@XZ + * @symbol ??0TransformationComponent\@\@QEAA\@XZ */ MCAPI TransformationComponent(); /** - * @symbol ?getDelayTicks\@TransformationComponent\@\@QEBAHXZ + * @symbol ?getDelayTicks\@TransformationComponent\@\@QEBAHXZ */ MCAPI int getDelayTicks() const; /** - * @symbol ?initFromDefinition\@TransformationComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@TransformationComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?maintainOldData\@TransformationComponent\@\@QEAAXAEAVActor\@\@0AEBUTransformationDescription\@\@AEBUActorUniqueID\@\@AEBVLevel\@\@\@Z + * @symbol ?maintainOldData\@TransformationComponent\@\@QEAAXAEAVActor\@\@0AEBUTransformationDescription\@\@AEBUActorUniqueID\@\@AEBVLevel\@\@\@Z */ MCAPI void maintainOldData(class Actor &, class Actor &, struct TransformationDescription const &, struct ActorUniqueID const &, class Level const &); /** - * @symbol ?reloadComponent\@TransformationComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?reloadComponent\@TransformationComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void reloadComponent(class Actor &); /** - * @symbol ?setDelayTicks\@TransformationComponent\@\@QEAAXH\@Z + * @symbol ?setDelayTicks\@TransformationComponent\@\@QEAAXH\@Z */ MCAPI void setDelayTicks(int); /** - * @symbol ?transformIfAble\@TransformationComponent\@\@QEAAXAEAVActor\@\@_N\@Z + * @symbol ?transformIfAble\@TransformationComponent\@\@QEAAXAEAVActor\@\@_N\@Z */ MCAPI void transformIfAble(class Actor &, bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TransformationDescription.hpp b/LiteLoader/include/llapi/mc/TransformationDescription.hpp index 9630c060eb..23ed4c399e 100644 --- a/LiteLoader/include/llapi/mc/TransformationDescription.hpp +++ b/LiteLoader/include/llapi/mc/TransformationDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -30,27 +29,28 @@ struct TransformationDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TransformationDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TransformationDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TransformationDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@TransformationDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@TransformationDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRANSFORMATIONDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TransformationDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TransformationDescription(); +#endif /** - * @symbol ??0TransformationDescription\@\@QEAA\@XZ + * @symbol ??0TransformationDescription\@\@QEAA\@XZ */ MCAPI TransformationDescription(); diff --git a/LiteLoader/include/llapi/mc/TransformationSystem.hpp b/LiteLoader/include/llapi/mc/TransformationSystem.hpp index 36db445711..a68c37b738 100644 --- a/LiteLoader/include/llapi/mc/TransformationSystem.hpp +++ b/LiteLoader/include/llapi/mc/TransformationSystem.hpp @@ -30,19 +30,19 @@ class TransformationSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TransformationSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@TransformationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@TransformationSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TransportInterface.hpp b/LiteLoader/include/llapi/mc/TransportInterface.hpp deleted file mode 100644 index 988238a67d..0000000000 --- a/LiteLoader/include/llapi/mc/TransportInterface.hpp +++ /dev/null @@ -1,41 +0,0 @@ -/** - * @file TransportInterface.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA -// Include Headers or Declare Types Here - -#undef BEFORE_EXTRA - -/** - * @brief MC class TransportInterface. - * - */ -class TransportInterface { - -#define AFTER_EXTRA -// Add Member There - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRANSPORTINTERFACE -public: - class TransportInterface& operator=(class TransportInterface const &) = delete; - TransportInterface(class TransportInterface const &) = delete; - TransportInterface() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRANSPORTINTERFACE - /** - * @symbol ??1TransportInterface@@UEAA@XZ - * @hash 251957652 - */ - MCVAPI ~TransportInterface(); -#endif - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TransportInterfaceComposite.hpp b/LiteLoader/include/llapi/mc/TransportInterfaceComposite.hpp deleted file mode 100644 index 846a8e6747..0000000000 --- a/LiteLoader/include/llapi/mc/TransportInterfaceComposite.hpp +++ /dev/null @@ -1,94 +0,0 @@ -/** - * @file TransportInterfaceComposite.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" -#include "RakNetInstance.hpp" -#include "RakPeerHelper.hpp" -#include "Bedrock.hpp" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class TransportInterfaceComposite. - * - */ -class TransportInterfaceComposite { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRANSPORTINTERFACECOMPOSITE -public: - class TransportInterfaceComposite& operator=(class TransportInterfaceComposite const &) = delete; - TransportInterfaceComposite(class TransportInterfaceComposite const &) = delete; -#endif - -public: - /** - * @symbol ??0TransportInterfaceComposite@@QEAA@XZ - * @hash -256667885 - */ - MCAPI TransportInterfaceComposite(); - /** - * @symbol ?disable@TransportInterfaceComposite@@QEAAXXZ - * @hash -1735556939 - */ - MCAPI void disable(); - /** - * @symbol ?getActiveInstance@TransportInterfaceComposite@@QEBA?AV?$shared_ptr@VTransportInterface@@@std@@XZ - * @hash -2121926417 - */ - MCAPI class std::shared_ptr getActiveInstance() const; - /** - * @symbol ?getNetherNetInstance@TransportInterfaceComposite@@QEAA?AV?$shared_ptr@UNetherNetInstance@@@std@@W4TransportLayer@@@Z - * @hash -965208810 - */ - MCAPI class std::shared_ptr getNetherNetInstance(enum TransportLayer); - /** - * @symbol ?getRakNetInstance@TransportInterfaceComposite@@QEAA?AV?$shared_ptr@VRakNetInstance@@@std@@XZ - * @hash 47864775 - */ - MCAPI class std::shared_ptr getRakNetInstance(); - /** - * @symbol ?hasNetherNetInstance@TransportInterfaceComposite@@QEAA_NW4TransportLayer@@@Z - * @hash 948744367 - */ - MCAPI bool hasNetherNetInstance(enum TransportLayer); - /** - * @symbol ?initializeRakNetInstance@TransportInterfaceComposite@@QEAAXAEAUConnectionCallbacks@RakNetInstance@@AEAVIPSupportInterface@RakPeerHelper@@AEBV?$NonOwnerPointer@VAppPlatform@@@Bedrock@@@Z - * @hash 1604374521 - */ - MCAPI void initializeRakNetInstance(struct RakNetInstance::ConnectionCallbacks &, class RakPeerHelper::IPSupportInterface &, class Bedrock::NonOwnerPointer const &); - /** - * @symbol ?isActiveTransportInterfaceSet@TransportInterfaceComposite@@QEBA_NXZ - * @hash 307203840 - */ - MCAPI bool isActiveTransportInterfaceSet() const; - /** - * @symbol ?setActiveTransportLayer@TransportInterfaceComposite@@QEAAXW4TransportLayer@@@Z - * @hash -1292460586 - */ - MCAPI void setActiveTransportLayer(enum TransportLayer); - /** - * @symbol ?tryEnable@TransportInterfaceComposite@@QEAAXXZ - * @hash 1122049313 - */ - MCAPI void tryEnable(); - /** - * @symbol ?update@TransportInterfaceComposite@@QEAAXXZ - * @hash -294229291 - */ - MCAPI void update(); - /** - * @symbol ??1TransportInterfaceComposite@@QEAA@XZ - * @hash -1045957469 - */ - MCAPI ~TransportInterfaceComposite(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TransporterComponent.hpp b/LiteLoader/include/llapi/mc/TransporterComponent.hpp index da3804d497..7738ca84cc 100644 --- a/LiteLoader/include/llapi/mc/TransporterComponent.hpp +++ b/LiteLoader/include/llapi/mc/TransporterComponent.hpp @@ -30,53 +30,53 @@ class TransporterComponent : public BaseCircuitComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TransporterComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol ?canConsumerPower\@TransporterComponent\@\@UEBA_NXZ + * @vftbl 7 + * @symbol ?canConsumerPower\@TransporterComponent\@\@UEBA_NXZ */ virtual bool canConsumerPower() const; /** - * @vftbl 11 - * @symbol ?addSource\@TransporterComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z + * @vftbl 11 + * @symbol ?addSource\@TransporterComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEAHAEA_N\@Z */ virtual bool addSource(class CircuitSceneGraph &, class CircuitTrackingInfo const &, int &, bool &); /** - * @vftbl 12 - * @symbol ?allowConnection\@TransporterComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z + * @vftbl 12 + * @symbol ?allowConnection\@TransporterComponent\@\@UEAA_NAEAVCircuitSceneGraph\@\@AEBVCircuitTrackingInfo\@\@AEA_N\@Z */ virtual bool allowConnection(class CircuitSceneGraph &, class CircuitTrackingInfo const &, bool &); /** - * @vftbl 14 - * @symbol ?evaluate\@TransporterComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 14 + * @symbol ?evaluate\@TransporterComponent\@\@UEAA_NAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual bool evaluate(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 15 - * @symbol ?cacheValues\@TransporterComponent\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z + * @vftbl 15 + * @symbol ?cacheValues\@TransporterComponent\@\@UEAAXAEAVCircuitSystem\@\@AEBVBlockPos\@\@\@Z */ virtual void cacheValues(class CircuitSystem &, class BlockPos const &); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 23 - * @symbol ?getCircuitComponentType\@TransporterComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ + * @vftbl 23 + * @symbol ?getCircuitComponentType\@TransporterComponent\@\@UEBA?AW4CircuitComponentType\@\@XZ */ virtual enum class CircuitComponentType getCircuitComponentType() const; /** - * @symbol ??0TransporterComponent\@\@QEAA\@XZ + * @symbol ??0TransporterComponent\@\@QEAA\@XZ */ MCAPI TransporterComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp index 057c303d20..059dad5c77 100644 --- a/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp +++ b/LiteLoader/include/llapi/mc/TrapDoorBlock.hpp @@ -31,280 +31,280 @@ class TrapDoorBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TrapDoorBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 69 - * @symbol ?checkIsPathable\@TrapDoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@TrapDoorBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 73 - * @symbol ?onRedstoneUpdate\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H_N\@Z + * @vftbl 73 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@TrapDoorBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@TrapDoorBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@TrapDoorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@TrapDoorBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@TrapDoorBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TrapDoorBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@TrapDoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@TrapDoorBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@TrapDoorBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRAPDOORBLOCK /** - * @symbol ?canBeSilkTouched\@TrapDoorBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@TrapDoorBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isInteractiveBlock\@TrapDoorBlock\@\@UEBA_NXZ + * @symbol ?isInteractiveBlock\@TrapDoorBlock\@\@UEBA_NXZ */ MCVAPI bool isInteractiveBlock() const; #endif /** - * @symbol ??0TrapDoorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol ??0TrapDoorBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI TrapDoorBlock(std::string const &, int, class Material const &); //private: /** - * @symbol ?_toggleOpen\@TrapDoorBlock\@\@AEBAXAEAVBlockSource\@\@PEAVActor\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_toggleOpen\@TrapDoorBlock\@\@AEBAXAEAVBlockSource\@\@PEAVActor\@\@AEBVBlockPos\@\@\@Z */ MCAPI void _toggleOpen(class BlockSource &, class Actor *, class BlockPos const &) const; private: /** - * @symbol ?TRAP_DOOR_DOESNT_BREAK_FALLING_BLOCK_VERSION\@TrapDoorBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?TRAP_DOOR_DOESNT_BREAK_FALLING_BLOCK_VERSION\@TrapDoorBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const TRAP_DOOR_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TravelMoveRequestSystem.hpp b/LiteLoader/include/llapi/mc/TravelMoveRequestSystem.hpp new file mode 100644 index 0000000000..4bb6b65af5 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TravelMoveRequestSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file TravelMoveRequestSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TravelMoveRequestSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRAVELMOVEREQUESTSYSTEM +public: + class TravelMoveRequestSystem& operator=(class TravelMoveRequestSystem const &) = delete; + TravelMoveRequestSystem(class TravelMoveRequestSystem const &) = delete; + TravelMoveRequestSystem() = delete; +#endif + +public: + /** + * @symbol ?createSystem\@TravelMoveRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp b/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp new file mode 100644 index 0000000000..a5743f4123 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TravelTypeSensingSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file TravelTypeSensingSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TravelTypeSensingSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRAVELTYPESENSINGSYSTEM +public: + class TravelTypeSensingSystem& operator=(class TravelTypeSensingSystem const &) = delete; + TravelTypeSensingSystem(class TravelTypeSensingSystem const &) = delete; + TravelTypeSensingSystem() = delete; +#endif + +public: + /** + * @symbol ?createTravelTypeSensingSideBySideSystem\@TravelTypeSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createTravelTypeSensingSideBySideSystem(); + /** + * @symbol ?createTravelTypeSensingSystem\@TravelTypeSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createTravelTypeSensingSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/TreeHelper.hpp b/LiteLoader/include/llapi/mc/TreeHelper.hpp index ffa8330d31..1fdbe5e779 100644 --- a/LiteLoader/include/llapi/mc/TreeHelper.hpp +++ b/LiteLoader/include/llapi/mc/TreeHelper.hpp @@ -27,27 +27,27 @@ struct TreeParams { #undef AFTER_EXTRA /** - * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isValidTreePosition(class IBlockWorldGenAPI const &, class BlockPos const &); /** - * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBUTreeParams\@1\@\@Z + * @symbol ?isValidTreePosition\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBUTreeParams\@1\@\@Z */ MCAPI bool isValidTreePosition(class IBlockWorldGenAPI const &, class BlockPos const &, struct TreeHelper::TreeParams const &); /** - * @symbol ?placeBaseBlock\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@3\@\@Z + * @symbol ?placeBaseBlock\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@3\@\@Z */ MCAPI class std::optional placeBaseBlock(class IBlockWorldGenAPI &, class BlockPos const &, std::vector const &); /** - * @symbol ?placeDecoratedBlock\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBVBlock\@\@AEBUAttachableDecoration\@1\@AEBUDirectionMask\@81\@\@Z + * @symbol ?placeDecoratedBlock\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBVBlock\@\@AEBUAttachableDecoration\@1\@AEBUDirectionMask\@81\@\@Z */ MCAPI class std::optional placeDecoratedBlock(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class Block const &, struct TreeHelper::AttachableDecoration const &, struct TreeHelper::AttachableDecoration::DirectionMask const &); /** - * @symbol ?placeRadialBlockGroup\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBVBlock\@\@HH_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@3\@\@Z + * @symbol ?placeRadialBlockGroup\@TreeHelper\@\@YA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEBVBlock\@\@HH_NAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@3\@\@Z */ MCAPI class std::optional placeRadialBlockGroup(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class Block const &, int, int, bool, std::vector const &); /** - * @symbol ?prepareSpawn\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@2\@Z + * @symbol ?prepareSpawn\@TreeHelper\@\@YA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@HAEBV?$vector\@VBlockDescriptor\@\@V?$allocator\@VBlockDescriptor\@\@\@std\@\@\@std\@\@2\@Z */ MCAPI bool prepareSpawn(class IBlockWorldGenAPI const &, class BlockPos const &, int, std::vector const &, std::vector const &); diff --git a/LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp b/LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp index 5113c318a7..3b2c60cee7 100644 --- a/LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentChannelingEnchant.hpp @@ -31,33 +31,33 @@ class TridentChannelingEnchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TridentChannelingEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isCompatibleWith\@TridentChannelingEnchant\@\@UEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 1 + * @symbol ?isCompatibleWith\@TridentChannelingEnchant\@\@UEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool isCompatibleWith(enum class Enchant::Type) const; /** - * @vftbl 2 - * @symbol ?getMinCost\@TridentChannelingEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@TridentChannelingEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@TridentChannelingEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@TridentChannelingEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 4 - * @symbol ?getMaxLevel\@TridentChannelingEnchant\@\@UEBAHXZ + * @vftbl 4 + * @symbol ?getMaxLevel\@TridentChannelingEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @symbol ??0TridentChannelingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0TridentChannelingEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI TridentChannelingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI TridentChannelingEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp b/LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp index a4a4c8e0cf..d0fb0245d2 100644 --- a/LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentImpalerEnchant.hpp @@ -31,53 +31,53 @@ class TridentImpalerEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TridentImpalerEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@TridentImpalerEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@TridentImpalerEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@TridentImpalerEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@TridentImpalerEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@TridentImpalerEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@TridentImpalerEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 7 - * @symbol ?getDamageBonus\@TridentImpalerEnchant\@\@UEBAMHAEBVActor\@\@\@Z + * @vftbl 7 + * @symbol ?getDamageBonus\@TridentImpalerEnchant\@\@UEBAMHAEBVActor\@\@\@Z */ virtual float getDamageBonus(int, class Actor const &) const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @symbol ??0TridentImpalerEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0TridentImpalerEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI TridentImpalerEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI TridentImpalerEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TridentItem.hpp b/LiteLoader/include/llapi/mc/TridentItem.hpp index 49438d0411..c6c1bddeb2 100644 --- a/LiteLoader/include/llapi/mc/TridentItem.hpp +++ b/LiteLoader/include/llapi/mc/TridentItem.hpp @@ -32,149 +32,149 @@ class TridentItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TridentItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 23 - * @symbol ?isThrowable\@TridentItem\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?isThrowable\@TridentItem\@\@UEBA_NXZ */ virtual bool isThrowable() const; /** - * @vftbl 47 - * @symbol ?getMaxDamage\@TridentItem\@\@UEBAFXZ + * @vftbl 47 + * @symbol ?getMaxDamage\@TridentItem\@\@UEBAFXZ */ virtual short getMaxDamage() const; /** - * @vftbl 48 - * @symbol ?getAttackDamage\@TridentItem\@\@UEBAHXZ + * @vftbl 48 + * @symbol ?getAttackDamage\@TridentItem\@\@UEBAHXZ */ virtual int getAttackDamage() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 55 - * @symbol ?canDestroyInCreative\@TridentItem\@\@UEBA_NXZ + * @vftbl 55 + * @symbol ?canDestroyInCreative\@TridentItem\@\@UEBA_NXZ */ virtual bool canDestroyInCreative() const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@TridentItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@TridentItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@TridentItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@TridentItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@TridentItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@TridentItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@TridentItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@TridentItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 85 - * @symbol ?dispense\@TridentItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 85 + * @symbol ?dispense\@TridentItem\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z */ virtual bool dispense(class BlockSource &, class Container &, int, class Vec3 const &, unsigned char) const; /** - * @vftbl 87 - * @symbol ?releaseUsing\@TridentItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z + * @vftbl 87 + * @symbol ?releaseUsing\@TridentItem\@\@UEBAXAEAVItemStack\@\@PEAVPlayer\@\@H\@Z */ virtual void releaseUsing(class ItemStack &, class Player *, int) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@TridentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@TridentItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @symbol ??0TridentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TridentItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TridentItem(std::string const &, int); /** - * @symbol ?CHARGE_THRESHOLD_TIME\@TridentItem\@\@2HB + * @symbol ?CHARGE_THRESHOLD_TIME\@TridentItem\@\@2HB */ MCAPI static int const CHARGE_THRESHOLD_TIME; /** - * @symbol ?THROW_THRESHOLD_TIME\@TridentItem\@\@2HB + * @symbol ?THROW_THRESHOLD_TIME\@TridentItem\@\@2HB */ MCAPI static int const THROW_THRESHOLD_TIME; //private: /** - * @symbol ?_setupProjectile\@TridentItem\@\@AEBAPEAVActor\@\@PEAV2\@VItemStack\@\@_N\@Z + * @symbol ?_setupProjectile\@TridentItem\@\@AEBAPEAVActor\@\@PEAV2\@VItemStack\@\@_N\@Z */ MCAPI class Actor * _setupProjectile(class Actor *, class ItemStack, bool) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp b/LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp index 7d667dd832..9eb87ccd50 100644 --- a/LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentLoyaltyEnchant.hpp @@ -31,48 +31,48 @@ class TridentLoyaltyEnchant : public Enchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TridentLoyaltyEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?getMinCost\@TridentLoyaltyEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@TridentLoyaltyEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@TridentLoyaltyEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@TridentLoyaltyEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 5 - * @symbol ?getMaxLevel\@TridentLoyaltyEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@TridentLoyaltyEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @symbol ??0TridentLoyaltyEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0TridentLoyaltyEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI TridentLoyaltyEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI TridentLoyaltyEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp b/LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp index c7bd03ed53..68436d1d88 100644 --- a/LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp +++ b/LiteLoader/include/llapi/mc/TridentRiptideEnchant.hpp @@ -31,38 +31,38 @@ class TridentRiptideEnchant { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TridentRiptideEnchant(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isCompatibleWith\@TridentRiptideEnchant\@\@UEBA_NW4Type\@Enchant\@\@\@Z + * @vftbl 1 + * @symbol ?isCompatibleWith\@TridentRiptideEnchant\@\@UEBA_NW4Type\@Enchant\@\@\@Z */ virtual bool isCompatibleWith(enum class Enchant::Type) const; /** - * @vftbl 2 - * @symbol ?getMinCost\@TridentRiptideEnchant\@\@UEBAHH\@Z + * @vftbl 2 + * @symbol ?getMinCost\@TridentRiptideEnchant\@\@UEBAHH\@Z */ virtual int getMinCost(int) const; /** - * @vftbl 3 - * @symbol ?getMaxCost\@TridentRiptideEnchant\@\@UEBAHH\@Z + * @vftbl 3 + * @symbol ?getMaxCost\@TridentRiptideEnchant\@\@UEBAHH\@Z */ virtual int getMaxCost(int) const; /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?getMaxLevel\@TridentRiptideEnchant\@\@UEBAHXZ + * @vftbl 5 + * @symbol ?getMaxLevel\@TridentRiptideEnchant\@\@UEBAHXZ */ virtual int getMaxLevel() const; /** - * @symbol ??0TridentRiptideEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@2H_NH\@Z + * @symbol ??0TridentRiptideEnchant\@\@QEAA\@W4Type\@Enchant\@\@W4Frequency\@2\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@2H_NH\@Z */ - MCAPI TridentRiptideEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class gsl::basic_string_span, class gsl::basic_string_span, int, bool, int); + MCAPI TridentRiptideEnchant(enum class Enchant::Type, enum class Enchant::Frequency, class std::basic_string_view>, class std::basic_string_view>, int, bool, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp b/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp new file mode 100644 index 0000000000..ff98770133 --- /dev/null +++ b/LiteLoader/include/llapi/mc/TriggerJumpSystem.hpp @@ -0,0 +1,40 @@ +/** + * @file TriggerJumpSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class TriggerJumpSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TRIGGERJUMPSYSTEM +public: + class TriggerJumpSystem& operator=(class TriggerJumpSystem const &) = delete; + TriggerJumpSystem(class TriggerJumpSystem const &) = delete; + TriggerJumpSystem() = delete; +#endif + +public: + /** + * @symbol ?createCleanupSystem\@TriggerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createCleanupSystem(); + /** + * @symbol ?createTriggerJumpSideBySideSystem\@TriggerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createTriggerJumpSideBySideSystem(); + /** + * @symbol ?createTriggerJumpSystem\@TriggerJumpSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createTriggerJumpSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/TripWireBlock.hpp b/LiteLoader/include/llapi/mc/TripWireBlock.hpp index ad8b7b2331..1334e60381 100644 --- a/LiteLoader/include/llapi/mc/TripWireBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireBlock.hpp @@ -31,264 +31,269 @@ class TripWireBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TripWireBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@TripWireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@TripWireBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 112 - * @symbol ?shouldTriggerEntityInside\@TripWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 112 + * @symbol ?shouldTriggerEntityInside\@TripWireBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual bool shouldTriggerEntityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 113 - * @symbol ?entityInside\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@TripWireBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TripWireBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@TripWireBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0TripWireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TripWireBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TripWireBlock(std::string const &, int); //private: /** - * @symbol ?checkPressed\@TripWireBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?checkPressed\@TripWireBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI void checkPressed(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?isEntityInsideTriggerable\@TripWireBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @symbol ?isEntityInsideTriggerable\@TripWireBlock\@\@AEBA_NAEBVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ MCAPI bool isEntityInsideTriggerable(class BlockSource const &, class BlockPos const &, class Actor &) const; /** - * @symbol ?updateSource\@TripWireBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?updateSource\@TripWireBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void updateSource(class BlockSource &, class BlockPos const &, class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp index bb4e92c22b..4a2ea62e4b 100644 --- a/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp +++ b/LiteLoader/include/llapi/mc/TripWireHookBlock.hpp @@ -31,279 +31,279 @@ class TripWireHookBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TripWireHookBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 64 - * @symbol ?shouldConnectToRedstone\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @vftbl 64 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@TripWireHookBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@TripWireHookBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 143 - * @symbol ?getVisualShape\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 143 + * @symbol ?getVisualShape\@TripWireHookBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getVisualShape(class Block const &, class AABB &, bool) const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@TripWireHookBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@TripWireHookBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TripWireHookBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; + virtual void __unk_vfn_178(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 179 + * @symbol ?canSurvive\@TripWireHookBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ - virtual void __unk_vfn_185(); + virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@TripWireHookBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @symbol ??0TripWireHookBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TripWireHookBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TripWireHookBlock(std::string const &, int); /** - * @symbol ?calculateState\@TripWireHookBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N2HAEBVBlock\@\@\@Z + * @symbol ?calculateState\@TripWireHookBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N2HAEBVBlock\@\@\@Z */ MCAPI void calculateState(class BlockSource &, class BlockPos const &, bool, bool, int, class Block const &) const; //private: /** - * @symbol ?_emitState\@TripWireHookBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N222\@Z + * @symbol ?_emitState\@TripWireHookBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@_N222\@Z */ MCAPI void _emitState(class BlockSource &, class BlockPos const &, bool, bool, bool, bool) const; /** - * @symbol ?_getShape\@TripWireHookBlock\@\@AEBAXHAEAVAABB\@\@\@Z + * @symbol ?_getShape\@TripWireHookBlock\@\@AEBAXHAEAVAABB\@\@\@Z */ MCAPI void _getShape(int, class AABB &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TripodCamera.hpp b/LiteLoader/include/llapi/mc/TripodCamera.hpp index 800a5dcf21..e540b76c49 100644 --- a/LiteLoader/include/llapi/mc/TripodCamera.hpp +++ b/LiteLoader/include/llapi/mc/TripodCamera.hpp @@ -32,204 +32,199 @@ class TripodCamera : public Mob { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@TripodCamera\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@TripodCamera\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~TripodCamera(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@TripodCamera\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@TripodCamera\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 80 - * @symbol ?getShadowHeightOffs\@TripodCamera\@\@UEAAMXZ + * @vftbl 79 + * @symbol ?getShadowHeightOffs\@TripodCamera\@\@UEAAMXZ */ virtual float getShadowHeightOffs(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@TripodCamera\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@TripodCamera\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@TripodCamera\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@TripodCamera\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@TripodCamera\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@TripodCamera\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@TripodCamera\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@TripodCamera\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 341 - * @symbol ?canExistWhenDisallowMob\@TripodCamera\@\@UEBA_NXZ + * @vftbl 338 + * @symbol ?canExistWhenDisallowMob\@TripodCamera\@\@UEBA_NXZ */ virtual bool canExistWhenDisallowMob() const; /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRIPODCAMERA /** - * @symbol ?breaksFallingBlocks\@TripodCamera\@\@UEBA_NXZ + * @symbol ?breaksFallingBlocks\@TripodCamera\@\@UEBA_NXZ */ MCVAPI bool breaksFallingBlocks() const; /** - * @symbol ?interactPreventDefault\@TripodCamera\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@TripodCamera\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); /** - * @symbol ?isTargetable\@TripodCamera\@\@UEBA_NXZ + * @symbol ?isTargetable\@TripodCamera\@\@UEBA_NXZ */ MCVAPI bool isTargetable() const; #endif /** - * @symbol ??0TripodCamera\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0TripodCamera\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI TripodCamera(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?interactWithPlayer\@TripodCamera\@\@QEAA_NAEAVPlayer\@\@\@Z + * @symbol ?interactWithPlayer\@TripodCamera\@\@QEAA_NAEAVPlayer\@\@\@Z */ MCAPI bool interactWithPlayer(class Player &); /** - * @symbol ?isActivated\@TripodCamera\@\@QEBA_NXZ + * @symbol ?isActivated\@TripodCamera\@\@QEBA_NXZ */ MCAPI bool isActivated() const; /** - * @symbol ?startTakingPicture\@TripodCamera\@\@QEAAXAEAVPlayer\@\@\@Z + * @symbol ?startTakingPicture\@TripodCamera\@\@QEAAXAEAVPlayer\@\@\@Z */ MCAPI void startTakingPicture(class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp b/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp index 19d1f865c2..fd4912d80a 100644 --- a/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp +++ b/LiteLoader/include/llapi/mc/TripodCameraActivatedComponent.hpp @@ -28,8 +28,8 @@ class TripodCameraActivatedComponent { public: /** - * @symbol ??1TripodCameraActivatedComponent\@\@QEAA\@XZ + * @symbol ??1TripodCameraActivatedComponent\@\@QEAA\@XZ */ MCAPI ~TripodCameraActivatedComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TripodCameraComponent.hpp b/LiteLoader/include/llapi/mc/TripodCameraComponent.hpp index b54d67e497..d96c05242e 100644 --- a/LiteLoader/include/llapi/mc/TripodCameraComponent.hpp +++ b/LiteLoader/include/llapi/mc/TripodCameraComponent.hpp @@ -30,8 +30,8 @@ class TripodCameraComponent { public: /** - * @symbol ?getInteraction\@TripodCameraComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@TripodCameraComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TripodCameraDescription.hpp b/LiteLoader/include/llapi/mc/TripodCameraDescription.hpp index d8b8c356c3..326d9394ee 100644 --- a/LiteLoader/include/llapi/mc/TripodCameraDescription.hpp +++ b/LiteLoader/include/llapi/mc/TripodCameraDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class TripodCameraDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TripodCameraDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TripodCameraDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TripodCameraDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRIPODCAMERADESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TripodCameraDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TripodCameraDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TropicalFish.hpp b/LiteLoader/include/llapi/mc/TropicalFish.hpp index f34be53904..f053ec40cd 100644 --- a/LiteLoader/include/llapi/mc/TropicalFish.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFish.hpp @@ -32,172 +32,162 @@ class TropicalFish : public WaterAnimal { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@TropicalFish\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@TropicalFish\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~TropicalFish(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@TropicalFish\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 53 - * @symbol ?startRiding\@TropicalFish\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 53 + * @symbol ?startRiding\@TropicalFish\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@TropicalFish\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@TropicalFish\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@TropicalFish\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@TropicalFish\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 334 - * @symbol ?createAIGoals\@TropicalFish\@\@UEAA_NXZ + * @vftbl 331 + * @symbol ?createAIGoals\@TropicalFish\@\@UEAA_NXZ */ virtual bool createAIGoals(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0TropicalFish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0TropicalFish\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI TropicalFish(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?postNormalTick\@TropicalFish\@\@QEAAXXZ + * @symbol ?postNormalTick\@TropicalFish\@\@QEAAXXZ */ MCAPI void postNormalTick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp b/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp index 0741950108..6b7d228136 100644 --- a/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp +++ b/LiteLoader/include/llapi/mc/TropicalFishInfo.hpp @@ -11,22 +11,22 @@ #undef BEFORE_EXTRA -struct TropicalFishInfo { +class TropicalFishInfo { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_TROPICALFISHINFO public: - struct TropicalFishInfo& operator=(struct TropicalFishInfo const &) = delete; - TropicalFishInfo(struct TropicalFishInfo const &) = delete; + class TropicalFishInfo& operator=(class TropicalFishInfo const &) = delete; + TropicalFishInfo(class TropicalFishInfo const &) = delete; TropicalFishInfo() = delete; #endif public: /** - * @symbol ??1TropicalFishInfo\@\@QEAA\@XZ + * @symbol ??1TropicalFishInfo\@\@QEAA\@XZ */ MCAPI ~TropicalFishInfo(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TropicalFishPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/TropicalFishPostNormalTickSystem.hpp deleted file mode 100644 index 65aa8bdeab..0000000000 --- a/LiteLoader/include/llapi/mc/TropicalFishPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file TropicalFishPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class TropicalFishPostNormalTickSystem. - * - */ -class TropicalFishPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_TROPICALFISHPOSTNORMALTICKSYSTEM -public: - class TropicalFishPostNormalTickSystem& operator=(class TropicalFishPostNormalTickSystem const &) = delete; - TropicalFishPostNormalTickSystem(class TropicalFishPostNormalTickSystem const &) = delete; - TropicalFishPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@TropicalFishPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doTropicalFishPostNormalTickSystem\@TropicalFishPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doTropicalFishPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/TrustComponent.hpp b/LiteLoader/include/llapi/mc/TrustComponent.hpp index 66273b9ff0..ca44f4ae14 100644 --- a/LiteLoader/include/llapi/mc/TrustComponent.hpp +++ b/LiteLoader/include/llapi/mc/TrustComponent.hpp @@ -29,36 +29,36 @@ class TrustComponent { public: /** - * @symbol ??0TrustComponent\@\@QEAA\@XZ + * @symbol ??0TrustComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI TrustComponent(); + MCAPI TrustComponent(class TrustComponent &&); /** - * @symbol ??0TrustComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0TrustComponent\@\@QEAA\@XZ */ - MCAPI TrustComponent(class TrustComponent &&); + MCAPI TrustComponent(); /** - * @symbol ?addAdditionalSaveData\@TrustComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@TrustComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?assignTrustedPlayer\@TrustComponent\@\@QEAAXUActorUniqueID\@\@\@Z + * @symbol ?assignTrustedPlayer\@TrustComponent\@\@QEAAXUActorUniqueID\@\@\@Z */ MCAPI void assignTrustedPlayer(struct ActorUniqueID); /** - * @symbol ?getTrustedPlayerIDs\@TrustComponent\@\@QEBAAEBV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@XZ + * @symbol ?getTrustedPlayerIDs\@TrustComponent\@\@QEBAAEBV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@XZ */ MCAPI class std::unordered_set, struct std::equal_to, class std::allocator> const & getTrustedPlayerIDs() const; /** - * @symbol ?initFromDefinition\@TrustComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@TrustComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ??4TrustComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4TrustComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class TrustComponent & operator=(class TrustComponent &&); /** - * @symbol ?readAdditionalSaveData\@TrustComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@TrustComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrustDescription.hpp b/LiteLoader/include/llapi/mc/TrustDescription.hpp index 37ab44e631..032961c1c1 100644 --- a/LiteLoader/include/llapi/mc/TrustDescription.hpp +++ b/LiteLoader/include/llapi/mc/TrustDescription.hpp @@ -5,7 +5,6 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here @@ -31,19 +30,20 @@ class TrustDescription { public: /** - * @vftbl 0 - * @symbol ?getJsonName\@TrustDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@TrustDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~TrustDescription(); + virtual void __unk_vfn_1(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_TRUSTDESCRIPTION /** - * @vftbl 3 - * @symbol ?serializeData\@TrustDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z + * @symbol __unk_destructor_-1 */ - virtual void serializeData(class Json::Value &) const; + MCVAPI ~TrustDescription(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrustedKeys.hpp b/LiteLoader/include/llapi/mc/TrustedKeys.hpp index 1130324731..366278ca5c 100644 --- a/LiteLoader/include/llapi/mc/TrustedKeys.hpp +++ b/LiteLoader/include/llapi/mc/TrustedKeys.hpp @@ -22,7 +22,7 @@ namespace TrustedKeys { #undef AFTER_EXTRA /** - * @symbol ?AuthServicePublicKey\@TrustedKeys\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?AuthServicePublicKey\@TrustedKeys\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const AuthServicePublicKey; diff --git a/LiteLoader/include/llapi/mc/TrustingComponent.hpp b/LiteLoader/include/llapi/mc/TrustingComponent.hpp index 518570365f..1f1d00c5c4 100644 --- a/LiteLoader/include/llapi/mc/TrustingComponent.hpp +++ b/LiteLoader/include/llapi/mc/TrustingComponent.hpp @@ -29,20 +29,20 @@ class TrustingComponent { public: /** - * @symbol ??0TrustingComponent\@\@QEAA\@XZ + * @symbol ??0TrustingComponent\@\@QEAA\@XZ */ MCAPI TrustingComponent(); /** - * @symbol ?getInteraction\@TrustingComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z + * @symbol ?getInteraction\@TrustingComponent\@\@QEAA_NAEAVActor\@\@AEAVPlayer\@\@AEAVActorInteraction\@\@\@Z */ MCAPI bool getInteraction(class Actor &, class Player &, class ActorInteraction &); //private: /** - * @symbol ?_becomeTrusting\@TrustingComponent\@\@AEAAXAEAVActor\@\@\@Z + * @symbol ?_becomeTrusting\@TrustingComponent\@\@AEAAXAEAVActor\@\@\@Z */ MCAPI void _becomeTrusting(class Actor &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TrustingDefinition.hpp b/LiteLoader/include/llapi/mc/TrustingDefinition.hpp index f71674aac1..a1f3bef1e7 100644 --- a/LiteLoader/include/llapi/mc/TrustingDefinition.hpp +++ b/LiteLoader/include/llapi/mc/TrustingDefinition.hpp @@ -30,20 +30,20 @@ class TrustingDefinition { public: /** - * @symbol ??0TrustingDefinition\@\@QEAA\@XZ + * @symbol ??0TrustingDefinition\@\@QEAA\@XZ */ MCAPI TrustingDefinition(); /** - * @symbol ?addTrustItemByName\@TrustingDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?addTrustItemByName\@TrustingDefinition\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void addTrustItemByName(std::string const &); /** - * @symbol ?initialize\@TrustingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTrustingComponent\@\@\@Z + * @symbol ?initialize\@TrustingDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVTrustingComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class TrustingComponent &) const; /** - * @symbol ?buildSchema\@TrustingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTrustingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@TrustingDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VTrustingDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TryExitVehicleSystem.hpp b/LiteLoader/include/llapi/mc/TryExitVehicleSystem.hpp index 5860f658b0..936f833d42 100644 --- a/LiteLoader/include/llapi/mc/TryExitVehicleSystem.hpp +++ b/LiteLoader/include/llapi/mc/TryExitVehicleSystem.hpp @@ -28,16 +28,16 @@ class TryExitVehicleSystem { public: /** - * @symbol ?createSystem\@TryExitVehicleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@TryExitVehicleSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_tickTryExitVehicle\@TryExitVehicleSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBUAttributesComponent\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@Z + * @symbol ?_tickTryExitVehicle\@TryExitVehicleSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUPassengerComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@\@\@U?$Exclude\@V?$FlagComponent\@UBoatFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UMobFlag\@\@\@\@\@\@V?$Optional\@$$CBUAttributesComponent\@\@\@\@$$CBUVehicleComponent\@\@$$CBUSynchedActorDataComponent\@\@\@\@AEAV?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UStopRidingRequestFlag\@\@\@\@V?$FlagComponent\@UExitFromPassengerFlag\@\@\@\@\@\@\@Z */ MCAPI static void _tickTryExitVehicle(class StrictEntityContext const &, struct PassengerComponent const &, class ViewT>, struct Exclude>, class Optional const>, class Optional, struct VehicleComponent const, struct SynchedActorDataComponent const>, class EntityModifierT, class FlagComponent> &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Turtle.hpp b/LiteLoader/include/llapi/mc/Turtle.hpp index efd0567f14..6e4a0b1c9f 100644 --- a/LiteLoader/include/llapi/mc/Turtle.hpp +++ b/LiteLoader/include/llapi/mc/Turtle.hpp @@ -32,153 +32,148 @@ class Turtle : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Turtle(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 81 - * @symbol ?getShadowRadius\@Turtle\@\@UEBAMXZ + * @vftbl 80 + * @symbol ?getShadowRadius\@Turtle\@\@UEBAMXZ */ virtual float getShadowRadius() const; /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@Turtle\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@Turtle\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@Turtle\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@Turtle\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Turtle\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Turtle\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Turtle(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp index 269353df1f..c70163a13f 100644 --- a/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp +++ b/LiteLoader/include/llapi/mc/TurtleEggBlock.hpp @@ -31,276 +31,281 @@ class TurtleEggBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TurtleEggBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@TurtleEggBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@TurtleEggBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 69 - * @symbol ?checkIsPathable\@TurtleEggBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 69 + * @symbol ?checkIsPathable\@TurtleEggBlock\@\@UEBA_NAEAVActor\@\@AEBVBlockPos\@\@1\@Z */ virtual bool checkIsPathable(class Actor &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 72 - * @symbol ?transformOnFall\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@M\@Z + * @vftbl 72 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@TurtleEggBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@TurtleEggBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@TurtleEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@TurtleEggBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TurtleEggBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@TurtleEggBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@TurtleEggBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@TurtleEggBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@TurtleEggBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_TURTLEEGGBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@TurtleEggBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@TurtleEggBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0TurtleEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TurtleEggBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TurtleEggBlock(std::string const &, int); //private: /** - * @symbol ?_decreaseEggs\@TurtleEggBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@I_N\@Z + * @symbol ?_decreaseEggs\@TurtleEggBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@I_N\@Z */ MCAPI static void _decreaseEggs(class BlockSource &, class BlockPos const &, unsigned int, bool); /** - * @symbol ?_destroyEgg\@TurtleEggBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@H_N\@Z + * @symbol ?_destroyEgg\@TurtleEggBlock\@\@CAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@H_N\@Z */ MCAPI static void _destroyEgg(class BlockSource &, class BlockPos const &, class Actor &, int, bool); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp index c96c6972c1..9baa83d389 100644 --- a/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesBlock.hpp @@ -31,260 +31,269 @@ class TwistingVinesBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TwistingVinesBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@TwistingVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@TwistingVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@TwistingVinesBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@TwistingVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@TwistingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@TwistingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@TwistingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@TwistingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0TwistingVinesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0TwistingVinesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI TwistingVinesBlock(std::string const &, int); //private: /** - * @symbol ?_getAge\@TwistingVinesBlock\@\@AEBAHAEBVBlock\@\@\@Z + * @symbol ?_getAge\@TwistingVinesBlock\@\@AEBAHAEBVBlock\@\@\@Z */ MCAPI int _getAge(class Block const &) const; /** - * @symbol ?_tryGrow\@TwistingVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_shouldGrow\@TwistingVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + */ + MCAPI bool _shouldGrow(class BlockSource &, class BlockPos const &, int) const; + /** + * @symbol ?_tryGrow\@TwistingVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void _tryGrow(class BlockSource &, class BlockPos const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp b/LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp index 40a82238e6..13efa648ce 100644 --- a/LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp +++ b/LiteLoader/include/llapi/mc/TwistingVinesClusterFeature.hpp @@ -31,22 +31,22 @@ class TwistingVinesClusterFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~TwistingVinesClusterFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@TwistingVinesClusterFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@TwistingVinesClusterFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_placeVineString\@TwistingVinesClusterFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHH\@Z + * @symbol ?_placeVineString\@TwistingVinesClusterFeature\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHH\@Z */ MCAPI void _placeVineString(class BlockSource &, class Random &, class BlockPos const &, int, int, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Types.hpp b/LiteLoader/include/llapi/mc/Types.hpp index e118d10e2e..6699b70c76 100644 --- a/LiteLoader/include/llapi/mc/Types.hpp +++ b/LiteLoader/include/llapi/mc/Types.hpp @@ -10,317 +10,50 @@ // enum #include "inc/enums.inc" #include "../HookAPI.h" -#include "../utils/RNG.h" -class Vec2; -class Vec3; -class BlockPos; -class AABB; -class BoundingBox; -class ChunkPos; -class ChunkBlockPos; +#include "entt/entity/entity.hpp" +#include "mce.hpp" +#include "Ref.hpp" +#include -typedef std::string xuid_t; -typedef unsigned long long QWORD; - -namespace mce { +class EntityId : public entt::entt_traits { +public: + entity_type mRawId; -LL_CONSTEXPR int static hexToNum(char s) { - if ('A' <= s && s <= 'F') { - return 10 + (s - 'A'); - } - if ('a' <= s && s <= 'f') { - return 10 + (s - 'a'); - } - if ('0' <= s && s <= '9') { - return (s - '0'); - } - return 0; -} + constexpr EntityId(EntityId&&) = default; -LL_CONSTEXPR double static hexToNum(std::string_view s) { - if (s.length() == 2) { - return (16 * hexToNum(s[0]) + hexToNum(s[1])) / 255.0; - } - return 0; -} + constexpr EntityId(const EntityId&) = default; -class UUID { - uint64_t a, b; + constexpr EntityId& operator=(const EntityId&) = default; -public: - UUID() - : a(RNG::rand()), b(RNG::rand()) { - } - UUID(uint64_t a, uint64_t b) - : a(a), b(b) { - } - MCAPI std::string asString() const; - MCAPI static UUID fromString(std::string const&); - MCAPI bool isEmpty() const; - MCAPI static UUID seedFromString(std::string const&); - MCAPI static class mce::UUID EMPTY; + template > || + std::is_same_v || std::is_same_v), + int> = 0> + constexpr EntityId(T rawId) : mRawId(static_cast(rawId)) {} - inline operator bool() const { - return !isEmpty(); + constexpr operator entity_type() const { + return mRawId; } }; -enum class ColorPalette { - BLACK, - INDIGO, - LAVENDER, - TEAL, - COCOA, - DARK, - OATMEAL, - WHITE, - RED, - APRICOT, - YELLOW, - GREEN, - VATBLUE, - SLATE, - PINK, - FAWN, -}; - -class Color { +class ActorRuntimeID { public: - float r; - float g; - float b; - float a; - Color() - : r(0.0f), g(0.0f), b(0.0f), a(0.0f){}; - Color(float r, float g, float b, float a = 1) - : r(r), g(g), b(b), a(a){}; - Color(double r, double g, double b, double a = 1) - : r((float)r), g((float)g), b((float)b), a((float)a){}; - Color(int ir, int ig, int ib, int ia = 255) - : r(ir / 255.0f), g(ig / 255.0f), b(ib / 255.0f), a(ia / 255.0f){}; - - LL_CONSTEXPR Color(std::string_view hex) { - r = 0, g = 0, b = 0, a = 1; - if (hex[0] == '#') { - hex = hex.substr(1); - } - if (hex.length() == 3) { - r = (float)((hexToNum(hex[0]) * 17) / 255.0); - g = (float)((hexToNum(hex[1]) * 17) / 255.0); - b = (float)((hexToNum(hex[2]) * 17) / 255.0); - return; - } - if (hex.length() == 4) { - a = (float)((hexToNum(hex[0]) * 17) / 255.0); - r = (float)((hexToNum(hex[1]) * 17) / 255.0); - g = (float)((hexToNum(hex[2]) * 17) / 255.0); - b = (float)((hexToNum(hex[3]) * 17) / 255.0); - return; - } - if (hex.length() == 6) { - r = (float)hexToNum(hex.substr(0, 2)); - g = (float)hexToNum(hex.substr(2, 2)); - b = (float)hexToNum(hex.substr(4, 2)); - return; - } - if (hex.length() == 8) { - a = (float)hexToNum(hex.substr(0, 2)); - r = (float)hexToNum(hex.substr(2, 2)); - g = (float)hexToNum(hex.substr(4, 2)); - b = (float)hexToNum(hex.substr(6, 2)); - return; - } - return; - }; - - inline operator bool() const { - return !(*this == NIL); - } - - LIAPI double distanceTo(mce::Color const& dst) const; - LIAPI std::string toConsoleCode(bool foreground = true) const; - LIAPI std::string toNearestColorCode() const; - LIAPI char toNearestParticleColorCode() const; - LIAPI ColorPalette toNearestParticleColorType() const; - LIAPI static class mce::Color fromConsoleCode(std::string const&); - LIAPI static class mce::Color fromColorCode(std::string const&); - LIAPI class mce::Color sRGBToLinear() const; - LIAPI class mce::Color LinearTosRGB() const; - LIAPI class mce::Color LinearToXYZ() const; - LIAPI class mce::Color XYZToLinear() const; - LIAPI class mce::Color XYZToLab() const; - LIAPI class mce::Color LabToXYZ() const; - LIAPI double deltaE76(mce::Color const& dst) const; // 2.3 for JND - LIAPI double deltaE94(mce::Color const& dst) const; // 1.0 for JND - LIAPI double deltaE00(mce::Color const& dst) const; // 1.0 for JND - - MCAPI static mce::Color const NIL; - MCAPI static class mce::Color fromHexString(std::string const&); - MCAPI bool operator==(class mce::Color const&) const; - MCAPI int toABGR(void) const; - MCAPI int toARGB(void) const; - MCAPI std::string toHexString(void) const; - - inline bool operator!=(const Color& c) const { - return !(c == *this); - } - - inline Color operator*(float c) const { - return {r * c, g * c, b * c, a * c}; - } - - inline Color operator/(float c) const { - return {r / c, g / c, b / c, a / c}; - } - - inline Color operator+(float c) const { - return {r + c, g + c, b + c, a + c}; - } - - inline Color operator-(float c) const { - return {r - c, g - c, b - c, a - c}; - } - - constexpr Color& operator+=(float c) { - r += c; - g += c; - b += c; - a += c; - return *this; - } - - constexpr Color& operator-=(float c) { - r -= c; - g -= c; - b -= c; - a -= c; - return *this; - } - - constexpr Color& operator*=(float c) { - r *= c; - g *= c; - b *= c; - a *= c; - return *this; - } - - constexpr Color& operator/=(float c) { - r /= c; - g /= c; - b /= c; - a /= c; - return *this; - } - - constexpr Color& operator+=(Color const& c) { - r += c.r; - g += c.g; - b += c.b; - a += c.a; - return *this; - } - - constexpr Color& operator-=(Color const& c) { - r -= c.r; - g -= c.g; - b -= c.b; - a -= c.a; - return *this; - } - - constexpr Color& operator*=(Color const& c) { - r *= c.r; - g *= c.g; - b *= c.b; - a *= c.a; - return *this; - } - - constexpr Color& operator/=(Color const& c) { - r /= c.r; - g /= c.g; - b /= c.b; - a /= c.a; - return *this; - } - - inline Color operator+(Color const& c) const { - return {r + c.r, g + c.g, b + c.b, a + c.a}; - } - - inline Color operator*(Color const& c) const { - return {r * c.r, g * c.g, b * c.b, a * c.a}; - } - - inline Color operator/(Color const& c) const { - return {r / c.r, g / c.g, b / c.b, a / c.a}; - } - - inline Color operator-(Color const& c) const { - return {r - c.r, g - c.g, b - c.b, a - c.a}; - } - - inline static Color max(const Color& k, const Color& l) { - return {std::max(k.r, l.r), std::max(k.g, l.g), std::max(k.b, l.b), std::max(k.a, l.a)}; - } - - inline static Color min(const Color& k, const Color& l) { - return {std::min(k.r, l.r), std::min(k.g, l.g), std::min(k.b, l.b), std::min(k.a, l.a)}; - } + unsigned long long id; - inline static Color lerp(const Color& k, const Color& l, float m) { - return k * (1.0f - m) + l * m; + inline unsigned long long get() const { + return id; } - inline static Color mix(const Color& k, const Color& l, float m) { - return lerp(k, l, m); + inline operator unsigned long long() const { + return id; } }; -static std::unordered_map> const particleColors = { - // clang-format off - {mce::ColorPalette::BLACK, {'B', Color("#000000")}}, - {mce::ColorPalette::INDIGO, {'I', Color("#144A74")}}, - {mce::ColorPalette::LAVENDER, {'L', Color("#8E65F3")}}, - {mce::ColorPalette::TEAL, {'T', Color("#07946E")}}, - {mce::ColorPalette::COCOA, {'C', Color("#AB5236")}}, - {mce::ColorPalette::DARK, {'D', Color("#56575F")}}, - {mce::ColorPalette::OATMEAL, {'O', Color("#A2A3A7")}}, - {mce::ColorPalette::WHITE, {'W', Color("#FFFFFF")}}, - {mce::ColorPalette::RED, {'R', Color("#FF3040")}}, - {mce::ColorPalette::APRICOT, {'A', Color("#FF7300")}}, - {mce::ColorPalette::YELLOW, {'Y', Color("#FFEC27")}}, - {mce::ColorPalette::GREEN, {'G', Color("#10E436")}}, - {mce::ColorPalette::VATBLUE, {'V', Color("#29ADFF")}}, - {mce::ColorPalette::SLATE, {'S', Color("#83769C")}}, - {mce::ColorPalette::PINK, {'P', Color("#FF77A8")}}, - {mce::ColorPalette::FAWN, {'E', Color("#FFCCAA")}}, - // clang-format on -}; - -inline static const char getParticleColorType(ColorPalette const& p) { - return particleColors.at(p).first; -} - -}; // namespace mce - +typedef std::string xuid_t; +typedef unsigned long long QWORD; namespace reflection { - struct Schema {}; -} - - -namespace std { - -template <> -struct hash { - std::size_t operator()(mce::Color const& c) const noexcept { - return (std::hash()(c.r) ^ std::hash()(c.g) ^ std::hash()(c.b) ^ std::hash()(c.a)); - } -}; - -} // namespace std +struct Schema {}; +} // namespace reflection template class AutomaticID { @@ -348,22 +81,8 @@ class NetherNet { struct NetworkID; }; -class ActorRuntimeID { -public: - unsigned long long id; - - inline unsigned long long get() const { - return id; - } - - inline operator unsigned long long() const { - return id; - } -}; // static_assert(std::is_pod_v); -#include "RelativeFloat.hpp" - // namespace Core { // // class PathPart { @@ -421,8 +140,6 @@ class AgentCommands { class Command; }; -#include "../mc/Automation.hpp" - class ClientBlobCache { public: struct Server { @@ -443,15 +160,6 @@ class ClientBlockPipeline { struct BlockSchematic; }; -template -class WeakStorageSharePtr { -public: - std::weak_ptr mHandle; -}; - -template -class WeakRefT : public WeakStorageSharePtr {}; - struct ISurfaceBuilder { struct BuildParameters; }; @@ -502,6 +210,7 @@ struct GameEventConfig { struct OperationNodeValues { enum class Terrain; }; + class Editor { public: class IEditorManager; @@ -517,6 +226,7 @@ template class TypedServerNetId { public: T2 netId; + inline operator T2() { return netId; } @@ -572,47 +282,9 @@ class LevelChunkGridAreaElement; template class GridArea; -template -class OwnerPtrT; - template class ServiceReference; -template -class SharedPtr; - -template -class StackRefResultT; - -template -class WeakPtr { - T** value; - -public: - inline T* get() { - if (value) - return *value; - return nullptr; - } - inline T const* get() const { - if (value) - return *value; - return nullptr; - } - inline T& operator*() { - return *get(); - } - inline T const& operator*() const { - return *get(); - } - inline operator bool() const { - return get() != nullptr; - } -}; - -template -struct SharePtrRefTraits {}; - template class SubChunkStorage; @@ -653,6 +325,7 @@ class optional_ref { return value; return nullptr; } + // inline T* set(T const& val) //{ // *value = &val; @@ -660,9 +333,11 @@ class optional_ref { inline T& operator*() const { return *value; } + inline T* operator->() const { return value; } + inline operator bool() const { return value != nullptr; } @@ -724,8 +399,7 @@ class CommandSelectorResults { } }; -enum class ActorType : __int32 -{ +enum class ActorType : __int32 { Undefined_2 = 0x1, TypeMask = 0xFF, Mob = 0x100, diff --git a/LiteLoader/include/llapi/mc/UIProfanityContext.hpp b/LiteLoader/include/llapi/mc/UIProfanityContext.hpp index d1b3f7d65d..c02bdc0ee2 100644 --- a/LiteLoader/include/llapi/mc/UIProfanityContext.hpp +++ b/LiteLoader/include/llapi/mc/UIProfanityContext.hpp @@ -30,8 +30,8 @@ class UIProfanityContext { public: /** - * @symbol ?filterProfanityFromString\@UIProfanityContext\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ProfanityFilterContext\@\@AEBV23\@_N\@Z + * @symbol ?filterProfanityFromString\@UIProfanityContext\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4ProfanityFilterContext\@\@AEBV23\@_N\@Z */ MCAPI std::string filterProfanityFromString(enum class ProfanityFilterContext, std::string const &, bool) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UPNPInterface.hpp b/LiteLoader/include/llapi/mc/UPNPInterface.hpp index 0ceb2914df..b1435b864a 100644 --- a/LiteLoader/include/llapi/mc/UPNPInterface.hpp +++ b/LiteLoader/include/llapi/mc/UPNPInterface.hpp @@ -32,25 +32,25 @@ class UPNPInterface { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPNPINTERFACE /** - * @symbol ?_onDisable\@UPNPInterface\@\@EEAAXXZ + * @symbol ?_onDisable\@UPNPInterface\@\@EEAAXXZ */ MCVAPI void _onDisable(); /** - * @symbol ?_onEnable\@UPNPInterface\@\@EEAAXXZ + * @symbol ?_onEnable\@UPNPInterface\@\@EEAAXXZ */ MCVAPI void _onEnable(); #endif /** - * @symbol ??0UPNPInterface\@\@QEAA\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z + * @symbol ??0UPNPInterface\@\@QEAA\@AEBV?$NonOwnerPointer\@VAppPlatform\@\@\@Bedrock\@\@\@Z */ MCAPI UPNPInterface(class Bedrock::NonOwnerPointer const &); /** - * @symbol ?reset\@UPNPInterface\@\@QEAAXXZ + * @symbol ?reset\@UPNPInterface\@\@QEAAXXZ */ MCAPI void reset(); /** - * @symbol ?tick\@UPNPInterface\@\@QEAAXXZ + * @symbol ?tick\@UPNPInterface\@\@QEAAXXZ */ MCAPI void tick(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp index ed989dfa34..4b17b7953a 100644 --- a/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp +++ b/LiteLoader/include/llapi/mc/UnburiedConstraint.hpp @@ -30,18 +30,18 @@ class UnburiedConstraint { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnburiedConstraint(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isSatisfied\@UnburiedConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z + * @vftbl 1 + * @symbol ?isSatisfied\@UnburiedConstraint\@\@UEBA_NAEBVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEBW4Rotation\@\@\@Z */ virtual bool isSatisfied(class IBlockWorldGenAPI const &, class BlockPos const &, enum class Rotation const &) const; /** - * @symbol ??0UnburiedConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z + * @symbol ??0UnburiedConstraint\@\@QEAA\@AEAVStructureTemplate\@\@\@Z */ MCAPI UnburiedConstraint(class StructureTemplate &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnderWaterSensingSideBySideSystem.hpp b/LiteLoader/include/llapi/mc/UnderWaterSensingSideBySideSystem.hpp deleted file mode 100644 index 4749eef812..0000000000 --- a/LiteLoader/include/llapi/mc/UnderWaterSensingSideBySideSystem.hpp +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file UnderWaterSensingSideBySideSystem.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class UnderWaterSensingSideBySideSystem. - * - */ -class UnderWaterSensingSideBySideSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNDERWATERSENSINGSIDEBYSIDESYSTEM -public: - class UnderWaterSensingSideBySideSystem& operator=(class UnderWaterSensingSideBySideSystem const &) = delete; - UnderWaterSensingSideBySideSystem(class UnderWaterSensingSideBySideSystem const &) = delete; - UnderWaterSensingSideBySideSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem@UnderWaterSensingSideBySideSystem@@SA?AUTickingSystemWithInfo@@XZ - * @hash 310699678 - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?doUnderWaterSensing@UnderWaterSensingSideBySideSystem@@CAXAEAVStrictEntityContext@@AEBUSideBySideLiquidSensingComponent@@V?$EntityModifierT@VEntityRegistryBase@@VStrictEntityContext@@V?$FlagComponent@UActorHeadInWaterFlag@@@@@@@Z - * @hash -1771689621 - */ - MCAPI static void doUnderWaterSensing(class StrictEntityContext &, struct SideBySideLiquidSensingComponent const &, class EntityModifierT>); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp b/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp index a54263cbbc..70ea8e4dda 100644 --- a/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp +++ b/LiteLoader/include/llapi/mc/UnderWaterSensingSystem.hpp @@ -11,48 +11,50 @@ #undef BEFORE_EXTRA -struct UnderWaterSensingSystem { +class UnderWaterSensingSystem { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNDERWATERSENSINGSYSTEM public: - struct UnderWaterSensingSystem& operator=(struct UnderWaterSensingSystem const &) = delete; - UnderWaterSensingSystem(struct UnderWaterSensingSystem const &) = delete; + class UnderWaterSensingSystem& operator=(class UnderWaterSensingSystem const &) = delete; + UnderWaterSensingSystem(class UnderWaterSensingSystem const &) = delete; UnderWaterSensingSystem() = delete; #endif public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnderWaterSensingSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@UnderWaterSensingSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@UUpdateWaterStateRequestComponent\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UDimensionTypeComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@UnderWaterSensingSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UDimensionTypeComponent\@\@UUpdateWaterStateRequestComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ - virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); + virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent, struct VehicleComponent, class FlagComponent, class FlagComponent>, struct Read, struct Write<>, struct AddRemove>, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?createSystem\@UnderWaterSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@UnderWaterSensingSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?doUnderWaterSensing\@UnderWaterSensingSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@AEAV?$StrictExecutionContext\@U?$Filter\@UUpdateWaterStateRequestComponent\@\@V?$FlagComponent\@UHorseFlag\@\@\@\@V?$FlagComponent\@UMobFlag\@\@\@\@V?$FlagComponent\@UParrotFlag\@\@\@\@UVehicleComponent\@\@V?$FlagComponent\@UCamelFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@U?$Read\@UDimensionTypeComponent\@\@UMobBodyRotationComponent\@\@UPassengerComponent\@\@URenderRotationComponent\@\@UStandAnimationComponent\@\@UStateVectorComponent\@\@UAABBShapeComponent\@\@UActorRotationComponent\@\@UOffsetsComponent\@\@USynchedActorDataComponent\@\@\@\@U?$Write\@$$V\@\@U?$AddRemove\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?doUnderWaterSensing\@UnderWaterSensingSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEBUUpdateWaterStateRequestComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@UActorHeadInWaterFlag\@\@\@\@\@\@AEBUGetAttachPositionViews\@\@AEBVIConstBlockSource\@\@\@Z */ - MCAPI static void doUnderWaterSensing(class StrictEntityContext const &, struct StateVectorComponent const &, class EntityModifierT>, class StrictExecutionContext, 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 doUnderWaterSensing(class StrictEntityContext const &, struct StateVectorComponent const &, struct UpdateWaterStateRequestComponent const &, class EntityModifierT>, struct GetAttachPositionViews const &, class IConstBlockSource const &); -}; \ No newline at end of file +private: + +}; diff --git a/LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp b/LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp index 2afca7eebd..4b3706072c 100644 --- a/LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterCanyonFeature.hpp @@ -32,22 +32,28 @@ class UnderwaterCanyonFeature : public CanyonFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnderwaterCanyonFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?carve\@UnderwaterCanyonFeature\@\@MEBA_NAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@4HHHHHHMMV?$span\@$$CBM$0?0\@gsl\@\@AEBUWorldGenContext\@\@\@Z + * @vftbl 1 + * @symbol ?carve\@UnderwaterCanyonFeature\@\@MEBA_NAEAVBlockVolume\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@4HHHHHHMMV?$span\@$$CBM$0?0\@gsl\@\@AEBUWorldGenContext\@\@\@Z */ virtual bool carve(class BlockVolume &, class BiomeSource const &, class Random &, class ChunkPos const &, class Vec3 const &, class Vec3 const &, int, int, int, int, int, int, float, float, class gsl::span, struct WorldGenContext const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UNDERWATERCANYONFEATURE /** - * @symbol ??0UnderwaterCanyonFeature\@\@QEAA\@F\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UnderwaterCanyonFeature(); +#endif + /** + * @symbol ??0UnderwaterCanyonFeature\@\@QEAA\@F\@Z */ MCAPI UnderwaterCanyonFeature(short); /** - * @symbol ?isDiggable\@UnderwaterCanyonFeature\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isDiggable\@UnderwaterCanyonFeature\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isDiggable(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnderwaterCaveFeature.hpp b/LiteLoader/include/llapi/mc/UnderwaterCaveFeature.hpp index 7903ec129a..628b092344 100644 --- a/LiteLoader/include/llapi/mc/UnderwaterCaveFeature.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterCaveFeature.hpp @@ -31,22 +31,22 @@ class UnderwaterCaveFeature : public CaveFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnderwaterCaveFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 5 - * @symbol ?carveEllipsoidVolume\@UnderwaterCaveFeature\@\@MEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEBVBoundingBox\@\@MMAEBUCarvingParameters\@4\@\@Z + * @vftbl 5 + * @symbol ?carveEllipsoidVolume\@UnderwaterCaveFeature\@\@MEBA_NAEAVIBlockWorldGenAPI\@\@AEBUCarverConfiguration\@CaveFeatureUtils\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVVec3\@\@AEBVBoundingBox\@\@MMAEBUCarvingParameters\@4\@\@Z */ virtual bool carveEllipsoidVolume(class IBlockWorldGenAPI &, struct CaveFeatureUtils::CarverConfiguration const &, class Random &, class ChunkPos const &, class Vec3 const &, class BoundingBox const &, float, float, struct CaveFeatureUtils::CarvingParameters const &) const; /** - * @symbol ??0UnderwaterCaveFeature\@\@QEAA\@XZ + * @symbol ??0UnderwaterCaveFeature\@\@QEAA\@XZ */ MCAPI UnderwaterCaveFeature(); /** - * @symbol ?isDiggable\@UnderwaterCaveFeature\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isDiggable\@UnderwaterCaveFeature\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isDiggable(class Block const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp index 8dccbd08f8..a1461ea95f 100644 --- a/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnderwaterTorchBlock.hpp @@ -31,218 +31,223 @@ class UnderwaterTorchBlock : public TorchBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnderwaterTorchBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@UnderwaterTorchBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@UnderwaterTorchBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@UnderwaterTorchBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@UnderwaterTorchBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 66 - * @symbol ?canBeUsedInCommands\@UnderwaterTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z + * @vftbl 66 + * @symbol ?canBeUsedInCommands\@UnderwaterTorchBlock\@\@UEBA_NAEBVBaseGameVersion\@\@\@Z */ virtual bool canBeUsedInCommands(class BaseGameVersion const &) const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 92 - * @symbol ?mayPlace\@UnderwaterTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@UnderwaterTorchBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 151 - * @symbol ?animateTick\@UnderwaterTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@UnderwaterTorchBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0UnderwaterTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0UnderwaterTorchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI UnderwaterTorchBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp index 0e34284f92..4e8bdcaaca 100644 --- a/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp +++ b/LiteLoader/include/llapi/mc/UndyedShulkerBoxBlock.hpp @@ -31,268 +31,273 @@ class UndyedShulkerBoxBlock : public ChestBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UndyedShulkerBoxBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@UndyedShulkerBoxBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@UndyedShulkerBoxBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 71 - * @symbol ?dispense\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol ?setupRedstoneComponent\@UndyedShulkerBoxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 79 + * @symbol ?setupRedstoneComponent\@UndyedShulkerBoxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void setupRedstoneComponent(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@UndyedShulkerBoxBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 101 - * @symbol ?playerWillDestroy\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 101 + * @symbol ?playerWillDestroy\@UndyedShulkerBoxBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool playerWillDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 102 - * @symbol ?spawnResources\@UndyedShulkerBoxBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAVRandomize\@\@AEBUResourceDropsContext\@\@\@Z + * @vftbl 102 + * @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 - * @symbol ?asItemInstance\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@UndyedShulkerBoxBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@UndyedShulkerBoxBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@UndyedShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@UndyedShulkerBoxBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 188 + * @symbol ?getResourceItem\@UndyedShulkerBoxBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0UndyedShulkerBoxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0UndyedShulkerBoxBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI UndyedShulkerBoxBlock(std::string const &, int); //protected: /** - * @symbol ?spawnBoxInstance\@UndyedShulkerBoxBlock\@\@IEBAXAEAVBlockSource\@\@AEAVLevel\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@7\@H\@Z + * @symbol ?spawnBoxInstance\@UndyedShulkerBoxBlock\@\@IEBAXAEAVBlockSource\@\@AEAVLevel\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCompoundTag\@\@U?$default_delete\@VCompoundTag\@\@\@std\@\@\@7\@H\@Z */ MCAPI void spawnBoxInstance(class BlockSource &, class Level &, class BlockPos const &, class Block const &, std::string const &, std::unique_ptr, int) const; //private: /** - * @symbol ?_isValidAttach\@UndyedShulkerBoxBlock\@\@AEBA_NAEAVBlockSource\@\@VBlockPos\@\@E\@Z + * @symbol ?_isValidAttach\@UndyedShulkerBoxBlock\@\@AEBA_NAEAVBlockSource\@\@VBlockPos\@\@E\@Z */ MCAPI bool _isValidAttach(class BlockSource &, class BlockPos, unsigned char) const; protected: /** - * @symbol ?SHULKER_BOX_DOESNT_BREAK_FALLING_BLOCK_VERSION\@UndyedShulkerBoxBlock\@\@1VBaseGameVersion\@\@B + * @symbol ?SHULKER_BOX_DOESNT_BREAK_FALLING_BLOCK_VERSION\@UndyedShulkerBoxBlock\@\@1VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const SHULKER_BOX_DOESNT_BREAK_FALLING_BLOCK_VERSION; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnknownBlock.hpp b/LiteLoader/include/llapi/mc/UnknownBlock.hpp index ba3c764567..ced84b8ac1 100644 --- a/LiteLoader/include/llapi/mc/UnknownBlock.hpp +++ b/LiteLoader/include/llapi/mc/UnknownBlock.hpp @@ -31,193 +31,198 @@ class UnknownBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnknownBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0UnknownBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0UnknownBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z */ MCAPI UnknownBlock(std::string const &, int, class Material const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnknownBlockTypeRegistry.hpp b/LiteLoader/include/llapi/mc/UnknownBlockTypeRegistry.hpp index 747abe5e30..31a437e22a 100644 --- a/LiteLoader/include/llapi/mc/UnknownBlockTypeRegistry.hpp +++ b/LiteLoader/include/llapi/mc/UnknownBlockTypeRegistry.hpp @@ -30,22 +30,22 @@ class UnknownBlockTypeRegistry { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UnknownBlockTypeRegistry(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getUnknownBlock\@UnknownBlockTypeRegistry\@\@UEAAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z + * @vftbl 1 + * @symbol ?getUnknownBlock\@UnknownBlockTypeRegistry\@\@UEAAAEBVBlock\@\@AEBVCompoundTag\@\@\@Z */ virtual class Block const & getUnknownBlock(class CompoundTag const &); //private: /** - * @symbol ?_registerBlock\@UnknownBlockTypeRegistry\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z + * @symbol ?_registerBlock\@UnknownBlockTypeRegistry\@\@AEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_K\@Z */ MCAPI void _registerBlock(std::string const &, unsigned __int64); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp new file mode 100644 index 0000000000..263a2cde4d --- /dev/null +++ b/LiteLoader/include/llapi/mc/UnlockedRecipesPacket.hpp @@ -0,0 +1,57 @@ +/** + * @file UnlockedRecipesPacket.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" +#include "Packet.hpp" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class UnlockedRecipesPacket : public Packet { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UNLOCKEDRECIPESPACKET +public: + class UnlockedRecipesPacket& operator=(class UnlockedRecipesPacket const &) = delete; + UnlockedRecipesPacket(class UnlockedRecipesPacket const &) = delete; +#endif + +public: + /** + * @vftbl 0 + * @symbol __unk_vfn_0 + */ + virtual void __unk_vfn_0(); + /** + * @vftbl 1 + * @symbol ?getId\@UnlockedRecipesPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + */ + virtual enum class MinecraftPacketIds getId() const; + /** + * @vftbl 2 + * @symbol ?getName\@UnlockedRecipesPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + */ + virtual std::string getName() const; + /** + * @vftbl 3 + * @symbol ?write\@UnlockedRecipesPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + */ + virtual void write(class BinaryStream &) const; + /** + * @vftbl 7 + * @symbol ?_read\@UnlockedRecipesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + */ + virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); + /** + * @symbol ??0UnlockedRecipesPacket\@\@QEAA\@XZ + */ + MCAPI UnlockedRecipesPacket(); + +}; diff --git a/LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp b/LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp index dc62452dbf..c487de1a22 100644 --- a/LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp +++ b/LiteLoader/include/llapi/mc/UnverifiedCertificate.hpp @@ -31,44 +31,44 @@ class UnverifiedCertificate { public: /** - * @symbol ??0UnverifiedCertificate\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0UnverifiedCertificate\@\@QEAA\@AEBV0\@\@Z */ MCAPI UnverifiedCertificate(class UnverifiedCertificate const &); /** - * @symbol ??0UnverifiedCertificate\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0UnverifiedCertificate\@\@QEAA\@$$QEAV0\@\@Z */ MCAPI UnverifiedCertificate(class UnverifiedCertificate &&); /** - * @symbol ?getIdentityPublicKey\@UnverifiedCertificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getIdentityPublicKey\@UnverifiedCertificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string getIdentityPublicKey() const; /** - * @symbol ?toString\@UnverifiedCertificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@UnverifiedCertificate\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; /** - * @symbol ?verify\@UnverifiedCertificate\@\@QEBA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@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 + * @symbol ?verify\@UnverifiedCertificate\@\@QEBA?AV?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@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 */ MCAPI std::unique_ptr verify(std::vector const &) const; /** - * @symbol ??1UnverifiedCertificate\@\@QEAA\@XZ + * @symbol ??1UnverifiedCertificate\@\@QEAA\@XZ */ MCAPI ~UnverifiedCertificate(); /** - * @symbol ?fromString\@UnverifiedCertificate\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@UnverifiedCertificate\@\@SA?AV1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class UnverifiedCertificate fromString(std::string const &); //private: /** - * @symbol ??0UnverifiedCertificate\@\@AEAA\@AEBVWebToken\@\@V?$unique_ptr\@VUnverifiedCertificate\@\@U?$default_delete\@VUnverifiedCertificate\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0UnverifiedCertificate\@\@AEAA\@AEBVWebToken\@\@V?$unique_ptr\@VUnverifiedCertificate\@\@U?$default_delete\@VUnverifiedCertificate\@\@\@std\@\@\@std\@\@\@Z */ MCAPI UnverifiedCertificate(class WebToken const &, std::unique_ptr); /** - * @symbol ?addToChain\@UnverifiedCertificate\@\@AEBAXAEAVValue\@Json\@\@\@Z + * @symbol ?addToChain\@UnverifiedCertificate\@\@AEBAXAEAVValue\@Json\@\@\@Z */ MCAPI void addToChain(class Json::Value &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateAISystem.hpp b/LiteLoader/include/llapi/mc/UpdateAISystem.hpp index 2092f9ca60..2616cd5832 100644 --- a/LiteLoader/include/llapi/mc/UpdateAISystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAISystem.hpp @@ -25,8 +25,8 @@ class UpdateAISystem { public: /** - * @symbol ?createSystem\@UpdateAISystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@UpdateAISystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp index 5200f434a3..f9c95dbc2a 100644 --- a/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAbilitiesPacket.hpp @@ -28,37 +28,43 @@ class UpdateAbilitiesPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateAbilitiesPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateAbilitiesPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateAbilitiesPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateAbilitiesPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateAbilitiesPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateAbilitiesPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateAbilitiesPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateAbilitiesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEABILITIESPACKET /** - * @symbol ??0UpdateAbilitiesPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateAbilitiesPacket(); +#endif + /** + * @symbol ??0UpdateAbilitiesPacket\@\@QEAA\@XZ */ MCAPI UpdateAbilitiesPacket(); /** - * @symbol ??0UpdateAbilitiesPacket\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z + * @symbol ??0UpdateAbilitiesPacket\@\@QEAA\@UActorUniqueID\@\@AEBVLayeredAbilities\@\@\@Z */ MCAPI UpdateAbilitiesPacket(struct ActorUniqueID, class LayeredAbilities const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp index baf6e9e4fb..1734ba88a8 100644 --- a/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAdventureSettingsPacket.hpp @@ -28,37 +28,43 @@ class UpdateAdventureSettingsPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateAdventureSettingsPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateAdventureSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateAdventureSettingsPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateAdventureSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateAdventureSettingsPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateAdventureSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateAdventureSettingsPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateAdventureSettingsPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEADVENTURESETTINGSPACKET /** - * @symbol ??0UpdateAdventureSettingsPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI UpdateAdventureSettingsPacket(); + MCVAPI ~UpdateAdventureSettingsPacket(); +#endif /** - * @symbol ??0UpdateAdventureSettingsPacket\@\@QEAA\@AEBUAdventureSettings\@\@\@Z + * @symbol ??0UpdateAdventureSettingsPacket\@\@QEAA\@AEBUAdventureSettings\@\@\@Z */ MCAPI UpdateAdventureSettingsPacket(struct AdventureSettings const &); + /** + * @symbol ??0UpdateAdventureSettingsPacket\@\@QEAA\@XZ + */ + MCAPI UpdateAdventureSettingsPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp index 7fd8d2053c..6972636bb8 100644 --- a/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateAttributesPacket.hpp @@ -30,37 +30,43 @@ class UpdateAttributesPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateAttributesPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateAttributesPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateAttributesPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateAttributesPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateAttributesPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateAttributesPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateAttributesPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateAttributesPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEATTRIBUTESPACKET /** - * @symbol ??0UpdateAttributesPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateAttributesPacket(); +#endif + /** + * @symbol ??0UpdateAttributesPacket\@\@QEAA\@XZ */ MCAPI UpdateAttributesPacket(); /** - * @symbol ??0UpdateAttributesPacket\@\@QEAA\@AEBVActor\@\@AEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0UpdateAttributesPacket\@\@QEAA\@AEBVActor\@\@AEBV?$vector\@VAttributeInstanceHandle\@\@V?$allocator\@VAttributeInstanceHandle\@\@\@std\@\@\@std\@\@\@Z */ MCAPI UpdateAttributesPacket(class Actor const &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp index 0595e48319..1157683d8b 100644 --- a/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockPacket.hpp @@ -30,37 +30,43 @@ class UpdateBlockPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateBlockPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateBlockPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateBlockPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateBlockPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateBlockPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateBlockPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateBlockPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateBlockPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEBLOCKPACKET /** - * @symbol ??0UpdateBlockPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateBlockPacket(); +#endif + /** + * @symbol ??0UpdateBlockPacket\@\@QEAA\@XZ */ MCAPI UpdateBlockPacket(); /** - * @symbol ??0UpdateBlockPacket\@\@QEAA\@AEBVBlockPos\@\@IIE\@Z + * @symbol ??0UpdateBlockPacket\@\@QEAA\@AEBVBlockPos\@\@IIE\@Z */ MCAPI UpdateBlockPacket(class BlockPos const &, unsigned int, unsigned int, unsigned char); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp index 1a26db8d77..cdafc4df44 100644 --- a/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBlockSyncedPacket.hpp @@ -30,37 +30,43 @@ class UpdateBlockSyncedPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateBlockSyncedPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateBlockSyncedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateBlockSyncedPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateBlockSyncedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateBlockSyncedPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateBlockSyncedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateBlockSyncedPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateBlockSyncedPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEBLOCKSYNCEDPACKET /** - * @symbol ??0UpdateBlockSyncedPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateBlockSyncedPacket(); +#endif + /** + * @symbol ??0UpdateBlockSyncedPacket\@\@QEAA\@XZ */ MCAPI UpdateBlockSyncedPacket(); /** - * @symbol ??0UpdateBlockSyncedPacket\@\@QEAA\@AEBVBlockPos\@\@IIEAEBUActorBlockSyncMessage\@\@\@Z + * @symbol ??0UpdateBlockSyncedPacket\@\@QEAA\@AEBVBlockPos\@\@IIEAEBUActorBlockSyncMessage\@\@\@Z */ MCAPI UpdateBlockSyncedPacket(class BlockPos const &, unsigned int, unsigned int, unsigned char, struct ActorBlockSyncMessage const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp b/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp index 5b61fde364..a24d2708d5 100644 --- a/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateBoundingBoxSystem.hpp @@ -28,8 +28,16 @@ class UpdateBoundingBoxSystem { public: /** - * @symbol ?createSystem\@UpdateBoundingBoxSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@UpdateBoundingBoxSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); + /** + * @symbol ?updateBoundingBoxFromDefinition\@UpdateBoundingBoxSystem\@\@SAXAEAVActor\@\@\@Z + */ + MCAPI static void updateBoundingBoxFromDefinition(class Actor &); + /** + * @symbol ?updatePlayerBoundingBoxFromDefinition\@UpdateBoundingBoxSystem\@\@SAXAEAVPlayer\@\@\@Z + */ + MCAPI static void updatePlayerBoundingBoxFromDefinition(class Player &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp index d67288ca08..f772fb2bf7 100644 --- a/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateClientInputLocksPacket.hpp @@ -28,33 +28,33 @@ class UpdateClientInputLocksPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateClientInputLocksPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateClientInputLocksPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateClientInputLocksPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateClientInputLocksPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateClientInputLocksPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateClientInputLocksPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateClientInputLocksPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateClientInputLocksPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); /** - * @symbol ??0UpdateClientInputLocksPacket\@\@QEAA\@XZ + * @symbol ??0UpdateClientInputLocksPacket\@\@QEAA\@XZ */ MCAPI UpdateClientInputLocksPacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp b/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp index eea0b66241..5544e963ee 100644 --- a/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp +++ b/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnActorProxy.hpp @@ -28,38 +28,38 @@ class UpdateEntityAfterFallOnActorProxy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateEntityAfterFallOnActorProxy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPosDeltaNonConst\@UpdateEntityAfterFallOnActorProxy\@\@UEAAAEAVVec3\@\@XZ + * @vftbl 1 + * @symbol ?getPosDeltaNonConst\@UpdateEntityAfterFallOnActorProxy\@\@UEAAAEAVVec3\@\@XZ */ virtual class Vec3 & getPosDeltaNonConst(); /** - * @vftbl 2 - * @symbol ?isSneaking\@UpdateEntityAfterFallOnActorProxy\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isSneaking\@UpdateEntityAfterFallOnActorProxy\@\@UEBA_NXZ */ virtual bool isSneaking() const; /** - * @vftbl 3 - * @symbol ?onBounceStarted\@UpdateEntityAfterFallOnActorProxy\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 3 + * @symbol ?onBounceStarted\@UpdateEntityAfterFallOnActorProxy\@\@UEAAXAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void onBounceStarted(class BlockPos const &, class Block const &); /** - * @vftbl 4 - * @symbol ?getPosition\@UpdateEntityAfterFallOnActorProxy\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getPosition\@UpdateEntityAfterFallOnActorProxy\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getPosition() const; /** - * @vftbl 5 - * @symbol ?getDimensionBlockSource\@UpdateEntityAfterFallOnActorProxy\@\@UEBAAEBVIConstBlockSource\@\@XZ + * @vftbl 5 + * @symbol ?getDimensionBlockSource\@UpdateEntityAfterFallOnActorProxy\@\@UEBAAEBVIConstBlockSource\@\@XZ */ virtual class IConstBlockSource const & getDimensionBlockSource() const; /** - * @symbol ??0UpdateEntityAfterFallOnActorProxy\@\@QEAA\@AEAUIActorMovementProxy\@\@\@Z + * @symbol ??0UpdateEntityAfterFallOnActorProxy\@\@QEAA\@AEAUIActorMovementProxy\@\@\@Z */ MCAPI UpdateEntityAfterFallOnActorProxy(struct IActorMovementProxy &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnEntityProxyBase.hpp b/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnEntityProxyBase.hpp index 4c1b3963cc..80ee173753 100644 --- a/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnEntityProxyBase.hpp +++ b/LiteLoader/include/llapi/mc/UpdateEntityAfterFallOnEntityProxyBase.hpp @@ -28,8 +28,8 @@ class UpdateEntityAfterFallOnEntityProxyBase { public: /** - * @symbol ?mDummy\@UpdateEntityAfterFallOnEntityProxyBase\@\@2VVec3\@\@A + * @symbol ?mDummy\@UpdateEntityAfterFallOnEntityProxyBase\@\@2VVec3\@\@A */ MCAPI static class Vec3 mDummy; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp index 40fe2bce68..e791fee6f9 100644 --- a/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateEquipPacket.hpp @@ -30,37 +30,43 @@ class UpdateEquipPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateEquipPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateEquipPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateEquipPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateEquipPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateEquipPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateEquipPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateEquipPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateEquipPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEEQUIPPACKET /** - * @symbol ??0UpdateEquipPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateEquipPacket(); +#endif + /** + * @symbol ??0UpdateEquipPacket\@\@QEAA\@XZ */ MCAPI UpdateEquipPacket(); /** - * @symbol ??0UpdateEquipPacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@H$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0UpdateEquipPacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@H$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI UpdateEquipPacket(enum class ContainerID, enum class ContainerType, int, class CompoundTag &&, struct ActorUniqueID const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp b/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp index 67b31b76d6..97cbea84ae 100644 --- a/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateMovingFlagSystem.hpp @@ -28,8 +28,8 @@ class UpdateMovingFlagSystem { public: /** - * @symbol ?createUpdateMovingFlagSystem\@UpdateMovingFlagSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createUpdateMovingFlagSystem\@UpdateMovingFlagSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createUpdateMovingFlagSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp index 222cb74467..99f44416b0 100644 --- a/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdatePlayerGameTypePacket.hpp @@ -30,37 +30,43 @@ class UpdatePlayerGameTypePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdatePlayerGameTypePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdatePlayerGameTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdatePlayerGameTypePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdatePlayerGameTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdatePlayerGameTypePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdatePlayerGameTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdatePlayerGameTypePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdatePlayerGameTypePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATEPLAYERGAMETYPEPACKET /** - * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdatePlayerGameTypePacket(); +#endif + /** + * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@XZ */ MCAPI UpdatePlayerGameTypePacket(); /** - * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@W4GameType\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ??0UpdatePlayerGameTypePacket\@\@QEAA\@W4GameType\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI UpdatePlayerGameTypePacket(enum class GameType, struct ActorUniqueID const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp b/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp index 3ec2f25f35..6e2d8e6b45 100644 --- a/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateRenderPosSystem.hpp @@ -28,16 +28,16 @@ class UpdateRenderPosSystem { public: /** - * @symbol ?createSystem\@UpdateRenderPosSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@UpdateRenderPosSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doUpdateRenderPosSystem\@UpdateRenderPosSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAURenderPositionComponent\@\@\@Z + * @symbol ?_doUpdateRenderPosSystem\@UpdateRenderPosSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUStateVectorComponent\@\@AEAURenderPositionComponent\@\@\@Z */ MCAPI static void _doUpdateRenderPosSystem(class StrictEntityContext const &, struct StateVectorComponent const &, struct RenderPositionComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp index 2ad39ae9a7..b8aaa124bb 100644 --- a/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSoftEnumPacket.hpp @@ -36,37 +36,43 @@ class UpdateSoftEnumPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateSoftEnumPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateSoftEnumPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateSoftEnumPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateSoftEnumPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateSoftEnumPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateSoftEnumPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateSoftEnumPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateSoftEnumPacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATESOFTENUMPACKET /** - * @symbol ??0UpdateSoftEnumPacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UpdateSoftEnumPacket(); +#endif + /** + * @symbol ??0UpdateSoftEnumPacket\@\@QEAA\@XZ */ MCAPI UpdateSoftEnumPacket(); /** - * @symbol ??0UpdateSoftEnumPacket\@\@QEAA\@W4SoftEnumUpdateType\@\@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 + * @symbol ??0UpdateSoftEnumPacket\@\@QEAA\@W4SoftEnumUpdateType\@\@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 */ MCAPI UpdateSoftEnumPacket(enum class SoftEnumUpdateType, std::string const &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp index 427d451da7..4788a36bdb 100644 --- a/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateSubChunkBlocksPacket.hpp @@ -30,41 +30,47 @@ class UpdateSubChunkBlocksPacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateSubChunkBlocksPacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateSubChunkBlocksPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateSubChunkBlocksPacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateSubChunkBlocksPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateSubChunkBlocksPacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateSubChunkBlocksPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateSubChunkBlocksPacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateSubChunkBlocksPacket\@\@MEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATESUBCHUNKBLOCKSPACKET /** - * @symbol ??0UpdateSubChunkBlocksPacket\@\@QEAA\@XZ + * @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 + * @symbol ??0UpdateSubChunkBlocksPacket\@\@QEAA\@AEBV?$vector\@UNetworkBlockInfo\@UpdateSubChunkBlocksPacket\@\@V?$allocator\@UNetworkBlockInfo\@UpdateSubChunkBlocksPacket\@\@\@std\@\@\@std\@\@0\@Z */ MCAPI UpdateSubChunkBlocksPacket(std::vector const &, std::vector const &); /** - * @symbol ?setSubChunkPosition\@UpdateSubChunkBlocksPacket\@\@QEAAXAEBVSubChunkPos\@\@\@Z + * @symbol ?setSubChunkPosition\@UpdateSubChunkBlocksPacket\@\@QEAAXAEBVSubChunkPos\@\@\@Z */ MCAPI void setSubChunkPosition(class SubChunkPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp index 675fc9eac5..295b1863c9 100644 --- a/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp +++ b/LiteLoader/include/llapi/mc/UpdateTradePacket.hpp @@ -30,37 +30,43 @@ class UpdateTradePacket : public Packet { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UpdateTradePacket(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getId\@UpdateTradePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ + * @vftbl 1 + * @symbol ?getId\@UpdateTradePacket\@\@UEBA?AW4MinecraftPacketIds\@\@XZ */ virtual enum class MinecraftPacketIds getId() const; /** - * @vftbl 2 - * @symbol ?getName\@UpdateTradePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@UpdateTradePacket\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?write\@UpdateTradePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z + * @vftbl 3 + * @symbol ?write\@UpdateTradePacket\@\@UEBAXAEAVBinaryStream\@\@\@Z */ virtual void write(class BinaryStream &) const; /** - * @vftbl 6 - * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z + * @vftbl 7 + * @symbol ?_read\@UpdateTradePacket\@\@EEAA?AW4StreamReadResult\@\@AEAVReadOnlyBinaryStream\@\@\@Z */ virtual enum class StreamReadResult _read(class ReadOnlyBinaryStream &); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_UPDATETRADEPACKET /** - * @symbol ??0UpdateTradePacket\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 */ - MCAPI UpdateTradePacket(); + MCVAPI ~UpdateTradePacket(); +#endif /** - * @symbol ??0UpdateTradePacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@4H_N5\@Z + * @symbol ??0UpdateTradePacket\@\@QEAA\@W4ContainerID\@\@W4ContainerType\@\@HAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$$QEAVCompoundTag\@\@AEBUActorUniqueID\@\@4H_N5\@Z */ MCAPI UpdateTradePacket(enum class ContainerID, enum class ContainerType, int, std::string const &, class CompoundTag &&, struct ActorUniqueID const &, struct ActorUniqueID const &, int, bool, bool); + /** + * @symbol ??0UpdateTradePacket\@\@QEAA\@XZ + */ + MCAPI UpdateTradePacket(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpdateWaterStateRequestComponent.hpp b/LiteLoader/include/llapi/mc/UpdateWaterStateRequestComponent.hpp deleted file mode 100644 index 67f5704105..0000000000 --- a/LiteLoader/include/llapi/mc/UpdateWaterStateRequestComponent.hpp +++ /dev/null @@ -1,39 +0,0 @@ -/** - * @file UpdateWaterStateRequestComponent.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC structure UpdateWaterStateRequestComponent. - * - */ -struct UpdateWaterStateRequestComponent { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_UPDATEWATERSTATEREQUESTCOMPONENT -public: - struct UpdateWaterStateRequestComponent& operator=(struct UpdateWaterStateRequestComponent const &) = delete; - UpdateWaterStateRequestComponent(struct UpdateWaterStateRequestComponent const &) = delete; - UpdateWaterStateRequestComponent() = delete; -#endif - -public: - /** - * @symbol ??4UpdateWaterStateRequestComponent\@\@QEAAAEAU0\@$$QEAU0\@\@Z - */ - MCAPI struct UpdateWaterStateRequestComponent & operator=(struct UpdateWaterStateRequestComponent &&); - /** - * @symbol ??1UpdateWaterStateRequestComponent\@\@QEAA\@XZ - */ - MCAPI ~UpdateWaterStateRequestComponent(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/UpdateWaterStateRequestSystem.hpp b/LiteLoader/include/llapi/mc/UpdateWaterStateRequestSystem.hpp index 54e042b7a1..f195a531e1 100644 --- a/LiteLoader/include/llapi/mc/UpdateWaterStateRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/UpdateWaterStateRequestSystem.hpp @@ -28,8 +28,8 @@ class UpdateWaterStateRequestSystem { public: /** - * @symbol ?createSystem\@UpdateWaterStateRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@UpdateWaterStateRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp b/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp index a2f1fc45ba..ee18be06e8 100644 --- a/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp +++ b/LiteLoader/include/llapi/mc/UpgradePatchHelpers.hpp @@ -20,7 +20,7 @@ namespace UpgradePatchHelpers { #undef AFTER_EXTRA /** - * @symbol ?setVersion\@UpgradePatchHelpers\@\@YAXAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?setVersion\@UpgradePatchHelpers\@\@YAXAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void setVersion(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &, std::string const &); diff --git a/LiteLoader/include/llapi/mc/UriListener.hpp b/LiteLoader/include/llapi/mc/UriListener.hpp index c4d5731d20..8cb2abbfc2 100644 --- a/LiteLoader/include/llapi/mc/UriListener.hpp +++ b/LiteLoader/include/llapi/mc/UriListener.hpp @@ -29,5 +29,11 @@ class UriListener { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_URILISTENER + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~UriListener(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UseActorDefinition.hpp b/LiteLoader/include/llapi/mc/UseActorDefinition.hpp index a30b0afbd9..398e954ead 100644 --- a/LiteLoader/include/llapi/mc/UseActorDefinition.hpp +++ b/LiteLoader/include/llapi/mc/UseActorDefinition.hpp @@ -32,9 +32,9 @@ class UseActorDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UseActorDefinition(); + virtual void __unk_vfn_0(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UseActorNode.hpp b/LiteLoader/include/llapi/mc/UseActorNode.hpp index d9e1e52c2f..c66b1482eb 100644 --- a/LiteLoader/include/llapi/mc/UseActorNode.hpp +++ b/LiteLoader/include/llapi/mc/UseActorNode.hpp @@ -29,18 +29,18 @@ class UseActorNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~UseActorNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@UseActorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@UseActorNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @symbol ??0UseActorNode\@\@QEAA\@XZ + * @symbol ??0UseActorNode\@\@QEAA\@XZ */ MCAPI UseActorNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/UseItemGoalUtility.hpp b/LiteLoader/include/llapi/mc/UseItemGoalUtility.hpp index 5949bf3cdb..94508a4a5c 100644 --- a/LiteLoader/include/llapi/mc/UseItemGoalUtility.hpp +++ b/LiteLoader/include/llapi/mc/UseItemGoalUtility.hpp @@ -20,19 +20,19 @@ namespace UseItemGoalUtility { #undef AFTER_EXTRA /** - * @symbol ?finishUsingItem\@UseItemGoalUtility\@\@YAXAEAVMob\@\@AEAUTick\@\@\@Z + * @symbol ?finishUsingItem\@UseItemGoalUtility\@\@YAXAEAVMob\@\@AEAUTick\@\@\@Z */ MCAPI void finishUsingItem(class Mob &, struct Tick &); /** - * @symbol ?isUsingItem\@UseItemGoalUtility\@\@YA_NAEBVMob\@\@\@Z + * @symbol ?isUsingItem\@UseItemGoalUtility\@\@YA_NAEBVMob\@\@\@Z */ MCAPI bool isUsingItem(class Mob const &); /** - * @symbol ?setUsingItem\@UseItemGoalUtility\@\@YAXAEAVMob\@\@_N\@Z + * @symbol ?setUsingItem\@UseItemGoalUtility\@\@YAXAEAVMob\@\@_N\@Z */ MCAPI void setUsingItem(class Mob &, bool); /** - * @symbol ?startUsingItem\@UseItemGoalUtility\@\@YA_NAEAVMob\@\@AEBVItemStack\@\@AEAUTick\@\@\@Z + * @symbol ?startUsingItem\@UseItemGoalUtility\@\@YA_NAEAVMob\@\@AEBVItemStack\@\@AEAUTick\@\@\@Z */ MCAPI bool startUsingItem(class Mob &, class ItemStack const &, struct Tick &); diff --git a/LiteLoader/include/llapi/mc/UseItemGoalUtilityInternal.hpp b/LiteLoader/include/llapi/mc/UseItemGoalUtilityInternal.hpp index c4d0897601..77ae2bc4b8 100644 --- a/LiteLoader/include/llapi/mc/UseItemGoalUtilityInternal.hpp +++ b/LiteLoader/include/llapi/mc/UseItemGoalUtilityInternal.hpp @@ -20,7 +20,7 @@ namespace UseItemGoalUtilityInternal { #undef AFTER_EXTRA /** - * @symbol ?updateEquipment\@UseItemGoalUtilityInternal\@\@YAXAEAVMob\@\@AEBVItemStack\@\@\@Z + * @symbol ?updateEquipment\@UseItemGoalUtilityInternal\@\@YAXAEAVMob\@\@AEBVItemStack\@\@\@Z */ MCAPI void updateEquipment(class Mob &, class ItemStack const &); diff --git a/LiteLoader/include/llapi/mc/UserEntityIdentifierComponent.hpp b/LiteLoader/include/llapi/mc/UserEntityIdentifierComponent.hpp index 03b1269988..5686d03763 100644 --- a/LiteLoader/include/llapi/mc/UserEntityIdentifierComponent.hpp +++ b/LiteLoader/include/llapi/mc/UserEntityIdentifierComponent.hpp @@ -38,28 +38,32 @@ class UserEntityIdentifierComponent { public: /** - * @symbol ??0UserEntityIdentifierComponent\@\@QEAA\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@6\@\@Z + * @symbol ??0UserEntityIdentifierComponent\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI UserEntityIdentifierComponent(class NetworkIdentifier const &, enum class SubClientId, class mce::UUID, std::string const &, std::unique_ptr); + MCAPI UserEntityIdentifierComponent(class UserEntityIdentifierComponent &&); /** - * @symbol ??0UserEntityIdentifierComponent\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0UserEntityIdentifierComponent\@\@QEAA\@AEBVNetworkIdentifier\@\@W4SubClientId\@\@VUUID\@mce\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$unique_ptr\@VCertificate\@\@U?$default_delete\@VCertificate\@\@\@std\@\@\@6\@\@Z */ - MCAPI UserEntityIdentifierComponent(class UserEntityIdentifierComponent &&); + MCAPI UserEntityIdentifierComponent(class NetworkIdentifier const &, enum class SubClientId, class mce::UUID, std::string const &, std::unique_ptr); /** - * @symbol ?isPrimaryClient\@UserEntityIdentifierComponent\@\@QEBA_NXZ + * @symbol ?isPrimaryClient\@UserEntityIdentifierComponent\@\@QEBA_NXZ */ MCAPI bool isPrimaryClient() const; /** - * @symbol ??4UserEntityIdentifierComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4UserEntityIdentifierComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class UserEntityIdentifierComponent & operator=(class UserEntityIdentifierComponent &&); /** - * @symbol ??1UserEntityIdentifierComponent\@\@QEAA\@XZ + * @symbol ??1UserEntityIdentifierComponent\@\@QEAA\@XZ */ MCAPI ~UserEntityIdentifierComponent(); /** - * @symbol ?tryGetFromEntity\@UserEntityIdentifierComponent\@\@SAPEAV1\@AEAVEntityContext\@\@\@Z + * @symbol ?tryGetFromEntity\@UserEntityIdentifierComponent\@\@SAPEAV1\@AEAVEntityContext\@\@\@Z */ MCAPI static class UserEntityIdentifierComponent * tryGetFromEntity(class EntityContext &); + /** + * @symbol ?tryGetFromEntity\@UserEntityIdentifierComponent\@\@SAPEBV1\@AEBVEntityContext\@\@\@Z + */ + MCAPI static class UserEntityIdentifierComponent const * tryGetFromEntity(class EntityContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Util.hpp b/LiteLoader/include/llapi/mc/Util.hpp index 3d6771dac2..521dd55d9e 100644 --- a/LiteLoader/include/llapi/mc/Util.hpp +++ b/LiteLoader/include/llapi/mc/Util.hpp @@ -47,343 +47,327 @@ struct FormattedString { #undef AFTER_EXTRA /** - * @symbol ?COLOR_CODE\@Util\@\@3HB + * @symbol ?COLOR_CODE\@Util\@\@3HB */ MCAPI extern int const COLOR_CODE; /** - * @symbol ?EMPTY_GUID\@Util\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EMPTY_GUID\@Util\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const EMPTY_GUID; /** - * @symbol ?EMPTY_STRING\@Util\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?EMPTY_STRING\@Util\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const EMPTY_STRING; /** - * @symbol ?NEW_LINE\@Util\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NEW_LINE\@Util\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const NEW_LINE; /** - * @symbol ?_breakIntoWordsAndFindProfanity\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@HH\@std\@\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@AEBV?$unordered_set\@DU?$hash\@D\@std\@\@U?$equal_to\@D\@2\@V?$allocator\@D\@2\@\@3\@AEAV?$set\@U?$pair\@HH\@std\@\@U?$less\@U?$pair\@HH\@std\@\@\@2\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z + * @symbol ?_breakIntoWordsAndFindProfanity\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@HH\@std\@\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@AEBV?$unordered_set\@DU?$hash\@D\@std\@\@U?$equal_to\@D\@2\@V?$allocator\@D\@2\@\@3\@AEAV?$set\@U?$pair\@HH\@std\@\@U?$less\@U?$pair\@HH\@std\@\@\@2\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z */ MCAPI void _breakIntoWordsAndFindProfanity(std::string &, std::vector> const &, class std::unordered_set, struct std::equal_to, class std::allocator> const &, class std::set, struct std::less>, class std::allocator>> &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class std::unordered_set, struct std::equal_to, class std::allocator> const &); /** - * @symbol ?_logIfValidLogArea\@Util\@\@YAXW4LogArea\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_logIfValidLogArea\@Util\@\@YAXW4LogArea\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _logIfValidLogArea(enum class LogArea, std::string const &); /** - * @symbol ?_recordProfanityLocationInWord\@Util\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@HH\@std\@\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@HHAEAV?$set\@U?$pair\@HH\@std\@\@U?$less\@U?$pair\@HH\@std\@\@\@2\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z + * @symbol ?_recordProfanityLocationInWord\@Util\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@HH\@std\@\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@HHAEAV?$set\@U?$pair\@HH\@std\@\@U?$less\@U?$pair\@HH\@std\@\@\@2\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@3\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z */ MCAPI void _recordProfanityLocationInWord(std::string const &, std::vector> const &, int, int, class std::set, struct std::less>, class std::allocator>> &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class std::unordered_set, struct std::equal_to, class std::allocator> const &); /** - * @symbol ?allocateVFormat\@Util\@\@YA?AUFormattedString\@1\@PEBDPEAD\@Z + * @symbol ?allocateVFormat\@Util\@\@YA?AUFormattedString\@1\@PEBDPEAD\@Z */ MCAPI struct Util::FormattedString allocateVFormat(char const *, char *); /** - * @symbol ?base64_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?base64_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string base64_decode(std::string const &); /** - * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_N\@Z + * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@_N\@Z */ MCAPI std::string base64_encode(std::string const &, bool); /** - * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K_N\@Z + * @symbol ?base64_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K_N\@Z */ MCAPI std::string base64_encode(unsigned char const *, unsigned __int64, bool); /** - * @symbol ?base64url_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z + * @symbol ?base64url_decode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ MCAPI std::string base64url_decode(std::string); /** - * @symbol ?base64url_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z + * @symbol ?base64url_encode\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ 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\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI std::string boolToString(bool); /** - * @symbol ?clearAndReturn\@Util\@\@YAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z + * @symbol ?clearAndReturn\@Util\@\@YAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ MCAPI std::string & clearAndReturn(std::string &); /** - * @symbol ?compareNoCase\@Util\@\@YA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z + * @symbol ?compareNoCase\@Util\@\@YA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z */ - MCAPI bool compareNoCase(class gsl::basic_string_span, class gsl::basic_string_span); + MCAPI bool compareNoCase(class std::basic_string_view>, class std::basic_string_view>); /** - * @symbol ?cp1252ToUTF8\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?cp1252ToUTF8\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string cp1252ToUTF8(std::string const &); /** - * @symbol ?cp437ToUTF8\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?cp437ToUTF8\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string cp437ToUTF8(std::string const &); /** - * @symbol ?decompressRaw\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z + * @symbol ?decompressRaw\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@\@Z */ MCAPI bool decompressRaw(std::string const &, std::string &); /** - * @symbol ?endsWith\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?endsWith\@Util\@\@YA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z */ - MCAPI bool endsWith(std::string const &, std::string const &); + MCAPI bool endsWith(class std::basic_string_view>, class std::basic_string_view>); /** - * @symbol ?endsWith\@Util\@\@YA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z - */ - MCAPI bool endsWith(class gsl::basic_string_span, class gsl::basic_string_span); - /** - * @symbol ?endsWithCaseInsensitive\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z + * @symbol ?endsWithCaseInsensitive\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z */ MCAPI bool endsWithCaseInsensitive(std::string const &, std::string const &); /** - * @symbol ?ensureNamespace\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?ensureNamespace\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string ensureNamespace(std::string const &); /** - * @symbol ?filterProfanityFromString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z + * @symbol ?filterProfanityFromString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z */ MCAPI std::string filterProfanityFromString(std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class std::unordered_set, struct std::equal_to, class std::allocator> const &); /** - * @symbol ?findProfanityInString\@Util\@\@YA?AV?$set\@U?$pair\@HH\@std\@\@U?$less\@U?$pair\@HH\@std\@\@\@2\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z + * @symbol ?findProfanityInString\@Util\@\@YA?AV?$set\@U?$pair\@HH\@std\@\@U?$less\@U?$pair\@HH\@std\@\@\@2\@V?$allocator\@U?$pair\@HH\@std\@\@\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HU?$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\@\@H\@std\@\@\@2\@\@3\@AEBV?$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\@\@3\@\@Z */ MCAPI class std::set, struct std::less>, class std::allocator>> findProfanityInString(std::string const &, class std::unordered_map, struct std::equal_to, class std::allocator>> const &, class std::unordered_set, struct std::equal_to, class std::allocator> const &); /** - * @symbol ?format\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDZZ + * @symbol ?format\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDZZ */ MCAPI std::string format(char const *, ...); /** - * @symbol ?freeStringMemory\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?freeStringMemory\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void freeStringMemory(std::string &); /** - * @symbol ?fromHex\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?fromHex\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string fromHex(class gsl::basic_string_span); + MCAPI std::string fromHex(class std::basic_string_view>); /** - * @symbol ?generateHashMapFromListTag\@Util\@\@YA?AV?$BidirectionalUnorderedMap\@H_K\@\@AEBVListTag\@\@\@Z + * @symbol ?generateHashMapFromListTag\@Util\@\@YA?AV?$BidirectionalUnorderedMap\@H_K\@\@AEBVListTag\@\@\@Z */ MCAPI class BidirectionalUnorderedMap generateHashMapFromListTag(class ListTag const &); /** - * @symbol ?getDataInheritance\@Util\@\@YA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?getDataInheritance\@Util\@\@YA?AU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI struct std::pair getDataInheritance(std::string const &); /** - * @symbol ?getNameWithoutNamespace\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getNameWithoutNamespace\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string getNameWithoutNamespace(std::string const &); /** - * @symbol ?getNamespace\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?getNamespace\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string getNamespace(std::string const &); /** - * @symbol ?hashCode\@Util\@\@YAIV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?hashCode\@Util\@\@YAIV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI unsigned int hashCode(class std::basic_string_view>); /** - * @symbol ?hashCodeAsUtf16\@Util\@\@YAIV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z + * @symbol ?hashCodeAsUtf16\@Util\@\@YAIV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ MCAPI unsigned int hashCodeAsUtf16(class std::basic_string_view>); /** - * @symbol ?isAlphaNumeric\@Util\@\@YA_ND\@Z + * @symbol ?isAlphaNumeric\@Util\@\@YA_ND\@Z */ MCAPI bool isAlphaNumeric(char); /** - * @symbol ?isAlphabeticChar\@Util\@\@YA_ND\@Z + * @symbol ?isAlphabeticChar\@Util\@\@YA_ND\@Z */ MCAPI bool isAlphabeticChar(char); /** - * @symbol ?isDigit\@Util\@\@YA_ND\@Z + * @symbol ?isDigit\@Util\@\@YA_ND\@Z */ MCAPI bool isDigit(char); /** - * @symbol ?isIdentifierChar\@Util\@\@YA_ND\@Z + * @symbol ?isIdentifierChar\@Util\@\@YA_ND\@Z */ MCAPI bool isIdentifierChar(char); /** - * @symbol ?isIntegral\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?isIntegral\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI bool isIntegral(std::string const &, bool); /** - * @symbol ?isStartIdentifierChar\@Util\@\@YA_ND\@Z + * @symbol ?isStartIdentifierChar\@Util\@\@YA_ND\@Z */ MCAPI bool isStartIdentifierChar(char); /** - * @symbol ?isUpperCaseAlphabetic\@Util\@\@YA_ND\@Z + * @symbol ?isUpperCaseAlphabetic\@Util\@\@YA_ND\@Z */ MCAPI bool isUpperCaseAlphabetic(char); /** - * @symbol ?isValidNamespaceFormat\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isValidNamespaceFormat\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isValidNamespaceFormat(std::string const &); /** - * @symbol ?isValidUTF8\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isValidUTF8\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isValidUTF8(std::string const &); /** - * @symbol ?isVanillaNamespace\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?isVanillaNamespace\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool isVanillaNamespace(std::string const &); /** - * @symbol ?isWhiteSpace\@Util\@\@YAHD\@Z + * @symbol ?isWhiteSpace\@Util\@\@YA_ND\@Z */ - MCAPI int isWhiteSpace(char); + MCAPI bool isWhiteSpace(char); /** - * @symbol ?loadGameVersion\@Util\@\@YAXAEAVSemVersion\@\@AEBVValue\@Json\@\@\@Z + * @symbol ?loadGameVersion\@Util\@\@YAXAEAVSemVersion\@\@AEBVValue\@Json\@\@\@Z */ MCAPI void loadGameVersion(class SemVersion &, class Json::Value const &); /** - * @symbol ?loadGameVersionFromJsonString\@Util\@\@YA?AVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?loadGameVersionFromJsonString\@Util\@\@YA?AVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class SemVersion loadGameVersionFromJsonString(std::string const &); /** - * @symbol ?removeChars\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@AEBV23\@\@Z + * @symbol ?removeChars\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@AEBV23\@\@Z */ MCAPI std::string removeChars(std::string, std::string const &); /** - * @symbol ?removeIllegalChars\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z + * @symbol ?removeIllegalChars\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V23\@\@Z */ MCAPI std::string removeIllegalChars(std::string); /** - * @symbol ?removeTrailingSpaces\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?removeTrailingSpaces\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string removeTrailingSpaces(std::string const &); /** - * @symbol ?replaceUtf8CharactersWithAscii\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@\@2\@\@3\@\@Z + * @symbol ?replaceUtf8CharactersWithAscii\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$vector\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@V?$allocator\@U?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@std\@\@\@2\@\@3\@\@Z */ MCAPI void replaceUtf8CharactersWithAscii(std::string &, std::vector> const &); /** - * @symbol ?safeGetline\@Util\@\@YAAEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV23\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?safeGetline\@Util\@\@YAAEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAV23\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::basic_istream> & safeGetline(class std::basic_istream> &, std::string &); /** - * @symbol ?simpleFormat\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@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 + * @symbol ?simpleFormat\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@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 */ MCAPI std::string simpleFormat(std::string const &, std::vector const &); /** - * @symbol ?split\@Util\@\@YA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@D\@Z + * @symbol ?splitAndDiscardEmpty\@Util\@\@YA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@D\@Z */ - MCAPI std::vector split(std::string const &, char); + MCAPI std::vector splitAndDiscardEmpty(std::string const &, char); /** - * @symbol ?splitLines\@Util\@\@YA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV23\@_N2P6AAEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@3\@AEAV53\@AEAV43\@\@Z\@Z + * @symbol ?splitLines\@Util\@\@YA?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\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBV23\@_N2P6AAEAV?$basic_istream\@DU?$char_traits\@D\@std\@\@\@3\@AEAV53\@AEAV43\@\@Z\@Z */ MCAPI std::vector splitLines(std::string const &, std::vector const &, bool, bool, class std::basic_istream> & ( *)(class std::basic_istream> &, std::string &)); /** - * @symbol ?splitString\@Util\@\@YAAEAV?$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?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@DAEAV23\@\@Z + * @symbol ?splitString\@Util\@\@YAAEAV?$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?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@DAEAV23\@\@Z */ MCAPI std::vector & splitString(class std::basic_string_view>, char, std::vector &); /** - * @symbol ?splitStringAsViews\@Util\@\@YAAEAV?$vector\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$allocator\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@DAEAV23\@\@Z + * @symbol ?splitStringAsViews\@Util\@\@YAAEAV?$vector\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$allocator\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@DAEAV23\@\@Z */ MCAPI std::vector>> & splitStringAsViews(class std::basic_string_view>, char, std::vector>> &); /** - * @symbol ?startsWith\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@0\@Z - */ - MCAPI bool startsWith(std::string const &, std::string const &); - /** - * @symbol ?startsWith\@Util\@\@YA_NV?$basic_string_span\@$$CBD$0?0\@gsl\@\@0\@Z + * @symbol ?startsWith\@Util\@\@YA_NV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@0\@Z */ - MCAPI bool startsWith(class gsl::basic_string_span, class gsl::basic_string_span); + MCAPI bool startsWith(class std::basic_string_view>, class std::basic_string_view>); /** - * @symbol ?stringContains\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@Z + * @symbol ?stringContains\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@D\@Z */ MCAPI bool stringContains(std::string const &, char); /** - * @symbol ?stringReplace\@Util\@\@YAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@AEBV23\@1H\@Z + * @symbol ?stringReplace\@Util\@\@YAAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV23\@AEBV23\@1H\@Z */ MCAPI std::string & stringReplace(std::string &, std::string const &, std::string const &, int); /** - * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z + * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@0\@Z */ MCAPI std::string stringTrim(std::string const &, std::string const &); /** - * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?stringTrim\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ MCAPI std::string stringTrim(std::string const &); /** - * @symbol ?stripBOM\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?stripBOM\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void stripBOM(std::string &); /** - * @symbol ?toBool\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_N\@Z + * @symbol ?toBool\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEA_N\@Z */ MCAPI bool toBool(std::string const &, bool &); /** - * @symbol ?toCamelCase\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@D\@Z + * @symbol ?toCamelCase\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@D\@Z */ MCAPI std::string toCamelCase(std::string const &, char); /** - * @symbol ?toHex\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?toHex\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string toHex(class gsl::basic_string_span); + MCAPI std::string toHex(class std::basic_string_view>); /** - * @symbol ?toIntWithMinMax\@Util\@\@YA?AW4NumberConversionResult\@1\@V?$basic_string_span\@$$CBD$0?0\@gsl\@\@AEAHHH\@Z + * @symbol ?toIntWithMinMax\@Util\@\@YA?AW4NumberConversionResult\@1\@V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@AEAHHH\@Z */ - MCAPI enum class Util::NumberConversionResult toIntWithMinMax(class gsl::basic_string_span, int &, int, int); + MCAPI enum class Util::NumberConversionResult toIntWithMinMax(class std::basic_string_view>, int &, int, int); /** - * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string toLower(std::string const &); + MCAPI std::string toLower(class std::basic_string_view> const &); /** - * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z - */ - MCAPI std::string toLower(class gsl::basic_string_span const &); - /** - * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z + * @symbol ?toLower\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBD\@Z */ MCAPI std::string toLower(char const *); /** - * @symbol ?toLowerInPlace\@Util\@\@YAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @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\@\@YAPEBDW4BoneTransformType\@\@\@Z + * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MH\@Z */ - MCAPI char const * toString(enum class BoneTransformType); + MCAPI std::string toString(float, int); /** - * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z + * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@3\@\@Z */ - MCAPI std::string toString(std::string const &); + MCAPI std::string toString(class std::basic_string, class std::allocator> const &); /** - * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@MH\@Z + * @symbol ?toString\@Util\@\@YAPEBDW4BoneTransformType\@\@\@Z */ - MCAPI std::string toString(float, int); + MCAPI char const * toString(enum class BoneTransformType); /** - * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@3\@\@Z + * @symbol ?toString\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z */ - MCAPI std::string toString(class std::basic_string, class std::allocator> const &); + MCAPI std::string toString(std::string const &); /** - * @symbol ?toStringWithPaddedZeroes\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IE\@Z + * @symbol ?toStringWithPaddedZeroes\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@IE\@Z */ MCAPI std::string toStringWithPaddedZeroes(unsigned int, unsigned char); /** - * @symbol ?toUpper\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@\@Z - */ - MCAPI std::string toUpper(std::string const &); - /** - * @symbol ?toUpper\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?toUpper\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@3\@\@Z */ - MCAPI std::string toUpper(class gsl::basic_string_span const &); + MCAPI std::string toUpper(class std::basic_string_view> const &); /** - * @symbol ?toWideString\@Util\@\@YA?AV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @symbol ?toWideString\@Util\@\@YA?AV?$basic_string\@_WU?$char_traits\@_W\@std\@\@V?$allocator\@_W\@2\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ MCAPI class std::basic_string, class std::allocator> toWideString(std::string const &); /** - * @symbol ?utf8len\@Util\@\@YAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?utf8len\@Util\@\@YAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI int utf8len(std::string const &); /** - * @symbol ?utf8substring\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@HH\@Z + * @symbol ?utf8substring\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@HH\@Z */ MCAPI std::string utf8substring(std::string const &, int, int); /** - * @symbol ?vFormat\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDPEAD\@Z + * @symbol ?vFormat\@Util\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBDPEAD\@Z */ MCAPI std::string vFormat(char const *, char *); /** - * @symbol ?validateIdentifier\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LogArea\@\@_NPEAU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@3\@\@Z + * @symbol ?validateIdentifier\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LogArea\@\@_NPEAU?$pair\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V12\@\@3\@\@Z */ MCAPI bool validateIdentifier(std::string const &, enum class LogArea, bool, struct std::pair *); /** - * @symbol ?validateIdentifierChunk\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LogArea\@\@\@Z + * @symbol ?validateIdentifierChunk\@Util\@\@YA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4LogArea\@\@\@Z */ MCAPI bool validateIdentifierChunk(std::string const &, enum class LogArea); diff --git a/LiteLoader/include/llapi/mc/VRBobControlSystem.hpp b/LiteLoader/include/llapi/mc/VRBobControlSystem.hpp new file mode 100644 index 0000000000..9ab1b587d0 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VRBobControlSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file VRBobControlSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class VRBobControlSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VRBOBCONTROLSYSTEM +public: + class VRBobControlSystem& operator=(class VRBobControlSystem const &) = delete; + VRBobControlSystem(class VRBobControlSystem const &) = delete; + VRBobControlSystem() = delete; +#endif + +public: + /** + * @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 new file mode 100644 index 0000000000..27c996a9d1 --- /dev/null +++ b/LiteLoader/include/llapi/mc/VRBobControlSystemInternal.hpp @@ -0,0 +1,24 @@ +/** + * @file VRBobControlSystemInternal.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +namespace VRBobControlSystemInternal { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA + /** + * @symbol ?tickVRBobControl\@VRBobControlSystemInternal\@\@YAXAEBVStrictEntityContext\@\@AEBUAABBShapeComponent\@\@AEBUAbilitiesComponent\@\@AEAUStateVectorComponent\@\@AEBVIConstBlockSource\@\@\@Z + */ + MCAPI void tickVRBobControl(class StrictEntityContext const &, struct AABBShapeComponent const &, struct AbilitiesComponent 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 6747a44331..d82dc918d5 100644 --- a/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/VRFlyTravelSystem.hpp @@ -25,12 +25,20 @@ class VRFlyTravelSystem { public: /** - * @symbol ?_postPlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUAbilitiesComponent\@\@AEBULocalPlayerPrePlayerTravelComponent\@\@\@Z + * @symbol ?_postPlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUAbilitiesComponent\@\@AEBULocalPlayerPrePlayerTravelComponent\@\@\@Z */ MCAPI static void _postPlayerTravelSystem(class StrictEntityContext const &, struct AbilitiesComponent &, struct LocalPlayerPrePlayerTravelComponent const &); /** - * @symbol ?createPostPlayerTravelSystem\@VRFlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?_prePlayerTravelSystem\@VRFlyTravelSystem\@\@SAXAEBVStrictEntityContext\@\@AEAUMobTravelComponent\@\@AEAUAbilitiesComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@ULocalPlayerPrePlayerTravelComponent\@\@\@\@\@Z + */ + MCAPI static void _prePlayerTravelSystem(class StrictEntityContext const &, struct MobTravelComponent &, struct AbilitiesComponent &, class EntityModifierT); + /** + * @symbol ?createPostPlayerTravelSystem\@VRFlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createPostPlayerTravelSystem(); + /** + * @symbol ?createPrePlayerTravelSystem\@VRFlyTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createPrePlayerTravelSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp b/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp index 1b7d1dfbf8..8e63d79813 100644 --- a/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp +++ b/LiteLoader/include/llapi/mc/VRRotateControlSystem.hpp @@ -28,8 +28,8 @@ class VRRotateControlSystem { public: /** - * @symbol ?create\@VRRotateControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@VRRotateControlSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ValidatorRegistry.hpp b/LiteLoader/include/llapi/mc/ValidatorRegistry.hpp index 397f164d69..33f6b52561 100644 --- a/LiteLoader/include/llapi/mc/ValidatorRegistry.hpp +++ b/LiteLoader/include/llapi/mc/ValidatorRegistry.hpp @@ -31,20 +31,20 @@ class ValidatorRegistry { public: /** - * @symbol ?findValidators\@ValidatorRegistry\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValidatorRegistryValidators\@1\@\@Z + * @symbol ?findValidators\@ValidatorRegistry\@\@SA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVValidatorRegistryValidators\@1\@\@Z */ MCAPI static bool findValidators(std::string const &, class ValidatorRegistry::ValidatorRegistryValidators &); /** - * @symbol ?registerValidators\@ValidatorRegistry\@\@SAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@V?$function\@$$A6A?AVContentTierIncompatibleReason\@\@AEBVPackInstance\@\@AEBVContentTierInfo\@\@\@Z\@std\@\@V?$function\@$$A6A?AVContentTierIncompatibleReason\@\@AEBUSubpackInfo\@\@AEBVContentTierInfo\@\@\@Z\@5\@\@Z + * @symbol ?registerValidators\@ValidatorRegistry\@\@SAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@V?$function\@$$A6A?AVContentTierIncompatibleReason\@\@AEBVPackInstance\@\@AEBVContentTierInfo\@\@\@Z\@3\@V?$function\@$$A6A?AVContentTierIncompatibleReason\@\@AEBUSubpackInfo\@\@AEBVContentTierInfo\@\@\@Z\@3\@\@Z */ - MCAPI static void registerValidators(class gsl::basic_string_span, class std::function, class std::function); + MCAPI static void registerValidators(class std::basic_string_view>, class std::function, class std::function); //private: /** - * @symbol ?_get\@ValidatorRegistry\@\@CA?AV?$NonOwnerPointer\@VValidatorRegistry\@\@\@Bedrock\@\@XZ + * @symbol ?_get\@ValidatorRegistry\@\@CA?AV?$NonOwnerPointer\@VValidatorRegistry\@\@\@Bedrock\@\@XZ */ MCAPI static class Bedrock::NonOwnerPointer _get(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp b/LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp index ccf38f79d9..6d20f6285b 100644 --- a/LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp +++ b/LiteLoader/include/llapi/mc/VanillaActorRendererId.hpp @@ -22,55 +22,55 @@ namespace VanillaActorRendererId { #undef AFTER_EXTRA /** - * @symbol ?_map\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?_map\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const _map; /** - * @symbol ?_photo\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?_photo\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const _photo; /** - * @symbol ?_query\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?_query\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const _query; /** - * @symbol ?elderGuardian\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?elderGuardian\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const elderGuardian; /** - * @symbol ?elderGuardianGhost\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?elderGuardianGhost\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const elderGuardianGhost; /** - * @symbol ?guardian\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?guardian\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const guardian; /** - * @symbol ?itemEntity\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?itemEntity\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const itemEntity; /** - * @symbol ?lingeringPotion\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?lingeringPotion\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const lingeringPotion; /** - * @symbol ?npc\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?npc\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const npc; /** - * @symbol ?player\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?player\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const player; /** - * @symbol ?shield\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?shield\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const shield; /** - * @symbol ?thrownPotion\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?thrownPotion\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const thrownPotion; /** - * @symbol ?trident\@VanillaActorRendererId\@\@3VHashedString\@\@B + * @symbol ?trident\@VanillaActorRendererId\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const trident; diff --git a/LiteLoader/include/llapi/mc/VanillaActors.hpp b/LiteLoader/include/llapi/mc/VanillaActors.hpp index 7a7fb6b0ea..94b22ed17b 100644 --- a/LiteLoader/include/llapi/mc/VanillaActors.hpp +++ b/LiteLoader/include/llapi/mc/VanillaActors.hpp @@ -22,7 +22,7 @@ namespace VanillaActors { #undef AFTER_EXTRA /** - * @symbol ?registerVanillaActorData\@VanillaActors\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?registerVanillaActorData\@VanillaActors\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI void registerVanillaActorData(class BaseGameVersion const &, class Experiments const &); diff --git a/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureBlockRules.hpp b/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureBlockRules.hpp index b2f9ad85a7..ba0cfd2861 100644 --- a/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureBlockRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureBlockRules.hpp @@ -28,8 +28,8 @@ class VanillaAncientCityJigsawStructureBlockRules { public: /** - * @symbol ?initialize\@VanillaAncientCityJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaAncientCityJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureElements.hpp b/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureElements.hpp index 243fd96dce..0ddc86424b 100644 --- a/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureElements.hpp +++ b/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructureElements.hpp @@ -29,8 +29,8 @@ class VanillaAncientCityJigsawStructureElements { public: /** - * @symbol ?initialize\@VanillaAncientCityJigsawStructureElements\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaAncientCityJigsawStructureElements\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class gsl::not_null>, class FeatureRegistry &, class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructures.hpp b/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructures.hpp index c0caa7c3ef..173a4d6115 100644 --- a/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaAncientCityJigsawStructures.hpp @@ -29,8 +29,8 @@ class VanillaAncientCityJigsawStructures { public: /** - * @symbol ?initialize\@VanillaAncientCityJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaAncientCityJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class gsl::not_null>, class FeatureRegistry &, class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp b/LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp index 2f24cb2971..c49f6d82e8 100644 --- a/LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp +++ b/LiteLoader/include/llapi/mc/VanillaAppConfigs.hpp @@ -32,149 +32,149 @@ class VanillaAppConfigs : public AppConfigs { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VanillaAppConfigs(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @vftbl 24 + * @symbol __unk_vfn_24 */ virtual void __unk_vfn_24(); /** - * @vftbl 25 - * @symbol __unk_vfn_25 + * @vftbl 25 + * @symbol __unk_vfn_25 */ virtual void __unk_vfn_25(); /** - * @vftbl 26 - * @symbol __unk_vfn_26 + * @vftbl 26 + * @symbol __unk_vfn_26 */ virtual void __unk_vfn_26(); /** - * @vftbl 27 - * @symbol __unk_vfn_27 + * @vftbl 27 + * @symbol __unk_vfn_27 */ virtual void __unk_vfn_27(); /** - * @vftbl 28 - * @symbol __unk_vfn_28 + * @vftbl 28 + * @symbol __unk_vfn_28 */ virtual void __unk_vfn_28(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 31 - * @symbol __unk_vfn_31 + * @vftbl 31 + * @symbol __unk_vfn_31 */ virtual void __unk_vfn_31(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp index 08f54f930f..2de142c858 100644 --- a/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureBlockRules.hpp @@ -30,8 +30,8 @@ class VanillaBastionJigsawStructureBlockRules { public: /** - * @symbol ?initialize\@VanillaBastionJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaBastionJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp index 807ffdfe5b..e1527bcd06 100644 --- a/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructureElements.hpp @@ -31,8 +31,8 @@ class VanillaBastionJigsawStructureElements { public: /** - * @symbol ?initialize\@VanillaBastionJigsawStructureElements\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaBastionJigsawStructureElements\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class gsl::not_null>, class FeatureRegistry &, class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp index e4ec3dbabd..16e085e872 100644 --- a/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBastionJigsawStructures.hpp @@ -31,8 +31,8 @@ class VanillaBastionJigsawStructures { public: /** - * @symbol ?initialize\@VanillaBastionJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaBastionJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class gsl::not_null>, class FeatureRegistry &, class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp b/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp index fec9e4d791..39827cf30b 100644 --- a/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBiomeNames.hpp @@ -20,343 +20,343 @@ namespace VanillaBiomeNames { #undef AFTER_EXTRA /** - * @symbol ?BambooJungle\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BambooJungle\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooJungle; /** - * @symbol ?BambooJungleHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BambooJungleHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooJungleHills; /** - * @symbol ?BasaltDeltas\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BasaltDeltas\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BasaltDeltas; /** - * @symbol ?Beach\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Beach\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Beach; /** - * @symbol ?BirchForest\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BirchForest\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchForest; /** - * @symbol ?BirchForestHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BirchForestHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchForestHills; /** - * @symbol ?BirchForestHillsMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BirchForestHillsMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchForestHillsMutated; /** - * @symbol ?BirchForestMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?BirchForestMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchForestMutated; /** - * @symbol ?ColdBeach\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ColdBeach\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColdBeach; /** - * @symbol ?ColdOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ColdOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColdOcean; /** - * @symbol ?ColdTaiga\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ColdTaiga\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColdTaiga; /** - * @symbol ?ColdTaigaHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ColdTaigaHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColdTaigaHills; /** - * @symbol ?ColdTaigaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ColdTaigaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColdTaigaMutated; /** - * @symbol ?CrimsonForest\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?CrimsonForest\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonForest; /** - * @symbol ?DeepColdOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DeepColdOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepColdOcean; /** - * @symbol ?DeepDark\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DeepDark\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepDark; /** - * @symbol ?DeepFrozenOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DeepFrozenOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepFrozenOcean; /** - * @symbol ?DeepLukewarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DeepLukewarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepLukewarmOcean; /** - * @symbol ?DeepOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DeepOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepOcean; /** - * @symbol ?DeepWarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DeepWarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepWarmOcean; /** - * @symbol ?Desert\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Desert\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Desert; /** - * @symbol ?DesertHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DesertHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DesertHills; /** - * @symbol ?DesertMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DesertMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DesertMutated; /** - * @symbol ?DripstoneCaves\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?DripstoneCaves\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DripstoneCaves; /** - * @symbol ?ExtremeHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ExtremeHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExtremeHills; /** - * @symbol ?ExtremeHillsEdge\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ExtremeHillsEdge\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExtremeHillsEdge; /** - * @symbol ?ExtremeHillsMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ExtremeHillsMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExtremeHillsMutated; /** - * @symbol ?ExtremeHillsPlusTrees\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ExtremeHillsPlusTrees\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExtremeHillsPlusTrees; /** - * @symbol ?ExtremeHillsPlusTreesMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ExtremeHillsPlusTreesMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExtremeHillsPlusTreesMutated; /** - * @symbol ?FlowerForest\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?FlowerForest\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlowerForest; /** - * @symbol ?Forest\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Forest\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Forest; /** - * @symbol ?ForestHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?ForestHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ForestHills; /** - * @symbol ?FrozenOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?FrozenOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FrozenOcean; /** - * @symbol ?FrozenPeaks\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?FrozenPeaks\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FrozenPeaks; /** - * @symbol ?FrozenRiver\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?FrozenRiver\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FrozenRiver; /** - * @symbol ?Grove\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Grove\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Grove; /** - * @symbol ?Hell\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Hell\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Hell; /** - * @symbol ?IceMountains\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?IceMountains\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IceMountains; /** - * @symbol ?IcePlains\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?IcePlains\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IcePlains; /** - * @symbol ?IcePlainsSpikes\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?IcePlainsSpikes\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IcePlainsSpikes; /** - * @symbol ?JaggedPeaks\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?JaggedPeaks\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JaggedPeaks; /** - * @symbol ?Jungle\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Jungle\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Jungle; /** - * @symbol ?JungleEdge\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?JungleEdge\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleEdge; /** - * @symbol ?JungleEdgeMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?JungleEdgeMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleEdgeMutated; /** - * @symbol ?JungleHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?JungleHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleHills; /** - * @symbol ?JungleMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?JungleMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleMutated; /** - * @symbol ?LegacyFrozenOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?LegacyFrozenOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LegacyFrozenOcean; /** - * @symbol ?LukewarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?LukewarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LukewarmOcean; /** - * @symbol ?LushCaves\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?LushCaves\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LushCaves; /** - * @symbol ?MangroveSwamp\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MangroveSwamp\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveSwamp; /** - * @symbol ?Meadow\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Meadow\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Meadow; /** - * @symbol ?MegaTaiga\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MegaTaiga\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MegaTaiga; /** - * @symbol ?MegaTaigaHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MegaTaigaHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MegaTaigaHills; /** - * @symbol ?Mesa\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Mesa\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Mesa; /** - * @symbol ?MesaBryce\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MesaBryce\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MesaBryce; /** - * @symbol ?MesaPlateau\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MesaPlateau\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MesaPlateau; /** - * @symbol ?MesaPlateauMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MesaPlateauMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MesaPlateauMutated; /** - * @symbol ?MesaPlateauStone\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MesaPlateauStone\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MesaPlateauStone; /** - * @symbol ?MesaPlateauStoneMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MesaPlateauStoneMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MesaPlateauStoneMutated; /** - * @symbol ?MushroomIsland\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MushroomIsland\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MushroomIsland; /** - * @symbol ?MushroomIslandShore\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?MushroomIslandShore\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MushroomIslandShore; /** - * @symbol ?Ocean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Ocean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Ocean; /** - * @symbol ?Plains\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Plains\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Plains; /** - * @symbol ?RedwoodTaigaHillsMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?RedwoodTaigaHillsMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedwoodTaigaHillsMutated; /** - * @symbol ?RedwoodTaigaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?RedwoodTaigaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedwoodTaigaMutated; /** - * @symbol ?River\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?River\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const River; /** - * @symbol ?RoofedForest\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?RoofedForest\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RoofedForest; /** - * @symbol ?RoofedForestMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?RoofedForestMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RoofedForestMutated; /** - * @symbol ?Savanna\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Savanna\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Savanna; /** - * @symbol ?SavannaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SavannaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SavannaMutated; /** - * @symbol ?SavannaPlateau\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SavannaPlateau\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SavannaPlateau; /** - * @symbol ?SavannaPlateauMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SavannaPlateauMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SavannaPlateauMutated; /** - * @symbol ?SnowySlopes\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SnowySlopes\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SnowySlopes; /** - * @symbol ?SoulsandValley\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SoulsandValley\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulsandValley; /** - * @symbol ?StoneBeach\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?StoneBeach\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneBeach; /** - * @symbol ?StonyPeaks\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?StonyPeaks\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StonyPeaks; /** - * @symbol ?SunflowerPlains\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SunflowerPlains\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SunflowerPlains; /** - * @symbol ?Swampland\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Swampland\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Swampland; /** - * @symbol ?SwamplandMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?SwamplandMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SwamplandMutated; /** - * @symbol ?Taiga\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?Taiga\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Taiga; /** - * @symbol ?TaigaHills\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?TaigaHills\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TaigaHills; /** - * @symbol ?TaigaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?TaigaMutated\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TaigaMutated; /** - * @symbol ?TheEnd\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?TheEnd\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TheEnd; /** - * @symbol ?WarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?WarmOcean\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarmOcean; /** - * @symbol ?WarpedForest\@VanillaBiomeNames\@\@3VHashedString\@\@B + * @symbol ?WarpedForest\@VanillaBiomeNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedForest; diff --git a/LiteLoader/include/llapi/mc/VanillaBiomes.hpp b/LiteLoader/include/llapi/mc/VanillaBiomes.hpp index 05cc83d721..d01a8f193f 100644 --- a/LiteLoader/include/llapi/mc/VanillaBiomes.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBiomes.hpp @@ -30,56 +30,56 @@ class VanillaBiomes { public: /** - * @symbol ?SWAMP_WATER_COLOR\@VanillaBiomes\@\@2VColor\@mce\@\@B + * @symbol ?SWAMP_WATER_COLOR\@VanillaBiomes\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const SWAMP_WATER_COLOR; /** - * @symbol ?WATER_FOG_COLOR_SWAMP\@VanillaBiomes\@\@2VColor\@mce\@\@B + * @symbol ?WATER_FOG_COLOR_SWAMP\@VanillaBiomes\@\@2VColor\@mce\@\@B */ MCAPI static class mce::Color const WATER_FOG_COLOR_SWAMP; /** - * @symbol ?initBiomeComponents\@VanillaBiomes\@\@SAXAEAVBiomeComponentFactory\@\@\@Z + * @symbol ?initBiomeComponents\@VanillaBiomes\@\@SAXAEAVBiomeComponentFactory\@\@\@Z */ MCAPI static void initBiomeComponents(class BiomeComponentFactory &); /** - * @symbol ?initBiomeDimensionComponent\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@\@Z + * @symbol ?initBiomeDimensionComponent\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@\@Z */ MCAPI static void initBiomeDimensionComponent(class BiomeRegistry &); /** - * @symbol ?initBiomes\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@AEBUSpawnSettings\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?initBiomes\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@AEBUSpawnSettings\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void initBiomes(class BiomeRegistry &, struct SpawnSettings const &, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?initClientOnlyComponents\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@\@Z + * @symbol ?initClientOnlyComponents\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@\@Z */ MCAPI static void initClientOnlyComponents(class BiomeRegistry &); /** - * @symbol ?initDefaultWorldGenComponents\@VanillaBiomes\@\@SAXAEAVIWorldRegistriesProvider\@\@\@Z + * @symbol ?initDefaultWorldGenComponents\@VanillaBiomes\@\@SAXAEAVIWorldRegistriesProvider\@\@\@Z */ MCAPI static void initDefaultWorldGenComponents(class IWorldRegistriesProvider &); /** - * @symbol ?initSurfaceBuilders\@VanillaBiomes\@\@SAXAEAVSurfaceBuilderRegistry\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?initSurfaceBuilders\@VanillaBiomes\@\@SAXAEAVSurfaceBuilderRegistry\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI static void initSurfaceBuilders(class SurfaceBuilderRegistry &, class BaseGameVersion const &); /** - * @symbol ?initVanillaBiomeTypeComponent\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@\@Z + * @symbol ?initVanillaBiomeTypeComponent\@VanillaBiomes\@\@SAXAEAVBiomeRegistry\@\@\@Z */ MCAPI static void initVanillaBiomeTypeComponent(class BiomeRegistry &); /** - * @symbol ?mPlayerValidSpawns\@VanillaBiomes\@\@2V?$set\@HU?$less\@H\@std\@\@V?$allocator\@H\@2\@\@std\@\@A + * @symbol ?mPlayerValidSpawns\@VanillaBiomes\@\@2V?$set\@HU?$less\@H\@std\@\@V?$allocator\@H\@2\@\@std\@\@A */ MCAPI static class std::set, class std::allocator> mPlayerValidSpawns; /** - * @symbol ?shutdownBiomes\@VanillaBiomes\@\@SAXXZ + * @symbol ?shutdownBiomes\@VanillaBiomes\@\@SAXXZ */ MCAPI static void shutdownBiomes(); //private: /** - * @symbol ?addBiomeDimensionAttributeComponentHelper\@VanillaBiomes\@\@CAXAEAVBiomeRegistry\@\@AEBVHashedString\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?addBiomeDimensionAttributeComponentHelper\@VanillaBiomes\@\@CAXAEAVBiomeRegistry\@\@AEBVHashedString\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI static void addBiomeDimensionAttributeComponentHelper(class BiomeRegistry &, class HashedString const &, class AutomaticID); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp b/LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp index da2fbb0951..ceefa66ebe 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockConversion.hpp @@ -22,15 +22,15 @@ namespace VanillaBlockConversion { #undef AFTER_EXTRA /** - * @symbol ?getBlockTypeFromLegacyId\@VanillaBlockConversion\@\@YA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@I\@Z + * @symbol ?getBlockTypeFromLegacyId\@VanillaBlockConversion\@\@YA?AV?$WeakPtr\@VBlockLegacy\@\@\@\@I\@Z */ MCAPI class WeakPtr getBlockTypeFromLegacyId(unsigned int); /** - * @symbol ?getBlockTypeLegacyIdFromName\@VanillaBlockConversion\@\@YAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?getBlockTypeLegacyIdFromName\@VanillaBlockConversion\@\@YAHAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI int getBlockTypeLegacyIdFromName(std::string const &); /** - * @symbol ?tryGetLegacyState\@VanillaBlockConversion\@\@YAPEBVBlock\@\@II\@Z + * @symbol ?tryGetLegacyState\@VanillaBlockConversion\@\@YAPEBVBlock\@\@II\@Z */ MCAPI class Block const * tryGetLegacyState(unsigned int, unsigned int); diff --git a/LiteLoader/include/llapi/mc/VanillaBlockDrops.hpp b/LiteLoader/include/llapi/mc/VanillaBlockDrops.hpp index 961d27e4b4..8bcdce812b 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockDrops.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockDrops.hpp @@ -17,12 +17,16 @@ namespace VanillaBlockDrops { #undef AFTER_EXTRA /** - * @symbol ?configureBlockDrops\@VanillaBlockDrops\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?add\@VanillaBlockDrops\@\@YAXAEBVHashedString\@\@V?$unique_ptr\@VIResourceDropsStrategy\@\@U?$default_delete\@VIResourceDropsStrategy\@\@\@std\@\@\@std\@\@\@Z + */ + MCAPI void add(class HashedString const &, std::unique_ptr); + /** + * @symbol ?configureBlockDrops\@VanillaBlockDrops\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI void configureBlockDrops(class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?dropNothing\@VanillaBlockDrops\@\@YAXAEBVHashedString\@\@\@Z + * @symbol ?dropSelf\@VanillaBlockDrops\@\@YAXAEBVHashedString\@\@\@Z */ - MCAPI void dropNothing(class HashedString const &); + MCAPI void dropSelf(class HashedString const &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp b/LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp index 63d2d7c0ab..585a6839cd 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockStateTransformUtils.hpp @@ -31,36 +31,36 @@ class VanillaBlockStateTransformUtils { public: /** - * @symbol ?transformBlock\@VanillaBlockStateTransformUtils\@\@SAPEBVBlock\@\@AEBV2\@W4CommonDirection\@\@\@Z + * @symbol ?transformBlock\@VanillaBlockStateTransformUtils\@\@SAPEBVBlock\@\@AEBV2\@W4CommonDirection\@\@\@Z */ MCAPI static class Block const * transformBlock(class Block const &, enum class CommonDirection); /** - * @symbol ?transformBlock\@VanillaBlockStateTransformUtils\@\@SAPEBVBlock\@\@AEBV2\@W4Name\@Facing\@\@\@Z + * @symbol ?transformBlock\@VanillaBlockStateTransformUtils\@\@SAPEBVBlock\@\@AEBV2\@W4Name\@Facing\@\@\@Z */ MCAPI static class Block const * transformBlock(class Block const &, enum class Facing::Name); /** - * @symbol ?transformBlock\@VanillaBlockStateTransformUtils\@\@SAPEBVBlock\@\@AEBV2\@W4Rotation\@\@W4Mirror\@\@\@Z + * @symbol ?transformBlock\@VanillaBlockStateTransformUtils\@\@SAPEBVBlock\@\@AEBV2\@W4Rotation\@\@W4Mirror\@\@\@Z */ MCAPI static class Block const * transformBlock(class Block const &, enum class Rotation, enum class Mirror); //private: /** - * @symbol ?_mirror\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@W4Mirror\@\@\@Z + * @symbol ?_mirror\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@W4Mirror\@\@\@Z */ MCAPI static enum class CommonDirection _mirror(enum class CommonDirection, enum class Mirror); /** - * @symbol ?_mirrorFrontBack\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@\@Z + * @symbol ?_mirrorFrontBack\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@\@Z */ MCAPI static enum class CommonDirection _mirrorFrontBack(enum class CommonDirection); /** - * @symbol ?_mirrorLeftRight\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@\@Z + * @symbol ?_mirrorLeftRight\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@\@Z */ MCAPI static enum class CommonDirection _mirrorLeftRight(enum class CommonDirection); /** - * @symbol ?_rotate\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@W4Rotation\@\@\@Z + * @symbol ?_rotate\@VanillaBlockStateTransformUtils\@\@CA?AW4CommonDirection\@\@W42\@W4Rotation\@\@\@Z */ MCAPI static enum class CommonDirection _rotate(enum class CommonDirection, enum class Rotation); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp index e205728862..3512b75f7f 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTags.hpp @@ -30,32 +30,32 @@ class VanillaBlockTags { public: /** - * @symbol ?Acacia\@VanillaBlockTags\@\@2QBDB + * @symbol ?Acacia\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const Acacia[]; /** - * @symbol ?Birch\@VanillaBlockTags\@\@2QBDB + * @symbol ?Birch\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const Birch[]; /** - * @symbol ?DarkOak\@VanillaBlockTags\@\@2QBDB + * @symbol ?DarkOak\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const DarkOak[]; /** - * @symbol ?Jungle\@VanillaBlockTags\@\@2QBDB + * @symbol ?Jungle\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const Jungle[]; /** - * @symbol ?Log\@VanillaBlockTags\@\@2QBDB + * @symbol ?Log\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const Log[]; /** - * @symbol ?Oak\@VanillaBlockTags\@\@2QBDB + * @symbol ?Oak\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const Oak[]; /** - * @symbol ?Spruce\@VanillaBlockTags\@\@2QBDB + * @symbol ?Spruce\@VanillaBlockTags\@\@2QBDB */ MCAPI static char const Spruce[]; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp index 779dc723ea..36ffaa0444 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypeIds.hpp @@ -20,2588 +20,2664 @@ namespace VanillaBlockTypeIds { #undef AFTER_EXTRA /** - * @symbol ?AcaciaButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaButton; /** - * @symbol ?AcaciaDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaDoor; /** - * @symbol ?AcaciaFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaFenceGate; /** - * @symbol ?AcaciaHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaHangingSign; /** - * @symbol ?AcaciaPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaPressurePlate; /** - * @symbol ?AcaciaStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaStairs; /** - * @symbol ?AcaciaStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaStandingSign; /** - * @symbol ?AcaciaTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaTrapdoor; /** - * @symbol ?AcaciaWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AcaciaWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaWallSign; /** - * @symbol ?ActivatorRail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ActivatorRail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ActivatorRail; /** - * @symbol ?Allow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Allow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Allow; /** - * @symbol ?AmethystBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AmethystBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AmethystBlock; /** - * @symbol ?AmethystCluster\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AmethystCluster\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AmethystCluster; /** - * @symbol ?AncientDebris\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AncientDebris\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AncientDebris; /** - * @symbol ?AndesiteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AndesiteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AndesiteStairs; /** - * @symbol ?Anvil\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Anvil\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Anvil; /** - * @symbol ?Azalea\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Azalea\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Azalea; /** - * @symbol ?AzaleaLeaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AzaleaLeaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AzaleaLeaves; /** - * @symbol ?AzaleaLeavesFlowered\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?AzaleaLeavesFlowered\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AzaleaLeavesFlowered; /** - * @symbol ?Bamboo\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Bamboo\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bamboo; /** - * @symbol ?BambooBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooBlock; /** - * @symbol ?BambooButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooButton; /** - * @symbol ?BambooDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooDoor; /** - * @symbol ?BambooDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooDoubleSlab; /** - * @symbol ?BambooFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooFence; /** - * @symbol ?BambooFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooFenceGate; /** - * @symbol ?BambooHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooHangingSign; /** - * @symbol ?BambooMosaic\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooMosaic\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooMosaic; /** - * @symbol ?BambooMosaicDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooMosaicDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooMosaicDoubleSlab; /** - * @symbol ?BambooMosaicSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooMosaicSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooMosaicSlab; /** - * @symbol ?BambooMosaicStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooMosaicStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooMosaicStairs; /** - * @symbol ?BambooPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooPlanks; /** - * @symbol ?BambooPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooPressurePlate; /** - * @symbol ?BambooSapling\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooSapling\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooSapling; /** - * @symbol ?BambooSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooSlab; /** - * @symbol ?BambooStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooStairs; /** - * @symbol ?BambooStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooStandingSign; /** - * @symbol ?BambooTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooTrapdoor; /** - * @symbol ?BambooWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BambooWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooWallSign; /** - * @symbol ?Barrel\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Barrel\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Barrel; /** - * @symbol ?Barrier\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Barrier\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Barrier; /** - * @symbol ?Basalt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Basalt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Basalt; /** - * @symbol ?Beacon\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Beacon\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Beacon; /** - * @symbol ?Bed\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Bed\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bed; /** - * @symbol ?Bedrock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Bedrock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bedrock; /** - * @symbol ?BeeNest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BeeNest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BeeNest; /** - * @symbol ?Beehive\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Beehive\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Beehive; /** - * @symbol ?Beetroot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Beetroot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Beetroot; /** - * @symbol ?Bell\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Bell\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bell; /** - * @symbol ?BigDripleaf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BigDripleaf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BigDripleaf; /** - * @symbol ?BirchButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchButton; /** - * @symbol ?BirchDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchDoor; /** - * @symbol ?BirchFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchFenceGate; /** - * @symbol ?BirchHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchHangingSign; /** - * @symbol ?BirchPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchPressurePlate; /** - * @symbol ?BirchStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchStairs; /** - * @symbol ?BirchStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchStandingSign; /** - * @symbol ?BirchTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchTrapdoor; /** - * @symbol ?BirchWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BirchWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchWallSign; /** - * @symbol ?BlackCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackCandle; /** - * @symbol ?BlackCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackCandleCake; /** - * @symbol ?BlackGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackGlazedTerracotta; /** - * @symbol ?Blackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlackWool; + /** + * @symbol ?Blackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Blackstone; /** - * @symbol ?BlackstoneDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackstoneDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackstoneDoubleSlab; /** - * @symbol ?BlackstoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackstoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackstoneSlab; /** - * @symbol ?BlackstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackstoneStairs; /** - * @symbol ?BlackstoneWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlackstoneWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackstoneWall; /** - * @symbol ?BlastFurnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlastFurnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlastFurnace; /** - * @symbol ?BlueCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlueCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueCandle; /** - * @symbol ?BlueCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlueCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueCandleCake; /** - * @symbol ?BlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueGlazedTerracotta; /** - * @symbol ?BlueIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlueIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueIce; /** - * @symbol ?BoneBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BlueWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BlueWool; + /** + * @symbol ?BoneBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BoneBlock; /** - * @symbol ?Bookshelf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Bookshelf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bookshelf; /** - * @symbol ?BorderBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BorderBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BorderBlock; /** - * @symbol ?BrewingStand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrewingStand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrewingStand; /** - * @symbol ?BrickBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrickBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrickBlock; /** - * @symbol ?BrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrickStairs; /** - * @symbol ?BrownCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrownCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownCandle; /** - * @symbol ?BrownCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrownCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownCandleCake; /** - * @symbol ?BrownGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrownGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownGlazedTerracotta; /** - * @symbol ?BrownMushroom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrownMushroom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownMushroom; /** - * @symbol ?BrownMushroomBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrownMushroomBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownMushroomBlock; /** - * @symbol ?BubbleColumn\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BrownWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const BrownWool; + /** + * @symbol ?BubbleColumn\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BubbleColumn; /** - * @symbol ?BuddingAmethyst\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?BuddingAmethyst\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BuddingAmethyst; /** - * @symbol ?Cactus\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Cactus\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cactus; /** - * @symbol ?Cake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Cake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cake; /** - * @symbol ?Calcite\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Calcite\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Calcite; /** - * @symbol ?Camera\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Camera\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Camera; /** - * @symbol ?CampFire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CampFire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CampFire; /** - * @symbol ?Candle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Candle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Candle; /** - * @symbol ?CandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CandleCake; /** - * @symbol ?Carpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Carpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Carpet; /** - * @symbol ?Carrots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Carrots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Carrots; /** - * @symbol ?CartographyTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CartographyTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CartographyTable; /** - * @symbol ?CarvedPumpkin\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CarvedPumpkin\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CarvedPumpkin; /** - * @symbol ?Cauldron\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Cauldron\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cauldron; /** - * @symbol ?CaveVines\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CaveVines\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CaveVines; /** - * @symbol ?CaveVinesBodyWithBerries\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CaveVinesBodyWithBerries\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CaveVinesBodyWithBerries; /** - * @symbol ?CaveVinesHeadWithBerries\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CaveVinesHeadWithBerries\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CaveVinesHeadWithBerries; /** - * @symbol ?Chain\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Chain\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Chain; /** - * @symbol ?ChainCommandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChainCommandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChainCommandBlock; /** - * @symbol ?Chalkboard\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Chalkboard\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Chalkboard; /** - * @symbol ?ChemicalHeat\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChemicalHeat\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChemicalHeat; /** - * @symbol ?ChemistryTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChemistryTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChemistryTable; /** - * @symbol ?Chest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Chest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Chest; /** - * @symbol ?ChiseledBookshelf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChiseledBookshelf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChiseledBookshelf; /** - * @symbol ?ChiseledDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChiseledDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChiseledDeepslate; /** - * @symbol ?ChiseledNetherBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChiseledNetherBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChiseledNetherBricks; /** - * @symbol ?ChiseledPolishedBlackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChiseledPolishedBlackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChiseledPolishedBlackstone; /** - * @symbol ?ChorusFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChorusFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChorusFlower; /** - * @symbol ?ChorusPlant\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ChorusPlant\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChorusPlant; /** - * @symbol ?Clay\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Clay\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Clay; /** - * @symbol ?ClientRequestPlaceholderBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ClientRequestPlaceholderBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ClientRequestPlaceholderBlock; /** - * @symbol ?CoalBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoalBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoalBlock; /** - * @symbol ?CoalOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoalOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoalOre; /** - * @symbol ?CobbledDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CobbledDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CobbledDeepslate; /** - * @symbol ?CobbledDeepslateDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CobbledDeepslateDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CobbledDeepslateDoubleSlab; /** - * @symbol ?CobbledDeepslateSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CobbledDeepslateSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CobbledDeepslateSlab; /** - * @symbol ?CobbledDeepslateStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CobbledDeepslateStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CobbledDeepslateStairs; /** - * @symbol ?CobbledDeepslateWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CobbledDeepslateWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CobbledDeepslateWall; /** - * @symbol ?Cobblestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Cobblestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cobblestone; /** - * @symbol ?CobblestoneWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CobblestoneWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CobblestoneWall; /** - * @symbol ?Cocoa\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Cocoa\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cocoa; /** - * @symbol ?ColoredTorchBp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ColoredTorchBp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColoredTorchBp; /** - * @symbol ?ColoredTorchRg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ColoredTorchRg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ColoredTorchRg; /** - * @symbol ?CommandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CommandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CommandBlock; /** - * @symbol ?Composter\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Composter\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Composter; /** - * @symbol ?Concrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Concrete\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Concrete; /** - * @symbol ?ConcretePowder\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ConcretePowder\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ConcretePowder; /** - * @symbol ?Conduit\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Conduit\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Conduit; /** - * @symbol ?CopperBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CopperBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CopperBlock; /** - * @symbol ?CopperOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CopperOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CopperOre; /** - * @symbol ?Coral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Coral\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Coral; /** - * @symbol ?CoralBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoralBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoralBlock; /** - * @symbol ?CoralFan\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoralFan\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoralFan; /** - * @symbol ?CoralFanDead\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoralFanDead\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoralFanDead; /** - * @symbol ?CoralFanHang\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoralFanHang\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoralFanHang; /** - * @symbol ?CoralFanHang2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoralFanHang2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoralFanHang2; /** - * @symbol ?CoralFanHang3\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CoralFanHang3\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CoralFanHang3; /** - * @symbol ?CrackedDeepslateBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrackedDeepslateBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrackedDeepslateBricks; /** - * @symbol ?CrackedDeepslateTiles\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrackedDeepslateTiles\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrackedDeepslateTiles; /** - * @symbol ?CrackedNetherBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrackedNetherBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrackedNetherBricks; /** - * @symbol ?CrackedPolishedBlackstoneBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrackedPolishedBlackstoneBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrackedPolishedBlackstoneBricks; /** - * @symbol ?CraftingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CraftingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CraftingTable; /** - * @symbol ?CrimsonButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonButton; /** - * @symbol ?CrimsonDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonDoor; /** - * @symbol ?CrimsonDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonDoubleSlab; /** - * @symbol ?CrimsonFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonFence; /** - * @symbol ?CrimsonFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonFenceGate; /** - * @symbol ?CrimsonFungus\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonFungus\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonFungus; /** - * @symbol ?CrimsonHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonHangingSign; /** - * @symbol ?CrimsonHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonHyphae; /** - * @symbol ?CrimsonNylium\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonNylium\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonNylium; /** - * @symbol ?CrimsonPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonPlanks; /** - * @symbol ?CrimsonPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonPressurePlate; /** - * @symbol ?CrimsonRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonRoots; /** - * @symbol ?CrimsonSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonSlab; /** - * @symbol ?CrimsonStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonStairs; /** - * @symbol ?CrimsonStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonStandingSign; /** - * @symbol ?CrimsonStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonStem; /** - * @symbol ?CrimsonTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonTrapdoor; /** - * @symbol ?CrimsonWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CrimsonWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonWallSign; /** - * @symbol ?CryingObsidian\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CryingObsidian\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CryingObsidian; /** - * @symbol ?CutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CutCopper; /** - * @symbol ?CutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CutCopperSlab; /** - * @symbol ?CutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CutCopperStairs; /** - * @symbol ?CyanCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CyanCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanCandle; /** - * @symbol ?CyanCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CyanCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanCandleCake; /** - * @symbol ?CyanGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CyanGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanGlazedTerracotta; /** - * @symbol ?DarkOakButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?CyanWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const CyanWool; + /** + * @symbol ?DarkOakButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakButton; /** - * @symbol ?DarkOakDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkOakDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakDoor; /** - * @symbol ?DarkOakFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkOakFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakFenceGate; /** - * @symbol ?DarkOakPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkOakPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakPressurePlate; /** - * @symbol ?DarkOakStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkOakStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakStairs; /** - * @symbol ?DarkOakTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkOakTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakTrapdoor; /** - * @symbol ?DarkPrismarineStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkPrismarineStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkPrismarineStairs; /** - * @symbol ?DarkoakHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkoakHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkoakHangingSign; /** - * @symbol ?DarkoakStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkoakStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkoakStandingSign; /** - * @symbol ?DarkoakWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DarkoakWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkoakWallSign; /** - * @symbol ?DaylightDetector\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DaylightDetector\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DaylightDetector; /** - * @symbol ?DaylightDetectorInverted\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DaylightDetectorInverted\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DaylightDetectorInverted; /** - * @symbol ?Deadbush\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Deadbush\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Deadbush; /** - * @symbol ?Deepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DecoratedPot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const DecoratedPot; + /** + * @symbol ?Deepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Deepslate; /** - * @symbol ?DeepslateBrickDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateBrickDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateBrickDoubleSlab; /** - * @symbol ?DeepslateBrickSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateBrickSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateBrickSlab; /** - * @symbol ?DeepslateBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateBrickStairs; /** - * @symbol ?DeepslateBrickWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateBrickWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateBrickWall; /** - * @symbol ?DeepslateBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateBricks; /** - * @symbol ?DeepslateCoalOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateCoalOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateCoalOre; /** - * @symbol ?DeepslateCopperOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateCopperOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateCopperOre; /** - * @symbol ?DeepslateDiamondOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateDiamondOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateDiamondOre; /** - * @symbol ?DeepslateEmeraldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateEmeraldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateEmeraldOre; /** - * @symbol ?DeepslateGoldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateGoldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateGoldOre; /** - * @symbol ?DeepslateIronOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateIronOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateIronOre; /** - * @symbol ?DeepslateLapisOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateLapisOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateLapisOre; /** - * @symbol ?DeepslateRedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateRedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateRedstoneOre; /** - * @symbol ?DeepslateTileDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateTileDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateTileDoubleSlab; /** - * @symbol ?DeepslateTileSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateTileSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateTileSlab; /** - * @symbol ?DeepslateTileStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateTileStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateTileStairs; /** - * @symbol ?DeepslateTileWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateTileWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateTileWall; /** - * @symbol ?DeepslateTiles\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DeepslateTiles\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DeepslateTiles; /** - * @symbol ?Deny\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Deny\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Deny; /** - * @symbol ?DetectorRail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DetectorRail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DetectorRail; /** - * @symbol ?DiamondBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DiamondBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondBlock; /** - * @symbol ?DiamondOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DiamondOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondOre; /** - * @symbol ?DioriteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DioriteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DioriteStairs; /** - * @symbol ?Dirt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Dirt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Dirt; /** - * @symbol ?DirtWithRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DirtWithRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DirtWithRoots; /** - * @symbol ?Dispenser\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Dispenser\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Dispenser; /** - * @symbol ?DoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoubleCutCopperSlab; /** - * @symbol ?DoublePlant\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoublePlant\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoublePlant; /** - * @symbol ?DoubleStoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoubleStoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoubleStoneSlab; /** - * @symbol ?DoubleStoneSlab2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoubleStoneSlab2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoubleStoneSlab2; /** - * @symbol ?DoubleStoneSlab3\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoubleStoneSlab3\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoubleStoneSlab3; /** - * @symbol ?DoubleStoneSlab4\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoubleStoneSlab4\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoubleStoneSlab4; /** - * @symbol ?DoubleWoodenSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DoubleWoodenSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DoubleWoodenSlab; /** - * @symbol ?DragonEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DragonEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DragonEgg; /** - * @symbol ?DriedKelpBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?DriedKelpBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DriedKelpBlock; /** - * @symbol ?Dripstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Dripstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Dripstone; /** - * @symbol ?Dropper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Dropper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Dropper; /** - * @symbol ?Elements\@VanillaBlockTypeIds\@\@3V?$array\@$$CBVHashedString\@\@$0HH\@\@std\@\@B + * @symbol ?Elements\@VanillaBlockTypeIds\@\@3V?$array\@$$CBVHashedString\@\@$0HH\@\@std\@\@B */ MCAPI extern class std::array const Elements; /** - * @symbol ?EmeraldBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EmeraldBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EmeraldBlock; /** - * @symbol ?EmeraldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EmeraldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EmeraldOre; /** - * @symbol ?EnchantingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EnchantingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnchantingTable; /** - * @symbol ?EndBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndBrickStairs; /** - * @symbol ?EndBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndBricks; /** - * @symbol ?EndGateway\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndGateway\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndGateway; /** - * @symbol ?EndPortal\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndPortal\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndPortal; /** - * @symbol ?EndPortalFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndPortalFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndPortalFrame; /** - * @symbol ?EndRod\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndRod\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndRod; /** - * @symbol ?EndStone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EndStone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndStone; /** - * @symbol ?EnderChest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?EnderChest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnderChest; /** - * @symbol ?ExposedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ExposedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExposedCopper; /** - * @symbol ?ExposedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ExposedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExposedCutCopper; /** - * @symbol ?ExposedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ExposedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExposedCutCopperSlab; /** - * @symbol ?ExposedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ExposedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExposedCutCopperStairs; /** - * @symbol ?ExposedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ExposedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExposedDoubleCutCopperSlab; /** - * @symbol ?FarmlandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FarmlandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FarmlandBlock; /** - * @symbol ?Fence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Fence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Fence; /** - * @symbol ?FenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FenceGate; /** - * @symbol ?Fire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Fire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Fire; /** - * @symbol ?FletchingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FletchingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FletchingTable; /** - * @symbol ?FlowerPot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FlowerPot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlowerPot; /** - * @symbol ?FloweringAzalea\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FloweringAzalea\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FloweringAzalea; /** - * @symbol ?FlowingLava\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FlowingLava\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlowingLava; /** - * @symbol ?FlowingWater\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FlowingWater\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlowingWater; /** - * @symbol ?FrogSpawn\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FrogSpawn\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FrogSpawn; /** - * @symbol ?FrostedIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?FrostedIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FrostedIce; /** - * @symbol ?Furnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Furnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Furnace; /** - * @symbol ?GildedBlackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GildedBlackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GildedBlackstone; /** - * @symbol ?Glass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Glass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Glass; /** - * @symbol ?GlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlassPane; /** - * @symbol ?GlowItemFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GlowItemFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowItemFrame; /** - * @symbol ?GlowLichen\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GlowLichen\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowLichen; /** - * @symbol ?Glowingobsidian\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GlowingObsidian\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ - MCAPI extern class HashedString const Glowingobsidian; + MCAPI extern class HashedString const GlowingObsidian; /** - * @symbol ?Glowstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Glowstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Glowstone; /** - * @symbol ?GoldBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GoldBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldBlock; /** - * @symbol ?GoldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GoldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldOre; /** - * @symbol ?GoldenRail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GoldenRail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenRail; /** - * @symbol ?GraniteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GraniteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GraniteStairs; /** - * @symbol ?Grass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Grass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Grass; /** - * @symbol ?GrassPath\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GrassPath\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrassPath; /** - * @symbol ?Gravel\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Gravel\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Gravel; /** - * @symbol ?GrayCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GrayCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayCandle; /** - * @symbol ?GrayCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GrayCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayCandleCake; /** - * @symbol ?GrayGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GrayGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayGlazedTerracotta; /** - * @symbol ?GreenCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GrayWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GrayWool; + /** + * @symbol ?GreenCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenCandle; /** - * @symbol ?GreenCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GreenCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenCandleCake; /** - * @symbol ?GreenGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GreenGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenGlazedTerracotta; /** - * @symbol ?Grindstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?GreenWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const GreenWool; + /** + * @symbol ?Grindstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Grindstone; /** - * @symbol ?HangingRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HangingRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HangingRoots; /** - * @symbol ?HardGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HardGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HardGlass; /** - * @symbol ?HardGlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HardGlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HardGlassPane; /** - * @symbol ?HardStainedGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HardStainedGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HardStainedGlass; /** - * @symbol ?HardStainedGlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HardStainedGlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HardStainedGlassPane; /** - * @symbol ?HardenedClay\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HardenedClay\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HardenedClay; /** - * @symbol ?HayBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HayBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HayBlock; /** - * @symbol ?HeavyWeightedPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HeavyWeightedPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HeavyWeightedPressurePlate; /** - * @symbol ?HoneyBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HoneyBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HoneyBlock; /** - * @symbol ?HoneycombBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?HoneycombBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HoneycombBlock; /** - * @symbol ?Hopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Hopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Hopper; /** - * @symbol ?Ice\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Ice\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Ice; /** - * @symbol ?InfestedDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?InfestedDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const InfestedDeepslate; /** - * @symbol ?InfoUpdate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?InfoUpdate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const InfoUpdate; /** - * @symbol ?InfoUpdate2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?InfoUpdate2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const InfoUpdate2; /** - * @symbol ?InvisibleBedrock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?InvisibleBedrock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const InvisibleBedrock; /** - * @symbol ?IronBars\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?IronBars\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronBars; /** - * @symbol ?IronBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?IronBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronBlock; /** - * @symbol ?IronDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?IronDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronDoor; /** - * @symbol ?IronOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?IronOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronOre; /** - * @symbol ?IronTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?IronTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronTrapdoor; /** - * @symbol ?ItemFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ItemFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ItemFrame; /** - * @symbol ?Jigsaw\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Jigsaw\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Jigsaw; /** - * @symbol ?Jukebox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Jukebox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Jukebox; /** - * @symbol ?JungleButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleButton; /** - * @symbol ?JungleDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleDoor; /** - * @symbol ?JungleFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleFenceGate; /** - * @symbol ?JungleHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleHangingSign; /** - * @symbol ?JunglePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JunglePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JunglePressurePlate; /** - * @symbol ?JungleStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleStairs; /** - * @symbol ?JungleStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleStandingSign; /** - * @symbol ?JungleTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleTrapdoor; /** - * @symbol ?JungleWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?JungleWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleWallSign; /** - * @symbol ?Kelp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Kelp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Kelp; /** - * @symbol ?Ladder\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Ladder\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Ladder; /** - * @symbol ?Lantern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Lantern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lantern; /** - * @symbol ?LapisBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LapisBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LapisBlock; /** - * @symbol ?LapisOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LapisOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LapisOre; /** - * @symbol ?LargeAmethystBud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LargeAmethystBud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LargeAmethystBud; /** - * @symbol ?Lava\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Lava\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lava; /** - * @symbol ?LavaCauldron\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LavaCauldron\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LavaCauldron; /** - * @symbol ?Leaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Leaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Leaves; /** - * @symbol ?Leaves2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Leaves2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Leaves2; /** - * @symbol ?Lectern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Lectern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lectern; /** - * @symbol ?Lever\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Lever\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lever; /** - * @symbol ?LightBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlock; /** - * @symbol ?LightBlueCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightBlueCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueCandle; /** - * @symbol ?LightBlueCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightBlueCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueCandleCake; /** - * @symbol ?LightBlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightBlueGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueGlazedTerracotta; /** - * @symbol ?LightGrayCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightBlueWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightBlueWool; + /** + * @symbol ?LightGrayCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightGrayCandle; /** - * @symbol ?LightGrayCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightGrayCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightGrayCandleCake; /** - * @symbol ?LightWeightedPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightGrayWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LightGrayWool; + /** + * @symbol ?LightWeightedPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightWeightedPressurePlate; /** - * @symbol ?LightningRod\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LightningRod\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightningRod; /** - * @symbol ?LimeCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LimeCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeCandle; /** - * @symbol ?LimeCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LimeCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeCandleCake; /** - * @symbol ?LimeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LimeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeGlazedTerracotta; /** - * @symbol ?LitBlastFurnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LimeWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const LimeWool; + /** + * @symbol ?LitBlastFurnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitBlastFurnace; /** - * @symbol ?LitDeepslateRedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LitDeepslateRedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitDeepslateRedstoneOre; /** - * @symbol ?LitFurnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LitFurnace\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitFurnace; /** - * @symbol ?LitPumpkin\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LitPumpkin\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitPumpkin; /** - * @symbol ?LitRedstoneLamp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LitRedstoneLamp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitRedstoneLamp; /** - * @symbol ?LitRedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LitRedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitRedstoneOre; /** - * @symbol ?LitSmoker\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?LitSmoker\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LitSmoker; /** - * @symbol ?Lodestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Lodestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lodestone; /** - * @symbol ?Log\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Log\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Log; /** - * @symbol ?Log2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Log2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Log2; /** - * @symbol ?Loom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Loom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Loom; /** - * @symbol ?MagentaCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MagentaCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaCandle; /** - * @symbol ?MagentaCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MagentaCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaCandleCake; /** - * @symbol ?MagentaGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MagentaGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaGlazedTerracotta; /** - * @symbol ?Magma\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MagentaWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const MagentaWool; + /** + * @symbol ?Magma\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Magma; /** - * @symbol ?MangroveButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveButton; /** - * @symbol ?MangroveDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveDoor; /** - * @symbol ?MangroveDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveDoubleSlab; /** - * @symbol ?MangroveFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveFence; /** - * @symbol ?MangroveFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveFenceGate; /** - * @symbol ?MangroveHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveHangingSign; /** - * @symbol ?MangroveLeaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveLeaves\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveLeaves; /** - * @symbol ?MangroveLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveLog; /** - * @symbol ?MangrovePlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangrovePlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangrovePlanks; /** - * @symbol ?MangrovePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangrovePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangrovePressurePlate; /** - * @symbol ?MangrovePropagule\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangrovePropagule\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangrovePropagule; /** - * @symbol ?MangroveRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveRoots; /** - * @symbol ?MangroveSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveSlab; /** - * @symbol ?MangroveStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveStairs; /** - * @symbol ?MangroveStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveStandingSign; /** - * @symbol ?MangroveTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveTrapdoor; /** - * @symbol ?MangroveWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveWallSign; /** - * @symbol ?MangroveWood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MangroveWood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveWood; /** - * @symbol ?MediumAmethystBud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MediumAmethystBud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MediumAmethystBud; /** - * @symbol ?MelonBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MelonBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MelonBlock; /** - * @symbol ?MelonStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MelonStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MelonStem; /** - * @symbol ?MobSpawner\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MobSpawner\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MobSpawner; /** - * @symbol ?MonsterEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MonsterEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MonsterEgg; /** - * @symbol ?MossBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MossBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MossBlock; /** - * @symbol ?MossCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MossCarpet\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MossCarpet; /** - * @symbol ?MossyCobblestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MossyCobblestone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MossyCobblestone; /** - * @symbol ?MossyCobblestoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MossyCobblestoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MossyCobblestoneStairs; /** - * @symbol ?MossyStoneBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MossyStoneBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MossyStoneBrickStairs; /** - * @symbol ?MovingBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MovingBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MovingBlock; /** - * @symbol ?Mud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Mud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Mud; /** - * @symbol ?MudBrickDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MudBrickDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MudBrickDoubleSlab; /** - * @symbol ?MudBrickSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MudBrickSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MudBrickSlab; /** - * @symbol ?MudBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MudBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MudBrickStairs; /** - * @symbol ?MudBrickWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MudBrickWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MudBrickWall; /** - * @symbol ?MudBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MudBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MudBricks; /** - * @symbol ?MuddyMangroveRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MuddyMangroveRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MuddyMangroveRoots; /** - * @symbol ?Mycelium\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Mycelium\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Mycelium; /** - * @symbol ?MysteriousFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MysteriousFrame\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MysteriousFrame; /** - * @symbol ?MysteriousFrameSlot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?MysteriousFrameSlot\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MysteriousFrameSlot; /** - * @symbol ?NetherBrickBlockName\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherBrickBlockName\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherBrickBlockName; /** - * @symbol ?NetherBrickFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherBrickFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherBrickFence; /** - * @symbol ?NetherBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherBrickStairs; /** - * @symbol ?NetherGoldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherGoldOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherGoldOre; /** - * @symbol ?NetherSprouts\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherSprouts\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherSprouts; /** - * @symbol ?NetherWart\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherWart\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherWart; /** - * @symbol ?NetherWartBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetherWartBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherWartBlock; /** - * @symbol ?NetheriteBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NetheriteBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteBlock; /** - * @symbol ?Netherrack\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Netherrack\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Netherrack; /** - * @symbol ?Netherreactor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Netherreactor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Netherreactor; /** - * @symbol ?NormalStoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?NormalStoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NormalStoneStairs; /** - * @symbol ?Noteblock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Noteblock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Noteblock; /** - * @symbol ?OakHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OakHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakHangingSign; /** - * @symbol ?OakStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OakStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakStairs; /** - * @symbol ?Observer\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Observer\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Observer; /** - * @symbol ?Obsidian\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Obsidian\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Obsidian; /** - * @symbol ?OchreFroglight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OchreFroglight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OchreFroglight; /** - * @symbol ?OrangeCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OrangeCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeCandle; /** - * @symbol ?OrangeCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OrangeCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeCandleCake; /** - * @symbol ?OrangeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OrangeGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeGlazedTerracotta; /** - * @symbol ?OxidizedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OrangeWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const OrangeWool; + /** + * @symbol ?OxidizedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OxidizedCopper; /** - * @symbol ?OxidizedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OxidizedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OxidizedCutCopper; /** - * @symbol ?OxidizedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OxidizedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OxidizedCutCopperSlab; /** - * @symbol ?OxidizedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OxidizedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OxidizedCutCopperStairs; /** - * @symbol ?OxidizedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?OxidizedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OxidizedDoubleCutCopperSlab; /** - * @symbol ?PackedIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PackedIce\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PackedIce; /** - * @symbol ?PackedMud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PackedMud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PackedMud; /** - * @symbol ?PearlescentFroglight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PearlescentFroglight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PearlescentFroglight; /** - * @symbol ?PinkCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PinkCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkCandle; /** - * @symbol ?PinkCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PinkCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkCandleCake; /** - * @symbol ?PinkGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PinkGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkGlazedTerracotta; /** - * @symbol ?Piston\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PinkWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PinkWool; + /** + * @symbol ?Piston\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Piston; /** - * @symbol ?PistonArmCollision\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PistonArmCollision\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PistonArmCollision; /** - * @symbol ?Planks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Planks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Planks; /** - * @symbol ?Podzol\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Podzol\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Podzol; /** - * @symbol ?PointedDripstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PointedDripstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PointedDripstone; /** - * @symbol ?PolishedAndesiteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedAndesiteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedAndesiteStairs; /** - * @symbol ?PolishedBasalt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBasalt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBasalt; /** - * @symbol ?PolishedBlackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstone; /** - * @symbol ?PolishedBlackstoneBrickDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneBrickDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneBrickDoubleSlab; /** - * @symbol ?PolishedBlackstoneBrickSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneBrickSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneBrickSlab; /** - * @symbol ?PolishedBlackstoneBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneBrickStairs; /** - * @symbol ?PolishedBlackstoneBrickWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneBrickWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneBrickWall; /** - * @symbol ?PolishedBlackstoneBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneBricks; /** - * @symbol ?PolishedBlackstoneButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneButton; /** - * @symbol ?PolishedBlackstoneDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneDoubleSlab; /** - * @symbol ?PolishedBlackstonePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstonePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstonePressurePlate; /** - * @symbol ?PolishedBlackstoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneSlab; /** - * @symbol ?PolishedBlackstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneStairs; /** - * @symbol ?PolishedBlackstoneWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedBlackstoneWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedBlackstoneWall; /** - * @symbol ?PolishedDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedDeepslate; /** - * @symbol ?PolishedDeepslateDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedDeepslateDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedDeepslateDoubleSlab; /** - * @symbol ?PolishedDeepslateSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedDeepslateSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedDeepslateSlab; /** - * @symbol ?PolishedDeepslateStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedDeepslateStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedDeepslateStairs; /** - * @symbol ?PolishedDeepslateWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedDeepslateWall\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedDeepslateWall; /** - * @symbol ?PolishedDioriteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedDioriteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedDioriteStairs; /** - * @symbol ?PolishedGraniteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PolishedGraniteStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolishedGraniteStairs; /** - * @symbol ?Portal\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Portal\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Portal; /** - * @symbol ?Potatoes\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Potatoes\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Potatoes; /** - * @symbol ?PowderSnow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PowderSnow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PowderSnow; /** - * @symbol ?PoweredComparator\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PoweredComparator\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PoweredComparator; /** - * @symbol ?PoweredRepeater\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PoweredRepeater\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PoweredRepeater; /** - * @symbol ?Prismarine\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Prismarine\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Prismarine; /** - * @symbol ?PrismarineBricksStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PrismarineBricksStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PrismarineBricksStairs; /** - * @symbol ?PrismarineStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PrismarineStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PrismarineStairs; /** - * @symbol ?Pumpkin\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Pumpkin\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Pumpkin; /** - * @symbol ?PumpkinStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PumpkinStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PumpkinStem; /** - * @symbol ?PurpleCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PurpleCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleCandle; /** - * @symbol ?PurpleCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PurpleCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleCandleCake; /** - * @symbol ?PurpleGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PurpleGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleGlazedTerracotta; /** - * @symbol ?PurpurBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PurpleWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PurpleWool; + /** + * @symbol ?PurpurBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpurBlock; /** - * @symbol ?PurpurStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?PurpurStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpurStairs; /** - * @symbol ?QuartzBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?QuartzBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const QuartzBlock; /** - * @symbol ?QuartzBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?QuartzBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const QuartzBricks; /** - * @symbol ?QuartzOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?QuartzOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const QuartzOre; /** - * @symbol ?QuartzStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?QuartzStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const QuartzStairs; /** - * @symbol ?Rail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Rail\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Rail; /** - * @symbol ?RawCopperBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RawCopperBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RawCopperBlock; /** - * @symbol ?RawGoldBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RawGoldBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RawGoldBlock; /** - * @symbol ?RawIronBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RawIronBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RawIronBlock; /** - * @symbol ?RedCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedCandle; /** - * @symbol ?RedCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedCandleCake; /** - * @symbol ?RedFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedFlower; /** - * @symbol ?RedGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedGlazedTerracotta; /** - * @symbol ?RedMushroom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedMushroom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedMushroom; /** - * @symbol ?RedMushroomBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedMushroomBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedMushroomBlock; /** - * @symbol ?RedNetherBrick\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedNetherBrick\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedNetherBrick; /** - * @symbol ?RedNetherBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedNetherBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedNetherBrickStairs; /** - * @symbol ?RedSandstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedSandstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedSandstone; /** - * @symbol ?RedSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedSandstoneStairs; /** - * @symbol ?RedstoneBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const RedWool; + /** + * @symbol ?RedstoneBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedstoneBlock; /** - * @symbol ?RedstoneLamp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedstoneLamp\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedstoneLamp; /** - * @symbol ?RedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedstoneOre\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedstoneOre; /** - * @symbol ?RedstoneTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedstoneTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedstoneTorch; /** - * @symbol ?RedstoneWire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RedstoneWire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedstoneWire; /** - * @symbol ?Reeds\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Reeds\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Reeds; /** - * @symbol ?ReinforcedDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ReinforcedDeepslate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ReinforcedDeepslate; /** - * @symbol ?RepeatingCommandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RepeatingCommandBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RepeatingCommandBlock; /** - * @symbol ?Reserved6\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Reserved6\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Reserved6; /** - * @symbol ?RespawnAnchor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?RespawnAnchor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RespawnAnchor; /** - * @symbol ?Sand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Sand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sand; /** - * @symbol ?Sandstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Sandstone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sandstone; /** - * @symbol ?SandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SandstoneStairs; /** - * @symbol ?Sapling\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Sapling\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sapling; /** - * @symbol ?Scaffolding\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Scaffolding\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Scaffolding; /** - * @symbol ?Sculk\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Sculk\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sculk; /** - * @symbol ?SculkCatalyst\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SculkCatalyst\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SculkCatalyst; /** - * @symbol ?SculkSensor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SculkSensor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SculkSensor; /** - * @symbol ?SculkShrieker\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SculkShrieker\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SculkShrieker; /** - * @symbol ?SculkVein\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SculkVein\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SculkVein; /** - * @symbol ?SeaLantern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SeaLantern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SeaLantern; /** - * @symbol ?SeaPickle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SeaPickle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SeaPickle; /** - * @symbol ?Seagrass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Seagrass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Seagrass; /** - * @symbol ?Shroomlight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Shroomlight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Shroomlight; /** - * @symbol ?ShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?ShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ShulkerBox; /** - * @symbol ?SilverGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SilverGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SilverGlazedTerracotta; /** - * @symbol ?Skull\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Skull\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Skull; /** - * @symbol ?SlimeBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SlimeBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SlimeBlock; /** - * @symbol ?SmallAmethystBud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmallAmethystBud\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmallAmethystBud; /** - * @symbol ?SmallDripleaf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmallDripleaf\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmallDripleaf; /** - * @symbol ?SmithingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmithingTable\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmithingTable; /** - * @symbol ?Smoker\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Smoker\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Smoker; /** - * @symbol ?SmoothBasalt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmoothBasalt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmoothBasalt; /** - * @symbol ?SmoothQuartzStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmoothQuartzStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmoothQuartzStairs; /** - * @symbol ?SmoothRedSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmoothRedSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmoothRedSandstoneStairs; /** - * @symbol ?SmoothSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmoothSandstoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmoothSandstoneStairs; /** - * @symbol ?SmoothStone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SmoothStone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SmoothStone; /** - * @symbol ?Snow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Snow\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Snow; /** - * @symbol ?SnowLayer\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SnowLayer\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SnowLayer; /** - * @symbol ?SoulCampfire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SoulCampfire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulCampfire; /** - * @symbol ?SoulFire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SoulFire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulFire; /** - * @symbol ?SoulLantern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SoulLantern\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulLantern; /** - * @symbol ?SoulSand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SoulSand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulSand; /** - * @symbol ?SoulSoil\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SoulSoil\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulSoil; /** - * @symbol ?SoulTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SoulTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulTorch; /** - * @symbol ?Sponge\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Sponge\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sponge; /** - * @symbol ?SporeBlossom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SporeBlossom\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SporeBlossom; /** - * @symbol ?SpruceButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceButton; /** - * @symbol ?SpruceDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceDoor; /** - * @symbol ?SpruceFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceFenceGate; /** - * @symbol ?SpruceHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceHangingSign; /** - * @symbol ?SprucePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SprucePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SprucePressurePlate; /** - * @symbol ?SpruceStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceStairs; /** - * @symbol ?SpruceStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceStandingSign; /** - * @symbol ?SpruceTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceTrapdoor; /** - * @symbol ?SpruceWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SpruceWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceWallSign; /** - * @symbol ?StainedGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StainedGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StainedGlass; /** - * @symbol ?StainedGlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StainedGlassPane\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StainedGlassPane; /** - * @symbol ?StainedHardenedClay\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StainedHardenedClay\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StainedHardenedClay; /** - * @symbol ?StandingBanner\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StandingBanner\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StandingBanner; /** - * @symbol ?StandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StandingSign; /** - * @symbol ?StickyPiston\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StickyPiston\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StickyPiston; /** - * @symbol ?StickyPistonArmCollision\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StickyPistonArmCollision\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StickyPistonArmCollision; /** - * @symbol ?Stone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Stone\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Stone; /** - * @symbol ?StoneBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneBrickStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneBrickStairs; /** - * @symbol ?StoneBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneBricks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneBricks; /** - * @symbol ?StoneButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneButton; /** - * @symbol ?StonePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StonePressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StonePressurePlate; /** - * @symbol ?StoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneSlab; /** - * @symbol ?StoneSlab2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneSlab2\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneSlab2; /** - * @symbol ?StoneSlab3\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneSlab3\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneSlab3; /** - * @symbol ?StoneSlab4\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneSlab4\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneSlab4; /** - * @symbol ?StoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StoneStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneStairs; /** - * @symbol ?Stonecutter\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Stonecutter\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Stonecutter; /** - * @symbol ?StonecutterBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StonecutterBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StonecutterBlock; /** - * @symbol ?StrippedAcaciaLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedAcaciaLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedAcaciaLog; /** - * @symbol ?StrippedBambooBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedBambooBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedBambooBlock; /** - * @symbol ?StrippedBirchLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedBirchLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedBirchLog; /** - * @symbol ?StrippedCrimsonHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedCrimsonHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedCrimsonHyphae; /** - * @symbol ?StrippedCrimsonStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedCrimsonStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedCrimsonStem; /** - * @symbol ?StrippedDarkOakLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedDarkOakLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedDarkOakLog; /** - * @symbol ?StrippedJungleLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedJungleLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedJungleLog; /** - * @symbol ?StrippedMangroveLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedMangroveLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedMangroveLog; /** - * @symbol ?StrippedMangroveWood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedMangroveWood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedMangroveWood; /** - * @symbol ?StrippedOakLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedOakLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedOakLog; /** - * @symbol ?StrippedSpruceLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedSpruceLog\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedSpruceLog; /** - * @symbol ?StrippedWarpedHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedWarpedHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedWarpedHyphae; /** - * @symbol ?StrippedWarpedStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StrippedWarpedStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StrippedWarpedStem; /** - * @symbol ?StructureBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StructureBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StructureBlock; /** - * @symbol ?StructureVoid\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?StructureVoid\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StructureVoid; /** - * @symbol ?SweetBerryBush\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?SuspiciousSand\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const SuspiciousSand; + /** + * @symbol ?SweetBerryBush\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SweetBerryBush; /** - * @symbol ?TallGrass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TallGrass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TallGrass; /** - * @symbol ?Target\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Target\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Target; /** - * @symbol ?TintedGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TintedGlass\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TintedGlass; /** - * @symbol ?Tnt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Tnt\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Tnt; /** - * @symbol ?Torch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Torch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Torch; /** - * @symbol ?Trapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Torchflower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Torchflower; + /** + * @symbol ?TorchflowerCrop\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const TorchflowerCrop; + /** + * @symbol ?Trapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Trapdoor; /** - * @symbol ?TrappedChest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TrappedChest\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TrappedChest; /** - * @symbol ?TripWire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TripWire\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TripWire; /** - * @symbol ?TripWireHook\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TripWireHook\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TripWireHook; /** - * @symbol ?Tuff\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Tuff\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Tuff; /** - * @symbol ?TurtleEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TurtleEgg\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TurtleEgg; /** - * @symbol ?TwistingVines\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?TwistingVines\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TwistingVines; /** - * @symbol ?UnderwaterTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?UnderwaterTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const UnderwaterTorch; /** - * @symbol ?UndyedShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?UndyedShulkerBox\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const UndyedShulkerBox; /** - * @symbol ?UnlitRedstoneTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?UnlitRedstoneTorch\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const UnlitRedstoneTorch; /** - * @symbol ?UnpoweredComparator\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?UnpoweredComparator\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const UnpoweredComparator; /** - * @symbol ?UnpoweredRepeater\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?UnpoweredRepeater\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const UnpoweredRepeater; /** - * @symbol ?VerdantFroglight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?VerdantFroglight\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const VerdantFroglight; /** - * @symbol ?Vine\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Vine\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Vine; /** - * @symbol ?WallBanner\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WallBanner\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WallBanner; /** - * @symbol ?WallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WallSign; /** - * @symbol ?WarpedButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedButton; /** - * @symbol ?WarpedDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedDoor; /** - * @symbol ?WarpedDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedDoubleSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedDoubleSlab; /** - * @symbol ?WarpedFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedFence\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedFence; /** - * @symbol ?WarpedFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedFenceGate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedFenceGate; /** - * @symbol ?WarpedFungus\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedFungus\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedFungus; /** - * @symbol ?WarpedHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedHangingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedHangingSign; /** - * @symbol ?WarpedHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedHyphae\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedHyphae; /** - * @symbol ?WarpedNylium\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedNylium\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedNylium; /** - * @symbol ?WarpedPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedPlanks\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedPlanks; /** - * @symbol ?WarpedPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedPressurePlate; /** - * @symbol ?WarpedRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedRoots\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedRoots; /** - * @symbol ?WarpedSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedSlab; /** - * @symbol ?WarpedStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedStairs; /** - * @symbol ?WarpedStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedStandingSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedStandingSign; /** - * @symbol ?WarpedStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedStem\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedStem; /** - * @symbol ?WarpedTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedTrapdoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedTrapdoor; /** - * @symbol ?WarpedWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedWallSign\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedWallSign; /** - * @symbol ?WarpedWartBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WarpedWartBlock\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedWartBlock; /** - * @symbol ?Water\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Water\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Water; /** - * @symbol ?WaterLily\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaterLily\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaterLily; /** - * @symbol ?WaxedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedCopper; /** - * @symbol ?WaxedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedCutCopper; /** - * @symbol ?WaxedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedCutCopperSlab; /** - * @symbol ?WaxedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedCutCopperStairs; /** - * @symbol ?WaxedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedDoubleCutCopperSlab; /** - * @symbol ?WaxedExposedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedExposedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedExposedCopper; /** - * @symbol ?WaxedExposedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedExposedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedExposedCutCopper; /** - * @symbol ?WaxedExposedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedExposedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedExposedCutCopperSlab; /** - * @symbol ?WaxedExposedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedExposedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedExposedCutCopperStairs; /** - * @symbol ?WaxedExposedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedExposedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedExposedDoubleCutCopperSlab; /** - * @symbol ?WaxedOxidizedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedOxidizedCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedOxidizedCopper; /** - * @symbol ?WaxedOxidizedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedOxidizedCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedOxidizedCutCopper; /** - * @symbol ?WaxedOxidizedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedOxidizedCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedOxidizedCutCopperSlab; /** - * @symbol ?WaxedOxidizedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedOxidizedCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedOxidizedCutCopperStairs; /** - * @symbol ?WaxedOxidizedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedOxidizedDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedOxidizedDoubleCutCopperSlab; /** - * @symbol ?WaxedWeatheredCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedWeatheredCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedWeatheredCopper; /** - * @symbol ?WaxedWeatheredCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedWeatheredCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedWeatheredCutCopper; /** - * @symbol ?WaxedWeatheredCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedWeatheredCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedWeatheredCutCopperSlab; /** - * @symbol ?WaxedWeatheredCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedWeatheredCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedWeatheredCutCopperStairs; /** - * @symbol ?WaxedWeatheredDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WaxedWeatheredDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaxedWeatheredDoubleCutCopperSlab; /** - * @symbol ?WeatheredCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WeatheredCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WeatheredCopper; /** - * @symbol ?WeatheredCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WeatheredCutCopper\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WeatheredCutCopper; /** - * @symbol ?WeatheredCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WeatheredCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WeatheredCutCopperSlab; /** - * @symbol ?WeatheredCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WeatheredCutCopperStairs\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WeatheredCutCopperStairs; /** - * @symbol ?WeatheredDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WeatheredDoubleCutCopperSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WeatheredDoubleCutCopperSlab; /** - * @symbol ?Web\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Web\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Web; /** - * @symbol ?WeepingVines\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WeepingVines\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WeepingVines; /** - * @symbol ?Wheat\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Wheat\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Wheat; /** - * @symbol ?WhiteCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WhiteCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteCandle; /** - * @symbol ?WhiteCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WhiteCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteCandleCake; /** - * @symbol ?WhiteGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WhiteGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteGlazedTerracotta; /** - * @symbol ?WitherRose\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WhiteWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const WhiteWool; + /** + * @symbol ?WitherRose\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WitherRose; /** - * @symbol ?Wood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?Wood\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Wood; /** - * @symbol ?WoodenButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WoodenButton\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenButton; /** - * @symbol ?WoodenDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WoodenDoor\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenDoor; /** - * @symbol ?WoodenPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WoodenPressurePlate\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenPressurePlate; /** - * @symbol ?WoodenSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?WoodenSlab\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenSlab; /** - * @symbol ?Wool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B - */ - MCAPI extern class HashedString const Wool; - /** - * @symbol ?YellowCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?YellowCandle\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowCandle; /** - * @symbol ?YellowCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?YellowCandleCake\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowCandleCake; /** - * @symbol ?YellowFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?YellowFlower\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowFlower; /** - * @symbol ?YellowGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + * @symbol ?YellowGlazedTerracotta\@VanillaBlockTypeIds\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowGlazedTerracotta; + /** + * @symbol ?YellowWool\@VanillaBlockTypeIds\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const YellowWool; }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp index f19b17ca72..497f94c7f9 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockTypes.hpp @@ -22,691 +22,503 @@ namespace VanillaBlockTypes { #undef AFTER_EXTRA /** - * @symbol ?mAmethystBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mAmethystBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mAmethystBlock; /** - * @symbol ?mAmethystCluster\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mAmethystCluster\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mAmethystCluster; /** - * @symbol ?mAnvil\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mAnvil\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mAnvil; /** - * @symbol ?mAzalea\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mAzalea; - /** - * @symbol ?mBamboo\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBamboo\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBamboo; /** - * @symbol ?mBambooSapling\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBambooSapling\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBambooSapling; /** - * @symbol ?mBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBasalt; /** - * @symbol ?mBeacon\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBeacon\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBeacon; /** - * @symbol ?mBeeNest\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBeeNest; - /** - * @symbol ?mBeehive\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBeehive; - /** - * @symbol ?mBigDripleaf\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBigDripleaf; - /** - * @symbol ?mBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBlackstone; /** - * @symbol ?mBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBlackstoneDoubleSlab; /** - * @symbol ?mBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBlackstoneSlab; /** - * @symbol ?mBoneBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mBoneBlock; - /** - * @symbol ?mBookshelf\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBookshelf\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBookshelf; /** - * @symbol ?mBrewingStand\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBrewingStand\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBrewingStand; /** - * @symbol ?mBuddingAmethyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mBuddingAmethyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mBuddingAmethyst; /** - * @symbol ?mCalcite\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCalcite\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCalcite; /** - * @symbol ?mCauldron\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCauldron\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCauldron; /** - * @symbol ?mCaveVines\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCaveVines; - /** - * @symbol ?mCaveVinesBodyWithBerries\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCaveVinesBodyWithBerries; - /** - * @symbol ?mCaveVinesHeadWithBerries\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCaveVinesHeadWithBerries; - /** - * @symbol ?mChest\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mChest\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mChest; /** - * @symbol ?mChiseledDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mChiseledDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mChiseledDeepslate; /** - * @symbol ?mChiseledPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mChiseledPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mChiseledPolishedBlackstone; /** - * @symbol ?mChorusPlantBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mChorusPlantBlock; - /** - * @symbol ?mCobbledDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCobbledDeepslate; - /** - * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCobbledDeepslateDoubleSlab; /** - * @symbol ?mCobbledDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCobbledDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCobbledDeepslateSlab; /** - * @symbol ?mCobblestone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCobblestone; - /** - * @symbol ?mConduitBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mConduitBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mConduitBlock; /** - * @symbol ?mCopperBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCopperBlock; - /** - * @symbol ?mCrackedDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCrackedDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCrackedDeepslateTiles; /** - * @symbol ?mCrimsonDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCrimsonDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCrimsonDoubleSlab; /** - * @symbol ?mCrimsonFungus\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCrimsonFungus; - /** - * @symbol ?mCrimsonNylium\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCrimsonNylium; - /** - * @symbol ?mCrimsonSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCrimsonSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCrimsonSlab; /** - * @symbol ?mCryingObsidian\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCryingObsidian; - /** - * @symbol ?mCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mCutCopper; - /** - * @symbol ?mCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCutCopperSlab; /** - * @symbol ?mCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mCutCopperStairs; /** - * @symbol ?mDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDeepslate; /** - * @symbol ?mDeepslateBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDeepslateBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDeepslateBrickDoubleSlab; /** - * @symbol ?mDeepslateBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDeepslateBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDeepslateBrickSlab; /** - * @symbol ?mDeepslateTileDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDeepslateTileDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDeepslateTileDoubleSlab; /** - * @symbol ?mDeepslateTileSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDeepslateTileSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDeepslateTileSlab; /** - * @symbol ?mDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDeepslateTiles\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDeepslateTiles; /** - * @symbol ?mDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDoubleCutCopperSlab; /** - * @symbol ?mDoubleStoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDoubleStoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDoubleStoneSlab; /** - * @symbol ?mDoubleStoneSlab2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDoubleStoneSlab2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDoubleStoneSlab2; /** - * @symbol ?mDoubleStoneSlab3\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDoubleStoneSlab3\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDoubleStoneSlab3; /** - * @symbol ?mDoubleStoneSlab4\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDoubleStoneSlab4\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDoubleStoneSlab4; /** - * @symbol ?mDoubleWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDoubleWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDoubleWoodenSlab; /** - * @symbol ?mDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mDripstone; /** - * @symbol ?mEnchantingTable\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mEnchantingTable\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mEnchantingTable; /** - * @symbol ?mExposedCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mExposedCopper; - /** - * @symbol ?mExposedCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mExposedCutCopper; - /** - * @symbol ?mExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mExposedCutCopperSlab; /** - * @symbol ?mExposedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mExposedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mExposedCutCopperStairs; /** - * @symbol ?mExposedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mExposedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mExposedDoubleCutCopperSlab; /** - * @symbol ?mFrogSpawn\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mFrogSpawn\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mFrogSpawn; /** - * @symbol ?mGildedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mGildedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mGildedBlackstone; /** - * @symbol ?mGlowLichen\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mGlowLichen; - /** - * @symbol ?mGlowingObsidian\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mGlowingObsidian; - /** - * @symbol ?mGoldBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mGoldBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mGoldBlock; /** - * @symbol ?mGrass\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mGrass; - /** - * @symbol ?mGrassPathBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mGrassPathBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mGrassPathBlock; /** - * @symbol ?mInfestedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mInfestedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mInfestedDeepslate; /** - * @symbol ?mInfoReserved6\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mInfoReserved6\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mInfoReserved6; /** - * @symbol ?mInfoUpdateGame1\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mInfoUpdateGame1\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mInfoUpdateGame1; /** - * @symbol ?mInfoUpdateGame2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mInfoUpdateGame2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mInfoUpdateGame2; /** - * @symbol ?mLargeAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mLargeAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mLargeAmethystBud; /** - * @symbol ?mLavaCauldron\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mLavaCauldron\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mLavaCauldron; /** - * @symbol ?mLodestoneBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mLodestoneBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mLodestoneBlock; /** - * @symbol ?mMagmaBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMagmaBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMagmaBlock; /** - * @symbol ?mMangroveDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMangroveDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMangroveDoubleSlab; /** - * @symbol ?mMangrovePropagule\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMangrovePropagule\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMangrovePropagule; /** - * @symbol ?mMangroveRoots\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMangroveRoots\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMangroveRoots; /** - * @symbol ?mMangroveSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMangroveSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMangroveSlab; /** - * @symbol ?mMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMangroveWood; /** - * @symbol ?mMediumAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMediumAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMediumAmethystBud; /** - * @symbol ?mMossyCobblestone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mMossyCobblestone; - /** - * @symbol ?mMovingBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMovingBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMovingBlock; /** - * @symbol ?mMudBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMudBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMudBrickDoubleSlab; /** - * @symbol ?mMudBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMudBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMudBrickSlab; /** - * @symbol ?mMuddyMangroveRoots\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mMuddyMangroveRoots\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mMuddyMangroveRoots; /** - * @symbol ?mObsidian\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mObsidian; - /** - * @symbol ?mOchreFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mOchreFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mOchreFroglight; /** - * @symbol ?mOxidizedCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mOxidizedCopper; - /** - * @symbol ?mOxidizedCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mOxidizedCutCopper; - /** - * @symbol ?mOxidizedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mOxidizedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mOxidizedCutCopperSlab; /** - * @symbol ?mOxidizedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mOxidizedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mOxidizedCutCopperStairs; /** - * @symbol ?mOxidizedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mOxidizedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mOxidizedDoubleCutCopperSlab; /** - * @symbol ?mPearlescentFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPearlescentFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPearlescentFroglight; /** - * @symbol ?mPointedDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPointedDripstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPointedDripstone; /** - * @symbol ?mPolishedBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBasalt; /** - * @symbol ?mPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedBlackstone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBlackstone; /** - * @symbol ?mPolishedBlackstoneBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedBlackstoneBrickDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBlackstoneBrickDoubleSlab; /** - * @symbol ?mPolishedBlackstoneBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedBlackstoneBrickSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBlackstoneBrickSlab; /** - * @symbol ?mPolishedBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedBlackstoneDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBlackstoneDoubleSlab; /** - * @symbol ?mPolishedBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedBlackstoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedBlackstoneSlab; /** - * @symbol ?mPolishedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedDeepslate; /** - * @symbol ?mPolishedDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedDeepslateDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedDeepslateDoubleSlab; /** - * @symbol ?mPolishedDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPolishedDeepslateSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPolishedDeepslateSlab; /** - * @symbol ?mPortal\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPortal\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPortal; /** - * @symbol ?mPrismarine\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPrismarine\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPrismarine; /** - * @symbol ?mPurpurBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mPurpurBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mPurpurBlock; /** - * @symbol ?mQuartzBricks\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mQuartzBricks\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mQuartzBricks; /** - * @symbol ?mRawCopperBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mRawCopperBlock; - /** - * @symbol ?mReeds\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mReeds\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mReeds; /** - * @symbol ?mReinforcedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mReinforcedDeepslate\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mReinforcedDeepslate; /** - * @symbol ?mSculk\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSculk\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSculk; /** - * @symbol ?mSculkCatalyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSculkCatalyst\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSculkCatalyst; /** - * @symbol ?mSculkSensor\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSculkSensor\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSculkSensor; /** - * @symbol ?mSculkShrieker\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSculkShrieker\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSculkShrieker; /** - * @symbol ?mSculkVein\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSculkVein\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSculkVein; /** - * @symbol ?mShulkerBox\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mShulkerBox\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mShulkerBox; /** - * @symbol ?mSkull\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSkull; - /** - * @symbol ?mSmallAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSmallAmethystBud\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSmallAmethystBud; /** - * @symbol ?mSmallDripleaf\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSmallDripleaf; - /** - * @symbol ?mSmoothBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSmoothBasalt\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSmoothBasalt; /** - * @symbol ?mSmoothStone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSmoothStone\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSmoothStone; /** - * @symbol ?mSporeBlossom\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mSporeBlossom; - /** - * @symbol ?mStoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mStoneSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStoneSlab; /** - * @symbol ?mStoneSlab2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mStoneSlab2\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStoneSlab2; /** - * @symbol ?mStoneSlab3\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mStoneSlab3\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStoneSlab3; /** - * @symbol ?mStoneSlab4\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mStoneSlab4\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStoneSlab4; /** - * @symbol ?mStrippedMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mStrippedMangroveWood\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mStrippedMangroveWood; /** - * @symbol ?mSweetBerryBushBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mSweetBerryBushBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mSweetBerryBushBlock; /** - * @symbol ?mTuff\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mTuff\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mTuff; /** - * @symbol ?mTwistingVinesBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mTwistingVinesBlock; - /** - * @symbol ?mUndyedShulkerBox\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mUndyedShulkerBox\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mUndyedShulkerBox; /** - * @symbol ?mVerdantFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mVerdantFroglight\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mVerdantFroglight; /** - * @symbol ?mVine\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mVine; - /** - * @symbol ?mWarpedDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWarpedDoubleSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWarpedDoubleSlab; /** - * @symbol ?mWarpedFungus\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWarpedFungus; - /** - * @symbol ?mWarpedNylium\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWarpedNylium; - /** - * @symbol ?mWarpedSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWarpedSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWarpedSlab; /** - * @symbol ?mWarpedWartBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWarpedWartBlock; - /** - * @symbol ?mWaterlily\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaterlily; - /** - * @symbol ?mWaxedCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedCopper; - /** - * @symbol ?mWaxedCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedCutCopper; - /** - * @symbol ?mWaxedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedCutCopperSlab; /** - * @symbol ?mWaxedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedCutCopperStairs; /** - * @symbol ?mWaxedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedDoubleCutCopperSlab; /** - * @symbol ?mWaxedExposedCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedExposedCopper; - /** - * @symbol ?mWaxedExposedCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedExposedCutCopper; - /** - * @symbol ?mWaxedExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedExposedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedExposedCutCopperSlab; /** - * @symbol ?mWaxedExposedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedExposedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedExposedCutCopperStairs; /** - * @symbol ?mWaxedExposedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedExposedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedExposedDoubleCutCopperSlab; /** - * @symbol ?mWaxedOxidizedCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedOxidizedCopper; - /** - * @symbol ?mWaxedOxidizedCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedOxidizedCutCopper; - /** - * @symbol ?mWaxedOxidizedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedOxidizedCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedOxidizedCutCopperSlab; /** - * @symbol ?mWaxedOxidizedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedOxidizedCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedOxidizedCutCopperStairs; /** - * @symbol ?mWaxedOxidizedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedOxidizedDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedOxidizedDoubleCutCopperSlab; /** - * @symbol ?mWaxedWeatheredCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedWeatheredCopper; - /** - * @symbol ?mWaxedWeatheredCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWaxedWeatheredCutCopper; - /** - * @symbol ?mWaxedWeatheredCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedWeatheredCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedWeatheredCutCopperSlab; /** - * @symbol ?mWaxedWeatheredCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedWeatheredCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedWeatheredCutCopperStairs; /** - * @symbol ?mWaxedWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWaxedWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWaxedWeatheredDoubleCutCopperSlab; /** - * @symbol ?mWeatheredCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWeatheredCopper; - /** - * @symbol ?mWeatheredCutCopper\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWeatheredCutCopper; - /** - * @symbol ?mWeatheredCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWeatheredCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWeatheredCutCopperSlab; /** - * @symbol ?mWeatheredCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWeatheredCutCopperStairs\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWeatheredCutCopperStairs; /** - * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWeatheredDoubleCutCopperSlab; /** - * @symbol ?mWeepingVines\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWeepingVines; - /** - * @symbol ?mWitherRose\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWitherRose\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWitherRose; /** - * @symbol ?mWoodBlock\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A - */ - MCAPI extern class WeakPtr mWoodBlock; - /** - * @symbol ?mWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A + * @symbol ?mWoodenSlab\@VanillaBlockTypes\@\@3V?$WeakPtr\@VBlockLegacy\@\@\@\@A */ MCAPI extern class WeakPtr mWoodenSlab; /** - * @symbol ?registerBlocks\@VanillaBlockTypes\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?registerBlocks\@VanillaBlockTypes\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI void registerBlocks(class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?unregisterBlocks\@VanillaBlockTypes\@\@YAXXZ + * @symbol ?unregisterBlocks\@VanillaBlockTypes\@\@YAXXZ */ MCAPI void unregisterBlocks(); diff --git a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp index 93e75a3044..0bb3880147 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlockUpdater.hpp @@ -30,64 +30,68 @@ class VanillaBlockUpdater { public: /** - * @symbol ?destroy\@VanillaBlockUpdater\@\@SAXXZ + * @symbol ?destroy\@VanillaBlockUpdater\@\@SAXXZ */ MCAPI static void destroy(); /** - * @symbol ?get\@VanillaBlockUpdater\@\@SAAEAVCompoundTagUpdaterContext\@\@XZ + * @symbol ?get\@VanillaBlockUpdater\@\@SAAEAVCompoundTagUpdaterContext\@\@XZ */ MCAPI static class CompoundTagUpdaterContext & get(); /** - * @symbol ?initialize\@VanillaBlockUpdater\@\@SAXXZ + * @symbol ?initialize\@VanillaBlockUpdater\@\@SAXXZ */ MCAPI static void initialize(); //private: /** - * @symbol ?addBaseUpdater\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addBaseUpdater\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addBaseUpdater(class CompoundTagUpdaterContext &); /** - * @symbol ?addRailUpdater_1_14_0\@VanillaBlockUpdater\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addRailUpdater_1_14_0\@VanillaBlockUpdater\@\@CAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addRailUpdater_1_14_0(std::string const &, class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_10_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_10_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_10_0(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_12_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_12_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_12_0(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_13_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_13_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_13_0(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_14_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_14_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_14_0(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_15_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_15_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_15_0(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_16_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_16_0\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_16_0(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_16_210\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_16_210\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_16_210(class CompoundTagUpdaterContext &); /** - * @symbol ?addUpdaters_1_18_10\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + * @symbol ?addUpdaters_1_18_10\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z */ MCAPI static void addUpdaters_1_18_10(class CompoundTagUpdaterContext &); + /** + * @symbol ?addUpdaters_1_19_70\@VanillaBlockUpdater\@\@CAXAEAVCompoundTagUpdaterContext\@\@\@Z + */ + MCAPI static void addUpdaters_1_19_70(class CompoundTagUpdaterContext &); private: /** - * @symbol ?mContext\@VanillaBlockUpdater\@\@0V?$unique_ptr\@VCompoundTagUpdaterContext\@\@U?$default_delete\@VCompoundTagUpdaterContext\@\@\@std\@\@\@std\@\@A + * @symbol ?mContext\@VanillaBlockUpdater\@\@0V?$unique_ptr\@VCompoundTagUpdaterContext\@\@U?$default_delete\@VCompoundTagUpdaterContext\@\@\@std\@\@\@std\@\@A */ MCAPI static std::unique_ptr mContext; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaBlocks.hpp b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp index 64eceb5889..2bcb13d1e5 100644 --- a/LiteLoader/include/llapi/mc/VanillaBlocks.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBlocks.hpp @@ -22,655 +22,487 @@ namespace VanillaBlocks { #undef AFTER_EXTRA /** - * @symbol ?assignBlocks\@VanillaBlocks\@\@YAXAEBVExperiments\@\@\@Z + * @symbol ?assignBlocks\@VanillaBlocks\@\@YAXAEBVExperiments\@\@\@Z */ MCAPI void assignBlocks(class Experiments const &); /** - * @symbol ?mAmethystBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mAmethystBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mAmethystBlock; /** - * @symbol ?mAmethystCluster\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mAmethystCluster\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mAmethystCluster; /** - * @symbol ?mAnvil\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mAnvil\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mAnvil; /** - * @symbol ?mAzalea\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mAzalea; - /** - * @symbol ?mBamboo\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBamboo\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBamboo; /** - * @symbol ?mBambooSapling\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBambooSapling\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBambooSapling; /** - * @symbol ?mBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBasalt; /** - * @symbol ?mBeacon\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBeacon\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBeacon; /** - * @symbol ?mBeeNest\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBeeNest; - /** - * @symbol ?mBeehive\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBeehive; - /** - * @symbol ?mBigDripleaf\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBigDripleaf; - /** - * @symbol ?mBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBlackstone; /** - * @symbol ?mBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBlackstoneDoubleSlab; /** - * @symbol ?mBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBlackstoneSlab; /** - * @symbol ?mBoneBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mBoneBlock; - /** - * @symbol ?mBookshelf\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBookshelf\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBookshelf; /** - * @symbol ?mBrewingStand\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBrewingStand\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBrewingStand; /** - * @symbol ?mBuddingAmethyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mBuddingAmethyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mBuddingAmethyst; /** - * @symbol ?mCalcite\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCalcite\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCalcite; /** - * @symbol ?mCauldron\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCauldron\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCauldron; /** - * @symbol ?mCaveVines\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCaveVines; - /** - * @symbol ?mCaveVinesBodyWithBerries\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCaveVinesBodyWithBerries; - /** - * @symbol ?mCaveVinesHeadWithBerries\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCaveVinesHeadWithBerries; - /** - * @symbol ?mChest\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mChest\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mChest; /** - * @symbol ?mChiseledDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mChiseledDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mChiseledDeepslate; /** - * @symbol ?mChiseledPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mChiseledPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mChiseledPolishedBlackstone; /** - * @symbol ?mChorusPlantBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mChorusPlantBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mChorusPlantBlock; /** - * @symbol ?mCobbledDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCobbledDeepslate; - /** - * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCobbledDeepslateDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCobbledDeepslateDoubleSlab; /** - * @symbol ?mCobbledDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCobbledDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCobbledDeepslateSlab; /** - * @symbol ?mCobblestone\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCobblestone; - /** - * @symbol ?mConduitBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mConduitBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mConduitBlock; /** - * @symbol ?mCopperBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCopperBlock; - /** - * @symbol ?mCrackedDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCrackedDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCrackedDeepslateTiles; /** - * @symbol ?mCrimsonDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCrimsonDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCrimsonDoubleSlab; /** - * @symbol ?mCrimsonFungus\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCrimsonFungus\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCrimsonFungus; /** - * @symbol ?mCrimsonNylium\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCrimsonNylium; - /** - * @symbol ?mCrimsonSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCrimsonSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCrimsonSlab; /** - * @symbol ?mCryingObsidian\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCryingObsidian; - /** - * @symbol ?mCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mCutCopper; - /** - * @symbol ?mCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mCutCopperSlab; /** - * @symbol ?mDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDeepslate; /** - * @symbol ?mDeepslateBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDeepslateBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDeepslateBrickDoubleSlab; /** - * @symbol ?mDeepslateBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDeepslateBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDeepslateBrickSlab; /** - * @symbol ?mDeepslateTileDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDeepslateTileDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDeepslateTileDoubleSlab; /** - * @symbol ?mDeepslateTileSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDeepslateTileSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDeepslateTileSlab; /** - * @symbol ?mDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDeepslateTiles\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDeepslateTiles; /** - * @symbol ?mDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDoubleCutCopperSlab; /** - * @symbol ?mDoubleStoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDoubleStoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDoubleStoneSlab; /** - * @symbol ?mDoubleStoneSlab2\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDoubleStoneSlab2\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDoubleStoneSlab2; /** - * @symbol ?mDoubleStoneSlab3\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDoubleStoneSlab3\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDoubleStoneSlab3; /** - * @symbol ?mDoubleStoneSlab4\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDoubleStoneSlab4\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDoubleStoneSlab4; /** - * @symbol ?mDoubleWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDoubleWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDoubleWoodenSlab; /** - * @symbol ?mDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mDripstone; /** - * @symbol ?mEnchantingTable\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mEnchantingTable\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mEnchantingTable; /** - * @symbol ?mExposedCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mExposedCopper; - /** - * @symbol ?mExposedCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mExposedCutCopper; - /** - * @symbol ?mExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mExposedCutCopperSlab; /** - * @symbol ?mExposedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mExposedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mExposedDoubleCutCopperSlab; /** - * @symbol ?mFrogSpawn\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mFrogSpawn\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mFrogSpawn; /** - * @symbol ?mGildedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mGildedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mGildedBlackstone; /** - * @symbol ?mGlowLichen\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mGlowLichen; - /** - * @symbol ?mGlowingObsidian\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mGlowingObsidian; - /** - * @symbol ?mGrass\@VanillaBlocks\@\@3PEAVBlock\@\@EA - */ - MCAPI extern class Block * mGrass; - /** - * @symbol ?mGrassPathBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mGrassPathBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mGrassPathBlock; /** - * @symbol ?mInfestedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mInfestedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mInfestedDeepslate; /** - * @symbol ?mInfoReserved6\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mInfoReserved6\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mInfoReserved6; /** - * @symbol ?mInfoUpdateGame1\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mInfoUpdateGame1\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mInfoUpdateGame1; /** - * @symbol ?mInfoUpdateGame2\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mInfoUpdateGame2\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mInfoUpdateGame2; /** - * @symbol ?mLargeAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mLargeAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mLargeAmethystBud; /** - * @symbol ?mLavaCauldron\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mLavaCauldron\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mLavaCauldron; /** - * @symbol ?mLodestoneBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mLodestoneBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mLodestoneBlock; /** - * @symbol ?mMagmaBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMagmaBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMagmaBlock; /** - * @symbol ?mMangroveDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMangroveDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMangroveDoubleSlab; /** - * @symbol ?mMangrovePropagule\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMangrovePropagule\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMangrovePropagule; /** - * @symbol ?mMangroveRoots\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMangroveRoots\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMangroveRoots; /** - * @symbol ?mMangroveSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMangroveSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMangroveSlab; /** - * @symbol ?mMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMangroveWood; /** - * @symbol ?mMediumAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMediumAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMediumAmethystBud; /** - * @symbol ?mMossyCobblestone\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mMossyCobblestone; - /** - * @symbol ?mMovingBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMovingBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMovingBlock; /** - * @symbol ?mMudBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMudBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMudBrickDoubleSlab; /** - * @symbol ?mMudBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMudBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMudBrickSlab; /** - * @symbol ?mMuddyMangroveRoots\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mMuddyMangroveRoots\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mMuddyMangroveRoots; /** - * @symbol ?mObsidian\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mObsidian; - /** - * @symbol ?mOchreFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mOchreFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mOchreFroglight; /** - * @symbol ?mOxidizedCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mOxidizedCopper; - /** - * @symbol ?mOxidizedCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mOxidizedCutCopper; - /** - * @symbol ?mOxidizedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mOxidizedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mOxidizedCutCopperSlab; /** - * @symbol ?mOxidizedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mOxidizedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mOxidizedDoubleCutCopperSlab; /** - * @symbol ?mPearlescentFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPearlescentFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPearlescentFroglight; /** - * @symbol ?mPointedDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPointedDripstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPointedDripstone; /** - * @symbol ?mPolishedBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBasalt; /** - * @symbol ?mPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedBlackstone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBlackstone; /** - * @symbol ?mPolishedBlackstoneBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedBlackstoneBrickDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBlackstoneBrickDoubleSlab; /** - * @symbol ?mPolishedBlackstoneBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedBlackstoneBrickSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBlackstoneBrickSlab; /** - * @symbol ?mPolishedBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedBlackstoneDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBlackstoneDoubleSlab; /** - * @symbol ?mPolishedBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedBlackstoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedBlackstoneSlab; /** - * @symbol ?mPolishedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedDeepslate; /** - * @symbol ?mPolishedDeepslateDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedDeepslateDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedDeepslateDoubleSlab; /** - * @symbol ?mPolishedDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPolishedDeepslateSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPolishedDeepslateSlab; /** - * @symbol ?mPortal\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPortal\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPortal; /** - * @symbol ?mPrismarine\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPrismarine\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPrismarine; /** - * @symbol ?mPurpurBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mPurpurBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mPurpurBlock; /** - * @symbol ?mQuartzBricks\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mQuartzBricks\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mQuartzBricks; /** - * @symbol ?mRawCopperBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mRawCopperBlock; - /** - * @symbol ?mReeds\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mReeds\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mReeds; /** - * @symbol ?mReinforcedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mReinforcedDeepslate\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mReinforcedDeepslate; /** - * @symbol ?mSculk\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSculk\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSculk; /** - * @symbol ?mSculkCatalyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSculkCatalyst\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSculkCatalyst; /** - * @symbol ?mSculkSensor\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSculkSensor\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSculkSensor; /** - * @symbol ?mSculkShrieker\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSculkShrieker\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSculkShrieker; /** - * @symbol ?mSculkVein\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSculkVein\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSculkVein; /** - * @symbol ?mShulkerBox\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mShulkerBox\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mShulkerBox; /** - * @symbol ?mSkull\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSkull; - /** - * @symbol ?mSmallAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSmallAmethystBud\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSmallAmethystBud; /** - * @symbol ?mSmallDripleaf\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSmallDripleaf; - /** - * @symbol ?mSmoothBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSmoothBasalt\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSmoothBasalt; /** - * @symbol ?mSmoothStone\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSmoothStone\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSmoothStone; /** - * @symbol ?mSporeBlossom\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mSporeBlossom; - /** - * @symbol ?mStoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mStoneSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStoneSlab; /** - * @symbol ?mStoneSlab2\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mStoneSlab2\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStoneSlab2; /** - * @symbol ?mStoneSlab3\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mStoneSlab3\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStoneSlab3; /** - * @symbol ?mStoneSlab4\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mStoneSlab4\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStoneSlab4; /** - * @symbol ?mStrippedMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mStrippedMangroveWood\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mStrippedMangroveWood; /** - * @symbol ?mSweetBerryBushBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mSweetBerryBushBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mSweetBerryBushBlock; /** - * @symbol ?mTuff\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mTuff\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mTuff; /** - * @symbol ?mTwistingVinesBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mTwistingVinesBlock; - /** - * @symbol ?mUndyedShulkerBox\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mUndyedShulkerBox\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mUndyedShulkerBox; /** - * @symbol ?mVerdantFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mVerdantFroglight\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mVerdantFroglight; /** - * @symbol ?mVine\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mVine\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mVine; /** - * @symbol ?mWarpedDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWarpedDoubleSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWarpedDoubleSlab; /** - * @symbol ?mWarpedFungus\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWarpedFungus\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWarpedFungus; /** - * @symbol ?mWarpedNylium\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWarpedNylium; - /** - * @symbol ?mWarpedSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWarpedSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWarpedSlab; /** - * @symbol ?mWarpedWartBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWarpedWartBlock; - /** - * @symbol ?mWaterlily\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaterlily\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaterlily; /** - * @symbol ?mWaxedCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedCopper; - /** - * @symbol ?mWaxedCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedCutCopper; - /** - * @symbol ?mWaxedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedCutCopperSlab; /** - * @symbol ?mWaxedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedDoubleCutCopperSlab; /** - * @symbol ?mWaxedExposedCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedExposedCopper; - /** - * @symbol ?mWaxedExposedCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedExposedCutCopper; - /** - * @symbol ?mWaxedExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedExposedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedExposedCutCopperSlab; /** - * @symbol ?mWaxedExposedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedExposedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedExposedDoubleCutCopperSlab; /** - * @symbol ?mWaxedOxidizedCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedOxidizedCopper; - /** - * @symbol ?mWaxedOxidizedCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedOxidizedCutCopper; - /** - * @symbol ?mWaxedOxidizedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedOxidizedCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedOxidizedCutCopperSlab; /** - * @symbol ?mWaxedOxidizedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedOxidizedDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedOxidizedDoubleCutCopperSlab; /** - * @symbol ?mWaxedWeatheredCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedWeatheredCopper; - /** - * @symbol ?mWaxedWeatheredCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWaxedWeatheredCutCopper; - /** - * @symbol ?mWaxedWeatheredCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedWeatheredCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedWeatheredCutCopperSlab; /** - * @symbol ?mWaxedWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWaxedWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWaxedWeatheredDoubleCutCopperSlab; /** - * @symbol ?mWeatheredCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWeatheredCopper; - /** - * @symbol ?mWeatheredCutCopper\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWeatheredCutCopper; - /** - * @symbol ?mWeatheredCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWeatheredCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWeatheredCutCopperSlab; /** - * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWeatheredDoubleCutCopperSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWeatheredDoubleCutCopperSlab; /** - * @symbol ?mWeepingVines\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWeepingVines; - /** - * @symbol ?mWitherRose\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWitherRose\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWitherRose; /** - * @symbol ?mWoodBlock\@VanillaBlocks\@\@3PEBVBlock\@\@EB - */ - MCAPI extern class Block const * mWoodBlock; - /** - * @symbol ?mWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB + * @symbol ?mWoodenSlab\@VanillaBlocks\@\@3PEBVBlock\@\@EB */ MCAPI extern class Block const * mWoodenSlab; /** - * @symbol ?unassignBlocks\@VanillaBlocks\@\@YAXXZ + * @symbol ?unassignBlocks\@VanillaBlocks\@\@YAXXZ */ MCAPI void unassignBlocks(); diff --git a/LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp b/LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp index 1e219edf68..8894c44077 100644 --- a/LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp +++ b/LiteLoader/include/llapi/mc/VanillaBuiltInEntities.hpp @@ -22,7 +22,7 @@ namespace VanillaBuiltInEntities { #undef AFTER_EXTRA /** - * @symbol ?registerMappings\@VanillaBuiltInEntities\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?registerMappings\@VanillaBuiltInEntities\@\@YAXAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI void registerMappings(class BaseGameVersion const &, class Experiments const &); diff --git a/LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp b/LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp index 562b8a0141..bfd9602378 100644 --- a/LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp +++ b/LiteLoader/include/llapi/mc/VanillaDimensionFactory.hpp @@ -22,8 +22,8 @@ namespace VanillaDimensionFactory { #undef AFTER_EXTRA /** - * @symbol ?registerDimensionTypes\@VanillaDimensionFactory\@\@YAXAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVLevel\@\@AEAVScheduler\@\@\@\@\@Z + * @symbol ?registerDimensionTypes\@VanillaDimensionFactory\@\@YAXAEAV?$OwnerPtrFactory\@VDimension\@\@AEAVILevel\@\@AEAVScheduler\@\@\@\@\@Z */ - MCAPI void registerDimensionTypes(class OwnerPtrFactory &); + MCAPI void registerDimensionTypes(class OwnerPtrFactory &); }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VanillaDimensions.hpp b/LiteLoader/include/llapi/mc/VanillaDimensions.hpp index b162416098..67fc3424a6 100644 --- a/LiteLoader/include/llapi/mc/VanillaDimensions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaDimensions.hpp @@ -30,43 +30,43 @@ class VanillaDimensions { public: /** - * @symbol ?Nether\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B + * @symbol ?Nether\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B */ MCAPI static class AutomaticID const Nether; /** - * @symbol ?Overworld\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B + * @symbol ?Overworld\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B */ MCAPI static class AutomaticID const Overworld; /** - * @symbol ?TheEnd\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B + * @symbol ?TheEnd\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B */ MCAPI static class AutomaticID const TheEnd; /** - * @symbol ?TheEndSpawnPoint\@VanillaDimensions\@\@2VVec3\@\@B + * @symbol ?TheEndSpawnPoint\@VanillaDimensions\@\@2VVec3\@\@B */ MCAPI static class Vec3 const TheEndSpawnPoint; /** - * @symbol ?Undefined\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B + * @symbol ?Undefined\@VanillaDimensions\@\@2V?$AutomaticID\@VDimension\@\@H\@\@B */ MCAPI static class AutomaticID const Undefined; /** - * @symbol ?convertPointBetweenDimensions\@VanillaDimensions\@\@SA_NAEBVVec3\@\@AEAV2\@V?$AutomaticID\@VDimension\@\@H\@\@2AEBVDimensionConversionData\@\@\@Z + * @symbol ?convertPointBetweenDimensions\@VanillaDimensions\@\@SA_NAEBVVec3\@\@AEAV2\@V?$AutomaticID\@VDimension\@\@H\@\@2AEBVDimensionConversionData\@\@\@Z */ MCAPI static bool convertPointBetweenDimensions(class Vec3 const &, class Vec3 &, class AutomaticID, class AutomaticID, class DimensionConversionData const &); /** - * @symbol ?fromSerializedInt\@VanillaDimensions\@\@SA?AV?$AutomaticID\@VDimension\@\@H\@\@H\@Z + * @symbol ?fromSerializedInt\@VanillaDimensions\@\@SA?AV?$AutomaticID\@VDimension\@\@H\@\@H\@Z */ MCAPI static class AutomaticID fromSerializedInt(int); /** - * @symbol ?fromString\@VanillaDimensions\@\@SA?AV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?fromString\@VanillaDimensions\@\@SA?AV?$AutomaticID\@VDimension\@\@H\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static class AutomaticID fromString(std::string const &); /** - * @symbol ?toSerializedInt\@VanillaDimensions\@\@SAHAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?toSerializedInt\@VanillaDimensions\@\@SAHAEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI static int toSerializedInt(class AutomaticID const &); /** - * @symbol ?toString\@VanillaDimensions\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?toString\@VanillaDimensions\@\@SA?BV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI static std::string const toString(class AutomaticID const &); @@ -74,8 +74,8 @@ class VanillaDimensions { protected: /** - * @symbol ?DimensionMap\@VanillaDimensions\@\@1V?$BidirectionalUnorderedMap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@\@B + * @symbol ?DimensionMap\@VanillaDimensions\@\@1V?$BidirectionalUnorderedMap\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@\@B */ MCAPI static class BidirectionalUnorderedMap> const DimensionMap; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp index 81fc94926a..2170006a84 100644 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp +++ b/LiteLoader/include/llapi/mc/VanillaEntityInitializerCommon.hpp @@ -28,24 +28,28 @@ class VanillaEntityInitializerCommon { public: /** - * @symbol ?createFromFunction\@VanillaEntityInitializerCommon\@\@SA?AV?$unique_ptr\@VIEntityInitializer\@\@U?$default_delete\@VIEntityInitializer\@\@\@std\@\@\@std\@\@V?$not_null\@P6AXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV3\@\@Z\@gsl\@\@\@Z + * @symbol ?createFromFunction\@VanillaEntityInitializerCommon\@\@SA?AV?$unique_ptr\@VIEntityInitializer\@\@U?$default_delete\@VIEntityInitializer\@\@\@std\@\@\@std\@\@V?$not_null\@P6AXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV3\@\@Z\@gsl\@\@\@Z */ MCAPI static std::unique_ptr createFromFunction(class gsl::not_null, class EntityContext &, class EntityContext const &)>); /** - * @symbol ?initActorComponents\@VanillaEntityInitializerCommon\@\@SAXW4EntityHost\@\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV5\@\@Z + * @symbol ?initActorComponents\@VanillaEntityInitializerCommon\@\@SAXW4EntityHost\@\@V?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV5\@\@Z */ MCAPI static void initActorComponents(enum class EntityHost, std::unique_ptr, class EntityContext &, class EntityContext const &); /** - * @symbol ?initECSMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z + * @symbol ?initECSMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z */ MCAPI static void initECSMovement(class EntityContext &, class EntityContext const &); /** - * @symbol ?initExperimentalMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z + * @symbol ?initExperimentalMovement\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z */ MCAPI static void initExperimentalMovement(class EntityContext &, class EntityContext const &); /** - * @symbol ?initSideBySideComparison\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z + * @symbol ?initSideBySideComparison\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z */ MCAPI static void initSideBySideComparison(class EntityContext &, class EntityContext const &); + /** + * @symbol ?initVanilla\@VanillaEntityInitializerCommon\@\@SAXAEAVEntityContext\@\@AEBV2\@\@Z + */ + MCAPI static void initVanilla(class EntityContext &, class EntityContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp b/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp index 72fe4d920d..311d49f936 100644 --- a/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaEntityInitializerServer.hpp @@ -29,16 +29,16 @@ class VanillaEntityInitializerServer { public: /** - * @symbol ?create\@VanillaEntityInitializerServer\@\@SA?AV?$unique_ptr\@VIEntityInitializer\@\@U?$default_delete\@VIEntityInitializer\@\@\@std\@\@\@std\@\@AEBURegistrationOptions\@VanillaSystemsRegistration\@\@\@Z + * @symbol ?create\@VanillaEntityInitializerServer\@\@SA?AV?$unique_ptr\@VIEntityInitializer\@\@U?$default_delete\@VIEntityInitializer\@\@\@std\@\@\@std\@\@AEBURegistrationOptions\@VanillaSystemsRegistration\@\@\@Z */ MCAPI static std::unique_ptr create(struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?initECSMovement\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z + * @symbol ?initECSMovement\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z */ MCAPI static void initECSMovement(std::unique_ptr, class EntityContext &, class EntityContext const &); /** - * @symbol ?initSideBySideComparison\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z + * @symbol ?initSideBySideComparison\@VanillaEntityInitializerServer\@\@SAXV?$unique_ptr\@VActor\@\@U?$default_delete\@VActor\@\@\@std\@\@\@std\@\@AEAVEntityContext\@\@AEBV4\@\@Z */ MCAPI static void initSideBySideComparison(std::unique_ptr, class EntityContext &, class EntityContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaFeatures.hpp b/LiteLoader/include/llapi/mc/VanillaFeatures.hpp index cfa5a844bb..0b87261033 100644 --- a/LiteLoader/include/llapi/mc/VanillaFeatures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaFeatures.hpp @@ -30,12 +30,12 @@ class VanillaFeatures { public: /** - * @symbol ?registerFeatureTypes\@VanillaFeatures\@\@SAXAEAVFeatureTypeFactory\@\@\@Z + * @symbol ?registerFeatureTypes\@VanillaFeatures\@\@SAXAEAVFeatureTypeFactory\@\@\@Z */ MCAPI static void registerFeatureTypes(class FeatureTypeFactory &); /** - * @symbol ?registerFeatures\@VanillaFeatures\@\@SAXAEAVFeatureRegistry\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?registerFeatures\@VanillaFeatures\@\@SAXAEAVFeatureRegistry\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void registerFeatures(class FeatureRegistry &, class BaseGameVersion const &, class Experiments const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp b/LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp index 5b15e46414..cbb6ad8a03 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameModuleDedicatedServer.hpp @@ -30,29 +30,29 @@ class VanillaGameModuleDedicatedServer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VanillaGameModuleDedicatedServer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?createGameModuleServer\@VanillaGameModuleDedicatedServer\@\@UEAA?AV?$unique_ptr\@VGameModuleServer\@\@U?$default_delete\@VGameModuleServer\@\@\@std\@\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?createGameModuleServer\@VanillaGameModuleDedicatedServer\@\@UEAA?AV?$unique_ptr\@VGameModuleServer\@\@U?$default_delete\@VGameModuleServer\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr createGameModuleServer(); /** - * @vftbl 2 - * @symbol ?createInPackagePacks\@VanillaGameModuleDedicatedServer\@\@UEAA?AV?$shared_ptr\@VIInPackagePacks\@\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?createInPackagePacks\@VanillaGameModuleDedicatedServer\@\@UEAA?AV?$shared_ptr\@VIInPackagePacks\@\@\@std\@\@XZ */ virtual class std::shared_ptr createInPackagePacks(); /** - * @vftbl 3 - * @symbol ?registerMolangQueries\@VanillaGameModuleDedicatedServer\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?registerMolangQueries\@VanillaGameModuleDedicatedServer\@\@UEAAXXZ */ virtual void registerMolangQueries(); /** - * @vftbl 4 - * @symbol ?registerServerInstanceHandler\@VanillaGameModuleDedicatedServer\@\@UEAAXAEAVServerInstanceEventCoordinator\@\@\@Z + * @vftbl 4 + * @symbol ?registerServerInstanceHandler\@VanillaGameModuleDedicatedServer\@\@UEAAXAEAVServerInstanceEventCoordinator\@\@\@Z */ virtual void registerServerInstanceHandler(class ServerInstanceEventCoordinator &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp index 3d51bcee78..ad8f908945 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameModuleServer.hpp @@ -30,75 +30,75 @@ class VanillaGameModuleServer { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VanillaGameModuleServer(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?init\@VanillaGameModuleServer\@\@UEAAXAEAVServerInstance\@\@AEAVLevel\@\@\@Z + * @vftbl 1 + * @symbol ?init\@VanillaGameModuleServer\@\@UEAAXAEAVServerInstance\@\@AEAVLevel\@\@\@Z */ virtual void init(class ServerInstance &, class Level &); /** - * @vftbl 2 - * @symbol ?initializeBehaviorStack\@VanillaGameModuleServer\@\@UEAAXAEBVExperiments\@\@AEAVIResourcePackRepository\@\@AEAVResourcePackStack\@\@AEBVBaseGameVersion\@\@\@Z + * @vftbl 2 + * @symbol ?initializeBehaviorStack\@VanillaGameModuleServer\@\@UEAAXAEBVExperiments\@\@AEAVIResourcePackRepository\@\@AEAVResourcePackStack\@\@AEBVBaseGameVersion\@\@\@Z */ virtual void initializeBehaviorStack(class Experiments const &, class IResourcePackRepository &, class ResourcePackStack &, class BaseGameVersion const &); /** - * @vftbl 3 - * @symbol ?configureLevel\@VanillaGameModuleServer\@\@UEAAXAEAVLevel\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z + * @vftbl 3 + * @symbol ?configureLevel\@VanillaGameModuleServer\@\@UEAAXAEAVLevel\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z */ virtual void configureLevel(class Level &, class Experiments const &, class ResourcePackManager &, class BaseGameVersion const &); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?configureDocumentation\@VanillaGameModuleServer\@\@UEAAXAEAVIGameModuleDocumentation\@\@VItemRegistryRef\@\@\@Z + * @vftbl 5 + * @symbol ?configureDocumentation\@VanillaGameModuleServer\@\@UEAAXAEAVIGameModuleDocumentation\@\@VItemRegistryRef\@\@\@Z */ virtual void configureDocumentation(class IGameModuleDocumentation &, class ItemRegistryRef); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol ?setupCommands\@VanillaGameModuleServer\@\@UEAAXAEAVCommandRegistry\@\@\@Z + * @vftbl 7 + * @symbol ?setupCommands\@VanillaGameModuleServer\@\@UEAAXAEAVCommandRegistry\@\@\@Z */ virtual void setupCommands(class CommandRegistry &); /** - * @vftbl 8 - * @symbol ?configureServerNetworkHandler\@VanillaGameModuleServer\@\@UEAAXAEAVServerInstance\@\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 8 + * @symbol ?configureServerNetworkHandler\@VanillaGameModuleServer\@\@UEAAXAEAVServerInstance\@\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual void configureServerNetworkHandler(class ServerInstance &, class gsl::not_null>); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VANILLAGAMEMODULESERVER /** - * @symbol ?configureNewPlayer\@VanillaGameModuleServer\@\@UEAAXAEAVPlayer\@\@\@Z + * @symbol ?configureNewPlayer\@VanillaGameModuleServer\@\@UEAAXAEAVPlayer\@\@\@Z */ MCVAPI void configureNewPlayer(class Player &); /** - * @symbol ?tick\@VanillaGameModuleServer\@\@UEAAXXZ + * @symbol ?tick\@VanillaGameModuleServer\@\@UEAAXXZ */ MCVAPI void tick(); #endif /** - * @symbol ??0VanillaGameModuleServer\@\@QEAA\@XZ + * @symbol ??0VanillaGameModuleServer\@\@QEAA\@XZ */ MCAPI VanillaGameModuleServer(); //private: /** - * @symbol ?_configureWorldGen\@VanillaGameModuleServer\@\@AEAAXAEAVIWorldRegistriesProvider\@\@AEBUSpawnSettings\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?_configureWorldGen\@VanillaGameModuleServer\@\@AEAAXAEAVIWorldRegistriesProvider\@\@AEBUSpawnSettings\@\@AEBVExperiments\@\@AEAVResourcePackManager\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI void _configureWorldGen(class IWorldRegistriesProvider &, struct SpawnSettings const &, class Experiments const &, class ResourcePackManager &, class BaseGameVersion const &); /** - * @symbol ?_registerListeners\@VanillaGameModuleServer\@\@AEAAXAEAVLevel\@\@\@Z + * @symbol ?_registerListeners\@VanillaGameModuleServer\@\@AEAAXAEAVLevel\@\@\@Z */ MCAPI void _registerListeners(class Level &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp index 9be82d0101..1b59185c01 100644 --- a/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGameVersions.hpp @@ -22,67 +22,71 @@ namespace VanillaGameVersions { #undef AFTER_EXTRA /** - * @symbol ?BeeUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?BeeUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const BeeUpdate; /** - * @symbol ?CavesAndCliffsUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?CavesAndCliffsUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const CavesAndCliffsUpdate; /** - * @symbol ?CavesAndCliffsUpdate_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?CavesAndCliffsUpdate_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const CavesAndCliffsUpdate_U1; /** - * @symbol ?CavesAndCliffsUpdate_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?CavesAndCliffsUpdate_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const CavesAndCliffsUpdate_U3; /** - * @symbol ?CavesAndCliffs_Part1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?CavesAndCliffs_Part1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const CavesAndCliffs_Part1; /** - * @symbol ?CavesAndCliffs_Part1_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?CavesAndCliffs_Part1_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const CavesAndCliffs_Part1_U1; /** - * @symbol ?LastLegacyGeneratorUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?LastLegacyGeneratorUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const LastLegacyGeneratorUpdate; /** - * @symbol ?NetherUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?NetherUpdate\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const NetherUpdate; /** - * @symbol ?NetherUpdate_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?NetherUpdate_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const NetherUpdate_U3; /** - * @symbol ?NextMajorUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?NextMajorUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const NextMajorUpdateVersion; /** - * @symbol ?SnifferVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?SneakingHeightChangeVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + */ + MCAPI extern class BaseGameVersion const SneakingHeightChangeVersion; + /** + * @symbol ?SnifferVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const SnifferVersion; /** - * @symbol ?WildUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?WildUpdateVersion\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const WildUpdateVersion; /** - * @symbol ?WildUpdateVersion_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?WildUpdateVersion_U1\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const WildUpdateVersion_U1; /** - * @symbol ?WildUpdateVersion_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?WildUpdateVersion_U3\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const WildUpdateVersion_U3; /** - * @symbol ?WildUpdateVersion_U4\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?WildUpdateVersion_U4\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const WildUpdateVersion_U4; /** - * @symbol ?WildUpdateVersion_U6\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B + * @symbol ?WildUpdateVersion_U6\@VanillaGameVersions\@\@3VBaseGameVersion\@\@B */ MCAPI extern class BaseGameVersion const WildUpdateVersion_U6; diff --git a/LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp b/LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp index ff9a100bde..a313b5ae84 100644 --- a/LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGoalDefinition.hpp @@ -22,7 +22,7 @@ namespace VanillaGoalDefinition { #undef AFTER_EXTRA /** - * @symbol ?init\@VanillaGoalDefinition\@\@YAXXZ + * @symbol ?init\@VanillaGoalDefinition\@\@YAXXZ */ MCAPI void init(); diff --git a/LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp b/LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp index f183dc3b0c..d72a6f5910 100644 --- a/LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp +++ b/LiteLoader/include/llapi/mc/VanillaGoalUtility.hpp @@ -22,7 +22,7 @@ namespace VanillaGoalUtility { #undef AFTER_EXTRA /** - * @symbol ?registerGoalsToFactory\@VanillaGoalUtility\@\@YAXAEAVActorGoalFactory\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?registerGoalsToFactory\@VanillaGoalUtility\@\@YAXAEAVActorGoalFactory\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI void registerGoalsToFactory(class ActorGoalFactory &, class BaseGameVersion const &, class Experiments const &); diff --git a/LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp b/LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp index 7b96ed9179..e83bfb5975 100644 --- a/LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp +++ b/LiteLoader/include/llapi/mc/VanillaInPackagePacks.hpp @@ -30,14 +30,14 @@ class VanillaInPackagePacks { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VanillaInPackagePacks(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPacks\@VanillaInPackagePacks\@\@UEBA?AV?$vector\@UMetaData\@IInPackagePacks\@\@V?$allocator\@UMetaData\@IInPackagePacks\@\@\@std\@\@\@std\@\@W4PackType\@\@\@Z + * @vftbl 1 + * @symbol ?getPacks\@VanillaInPackagePacks\@\@UEBA?AV?$vector\@UMetaData\@IInPackagePacks\@\@V?$allocator\@UMetaData\@IInPackagePacks\@\@\@std\@\@\@std\@\@W4PackType\@\@\@Z */ virtual std::vector getPacks(enum class PackType) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaItemNames.hpp b/LiteLoader/include/llapi/mc/VanillaItemNames.hpp index 5a8b378454..c46b135b73 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemNames.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemNames.hpp @@ -20,1703 +20,1727 @@ namespace VanillaItemNames { #undef AFTER_EXTRA /** - * @symbol ?AcaciaBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AcaciaBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaBoat; /** - * @symbol ?AcaciaChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AcaciaChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaChestBoat; /** - * @symbol ?AcaciaDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AcaciaDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaDoor; /** - * @symbol ?AcaciaHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AcaciaHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaHangingSign; /** - * @symbol ?AcaciaSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AcaciaSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AcaciaSign; /** - * @symbol ?AgentSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AgentSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AgentSpawnEgg; /** - * @symbol ?AllaySpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AllaySpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AllaySpawnEgg; /** - * @symbol ?AmethystShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AmethystShard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AmethystShard; /** - * @symbol ?Apple\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Apple\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Apple; /** - * @symbol ?ArmorStand\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ArmorStand\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ArmorStand; /** - * @symbol ?Arrow\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Arrow\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Arrow; /** - * @symbol ?AxolotlBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AxolotlBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AxolotlBucket; /** - * @symbol ?AxolotlSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?AxolotlSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const AxolotlSpawnEgg; /** - * @symbol ?BakedPotato\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BakedPotato\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BakedPotato; /** - * @symbol ?Balloon\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Balloon\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Balloon; /** - * @symbol ?BambooChestRaft\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BambooChestRaft\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooChestRaft; /** - * @symbol ?BambooDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BambooDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooDoor; /** - * @symbol ?BambooHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BambooHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooHangingSign; /** - * @symbol ?BambooRaft\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BambooRaft\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooRaft; /** - * @symbol ?BambooSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BambooSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BambooSign; /** - * @symbol ?Banner\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Banner\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Banner; /** - * @symbol ?BannerLegacy\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BannerLegacy\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BannerLegacy; /** - * @symbol ?BatSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BatSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BatSpawnEgg; /** - * @symbol ?Bed\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bed\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bed; /** - * @symbol ?BeeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BeeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BeeSpawnEgg; /** - * @symbol ?Beef\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Beef\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Beef; /** - * @symbol ?Beetroot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Beetroot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Beetroot; /** - * @symbol ?BeetrootSeeds\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BeetrootSeeds\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BeetrootSeeds; /** - * @symbol ?BeetrootSoup\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BeetrootSoup\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BeetrootSoup; /** - * @symbol ?BirchBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BirchBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchBoat; /** - * @symbol ?BirchChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BirchChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchChestBoat; /** - * @symbol ?BirchDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BirchDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchDoor; /** - * @symbol ?BirchHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BirchHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchHangingSign; /** - * @symbol ?BirchSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BirchSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BirchSign; /** - * @symbol ?BlackDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BlackDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlackDye; /** - * @symbol ?BlazePowder\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BlazePowder\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlazePowder; /** - * @symbol ?BlazeRod\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BlazeRod\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlazeRod; /** - * @symbol ?BlazeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BlazeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlazeSpawnEgg; /** - * @symbol ?Bleach\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bleach\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bleach; /** - * @symbol ?BlueDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BlueDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BlueDye; /** - * @symbol ?BoatLegacy\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BoatLegacy\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BoatLegacy; /** - * @symbol ?Bone\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bone\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bone; /** - * @symbol ?BoneMeal\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BoneMeal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BoneMeal; /** - * @symbol ?Book\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Book\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Book; /** - * @symbol ?BookAndQuill\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BookAndQuill\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BookAndQuill; /** - * @symbol ?BordureIndentedBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BordureIndentedBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BordureIndentedBannerPattern; /** - * @symbol ?Bow\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bow\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bow; /** - * @symbol ?Bowl\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bowl\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bowl; /** - * @symbol ?Bread\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bread\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bread; /** - * @symbol ?BrewingStand\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BrewingStand\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrewingStand; /** - * @symbol ?Brick\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Brick\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Brick; /** - * @symbol ?BrownDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?BrownDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const BrownDye; /** - * @symbol ?Bucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Brush\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const Brush; + /** + * @symbol ?Bucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bucket; /** - * @symbol ?Bundle\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Bundle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Bundle; /** - * @symbol ?Cake\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Cake\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cake; /** - * @symbol ?CamelSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CamelSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CamelSpawnEgg; /** - * @symbol ?Camera\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Camera\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Camera; /** - * @symbol ?CampFire\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CampFire\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CampFire; /** - * @symbol ?Carrot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Carrot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Carrot; /** - * @symbol ?CarrotOnAStick\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CarrotOnAStick\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CarrotOnAStick; /** - * @symbol ?CatSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CatSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CatSpawnEgg; /** - * @symbol ?Cauldron\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Cauldron\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cauldron; /** - * @symbol ?CaveSpiderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CaveSpiderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CaveSpiderSpawnEgg; /** - * @symbol ?Chain\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Chain\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Chain; /** - * @symbol ?ChainmailBoots\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChainmailBoots\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChainmailBoots; /** - * @symbol ?ChainmailChestplate\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChainmailChestplate\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChainmailChestplate; /** - * @symbol ?ChainmailHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChainmailHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChainmailHelmet; /** - * @symbol ?ChainmailLeggings\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChainmailLeggings\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChainmailLeggings; /** - * @symbol ?ChalkBoard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChalkBoard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChalkBoard; /** - * @symbol ?Charcoal\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Charcoal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Charcoal; /** - * @symbol ?ChestMinecart\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChestMinecart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChestMinecart; /** - * @symbol ?Chicken\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Chicken\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Chicken; /** - * @symbol ?ChickenSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChickenSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChickenSpawnEgg; /** - * @symbol ?ChorusFruit\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ChorusFruit\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ChorusFruit; /** - * @symbol ?ClayBall\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ClayBall\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ClayBall; /** - * @symbol ?Clock\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Clock\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Clock; /** - * @symbol ?Coal\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Coal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Coal; /** - * @symbol ?CocoaBeans\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CocoaBeans\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CocoaBeans; /** - * @symbol ?Cod\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Cod\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cod; /** - * @symbol ?CodBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CodBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CodBucket; /** - * @symbol ?CodSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CodSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CodSpawnEgg; /** - * @symbol ?CommandBlockMinecart\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CommandBlockMinecart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CommandBlockMinecart; /** - * @symbol ?Comparator\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Comparator\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Comparator; /** - * @symbol ?Compass\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Compass\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Compass; /** - * @symbol ?Compound\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Compound\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Compound; /** - * @symbol ?CookedBeef\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedBeef\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedBeef; /** - * @symbol ?CookedChicken\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedChicken\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedChicken; /** - * @symbol ?CookedCod\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedCod\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedCod; /** - * @symbol ?CookedMutton\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedMutton\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedMutton; /** - * @symbol ?CookedPorkchop\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedPorkchop\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedPorkchop; /** - * @symbol ?CookedRabbit\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedRabbit\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedRabbit; /** - * @symbol ?CookedSalmon\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CookedSalmon\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CookedSalmon; /** - * @symbol ?Cookie\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Cookie\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Cookie; /** - * @symbol ?CopperHorn\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CopperHorn\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CopperHorn; /** - * @symbol ?CopperIngot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CopperIngot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CopperIngot; /** - * @symbol ?CowSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CowSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CowSpawnEgg; /** - * @symbol ?CreeperBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CreeperBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CreeperBannerPattern; /** - * @symbol ?CreeperSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CreeperSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CreeperSpawnEgg; /** - * @symbol ?CrimsonDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CrimsonDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonDoor; /** - * @symbol ?CrimsonHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CrimsonHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonHangingSign; /** - * @symbol ?CrimsonSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CrimsonSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CrimsonSign; /** - * @symbol ?Crossbow\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Crossbow\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Crossbow; /** - * @symbol ?CyanDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?CyanDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const CyanDye; /** - * @symbol ?DarkOakBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DarkOakBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakBoat; /** - * @symbol ?DarkOakChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DarkOakChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakChestBoat; /** - * @symbol ?DarkOakDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DarkOakDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakDoor; /** - * @symbol ?DarkOakHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DarkOakHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakHangingSign; /** - * @symbol ?DarkOakSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DarkOakSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DarkOakSign; /** - * @symbol ?DebugStick\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DebugStick\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DebugStick; /** - * @symbol ?Diamond\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Diamond\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Diamond; /** - * @symbol ?DiamondAxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondAxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondAxe; /** - * @symbol ?DiamondBoots\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondBoots\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondBoots; /** - * @symbol ?DiamondChestplate\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondChestplate\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondChestplate; /** - * @symbol ?DiamondHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondHelmet; /** - * @symbol ?DiamondHoe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondHoe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondHoe; /** - * @symbol ?DiamondHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondHorseArmor; /** - * @symbol ?DiamondLeggings\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondLeggings\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondLeggings; /** - * @symbol ?DiamondPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondPickaxe; /** - * @symbol ?DiamondShovel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondShovel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondShovel; /** - * @symbol ?DiamondSword\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiamondSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondSword; /** - * @symbol ?DiscFragment5\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DiscFragment5\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiscFragment5; /** - * @symbol ?DolphinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DolphinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DolphinSpawnEgg; /** - * @symbol ?DonkeySpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DonkeySpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DonkeySpawnEgg; /** - * @symbol ?DragonBreath\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DragonBreath\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DragonBreath; /** - * @symbol ?DriedKelp\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DriedKelp\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DriedKelp; /** - * @symbol ?DrownedSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DrownedSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DrownedSpawnEgg; /** - * @symbol ?DyeLegacy\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?DyeLegacy\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DyeLegacy; /** - * @symbol ?EchoShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EchoShard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EchoShard; /** - * @symbol ?Egg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Egg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Egg; /** - * @symbol ?ElderGuardianSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ElderGuardianSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ElderGuardianSpawnEgg; /** - * @symbol ?Elytra\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Elytra\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Elytra; /** - * @symbol ?Emerald\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Emerald\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Emerald; /** - * @symbol ?EmptyMap\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EmptyMap\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EmptyMap; /** - * @symbol ?EnchantedBook\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EnchantedBook\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnchantedBook; /** - * @symbol ?EnchantedGoldenApple\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EnchantedGoldenApple\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnchantedGoldenApple; /** - * @symbol ?EndCrystal\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EndCrystal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndCrystal; /** - * @symbol ?EnderDragonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EnderDragonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnderDragonSpawnEgg; /** - * @symbol ?EnderEye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EnderEye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnderEye; /** - * @symbol ?EnderPearl\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EnderPearl\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EnderPearl; /** - * @symbol ?EndermanSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EndermanSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndermanSpawnEgg; /** - * @symbol ?EndermiteSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EndermiteSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EndermiteSpawnEgg; /** - * @symbol ?EvokerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?EvokerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const EvokerSpawnEgg; /** - * @symbol ?ExperienceBottle\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ExperienceBottle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ExperienceBottle; /** - * @symbol ?Feather\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Feather\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Feather; /** - * @symbol ?FermentedSpiderEye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FermentedSpiderEye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FermentedSpiderEye; /** - * @symbol ?FieldMasonedBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FieldMasonedBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FieldMasonedBannerPattern; /** - * @symbol ?FilledMap\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FilledMap\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FilledMap; /** - * @symbol ?FireCharge\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FireCharge\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FireCharge; /** - * @symbol ?FireworkRocket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FireworkRocket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FireworkRocket; /** - * @symbol ?FireworkStar\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FireworkStar\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FireworkStar; /** - * @symbol ?FishingRod\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FishingRod\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FishingRod; /** - * @symbol ?Flint\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Flint\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Flint; /** - * @symbol ?FlintAndSteel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FlintAndSteel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlintAndSteel; /** - * @symbol ?FlowerBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FlowerBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlowerBannerPattern; /** - * @symbol ?FlowerPot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FlowerPot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FlowerPot; /** - * @symbol ?FoxSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FoxSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FoxSpawnEgg; /** - * @symbol ?FrogSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?FrogSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FrogSpawnEgg; /** - * @symbol ?GhastSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GhastSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GhastSpawnEgg; /** - * @symbol ?GhastTear\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GhastTear\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GhastTear; /** - * @symbol ?GlassBottle\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlassBottle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlassBottle; /** - * @symbol ?GlisteringMelonSlice\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlisteringMelonSlice\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlisteringMelonSlice; /** - * @symbol ?GlobeBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlobeBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlobeBannerPattern; /** - * @symbol ?GlowBerries\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlowBerries\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowBerries; /** - * @symbol ?GlowInkSac\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlowInkSac\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowInkSac; /** - * @symbol ?GlowItemFrame\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlowItemFrame\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowItemFrame; /** - * @symbol ?GlowSquidSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlowSquidSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowSquidSpawnEgg; /** - * @symbol ?GlowStick\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlowStick\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowStick; /** - * @symbol ?GlowStoneDust\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GlowStoneDust\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GlowStoneDust; /** - * @symbol ?Goat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Goat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Goat; /** - * @symbol ?GoatHorn\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoatHorn\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoatHorn; /** - * @symbol ?GoatSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoatSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoatSpawnEgg; /** - * @symbol ?GoldIngot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldIngot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldIngot; /** - * @symbol ?GoldNugget\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldNugget\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldNugget; /** - * @symbol ?GoldenApple\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenApple\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenApple; /** - * @symbol ?GoldenAxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenAxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenAxe; /** - * @symbol ?GoldenBoots\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenBoots\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenBoots; /** - * @symbol ?GoldenCarrot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenCarrot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenCarrot; /** - * @symbol ?GoldenChestplate\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenChestplate\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenChestplate; /** - * @symbol ?GoldenHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenHelmet; /** - * @symbol ?GoldenHoe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenHoe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenHoe; /** - * @symbol ?GoldenHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenHorseArmor; /** - * @symbol ?GoldenLeggings\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenLeggings\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenLeggings; /** - * @symbol ?GoldenPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenPickaxe; /** - * @symbol ?GoldenShovel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenShovel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenShovel; /** - * @symbol ?GoldenSword\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GoldenSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldenSword; /** - * @symbol ?GrayDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GrayDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GrayDye; /** - * @symbol ?GreenDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GreenDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GreenDye; /** - * @symbol ?GuardianSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?GuardianSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GuardianSpawnEgg; /** - * @symbol ?Gunpowder\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Gunpowder\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Gunpowder; /** - * @symbol ?HeartOfTheSea\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HeartOfTheSea\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HeartOfTheSea; /** - * @symbol ?HoglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HoglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HoglinSpawnEgg; /** - * @symbol ?HoneyBottle\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HoneyBottle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HoneyBottle; /** - * @symbol ?HoneyComb\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HoneyComb\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HoneyComb; /** - * @symbol ?Hopper\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Hopper\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Hopper; /** - * @symbol ?HopperMinecart\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HopperMinecart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HopperMinecart; /** - * @symbol ?HorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HorseSpawnEgg; /** - * @symbol ?HuskSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?HuskSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const HuskSpawnEgg; /** - * @symbol ?IceBomb\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IceBomb\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IceBomb; /** - * @symbol ?InkSac\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?InkSac\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const InkSac; /** - * @symbol ?IronAxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronAxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronAxe; /** - * @symbol ?IronBoots\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronBoots\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronBoots; /** - * @symbol ?IronChestplate\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronChestplate\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronChestplate; /** - * @symbol ?IronDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronDoor; /** - * @symbol ?IronGolemSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronGolemSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronGolemSpawnEgg; /** - * @symbol ?IronHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronHelmet; /** - * @symbol ?IronHoe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronHoe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronHoe; /** - * @symbol ?IronHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronHorseArmor; /** - * @symbol ?IronIngot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronIngot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronIngot; /** - * @symbol ?IronLeggings\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronLeggings\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronLeggings; /** - * @symbol ?IronNugget\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronNugget\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronNugget; /** - * @symbol ?IronPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronPickaxe; /** - * @symbol ?IronShovel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronShovel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronShovel; /** - * @symbol ?IronSword\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?IronSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronSword; /** - * @symbol ?ItemFrame\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ItemFrame\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ItemFrame; /** - * @symbol ?JungleBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?JungleBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleBoat; /** - * @symbol ?JungleChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?JungleChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleChestBoat; /** - * @symbol ?JungleDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?JungleDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleDoor; /** - * @symbol ?JungleHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?JungleHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleHangingSign; /** - * @symbol ?JungleSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?JungleSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const JungleSign; /** - * @symbol ?Kelp\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Kelp\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Kelp; /** - * @symbol ?LapisLazuli\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LapisLazuli\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LapisLazuli; /** - * @symbol ?LavaBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LavaBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LavaBucket; /** - * @symbol ?Lead\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Lead\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Lead; /** - * @symbol ?Leather\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Leather\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Leather; /** - * @symbol ?LeatherBoots\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LeatherBoots\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LeatherBoots; /** - * @symbol ?LeatherChestplate\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LeatherChestplate\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LeatherChestplate; /** - * @symbol ?LeatherHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LeatherHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LeatherHelmet; /** - * @symbol ?LeatherHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LeatherHorseArmor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LeatherHorseArmor; /** - * @symbol ?LeatherLeggings\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LeatherLeggings\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LeatherLeggings; /** - * @symbol ?LightBlueDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LightBlueDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightBlueDye; /** - * @symbol ?LightGrayDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LightGrayDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LightGrayDye; /** - * @symbol ?LimeDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LimeDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LimeDye; /** - * @symbol ?LingeringPotion\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LingeringPotion\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LingeringPotion; /** - * @symbol ?LlamaSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LlamaSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LlamaSpawnEgg; /** - * @symbol ?LodestoneCompass\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?LodestoneCompass\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const LodestoneCompass; /** - * @symbol ?MagentaDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MagentaDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagentaDye; /** - * @symbol ?MagmaCream\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MagmaCream\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagmaCream; /** - * @symbol ?MagmaCubeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MagmaCubeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MagmaCubeSpawnEgg; /** - * @symbol ?MangroveBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MangroveBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveBoat; /** - * @symbol ?MangroveChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MangroveChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveChestBoat; /** - * @symbol ?MangroveDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MangroveDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveDoor; /** - * @symbol ?MangroveHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MangroveHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveHangingSign; /** - * @symbol ?MangroveSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MangroveSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MangroveSign; /** - * @symbol ?Medicine\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Medicine\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Medicine; /** - * @symbol ?MelonSeeds\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MelonSeeds\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MelonSeeds; /** - * @symbol ?MelonSlice\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MelonSlice\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MelonSlice; /** - * @symbol ?MilkBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MilkBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MilkBucket; /** - * @symbol ?Minecart\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Minecart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Minecart; /** - * @symbol ?MojangBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MojangBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MojangBannerPattern; /** - * @symbol ?MooshroomSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MooshroomSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MooshroomSpawnEgg; /** - * @symbol ?MuleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MuleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MuleSpawnEgg; /** - * @symbol ?MushroomStew\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MushroomStew\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MushroomStew; /** - * @symbol ?MusicDisc11\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDisc11\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDisc11; /** - * @symbol ?MusicDisc13\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDisc13\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDisc13; /** - * @symbol ?MusicDisc5\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDisc5\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDisc5; /** - * @symbol ?MusicDiscBlocks\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscBlocks\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscBlocks; /** - * @symbol ?MusicDiscCat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscCat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscCat; /** - * @symbol ?MusicDiscChirp\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscChirp\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscChirp; /** - * @symbol ?MusicDiscFar\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscFar\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscFar; /** - * @symbol ?MusicDiscMall\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscMall\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscMall; /** - * @symbol ?MusicDiscMellohi\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscMellohi\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscMellohi; /** - * @symbol ?MusicDiscOtherside\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscOtherside\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscOtherside; /** - * @symbol ?MusicDiscPigstep\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscPigstep\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscPigstep; /** - * @symbol ?MusicDiscStal\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscStal\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscStal; /** - * @symbol ?MusicDiscStrad\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscStrad\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscStrad; /** - * @symbol ?MusicDiscWait\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscWait\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscWait; /** - * @symbol ?MusicDiscWard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?MusicDiscWard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MusicDiscWard; /** - * @symbol ?Mutton\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Mutton\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Mutton; /** - * @symbol ?NameTag\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NameTag\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NameTag; /** - * @symbol ?NautilusShell\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NautilusShell\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NautilusShell; /** - * @symbol ?NetherBrickItemName\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetherBrickItemName\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherBrickItemName; /** - * @symbol ?NetherSprouts\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetherSprouts\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherSprouts; /** - * @symbol ?NetherStar\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetherStar\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherStar; /** - * @symbol ?NetherWart\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetherWart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetherWart; /** - * @symbol ?NetheriteAxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteAxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteAxe; /** - * @symbol ?NetheriteBoots\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteBoots\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteBoots; /** - * @symbol ?NetheriteChestplate\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteChestplate\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteChestplate; /** - * @symbol ?NetheriteHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteHelmet; /** - * @symbol ?NetheriteHoe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteHoe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteHoe; /** - * @symbol ?NetheriteIngot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteIngot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteIngot; /** - * @symbol ?NetheriteLeggings\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteLeggings\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteLeggings; /** - * @symbol ?NetheritePickaxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheritePickaxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheritePickaxe; /** - * @symbol ?NetheriteScrap\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteScrap\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteScrap; /** - * @symbol ?NetheriteShovel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteShovel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteShovel; /** - * @symbol ?NetheriteSword\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NetheriteSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NetheriteSword; /** - * @symbol ?NpcSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?NpcSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NpcSpawnEgg; /** - * @symbol ?OakBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OakBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakBoat; /** - * @symbol ?OakChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OakChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakChestBoat; /** - * @symbol ?OakDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OakDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakDoor; /** - * @symbol ?OakHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OakHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakHangingSign; /** - * @symbol ?OakSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OakSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OakSign; /** - * @symbol ?OcelotSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OcelotSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OcelotSpawnEgg; /** - * @symbol ?OrangeDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?OrangeDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const OrangeDye; /** - * @symbol ?Painting\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Painting\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Painting; /** - * @symbol ?PandaSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PandaSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PandaSpawnEgg; /** - * @symbol ?Paper\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Paper\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Paper; /** - * @symbol ?ParrotSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ParrotSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ParrotSpawnEgg; /** - * @symbol ?PhantomMembrane\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PhantomMembrane\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PhantomMembrane; /** - * @symbol ?PhantomSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PhantomSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PhantomSpawnEgg; /** - * @symbol ?PhotoItem\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PhotoItem\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PhotoItem; /** - * @symbol ?PigSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PigSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PigSpawnEgg; /** - * @symbol ?PiglinBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PiglinBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PiglinBannerPattern; /** - * @symbol ?PiglinBruteSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PiglinBruteSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PiglinBruteSpawnEgg; /** - * @symbol ?PiglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PiglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PiglinSpawnEgg; /** - * @symbol ?PillagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PillagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PillagerSpawnEgg; /** - * @symbol ?PinkDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PinkDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PinkDye; /** - * @symbol ?PoisonousPotato\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PoisonousPotato\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PoisonousPotato; /** - * @symbol ?PolarBearSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PolarBearSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PolarBearSpawnEgg; /** - * @symbol ?PoppedChorusFruit\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PoppedChorusFruit\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PoppedChorusFruit; /** - * @symbol ?PorkChop\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PorkChop\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PorkChop; /** - * @symbol ?PortfolioBook\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PortfolioBook\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PortfolioBook; /** - * @symbol ?Potato\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Potato\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Potato; /** - * @symbol ?Potion\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Potion\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Potion; /** - * @symbol ?PowderSnowBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PotteryShardArcher\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PotteryShardArcher; + /** + * @symbol ?PotteryShardArmsUp\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PotteryShardArmsUp; + /** + * @symbol ?PotteryShardPrize\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PotteryShardPrize; + /** + * @symbol ?PotteryShardSkull\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const PotteryShardSkull; + /** + * @symbol ?PowderSnowBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PowderSnowBucket; /** - * @symbol ?PrismarineCrystals\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PrismarineCrystals\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PrismarineCrystals; /** - * @symbol ?PrismarineShard\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PrismarineShard\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PrismarineShard; /** - * @symbol ?Pufferfish\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Pufferfish\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Pufferfish; /** - * @symbol ?PufferfishBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PufferfishBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PufferfishBucket; /** - * @symbol ?PufferfishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PufferfishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PufferfishSpawnEgg; /** - * @symbol ?PumpkinPie\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PumpkinPie\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PumpkinPie; /** - * @symbol ?PumpkinSeeds\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PumpkinSeeds\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PumpkinSeeds; /** - * @symbol ?PurpleDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?PurpleDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const PurpleDye; /** - * @symbol ?Quartz\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Quartz\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Quartz; /** - * @symbol ?Rabbit\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Rabbit\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Rabbit; /** - * @symbol ?RabbitFoot\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RabbitFoot\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RabbitFoot; /** - * @symbol ?RabbitHide\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RabbitHide\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RabbitHide; /** - * @symbol ?RabbitSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RabbitSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RabbitSpawnEgg; /** - * @symbol ?RabbitStew\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RabbitStew\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RabbitStew; /** - * @symbol ?RapidFertilizer\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RapidFertilizer\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RapidFertilizer; /** - * @symbol ?RavagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RavagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RavagerSpawnEgg; /** - * @symbol ?RawCopper\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RawCopper\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RawCopper; /** - * @symbol ?RawGold\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RawGold\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RawGold; /** - * @symbol ?RawIron\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RawIron\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RawIron; /** - * @symbol ?RecoveryCompass\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RecoveryCompass\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RecoveryCompass; /** - * @symbol ?RedDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RedDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedDye; /** - * @symbol ?RedStone\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RedStone\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RedStone; /** - * @symbol ?Repeater\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Repeater\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Repeater; /** - * @symbol ?RottenFlesh\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?RottenFlesh\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const RottenFlesh; /** - * @symbol ?Saddle\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Saddle\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Saddle; /** - * @symbol ?Salmon\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Salmon\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Salmon; /** - * @symbol ?SalmonBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SalmonBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SalmonBucket; /** - * @symbol ?SalmonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SalmonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SalmonSpawnEgg; /** - * @symbol ?Scute\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Scute\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Scute; /** - * @symbol ?Shears\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Shears\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Shears; /** - * @symbol ?SheepSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SheepSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SheepSpawnEgg; /** - * @symbol ?Shield\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Shield\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Shield; /** - * @symbol ?Shroomlight\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Shroomlight\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Shroomlight; /** - * @symbol ?ShulkerShell\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ShulkerShell\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ShulkerShell; /** - * @symbol ?ShulkerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ShulkerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ShulkerSpawnEgg; /** - * @symbol ?SilverfishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SilverfishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SilverfishSpawnEgg; /** - * @symbol ?SkeletonHorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SkeletonHorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SkeletonHorseSpawnEgg; /** - * @symbol ?SkeletonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SkeletonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SkeletonSpawnEgg; /** - * @symbol ?Skull\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Skull\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Skull; /** - * @symbol ?SkullBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SkullBannerPattern\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SkullBannerPattern; /** - * @symbol ?SlimeBall\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SlimeBall\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SlimeBall; /** - * @symbol ?SlimeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SlimeSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SlimeSpawnEgg; /** - * @symbol ?SnifferSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SnifferSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SnifferSpawnEgg; /** - * @symbol ?SnowBall\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SnowBall\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SnowBall; /** - * @symbol ?SnowGolemSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SnowGolemSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SnowGolemSpawnEgg; /** - * @symbol ?SoulCampfire\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SoulCampfire\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SoulCampfire; /** - * @symbol ?Sparkler\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Sparkler\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sparkler; /** - * @symbol ?SpawnEggLegacy\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpawnEggLegacy\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpawnEggLegacy; /** - * @symbol ?SpiderEye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpiderEye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpiderEye; /** - * @symbol ?SpiderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpiderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpiderSpawnEgg; /** - * @symbol ?SplashPotion\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SplashPotion\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SplashPotion; /** - * @symbol ?SpruceBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpruceBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceBoat; /** - * @symbol ?SpruceChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpruceChestBoat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceChestBoat; /** - * @symbol ?SpruceDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpruceDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceDoor; /** - * @symbol ?SpruceHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpruceHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceHangingSign; /** - * @symbol ?SpruceSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SpruceSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SpruceSign; /** - * @symbol ?Spyglass\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Spyglass\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Spyglass; /** - * @symbol ?SquidSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SquidSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SquidSpawnEgg; /** - * @symbol ?Stick\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Stick\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Stick; /** - * @symbol ?StoneAxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StoneAxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneAxe; /** - * @symbol ?StoneHoe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StoneHoe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneHoe; /** - * @symbol ?StonePickaxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StonePickaxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StonePickaxe; /** - * @symbol ?StoneShovel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StoneShovel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneShovel; /** - * @symbol ?StoneSword\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StoneSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneSword; /** - * @symbol ?StraySpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StraySpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StraySpawnEgg; /** - * @symbol ?StriderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?StriderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StriderSpawnEgg; /** - * @symbol ?String\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?String\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const String; /** - * @symbol ?Sugar\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Sugar\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sugar; /** - * @symbol ?SugarCane\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SugarCane\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SugarCane; /** - * @symbol ?SuspiciousStew\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SuspiciousStew\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SuspiciousStew; /** - * @symbol ?SweetBerries\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?SweetBerries\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const SweetBerries; /** - * @symbol ?TadpoleBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TadpoleBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TadpoleBucket; /** - * @symbol ?TadpoleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TadpoleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TadpoleSpawnEgg; /** - * @symbol ?TntMinecart\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TntMinecart\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TntMinecart; /** - * @symbol ?TotemOfUndying\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TorchflowerSeeds\@VanillaItemNames\@\@3VHashedString\@\@B + */ + MCAPI extern class HashedString const TorchflowerSeeds; + /** + * @symbol ?TotemOfUndying\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TotemOfUndying; /** - * @symbol ?TraderLlamaSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TraderLlamaSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TraderLlamaSpawnEgg; /** - * @symbol ?Trident\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Trident\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Trident; /** - * @symbol ?TropicalFish\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TropicalFish\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TropicalFish; /** - * @symbol ?TropicalFishBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TropicalFishBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TropicalFishBucket; /** - * @symbol ?TropicalFishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TropicalFishSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TropicalFishSpawnEgg; /** - * @symbol ?TurtleHelmet\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TurtleHelmet\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TurtleHelmet; /** - * @symbol ?TurtleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?TurtleSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TurtleSpawnEgg; /** - * @symbol ?VexSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?VexSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const VexSpawnEgg; /** - * @symbol ?VillagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?VillagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const VillagerSpawnEgg; /** - * @symbol ?VindicatorSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?VindicatorSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const VindicatorSpawnEgg; /** - * @symbol ?WanderingTraderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WanderingTraderSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WanderingTraderSpawnEgg; /** - * @symbol ?WardenSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WardenSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WardenSpawnEgg; /** - * @symbol ?WarpedDoor\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WarpedDoor\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedDoor; /** - * @symbol ?WarpedFungusOnAStick\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WarpedFungusOnAStick\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedFungusOnAStick; /** - * @symbol ?WarpedHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WarpedHangingSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedHangingSign; /** - * @symbol ?WarpedSign\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WarpedSign\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WarpedSign; /** - * @symbol ?WaterBucket\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WaterBucket\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WaterBucket; /** - * @symbol ?Wheat\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?Wheat\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Wheat; /** - * @symbol ?WheatSeeds\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WheatSeeds\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WheatSeeds; /** - * @symbol ?WhiteDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WhiteDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WhiteDye; /** - * @symbol ?WitchSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WitchSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WitchSpawnEgg; /** - * @symbol ?WitherSkeletonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WitherSkeletonSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WitherSkeletonSpawnEgg; /** - * @symbol ?WitherSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WitherSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WitherSpawnEgg; /** - * @symbol ?WolfSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WolfSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WolfSpawnEgg; /** - * @symbol ?WoodenAxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WoodenAxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenAxe; /** - * @symbol ?WoodenHoe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WoodenHoe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenHoe; /** - * @symbol ?WoodenPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WoodenPickaxe\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenPickaxe; /** - * @symbol ?WoodenShovel\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WoodenShovel\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenShovel; /** - * @symbol ?WoodenSword\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WoodenSword\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodenSword; /** - * @symbol ?WrittenBook\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?WrittenBook\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WrittenBook; /** - * @symbol ?YellowDye\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?YellowDye\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const YellowDye; /** - * @symbol ?ZoglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ZoglinSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ZoglinSpawnEgg; /** - * @symbol ?ZombieHorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ZombieHorseSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ZombieHorseSpawnEgg; /** - * @symbol ?ZombiePigmanSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ZombiePigmanSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ZombiePigmanSpawnEgg; /** - * @symbol ?ZombieSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ZombieSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ZombieSpawnEgg; /** - * @symbol ?ZombieVillagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B + * @symbol ?ZombieVillagerSpawnEgg\@VanillaItemNames\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ZombieVillagerSpawnEgg; diff --git a/LiteLoader/include/llapi/mc/VanillaItemTags.hpp b/LiteLoader/include/llapi/mc/VanillaItemTags.hpp index 9be2746a4e..732683d425 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemTags.hpp @@ -30,212 +30,220 @@ class VanillaItemTags { public: /** - * @symbol ?Armor\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Armor\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Armor; /** - * @symbol ?Arrows\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Arrows\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Arrows; /** - * @symbol ?Banners\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Banners\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Banners; /** - * @symbol ?Boat\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Boat\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Boat; /** - * @symbol ?Boats\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Boats\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Boats; /** - * @symbol ?BookshelfBooks\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?BookshelfBooks\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const BookshelfBooks; /** - * @symbol ?ChainmailTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?ChainmailTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const ChainmailTier; /** - * @symbol ?ChestBoat\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?ChestBoat\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const ChestBoat; /** - * @symbol ?Coals\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Coals\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Coals; /** - * @symbol ?Cooked\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Cooked\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Cooked; /** - * @symbol ?CrimsonStems\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?CrimsonStems\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const CrimsonStems; /** - * @symbol ?DiamondTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?DecoratedPotShards\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const DecoratedPotShards; + /** + * @symbol ?DiamondTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const DiamondTier; /** - * @symbol ?Digger\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Digger\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Digger; /** - * @symbol ?Door\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Door\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Door; /** - * @symbol ?Fishes\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Fishes\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Fishes; /** - * @symbol ?Food\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Food\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Food; /** - * @symbol ?GoldenTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?GoldenTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const GoldenTier; /** - * @symbol ?HangingActor\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?HangingActor\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const HangingActor; /** - * @symbol ?HangingSign\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?HangingSign\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const HangingSign; /** - * @symbol ?Hatchet\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Hatchet\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Hatchet; /** - * @symbol ?Hoe\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Hoe\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Hoe; /** - * @symbol ?HorseArmor\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?HorseArmor\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const HorseArmor; /** - * @symbol ?IronTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?IronTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const IronTier; /** - * @symbol ?LeatherTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?LeatherTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const LeatherTier; /** - * @symbol ?LecternBooks\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?LecternBooks\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const LecternBooks; /** - * @symbol ?Logs\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Logs\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Logs; /** - * @symbol ?LogsThatBurn\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?LogsThatBurn\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const LogsThatBurn; /** - * @symbol ?MangroveLogs\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?MangroveLogs\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const MangroveLogs; /** - * @symbol ?Meat\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Meat\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Meat; /** - * @symbol ?Minecart\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Minecart\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Minecart; /** - * @symbol ?MusicDiscs\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?MusicDiscs\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const MusicDiscs; /** - * @symbol ?NetheriteTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?NetheriteTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const NetheriteTier; /** - * @symbol ?Pickaxe\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Pickaxe\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Pickaxe; /** - * @symbol ?PiglinLoved\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?PiglinLoved\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const PiglinLoved; /** - * @symbol ?PiglinRepellents\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?PiglinRepellents\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const PiglinRepellents; /** - * @symbol ?Planks\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Planks\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Planks; /** - * @symbol ?Sand\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Sand\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Sand; /** - * @symbol ?Shovel\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Shovel\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Shovel; /** - * @symbol ?Sign\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Sign\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Sign; /** - * @symbol ?SoulFireBaseBlocks\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?SoulFireBaseBlocks\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const SoulFireBaseBlocks; /** - * @symbol ?SpawnEgg\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?SpawnEgg\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const SpawnEgg; /** - * @symbol ?StoneBricks\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?StoneBricks\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const StoneBricks; /** - * @symbol ?StoneCraftingMaterials\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?StoneCraftingMaterials\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const StoneCraftingMaterials; /** - * @symbol ?StoneTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?StoneTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const StoneTier; /** - * @symbol ?StoneToolMaterials\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?StoneToolMaterials\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const StoneToolMaterials; /** - * @symbol ?Sword\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Sword\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Sword; /** - * @symbol ?Tool\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Tool\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Tool; /** - * @symbol ?VibrationDamper\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Trident\@VanillaItemTags\@\@2UItemTag\@\@B + */ + MCAPI static struct ItemTag const Trident; + /** + * @symbol ?VibrationDamper\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const VibrationDamper; /** - * @symbol ?WarpedStems\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?WarpedStems\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const WarpedStems; /** - * @symbol ?WoodenSlabs\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?WoodenSlabs\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const WoodenSlabs; /** - * @symbol ?WoodenTier\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?WoodenTier\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const WoodenTier; /** - * @symbol ?Wool\@VanillaItemTags\@\@2UItemTag\@\@B + * @symbol ?Wool\@VanillaItemTags\@\@2UItemTag\@\@B */ MCAPI static struct ItemTag const Wool; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaItemTiers.hpp b/LiteLoader/include/llapi/mc/VanillaItemTiers.hpp index b598953fc0..73ef0209e7 100644 --- a/LiteLoader/include/llapi/mc/VanillaItemTiers.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItemTiers.hpp @@ -31,32 +31,32 @@ class VanillaItemTiers { public: /** - * @symbol ?DIAMOND\@VanillaItemTiers\@\@2VTier\@Item\@\@B + * @symbol ?DIAMOND\@VanillaItemTiers\@\@2VTier\@Item\@\@B */ MCAPI static class Item::Tier const DIAMOND; /** - * @symbol ?GOLD\@VanillaItemTiers\@\@2VTier\@Item\@\@B + * @symbol ?GOLD\@VanillaItemTiers\@\@2VTier\@Item\@\@B */ MCAPI static class Item::Tier const GOLD; /** - * @symbol ?IRON\@VanillaItemTiers\@\@2VTier\@Item\@\@B + * @symbol ?IRON\@VanillaItemTiers\@\@2VTier\@Item\@\@B */ MCAPI static class Item::Tier const IRON; /** - * @symbol ?NETHERITE\@VanillaItemTiers\@\@2VTier\@Item\@\@B + * @symbol ?NETHERITE\@VanillaItemTiers\@\@2VTier\@Item\@\@B */ MCAPI static class Item::Tier const NETHERITE; /** - * @symbol ?STONE\@VanillaItemTiers\@\@2VTier\@Item\@\@B + * @symbol ?STONE\@VanillaItemTiers\@\@2VTier\@Item\@\@B */ MCAPI static class Item::Tier const STONE; /** - * @symbol ?WOOD\@VanillaItemTiers\@\@2VTier\@Item\@\@B + * @symbol ?WOOD\@VanillaItemTiers\@\@2VTier\@Item\@\@B */ MCAPI static class Item::Tier const WOOD; /** - * @symbol ?getTierItems\@VanillaItemTiers\@\@SA?BV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVTier\@Item\@\@AEBVBaseGameVersion\@\@\@Z + * @symbol ?getTierItems\@VanillaItemTiers\@\@SA?BV?$vector\@VItemStack\@\@V?$allocator\@VItemStack\@\@\@std\@\@\@std\@\@AEBVTier\@Item\@\@AEBVBaseGameVersion\@\@\@Z */ MCAPI static std::vector const getTierItems(class Item::Tier const &, class BaseGameVersion const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaItems.hpp b/LiteLoader/include/llapi/mc/VanillaItems.hpp index 4e7a6156d9..80675a679d 100644 --- a/LiteLoader/include/llapi/mc/VanillaItems.hpp +++ b/LiteLoader/include/llapi/mc/VanillaItems.hpp @@ -30,40 +30,40 @@ class VanillaItems { public: /** - * @symbol ?registerHardCodedItemTags\@VanillaItems\@\@SAXVItemRegistryRef\@\@\@Z + * @symbol ?registerHardCodedItemTags\@VanillaItems\@\@SAXVItemRegistryRef\@\@\@Z */ MCAPI static void registerHardCodedItemTags(class ItemRegistryRef); /** - * @symbol ?registerItems\@VanillaItems\@\@SAXVItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@_N\@Z + * @symbol ?registerItems\@VanillaItems\@\@SAXVItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@_N\@Z */ MCAPI static void registerItems(class ItemRegistryRef, class BaseGameVersion const &, class Experiments const &, bool); /** - * @symbol ?serverInitCreativeItemsCallback\@VanillaItems\@\@SAXVItemRegistryRef\@\@PEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@PEAVCreativeItemRegistry\@\@_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?serverInitCreativeItemsCallback\@VanillaItems\@\@SAXVItemRegistryRef\@\@PEAVActorInfoRegistry\@\@PEAVBlockDefinitionGroup\@\@PEAVCreativeItemRegistry\@\@_NAEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void serverInitCreativeItemsCallback(class ItemRegistryRef, class ActorInfoRegistry *, class BlockDefinitionGroup *, class CreativeItemRegistry *, bool, class BaseGameVersion const &, class Experiments const &); //private: /** - * @symbol ?_addCommandOnlyCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?_addCommandOnlyCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void _addCommandOnlyCategory(class CreativeItemRegistry *, class ItemRegistryRef, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?_addConstructionCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?_addConstructionCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void _addConstructionCategory(class CreativeItemRegistry *, class ItemRegistryRef, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?_addEquipmentCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?_addEquipmentCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void _addEquipmentCategory(class CreativeItemRegistry *, class ItemRegistryRef, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?_addItemsCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?_addItemsCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void _addItemsCategory(class CreativeItemRegistry *, class ItemRegistryRef, class BaseGameVersion const &, class Experiments const &); /** - * @symbol ?_addNatureCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z + * @symbol ?_addNatureCategory\@VanillaItems\@\@CAXPEAVCreativeItemRegistry\@\@VItemRegistryRef\@\@AEBVBaseGameVersion\@\@AEBVExperiments\@\@\@Z */ MCAPI static void _addNatureCategory(class CreativeItemRegistry *, class ItemRegistryRef, class BaseGameVersion const &, class Experiments const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp b/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp index f8f8946156..d3af469ddd 100644 --- a/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp +++ b/LiteLoader/include/llapi/mc/VanillaLevelChunkUpgrade.hpp @@ -23,99 +23,99 @@ enum class Axis; #undef AFTER_EXTRA /** - * @symbol ?_updateBelowZero\@VanillaLevelChunkUpgrade\@\@YA_NAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z + * @symbol ?_updateBelowZero\@VanillaLevelChunkUpgrade\@\@YA_NAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z */ MCAPI bool _updateBelowZero(class LevelChunk &, class LevelChunk &, class BlockSource &); /** - * @symbol ?_upgradeLevelChunkLegacy\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_upgradeLevelChunkLegacy\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z */ MCAPI void _upgradeLevelChunkLegacy(class LevelChunk &, class BlockSource &); /** - * @symbol ?_upgradeLevelChunkViaMetaData\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z + * @symbol ?_upgradeLevelChunkViaMetaData\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z */ MCAPI void _upgradeLevelChunkViaMetaData(class LevelChunk &, class LevelChunk &, class BlockSource &); /** - * @symbol ?addBiomeSpecificVillageSkins\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@AEAVBlockSource\@\@\@Z + * @symbol ?addBiomeSpecificVillageSkins\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@AEAVBlockSource\@\@\@Z */ MCAPI bool addBiomeSpecificVillageSkins(class CompoundTag &, class BlockSource &); /** - * @symbol ?convertOcelotTagToCat\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z + * @symbol ?convertOcelotTagToCat\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool convertOcelotTagToCat(class CompoundTag &); /** - * @symbol ?convertVillagerV1TagToV2\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z + * @symbol ?convertVillagerV1TagToV2\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool convertVillagerV1TagToV2(class CompoundTag &); /** - * @symbol ?convertVillagerV2TagToV1\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z + * @symbol ?convertVillagerV2TagToV1\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool convertVillagerV2TagToV1(class CompoundTag &); /** - * @symbol ?convertZombieVillagerV1TagToV2\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z + * @symbol ?convertZombieVillagerV1TagToV2\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool convertZombieVillagerV1TagToV2(class CompoundTag &); /** - * @symbol ?convertZombieVillagerV2TagToV1\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z + * @symbol ?convertZombieVillagerV2TagToV1\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool convertZombieVillagerV2TagToV1(class CompoundTag &); /** - * @symbol ?fillNegativeSubChunksWithAir\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z + * @symbol ?fillNegativeSubChunksWithAir\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z */ MCAPI void fillNegativeSubChunksWithAir(class LevelChunk &, class BlockSource &); /** - * @symbol ?fillNegativeSubChunksWithGeneration\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0\@Z + * @symbol ?fillNegativeSubChunksWithGeneration\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0\@Z */ MCAPI void fillNegativeSubChunksWithGeneration(class LevelChunk &, class LevelChunk &); /** - * @symbol ?fillNegativeSubChunksWithGenerationOrAir\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z + * @symbol ?fillNegativeSubChunksWithGenerationOrAir\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z */ MCAPI void fillNegativeSubChunksWithGenerationOrAir(class LevelChunk &, class LevelChunk &, class BlockSource &); /** - * @symbol ?fixBlockStatesOnChunkBorderAxis\@VanillaLevelChunkUpgrade\@\@YAXAEAVBlockSource\@\@AEBVLevelChunk\@\@EVBlockPos\@\@W4Axis\@1\@\@Z + * @symbol ?fixBlockStatesOnChunkBorderAxis\@VanillaLevelChunkUpgrade\@\@YAXAEAVBlockSource\@\@AEBVLevelChunk\@\@EVBlockPos\@\@W4Axis\@1\@\@Z */ MCAPI void fixBlockStatesOnChunkBorderAxis(class BlockSource &, class LevelChunk const &, unsigned char, class BlockPos, enum class VanillaLevelChunkUpgrade::Axis); /** - * @symbol ?fixStemBlockStates\@VanillaLevelChunkUpgrade\@\@YAXAEAVBlockSource\@\@VBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?fixStemBlockStates\@VanillaLevelChunkUpgrade\@\@YAXAEAVBlockSource\@\@VBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI void fixStemBlockStates(class BlockSource &, class BlockPos, class Block const &); /** - * @symbol ?fixUselessDynamicWater\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z + * @symbol ?fixUselessDynamicWater\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z */ MCAPI void fixUselessDynamicWater(class LevelChunk &, class BlockSource &); /** - * @symbol ?fixWallBlockStates\@VanillaLevelChunkUpgrade\@\@YAXAEAVBlockSource\@\@VBlockPos\@\@\@Z + * @symbol ?fixWallBlockStates\@VanillaLevelChunkUpgrade\@\@YAXAEAVBlockSource\@\@VBlockPos\@\@\@Z */ MCAPI void fixWallBlockStates(class BlockSource &, class BlockPos); /** - * @symbol ?fixWallChunk\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z + * @symbol ?fixWallChunk\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@AEAVBlockSource\@\@\@Z */ MCAPI void fixWallChunk(class LevelChunk &, class BlockSource &); /** - * @symbol ?getV1CareerFromDefinitionsList\@VanillaLevelChunkUpgrade\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVListTag\@\@\@Z + * @symbol ?getV1CareerFromDefinitionsList\@VanillaLevelChunkUpgrade\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBVListTag\@\@\@Z */ MCAPI std::string const & getV1CareerFromDefinitionsList(class ListTag const *); /** - * @symbol ?isWallBlock\@VanillaLevelChunkUpgrade\@\@YA_NAEBVBlock\@\@\@Z + * @symbol ?isWallBlock\@VanillaLevelChunkUpgrade\@\@YA_NAEBVBlock\@\@\@Z */ MCAPI bool isWallBlock(class Block const &); /** - * @symbol ?levelChunkNeedsUpgrade\@VanillaLevelChunkUpgrade\@\@YA_NAEBVLevelChunk\@\@\@Z + * @symbol ?levelChunkNeedsUpgrade\@VanillaLevelChunkUpgrade\@\@YA_NAEBVLevelChunk\@\@\@Z */ MCAPI bool levelChunkNeedsUpgrade(class LevelChunk const &); /** - * @symbol ?upgradeArmorStandComponents\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z + * @symbol ?upgradeArmorStandComponents\@VanillaLevelChunkUpgrade\@\@YA_NAEAVCompoundTag\@\@\@Z */ MCAPI bool upgradeArmorStandComponents(class CompoundTag &); /** - * @symbol ?upgradeLevelChunk\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z + * @symbol ?upgradeLevelChunk\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z */ MCAPI void upgradeLevelChunk(class LevelChunk &, class LevelChunk &, class BlockSource &); /** - * @symbol ?upgradeOldLimboEntity\@VanillaLevelChunkUpgrade\@\@YAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@_N\@Z + * @symbol ?upgradeOldLimboEntity\@VanillaLevelChunkUpgrade\@\@YAXAEAVCompoundTag\@\@W4LimboEntitiesVersion\@\@_N\@Z */ MCAPI void upgradeOldLimboEntity(class CompoundTag &, enum class LimboEntitiesVersion, bool); /** - * @symbol ?upgradeWorldHeight\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z + * @symbol ?upgradeWorldHeight\@VanillaLevelChunkUpgrade\@\@YAXAEAVLevelChunk\@\@0AEAVBlockSource\@\@\@Z */ MCAPI void upgradeWorldHeight(class LevelChunk &, class LevelChunk &, class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/VanillaMapColor.hpp b/LiteLoader/include/llapi/mc/VanillaMapColor.hpp index b241a5cc15..34d14df1ca 100644 --- a/LiteLoader/include/llapi/mc/VanillaMapColor.hpp +++ b/LiteLoader/include/llapi/mc/VanillaMapColor.hpp @@ -20,311 +20,311 @@ namespace VanillaMapColor { #undef AFTER_EXTRA /** - * @symbol ?CLAY\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?CLAY\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const CLAY; /** - * @symbol ?COLOR_BLACK\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_BLACK\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_BLACK; /** - * @symbol ?COLOR_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_BLUE; /** - * @symbol ?COLOR_BROWN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_BROWN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_BROWN; /** - * @symbol ?COLOR_CYAN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_CYAN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_CYAN; /** - * @symbol ?COLOR_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_GRAY; /** - * @symbol ?COLOR_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_GREEN; /** - * @symbol ?COLOR_LIGHT_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_LIGHT_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_LIGHT_BLUE; /** - * @symbol ?COLOR_LIGHT_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_LIGHT_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_LIGHT_GRAY; /** - * @symbol ?COLOR_LIGHT_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_LIGHT_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_LIGHT_GREEN; /** - * @symbol ?COLOR_MAGENTA\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_MAGENTA\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_MAGENTA; /** - * @symbol ?COLOR_ORANGE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_ORANGE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_ORANGE; /** - * @symbol ?COLOR_PINK\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_PINK\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_PINK; /** - * @symbol ?COLOR_PURPLE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_PURPLE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_PURPLE; /** - * @symbol ?COLOR_RED\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_RED\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_RED; /** - * @symbol ?COLOR_WHITE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_WHITE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_WHITE; /** - * @symbol ?COLOR_YELLOW\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?COLOR_YELLOW\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const COLOR_YELLOW; /** - * @symbol ?CRIMSON_HYPHAE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?CRIMSON_HYPHAE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const CRIMSON_HYPHAE; /** - * @symbol ?CRIMSON_NYLIUM\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?CRIMSON_NYLIUM\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const CRIMSON_NYLIUM; /** - * @symbol ?CRIMSON_STEM\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?CRIMSON_STEM\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const CRIMSON_STEM; /** - * @symbol ?DEEPSLATE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?DEEPSLATE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const DEEPSLATE; /** - * @symbol ?DIAMOND\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?DIAMOND\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const DIAMOND; /** - * @symbol ?DIRT\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?DIRT\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const DIRT; /** - * @symbol ?ELEMENT_GROUP_ACTINIDE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_ACTINIDE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_ACTINIDE; /** - * @symbol ?ELEMENT_GROUP_ALKALINE_EARTH\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_ALKALINE_EARTH\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_ALKALINE_EARTH; /** - * @symbol ?ELEMENT_GROUP_ALKALI_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_ALKALI_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_ALKALI_METAL; /** - * @symbol ?ELEMENT_GROUP_BASIC_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_BASIC_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_BASIC_METAL; /** - * @symbol ?ELEMENT_GROUP_HALOGEN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_HALOGEN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_HALOGEN; /** - * @symbol ?ELEMENT_GROUP_LATHANIDE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_LATHANIDE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_LATHANIDE; /** - * @symbol ?ELEMENT_GROUP_NOBLE_GAS\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_NOBLE_GAS\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_NOBLE_GAS; /** - * @symbol ?ELEMENT_GROUP_NON_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_NON_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_NON_METAL; /** - * @symbol ?ELEMENT_GROUP_SEMI_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_SEMI_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_SEMI_METAL; /** - * @symbol ?ELEMENT_GROUP_TRANSITION_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_TRANSITION_METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_TRANSITION_METAL; /** - * @symbol ?ELEMENT_GROUP_UNKNOWN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ELEMENT_GROUP_UNKNOWN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ELEMENT_GROUP_UNKNOWN; /** - * @symbol ?EMERALD\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?EMERALD\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const EMERALD; /** - * @symbol ?FIRE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?FIRE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const FIRE; /** - * @symbol ?GLOW_LICHEN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?GLOW_LICHEN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const GLOW_LICHEN; /** - * @symbol ?GOLD\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?GOLD\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const GOLD; /** - * @symbol ?GRASS\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?GRASS\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const GRASS; /** - * @symbol ?ICE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?ICE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const ICE; /** - * @symbol ?LAPIS\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?LAPIS\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const LAPIS; /** - * @symbol ?METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?METAL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const METAL; /** - * @symbol ?NETHER\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?NETHER\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const NETHER; /** - * @symbol ?NONE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?NONE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const NONE; /** - * @symbol ?PLANT\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?PLANT\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const PLANT; /** - * @symbol ?PODZOL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?PODZOL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const PODZOL; /** - * @symbol ?QUARTZ\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?QUARTZ\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const QUARTZ; /** - * @symbol ?RAW_IRON\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?RAW_IRON\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const RAW_IRON; /** - * @symbol ?SAND\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?SAND\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const SAND; /** - * @symbol ?SCULK\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?SCULK\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const SCULK; /** - * @symbol ?SNOW\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?SNOW\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const SNOW; /** - * @symbol ?STONE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?STONE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const STONE; /** - * @symbol ?TERRACOTTA_BLACK\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_BLACK\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_BLACK; /** - * @symbol ?TERRACOTTA_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_BLUE; /** - * @symbol ?TERRACOTTA_BROWN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_BROWN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_BROWN; /** - * @symbol ?TERRACOTTA_CYAN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_CYAN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_CYAN; /** - * @symbol ?TERRACOTTA_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_GRAY; /** - * @symbol ?TERRACOTTA_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_GREEN; /** - * @symbol ?TERRACOTTA_LIGHT_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_LIGHT_BLUE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_LIGHT_BLUE; /** - * @symbol ?TERRACOTTA_LIGHT_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_LIGHT_GRAY\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_LIGHT_GRAY; /** - * @symbol ?TERRACOTTA_LIGHT_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_LIGHT_GREEN\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_LIGHT_GREEN; /** - * @symbol ?TERRACOTTA_MAGENTA\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_MAGENTA\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_MAGENTA; /** - * @symbol ?TERRACOTTA_ORANGE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_ORANGE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_ORANGE; /** - * @symbol ?TERRACOTTA_PINK\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_PINK\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_PINK; /** - * @symbol ?TERRACOTTA_PURPLE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_PURPLE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_PURPLE; /** - * @symbol ?TERRACOTTA_RED\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_RED\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_RED; /** - * @symbol ?TERRACOTTA_WHITE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_WHITE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_WHITE; /** - * @symbol ?TERRACOTTA_YELLOW\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?TERRACOTTA_YELLOW\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const TERRACOTTA_YELLOW; /** - * @symbol ?WARPED_HYPHAE\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WARPED_HYPHAE\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WARPED_HYPHAE; /** - * @symbol ?WARPED_NYLIUM\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WARPED_NYLIUM\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WARPED_NYLIUM; /** - * @symbol ?WARPED_STEM\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WARPED_STEM\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WARPED_STEM; /** - * @symbol ?WARPED_WART_BLOCK\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WARPED_WART_BLOCK\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WARPED_WART_BLOCK; /** - * @symbol ?WATER\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WATER\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WATER; /** - * @symbol ?WOOD\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WOOD\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WOOD; /** - * @symbol ?WOOL\@VanillaMapColor\@\@3VColor\@mce\@\@B + * @symbol ?WOOL\@VanillaMapColor\@\@3VColor\@mce\@\@B */ MCAPI extern class mce::Color const WOOL; /** - * @symbol ?getColorFromPaletteColor\@VanillaMapColor\@\@YA?AVColor\@mce\@\@W4PaletteColor\@\@\@Z + * @symbol ?getColorFromPaletteColor\@VanillaMapColor\@\@YA?AVColor\@mce\@\@W4PaletteColor\@\@\@Z */ MCAPI class mce::Color getColorFromPaletteColor(enum class PaletteColor); /** - * @symbol ?getColorFromTerracottaColor\@VanillaMapColor\@\@YA?AVColor\@mce\@\@W4BlockColor\@\@\@Z + * @symbol ?getColorFromTerracottaColor\@VanillaMapColor\@\@YA?AVColor\@mce\@\@W4BlockColor\@\@\@Z */ MCAPI class mce::Color getColorFromTerracottaColor(enum class BlockColor); diff --git a/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp b/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp index 95b1299645..f3c977347c 100644 --- a/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerCommands.hpp @@ -20,7 +20,7 @@ namespace VanillaServerCommands { #undef AFTER_EXTRA /** - * @symbol ?setup\@VanillaServerCommands\@\@YAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@VanillaServerCommands\@\@YAXAEAVCommandRegistry\@\@\@Z */ MCAPI void setup(class CommandRegistry &); diff --git a/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp b/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp index 02757ef559..da90e14b09 100644 --- a/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerGameplayEventListener.hpp @@ -31,33 +31,33 @@ class VanillaServerGameplayEventListener { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VANILLASERVERGAMEPLAYEVENTLISTENER /** - * @symbol ?onBlockInteractedWith\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z + * @symbol ?onBlockInteractedWith\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class EventResult onBlockInteractedWith(class Player &, class BlockPos const &); /** - * @symbol ?onBlockPlacedByPlayer\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?onBlockPlacedByPlayer\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVBlock\@\@AEBVBlockPos\@\@_N\@Z */ MCVAPI enum class EventResult onBlockPlacedByPlayer(class Player &, class Block const &, class BlockPos const &, bool); /** - * @symbol ?onEvent\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUPlayerDamageEvent\@\@\@Z + * @symbol ?onEvent\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUPlayerDamageEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct PlayerDamageEvent const &); /** - * @symbol ?onEvent\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUActorHurtEvent\@\@\@Z + * @symbol ?onEvent\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUActorHurtEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct ActorHurtEvent const &); /** - * @symbol ?onEvent\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUPlayerOpenContainerEvent\@\@\@Z + * @symbol ?onEvent\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEBUPlayerOpenContainerEvent\@\@\@Z */ MCVAPI enum class EventResult onEvent(struct PlayerOpenContainerEvent const &); /** - * @symbol ?onPlayerMovementAnomaly\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z + * @symbol ?onPlayerMovementAnomaly\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z */ MCVAPI enum class EventResult onPlayerMovementAnomaly(class Player &, class Vec3 const &, float, float); /** - * @symbol ?onPlayerMovementCorrected\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z + * @symbol ?onPlayerMovementCorrected\@VanillaServerGameplayEventListener\@\@UEAA?AW4EventResult\@\@AEAVPlayer\@\@AEBVVec3\@\@MM\@Z */ MCVAPI enum class EventResult onPlayerMovementCorrected(class Player &, class Vec3 const &, float, float); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp b/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp index 496a7d1e55..c8320f2cab 100644 --- a/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp +++ b/LiteLoader/include/llapi/mc/VanillaServerNetworkHandler.hpp @@ -31,18 +31,18 @@ class VanillaServerNetworkHandler { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VanillaServerNetworkHandler(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handle\@VanillaServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z + * @vftbl 1 + * @symbol ?handle\@VanillaServerNetworkHandler\@\@UEAAXAEBVNetworkIdentifier\@\@AEBVResourcePackClientResponsePacket\@\@\@Z */ virtual void handle(class NetworkIdentifier const &, class ResourcePackClientResponsePacket const &); /** - * @symbol ??0VanillaServerNetworkHandler\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@AEAVServerInstance\@\@\@Z + * @symbol ??0VanillaServerNetworkHandler\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VServerNetworkHandler\@\@\@Bedrock\@\@\@gsl\@\@AEAVServerInstance\@\@\@Z */ MCAPI VanillaServerNetworkHandler(class gsl::not_null>, class ServerInstance &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaStates.hpp b/LiteLoader/include/llapi/mc/VanillaStates.hpp index e3a8206f51..08f40e33dc 100644 --- a/LiteLoader/include/llapi/mc/VanillaStates.hpp +++ b/LiteLoader/include/llapi/mc/VanillaStates.hpp @@ -27,527 +27,531 @@ struct CachedItemStateMapPtr { #undef AFTER_EXTRA /** - * @symbol ?Active\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Active\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const Active; /** - * @symbol ?Age\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Age\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Age; /** - * @symbol ?AgeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?AgeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const AgeBit; /** - * @symbol ?AllowUnderwaterBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?AllowUnderwaterBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const AllowUnderwaterBit; /** - * @symbol ?AttachedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?AttachedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const AttachedBit; /** - * @symbol ?Attachment\@VanillaStates\@\@3V?$ItemStateVariant\@W4AttachmentType\@\@\@\@B + * @symbol ?Attachment\@VanillaStates\@\@3V?$ItemStateVariant\@W4AttachmentType\@\@\@\@B */ MCAPI extern class ItemStateVariant const Attachment; /** - * @symbol ?BambooLeafSize\@VanillaStates\@\@3V?$ItemStateVariant\@W4LeafSize\@\@\@\@B + * @symbol ?BambooLeafSize\@VanillaStates\@\@3V?$ItemStateVariant\@W4LeafSize\@\@\@\@B */ MCAPI extern class ItemStateVariant const BambooLeafSize; /** - * @symbol ?BambooThickness\@VanillaStates\@\@3V?$ItemStateVariant\@W4StalkThickness\@\@\@\@B + * @symbol ?BambooThickness\@VanillaStates\@\@3V?$ItemStateVariant\@W4StalkThickness\@\@\@\@B */ MCAPI extern class ItemStateVariant const BambooThickness; /** - * @symbol ?BeehiveHoneyLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BeehiveHoneyLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const BeehiveHoneyLevel; /** - * @symbol ?BigDripleafHead\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BigDripleafHead\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const BigDripleafHead; /** - * @symbol ?BigDripleafTilt\@VanillaStates\@\@3V?$ItemStateVariant\@W4BigDripleafTilt\@\@\@\@B + * @symbol ?BigDripleafTilt\@VanillaStates\@\@3V?$ItemStateVariant\@W4BigDripleafTilt\@\@\@\@B */ MCAPI extern class ItemStateVariant const BigDripleafTilt; /** - * @symbol ?BiteCounter\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BiteCounter\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const BiteCounter; /** - * @symbol ?BlockLightLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BlockLightLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const BlockLightLevel; /** - * @symbol ?Bloom\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Bloom\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const Bloom; /** - * @symbol ?BookshelfOccupiedSlots\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?BookshelfOccupiedSlots\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const BookshelfOccupiedSlots; /** - * @symbol ?BrewingStandSlotABit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrewingStandSlotABit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const BrewingStandSlotABit; /** - * @symbol ?BrewingStandSlotBBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrewingStandSlotBBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const BrewingStandSlotBBit; /** - * @symbol ?BrewingStandSlotCBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrewingStandSlotCBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const BrewingStandSlotCBit; /** - * @symbol ?ButtonPressedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?BrushedProgress\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + */ + MCAPI extern class ItemStateVariant const BrushedProgress; + /** + * @symbol ?ButtonPressedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ButtonPressedBit; /** - * @symbol ?CanSummon\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?CanSummon\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const CanSummon; /** - * @symbol ?Candles\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Candles\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Candles; /** - * @symbol ?CauldronLiquid\@VanillaStates\@\@3V?$ItemStateVariant\@W4CauldronLiquidType\@\@\@\@B + * @symbol ?CauldronLiquid\@VanillaStates\@\@3V?$ItemStateVariant\@W4CauldronLiquidType\@\@\@\@B */ MCAPI extern class ItemStateVariant const CauldronLiquid; /** - * @symbol ?ChemistryTableType\@VanillaStates\@\@3V?$ItemStateVariant\@W4ChemistryTableType\@\@\@\@B + * @symbol ?ChemistryTableType\@VanillaStates\@\@3V?$ItemStateVariant\@W4ChemistryTableType\@\@\@\@B */ MCAPI extern class ItemStateVariant const ChemistryTableType; /** - * @symbol ?ChiselType\@VanillaStates\@\@3V?$ItemStateVariant\@W4ChiselType\@\@\@\@B + * @symbol ?ChiselType\@VanillaStates\@\@3V?$ItemStateVariant\@W4ChiselType\@\@\@\@B */ MCAPI extern class ItemStateVariant const ChiselType; /** - * @symbol ?ClusterCount\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?ClusterCount\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const ClusterCount; /** - * @symbol ?Color\@VanillaStates\@\@3V?$ItemStateVariant\@W4BlockColor\@\@\@\@B + * @symbol ?Color\@VanillaStates\@\@3V?$ItemStateVariant\@W4BlockColor\@\@\@\@B */ MCAPI extern class ItemStateVariant const Color; /** - * @symbol ?ColorBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ColorBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ColorBit; /** - * @symbol ?ComposterFillLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?ComposterFillLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const ComposterFillLevel; /** - * @symbol ?ConditionalBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ConditionalBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ConditionalBit; /** - * @symbol ?CoralColor\@VanillaStates\@\@3V?$ItemStateVariant\@W4CoralColor\@\@\@\@B + * @symbol ?CoralColor\@VanillaStates\@\@3V?$ItemStateVariant\@W4CoralColor\@\@\@\@B */ MCAPI extern class ItemStateVariant const CoralColor; /** - * @symbol ?CoralDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?CoralDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const CoralDirection; /** - * @symbol ?CoralFanDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?CoralFanDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const CoralFanDirection; /** - * @symbol ?CoralHangTypeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?CoralHangTypeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const CoralHangTypeBit; /** - * @symbol ?CoveredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?CoveredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const CoveredBit; /** - * @symbol ?CrackedState\@VanillaStates\@\@3V?$ItemStateVariant\@W4HatchLevel\@\@\@\@B + * @symbol ?CrackedState\@VanillaStates\@\@3V?$ItemStateVariant\@W4HatchLevel\@\@\@\@B */ MCAPI extern class ItemStateVariant const CrackedState; /** - * @symbol ?DEPRECATED\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?DEPRECATED\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const DEPRECATED; /** - * @symbol ?Damage\@VanillaStates\@\@3V?$ItemStateVariant\@W4AnvilDamage\@\@\@\@B + * @symbol ?Damage\@VanillaStates\@\@3V?$ItemStateVariant\@W4AnvilDamage\@\@\@\@B */ MCAPI extern class ItemStateVariant const Damage; /** - * @symbol ?DeadBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DeadBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const DeadBit; /** - * @symbol ?Direction\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Direction\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Direction; /** - * @symbol ?DirtType\@VanillaStates\@\@3V?$ItemStateVariant\@W4DirtType\@\@\@\@B + * @symbol ?DirtType\@VanillaStates\@\@3V?$ItemStateVariant\@W4DirtType\@\@\@\@B */ MCAPI extern class ItemStateVariant const DirtType; /** - * @symbol ?DisarmedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DisarmedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const DisarmedBit; /** - * @symbol ?DoorHingeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DoorHingeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const DoorHingeBit; /** - * @symbol ?DoublePlantType\@VanillaStates\@\@3V?$ItemStateVariant\@W4DoublePlantType\@\@\@\@B + * @symbol ?DoublePlantType\@VanillaStates\@\@3V?$ItemStateVariant\@W4DoublePlantType\@\@\@\@B */ MCAPI extern class ItemStateVariant const DoublePlantType; /** - * @symbol ?DragDown\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?DragDown\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const DragDown; /** - * @symbol ?DripstoneThickness\@VanillaStates\@\@3V?$ItemStateVariant\@W4DripstoneThickness\@\@\@\@B + * @symbol ?DripstoneThickness\@VanillaStates\@\@3V?$ItemStateVariant\@W4DripstoneThickness\@\@\@\@B */ MCAPI extern class ItemStateVariant const DripstoneThickness; /** - * @symbol ?EndPortalEyeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?EndPortalEyeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const EndPortalEyeBit; /** - * @symbol ?ExplodeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ExplodeBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ExplodeBit; /** - * @symbol ?Extinguished\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Extinguished\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const Extinguished; /** - * @symbol ?FacingDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?FacingDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const FacingDirection; /** - * @symbol ?FillLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?FillLevel\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const FillLevel; /** - * @symbol ?FlowerType\@VanillaStates\@\@3V?$ItemStateVariant\@W4FlowerType\@\@\@\@B + * @symbol ?FlowerType\@VanillaStates\@\@3V?$ItemStateVariant\@W4FlowerType\@\@\@\@B */ MCAPI extern class ItemStateVariant const FlowerType; /** - * @symbol ?GrowingPlantAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?GrowingPlantAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const GrowingPlantAge; /** - * @symbol ?Growth\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Growth\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Growth; /** - * @symbol ?HangingBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?HangingBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const HangingBit; /** - * @symbol ?HeadPieceBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?HeadPieceBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const HeadPieceBit; /** - * @symbol ?Height\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Height\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Height; /** - * @symbol ?HugeMushroomBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?HugeMushroomBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const HugeMushroomBits; /** - * @symbol ?InWallBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?InWallBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const InWallBit; /** - * @symbol ?InfiniburnBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?InfiniburnBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const InfiniburnBit; /** - * @symbol ?ItemFrameMapBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ItemFrameMapBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ItemFrameMapBit; /** - * @symbol ?ItemFramePhotoBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ItemFramePhotoBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ItemFramePhotoBit; /** - * @symbol ?KelpAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?KelpAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const KelpAge; /** - * @symbol ?LeverDirection\@VanillaStates\@\@3V?$ItemStateVariant\@W4LeverDirection\@\@\@\@B + * @symbol ?LeverDirection\@VanillaStates\@\@3V?$ItemStateVariant\@W4LeverDirection\@\@\@\@B */ MCAPI extern class ItemStateVariant const LeverDirection; /** - * @symbol ?LiquidDepth\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?LiquidDepth\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const LiquidDepth; /** - * @symbol ?Lit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?Lit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const Lit; /** - * @symbol ?MoisturizedAmount\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?MoisturizedAmount\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const MoisturizedAmount; /** - * @symbol ?MonsterEggStoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4MonsterEggStoneType\@\@\@\@B + * @symbol ?MonsterEggStoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4MonsterEggStoneType\@\@\@\@B */ MCAPI extern class ItemStateVariant const MonsterEggStoneType; /** - * @symbol ?MultiFaceDirectionBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?MultiFaceDirectionBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const MultiFaceDirectionBits; /** - * @symbol ?NewLeafType\@VanillaStates\@\@3V?$ItemStateVariant\@W4NewLeafType\@\@\@\@B + * @symbol ?NewLeafType\@VanillaStates\@\@3V?$ItemStateVariant\@W4NewLeafType\@\@\@\@B */ MCAPI extern class ItemStateVariant const NewLeafType; /** - * @symbol ?NewLogType\@VanillaStates\@\@3V?$ItemStateVariant\@W4NewLogType\@\@\@\@B + * @symbol ?NewLogType\@VanillaStates\@\@3V?$ItemStateVariant\@W4NewLogType\@\@\@\@B */ MCAPI extern class ItemStateVariant const NewLogType; /** - * @symbol ?NoDropBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?NoDropBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const NoDropBit; /** - * @symbol ?OccupiedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OccupiedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const OccupiedBit; /** - * @symbol ?OldLeafType\@VanillaStates\@\@3V?$ItemStateVariant\@W4OldLeafType\@\@\@\@B + * @symbol ?OldLeafType\@VanillaStates\@\@3V?$ItemStateVariant\@W4OldLeafType\@\@\@\@B */ MCAPI extern class ItemStateVariant const OldLeafType; /** - * @symbol ?OldLogType\@VanillaStates\@\@3V?$ItemStateVariant\@W4OldLogType\@\@\@\@B + * @symbol ?OldLogType\@VanillaStates\@\@3V?$ItemStateVariant\@W4OldLogType\@\@\@\@B */ MCAPI extern class ItemStateVariant const OldLogType; /** - * @symbol ?OpenBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OpenBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const OpenBit; /** - * @symbol ?OutputLitBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OutputLitBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const OutputLitBit; /** - * @symbol ?OutputSubtractBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?OutputSubtractBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const OutputSubtractBit; /** - * @symbol ?PersistentBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?PersistentBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const PersistentBit; /** - * @symbol ?PillarAxis\@VanillaStates\@\@3V?$ItemStateVariant\@W4PillarAxis\@\@\@\@B + * @symbol ?PillarAxis\@VanillaStates\@\@3V?$ItemStateVariant\@W4PillarAxis\@\@\@\@B */ MCAPI extern class ItemStateVariant const PillarAxis; /** - * @symbol ?PortalAxis\@VanillaStates\@\@3V?$ItemStateVariant\@W4PortalAxis\@\@\@\@B + * @symbol ?PortalAxis\@VanillaStates\@\@3V?$ItemStateVariant\@W4PortalAxis\@\@\@\@B */ MCAPI extern class ItemStateVariant const PortalAxis; /** - * @symbol ?PoweredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?PoweredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const PoweredBit; /** - * @symbol ?PrismarineBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4PrismarineBlockType\@\@\@\@B + * @symbol ?PrismarineBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4PrismarineBlockType\@\@\@\@B */ MCAPI extern class ItemStateVariant const PrismarineBlockType; /** - * @symbol ?PropaguleStage\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?PropaguleStage\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const PropaguleStage; /** - * @symbol ?RailDataBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?RailDataBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const RailDataBit; /** - * @symbol ?RailDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RailDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const RailDirection; /** - * @symbol ?RedstoneSignal\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RedstoneSignal\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const RedstoneSignal; /** - * @symbol ?RepeaterDelay\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RepeaterDelay\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const RepeaterDelay; /** - * @symbol ?RespawnAnchorCharge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?RespawnAnchorCharge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const RespawnAnchorCharge; /** - * @symbol ?Rotation\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Rotation\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Rotation; /** - * @symbol ?SandStoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SandStoneType\@\@\@\@B + * @symbol ?SandStoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SandStoneType\@\@\@\@B */ MCAPI extern class ItemStateVariant const SandStoneType; /** - * @symbol ?SandType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SandType\@\@\@\@B + * @symbol ?SandType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SandType\@\@\@\@B */ MCAPI extern class ItemStateVariant const SandType; /** - * @symbol ?SaplingType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SaplingType\@\@\@\@B + * @symbol ?SaplingType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SaplingType\@\@\@\@B */ MCAPI extern class ItemStateVariant const SaplingType; /** - * @symbol ?SeaGrassType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SeaGrassType\@\@\@\@B + * @symbol ?SeaGrassType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SeaGrassType\@\@\@\@B */ MCAPI extern class ItemStateVariant const SeaGrassType; /** - * @symbol ?SpongeType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SpongeType\@\@\@\@B + * @symbol ?SpongeType\@VanillaStates\@\@3V?$ItemStateVariant\@W4SpongeType\@\@\@\@B */ MCAPI extern class ItemStateVariant const SpongeType; /** - * @symbol ?Stability\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?Stability\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const Stability; /** - * @symbol ?StabilityCheckBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?StabilityCheckBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const StabilityCheckBit; /** - * @symbol ?StandingRotation\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?StandingRotation\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const StandingRotation; /** - * @symbol ?StoneBrickType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneBrickType\@\@\@\@B + * @symbol ?StoneBrickType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneBrickType\@\@\@\@B */ MCAPI extern class ItemStateVariant const StoneBrickType; /** - * @symbol ?StoneSlabType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType\@\@\@\@B + * @symbol ?StoneSlabType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType\@\@\@\@B */ MCAPI extern class ItemStateVariant const StoneSlabType; /** - * @symbol ?StoneSlabType2\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType2\@\@\@\@B + * @symbol ?StoneSlabType2\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType2\@\@\@\@B */ MCAPI extern class ItemStateVariant const StoneSlabType2; /** - * @symbol ?StoneSlabType3\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType3\@\@\@\@B + * @symbol ?StoneSlabType3\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType3\@\@\@\@B */ MCAPI extern class ItemStateVariant const StoneSlabType3; /** - * @symbol ?StoneSlabType4\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType4\@\@\@\@B + * @symbol ?StoneSlabType4\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneSlabType4\@\@\@\@B */ MCAPI extern class ItemStateVariant const StoneSlabType4; /** - * @symbol ?StoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneType\@\@\@\@B + * @symbol ?StoneType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StoneType\@\@\@\@B */ MCAPI extern class ItemStateVariant const StoneType; /** - * @symbol ?StrippedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?StrippedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const StrippedBit; /** - * @symbol ?StructureBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StructureBlockType\@\@\@\@B + * @symbol ?StructureBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StructureBlockType\@\@\@\@B */ MCAPI extern class ItemStateVariant const StructureBlockType; /** - * @symbol ?StructureVoidType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StructureVoidType\@\@\@\@B + * @symbol ?StructureVoidType\@VanillaStates\@\@3V?$ItemStateVariant\@W4StructureVoidType\@\@\@\@B */ MCAPI extern class ItemStateVariant const StructureVoidType; /** - * @symbol ?SuspendedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?SuspendedBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const SuspendedBit; /** - * @symbol ?TallGrassType\@VanillaStates\@\@3V?$ItemStateVariant\@W4TallGrassType\@\@\@\@B + * @symbol ?TallGrassType\@VanillaStates\@\@3V?$ItemStateVariant\@W4TallGrassType\@\@\@\@B */ MCAPI extern class ItemStateVariant const TallGrassType; /** - * @symbol ?ToggleBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?ToggleBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const ToggleBit; /** - * @symbol ?TopSlotBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?TopSlotBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const TopSlotBit; /** - * @symbol ?TorchFacingDirection\@VanillaStates\@\@3V?$ItemStateVariant\@W4TorchFacing\@\@\@\@B + * @symbol ?TorchFacingDirection\@VanillaStates\@\@3V?$ItemStateVariant\@W4TorchFacing\@\@\@\@B */ MCAPI extern class ItemStateVariant const TorchFacingDirection; /** - * @symbol ?TriggeredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?TriggeredBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const TriggeredBit; /** - * @symbol ?TurtleEggCount\@VanillaStates\@\@3V?$ItemStateVariant\@W4EggCount\@\@\@\@B + * @symbol ?TurtleEggCount\@VanillaStates\@\@3V?$ItemStateVariant\@W4EggCount\@\@\@\@B */ MCAPI extern class ItemStateVariant const TurtleEggCount; /** - * @symbol ?TwistingVinesAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?TwistingVinesAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const TwistingVinesAge; /** - * @symbol ?UpdateBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?UpdateBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const UpdateBit; /** - * @symbol ?UpperBlockBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?UpperBlockBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const UpperBlockBit; /** - * @symbol ?UpsideDownBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?UpsideDownBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const UpsideDownBit; /** - * @symbol ?VineDirectionBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?VineDirectionBits\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const VineDirectionBits; /** - * @symbol ?WallBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallBlockType\@\@\@\@B + * @symbol ?WallBlockType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallBlockType\@\@\@\@B */ MCAPI extern class ItemStateVariant const WallBlockType; /** - * @symbol ?WallConnectionTypeEast\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeEast\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B */ MCAPI extern class ItemStateVariant const WallConnectionTypeEast; /** - * @symbol ?WallConnectionTypeNorth\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeNorth\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B */ MCAPI extern class ItemStateVariant const WallConnectionTypeNorth; /** - * @symbol ?WallConnectionTypeSouth\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeSouth\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B */ MCAPI extern class ItemStateVariant const WallConnectionTypeSouth; /** - * @symbol ?WallConnectionTypeWest\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B + * @symbol ?WallConnectionTypeWest\@VanillaStates\@\@3V?$ItemStateVariant\@W4WallConnectionType\@\@\@\@B */ MCAPI extern class ItemStateVariant const WallConnectionTypeWest; /** - * @symbol ?WallPostBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B + * @symbol ?WallPostBit\@VanillaStates\@\@3V?$ItemStateVariant\@_N\@\@B */ MCAPI extern class ItemStateVariant const WallPostBit; /** - * @symbol ?WeepingVinesAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?WeepingVinesAge\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const WeepingVinesAge; /** - * @symbol ?WeirdoDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B + * @symbol ?WeirdoDirection\@VanillaStates\@\@3V?$ItemStateVariant\@H\@\@B */ MCAPI extern class ItemStateVariant const WeirdoDirection; /** - * @symbol ?WoodType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WoodType\@\@\@\@B + * @symbol ?WoodType\@VanillaStates\@\@3V?$ItemStateVariant\@W4WoodType\@\@\@\@B */ MCAPI extern class ItemStateVariant const WoodType; /** - * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@\@Z + * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@\@Z */ MCAPI class ItemState const * getState(class HashedString const &); /** - * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@AEAUCachedItemStateMapPtr\@1\@\@Z + * @symbol ?getState\@VanillaStates\@\@YAPEBVItemState\@\@AEBVHashedString\@\@AEAUCachedItemStateMapPtr\@1\@\@Z */ MCAPI class ItemState const * getState(class HashedString const &, struct VanillaStates::CachedItemStateMapPtr &); /** - * @symbol ?registerStates\@VanillaStates\@\@YAXXZ + * @symbol ?registerStates\@VanillaStates\@\@YAXXZ */ MCAPI void registerStates(); /** - * @symbol ?unregisterStates\@VanillaStates\@\@YAXXZ + * @symbol ?unregisterStates\@VanillaStates\@\@YAXXZ */ MCAPI void unregisterStates(); diff --git a/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp index a9e7dd3f45..a78888487b 100644 --- a/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp +++ b/LiteLoader/include/llapi/mc/VanillaSystemsRegistration.hpp @@ -23,59 +23,59 @@ namespace VanillaSystemsRegistration { #undef AFTER_EXTRA /** - * @symbol ?_registerSideBySideCompare\@VanillaSystemsRegistration\@\@YAXAEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@AEAVEntitySystems\@\@W4SideBySideExtractionId\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?_registerSideBySideCompare\@VanillaSystemsRegistration\@\@YAXAEBV?$vector\@IV?$allocator\@I\@std\@\@\@std\@\@AEAVEntitySystems\@\@W4SideBySideExtractionId\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void _registerSideBySideCompare(std::vector const &, class EntitySystems &, enum class SideBySideExtractionId, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorAiStepSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z + * @symbol ?registerActorAiStepSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z */ MCAPI void registerActorAiStepSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::shared_future &); /** - * @symbol ?registerActorMoveSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@W4MoveSystemsRegistrationMode\@1\@\@Z + * @symbol ?registerActorMoveSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@W4MoveSystemsRegistrationMode\@1\@\@Z */ MCAPI void registerActorMoveSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &, enum class VanillaSystemsRegistration::MoveSystemsRegistrationMode); /** - * @symbol ?registerActorMovementTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z + * @symbol ?registerActorMovementTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z */ MCAPI void registerActorMovementTickSystems(class EntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::shared_future &); /** - * @symbol ?registerActorNormalTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z + * @symbol ?registerActorNormalTickSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@AEAV?$shared_future\@UEntitySystemsInfo\@\@\@std\@\@\@Z */ MCAPI void registerActorNormalTickSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &, class std::shared_future &); /** - * @symbol ?registerActorPositionPassenger\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerActorPositionPassenger\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerActorPositionPassenger(class IEntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerActorTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerActorTravelSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerActorTravelSystems(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerExtractApplyBlock\@VanillaSystemsRegistration\@\@YAXAEAUDependencyInfo\@1\@W4ExtractApplyMode\@1\@W4SideBySideExtractionId\@\@AEAVEntitySystems\@\@AEBURegistrationOptions\@1\@AEBV?$function\@$$A6AXAEAVIEntitySystems\@\@\@Z\@std\@\@\@Z + * @symbol ?registerExtractApplyBlock\@VanillaSystemsRegistration\@\@YAXAEAUDependencyInfo\@1\@W4ExtractApplyMode\@1\@W4SideBySideExtractionId\@\@AEAVEntitySystems\@\@AEBURegistrationOptions\@1\@AEBV?$function\@$$A6AXAEAVIEntitySystems\@\@\@Z\@std\@\@\@Z */ 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\@\@AEAUDependencyInfo\@1\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerPassengerTick(class EntitySystems &, struct VanillaSystemsRegistration::DependencyInfo &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerRemovePassengerSystems\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerRemovePassengerSystems\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerRemovePassengerSystems(class IEntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerSetPosSystems\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerSetPosSystems\@VanillaSystemsRegistration\@\@YAXAEAVIEntitySystems\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerSetPosSystems(class IEntitySystems &, struct VanillaSystemsRegistration::RegistrationOptions const &); /** - * @symbol ?registerSharedVanillaPlayerInteractionSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z + * @symbol ?registerSharedVanillaPlayerInteractionSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z */ MCAPI void registerSharedVanillaPlayerInteractionSystems(class EntitySystems &); /** - * @symbol ?registerTickFilterSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z + * @symbol ?registerTickFilterSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@\@Z */ MCAPI void registerTickFilterSystems(class EntitySystems &); /** - * @symbol ?registerVanillaServerTickingSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@AEBURegistrationOptions\@1\@\@Z + * @symbol ?registerVanillaServerTickingSystems\@VanillaSystemsRegistration\@\@YAXAEAVEntitySystems\@\@V?$not_null\@V?$NonOwnerPointer\@$$CBVILevel\@\@\@Bedrock\@\@\@gsl\@\@AEBURegistrationOptions\@1\@\@Z */ MCAPI void registerVanillaServerTickingSystems(class EntitySystems &, class gsl::not_null>, struct VanillaSystemsRegistration::RegistrationOptions const &); diff --git a/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp b/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp index f67d4e2528..bff69e8a0b 100644 --- a/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp +++ b/LiteLoader/include/llapi/mc/VanillaTagMaps.hpp @@ -22,11 +22,11 @@ namespace VanillaTagMaps { #undef AFTER_EXTRA /** - * @symbol ?BlockNameIdToTagsMap\@VanillaTagMaps\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?BlockNameIdToTagsMap\@VanillaTagMaps\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@B */ MCAPI extern class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const BlockNameIdToTagsMap; /** - * @symbol ?ItemNameIdToTagsMap\@VanillaTagMaps\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@B + * @symbol ?ItemNameIdToTagsMap\@VanillaTagMaps\@\@3V?$unordered_map\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@U?$hash\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@U?$equal_to\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@2\@V?$allocator\@U?$pair\@$$CBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$vector\@VHashedString\@\@V?$allocator\@VHashedString\@\@\@std\@\@\@2\@\@std\@\@\@2\@\@std\@\@B */ MCAPI extern class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const ItemNameIdToTagsMap; diff --git a/LiteLoader/include/llapi/mc/VanillaTags.hpp b/LiteLoader/include/llapi/mc/VanillaTags.hpp index 69d2c1e9d1..a1e6e61a54 100644 --- a/LiteLoader/include/llapi/mc/VanillaTags.hpp +++ b/LiteLoader/include/llapi/mc/VanillaTags.hpp @@ -22,87 +22,87 @@ namespace VanillaTags { #undef AFTER_EXTRA /** - * @symbol ?DiamondDiggable\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?DiamondDiggable\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const DiamondDiggable; /** - * @symbol ?Dirt\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Dirt\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Dirt; /** - * @symbol ?FertilizeArea\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?FertilizeArea\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const FertilizeArea; /** - * @symbol ?GoldDiggable\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?GoldDiggable\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const GoldDiggable; /** - * @symbol ?Grass\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Grass\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Grass; /** - * @symbol ?Gravel\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Gravel\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Gravel; /** - * @symbol ?IronDiggable\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?IronDiggable\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const IronDiggable; /** - * @symbol ?Metal\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Metal\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Metal; /** - * @symbol ?MobSpawner\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?MobSpawner\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const MobSpawner; /** - * @symbol ?NotFeatureReplaceable\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?NotFeatureReplaceable\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const NotFeatureReplaceable; /** - * @symbol ?Plant\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Plant\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Plant; /** - * @symbol ?Pumpkin\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Pumpkin\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Pumpkin; /** - * @symbol ?Rail\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Rail\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Rail; /** - * @symbol ?Sand\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Sand\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Sand; /** - * @symbol ?Snow\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Snow\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Snow; /** - * @symbol ?Stone\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Stone\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Stone; /** - * @symbol ?StoneDiggable\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?StoneDiggable\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const StoneDiggable; /** - * @symbol ?TextSign\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?TextSign\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const TextSign; /** - * @symbol ?Water\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Water\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Water; /** - * @symbol ?Wood\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?Wood\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const Wood; /** - * @symbol ?WoodDiggable\@VanillaTags\@\@3VHashedString\@\@B + * @symbol ?WoodDiggable\@VanillaTags\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const WoodDiggable; diff --git a/LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp b/LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp index 4372884004..9db1f96824 100644 --- a/LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp +++ b/LiteLoader/include/llapi/mc/VanillaTreeFeature.hpp @@ -31,34 +31,34 @@ class VanillaTreeFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VanillaTreeFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@VanillaTreeFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@VanillaTreeFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; //private: /** - * @symbol ?_buildSchema\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@\@Z + * @symbol ?_buildSchema\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@\@Z */ MCAPI static void _buildSchema(class JsonUtil::JsonSchemaObjectNode, struct FeatureLoading::ConcreteFeatureHolder> &); /** - * @symbol ?_buildVanillaCanopyVariants\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@V?$function\@$$A6AAEAVITreeCanopyWrapper\@\@PEAU?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@Z\@std\@\@\@Z + * @symbol ?_buildVanillaCanopyVariants\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@V?$function\@$$A6AAEAVITreeCanopyWrapper\@\@PEAU?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@Z\@std\@\@\@Z */ MCAPI static void _buildVanillaCanopyVariants(class JsonUtil::JsonSchemaObjectNode, struct FeatureLoading::ConcreteFeatureHolder> &, class std::function *)>); /** - * @symbol ?_buildVanillaRootVariants\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@V?$function\@$$A6AAEAVITreeRootWrapper\@\@PEAU?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@Z\@std\@\@\@Z + * @symbol ?_buildVanillaRootVariants\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@V?$function\@$$A6AAEAVITreeRootWrapper\@\@PEAU?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@Z\@std\@\@\@Z */ MCAPI static void _buildVanillaRootVariants(class JsonUtil::JsonSchemaObjectNode, struct FeatureLoading::ConcreteFeatureHolder> &, class std::function *)>); /** - * @symbol ?_buildVanillaTrunkVariants\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@V?$function\@$$A6AAEAVITreeTrunkWrapper\@\@PEAU?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@Z\@std\@\@\@Z + * @symbol ?_buildVanillaTrunkVariants\@VanillaTreeFeature\@\@CAXAEAV?$JsonSchemaObjectNode\@V?$JsonParseState\@VEmptyClass\@JsonUtil\@\@UFeatureRootParseContext\@FeatureLoading\@\@\@JsonUtil\@\@U?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@JsonUtil\@\@V?$function\@$$A6AAEAVITreeTrunkWrapper\@\@PEAU?$ConcreteFeatureHolder\@VVanillaTreeFeature\@\@\@FeatureLoading\@\@\@Z\@std\@\@\@Z */ MCAPI static void _buildVanillaTrunkVariants(class JsonUtil::JsonSchemaObjectNode, struct FeatureLoading::ConcreteFeatureHolder> &, class std::function *)>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp index 3dead6079b..ffcf887e43 100644 --- a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureActorRules.hpp @@ -30,8 +30,8 @@ class VanillaVillageJigsawStructureActorRules { public: /** - * @symbol ?initialize\@VanillaVillageJigsawStructureActorRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaVillageJigsawStructureActorRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp index 84e706d5f3..cfbb9e5827 100644 --- a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockRules.hpp @@ -30,8 +30,8 @@ class VanillaVillageJigsawStructureBlockRules { public: /** - * @symbol ?initialize\@VanillaVillageJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaVillageJigsawStructureBlockRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp index 2e6738b7a6..4366f531b0 100644 --- a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureBlockTagRules.hpp @@ -30,8 +30,8 @@ class VanillaVillageJigsawStructureBlockTagRules { public: /** - * @symbol ?initialize\@VanillaVillageJigsawStructureBlockTagRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaVillageJigsawStructureBlockTagRules\@\@SAXAEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp index 4e14472c4e..c4336012ed 100644 --- a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructureElements.hpp @@ -31,8 +31,8 @@ class VanillaVillageJigsawStructureElements { public: /** - * @symbol ?initialize\@VanillaVillageJigsawStructureElements\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaVillageJigsawStructureElements\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class gsl::not_null>, class FeatureRegistry &, class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp index 5468cabb39..c7b3ae89fd 100644 --- a/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp +++ b/LiteLoader/include/llapi/mc/VanillaVillageJigsawStructures.hpp @@ -31,8 +31,8 @@ class VanillaVillageJigsawStructures { public: /** - * @symbol ?initialize\@VanillaVillageJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z + * @symbol ?initialize\@VanillaVillageJigsawStructures\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEAVFeatureRegistry\@\@AEAVJigsawStructureRegistry\@\@\@Z */ MCAPI static void initialize(class gsl::not_null>, class FeatureRegistry &, class JigsawStructureRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp b/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp index 144581023a..62acbc101f 100644 --- a/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp +++ b/LiteLoader/include/llapi/mc/VanillaWorldSystems.hpp @@ -28,7 +28,7 @@ class Impl { #undef AFTER_EXTRA /** - * @symbol ?init\@VanillaWorldSystems\@\@YA?AV?$shared_ptr\@VImpl\@VanillaWorldSystems\@\@\@std\@\@PEAVLevel\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@VItemRegistryRef\@\@\@Z + * @symbol ?init\@VanillaWorldSystems\@\@YA?AV?$shared_ptr\@VImpl\@VanillaWorldSystems\@\@\@std\@\@PEAVLevel\@\@AEBVExperiments\@\@AEBVBaseGameVersion\@\@PEAVResourcePackManager\@\@VItemRegistryRef\@\@\@Z */ MCAPI class std::shared_ptr init(class Level *, class Experiments const &, class BaseGameVersion const &, class ResourcePackManager *, class ItemRegistryRef); diff --git a/LiteLoader/include/llapi/mc/VarIntDataInput.hpp b/LiteLoader/include/llapi/mc/VarIntDataInput.hpp index e788e04aba..ff0dab4985 100644 --- a/LiteLoader/include/llapi/mc/VarIntDataInput.hpp +++ b/LiteLoader/include/llapi/mc/VarIntDataInput.hpp @@ -30,69 +30,73 @@ class VarIntDataInput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VarIntDataInput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?readFloat\@VarIntDataInput\@\@UEAAMXZ + * @vftbl 3 + * @symbol ?readFloat\@VarIntDataInput\@\@UEAAMXZ */ virtual float readFloat(); /** - * @vftbl 4 - * @symbol ?readDouble\@VarIntDataInput\@\@UEAANXZ + * @vftbl 4 + * @symbol ?readDouble\@VarIntDataInput\@\@UEAANXZ */ virtual double readDouble(); /** - * @vftbl 5 - * @symbol ?readByte\@VarIntDataInput\@\@UEAADXZ + * @vftbl 5 + * @symbol ?readByte\@VarIntDataInput\@\@UEAADXZ */ virtual char readByte(); /** - * @vftbl 6 - * @symbol ?readShort\@VarIntDataInput\@\@UEAAFXZ + * @vftbl 6 + * @symbol ?readShort\@VarIntDataInput\@\@UEAAFXZ */ virtual short readShort(); /** - * @vftbl 7 - * @symbol ?readInt\@VarIntDataInput\@\@UEAAHXZ + * @vftbl 7 + * @symbol ?readInt\@VarIntDataInput\@\@UEAAHXZ */ virtual int readInt(); /** - * @vftbl 8 - * @symbol ?readLongLong\@VarIntDataInput\@\@UEAA_JXZ + * @vftbl 8 + * @symbol ?readLongLong\@VarIntDataInput\@\@UEAA_JXZ */ virtual __int64 readLongLong(); /** - * @vftbl 9 - * @symbol ?readBytes\@VarIntDataInput\@\@UEAA_NPEAX_K\@Z + * @vftbl 9 + * @symbol ?readBytes\@VarIntDataInput\@\@UEAA_NPEAX_K\@Z */ virtual bool readBytes(void *, unsigned __int64); /** - * @vftbl 10 - * @symbol ?numBytesLeft\@VarIntDataInput\@\@UEBA_KXZ + * @vftbl 10 + * @symbol ?numBytesLeft\@VarIntDataInput\@\@UEBA_KXZ */ virtual unsigned __int64 numBytesLeft() const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VARINTDATAINPUT /** - * @symbol ?readLongString\@VarIntDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?readLongString\@VarIntDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string readLongString(); /** - * @symbol ?readString\@VarIntDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?readString\@VarIntDataInput\@\@UEAA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCVAPI std::string readString(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~VarIntDataInput(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VarIntDataOutput.hpp b/LiteLoader/include/llapi/mc/VarIntDataOutput.hpp index 1f3e95fdb5..37b3ecc8d9 100644 --- a/LiteLoader/include/llapi/mc/VarIntDataOutput.hpp +++ b/LiteLoader/include/llapi/mc/VarIntDataOutput.hpp @@ -42,64 +42,68 @@ class VarIntDataOutput { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VarIntDataOutput(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?writeFloat\@VarIntDataOutput\@\@UEAAXM\@Z + * @vftbl 3 + * @symbol ?writeFloat\@VarIntDataOutput\@\@UEAAXM\@Z */ virtual void writeFloat(float); /** - * @vftbl 4 - * @symbol ?writeDouble\@VarIntDataOutput\@\@UEAAXN\@Z + * @vftbl 4 + * @symbol ?writeDouble\@VarIntDataOutput\@\@UEAAXN\@Z */ virtual void writeDouble(double); /** - * @vftbl 5 - * @symbol ?writeByte\@VarIntDataOutput\@\@UEAAXD\@Z + * @vftbl 5 + * @symbol ?writeByte\@VarIntDataOutput\@\@UEAAXD\@Z */ virtual void writeByte(char); /** - * @vftbl 6 - * @symbol ?writeShort\@VarIntDataOutput\@\@UEAAXF\@Z + * @vftbl 6 + * @symbol ?writeShort\@VarIntDataOutput\@\@UEAAXF\@Z */ virtual void writeShort(short); /** - * @vftbl 7 - * @symbol ?writeInt\@VarIntDataOutput\@\@UEAAXH\@Z + * @vftbl 7 + * @symbol ?writeInt\@VarIntDataOutput\@\@UEAAXH\@Z */ virtual void writeInt(int); /** - * @vftbl 8 - * @symbol ?writeLongLong\@VarIntDataOutput\@\@UEAAX_J\@Z + * @vftbl 8 + * @symbol ?writeLongLong\@VarIntDataOutput\@\@UEAAX_J\@Z */ virtual void writeLongLong(__int64); /** - * @vftbl 9 - * @symbol ?writeBytes\@VarIntDataOutput\@\@UEAAXPEBX_K\@Z + * @vftbl 9 + * @symbol ?writeBytes\@VarIntDataOutput\@\@UEAAXPEBX_K\@Z */ virtual void writeBytes(void const *, unsigned __int64); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VARINTDATAOUTPUT /** - * @symbol ?writeLongString\@VarIntDataOutput\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?writeLongString\@VarIntDataOutput\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCVAPI void writeLongString(class gsl::basic_string_span); + MCVAPI void writeLongString(class std::basic_string_view>); /** - * @symbol ?writeString\@VarIntDataOutput\@\@UEAAXV?$basic_string_span\@$$CBD$0?0\@gsl\@\@\@Z + * @symbol ?writeString\@VarIntDataOutput\@\@UEAAXV?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@\@Z */ - MCVAPI void writeString(class gsl::basic_string_span); + MCVAPI void writeString(class std::basic_string_view>); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~VarIntDataOutput(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VariableMaxAutoStepDefinition.hpp b/LiteLoader/include/llapi/mc/VariableMaxAutoStepDefinition.hpp index 9ce8ee0007..ca843e3763 100644 --- a/LiteLoader/include/llapi/mc/VariableMaxAutoStepDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VariableMaxAutoStepDefinition.hpp @@ -29,12 +29,12 @@ class VariableMaxAutoStepDefinition { public: /** - * @symbol ?initialize\@VariableMaxAutoStepDefinition\@\@QEBAXAEAVEntityContext\@\@AEAUVariableMaxAutoStepComponent\@\@\@Z + * @symbol ?initialize\@VariableMaxAutoStepDefinition\@\@QEBAXAEAVEntityContext\@\@AEAUVariableMaxAutoStepComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, struct VariableMaxAutoStepComponent &) const; /** - * @symbol ?buildSchema\@VariableMaxAutoStepDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VVariableMaxAutoStepDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@VariableMaxAutoStepDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VVariableMaxAutoStepDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VariableMaxAutoStepSystem.hpp b/LiteLoader/include/llapi/mc/VariableMaxAutoStepSystem.hpp index 5ff1ebb8ab..59e3d0cff3 100644 --- a/LiteLoader/include/llapi/mc/VariableMaxAutoStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/VariableMaxAutoStepSystem.hpp @@ -28,20 +28,16 @@ class VariableMaxAutoStepSystem { public: /** - * @symbol ?createSystem\@VariableMaxAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@VariableMaxAutoStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_tickEntity\@VariableMaxAutoStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUVariableMaxAutoStepComponent\@\@AEAUMaxAutoStepComponent\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEBVActorMovementProxyComponent\@\@\@Z + * @symbol ?_tickEntity\@VariableMaxAutoStepSystem\@\@CAXAEBVStrictEntityContext\@\@V?$Optional\@$$CBUVehicleComponent\@\@\@\@AEBUVariableMaxAutoStepComponent\@\@AEAUMaxAutoStepComponent\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEBUSynchedActorDataComponent\@\@AEBVActorMovementProxyComponent\@\@\@Z */ - MCAPI static void _tickEntity(class StrictEntityContext const &, struct VariableMaxAutoStepComponent const &, struct MaxAutoStepComponent &, struct AABBShapeComponent const &, struct StateVectorComponent const &, class ActorMovementProxyComponent const &); - /** - * @symbol ?_tickSystem\@VariableMaxAutoStepSystem\@\@CAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@VActorTickNeededComponent\@\@\@\@$$CBUVariableMaxAutoStepComponent\@\@UMaxAutoStepComponent\@\@$$CBUAABBShapeComponent\@\@$$CBUStateVectorComponent\@\@$$CBVActorMovementProxyComponent\@\@\@\@\@Z - */ - MCAPI static void _tickSystem(class ViewT, struct VariableMaxAutoStepComponent const, struct MaxAutoStepComponent, struct AABBShapeComponent const, struct StateVectorComponent const, class ActorMovementProxyComponent const>); + MCAPI static void _tickEntity(class StrictEntityContext const &, class Optional, struct VariableMaxAutoStepComponent const &, struct MaxAutoStepComponent &, struct AABBShapeComponent const &, struct StateVectorComponent const &, struct SynchedActorDataComponent const &, class ActorMovementProxyComponent const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VariantDefinition.hpp b/LiteLoader/include/llapi/mc/VariantDefinition.hpp index cb08faf387..fa19308b8c 100644 --- a/LiteLoader/include/llapi/mc/VariantDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VariantDefinition.hpp @@ -31,7 +31,7 @@ struct VariantDefinition { public: /** - * @symbol ?buildSchema\@VariantDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UVariantDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@VariantDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UVariantDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/VariantParameterList.hpp b/LiteLoader/include/llapi/mc/VariantParameterList.hpp index ba27da9bf0..53a67e5cbd 100644 --- a/LiteLoader/include/llapi/mc/VariantParameterList.hpp +++ b/LiteLoader/include/llapi/mc/VariantParameterList.hpp @@ -29,12 +29,12 @@ class VariantParameterList { public: /** - * @symbol ??0VariantParameterList\@\@QEAA\@XZ + * @symbol ??0VariantParameterList\@\@QEAA\@XZ */ MCAPI VariantParameterList(); /** - * @symbol ?hasParameter\@VariantParameterList\@\@QEBA_NW4FilterSubject\@\@\@Z + * @symbol ?hasParameter\@VariantParameterList\@\@QEBA_NW4FilterSubject\@\@\@Z */ MCAPI bool hasParameter(enum class FilterSubject) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Vec2.hpp b/LiteLoader/include/llapi/mc/Vec2.hpp index cfb255724f..c086f5df35 100644 --- a/LiteLoader/include/llapi/mc/Vec2.hpp +++ b/LiteLoader/include/llapi/mc/Vec2.hpp @@ -9,7 +9,7 @@ class Vec2 { Vec2() = default; Vec2(float a, float b) : x(a), y(b){}; - constexpr float& operator[](size_t index) { + [[nodiscard]] constexpr float& operator[](size_t index) { switch (index) { case 1: return y; @@ -18,7 +18,7 @@ class Vec2 { } } - constexpr float operator[](size_t index) const { + [[nodiscard]] constexpr float operator[](size_t index) const { switch (index) { case 1: return y; diff --git a/LiteLoader/include/llapi/mc/Vec2Component.hpp b/LiteLoader/include/llapi/mc/Vec2Component.hpp index 6a73e4b90f..c9c3d7f70a 100644 --- a/LiteLoader/include/llapi/mc/Vec2Component.hpp +++ b/LiteLoader/include/llapi/mc/Vec2Component.hpp @@ -25,7 +25,7 @@ struct Vec2Component { public: /** - * @symbol ?getDiff\@Vec2Component\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z + * @symbol ?getDiff\@Vec2Component\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z */ MCAPI static class std::optional getDiff(struct Vec2Component const &, struct Vec2Component const &); diff --git a/LiteLoader/include/llapi/mc/Vec3.hpp b/LiteLoader/include/llapi/mc/Vec3.hpp index f258250a5b..f619e9176c 100644 --- a/LiteLoader/include/llapi/mc/Vec3.hpp +++ b/LiteLoader/include/llapi/mc/Vec3.hpp @@ -66,9 +66,9 @@ class Vec3 { MCAPI static class Vec2 rotationFromDirection(class Vec3 const&); - LIAPI BlockPos toBlockPos() const; + [[nodiscard]] LIAPI BlockPos toBlockPos() const; - constexpr float& operator[](size_t index) { + [[nodiscard]] constexpr float& operator[](size_t index) { switch (index) { case 1: return y; @@ -79,7 +79,7 @@ class Vec3 { } } - constexpr float operator[](size_t index) const { + [[nodiscard]] constexpr float operator[](size_t index) const { switch (index) { case 1: return y; @@ -90,7 +90,9 @@ class Vec3 { } } - inline Vec3 cross(const Vec3& b) const { return {y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x}; } + [[nodiscard]] inline Vec3 cross(const Vec3& b) const { + return {y * b.z - z * b.y, z * b.x - x * b.z, x * b.y - y * b.x}; + } FAKE_CRTP(Vec3, float, 3); }; diff --git a/LiteLoader/include/llapi/mc/Vec3Component.hpp b/LiteLoader/include/llapi/mc/Vec3Component.hpp index 798ce91195..6418c96385 100644 --- a/LiteLoader/include/llapi/mc/Vec3Component.hpp +++ b/LiteLoader/include/llapi/mc/Vec3Component.hpp @@ -25,7 +25,7 @@ struct Vec3Component { public: /** - * @symbol ?getDiff\@Vec3Component\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z + * @symbol ?getDiff\@Vec3Component\@\@SA?AV?$optional\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@std\@\@AEBU1\@0\@Z */ MCAPI static class std::optional getDiff(struct Vec3Component const &, struct Vec3Component const &); diff --git a/LiteLoader/include/llapi/mc/VectorBase.hpp b/LiteLoader/include/llapi/mc/VectorBase.hpp index 240a3844b9..7e466d86bf 100644 --- a/LiteLoader/include/llapi/mc/VectorBase.hpp +++ b/LiteLoader/include/llapi/mc/VectorBase.hpp @@ -29,7 +29,7 @@ constexpr void unroll(Fn fn) { // } #define FAKE_CRTP(T, _t_type_, N) \ - inline std::vector getNeighbors() const { \ + [[nodiscard]] inline std::vector getNeighbors() const { \ std::vector res; \ res.clear(); \ unroll([&](size_t iter) { \ @@ -40,20 +40,20 @@ constexpr void unroll(Fn fn) { return res; \ } \ \ - inline std::string toString() const { \ + [[nodiscard]] inline std::string toString() const { \ std::string res("("); \ unroll([&](size_t iter) { res += std::to_string(operator[](iter)) + ", "; }); \ res += std::to_string(operator[](N - 1)) + ')'; \ return res; \ } \ \ - constexpr bool operator==(T const& b) const { \ + [[nodiscard]] constexpr bool operator==(T const& b) const { \ bool res = true; \ unroll([&](size_t iter) { res = res && (b[iter] == operator[](iter)); }); \ return res; \ } \ \ - constexpr bool operator!=(T const& b) const { return !((*this) == b); } \ + [[nodiscard]] constexpr bool operator!=(T const& b) const { return !((*this) == b); } \ \ constexpr T& operator+=(T const& b) { \ unroll([&](size_t iter) { operator[](iter) += b[iter]; }); \ @@ -75,25 +75,25 @@ constexpr void unroll(Fn fn) { return static_cast((*this)); \ } \ \ - inline T operator+(T const& b) const { \ + [[nodiscard]] inline T operator+(T const& b) const { \ T tmp = (*this); \ tmp += b; \ return tmp; \ } \ \ - inline T operator-(T const& b) const { \ + [[nodiscard]] inline T operator-(T const& b) const { \ T tmp = (*this); \ tmp -= b; \ return tmp; \ } \ \ - inline T operator*(T const& b) const { \ + [[nodiscard]] inline T operator*(T const& b) const { \ T tmp = (*this); \ tmp *= b; \ return tmp; \ } \ \ - inline T operator/(T const& b) const { \ + [[nodiscard]] inline T operator/(T const& b) const { \ T tmp = (*this); \ tmp /= b; \ return tmp; \ @@ -119,108 +119,108 @@ constexpr void unroll(Fn fn) { return static_cast((*this)); \ } \ \ - inline T operator+(_t_type_ b) const { \ + [[nodiscard]] inline T operator+(_t_type_ b) const { \ T tmp = (*this); \ tmp += b; \ return tmp; \ } \ \ - inline T operator-(_t_type_ b) const { \ + [[nodiscard]] inline T operator-(_t_type_ b) const { \ T tmp = (*this); \ tmp -= b; \ return tmp; \ } \ \ - inline T operator*(_t_type_ b) const { \ + [[nodiscard]] inline T operator*(_t_type_ b) const { \ T tmp = (*this); \ tmp *= b; \ return tmp; \ } \ \ - inline T operator/(_t_type_ b) const { \ + [[nodiscard]] inline T operator/(_t_type_ b) const { \ T tmp = (*this); \ tmp /= b; \ return tmp; \ } \ \ - inline double dot(T const& b) const { \ + [[nodiscard]] inline double dot(T const& b) const { \ double res = 0.0; \ unroll([&](size_t iter) { res += (double)(operator[](iter)) * b[iter]; }); \ return res; \ } \ \ - inline double lengthSqr() const { return dot((*this)); } \ + [[nodiscard]] inline double lengthSqr() const { return dot((*this)); } \ \ - inline double length() const { return sqrt(static_cast(lengthSqr())); } \ + [[nodiscard]] inline double length() const { return sqrt(static_cast(lengthSqr())); } \ \ - inline double distanceTo(T const& b) const { return ((*this) - b).length(); } \ + [[nodiscard]] inline double distanceTo(T const& b) const { return ((*this) - b).length(); } \ \ - inline double distanceToSqr(T const& b) const { return ((*this) - b).lengthSqr(); } \ + [[nodiscard]] inline double distanceToSqr(T const& b) const { return ((*this) - b).lengthSqr(); } \ \ - inline T normalize() const { return (*this) / static_cast<_t_type_>(length()); } \ + [[nodiscard]] inline T normalize() const { return (*this) / static_cast<_t_type_>(length()); } \ \ - inline T add(T const& b) const { return (*this) + b; } \ + [[nodiscard]] inline T add(T const& b) const { return (*this) + b; } \ \ - inline T sub(T const& b) const { return (*this) - b; } \ + [[nodiscard]] inline T sub(T const& b) const { return (*this) - b; } \ \ - inline T mul(T const& b) const { return (*this) * b; } \ + [[nodiscard]] inline T mul(T const& b) const { return (*this) * b; } \ \ - inline T div(T const& b) const { return (*this) / b; } \ + [[nodiscard]] inline T div(T const& b) const { return (*this) / b; } \ \ template \ - inline T add(_t_type_ first, Args... args) const { \ + [[nodiscard]] inline T add(_t_type_ first, Args... args) const { \ static_assert(sizeof...(args) <= N - 1, "too many arguments!"); \ T tmp = (*this); \ - const std::array<_t_type_> vec = {first, args...}; \ + const std::array<_t_type_, sizeof...(args) + 1> vec = {first, args...}; \ unroll([&](size_t iter) { tmp[iter] += vec[iter]; }); \ return tmp; \ } \ template \ - inline T sub(_t_type_ first, Args... args) const { \ + [[nodiscard]] inline T sub(_t_type_ first, Args... args) const { \ static_assert(sizeof...(args) <= N - 1, "too many arguments!"); \ T tmp = (*this); \ - const std::array<_t_type_> vec = {first, args...}; \ + const std::array<_t_type_, sizeof...(args) + 1> vec = {first, args...}; \ unroll([&](size_t iter) { tmp[iter] -= vec[iter]; }); \ return tmp; \ } \ template \ - inline T mul(_t_type_ first, Args... args) const { \ + [[nodiscard]] inline T mul(_t_type_ first, Args... args) const { \ static_assert(sizeof...(args) <= N - 1, "too many arguments!"); \ T tmp = (*this); \ - const std::array<_t_type_> vec = {first, args...}; \ + const std::array<_t_type_, sizeof...(args) + 1> vec = {first, args...}; \ unroll([&](size_t iter) { tmp[iter] *= vec[iter]; }); \ return tmp; \ } \ template \ - inline T div(_t_type_ first, Args... args) const { \ + [[nodiscard]] inline T div(_t_type_ first, Args... args) const { \ static_assert(sizeof...(args) <= N - 1, "too many arguments!"); \ T tmp = (*this); \ - const std::array<_t_type_> vec = {first, args...}; \ + const std::array<_t_type_, sizeof...(args) + 1> vec = {first, args...}; \ unroll([&](size_t iter) { tmp[iter] /= vec[iter]; }); \ return tmp; \ } \ \ - inline static T min(T const& a, T const& b) { \ + [[nodiscard]] inline static T min(T const& a, T const& b) { \ T tmp; \ unroll([&](size_t iter) { tmp[iter] = std::min<_t_type_>(a[iter], b[iter]); }); \ return tmp; \ } \ \ - inline static T max(T const& a, T const& b) { \ + [[nodiscard]] inline static T max(T const& a, T const& b) { \ T tmp; \ unroll([&](size_t iter) { tmp[iter] = std::max<_t_type_>(a[iter], b[iter]); }); \ return tmp; \ } \ \ - inline bool operator<(const T& b) const { return lengthSqr() < b.lengthSqr(); } \ + [[nodiscard]] inline bool operator<(const T& b) const { return lengthSqr() < b.lengthSqr(); } \ \ - inline bool operator>(const T& b) const { return lengthSqr() > b.lengthSqr(); } \ + [[nodiscard]] inline bool operator>(const T& b) const { return lengthSqr() > b.lengthSqr(); } \ \ - inline std::size_t hash() const { \ + [[nodiscard]] inline std::size_t hash() const { \ std::size_t res = 0; \ unroll( \ [&](size_t iter) { res ^= std::hash<_t_type_>()(operator[](iter)) + (res << 3) + (res >> 7) - res; }); \ return res; \ } \ \ - constexpr size_t size() const { return N; } + [[nodiscard]] constexpr size_t size() const { return N; } diff --git a/LiteLoader/include/llapi/mc/VegetationPatchFeature.hpp b/LiteLoader/include/llapi/mc/VegetationPatchFeature.hpp index d6d803d8f5..399e97670c 100644 --- a/LiteLoader/include/llapi/mc/VegetationPatchFeature.hpp +++ b/LiteLoader/include/llapi/mc/VegetationPatchFeature.hpp @@ -30,26 +30,26 @@ class VegetationPatchFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VegetationPatchFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@VegetationPatchFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@VegetationPatchFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; //private: /** - * @symbol ?_isExposedDirection\@VegetationPatchFeature\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_isExposedDirection\@VegetationPatchFeature\@\@AEBA_NAEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@E\@Z */ MCAPI bool _isExposedDirection(class IBlockWorldGenAPI &, class BlockPos const &, unsigned char) const; /** - * @symbol ?_placeGroundPatch\@VegetationPatchFeature\@\@AEBA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ?_placeGroundPatch\@VegetationPatchFeature\@\@AEBA?AV?$vector\@VBlockPos\@\@V?$allocator\@VBlockPos\@\@\@std\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEAVRandom\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI std::vector _placeGroundPatch(class IBlockWorldGenAPI &, class Random &, class BlockPos const &, int, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp index 1939bce5f2..d780b8297a 100644 --- a/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleClientPositionPassengerSystem.hpp @@ -28,16 +28,20 @@ class VehicleClientPositionPassengerSystem { public: /** - * @symbol ?createSetPositionRequestSystem\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?_setRotationLockSystem\@VehicleClientPositionPassengerSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UMobFlag\@\@\@\@\@\@$$CBUSynchedActorDataComponent\@\@$$CBUActorHeadRotationComponent\@\@UMobBodyRotationComponent\@\@UPassengerYRotLimitComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBURenderRotationComponent\@\@\@\@V?$OptionalGlobalT\@UPassengersToPositionComponent\@\@VEntityRegistryBase\@\@\@\@\@Z + */ + MCAPI static void _setRotationLockSystem(class ViewT>, struct SynchedActorDataComponent const, struct ActorHeadRotationComponent const, struct MobBodyRotationComponent, struct PassengerYRotLimitComponent>, class ViewT, class OptionalGlobalT); + /** + * @symbol ?createSetPositionRequestSystem\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSetPositionRequestSystem(); /** - * @symbol ?createSetPreviousPosRotSystem\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSetPreviousPosRotSystem\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSetPreviousPosRotSystem(); /** - * @symbol ?createSetRotationLock\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSetRotationLock\@VehicleClientPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSetRotationLock(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VehicleComponent.hpp b/LiteLoader/include/llapi/mc/VehicleComponent.hpp index 03e244db70..6f4cf3033f 100644 --- a/LiteLoader/include/llapi/mc/VehicleComponent.hpp +++ b/LiteLoader/include/llapi/mc/VehicleComponent.hpp @@ -27,11 +27,11 @@ struct VehicleComponent { public: /** - * @symbol ??0VehicleComponent\@\@QEAA\@AEBU0\@\@Z + * @symbol ??0VehicleComponent\@\@QEAA\@AEBU0\@\@Z */ MCAPI VehicleComponent(struct VehicleComponent const &); /** - * @symbol ??1VehicleComponent\@\@QEAA\@XZ + * @symbol ??1VehicleComponent\@\@QEAA\@XZ */ MCAPI ~VehicleComponent(); diff --git a/LiteLoader/include/llapi/mc/VehicleInputSwitchRequestSystem.hpp b/LiteLoader/include/llapi/mc/VehicleInputSwitchRequestSystem.hpp index 23ee2f86af..3f288b2969 100644 --- a/LiteLoader/include/llapi/mc/VehicleInputSwitchRequestSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleInputSwitchRequestSystem.hpp @@ -28,8 +28,8 @@ class VehicleInputSwitchRequestSystem { public: /** - * @symbol ?createSystem\@VehicleInputSwitchRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@VehicleInputSwitchRequestSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VehicleRenderingRidingOffsetComponent.hpp b/LiteLoader/include/llapi/mc/VehicleRenderingRidingOffsetComponent.hpp index f0a2350690..1a94fdb798 100644 --- a/LiteLoader/include/llapi/mc/VehicleRenderingRidingOffsetComponent.hpp +++ b/LiteLoader/include/llapi/mc/VehicleRenderingRidingOffsetComponent.hpp @@ -25,7 +25,7 @@ struct VehicleRenderingRidingOffsetComponent { public: /** - * @symbol ??0VehicleRenderingRidingOffsetComponent\@\@QEAA\@AEBV?$vector\@URenderingRidingOffsetInfo\@\@V?$allocator\@URenderingRidingOffsetInfo\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0VehicleRenderingRidingOffsetComponent\@\@QEAA\@AEBV?$vector\@URenderingRidingOffsetInfo\@\@V?$allocator\@URenderingRidingOffsetInfo\@\@\@std\@\@\@std\@\@\@Z */ MCAPI VehicleRenderingRidingOffsetComponent(std::vector const &); diff --git a/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp index d4fa3b311d..9f7b8525d9 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerMolangSeatPositionSystem.hpp @@ -28,12 +28,12 @@ class VehicleServerMolangSeatPositionSystem { public: /** - * @symbol ?_tickActor\@VehicleServerMolangSeatPositionSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAVActorOwnerComponent\@\@AEAUPositionPassengerRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRideableComponent\@\@$$CBUVehicleComponent\@\@\@\@\@Z + * @symbol ?_tickActor\@VehicleServerMolangSeatPositionSystem\@\@SAXAEAVStrictEntityContext\@\@AEBUPassengerComponent\@\@AEAVActorOwnerComponent\@\@AEAUPositionPassengerRequestComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBVRideableComponent\@\@$$CBUVehicleComponent\@\@\@\@\@Z */ MCAPI static void _tickActor(class StrictEntityContext &, struct PassengerComponent const &, class ActorOwnerComponent &, struct PositionPassengerRequestComponent &, class ViewT); /** - * @symbol ?createSystem\@VehicleServerMolangSeatPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@VehicleServerMolangSeatPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp index e61a00e129..3f682eaef9 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerPositionPassengerSystem.hpp @@ -28,8 +28,8 @@ class VehicleServerPositionPassengerSystem { public: /** - * @symbol ?createSystem\@VehicleServerPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@VehicleServerPositionPassengerSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp b/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp index cbb8415e7e..0f64b0cca3 100644 --- a/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VehicleServerSeatPositionSystem.hpp @@ -28,8 +28,16 @@ class VehicleServerSeatPositionSystem { public: /** - * @symbol ?createSystem\@VehicleServerSeatPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@VehicleServerSeatPositionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); -}; \ No newline at end of file +//private: + /** + * @symbol ?_getRidingHeight\@VehicleServerSeatPositionSystem\@\@CAMAEBVStrictEntityContext\@\@AEBUOffsetsComponent\@\@AEBUSynchedActorDataComponent\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBURidingHeightComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAdultRidingHeightOffsetComponent\@\@\@\@\@Z + */ + MCAPI static float _getRidingHeight(class StrictEntityContext const &, struct OffsetsComponent const &, struct SynchedActorDataComponent const &, class ViewT, class ViewT); + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/VehicleUtils.hpp b/LiteLoader/include/llapi/mc/VehicleUtils.hpp index 9e037680f4..80c947ce0b 100644 --- a/LiteLoader/include/llapi/mc/VehicleUtils.hpp +++ b/LiteLoader/include/llapi/mc/VehicleUtils.hpp @@ -36,36 +36,36 @@ struct VehicleDirections { public: /** - * @symbol ?calculateBlockFloorHeight\@VehicleUtils\@\@SA?AV?$optional\@M\@std\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?calculateBlockFloorHeight\@VehicleUtils\@\@SA?AV?$optional\@M\@std\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static class std::optional calculateBlockFloorHeight(class IConstBlockSource const &, class BlockPos const &); /** - * @symbol ?calculateVehicleDirections\@VehicleUtils\@\@SA?AUVehicleDirections\@1\@AEBVVec3\@\@0\@Z + * @symbol ?calculateVehicleDirections\@VehicleUtils\@\@SA?AUVehicleDirections\@1\@AEBVVec3\@\@0\@Z */ MCAPI static struct VehicleUtils::VehicleDirections calculateVehicleDirections(class Vec3 const &, class Vec3 const &); /** - * @symbol ?getActivatorRailExitPatternStrategy\@VehicleUtils\@\@SAP6A?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@ZAEBVBaseGameVersion\@\@\@Z + * @symbol ?getActivatorRailExitPatternStrategy\@VehicleUtils\@\@SAP6A?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@ZAEBVBaseGameVersion\@\@\@Z */ //MCAPI static class std::optional ( *)(struct VehicleUtils::VehicleDirections const &, class std::function) getActivatorRailExitPatternStrategy(class BaseGameVersion const &); /** - * @symbol ?getActorExitPatternStrategy\@VehicleUtils\@\@SAP6A?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@ZAEBVBaseGameVersion\@\@\@Z + * @symbol ?getActorExitPatternStrategy\@VehicleUtils\@\@SAP6A?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@ZAEBVBaseGameVersion\@\@\@Z */ //MCAPI static class std::optional ( *)(struct VehicleUtils::VehicleDirections const &, class std::function) getActorExitPatternStrategy(class BaseGameVersion const &); /** - * @symbol ?ignoredExitCollisionBlock\@VehicleUtils\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?ignoredExitCollisionBlock\@VehicleUtils\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool ignoredExitCollisionBlock(class Block const &); /** - * @symbol ?testPosFollowingEjectPattern\@VehicleUtils\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z + * @symbol ?testPosFollowingEjectPattern\@VehicleUtils\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z */ MCAPI static class std::optional testPosFollowingEjectPattern(struct VehicleUtils::VehicleDirections const &, class std::function); /** - * @symbol ?testPosFollowingLegacyActivatorRailPattern\@VehicleUtils\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z + * @symbol ?testPosFollowingLegacyActivatorRailPattern\@VehicleUtils\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z */ MCAPI static class std::optional testPosFollowingLegacyActivatorRailPattern(struct VehicleUtils::VehicleDirections const &, class std::function); /** - * @symbol ?testPosFollowingLegacyActorPattern\@VehicleUtils\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z + * @symbol ?testPosFollowingLegacyActorPattern\@VehicleUtils\@\@SA?AV?$optional\@VVec3\@\@\@std\@\@AEBUVehicleDirections\@1\@V?$function\@$$A6A_NAEBVVec3\@\@0\@Z\@3\@\@Z */ MCAPI static class std::optional testPosFollowingLegacyActorPattern(struct VehicleUtils::VehicleDirections const &, class std::function); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp b/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp index 234d5be1bb..deda37d824 100644 --- a/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp +++ b/LiteLoader/include/llapi/mc/VerticalCollisionSystem.hpp @@ -28,36 +28,36 @@ class VerticalCollisionSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VerticalCollisionSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?tick\@VerticalCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z + * @vftbl 3 + * @symbol ?tick\@VerticalCollisionSystem\@\@EEAAXAEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@\@Z */ virtual void tick(class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &); /** - * @symbol ?create\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?create\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo create(); /** - * @symbol ?createSideBySide\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSideBySide\@VerticalCollisionSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSideBySide(); /** - * @symbol ?tickVerticalCollisionSystem\@VerticalCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAUWalkDistComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z + * @symbol ?tickVerticalCollisionSystem\@VerticalCollisionSystem\@\@SAXAEBVStrictEntityContext\@\@AEBUMoveRequestComponent\@\@AEBUAABBShapeComponent\@\@AEBUStateVectorComponent\@\@AEAUWalkDistComponent\@\@AEAV?$StrictExecutionContext\@U?$Filter\@V?$FlagComponent\@UMinecartFlag\@\@\@\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@V?$FlagComponent\@UVerticalCollisionFlag\@\@\@\@\@\@U?$Read\@USynchedActorDataComponent\@\@UMoveRequestComponent\@\@UAABBShapeComponent\@\@UDimensionTypeComponent\@\@UStateVectorComponent\@\@\@\@U?$Write\@UStateVectorComponent\@\@UWalkDistComponent\@\@USideBySidePlaybackBlocksComponent\@\@\@\@U?$AddRemove\@UBounceComponent\@\@\@\@U?$GlobalRead\@ULocalConstBlockSourceFactoryComponent\@\@\@\@U?$GlobalWrite\@$$V\@\@U?$EntityFactoryT\@$$V\@\@\@\@AEBVIConstBlockSource\@\@\@Z */ MCAPI static void tickVerticalCollisionSystem(class StrictEntityContext const &, struct MoveRequestComponent const &, struct AABBShapeComponent const &, struct StateVectorComponent const &, struct WalkDistComponent &, class StrictExecutionContext, class FlagComponent, class FlagComponent>, struct Read, struct Write, struct AddRemove, struct GlobalRead, struct GlobalWrite<>, struct EntityFactoryT<>> &, class IConstBlockSource const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Vex.hpp b/LiteLoader/include/llapi/mc/Vex.hpp index 646f516d66..d593a4aabc 100644 --- a/LiteLoader/include/llapi/mc/Vex.hpp +++ b/LiteLoader/include/llapi/mc/Vex.hpp @@ -32,168 +32,163 @@ class Vex : public Monster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Vex\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Vex\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 12 - * @symbol ?initializeComponents\@Vex\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@Vex\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Vex(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 59 - * @symbol ?isInWall\@Vex\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?isInWall\@Vex\@\@UEBA_NXZ */ virtual bool isInWall() const; /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@Vex\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@Vex\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@Vex\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@Vex\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 290 - * @symbol ?applyFinalFriction\@Vex\@\@UEAAXM_N\@Z + * @vftbl 287 + * @symbol ?applyFinalFriction\@Vex\@\@UEAAXM_N\@Z */ virtual void applyFinalFriction(float, bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Vex\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Vex\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Vex(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp b/LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp index 6e9928030d..dcc1b062c2 100644 --- a/LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp +++ b/LiteLoader/include/llapi/mc/VexCopyOwnerTargetGoal.hpp @@ -31,38 +31,38 @@ class VexCopyOwnerTargetGoal : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VexCopyOwnerTargetGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@VexCopyOwnerTargetGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@VexCopyOwnerTargetGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 4 - * @symbol ?start\@VexCopyOwnerTargetGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@VexCopyOwnerTargetGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@VexCopyOwnerTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@VexCopyOwnerTargetGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0VexCopyOwnerTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0VexCopyOwnerTargetGoal\@\@QEAA\@AEAVMob\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI VexCopyOwnerTargetGoal(class Mob &, std::vector const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp b/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp index f74af47bdd..41246e5b9b 100644 --- a/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp +++ b/LiteLoader/include/llapi/mc/VexRandomMoveGoal.hpp @@ -30,48 +30,48 @@ class VexRandomMoveGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VexRandomMoveGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@VexRandomMoveGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@VexRandomMoveGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@VexRandomMoveGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@VexRandomMoveGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol __unk_vfn_5 + * @vftbl 5 + * @symbol __unk_vfn_5 */ virtual void __unk_vfn_5(); /** - * @vftbl 6 - * @symbol ?tick\@VexRandomMoveGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@VexRandomMoveGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@VexRandomMoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@VexRandomMoveGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0VexRandomMoveGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0VexRandomMoveGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI VexRandomMoveGoal(class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationDamperDefinition.hpp b/LiteLoader/include/llapi/mc/VibrationDamperDefinition.hpp index eb4d7ff21c..4cc39ff6d1 100644 --- a/LiteLoader/include/llapi/mc/VibrationDamperDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VibrationDamperDefinition.hpp @@ -29,7 +29,7 @@ struct VibrationDamperDefinition { public: /** - * @symbol ?buildSchema\@VibrationDamperDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UVibrationDamperDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@VibrationDamperDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UVibrationDamperDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/VibrationDataComponent.hpp b/LiteLoader/include/llapi/mc/VibrationDataComponent.hpp index 7bd2464de4..a3e0b3eca4 100644 --- a/LiteLoader/include/llapi/mc/VibrationDataComponent.hpp +++ b/LiteLoader/include/llapi/mc/VibrationDataComponent.hpp @@ -28,20 +28,20 @@ class VibrationDataComponent { public: /** - * @symbol ?clearLastVibrationPos\@VibrationDataComponent\@\@QEAAXXZ + * @symbol ?clearLastVibrationPos\@VibrationDataComponent\@\@QEAAXXZ */ MCAPI void clearLastVibrationPos(); /** - * @symbol ?getLastVibrationPos\@VibrationDataComponent\@\@QEBAAEBV?$optional\@VBlockPos\@\@\@std\@\@XZ + * @symbol ?getLastVibrationPos\@VibrationDataComponent\@\@QEBAAEBV?$optional\@VBlockPos\@\@\@std\@\@XZ */ MCAPI class std::optional const & getLastVibrationPos() const; /** - * @symbol ?getTicksSinceLastVibration\@VibrationDataComponent\@\@QEBA?AV?$optional\@_K\@std\@\@AEBVILevel\@\@\@Z + * @symbol ?getTicksSinceLastVibration\@VibrationDataComponent\@\@QEBA?AV?$optional\@_K\@std\@\@AEBVILevel\@\@\@Z */ MCAPI class std::optional getTicksSinceLastVibration(class ILevel const &) const; /** - * @symbol ?setLastVibrationPos\@VibrationDataComponent\@\@QEAAXVBlockPos\@\@UTick\@\@\@Z + * @symbol ?setLastVibrationPos\@VibrationDataComponent\@\@QEAAXVBlockPos\@\@UTick\@\@\@Z */ MCAPI void setLastVibrationPos(class BlockPos, struct Tick); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationInfo.hpp b/LiteLoader/include/llapi/mc/VibrationInfo.hpp index d755e7bad2..f31c454c7f 100644 --- a/LiteLoader/include/llapi/mc/VibrationInfo.hpp +++ b/LiteLoader/include/llapi/mc/VibrationInfo.hpp @@ -28,28 +28,28 @@ class VibrationInfo { public: /** - * @symbol ??0VibrationInfo\@\@QEAA\@AEBVGameEvent\@\@AEBUGameEventContext\@\@M\@Z + * @symbol ??0VibrationInfo\@\@QEAA\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ - MCAPI VibrationInfo(class GameEvent const &, struct GameEventContext const &, float); + MCAPI VibrationInfo(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ??0VibrationInfo\@\@QEAA\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ??0VibrationInfo\@\@QEAA\@AEBVGameEvent\@\@AEBUGameEventContext\@\@M\@Z */ - MCAPI VibrationInfo(class CompoundTag const &, class DataLoadHelper &); + MCAPI VibrationInfo(class GameEvent const &, struct GameEventContext const &, float); /** - * @symbol ?getProjectileOwner\@VibrationInfo\@\@QEBAPEAVActor\@\@AEAVLevel\@\@\@Z + * @symbol ?getProjectileOwner\@VibrationInfo\@\@QEBAPEAVActor\@\@AEAVLevel\@\@\@Z */ MCAPI class Actor * getProjectileOwner(class Level &) const; /** - * @symbol ?getSource\@VibrationInfo\@\@QEBAPEAVActor\@\@AEAVLevel\@\@\@Z + * @symbol ?getSource\@VibrationInfo\@\@QEBAPEAVActor\@\@AEAVLevel\@\@\@Z */ MCAPI class Actor * getSource(class Level &) const; /** - * @symbol ?load\@VibrationInfo\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@VibrationInfo\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?save\@VibrationInfo\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@VibrationInfo\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationListener.hpp b/LiteLoader/include/llapi/mc/VibrationListener.hpp index cc14d2e65f..d7def5358a 100644 --- a/LiteLoader/include/llapi/mc/VibrationListener.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListener.hpp @@ -30,60 +30,64 @@ class VibrationListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VibrationListener(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?handleGameEvent\@VibrationListener\@\@UEAAXAEBVGameEvent\@\@AEBUGameEventContext\@\@AEAVBlockSource\@\@\@Z + * @vftbl 1 + * @symbol ?handleGameEvent\@VibrationListener\@\@UEAAXAEBVGameEvent\@\@AEBUGameEventContext\@\@AEAVBlockSource\@\@\@Z */ virtual void handleGameEvent(class GameEvent const &, struct GameEventContext const &, class BlockSource &); /** - * @vftbl 2 - * @symbol ?getPositionSource\@VibrationListener\@\@UEBAAEBVPositionSource\@GameEvents\@\@XZ + * @vftbl 2 + * @symbol ?getPositionSource\@VibrationListener\@\@UEBAAEBVPositionSource\@GameEvents\@\@XZ */ virtual class GameEvents::PositionSource const & getPositionSource() const; /** - * @vftbl 3 - * @symbol ?getRange\@VibrationListener\@\@UEBAIXZ + * @vftbl 3 + * @symbol ?getRange\@VibrationListener\@\@UEBAIXZ */ virtual unsigned int getRange() const; /** - * @symbol ??0VibrationListener\@\@QEAA\@$$QEAV?$unique_ptr\@VVibrationListenerConfig\@\@U?$default_delete\@VVibrationListenerConfig\@\@\@std\@\@\@std\@\@VPositionSource\@GameEvents\@\@IW4OwnerType\@0\@\@Z + * @symbol ??0VibrationListener\@\@QEAA\@$$QEAV?$unique_ptr\@VVibrationListenerConfig\@\@U?$default_delete\@VVibrationListenerConfig\@\@\@std\@\@\@std\@\@VPositionSource\@GameEvents\@\@IW4OwnerType\@0\@\@Z */ MCAPI VibrationListener(std::unique_ptr &&, class GameEvents::PositionSource, unsigned int, enum class VibrationListener::OwnerType); /** - * @symbol ?getLatestReceivedVibration\@VibrationListener\@\@QEBAAEBVGameEvent\@\@XZ + * @symbol ?getLatestReceivedVibration\@VibrationListener\@\@QEBAAEBVGameEvent\@\@XZ */ MCAPI class GameEvent const & getLatestReceivedVibration() const; /** - * @symbol ?load\@VibrationListener\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@VibrationListener\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?save\@VibrationListener\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@VibrationListener\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; /** - * @symbol ?tick\@VibrationListener\@\@QEAAXAEAVBlockSource\@\@\@Z + * @symbol ?tick\@VibrationListener\@\@QEAAXAEAVBlockSource\@\@\@Z */ MCAPI void tick(class BlockSource &); //private: /** - * @symbol ?_requestVibrationParticle\@VibrationListener\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@M\@Z + * @symbol ?_requestVibrationParticle\@VibrationListener\@\@AEAAXAEAVBlockSource\@\@AEBVBlockPos\@\@M\@Z */ MCAPI void _requestVibrationParticle(class BlockSource &, class BlockPos const &, float); /** - * @symbol ?_isVibrationOccluded\@VibrationListener\@\@CA_NAEAVBlockSource\@\@AEBVVec3\@\@1\@Z + * @symbol ?_trySendSneakCloseToSculkSensorEventPacket\@VibrationListener\@\@AEAAXAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@AEBVVec3\@\@\@Z + */ + MCAPI void _trySendSneakCloseToSculkSensorEventPacket(class BlockSource &, class GameEvent const &, struct GameEventContext const &, class Vec3 const &); + /** + * @symbol ?_isVibrationOccluded\@VibrationListener\@\@CA_NAEAVBlockSource\@\@AEBVVec3\@\@1\@Z */ MCAPI static bool _isVibrationOccluded(class BlockSource &, class Vec3 const &, class Vec3 const &); /** - * @symbol ?_shouldIgnoreVibration\@VibrationListener\@\@CA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + * @symbol ?_shouldIgnoreVibration\@VibrationListener\@\@CA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ MCAPI static bool _shouldIgnoreVibration(class BlockSource &, class GameEvent const &, struct GameEventContext const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp b/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp index 05a03796cd..1c3419755c 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerComponent.hpp @@ -28,8 +28,16 @@ class VibrationListenerComponent { public: /** - * @symbol ??1VibrationListenerComponent\@\@QEAA\@XZ + * @symbol ?addAdditionalSaveData\@VibrationListenerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + */ + MCAPI void addAdditionalSaveData(class CompoundTag &) const; + /** + * @symbol ?readAdditionalSaveData\@VibrationListenerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + */ + MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); + /** + * @symbol ??1VibrationListenerComponent\@\@QEAA\@XZ */ MCAPI ~VibrationListenerComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp b/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp index 1862ced108..dd982efa74 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerConfig.hpp @@ -10,28 +10,11 @@ #undef BEFORE_EXTRA -/** - * @brief MC class VibrationListenerConfig. - * - */ -class VibrationListenerConfig { + +namespace VibrationListenerConfig { #define AFTER_EXTRA #undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_VIBRATIONLISTENERCONFIG -public: - class VibrationListenerConfig& operator=(class VibrationListenerConfig const &) = delete; - VibrationListenerConfig(class VibrationListenerConfig const &) = delete; - VibrationListenerConfig() = delete; -#endif - -public: -#ifdef ENABLE_VIRTUAL_FAKESYMBOL_VIBRATIONLISTENERCONFIG - /** - * @symbol ?isValidVibration\@VibrationListenerConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z - */ - MCVAPI bool isValidVibration(class GameEvent const &); -#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/VibrationListenerDefinition.hpp b/LiteLoader/include/llapi/mc/VibrationListenerDefinition.hpp index 65bd076285..a68ebb2370 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerDefinition.hpp @@ -29,12 +29,12 @@ class VibrationListenerDefinition { public: /** - * @symbol ?initialize\@VibrationListenerDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@VibrationListenerDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@VibrationListenerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VVibrationListenerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@VibrationListenerDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VVibrationListenerDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationListenerSystem.hpp b/LiteLoader/include/llapi/mc/VibrationListenerSystem.hpp index fa66d07c51..ca1e0fe210 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerSystem.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerSystem.hpp @@ -28,19 +28,19 @@ class VibrationListenerSystem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VibrationListenerSystem(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?tick\@VibrationListenerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@VibrationListenerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ virtual void tick(class EntityRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VibrationListenerSystemInternal.hpp b/LiteLoader/include/llapi/mc/VibrationListenerSystemInternal.hpp index 1492941c2c..01d5e80dc7 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerSystemInternal.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerSystemInternal.hpp @@ -20,7 +20,7 @@ namespace VibrationListenerSystemInternal { #undef AFTER_EXTRA /** - * @symbol ?tickComponent\@VibrationListenerSystemInternal\@\@YAXAEAVActorOwnerComponent\@\@AEAVVibrationListenerComponent\@\@\@Z + * @symbol ?tickComponent\@VibrationListenerSystemInternal\@\@YAXAEAVActorOwnerComponent\@\@AEAVVibrationListenerComponent\@\@\@Z */ MCAPI void tickComponent(class ActorOwnerComponent &, class VibrationListenerComponent &); diff --git a/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp b/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp index f6128cbd29..ed3e9757fb 100644 --- a/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp +++ b/LiteLoader/include/llapi/mc/VibrationListenerUtils.hpp @@ -20,11 +20,11 @@ namespace VibrationListenerUtils { #undef AFTER_EXTRA /** - * @symbol ?getGameEventFrequency\@VibrationListenerUtils\@\@YAHAEBVGameEvent\@\@\@Z + * @symbol ?getGameEventFrequency\@VibrationListenerUtils\@\@YAHAEBVGameEvent\@\@\@Z */ MCAPI int getGameEventFrequency(class GameEvent const &); /** - * @symbol ?ignoreVibrationIfSneaking\@VibrationListenerUtils\@\@YA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + * @symbol ?ignoreVibrationIfSneaking\@VibrationListenerUtils\@\@YA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ MCAPI bool ignoreVibrationIfSneaking(class BlockSource &, class GameEvent const &, struct GameEventContext const &); diff --git a/LiteLoader/include/llapi/mc/VibrationSelector.hpp b/LiteLoader/include/llapi/mc/VibrationSelector.hpp index 403f1526af..12475dfb19 100644 --- a/LiteLoader/include/llapi/mc/VibrationSelector.hpp +++ b/LiteLoader/include/llapi/mc/VibrationSelector.hpp @@ -27,24 +27,24 @@ class VibrationSelector { public: /** - * @symbol ??0VibrationSelector\@\@QEAA\@XZ + * @symbol ??0VibrationSelector\@\@QEAA\@XZ */ MCAPI VibrationSelector(); /** - * @symbol ?addCandidate\@VibrationSelector\@\@QEAAXUTick\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@AEBVBlockPos\@\@\@Z + * @symbol ?addCandidate\@VibrationSelector\@\@QEAAXUTick\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@AEBVBlockPos\@\@\@Z */ MCAPI void addCandidate(struct Tick, class GameEvent const &, struct GameEventContext const &, class BlockPos const &); /** - * @symbol ?consumeBestCandidate\@VibrationSelector\@\@QEAA?AV?$optional\@VVibrationInfo\@\@\@std\@\@UTick\@\@\@Z + * @symbol ?consumeBestCandidate\@VibrationSelector\@\@QEAA?AV?$optional\@VVibrationInfo\@\@\@std\@\@UTick\@\@\@Z */ MCAPI class std::optional consumeBestCandidate(struct Tick); /** - * @symbol ?load\@VibrationSelector\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?load\@VibrationSelector\@\@QEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void load(class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?save\@VibrationSelector\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?save\@VibrationSelector\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void save(class CompoundTag &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Village.hpp b/LiteLoader/include/llapi/mc/Village.hpp index 8c9521346f..b0209de896 100644 --- a/LiteLoader/include/llapi/mc/Village.hpp +++ b/LiteLoader/include/llapi/mc/Village.hpp @@ -36,456 +36,456 @@ struct DwellerData { public: /** - * @symbol ??0Village\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBVBlockPos\@\@\@Z + * @symbol ??0Village\@\@QEAA\@AEAVDimension\@\@VUUID\@mce\@\@AEBVBlockPos\@\@\@Z */ MCAPI Village(class Dimension &, class mce::UUID, class BlockPos const &); /** - * @symbol ?addActorToVillage\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?addActorToVillage\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void addActorToVillage(enum class DwellerRole, struct ActorUniqueID const &); /** - * @symbol ?addAggressor\@Village\@\@QEAAXAEBVMob\@\@\@Z + * @symbol ?addAggressor\@Village\@\@QEAAXAEBVMob\@\@\@Z */ MCAPI void addAggressor(class Mob const &); /** - * @symbol ?addPOI\@Village\@\@QEAA_NV?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z + * @symbol ?addPOI\@Village\@\@QEAA_NV?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI bool addPOI(class std::weak_ptr); /** - * @symbol ?addVillager\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?addVillager\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void addVillager(struct ActorUniqueID const &); /** - * @symbol ?alwaysTickRaid\@Village\@\@QEBA_NXZ + * @symbol ?alwaysTickRaid\@Village\@\@QEBA_NXZ */ MCAPI bool alwaysTickRaid() const; /** - * @symbol ?canRemove\@Village\@\@QEBA_NXZ + * @symbol ?canRemove\@Village\@\@QEBA_NXZ */ MCAPI bool canRemove() const; /** - * @symbol ?checkNeedMoreVillagers\@Village\@\@QEBA_NXZ + * @symbol ?checkNeedMoreVillagers\@Village\@\@QEBA_NXZ */ MCAPI bool checkNeedMoreVillagers() const; /** - * @symbol ?clearOwnedPOIs\@Village\@\@QEAAXXZ + * @symbol ?clearOwnedPOIs\@Village\@\@QEAAXXZ */ MCAPI void clearOwnedPOIs(); /** - * @symbol ?debugDraw\@Village\@\@QEAAXXZ + * @symbol ?debugDraw\@Village\@\@QEAAXXZ */ MCAPI void debugDraw(); /** - * @symbol ?fetchOwnedPOI\@Village\@\@QEAA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@AEBUActorUniqueID\@\@W4POIType\@\@\@Z + * @symbol ?fetchOwnedPOI\@Village\@\@QEAA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@AEBUActorUniqueID\@\@W4POIType\@\@\@Z */ MCAPI class std::weak_ptr fetchOwnedPOI(struct ActorUniqueID const &, enum class POIType); /** - * @symbol ?fireSoundTheAlarm\@Village\@\@QEAAXXZ + * @symbol ?fireSoundTheAlarm\@Village\@\@QEAAXXZ */ MCAPI void fireSoundTheAlarm(); /** - * @symbol ?getApproximateRadius\@Village\@\@QEBAMXZ + * @symbol ?getApproximateRadius\@Village\@\@QEBAMXZ */ MCAPI float getApproximateRadius() const; /** - * @symbol ?getBedPOICount\@Village\@\@QEBA_KXZ + * @symbol ?getBedPOICount\@Village\@\@QEBA_KXZ */ MCAPI unsigned __int64 getBedPOICount() const; /** - * @symbol ?getBounds\@Village\@\@QEBAAEBVAABB\@\@XZ + * @symbol ?getBounds\@Village\@\@QEBAAEBVAABB\@\@XZ */ MCAPI class AABB const & getBounds() const; /** - * @symbol ?getCenter\@Village\@\@QEBA?AVVec3\@\@XZ + * @symbol ?getCenter\@Village\@\@QEBA?AVVec3\@\@XZ */ MCAPI class Vec3 getCenter() const; /** - * @symbol ?getClosestAggressor\@Village\@\@QEAAPEAVActor\@\@PEAV2\@\@Z + * @symbol ?getClosestAggressor\@Village\@\@QEAAPEAVActor\@\@PEAV2\@\@Z */ MCAPI class Actor * getClosestAggressor(class Actor *); /** - * @symbol ?getClosestBadStandingPlayer\@Village\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@\@Z + * @symbol ?getClosestBadStandingPlayer\@Village\@\@QEAAPEAVPlayer\@\@AEAVActor\@\@\@Z */ MCAPI class Player * getClosestBadStandingPlayer(class Actor &); /** - * @symbol ?getClosestPOI\@Village\@\@QEAA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@W4POIType\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getClosestPOI\@Village\@\@QEAA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@W4POIType\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::weak_ptr getClosestPOI(enum class POIType, class BlockPos const &); /** - * @symbol ?getRaid\@Village\@\@QEBAPEBVRaid\@\@XZ + * @symbol ?getRaid\@Village\@\@QEBAPEBVRaid\@\@XZ */ MCAPI class Raid const * getRaid() const; /** - * @symbol ?getRaidBounds\@Village\@\@QEBAAEBVAABB\@\@XZ + * @symbol ?getRaidBounds\@Village\@\@QEBAAEBVAABB\@\@XZ */ MCAPI class AABB const & getRaidBounds() const; /** - * @symbol ?getRaidMutable\@Village\@\@QEAAPEAVRaid\@\@XZ + * @symbol ?getRaidMutable\@Village\@\@QEAAPEAVRaid\@\@XZ */ MCAPI class Raid * getRaidMutable(); /** - * @symbol ?getStanding\@Village\@\@QEAAHAEBUActorUniqueID\@\@\@Z + * @symbol ?getStanding\@Village\@\@QEAAHAEBUActorUniqueID\@\@\@Z */ MCAPI int getStanding(struct ActorUniqueID const &); /** - * @symbol ?getUnclaimedPOIs\@Village\@\@QEBAAEBV?$array\@V?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@$02\@std\@\@XZ + * @symbol ?getUnclaimedPOIs\@Village\@\@QEBAAEBV?$array\@V?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@$02\@std\@\@XZ */ MCAPI class std::array>, 3> const & getUnclaimedPOIs() const; /** - * @symbol ?getUniqueID\@Village\@\@QEBA?AVUUID\@mce\@\@XZ + * @symbol ?getUniqueID\@Village\@\@QEBA?AVUUID\@mce\@\@XZ */ MCAPI class mce::UUID getUniqueID() const; /** - * @symbol ?hasInvalidRole\@Village\@\@QEAA_NAEBUActorUniqueID\@\@AEBW4DwellerRole\@\@\@Z + * @symbol ?hasInvalidRole\@Village\@\@QEAA_NAEBUActorUniqueID\@\@AEBW4DwellerRole\@\@\@Z */ MCAPI bool hasInvalidRole(struct ActorUniqueID const &, enum class DwellerRole const &); /** - * @symbol ?hasRaid\@Village\@\@QEBA_NXZ + * @symbol ?hasRaid\@Village\@\@QEBA_NXZ */ MCAPI bool hasRaid() const; /** - * @symbol ?hasSpecificDweller\@Village\@\@QEBA_NW4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?hasSpecificDweller\@Village\@\@QEBA_NW4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI bool hasSpecificDweller(enum class DwellerRole, struct ActorUniqueID const &) const; /** - * @symbol ?loadDataByKey\@Village\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?loadDataByKey\@Village\@\@QEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ MCAPI void loadDataByKey(std::string const &, class CompoundTag const &); /** - * @symbol ?modifyStanding\@Village\@\@QEAAHAEBUActorUniqueID\@\@H\@Z + * @symbol ?modifyStanding\@Village\@\@QEAAHAEBUActorUniqueID\@\@H\@Z */ MCAPI int modifyStanding(struct ActorUniqueID const &, int); /** - * @symbol ?removeActorFromVillage\@Village\@\@QEAA?AV?$_List_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBUActorUniqueID\@\@UDwellerData\@Village\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@W4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?removeActorFromVillage\@Village\@\@QEAA?AV?$_List_iterator\@V?$_List_val\@U?$_List_simple_types\@U?$pair\@$$CBUActorUniqueID\@\@UDwellerData\@Village\@\@\@std\@\@\@std\@\@\@std\@\@\@std\@\@W4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI class std::_List_iterator>>> removeActorFromVillage(enum class DwellerRole, struct ActorUniqueID const &); /** - * @symbol ?removeAllInstancesofActorFromVillage\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?removeAllInstancesofActorFromVillage\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void removeAllInstancesofActorFromVillage(struct ActorUniqueID const &); /** - * @symbol ?removeVillageSavedData\@Village\@\@QEAAXXZ + * @symbol ?removeVillageSavedData\@Village\@\@QEAAXXZ */ MCAPI void removeVillageSavedData(); /** - * @symbol ?resetDwellerTimer\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z + * @symbol ?resetDwellerTimer\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@\@Z */ MCAPI void resetDwellerTimer(enum class DwellerRole, struct ActorUniqueID const &); /** - * @symbol ?resetNoBreedTimer\@Village\@\@QEAAXXZ + * @symbol ?resetNoBreedTimer\@Village\@\@QEAAXXZ */ MCAPI void resetNoBreedTimer(); /** - * @symbol ?rewardAllPlayers\@Village\@\@QEAAXH\@Z + * @symbol ?rewardAllPlayers\@Village\@\@QEAAXH\@Z */ MCAPI void rewardAllPlayers(int); /** - * @symbol ?saveEntireVillage\@Village\@\@QEAAXXZ + * @symbol ?saveEntireVillage\@Village\@\@QEAAXXZ */ MCAPI void saveEntireVillage(); /** - * @symbol ?setSavedDwellerPosition\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@VBlockPos\@\@\@Z + * @symbol ?setSavedDwellerPosition\@Village\@\@QEAAXW4DwellerRole\@\@AEBUActorUniqueID\@\@VBlockPos\@\@\@Z */ MCAPI void setSavedDwellerPosition(enum class DwellerRole, struct ActorUniqueID const &, class BlockPos); /** - * @symbol ?tick\@Village\@\@QEAAXUTick\@\@AEAVBlockSource\@\@\@Z + * @symbol ?tick\@Village\@\@QEAAXUTick\@\@AEAVBlockSource\@\@\@Z */ MCAPI void tick(struct Tick, class BlockSource &); /** - * @symbol ?tickRaid\@Village\@\@QEAAXUTick\@\@\@Z + * @symbol ?tickRaid\@Village\@\@QEAAXUTick\@\@\@Z */ MCAPI void tickRaid(struct Tick); /** - * @symbol ?triggerRaid\@Village\@\@QEAAXXZ + * @symbol ?triggerRaid\@Village\@\@QEAAXXZ */ MCAPI void triggerRaid(); /** - * @symbol ?trySetVillagerWorkTimestamp\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?trySetVillagerWorkTimestamp\@Village\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void trySetVillagerWorkTimestamp(struct ActorUniqueID const &); /** - * @symbol ?unlinkMismatchedJobsites\@Village\@\@QEAAXAEBVActor\@\@\@Z + * @symbol ?unlinkMismatchedJobsites\@Village\@\@QEAAXAEBVActor\@\@\@Z */ MCAPI void unlinkMismatchedJobsites(class Actor const &); /** - * @symbol ?villagerLivesHere\@Village\@\@QEBA_NAEBUActorUniqueID\@\@\@Z + * @symbol ?villagerLivesHere\@Village\@\@QEBA_NAEBUActorUniqueID\@\@\@Z */ MCAPI bool villagerLivesHere(struct ActorUniqueID const &) const; /** - * @symbol ?withinVillageBounds\@Village\@\@QEBA_NAEBVVec3\@\@M\@Z + * @symbol ?withinVillageBounds\@Village\@\@QEBA_NAEBVVec3\@\@M\@Z */ MCAPI bool withinVillageBounds(class Vec3 const &, float) const; /** - * @symbol ??1Village\@\@QEAA\@XZ + * @symbol ??1Village\@\@QEAA\@XZ */ MCAPI ~Village(); /** - * @symbol ?DEBUG_DRAWING\@Village\@\@2_NA + * @symbol ?DEBUG_DRAWING\@Village\@\@2_NA */ MCAPI static bool DEBUG_DRAWING; /** - * @symbol ?DWELLER_REMOVAL_TOLERANCE\@Village\@\@2MB + * @symbol ?DWELLER_REMOVAL_TOLERANCE\@Village\@\@2MB */ MCAPI static float const DWELLER_REMOVAL_TOLERANCE; /** - * @symbol ?MAX_VILLAGE_STANDING\@Village\@\@2HB + * @symbol ?MAX_VILLAGE_STANDING\@Village\@\@2HB */ MCAPI static int const MAX_VILLAGE_STANDING; /** - * @symbol ?MIN_VILLAGE_STANDING\@Village\@\@2HB + * @symbol ?MIN_VILLAGE_STANDING\@Village\@\@2HB */ MCAPI static int const MIN_VILLAGE_STANDING; /** - * @symbol ?STORAGE_KEY_PREFIX\@Village\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_KEY_PREFIX\@Village\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_KEY_PREFIX; /** - * @symbol ?VILLAGE_START_XZ_BOUNDS\@Village\@\@2HB + * @symbol ?VILLAGE_START_XZ_BOUNDS\@Village\@\@2HB */ MCAPI static int const VILLAGE_START_XZ_BOUNDS; /** - * @symbol ?isValidRegisteredPOI\@Village\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isValidRegisteredPOI\@Village\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isValidRegisteredPOI(class BlockSource &, class BlockPos const &); /** - * @symbol ?isVillagePOI\@Village\@\@SA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isVillagePOI\@Village\@\@SA_NAEBVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool isVillagePOI(class BlockSource const &, class BlockPos const &); /** - * @symbol ?isVillagePOI\@Village\@\@SA_NAEBVVillageManager\@\@AEBVBlock\@\@\@Z + * @symbol ?isVillagePOI\@Village\@\@SA_NAEBVVillageManager\@\@AEBVBlock\@\@\@Z */ MCAPI static bool isVillagePOI(class VillageManager const &, class Block const &); //private: /** - * @symbol ?_addPoiToVillage\@Village\@\@AEAAXAEBUActorUniqueID\@\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z + * @symbol ?_addPoiToVillage\@Village\@\@AEAAXAEBUActorUniqueID\@\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void _addPoiToVillage(struct ActorUniqueID const &, class std::weak_ptr); /** - * @symbol ?_calcPOIDist\@Village\@\@AEAAXXZ + * @symbol ?_calcPOIDist\@Village\@\@AEAAXXZ */ MCAPI void _calcPOIDist(); /** - * @symbol ?_claimUnclaimedPOIs\@Village\@\@AEAAXXZ + * @symbol ?_claimUnclaimedPOIs\@Village\@\@AEAAXXZ */ MCAPI void _claimUnclaimedPOIs(); /** - * @symbol ?_clearVillagerPOIs\@Village\@\@AEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?_clearVillagerPOIs\@Village\@\@AEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void _clearVillagerPOIs(struct ActorUniqueID const &); /** - * @symbol ?_createRaid\@Village\@\@AEAAXXZ + * @symbol ?_createRaid\@Village\@\@AEAAXXZ */ MCAPI void _createRaid(); /** - * @symbol ?_findAvailablePOI\@Village\@\@AEAA_N_KAEAVLevel\@\@AEAVRandom\@\@UActorUniqueID\@\@\@Z + * @symbol ?_findAvailablePOI\@Village\@\@AEAA_N_KAEAVLevel\@\@AEAVRandom\@\@UActorUniqueID\@\@\@Z */ MCAPI bool _findAvailablePOI(unsigned __int64, class Level &, class Random &, struct ActorUniqueID); /** - * @symbol ?_findPlayerCentricSpawnPointForRaid\@Village\@\@AEBA_NAEAVVec3\@\@_N\@Z + * @symbol ?_findPlayerCentricSpawnPointForRaid\@Village\@\@AEBA_NAEAVVec3\@\@_N\@Z */ MCAPI bool _findPlayerCentricSpawnPointForRaid(class Vec3 &, bool) const; /** - * @symbol ?_findPreferredPOI\@Village\@\@AEAAXAEAV?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@AEBVHashedString\@\@UActorUniqueID\@\@\@Z + * @symbol ?_findPreferredPOI\@Village\@\@AEAAXAEAV?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@AEBVHashedString\@\@UActorUniqueID\@\@\@Z */ MCAPI void _findPreferredPOI(std::vector> &, class HashedString const &, struct ActorUniqueID); /** - * @symbol ?_findSpawnPointForRaid\@Village\@\@AEBA_NAEAVVec3\@\@MM_N1\@Z + * @symbol ?_findSpawnPointForRaid\@Village\@\@AEBA_NAEAVVec3\@\@MM_N1\@Z */ MCAPI bool _findSpawnPointForRaid(class Vec3 &, float, float, bool, bool) const; /** - * @symbol ?_findSpawnableRegion\@Village\@\@AEBAPEAVBlockSource\@\@VVec3\@\@HAEA_N\@Z + * @symbol ?_findSpawnableRegion\@Village\@\@AEBAPEAVBlockSource\@\@VVec3\@\@HAEA_N\@Z */ MCAPI class BlockSource * _findSpawnableRegion(class Vec3, int, bool &) const; /** - * @symbol ?_findWeightedPOI\@Village\@\@AEAAXAEAV?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@UActorUniqueID\@\@\@Z + * @symbol ?_findWeightedPOI\@Village\@\@AEAAXAEAV?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@UActorUniqueID\@\@\@Z */ MCAPI void _findWeightedPOI(std::vector> &, class Random &, struct ActorUniqueID); /** - * @symbol ?_helpLocateRaiders\@Village\@\@AEAAXAEBVRaid\@\@\@Z + * @symbol ?_helpLocateRaiders\@Village\@\@AEAAXAEBVRaid\@\@\@Z */ MCAPI void _helpLocateRaiders(class Raid const &); /** - * @symbol ?_loadVillageData\@Village\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_loadVillageData\@Village\@\@AEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void _loadVillageData(class CompoundTag const &); /** - * @symbol ?_loadVillageDwellers\@Village\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_loadVillageDwellers\@Village\@\@AEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void _loadVillageDwellers(class CompoundTag const &); /** - * @symbol ?_loadVillagePOIs\@Village\@\@AEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_loadVillagePOIs\@Village\@\@AEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void _loadVillagePOIs(class CompoundTag const &); /** - * @symbol ?_playSoundFrom\@Village\@\@AEAAXAEBVVec3\@\@W4LevelSoundEvent\@\@\@Z + * @symbol ?_playSoundFrom\@Village\@\@AEAAXAEBVVec3\@\@W4LevelSoundEvent\@\@\@Z */ MCAPI void _playSoundFrom(class Vec3 const &, enum class LevelSoundEvent); /** - * @symbol ?_readyRaidGroup\@Village\@\@AEAAXAEAV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@\@Z + * @symbol ?_readyRaidGroup\@Village\@\@AEAAXAEAV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@\@Z */ MCAPI void _readyRaidGroup(class std::unordered_set, struct std::equal_to, class std::allocator> &); /** - * @symbol ?_ringBells\@Village\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@\@Z + * @symbol ?_ringBells\@Village\@\@AEBAXAEAVBlockSource\@\@AEAVRandom\@\@\@Z */ MCAPI void _ringBells(class BlockSource &, class Random &) const; /** - * @symbol ?_saveVillageData\@Village\@\@AEBAXXZ + * @symbol ?_saveVillageData\@Village\@\@AEBAXXZ */ MCAPI void _saveVillageData() const; /** - * @symbol ?_saveVillageDwellers\@Village\@\@AEBAXXZ + * @symbol ?_saveVillageDwellers\@Village\@\@AEBAXXZ */ MCAPI void _saveVillageDwellers() const; /** - * @symbol ?_saveVillagePOIs\@Village\@\@AEBAXXZ + * @symbol ?_saveVillagePOIs\@Village\@\@AEBAXXZ */ MCAPI void _saveVillagePOIs() const; /** - * @symbol ?_saveVillagePlayerStanding\@Village\@\@AEBAXXZ + * @symbol ?_saveVillagePlayerStanding\@Village\@\@AEBAXXZ */ MCAPI void _saveVillagePlayerStanding() const; /** - * @symbol ?_saveVillageRaid\@Village\@\@AEBAXXZ + * @symbol ?_saveVillageRaid\@Village\@\@AEBAXXZ */ MCAPI void _saveVillageRaid() const; /** - * @symbol ?_spawnPassiveDwellers\@Village\@\@AEAAXAEAVBlockSource\@\@H\@Z + * @symbol ?_spawnPassiveDwellers\@Village\@\@AEAAXAEAVBlockSource\@\@H\@Z */ MCAPI void _spawnPassiveDwellers(class BlockSource &, int); /** - * @symbol ?_spawnRaidGroup\@Village\@\@AEBA_NVVec3\@\@EAEAV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@\@Z + * @symbol ?_spawnRaidGroup\@Village\@\@AEBA_NVVec3\@\@EAEAV?$unordered_set\@UActorUniqueID\@\@U?$hash\@UActorUniqueID\@\@\@std\@\@U?$equal_to\@UActorUniqueID\@\@\@3\@V?$allocator\@UActorUniqueID\@\@\@3\@\@std\@\@\@Z */ MCAPI bool _spawnRaidGroup(class Vec3, unsigned char, class std::unordered_set, struct std::equal_to, class std::allocator> &) const; /** - * @symbol ?_tryShiftStandingsTowardNeutral\@Village\@\@AEAAXAEAUTick\@\@_K_N\@Z + * @symbol ?_tryShiftStandingsTowardNeutral\@Village\@\@AEAAXAEAUTick\@\@_K_N\@Z */ MCAPI void _tryShiftStandingsTowardNeutral(struct Tick &, unsigned __int64, bool); /** - * @symbol ?_trySpawnDefenderDwellers\@Village\@\@AEAAXAEAVBlockSource\@\@_K\@Z + * @symbol ?_trySpawnDefenderDwellers\@Village\@\@AEAAXAEAVBlockSource\@\@_K\@Z */ MCAPI void _trySpawnDefenderDwellers(class BlockSource &, unsigned __int64); /** - * @symbol ?_updateAndRemoveInactiveDwellers\@Village\@\@AEAAX_KM\@Z + * @symbol ?_updateAndRemoveInactiveDwellers\@Village\@\@AEAAX_KM\@Z */ MCAPI void _updateAndRemoveInactiveDwellers(unsigned __int64, float); /** - * @symbol ?_updateClaimedPOIs\@Village\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_updateClaimedPOIs\@Village\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _updateClaimedPOIs(class BlockSource &); /** - * @symbol ?_updateUnclaimedPOIs\@Village\@\@AEAAXAEAVBlockSource\@\@\@Z + * @symbol ?_updateUnclaimedPOIs\@Village\@\@AEAAXAEAVBlockSource\@\@\@Z */ MCAPI void _updateUnclaimedPOIs(class BlockSource &); private: /** - * @symbol ?ACHIEVEMENT_SOUND_THE_ALARM_TOLERANCE\@Village\@\@0MB + * @symbol ?ACHIEVEMENT_SOUND_THE_ALARM_TOLERANCE\@Village\@\@0MB */ MCAPI static float const ACHIEVEMENT_SOUND_THE_ALARM_TOLERANCE; /** - * @symbol ?CELEBRATION_EVENT\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?CELEBRATION_EVENT\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const CELEBRATION_EVENT; /** - * @symbol ?RAID_BOUNDS_PADDING\@Village\@\@0VVec3\@\@B + * @symbol ?RAID_BOUNDS_PADDING\@Village\@\@0VVec3\@\@B */ MCAPI static class Vec3 const RAID_BOUNDS_PADDING; /** - * @symbol ?RAID_EXPIRY_EVENT\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?RAID_EXPIRY_EVENT\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const RAID_EXPIRY_EVENT; /** - * @symbol ?RAID_FINISHED_DELAY_IN_TICKS\@Village\@\@0HB + * @symbol ?RAID_FINISHED_DELAY_IN_TICKS\@Village\@\@0HB */ MCAPI static int const RAID_FINISHED_DELAY_IN_TICKS; /** - * @symbol ?RAID_GROUP_COMPLETE_DELAY_IN_TICKS\@Village\@\@0HB + * @symbol ?RAID_GROUP_COMPLETE_DELAY_IN_TICKS\@Village\@\@0HB */ MCAPI static int const RAID_GROUP_COMPLETE_DELAY_IN_TICKS; /** - * @symbol ?RAID_LOCATION_HELP_DELAY_IN_TICKS\@Village\@\@0HB + * @symbol ?RAID_LOCATION_HELP_DELAY_IN_TICKS\@Village\@\@0HB */ MCAPI static int const RAID_LOCATION_HELP_DELAY_IN_TICKS; /** - * @symbol ?RAID_MAX_SPAWN_FAILURES\@Village\@\@0EB + * @symbol ?RAID_MAX_SPAWN_FAILURES\@Village\@\@0EB */ MCAPI static unsigned char const RAID_MAX_SPAWN_FAILURES; /** - * @symbol ?RAID_PREP_TIME_IN_TICKS\@Village\@\@0HB + * @symbol ?RAID_PREP_TIME_IN_TICKS\@Village\@\@0HB */ MCAPI static int const RAID_PREP_TIME_IN_TICKS; /** - * @symbol ?RAID_TIMEOUT_IN_TICKS\@Village\@\@0UTick\@\@B + * @symbol ?RAID_TIMEOUT_IN_TICKS\@Village\@\@0UTick\@\@B */ MCAPI static struct Tick const RAID_TIMEOUT_IN_TICKS; /** - * @symbol ?STANDING_DECAY_INTERVAL_BAD\@Village\@\@0_KB + * @symbol ?STANDING_DECAY_INTERVAL_BAD\@Village\@\@0_KB */ MCAPI static unsigned __int64 const STANDING_DECAY_INTERVAL_BAD; /** - * @symbol ?STANDING_DECAY_INTERVAL_GOOD\@Village\@\@0_KB + * @symbol ?STANDING_DECAY_INTERVAL_GOOD\@Village\@\@0_KB */ MCAPI static unsigned __int64 const STANDING_DECAY_INTERVAL_GOOD; /** - * @symbol ?STORAGE_KEY_DWELLERS\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_KEY_DWELLERS\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_KEY_DWELLERS; /** - * @symbol ?STORAGE_KEY_PLAYERS\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_KEY_PLAYERS\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_KEY_PLAYERS; /** - * @symbol ?STORAGE_KEY_POI\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_KEY_POI\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_KEY_POI; /** - * @symbol ?STORAGE_KEY_RAID\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_KEY_RAID\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_KEY_RAID; /** - * @symbol ?STORAGE_KEY_VILLAGE\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?STORAGE_KEY_VILLAGE\@Village\@\@0V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const STORAGE_KEY_VILLAGE; /** - * @symbol ?UNINITIALIZED_VILLAGE_LIFETIME_MAX_TICKS\@Village\@\@0HB + * @symbol ?UNINITIALIZED_VILLAGE_LIFETIME_MAX_TICKS\@Village\@\@0HB */ MCAPI static int const UNINITIALIZED_VILLAGE_LIFETIME_MAX_TICKS; /** - * @symbol ?VILLAGER_EXPECTED_WORK_INTERVAL\@Village\@\@0_JB + * @symbol ?VILLAGER_EXPECTED_WORK_INTERVAL\@Village\@\@0_JB */ MCAPI static __int64 const VILLAGER_EXPECTED_WORK_INTERVAL; /** - * @symbol ?VILLAGE_HERO_BESTOW_TIME\@Village\@\@0HB + * @symbol ?VILLAGE_HERO_BESTOW_TIME\@Village\@\@0HB */ MCAPI static int const VILLAGE_HERO_BESTOW_TIME; /** - * @symbol ?VILLAGE_POI_PURGE_TIME\@Village\@\@0_KB + * @symbol ?VILLAGE_POI_PURGE_TIME\@Village\@\@0_KB */ MCAPI static unsigned __int64 const VILLAGE_POI_PURGE_TIME; /** - * @symbol ?VILLAGE_RADIUS_APPROX_SCALAR\@Village\@\@0MB + * @symbol ?VILLAGE_RADIUS_APPROX_SCALAR\@Village\@\@0MB */ MCAPI static float const VILLAGE_RADIUS_APPROX_SCALAR; /** - * @symbol ?VILLAGE_SAVE_TICK_DELAY\@Village\@\@0_KB + * @symbol ?VILLAGE_SAVE_TICK_DELAY\@Village\@\@0_KB */ MCAPI static unsigned __int64 const VILLAGE_SAVE_TICK_DELAY; /** - * @symbol ?VILLAGE_START_HEIGHT\@Village\@\@0HB + * @symbol ?VILLAGE_START_HEIGHT\@Village\@\@0HB */ MCAPI static int const VILLAGE_START_HEIGHT; /** - * @symbol ?VILLAGE_UNCLAIMED_POI_CAP\@Village\@\@0HB + * @symbol ?VILLAGE_UNCLAIMED_POI_CAP\@Village\@\@0HB */ MCAPI static int const VILLAGE_UNCLAIMED_POI_CAP; /** - * @symbol ?VILLAGE_UPDATE_TICK_DELAY\@Village\@\@0_KB + * @symbol ?VILLAGE_UPDATE_TICK_DELAY\@Village\@\@0_KB */ MCAPI static unsigned __int64 const VILLAGE_UPDATE_TICK_DELAY; /** - * @symbol ?VILLAGE_VERSION_CURRENT\@Village\@\@0EB + * @symbol ?VILLAGE_VERSION_CURRENT\@Village\@\@0EB */ MCAPI static unsigned char const VILLAGE_VERSION_CURRENT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillageFeature.hpp b/LiteLoader/include/llapi/mc/VillageFeature.hpp index ba2a948d90..c2c9d8808b 100644 --- a/LiteLoader/include/llapi/mc/VillageFeature.hpp +++ b/LiteLoader/include/llapi/mc/VillageFeature.hpp @@ -31,33 +31,33 @@ class VillageFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VillageFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@VillageFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@VillageFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@VillageFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@VillageFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@VillageFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@VillageFeature\@\@UEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@VillageFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@VillageFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0VillageFeature\@\@QEAA\@IHH\@Z + * @symbol ??0VillageFeature\@\@QEAA\@IHH\@Z */ MCAPI VillageFeature(unsigned int, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillageManager.hpp b/LiteLoader/include/llapi/mc/VillageManager.hpp index 3fb112b3d3..0f1ab79415 100644 --- a/LiteLoader/include/llapi/mc/VillageManager.hpp +++ b/LiteLoader/include/llapi/mc/VillageManager.hpp @@ -32,142 +32,142 @@ enum class BedAvailabilityState; public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VillageManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?fetchClosestVillage\@VillageManager\@\@UEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@HI\@Z + * @vftbl 1 + * @symbol ?fetchClosestVillage\@VillageManager\@\@UEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@HI\@Z */ virtual class std::weak_ptr fetchClosestVillage(class BlockPos const &, int, unsigned int) const; /** - * @symbol ??0VillageManager\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0VillageManager\@\@QEAA\@AEAVDimension\@\@\@Z */ MCAPI VillageManager(class Dimension &); /** - * @symbol ?applyHeroOfTheVillageEffect\@VillageManager\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?applyHeroOfTheVillageEffect\@VillageManager\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void applyHeroOfTheVillageEffect(class Actor &); /** - * @symbol ?fetchClosestVillageMostSuitableForDweller\@VillageManager\@\@QEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@HI\@Z + * @symbol ?fetchClosestVillageMostSuitableForDweller\@VillageManager\@\@QEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@HI\@Z */ MCAPI class std::weak_ptr fetchClosestVillageMostSuitableForDweller(class BlockPos const &, int, unsigned int) const; /** - * @symbol ?getClosestVillageWithRaid\@VillageManager\@\@QEAA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getClosestVillageWithRaid\@VillageManager\@\@QEAA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::weak_ptr getClosestVillageWithRaid(class BlockPos const &); /** - * @symbol ?getPOI\@VillageManager\@\@QEBA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getPOI\@VillageManager\@\@QEBA?AV?$weak_ptr\@VPOIInstance\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::weak_ptr getPOI(class BlockPos const &) const; /** - * @symbol ?getPOIInitEventFromName\@VillageManager\@\@QEBA?AVHashedString\@\@AEBV2\@\@Z + * @symbol ?getPOIInitEventFromName\@VillageManager\@\@QEBA?AVHashedString\@\@AEBV2\@\@Z */ MCAPI class HashedString getPOIInitEventFromName(class HashedString const &) const; /** - * @symbol ?getVillageByID\@VillageManager\@\@QEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z + * @symbol ?getVillageByID\@VillageManager\@\@QEBA?AV?$weak_ptr\@VVillage\@\@\@std\@\@AEBVUUID\@mce\@\@\@Z */ MCAPI class std::weak_ptr getVillageByID(class mce::UUID const &) const; /** - * @symbol ?hasPOI\@VillageManager\@\@QEBA_NAEBVBlockPos\@\@W4POIType\@\@\@Z + * @symbol ?hasPOI\@VillageManager\@\@QEBA_NAEBVBlockPos\@\@W4POIType\@\@\@Z */ MCAPI bool hasPOI(class BlockPos const &, enum class POIType) const; /** - * @symbol ?insertPOI\@VillageManager\@\@QEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z + * @symbol ?insertPOI\@VillageManager\@\@QEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void insertPOI(class std::shared_ptr &&); /** - * @symbol ?isRegisteredPOI\@VillageManager\@\@QEBA_NAEBVBlock\@\@\@Z + * @symbol ?isRegisteredPOI\@VillageManager\@\@QEBA_NAEBVBlock\@\@\@Z */ MCAPI bool isRegisteredPOI(class Block const &) const; /** - * @symbol ?isValidPOIType\@VillageManager\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?isValidPOIType\@VillageManager\@\@QEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool isValidPOIType(class BlockPos const &, class Block const &) const; /** - * @symbol ?isWanderingTraderManagedByScheduler\@VillageManager\@\@QEAA_NAEBVActor\@\@\@Z + * @symbol ?isWanderingTraderManagedByScheduler\@VillageManager\@\@QEAA_NAEBVActor\@\@\@Z */ MCAPI bool isWanderingTraderManagedByScheduler(class Actor const &); /** - * @symbol ?loadAllVillages\@VillageManager\@\@QEAAXXZ + * @symbol ?loadAllVillages\@VillageManager\@\@QEAAXXZ */ MCAPI void loadAllVillages(); /** - * @symbol ?removePOI\@VillageManager\@\@QEAAXV?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z + * @symbol ?removePOI\@VillageManager\@\@QEAAXV?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void removePOI(class std::weak_ptr); /** - * @symbol ?saveAllVillages\@VillageManager\@\@QEAAXXZ + * @symbol ?saveAllVillages\@VillageManager\@\@QEAAXXZ */ MCAPI void saveAllVillages(); /** - * @symbol ?submitFindPOIQuery\@VillageManager\@\@QEAAXAEBUActorUniqueID\@\@\@Z + * @symbol ?submitFindPOIQuery\@VillageManager\@\@QEAAXAEBUActorUniqueID\@\@\@Z */ MCAPI void submitFindPOIQuery(struct ActorUniqueID const &); /** - * @symbol ?tick\@VillageManager\@\@QEAAXAEBUTick\@\@\@Z + * @symbol ?tick\@VillageManager\@\@QEAAXAEBUTick\@\@\@Z */ MCAPI void tick(struct Tick const &); /** - * @symbol ?tickVillages\@VillageManager\@\@QEAAXAEBUTick\@\@AEBVVec3\@\@AEAVBlockSource\@\@\@Z + * @symbol ?tickVillages\@VillageManager\@\@QEAAXAEBUTick\@\@AEBVVec3\@\@AEAVBlockSource\@\@\@Z */ MCAPI void tickVillages(struct Tick const &, class Vec3 const &, class BlockSource &); /** - * @symbol ?tryCreatePOI\@VillageManager\@\@QEAA?AV?$shared_ptr\@VPOIInstance\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?tryCreatePOI\@VillageManager\@\@QEAA?AV?$shared_ptr\@VPOIInstance\@\@\@std\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI class std::shared_ptr tryCreatePOI(class BlockPos const &, class Block const &); /** - * @symbol ?MAX_POI_TOLERANCE_DIST\@VillageManager\@\@2HB + * @symbol ?MAX_POI_TOLERANCE_DIST\@VillageManager\@\@2HB */ MCAPI static int const MAX_POI_TOLERANCE_DIST; //private: /** - * @symbol ?_addPOIWithinRadius\@VillageManager\@\@AEAAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_addPOIWithinRadius\@VillageManager\@\@AEAAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI void _addPOIWithinRadius(class BlockPos const &, class BlockSource &); /** - * @symbol ?_assignPOIOnly\@VillageManager\@\@AEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z + * @symbol ?_assignPOIOnly\@VillageManager\@\@AEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void _assignPOIOnly(class std::shared_ptr &&); /** - * @symbol ?_calculateDistanceFromPositionToEdgeOfVillage\@VillageManager\@\@AEBAMAEBVBlockPos\@\@AEBVVillage\@\@\@Z + * @symbol ?_calculateDistanceFromPositionToEdgeOfVillage\@VillageManager\@\@AEBAMAEBVBlockPos\@\@AEBVVillage\@\@\@Z */ MCAPI float _calculateDistanceFromPositionToEdgeOfVillage(class BlockPos const &, class Village const &) const; /** - * @symbol ?_createOrGetVillage\@VillageManager\@\@AEAA?AV?$shared_ptr\@VVillage\@\@\@std\@\@AEBVUUID\@mce\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_createOrGetVillage\@VillageManager\@\@AEAA?AV?$shared_ptr\@VVillage\@\@\@std\@\@AEBVUUID\@mce\@\@AEBVBlockPos\@\@\@Z */ MCAPI class std::shared_ptr _createOrGetVillage(class mce::UUID const &, class BlockPos const &); /** - * @symbol ?_getVillageWithBedsAvailableMap\@VillageManager\@\@AEBA?AV?$unordered_map\@PEBVVillage\@\@W4BedAvailabilityState\@VillageManager\@\@U?$hash\@PEBVVillage\@\@\@std\@\@U?$equal_to\@PEBVVillage\@\@\@5\@V?$allocator\@U?$pair\@QEBVVillage\@\@W4BedAvailabilityState\@VillageManager\@\@\@std\@\@\@5\@\@std\@\@XZ + * @symbol ?_getVillageWithBedsAvailableMap\@VillageManager\@\@AEBA?AV?$unordered_map\@PEBVVillage\@\@W4BedAvailabilityState\@VillageManager\@\@U?$hash\@PEBVVillage\@\@\@std\@\@U?$equal_to\@PEBVVillage\@\@\@5\@V?$allocator\@U?$pair\@QEBVVillage\@\@W4BedAvailabilityState\@VillageManager\@\@\@std\@\@\@5\@\@std\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> _getVillageWithBedsAvailableMap() const; /** - * @symbol ?_loadPOIBlueprints\@VillageManager\@\@AEAAXXZ + * @symbol ?_loadPOIBlueprints\@VillageManager\@\@AEAAXXZ */ MCAPI void _loadPOIBlueprints(); /** - * @symbol ?_tryAssignPOIOrCreateVillage\@VillageManager\@\@AEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z + * @symbol ?_tryAssignPOIOrCreateVillage\@VillageManager\@\@AEAAX$$QEAV?$shared_ptr\@VPOIInstance\@\@\@std\@\@\@Z */ MCAPI void _tryAssignPOIOrCreateVillage(class std::shared_ptr &&); /** - * @symbol ?_unclusterDerelictPOIs\@VillageManager\@\@AEAAXAEAV?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@\@Z + * @symbol ?_unclusterDerelictPOIs\@VillageManager\@\@AEAAXAEAV?$vector\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@V?$allocator\@V?$weak_ptr\@VPOIInstance\@\@\@std\@\@\@2\@\@std\@\@\@Z */ MCAPI void _unclusterDerelictPOIs(std::vector> &); private: /** - * @symbol ?MAX_POI_QUERIES\@VillageManager\@\@0_KB + * @symbol ?MAX_POI_QUERIES\@VillageManager\@\@0_KB */ MCAPI static unsigned __int64 const MAX_POI_QUERIES; /** - * @symbol ?MAX_QUERY_SCAN_ITERATIONS\@VillageManager\@\@0HB + * @symbol ?MAX_QUERY_SCAN_ITERATIONS\@VillageManager\@\@0HB */ MCAPI static int const MAX_QUERY_SCAN_ITERATIONS; /** - * @symbol ?VILLAGE_HERO_EFFECT_DURATION\@VillageManager\@\@0HB + * @symbol ?VILLAGE_HERO_EFFECT_DURATION\@VillageManager\@\@0HB */ MCAPI static int const VILLAGE_HERO_EFFECT_DURATION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillageManagerComponentUtils.hpp b/LiteLoader/include/llapi/mc/VillageManagerComponentUtils.hpp index 227b03c742..4bf6d5b27e 100644 --- a/LiteLoader/include/llapi/mc/VillageManagerComponentUtils.hpp +++ b/LiteLoader/include/llapi/mc/VillageManagerComponentUtils.hpp @@ -18,11 +18,11 @@ namespace VillageManagerComponentUtils { #undef AFTER_EXTRA /** - * @symbol ?addVillageManager\@VillageManagerComponentUtils\@\@YAXAEAUVillageManagerComponent\@\@V?$AutomaticID\@VDimension\@\@H\@\@PEAVIVillageManager\@\@\@Z + * @symbol ?addVillageManager\@VillageManagerComponentUtils\@\@YAXAEAUVillageManagerComponent\@\@V?$AutomaticID\@VDimension\@\@H\@\@PEAVIVillageManager\@\@\@Z */ MCAPI void addVillageManager(struct VillageManagerComponent &, class AutomaticID, class IVillageManager *); /** - * @symbol ?getVillageManager\@VillageManagerComponentUtils\@\@YA?AV?$NonOwnerPointer\@VIVillageManager\@\@\@Bedrock\@\@AEBUVillageManagerComponent\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getVillageManager\@VillageManagerComponentUtils\@\@YA?AV?$NonOwnerPointer\@VIVillageManager\@\@\@Bedrock\@\@AEBUVillageManagerComponent\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI class Bedrock::NonOwnerPointer getVillageManager(struct VillageManagerComponent const &, class AutomaticID); diff --git a/LiteLoader/include/llapi/mc/VillagePiece.hpp b/LiteLoader/include/llapi/mc/VillagePiece.hpp index 836d09fe87..3d9a93cdb7 100644 --- a/LiteLoader/include/llapi/mc/VillagePiece.hpp +++ b/LiteLoader/include/llapi/mc/VillagePiece.hpp @@ -31,38 +31,38 @@ class VillagePiece : public PoolElementStructurePiece { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VillagePiece(); + virtual void __unk_vfn_0(); /** - * @vftbl 13 - * @symbol ?generateHeightAtPosition\@VillagePiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z + * @vftbl 13 + * @symbol ?generateHeightAtPosition\@VillagePiece\@\@UEBAHAEBVBlockPos\@\@AEAVDimension\@\@AEAVBlockVolume\@\@AEAV?$unordered_map\@VChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$unique_ptr\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@U?$default_delete\@V?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@\@2\@\@std\@\@\@std\@\@\@3\@\@std\@\@\@Z */ virtual int generateHeightAtPosition(class BlockPos const &, class Dimension &, class BlockVolume &, class std::unordered_map>, struct std::hash, struct std::equal_to, class std::allocator>>>> &) const; /** - * @vftbl 14 - * @symbol ?getSupportBlock\@VillagePiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z + * @vftbl 14 + * @symbol ?getSupportBlock\@VillagePiece\@\@UEBAPEBVBlock\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBV2\@\@Z */ virtual class Block const * getSupportBlock(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 15 - * @symbol ?getBeardStabilizeBlock\@VillagePiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + * @vftbl 15 + * @symbol ?getBeardStabilizeBlock\@VillagePiece\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getBeardStabilizeBlock(class Block const &) const; /** - * @vftbl 16 - * @symbol ?getTerrainAdjustmentEffect\@VillagePiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ + * @vftbl 16 + * @symbol ?getTerrainAdjustmentEffect\@VillagePiece\@\@UEBA?AW4AdjustmentEffect\@\@XZ */ virtual enum class AdjustmentEffect getTerrainAdjustmentEffect() const; /** - * @vftbl 17 - * @symbol ?_needsPostProcessing\@VillagePiece\@\@MEAA_NAEAVBlockSource\@\@\@Z + * @vftbl 17 + * @symbol ?_needsPostProcessing\@VillagePiece\@\@MEAA_NAEAVBlockSource\@\@\@Z */ virtual bool _needsPostProcessing(class BlockSource &); /** - * @symbol ?addPieces\@VillagePiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z + * @symbol ?addPieces\@VillagePiece\@\@SAXVBlockPos\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@AEAVJigsawStructureRegistry\@\@W4VanillaBiomeTypes\@\@AEAVDimension\@\@\@Z */ MCAPI static void addPieces(class BlockPos, std::vector> &, class Random &, class JigsawStructureRegistry &, enum class VanillaBiomeTypes, class Dimension &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillageStart.hpp b/LiteLoader/include/llapi/mc/VillageStart.hpp index 1af7c1ad7f..2bcb24caf8 100644 --- a/LiteLoader/include/llapi/mc/VillageStart.hpp +++ b/LiteLoader/include/llapi/mc/VillageStart.hpp @@ -31,18 +31,18 @@ class VillageStart : public StructureStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VillageStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?isValid\@VillageStart\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?isValid\@VillageStart\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0VillageStart\@\@QEAA\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@HHAEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ??0VillageStart\@\@QEAA\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@HHAEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI VillageStart(class Dimension &, class BiomeSource const &, class Random &, int, int, class IPreliminarySurfaceProvider const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Villager.hpp b/LiteLoader/include/llapi/mc/Villager.hpp index 4660518e99..0408c59d58 100644 --- a/LiteLoader/include/llapi/mc/Villager.hpp +++ b/LiteLoader/include/llapi/mc/Villager.hpp @@ -32,148 +32,143 @@ class Villager : public VillagerBase { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Villager\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Villager\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Villager(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 200 - * @symbol ?buildDebugInfo\@Villager\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 199 + * @symbol ?buildDebugInfo\@Villager\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 - */ - virtual void __unk_vfn_218(); - /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Villager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Villager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Villager(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillagerBase.hpp b/LiteLoader/include/llapi/mc/VillagerBase.hpp index 575a1ab001..b52c03189e 100644 --- a/LiteLoader/include/llapi/mc/VillagerBase.hpp +++ b/LiteLoader/include/llapi/mc/VillagerBase.hpp @@ -33,219 +33,218 @@ class VillagerBase : public Mob { public: /** - * @vftbl 13 - * @symbol ?reloadComponents\@VillagerBase\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 13 + * @symbol ?reloadComponents\@VillagerBase\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~VillagerBase(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 139 - * @symbol ?onLightningHit\@VillagerBase\@\@UEAAXXZ + * @vftbl 138 + * @symbol ?onLightningHit\@VillagerBase\@\@UEAAXXZ */ virtual void onLightningHit(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@VillagerBase\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@VillagerBase\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@VillagerBase\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@VillagerBase\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@VillagerBase\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@VillagerBase\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@VillagerBase\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@VillagerBase\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_301(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_305(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 - */ - virtual void __unk_vfn_308(); - /** - * @vftbl 350 - * @symbol ?_serverAiMobStep\@VillagerBase\@\@MEAAXXZ + * @vftbl 347 + * @symbol ?_serverAiMobStep\@VillagerBase\@\@MEAAXXZ */ virtual void _serverAiMobStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VILLAGERBASE /** - * @symbol ?interactPreventDefault\@VillagerBase\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@VillagerBase\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~VillagerBase(); #endif /** - * @symbol ??0VillagerBase\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0VillagerBase\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI VillagerBase(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?consumeLoveFood\@VillagerBase\@\@QEAAXXZ + * @symbol ?consumeLoveFood\@VillagerBase\@\@QEAAXXZ */ MCAPI void consumeLoveFood(); /** - * @symbol ?getBreedingStackIndex\@VillagerBase\@\@QEBAHXZ + * @symbol ?getBreedingStackIndex\@VillagerBase\@\@QEBAHXZ */ MCAPI int getBreedingStackIndex() const; /** - * @symbol ?isChasing\@VillagerBase\@\@QEBA_NXZ + * @symbol ?isChasing\@VillagerBase\@\@QEBA_NXZ */ MCAPI bool isChasing() const; /** - * @symbol ?isWillingToBreed\@VillagerBase\@\@QEAA_N_N\@Z + * @symbol ?isWillingToBreed\@VillagerBase\@\@QEAA_N_N\@Z */ MCAPI bool isWillingToBreed(bool); /** - * @symbol ?setChasing\@VillagerBase\@\@QEAAX_N\@Z + * @symbol ?setChasing\@VillagerBase\@\@QEAAX_N\@Z */ MCAPI void setChasing(bool); /** - * @symbol ?setWillingToBreed\@VillagerBase\@\@QEAAX_N\@Z + * @symbol ?setWillingToBreed\@VillagerBase\@\@QEAAX_N\@Z */ MCAPI void setWillingToBreed(bool); /** - * @symbol ?stopGoals\@VillagerBase\@\@QEAAXXZ + * @symbol ?stopGoals\@VillagerBase\@\@QEAAXXZ */ MCAPI void stopGoals(); /** - * @symbol ?BiomeStrToEnum\@VillagerBase\@\@SA?AW4BiomeType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?BiomeStrToEnum\@VillagerBase\@\@SA?AW4BiomeType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI static enum class VillagerBase::BiomeType BiomeStrToEnum(std::string const &); //private: /** - * @symbol ?_addParticlesAroundSelf\@VillagerBase\@\@AEAAXW4ParticleType\@\@\@Z + * @symbol ?_addParticlesAroundSelf\@VillagerBase\@\@AEAAXW4ParticleType\@\@\@Z */ MCAPI void _addParticlesAroundSelf(enum class ParticleType); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp b/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp index 8b7194795d..4e10a5ec5b 100644 --- a/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp +++ b/LiteLoader/include/llapi/mc/VillagerCelebrationGoal.hpp @@ -28,60 +28,60 @@ class VillagerCelebrationGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VillagerCelebrationGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@VillagerCelebrationGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@VillagerCelebrationGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@VillagerCelebrationGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@VillagerCelebrationGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@VillagerCelebrationGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@VillagerCelebrationGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@VillagerCelebrationGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@VillagerCelebrationGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@VillagerCelebrationGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@VillagerCelebrationGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@VillagerCelebrationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@VillagerCelebrationGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @symbol ??0VillagerCelebrationGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0VillagerCelebrationGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI VillagerCelebrationGoal(class Mob &); //private: /** - * @symbol ?_launchFirework\@VillagerCelebrationGoal\@\@AEAAXXZ + * @symbol ?_launchFirework\@VillagerCelebrationGoal\@\@AEAAXXZ */ MCAPI void _launchFirework(); /** - * @symbol ?_setNextFireworkTick\@VillagerCelebrationGoal\@\@AEAAXXZ + * @symbol ?_setNextFireworkTick\@VillagerCelebrationGoal\@\@AEAAXXZ */ MCAPI void _setNextFireworkTick(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillagerV2.hpp b/LiteLoader/include/llapi/mc/VillagerV2.hpp index d6ed8b9ad8..68ef3e65fa 100644 --- a/LiteLoader/include/llapi/mc/VillagerV2.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2.hpp @@ -32,183 +32,178 @@ class VillagerV2 : public VillagerBase { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@VillagerV2\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@VillagerV2\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~VillagerV2(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@VillagerV2\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@VillagerV2\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 21 - * @symbol ?isRuntimePredictedMovementEnabled\@VillagerV2\@\@UEBA_NXZ + * @vftbl 21 + * @symbol ?isRuntimePredictedMovementEnabled\@VillagerV2\@\@UEBA_NXZ */ virtual bool isRuntimePredictedMovementEnabled() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 200 - * @symbol ?buildDebugInfo\@VillagerV2\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 199 + * @symbol ?buildDebugInfo\@VillagerV2\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void buildDebugInfo(std::string &) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 231 - * @symbol ?getInteraction\@VillagerV2\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z + * @vftbl 230 + * @symbol ?getInteraction\@VillagerV2\@\@UEAA_NAEAVPlayer\@\@AEAVActorInteraction\@\@AEBVVec3\@\@\@Z */ virtual bool getInteraction(class Player &, class ActorInteraction &, class Vec3 const &); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@VillagerV2\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@VillagerV2\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@VillagerV2\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@VillagerV2\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 289 - * @symbol ?travel\@VillagerV2\@\@UEAAXMMM\@Z + * @vftbl 286 + * @symbol ?travel\@VillagerV2\@\@UEAAXMMM_N\@Z */ - virtual void travel(float, float, float); + virtual void travel(float, float, float, bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 349 - * @symbol ?newServerAiStep\@VillagerV2\@\@UEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@VillagerV2\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0VillagerV2\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0VillagerV2\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI VillagerV2(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp b/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp index b2a781db66..f33b1c3c04 100644 --- a/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp +++ b/LiteLoader/include/llapi/mc/VillagerV2PreTravelSystem.hpp @@ -25,16 +25,16 @@ class VillagerV2PreTravelSystem { public: /** - * @symbol ?createSystem\@VillagerV2PreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@VillagerV2PreTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doVillagerV2PreTravel\@VillagerV2PreTravelSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUSynchedActorDataComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@V?$FlagComponent\@USkipMobTravelFlag\@\@\@\@\@\@\@Z + * @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>); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VindicationIllager.hpp b/LiteLoader/include/llapi/mc/VindicationIllager.hpp index 7c4598e06c..8cfae73fb2 100644 --- a/LiteLoader/include/llapi/mc/VindicationIllager.hpp +++ b/LiteLoader/include/llapi/mc/VindicationIllager.hpp @@ -32,149 +32,144 @@ class VindicationIllager : public HumanoidMonster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~VindicationIllager(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 340 - * @symbol ?_getWalkTargetValue\@VindicationIllager\@\@UEAAMAEBVBlockPos\@\@\@Z + * @vftbl 337 + * @symbol ?_getWalkTargetValue\@VindicationIllager\@\@UEAAMAEBVBlockPos\@\@\@Z */ virtual float _getWalkTargetValue(class BlockPos const &); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VINDICATIONILLAGER /** - * @symbol ?canExistInPeaceful\@VindicationIllager\@\@UEBA_NXZ + * @symbol ?canExistInPeaceful\@VindicationIllager\@\@UEBA_NXZ */ MCVAPI bool canExistInPeaceful() const; #endif /** - * @symbol ??0VindicationIllager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0VindicationIllager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI VindicationIllager(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VineBlock.hpp b/LiteLoader/include/llapi/mc/VineBlock.hpp index 6b6208d4af..691adfe0f2 100644 --- a/LiteLoader/include/llapi/mc/VineBlock.hpp +++ b/LiteLoader/include/llapi/mc/VineBlock.hpp @@ -31,324 +31,333 @@ class VineBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VineBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 91 - * @symbol ?mayPlace\@VineBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 91 + * @symbol ?mayPlace\@VineBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@VineBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@VineBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@VineBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@VineBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 136 - * @symbol ?getColor\@VineBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 136 + * @symbol ?getColor\@VineBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual int getColor(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@VineBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 172 - * @symbol ?randomTick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 172 + * @symbol ?randomTick\@VineBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void randomTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@VineBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@VineBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@VineBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@VineBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 187 + * @symbol ?playerDestroy\@VineBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 188 - * @symbol ?getResourceCount\@VineBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 189 + * @symbol ?getResourceCount\@VineBlock\@\@UEBAHAEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual int getResourceCount(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_VINEBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@VineBlock\@\@UEBA_NXZ + * @symbol ?canBeSilkTouched\@VineBlock\@\@UEBA_NXZ + */ + MCVAPI bool canBeSilkTouched() const; + /** + * @symbol ?waterSpreadCausesSpawn\@VineBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0VineBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0VineBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI VineBlock(std::string const &, int); /** - * @symbol ?growDown\@VineBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?growDown\@VineBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void growDown(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?growSideways\@VineBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?growSideways\@VineBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void growSideways(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?growUp\@VineBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?growUp\@VineBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void growUp(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?VINE_ALL\@VineBlock\@\@2HB + * @symbol ?VINE_ALL\@VineBlock\@\@2HB */ MCAPI static int const VINE_ALL; /** - * @symbol ?VINE_EAST\@VineBlock\@\@2HB + * @symbol ?VINE_EAST\@VineBlock\@\@2HB */ MCAPI static int const VINE_EAST; /** - * @symbol ?VINE_NORTH\@VineBlock\@\@2HB + * @symbol ?VINE_NORTH\@VineBlock\@\@2HB */ MCAPI static int const VINE_NORTH; /** - * @symbol ?VINE_SOUTH\@VineBlock\@\@2HB + * @symbol ?VINE_SOUTH\@VineBlock\@\@2HB */ MCAPI static int const VINE_SOUTH; /** - * @symbol ?VINE_WEST\@VineBlock\@\@2HB + * @symbol ?VINE_WEST\@VineBlock\@\@2HB */ MCAPI static int const VINE_WEST; /** - * @symbol ?getBlockForFace\@VineBlock\@\@SAAEBVBlock\@\@E\@Z + * @symbol ?getBlockForFace\@VineBlock\@\@SAAEBVBlock\@\@E\@Z */ MCAPI static class Block const & getBlockForFace(unsigned char); /** - * @symbol ?isAcceptableNeighbour\@VineBlock\@\@SA_NAEBVBlock\@\@\@Z + * @symbol ?isAcceptableNeighbour\@VineBlock\@\@SA_NAEBVBlock\@\@\@Z */ MCAPI static bool isAcceptableNeighbour(class Block const &); //private: /** - * @symbol ?_canGrowDown\@VineBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canGrowDown\@VineBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canGrowDown(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_canGrowUp\@VineBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canGrowUp\@VineBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canGrowUp(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_canSideSpread\@VineBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_canSideSpread\@VineBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _canSideSpread(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_nextVineDirections\@VineBlock\@\@AEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_nextVineDirections\@VineBlock\@\@AEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI int _nextVineDirections(class BlockSource &, class BlockPos const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VinesFeature.hpp b/LiteLoader/include/llapi/mc/VinesFeature.hpp index bcbf69e593..b95ee985c8 100644 --- a/LiteLoader/include/llapi/mc/VinesFeature.hpp +++ b/LiteLoader/include/llapi/mc/VinesFeature.hpp @@ -31,14 +31,14 @@ class VinesFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VinesFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@VinesFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@VinesFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VinesSingleFaceFeature.hpp b/LiteLoader/include/llapi/mc/VinesSingleFaceFeature.hpp index fabe41aabd..7f055c3c99 100644 --- a/LiteLoader/include/llapi/mc/VinesSingleFaceFeature.hpp +++ b/LiteLoader/include/llapi/mc/VinesSingleFaceFeature.hpp @@ -30,14 +30,14 @@ class VinesSingleFaceFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VinesSingleFaceFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@VinesSingleFaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@VinesSingleFaceFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp b/LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp index 595bafc38a..47c8278b79 100644 --- a/LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp +++ b/LiteLoader/include/llapi/mc/VirtualCommandOrigin.hpp @@ -32,144 +32,144 @@ class VirtualCommandOrigin : public CommandOrigin { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VirtualCommandOrigin(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getRequestId\@VirtualCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?getRequestId\@VirtualCommandOrigin\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getRequestId() const; /** - * @vftbl 2 - * @symbol ?getName\@VirtualCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 2 + * @symbol ?getName\@VirtualCommandOrigin\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string getName() const; /** - * @vftbl 3 - * @symbol ?getBlockPosition\@VirtualCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ + * @vftbl 3 + * @symbol ?getBlockPosition\@VirtualCommandOrigin\@\@UEBA?AVBlockPos\@\@XZ */ virtual class BlockPos getBlockPosition() const; /** - * @vftbl 4 - * @symbol ?getWorldPosition\@VirtualCommandOrigin\@\@UEBA?AVVec3\@\@XZ + * @vftbl 4 + * @symbol ?getWorldPosition\@VirtualCommandOrigin\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getWorldPosition() const; /** - * @vftbl 5 - * @symbol ?getRotation\@VirtualCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ + * @vftbl 5 + * @symbol ?getRotation\@VirtualCommandOrigin\@\@UEBA?AV?$optional\@VVec2\@\@\@std\@\@XZ */ virtual class std::optional getRotation() const; /** - * @vftbl 6 - * @symbol ?getLevel\@VirtualCommandOrigin\@\@UEBAPEAVLevel\@\@XZ + * @vftbl 6 + * @symbol ?getLevel\@VirtualCommandOrigin\@\@UEBAPEAVLevel\@\@XZ */ virtual class Level * getLevel() const; /** - * @vftbl 7 - * @symbol ?getDimension\@VirtualCommandOrigin\@\@UEBAPEAVDimension\@\@XZ + * @vftbl 7 + * @symbol ?getDimension\@VirtualCommandOrigin\@\@UEBAPEAVDimension\@\@XZ */ virtual class Dimension * getDimension() const; /** - * @vftbl 8 - * @symbol ?getEntity\@VirtualCommandOrigin\@\@UEBAPEAVActor\@\@XZ + * @vftbl 8 + * @symbol ?getEntity\@VirtualCommandOrigin\@\@UEBAPEAVActor\@\@XZ */ virtual class Actor * getEntity() const; /** - * @vftbl 9 - * @symbol ?getPermissionsLevel\@VirtualCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ + * @vftbl 9 + * @symbol ?getPermissionsLevel\@VirtualCommandOrigin\@\@UEBA?AW4CommandPermissionLevel\@\@XZ */ virtual enum class CommandPermissionLevel getPermissionsLevel() const; /** - * @vftbl 10 - * @symbol ?clone\@VirtualCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?clone\@VirtualCommandOrigin\@\@UEBA?AV?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; /** - * @vftbl 13 - * @symbol ?hasChatPerms\@VirtualCommandOrigin\@\@UEBA_NXZ + * @vftbl 13 + * @symbol ?hasChatPerms\@VirtualCommandOrigin\@\@UEBA_NXZ */ virtual bool hasChatPerms() const; /** - * @vftbl 14 - * @symbol ?hasTellPerms\@VirtualCommandOrigin\@\@UEBA_NXZ + * @vftbl 14 + * @symbol ?hasTellPerms\@VirtualCommandOrigin\@\@UEBA_NXZ */ virtual bool hasTellPerms() const; /** - * @vftbl 15 - * @symbol ?canUseAbility\@VirtualCommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z + * @vftbl 15 + * @symbol ?canUseAbility\@VirtualCommandOrigin\@\@UEBA_NW4AbilitiesIndex\@\@\@Z */ virtual bool canUseAbility(enum class AbilitiesIndex) const; /** - * @vftbl 17 - * @symbol ?canUseCommandsWithoutCheatsEnabled\@VirtualCommandOrigin\@\@UEBA_NXZ + * @vftbl 17 + * @symbol ?canUseCommandsWithoutCheatsEnabled\@VirtualCommandOrigin\@\@UEBA_NXZ */ virtual bool canUseCommandsWithoutCheatsEnabled() const; /** - * @vftbl 18 - * @symbol ?isSelectorExpansionAllowed\@VirtualCommandOrigin\@\@UEBA_NXZ + * @vftbl 18 + * @symbol ?isSelectorExpansionAllowed\@VirtualCommandOrigin\@\@UEBA_NXZ */ virtual bool isSelectorExpansionAllowed() const; /** - * @vftbl 19 - * @symbol ?getSourceId\@VirtualCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ + * @vftbl 19 + * @symbol ?getSourceId\@VirtualCommandOrigin\@\@UEBAAEBVNetworkIdentifier\@\@XZ */ virtual class NetworkIdentifier const & getSourceId() const; /** - * @vftbl 21 - * @symbol ?getOutputReceiver\@VirtualCommandOrigin\@\@UEBAAEBVCommandOrigin\@\@XZ + * @vftbl 21 + * @symbol ?getOutputReceiver\@VirtualCommandOrigin\@\@UEBAAEBVCommandOrigin\@\@XZ */ virtual class CommandOrigin const & getOutputReceiver() const; /** - * @vftbl 22 - * @symbol ?getIdentity\@VirtualCommandOrigin\@\@UEBA?AUCommandOriginIdentity\@\@XZ + * @vftbl 22 + * @symbol ?getIdentity\@VirtualCommandOrigin\@\@UEBA?AUCommandOriginIdentity\@\@XZ */ virtual struct CommandOriginIdentity getIdentity() const; /** - * @vftbl 23 - * @symbol ?getOriginType\@VirtualCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ + * @vftbl 23 + * @symbol ?getOriginType\@VirtualCommandOrigin\@\@UEBA?AW4CommandOriginType\@\@XZ */ virtual enum class CommandOriginType getOriginType() const; /** - * @vftbl 27 - * @symbol ?updateValues\@VirtualCommandOrigin\@\@UEAAXXZ + * @vftbl 27 + * @symbol ?updateValues\@VirtualCommandOrigin\@\@UEAAXXZ */ virtual void updateValues(); /** - * @vftbl 28 - * @symbol ?getExecutePosition\@VirtualCommandOrigin\@\@UEBA?BVVec3\@\@HAEBVCommandPositionFloat\@\@\@Z + * @vftbl 28 + * @symbol ?getExecutePosition\@VirtualCommandOrigin\@\@UEBA?BVVec3\@\@HAEBVCommandPositionFloat\@\@\@Z */ virtual class Vec3 const getExecutePosition(int, class CommandPositionFloat const &) const; /** - * @vftbl 29 - * @symbol ?serialize\@VirtualCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ + * @vftbl 29 + * @symbol ?serialize\@VirtualCommandOrigin\@\@UEBA?AVCompoundTag\@\@XZ */ virtual class CompoundTag serialize() const; /** - * @vftbl 30 - * @symbol ?isValid\@VirtualCommandOrigin\@\@UEBA_NXZ + * @vftbl 30 + * @symbol ?isValid\@VirtualCommandOrigin\@\@UEBA_NXZ */ virtual bool isValid() const; /** - * @symbol ??0VirtualCommandOrigin\@\@QEAA\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@0AEBVCommandPositionFloat\@\@H\@Z + * @symbol ??0VirtualCommandOrigin\@\@QEAA\@AEBVCommandOrigin\@\@0AEBVCommandPositionFloat\@\@H\@Z */ - MCAPI VirtualCommandOrigin(std::unique_ptr, std::unique_ptr, class CommandPositionFloat const &, int); + MCAPI VirtualCommandOrigin(class CommandOrigin const &, class CommandOrigin const &, class CommandPositionFloat const &, int); /** - * @symbol ??0VirtualCommandOrigin\@\@QEAA\@AEBVCommandOrigin\@\@AEAVActor\@\@AEBVCommandPositionFloat\@\@H\@Z + * @symbol ??0VirtualCommandOrigin\@\@QEAA\@V?$unique_ptr\@VCommandOrigin\@\@U?$default_delete\@VCommandOrigin\@\@\@std\@\@\@std\@\@0AEBVCommandPositionFloat\@\@H\@Z */ - MCAPI VirtualCommandOrigin(class CommandOrigin const &, class Actor &, class CommandPositionFloat const &, int); + MCAPI VirtualCommandOrigin(std::unique_ptr, std::unique_ptr, class CommandPositionFloat const &, int); /** - * @symbol ??0VirtualCommandOrigin\@\@QEAA\@AEBVCommandOrigin\@\@0AEBVCommandPositionFloat\@\@H\@Z + * @symbol ??0VirtualCommandOrigin\@\@QEAA\@AEBVCommandOrigin\@\@AEAVActor\@\@AEBVCommandPositionFloat\@\@H\@Z */ - MCAPI VirtualCommandOrigin(class CommandOrigin const &, class CommandOrigin const &, class CommandPositionFloat const &, int); + MCAPI VirtualCommandOrigin(class CommandOrigin const &, class Actor &, class CommandPositionFloat const &, int); /** - * @symbol ?getOrigin\@VirtualCommandOrigin\@\@QEBAPEAVCommandOrigin\@\@XZ + * @symbol ?getOrigin\@VirtualCommandOrigin\@\@QEBAPEAVCommandOrigin\@\@XZ */ MCAPI class CommandOrigin * getOrigin() const; /** - * @symbol ?load\@VirtualCommandOrigin\@\@SA?AV?$unique_ptr\@VVirtualCommandOrigin\@\@U?$default_delete\@VVirtualCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z + * @symbol ?load\@VirtualCommandOrigin\@\@SA?AV?$unique_ptr\@VVirtualCommandOrigin\@\@U?$default_delete\@VVirtualCommandOrigin\@\@\@std\@\@\@std\@\@AEBVCompoundTag\@\@AEAVServerLevel\@\@\@Z */ MCAPI static std::unique_ptr load(class CompoundTag const &, class ServerLevel &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp b/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp index b795421962..d3e13c1d41 100644 --- a/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp +++ b/LiteLoader/include/llapi/mc/VolumeAreaCommand.hpp @@ -29,38 +29,38 @@ class VolumeAreaCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~VolumeAreaCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@VolumeAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@VolumeAreaCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@VolumeAreaCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@VolumeAreaCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); //private: /** - * @symbol ?_add\@VolumeAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVDimension\@\@AEAVVolumeEntityManagerServer\@\@AEAVPacketSender\@\@\@Z + * @symbol ?_add\@VolumeAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVDimension\@\@AEAVVolumeEntityManagerServer\@\@AEAVPacketSender\@\@\@Z */ MCAPI void _add(class CommandOrigin const &, class CommandOutput &, class Dimension const &, class VolumeEntityManagerServer &, class PacketSender &) const; /** - * @symbol ?_list\@VolumeAreaCommand\@\@AEBAXAEAVCommandOutput\@\@AEBVLevel\@\@AEBVDimension\@\@AEBVVolumeEntityManagerServer\@\@\@Z + * @symbol ?_list\@VolumeAreaCommand\@\@AEBAXAEAVCommandOutput\@\@AEBVLevel\@\@AEBVDimension\@\@AEBVVolumeEntityManagerServer\@\@\@Z */ MCAPI void _list(class CommandOutput &, class Level const &, class Dimension const &, class VolumeEntityManagerServer const &) const; /** - * @symbol ?_remove\@VolumeAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVDimension\@\@AEAVVolumeEntityManagerServer\@\@AEAVPacketSender\@\@\@Z + * @symbol ?_remove\@VolumeAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVDimension\@\@AEAVVolumeEntityManagerServer\@\@AEAVPacketSender\@\@\@Z */ MCAPI void _remove(class CommandOrigin const &, class CommandOutput &, class Dimension const &, class VolumeEntityManagerServer &, class PacketSender &) const; /** - * @symbol ?_removeAll\@VolumeAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVDimension\@\@AEAVVolumeEntityManagerServer\@\@AEAVPacketSender\@\@\@Z + * @symbol ?_removeAll\@VolumeAreaCommand\@\@AEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@AEBVDimension\@\@AEAVVolumeEntityManagerServer\@\@AEAVPacketSender\@\@\@Z */ MCAPI void _removeAll(class CommandOrigin const &, class CommandOutput &, class Dimension const &, class VolumeEntityManagerServer &, class PacketSender &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeComponentFactory.hpp b/LiteLoader/include/llapi/mc/VolumeComponentFactory.hpp index efac030344..4ea90e6968 100644 --- a/LiteLoader/include/llapi/mc/VolumeComponentFactory.hpp +++ b/LiteLoader/include/llapi/mc/VolumeComponentFactory.hpp @@ -23,16 +23,13 @@ class VolumeComponentFactory { public: class VolumeComponentFactory& operator=(class VolumeComponentFactory const &) = delete; VolumeComponentFactory(class VolumeComponentFactory const &) = delete; + VolumeComponentFactory() = delete; #endif public: /** - * @symbol ??0VolumeComponentFactory\@\@QEAA\@XZ - */ - MCAPI VolumeComponentFactory(); - /** - * @symbol ?registerVolumeComponentDefinitions\@VolumeComponentFactory\@\@QEAAX_N\@Z + * @symbol ?registerVolumeComponentDefinitions\@VolumeComponentFactory\@\@QEAAX_N\@Z */ MCAPI void registerVolumeComponentDefinitions(bool); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeCreationDataComponent.hpp b/LiteLoader/include/llapi/mc/VolumeCreationDataComponent.hpp index 668f93b4ab..7bb8043a8c 100644 --- a/LiteLoader/include/llapi/mc/VolumeCreationDataComponent.hpp +++ b/LiteLoader/include/llapi/mc/VolumeCreationDataComponent.hpp @@ -28,8 +28,8 @@ class VolumeCreationDataComponent { public: /** - * @symbol ??1VolumeCreationDataComponent\@\@QEAA\@XZ + * @symbol ??1VolumeCreationDataComponent\@\@QEAA\@XZ */ MCAPI ~VolumeCreationDataComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeDefinition.hpp b/LiteLoader/include/llapi/mc/VolumeDefinition.hpp index e1df55ec82..f65d44ef5a 100644 --- a/LiteLoader/include/llapi/mc/VolumeDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VolumeDefinition.hpp @@ -29,31 +29,27 @@ struct VolumeDefinition { public: /** - * @symbol ??0VolumeDefinition\@\@QEAA\@XZ + * @symbol ??0VolumeDefinition\@\@QEAA\@XZ */ MCAPI VolumeDefinition(); /** - * @symbol ??0VolumeDefinition\@\@QEAA\@$$QEAU0\@\@Z - */ - MCAPI VolumeDefinition(struct VolumeDefinition &&); - /** - * @symbol ??1VolumeDefinition\@\@QEAA\@XZ + * @symbol ??1VolumeDefinition\@\@QEAA\@XZ */ MCAPI ~VolumeDefinition(); /** - * @symbol ?NAME\@VolumeDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NAME\@VolumeDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NAME; /** - * @symbol ?bindType\@VolumeDefinition\@\@SAXXZ + * @symbol ?bindType\@VolumeDefinition\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getMaxSupportedVersion\@VolumeDefinition\@\@SAAEBVSemVersion\@\@XZ + * @symbol ?getMaxSupportedVersion\@VolumeDefinition\@\@SAAEBVSemVersion\@\@XZ */ MCAPI static class SemVersion const & getMaxSupportedVersion(); /** - * @symbol ?getMinSupportedVersion\@VolumeDefinition\@\@SAAEBVSemVersion\@\@XZ + * @symbol ?getMinSupportedVersion\@VolumeDefinition\@\@SAAEBVSemVersion\@\@XZ */ MCAPI static class SemVersion const & getMinSupportedVersion(); diff --git a/LiteLoader/include/llapi/mc/VolumeDefinitionGroup.hpp b/LiteLoader/include/llapi/mc/VolumeDefinitionGroup.hpp index d73d662f22..de612b23db 100644 --- a/LiteLoader/include/llapi/mc/VolumeDefinitionGroup.hpp +++ b/LiteLoader/include/llapi/mc/VolumeDefinitionGroup.hpp @@ -29,36 +29,36 @@ class VolumeDefinitionGroup { public: /** - * @symbol ??0VolumeDefinitionGroup\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVVolumeComponentFactory\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0VolumeDefinitionGroup\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@$$CBVVolumeComponentFactory\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI VolumeDefinitionGroup(class gsl::not_null>); /** - * @symbol ?loadDefinitions\@VolumeDefinitionGroup\@\@QEAAXAEBVResourcePackManager\@\@_N\@Z + * @symbol ?loadDefinitions\@VolumeDefinitionGroup\@\@QEAAXAEBVResourcePackManager\@\@_N\@Z */ MCAPI void loadDefinitions(class ResourcePackManager const &, bool); /** - * @symbol ?tryGetVolumeDefinition\@VolumeDefinitionGroup\@\@QEBAPEBUVolumeDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?tryGetVolumeDefinition\@VolumeDefinitionGroup\@\@QEBAPEBUVolumeDefinition\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI struct VolumeDefinition const * tryGetVolumeDefinition(std::string const &) const; /** - * @symbol ??1VolumeDefinitionGroup\@\@QEAA\@XZ + * @symbol ??1VolumeDefinitionGroup\@\@QEAA\@XZ */ MCAPI ~VolumeDefinitionGroup(); /** - * @symbol ?bindVolumeDefinitions\@VolumeDefinitionGroup\@\@SAXXZ + * @symbol ?bindVolumeDefinitions\@VolumeDefinitionGroup\@\@SAXXZ */ MCAPI static void bindVolumeDefinitions(); //private: /** - * @symbol ?_parseAndRegisterDefinition\@VolumeDefinitionGroup\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@0\@Z + * @symbol ?_parseAndRegisterDefinition\@VolumeDefinitionGroup\@\@AEAA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVSemVersion\@\@0\@Z */ MCAPI bool _parseAndRegisterDefinition(std::string const &, class SemVersion const &, std::string const &); /** - * @symbol ?_registerDefinition\@VolumeDefinitionGroup\@\@AEAA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_registerDefinition\@VolumeDefinitionGroup\@\@AEAA_NAEAV?$GenericDocument\@U?$UTF8\@D\@rapidjson\@\@V?$MemoryPoolAllocator\@VCrtAllocator\@rapidjson\@\@\@2\@VCrtAllocator\@2\@\@rapidjson\@\@AEBVSemVersion\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _registerDefinition(class rapidjson::GenericDocument, class rapidjson::MemoryPoolAllocator, class rapidjson::CrtAllocator> &, class SemVersion const &, std::string const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeEntityManager.hpp b/LiteLoader/include/llapi/mc/VolumeEntityManager.hpp index afb1dfd1bb..8cc2d54e74 100644 --- a/LiteLoader/include/llapi/mc/VolumeEntityManager.hpp +++ b/LiteLoader/include/llapi/mc/VolumeEntityManager.hpp @@ -35,33 +35,39 @@ struct VolumeEntityDefinition { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_VOLUMEENTITYMANAGER /** - * @symbol ?getVolumeInstanceCount\@VolumeEntityManager\@\@QEBA_KXZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~VolumeEntityManager(); +#endif + /** + * @symbol ?getVolumeInstanceCount\@VolumeEntityManager\@\@QEBA_KXZ */ MCAPI unsigned __int64 getVolumeInstanceCount() const; /** - * @symbol ?getVolumeInstances\@VolumeEntityManager\@\@QEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getVolumeInstances\@VolumeEntityManager\@\@QEBAAEBV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI std::vector> const & getVolumeInstances(class AutomaticID) const; /** - * @symbol ?isTriggerVolumesEnabled\@VolumeEntityManager\@\@2_NA + * @symbol ?isTriggerVolumesEnabled\@VolumeEntityManager\@\@2_NA */ MCAPI static bool isTriggerVolumesEnabled; /** - * @symbol ?registerComponentNetRelevancy\@VolumeEntityManager\@\@SAXAEAVComponentNetRelevancyRegistry\@\@\@Z + * @symbol ?registerComponentNetRelevancy\@VolumeEntityManager\@\@SAXAEAVComponentNetRelevancyRegistry\@\@\@Z */ MCAPI static void registerComponentNetRelevancy(class ComponentNetRelevancyRegistry &); //protected: /** - * @symbol ??0VolumeEntityManager\@\@IEAA\@V?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@\@Z + * @symbol ??0VolumeEntityManager\@\@IEAA\@V?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@\@Z */ MCAPI VolumeEntityManager(class StackRefResultT); /** - * @symbol ?_createVolumeEntity\@VolumeEntityManager\@\@IEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBVDefinitionInstanceGroup\@\@\@Z + * @symbol ?_createVolumeEntity\@VolumeEntityManager\@\@IEAA?AV?$OwnerPtrT\@UEntityRefTraits\@\@\@\@AEBVDefinitionInstanceGroup\@\@\@Z */ MCAPI class OwnerPtrT _createVolumeEntity(class DefinitionInstanceGroup const &); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp b/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp index 26b0575f00..f4fab5da8a 100644 --- a/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp +++ b/LiteLoader/include/llapi/mc/VolumeEntityManagerServer.hpp @@ -30,40 +30,48 @@ class VolumeEntityManagerServer { public: /** - * @symbol ??0VolumeEntityManagerServer\@\@QEAA\@V?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@\@Z + * @symbol ??0VolumeEntityManagerServer\@\@QEAA\@V?$StackRefResultT\@UEntityRegistryRefTraits\@\@\@\@\@Z */ MCAPI VolumeEntityManagerServer(class StackRefResultT); /** - * @symbol ?createVolume\@VolumeEntityManagerServer\@\@QEAA?AU?$pair\@W4CreateVolumeResult\@VolumeEntityManagerServer\@\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@\@std\@\@AEAVLevelStorage\@\@AEAVPacketSender\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVBlockPos\@\@3V?$AutomaticID\@VDimension\@\@H\@\@2\@Z + * @symbol ?createVolume\@VolumeEntityManagerServer\@\@QEAA?AU?$pair\@W4CreateVolumeResult\@VolumeEntityManagerServer\@\@V?$StackRefResultT\@UEntityRefTraits\@\@\@\@\@std\@\@AEAVLevelStorage\@\@AEAVPacketSender\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@AEBVBlockPos\@\@3V?$AutomaticID\@VDimension\@\@H\@\@2\@Z */ MCAPI struct std::pair> createVolume(class LevelStorage &, class PacketSender &, std::string const &, class BlockPos const &, class BlockPos const &, class AutomaticID, std::string const &); /** - * @symbol ?getAllVolumesOverlappingChunkPosition\@VolumeEntityManagerServer\@\@QEBA?AV?$vector\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + * @symbol ?getAllVolumesOverlappingChunkPosition\@VolumeEntityManagerServer\@\@QEBA?AV?$vector\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEBVChunkPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z */ MCAPI std::vector> getAllVolumesOverlappingChunkPosition(class ChunkPos const &, class AutomaticID) const; /** - * @symbol ?loadVolumeFiles\@VolumeEntityManagerServer\@\@QEAAXAEBVResourcePackManager\@\@_N\@Z + * @symbol ?loadVolumeFiles\@VolumeEntityManagerServer\@\@QEAAXAEBVResourcePackManager\@\@_N\@Z */ MCAPI void loadVolumeFiles(class ResourcePackManager const &, bool); /** - * @symbol ?loadVolumeInstances\@VolumeEntityManagerServer\@\@QEAAXAEBVLevelStorage\@\@_N\@Z + * @symbol ?loadVolumeInstances\@VolumeEntityManagerServer\@\@QEAAXAEBVLevelStorage\@\@_N\@Z */ MCAPI void loadVolumeInstances(class LevelStorage const &, bool); /** - * @symbol ?removeAllVolumes\@VolumeEntityManagerServer\@\@QEAA?AV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVPacketSender\@\@\@Z + * @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 + * @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 + * @symbol ?removeVolumes\@VolumeEntityManagerServer\@\@QEAA?AV?$vector\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@V?$allocator\@V?$OwnerPtrT\@UEntityRefTraits\@\@\@\@\@std\@\@\@std\@\@AEAVLevelStorage\@\@AEBVBlockPos\@\@V?$AutomaticID\@VDimension\@\@H\@\@AEAVPacketSender\@\@\@Z */ MCAPI std::vector> removeVolumes(class LevelStorage &, class BlockPos const &, class AutomaticID, class PacketSender &); /** - * @symbol ?sendAllVolumesToClient\@VolumeEntityManagerServer\@\@QEBAXAEBVUserEntityIdentifierComponent\@\@AEBVNetworkIdentifier\@\@AEAVPacketSender\@\@\@Z + * @symbol ?sendAllVolumesToClient\@VolumeEntityManagerServer\@\@QEBAXAEBVUserEntityIdentifierComponent\@\@AEBVNetworkIdentifier\@\@AEAVPacketSender\@\@\@Z */ MCAPI void sendAllVolumesToClient(class UserEntityIdentifierComponent const &, class NetworkIdentifier const &, class PacketSender &) const; -}; \ No newline at end of file +//private: + /** + * @symbol ?_findUsableName\@VolumeEntityManagerServer\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@V?$AutomaticID\@VDimension\@\@H\@\@\@Z + */ + MCAPI std::string _findUsableName(class AutomaticID) const; + +private: + +}; diff --git a/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp b/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp index d48c3f03d1..bb847b9f70 100644 --- a/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp +++ b/LiteLoader/include/llapi/mc/VolumeFogComponent.hpp @@ -28,12 +28,12 @@ class VolumeFogComponent { public: /** - * @symbol ??4VolumeFogComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4VolumeFogComponent\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class VolumeFogComponent & operator=(class VolumeFogComponent &&); /** - * @symbol ??1VolumeFogComponent\@\@QEAA\@XZ + * @symbol ??1VolumeFogComponent\@\@QEAA\@XZ */ MCAPI ~VolumeFogComponent(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/VolumeFogDefinition.hpp b/LiteLoader/include/llapi/mc/VolumeFogDefinition.hpp index 7d573881c7..e69003087c 100644 --- a/LiteLoader/include/llapi/mc/VolumeFogDefinition.hpp +++ b/LiteLoader/include/llapi/mc/VolumeFogDefinition.hpp @@ -30,19 +30,19 @@ struct VolumeFogDefinition { public: /** - * @symbol ?initialize\@VolumeFogDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVVolumeFogComponent\@\@\@Z + * @symbol ?initialize\@VolumeFogDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVVolumeFogComponent\@\@\@Z */ MCAPI void initialize(class EntityContext &, class VolumeFogComponent &) const; /** - * @symbol ??1VolumeFogDefinition\@\@QEAA\@XZ + * @symbol ??1VolumeFogDefinition\@\@QEAA\@XZ */ MCAPI ~VolumeFogDefinition(); /** - * @symbol ?NAME\@VolumeFogDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NAME\@VolumeFogDefinition\@\@2V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI static std::string const NAME; /** - * @symbol ?bindType\@VolumeFogDefinition\@\@SAXXZ + * @symbol ?bindType\@VolumeFogDefinition\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/VolumeIdentifier.hpp b/LiteLoader/include/llapi/mc/VolumeIdentifier.hpp index d6e69aebd9..1c402f26fb 100644 --- a/LiteLoader/include/llapi/mc/VolumeIdentifier.hpp +++ b/LiteLoader/include/llapi/mc/VolumeIdentifier.hpp @@ -30,11 +30,11 @@ struct VolumeIdentifier { public: /** - * @symbol ??8VolumeIdentifier\@\@QEBA_NAEBU0\@\@Z + * @symbol ??8VolumeIdentifier\@\@QEBA_NAEBU0\@\@Z */ MCAPI bool operator==(struct VolumeIdentifier const &) const; /** - * @symbol ?bindType\@VolumeIdentifier\@\@SAXXZ + * @symbol ?bindType\@VolumeIdentifier\@\@SAXXZ */ MCAPI static void bindType(); diff --git a/LiteLoader/include/llapi/mc/VolumeInstanceData.hpp b/LiteLoader/include/llapi/mc/VolumeInstanceData.hpp index 1f6af7ea42..303bdde112 100644 --- a/LiteLoader/include/llapi/mc/VolumeInstanceData.hpp +++ b/LiteLoader/include/llapi/mc/VolumeInstanceData.hpp @@ -20,19 +20,19 @@ namespace VolumeInstanceData { #undef AFTER_EXTRA /** - * @symbol ?bindVolumeStorageType\@VolumeInstanceData\@\@YAXXZ + * @symbol ?bindVolumeStorageType\@VolumeInstanceData\@\@YAXXZ */ MCAPI void bindVolumeStorageType(); /** - * @symbol ?deserialize\@VolumeInstanceData\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVEntityContext\@\@\@Z + * @symbol ?deserialize\@VolumeInstanceData\@\@YAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@AEAVEntityContext\@\@\@Z */ MCAPI void deserialize(std::string const &, class CompoundTag const &, class EntityContext &); /** - * @symbol ?getIdentifier\@VolumeInstanceData\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z + * @symbol ?getIdentifier\@VolumeInstanceData\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVCompoundTag\@\@\@Z */ MCAPI std::string const & getIdentifier(class CompoundTag const &); /** - * @symbol ?serialize\@VolumeInstanceData\@\@YA?AVCompoundTag\@\@AEBVEntityContext\@\@\@Z + * @symbol ?serialize\@VolumeInstanceData\@\@YA?AVCompoundTag\@\@AEBVEntityContext\@\@\@Z */ MCAPI class CompoundTag serialize(class EntityContext const &); diff --git a/LiteLoader/include/llapi/mc/VoronoiZoomMultiNoise.hpp b/LiteLoader/include/llapi/mc/VoronoiZoomMultiNoise.hpp index 93cfe4d003..1435e37900 100644 --- a/LiteLoader/include/llapi/mc/VoronoiZoomMultiNoise.hpp +++ b/LiteLoader/include/llapi/mc/VoronoiZoomMultiNoise.hpp @@ -22,11 +22,11 @@ namespace VoronoiZoomMultiNoise { #undef AFTER_EXTRA /** - * @symbol ?getGridOffset\@VoronoiZoomMultiNoise\@\@YA?AVVec3\@\@AEBVSimplePositionalRandomFactory\@\@VBlockPos\@\@\@Z + * @symbol ?getGridOffset\@VoronoiZoomMultiNoise\@\@YA?AVVec3\@\@AEBVSimplePositionalRandomFactory\@\@VBlockPos\@\@\@Z */ MCAPI class Vec3 getGridOffset(class SimplePositionalRandomFactory const &, class BlockPos); /** - * @symbol ?getZoomedVoronoiCellIndex\@VoronoiZoomMultiNoise\@\@YAIVBlockPos\@\@AEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@III\@Z + * @symbol ?getZoomedVoronoiCellIndex\@VoronoiZoomMultiNoise\@\@YAIVBlockPos\@\@AEBV?$vector\@VVec3\@\@V?$allocator\@VVec3\@\@\@std\@\@\@std\@\@III\@Z */ MCAPI unsigned int getZoomedVoronoiCellIndex(class BlockPos, std::vector const &, unsigned int, unsigned int, unsigned int); diff --git a/LiteLoader/include/llapi/mc/WASDControlledDefinition.hpp b/LiteLoader/include/llapi/mc/WASDControlledDefinition.hpp index dd7100ac3c..31a062ff41 100644 --- a/LiteLoader/include/llapi/mc/WASDControlledDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WASDControlledDefinition.hpp @@ -31,15 +31,15 @@ struct WASDControlledDefinition { public: /** - * @symbol ?initialize\@WASDControlledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?initialize\@WASDControlledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void initialize(class EntityContext &) const; /** - * @symbol ?uninitialize\@WASDControlledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z + * @symbol ?uninitialize\@WASDControlledDefinition\@\@QEBAXAEAVEntityContext\@\@\@Z */ MCAPI void uninitialize(class EntityContext &) const; /** - * @symbol ?buildSchema\@WASDControlledDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UWASDControlledDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@WASDControlledDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UWASDControlledDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp b/LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp index 7402976f9c..76462d57b4 100644 --- a/LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp +++ b/LiteLoader/include/llapi/mc/WSAStartupSingleton.hpp @@ -30,11 +30,11 @@ class WSAStartupSingleton { public: /** - * @symbol ?AddRef\@WSAStartupSingleton\@\@SAXXZ + * @symbol ?AddRef\@WSAStartupSingleton\@\@SAXXZ */ MCAPI static void AddRef(); /** - * @symbol ?Deref\@WSAStartupSingleton\@\@SAXXZ + * @symbol ?Deref\@WSAStartupSingleton\@\@SAXXZ */ MCAPI static void Deref(); @@ -42,8 +42,8 @@ class WSAStartupSingleton { protected: /** - * @symbol ?refCount\@WSAStartupSingleton\@\@1HA + * @symbol ?refCount\@WSAStartupSingleton\@\@1HA */ MCAPI static int refCount; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WSServerCommand.hpp b/LiteLoader/include/llapi/mc/WSServerCommand.hpp index 8c4de3041a..f3efa58a12 100644 --- a/LiteLoader/include/llapi/mc/WSServerCommand.hpp +++ b/LiteLoader/include/llapi/mc/WSServerCommand.hpp @@ -31,18 +31,18 @@ class WSServerCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WSServerCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@WSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@WSServerCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@WSServerCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@WSServerCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaitDefinition.hpp b/LiteLoader/include/llapi/mc/WaitDefinition.hpp index 73bbc29e1e..e8cd918fb9 100644 --- a/LiteLoader/include/llapi/mc/WaitDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WaitDefinition.hpp @@ -32,14 +32,14 @@ class WaitDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaitDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@WaitDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@WaitDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaitNode.hpp b/LiteLoader/include/llapi/mc/WaitNode.hpp index 5583bfd3ee..63cb4b63c0 100644 --- a/LiteLoader/include/llapi/mc/WaitNode.hpp +++ b/LiteLoader/include/llapi/mc/WaitNode.hpp @@ -29,23 +29,23 @@ class WaitNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaitNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@WaitNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@WaitNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@WaitNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@WaitNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0WaitNode\@\@QEAA\@XZ + * @symbol ??0WaitNode\@\@QEAA\@XZ */ MCAPI WaitNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp b/LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp index f215e74459..c7d2b6677c 100644 --- a/LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WaitTicksDefinition.hpp @@ -32,14 +32,14 @@ class WaitTicksDefinition : public BehaviorDefinition { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaitTicksDefinition(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?load\@WaitTicksDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z + * @vftbl 1 + * @symbol ?load\@WaitTicksDefinition\@\@UEAAXVValue\@Json\@\@AEBVBehaviorFactory\@\@\@Z */ virtual void load(class Json::Value, class BehaviorFactory const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaitTicksNode.hpp b/LiteLoader/include/llapi/mc/WaitTicksNode.hpp index ac7f93f990..6948716e22 100644 --- a/LiteLoader/include/llapi/mc/WaitTicksNode.hpp +++ b/LiteLoader/include/llapi/mc/WaitTicksNode.hpp @@ -29,23 +29,23 @@ class WaitTicksNode { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaitTicksNode(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@WaitTicksNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z + * @vftbl 1 + * @symbol ?tick\@WaitTicksNode\@\@UEAA?AW4BehaviorStatus\@\@AEAVActor\@\@\@Z */ virtual enum class BehaviorStatus tick(class Actor &); /** - * @vftbl 2 - * @symbol ?initializeFromDefinition\@WaitTicksNode\@\@EEAAXAEAVActor\@\@\@Z + * @vftbl 2 + * @symbol ?initializeFromDefinition\@WaitTicksNode\@\@EEAAXAEAVActor\@\@\@Z */ virtual void initializeFromDefinition(class Actor &); /** - * @symbol ??0WaitTicksNode\@\@QEAA\@XZ + * @symbol ??0WaitTicksNode\@\@QEAA\@XZ */ MCAPI WaitTicksNode(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WalkAnimationSpeedDefinition.hpp b/LiteLoader/include/llapi/mc/WalkAnimationSpeedDefinition.hpp index a1851fa261..218bb8ca5e 100644 --- a/LiteLoader/include/llapi/mc/WalkAnimationSpeedDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WalkAnimationSpeedDefinition.hpp @@ -31,7 +31,7 @@ struct WalkAnimationSpeedDefinition { public: /** - * @symbol ?buildSchema\@WalkAnimationSpeedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UWalkAnimationSpeedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@WalkAnimationSpeedDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UWalkAnimationSpeedDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/WalkState.hpp b/LiteLoader/include/llapi/mc/WalkState.hpp index c857619126..39b700ec1e 100644 --- a/LiteLoader/include/llapi/mc/WalkState.hpp +++ b/LiteLoader/include/llapi/mc/WalkState.hpp @@ -31,24 +31,24 @@ class WalkState : public PetSleepWithOwnerState { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WalkState(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?tick\@WalkState\@\@UEAAXXZ + * @vftbl 1 + * @symbol ?tick\@WalkState\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 2 - * @symbol ?start\@PetSleepWithOwnerState\@\@UEAAXXZ + * @vftbl 2 + * @symbol ?start\@PetSleepWithOwnerState\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 3 - * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ + * @vftbl 3 + * @symbol ?stop\@PetSleepWithOwnerState\@\@UEAAXXZ */ virtual void stop(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WallBlock.hpp b/LiteLoader/include/llapi/mc/WallBlock.hpp index 7e4e10b5ed..da01022daa 100644 --- a/LiteLoader/include/llapi/mc/WallBlock.hpp +++ b/LiteLoader/include/llapi/mc/WallBlock.hpp @@ -31,354 +31,363 @@ class WallBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WallBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 14 - * @symbol ?getLiquidClipVolume\@WallBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z + * @vftbl 14 + * @symbol ?getLiquidClipVolume\@WallBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVAABB\@\@\@Z */ virtual bool getLiquidClipVolume(class BlockSource &, class BlockPos const &, class AABB &) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 22 - * @symbol ?canProvideSupport\@WallBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z + * @vftbl 22 + * @symbol ?canProvideSupport\@WallBlock\@\@UEBA_NAEBVBlock\@\@EW4BlockSupportType\@\@\@Z */ virtual bool canProvideSupport(class Block const &, unsigned char, enum class BlockSupportType) const; /** - * @vftbl 25 - * @symbol ?canConnect\@WallBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z + * @vftbl 25 + * @symbol ?canConnect\@WallBlock\@\@UEBA_NAEBVBlock\@\@E0\@Z */ virtual bool canConnect(class Block const &, unsigned char, class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@WallBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@WallBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 77 - * @symbol ?onStructureBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 77 + * @symbol ?onStructureBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 78 - * @symbol ?onStructureNeighborBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 78 + * @symbol ?onStructureNeighborBlockPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onStructureNeighborBlockPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 96 - * @symbol ?breaksFallingBlocks\@WallBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z + * @vftbl 96 + * @symbol ?breaksFallingBlocks\@WallBlock\@\@UEBA_NAEBVBlock\@\@VBaseGameVersion\@\@\@Z */ virtual bool breaksFallingBlocks(class Block const &, class BaseGameVersion) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @symbol ?neighborChanged\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z */ virtual void neighborChanged(class BlockSource &, class BlockPos const &, class BlockPos const &) const; /** - * @vftbl 103 - * @symbol ?asItemInstance\@WallBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 106 - * @symbol ?getPlacementBlock\@WallBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z + * @vftbl 106 + * @symbol ?getPlacementBlock\@WallBlock\@\@UEBAAEBVBlock\@\@AEAVActor\@\@AEBVBlockPos\@\@EAEBVVec3\@\@H\@Z */ virtual class Block const & getPlacementBlock(class Actor &, class BlockPos const &, unsigned char, class Vec3 const &, int) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@WallBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@WallBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@WallBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@WallBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 142 - * @symbol ?getVisualShapeInWorld\@WallBlock\@\@UEBAAEBVAABB\@\@AEBVBlock\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEAV2\@_N\@Z + * @vftbl 142 + * @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 146 - * @symbol ?getVariant\@WallBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@WallBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@WallBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@WallBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@WallBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@WallBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WALLBLOCK /** - * @symbol ?canBeSilkTouched\@WallBlock\@\@MEBA_NXZ + * @symbol ?canBeSilkTouched\@WallBlock\@\@MEBA_NXZ */ MCVAPI bool canBeSilkTouched() const; /** - * @symbol ?isWallBlock\@WallBlock\@\@UEBA_NXZ + * @symbol ?isWallBlock\@WallBlock\@\@UEBA_NXZ */ MCVAPI bool isWallBlock() const; -#endif /** - * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI WallBlock(std::string const &, int, class Material const &); + MCVAPI ~WallBlock(); +#endif /** - * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z + * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVBlockLegacy\@\@\@Z */ MCAPI WallBlock(std::string const &, int, class BlockLegacy const &); /** - * @symbol ?tryFixWallStates\@WallBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ??0WallBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@\@Z + */ + MCAPI WallBlock(std::string const &, int, class Material const &); + /** + * @symbol ?tryFixWallStates\@WallBlock\@\@QEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void tryFixWallStates(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?POST_HEIGHT\@WallBlock\@\@2MB + * @symbol ?POST_HEIGHT\@WallBlock\@\@2MB */ MCAPI static float const POST_HEIGHT; /** - * @symbol ?POST_WIDTH\@WallBlock\@\@2MB + * @symbol ?POST_WIDTH\@WallBlock\@\@2MB */ MCAPI static float const POST_WIDTH; /** - * @symbol ?WALL_HEIGHT\@WallBlock\@\@2MB + * @symbol ?WALL_HEIGHT\@WallBlock\@\@2MB */ MCAPI static float const WALL_HEIGHT; /** - * @symbol ?WALL_NAMES\@WallBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$0O\@\@std\@\@B + * @symbol ?WALL_NAMES\@WallBlock\@\@2V?$array\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@$0O\@\@std\@\@B */ MCAPI static class std::array const WALL_NAMES; /** - * @symbol ?WALL_WIDTH\@WallBlock\@\@2MB + * @symbol ?WALL_WIDTH\@WallBlock\@\@2MB */ MCAPI static float const WALL_WIDTH; //private: /** - * @symbol ?_desiredConnectionState\@WallBlock\@\@AEBA?AW4WallConnectionType\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z + * @symbol ?_desiredConnectionState\@WallBlock\@\@AEBA?AW4WallConnectionType\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@E\@Z */ MCAPI enum class WallConnectionType _desiredConnectionState(class BlockSource &, class BlockPos const &, unsigned char) const; /** - * @symbol ?_getItemInstance\@WallBlock\@\@AEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @symbol ?_getItemInstance\@WallBlock\@\@AEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ MCAPI class ItemInstance _getItemInstance(class Block const &) const; /** - * @symbol ?_isCovered\@WallBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@\@Z + * @symbol ?_isCovered\@WallBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVAABB\@\@\@Z */ MCAPI bool _isCovered(class BlockSource &, class BlockPos const &, class AABB const &) const; /** - * @symbol ?_shouldBePost\@WallBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @symbol ?_shouldBePost\@WallBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ MCAPI bool _shouldBePost(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @symbol ?_tryAddToTickingQueue\@WallBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_tryAddToTickingQueue\@WallBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _tryAddToTickingQueue(class BlockSource &, class BlockPos const &) const; private: /** - * @symbol ?WALL_DOESNT_BREAK_FALLING_BLOCK_VERSION\@WallBlock\@\@0VBaseGameVersion\@\@B + * @symbol ?WALL_DOESNT_BREAK_FALLING_BLOCK_VERSION\@WallBlock\@\@0VBaseGameVersion\@\@B */ MCAPI static class BaseGameVersion const WALL_DOESNT_BREAK_FALLING_BLOCK_VERSION; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp b/LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp index 8be9ee169c..8b23106b3c 100644 --- a/LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/WallClimberPathNavigation.hpp @@ -31,34 +31,34 @@ class WallClimberPathNavigation : public PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WallClimberPathNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?tick\@WallClimberPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@WallClimberPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class NavigationComponent &, class Mob &); /** - * @vftbl 4 - * @symbol ?createPath\@WallClimberPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z + * @vftbl 4 + * @symbol ?createPath\@WallClimberPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEBVVec3\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Vec3 const &); /** - * @vftbl 5 - * @symbol ?createPath\@WallClimberPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z + * @vftbl 5 + * @symbol ?createPath\@WallClimberPathNavigation\@\@MEAA?AV?$unique_ptr\@VPath\@\@U?$default_delete\@VPath\@\@\@std\@\@\@std\@\@AEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@\@Z */ virtual std::unique_ptr createPath(class NavigationComponent &, class Mob &, class Actor &); /** - * @vftbl 7 - * @symbol ?moveTo\@WallClimberPathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@M\@Z + * @vftbl 7 + * @symbol ?moveTo\@WallClimberPathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAVActor\@\@M\@Z */ virtual bool moveTo(class NavigationComponent &, class Mob &, class Actor &, float); /** - * @vftbl 11 - * @symbol ?canUpdatePath\@WallClimberPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z + * @vftbl 11 + * @symbol ?canUpdatePath\@WallClimberPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z */ virtual bool canUpdatePath(class Mob const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WanderingTrader.hpp b/LiteLoader/include/llapi/mc/WanderingTrader.hpp index 1d9ee30b00..12a6103acc 100644 --- a/LiteLoader/include/llapi/mc/WanderingTrader.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTrader.hpp @@ -32,154 +32,149 @@ class WanderingTrader : public Mob { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~WanderingTrader(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 168 - * @symbol ?getEntityTypeId\@WanderingTrader\@\@UEBA?AW4ActorType\@\@XZ + * @vftbl 167 + * @symbol ?getEntityTypeId\@WanderingTrader\@\@UEBA?AW4ActorType\@\@XZ */ virtual enum class ActorType getEntityTypeId() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@WanderingTrader\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@WanderingTrader\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 - */ - virtual void __unk_vfn_262(); - /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WANDERINGTRADER /** - * @symbol ?interactPreventDefault\@WanderingTrader\@\@UEAA_NXZ + * @symbol ?interactPreventDefault\@WanderingTrader\@\@UEAA_NXZ */ MCVAPI bool interactPreventDefault(); #endif /** - * @symbol ??0WanderingTrader\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0WanderingTrader\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI WanderingTrader(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp b/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp index 52d35c9c00..049bc8ca55 100644 --- a/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp +++ b/LiteLoader/include/llapi/mc/WanderingTraderScheduler.hpp @@ -30,84 +30,88 @@ class WanderingTraderScheduler { public: /** - * @symbol ??0WanderingTraderScheduler\@\@QEAA\@AEAVLevel\@\@\@Z + * @symbol ??0WanderingTraderScheduler\@\@QEAA\@AEAVLevel\@\@\@Z */ MCAPI WanderingTraderScheduler(class Level &); /** - * @symbol ?isWanderingTraderCurrentlyManaged\@WanderingTraderScheduler\@\@QEAA_NAEBVActor\@\@\@Z + * @symbol ?isWanderingTraderCurrentlyManaged\@WanderingTraderScheduler\@\@QEAA_NAEBVActor\@\@\@Z */ MCAPI bool isWanderingTraderCurrentlyManaged(class Actor const &); /** - * @symbol ?readSaveData\@WanderingTraderScheduler\@\@QEAAXXZ + * @symbol ?readSaveData\@WanderingTraderScheduler\@\@QEAAXXZ */ MCAPI void readSaveData(); /** - * @symbol ?tick\@WanderingTraderScheduler\@\@QEAAXXZ + * @symbol ?tick\@WanderingTraderScheduler\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?writeSaveData\@WanderingTraderScheduler\@\@QEBAXXZ + * @symbol ?writeSaveData\@WanderingTraderScheduler\@\@QEBAXXZ */ MCAPI void writeSaveData() const; /** - * @symbol ??1WanderingTraderScheduler\@\@QEAA\@XZ + * @symbol ??1WanderingTraderScheduler\@\@QEAA\@XZ */ MCAPI ~WanderingTraderScheduler(); //private: /** - * @symbol ?_canSpawnAtPosition\@WanderingTraderScheduler\@\@AEBA_NAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_canSpawnAtPosition\@WanderingTraderScheduler\@\@AEBA_NAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI bool _canSpawnAtPosition(class BlockPos const &, class BlockSource &) const; /** - * @symbol ?_canWanderingTraderBeMoved\@WanderingTraderScheduler\@\@AEBA_NXZ + * @symbol ?_canWanderingTraderBeMoved\@WanderingTraderScheduler\@\@AEBA_NXZ */ MCAPI bool _canWanderingTraderBeMoved() const; /** - * @symbol ?_doesWanderingTraderExist\@WanderingTraderScheduler\@\@AEBA_NXZ + * @symbol ?_doesWanderingTraderExist\@WanderingTraderScheduler\@\@AEBA_NXZ */ MCAPI bool _doesWanderingTraderExist() const; /** - * @symbol ?_findValidSpawnPosUnder\@WanderingTraderScheduler\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_findValidSpawnPosUnder\@WanderingTraderScheduler\@\@AEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI class std::optional _findValidSpawnPosUnder(class BlockPos const &, class BlockSource &) const; /** - * @symbol ?_getRandomHeightmapPosAroundOrigin\@WanderingTraderScheduler\@\@AEAA?AVBlockPos\@\@AEBVBlockSource\@\@AEBV2\@H_N\@Z + * @symbol ?_getRandomHeightmapPosAroundOrigin\@WanderingTraderScheduler\@\@AEAA?AVBlockPos\@\@AEBVBlockSource\@\@AEBV2\@H_N\@Z */ MCAPI class BlockPos _getRandomHeightmapPosAroundOrigin(class BlockSource const &, class BlockPos const &, int, bool); /** - * @symbol ?_getRandomPlayerInOverworld\@WanderingTraderScheduler\@\@AEBAPEAVActor\@\@XZ + * @symbol ?_getRandomPlayerInOverworld\@WanderingTraderScheduler\@\@AEBAPEAVActor\@\@XZ */ MCAPI class Actor * _getRandomPlayerInOverworld() const; /** - * @symbol ?_getSpawnPosFromNearestVillageToPlayerPos\@WanderingTraderScheduler\@\@AEAA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_getSpawnPosFromNearestVillageToPlayerPos\@WanderingTraderScheduler\@\@AEAA?AV?$optional\@VBlockPos\@\@\@std\@\@AEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI class std::optional _getSpawnPosFromNearestVillageToPlayerPos(class BlockPos const &, class BlockSource &); + /** + * @symbol ?_spawnWanderingTraderAtPos\@WanderingTraderScheduler\@\@AEAAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + */ + MCAPI void _spawnWanderingTraderAtPos(class BlockPos const &, class BlockSource &); private: /** - * @symbol ?CHANCE_TO_SPAWN_IN_WILDERNESS\@WanderingTraderScheduler\@\@0MB + * @symbol ?CHANCE_TO_SPAWN_IN_WILDERNESS\@WanderingTraderScheduler\@\@0MB */ MCAPI static float const CHANCE_TO_SPAWN_IN_WILDERNESS; /** - * @symbol ?CHANCE_TO_SPAWN_PER_DAY\@WanderingTraderScheduler\@\@0V?$vector\@MV?$allocator\@M\@std\@\@\@std\@\@B + * @symbol ?CHANCE_TO_SPAWN_PER_DAY\@WanderingTraderScheduler\@\@0V?$vector\@MV?$allocator\@M\@std\@\@\@std\@\@B */ MCAPI static std::vector const CHANCE_TO_SPAWN_PER_DAY; /** - * @symbol ?DISTANCE_IN_BLOCKS_FROM_MEETING_AREA\@WanderingTraderScheduler\@\@0HB + * @symbol ?DISTANCE_IN_BLOCKS_FROM_MEETING_AREA\@WanderingTraderScheduler\@\@0HB */ MCAPI static int const DISTANCE_IN_BLOCKS_FROM_MEETING_AREA; /** - * @symbol ?DISTANCE_IN_BLOCKS_FROM_PLAYER\@WanderingTraderScheduler\@\@0HB + * @symbol ?DISTANCE_IN_BLOCKS_FROM_PLAYER\@WanderingTraderScheduler\@\@0HB */ MCAPI static int const DISTANCE_IN_BLOCKS_FROM_PLAYER; /** - * @symbol ?DISTANCE_IN_BLOCKS_FROM_PLAYER_SQUARE\@WanderingTraderScheduler\@\@0HB + * @symbol ?DISTANCE_IN_BLOCKS_FROM_PLAYER_SQUARE\@WanderingTraderScheduler\@\@0HB */ MCAPI static int const DISTANCE_IN_BLOCKS_FROM_PLAYER_SQUARE; /** - * @symbol ?LENGTH_OF_DAY_IN_TICKS\@WanderingTraderScheduler\@\@0HB + * @symbol ?LENGTH_OF_DAY_IN_TICKS\@WanderingTraderScheduler\@\@0HB */ MCAPI static int const LENGTH_OF_DAY_IN_TICKS; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WantsJockeyDefinition.hpp b/LiteLoader/include/llapi/mc/WantsJockeyDefinition.hpp index be8eafb11b..b4942fe8aa 100644 --- a/LiteLoader/include/llapi/mc/WantsJockeyDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WantsJockeyDefinition.hpp @@ -31,7 +31,7 @@ struct WantsJockeyDefinition { public: /** - * @symbol ?buildSchema\@WantsJockeyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UWantsJockeyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z + * @symbol ?buildSchema\@WantsJockeyDefinition\@\@SAXAEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@UWantsJockeyDefinition\@\@\@JsonUtil\@\@\@std\@\@\@Z */ MCAPI static void buildSchema(class std::shared_ptr> &); diff --git a/LiteLoader/include/llapi/mc/Warden.hpp b/LiteLoader/include/llapi/mc/Warden.hpp index 4779f37f80..e89c3da837 100644 --- a/LiteLoader/include/llapi/mc/Warden.hpp +++ b/LiteLoader/include/llapi/mc/Warden.hpp @@ -30,188 +30,183 @@ class Warden : public Monster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Warden(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 43 - * @symbol ?canDisableShield\@Warden\@\@UEAA_NXZ + * @vftbl 43 + * @symbol ?canDisableShield\@Warden\@\@UEAA_NXZ */ virtual bool canDisableShield(); /** - * @vftbl 49 - * @symbol ?normalTick\@Warden\@\@UEAAXXZ + * @vftbl 49 + * @symbol ?normalTick\@Warden\@\@UEAAXXZ */ virtual void normalTick(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 115 - * @symbol ?setTarget\@Warden\@\@UEAAXPEAVActor\@\@\@Z + * @vftbl 114 + * @symbol ?setTarget\@Warden\@\@UEAAXPEAVActor\@\@\@Z */ virtual void setTarget(class Actor *); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@Warden\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@Warden\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Warden\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Warden\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 253 - * @symbol ?onPush\@Warden\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 251 + * @symbol ?onPush\@Warden\@\@UEAAXAEAVActor\@\@\@Z */ virtual void onPush(class Actor &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Warden\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Warden\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Warden\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Warden\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 297 - * @symbol ?checkSpawnObstruction\@Warden\@\@UEBA_NXZ + * @vftbl 294 + * @symbol ?checkSpawnObstruction\@Warden\@\@UEBA_NXZ */ virtual bool checkSpawnObstruction() const; /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 307 - * @symbol ?doHurtTarget\@Warden\@\@MEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z + * @vftbl 304 + * @symbol ?doHurtTarget\@Warden\@\@MEAA_NPEAVActor\@\@AEBW4ActorDamageCause\@\@\@Z */ virtual bool doHurtTarget(class Actor *, enum class ActorDamageCause const &); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Warden\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Warden\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Warden(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WardenSpawnTrackerComponent.hpp b/LiteLoader/include/llapi/mc/WardenSpawnTrackerComponent.hpp index d6af8fe235..7ce0670926 100644 --- a/LiteLoader/include/llapi/mc/WardenSpawnTrackerComponent.hpp +++ b/LiteLoader/include/llapi/mc/WardenSpawnTrackerComponent.hpp @@ -29,40 +29,44 @@ class WardenSpawnTrackerComponent { public: /** - * @symbol ??0WardenSpawnTrackerComponent\@\@QEAA\@XZ + * @symbol ??0WardenSpawnTrackerComponent\@\@QEAA\@XZ */ MCAPI WardenSpawnTrackerComponent(); /** - * @symbol ?addAdditionalSaveData\@WardenSpawnTrackerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?addAdditionalSaveData\@WardenSpawnTrackerComponent\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void addAdditionalSaveData(class CompoundTag &) const; /** - * @symbol ?canIncreaseThreatLevel\@WardenSpawnTrackerComponent\@\@QEBA_NXZ + * @symbol ?canIncreaseThreatLevel\@WardenSpawnTrackerComponent\@\@QEBA_NXZ */ MCAPI bool canIncreaseThreatLevel() const; /** - * @symbol ?copyDataFrom\@WardenSpawnTrackerComponent\@\@QEAAXAEBV1\@\@Z + * @symbol ?copyDataFrom\@WardenSpawnTrackerComponent\@\@QEAAXAEBV1\@\@Z */ MCAPI void copyDataFrom(class WardenSpawnTrackerComponent const &); /** - * @symbol ?readAdditionalSaveData\@WardenSpawnTrackerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @symbol ?readAdditionalSaveData\@WardenSpawnTrackerComponent\@\@QEAAXAEAVActor\@\@AEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ MCAPI void readAdditionalSaveData(class Actor &, class CompoundTag const &, class DataLoadHelper &); /** - * @symbol ?tick\@WardenSpawnTrackerComponent\@\@QEAAXXZ + * @symbol ?tick\@WardenSpawnTrackerComponent\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?tryIncreaseThreatLevel\@WardenSpawnTrackerComponent\@\@QEAAHXZ + * @symbol ?tryIncreaseThreatLevel\@WardenSpawnTrackerComponent\@\@QEAAHXZ */ MCAPI int tryIncreaseThreatLevel(); /** - * @symbol ?getSoundEventForThreatLevel\@WardenSpawnTrackerComponent\@\@SA?AV?$optional\@W4LevelSoundEvent\@\@\@std\@\@H\@Z + * @symbol ?MAX_THREAT_LEVEL\@WardenSpawnTrackerComponent\@\@2HB + */ + MCAPI static int const MAX_THREAT_LEVEL; + /** + * @symbol ?getSoundEventForThreatLevel\@WardenSpawnTrackerComponent\@\@SA?AV?$optional\@W4LevelSoundEvent\@\@\@std\@\@H\@Z */ MCAPI static class std::optional getSoundEventForThreatLevel(int); /** - * @symbol ?hasNearbyWarden\@WardenSpawnTrackerComponent\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?hasNearbyWarden\@WardenSpawnTrackerComponent\@\@SA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI static bool hasNearbyWarden(class BlockSource &, class BlockPos const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystem.hpp b/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystem.hpp index b281ef3c59..f6fa5973f6 100644 --- a/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystem.hpp +++ b/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystem.hpp @@ -31,13 +31,13 @@ class WardenSpawnTrackerSystem { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WARDENSPAWNTRACKERSYSTEM /** - * @symbol ?onLevelAddedPlayer\@WardenSpawnTrackerSystem\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z + * @symbol ?onLevelAddedPlayer\@WardenSpawnTrackerSystem\@\@UEAA?AW4EventResult\@\@AEAVLevel\@\@AEAVPlayer\@\@\@Z */ MCVAPI enum class EventResult onLevelAddedPlayer(class Level &, class Player &); /** - * @symbol ?tick\@WardenSpawnTrackerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z + * @symbol ?tick\@WardenSpawnTrackerSystem\@\@UEAAXAEAVEntityRegistry\@\@\@Z */ MCVAPI void tick(class EntityRegistry &); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystemInternal.hpp b/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystemInternal.hpp index f27bcd3440..cf4ccc4ef6 100644 --- a/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystemInternal.hpp +++ b/LiteLoader/include/llapi/mc/WardenSpawnTrackerSystemInternal.hpp @@ -17,7 +17,7 @@ namespace WardenSpawnTrackerSystemInternal { #undef AFTER_EXTRA /** - * @symbol ?tickWardenSpawnTrackerComponent\@WardenSpawnTrackerSystemInternal\@\@YAXAEAVActorOwnerComponent\@\@AEAVWardenSpawnTrackerComponent\@\@\@Z + * @symbol ?tickWardenSpawnTrackerComponent\@WardenSpawnTrackerSystemInternal\@\@YAXAEAVActorOwnerComponent\@\@AEAVWardenSpawnTrackerComponent\@\@\@Z */ MCAPI void tickWardenSpawnTrackerComponent(class ActorOwnerComponent &, class WardenSpawnTrackerComponent &); diff --git a/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp b/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp index 25ecd1ae94..48082e3395 100644 --- a/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp +++ b/LiteLoader/include/llapi/mc/WardenVibrationConfig.hpp @@ -28,28 +28,28 @@ class WardenVibrationConfig { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WardenVibrationConfig(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?onSignalReceive\@WardenVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z + * @vftbl 1 + * @symbol ?onSignalReceive\@WardenVibrationConfig\@\@UEAAXAEAVBlockSource\@\@VBlockPos\@\@AEBVGameEvent\@\@PEAVActor\@\@M3\@Z */ virtual void onSignalReceive(class BlockSource &, class BlockPos, class GameEvent const &, class Actor *, float, class Actor *); /** - * @vftbl 2 - * @symbol ?isValidVibration\@WardenVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z + * @vftbl 2 + * @symbol ?isValidVibration\@WardenVibrationConfig\@\@UEAA_NAEBVGameEvent\@\@\@Z */ virtual bool isValidVibration(class GameEvent const &); /** - * @vftbl 3 - * @symbol ?shouldListen\@WardenVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z + * @vftbl 3 + * @symbol ?shouldListen\@WardenVibrationConfig\@\@UEAA_NAEAVBlockSource\@\@AEBVGameEvent\@\@AEBUGameEventContext\@\@\@Z */ virtual bool shouldListen(class BlockSource &, class GameEvent const &, struct GameEventContext const &); /** - * @symbol ??0WardenVibrationConfig\@\@QEAA\@AEAVActor\@\@G\@Z + * @symbol ??0WardenVibrationConfig\@\@QEAA\@AEAVActor\@\@G\@Z */ MCAPI WardenVibrationConfig(class Actor &, unsigned short); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp index abb8e564a7..6329208bd9 100644 --- a/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp +++ b/LiteLoader/include/llapi/mc/WarpedFungusOnAStickItem.hpp @@ -32,103 +32,103 @@ class WarpedFungusOnAStickItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WarpedFungusOnAStickItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 49 - * @symbol ?isHandEquipped\@WarpedFungusOnAStickItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@WarpedFungusOnAStickItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 59 - * @symbol ?requiresInteract\@WarpedFungusOnAStickItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@WarpedFungusOnAStickItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@WarpedFungusOnAStickItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@WarpedFungusOnAStickItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@WarpedFungusOnAStickItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@WarpedFungusOnAStickItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 93 - * @symbol ?mineBlock\@WarpedFungusOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z + * @vftbl 93 + * @symbol ?mineBlock\@WarpedFungusOnAStickItem\@\@UEBA_NAEAVItemStack\@\@AEBVBlock\@\@HHHPEAVActor\@\@\@Z */ virtual bool mineBlock(class ItemStack &, class Block const &, int, int, int, class Actor *) const; /** - * @symbol ??0WarpedFungusOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WarpedFungusOnAStickItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WarpedFungusOnAStickItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterAnimal.hpp b/LiteLoader/include/llapi/mc/WaterAnimal.hpp index af999b5cd1..e5b8f1d08a 100644 --- a/LiteLoader/include/llapi/mc/WaterAnimal.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimal.hpp @@ -32,162 +32,158 @@ class WaterAnimal : public Mob { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~WaterAnimal(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); - /** - * @vftbl 110 - * @symbol __unk_vfn_110 - */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_108(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_109(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_111(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_178(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); - /** - * @vftbl 244 - * @symbol __unk_vfn_244 - */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_218(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_240(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_243(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_260(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_268(); /** - * @vftbl 291 - * @symbol ?aiStep\@WaterAnimal\@\@UEAAXXZ + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void aiStep(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@WaterAnimal\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@WaterAnimal\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @vftbl 356 - * @symbol ?getFlopVerticalVelocityFactor\@WaterAnimal\@\@UEBAMXZ + * @vftbl 353 + * @symbol ?getFlopVerticalVelocityFactor\@WaterAnimal\@\@UEBAMXZ */ virtual float getFlopVerticalVelocityFactor() const; /** - * @vftbl 357 - * @symbol ?getFlopHorizontalVelocityFactor\@WaterAnimal\@\@UEBAMXZ + * @vftbl 354 + * @symbol ?getFlopHorizontalVelocityFactor\@WaterAnimal\@\@UEBAMXZ */ virtual float getFlopHorizontalVelocityFactor() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WATERANIMAL + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WaterAnimal(); +#endif /** - * @symbol ??0WaterAnimal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0WaterAnimal\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI WaterAnimal(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?preAiStep\@WaterAnimal\@\@QEAAXXZ + * @symbol ?preAiStep\@WaterAnimal\@\@QEAAXXZ */ MCAPI void preAiStep(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp index 741332eba8..7108618569 100644 --- a/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterAnimalPreAIStepSystem.hpp @@ -28,16 +28,16 @@ class WaterAnimalPreAIStepSystem { public: /** - * @symbol ?createSystem\@WaterAnimalPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@WaterAnimalPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doWaterAnimalPreAIStepSystem\@WaterAnimalPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doWaterAnimalPreAIStepSystem\@WaterAnimalPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWaterAnimalPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp b/LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp index 19465298ec..a482d1a9ca 100644 --- a/LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp +++ b/LiteLoader/include/llapi/mc/WaterBoundPathNavigation.hpp @@ -31,39 +31,39 @@ class WaterBoundPathNavigation : public PathNavigation { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaterBoundPathNavigation(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?initializeInternal\@WaterBoundPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z + * @vftbl 1 + * @symbol ?initializeInternal\@WaterBoundPathNavigation\@\@UEAAXAEAVMob\@\@PEAUNavigationDescription\@\@\@Z */ virtual void initializeInternal(class Mob &, struct NavigationDescription *); /** - * @vftbl 2 - * @symbol ?tick\@WaterBoundPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 2 + * @symbol ?tick\@WaterBoundPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void tick(class NavigationComponent &, class Mob &); /** - * @vftbl 3 - * @symbol ?getTempMobPos\@WaterBoundPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z + * @vftbl 3 + * @symbol ?getTempMobPos\@WaterBoundPathNavigation\@\@MEBA?AVVec3\@\@AEBVMob\@\@\@Z */ virtual class Vec3 getTempMobPos(class Mob const &) const; /** - * @vftbl 10 - * @symbol ?travel\@WaterBoundPathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAM22\@Z + * @vftbl 10 + * @symbol ?travel\@WaterBoundPathNavigation\@\@MEAA_NAEAVNavigationComponent\@\@AEAVMob\@\@AEAM22\@Z */ virtual bool travel(class NavigationComponent &, class Mob &, float &, float &, float &); /** - * @vftbl 11 - * @symbol ?canUpdatePath\@WaterBoundPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z + * @vftbl 11 + * @symbol ?canUpdatePath\@WaterBoundPathNavigation\@\@MEBA_NAEBVMob\@\@\@Z */ virtual bool canUpdatePath(class Mob const &) const; /** - * @vftbl 12 - * @symbol ?updatePath\@WaterBoundPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z + * @vftbl 12 + * @symbol ?updatePath\@WaterBoundPathNavigation\@\@MEAAXAEAVNavigationComponent\@\@AEAVMob\@\@\@Z */ virtual void updatePath(class NavigationComponent &, class Mob &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp index 913e8a2b98..5acd2664c9 100644 --- a/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WaterLilyBlockItem.hpp @@ -32,93 +32,93 @@ class WaterLilyBlockItem : public BlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaterLilyBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 57 - * @symbol ?isLiquidClipItem\@WaterLilyBlockItem\@\@UEBA_NH\@Z + * @vftbl 57 + * @symbol ?isLiquidClipItem\@WaterLilyBlockItem\@\@UEBA_NH\@Z */ virtual bool isLiquidClipItem(int) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 131 - * @symbol ?_calculatePlacePos\@WaterLilyBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z + * @vftbl 131 + * @symbol ?_calculatePlacePos\@WaterLilyBlockItem\@\@UEBA_NAEAVItemStackBase\@\@AEAVActor\@\@AEAEAEAVBlockPos\@\@\@Z */ virtual bool _calculatePlacePos(class ItemStackBase &, class Actor &, unsigned char &, class BlockPos &) const; /** - * @vftbl 132 - * @symbol ?_useOn\@WaterLilyBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z + * @vftbl 132 + * @symbol ?_useOn\@WaterLilyBlockItem\@\@UEBA_NAEAVItemStack\@\@AEAVActor\@\@VBlockPos\@\@EAEBVVec3\@\@\@Z */ virtual bool _useOn(class ItemStack &, class Actor &, class BlockPos, unsigned char, class Vec3 const &) const; /** - * @symbol ??0WaterLilyBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WaterLilyBlockItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WaterLilyBlockItem(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp b/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp new file mode 100644 index 0000000000..0afe8ddea2 --- /dev/null +++ b/LiteLoader/include/llapi/mc/WaterMoveFinalizeSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file WaterMoveFinalizeSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class WaterMoveFinalizeSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WATERMOVEFINALIZESYSTEM +public: + class WaterMoveFinalizeSystem& operator=(class WaterMoveFinalizeSystem const &) = delete; + WaterMoveFinalizeSystem(class WaterMoveFinalizeSystem const &) = delete; + WaterMoveFinalizeSystem() = delete; +#endif + +public: + /** + * @symbol ?createWaterMoveFinalizeSideBySideSystem\@WaterMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createWaterMoveFinalizeSideBySideSystem(); + /** + * @symbol ?createWaterMoveFinalizeSystem\@WaterMoveFinalizeSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createWaterMoveFinalizeSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/WaterMoveSystem.hpp b/LiteLoader/include/llapi/mc/WaterMoveSystem.hpp new file mode 100644 index 0000000000..121b0a6350 --- /dev/null +++ b/LiteLoader/include/llapi/mc/WaterMoveSystem.hpp @@ -0,0 +1,32 @@ +/** + * @file WaterMoveSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class WaterMoveSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WATERMOVESYSTEM +public: + class WaterMoveSystem& operator=(class WaterMoveSystem const &) = delete; + WaterMoveSystem(class WaterMoveSystem const &) = delete; + WaterMoveSystem() = delete; +#endif + +public: + /** + * @symbol ?createWaterMoveSystem\@WaterMoveSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createWaterMoveSystem(); + +}; diff --git a/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp b/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp index e07f511178..cd56dc682a 100644 --- a/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp +++ b/LiteLoader/include/llapi/mc/WaterMovementComponent.hpp @@ -29,20 +29,24 @@ class WaterMovementComponent { public: /** - * @symbol ??0WaterMovementComponent\@\@QEAA\@XZ + * @symbol ??0WaterMovementComponent\@\@QEAA\@XZ */ MCAPI WaterMovementComponent(); /** - * @symbol ?getDragFactor\@WaterMovementComponent\@\@QEBAMXZ + * @symbol ?getDragFactor\@WaterMovementComponent\@\@QEBAMXZ */ MCAPI float getDragFactor() const; /** - * @symbol ?initFromDefinition\@WaterMovementComponent\@\@QEAAXAEAVActor\@\@\@Z + * @symbol ?initFromDefinition\@WaterMovementComponent\@\@QEAAXAEAVActor\@\@\@Z */ MCAPI void initFromDefinition(class Actor &); /** - * @symbol ?getDefaultDragFactor\@WaterMovementComponent\@\@SAMXZ + * @symbol ??8WaterMovementComponent\@\@QEBA_NAEBV0\@\@Z + */ + MCAPI bool operator==(class WaterMovementComponent const &) const; + /** + * @symbol ?getDefaultDragFactor\@WaterMovementComponent\@\@SAMXZ */ MCAPI static float getDefaultDragFactor(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterMovementDescription.hpp b/LiteLoader/include/llapi/mc/WaterMovementDescription.hpp index f68f9c8a52..a5e42d206b 100644 --- a/LiteLoader/include/llapi/mc/WaterMovementDescription.hpp +++ b/LiteLoader/include/llapi/mc/WaterMovementDescription.hpp @@ -5,18 +5,14 @@ #pragma once #define AUTO_GENERATED #include "llapi/Global.h" -#include "Json.hpp" #define BEFORE_EXTRA // Include Headers or Declare Types Here #undef BEFORE_EXTRA -/** - * @brief MC class WaterMovementDescription. - * - */ -class WaterMovementDescription { + +struct WaterMovementDescription { #define AFTER_EXTRA // Add Member There @@ -24,33 +20,28 @@ class WaterMovementDescription { #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WATERMOVEMENTDESCRIPTION public: - class WaterMovementDescription& operator=(class WaterMovementDescription const &) = delete; - WaterMovementDescription(class WaterMovementDescription const &) = delete; + struct WaterMovementDescription& operator=(struct WaterMovementDescription const &) = delete; + WaterMovementDescription(struct WaterMovementDescription const &) = delete; #endif public: /** - * @vftbl 0 - * @symbol ?getJsonName\@WaterMovementDescription\@\@UEBAPEBDXZ + * @vftbl 0 + * @symbol ?getJsonName\@WaterMovementDescription\@\@UEBAPEBDXZ */ virtual char const * getJsonName() const; /** - * @vftbl 1 - * @symbol __unk_destructor_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ - virtual ~WaterMovementDescription(); + virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?deserializeData\@WaterMovementDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z + * @vftbl 2 + * @symbol ?deserializeData\@WaterMovementDescription\@\@UEAAXUDeserializeDataParams\@\@\@Z */ virtual void deserializeData(struct DeserializeDataParams); /** - * @vftbl 3 - * @symbol ?serializeData\@WaterMovementDescription\@\@UEBAXAEAVValue\@Json\@\@\@Z - */ - virtual void serializeData(class Json::Value &) const; - /** - * @symbol ??0WaterMovementDescription\@\@QEAA\@XZ + * @symbol ??0WaterMovementDescription\@\@QEAA\@XZ */ MCAPI WaterMovementDescription(); diff --git a/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp b/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp index 68b09c51a3..c44a6a7b32 100644 --- a/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp +++ b/LiteLoader/include/llapi/mc/WaterSinkInputSystem.hpp @@ -28,8 +28,8 @@ class WaterSinkInputSystem { public: /** - * @symbol ?createWaterSinkInputSystem\@WaterSinkInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createWaterSinkInputSystem\@WaterSinkInputSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createWaterSinkInputSystem(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp b/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp new file mode 100644 index 0000000000..e995ec690c --- /dev/null +++ b/LiteLoader/include/llapi/mc/WaterTravelSystem.hpp @@ -0,0 +1,36 @@ +/** + * @file WaterTravelSystem.hpp + * + */ +#pragma once +#define AUTO_GENERATED +#include "llapi/Global.h" + +#define BEFORE_EXTRA + +#undef BEFORE_EXTRA + + +class WaterTravelSystem { + +#define AFTER_EXTRA + +#undef AFTER_EXTRA +#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WATERTRAVELSYSTEM +public: + class WaterTravelSystem& operator=(class WaterTravelSystem const &) = delete; + WaterTravelSystem(class WaterTravelSystem const &) = delete; + WaterTravelSystem() = delete; +#endif + +public: + /** + * @symbol ?createWaterTravelSystem\@WaterTravelSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + */ + MCAPI static struct TickingSystemWithInfo createWaterTravelSystem(); + /** + * @symbol ?tickWaterTravelSystem\@WaterTravelSystem\@\@SAXV?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@$$CBV?$FlagComponent\@UActorMovementTickNeededFlag\@\@\@\@$$CBV?$FlagComponent\@UWaterTravelFlag\@\@\@\@\@\@$$CBUAttributesComponent\@\@$$CBUSwimSpeedMultiplierComponent\@\@$$CBUWaterWalkSpeedEnchantComponent\@\@UMobTravelComponent\@\@V?$Optional\@$$CBV?$FlagComponent\@UDolphinFlag\@\@\@\@\@\@V?$Optional\@$$CBV?$FlagComponent\@UOnGroundFlag\@\@\@\@\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@$$CBUAttributesComponent\@\@$$CBUMovementSpeedComponent\@\@\@\@V?$ViewT\@VStrictEntityContext\@\@VEntityRegistryBase\@\@U?$Include\@V?$FlagComponent\@UPlayerComponentFlag\@\@\@\@\@\@\@\@\@Z + */ + MCAPI static void tickWaterTravelSystem(class ViewT const, class FlagComponent const>, struct AttributesComponent const, struct SwimSpeedMultiplierComponent const, struct WaterWalkSpeedEnchantComponent const, struct MobTravelComponent, class Optional const>, class Optional const>>, class ViewT, class ViewT>>); + +}; diff --git a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp index b84edb0fef..6f26cdb4a6 100644 --- a/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyBlock.hpp @@ -31,233 +31,238 @@ class WaterlilyBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaterlilyBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@WaterlilyBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@WaterlilyBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 35 - * @symbol ?isWaterBlocking\@WaterlilyBlock\@\@UEBA_NXZ + * @vftbl 35 + * @symbol ?isWaterBlocking\@WaterlilyBlock\@\@UEBA_NXZ */ virtual bool isWaterBlocking() const; /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@WaterlilyBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@WaterlilyBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@WaterlilyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@WaterlilyBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 135 - * @symbol ?getColor\@WaterlilyBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 135 + * @symbol ?getColor\@WaterlilyBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getColor(class Block const &) const; /** - * @vftbl 137 - * @symbol ?getColorAtPos\@WaterlilyBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 137 + * @symbol ?getColorAtPos\@WaterlilyBlock\@\@UEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getColorAtPos(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@WaterlilyBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @symbol ??0WaterlilyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WaterlilyBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WaterlilyBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WaterlilyFeature.hpp b/LiteLoader/include/llapi/mc/WaterlilyFeature.hpp index 8b7d3bdb66..f4a9a698f8 100644 --- a/LiteLoader/include/llapi/mc/WaterlilyFeature.hpp +++ b/LiteLoader/include/llapi/mc/WaterlilyFeature.hpp @@ -31,14 +31,14 @@ class WaterlilyFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WaterlilyFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@WaterlilyFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@WaterlilyFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeakEntityRef.hpp b/LiteLoader/include/llapi/mc/WeakEntityRef.hpp index 248f002d7b..a242c4c555 100644 --- a/LiteLoader/include/llapi/mc/WeakEntityRef.hpp +++ b/LiteLoader/include/llapi/mc/WeakEntityRef.hpp @@ -3,25 +3,25 @@ * */ #pragma once -#define AUTO_GENERATED + #include "llapi/Global.h" #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "EntityRefTraits.hpp" + #undef BEFORE_EXTRA /** * @brief MC class WeakEntityRef. * */ -class WeakEntityRef { +class WeakEntityRef : public WeakRefT { #define AFTER_EXTRA // Add Member There -public: - char filler[24]; - LIAPI class Actor* tryUnwrap(); +#define DISABLE_CONSTRUCTOR_PREVENTION_WEAKENTITYREF #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WEAKENTITYREF public: @@ -32,23 +32,23 @@ class WeakEntityRef { public: /** - * @symbol ??0WeakEntityRef\@\@QEAA\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ??0WeakEntityRef\@\@QEAA\@V?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI WeakEntityRef(class WeakRefT); /** - * @symbol ??4WeakEntityRef\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4WeakEntityRef\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class WeakEntityRef & operator=(class WeakEntityRef &&); /** - * @symbol ??8WeakEntityRef\@\@QEBA_NV?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z + * @symbol ??8WeakEntityRef\@\@QEBA_NV?$WeakRefT\@UEntityRefTraits\@\@\@\@\@Z */ MCAPI bool operator==(class WeakRefT) const; /** - * @symbol ??8WeakEntityRef\@\@QEBA_NV0\@\@Z + * @symbol ??8WeakEntityRef\@\@QEBA_NV0\@\@Z */ MCAPI bool operator==(class WeakEntityRef) const; /** - * @symbol ??1WeakEntityRef\@\@QEAA\@XZ + * @symbol ??1WeakEntityRef\@\@QEAA\@XZ */ MCAPI ~WeakEntityRef(); diff --git a/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp b/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp index 457fcba4db..a4311e6207 100644 --- a/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp +++ b/LiteLoader/include/llapi/mc/WeakStorageEntity.hpp @@ -8,6 +8,8 @@ #define BEFORE_EXTRA // Include Headers or Declare Types Here +#include "EntityRegistry.hpp" +#include "StackResultStorageEntity.hpp" #undef BEFORE_EXTRA @@ -20,13 +22,20 @@ class WeakStorageEntity { #define AFTER_EXTRA // Add Member There public: - enum class VariadicInit{ + enum class VariadicInit : int { NonAmbiguous = 0, }; - enum class EmptyInit { + enum class EmptyInit : int { NoValue = 0, }; - LIAPI class Actor* tryUnwrap(); + + WeakRefT mRegistry; + class EntityId mEntity; + + template + inline Entity* tryUnwrap() { + return StackResultStorageEntity(*this).tryUnwrap(); + } #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WEAKSTORAGEENTITY @@ -38,40 +47,36 @@ class WeakStorageEntity { public: /** - * @symbol ??8WeakStorageEntity\@\@QEBA_NAEBV0\@\@Z + * @symbol ??8WeakStorageEntity\@\@QEBA_NAEBV0\@\@Z */ MCAPI bool operator==(class WeakStorageEntity const &) const; //protected: /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEBVEntityContext\@\@\@Z + * @symbol ??0WeakStorageEntity\@\@IEAA\@W4VariadicInit\@0\@AEBVEntityContext\@\@\@Z */ MCAPI WeakStorageEntity(enum class WeakStorageEntity::VariadicInit, class EntityContext const &); /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z - */ - MCAPI WeakStorageEntity(enum class WeakStorageEntity::EmptyInit); - /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVStackResultStorageEntity\@\@\@Z + * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVStackResultStorageEntity\@\@\@Z */ MCAPI WeakStorageEntity(class StackResultStorageEntity const &); /** - * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z + * @symbol ??0WeakStorageEntity\@\@IEAA\@AEBVOwnerStorageEntity\@\@\@Z */ MCAPI WeakStorageEntity(class OwnerStorageEntity const &); /** - * @symbol ?_isSet\@WeakStorageEntity\@\@IEBA_NXZ + * @symbol ??0WeakStorageEntity\@\@IEAA\@W4EmptyInit\@0\@\@Z */ - MCAPI bool _isSet() const; + MCAPI WeakStorageEntity(enum class WeakStorageEntity::EmptyInit); /** - * @symbol ?_reset\@WeakStorageEntity\@\@IEAAXXZ + * @symbol ?_isSet\@WeakStorageEntity\@\@IEBA_NXZ */ - MCAPI void _reset(); + MCAPI bool _isSet() const; /** - * @symbol ??1WeakStorageEntity\@\@IEAA\@XZ + * @symbol ?_reset\@WeakStorageEntity\@\@IEAAXXZ */ - MCAPI ~WeakStorageEntity(); + MCAPI void _reset(); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp b/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp index a7de16574f..b057350f21 100644 --- a/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp +++ b/LiteLoader/include/llapi/mc/WeakStorageFeature.hpp @@ -32,26 +32,26 @@ class WeakStorageFeature { //protected: /** - * @symbol ??0WeakStorageFeature\@\@IEAA\@W4EmptyInit\@0\@\@Z + * @symbol ??0WeakStorageFeature\@\@IEAA\@W4EmptyInit\@0\@\@Z */ MCAPI WeakStorageFeature(enum class WeakStorageFeature::EmptyInit); /** - * @symbol ??0WeakStorageFeature\@\@IEAA\@AEBVOwnerStorageFeature\@\@\@Z + * @symbol ??0WeakStorageFeature\@\@IEAA\@$$QEAV0\@\@Z */ - MCAPI WeakStorageFeature(class OwnerStorageFeature const &); + MCAPI WeakStorageFeature(class WeakStorageFeature &&); /** - * @symbol ??0WeakStorageFeature\@\@IEAA\@$$QEAV0\@\@Z + * @symbol ??0WeakStorageFeature\@\@IEAA\@AEBVOwnerStorageFeature\@\@\@Z */ - MCAPI WeakStorageFeature(class WeakStorageFeature &&); + MCAPI WeakStorageFeature(class OwnerStorageFeature const &); /** - * @symbol ?_isSet\@WeakStorageFeature\@\@IEBA_NXZ + * @symbol ?_isSet\@WeakStorageFeature\@\@IEBA_NXZ */ MCAPI bool _isSet() const; /** - * @symbol ??4WeakStorageFeature\@\@IEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4WeakStorageFeature\@\@IEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class WeakStorageFeature & operator=(class WeakStorageFeature &&); protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeaponItem.hpp b/LiteLoader/include/llapi/mc/WeaponItem.hpp index 18afba4e38..429d348a03 100644 --- a/LiteLoader/include/llapi/mc/WeaponItem.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItem.hpp @@ -32,133 +32,133 @@ class WeaponItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeaponItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 44 - * @symbol ?canDestroySpecial\@WeaponItem\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 44 + * @symbol ?canDestroySpecial\@WeaponItem\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroySpecial(class Block const &) const; /** - * @vftbl 48 - * @symbol ?getAttackDamage\@WeaponItem\@\@UEBAHXZ + * @vftbl 48 + * @symbol ?getAttackDamage\@WeaponItem\@\@UEBAHXZ */ virtual int getAttackDamage() const; /** - * @vftbl 49 - * @symbol ?isHandEquipped\@WeaponItem\@\@UEBA_NXZ + * @vftbl 49 + * @symbol ?isHandEquipped\@WeaponItem\@\@UEBA_NXZ */ virtual bool isHandEquipped() const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 55 - * @symbol ?canDestroyInCreative\@WeaponItem\@\@UEBA_NXZ + * @vftbl 55 + * @symbol ?canDestroyInCreative\@WeaponItem\@\@UEBA_NXZ */ virtual bool canDestroyInCreative() const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@WeaponItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@WeaponItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 61 - * @symbol ?isValidRepairItem\@WeaponItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z + * @vftbl 61 + * @symbol ?isValidRepairItem\@WeaponItem\@\@UEBA_NAEBVItemStackBase\@\@0AEBVBaseGameVersion\@\@\@Z */ virtual bool isValidRepairItem(class ItemStackBase const &, class ItemStackBase const &, class BaseGameVersion const &) const; /** - * @vftbl 62 - * @symbol ?getEnchantSlot\@WeaponItem\@\@UEBAHXZ + * @vftbl 62 + * @symbol ?getEnchantSlot\@WeaponItem\@\@UEBAHXZ */ virtual int getEnchantSlot() const; /** - * @vftbl 63 - * @symbol ?getEnchantValue\@WeaponItem\@\@UEBAHXZ + * @vftbl 63 + * @symbol ?getEnchantValue\@WeaponItem\@\@UEBAHXZ */ virtual int getEnchantValue() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@WeaponItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@WeaponItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 88 - * @symbol ?getDestroySpeed\@WeaponItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?getDestroySpeed\@WeaponItem\@\@UEBAMAEBVItemStackBase\@\@AEBVBlock\@\@\@Z */ virtual float getDestroySpeed(class ItemStackBase const &, class Block const &) const; /** - * @vftbl 89 - * @symbol ?hurtActor\@WeaponItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @vftbl 89 + * @symbol ?hurtActor\@WeaponItem\@\@UEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ virtual void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @symbol ??0WeaponItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z + * @symbol ??0WeaponItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVTier\@Item\@\@\@Z */ MCAPI WeaponItem(std::string const &, int, class Item::Tier const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp b/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp index 7b391380f9..b21c4d016b 100644 --- a/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/WeaponItemComponent.hpp @@ -30,63 +30,63 @@ class WeaponItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeaponItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VWeaponItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VWeaponItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VWeaponItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VWeaponItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?appendFormattedHovertext\@WeaponItemComponent\@\@QEBAXAEBVItemStackBase\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @symbol ?appendFormattedHovertext\@WeaponItemComponent\@\@QEBAXAEBVItemStackBase\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ MCAPI void appendFormattedHovertext(class ItemStackBase const &, std::string &, bool) const; /** - * @symbol ?hitActor\@WeaponItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @symbol ?hitActor\@WeaponItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ MCAPI void hitActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @symbol ?hitBlock\@WeaponItemComponent\@\@QEBAXAEAVItemStack\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVMob\@\@\@Z + * @symbol ?hitBlock\@WeaponItemComponent\@\@QEBAXAEAVItemStack\@\@AEBVBlock\@\@AEBVBlockPos\@\@AEAVMob\@\@\@Z */ MCAPI void hitBlock(class ItemStack &, class Block const &, class BlockPos const &, class Mob &) const; /** - * @symbol ?hurtActor\@WeaponItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z + * @symbol ?hurtActor\@WeaponItemComponent\@\@QEBAXAEAVItemStack\@\@AEAVActor\@\@AEAVMob\@\@\@Z */ MCAPI void hurtActor(class ItemStack &, class Actor &, class Mob &) const; /** - * @symbol ?bindType\@WeaponItemComponent\@\@SAXXZ + * @symbol ?bindType\@WeaponItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@WeaponItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@WeaponItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WearableItemComponent.hpp b/LiteLoader/include/llapi/mc/WearableItemComponent.hpp index 86d215ff88..17560937b7 100644 --- a/LiteLoader/include/llapi/mc/WearableItemComponent.hpp +++ b/LiteLoader/include/llapi/mc/WearableItemComponent.hpp @@ -30,55 +30,55 @@ class WearableItemComponent { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WearableItemComponent(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VWearableItemComponent\@\@\@\@UEBA_NXZ + * @vftbl 1 + * @symbol ?isNetworkComponent\@?$NetworkedItemComponent\@VWearableItemComponent\@\@\@\@UEBA_NXZ */ virtual bool isNetworkComponent() const; /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @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 + * @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 - * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VWearableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z + * @vftbl 6 + * @symbol ?initializeFromNetwork\@?$NetworkedItemComponent\@VWearableItemComponent\@\@\@\@UEAA_NAEBVCompoundTag\@\@\@Z */ virtual bool initializeFromNetwork(class CompoundTag const &); /** - * @symbol ?getSlot\@WearableItemComponent\@\@QEBA?AW4EquipmentSlot\@\@XZ + * @symbol ?getSlot\@WearableItemComponent\@\@QEBA?AW4EquipmentSlot\@\@XZ */ MCAPI enum class EquipmentSlot getSlot() const; /** - * @symbol ?use\@WearableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z + * @symbol ?use\@WearableItemComponent\@\@QEBA_NAEAVItemStack\@\@AEAVPlayer\@\@\@Z */ MCAPI bool use(class ItemStack &, class Player &) const; /** - * @symbol ?bindType\@WearableItemComponent\@\@SAXXZ + * @symbol ?bindType\@WearableItemComponent\@\@SAXXZ */ MCAPI static void bindType(); /** - * @symbol ?getIdentifier\@WearableItemComponent\@\@SAAEBVHashedString\@\@XZ + * @symbol ?getIdentifier\@WearableItemComponent\@\@SAAEBVHashedString\@\@XZ */ MCAPI static class HashedString const & getIdentifier(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Weather.hpp b/LiteLoader/include/llapi/mc/Weather.hpp index 3fa4660af0..e118ee3329 100644 --- a/LiteLoader/include/llapi/mc/Weather.hpp +++ b/LiteLoader/include/llapi/mc/Weather.hpp @@ -31,217 +31,212 @@ class Weather : public BlockSourceListener { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~Weather(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 6 - * @symbol __unk_vfn_6 + * @vftbl 6 + * @symbol __unk_vfn_6 */ virtual void __unk_vfn_6(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol __unk_vfn_10 + * @vftbl 10 + * @symbol __unk_vfn_10 */ virtual void __unk_vfn_10(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol __unk_vfn_12 + * @vftbl 12 + * @symbol __unk_vfn_12 */ virtual void __unk_vfn_12(); /** - * @vftbl 13 - * @symbol __unk_vfn_13 + * @vftbl 13 + * @symbol __unk_vfn_13 */ virtual void __unk_vfn_13(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 15 - * @symbol __unk_vfn_15 + * @vftbl 15 + * @symbol __unk_vfn_15 */ virtual void __unk_vfn_15(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 17 - * @symbol __unk_vfn_17 + * @vftbl 17 + * @symbol __unk_vfn_17 */ virtual void __unk_vfn_17(); /** - * @vftbl 18 - * @symbol __unk_vfn_18 + * @vftbl 18 + * @symbol __unk_vfn_18 */ virtual void __unk_vfn_18(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol __unk_vfn_20 + * @vftbl 20 + * @symbol __unk_vfn_20 */ virtual void __unk_vfn_20(); /** - * @vftbl 21 - * @symbol __unk_vfn_21 + * @vftbl 21 + * @symbol __unk_vfn_21 */ virtual void __unk_vfn_21(); /** - * @vftbl 22 - * @symbol __unk_vfn_22 + * @vftbl 22 + * @symbol __unk_vfn_22 */ virtual void __unk_vfn_22(); /** - * @vftbl 23 - * @symbol __unk_vfn_23 + * @vftbl 23 + * @symbol __unk_vfn_23 */ virtual void __unk_vfn_23(); /** - * @vftbl 24 - * @symbol __unk_vfn_24 + * @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 ?levelEvent\@Weather\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z + * @vftbl 25 + * @symbol ?levelEvent\@Weather\@\@UEAAXW4LevelEvent\@\@AEBVVec3\@\@H\@Z */ virtual void levelEvent(enum class LevelEvent, class Vec3 const &, int); /** - * @symbol ??0Weather\@\@QEAA\@AEAVDimension\@\@AEAVIRandom\@\@\@Z + * @symbol ??0Weather\@\@QEAA\@AEAVDimension\@\@AEAVIRandom\@\@\@Z */ MCAPI Weather(class Dimension &, class IRandom &); /** - * @symbol ?calcSnowBlockDepth\@Weather\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?calcSnowBlockDepth\@Weather\@\@QEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI int calcSnowBlockDepth(class BlockSource &, class BlockPos const &, int) const; /** - * @symbol ?canPlaceTopSnow\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N2PEAH\@Z + * @symbol ?canPlaceTopSnow\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N2PEAH\@Z */ MCAPI bool canPlaceTopSnow(class BlockSource &, class BlockPos const &, bool, bool, int *) const; /** - * @symbol ?getFogLevel\@Weather\@\@QEBAMXZ + * @symbol ?getFogLevel\@Weather\@\@QEBAMXZ */ MCAPI float getFogLevel() const; /** - * @symbol ?getLightningLevel\@Weather\@\@QEBAMM\@Z + * @symbol ?getLightningLevel\@Weather\@\@QEBAMM\@Z */ MCAPI float getLightningLevel(float) const; /** - * @symbol ?getRainLevel\@Weather\@\@QEBAMM\@Z + * @symbol ?getRainLevel\@Weather\@\@QEBAMM\@Z */ MCAPI float getRainLevel(float) const; /** - * @symbol ?isLightning\@Weather\@\@QEBA_NXZ + * @symbol ?isLightning\@Weather\@\@QEBA_NXZ */ MCAPI bool isLightning() const; /** - * @symbol ?isPrecipitatingAt\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isPrecipitatingAt\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isPrecipitatingAt(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?isRaining\@Weather\@\@QEBA_NXZ + * @symbol ?isRaining\@Weather\@\@QEBA_NXZ */ MCAPI bool isRaining() const; /** - * @symbol ?isRainingAt\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isRainingAt\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isRainingAt(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?isSnowingAt\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?isSnowingAt\@Weather\@\@QEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool isSnowingAt(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?serverTick\@Weather\@\@QEAAXXZ + * @symbol ?serverTick\@Weather\@\@QEAAXXZ */ MCAPI void serverTick(); /** - * @symbol ?setSkyFlashTime\@Weather\@\@QEAAXH\@Z + * @symbol ?setSkyFlashTime\@Weather\@\@QEAAXH\@Z */ MCAPI void setSkyFlashTime(int); /** - * @symbol ?setTargetLightningLevel\@Weather\@\@QEAAXM\@Z + * @symbol ?setTargetLightningLevel\@Weather\@\@QEAAXM\@Z */ MCAPI void setTargetLightningLevel(float); /** - * @symbol ?setTargetRainLevel\@Weather\@\@QEAAXM\@Z + * @symbol ?setTargetRainLevel\@Weather\@\@QEAAXM\@Z */ MCAPI void setTargetRainLevel(float); /** - * @symbol ?stop\@Weather\@\@QEAAXXZ + * @symbol ?stop\@Weather\@\@QEAAXXZ */ MCAPI void stop(); /** - * @symbol ?tick\@Weather\@\@QEAAXXZ + * @symbol ?tick\@Weather\@\@QEAAXXZ */ MCAPI void tick(); /** - * @symbol ?tryToPlaceTopSnow\@Weather\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N2\@Z + * @symbol ?tryToPlaceTopSnow\@Weather\@\@QEAA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N2\@Z */ MCAPI bool tryToPlaceTopSnow(class BlockSource &, class BlockPos const &, bool, bool); /** - * @symbol ?calcLightningCycleTime\@Weather\@\@SAHAEAVIRandom\@\@\@Z + * @symbol ?calcLightningCycleTime\@Weather\@\@SAHAEAVIRandom\@\@\@Z */ MCAPI static int calcLightningCycleTime(class IRandom &); /** - * @symbol ?calcRainCycleTime\@Weather\@\@SAHAEAVIRandom\@\@\@Z + * @symbol ?calcRainCycleTime\@Weather\@\@SAHAEAVIRandom\@\@\@Z */ MCAPI static int calcRainCycleTime(class IRandom &); /** - * @symbol ?calcRainDuration\@Weather\@\@SAHAEAVIRandom\@\@\@Z + * @symbol ?calcRainDuration\@Weather\@\@SAHAEAVIRandom\@\@\@Z */ MCAPI static int calcRainDuration(class IRandom &); /** - * @symbol ?rebuildTopSnowToDepth\@Weather\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?rebuildTopSnowToDepth\@Weather\@\@SAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI static void rebuildTopSnowToDepth(class BlockSource &, class BlockPos const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeatherCommand.hpp b/LiteLoader/include/llapi/mc/WeatherCommand.hpp index 6ea07ff114..e7488d0d05 100644 --- a/LiteLoader/include/llapi/mc/WeatherCommand.hpp +++ b/LiteLoader/include/llapi/mc/WeatherCommand.hpp @@ -31,18 +31,18 @@ class WeatherCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeatherCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@WeatherCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@WeatherCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@WeatherCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@WeatherCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeatherHelpers.hpp b/LiteLoader/include/llapi/mc/WeatherHelpers.hpp index 57758fe279..d19232e2e5 100644 --- a/LiteLoader/include/llapi/mc/WeatherHelpers.hpp +++ b/LiteLoader/include/llapi/mc/WeatherHelpers.hpp @@ -22,15 +22,15 @@ namespace WeatherHelpers { #undef AFTER_EXTRA /** - * @symbol ?getTopRainBlockPos\@WeatherHelpers\@\@YA?BVBlockPos\@\@PEAVLevelChunk\@\@AEBV2\@\@Z + * @symbol ?getTopRainBlockPos\@WeatherHelpers\@\@YA?BVBlockPos\@\@PEAVLevelChunk\@\@AEBV2\@\@Z */ MCAPI class BlockPos const getTopRainBlockPos(class LevelChunk *, class BlockPos const &); /** - * @symbol ?shouldFreeze\@WeatherHelpers\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z + * @symbol ?shouldFreeze\@WeatherHelpers\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_N\@Z */ MCAPI bool shouldFreeze(class BlockSource &, class BlockPos const &, bool); /** - * @symbol ?shouldSnow\@WeatherHelpers\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?shouldSnow\@WeatherHelpers\@\@YA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool shouldSnow(class BlockSource &, class BlockPos const &); diff --git a/LiteLoader/include/llapi/mc/WebBlock.hpp b/LiteLoader/include/llapi/mc/WebBlock.hpp index bf9e67cd90..bc9f65fe73 100644 --- a/LiteLoader/include/llapi/mc/WebBlock.hpp +++ b/LiteLoader/include/llapi/mc/WebBlock.hpp @@ -31,224 +31,229 @@ class WebBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WebBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@WebBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@WebBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@WebBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@WebBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@WebBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@WebBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 186 - * @symbol ?playerDestroy\@WebBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 187 + * @symbol ?playerDestroy\@WebBlock\@\@UEBAXAEAVPlayer\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual void playerDestroy(class Player &, class BlockPos const &, class Block const &) const; /** - * @vftbl 187 - * @symbol ?getResourceItem\@WebBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@WebBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WEBBLOCK /** - * @symbol ?waterSpreadCausesSpawn\@WebBlock\@\@UEBA_NXZ + * @symbol ?waterSpreadCausesSpawn\@WebBlock\@\@UEBA_NXZ */ MCVAPI bool waterSpreadCausesSpawn() const; #endif /** - * @symbol ??0WebBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WebBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WebBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp b/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp index b5403481f7..ef12d472e6 100644 --- a/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp +++ b/LiteLoader/include/llapi/mc/WebSocketPacketData.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure WebSocketPacketData. - * - */ -struct WebSocketPacketData { + +class WebSocketPacketData { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_WEBSOCKETPACKETDATA public: - struct WebSocketPacketData& operator=(struct WebSocketPacketData const &) = delete; - WebSocketPacketData(struct WebSocketPacketData const &) = delete; + class WebSocketPacketData& operator=(class WebSocketPacketData const &) = delete; + WebSocketPacketData(class WebSocketPacketData const &) = delete; WebSocketPacketData() = delete; #endif public: /** - * @symbol ??0WebSocketPacketData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0WebSocketPacketData\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI WebSocketPacketData(std::string const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WebToken.hpp b/LiteLoader/include/llapi/mc/WebToken.hpp index 3ef6cb1541..66e25a216f 100644 --- a/LiteLoader/include/llapi/mc/WebToken.hpp +++ b/LiteLoader/include/llapi/mc/WebToken.hpp @@ -38,40 +38,40 @@ class WebToken { public: /** - * @symbol ??0WebToken\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ??0WebToken\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI WebToken(std::string); /** - * @symbol ?toString\@WebToken\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?toString\@WebToken\@\@QEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string toString() const; /** - * @symbol ?verifyWithIncludedKey\@WebToken\@\@QEBA_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 ?verifyWithIncludedKey\@WebToken\@\@QEBA_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 bool verifyWithIncludedKey(std::vector const &) const; /** - * @symbol ??1WebToken\@\@QEAA\@XZ + * @symbol ??1WebToken\@\@QEAA\@XZ */ MCAPI ~WebToken(); /** - * @symbol ?createFromData\@WebToken\@\@SA?AV?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@AEBVPrivateKeyManager\@\@\@Z + * @symbol ?createFromData\@WebToken\@\@SA?AV?$unique_ptr\@VWebToken\@\@U?$default_delete\@VWebToken\@\@\@std\@\@\@std\@\@AEBVValue\@Json\@\@AEBVPrivateKeyManager\@\@\@Z */ MCAPI static std::unique_ptr createFromData(class Json::Value const &, class PrivateKeyManager const &); //private: /** - * @symbol ?_parse\@WebToken\@\@AEAAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_parse\@WebToken\@\@AEAAXAEAVValue\@Json\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI void _parse(class Json::Value &, std::string const &); /** - * @symbol ?_signatureToDER\@WebToken\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?_signatureToDER\@WebToken\@\@AEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string _signatureToDER() const; /** - * @symbol ?_DERToBinary\@WebToken\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@H\@Z + * @symbol ?_DERToBinary\@WebToken\@\@CA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBV23\@H\@Z */ MCAPI static std::string _DERToBinary(std::string const &, int); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WebviewObserver.hpp b/LiteLoader/include/llapi/mc/WebviewObserver.hpp index 59e5d5b3f4..2c05f23984 100644 --- a/LiteLoader/include/llapi/mc/WebviewObserver.hpp +++ b/LiteLoader/include/llapi/mc/WebviewObserver.hpp @@ -31,41 +31,45 @@ class WebviewObserver { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WEBVIEWOBSERVER /** - * @symbol ?onDownloadBegin\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @symbol ?onDownloadBegin\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ MCVAPI void onDownloadBegin(struct WebviewDownloadInfo const &); /** - * @symbol ?onDownloadCanceled\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @symbol ?onDownloadCanceled\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ MCVAPI void onDownloadCanceled(struct WebviewDownloadInfo const &); /** - * @symbol ?onDownloadComplete\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @symbol ?onDownloadComplete\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ MCVAPI void onDownloadComplete(struct WebviewDownloadInfo const &); /** - * @symbol ?onDownloadUpdate\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z + * @symbol ?onDownloadUpdate\@WebviewObserver\@\@UEAAXAEBUWebviewDownloadInfo\@\@\@Z */ MCVAPI void onDownloadUpdate(struct WebviewDownloadInfo const &); /** - * @symbol ?onError\@WebviewObserver\@\@UEAAXAEBUWebviewError\@\@\@Z + * @symbol ?onError\@WebviewObserver\@\@UEAAXAEBUWebviewError\@\@\@Z */ MCVAPI void onError(struct WebviewError const &); /** - * @symbol ?onLoadingBegin\@WebviewObserver\@\@UEAAXXZ + * @symbol ?onLoadingBegin\@WebviewObserver\@\@UEAAXXZ */ MCVAPI void onLoadingBegin(); /** - * @symbol ?onLoadingEnd\@WebviewObserver\@\@UEAAXXZ + * @symbol ?onLoadingEnd\@WebviewObserver\@\@UEAAXXZ */ MCVAPI void onLoadingEnd(); /** - * @symbol ?onMessageRecieved\@WebviewObserver\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?onMessageRecieved\@WebviewObserver\@\@UEAAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCVAPI void onMessageRecieved(std::string const &); /** - * @symbol ?onWebviewChanged\@WebviewObserver\@\@UEAAXXZ + * @symbol ?onWebviewChanged\@WebviewObserver\@\@UEAAXXZ */ MCVAPI void onWebviewChanged(); + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WebviewObserver(); #endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp index fb009e2eeb..77df632a72 100644 --- a/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesBlock.hpp @@ -31,264 +31,273 @@ class WeepingVinesBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeepingVinesBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 10 - * @symbol ?getAABB\@WeepingVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z + * @vftbl 10 + * @symbol ?getAABB\@WeepingVinesBlock\@\@UEBAAEBVAABB\@\@AEBVIConstBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@AEAV2\@_N\@Z */ virtual class AABB const & getAABB(class IConstBlockSource const &, class BlockPos const &, class Block const &, class AABB &, bool) const; /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 62 - * @symbol ?canContainLiquid\@WeepingVinesBlock\@\@UEBA_NXZ + * @vftbl 62 + * @symbol ?canContainLiquid\@WeepingVinesBlock\@\@UEBA_NXZ */ virtual bool canContainLiquid() const; /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 92 - * @symbol ?mayPlace\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 92 + * @symbol ?mayPlace\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 99 - * @symbol ?neighborChanged\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@1\@Z + * @vftbl 99 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 162 - * @symbol ?onRemove\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 162 + * @symbol ?onRemove\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onRemove(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 168 - * @symbol ?onPlace\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 168 + * @symbol ?onPlace\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual void onPlace(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 171 - * @symbol ?tick\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 171 + * @symbol ?tick\@WeepingVinesBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void tick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 178 - * @symbol ?canSurvive\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 179 + * @symbol ?canSurvive\@WeepingVinesBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool canSurvive(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@WeepingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@WeepingVinesBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @symbol ??0WeepingVinesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WeepingVinesBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WeepingVinesBlock(std::string const &, int); /** - * @symbol ?placeVineString\@WeepingVinesBlock\@\@SAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHH\@Z + * @symbol ?placeVineString\@WeepingVinesBlock\@\@SAXAEAVBlockSource\@\@AEAVRandom\@\@AEBVBlockPos\@\@HHH\@Z */ MCAPI static void placeVineString(class BlockSource &, class Random &, class BlockPos const &, int, int, int); //private: /** - * @symbol ?_getAge\@WeepingVinesBlock\@\@AEBAHAEBVBlock\@\@\@Z + * @symbol ?_getAge\@WeepingVinesBlock\@\@AEBAHAEBVBlock\@\@\@Z */ MCAPI int _getAge(class Block const &) const; /** - * @symbol ?_tryGrow\@WeepingVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z + * @symbol ?_shouldGrow\@WeepingVinesBlock\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@_K\@Z + */ + MCAPI bool _shouldGrow(class BlockSource &, class BlockPos const &, unsigned __int64) const; + /** + * @symbol ?_tryGrow\@WeepingVinesBlock\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@H\@Z */ MCAPI void _tryGrow(class BlockSource &, class BlockPos const &, int) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp b/LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp index b7576d6725..2057786025 100644 --- a/LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp +++ b/LiteLoader/include/llapi/mc/WeepingVinesClusterFeature.hpp @@ -31,30 +31,30 @@ class WeepingVinesClusterFeature : public Feature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeepingVinesClusterFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?place\@WeepingVinesClusterFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 3 + * @symbol ?place\@WeepingVinesClusterFeature\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool place(class BlockSource &, class BlockPos const &, class Random &) const; //private: /** - * @symbol ?_isInvalidPlacementLocation\@WeepingVinesClusterFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @symbol ?_isInvalidPlacementLocation\@WeepingVinesClusterFeature\@\@AEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ MCAPI bool _isInvalidPlacementLocation(class BlockSource &, class BlockPos const &) const; /** - * @symbol ?_placeRoofNetherWart\@WeepingVinesClusterFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_placeRoofNetherWart\@WeepingVinesClusterFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void _placeRoofNetherWart(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @symbol ?_placeRoofWeepingVines\@WeepingVinesClusterFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @symbol ?_placeRoofWeepingVines\@WeepingVinesClusterFeature\@\@AEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ MCAPI void _placeRoofWeepingVines(class BlockSource &, class BlockPos const &, class Random &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp index 3563cef1e6..506a0d1ffd 100644 --- a/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp +++ b/LiteLoader/include/llapi/mc/WeightedPressurePlateBlock.hpp @@ -31,226 +31,231 @@ class WeightedPressurePlateBlock : public BasePressurePlateBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeightedPressurePlateBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@WeightedPressurePlateBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol ?getTickDelay\@WeightedPressurePlateBlock\@\@UEBAHXZ + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @vftbl 194 + * @symbol ?getTickDelay\@WeightedPressurePlateBlock\@\@UEBAHXZ */ virtual int getTickDelay() const; /** - * @vftbl 194 - * @symbol ?getSignalStrength\@WeightedPressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 195 + * @symbol ?getSignalStrength\@WeightedPressurePlateBlock\@\@MEBAHAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual int getSignalStrength(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 195 - * @symbol ?getSignalForData\@WeightedPressurePlateBlock\@\@MEBAHH\@Z + * @vftbl 196 + * @symbol ?getSignalForData\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getSignalForData(int) const; /** - * @vftbl 196 - * @symbol ?getRedstoneSignal\@WeightedPressurePlateBlock\@\@MEBAHH\@Z + * @vftbl 197 + * @symbol ?getRedstoneSignal\@WeightedPressurePlateBlock\@\@MEBAHH\@Z */ virtual int getRedstoneSignal(int) const; /** - * @symbol ??0WeightedPressurePlateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@H\@Z + * @symbol ??0WeightedPressurePlateBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@HAEBVMaterial\@\@H\@Z */ MCAPI WeightedPressurePlateBlock(std::string const &, int, class Material const &, int); /** - * @symbol ?MAX_WEIGHT_HEAVY\@WeightedPressurePlateBlock\@\@2HB + * @symbol ?MAX_WEIGHT_HEAVY\@WeightedPressurePlateBlock\@\@2HB */ MCAPI static int const MAX_WEIGHT_HEAVY; /** - * @symbol ?MAX_WEIGHT_LIGHT\@WeightedPressurePlateBlock\@\@2HB + * @symbol ?MAX_WEIGHT_LIGHT\@WeightedPressurePlateBlock\@\@2HB */ MCAPI static int const MAX_WEIGHT_LIGHT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp b/LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp index 709c5652d4..be9562bfa1 100644 --- a/LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp +++ b/LiteLoader/include/llapi/mc/WeightedRandomFeature.hpp @@ -29,18 +29,18 @@ class WeightedRandomFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WeightedRandomFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?place\@WeightedRandomFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z + * @vftbl 1 + * @symbol ?place\@WeightedRandomFeature\@\@UEBA?AV?$optional\@VBlockPos\@\@\@std\@\@AEAVIBlockWorldGenAPI\@\@AEBVBlockPos\@\@AEAVRandom\@\@AEAVRenderParams\@\@\@Z */ virtual class std::optional place(class IBlockWorldGenAPI &, class BlockPos const &, class Random &, class RenderParams &) const; /** - * @symbol ??0WeightedRandomFeature\@\@QEAA\@XZ + * @symbol ??0WeightedRandomFeature\@\@QEAA\@XZ */ MCAPI WeightedRandomFeature(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Witch.hpp b/LiteLoader/include/llapi/mc/Witch.hpp index d58d0f6c88..ee803ccb02 100644 --- a/LiteLoader/include/llapi/mc/Witch.hpp +++ b/LiteLoader/include/llapi/mc/Witch.hpp @@ -32,189 +32,167 @@ class Witch : public HumanoidMonster { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Witch(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 27 + * @symbol ?getFiringPos\@Witch\@\@UEBA?AVVec3\@\@XZ + */ + virtual class Vec3 getFiringPos() const; + /** + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 114 - * @symbol ?canAttack\@Witch\@\@UEBA_NPEAVActor\@\@_N\@Z + * @vftbl 113 + * @symbol ?canAttack\@Witch\@\@UEBA_NPEAVActor\@\@_N\@Z */ virtual bool canAttack(class Actor *, bool) const; /** - * @vftbl 118 - * @symbol ?performRangedAttack\@Witch\@\@UEAAXAEAVActor\@\@M\@Z - */ - virtual void performRangedAttack(class Actor &, float); - /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Witch\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Witch\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 260 - * @symbol ?updateEntitySpecificMolangVariables\@Witch\@\@UEAAXAEAVRenderParams\@\@\@Z + * @vftbl 258 + * @symbol ?updateEntitySpecificMolangVariables\@Witch\@\@UEAAXAEAVRenderParams\@\@\@Z */ virtual void updateEntitySpecificMolangVariables(class RenderParams &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 276 - * @symbol ?_onSizeUpdated\@Witch\@\@EEAAXXZ + * @vftbl 274 + * @symbol ?_onSizeUpdated\@Witch\@\@EEAAXXZ */ virtual void _onSizeUpdated(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 - */ - virtual void __unk_vfn_277(); - /** - * @vftbl 285 - * @symbol __unk_vfn_285 - */ - virtual void __unk_vfn_285(); - /** - * @vftbl 291 - * @symbol ?aiStep\@Witch\@\@UEAAXXZ + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void aiStep(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 331 - * @symbol ?getDamageAfterEnchantReduction\@Witch\@\@MEBAMAEBVActorDamageSource\@\@M\@Z + * @vftbl 328 + * @symbol ?getDamageAfterEnchantReduction\@Witch\@\@MEBAMAEBVActorDamageSource\@\@M\@Z */ virtual float getDamageAfterEnchantReduction(class ActorDamageSource const &, float) const; /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Witch\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Witch\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Witch(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?preAiStep\@Witch\@\@QEAAXXZ + * @symbol ?preAiStep\@Witch\@\@QEAAXXZ */ MCAPI void preAiStep(); -//private: - -private: - /** - * @symbol ?SPEED_MODIFIER_DRINKING\@Witch\@\@0V?$shared_ptr\@VAttributeModifier\@\@\@std\@\@A - */ - MCAPI static class std::shared_ptr SPEED_MODIFIER_DRINKING; - /** - * @symbol ?SPEED_MODIFIER_DRINKING_UUID\@Witch\@\@0VUUID\@mce\@\@B - */ - MCAPI static class mce::UUID const SPEED_MODIFIER_DRINKING_UUID; - -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp index 402f64a848..1177fe66b2 100644 --- a/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitchPreAIStepSystem.hpp @@ -28,16 +28,16 @@ class WitchPreAIStepSystem { public: /** - * @symbol ?createSystem\@WitchPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@WitchPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doWitchPreAIStepSystem\@WitchPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doWitchPreAIStepSystem\@WitchPreAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWitchPreAIStepSystem(class StrictEntityContext const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherBoss.hpp b/LiteLoader/include/llapi/mc/WitherBoss.hpp index 014343bcc8..739b0ce42d 100644 --- a/LiteLoader/include/llapi/mc/WitherBoss.hpp +++ b/LiteLoader/include/llapi/mc/WitherBoss.hpp @@ -32,334 +32,329 @@ class WitherBoss : public Monster { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@WitherBoss\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@WitherBoss\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 11 - * @symbol ?reloadHardcodedClient\@WitherBoss\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 11 + * @symbol ?reloadHardcodedClient\@WitherBoss\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcodedClient(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~WitherBoss(); + virtual void __unk_vfn_16(); /** - * @vftbl 19 - * @symbol ?remove\@WitherBoss\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?remove\@WitherBoss\@\@UEAAXXZ */ virtual void remove(); /** - * @vftbl 27 - * @symbol ?getFiringPos\@WitherBoss\@\@UEBA?AVVec3\@\@XZ + * @vftbl 27 + * @symbol ?getFiringPos\@WitherBoss\@\@UEBA?AVVec3\@\@XZ */ virtual class Vec3 getFiringPos() const; /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 53 - * @symbol ?startRiding\@WitherBoss\@\@UEAA_NAEAVActor\@\@\@Z + * @vftbl 53 + * @symbol ?startRiding\@WitherBoss\@\@UEAA_NAEAVActor\@\@\@Z */ virtual bool startRiding(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 77 - * @symbol ?setBlockMovementSlowdownMultiplier\@WitherBoss\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z + * @vftbl 76 + * @symbol ?setBlockMovementSlowdownMultiplier\@WitherBoss\@\@UEAAXAEBVBlockLegacy\@\@AEBVVec3\@\@\@Z */ virtual void setBlockMovementSlowdownMultiplier(class BlockLegacy const &, class Vec3 const &); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 135 - * @symbol ?isInvulnerableTo\@WitherBoss\@\@UEBA_NAEBVActorDamageSource\@\@\@Z + * @vftbl 134 + * @symbol ?isInvulnerableTo\@WitherBoss\@\@UEBA_NAEBVActorDamageSource\@\@\@Z */ virtual bool isInvulnerableTo(class ActorDamageSource const &) const; /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@WitherBoss\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@WitherBoss\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 172 - * @symbol ?canFreeze\@WitherBoss\@\@UEBA_NXZ + * @vftbl 171 + * @symbol ?canFreeze\@WitherBoss\@\@UEBA_NXZ */ virtual bool canFreeze() const; /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 183 - * @symbol ?causeFallDamage\@WitherBoss\@\@UEAAXMMVActorDamageSource\@\@\@Z + * @vftbl 182 + * @symbol ?causeFallDamage\@WitherBoss\@\@UEAAXMMVActorDamageSource\@\@\@Z */ virtual void causeFallDamage(float, float, class ActorDamageSource); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 208 - * @symbol ?canBeAffected\@WitherBoss\@\@UEBA_NI\@Z + * @vftbl 207 + * @symbol ?canBeAffected\@WitherBoss\@\@UEBA_NI\@Z */ virtual bool canBeAffected(unsigned int) const; /** - * @vftbl 209 - * @symbol ?canBeAffectedByArrow\@WitherBoss\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z + * @vftbl 208 + * @symbol ?canBeAffectedByArrow\@WitherBoss\@\@UEBA_NAEBVMobEffectInstance\@\@\@Z */ virtual bool canBeAffectedByArrow(class MobEffectInstance const &) const; /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 246 - * @symbol ?die\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@\@Z + * @vftbl 245 + * @symbol ?die\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@\@Z */ virtual void die(class ActorDamageSource const &); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@WitherBoss\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@WitherBoss\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@WitherBoss\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@WitherBoss\@\@UEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@WitherBoss\@\@UEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@WitherBoss\@\@UEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 286 - * @symbol ?hurtEffects\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 283 + * @symbol ?hurtEffects\@WitherBoss\@\@UEAAXAEBVActorDamageSource\@\@M_N1\@Z */ virtual void hurtEffects(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 291 - * @symbol ?aiStep\@WitherBoss\@\@UEAAXXZ + * @vftbl 288 + * @symbol ?aiStep\@WitherBoss\@\@UEAAXXZ */ virtual void aiStep(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@WitherBoss\@\@UEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@WitherBoss\@\@UEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 349 - * @symbol ?newServerAiStep\@WitherBoss\@\@UEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@WitherBoss\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0WitherBoss\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0WitherBoss\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI WitherBoss(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?awardSpawnWitherAchievement\@WitherBoss\@\@QEBAXXZ + * @symbol ?awardSpawnWitherAchievement\@WitherBoss\@\@QEBAXXZ */ MCAPI void awardSpawnWitherAchievement() const; /** - * @symbol ?getHeadPos\@WitherBoss\@\@QEBA?AVVec3\@\@H\@Z + * @symbol ?getHeadPos\@WitherBoss\@\@QEBA?AVVec3\@\@H\@Z */ MCAPI class Vec3 getHeadPos(int) const; /** - * @symbol ?getHeadRot\@WitherBoss\@\@QEAA?AVVec2\@\@H\@Z + * @symbol ?getHeadRot\@WitherBoss\@\@QEAA?AVVec2\@\@H\@Z */ MCAPI class Vec2 getHeadRot(int); /** - * @symbol ?getInvulnerableTicks\@WitherBoss\@\@QEBAHXZ + * @symbol ?getInvulnerableTicks\@WitherBoss\@\@QEBAHXZ */ MCAPI int getInvulnerableTicks() const; /** - * @symbol ?getOverlayAlpha\@WitherBoss\@\@QEAAMXZ + * @symbol ?getOverlayAlpha\@WitherBoss\@\@QEAAMXZ */ MCAPI float getOverlayAlpha(); /** - * @symbol ?getSwellAmount\@WitherBoss\@\@QEBAMM\@Z + * @symbol ?getSwellAmount\@WitherBoss\@\@QEBAMM\@Z */ MCAPI float getSwellAmount(float) const; /** - * @symbol ?hasAerialAttack\@WitherBoss\@\@QEBA_NXZ + * @symbol ?hasAerialAttack\@WitherBoss\@\@QEBA_NXZ */ MCAPI bool hasAerialAttack() const; /** - * @symbol ?postAiStep\@WitherBoss\@\@QEAAXXZ + * @symbol ?postAiStep\@WitherBoss\@\@QEAAXXZ */ MCAPI void postAiStep(); /** - * @symbol ?preAiStep\@WitherBoss\@\@QEAA?AW4WitherBossPreAIStepResult\@\@XZ + * @symbol ?preAiStep\@WitherBoss\@\@QEAA?AW4WitherBossPreAIStepResult\@\@XZ */ MCAPI enum class WitherBossPreAIStepResult preAiStep(); /** - * @symbol ?removeSkeleton\@WitherBoss\@\@QEAAXXZ + * @symbol ?removeSkeleton\@WitherBoss\@\@QEAAXXZ */ MCAPI void removeSkeleton(); /** - * @symbol ?setAerialAttack\@WitherBoss\@\@QEAAX_N\@Z + * @symbol ?setAerialAttack\@WitherBoss\@\@QEAAX_N\@Z */ MCAPI void setAerialAttack(bool); /** - * @symbol ?setAlternativeTarget\@WitherBoss\@\@QEAAXHUActorUniqueID\@\@\@Z + * @symbol ?setAlternativeTarget\@WitherBoss\@\@QEAAXHUActorUniqueID\@\@\@Z */ MCAPI void setAlternativeTarget(int, struct ActorUniqueID); /** - * @symbol ?setIsPathing\@WitherBoss\@\@QEAAX_N\@Z + * @symbol ?setIsPathing\@WitherBoss\@\@QEAAX_N\@Z */ MCAPI void setIsPathing(bool); /** - * @symbol ?setShotDelay\@WitherBoss\@\@QEAAXH\@Z + * @symbol ?setShotDelay\@WitherBoss\@\@QEAAXH\@Z */ MCAPI void setShotDelay(int); /** - * @symbol ?setWantsToMove\@WitherBoss\@\@QEAAX_N\@Z + * @symbol ?setWantsToMove\@WitherBoss\@\@QEAAX_N\@Z */ MCAPI void setWantsToMove(bool); /** - * @symbol ?wantsToMove\@WitherBoss\@\@QEAA_NXZ + * @symbol ?wantsToMove\@WitherBoss\@\@QEAA_NXZ */ MCAPI bool wantsToMove(); /** - * @symbol ?MAX_HEALTH_CAP_UUID\@WitherBoss\@\@2VUUID\@mce\@\@B + * @symbol ?MAX_HEALTH_CAP_UUID\@WitherBoss\@\@2VUUID\@mce\@\@B */ MCAPI static class mce::UUID const MAX_HEALTH_CAP_UUID; /** - * @symbol ?canDestroy\@WitherBoss\@\@SA_NAEBVBlock\@\@W4WitherAttackType\@1\@\@Z + * @symbol ?canDestroy\@WitherBoss\@\@SA_NAEBVBlock\@\@W4WitherAttackType\@1\@\@Z */ MCAPI static bool canDestroy(class Block const &, enum class WitherBoss::WitherAttackType); //private: /** - * @symbol ?_destroyBlocks\@WitherBoss\@\@AEAAXAEAVLevel\@\@AEBVAABB\@\@AEAVBlockSource\@\@HW4WitherAttackType\@1\@\@Z + * @symbol ?_destroyBlocks\@WitherBoss\@\@AEAAXAEAVLevel\@\@AEBVAABB\@\@AEAVBlockSource\@\@HW4WitherAttackType\@1\@\@Z */ MCAPI void _destroyBlocks(class Level &, class AABB const &, class BlockSource &, int, enum class WitherBoss::WitherAttackType); /** - * @symbol ?_performRangedAttack\@WitherBoss\@\@AEAAXHAEAVActor\@\@\@Z + * @symbol ?_performRangedAttack\@WitherBoss\@\@AEAAXHAEAVActor\@\@\@Z */ MCAPI void _performRangedAttack(int, class Actor &); /** - * @symbol ?_performRangedAttack\@WitherBoss\@\@AEAAXHAEBVVec3\@\@_N\@Z + * @symbol ?_performRangedAttack\@WitherBoss\@\@AEAAXHAEBVVec3\@\@_N\@Z */ MCAPI void _performRangedAttack(int, class Vec3 const &, bool); /** - * @symbol ?canShoot\@WitherBoss\@\@AEAA_NXZ + * @symbol ?canShoot\@WitherBoss\@\@AEAA_NXZ */ MCAPI bool canShoot(); private: /** - * @symbol ?TIME_BEFORE_MOVING\@WitherBoss\@\@0HB + * @symbol ?TIME_BEFORE_MOVING\@WitherBoss\@\@0HB */ MCAPI static int const TIME_BEFORE_MOVING; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp index c3db69c5c2..042b53a056 100644 --- a/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitherBossPostAIStepSystem.hpp @@ -28,16 +28,16 @@ class WitherBossPostAIStepSystem { public: /** - * @symbol ?createSystem\@WitherBossPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@WitherBossPostAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doWitherBossPostAIStepSystem\@WitherBossPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUWitherBossPreAIStepResultComponent\@\@AEAVActorOwnerComponent\@\@\@Z + * @symbol ?_doWitherBossPostAIStepSystem\@WitherBossPostAIStepSystem\@\@CAXAEBVStrictEntityContext\@\@AEBUWitherBossPreAIStepResultComponent\@\@AEAVActorOwnerComponent\@\@\@Z */ MCAPI static void _doWitherBossPostAIStepSystem(class StrictEntityContext const &, struct WitherBossPreAIStepResultComponent const &, class ActorOwnerComponent &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp b/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp index 6eb92629d1..9d6296fe28 100644 --- a/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp +++ b/LiteLoader/include/llapi/mc/WitherBossPreAIStepSystem.hpp @@ -28,16 +28,16 @@ class WitherBossPreAIStepSystem { public: /** - * @symbol ?createSystem\@WitherBossPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ + * @symbol ?createSystem\@WitherBossPreAIStepSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ */ MCAPI static struct TickingSystemWithInfo createSystem(); //private: /** - * @symbol ?_doWitherBossPreAIStepSystem\@WitherBossPreAIStepSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UWitherBossPreAIStepResultComponent\@\@\@\@\@Z + * @symbol ?_doWitherBossPreAIStepSystem\@WitherBossPreAIStepSystem\@\@CAXAEAVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@V?$EntityModifierT\@VEntityRegistryBase\@\@VStrictEntityContext\@\@UWitherBossPreAIStepResultComponent\@\@\@\@\@Z */ MCAPI static void _doWitherBossPreAIStepSystem(class StrictEntityContext &, class ActorOwnerComponent &, class EntityModifierT); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp b/LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp index 18c957883e..11611e0daa 100644 --- a/LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp +++ b/LiteLoader/include/llapi/mc/WitherBossSpawnUtilities.hpp @@ -22,11 +22,11 @@ namespace WitherBossSpawnUtilities { #undef AFTER_EXTRA /** - * @symbol ?createWitherBuilder\@WitherBossSpawnUtilities\@\@YA?AV?$unique_ptr\@VBlockPatternBuilder\@\@U?$default_delete\@VBlockPatternBuilder\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?createWitherBuilder\@WitherBossSpawnUtilities\@\@YA?AV?$unique_ptr\@VBlockPatternBuilder\@\@U?$default_delete\@VBlockPatternBuilder\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCAPI std::unique_ptr createWitherBuilder(class BlockSource &); /** - * @symbol ?createWitherBuilderForTShape\@WitherBossSpawnUtilities\@\@YA?AV?$unique_ptr\@VBlockPatternBuilder\@\@U?$default_delete\@VBlockPatternBuilder\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z + * @symbol ?createWitherBuilderForTShape\@WitherBossSpawnUtilities\@\@YA?AV?$unique_ptr\@VBlockPatternBuilder\@\@U?$default_delete\@VBlockPatternBuilder\@\@\@std\@\@\@std\@\@AEAVBlockSource\@\@\@Z */ MCAPI std::unique_ptr createWitherBuilderForTShape(class BlockSource &); diff --git a/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp b/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp index a034a72738..2be54ddda7 100644 --- a/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp +++ b/LiteLoader/include/llapi/mc/WitherRandomAttackPosGoal.hpp @@ -31,43 +31,43 @@ class WitherRandomAttackPosGoal : public RandomStrollGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WitherRandomAttackPosGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@WitherRandomAttackPosGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@WitherRandomAttackPosGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@WitherRandomAttackPosGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@WitherRandomAttackPosGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 4 - * @symbol ?start\@WitherRandomAttackPosGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@WitherRandomAttackPosGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@WitherRandomAttackPosGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@WitherRandomAttackPosGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @symbol ??0WitherRandomAttackPosGoal\@\@QEAA\@AEAVMob\@\@MHH\@Z + * @symbol ??0WitherRandomAttackPosGoal\@\@QEAA\@AEAVMob\@\@MHH\@Z */ MCAPI WitherRandomAttackPosGoal(class Mob &, float, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp index a983fd8a6a..11088ea9d5 100644 --- a/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp +++ b/LiteLoader/include/llapi/mc/WitherRoseBlock.hpp @@ -31,243 +31,243 @@ class WitherRoseBlock : public FlowerBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WitherRoseBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol ?onFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@PEAVActor\@\@W4FertilizerType\@\@\@Z + * @vftbl 86 + * @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 - * @symbol ?canBeFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 88 + * @symbol ?canBeFertilized\@WitherRoseBlock\@\@UEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeFertilized(class BlockSource &, class BlockPos const &, class Block const &) const; /** - * @vftbl 93 - * @symbol ?mayPlaceOn\@WitherRoseBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z + * @vftbl 93 + * @symbol ?mayPlaceOn\@WitherRoseBlock\@\@MEBA_NAEAVBlockSource\@\@AEBVBlockPos\@\@\@Z */ virtual bool mayPlaceOn(class BlockSource &, class BlockPos const &) const; /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 113 - * @symbol ?entityInside\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z + * @vftbl 113 + * @symbol ?entityInside\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVActor\@\@\@Z */ virtual void entityInside(class BlockSource &, class BlockPos const &, class Actor &) const; /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@WitherRoseBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@WitherRoseBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@WitherRoseBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@WitherRoseBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 147 - * @symbol ?canSpawnOn\@WitherRoseBlock\@\@UEBA_NPEAVActor\@\@\@Z + * @vftbl 147 + * @symbol ?canSpawnOn\@WitherRoseBlock\@\@UEBA_NPEAVActor\@\@\@Z */ virtual bool canSpawnOn(class Actor *) const; /** - * @vftbl 151 - * @symbol ?animateTick\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 151 + * @symbol ?animateTick\@WitherRoseBlock\@\@UEBAXAEAVBlockSource\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual void animateTick(class BlockSource &, class BlockPos const &, class Random &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@WitherRoseBlock\@\@MEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; + virtual void __unk_vfn_186(); /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@WitherRoseBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@WitherRoseBlock\@\@MEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0WitherRoseBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WitherRoseBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WitherRoseBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherSkull.hpp b/LiteLoader/include/llapi/mc/WitherSkull.hpp index b00ee99865..a574134786 100644 --- a/LiteLoader/include/llapi/mc/WitherSkull.hpp +++ b/LiteLoader/include/llapi/mc/WitherSkull.hpp @@ -32,159 +32,159 @@ class WitherSkull : public Fireball { public: /** - * @vftbl 12 - * @symbol ?initializeComponents\@WitherSkull\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 12 + * @symbol ?initializeComponents\@WitherSkull\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void initializeComponents(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~WitherSkull(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 96 - * @symbol ?isPickable\@WitherSkull\@\@UEAA_NXZ + * @vftbl 95 + * @symbol ?isPickable\@WitherSkull\@\@UEAA_NXZ */ virtual bool isPickable(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 105 - * @symbol ?isOnFire\@WitherSkull\@\@UEBA_NXZ + * @vftbl 104 + * @symbol ?isOnFire\@WitherSkull\@\@UEBA_NXZ */ virtual bool isOnFire() const; /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 232 - * @symbol ?canDestroyBlock\@WitherSkull\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 231 + * @symbol ?canDestroyBlock\@WitherSkull\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool canDestroyBlock(class Block const &) const; /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@WitherSkull\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@WitherSkull\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_268(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_275(); /** - * @vftbl 278 - * @symbol ?getInertia\@WitherSkull\@\@MEAAMXZ + * @vftbl 276 + * @symbol ?getInertia\@WitherSkull\@\@MEAAMXZ */ virtual float getInertia(); /** - * @vftbl 279 - * @symbol __unk_vfn_279 + * @vftbl 277 + * @symbol __unk_vfn_277 */ - virtual void __unk_vfn_279(); + virtual void __unk_vfn_277(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WITHERSKULL /** - * @symbol ?shouldBurn\@WitherSkull\@\@UEAA_NXZ + * @symbol ?shouldBurn\@WitherSkull\@\@UEAA_NXZ */ MCVAPI bool shouldBurn(); #endif /** - * @symbol ??0WitherSkull\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0WitherSkull\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI WitherSkull(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp b/LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp index 02fe629f1f..e70bc34caf 100644 --- a/LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp +++ b/LiteLoader/include/llapi/mc/WitherTargetHighestDamage.hpp @@ -31,56 +31,56 @@ class WitherTargetHighestDamage : public TargetGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WitherTargetHighestDamage(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@WitherTargetHighestDamage\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@WitherTargetHighestDamage\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@WitherTargetHighestDamage\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@WitherTargetHighestDamage\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 4 - * @symbol ?start\@WitherTargetHighestDamage\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@WitherTargetHighestDamage\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@WitherTargetHighestDamage\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@WitherTargetHighestDamage\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 10 - * @symbol ?_canAttack\@WitherTargetHighestDamage\@\@EEAA_NPEAVMob\@\@PEAVActor\@\@_N2PEAPEBUMobDescriptor\@\@\@Z + * @vftbl 10 + * @symbol ?_canAttack\@WitherTargetHighestDamage\@\@EEAA_NPEAVMob\@\@PEAVActor\@\@_N2PEAPEBUMobDescriptor\@\@\@Z */ virtual bool _canAttack(class Mob *, class Actor *, bool, bool, struct MobDescriptor const **); /** - * @symbol ??0WitherTargetHighestDamage\@\@QEAA\@AEAVWitherBoss\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0WitherTargetHighestDamage\@\@QEAA\@AEAVWitherBoss\@\@AEBV?$vector\@UMobDescriptor\@\@V?$allocator\@UMobDescriptor\@\@\@std\@\@\@std\@\@\@Z */ MCAPI WitherTargetHighestDamage(class WitherBoss &, std::vector const &); //private: /** - * @symbol ?getHighestDamageTarget\@WitherTargetHighestDamage\@\@AEAAPEAVPlayer\@\@XZ + * @symbol ?getHighestDamageTarget\@WitherTargetHighestDamage\@\@AEAAPEAVPlayer\@\@XZ */ MCAPI class Player * getHighestDamageTarget(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Wolf.hpp b/LiteLoader/include/llapi/mc/Wolf.hpp index 13ea062271..83553a5125 100644 --- a/LiteLoader/include/llapi/mc/Wolf.hpp +++ b/LiteLoader/include/llapi/mc/Wolf.hpp @@ -32,221 +32,211 @@ class Wolf : public Animal { public: /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Wolf(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 49 - * @symbol ?normalTick\@Wolf\@\@UEAAXXZ - */ - virtual void normalTick(); - /** - * @vftbl 54 - * @symbol ?addPassenger\@Wolf\@\@UEAAXAEAVActor\@\@\@Z + * @vftbl 54 + * @symbol ?addPassenger\@Wolf\@\@UEAAXAEAVActor\@\@\@Z */ virtual void addPassenger(class Actor &); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 121 - * @symbol ?setSitting\@Wolf\@\@UEAAX_N\@Z + * @vftbl 120 + * @symbol ?setSitting\@Wolf\@\@UEAAX_N\@Z */ virtual void setSitting(bool); /** - * @vftbl 134 - * @symbol ?getAmbientSound\@Wolf\@\@UEBA?AW4LevelSoundEvent\@\@XZ + * @vftbl 133 + * @symbol ?getAmbientSound\@Wolf\@\@UEBA?AW4LevelSoundEvent\@\@XZ */ virtual enum class LevelSoundEvent getAmbientSound() const; /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@Wolf\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@Wolf\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 166 - * @symbol ?load\@Wolf\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 165 + * @symbol ?load\@Wolf\@\@UEAA_NAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual bool load(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 188 - * @symbol ?onSynchedDataUpdate\@Wolf\@\@UEAAXH\@Z + * @vftbl 187 + * @symbol ?onSynchedDataUpdate\@Wolf\@\@UEAAXH\@Z */ virtual void onSynchedDataUpdate(int); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 263 - * @symbol ?_hurt\@Wolf\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z + * @vftbl 261 + * @symbol ?_hurt\@Wolf\@\@MEAA_NAEBVActorDamageSource\@\@M_N1\@Z */ virtual bool _hurt(class ActorDamageSource const &, float, bool, bool); /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 306 - * @symbol ?isAlliedTo\@Wolf\@\@UEAA_NPEAVMob\@\@\@Z + * @vftbl 303 + * @symbol ?isAlliedTo\@Wolf\@\@UEAA_NPEAVMob\@\@\@Z */ virtual bool isAlliedTo(class Mob *); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 335 - * @symbol ?onBorn\@Wolf\@\@UEAAXAEAVActor\@\@0\@Z + * @vftbl 332 + * @symbol ?onBorn\@Wolf\@\@UEAAXAEAVActor\@\@0\@Z */ virtual void onBorn(class Actor &, class Actor &); /** - * @vftbl 349 - * @symbol ?newServerAiStep\@Wolf\@\@UEAAXXZ + * @vftbl 346 + * @symbol ?newServerAiStep\@Wolf\@\@UEAAXXZ */ virtual void newServerAiStep(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0Wolf\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Wolf\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Wolf(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?getHeadRollAngle\@Wolf\@\@QEAAMM\@Z + * @symbol ?getHeadRollAngle\@Wolf\@\@QEAAMM\@Z */ MCAPI float getHeadRollAngle(float); /** - * @symbol ?getShakeAnim\@Wolf\@\@QEBAMXZ + * @symbol ?getShakeAnim\@Wolf\@\@QEBAMXZ */ MCAPI float getShakeAnim() const; /** - * @symbol ?getTailAngle\@Wolf\@\@QEAAMXZ + * @symbol ?getTailAngle\@Wolf\@\@QEAAMXZ */ MCAPI float getTailAngle(); /** - * @symbol ?isShaking\@Wolf\@\@QEBA_NXZ + * @symbol ?isShaking\@Wolf\@\@QEBA_NXZ */ MCAPI bool isShaking() const; /** - * @symbol ?postNormalTick\@Wolf\@\@QEAAXXZ + * @symbol ?postNormalTick\@Wolf\@\@QEAAXXZ */ MCAPI void postNormalTick(); //private: /** - * @symbol ?_avoidSnowBury\@Wolf\@\@AEAAXXZ + * @symbol ?_avoidSnowBury\@Wolf\@\@AEAAXXZ */ MCAPI void _avoidSnowBury(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WolfPostNormalTickSystem.hpp b/LiteLoader/include/llapi/mc/WolfPostNormalTickSystem.hpp deleted file mode 100644 index 51926ee404..0000000000 --- a/LiteLoader/include/llapi/mc/WolfPostNormalTickSystem.hpp +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @file WolfPostNormalTickSystem.hpp - * - */ -#pragma once -#define AUTO_GENERATED -#include "llapi/Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC class WolfPostNormalTickSystem. - * - */ -class WolfPostNormalTickSystem { - -#define AFTER_EXTRA - -#undef AFTER_EXTRA -#ifndef DISABLE_CONSTRUCTOR_PREVENTION_WOLFPOSTNORMALTICKSYSTEM -public: - class WolfPostNormalTickSystem& operator=(class WolfPostNormalTickSystem const &) = delete; - WolfPostNormalTickSystem(class WolfPostNormalTickSystem const &) = delete; - WolfPostNormalTickSystem() = delete; -#endif - -public: - /** - * @symbol ?createSystem\@WolfPostNormalTickSystem\@\@SA?AUTickingSystemWithInfo\@\@XZ - */ - MCAPI static struct TickingSystemWithInfo createSystem(); - -//private: - /** - * @symbol ?_doWolfPostNormalTickSystem\@WolfPostNormalTickSystem\@\@CAXAEBVStrictEntityContext\@\@AEAVActorOwnerComponent\@\@\@Z - */ - MCAPI static void _doWolfPostNormalTickSystem(class StrictEntityContext const &, class ActorOwnerComponent &); - -private: - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/WoodBlock.hpp b/LiteLoader/include/llapi/mc/WoodBlock.hpp index 2a9a4a1912..ad96dee8f5 100644 --- a/LiteLoader/include/llapi/mc/WoodBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodBlock.hpp @@ -31,251 +31,256 @@ class WoodBlock : public RotatedPillarBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoodBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 20 - * @symbol ?isStrippable\@WoodBlock\@\@UEBA_NAEBVBlock\@\@\@Z + * @vftbl 20 + * @symbol ?isStrippable\@WoodBlock\@\@UEBA_NAEBVBlock\@\@\@Z */ virtual bool isStrippable(class Block const &) const; /** - * @vftbl 21 - * @symbol ?getStrippedBlock\@WoodBlock\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z + * @vftbl 21 + * @symbol ?getStrippedBlock\@WoodBlock\@\@UEBAAEBVBlock\@\@AEBV2\@\@Z */ virtual class Block const & getStrippedBlock(class Block const &) const; /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@WoodBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@WoodBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@WoodBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@WoodBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@WoodBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@WoodBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@WoodBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@WoodBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 184 - * @symbol ?getMapColor\@WoodBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@WoodBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0WoodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WoodBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WoodBlock(std::string const &, int); //private: /** - * @symbol ?_createBlockWithStates\@WoodBlock\@\@AEBAAEBVBlock\@\@AEBV2\@\@Z + * @symbol ?_createBlockWithStates\@WoodBlock\@\@AEBAAEBVBlock\@\@AEBV2\@\@Z */ MCAPI class Block const & _createBlockWithStates(class Block const &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp index a2ff1a955a..64f406b5f7 100644 --- a/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodButtonBlock.hpp @@ -31,193 +31,198 @@ class WoodButtonBlock : public ButtonBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoodButtonBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); /** - * @symbol ??0WoodButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); + /** + * @symbol ??0WoodButtonBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WoodButtonBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp index 1a778a296c..c93ae303f5 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlock.hpp @@ -31,233 +31,238 @@ class WoodSlabBlock : public SlabBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoodSlabBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 55 - * @symbol ?isValidAuxValue\@WoodSlabBlock\@\@UEBA_NH\@Z + * @vftbl 55 + * @symbol ?isValidAuxValue\@WoodSlabBlock\@\@UEBA_NH\@Z */ virtual bool isValidAuxValue(int) const; /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 103 - * @symbol ?asItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@PEBVBlockActor\@\@\@Z + * @vftbl 103 + * @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 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 133 - * @symbol ?buildDescriptionId\@WoodSlabBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z + * @vftbl 133 + * @symbol ?buildDescriptionId\@WoodSlabBlock\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVBlock\@\@\@Z */ virtual std::string buildDescriptionId(class Block const &) const; /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@WoodSlabBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@WoodSlabBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 146 - * @symbol ?getVariant\@WoodSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z + * @vftbl 146 + * @symbol ?getVariant\@WoodSlabBlock\@\@UEBAHAEBVBlock\@\@\@Z */ virtual int getVariant(class Block const &) const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@WoodSlabBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@WoodSlabBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; /** - * @symbol ??0WoodSlabBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z + * @symbol ??0WoodSlabBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H_NV?$WeakPtr\@VBlockLegacy\@\@\@\@\@Z */ MCAPI WoodSlabBlock(std::string const &, int, bool, class WeakPtr); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp index f1a0332945..23e57f891f 100644 --- a/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp +++ b/LiteLoader/include/llapi/mc/WoodSlabBlockItem.hpp @@ -32,79 +32,79 @@ class WoodSlabBlockItem : public DeprecatedSlabBlockItem { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoodSlabBlockItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 45 - * @symbol ?getLevelDataForAuxValue\@WoodSlabBlockItem\@\@UEBAHH\@Z + * @vftbl 45 + * @symbol ?getLevelDataForAuxValue\@WoodSlabBlockItem\@\@UEBAHH\@Z */ virtual int getLevelDataForAuxValue(int) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp b/LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp index fa59848619..8416e6ca22 100644 --- a/LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp +++ b/LiteLoader/include/llapi/mc/WoodlandMansionFeature.hpp @@ -31,33 +31,33 @@ class WoodlandMansionFeature : public StructureFeature { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoodlandMansionFeature(); + virtual void __unk_vfn_0(); /** - * @vftbl 2 - * @symbol ?shouldPostProcessMobs\@WoodlandMansionFeature\@\@UEBA_NXZ + * @vftbl 2 + * @symbol ?shouldPostProcessMobs\@WoodlandMansionFeature\@\@UEBA_NXZ */ virtual bool shouldPostProcessMobs() const; /** - * @vftbl 3 - * @symbol ?getNearestGeneratedFeature\@WoodlandMansionFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z + * @vftbl 3 + * @symbol ?getNearestGeneratedFeature\@WoodlandMansionFeature\@\@UEAA_NAEAVDimension\@\@AEBVBiomeSource\@\@AEBVBlockPos\@\@AEAV4\@AEBVIPreliminarySurfaceProvider\@\@_N\@Z */ virtual bool getNearestGeneratedFeature(class Dimension &, class BiomeSource const &, class BlockPos const &, class BlockPos &, class IPreliminarySurfaceProvider const &, bool); /** - * @vftbl 5 - * @symbol ?isFeatureChunk\@WoodlandMansionFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z + * @vftbl 5 + * @symbol ?isFeatureChunk\@WoodlandMansionFeature\@\@MEAA_NAEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@IAEBVIPreliminarySurfaceProvider\@\@AEBVDimension\@\@\@Z */ virtual bool isFeatureChunk(class BiomeSource const &, class Random &, class ChunkPos const &, unsigned int, class IPreliminarySurfaceProvider const &, class Dimension const &); /** - * @vftbl 6 - * @symbol ?createStructureStart\@WoodlandMansionFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @vftbl 6 + * @symbol ?createStructureStart\@WoodlandMansionFeature\@\@MEAA?AV?$unique_ptr\@VStructureStart\@\@U?$default_delete\@VStructureStart\@\@\@std\@\@\@std\@\@AEAVDimension\@\@AEBVBiomeSource\@\@AEAVRandom\@\@AEBVChunkPos\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ virtual std::unique_ptr createStructureStart(class Dimension &, class BiomeSource const &, class Random &, class ChunkPos const &, class IPreliminarySurfaceProvider const &); /** - * @symbol ??0WoodlandMansionFeature\@\@QEAA\@I\@Z + * @symbol ??0WoodlandMansionFeature\@\@QEAA\@I\@Z */ MCAPI WoodlandMansionFeature(unsigned int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp b/LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp index d68eff7a8c..1672ec22fa 100644 --- a/LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp +++ b/LiteLoader/include/llapi/mc/WoodlandMansionPieces.hpp @@ -31,8 +31,8 @@ class WoodlandMansionPieces { public: /** - * @symbol ?generateMansion\@WoodlandMansionPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@W4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z + * @symbol ?generateMansion\@WoodlandMansionPieces\@\@SAXV?$not_null\@V?$NonOwnerPointer\@VStructureManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVBlockPos\@\@W4Rotation\@\@AEAV?$vector\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@V?$allocator\@V?$unique_ptr\@VStructurePiece\@\@U?$default_delete\@VStructurePiece\@\@\@std\@\@\@std\@\@\@2\@\@std\@\@AEAVRandom\@\@\@Z */ MCAPI static void generateMansion(class gsl::not_null>, class BlockPos const &, enum class Rotation, std::vector> &, class Random &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp b/LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp index deefda93ab..61707270bb 100644 --- a/LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp +++ b/LiteLoader/include/llapi/mc/WoodlandMansionStart.hpp @@ -30,30 +30,30 @@ class WoodlandMansionStart { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoodlandMansionStart(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?postProcess\@WoodlandMansionStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z + * @vftbl 1 + * @symbol ?postProcess\@WoodlandMansionStart\@\@UEAA_NAEAVBlockSource\@\@AEAVRandom\@\@AEBVBoundingBox\@\@\@Z */ virtual bool postProcess(class BlockSource &, class Random &, class BoundingBox const &); //private: /** - * @symbol ?_create\@WoodlandMansionStart\@\@AEAAXAEAVDimension\@\@AEAVRandom\@\@HH\@Z + * @symbol ?_create\@WoodlandMansionStart\@\@AEAAXAEAVDimension\@\@AEAVRandom\@\@HH\@Z */ MCAPI void _create(class Dimension &, class Random &, int, int); /** - * @symbol ?_makeStairs\@WoodlandMansionStart\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@EEAEAVBlockSource\@\@AEBVBoundingBox\@\@\@Z + * @symbol ?_makeStairs\@WoodlandMansionStart\@\@AEAAXAEBVBlockPos\@\@AEBVBlock\@\@EEAEAVBlockSource\@\@AEBVBoundingBox\@\@\@Z */ MCAPI void _makeStairs(class BlockPos const &, class Block const &, unsigned char, unsigned char, class BlockSource &, class BoundingBox const &); /** - * @symbol ?_fillCobblestone\@WoodlandMansionStart\@\@CAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z + * @symbol ?_fillCobblestone\@WoodlandMansionStart\@\@CAXAEBVBlockPos\@\@AEAVBlockSource\@\@\@Z */ MCAPI static void _fillCobblestone(class BlockPos const &, class BlockSource &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp index c3ceae1548..2d7ce0c877 100644 --- a/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp +++ b/LiteLoader/include/llapi/mc/WoolCarpetBlock.hpp @@ -31,224 +31,229 @@ class WoolCarpetBlock : public CarpetBlock { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WoolCarpetBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 71 - * @symbol ?dispense\@WoolCarpetBlock\@\@UEBA_NAEAVBlockSource\@\@AEAVContainer\@\@HAEBVVec3\@\@E\@Z + * @vftbl 71 + * @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 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 134 - * @symbol ?isAuxValueRelevantForPicking\@WoolCarpetBlock\@\@UEBA_NXZ + * @vftbl 134 + * @symbol ?isAuxValueRelevantForPicking\@WoolCarpetBlock\@\@UEBA_NXZ */ virtual bool isAuxValueRelevantForPicking() const; /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 184 - * @symbol ?getMapColor\@WoolCarpetBlock\@\@UEBA?AVColor\@mce\@\@AEAVBlockSource\@\@AEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 178 + * @symbol __unk_vfn_178 + */ + virtual void __unk_vfn_178(); + /** + * @vftbl 185 + * @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 185 - * @symbol __unk_vfn_185 + * @vftbl 186 + * @symbol __unk_vfn_186 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_186(); /** - * @vftbl 187 - * @symbol ?getResourceItem\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z + * @vftbl 188 + * @symbol ?getResourceItem\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEAVRandomize\@\@AEBVBlock\@\@H\@Z */ virtual class ItemInstance getResourceItem(class Randomize &, class Block const &, int) const; /** - * @vftbl 189 - * @symbol ?getSilkTouchItemInstance\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z + * @vftbl 190 + * @symbol ?getSilkTouchItemInstance\@WoolCarpetBlock\@\@UEBA?AVItemInstance\@\@AEBVBlock\@\@\@Z */ virtual class ItemInstance getSilkTouchItemInstance(class Block const &) const; #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WOOLCARPETBLOCK /** - * @symbol ?canDamperVibrations\@WoolCarpetBlock\@\@UEBA_NXZ + * @symbol ?canDamperVibrations\@WoolCarpetBlock\@\@UEBA_NXZ */ 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\@\@H\@Z */ MCAPI WoolCarpetBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp b/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp index 25b92c686b..dded13a20c 100644 --- a/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WorkComposterDefinition.hpp @@ -28,16 +28,16 @@ class WorkComposterDefinition { public: /** - * @symbol ??0WorkComposterDefinition\@\@QEAA\@XZ + * @symbol ??0WorkComposterDefinition\@\@QEAA\@XZ */ MCAPI WorkComposterDefinition(); /** - * @symbol ?initialize\@WorkComposterDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVWorkComposterGoal\@\@\@Z + * @symbol ?initialize\@WorkComposterDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVWorkComposterGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class WorkComposterGoal &) const; /** - * @symbol ?buildSchema\@WorkComposterDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VWorkComposterDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@WorkComposterDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VWorkComposterDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp b/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp index 7a2b6211c9..3b606c55d2 100644 --- a/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp +++ b/LiteLoader/include/llapi/mc/WorkComposterGoal.hpp @@ -29,50 +29,50 @@ class WorkComposterGoal : public WorkGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorkComposterGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@WorkComposterGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@WorkComposterGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 18 - * @symbol ?useWorkstation\@WorkComposterGoal\@\@UEAAXXZ + * @vftbl 18 + * @symbol ?useWorkstation\@WorkComposterGoal\@\@UEAAXXZ */ virtual void useWorkstation(); /** - * @symbol ??0WorkComposterGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol ??0WorkComposterGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI WorkComposterGoal(class Mob &); //private: /** - * @symbol ?_tryCompostItems\@WorkComposterGoal\@\@AEAA_NXZ + * @symbol ?_tryCompostItems\@WorkComposterGoal\@\@AEAA_NXZ */ MCAPI bool _tryCompostItems(); /** - * @symbol ?_tryEmptyComposter\@WorkComposterGoal\@\@AEAA_NXZ + * @symbol ?_tryEmptyComposter\@WorkComposterGoal\@\@AEAA_NXZ */ MCAPI bool _tryEmptyComposter(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkDefinition.hpp b/LiteLoader/include/llapi/mc/WorkDefinition.hpp index c64f14ea94..76e74211f2 100644 --- a/LiteLoader/include/llapi/mc/WorkDefinition.hpp +++ b/LiteLoader/include/llapi/mc/WorkDefinition.hpp @@ -27,17 +27,23 @@ class WorkDefinition { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORKDEFINITION /** - * @symbol ??0WorkDefinition\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WorkDefinition(); +#endif + /** + * @symbol ??0WorkDefinition\@\@QEAA\@XZ */ MCAPI WorkDefinition(); /** - * @symbol ?initialize\@WorkDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVWorkGoal\@\@\@Z + * @symbol ?initialize\@WorkDefinition\@\@QEBAXAEAVEntityContext\@\@AEAVWorkGoal\@\@\@Z */ MCAPI void initialize(class EntityContext &, class WorkGoal &) const; /** - * @symbol ?buildSchema\@WorkDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VWorkDefinition\@\@\@JsonUtil\@\@\@3\@\@Z + * @symbol ?buildSchema\@WorkDefinition\@\@SAXAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAV?$shared_ptr\@V?$JsonSchemaObjectNode\@VEmptyClass\@JsonUtil\@\@VWorkDefinition\@\@\@JsonUtil\@\@\@3\@\@Z */ MCAPI static void buildSchema(std::string const &, class std::shared_ptr> &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkGoal.hpp b/LiteLoader/include/llapi/mc/WorkGoal.hpp index 9d4bd9b062..373f2e50e7 100644 --- a/LiteLoader/include/llapi/mc/WorkGoal.hpp +++ b/LiteLoader/include/llapi/mc/WorkGoal.hpp @@ -31,83 +31,89 @@ class WorkGoal : public MoveToPOIGoal { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorkGoal(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?canUse\@WorkGoal\@\@UEAA_NXZ + * @vftbl 1 + * @symbol ?canUse\@WorkGoal\@\@UEAA_NXZ */ virtual bool canUse(); /** - * @vftbl 2 - * @symbol ?canContinueToUse\@WorkGoal\@\@UEAA_NXZ + * @vftbl 2 + * @symbol ?canContinueToUse\@WorkGoal\@\@UEAA_NXZ */ virtual bool canContinueToUse(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol ?start\@WorkGoal\@\@UEAAXXZ + * @vftbl 4 + * @symbol ?start\@WorkGoal\@\@UEAAXXZ */ virtual void start(); /** - * @vftbl 5 - * @symbol ?stop\@WorkGoal\@\@UEAAXXZ + * @vftbl 5 + * @symbol ?stop\@WorkGoal\@\@UEAAXXZ */ virtual void stop(); /** - * @vftbl 6 - * @symbol ?tick\@WorkGoal\@\@UEAAXXZ + * @vftbl 6 + * @symbol ?tick\@WorkGoal\@\@UEAAXXZ */ virtual void tick(); /** - * @vftbl 7 - * @symbol ?appendDebugInfo\@WorkGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 7 + * @symbol ?appendDebugInfo\@WorkGoal\@\@UEBAXAEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual void appendDebugInfo(std::string &) const; /** - * @vftbl 8 - * @symbol __unk_vfn_8 + * @vftbl 8 + * @symbol __unk_vfn_8 */ virtual void __unk_vfn_8(); /** - * @vftbl 9 - * @symbol __unk_vfn_9 + * @vftbl 9 + * @symbol __unk_vfn_9 */ virtual void __unk_vfn_9(); /** - * @vftbl 18 - * @symbol ?useWorkstation\@WorkGoal\@\@UEAAXXZ + * @vftbl 18 + * @symbol ?useWorkstation\@WorkGoal\@\@UEAAXXZ */ virtual void useWorkstation(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORKGOAL /** - * @symbol ??0WorkGoal\@\@QEAA\@AEAVMob\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WorkGoal(); +#endif + /** + * @symbol ??0WorkGoal\@\@QEAA\@AEAVMob\@\@\@Z */ MCAPI WorkGoal(class Mob &); /** - * @symbol ?playPOISoundEvent\@WorkGoal\@\@QEBAXXZ + * @symbol ?playPOISoundEvent\@WorkGoal\@\@QEBAXXZ */ MCAPI void playPOISoundEvent() const; //private: /** - * @symbol ?_isInsideOrIsNotRaining\@WorkGoal\@\@AEAA_NXZ + * @symbol ?_isInsideOrIsNotRaining\@WorkGoal\@\@AEAA_NXZ */ MCAPI bool _isInsideOrIsNotRaining(); private: /** - * @symbol ?RAIN_CHECK_MAX_COOLDOWN\@WorkGoal\@\@0HB + * @symbol ?RAIN_CHECK_MAX_COOLDOWN\@WorkGoal\@\@0HB */ MCAPI static int const RAIN_CHECK_MAX_COOLDOWN; /** - * @symbol ?WORK_TIMESTAMP_UPDATE_INVERVAL\@WorkGoal\@\@0HB + * @symbol ?WORK_TIMESTAMP_UPDATE_INVERVAL\@WorkGoal\@\@0HB */ MCAPI static int const WORK_TIMESTAMP_UPDATE_INVERVAL; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp b/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp index 4441b1d6d1..d7661eb86e 100644 --- a/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp +++ b/LiteLoader/include/llapi/mc/WorkbenchBlock.hpp @@ -31,209 +31,214 @@ class WorkbenchBlock : public BlockLegacy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorkbenchBlock(); + virtual void __unk_vfn_0(); /** - * @vftbl 19 - * @symbol __unk_vfn_19 + * @vftbl 19 + * @symbol __unk_vfn_19 */ virtual void __unk_vfn_19(); /** - * @vftbl 29 - * @symbol __unk_vfn_29 + * @vftbl 29 + * @symbol __unk_vfn_29 */ virtual void __unk_vfn_29(); /** - * @vftbl 30 - * @symbol __unk_vfn_30 + * @vftbl 30 + * @symbol __unk_vfn_30 */ virtual void __unk_vfn_30(); /** - * @vftbl 32 - * @symbol __unk_vfn_32 + * @vftbl 32 + * @symbol __unk_vfn_32 */ virtual void __unk_vfn_32(); /** - * @vftbl 33 - * @symbol __unk_vfn_33 + * @vftbl 33 + * @symbol __unk_vfn_33 */ virtual void __unk_vfn_33(); /** - * @vftbl 34 - * @symbol __unk_vfn_34 + * @vftbl 34 + * @symbol __unk_vfn_34 */ virtual void __unk_vfn_34(); /** - * @vftbl 36 - * @symbol __unk_vfn_36 + * @vftbl 36 + * @symbol __unk_vfn_36 */ virtual void __unk_vfn_36(); /** - * @vftbl 37 - * @symbol __unk_vfn_37 + * @vftbl 37 + * @symbol __unk_vfn_37 */ virtual void __unk_vfn_37(); /** - * @vftbl 38 - * @symbol __unk_vfn_38 + * @vftbl 38 + * @symbol __unk_vfn_38 */ virtual void __unk_vfn_38(); /** - * @vftbl 39 - * @symbol __unk_vfn_39 + * @vftbl 39 + * @symbol __unk_vfn_39 */ virtual void __unk_vfn_39(); /** - * @vftbl 40 - * @symbol __unk_vfn_40 + * @vftbl 40 + * @symbol __unk_vfn_40 */ virtual void __unk_vfn_40(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 42 - * @symbol __unk_vfn_42 + * @vftbl 42 + * @symbol __unk_vfn_42 */ virtual void __unk_vfn_42(); /** - * @vftbl 44 - * @symbol __unk_vfn_44 + * @vftbl 44 + * @symbol __unk_vfn_44 */ virtual void __unk_vfn_44(); /** - * @vftbl 45 - * @symbol __unk_vfn_45 + * @vftbl 45 + * @symbol __unk_vfn_45 */ virtual void __unk_vfn_45(); /** - * @vftbl 46 - * @symbol __unk_vfn_46 + * @vftbl 46 + * @symbol __unk_vfn_46 */ virtual void __unk_vfn_46(); /** - * @vftbl 47 - * @symbol __unk_vfn_47 + * @vftbl 47 + * @symbol __unk_vfn_47 */ virtual void __unk_vfn_47(); /** - * @vftbl 48 - * @symbol __unk_vfn_48 + * @vftbl 48 + * @symbol __unk_vfn_48 */ virtual void __unk_vfn_48(); /** - * @vftbl 49 - * @symbol __unk_vfn_49 + * @vftbl 49 + * @symbol __unk_vfn_49 */ virtual void __unk_vfn_49(); /** - * @vftbl 54 - * @symbol __unk_vfn_54 + * @vftbl 54 + * @symbol __unk_vfn_54 */ virtual void __unk_vfn_54(); /** - * @vftbl 60 - * @symbol __unk_vfn_60 + * @vftbl 60 + * @symbol __unk_vfn_60 */ virtual void __unk_vfn_60(); /** - * @vftbl 61 - * @symbol __unk_vfn_61 + * @vftbl 61 + * @symbol __unk_vfn_61 */ virtual void __unk_vfn_61(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 82 - * @symbol __unk_vfn_82 + * @vftbl 82 + * @symbol __unk_vfn_82 */ virtual void __unk_vfn_82(); /** - * @vftbl 105 - * @symbol __unk_vfn_105 + * @vftbl 105 + * @symbol __unk_vfn_105 */ virtual void __unk_vfn_105(); /** - * @vftbl 123 - * @symbol __unk_vfn_123 + * @vftbl 123 + * @symbol __unk_vfn_123 */ virtual void __unk_vfn_123(); /** - * @vftbl 125 - * @symbol __unk_vfn_125 + * @vftbl 125 + * @symbol __unk_vfn_125 */ virtual void __unk_vfn_125(); /** - * @vftbl 126 - * @symbol __unk_vfn_126 + * @vftbl 126 + * @symbol __unk_vfn_126 */ virtual void __unk_vfn_126(); /** - * @vftbl 131 - * @symbol __unk_vfn_131 + * @vftbl 131 + * @symbol __unk_vfn_131 */ virtual void __unk_vfn_131(); /** - * @vftbl 156 - * @symbol __unk_vfn_156 + * @vftbl 156 + * @symbol __unk_vfn_156 */ virtual void __unk_vfn_156(); /** - * @vftbl 161 - * @symbol ?_addHardCodedBlockComponents\@WorkbenchBlock\@\@UEAAXXZ + * @vftbl 161 + * @symbol ?_addHardCodedBlockComponents\@WorkbenchBlock\@\@UEAAXXZ */ virtual void _addHardCodedBlockComponents(); /** - * @vftbl 165 - * @symbol __unk_vfn_165 + * @vftbl 165 + * @symbol __unk_vfn_165 */ virtual void __unk_vfn_165(); /** - * @vftbl 166 - * @symbol __unk_vfn_166 + * @vftbl 166 + * @symbol __unk_vfn_166 */ virtual void __unk_vfn_166(); /** - * @vftbl 167 - * @symbol __unk_vfn_167 + * @vftbl 167 + * @symbol __unk_vfn_167 */ virtual void __unk_vfn_167(); /** - * @vftbl 170 - * @symbol __unk_vfn_170 + * @vftbl 170 + * @symbol __unk_vfn_170 */ virtual void __unk_vfn_170(); /** - * @vftbl 174 - * @symbol __unk_vfn_174 + * @vftbl 174 + * @symbol __unk_vfn_174 */ virtual void __unk_vfn_174(); /** - * @vftbl 177 - * @symbol ?use\@WorkbenchBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z + * @vftbl 177 + * @symbol ?use\@WorkbenchBlock\@\@UEBA_NAEAVPlayer\@\@AEBVBlockPos\@\@E\@Z */ virtual bool use(class Player &, class BlockPos const &, unsigned char) const; /** - * @vftbl 185 - * @symbol __unk_vfn_185 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_185(); + virtual void __unk_vfn_178(); + /** + * @vftbl 186 + * @symbol __unk_vfn_186 + */ + virtual void __unk_vfn_186(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORKBENCHBLOCK /** - * @symbol ?isCraftingBlock\@WorkbenchBlock\@\@UEBA_NXZ + * @symbol ?isCraftingBlock\@WorkbenchBlock\@\@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 ??0WorkbenchBlock\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WorkbenchBlock(std::string const &, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkerPool.hpp b/LiteLoader/include/llapi/mc/WorkerPool.hpp index b92ac8ff5d..bd984b66ca 100644 --- a/LiteLoader/include/llapi/mc/WorkerPool.hpp +++ b/LiteLoader/include/llapi/mc/WorkerPool.hpp @@ -30,53 +30,59 @@ class WorkerPool { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORKERPOOL /** - * @symbol ??0WorkerPool\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KAEBVOSThreadPriority\@Threading\@Bedrock\@\@V?$optional\@_K\@2\@_NV?$optional\@H\@2\@\@Z + * @symbol __unk_destructor_-1 */ - MCAPI WorkerPool(std::string, unsigned __int64, class Bedrock::Threading::OSThreadPriority const &, class std::optional, bool, class std::optional); + MCVAPI ~WorkerPool(); +#endif /** - * @symbol ??0WorkerPool\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVScheduler\@\@\@Z + * @symbol ??0WorkerPool\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEAVScheduler\@\@\@Z */ MCAPI WorkerPool(std::string, class Scheduler &); /** - * @symbol ?queue\@WorkerPool\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z + * @symbol ??0WorkerPool\@\@QEAA\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_KAEBVOSThreadPriority\@Threading\@Bedrock\@\@V?$optional\@_K\@2\@_NV?$optional\@H\@2\@\@Z + */ + MCAPI WorkerPool(std::string, unsigned __int64, class Bedrock::Threading::OSThreadPriority const &, class std::optional, bool, class std::optional); + /** + * @symbol ?queue\@WorkerPool\@\@QEAAXV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@_N\@Z */ MCAPI void queue(class std::shared_ptr, bool); /** - * @symbol ?resortPriorityQueue\@WorkerPool\@\@QEAAXXZ + * @symbol ?resortPriorityQueue\@WorkerPool\@\@QEAAXXZ */ MCAPI void resortPriorityQueue(); /** - * @symbol ?size\@WorkerPool\@\@QEBA_KXZ + * @symbol ?size\@WorkerPool\@\@QEBA_KXZ */ MCAPI unsigned __int64 size() const; /** - * @symbol ?tryPop\@WorkerPool\@\@QEAA?AV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@H\@Z + * @symbol ?tryPop\@WorkerPool\@\@QEAA?AV?$shared_ptr\@VBackgroundTaskBase\@\@\@std\@\@H\@Z */ MCAPI class std::shared_ptr tryPop(int); //protected: /** - * @symbol ?_registerPool\@WorkerPool\@\@KAXAEAV1\@\@Z + * @symbol ?_registerPool\@WorkerPool\@\@KAXAEAV1\@\@Z */ MCAPI static void _registerPool(class WorkerPool &); //private: /** - * @symbol ?_checkPendingWork\@WorkerPool\@\@AEAA_NXZ + * @symbol ?_checkPendingWork\@WorkerPool\@\@AEAA_NXZ */ MCAPI bool _checkPendingWork(); protected: /** - * @symbol ?sAllPools\@WorkerPool\@\@1V?$SmallSet\@PEAVWorkerPool\@\@\@\@A + * @symbol ?sAllPools\@WorkerPool\@\@1V?$SmallSet\@PEAVWorkerPool\@\@\@\@A */ MCAPI static class SmallSet sAllPools; /** - * @symbol ?sAllPoolsMutex\@WorkerPool\@\@1Vmutex\@std\@\@A + * @symbol ?sAllPoolsMutex\@WorkerPool\@\@1Vmutex\@std\@\@A */ MCAPI static class std::mutex sAllPoolsMutex; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorkerPoolGlobalState.hpp b/LiteLoader/include/llapi/mc/WorkerPoolGlobalState.hpp index 50ba3aa210..13a41cf1f9 100644 --- a/LiteLoader/include/llapi/mc/WorkerPoolGlobalState.hpp +++ b/LiteLoader/include/llapi/mc/WorkerPoolGlobalState.hpp @@ -28,8 +28,8 @@ class WorkerPoolGlobalState { public: /** - * @symbol ??1WorkerPoolGlobalState\@\@QEAA\@XZ + * @symbol ??1WorkerPoolGlobalState\@\@QEAA\@XZ */ MCAPI ~WorkerPoolGlobalState(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldBlockTarget.hpp b/LiteLoader/include/llapi/mc/WorldBlockTarget.hpp index e586ed352d..13b015680a 100644 --- a/LiteLoader/include/llapi/mc/WorldBlockTarget.hpp +++ b/LiteLoader/include/llapi/mc/WorldBlockTarget.hpp @@ -30,153 +30,157 @@ class WorldBlockTarget { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldBlockTarget(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol ?getChunk\@WorldBlockTarget\@\@UEAAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z + * @vftbl 2 + * @symbol ?getChunk\@WorldBlockTarget\@\@UEAAPEAVLevelChunk\@\@AEBVChunkPos\@\@\@Z */ virtual class LevelChunk * getChunk(class ChunkPos const &); /** - * @vftbl 3 - * @symbol ?tryGetLiquidBlock\@WorldBlockTarget\@\@UEBAPEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 3 + * @symbol ?tryGetLiquidBlock\@WorldBlockTarget\@\@UEBAPEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const * tryGetLiquidBlock(class BlockPos const &) const; /** - * @vftbl 4 - * @symbol ?getBlock\@WorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 4 + * @symbol ?getBlock\@WorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlock(class BlockPos const &) const; /** - * @vftbl 5 - * @symbol ?getBlockNoBoundsCheck\@WorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 5 + * @symbol ?getBlockNoBoundsCheck\@WorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getBlockNoBoundsCheck(class BlockPos const &) const; /** - * @vftbl 6 - * @symbol ?getExtraBlock\@WorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @vftbl 6 + * @symbol ?getExtraBlock\@WorldBlockTarget\@\@UEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ virtual class Block const & getExtraBlock(class BlockPos const &) const; /** - * @vftbl 7 - * @symbol ?fetchBlocksInBox\@WorldBlockTarget\@\@UEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z + * @vftbl 7 + * @symbol ?fetchBlocksInBox\@WorldBlockTarget\@\@UEAA?AV?$span\@$$CBV?$BlockDataFetchResult\@VBlock\@\@\@\@$0?0\@gsl\@\@AEBVBoundingBox\@\@V?$function\@$$A6A_NAEBVBlock\@\@\@Z\@std\@\@\@Z */ virtual class gsl::span const, -1> fetchBlocksInBox(class BoundingBox const &, class std::function); /** - * @vftbl 8 - * @symbol ?hasBiomeTag\@WorldBlockTarget\@\@UEBA_N_KAEBVBlockPos\@\@\@Z + * @vftbl 8 + * @symbol ?hasBiomeTag\@WorldBlockTarget\@\@UEBA_N_KAEBVBlockPos\@\@\@Z */ virtual bool hasBiomeTag(unsigned __int64, class BlockPos const &) const; /** - * @vftbl 9 - * @symbol ?setBlock\@WorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @vftbl 9 + * @symbol ?setBlock\@WorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ virtual bool setBlock(class BlockPos const &, class Block const &, int); /** - * @vftbl 10 - * @symbol ?setBlockSimple\@WorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 10 + * @symbol ?setBlockSimple\@WorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool setBlockSimple(class BlockPos const &, class Block const &); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 12 - * @symbol ?placeStructure\@WorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEAVStructureTemplate\@\@AEAVStructureSettings\@\@\@Z + * @vftbl 12 + * @symbol ?placeStructure\@WorldBlockTarget\@\@UEAA_NAEBVBlockPos\@\@AEAVStructureTemplate\@\@AEAVStructureSettings\@\@\@Z */ virtual bool placeStructure(class BlockPos const &, class StructureTemplate &, class StructureSettings &); /** - * @vftbl 13 - * @symbol ?mayPlace\@WorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 13 + * @symbol ?mayPlace\@WorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool mayPlace(class BlockPos const &, class Block const &) const; /** - * @vftbl 14 - * @symbol ?canSurvive\@WorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 14 + * @symbol ?canSurvive\@WorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canSurvive(class BlockPos const &, class Block const &) const; /** - * @vftbl 15 - * @symbol ?canBeBuiltOver\@WorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z + * @vftbl 15 + * @symbol ?canBeBuiltOver\@WorldBlockTarget\@\@UEBA_NAEBVBlockPos\@\@AEBVBlock\@\@\@Z */ virtual bool canBeBuiltOver(class BlockPos const &, class Block const &) const; /** - * @vftbl 16 - * @symbol ?getMaxHeight\@WorldBlockTarget\@\@UEBAFXZ + * @vftbl 16 + * @symbol ?getMaxHeight\@WorldBlockTarget\@\@UEBAFXZ */ virtual short getMaxHeight() const; /** - * @vftbl 17 - * @symbol ?getMinHeight\@WorldBlockTarget\@\@UEBAFXZ + * @vftbl 17 + * @symbol ?getMinHeight\@WorldBlockTarget\@\@UEBAFXZ */ virtual short getMinHeight() const; /** - * @vftbl 18 - * @symbol ?shimPlaceForOldFeatures\@WorldBlockTarget\@\@UEBA_NAEBVFeature\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z + * @vftbl 18 + * @symbol ?shimPlaceForOldFeatures\@WorldBlockTarget\@\@UEBA_NAEBVFeature\@\@AEBVBlockPos\@\@AEAVRandom\@\@\@Z */ virtual bool shimPlaceForOldFeatures(class Feature const &, class BlockPos const &, class Random &) const; /** - * @vftbl 19 - * @symbol ?getHeightmap\@WorldBlockTarget\@\@UEAAFHH\@Z + * @vftbl 19 + * @symbol ?getHeightmap\@WorldBlockTarget\@\@UEAAFHH\@Z */ virtual short getHeightmap(int, int); /** - * @vftbl 20 - * @symbol ?isLegacyLevel\@WorldBlockTarget\@\@UEAA_NXZ + * @vftbl 20 + * @symbol ?isLegacyLevel\@WorldBlockTarget\@\@UEAA_NXZ */ virtual bool isLegacyLevel(); /** - * @vftbl 21 - * @symbol ?getBiome\@WorldBlockTarget\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z + * @vftbl 21 + * @symbol ?getBiome\@WorldBlockTarget\@\@UEBAPEBVBiome\@\@AEBVBlockPos\@\@\@Z */ virtual class Biome const * getBiome(class BlockPos const &) const; /** - * @vftbl 22 - * @symbol ?isInBounds\@WorldBlockTarget\@\@UEBA_NAEBVPos\@\@\@Z + * @vftbl 22 + * @symbol ?isInBounds\@WorldBlockTarget\@\@UEBA_NAEBVPos\@\@\@Z */ virtual bool isInBounds(class Pos const &) const; /** - * @vftbl 23 - * @symbol ?getLocalWaterLevel\@WorldBlockTarget\@\@UEBAFAEBVBlockPos\@\@\@Z + * @vftbl 23 + * @symbol ?getLocalWaterLevel\@WorldBlockTarget\@\@UEBAFAEBVBlockPos\@\@\@Z */ virtual short getLocalWaterLevel(class BlockPos const &) const; /** - * @vftbl 24 - * @symbol ?getLevelData\@WorldBlockTarget\@\@UEBAAEBVLevelData\@\@XZ + * @vftbl 24 + * @symbol ?getLevelData\@WorldBlockTarget\@\@UEBAAEBVLevelData\@\@XZ */ virtual class LevelData const & getLevelData() const; /** - * @vftbl 25 - * @symbol ?getContext\@WorldBlockTarget\@\@UEAAAEBUWorldGenContext\@\@XZ + * @vftbl 25 + * @symbol ?getContext\@WorldBlockTarget\@\@UEAAAEBUWorldGenContext\@\@XZ */ virtual struct WorldGenContext const & getContext(); /** - * @vftbl 26 - * @symbol ?disableBlockSimple\@WorldBlockTarget\@\@UEAAXXZ + * @vftbl 26 + * @symbol ?disableBlockSimple\@WorldBlockTarget\@\@UEAAXXZ */ virtual void disableBlockSimple(); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORLDBLOCKTARGET /** - * @symbol ?apply\@WorldBlockTarget\@\@UEBA_NXZ + * @symbol ?apply\@WorldBlockTarget\@\@UEBA_NXZ */ MCVAPI bool apply() const; /** - * @symbol ?canGetChunk\@WorldBlockTarget\@\@UEBA_NXZ + * @symbol ?canGetChunk\@WorldBlockTarget\@\@UEBA_NXZ */ MCVAPI bool canGetChunk() const; + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WorldBlockTarget(); #endif /** - * @symbol ??0WorldBlockTarget\@\@QEAA\@AEAVBlockSource\@\@AEBUWorldGenContext\@\@\@Z + * @symbol ??0WorldBlockTarget\@\@QEAA\@AEAVBlockSource\@\@AEBUWorldGenContext\@\@\@Z */ MCAPI WorldBlockTarget(class BlockSource &, struct WorldGenContext const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp index 7342ab1792..dfc6545897 100644 --- a/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp +++ b/LiteLoader/include/llapi/mc/WorldBuilderCommand.hpp @@ -31,22 +31,22 @@ class WorldBuilderCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldBuilderCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@WorldBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@WorldBuilderCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setWorldBuilder\@WorldBuilderCommand\@\@SAXAEAVLayeredAbilities\@\@_N\@Z + * @symbol ?setWorldBuilder\@WorldBuilderCommand\@\@SAXAEAVLayeredAbilities\@\@_N\@Z */ MCAPI static void setWorldBuilder(class LayeredAbilities &, bool); /** - * @symbol ?setup\@WorldBuilderCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@WorldBuilderCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp b/LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp index 513e69e302..55b4dd6f7a 100644 --- a/LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp +++ b/LiteLoader/include/llapi/mc/WorldChangeTransaction.hpp @@ -30,24 +30,24 @@ class WorldChangeTransaction { public: /** - * @symbol ??0WorldChangeTransaction\@\@QEAA\@AEAVIBlockWorldGenAPI\@\@\@Z + * @symbol ??0WorldChangeTransaction\@\@QEAA\@AEAVIBlockWorldGenAPI\@\@\@Z */ MCAPI WorldChangeTransaction(class IBlockWorldGenAPI &); /** - * @symbol ?apply\@WorldChangeTransaction\@\@QEBA_NXZ + * @symbol ?apply\@WorldChangeTransaction\@\@QEBA_NXZ */ MCAPI bool apply() const; /** - * @symbol ?getBlock\@WorldChangeTransaction\@\@QEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z + * @symbol ?getBlock\@WorldChangeTransaction\@\@QEBAAEBVBlock\@\@AEBVBlockPos\@\@\@Z */ MCAPI class Block const & getBlock(class BlockPos const &) const; /** - * @symbol ?setBlock\@WorldChangeTransaction\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z + * @symbol ?setBlock\@WorldChangeTransaction\@\@QEAAXAEBVBlockPos\@\@AEBVBlock\@\@H\@Z */ MCAPI void setBlock(class BlockPos const &, class Block const &, int); /** - * @symbol ??1WorldChangeTransaction\@\@QEAA\@XZ + * @symbol ??1WorldChangeTransaction\@\@QEAA\@XZ */ MCAPI ~WorldChangeTransaction(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldGenCache.hpp b/LiteLoader/include/llapi/mc/WorldGenCache.hpp index 1ebf7724aa..f6d279e169 100644 --- a/LiteLoader/include/llapi/mc/WorldGenCache.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenCache.hpp @@ -30,20 +30,20 @@ class WorldGenCache { public: /** - * @symbol ??0WorldGenCache\@\@QEAA\@VChunkLocalNoiseCache\@\@VSurfaceLevelCache\@\@\@Z + * @symbol ??0WorldGenCache\@\@QEAA\@VChunkLocalNoiseCache\@\@VSurfaceLevelCache\@\@\@Z */ MCAPI WorldGenCache(class ChunkLocalNoiseCache, class SurfaceLevelCache); /** - * @symbol ?getChunkLocalNoiseCache\@WorldGenCache\@\@QEBAAEBVChunkLocalNoiseCache\@\@XZ + * @symbol ?getChunkLocalNoiseCache\@WorldGenCache\@\@QEBAAEBVChunkLocalNoiseCache\@\@XZ */ MCAPI class ChunkLocalNoiseCache const & getChunkLocalNoiseCache() const; /** - * @symbol ?getSurfaceLevelCache\@WorldGenCache\@\@QEBAAEBVSurfaceLevelCache\@\@XZ + * @symbol ?getSurfaceLevelCache\@WorldGenCache\@\@QEBAAEBVSurfaceLevelCache\@\@XZ */ MCAPI class SurfaceLevelCache const & getSurfaceLevelCache() const; /** - * @symbol ??1WorldGenCache\@\@QEAA\@XZ + * @symbol ??1WorldGenCache\@\@QEAA\@XZ */ MCAPI ~WorldGenCache(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp b/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp index a6b3c0ee4f..afb0a28d5d 100644 --- a/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenClimateMappingAttributes.hpp @@ -30,12 +30,12 @@ class WorldGenClimateMappingAttributes { public: /** - * @symbol ??4WorldGenClimateMappingAttributes\@\@QEAAAEAV0\@$$QEAV0\@\@Z + * @symbol ??4WorldGenClimateMappingAttributes\@\@QEAAAEAV0\@$$QEAV0\@\@Z */ MCAPI class WorldGenClimateMappingAttributes & operator=(class WorldGenClimateMappingAttributes &&); /** - * @symbol ??1WorldGenClimateMappingAttributes\@\@QEAA\@XZ + * @symbol ??1WorldGenClimateMappingAttributes\@\@QEAA\@XZ */ MCAPI ~WorldGenClimateMappingAttributes(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldGenContext.hpp b/LiteLoader/include/llapi/mc/WorldGenContext.hpp index fe463aabc5..8e878a9833 100644 --- a/LiteLoader/include/llapi/mc/WorldGenContext.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenContext.hpp @@ -28,7 +28,7 @@ struct WorldGenContext { public: /** - * @symbol ??1WorldGenContext\@\@QEAA\@XZ + * @symbol ??1WorldGenContext\@\@QEAA\@XZ */ MCAPI ~WorldGenContext(); diff --git a/LiteLoader/include/llapi/mc/WorldGenMolangQueries.hpp b/LiteLoader/include/llapi/mc/WorldGenMolangQueries.hpp index ea71408453..d8961dd19a 100644 --- a/LiteLoader/include/llapi/mc/WorldGenMolangQueries.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenMolangQueries.hpp @@ -22,7 +22,7 @@ namespace WorldGenMolangQueries { #undef AFTER_EXTRA /** - * @symbol ?registerWorldGenMolangQueries\@WorldGenMolangQueries\@\@YAXXZ + * @symbol ?registerWorldGenMolangQueries\@WorldGenMolangQueries\@\@YAXXZ */ MCAPI void registerWorldGenMolangQueries(); diff --git a/LiteLoader/include/llapi/mc/WorldGenerator.hpp b/LiteLoader/include/llapi/mc/WorldGenerator.hpp index 18e1e92811..ee714e7ada 100644 --- a/LiteLoader/include/llapi/mc/WorldGenerator.hpp +++ b/LiteLoader/include/llapi/mc/WorldGenerator.hpp @@ -37,73 +37,73 @@ struct BlockVolumeDimensions { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORLDGENERATOR /** - * @symbol ?addHardcodedSpawnAreas\@WorldGenerator\@\@UEAAXAEAVLevelChunk\@\@\@Z + * @symbol ?addHardcodedSpawnAreas\@WorldGenerator\@\@UEAAXAEAVLevelChunk\@\@\@Z */ MCVAPI void addHardcodedSpawnAreas(class LevelChunk &); /** - * @symbol ?debugRender\@WorldGenerator\@\@UEAAXXZ + * @symbol ?debugRender\@WorldGenerator\@\@UEAAXXZ */ MCVAPI void debugRender(); /** - * @symbol ?findNearestStructureFeature\@WorldGenerator\@\@UEAA_NW4StructureFeatureType\@\@AEBVBlockPos\@\@AEAV3\@_N\@Z + * @symbol ?findNearestStructureFeature\@WorldGenerator\@\@UEAA_NW4StructureFeatureType\@\@AEBVBlockPos\@\@AEAV3\@_N\@Z */ MCVAPI bool findNearestStructureFeature(enum class StructureFeatureType, class BlockPos const &, class BlockPos &, bool); /** - * @symbol ?findStructureFeatureTypeAt\@WorldGenerator\@\@UEAA?AW4StructureFeatureType\@\@AEBVBlockPos\@\@\@Z + * @symbol ?findStructureFeatureTypeAt\@WorldGenerator\@\@UEAA?AW4StructureFeatureType\@\@AEBVBlockPos\@\@\@Z */ MCVAPI enum class StructureFeatureType findStructureFeatureTypeAt(class BlockPos const &); /** - * @symbol ?garbageCollectBlueprints\@WorldGenerator\@\@UEAAXV?$buffer_span\@VChunkPos\@\@\@\@\@Z + * @symbol ?garbageCollectBlueprints\@WorldGenerator\@\@UEAAXV?$buffer_span\@VChunkPos\@\@\@\@\@Z */ MCVAPI void garbageCollectBlueprints(class buffer_span); /** - * @symbol ?getPreliminarySurfaceLevel\@WorldGenerator\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z + * @symbol ?getPreliminarySurfaceLevel\@WorldGenerator\@\@UEBA?AV?$optional\@F\@std\@\@V?$DividedPos2d\@$03\@\@\@Z */ MCVAPI class std::optional getPreliminarySurfaceLevel(class DividedPos2d<4>) const; /** - * @symbol ?isStructureFeatureTypeAt\@WorldGenerator\@\@UEBA_NAEBVBlockPos\@\@W4StructureFeatureType\@\@\@Z + * @symbol ?isStructureFeatureTypeAt\@WorldGenerator\@\@UEBA_NAEBVBlockPos\@\@W4StructureFeatureType\@\@\@Z */ MCVAPI bool isStructureFeatureTypeAt(class BlockPos const &, enum class StructureFeatureType) const; /** - * @symbol ?postProcessMobsAt\@WorldGenerator\@\@UEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z + * @symbol ?postProcessMobsAt\@WorldGenerator\@\@UEAAXAEAVBlockSource\@\@HHAEAVRandom\@\@\@Z */ MCVAPI void postProcessMobsAt(class BlockSource &, int, int, class Random &); /** - * @symbol __unk_destructor_-1 + * @symbol __unk_destructor_-1 */ MCVAPI ~WorldGenerator(); #endif /** - * @symbol ??0WorldGenerator\@\@QEAA\@AEAVDimension\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z + * @symbol ??0WorldGenerator\@\@QEAA\@AEAVDimension\@\@\@Z */ - MCAPI WorldGenerator(class Dimension &, std::unique_ptr); + MCAPI WorldGenerator(class Dimension &); /** - * @symbol ??0WorldGenerator\@\@QEAA\@AEAVDimension\@\@\@Z + * @symbol ??0WorldGenerator\@\@QEAA\@AEAVDimension\@\@V?$unique_ptr\@VStructureFeatureRegistry\@\@U?$default_delete\@VStructureFeatureRegistry\@\@\@std\@\@\@std\@\@\@Z */ - MCAPI WorldGenerator(class Dimension &); + MCAPI WorldGenerator(class Dimension &, std::unique_ptr); /** - * @symbol ?computeChunkHeightMap\@WorldGenerator\@\@QEAA?AV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @symbol ?computeChunkHeightMap\@WorldGenerator\@\@QEAA?AV?$vector\@FV?$allocator\@F\@std\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ MCAPI std::vector computeChunkHeightMap(class ChunkPos const &); /** - * @symbol ?getStructureFeatureRegistry\@WorldGenerator\@\@QEBAAEAVStructureFeatureRegistry\@\@XZ + * @symbol ?getStructureFeatureRegistry\@WorldGenerator\@\@QEBAAEAVStructureFeatureRegistry\@\@XZ */ MCAPI class StructureFeatureRegistry & getStructureFeatureRegistry() const; //protected: /** - * @symbol ?postProcessStructureFeatures\@WorldGenerator\@\@IEAAXAEAVBlockSource\@\@AEAVRandom\@\@HH\@Z + * @symbol ?postProcessStructureFeatures\@WorldGenerator\@\@IEAAXAEAVBlockSource\@\@AEAVRandom\@\@HH\@Z */ MCAPI void postProcessStructureFeatures(class BlockSource &, class Random &, int, int); /** - * @symbol ?prepareStructureFeatureBlueprints\@WorldGenerator\@\@IEAAXAEAVDimension\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z + * @symbol ?prepareStructureFeatureBlueprints\@WorldGenerator\@\@IEAAXAEAVDimension\@\@AEBVChunkPos\@\@AEBVBiomeSource\@\@AEBVIPreliminarySurfaceProvider\@\@\@Z */ MCAPI void prepareStructureFeatureBlueprints(class Dimension &, class ChunkPos const &, class BiomeSource const &, class IPreliminarySurfaceProvider const &); protected: /** - * @symbol ?TICKING_QUEUE_PASS_LIMIT\@WorldGenerator\@\@1_KB + * @symbol ?TICKING_QUEUE_PASS_LIMIT\@WorldGenerator\@\@1_KB */ MCAPI static unsigned __int64 const TICKING_QUEUE_PASS_LIMIT; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp b/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp index a7720b819e..9f554bc3c5 100644 --- a/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldHistoryPackSource.hpp @@ -32,72 +32,72 @@ class WorldHistoryPackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldHistoryPackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol ?getPackOrigin\@WorldHistoryPackSource\@\@UEBA?AW4PackOrigin\@\@XZ + * @vftbl 3 + * @symbol ?getPackOrigin\@WorldHistoryPackSource\@\@UEBA?AW4PackOrigin\@\@XZ */ virtual enum class PackOrigin getPackOrigin() const; /** - * @vftbl 4 - * @symbol ?getPackType\@WorldHistoryPackSource\@\@UEBA?AW4PackType\@\@XZ + * @vftbl 4 + * @symbol ?getPackType\@WorldHistoryPackSource\@\@UEBA?AW4PackType\@\@XZ */ virtual enum class PackType getPackType() const; /** - * @vftbl 5 - * @symbol ?load\@WorldHistoryPackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 5 + * @symbol ?load\@WorldHistoryPackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual class PackSourceReport load(class IPackManifestFactory &, class gsl::not_null> const &); #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORLDHISTORYPACKSOURCE /** - * @symbol ?forEachPack\@WorldHistoryPackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPack\@WorldHistoryPackSource\@\@UEAAXV?$function\@$$A6AXAEAVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPack(class std::function); /** - * @symbol ?forEachPackConst\@WorldHistoryPackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z + * @symbol ?forEachPackConst\@WorldHistoryPackSource\@\@UEBAXV?$function\@$$A6AXAEBVPack\@\@\@Z\@std\@\@\@Z */ MCVAPI void forEachPackConst(class std::function) const; #endif /** - * @symbol ??0WorldHistoryPackSource\@\@QEAA\@AEBVPath\@Core\@\@W4PackType\@\@\@Z + * @symbol ??0WorldHistoryPackSource\@\@QEAA\@AEBVPath\@Core\@\@W4PackType\@\@\@Z */ MCAPI WorldHistoryPackSource(class Core::Path const &, enum class PackType); /** - * @symbol ?getPathToWorld\@WorldHistoryPackSource\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getPathToWorld\@WorldHistoryPackSource\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer const & getPathToWorld() const; /** - * @symbol ?generateHistoryFilePath\@WorldHistoryPackSource\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@W4PackType\@\@\@Z + * @symbol ?generateHistoryFilePath\@WorldHistoryPackSource\@\@SA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@AEBVPath\@3\@W4PackType\@\@\@Z */ MCAPI static class Core::PathBuffer generateHistoryFilePath(class Core::Path const &, enum class PackType); //private: /** - * @symbol ?_addPackFromHistoryPack\@WorldHistoryPackSource\@\@AEAAXAEBVWorldPackHistory\@\@\@Z + * @symbol ?_addPackFromHistoryPack\@WorldHistoryPackSource\@\@AEAAXAEBVWorldPackHistory\@\@\@Z */ MCAPI void _addPackFromHistoryPack(class WorldPackHistory const &); /** - * @symbol ?_createPackFromHistoryPack\@WorldHistoryPackSource\@\@AEAA?AV?$unique_ptr\@VPack\@\@U?$default_delete\@VPack\@\@\@std\@\@\@std\@\@AEBVWorldPackHistory\@\@\@Z + * @symbol ?_createPackFromHistoryPack\@WorldHistoryPackSource\@\@AEAA?AV?$unique_ptr\@VPack\@\@U?$default_delete\@VPack\@\@\@std\@\@\@std\@\@AEBVWorldPackHistory\@\@\@Z */ MCAPI std::unique_ptr _createPackFromHistoryPack(class WorldPackHistory const &); /** - * @symbol ?_readWorldHistoryFile\@WorldHistoryPackSource\@\@AEAA_NXZ + * @symbol ?_readWorldHistoryFile\@WorldHistoryPackSource\@\@AEAA_NXZ */ MCAPI bool _readWorldHistoryFile(); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp b/LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp index 2f8785c26d..ba84a219c9 100644 --- a/LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldLimitChunkSource.hpp @@ -31,33 +31,38 @@ class WorldLimitChunkSource : public ChunkSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldLimitChunkSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 3 - * @symbol ?getExistingChunk\@WorldLimitChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z + * @vftbl 3 + * @symbol ?getExistingChunk\@WorldLimitChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@\@Z */ virtual class std::shared_ptr getExistingChunk(class ChunkPos const &); /** - * @vftbl 7 - * @symbol ?createNewChunk\@WorldLimitChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z + * @vftbl 7 + * @symbol ?createNewChunk\@WorldLimitChunkSource\@\@UEAA?AV?$shared_ptr\@VLevelChunk\@\@\@std\@\@AEBVChunkPos\@\@W4LoadMode\@ChunkSource\@\@_N\@Z */ virtual class std::shared_ptr createNewChunk(class ChunkPos const &, enum class ChunkSource::LoadMode, bool); /** - * @vftbl 22 - * @symbol ?isWithinWorldLimit\@WorldLimitChunkSource\@\@UEBA_NAEBVChunkPos\@\@\@Z + * @vftbl 22 + * @symbol ?isWithinWorldLimit\@WorldLimitChunkSource\@\@UEBA_NAEBVChunkPos\@\@\@Z */ virtual bool isWithinWorldLimit(class ChunkPos const &) const; /** - * @vftbl 26 - * @symbol ?canCreateViews\@WorldLimitChunkSource\@\@UEBA_NXZ + * @vftbl 23 + * @symbol ?getChunkMap\@WorldLimitChunkSource\@\@UEAAPEBV?$unordered_map\@VChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@U?$hash\@VChunkPos\@\@\@3\@U?$equal_to\@VChunkPos\@\@\@3\@V?$allocator\@U?$pair\@$$CBVChunkPos\@\@V?$weak_ptr\@VLevelChunk\@\@\@std\@\@\@std\@\@\@3\@\@std\@\@XZ + */ + virtual class std::unordered_map, struct std::hash, struct std::equal_to, class std::allocator>>> const * getChunkMap(); + /** + * @vftbl 26 + * @symbol ?canCreateViews\@WorldLimitChunkSource\@\@UEBA_NXZ */ virtual bool canCreateViews() const; /** - * @symbol ??0WorldLimitChunkSource\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@HH\@Z + * @symbol ??0WorldLimitChunkSource\@\@QEAA\@V?$unique_ptr\@VChunkSource\@\@U?$default_delete\@VChunkSource\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@HH\@Z */ MCAPI WorldLimitChunkSource(std::unique_ptr, class BlockPos const &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldPackHistory.hpp b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp index 290eaaa708..17194a9092 100644 --- a/LiteLoader/include/llapi/mc/WorldPackHistory.hpp +++ b/LiteLoader/include/llapi/mc/WorldPackHistory.hpp @@ -30,52 +30,52 @@ class WorldPackHistory { public: /** - * @symbol ??0WorldPackHistory\@\@QEAA\@AEBV0\@\@Z + * @symbol ??0WorldPackHistory\@\@QEAA\@$$QEAV0\@\@Z */ - MCAPI WorldPackHistory(class WorldPackHistory const &); + MCAPI WorldPackHistory(class WorldPackHistory &&); /** - * @symbol ??0WorldPackHistory\@\@QEAA\@$$QEAV0\@\@Z + * @symbol ??0WorldPackHistory\@\@QEAA\@AEBV0\@\@Z */ - MCAPI WorldPackHistory(class WorldPackHistory &&); + MCAPI WorldPackHistory(class WorldPackHistory const &); /** - * @symbol ?getCanBeRedownloaded\@WorldPackHistory\@\@QEBA_NXZ + * @symbol ?getCanBeRedownloaded\@WorldPackHistory\@\@QEBA_NXZ */ MCAPI bool getCanBeRedownloaded() const; /** - * @symbol ?getLocalizedNames\@WorldPackHistory\@\@QEBAAEBV?$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\@\@XZ + * @symbol ?getLocalizedNames\@WorldPackHistory\@\@QEBAAEBV?$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\@\@XZ */ MCAPI class std::unordered_map, struct std::equal_to, class std::allocator>> const & getLocalizedNames() const; /** - * @symbol ?getPackIdVersion\@WorldPackHistory\@\@QEBAAEBUPackIdVersion\@\@XZ + * @symbol ?getPackIdVersion\@WorldPackHistory\@\@QEBAAEBUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion const & getPackIdVersion() const; /** - * @symbol ?getSourceUUID\@WorldPackHistory\@\@QEBAAEBVUUID\@mce\@\@XZ + * @symbol ?getSourceUUID\@WorldPackHistory\@\@QEBAAEBVUUID\@mce\@\@XZ */ MCAPI class mce::UUID const & getSourceUUID() const; /** - * @symbol ?getSubpackCount\@WorldPackHistory\@\@QEBAHXZ + * @symbol ?getSubpackCount\@WorldPackHistory\@\@QEBAHXZ */ MCAPI int getSubpackCount() const; /** - * @symbol ?getUnlocalizedName\@WorldPackHistory\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getUnlocalizedName\@WorldPackHistory\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getUnlocalizedName() const; /** - * @symbol ?hasLocalizedNames\@WorldPackHistory\@\@QEBA_NXZ + * @symbol ?hasLocalizedNames\@WorldPackHistory\@\@QEBA_NXZ */ MCAPI bool hasLocalizedNames() const; /** - * @symbol ?hasSourceUUID\@WorldPackHistory\@\@QEBA_NXZ + * @symbol ?hasSourceUUID\@WorldPackHistory\@\@QEBA_NXZ */ MCAPI bool hasSourceUUID() const; /** - * @symbol ?hasSubpacks\@WorldPackHistory\@\@QEBA_NXZ + * @symbol ?hasSubpacks\@WorldPackHistory\@\@QEBA_NXZ */ MCAPI bool hasSubpacks() const; /** - * @symbol ?initializeFromJson\@WorldPackHistory\@\@QEAA_NAEBVValue\@Json\@\@\@Z + * @symbol ?initializeFromJson\@WorldPackHistory\@\@QEAA_NAEBVValue\@Json\@\@\@Z */ MCAPI bool initializeFromJson(class Json::Value const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp b/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp index 11d9e320d4..064f108fad 100644 --- a/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp +++ b/LiteLoader/include/llapi/mc/WorldPacksHistoryFile.hpp @@ -32,20 +32,20 @@ enum class ParseResult; public: /** - * @symbol ??0WorldPacksHistoryFile\@\@QEAA\@XZ + * @symbol ??0WorldPacksHistoryFile\@\@QEAA\@XZ */ MCAPI WorldPacksHistoryFile(); /** - * @symbol ?getPacks\@WorldPacksHistoryFile\@\@QEBAAEBV?$vector\@VWorldPackHistory\@\@V?$allocator\@VWorldPackHistory\@\@\@std\@\@\@std\@\@XZ + * @symbol ?getPacks\@WorldPacksHistoryFile\@\@QEBAAEBV?$vector\@VWorldPackHistory\@\@V?$allocator\@VWorldPackHistory\@\@\@std\@\@\@std\@\@XZ */ MCAPI std::vector const & getPacks() const; /** - * @symbol ?initializeFromJson\@WorldPacksHistoryFile\@\@QEAA?AW4ParseResult\@1\@AEBVValue\@Json\@\@\@Z + * @symbol ?initializeFromJson\@WorldPacksHistoryFile\@\@QEAA?AW4ParseResult\@1\@AEBVValue\@Json\@\@\@Z */ MCAPI enum class WorldPacksHistoryFile::ParseResult initializeFromJson(class Json::Value const &); /** - * @symbol ??1WorldPacksHistoryFile\@\@QEAA\@XZ + * @symbol ??1WorldPacksHistoryFile\@\@QEAA\@XZ */ MCAPI ~WorldPacksHistoryFile(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp b/LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp index f3d1728246..592b366029 100644 --- a/LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp +++ b/LiteLoader/include/llapi/mc/WorldSessionEndPoint.hpp @@ -31,29 +31,29 @@ class WorldSessionEndPoint { public: #ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORLDSESSIONENDPOINT /** - * @symbol ?flush\@WorldSessionEndPoint\@\@UEAAXXZ + * @symbol ?flush\@WorldSessionEndPoint\@\@UEAAXXZ */ MCVAPI void flush(); /** - * @symbol ?isEnabled\@WorldSessionEndPoint\@\@UEBA_NXZ + * @symbol ?isEnabled\@WorldSessionEndPoint\@\@UEBA_NXZ */ MCVAPI bool isEnabled() const; /** - * @symbol ?log\@WorldSessionEndPoint\@\@UEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z + * @symbol ?log\@WorldSessionEndPoint\@\@UEAAXW4LogArea\@\@W4LogLevel\@\@PEBD\@Z */ MCVAPI void log(enum class LogArea, enum class LogLevel, char const *); /** - * @symbol ?logOnlyOnce\@WorldSessionEndPoint\@\@UEBA_NXZ + * @symbol ?logOnlyOnce\@WorldSessionEndPoint\@\@UEBA_NXZ */ MCVAPI bool logOnlyOnce() const; /** - * @symbol ?setEnabled\@WorldSessionEndPoint\@\@UEAAX_N\@Z + * @symbol ?setEnabled\@WorldSessionEndPoint\@\@UEAAX_N\@Z */ MCVAPI void setEnabled(bool); #endif /** - * @symbol ??0WorldSessionEndPoint\@\@QEAA\@AEAVIMinecraftEventing\@\@\@Z + * @symbol ??0WorldSessionEndPoint\@\@QEAA\@AEAVIMinecraftEventing\@\@\@Z */ MCAPI WorldSessionEndPoint(class IMinecraftEventing &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp b/LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp index 57c9f59858..26cad0c34e 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateInfo.hpp @@ -31,31 +31,31 @@ struct WorldTemplateInfo { public: /** - * @symbol ??0WorldTemplateInfo\@\@QEAA\@AEBVWorldTemplatePackManifest\@\@\@Z + * @symbol ??0WorldTemplateInfo\@\@QEAA\@AEBVWorldTemplatePackManifest\@\@\@Z */ MCAPI WorldTemplateInfo(class WorldTemplatePackManifest const &); /** - * @symbol ?addWorldTemplatePackSource\@WorldTemplateInfo\@\@QEAAXAEAVWorldTemplatePackSource\@\@\@Z + * @symbol ?addWorldTemplatePackSource\@WorldTemplateInfo\@\@QEAAXAEAVWorldTemplatePackSource\@\@\@Z */ MCAPI void addWorldTemplatePackSource(class WorldTemplatePackSource &); /** - * @symbol ?getPackManifest\@WorldTemplateInfo\@\@QEBAAEBVWorldTemplatePackManifest\@\@XZ + * @symbol ?getPackManifest\@WorldTemplateInfo\@\@QEBAAEBVWorldTemplatePackManifest\@\@XZ */ MCAPI class WorldTemplatePackManifest const & getPackManifest() const; /** - * @symbol ?getWorldName\@WorldTemplateInfo\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @symbol ?getWorldName\@WorldTemplateInfo\@\@QEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ MCAPI std::string const & getWorldName() const; /** - * @symbol ?getWorldPath\@WorldTemplateInfo\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getWorldPath\@WorldTemplateInfo\@\@QEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer const & getWorldPath() const; /** - * @symbol ?isVirtualCatalogItem\@WorldTemplateInfo\@\@QEBA_NXZ + * @symbol ?isVirtualCatalogItem\@WorldTemplateInfo\@\@QEBA_NXZ */ MCAPI bool isVirtualCatalogItem() const; /** - * @symbol ??1WorldTemplateInfo\@\@QEAA\@XZ + * @symbol ??1WorldTemplateInfo\@\@QEAA\@XZ */ MCAPI ~WorldTemplateInfo(); diff --git a/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp b/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp index 3070c70e47..14ecda00ef 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateLevelData.hpp @@ -29,76 +29,76 @@ class WorldTemplateLevelData { public: /** - * @symbol ??0WorldTemplateLevelData\@\@QEAA\@_N0AEBVBaseGameVersion\@\@1\@Z + * @symbol ??0WorldTemplateLevelData\@\@QEAA\@_N0AEBVBaseGameVersion\@\@1\@Z */ MCAPI WorldTemplateLevelData(bool, bool, class BaseGameVersion const &, class BaseGameVersion const &); /** - * @symbol ??0WorldTemplateLevelData\@\@QEAA\@XZ + * @symbol ??0WorldTemplateLevelData\@\@QEAA\@XZ */ MCAPI WorldTemplateLevelData(); /** - * @symbol ?getBaseGameVersion\@WorldTemplateLevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ + * @symbol ?getBaseGameVersion\@WorldTemplateLevelData\@\@QEBAAEBVBaseGameVersion\@\@XZ */ MCAPI class BaseGameVersion const & getBaseGameVersion() const; /** - * @symbol ?getContentIdentity\@WorldTemplateLevelData\@\@QEBAAEBVContentIdentity\@\@XZ + * @symbol ?getContentIdentity\@WorldTemplateLevelData\@\@QEBAAEBVContentIdentity\@\@XZ */ MCAPI class ContentIdentity const & getContentIdentity() const; /** - * @symbol ?getTagData\@WorldTemplateLevelData\@\@QEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?getTagData\@WorldTemplateLevelData\@\@QEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void getTagData(class CompoundTag const &); /** - * @symbol ?getWorldTemplateIdentity\@WorldTemplateLevelData\@\@QEBAAEBUPackIdVersion\@\@XZ + * @symbol ?getWorldTemplateIdentity\@WorldTemplateLevelData\@\@QEBAAEBUPackIdVersion\@\@XZ */ MCAPI struct PackIdVersion const & getWorldTemplateIdentity() const; /** - * @symbol ?isFromWorldTemplate\@WorldTemplateLevelData\@\@QEBA_NXZ + * @symbol ?isFromWorldTemplate\@WorldTemplateLevelData\@\@QEBA_NXZ */ MCAPI bool isFromWorldTemplate() const; /** - * @symbol ?isWorldTemplateOptionLocked\@WorldTemplateLevelData\@\@QEBA_NXZ + * @symbol ?isWorldTemplateOptionLocked\@WorldTemplateLevelData\@\@QEBA_NXZ */ MCAPI bool isWorldTemplateOptionLocked() const; /** - * @symbol ?setBaseGameVersion\@WorldTemplateLevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z + * @symbol ?setBaseGameVersion\@WorldTemplateLevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z */ MCAPI void setBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?setContentIdentity\@WorldTemplateLevelData\@\@QEAAXAEBVContentIdentity\@\@\@Z + * @symbol ?setContentIdentity\@WorldTemplateLevelData\@\@QEAAXAEBVContentIdentity\@\@\@Z */ MCAPI void setContentIdentity(class ContentIdentity const &); /** - * @symbol ?setIsWorldTemplateOptionLocked\@WorldTemplateLevelData\@\@QEAAX_N\@Z + * @symbol ?setIsWorldTemplateOptionLocked\@WorldTemplateLevelData\@\@QEAAX_N\@Z */ MCAPI void setIsWorldTemplateOptionLocked(bool); /** - * @symbol ?setMaxBaseGameVersion\@WorldTemplateLevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z + * @symbol ?setMaxBaseGameVersion\@WorldTemplateLevelData\@\@QEAAXAEBVBaseGameVersion\@\@\@Z */ MCAPI void setMaxBaseGameVersion(class BaseGameVersion const &); /** - * @symbol ?setTagData\@WorldTemplateLevelData\@\@QEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?setTagData\@WorldTemplateLevelData\@\@QEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void setTagData(class CompoundTag &) const; /** - * @symbol ?setWorldTemplateIdentity\@WorldTemplateLevelData\@\@QEAAXAEBUPackIdVersion\@\@\@Z + * @symbol ?setWorldTemplateIdentity\@WorldTemplateLevelData\@\@QEAAXAEBUPackIdVersion\@\@\@Z */ MCAPI void setWorldTemplateIdentity(struct PackIdVersion const &); /** - * @symbol ??1WorldTemplateLevelData\@\@QEAA\@XZ + * @symbol ??1WorldTemplateLevelData\@\@QEAA\@XZ */ MCAPI ~WorldTemplateLevelData(); //protected: /** - * @symbol ?_getTagData\@WorldTemplateLevelData\@\@IEAAXAEBVCompoundTag\@\@\@Z + * @symbol ?_getTagData\@WorldTemplateLevelData\@\@IEAAXAEBVCompoundTag\@\@\@Z */ MCAPI void _getTagData(class CompoundTag const &); /** - * @symbol ?_setTagData\@WorldTemplateLevelData\@\@IEBAXAEAVCompoundTag\@\@\@Z + * @symbol ?_setTagData\@WorldTemplateLevelData\@\@IEBAXAEAVCompoundTag\@\@\@Z */ MCAPI void _setTagData(class CompoundTag &) const; protected: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplateManager.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManager.hpp index baa0d07ecd..b3292ccc93 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateManager.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateManager.hpp @@ -32,42 +32,48 @@ class WorldTemplateManager { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldTemplateManager(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?findInstalledWorldTemplateByUUID\@WorldTemplateManager\@\@UEBAPEBUWorldTemplateInfo\@\@AEBV?$vector\@VUUID\@mce\@\@V?$allocator\@VUUID\@mce\@\@\@std\@\@\@std\@\@\@Z + * @vftbl 1 + * @symbol ?findInstalledWorldTemplateByUUID\@WorldTemplateManager\@\@UEBAPEBUWorldTemplateInfo\@\@AEBV?$vector\@VUUID\@mce\@\@V?$allocator\@VUUID\@mce\@\@\@std\@\@\@std\@\@\@Z */ virtual struct WorldTemplateInfo const * findInstalledWorldTemplateByUUID(std::vector const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORLDTEMPLATEMANAGER /** - * @symbol ??0WorldTemplateManager\@\@QEAA\@AEAVPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEAVPackSourceFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@3\@_N\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WorldTemplateManager(); +#endif + /** + * @symbol ??0WorldTemplateManager\@\@QEAA\@AEAVPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@AEAVPackSourceFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@VFilePathManager\@Core\@\@\@Bedrock\@\@\@3\@_N\@Z */ MCAPI WorldTemplateManager(class PackManifestFactory &, class gsl::not_null> const &, class PackSourceFactory &, class gsl::not_null> const &, bool); /** - * @symbol ?findInstalledWorldTemplate\@WorldTemplateManager\@\@QEBAPEBUWorldTemplateInfo\@\@AEBUPackIdVersion\@\@\@Z + * @symbol ?findInstalledWorldTemplate\@WorldTemplateManager\@\@QEBAPEBUWorldTemplateInfo\@\@AEBUPackIdVersion\@\@\@Z */ MCAPI struct WorldTemplateInfo const * findInstalledWorldTemplate(struct PackIdVersion const &) const; /** - * @symbol ?getWorldTemplatesPath\@WorldTemplateManager\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @symbol ?getWorldTemplatesPath\@WorldTemplateManager\@\@QEBA?AV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ MCAPI class Core::PathBuffer getWorldTemplatesPath() const; //private: /** - * @symbol ?_initialize\@WorldTemplateManager\@\@AEAAXXZ + * @symbol ?_initialize\@WorldTemplateManager\@\@AEAAXXZ */ MCAPI void _initialize(); /** - * @symbol ?_initializePackSources\@WorldTemplateManager\@\@AEAAXXZ + * @symbol ?_initializePackSources\@WorldTemplateManager\@\@AEAAXXZ */ MCAPI void _initializePackSources(); /** - * @symbol ?_onDiscoverWorldTemplate\@WorldTemplateManager\@\@AEAAXAEBVPack\@\@\@Z + * @symbol ?_onDiscoverWorldTemplate\@WorldTemplateManager\@\@AEAAXAEBVPack\@\@\@Z */ MCAPI void _onDiscoverWorldTemplate(class Pack const &); private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp index 4325b2aa15..8f02ef8b9c 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxy.hpp @@ -28,12 +28,12 @@ class WorldTemplateManagerProxy { public: /** - * @symbol ??0WorldTemplateManagerProxy\@\@QEAA\@AEBUWorldTemplateManagerProxyCallbacks\@\@\@Z + * @symbol ??0WorldTemplateManagerProxy\@\@QEAA\@AEBUWorldTemplateManagerProxyCallbacks\@\@\@Z */ MCAPI WorldTemplateManagerProxy(struct WorldTemplateManagerProxyCallbacks const &); /** - * @symbol ??1WorldTemplateManagerProxy\@\@QEAA\@XZ + * @symbol ??1WorldTemplateManagerProxy\@\@QEAA\@XZ */ MCAPI ~WorldTemplateManagerProxy(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp index 33cd371df1..812d3ab2aa 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplateManagerProxyCallbacks.hpp @@ -28,7 +28,7 @@ struct WorldTemplateManagerProxyCallbacks { public: /** - * @symbol ??1WorldTemplateManagerProxyCallbacks\@\@QEAA\@XZ + * @symbol ??1WorldTemplateManagerProxyCallbacks\@\@QEAA\@XZ */ MCAPI ~WorldTemplateManagerProxyCallbacks(); diff --git a/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp b/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp index 4c149bf235..f262da4152 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplatePackManifest.hpp @@ -29,30 +29,36 @@ class WorldTemplatePackManifest { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldTemplatePackManifest(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?clone\@WorldTemplatePackManifest\@\@UEBA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@XZ + * @vftbl 1 + * @symbol ?clone\@WorldTemplatePackManifest\@\@UEBA?AV?$unique_ptr\@VPackManifest\@\@U?$default_delete\@VPackManifest\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr clone() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_WORLDTEMPLATEPACKMANIFEST /** - * @symbol ??0WorldTemplatePackManifest\@\@QEAA\@XZ + * @symbol __unk_destructor_-1 + */ + MCVAPI ~WorldTemplatePackManifest(); +#endif + /** + * @symbol ??0WorldTemplatePackManifest\@\@QEAA\@XZ */ MCAPI WorldTemplatePackManifest(); /** - * @symbol ??0WorldTemplatePackManifest\@\@QEAA\@$$QEAVPackManifest\@\@\@Z + * @symbol ??0WorldTemplatePackManifest\@\@QEAA\@$$QEAVPackManifest\@\@\@Z */ MCAPI WorldTemplatePackManifest(class PackManifest &&); /** - * @symbol ?getGameType\@WorldTemplatePackManifest\@\@QEBA?AW4GameType\@\@XZ + * @symbol ?getGameType\@WorldTemplatePackManifest\@\@QEBA?AW4GameType\@\@XZ */ MCAPI enum class GameType getGameType() const; /** - * @symbol ?setGameType\@WorldTemplatePackManifest\@\@QEAAXW4GameType\@\@\@Z + * @symbol ?setGameType\@WorldTemplatePackManifest\@\@QEAAXW4GameType\@\@\@Z */ MCAPI void setGameType(enum class GameType); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp b/LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp index 6699dad53c..8e9f0cca23 100644 --- a/LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp +++ b/LiteLoader/include/llapi/mc/WorldTemplatePackSource.hpp @@ -31,42 +31,42 @@ class WorldTemplatePackSource { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WorldTemplatePackSource(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol __unk_vfn_1 + * @vftbl 1 + * @symbol __unk_vfn_1 */ virtual void __unk_vfn_1(); /** - * @vftbl 2 - * @symbol __unk_vfn_2 + * @vftbl 2 + * @symbol __unk_vfn_2 */ virtual void __unk_vfn_2(); /** - * @vftbl 3 - * @symbol __unk_vfn_3 + * @vftbl 3 + * @symbol __unk_vfn_3 */ virtual void __unk_vfn_3(); /** - * @vftbl 4 - * @symbol __unk_vfn_4 + * @vftbl 4 + * @symbol __unk_vfn_4 */ virtual void __unk_vfn_4(); /** - * @vftbl 5 - * @symbol ?load\@WorldTemplatePackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @vftbl 5 + * @symbol ?load\@WorldTemplatePackSource\@\@UEAA?AVPackSourceReport\@\@AEAVIPackManifestFactory\@\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVIContentKeyProvider\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ virtual class PackSourceReport load(class IPackManifestFactory &, class gsl::not_null> const &); /** - * @symbol ??0WorldTemplatePackSource\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVWorldTemplateManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVUUID\@mce\@\@W4PackType\@\@W4PackOrigin\@\@\@Z + * @symbol ??0WorldTemplatePackSource\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@$$CBVWorldTemplateManager\@\@\@Bedrock\@\@\@gsl\@\@AEBVUUID\@mce\@\@W4PackType\@\@W4PackOrigin\@\@\@Z */ MCAPI WorldTemplatePackSource(class gsl::not_null> const &, class mce::UUID const &, enum class PackType, enum class PackOrigin); /** - * @symbol ?getWorldTemplateId\@WorldTemplatePackSource\@\@QEBAAEBVUUID\@mce\@\@XZ + * @symbol ?getWorldTemplateId\@WorldTemplatePackSource\@\@QEBAAEBVUUID\@mce\@\@XZ */ MCAPI class mce::UUID const & getWorldTemplateId() const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WritableBookItem.hpp b/LiteLoader/include/llapi/mc/WritableBookItem.hpp index 95e0549e9f..2a0f902e48 100644 --- a/LiteLoader/include/llapi/mc/WritableBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WritableBookItem.hpp @@ -32,113 +32,113 @@ class WritableBookItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WritableBookItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 59 - * @symbol ?requiresInteract\@WritableBookItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@WritableBookItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@WritableBookItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@WritableBookItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 119 - * @symbol ?getInteractText\@WritableBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z + * @vftbl 119 + * @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; /** - * @symbol ??0WritableBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WritableBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WritableBookItem(std::string const &, int); /** - * @symbol ?addPageAt\@WritableBookItem\@\@SAXAEAVItemStack\@\@HAEBUPageContent\@\@\@Z + * @symbol ?addPageAt\@WritableBookItem\@\@SAXAEAVItemStack\@\@HAEBUPageContent\@\@\@Z */ MCAPI static void addPageAt(class ItemStack &, int, struct PageContent const &); /** - * @symbol ?deletePage\@WritableBookItem\@\@SA?AUPageContent\@\@AEAVItemStack\@\@H\@Z + * @symbol ?deletePage\@WritableBookItem\@\@SA?AUPageContent\@\@AEAVItemStack\@\@H\@Z */ MCAPI static struct PageContent deletePage(class ItemStack &, int); /** - * @symbol ?replacePage\@WritableBookItem\@\@SAXAEAVItemStack\@\@HAEBUPageContent\@\@\@Z + * @symbol ?replacePage\@WritableBookItem\@\@SAXAEAVItemStack\@\@HAEBUPageContent\@\@\@Z */ MCAPI static void replacePage(class ItemStack &, int, struct PageContent const &); /** - * @symbol ?signBook\@WritableBookItem\@\@SAXAEAVItemStack\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11\@Z + * @symbol ?signBook\@WritableBookItem\@\@SAXAEAVItemStack\@\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@11\@Z */ MCAPI static void signBook(class ItemStack &, std::string, std::string, std::string); /** - * @symbol ?swapPages\@WritableBookItem\@\@SAXAEAVItemStack\@\@HH\@Z + * @symbol ?swapPages\@WritableBookItem\@\@SAXAEAVItemStack\@\@HH\@Z */ MCAPI static void swapPages(class ItemStack &, int, int); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp index 26f7153572..25e0c40778 100644 --- a/LiteLoader/include/llapi/mc/WrittenBookItem.hpp +++ b/LiteLoader/include/llapi/mc/WrittenBookItem.hpp @@ -32,176 +32,176 @@ class WrittenBookItem : public Item { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~WrittenBookItem(); + virtual void __unk_vfn_0(); /** - * @vftbl 7 - * @symbol __unk_vfn_7 + * @vftbl 7 + * @symbol __unk_vfn_7 */ virtual void __unk_vfn_7(); /** - * @vftbl 11 - * @symbol __unk_vfn_11 + * @vftbl 11 + * @symbol __unk_vfn_11 */ virtual void __unk_vfn_11(); /** - * @vftbl 14 - * @symbol __unk_vfn_14 + * @vftbl 14 + * @symbol __unk_vfn_14 */ virtual void __unk_vfn_14(); /** - * @vftbl 16 - * @symbol __unk_vfn_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ virtual void __unk_vfn_16(); /** - * @vftbl 50 - * @symbol ?isGlint\@WrittenBookItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z + * @vftbl 50 + * @symbol ?isGlint\@WrittenBookItem\@\@MEBA_NAEBVItemStackBase\@\@\@Z */ virtual bool isGlint(class ItemStackBase const &) const; /** - * @vftbl 51 - * @symbol __unk_vfn_51 + * @vftbl 51 + * @symbol __unk_vfn_51 */ virtual void __unk_vfn_51(); /** - * @vftbl 53 - * @symbol __unk_vfn_53 + * @vftbl 53 + * @symbol __unk_vfn_53 */ virtual void __unk_vfn_53(); /** - * @vftbl 59 - * @symbol ?requiresInteract\@WrittenBookItem\@\@UEBA_NXZ + * @vftbl 59 + * @symbol ?requiresInteract\@WrittenBookItem\@\@UEBA_NXZ */ virtual bool requiresInteract() const; /** - * @vftbl 60 - * @symbol ?appendFormattedHovertext\@WrittenBookItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 60 + * @symbol ?appendFormattedHovertext\@WrittenBookItem\@\@UEBAXAEBVItemStackBase\@\@AEAVLevel\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual void appendFormattedHovertext(class ItemStackBase const &, class Level &, std::string &, bool) const; /** - * @vftbl 66 - * @symbol __unk_vfn_66 + * @vftbl 66 + * @symbol __unk_vfn_66 */ virtual void __unk_vfn_66(); /** - * @vftbl 70 - * @symbol __unk_vfn_70 + * @vftbl 70 + * @symbol __unk_vfn_70 */ virtual void __unk_vfn_70(); /** - * @vftbl 71 - * @symbol __unk_vfn_71 + * @vftbl 71 + * @symbol __unk_vfn_71 */ virtual void __unk_vfn_71(); /** - * @vftbl 72 - * @symbol __unk_vfn_72 + * @vftbl 72 + * @symbol __unk_vfn_72 */ virtual void __unk_vfn_72(); /** - * @vftbl 75 - * @symbol __unk_vfn_75 + * @vftbl 75 + * @symbol __unk_vfn_75 */ virtual void __unk_vfn_75(); /** - * @vftbl 79 - * @symbol __unk_vfn_79 + * @vftbl 79 + * @symbol __unk_vfn_79 */ virtual void __unk_vfn_79(); /** - * @vftbl 80 - * @symbol __unk_vfn_80 + * @vftbl 80 + * @symbol __unk_vfn_80 */ virtual void __unk_vfn_80(); /** - * @vftbl 84 - * @symbol ?use\@WrittenBookItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z + * @vftbl 84 + * @symbol ?use\@WrittenBookItem\@\@UEBAAEAVItemStack\@\@AEAV2\@AEAVPlayer\@\@\@Z */ virtual class ItemStack & use(class ItemStack &, class Player &) const; /** - * @vftbl 95 - * @symbol ?buildDescriptionId\@WrittenBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z + * @vftbl 95 + * @symbol ?buildDescriptionId\@WrittenBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVItemDescriptor\@\@PEBVCompoundTag\@\@\@Z */ virtual std::string buildDescriptionId(class ItemDescriptor const &, class CompoundTag const *) const; /** - * @vftbl 119 - * @symbol ?getInteractText\@WrittenBookItem\@\@UEBA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@AEBVPlayer\@\@\@Z + * @vftbl 119 + * @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; /** - * @symbol ??0WrittenBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z + * @symbol ??0WrittenBookItem\@\@QEAA\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@H\@Z */ MCAPI WrittenBookItem(std::string const &, int); /** - * @symbol ?MAX_GENERATION\@WrittenBookItem\@\@2HB + * @symbol ?MAX_GENERATION\@WrittenBookItem\@\@2HB */ MCAPI static int const MAX_GENERATION; /** - * @symbol ?MAX_PAGES\@WrittenBookItem\@\@2HB + * @symbol ?MAX_PAGES\@WrittenBookItem\@\@2HB */ MCAPI static int const MAX_PAGES; /** - * @symbol ?MAX_PAGE_LENGTH\@WrittenBookItem\@\@2HB + * @symbol ?MAX_PAGE_LENGTH\@WrittenBookItem\@\@2HB */ MCAPI static int const MAX_PAGE_LENGTH; /** - * @symbol ?MAX_TITLE_LENGTH\@WrittenBookItem\@\@2HB + * @symbol ?MAX_TITLE_LENGTH\@WrittenBookItem\@\@2HB */ MCAPI static int const MAX_TITLE_LENGTH; /** - * @symbol ?TAG_AUTHOR\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_AUTHOR\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_AUTHOR; + MCAPI static class std::basic_string_view> const TAG_AUTHOR; /** - * @symbol ?TAG_GENERATION\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_GENERATION\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_GENERATION; + MCAPI static class std::basic_string_view> const TAG_GENERATION; /** - * @symbol ?TAG_ID\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_ID\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_ID; + MCAPI static class std::basic_string_view> const TAG_ID; /** - * @symbol ?TAG_PAGES\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_PAGES\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_PAGES; + MCAPI static class std::basic_string_view> const TAG_PAGES; /** - * @symbol ?TAG_PAGE_PHOTO_NAME\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_PAGE_PHOTO_NAME\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_PAGE_PHOTO_NAME; + MCAPI static class std::basic_string_view> const TAG_PAGE_PHOTO_NAME; /** - * @symbol ?TAG_PAGE_TEXT\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_PAGE_TEXT\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_PAGE_TEXT; + MCAPI static class std::basic_string_view> const TAG_PAGE_TEXT; /** - * @symbol ?TAG_RESOLVED\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_RESOLVED\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_RESOLVED; + MCAPI static class std::basic_string_view> const TAG_RESOLVED; /** - * @symbol ?TAG_TITLE\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_TITLE\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_TITLE; + MCAPI static class std::basic_string_view> const TAG_TITLE; /** - * @symbol ?TAG_XUID\@WrittenBookItem\@\@2V?$basic_string_span\@$$CBD$0?0\@gsl\@\@B + * @symbol ?TAG_XUID\@WrittenBookItem\@\@2V?$basic_string_view\@DU?$char_traits\@D\@std\@\@\@std\@\@B */ - MCAPI static class gsl::basic_string_span const TAG_XUID; + MCAPI static class std::basic_string_view> const TAG_XUID; /** - * @symbol ?canBeCopied\@WrittenBookItem\@\@SA_NPEBVCompoundTag\@\@\@Z + * @symbol ?canBeCopied\@WrittenBookItem\@\@SA_NPEBVCompoundTag\@\@\@Z */ MCAPI static bool canBeCopied(class CompoundTag const *); /** - * @symbol ?getGeneration\@WrittenBookItem\@\@SAHPEBVCompoundTag\@\@\@Z + * @symbol ?getGeneration\@WrittenBookItem\@\@SAHPEBVCompoundTag\@\@\@Z */ MCAPI static int getGeneration(class CompoundTag const *); /** - * @symbol ?getPageCount\@WrittenBookItem\@\@SAHAEBVItemStack\@\@\@Z + * @symbol ?getPageCount\@WrittenBookItem\@\@SAHAEBVItemStack\@\@\@Z */ MCAPI static int getPageCount(class ItemStack const &); /** - * @symbol ?getPages\@WrittenBookItem\@\@SA?AV?$vector\@UPageContent\@\@V?$allocator\@UPageContent\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@\@Z + * @symbol ?getPages\@WrittenBookItem\@\@SA?AV?$vector\@UPageContent\@\@V?$allocator\@UPageContent\@\@\@std\@\@\@std\@\@AEBVItemStack\@\@\@Z */ MCAPI static std::vector getPages(class ItemStack const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/XPCommand.hpp b/LiteLoader/include/llapi/mc/XPCommand.hpp index 5806ce38db..b4992efbb4 100644 --- a/LiteLoader/include/llapi/mc/XPCommand.hpp +++ b/LiteLoader/include/llapi/mc/XPCommand.hpp @@ -31,18 +31,18 @@ class XPCommand : public Command { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~XPCommand(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?execute\@XPCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z + * @vftbl 1 + * @symbol ?execute\@XPCommand\@\@UEBAXAEBVCommandOrigin\@\@AEAVCommandOutput\@\@\@Z */ virtual void execute(class CommandOrigin const &, class CommandOutput &) const; /** - * @symbol ?setup\@XPCommand\@\@SAXAEAVCommandRegistry\@\@\@Z + * @symbol ?setup\@XPCommand\@\@SAXAEAVCommandRegistry\@\@\@Z */ MCAPI static void setup(class CommandRegistry &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Xoroshiro128PlusPlus.hpp b/LiteLoader/include/llapi/mc/Xoroshiro128PlusPlus.hpp index b520b138a5..42a44615fd 100644 --- a/LiteLoader/include/llapi/mc/Xoroshiro128PlusPlus.hpp +++ b/LiteLoader/include/llapi/mc/Xoroshiro128PlusPlus.hpp @@ -28,8 +28,8 @@ class Xoroshiro128PlusPlus { public: /** - * @symbol ?nextLong\@Xoroshiro128PlusPlus\@\@QEAA_JXZ + * @symbol ?nextLong\@Xoroshiro128PlusPlus\@\@QEAA_JXZ */ MCAPI __int64 nextLong(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp b/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp index 096ea5d655..e31e0b8dd3 100644 --- a/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp +++ b/LiteLoader/include/llapi/mc/XoroshiroPositionalRandomFactory.hpp @@ -32,22 +32,28 @@ class XoroshiroPositionalRandomFactory { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~XoroshiroPositionalRandomFactory(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?forBlockPos\@XoroshiroPositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@\@Z + * @vftbl 1 + * @symbol ?forBlockPos\@XoroshiroPositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBVBlockPos\@\@\@Z */ virtual std::unique_ptr forBlockPos(class BlockPos const &) const; /** - * @vftbl 2 - * @symbol ?forString\@XoroshiroPositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z + * @vftbl 2 + * @symbol ?forString\@XoroshiroPositionalRandomFactory\@\@UEBA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@3\@\@Z */ virtual std::unique_ptr forString(std::string const &) const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_XOROSHIROPOSITIONALRANDOMFACTORY /** - * @symbol ?forStringImpl\@XoroshiroPositionalRandomFactory\@\@QEBA?AVXoroshiroRandom\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~XoroshiroPositionalRandomFactory(); +#endif + /** + * @symbol ?forStringImpl\@XoroshiroPositionalRandomFactory\@\@QEBA?AVXoroshiroRandom\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI class XoroshiroRandom forStringImpl(std::string const &) const; @@ -55,8 +61,8 @@ class XoroshiroPositionalRandomFactory { private: /** - * @symbol ?mThreadLocalDigest\@XoroshiroPositionalRandomFactory\@\@0V?$ThreadLocalObject\@Vmd5\@Hash\@Crypto\@\@V?$allocator\@Vmd5\@Hash\@Crypto\@\@\@std\@\@\@Threading\@Bedrock\@\@A + * @symbol ?mThreadLocalDigest\@XoroshiroPositionalRandomFactory\@\@0V?$ThreadLocalObject\@Vmd5\@Hash\@Crypto\@\@V?$allocator\@Vmd5\@Hash\@Crypto\@\@\@std\@\@\@Threading\@Bedrock\@\@A */ MCAPI static class Bedrock::Threading::ThreadLocalObject> mThreadLocalDigest; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/XoroshiroRandom.hpp b/LiteLoader/include/llapi/mc/XoroshiroRandom.hpp index 4d14f1f1e0..b32c861263 100644 --- a/LiteLoader/include/llapi/mc/XoroshiroRandom.hpp +++ b/LiteLoader/include/llapi/mc/XoroshiroRandom.hpp @@ -30,59 +30,65 @@ class XoroshiroRandom { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~XoroshiroRandom(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?nextInt\@XoroshiroRandom\@\@UEAAHXZ + * @vftbl 1 + * @symbol ?nextInt\@XoroshiroRandom\@\@UEAAHXZ */ virtual int nextInt(); /** - * @vftbl 2 - * @symbol ?nextInt\@XoroshiroRandom\@\@UEAAHH\@Z + * @vftbl 2 + * @symbol ?nextInt\@XoroshiroRandom\@\@UEAAHH\@Z */ virtual int nextInt(int); /** - * @vftbl 3 - * @symbol ?nextLong\@XoroshiroRandom\@\@UEAA_JXZ + * @vftbl 3 + * @symbol ?nextLong\@XoroshiroRandom\@\@UEAA_JXZ */ virtual __int64 nextLong(); /** - * @vftbl 4 - * @symbol ?nextBoolean\@XoroshiroRandom\@\@UEAA_NXZ + * @vftbl 4 + * @symbol ?nextBoolean\@XoroshiroRandom\@\@UEAA_NXZ */ virtual bool nextBoolean(); /** - * @vftbl 5 - * @symbol ?nextFloat\@XoroshiroRandom\@\@UEAAMXZ + * @vftbl 5 + * @symbol ?nextFloat\@XoroshiroRandom\@\@UEAAMXZ */ virtual float nextFloat(); /** - * @vftbl 6 - * @symbol ?nextDouble\@XoroshiroRandom\@\@UEAANXZ + * @vftbl 6 + * @symbol ?nextDouble\@XoroshiroRandom\@\@UEAANXZ */ virtual double nextDouble(); /** - * @vftbl 7 - * @symbol ?nextGaussianDouble\@XoroshiroRandom\@\@UEAANXZ + * @vftbl 7 + * @symbol ?nextGaussianDouble\@XoroshiroRandom\@\@UEAANXZ */ virtual double nextGaussianDouble(); /** - * @vftbl 8 - * @symbol ?consumeCount\@XoroshiroRandom\@\@UEAAXI\@Z + * @vftbl 8 + * @symbol ?consumeCount\@XoroshiroRandom\@\@UEAAXI\@Z */ virtual void consumeCount(unsigned int); /** - * @vftbl 9 - * @symbol ?fork\@XoroshiroRandom\@\@UEAA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@XZ + * @vftbl 9 + * @symbol ?fork\@XoroshiroRandom\@\@UEAA?AV?$unique_ptr\@VIRandom\@\@U?$default_delete\@VIRandom\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr fork(); /** - * @vftbl 10 - * @symbol ?forkPositional\@XoroshiroRandom\@\@UEAA?AV?$unique_ptr\@VIPositionalRandomFactory\@\@U?$default_delete\@VIPositionalRandomFactory\@\@\@std\@\@\@std\@\@XZ + * @vftbl 10 + * @symbol ?forkPositional\@XoroshiroRandom\@\@UEAA?AV?$unique_ptr\@VIPositionalRandomFactory\@\@U?$default_delete\@VIPositionalRandomFactory\@\@\@std\@\@\@std\@\@XZ */ virtual std::unique_ptr forkPositional(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_XOROSHIRORANDOM + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~XoroshiroRandom(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp b/LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp index 6a823c05f3..3efb9bbcd8 100644 --- a/LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp +++ b/LiteLoader/include/llapi/mc/ZipPackAccessStrategy.hpp @@ -33,106 +33,112 @@ class ZipPackAccessStrategy : public PackAccessStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ZipPackAccessStrategy(); + virtual void __unk_vfn_0(); /** - * @vftbl 1 - * @symbol ?getPackSize\@ZipPackAccessStrategy\@\@UEBA_KXZ + * @vftbl 1 + * @symbol ?getPackSize\@ZipPackAccessStrategy\@\@UEBA_KXZ */ virtual unsigned __int64 getPackSize() const; /** - * @vftbl 2 - * @symbol ?getPackLocation\@ZipPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ + * @vftbl 2 + * @symbol ?getPackLocation\@ZipPackAccessStrategy\@\@UEBAAEBVResourceLocation\@\@XZ */ virtual class ResourceLocation const & getPackLocation() const; /** - * @vftbl 3 - * @symbol ?getPackName\@ZipPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ + * @vftbl 3 + * @symbol ?getPackName\@ZipPackAccessStrategy\@\@UEBAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@XZ */ virtual std::string const & getPackName() const; /** - * @vftbl 4 - * @symbol ?isWritable\@ZipPackAccessStrategy\@\@UEBA_NXZ + * @vftbl 4 + * @symbol ?isWritable\@ZipPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isWritable() const; /** - * @vftbl 5 - * @symbol ?setIsTrusted\@ZipPackAccessStrategy\@\@UEAAX_N\@Z + * @vftbl 5 + * @symbol ?setIsTrusted\@ZipPackAccessStrategy\@\@UEAAX_N\@Z */ virtual void setIsTrusted(bool); /** - * @vftbl 6 - * @symbol ?isTrusted\@ZipPackAccessStrategy\@\@UEBA_NXZ + * @vftbl 6 + * @symbol ?isTrusted\@ZipPackAccessStrategy\@\@UEBA_NXZ */ virtual bool isTrusted() const; /** - * @vftbl 7 - * @symbol ?hasAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N\@Z + * @vftbl 7 + * @symbol ?hasAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@_N1\@Z */ - virtual bool hasAsset(class Core::Path const &, bool) const; + virtual bool hasAsset(class Core::Path const &, bool, bool) const; /** - * @vftbl 8 - * @symbol ?hasFolder\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z + * @vftbl 8 + * @symbol ?hasFolder\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@\@Z */ virtual bool hasFolder(class Core::Path const &) const; /** - * @vftbl 9 - * @symbol ?getAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z + * @vftbl 9 + * @symbol ?getAsset\@ZipPackAccessStrategy\@\@UEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@_N\@Z */ virtual bool getAsset(class Core::Path const &, std::string &, bool) const; /** - * @vftbl 10 - * @symbol ?deleteAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z + * @vftbl 10 + * @symbol ?deleteAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@\@Z */ virtual bool deleteAsset(class Core::PathBuffer const &); /** - * @vftbl 11 - * @symbol ?writeAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @vftbl 11 + * @symbol ?writeAsset\@ZipPackAccessStrategy\@\@UEAA_NAEBVPath\@Core\@\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ virtual bool writeAsset(class Core::Path const &, std::string const &); /** - * @vftbl 12 - * @symbol ?forEachIn\@ZipPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z + * @vftbl 12 + * @symbol ?forEachIn\@ZipPackAccessStrategy\@\@UEBAXAEBVPath\@Core\@\@V?$function\@$$A6AXAEBVPath\@Core\@\@\@Z\@std\@\@_N\@Z */ virtual void forEachIn(class Core::Path const &, class std::function, bool) const; /** - * @vftbl 14 - * @symbol ?getStrategyType\@ZipPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ + * @vftbl 14 + * @symbol ?getStrategyType\@ZipPackAccessStrategy\@\@UEBA?AW4PackAccessStrategyType\@\@XZ */ virtual enum class PackAccessStrategyType getStrategyType() const; /** - * @vftbl 15 - * @symbol ?getSubPath\@ZipPackAccessStrategy\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ + * @vftbl 15 + * @symbol ?getSubPath\@ZipPackAccessStrategy\@\@UEBAAEBV?$PathBuffer\@V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Core\@\@XZ */ 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 + * @vftbl 16 + * @symbol ?createSubPack\@ZipPackAccessStrategy\@\@UEBA?AV?$unique_ptr\@VPackAccessStrategy\@\@U?$default_delete\@VPackAccessStrategy\@\@\@std\@\@\@std\@\@AEBVPath\@Core\@\@\@Z */ virtual std::unique_ptr createSubPack(class Core::Path const &) const; /** - * @vftbl 19 - * @symbol ?unload\@ZipPackAccessStrategy\@\@UEAAXXZ + * @vftbl 19 + * @symbol ?unload\@ZipPackAccessStrategy\@\@UEAAXXZ */ virtual void unload(); /** - * @vftbl 21 - * @symbol ?readContentIdentity\@ZipPackAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ + * @vftbl 21 + * @symbol ?readContentIdentity\@ZipPackAccessStrategy\@\@UEBA?AVContentIdentity\@\@XZ */ virtual class ContentIdentity readContentIdentity() const; +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ZIPPACKACCESSSTRATEGY /** - * @symbol ??0ZipPackAccessStrategy\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@AEBVResourceLocation\@\@AEBVPath\@Core\@\@\@Z + * @symbol __unk_destructor_-1 + */ + MCVAPI ~ZipPackAccessStrategy(); +#endif + /** + * @symbol ??0ZipPackAccessStrategy\@\@QEAA\@AEBV?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@AEBVResourceLocation\@\@AEBVPath\@Core\@\@\@Z */ MCAPI ZipPackAccessStrategy(class gsl::not_null> const &, class ResourceLocation const &, class Core::Path const &); //private: /** - * @symbol ?_tryReadFromPendingQueue\@ZipPackAccessStrategy\@\@AEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?_tryReadFromPendingQueue\@ZipPackAccessStrategy\@\@AEBA_NAEBVPath\@Core\@\@AEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool _tryReadFromPendingQueue(class Core::Path const &, std::string &) const; private: -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAccess.hpp b/LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAccess.hpp index 8e919919c9..7484ad6942 100644 --- a/LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAccess.hpp +++ b/LiteLoader/include/llapi/mc/ZipPackAccessStrategyOwningFileAccess.hpp @@ -30,13 +30,13 @@ class ZipPackAccessStrategyOwningFileAccess : public ZipPackAccessStrategy { public: /** - * @vftbl 0 - * @symbol __unk_destructor_0 + * @vftbl 0 + * @symbol __unk_vfn_0 */ - virtual ~ZipPackAccessStrategyOwningFileAccess(); + virtual void __unk_vfn_0(); /** - * @symbol ??0ZipPackAccessStrategyOwningFileAccess\@\@QEAA\@V?$shared_ptr\@VIFileAccess\@\@\@std\@\@AEBVResourceLocation\@\@AEBVPath\@Core\@\@\@Z + * @symbol ??0ZipPackAccessStrategyOwningFileAccess\@\@QEAA\@V?$shared_ptr\@VIFileAccess\@\@\@std\@\@AEBVResourceLocation\@\@AEBVPath\@Core\@\@\@Z */ MCAPI ZipPackAccessStrategyOwningFileAccess(class std::shared_ptr, class ResourceLocation const &, class Core::Path const &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp b/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp index 6283394da4..df0aec80b0 100644 --- a/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp +++ b/LiteLoader/include/llapi/mc/ZlibFileAccessWrapper.hpp @@ -31,16 +31,16 @@ class ZlibFileAccessWrapper { public: /** - * @symbol ??0ZlibFileAccessWrapper\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@\@Z + * @symbol ??0ZlibFileAccessWrapper\@\@QEAA\@V?$not_null\@V?$NonOwnerPointer\@VIFileAccess\@\@\@Bedrock\@\@\@gsl\@\@\@Z */ MCAPI ZlibFileAccessWrapper(class gsl::not_null>); /** - * @symbol ?getZipFunctions\@ZlibFileAccessWrapper\@\@QEBAPEAUzlib_filefunc64_32_def_s\@\@XZ + * @symbol ?getZipFunctions\@ZlibFileAccessWrapper\@\@QEBAPEAUzlib_filefunc64_32_def_s\@\@XZ */ MCAPI struct zlib_filefunc64_32_def_s * getZipFunctions() const; /** - * @symbol ??1ZlibFileAccessWrapper\@\@QEAA\@XZ + * @symbol ??1ZlibFileAccessWrapper\@\@QEAA\@XZ */ MCAPI ~ZlibFileAccessWrapper(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/Zombie.hpp b/LiteLoader/include/llapi/mc/Zombie.hpp index 5cafa5ae45..230e015022 100644 --- a/LiteLoader/include/llapi/mc/Zombie.hpp +++ b/LiteLoader/include/llapi/mc/Zombie.hpp @@ -34,161 +34,162 @@ enum class ZombieType; public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@Zombie\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@Zombie\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~Zombie(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 190 - * @symbol ?canPickupItem\@Zombie\@\@UEBA_NAEBVItemStack\@\@\@Z + * @vftbl 189 + * @symbol ?canPickupItem\@Zombie\@\@UEBA_NAEBVItemStack\@\@\@Z */ virtual bool canPickupItem(class ItemStack const &) const; /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); - /** - * @vftbl 218 - * @symbol __unk_vfn_218 - */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_192(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_217(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_218(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_240(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_243(); /** - * @vftbl 270 - * @symbol __unk_vfn_270 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_270(); + virtual void __unk_vfn_260(); /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 296 - * @symbol ?checkSpawnRules\@Zombie\@\@UEAA_N_N\@Z + * @vftbl 293 + * @symbol ?checkSpawnRules\@Zombie\@\@UEAA_N_N\@Z */ virtual bool checkSpawnRules(bool); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 313 - * @symbol ?getArmorValue\@Zombie\@\@MEBAHXZ + * @vftbl 310 + * @symbol ?getArmorValue\@Zombie\@\@MEBAHXZ */ virtual int getArmorValue() const; /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 + */ + virtual void __unk_vfn_351(); +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_ZOMBIE + /** + * @symbol __unk_destructor_-1 */ - virtual void __unk_vfn_354(); + MCVAPI ~Zombie(); +#endif /** - * @symbol ??0Zombie\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0Zombie\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI Zombie(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); /** - * @symbol ?setZombieType\@Zombie\@\@QEAAXW4ZombieType\@1\@\@Z + * @symbol ?setZombieType\@Zombie\@\@QEAAXW4ZombieType\@1\@\@Z */ MCAPI void setZombieType(enum class Zombie::ZombieType); @@ -196,12 +197,12 @@ enum class ZombieType; protected: /** - * @symbol ?SPAWN_BONUS_UUID\@Zombie\@\@1VUUID\@mce\@\@B + * @symbol ?SPAWN_BONUS_UUID\@Zombie\@\@1VUUID\@mce\@\@B */ MCAPI static class mce::UUID const SPAWN_BONUS_UUID; /** - * @symbol ?SPAWN_REINFORCEMENTS_CHANCE\@Zombie\@\@1VAttribute\@\@B + * @symbol ?SPAWN_REINFORCEMENTS_CHANCE\@Zombie\@\@1VAttribute\@\@B */ MCAPI static class Attribute const SPAWN_REINFORCEMENTS_CHANCE; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/ZombieVillager.hpp b/LiteLoader/include/llapi/mc/ZombieVillager.hpp index 8e72f034b2..445e20e2aa 100644 --- a/LiteLoader/include/llapi/mc/ZombieVillager.hpp +++ b/LiteLoader/include/llapi/mc/ZombieVillager.hpp @@ -32,158 +32,153 @@ class ZombieVillager : public Zombie { public: /** - * @vftbl 10 - * @symbol ?reloadHardcoded\@ZombieVillager\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z + * @vftbl 10 + * @symbol ?reloadHardcoded\@ZombieVillager\@\@UEAAXW4InitializationMethod\@Actor\@\@AEBVVariantParameterList\@\@\@Z */ virtual void reloadHardcoded(enum class Actor::InitializationMethod, class VariantParameterList const &); /** - * @vftbl 16 - * @symbol __unk_destructor_16 + * @vftbl 16 + * @symbol __unk_vfn_16 */ - virtual ~ZombieVillager(); + virtual void __unk_vfn_16(); /** - * @vftbl 41 - * @symbol __unk_vfn_41 + * @vftbl 41 + * @symbol __unk_vfn_41 */ virtual void __unk_vfn_41(); /** - * @vftbl 62 - * @symbol __unk_vfn_62 + * @vftbl 62 + * @symbol __unk_vfn_62 */ virtual void __unk_vfn_62(); /** - * @vftbl 69 - * @symbol __unk_vfn_69 + * @vftbl 69 + * @symbol __unk_vfn_69 */ virtual void __unk_vfn_69(); /** - * @vftbl 83 - * @symbol __unk_vfn_83 + * @vftbl 82 + * @symbol __unk_vfn_82 */ - virtual void __unk_vfn_83(); + virtual void __unk_vfn_82(); /** - * @vftbl 86 - * @symbol __unk_vfn_86 + * @vftbl 85 + * @symbol __unk_vfn_85 */ - virtual void __unk_vfn_86(); + virtual void __unk_vfn_85(); /** - * @vftbl 89 - * @symbol __unk_vfn_89 + * @vftbl 88 + * @symbol __unk_vfn_88 */ - virtual void __unk_vfn_89(); + virtual void __unk_vfn_88(); /** - * @vftbl 97 - * @symbol __unk_vfn_97 + * @vftbl 96 + * @symbol __unk_vfn_96 */ - virtual void __unk_vfn_97(); + virtual void __unk_vfn_96(); /** - * @vftbl 100 - * @symbol __unk_vfn_100 + * @vftbl 99 + * @symbol __unk_vfn_99 */ - virtual void __unk_vfn_100(); + virtual void __unk_vfn_99(); /** - * @vftbl 107 - * @symbol __unk_vfn_107 + * @vftbl 106 + * @symbol __unk_vfn_106 */ - virtual void __unk_vfn_107(); + virtual void __unk_vfn_106(); /** - * @vftbl 109 - * @symbol __unk_vfn_109 + * @vftbl 108 + * @symbol __unk_vfn_108 */ - virtual void __unk_vfn_109(); + virtual void __unk_vfn_108(); /** - * @vftbl 110 - * @symbol __unk_vfn_110 + * @vftbl 109 + * @symbol __unk_vfn_109 */ - virtual void __unk_vfn_110(); + virtual void __unk_vfn_109(); /** - * @vftbl 112 - * @symbol __unk_vfn_112 + * @vftbl 111 + * @symbol __unk_vfn_111 */ - virtual void __unk_vfn_112(); + virtual void __unk_vfn_111(); /** - * @vftbl 142 - * @symbol ?handleEntityEvent\@ZombieVillager\@\@UEAAXW4ActorEvent\@\@H\@Z + * @vftbl 141 + * @symbol ?handleEntityEvent\@ZombieVillager\@\@UEAAXW4ActorEvent\@\@H\@Z */ virtual void handleEntityEvent(enum class ActorEvent, int); /** - * @vftbl 179 - * @symbol __unk_vfn_179 + * @vftbl 178 + * @symbol __unk_vfn_178 */ - virtual void __unk_vfn_179(); + virtual void __unk_vfn_178(); /** - * @vftbl 193 - * @symbol __unk_vfn_193 + * @vftbl 192 + * @symbol __unk_vfn_192 */ - virtual void __unk_vfn_193(); + virtual void __unk_vfn_192(); /** - * @vftbl 218 - * @symbol __unk_vfn_218 + * @vftbl 217 + * @symbol __unk_vfn_217 */ - virtual void __unk_vfn_218(); + virtual void __unk_vfn_217(); /** - * @vftbl 219 - * @symbol __unk_vfn_219 + * @vftbl 218 + * @symbol __unk_vfn_218 */ - virtual void __unk_vfn_219(); + virtual void __unk_vfn_218(); /** - * @vftbl 241 - * @symbol __unk_vfn_241 + * @vftbl 240 + * @symbol __unk_vfn_240 */ - virtual void __unk_vfn_241(); + virtual void __unk_vfn_240(); /** - * @vftbl 244 - * @symbol __unk_vfn_244 + * @vftbl 243 + * @symbol __unk_vfn_243 */ - virtual void __unk_vfn_244(); + virtual void __unk_vfn_243(); /** - * @vftbl 262 - * @symbol __unk_vfn_262 + * @vftbl 260 + * @symbol __unk_vfn_260 */ - virtual void __unk_vfn_262(); + virtual void __unk_vfn_260(); /** - * @vftbl 266 - * @symbol ?readAdditionalSaveData\@ZombieVillager\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z + * @vftbl 264 + * @symbol ?readAdditionalSaveData\@ZombieVillager\@\@MEAAXAEBVCompoundTag\@\@AEAVDataLoadHelper\@\@\@Z */ virtual void readAdditionalSaveData(class CompoundTag const &, class DataLoadHelper &); /** - * @vftbl 267 - * @symbol ?addAdditionalSaveData\@ZombieVillager\@\@MEBAXAEAVCompoundTag\@\@\@Z + * @vftbl 265 + * @symbol ?addAdditionalSaveData\@ZombieVillager\@\@MEBAXAEAVCompoundTag\@\@\@Z */ virtual void addAdditionalSaveData(class CompoundTag &) const; /** - * @vftbl 270 - * @symbol __unk_vfn_270 - */ - virtual void __unk_vfn_270(); - /** - * @vftbl 277 - * @symbol __unk_vfn_277 + * @vftbl 268 + * @symbol __unk_vfn_268 */ - virtual void __unk_vfn_277(); + virtual void __unk_vfn_268(); /** - * @vftbl 285 - * @symbol __unk_vfn_285 + * @vftbl 275 + * @symbol __unk_vfn_275 */ - virtual void __unk_vfn_285(); + virtual void __unk_vfn_275(); /** - * @vftbl 304 - * @symbol __unk_vfn_304 + * @vftbl 301 + * @symbol __unk_vfn_301 */ - virtual void __unk_vfn_304(); + virtual void __unk_vfn_301(); /** - * @vftbl 308 - * @symbol __unk_vfn_308 + * @vftbl 305 + * @symbol __unk_vfn_305 */ - virtual void __unk_vfn_308(); + virtual void __unk_vfn_305(); /** - * @vftbl 354 - * @symbol __unk_vfn_354 + * @vftbl 351 + * @symbol __unk_vfn_351 */ - virtual void __unk_vfn_354(); + virtual void __unk_vfn_351(); /** - * @symbol ??0ZombieVillager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z + * @symbol ??0ZombieVillager\@\@QEAA\@PEAVActorDefinitionGroup\@\@AEBUActorDefinitionIdentifier\@\@AEAVEntityContext\@\@\@Z */ MCAPI ZombieVillager(class ActorDefinitionGroup *, struct ActorDefinitionIdentifier const &, class EntityContext &); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp b/LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp index b1eaf5e945..bb5dac065c 100644 --- a/LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp +++ b/LiteLoader/include/llapi/mc/_ProfilerLiteTimer.hpp @@ -29,12 +29,12 @@ class _ProfilerLiteTimer { public: /** - * @symbol ??0_ProfilerLiteTimer\@\@QEAA\@AEAUScopedData\@ProfilerLite\@\@Vid\@thread\@std\@\@\@Z + * @symbol ??0_ProfilerLiteTimer\@\@QEAA\@AEAUScopedData\@ProfilerLite\@\@Vid\@thread\@std\@\@\@Z */ MCAPI _ProfilerLiteTimer(struct ProfilerLite::ScopedData &, class std::thread::id); /** - * @symbol ??1_ProfilerLiteTimer\@\@QEAA\@XZ + * @symbol ??1_ProfilerLiteTimer\@\@QEAA\@XZ */ MCAPI ~_ProfilerLiteTimer(); -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/_TickPtr.hpp b/LiteLoader/include/llapi/mc/_TickPtr.hpp index ee3e85730f..953f14671b 100644 --- a/LiteLoader/include/llapi/mc/_TickPtr.hpp +++ b/LiteLoader/include/llapi/mc/_TickPtr.hpp @@ -29,5 +29,11 @@ class _TickPtr { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL__TICKPTR + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~_TickPtr(); +#endif -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/asio.hpp b/LiteLoader/include/llapi/mc/asio.hpp index 74c628c61a..6c1eee89de 100644 --- a/LiteLoader/include/llapi/mc/asio.hpp +++ b/LiteLoader/include/llapi/mc/asio.hpp @@ -20,15 +20,15 @@ namespace asio { #undef AFTER_EXTRA /** - * @symbol ?asio_handler_allocate\@asio\@\@YAPEAX_KZZ + * @symbol ?asio_handler_allocate\@asio\@\@YAPEAX_KZZ */ MCAPI void * asio_handler_allocate(unsigned __int64, ...); /** - * @symbol ?asio_handler_deallocate\@asio\@\@YAXPEAX_KZZ + * @symbol ?asio_handler_deallocate\@asio\@\@YAXPEAX_KZZ */ MCAPI void asio_handler_deallocate(void *, unsigned __int64, ...); /** - * @symbol ??Hasio\@\@YA?AV?$buffers_iterator\@Vconst_buffers_1\@asio\@\@D\@0\@AEBV10\@_J\@Z + * @symbol ??Hasio\@\@YA?AV?$buffers_iterator\@Vconst_buffers_1\@asio\@\@D\@0\@AEBV10\@_J\@Z */ MCAPI class asio::buffers_iterator operator+(class asio::buffers_iterator const &, __int64); diff --git a/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp b/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp index 5d991ce068..20e7336185 100644 --- a/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp +++ b/LiteLoader/include/llapi/mc/hc_websocket_impl.hpp @@ -27,5 +27,11 @@ struct hc_websocket_impl { #endif public: +#ifdef ENABLE_VIRTUAL_FAKESYMBOL_HC_WEBSOCKET_IMPL + /** + * @symbol __unk_destructor_-1 + */ + MCVAPI ~hc_websocket_impl(); +#endif }; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/http_header_compare.hpp b/LiteLoader/include/llapi/mc/http_header_compare.hpp index b7b2ecd804..991b752743 100644 --- a/LiteLoader/include/llapi/mc/http_header_compare.hpp +++ b/LiteLoader/include/llapi/mc/http_header_compare.hpp @@ -10,26 +10,23 @@ #undef BEFORE_EXTRA -/** - * @brief MC structure http_header_compare. - * - */ -struct http_header_compare { + +class http_header_compare { #define AFTER_EXTRA #undef AFTER_EXTRA #ifndef DISABLE_CONSTRUCTOR_PREVENTION_HTTP_HEADER_COMPARE public: - struct http_header_compare& operator=(struct http_header_compare const &) = delete; - http_header_compare(struct http_header_compare const &) = delete; + class http_header_compare& operator=(class http_header_compare const &) = delete; + http_header_compare(class http_header_compare const &) = delete; http_header_compare() = delete; #endif public: /** - * @symbol ??Rhttp_header_compare\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@0\@Z + * @symbol ??Rhttp_header_compare\@\@QEBA_NAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$http_stl_allocator\@D\@\@\@std\@\@0\@Z */ MCAPI bool operator()(class std::basic_string, class http_stl_allocator> const &, class std::basic_string, class http_stl_allocator> const &) const; -}; \ No newline at end of file +}; diff --git a/LiteLoader/include/llapi/mc/inc/enums.inc b/LiteLoader/include/llapi/mc/inc/enums.inc index 5f7d57f17b..af9a8e0aba 100644 --- a/LiteLoader/include/llapi/mc/inc/enums.inc +++ b/LiteLoader/include/llapi/mc/inc/enums.inc @@ -216,45 +216,46 @@ enum class ContainerEnumName : int8_t { RecipeSearchContainer = 18, RecipeSearchBarContainer = 19, RecipeEquipmentContainer = 20, - EnchantingInputContainer = 21, - EnchantingMaterialContainer = 22, - FurnaceFuelContainer = 23, - FurnaceIngredientContainer = 24, - FurnaceResultContainer = 25, - HorseEquipContainer = 26, - HotbarContainer = 27, - InventoryContainer = 28, - ShulkerBoxContainer = 29, - TradeIngredient1Container = 30, - TradeIngredient2Container = 31, - TradeResultPreviewContainer = 32, - OffhandContainer = 33, - CompoundCreatorInput = 34, - CompoundCreatorOutputPreview = 35, - ElementConstructorOutputPreview = 36, - MaterialReducerInput = 37, - MaterialReducerOutput = 38, - LabTableInput = 39, - LoomInputContainer = 40, - LoomDyeContainer = 41, - LoomMaterialContainer = 42, - LoomResultPreviewContainer = 43, - BlastFurnaceIngredientContainer = 44, - SmokerIngredientContainer = 45, - Trade2Ingredient1Container = 46, - Trade2Ingredient2Container = 47, - Trade2ResultPreviewContainer = 48, - GrindstoneInputContainer = 49, - GrindstoneAdditionalContainer = 50, - GrindstoneResultPreviewContainer = 51, - StonecutterInputContainer = 52, - StonecutterResultPreviewContainer = 53, - CartographyInputContainer = 54, - CartographyAdditionalContainer = 55, - CartographyResultPreviewContainer = 56, - BarrelContainer = 57, - CursorContainer = 58, - CreatedOutputContainer = 59 + //UnkownRecipeBook = 21, + EnchantingInputContainer = 22, + EnchantingMaterialContainer = 23, + FurnaceFuelContainer = 24, + FurnaceIngredientContainer = 25, + FurnaceResultContainer = 26, + HorseEquipContainer = 27, + HotbarContainer = 28, + InventoryContainer = 29, + ShulkerBoxContainer = 30, + TradeIngredient1Container = 31, + TradeIngredient2Container = 32, + TradeResultPreviewContainer = 33, + OffhandContainer = 34, + CompoundCreatorInput = 35, + CompoundCreatorOutputPreview = 36, + ElementConstructorOutputPreview = 37, + MaterialReducerInput = 38, + MaterialReducerOutput = 39, + LabTableInput = 40, + LoomInputContainer = 41, + LoomDyeContainer = 42, + LoomMaterialContainer = 43, + LoomResultPreviewContainer = 44, + BlastFurnaceIngredientContainer = 45, + SmokerIngredientContainer = 46, + Trade2Ingredient1Container = 47, + Trade2Ingredient2Container = 48, + Trade2ResultPreviewContainer = 49, + GrindstoneInputContainer = 50, + GrindstoneAdditionalContainer = 51, + GrindstoneResultPreviewContainer = 52, + StonecutterInputContainer = 53, + StonecutterResultPreviewContainer = 54, + CartographyInputContainer = 55, + CartographyAdditionalContainer = 56, + CartographyResultPreviewContainer = 57, + BarrelContainer = 58, + CursorContainer = 59, + CreatedOutputContainer = 60 }; enum class ParticleType { @@ -604,7 +605,12 @@ enum class MinecraftPacketIds : int { ServerStats = 0xC0, RequestNetworkSettings = 0xC1, GameTestRequest = 0XC2, - GameTestResults = 0xC3 + GameTestResults = 0xC3, + UpdateClientInputLocks = 0xC4, + ClientCheatAbility = 0xC5, + CameraPresets = 0xC6, + UnlockedRecipes = 0xC7, + CameraInstruction = 0x12C // 300 }; enum class ItemStackNetResult : unsigned char { diff --git a/LiteLoader/include/llapi/mc/mce.hpp b/LiteLoader/include/llapi/mc/mce.hpp new file mode 100644 index 0000000000..8c84447ba9 --- /dev/null +++ b/LiteLoader/include/llapi/mc/mce.hpp @@ -0,0 +1,270 @@ +#pragma once + +#include "llapi/Global.h" +#include "../utils/RNG.h" +#include "VectorBase.hpp" + +namespace mce { + + class UUID { + uint64_t a, b; + + public: + UUID() : a(RNG::rand()), b(RNG::rand()) {} + UUID(uint64_t a, uint64_t b) : a(a), b(b) {} + MCAPI std::string asString() const; + MCAPI static UUID fromString(std::string const&); + MCAPI bool isEmpty() const; + MCAPI static UUID seedFromString(std::string const&); + MCAPI static class mce::UUID EMPTY; + + inline operator bool() const { return !isEmpty(); } + }; + + enum class ColorPalette { + BLACK, + INDIGO, + LAVENDER, + TEAL, + COCOA, + DARK, + OATMEAL, + WHITE, + RED, + APRICOT, + YELLOW, + GREEN, + VATBLUE, + SLATE, + PINK, + FAWN, + }; + + class Color { + public: + float r; + float g; + float b; + float a; + Color() : r(0.0f), g(0.0f), b(0.0f), a(0.0f){}; + Color(float r, float g, float b, float a = 1) : r(r), g(g), b(b), a(a){}; + Color(double r, double g, double b, double a = 1) : r((float)r), g((float)g), b((float)b), a((float)a){}; + Color(int ir, int ig, int ib, int ia = 255) : r(ir / 255.0f), g(ig / 255.0f), b(ib / 255.0f), a(ia / 255.0f){}; + + LL_CONSTEXPR int static hexToNum(char s) { + if ('A' <= s && s <= 'F') { + return 10 + (s - 'A'); + } + if ('a' <= s && s <= 'f') { + return 10 + (s - 'a'); + } + if ('0' <= s && s <= '9') { + return (s - '0'); + } + return 0; + } + + LL_CONSTEXPR double static hexToNum(std::string_view s) { + if (s.length() == 2) { + return (16 * hexToNum(s[0]) + hexToNum(s[1])) / 255.0; + } + return 0; + } + + LL_CONSTEXPR Color(std::string_view hex) { + r = 0, g = 0, b = 0, a = 1; + if (hex[0] == '#') { + hex = hex.substr(1); + } + if (hex.length() == 3) { + r = (float)((hexToNum(hex[0]) * 17) / 255.0); + g = (float)((hexToNum(hex[1]) * 17) / 255.0); + b = (float)((hexToNum(hex[2]) * 17) / 255.0); + return; + } + if (hex.length() == 4) { + a = (float)((hexToNum(hex[0]) * 17) / 255.0); + r = (float)((hexToNum(hex[1]) * 17) / 255.0); + g = (float)((hexToNum(hex[2]) * 17) / 255.0); + b = (float)((hexToNum(hex[3]) * 17) / 255.0); + return; + } + if (hex.length() == 6) { + r = (float)hexToNum(hex.substr(0, 2)); + g = (float)hexToNum(hex.substr(2, 2)); + b = (float)hexToNum(hex.substr(4, 2)); + return; + } + if (hex.length() == 8) { + a = (float)hexToNum(hex.substr(0, 2)); + r = (float)hexToNum(hex.substr(2, 2)); + g = (float)hexToNum(hex.substr(4, 2)); + b = (float)hexToNum(hex.substr(6, 2)); + return; + } + return; + }; + + inline operator bool() const { return !(*this == NIL); } + + LIAPI double distanceTo(mce::Color const& dst) const; + LIAPI std::string toConsoleCode(bool foreground = true) const; + LIAPI std::string toNearestColorCode() const; + LIAPI char toNearestParticleColorCode() const; + LIAPI ColorPalette toNearestParticleColorType() const; + LIAPI static class mce::Color fromConsoleCode(std::string const&); + LIAPI static class mce::Color fromColorCode(std::string const&); + LIAPI class mce::Color sRGBToLinear() const; + LIAPI class mce::Color LinearTosRGB() const; + LIAPI class mce::Color LinearToXYZ() const; + LIAPI class mce::Color XYZToLinear() const; + LIAPI class mce::Color XYZToLab() const; + LIAPI class mce::Color LabToXYZ() const; + LIAPI double deltaE76(mce::Color const& dst) const; // 2.3 for JND + LIAPI double deltaE94(mce::Color const& dst) const; // 1.0 for JND + LIAPI double deltaE00(mce::Color const& dst) const; // 1.0 for JND + + MCAPI static mce::Color const NIL; + MCAPI static class mce::Color fromHexString(std::string const&); + MCAPI bool operator==(class mce::Color const&) const; + MCAPI int toABGR(void) const; + MCAPI int toARGB(void) const; + MCAPI std::string toHexString(void) const; + + inline bool operator!=(const Color& c) const { return !(c == *this); } + + inline Color operator*(float c) const { return {r * c, g * c, b * c, a * c}; } + + inline Color operator/(float c) const { return {r / c, g / c, b / c, a / c}; } + + inline Color operator+(float c) const { return {r + c, g + c, b + c, a + c}; } + + inline Color operator-(float c) const { return {r - c, g - c, b - c, a - c}; } + + constexpr Color& operator+=(float c) { + r += c; + g += c; + b += c; + a += c; + return *this; + } + + constexpr Color& operator-=(float c) { + r -= c; + g -= c; + b -= c; + a -= c; + return *this; + } + + constexpr Color& operator*=(float c) { + r *= c; + g *= c; + b *= c; + a *= c; + return *this; + } + + constexpr Color& operator/=(float c) { + r /= c; + g /= c; + b /= c; + a /= c; + return *this; + } + + constexpr Color& operator+=(Color const& c) { + r += c.r; + g += c.g; + b += c.b; + a += c.a; + return *this; + } + + constexpr Color& operator-=(Color const& c) { + r -= c.r; + g -= c.g; + b -= c.b; + a -= c.a; + return *this; + } + + constexpr Color& operator*=(Color const& c) { + r *= c.r; + g *= c.g; + b *= c.b; + a *= c.a; + return *this; + } + + constexpr Color& operator/=(Color const& c) { + r /= c.r; + g /= c.g; + b /= c.b; + a /= c.a; + return *this; + } + + inline Color operator+(Color const& c) const { return {r + c.r, g + c.g, b + c.b, a + c.a}; } + + inline Color operator*(Color const& c) const { return {r * c.r, g * c.g, b * c.b, a * c.a}; } + + inline Color operator/(Color const& c) const { return {r / c.r, g / c.g, b / c.b, a / c.a}; } + + inline Color operator-(Color const& c) const { return {r - c.r, g - c.g, b - c.b, a - c.a}; } + + inline static Color max(const Color& k, const Color& l) { + return {std::max(k.r, l.r), std::max(k.g, l.g), std::max(k.b, l.b), std::max(k.a, l.a)}; + } + + inline static Color min(const Color& k, const Color& l) { + return {std::min(k.r, l.r), std::min(k.g, l.g), std::min(k.b, l.b), std::min(k.a, l.a)}; + } + + inline static Color lerp(const Color& k, const Color& l, float m) { + return k * (1.0f - m) + l * m; + } + + inline static Color mix(const Color& k, const Color& l, float m) { + return lerp(k, l, m); + } + }; + + static std::unordered_map> const particleColors = { + // clang-format off + {mce::ColorPalette::BLACK, {'B', Color("#000000")}}, + {mce::ColorPalette::INDIGO, {'I', Color("#144A74")}}, + {mce::ColorPalette::LAVENDER, {'L', Color("#8E65F3")}}, + {mce::ColorPalette::TEAL, {'T', Color("#07946E")}}, + {mce::ColorPalette::COCOA, {'C', Color("#AB5236")}}, + {mce::ColorPalette::DARK, {'D', Color("#56575F")}}, + {mce::ColorPalette::OATMEAL, {'O', Color("#A2A3A7")}}, + {mce::ColorPalette::WHITE, {'W', Color("#FFFFFF")}}, + {mce::ColorPalette::RED, {'R', Color("#FF3040")}}, + {mce::ColorPalette::APRICOT, {'A', Color("#FF7300")}}, + {mce::ColorPalette::YELLOW, {'Y', Color("#FFEC27")}}, + {mce::ColorPalette::GREEN, {'G', Color("#10E436")}}, + {mce::ColorPalette::VATBLUE, {'V', Color("#29ADFF")}}, + {mce::ColorPalette::SLATE, {'S', Color("#83769C")}}, + {mce::ColorPalette::PINK, {'P', Color("#FF77A8")}}, + {mce::ColorPalette::FAWN, {'E', Color("#FFCCAA")}}, + // clang-format on + }; + + inline static const char getParticleColorType(ColorPalette const& p) { + return particleColors.at(p).first; + } + +}; // namespace mce + +namespace std { + + template <> + struct hash { + std::size_t operator()(mce::Color const& c) const noexcept { + return (std::hash()(c.r) ^ std::hash()(c.g) ^ std::hash()(c.b) ^ + std::hash()(c.a)); + } + }; + +} // namespace std \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/persona.hpp b/LiteLoader/include/llapi/mc/persona.hpp index b31d7f84e8..9f9964daad 100644 --- a/LiteLoader/include/llapi/mc/persona.hpp +++ b/LiteLoader/include/llapi/mc/persona.hpp @@ -24,79 +24,79 @@ enum class PieceType; #undef AFTER_EXTRA /** - * @symbol ?ANIMATED_128X128_NAME\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_128X128_NAME\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_128X128_NAME; /** - * @symbol ?ANIMATED_128X128_TEXTURE_CONTROLLER_FIRST_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_128X128_TEXTURE_CONTROLLER_FIRST_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_128X128_TEXTURE_CONTROLLER_FIRST_PERSON; /** - * @symbol ?ANIMATED_128X128_TEXTURE_CONTROLLER_THIRD_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_128X128_TEXTURE_CONTROLLER_THIRD_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_128X128_TEXTURE_CONTROLLER_THIRD_PERSON; /** - * @symbol ?ANIMATED_128X128_TEXTURE_FRAMES_VARIABLE\@persona\@\@3VHashedString\@\@B + * @symbol ?ANIMATED_128X128_TEXTURE_FRAMES_VARIABLE\@persona\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ANIMATED_128X128_TEXTURE_FRAMES_VARIABLE; /** - * @symbol ?ANIMATED_32X32_NAME\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_32X32_NAME\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_32X32_NAME; /** - * @symbol ?ANIMATED_32X32_TEXTURE_CONTROLLER_FIRST_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_32X32_TEXTURE_CONTROLLER_FIRST_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_32X32_TEXTURE_CONTROLLER_FIRST_PERSON; /** - * @symbol ?ANIMATED_32X32_TEXTURE_CONTROLLER_THIRD_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_32X32_TEXTURE_CONTROLLER_THIRD_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_32X32_TEXTURE_CONTROLLER_THIRD_PERSON; /** - * @symbol ?ANIMATED_32X32_TEXTURE_FRAMES_VARIABLE\@persona\@\@3VHashedString\@\@B + * @symbol ?ANIMATED_32X32_TEXTURE_FRAMES_VARIABLE\@persona\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ANIMATED_32X32_TEXTURE_FRAMES_VARIABLE; /** - * @symbol ?ANIMATED_FACE_CONTROLLER_FIRST_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_FACE_CONTROLLER_FIRST_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_FACE_CONTROLLER_FIRST_PERSON; /** - * @symbol ?ANIMATED_FACE_CONTROLLER_THIRD_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_FACE_CONTROLLER_THIRD_PERSON\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_FACE_CONTROLLER_THIRD_PERSON; /** - * @symbol ?ANIMATED_FACE_NAME\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?ANIMATED_FACE_NAME\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const ANIMATED_FACE_NAME; /** - * @symbol ?ANIMATED_FACE_TEXTURE_FRAMES_VARIABLE\@persona\@\@3VHashedString\@\@B + * @symbol ?ANIMATED_FACE_TEXTURE_FRAMES_VARIABLE\@persona\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const ANIMATED_FACE_TEXTURE_FRAMES_VARIABLE; /** - * @symbol ?INVALID_INDEX\@persona\@\@3HB + * @symbol ?INVALID_INDEX\@persona\@\@3HB */ MCAPI extern int const INVALID_INDEX; /** - * @symbol ?NONE_PIECE_ID\@persona\@\@3VUUID\@mce\@\@B + * @symbol ?NONE_PIECE_ID\@persona\@\@3VUUID\@mce\@\@B */ MCAPI extern class mce::UUID const NONE_PIECE_ID; /** - * @symbol ?NONE_PIECE_PATH\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B + * @symbol ?NONE_PIECE_PATH\@persona\@\@3V?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@B */ MCAPI extern std::string const NONE_PIECE_PATH; /** - * @symbol ?NO_PIECE_SELECTED\@persona\@\@3VUUID\@mce\@\@B + * @symbol ?NO_PIECE_SELECTED\@persona\@\@3VUUID\@mce\@\@B */ MCAPI extern class mce::UUID const NO_PIECE_SELECTED; /** - * @symbol ?USE_BLINKING_ANIMATION_VARIABLE\@persona\@\@3VHashedString\@\@B + * @symbol ?USE_BLINKING_ANIMATION_VARIABLE\@persona\@\@3VHashedString\@\@B */ MCAPI extern class HashedString const USE_BLINKING_ANIMATION_VARIABLE; /** - * @symbol ?pieceTypeFromString\@persona\@\@YA?AW4PieceType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?pieceTypeFromString\@persona\@\@YA?AW4PieceType\@1\@AEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI enum class persona::PieceType pieceTypeFromString(std::string const &); /** - * @symbol ?stringFromPieceType\@persona\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PieceType\@1\@_N\@Z + * @symbol ?stringFromPieceType\@persona\@\@YAAEBV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@W4PieceType\@1\@_N\@Z */ MCAPI std::string const & stringFromPieceType(enum class persona::PieceType, bool); diff --git a/LiteLoader/include/llapi/mc/personaDefault.hpp b/LiteLoader/include/llapi/mc/personaDefault.hpp index 6d818598f3..d9770a065f 100644 --- a/LiteLoader/include/llapi/mc/personaDefault.hpp +++ b/LiteLoader/include/llapi/mc/personaDefault.hpp @@ -20,11 +20,11 @@ namespace personaDefault { #undef AFTER_EXTRA /** - * @symbol ?ALLOW_ITEM_LIST\@personaDefault\@\@3V?$set\@VUUID\@mce\@\@U?$less\@VUUID\@mce\@\@\@std\@\@V?$allocator\@VUUID\@mce\@\@\@4\@\@std\@\@B + * @symbol ?ALLOW_ITEM_LIST\@personaDefault\@\@3V?$set\@VUUID\@mce\@\@U?$less\@VUUID\@mce\@\@\@std\@\@V?$allocator\@VUUID\@mce\@\@\@4\@\@std\@\@B */ MCAPI extern class std::set, class std::allocator> const ALLOW_ITEM_LIST; /** - * @symbol ?EMOTE_LIST\@personaDefault\@\@3V?$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\@\@B + * @symbol ?EMOTE_LIST\@personaDefault\@\@3V?$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\@\@B */ MCAPI extern std::vector const EMOTE_LIST; diff --git a/LiteLoader/include/llapi/mc/reflection.hpp b/LiteLoader/include/llapi/mc/reflection.hpp deleted file mode 100644 index ca3cf9a09a..0000000000 --- a/LiteLoader/include/llapi/mc/reflection.hpp +++ /dev/null @@ -1,32 +0,0 @@ -/** - * @file reflection.hpp - * @note This Header is auto generated by LiteLoaderBDS Toolchain. - * - */ -#pragma once -#define AUTO_GENERATED -#include "../Global.h" - -#define BEFORE_EXTRA - -#undef BEFORE_EXTRA - -/** - * @brief MC namespace reflection. - * - */ -namespace reflection { - -#define AFTER_EXTRA - class details { - class BasicCompositeSchema; - }; - struct Schema; -#undef AFTER_EXTRA - /** - * @symbol ?schemaMap@reflection@@YAAEAV?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicCompositeSchema@details@reflection@@U?$default_delete@VBasicCompositeSchema@details@reflection@@@std@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicCompositeSchema@details@reflection@@U?$default_delete@VBasicCompositeSchema@details@reflection@@@std@@@2@@std@@@2@@entt@@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$dense_map@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicCompositeSchema@details@reflection@@U?$default_delete@VBasicCompositeSchema@details@reflection@@@std@@@2@U?$hash@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@U?$equal_to@V?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@2@V?$allocator@U?$pair@$$CBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@V?$unique_ptr@VBasicCompositeSchema@details@reflection@@U?$default_delete@VBasicCompositeSchema@details@reflection@@@std@@@2@@std@@@2@@entt@@@std@@@2@@entt@@XZ - * @hash 185646711 - */ - MCAPI class entt::dense_map, struct std::hash, struct std::equal_to, class std::allocator>>>, struct std::hash, struct std::equal_to, class std::allocator, struct std::hash, struct std::equal_to, class std::allocator>>>>>> & schemaMap(); - -}; \ No newline at end of file diff --git a/LiteLoader/include/llapi/mc/snappy.hpp b/LiteLoader/include/llapi/mc/snappy.hpp index 30316632b5..30a89c7a19 100644 --- a/LiteLoader/include/llapi/mc/snappy.hpp +++ b/LiteLoader/include/llapi/mc/snappy.hpp @@ -20,15 +20,15 @@ namespace snappy { #undef AFTER_EXTRA /** - * @symbol ?Compress\@snappy\@\@YA_KPEAVSource\@1\@PEAVSink\@1\@\@Z + * @symbol ?Compress\@snappy\@\@YA_KPEAVSource\@1\@PEAVSink\@1\@\@Z */ MCAPI unsigned __int64 Compress(class snappy::Source *, class snappy::Sink *); /** - * @symbol ?Compress\@snappy\@\@YA_KPEBD_KPEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?Compress\@snappy\@\@YA_KPEBD_KPEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI unsigned __int64 Compress(char const *, unsigned __int64, std::string *); /** - * @symbol ?Uncompress\@snappy\@\@YA_NPEBD_KPEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z + * @symbol ?Uncompress\@snappy\@\@YA_NPEBD_KPEAV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@\@Z */ MCAPI bool Uncompress(char const *, unsigned __int64, std::string *); diff --git a/LiteLoader/include/llapi/mc/utility.hpp b/LiteLoader/include/llapi/mc/utility.hpp index 1f395927e0..ea3c3f66ef 100644 --- a/LiteLoader/include/llapi/mc/utility.hpp +++ b/LiteLoader/include/llapi/mc/utility.hpp @@ -20,7 +20,7 @@ namespace utility { #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 + * @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 &); diff --git a/LiteLoader/include/llapi/mc/websocket_outgoing_message.hpp b/LiteLoader/include/llapi/mc/websocket_outgoing_message.hpp index 899f9d866d..b8fc171336 100644 --- a/LiteLoader/include/llapi/mc/websocket_outgoing_message.hpp +++ b/LiteLoader/include/llapi/mc/websocket_outgoing_message.hpp @@ -28,7 +28,7 @@ struct websocket_outgoing_message { public: /** - * @symbol ??1websocket_outgoing_message\@\@QEAA\@XZ + * @symbol ??1websocket_outgoing_message\@\@QEAA\@XZ */ MCAPI ~websocket_outgoing_message(); diff --git a/LiteLoader/include/llapi/mc/websocketpp.hpp b/LiteLoader/include/llapi/mc/websocketpp.hpp index 4a95d25948..15feac2e62 100644 --- a/LiteLoader/include/llapi/mc/websocketpp.hpp +++ b/LiteLoader/include/llapi/mc/websocketpp.hpp @@ -20,7 +20,7 @@ namespace websocketpp { #undef AFTER_EXTRA /** - * @symbol ?base64_encode\@websocketpp\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K\@Z + * @symbol ?base64_encode\@websocketpp\@\@YA?AV?$basic_string\@DU?$char_traits\@D\@std\@\@V?$allocator\@D\@2\@\@std\@\@PEBE_K\@Z */ MCAPI std::string base64_encode(unsigned char const *, unsigned __int64); diff --git a/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp b/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp index 29353e3315..e432c66861 100644 --- a/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp +++ b/LiteLoader/include/llapi/mc/winhttp_websocket_impl.hpp @@ -28,29 +28,29 @@ struct winhttp_websocket_impl { public: /** - * @symbol ?connect_websocket\@winhttp_websocket_impl\@\@QEAAJPEAUHC_WEBSOCKET\@\@PEAUXAsyncBlock\@\@V?$shared_ptr\@UWinHttpState\@httpclient\@xbox\@\@\@std\@\@\@Z + * @symbol ?connect_websocket\@winhttp_websocket_impl\@\@QEAAJPEAUHC_WEBSOCKET\@\@PEAUXAsyncBlock\@\@V?$shared_ptr\@UWinHttpState\@httpclient\@xbox\@\@\@std\@\@\@Z */ MCAPI long connect_websocket(struct HC_WEBSOCKET *, struct XAsyncBlock *, class std::shared_ptr); /** - * @symbol ?send_websocket_binary_message_async\@winhttp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBEI\@Z + * @symbol ?send_websocket_binary_message_async\@winhttp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBEI\@Z */ MCAPI long send_websocket_binary_message_async(struct XAsyncBlock *, unsigned char const *, unsigned int); /** - * @symbol ?send_websocket_message_async\@winhttp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBD\@Z + * @symbol ?send_websocket_message_async\@winhttp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBD\@Z */ MCAPI long send_websocket_message_async(struct XAsyncBlock *, char const *); //private: /** - * @symbol ?enqueue_message\@winhttp_websocket_impl\@\@AEAAJV?$shared_ptr\@Usend_msg_context\@winhttp_websocket_impl\@\@\@std\@\@\@Z + * @symbol ?enqueue_message\@winhttp_websocket_impl\@\@AEAAJV?$shared_ptr\@Usend_msg_context\@winhttp_websocket_impl\@\@\@std\@\@\@Z */ MCAPI long enqueue_message(class std::shared_ptr); /** - * @symbol ?send_complete\@winhttp_websocket_impl\@\@AEAAXJ\@Z + * @symbol ?send_complete\@winhttp_websocket_impl\@\@AEAAXJ\@Z */ MCAPI void send_complete(long); /** - * @symbol ?send_message\@winhttp_websocket_impl\@\@AEAAXV?$shared_ptr\@Usend_msg_context\@winhttp_websocket_impl\@\@\@std\@\@\@Z + * @symbol ?send_message\@winhttp_websocket_impl\@\@AEAAXV?$shared_ptr\@Usend_msg_context\@winhttp_websocket_impl\@\@\@std\@\@\@Z */ MCAPI void send_message(class std::shared_ptr); diff --git a/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp b/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp index bb3e221a6c..2c22be0e61 100644 --- a/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp +++ b/LiteLoader/include/llapi/mc/wspp_websocket_impl.hpp @@ -28,37 +28,37 @@ struct wspp_websocket_impl { public: /** - * @symbol ?close\@wspp_websocket_impl\@\@QEAAJW4HCWebSocketCloseStatus\@\@\@Z + * @symbol ?close\@wspp_websocket_impl\@\@QEAAJW4HCWebSocketCloseStatus\@\@\@Z */ MCAPI long close(enum class HCWebSocketCloseStatus); /** - * @symbol ?connect\@wspp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@\@Z + * @symbol ?connect\@wspp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@\@Z */ MCAPI long connect(struct XAsyncBlock *); /** - * @symbol ?send\@wspp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBD\@Z + * @symbol ?send\@wspp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBD\@Z */ MCAPI long send(struct XAsyncBlock *, char const *); /** - * @symbol ?sendBinary\@wspp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBEI\@Z + * @symbol ?sendBinary\@wspp_websocket_impl\@\@QEAAJPEAUXAsyncBlock\@\@PEBEI\@Z */ MCAPI long sendBinary(struct XAsyncBlock *, unsigned char const *, unsigned int); /** - * @symbol ??0wspp_websocket_impl\@\@QEAA\@PEAUHC_WEBSOCKET\@\@PEBD1\@Z + * @symbol ??0wspp_websocket_impl\@\@QEAA\@PEAUHC_WEBSOCKET\@\@PEBD1\@Z */ MCAPI wspp_websocket_impl(struct HC_WEBSOCKET *, char const *, char const *); //private: /** - * @symbol ?send_msg\@wspp_websocket_impl\@\@AEAAJXZ + * @symbol ?send_msg\@wspp_websocket_impl\@\@AEAAJXZ */ MCAPI long send_msg(); /** - * @symbol ?send_msg_do_work\@wspp_websocket_impl\@\@AEAAJAEAUwebsocket_outgoing_message\@\@\@Z + * @symbol ?send_msg_do_work\@wspp_websocket_impl\@\@AEAAJAEAUwebsocket_outgoing_message\@\@\@Z */ MCAPI long send_msg_do_work(struct websocket_outgoing_message &); /** - * @symbol ?send_ping\@wspp_websocket_impl\@\@AEAAXXZ + * @symbol ?send_ping\@wspp_websocket_impl\@\@AEAAXXZ */ MCAPI void send_ping(); diff --git a/LiteLoader/include/llapi/utils/StringHelper.h b/LiteLoader/include/llapi/utils/StringHelper.h index 45158f922c..38a2c01610 100644 --- a/LiteLoader/include/llapi/utils/StringHelper.h +++ b/LiteLoader/include/llapi/utils/StringHelper.h @@ -65,3 +65,7 @@ std::string IntToHexStr(const T& value, bool upper = true, bool no0x = true, } return result; } + +inline std::string asString(std::string_view v) { + return {v.data(), v.size()}; +} \ No newline at end of file diff --git a/LiteLoader/include/llapi/utils/WinHelper.h b/LiteLoader/include/llapi/utils/WinHelper.h index 284d7daf1d..991f58fd76 100644 --- a/LiteLoader/include/llapi/utils/WinHelper.h +++ b/LiteLoader/include/llapi/utils/WinHelper.h @@ -37,3 +37,5 @@ LIAPI std::string GetModuleName(HMODULE handle); LIAPI std::string GetSystemLocaleName(); LIAPI bool IsWineEnvironment(); + +LIAPI void SetCurrentThreadDescription(PCWSTR desc); diff --git a/LiteLoader/src/liteloader/BStats.cpp b/LiteLoader/src/liteloader/BStats.cpp index 86dad78700..a8e5dd4a63 100644 --- a/LiteLoader/src/liteloader/BStats.cpp +++ b/LiteLoader/src/liteloader/BStats.cpp @@ -262,6 +262,7 @@ void submitTask() { } std::thread a([] { + SetCurrentThreadDescription(L"LL_BStat_Report_Thread"); auto json = createJson(); httplib::Headers headers = { {"Accept-Encoding", "gzip"}, diff --git a/LiteLoader/src/liteloader/BuiltinBugFix.cpp b/LiteLoader/src/liteloader/BuiltinBugFix.cpp index b542388cde..31b689fbfb 100644 --- a/LiteLoader/src/liteloader/BuiltinBugFix.cpp +++ b/LiteLoader/src/liteloader/BuiltinBugFix.cpp @@ -22,7 +22,6 @@ #include "llapi/mc/LevelChunk.hpp" #include "llapi/mc/ChunkSource.hpp" -#include "llapi/mc/NetworkHandler.hpp" #include "llapi/mc/NetworkPeer.hpp" #include "llapi/mc/ReadOnlyBinaryStream.hpp" @@ -156,7 +155,8 @@ inline bool Interval(int a1) { return false; } -template inline bool validPosition(T const& pos) { +template +inline bool validPosition(T const& pos) { if (isnan(static_cast(pos.x)) || isnan(static_cast(pos.z))) return false; return Interval(static_cast(pos.x)) && Interval(static_cast(pos.y)) && Interval(static_cast(pos.z)); @@ -182,11 +182,10 @@ TInstanceHook(void, "?moveSpawnView@Player@@QEAAXAEBVVec3@@V?$AutomaticID@VDimen fixPlayerPosition(this, false); } - -TClasslessInstanceHook( - __int64, - "?move@ChunkViewSource@@QEAAXAEBVBlockPos@@H_NW4ChunkSourceViewGenerateMode@@V?$function@$$A6AXV?$buffer_span_mut@V?$shared_ptr@VLevelChunk@@@std@@@@V?$buffer_span@I@@@Z@std@@@Z", - BlockPos a2, int a3, unsigned __int8 a4, int a5, __int64 a6) { +TClasslessInstanceHook(__int64, + "?move@ChunkViewSource@@QEAAXAEBVBlockPos@@H_NW4ChunkSourceViewGenerateMode@@V?$function@$$" + "A6AXV?$buffer_span_mut@V?$shared_ptr@VLevelChunk@@@std@@@@V?$buffer_span@I@@@Z@std@@@Z", + BlockPos a2, int a3, unsigned __int8 a4, int a5, __int64 a6) { if (validPosition(a2)) return original(this, a2, a3, a4, a5, a6); fixPlayerPosition(movingViewPlayer); @@ -200,56 +199,6 @@ TInstanceHook(void, "?move@Player@@UEAAXAEBVVec3@@@Z", Player, Vec3 pos) { this->kick("error move"); } -static inline bool checkPktId(unsigned int id) { - id &= 0x3ff; - return id==0 || id == 0x01 || id == 0x5e || id == 0xc1; -} - -static inline bool& connState(void* conn) { - return *((bool*)conn + 362); -} - - - -TInstanceHook(NetworkPeer::DataStatus, - "?receivePacket@NetworkConnection@@QEAA?AW4DataStatus@NetworkPeer@@AEAV?$basic_string@DU?$char_traits@D@std@@V?$" - "allocator@D@2@@std@@AEAVNetworkHandler@@AEBV?$shared_ptr@V?$time_point@Usteady_clock@chrono@std@@V?$duration@_" - "JU?$ratio@$00$0DLJKMKAA@@std@@@23@@chrono@std@@@5@@Z", - NetworkConnection, string* data, __int64 a3, __int64** a4) { - auto status = original(this, data, a3, a4); - if (status == NetworkPeer::DataStatus::HasData) { - auto stream = ReadOnlyBinaryStream(*data, false); - auto packetId = stream.getUnsignedVarInt(); - if (packetId == 0) { - data->clear(); - return NetworkPeer::DataStatus::NoData; - } - if (!data->empty()) { - if (checkPktId(packetId)) { - connState(this) = true; - } else { - if (!connState(this)) { - data->clear(); - return NetworkPeer::DataStatus::NoData; - } - } - } - } - return status; -} - -THook(void*, - "??0NetworkConnection@@QEAA@AEBVNetworkIdentifier@@V?$shared_ptr@VNetworkPeer@@@std@@V?$time_point@Usteady_clock@" - "chrono@std@@V?$duration@_JU?$ratio@$00$0DLJKMKAA@@std@@@23@@chrono@3@_NV?$NonOwnerPointer@VIPacketObserver@@@" - "Bedrock@@AEAVScheduler@@@Z", - void* thi, void* a1, void* a2, void* a3, void* a4, void* a5, void* a6, void* a7) { - auto res = original(thi, a1, a2, a3, a4, a5, a6,a7); - connState(thi) = false; - return res; -} - - - // Fix wine stop TClasslessInstanceHook(void, "?leaveGameSync@ServerInstance@@QEAAXXZ") { original(this); @@ -328,8 +277,7 @@ THook(std::wistream&, TInstanceHook(LevelData*, "??0LevelData@@QEAA@AEBVLevelSettings@@AEBV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@" "W4GeneratorType@@AEBVBlockPos@@_NW4EducationEditionOffer@@MM@Z", - LevelData, void* a2, __int64 a3, unsigned int a4, BlockPos* a5, char a6, int a7, int a8, - int a9) { + LevelData, void* a2, __int64 a3, unsigned int a4, BlockPos* a5, char a6, int a7, int a8, int a9) { if (ll::globalConfig.enableFixBroadcastBug) { auto data = original(this, a2, a3, a4, a5, a6, a7, a8, a9); data->setLANBroadcast(true); @@ -403,6 +351,7 @@ TInstanceHook(BlockSource*, "?getDimensionBlockSourceConst@Actor@@QEBAAEBVBlockS enum class AbilitiesLayer; enum class SubClientId; + TInstanceHook(void, "?handle@ServerNetworkHandler@@UEAAXAEBVNetworkIdentifier@@AEBVRequestAbilityPacket@@@Z", ServerNetworkHandler, class NetworkIdentifier const& nid, class RequestAbilityPacket const& pkt) { original(this, nid, pkt); @@ -449,16 +398,16 @@ TInstanceHook(void, "?tickWorld@Player@@UEAAXAEBUTick@@@Z", Player, struct Tick // _updateChunkPublisherView will be called after Player::tick in ServerPlayer::tick if (isSimulatedPlayer()) { // Force to call the implementation of ServerPlayer - ((ServerPlayer*)this)->_updateChunkPublisherView(getPos(), 16.0f * Global->getServerTickRange()); + ((ServerPlayer*)this) + ->_updateChunkPublisherView(getPos(), 16.0f * Global->getServerTickRange()); } } // fix chunk load and tick - ChunkSource load mode -static_assert(sizeof(ChunkSource) == 0x50); // 88 -static_assert(sizeof(ChunkViewSource) == 0x1d8);//472 +static_assert(sizeof(ChunkSource) == 0x50); // 88 +static_assert(sizeof(ChunkViewSource) == 0x1d8); // 472 -TInstanceHook( - std::shared_ptr, +TInstanceHook(std::shared_ptr, "?_createChunkSource@SimulatedPlayer@@MEAA?AV?$shared_ptr@VChunkViewSource@@@std@@AEAVChunkSource@@@Z", SimulatedPlayer, ChunkSource& chunkSource) { auto result = ChunkViewSource(chunkSource, ChunkSource::LoadMode::Deferred); @@ -469,7 +418,8 @@ TInstanceHook( // fix armor display #include "llapi/mc/WeakStorageEntity.hpp" #include "llapi/mc/WeakEntityRef.hpp" -//void sendEvent(class EventRef> const &); + +// void sendEvent(class EventRef> const &); TClasslessInstanceHook(void, "?sendEvent@ActorEventCoordinator@@QEAAXAEBV?$EventRef@U?$ActorGameplayEvent@X@@@@@Z", void* a2) { original(this, a2); @@ -488,7 +438,7 @@ TClasslessInstanceHook(void, "?sendEvent@ActorEventCoordinator@@QEAAXAEBV?$Event v59 = *(WeakStorageEntity**)a2; } if (v59) { - Actor* actor = v59->tryUnwrap(); + Actor* actor = v59->tryUnwrap(); if (actor->isSimulatedPlayer()) { ItemInstance const& newItem = dAccess(v59); int slot = dAccess(v59); @@ -512,7 +462,7 @@ TClasslessInstanceHook(void, "?sendEvent@ActorEventCoordinator@@QEAAXAEBV?$Event v31 = *(WeakStorageEntity**)a2; } if (v31) { - Actor* actor = v31->tryUnwrap(); + Actor* actor = v31->tryUnwrap(); if (actor->isSimulatedPlayer()) { int slot = dAccess(v31); ItemInstance const& item = dAccess(v31); diff --git a/LiteLoader/src/liteloader/LiteLoader.cpp b/LiteLoader/src/liteloader/LiteLoader.cpp index e2f2506a0d..4c2237d19c 100644 --- a/LiteLoader/src/liteloader/LiteLoader.cpp +++ b/LiteLoader/src/liteloader/LiteLoader.cpp @@ -68,35 +68,51 @@ void fixUpCWD() { } void unzipNodeModules() { - if (std::filesystem::exists(std::filesystem::path(TEXT(".\\plugins\\lib\\node_modules.tar")))) { + if (std::filesystem::exists(std::filesystem::path(TEXT(".\\plugins\\lib\\node_modules.zip")))) { std::error_code ec; - // if(std::filesystem::exists(".\\plugins\\lib\\node_modules\\")) - // filesystem::remove_all(".\\plugins\\lib\\node_modules\\", ec); + if(std::filesystem::exists(".\\plugins\\lib\\node_modules\\")) + filesystem::remove_all(".\\plugins\\lib\\node_modules\\", ec); auto res = NewProcessSync( - fmt::format(R"({} x "{}" -o".\plugins\lib\" -aoa)", ZIP_PROGRAM_PATH, R"(.\plugins\lib\node_modules.tar)"), + fmt::format(R"({} x "{}" -o".\plugins\lib\" -aoa)", ZIP_PROGRAM_PATH, R"(.\plugins\lib\node_modules.zip)"), 30000); if (res.first != 0) { logger.error(tr("ll.unzipNodeModules.fail")); } else { - filesystem::remove(R"(.\plugins\lib\node_modules.tar)", ec); + filesystem::remove(R"(.\plugins\lib\node_modules.zip)", ec); + } + } +} + +void unzipPythonModules() { + if (std::filesystem::exists(std::filesystem::path(TEXT(".\\plugins\\lib\\python-env.zip")))) { + std::error_code ec; + if(std::filesystem::exists(".\\plugins\\lib\\python-env\\")) + filesystem::remove_all(".\\plugins\\lib\\python-env\\", ec); + auto res = NewProcessSync( + fmt::format(R"({} x "{}" -o".\plugins\lib\" -aoa)", ZIP_PROGRAM_PATH, R"(.\plugins\lib\python-env.zip)"), + 30000); + if (res.first != 0) { + logger.error(tr("ll.unzipPythonModules.fail")); + } else { + filesystem::remove(R"(.\plugins\lib\python-env.zip)", ec); } } } void decompressResourcePacks() { if (std::filesystem::exists( - std::filesystem::path(TEXT(".\\plugins\\LiteLoader\\ResourcePacks\\LiteLoaderBDS-CUI.tar")))) { + std::filesystem::path(TEXT(".\\plugins\\LiteLoader\\ResourcePacks\\LiteLoaderBDS-CUI.zip")))) { std::error_code ec; - // if(std::filesystem::exists(".\\plugins\\lib\\node_modules\\")) - // filesystem::remove_all(".\\plugins\\lib\\node_modules\\", ec); + if(std::filesystem::exists(".\\plugins\\LiteLoader\\ResourcePacks\\LiteLoaderBDS-CUI")) + filesystem::remove_all(".\\plugins\\LiteLoader\\ResourcePacks\\LiteLoaderBDS-CUI", ec); auto res = NewProcessSync(fmt::format(R"({} x "{}" -o".\plugins\LiteLoader\ResourcePacks\" -aoa)", ZIP_PROGRAM_PATH, - R"(.\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar)"), + R"(.\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.zip)"), 30000); if (res.first != 0) { logger.error(tr("ll.decompressResourcePacks.fail")); } else { - filesystem::remove(R"(.\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.tar)", ec); + filesystem::remove(R"(.\plugins\LiteLoader\ResourcePacks\LiteLoaderBDS-CUI.zip)", ec); } } } @@ -297,12 +313,6 @@ void liteloaderMain() { // Load Config ll::LoadLLConfig(); - // Unzip packed Node Modules - unzipNodeModules(); - - // Decompress resource packs - decompressResourcePacks(); - // If SEH Protection is not enabled (Debug mode), restore old SE translator if (!ll::isDebugMode()) _set_se_translator(oldSeTranslator); @@ -325,6 +335,14 @@ void liteloaderMain() { // Init LL Logger Logger::setDefaultFile("logs/LiteLoader-latest.log", false); + logger.info(tr("ll.main.unpackResources.begin")); + // Unzip packed Node & Python Modules + unzipNodeModules(); + unzipPythonModules(); + // Decompress resource packs + decompressResourcePacks(); + logger.info(tr("ll.main.unpackResources.end")); + // Check Running BDS(Requires Config) checkRunningBDS(); @@ -369,8 +387,9 @@ void liteloaderMain() { // Register Started Event::ServerStartedEvent::subscribe([](Event::ServerStartedEvent) { + logger.info("Repository: https://github.com/LiteLDev/LiteLoaderBDS"); logger.info(tr("ll.notice.license", "LGPLv3")); - logger.info(tr("ll.notice.newForum", "https://forum.litebds.com")); + logger.info(tr("ll.notice.newForum", "https://litebds.com")); logger.info(tr("ll.notice.translateText", "https://crowdin.com/project/liteloaderbds")); logger.info("Thanks to RhyMC(rhymc.com) for the support"); return true; diff --git a/LiteLoader/src/liteloader/Loader.cpp b/LiteLoader/src/liteloader/Loader.cpp index 856f3f35ff..0d306ecdc4 100644 --- a/LiteLoader/src/liteloader/Loader.cpp +++ b/LiteLoader/src/liteloader/Loader.cpp @@ -119,6 +119,21 @@ inline bool isExistNodeJsPlugin() { return exist; } +inline bool isExistPythonPlugin() { + if (!filesystem::exists(LLSE_PYTHON_ROOT_DIR)) + return false; + + bool exist = false; + filesystem::directory_iterator ent(LLSE_PYTHON_ROOT_DIR); + for (auto& file : ent) { + if (file.is_directory() && filesystem::exists(file.path() / "pyproject.toml")) { + exist = true; + break; + } + } + return exist; +} + inline void initNodeJsDirectories() { // Check & Create nodejs directories if (!filesystem::exists(LLSE_NODEJS_ROOT_DIR)) { @@ -136,6 +151,14 @@ inline void initNodeJsDirectories() { } } +inline void initPythonDirectories() { + // Check & Create python directories + if (!filesystem::exists(LLSE_PYTHON_ROOT_DIR)) { + filesystem::create_directories(LLSE_PYTHON_ROOT_DIR); + ll::logger.warn(tr("ll.loader.initPythonDirectories.created")); + } +} + inline void loadScriptEngine() { std::string llVersion = GetFileVersionString(GetCurrentModule(), true); for (const string& backend : LLSE_VALID_BACKENDS) { @@ -302,7 +325,10 @@ void ll::LoadMain() { // Load ScriptEngine if (ll::globalConfig.enableScriptEngine) { initNodeJsDirectories(); - if (ll::globalConfig.alwaysLaunchScriptEngine || isExistNodeJsPlugin() || isExistScriptPlugin()) { + initPythonDirectories(); + if (ll::globalConfig.alwaysLaunchScriptEngine || isExistNodeJsPlugin() || isExistPythonPlugin() + || isExistScriptPlugin()) + { loadScriptEngine(); } } diff --git a/LiteLoader/src/liteloader/ModifyPack.cpp b/LiteLoader/src/liteloader/ModifyPack.cpp index 810c38658e..3d54f95059 100644 --- a/LiteLoader/src/liteloader/ModifyPack.cpp +++ b/LiteLoader/src/liteloader/ModifyPack.cpp @@ -14,6 +14,7 @@ #include "llapi/mc/PackInstance.hpp" #include "llapi/mc/IResourcePackRepository.hpp" #include "llapi/mc/PackIdVersion.hpp" +#include "llapi/mc/PackSourceReport.hpp" namespace ModifyPack { vector PackListCache; diff --git a/LiteLoader/src/llapi/EventAPI.cpp b/LiteLoader/src/llapi/EventAPI.cpp index 75d4fa90c9..e7894b225c 100644 --- a/LiteLoader/src/llapi/EventAPI.cpp +++ b/LiteLoader/src/llapi/EventAPI.cpp @@ -431,14 +431,14 @@ TClasslessInstanceHook(bool, int num = 0; /////////////////// PlayerJump /////////////////// -TInstanceHook(void, "?jumpFromGround@Player@@UEAAXXZ", Player) { +TInstanceHook(void, "?jumpFromGround@Player@@UEAAXAEBVIConstBlockSource@@@Z", Player, void* a2) { IF_LISTENED(PlayerJumpEvent) { PlayerJumpEvent ev{}; ev.mPlayer = this; ev.call(); } IF_LISTENED_END(PlayerJumpEvent) - return original(this); + return original(this, a2); } /////////////////// PlayerSneak /////////////////// @@ -671,7 +671,7 @@ TClasslessInstanceHook(void, TClasslessInstanceHook( __int64, "?onEvent@VanillaServerGameplayEventListener@@UEAA?AW4EventResult@@AEBUPlayerOpenContainerEvent@@@Z", void* a2) { - Actor* player = ((class WeakEntityRef*)(a2))->tryUnwrap(); + Actor* player = ((class WeakEntityRef*)(a2))->tryUnwrap(); if (player->isPlayer()) { IF_LISTENED(PlayerOpenContainerEvent) { BlockPos blockPosPtr = dAccess(a2, 28); @@ -1843,8 +1843,7 @@ TInstanceHook(void, // IDA NpcComponent::executeCommandAction // NpcSceneDialogueData data(*this, *ac, a5); - auto ec = (EntityContext*)((char*)ac + 8); - NpcSceneDialogueData data(WeakEntityRef(ec->getWeakRef()), a5); + NpcSceneDialogueData data(WeakEntityRef(ac->getEntityContext()->getWeakRef()), a5); auto container = data.getActionsContainer(); auto actionAt = container->getActionAt(a4); diff --git a/LiteLoader/src/llapi/RemoteCallAPI.cpp b/LiteLoader/src/llapi/RemoteCallAPI.cpp index 57cf0d9b2b..bf5b205293 100644 --- a/LiteLoader/src/llapi/RemoteCallAPI.cpp +++ b/LiteLoader/src/llapi/RemoteCallAPI.cpp @@ -139,6 +139,7 @@ void exportTestSimulatedPlayerLL() { #include "llapi/EventAPI.h" auto TestRemoteCall = ([]() -> bool { std::thread([]() { + SetCurrentThreadDescription(L"LL_Test_RemoteCall_Thread"); Sleep(5000); Schedule::nextTick([]() { RemoteCall::exportAs("TestNameSpace", "StrSize", [](std::string arg) -> size_t { diff --git a/LiteLoader/src/llapi/ScheduleAPI.cpp b/LiteLoader/src/llapi/ScheduleAPI.cpp index 40648c6964..061b03c789 100644 --- a/LiteLoader/src/llapi/ScheduleAPI.cpp +++ b/LiteLoader/src/llapi/ScheduleAPI.cpp @@ -226,7 +226,7 @@ ScheduleTask nextTick(std::function task, HMODULE handle) { } } // namespace Schedule -THook(void, "?tick@ServerLevel@@UEAAXXZ", +THook(void, "?_subTick@ServerLevel@@MEAAXXZ", void* _this) { original(_this); taskQueue.tick(); diff --git a/LiteLoader/src/llapi/mc/ActorAPI.cpp b/LiteLoader/src/llapi/mc/ActorAPI.cpp index 3293cb2768..f9ea3ab015 100644 --- a/LiteLoader/src/llapi/mc/ActorAPI.cpp +++ b/LiteLoader/src/llapi/mc/ActorAPI.cpp @@ -1,4 +1,5 @@ #include "llapi/Global.h" +#include "llapi/mc/AABB.hpp" #include "llapi/mc/Actor.hpp" #include "llapi/mc/ActorDamageSource.hpp" #include "llapi/mc/Block.hpp" @@ -26,17 +27,14 @@ #include "llapi/mc/ActorDefinitionIdentifier.hpp" #include "llapi/mc/ActorDamageSource.hpp" #include "llapi/mc/Vec2.hpp" -#include "llapi/mc/AABB.hpp" #include "llapi/mc/RotationCommandUtils.hpp" #include "llapi/mc/WeakEntityRef.hpp" #include "llapi/mc/WeakStorageEntity.hpp" -Actor* WeakStorageEntity::tryUnwrap() { - return SymCall("??$tryUnwrap@VActor@@$$V@WeakEntityRef@@QEBAPEAVActor@@XZ", Actor*,void*)(this); -} +class UserEntityIdentifierComponent; -Actor* WeakEntityRef::tryUnwrap() { - return SymCall("??$tryUnwrap@VActor@@$$V@WeakEntityRef@@QEBAPEAVActor@@XZ", Actor*, void*)(this); +EntityContext* Actor::getEntityContext() const { + return dAccess((Actor*)this); } class UserEntityIdentifierComponent; @@ -81,8 +79,10 @@ bool Actor::isItemActor() const { return hasCategory(ActorCategory::Item); // IDA Player::take } +#include "llapi/mc/ActorCollision.hpp" + bool Actor::isOnGround() const { - return (dAccess(this)); // IDA DirectActorProxyImpl::isOnGround + return ActorCollision::isOnGround(*getEntityContext()); // IDA DirectActorProxyImpl::isOnGround } std::string Actor::getTypeName() const { diff --git a/LiteLoader/src/llapi/mc/BlockSourceAPI.cpp b/LiteLoader/src/llapi/mc/BlockSourceAPI.cpp index b3e6b7f38d..287d4fdb7a 100644 --- a/LiteLoader/src/llapi/mc/BlockSourceAPI.cpp +++ b/LiteLoader/src/llapi/mc/BlockSourceAPI.cpp @@ -2,11 +2,60 @@ #include "llapi/Global.h" #include "llapi/mc/BlockInstance.hpp" +#include "llapi/mc/AABB.hpp" +#include "llapi/mc/ChunkPos.hpp" +#include "llapi/mc/LevelChunk.hpp" +#include "llapi/mc/WeakEntityRef.hpp" +#include "llapi/mc/ActorClassTree.hpp" BlockInstance BlockSource::getBlockInstance(BlockPos a1) { return BlockInstance{const_cast(&getBlock(a1)), a1, this->getDimensionId()}; } -std::vector BlockSource::queryEntities(ActorType actorType, const AABB& range, bool ignoreType) { - return fetchEntities2(actorType, range, ignoreType); +std::vector BlockSource::queryEntities(ActorType actorType, const AABB& range, bool ignoreType, + float extendDistance) { + std::vector entities; + entities.clear(); + ChunkPos minChunk(((int)std::floor(range.min.x - extendDistance)) >> 4, + ((int)std::floor(range.min.z - extendDistance)) >> 4); + ChunkPos maxChunk(((int)std::floor(range.max.x + extendDistance)) >> 4, + ((int)std::floor(range.max.z + extendDistance)) >> 4); + + for (int x = minChunk.x; x <= maxChunk.x; x++) + for (int z = minChunk.z; z <= maxChunk.z; z++) { + LevelChunk* chunk = getChunk({x, z}); + if (chunk != nullptr) { + for (auto& weakEntityRef : chunk->getChunkEntities()) { + Actor* actor = weakEntityRef.tryUnwrap(); + if (actor != nullptr && ActorClassTree::isInstanceOf(*actor, actorType) != ignoreType && + range.intersects(actor->getAABB())) { + entities.emplace_back(actor); + } + } + } + } + return std::move(entities); +} + +std::vector BlockSource::getEntities(const AABB& range, float extendDistance) { + std::vector entities; + entities.clear(); + ChunkPos minChunk(((int)std::floor(range.min.x - extendDistance)) >> 4, + ((int)std::floor(range.min.z - extendDistance)) >> 4); + ChunkPos maxChunk(((int)std::floor(range.max.x + extendDistance)) >> 4, + ((int)std::floor(range.max.z + extendDistance)) >> 4); + + for (int x = minChunk.x; x <= maxChunk.x; x++) + for (int z = minChunk.z; z <= maxChunk.z; z++) { + LevelChunk* chunk = getChunk({x, z}); + if (chunk != nullptr) { + for (auto& weakEntityRef : chunk->getChunkEntities()) { + Actor* actor = weakEntityRef.tryUnwrap(); + if (actor != nullptr && range.intersects(actor->getAABB())) { + entities.emplace_back(actor); + } + } + } + } + return std::move(entities); } \ No newline at end of file diff --git a/LiteLoader/src/llapi/mc/ContainerAPI.cpp b/LiteLoader/src/llapi/mc/ContainerAPI.cpp index 21d4367150..da03679f1e 100644 --- a/LiteLoader/src/llapi/mc/ContainerAPI.cpp +++ b/LiteLoader/src/llapi/mc/ContainerAPI.cpp @@ -5,7 +5,6 @@ #include "llapi/mc/Vec3.hpp" LIAPI std::string Container::getTypeName() { - // ContainerType type = dAccess(this, 8); //IDA Container::Container ContainerType type = getContainerType(); return getContainerTypeName(type); } diff --git a/LiteLoader/src/llapi/mc/ItemActorAPI.cpp b/LiteLoader/src/llapi/mc/ItemActorAPI.cpp index acb5840dbc..a26450d188 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 (ItemStack*)((uintptr_t)this + 1152); // 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 f41379ed8d..fefc05c41c 100644 --- a/LiteLoader/src/llapi/mc/LevelAPI.cpp +++ b/LiteLoader/src/llapi/mc/LevelAPI.cpp @@ -43,7 +43,7 @@ BlockSource* Level::getBlockSource(Actor* ac) { } Dimension* Level::getDimensionPtr(class AutomaticID dimId) { - return (Dimension*)Global->getDimension(dimId).mHandle.lock().get(); + return Global->getDimension(dimId).get(); } Block* Level::getBlock(BlockPos* pos, int dimId) { @@ -211,7 +211,7 @@ std::vector Level::getAllPlayers() { std::vector Level::getAllEntities(int dimId) { try { Level* lv = Global; - Dimension* dim = (Dimension*)lv->getDimension(dimId).mHandle.lock().get(); + Dimension* dim = Level::getDimensionPtr(dimId); if (!dim) return {}; auto& list = @@ -219,7 +219,7 @@ std::vector Level::getAllEntities(int dimId) { // Check Valid std::vector result; - auto currTick = SymCall("?getCurrentTick@Level@@UEBAAEBUTick@@XZ", Tick*, Level*)(lv)->t; + auto currTick = lv->getCurrentTick().t; for (auto& i : list) { auto entity = getEntity(i.first); if (!entity) diff --git a/LiteLoader/src/llapi/mc/PlayerAPI.cpp b/LiteLoader/src/llapi/mc/PlayerAPI.cpp index e9a95ce55f..b478298ba2 100644 --- a/LiteLoader/src/llapi/mc/PlayerAPI.cpp +++ b/LiteLoader/src/llapi/mc/PlayerAPI.cpp @@ -1,4 +1,5 @@ -#include +#include +#include #include "magic_enum/magic_enum.hpp" #include "llapi/mc/Minecraft.hpp" @@ -9,12 +10,12 @@ #include "llapi/mc/Certificate.hpp" #include "llapi/mc/CompoundTag.hpp" -#include "llapi/mc/NetworkHandler.hpp" #include "llapi/mc/ServerNetworkHandler.hpp" #include "llapi/mc/NetworkIdentifier.hpp" #include "llapi/mc/NetworkPeer.hpp" #include "llapi/mc/ToastRequestPacket.hpp" +#include "llapi/mc/NetworkSystem.hpp" #include "llapi/mc/ExtendedCertificate.hpp" #include "llapi/mc/ConnectionRequest.hpp" #include "llapi/mc/MinecraftPackets.hpp" @@ -117,13 +118,13 @@ std::string Player::getRealName() { int Player::getAvgPing() { if (isSimulatedPlayer()) return -1; - return Global->getNetworkHandler().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mAveragePing; + return Global->getNetworkSystem().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mAveragePing; } int Player::getLastPing() { if (isSimulatedPlayer()) return -1; - return Global->getNetworkHandler().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mCurrentPing; + return Global->getNetworkSystem().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mCurrentPing; } string Player::getIP() { @@ -251,50 +252,73 @@ bool Player::giveItem(string typeName, int amount) { return true; } -int Player::clearItem(string typeName) { - int res = 0; +int Player::clearItem(std::string typeName) { + return this->clearItem(typeName, 2 ^ 32); +} + +unsigned int Player::clearItem(std::string_view typeName, unsigned int num) { + unsigned int clearedCount = 0; + if (num < 0) { + return 0; + } + + auto reduceItemCount = [&typeName, &clearedCount, num](Player* player, ItemStack* item) { + if (item->getTypeName() == typeName) { + auto itemCount = item->getCount(); + if (itemCount >= int(num) - int(clearedCount)) { + item->setNull({}); + clearedCount += itemCount; + } else { + item->remove(num - clearedCount); + clearedCount = num; + } + } + }; // Hand - ItemStack* item = getHandSlot(); - if (item->getTypeName() == typeName) { - auto out = item->getCount(); - item->setNull({}); - res += out; + reduceItemCount(this, getHandSlot()); + if (clearedCount >= num) { // > case should never happen + refreshInventory(); + return clearedCount; } // OffHand - item = (ItemStack*)&getOffhandSlot(); - if (item->getTypeName() == typeName) { - auto out = item->getCount(); - item->setNull({}); - res += out; + reduceItemCount(this, (ItemStack*)&getOffhandSlot()); + if (clearedCount >= num) { // > case should never happen + refreshInventory(); + return clearedCount; } // Inventory - Container* container = &getInventory(); - auto items = container->getAllSlots(); - int size = container->getSize(); - for (int i = 0; i < size; ++i) { - if (items[i]->getTypeName() == typeName) { - int cnt = items[i]->getCount(); - container->removeItem(i, cnt); - res += cnt; + { + Container* container = &getInventory(); + auto items = container->getAllSlots(); + auto size = container->getSize(); + for (int i = 0; i < size; ++i) { + reduceItemCount(this, (ItemStack*)items[i]); + if (clearedCount >= num) { // > case should never happen + refreshInventory(); + return clearedCount; + } } } // Armor - auto& armor = getArmorContainer(); - items = armor.getAllSlots(); - size = armor.getSize(); - for (int i = 0; i < size; ++i) { - if (items[i]->getTypeName() == typeName) { - int cnt = items[i]->getCount(); - armor.removeItem(i, cnt); - res += cnt; + { + Container* armor = &getArmorContainer(); + auto items = armor->getAllSlots(); + auto size = armor->getSize(); + for (int i = 0; i < size; ++i) { + reduceItemCount(this, (ItemStack*)items[i]); + if (clearedCount >= num) { // > case should never happen + refreshInventory(); + return clearedCount; + } } } + refreshInventory(); - return res; + return clearedCount; } string Player::getName() { @@ -306,7 +330,7 @@ bool Player::runcmd(const string& cmd) { } Container* Player::getEnderChestContainer() { - return dAccess(this, 3792); // IDA Player::Player() 782 + return dAccess(this, 3800); // IDA Player::Player() 782 } bool Player::transferServer(const string& address, unsigned short port) { @@ -361,7 +385,7 @@ bool Player::refreshAttributes(std::vector const& attributes) wp.writeString((*attribute).getName().getString()); } wp.writeUnsignedVarInt64(0); - auto pkt = MinecraftPackets::createPacket(0x1D); + auto pkt = MinecraftPackets::createPacket(MinecraftPacketIds::UpdateAttributes); pkt->read(wp); sendNetworkPacket(*pkt); return true; @@ -384,14 +408,14 @@ unsigned char Player::getClientSubId() { float Player::getAvgPacketLoss() { if (isSimulatedPlayer()) return 0.f; - return Global->getNetworkHandler().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mAveragePacketLoss; + return Global->getNetworkSystem().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mAveragePacketLoss; } float Player::getLastPacketLoss() { if (isSimulatedPlayer()) { return 0.f; } - return Global->getNetworkHandler().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mCurrentPacketLoss; + return Global->getNetworkSystem().getPeerForUser(*getNetworkIdentifier())->getNetworkStatus().mCurrentPacketLoss; } string Player::getClientId() { @@ -582,7 +606,7 @@ static_assert(sizeof(TransferPacket) == 88); bool Player::sendTextPacket(string text, TextType Type) const { BinaryStream wp; - wp.reserve(8 + text.size()); + wp.reserve(40 + text.size()); wp.writeUnsignedChar((char)Type); wp.writeBool(true); switch (Type) { @@ -622,7 +646,7 @@ bool Player::sendToastPacket(string title, string msg) { bool Player::sendTitlePacket(string text, TitleType Type, int FadeInDuration, int RemainDuration, int FadeOutDuration) const { BinaryStream wp; - wp.reserve(8 + text.size()); + wp.reserve(16 + text.size()); wp.writeVarInt((int)Type); wp.writeString(text); wp.writeVarInt(FadeInDuration); @@ -631,9 +655,8 @@ bool Player::sendTitlePacket(string text, TitleType Type, int FadeInDuration, in wp.writeString(getXuid()); wp.writeString(""); - auto pkt = MinecraftPackets::createPacket(MinecraftPacketIds::SetTitle); - pkt->read(wp); - sendNetworkPacket(*pkt); + NetworkPacket<(int)MinecraftPacketIds::SetTitle> pkt(wp.getAndReleaseData()); + sendNetworkPacket(pkt); return true; } @@ -699,7 +722,7 @@ bool Player::sendAddItemEntityPacket(unsigned long long runtimeID, Item const& i wp.writeBool(false); - NetworkPacket<15> pkt(wp.getRaw()); + NetworkPacket<(int)MinecraftPacketIds::AddItemActor> pkt(wp.getAndReleaseData()); sendNetworkPacket(pkt); return true; } @@ -727,7 +750,7 @@ bool Player::sendAddEntityPacket(unsigned long long runtimeID, string entityType // Links bs.writeUnsignedVarInt(0); - NetworkPacket<13> pkt(bs.getAndReleaseData()); + NetworkPacket<(int)MinecraftPacketIds::AddActor> pkt(bs.getAndReleaseData()); sendNetworkPacket(pkt); return true; } @@ -818,7 +841,6 @@ bool Player::sendBossEventPacket(BossEvent type, string name, float percent, Bos return true; } - bool Player::sendCommandRequestPacket(const string& cmd) { auto packet = MinecraftPackets::createPacket(0x4d); dAccess(packet.get()) = cmd; @@ -859,7 +881,7 @@ bool Player::sendTextTalkPacket(const string& msg, Player* target) { bool Player::sendRawFormPacket(unsigned formId, const string& data) const { BinaryStream wp; - wp.reserve(32 + data.size()); + wp.reserve(8 + data.size()); wp.writeUnsignedVarInt(formId); wp.writeString(data); diff --git a/LiteLoader/src/llapi/mc/SimulatedPlayerAPI.cpp b/LiteLoader/src/llapi/mc/SimulatedPlayerAPI.cpp index ddb952cf3b..b4ecfa3f7f 100644 --- a/LiteLoader/src/llapi/mc/SimulatedPlayerAPI.cpp +++ b/LiteLoader/src/llapi/mc/SimulatedPlayerAPI.cpp @@ -38,39 +38,6 @@ bool SimulatedPlayer::simulateStopSneaking() { return !isSneaking(); } -template <> -class OwnerPtrT { - char filler[24]; - -public: - MCAPI ~OwnerPtrT(); - - inline OwnerPtrT(OwnerPtrT&& right) noexcept { - void (OwnerPtrT::*rv)(OwnerPtrT && right); - *((void**)&rv) = dlsym("??0OwnerStorageEntity@@IEAA@$$QEAV0@@Z"); - (this->*rv)(std::move(right)); - } - - inline OwnerPtrT& operator=(OwnerPtrT&& right) noexcept { - void (OwnerPtrT::*rv)(OwnerPtrT && right); - *((void**)&rv) = dlsym("??4OwnerStorageEntity@@IEAAAEAV0@$$QEAV0@@Z"); - (this->*rv)(std::move(right)); - } - - inline SimulatedPlayer* tryGetSimulatedPlayer(bool b = false) { - auto& context = dAccess(this).getStackRef(); - return SimulatedPlayer::tryGetFromEntity(context, b); - } - - inline bool hasValue() const { - if (!this) - return false; - return dAccess(this); - } - - // inline bool isValid() -}; - #include "llapi/mc/HashedString.hpp" class SimulatedPlayer* SimulatedPlayer::create(std::string const& name, class Vec3 const& pos, @@ -79,7 +46,7 @@ class SimulatedPlayer* SimulatedPlayer::create(std::string const& name, class Ve // return create(name, position, dimensionId, Global->getServerNetworkHandler()); OwnerPtrT ownerPtr = Global->createSimulatedPlayer( name, '-' + std::to_string(HashedString::computeHash(name) ^ RNG::rand())); - auto player = ownerPtr.tryGetSimulatedPlayer(); + auto player = ownerPtr.tryUnwrap(); if (player /* && player->isSimulatedPlayer() */) { // player->changeDimension(dimensionId); @@ -107,7 +74,7 @@ class SimulatedPlayer* SimulatedPlayer::create(std::string const& name, class AutomaticID dimensionId) { OwnerPtrT ownerPtr = Global->createSimulatedPlayer( name, '-' + std::to_string(HashedString::computeHash(name) ^ RNG::rand())); - auto player = ownerPtr.tryGetSimulatedPlayer(); + auto player = ownerPtr.tryUnwrap(); if (player /* && player->isSimulatedPlayer() */) { // player->changeDimension(dimensionId); diff --git a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp index 9eb5016ae5..923f96b848 100644 --- a/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp +++ b/LiteLoader/src/llapi/mc/StaticVanillaBlocksAPI.cpp @@ -2,12 +2,21 @@ #include "llapi/mc/BlockTypeRegistry.hpp" #include "llapi/mc/HashedString.hpp" #include "llapi/mc/VanillaBlockTypeIds.hpp" +#include "llapi/mc/Experiments.hpp" + +THook(void, "?assignBlocks@VanillaBlocks@@YAXAEBVExperiments@@@Z", Experiments const& exp) { + original(exp); + StaticVanillaBlocks::assignBlocks(); +} namespace StaticVanillaBlocks { +Block const* mElements[119]; + Block const* mAcaciaButton; Block const* mAcaciaDoor; Block const* mAcaciaFenceGate; +Block const* mAcaciaHangingSign; Block const* mAcaciaPressurePlate; Block const* mAcaciaStairs; Block const* mAcaciaStandingSign; @@ -24,7 +33,25 @@ Block const* mAzalea; Block const* mAzaleaLeaves; Block const* mAzaleaLeavesFlowered; Block const* mBamboo; +Block const* mBambooBlock; +Block const* mBambooButton; +Block const* mBambooDoor; +Block const* mBambooDoubleSlab; +Block const* mBambooFence; +Block const* mBambooFenceGate; +Block const* mBambooHangingSign; +Block const* mBambooMosaic; +Block const* mBambooMosaicDoubleSlab; +Block const* mBambooMosaicSlab; +Block const* mBambooMosaicStairs; +Block const* mBambooPlanks; +Block const* mBambooPressurePlate; Block const* mBambooSapling; +Block const* mBambooSlab; +Block const* mBambooStairs; +Block const* mBambooStandingSign; +Block const* mBambooTrapdoor; +Block const* mBambooWallSign; Block const* mBarrel; Block const* mBarrier; Block const* mBasalt; @@ -39,6 +66,7 @@ Block const* mBigDripleaf; Block const* mBirchButton; Block const* mBirchDoor; Block const* mBirchFenceGate; +Block const* mBirchHangingSign; Block const* mBirchPressurePlate; Block const* mBirchStairs; Block const* mBirchStandingSign; @@ -47,6 +75,7 @@ Block const* mBirchWallSign; Block const* mBlackCandle; Block const* mBlackCandleCake; Block const* mBlackGlazedTerracotta; +Block const* mBlackWool; Block const* mBlackstone; Block const* mBlackstoneDoubleSlab; Block const* mBlackstoneSlab; @@ -57,6 +86,7 @@ Block const* mBlueCandle; Block const* mBlueCandleCake; Block const* mBlueGlazedTerracotta; Block const* mBlueIce; +Block const* mBlueWool; Block const* mBoneBlock; Block const* mBookshelf; Block const* mBorderBlock; @@ -68,6 +98,7 @@ Block const* mBrownCandleCake; Block const* mBrownGlazedTerracotta; Block const* mBrownMushroom; Block const* mBrownMushroomBlock; +Block const* mBrownWool; Block const* mBubbleColumn; Block const* mBuddingAmethyst; Block const* mCactus; @@ -91,6 +122,7 @@ Block const* mChalkboard; Block const* mChemicalHeat; Block const* mChemistryTable; Block const* mChest; +Block const* mChiseledBookshelf; Block const* mChiseledDeepslate; Block const* mChiseledNetherBricks; Block const* mChiseledPolishedBlackstone; @@ -135,6 +167,7 @@ Block const* mCrimsonDoubleSlab; Block const* mCrimsonFence; Block const* mCrimsonFenceGate; Block const* mCrimsonFungus; +Block const* mCrimsonHangingSign; Block const* mCrimsonHyphae; Block const* mCrimsonNylium; Block const* mCrimsonPlanks; @@ -153,6 +186,7 @@ Block const* mCutCopperStairs; Block const* mCyanCandle; Block const* mCyanCandleCake; Block const* mCyanGlazedTerracotta; +Block const* mCyanWool; Block const* mDarkOakButton; Block const* mDarkOakDoor; Block const* mDarkOakFenceGate; @@ -160,11 +194,13 @@ Block const* mDarkOakPressurePlate; Block const* mDarkOakStairs; Block const* mDarkOakTrapdoor; Block const* mDarkPrismarineStairs; +Block const* mDarkoakHangingSign; Block const* mDarkoakStandingSign; Block const* mDarkoakWallSign; Block const* mDaylightDetector; Block const* mDaylightDetectorInverted; Block const* mDeadbush; +Block const* mDecoratedPot; Block const* mDeepslate; Block const* mDeepslateBrickDoubleSlab; Block const* mDeepslateBrickSlab; @@ -203,7 +239,6 @@ Block const* mDragonEgg; Block const* mDriedKelpBlock; Block const* mDripstone; Block const* mDropper; -Block const* mElements[119]; Block const* mEmeraldBlock; Block const* mEmeraldOre; Block const* mEnchantingTable; @@ -237,7 +272,7 @@ Block const* mGlass; Block const* mGlassPane; Block const* mGlowItemFrame; Block const* mGlowLichen; -Block const* mGlowingobsidian; +Block const* mGlowingObsidian; Block const* mGlowstone; Block const* mGoldBlock; Block const* mGoldOre; @@ -249,9 +284,11 @@ Block const* mGravel; Block const* mGrayCandle; Block const* mGrayCandleCake; Block const* mGrayGlazedTerracotta; +Block const* mGrayWool; Block const* mGreenCandle; Block const* mGreenCandleCake; Block const* mGreenGlazedTerracotta; +Block const* mGreenWool; Block const* mGrindstone; Block const* mHangingRoots; Block const* mHardGlass; @@ -280,6 +317,7 @@ Block const* mJukebox; Block const* mJungleButton; Block const* mJungleDoor; Block const* mJungleFenceGate; +Block const* mJungleHangingSign; Block const* mJunglePressurePlate; Block const* mJungleStairs; Block const* mJungleStandingSign; @@ -301,13 +339,16 @@ Block const* mLightBlock; Block const* mLightBlueCandle; Block const* mLightBlueCandleCake; Block const* mLightBlueGlazedTerracotta; +Block const* mLightBlueWool; Block const* mLightGrayCandle; Block const* mLightGrayCandleCake; +Block const* mLightGrayWool; Block const* mLightWeightedPressurePlate; Block const* mLightningRod; Block const* mLimeCandle; Block const* mLimeCandleCake; Block const* mLimeGlazedTerracotta; +Block const* mLimeWool; Block const* mLitBlastFurnace; Block const* mLitDeepslateRedstoneOre; Block const* mLitFurnace; @@ -322,12 +363,14 @@ Block const* mLoom; Block const* mMagentaCandle; Block const* mMagentaCandleCake; Block const* mMagentaGlazedTerracotta; +Block const* mMagentaWool; Block const* mMagma; Block const* mMangroveButton; Block const* mMangroveDoor; Block const* mMangroveDoubleSlab; Block const* mMangroveFence; Block const* mMangroveFenceGate; +Block const* mMangroveHangingSign; Block const* mMangroveLeaves; Block const* mMangroveLog; Block const* mMangrovePlanks; @@ -373,6 +416,7 @@ Block const* mNetherrack; Block const* mNetherreactor; Block const* mNormalStoneStairs; Block const* mNoteblock; +Block const* mOakHangingSign; Block const* mOakStairs; Block const* mObserver; Block const* mObsidian; @@ -380,6 +424,7 @@ Block const* mOchreFroglight; Block const* mOrangeCandle; Block const* mOrangeCandleCake; Block const* mOrangeGlazedTerracotta; +Block const* mOrangeWool; Block const* mOxidizedCopper; Block const* mOxidizedCutCopper; Block const* mOxidizedCutCopperSlab; @@ -391,6 +436,7 @@ Block const* mPearlescentFroglight; Block const* mPinkCandle; Block const* mPinkCandleCake; Block const* mPinkGlazedTerracotta; +Block const* mPinkWool; Block const* mPiston; Block const* mPistonArmCollision; Block const* mPlanks; @@ -430,6 +476,7 @@ Block const* mPumpkinStem; Block const* mPurpleCandle; Block const* mPurpleCandleCake; Block const* mPurpleGlazedTerracotta; +Block const* mPurpleWool; Block const* mPurpurBlock; Block const* mPurpurStairs; Block const* mQuartzBlock; @@ -450,6 +497,7 @@ Block const* mRedNetherBrick; Block const* mRedNetherBrickStairs; Block const* mRedSandstone; Block const* mRedSandstoneStairs; +Block const* mRedWool; Block const* mRedstoneBlock; Block const* mRedstoneLamp; Block const* mRedstoneOre; @@ -500,6 +548,7 @@ Block const* mSporeBlossom; Block const* mSpruceButton; Block const* mSpruceDoor; Block const* mSpruceFenceGate; +Block const* mSpruceHangingSign; Block const* mSprucePressurePlate; Block const* mSpruceStairs; Block const* mSpruceStandingSign; @@ -525,6 +574,7 @@ Block const* mStoneStairs; Block const* mStonecutter; Block const* mStonecutterBlock; Block const* mStrippedAcaciaLog; +Block const* mStrippedBambooBlock; Block const* mStrippedBirchLog; Block const* mStrippedCrimsonHyphae; Block const* mStrippedCrimsonStem; @@ -538,12 +588,15 @@ Block const* mStrippedWarpedHyphae; Block const* mStrippedWarpedStem; Block const* mStructureBlock; Block const* mStructureVoid; +Block const* mSuspiciousSand; Block const* mSweetBerryBush; Block const* mTallGrass; Block const* mTarget; Block const* mTintedGlass; Block const* mTnt; Block const* mTorch; +Block const* mTorchflower; +Block const* mTorchflowerCrop; Block const* mTrapdoor; Block const* mTrappedChest; Block const* mTripWire; @@ -566,6 +619,7 @@ Block const* mWarpedDoubleSlab; Block const* mWarpedFence; Block const* mWarpedFenceGate; Block const* mWarpedFungus; +Block const* mWarpedHangingSign; Block const* mWarpedHyphae; Block const* mWarpedNylium; Block const* mWarpedPlanks; @@ -611,22 +665,27 @@ Block const* mWheat; Block const* mWhiteCandle; Block const* mWhiteCandleCake; Block const* mWhiteGlazedTerracotta; +Block const* mWhiteWool; Block const* mWitherRose; Block const* mWood; Block const* mWoodenButton; Block const* mWoodenDoor; Block const* mWoodenPressurePlate; Block const* mWoodenSlab; -Block const* mWool; Block const* mYellowCandle; Block const* mYellowCandleCake; Block const* mYellowFlower; Block const* mYellowGlazedTerracotta; +Block const* mYellowWool; void assignBlocks() { + for (int i = 0; i < 119; ++i) { + mElements[i] = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Elements[i], true); + } mAcaciaButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaButton, true); mAcaciaDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaDoor, true); mAcaciaFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaFenceGate, true); + mAcaciaHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaHangingSign, true); mAcaciaPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaPressurePlate, true); mAcaciaStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaStairs, true); mAcaciaStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::AcaciaStandingSign, true); @@ -643,7 +702,26 @@ void assignBlocks() { 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); @@ -658,6 +736,7 @@ void assignBlocks() { mBirchButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchButton, true); mBirchDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchDoor, true); mBirchFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchFenceGate, true); + mBirchHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchHangingSign, true); mBirchPressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchPressurePlate, true); mBirchStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchStairs, true); mBirchStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::BirchStandingSign, true); @@ -666,6 +745,7 @@ void assignBlocks() { 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); @@ -676,6 +756,7 @@ void assignBlocks() { 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); @@ -687,6 +768,7 @@ void assignBlocks() { 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); @@ -712,6 +794,7 @@ void assignBlocks() { mChemicalHeat = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChemicalHeat, true); mChemistryTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::ChemistryTable, 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 = @@ -762,6 +845,7 @@ void assignBlocks() { 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); @@ -780,6 +864,7 @@ void assignBlocks() { 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); mDarkOakFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DarkOakFenceGate, true); @@ -787,12 +872,14 @@ void assignBlocks() { 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); @@ -833,9 +920,6 @@ void assignBlocks() { mDriedKelpBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::DriedKelpBlock, true); mDripstone = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Dripstone, true); mDropper = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Dropper, true); - for (int i = 0; i < 119; ++i) { - mElements[i] = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Elements[i], true); - } mEmeraldBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EmeraldBlock, true); mEmeraldOre = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EmeraldOre, true); mEnchantingTable = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::EnchantingTable, true); @@ -871,7 +955,7 @@ void assignBlocks() { mGlassPane = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlassPane, true); mGlowItemFrame = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlowItemFrame, true); mGlowLichen = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::GlowLichen, true); - mGlowingobsidian = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Glowingobsidian, 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); @@ -883,9 +967,11 @@ void assignBlocks() { 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); @@ -915,6 +1001,7 @@ void assignBlocks() { mJungleButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleButton, true); mJungleDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleDoor, true); mJungleFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleFenceGate, true); + mJungleHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleHangingSign, true); mJunglePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JunglePressurePlate, true); mJungleStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleStairs, true); mJungleStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::JungleStandingSign, true); @@ -937,14 +1024,17 @@ void assignBlocks() { 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); @@ -961,12 +1051,14 @@ void assignBlocks() { 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); @@ -1013,6 +1105,7 @@ void assignBlocks() { mNetherreactor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Netherreactor, true); mNormalStoneStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::NormalStoneStairs, true); mNoteblock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Noteblock, true); + mOakHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakHangingSign, true); mOakStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::OakStairs, true); mObserver = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Observer, true); mObsidian = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Obsidian, true); @@ -1021,6 +1114,7 @@ void assignBlocks() { 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); @@ -1034,6 +1128,7 @@ void assignBlocks() { mPinkCandle = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkCandle, true); mPinkCandleCake = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkCandleCake, true); mPinkGlazedTerracotta = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::PinkGlazedTerracotta, 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); @@ -1089,6 +1184,7 @@ void assignBlocks() { 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); @@ -1109,6 +1205,7 @@ void assignBlocks() { 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); @@ -1161,6 +1258,7 @@ void assignBlocks() { mSpruceButton = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceButton, true); mSpruceDoor = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceDoor, true); mSpruceFenceGate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceFenceGate, true); + mSpruceHangingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceHangingSign, true); mSprucePressurePlate = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SprucePressurePlate, true); mSpruceStairs = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceStairs, true); mSpruceStandingSign = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::SpruceStandingSign, true); @@ -1187,6 +1285,7 @@ void assignBlocks() { 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); mStrippedCrimsonHyphae = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCrimsonHyphae, true); mStrippedCrimsonStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedCrimsonStem, true); @@ -1200,12 +1299,15 @@ void assignBlocks() { mStrippedWarpedStem = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StrippedWarpedStem, true); mStructureBlock = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StructureBlock, true); mStructureVoid = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::StructureVoid, 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); @@ -1228,6 +1330,7 @@ void assignBlocks() { 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); @@ -1288,22 +1391,18 @@ void assignBlocks() { 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); - mWool = &BlockTypeRegistry::getDefaultBlockState(VanillaBlockTypeIds::Wool, 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); } }; // namespace StaticVanillaBlocks - -THook(void, "?assignBlocks@VanillaBlocks@@YAXAEBVExperiments@@@Z", class Experiments const& exp) { - StaticVanillaBlocks::assignBlocks(); - return original(exp); -} diff --git a/LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp b/LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp index 1b61575d7d..a97f51c0dc 100644 --- a/LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp +++ b/LiteLoader/src/llapi/mc/StructureTemplateAPI.cpp @@ -4,10 +4,12 @@ #include "llapi/mc/StructureSettings.hpp" #include "llapi/mc/StructureTemplate.hpp" #include "llapi/mc/StructureTemplateData.hpp" -static_assert(sizeof(StructureTemplate) == 224); +static_assert(sizeof(StructureTemplate) == 240); StructureTemplate* StructureTemplate::fromTag(std::string name, CompoundTag const& tag) { - StructureTemplate* st = new StructureTemplate(name); + auto& unBlockType = + dAccess, 192>(Global); + StructureTemplate* st = new StructureTemplate(name, unBlockType); // st.getName(name_span) st->getData()->load(tag); return st; @@ -19,7 +21,9 @@ std::unique_ptr StructureTemplate::toTag() { StructureTemplate* StructureTemplate::fromWorld(std::string name, int dimID, BlockPos p1, BlockPos p2, bool ignoreBlocks, bool ignoreEntities) { - auto st = new StructureTemplate(name); + auto& unBlockType = + dAccess, 192>(Global); + auto st = new StructureTemplate(name, unBlockType); BlockPos start = {std::min(p1.x, p2.x), std::min(p1.y, p2.y), std::min(p1.z, p2.z)}; BlockPos size = {std::abs(p1.x - p2.x) + 1, std::abs(p1.y - p2.y) + 1, std::abs(p1.z - p2.z) + 1}; auto setting = StructureSettings(); diff --git a/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp b/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp index 3331187374..6b100edeb9 100644 --- a/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp +++ b/LiteLoader/src/llapi/nbt/CompoundTagAPI.cpp @@ -71,20 +71,21 @@ inline map& CompoundTag::value() { } // get value -double CompoundTag::getDouble(class gsl::basic_string_span key) const { +double CompoundTag::getDouble(std::string_view key) const { auto tag = const_cast(get(key))->asDoubleTag(); if (tag) return tag->value(); // TODO return 0.0; }; -struct TagMemoryChunk const& CompoundTag::getIntArray(class gsl::basic_string_span key) const { + +struct TagMemoryChunk const& CompoundTag::getIntArray(std::string_view key) const { auto tag = const_cast(get(key))->asIntArrayTag(); return tag->value(); }; // get tag -class ByteTag const* CompoundTag::getByteTag(class gsl::basic_string_span key) const { +class ByteTag const* CompoundTag::getByteTag(std::string_view key) const { return const_cast(get(key))->asByteTag(); }; @@ -94,19 +95,19 @@ class ByteTag const* CompoundTag::getByteTag(class gsl::basic_string_span(get(key))->asShortTag(); //}; -class FloatTag const* CompoundTag::getFloatTag(class gsl::basic_string_span key) const { +class FloatTag const* CompoundTag::getFloatTag(std::string_view key) const { return const_cast(get(key))->asFloatTag(); }; -class DoubleTag const* CompoundTag::getDoubleTag(class gsl::basic_string_span key) const { +class DoubleTag const* CompoundTag::getDoubleTag(std::string_view key) const { return const_cast(get(key))->asDoubleTag(); }; -class ByteArrayTag const* CompoundTag::getByteArrayTag(class gsl::basic_string_span key) const { +class ByteArrayTag const* CompoundTag::getByteArrayTag(std::string_view key) const { return const_cast(get(key))->asByteArrayTag(); }; -class IntArrayTag const* CompoundTag::getIntArrayTag(class gsl::basic_string_span key) const { +class IntArrayTag const* CompoundTag::getIntArrayTag(std::string_view key) const { return const_cast(get(key))->asIntArrayTag(); }; @@ -114,15 +115,15 @@ class IntArrayTag const* CompoundTag::getIntArrayTag(class gsl::basic_string_spa // return const_cast(get(key))->asStringTag(); // }; -class ListTag const* CompoundTag::getListTag(class gsl::basic_string_span key) const { +class ListTag const* CompoundTag::getListTag(std::string_view key) const { return getList(key); }; -class CompoundTag const* CompoundTag::getCompoundTag(class gsl::basic_string_span key) const { +class CompoundTag const* CompoundTag::getCompoundTag(std::string_view key) const { return getCompound(key); }; -Tag* CompoundTag::operator[](class gsl::basic_string_span key) { +Tag* CompoundTag::operator[](std::string_view key) { return get(key); } @@ -232,13 +233,14 @@ class BigEndianStringByteOutput { public: virtual ~BigEndianStringByteOutput() = default; ; - virtual void* writeString(gsl::basic_string_span string_span) { - return SymCall("?writeString@BytesDataOutput@@UEAAXV?$basic_string_span@$$CBD$0?0@gsl@@@Z", - void*, void*, gsl::basic_string_span)((void*)this, std::move(string_span)); + virtual void* writeString(std::string_view string_span) { + return SymCall("?writeString@BytesDataOutput@@UEAAXV?$basic_string_view@DU?$char_traits@D@std@@@std@@@Z", void*, + void*, std::string_view)((void*)this, std::move(string_span)); } - virtual void* writeLongString(gsl::basic_string_span string_span) { - return SymCall("?writeLongString@BytesDataOutput@@UEAAXV?$basic_string_span@$$CBD$0?0@gsl@@@Z", - void*, void*, gsl::basic_string_span)((void*)this, std::move(string_span)); + + virtual void* writeLongString(std::string_view string_span) { + return SymCall("?writeLongString@BytesDataOutput@@UEAAXV?$basic_string_view@DU?$char_traits@D@std@@@std@@@Z", void*, void*, + std::string_view)((void*)this, std::move(string_span)); } virtual void writeFloat(float data) { writeBigEndianBytes((byte*)&data, 4); diff --git a/LiteLoader/src/llapi/network/PacketAPI.cpp b/LiteLoader/src/llapi/network/PacketAPI.cpp index 06e53716d1..6e59770d2a 100644 --- a/LiteLoader/src/llapi/network/PacketAPI.cpp +++ b/LiteLoader/src/llapi/network/PacketAPI.cpp @@ -203,6 +203,9 @@ using ll::logger; #include "llapi/mc/GameTestResultsPacket.hpp" #include "llapi/mc/UpdateClientInputLocksPacket.hpp" #include "llapi/mc/ClientCheatAbilityPacket.hpp" +#include "llapi/mc/CameraPresetsPacket.hpp" +#include "llapi/mc/UnlockedRecipesPacket.hpp" +#include "llapi/mc/CameraInstructionPacket.hpp" #endif INCLUDE_ALL_PACKET @@ -400,7 +403,11 @@ using ll::logger; Func(GameTestRequestPacket); \ Func(GameTestResultsPacket); \ Func(UpdateClientInputLocksPacket); \ - Func(ClientCheatAbilityPacket) + Func(ClientCheatAbilityPacket) \ + Func(CameraPresetsPacket) \ + Func(UnlockedRecipesPacket) \ + Func(CameraInstructionPacket) + #define DeclearClass(packet) class packet; @@ -445,7 +452,7 @@ void __initPacketSize() { continue; \ } int packetId = -1; - while (packetId < 200) { + while (packetId < 500) { auto packet = MinecraftPackets::createPacket(++packetId); if (packet) { auto size = _msize((void**)packet.get() - 2); @@ -469,11 +476,11 @@ std::string getClassName(Packet* packet) { inline void forEachPacket(std::function callback) { int packetId = 0; - while (packetId < 200) { + while (packetId < 500) { auto packet = MinecraftPackets::createPacket(packetId); if (packet) { auto size = _msize((void**)packet.get() - 2); - // logger.warn("Packet: {},{},{},{},{}", magic_enum::enum_name((MinecraftPacketIds)packetId), packet->getName(), getClassName(packet.get()), packetId, size); + //logger.warn("Packet: {},{},{},{},{}", magic_enum::enum_name((MinecraftPacketIds)packetId), packet->getName(), getClassName(packet.get()), packetId, size); auto className = getClassName(packet.get()); callback(*packet, className, size - 16); @@ -643,7 +650,7 @@ static_assert(sizeof(ResourcePackClientResponsePacket) == 0x48, "size of Resourc static_assert(sizeof(TextPacket) == 0xD8, "size of TextPacket should be 216"); static_assert(sizeof(SetTimePacket) == 0x38, "size of SetTimePacket should be 56"); static_assert(sizeof(StartGamePacket) == 0x520, "size of StartGamePacket should be 1312"); -static_assert(sizeof(AddPlayerPacket) == 0x5E8, "size of AddPlayerPacket should be 1512"); +static_assert(sizeof(AddPlayerPacket) == 0x620, "size of AddPlayerPacket should be 1568"); static_assert(sizeof(AddActorPacket) == 0x1B0, "size of AddActorPacket should be 432"); static_assert(sizeof(RemoveActorPacket) == 0x38, "size of RemoveActorPacket should be 56"); static_assert(sizeof(AddItemActorPacket) == 0xE0, "size of AddItemActorPacket should be 224"); @@ -769,7 +776,7 @@ static_assert(sizeof(SettingsCommandPacket) == 0x58, "size of SettingsCommandPac 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(PlayerAuthInputPacket) == 0xB0, "size of PlayerAuthInputPacket should be 176"); +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"); static_assert(sizeof(ItemStackRequestPacket) == 0x38, "size of ItemStackRequestPacket should be 56"); @@ -822,6 +829,9 @@ static_assert(sizeof(GameTestRequestPacket) == 0x90, "size of GameTestRequestPac static_assert(sizeof(GameTestResultsPacket) == 0x78, "size of GameTestResultsPacket should be 120"); static_assert(sizeof(UpdateClientInputLocksPacket) == 0x40, "size of UpdateClientInputLocksPacket should be 64"); static_assert(sizeof(ClientCheatAbilityPacket) == 0x58, "size of ClientCheatAbilityPacket should be 88"); +static_assert(sizeof(CameraPresetsPacket) == 0x48, "size of CameraPresetsPacket should be 72"); +static_assert(sizeof(UnlockedRecipesPacket) == 0x50, "size of UnlockedRecipesPacket should be 80"); +static_assert(sizeof(CameraInstructionPacket) == 0x48, "size of CameraInstructionPacket should be 72"); #endif // SIZE_STATIC_ASSERT @@ -838,7 +848,7 @@ static_assert(sizeof(ResourcePackClientResponsePacket) == 0x48 || sizeof(Resourc static_assert(sizeof(TextPacket) == 0xD8 || sizeof(TextPacket) == 48, "size of TextPacket should be 216 or 48(default)"); static_assert(sizeof(SetTimePacket) == 0x38 || sizeof(SetTimePacket) == 48, "size of SetTimePacket should be 56 or 48(default)"); static_assert(sizeof(StartGamePacket) == 0x520 || sizeof(StartGamePacket) == 48, "size of StartGamePacket should be 1312 or 48(default)"); -static_assert(sizeof(AddPlayerPacket) == 0x5E8 || sizeof(AddPlayerPacket) == 48, "size of AddPlayerPacket should be 1512 or 48(default)"); +static_assert(sizeof(AddPlayerPacket) == 0x620 || sizeof(AddPlayerPacket) == 48, "size of AddPlayerPacket should be 1568 or 48(default)"); static_assert(sizeof(AddActorPacket) == 0x1B0 || sizeof(AddActorPacket) == 48, "size of AddActorPacket should be 432 or 48(default)"); static_assert(sizeof(RemoveActorPacket) == 0x38 || sizeof(RemoveActorPacket) == 48, "size of RemoveActorPacket should be 56 or 48(default)"); static_assert(sizeof(AddItemActorPacket) == 0xE0 || sizeof(AddItemActorPacket) == 48, "size of AddItemActorPacket should be 224 or 48(default)"); @@ -964,7 +974,7 @@ static_assert(sizeof(SettingsCommandPacket) == 0x58 || sizeof(SettingsCommandPac 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(PlayerAuthInputPacket) == 0xB0 || sizeof(PlayerAuthInputPacket) == 48, "size of PlayerAuthInputPacket should be 176 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)"); static_assert(sizeof(ItemStackRequestPacket) == 0x38 || sizeof(ItemStackRequestPacket) == 48, "size of ItemStackRequestPacket should be 56 or 48(default)"); @@ -1017,5 +1027,8 @@ static_assert(sizeof(GameTestRequestPacket) == 0x90 || sizeof(GameTestRequestPac static_assert(sizeof(GameTestResultsPacket) == 0x78 || sizeof(GameTestResultsPacket) == 48, "size of GameTestResultsPacket should be 120 or 48(default)"); static_assert(sizeof(UpdateClientInputLocksPacket) == 0x40 || sizeof(UpdateClientInputLocksPacket) == 48, "size of UpdateClientInputLocksPacket should be 64 or 48(default)"); static_assert(sizeof(ClientCheatAbilityPacket) == 0x58 || sizeof(ClientCheatAbilityPacket) == 48, "size of ClientCheatAbilityPacket should be 88 or 48(default)"); +static_assert(sizeof(CameraPresetsPacket) == 0x48 || sizeof(CameraPresetsPacket) == 48, "size of CameraPresetsPacket should be 72 or 48(default)"); +static_assert(sizeof(UnlockedRecipesPacket) == 0x50 || sizeof(UnlockedRecipesPacket) == 48, "size of UnlockedRecipesPacket should be 80 or 48(default)"); +static_assert(sizeof(CameraInstructionPacket) == 0x48 || sizeof(CameraInstructionPacket) == 48, "size of CameraInstructionPacket should be 72 or 48(default)"); #endif // SIZE_STATIC_ASSERT_IF_DEFINE diff --git a/LiteLoader/src/llapi/utils/GlobalService.cpp b/LiteLoader/src/llapi/utils/GlobalService.cpp index 0aa3b7af82..fcdce0648a 100644 --- a/LiteLoader/src/llapi/utils/GlobalService.cpp +++ b/LiteLoader/src/llapi/utils/GlobalService.cpp @@ -105,3 +105,12 @@ TInstanceHook(int, "?reload@AllowListFile@@QEAA?AW4FileReadResult@@XZ", AllowLis } // PropertiesSettings // -> BuiltinBugFix.cpp + +//StructureManager +#include "llapi/mc/StructureManager.hpp" +TInstanceHook(StructureManager*, "??0StructureManager@@QEAA@AEAVResourcePackManager@@@Z", StructureManager, + void* a1) { + StructureManager* result = original(this, a1); + Global = result; + return result; +} \ No newline at end of file diff --git a/LiteLoader/src/llapi/utils/NetworkHelper.cpp b/LiteLoader/src/llapi/utils/NetworkHelper.cpp index 9024957122..b63328465d 100644 --- a/LiteLoader/src/llapi/utils/NetworkHelper.cpp +++ b/LiteLoader/src/llapi/utils/NetworkHelper.cpp @@ -44,6 +44,7 @@ bool HttpGet(const string& url, const httplib::Headers& headers, const function< cli->set_connection_timeout(timeout, 0); std::thread([cli, headers, callback, path{std::move(path)}]() { + SetCurrentThreadDescription(L"LL_HttpGet_Thread"); if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); try { @@ -90,6 +91,7 @@ bool HttpPost(const string& url, const httplib::Headers& headers, const string& cli->set_connection_timeout(timeout, 0); std::thread([cli, headers, data, type, callback, path{std::move(path)}]() { + SetCurrentThreadDescription(L"LL_HttpPost_Thread"); if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); try { diff --git a/LiteLoader/src/llapi/utils/WinHelper.cpp b/LiteLoader/src/llapi/utils/WinHelper.cpp index 252df669bb..2e34dd1139 100644 --- a/LiteLoader/src/llapi/utils/WinHelper.cpp +++ b/LiteLoader/src/llapi/utils/WinHelper.cpp @@ -7,6 +7,7 @@ #include "llapi/LoggerAPI.h" #include "llapi/I18nAPI.h" +#include "llapi/LLAPI.h" #include "liteloader/Config.h" #include "liteloader/LiteLoader.h" @@ -79,6 +80,7 @@ bool NewProcess(const std::string& process, std::function { - 💻 Support for developing plugins in many different languages, Keeping the API uniform -| Supported languages | `C++`, `JavaScript(NodeJs)`, `Lua`, `.NET` | -| -------------------------------- |--------------------------------------------| -| **Upcoming supported languages** | `Python`, `Ruby`, `TypeScript`, `Go` | +| Supported languages | `C++`, `JavaScript(NodeJs)`, `Lua`, `Python`,`.NET` | +| -------------------------------- | --------------------------------------------------- | +| **Upcoming supported languages** | `Ruby`, `TypeScript`, `Golang` | - 📕 Smooth development experience with great compatibility - Auto-generated C++ headers, access to all `BDS` classes and functions, full toolchain support and evolving diff --git a/README_zh-cn.md b/README_zh-cn.md index aa96848547..f07393ac07 100644 --- a/README_zh-cn.md +++ b/README_zh-cn.md @@ -78,9 +78,9 @@ mc.listen("onServerStarted", () => { - 💻 支持多种不同的语言开发插件，保持接口统一 -| 目前已支持的插件开发语言 | `C++`、`JavaScript(NodeJs)`、`Lua` 、`.NET` | -| -------------------------- |------------------------------------------| -| **即将支持的插件开发语言** | `Python`、`Ruby`、`TypeScript`、`Go` | +| 目前已支持的插件开发语言 | `C++`、`JavaScript(NodeJs)`、`Lua` 、`Python`、`.NET` | +| -------------------------- | ----------------------------------------------------- | +| **即将支持的插件开发语言** | `Ruby`、`TypeScript`、`Golang` | - 📕 开发体验流畅，兼容性强 - 拥有自动生成的C++头文件，可以访问`BDS`所有的类和功能，拥有完善的工具链支持，且功能不断发展中 diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index cfcac7dda3..fc673ab1a3 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -1,23 +1,35 @@ -# Release 2.11.1 +# Release 2.12.0 -![BDS 1.19.63.01](https://img.shields.io/badge/BDS-1.19.63.01-blue?style=for-the-badge) ![Protocol 568](https://img.shields.io/badge/Protocol-568-orange?style=for-the-badge) +![BDS 1.19.72.01](https://img.shields.io/badge/BDS-1.19.72.01-blue?style=for-the-badge) ![Protocol 575](https://img.shields.io/badge/Protocol-575-orange?style=for-the-badge) + +# Warning +![BDS 1.19.70.02](https://img.shields.io/badge/NoSupport-1.19.70.02-red?style=for-the-badge)  + +## New Feature + +- ⭐LLSE Support Python plugins (by @yqs112358 @twoone-3) +- More docs to see: [📋 Multi Development Language Support (litebds.com)](https://docs.litebds.com/en/#/LLSEPluginDevelopment/LanguageSupport?id=python-language-support-description) + +## Adaptation + +- feat: adapt to 1.19.72/71 (#1126) (by @dreamguxiang) ## Added -* feat: add PosDelta for entity in LLSE (by OEOTYAN) -* feat: rename pl.sneaking & add be.name for LLSE (by @shishkevichd @OEOTYAN) -* feat: add Level::getDimensionPtr (by @OEOTYAN) +- feat: add templates and update StaticVanillaBlocks (#1116) (by @OEOTYAN) +- feat: #1112 (#1118) (by 3 people) +- feat: complete Ref.hpp & EntityId (by @OEOTYAN) +- feat: add some common functions (#1138) (by @OEOTYAN) +- feat: add SetCurrentThreadDescriptions to help debug (by @yqs112358) ## Changed -* feat: update WeakEntityRef.hpp (by @OEOTYAN) -* fix: fix a problem caused by HopperEvents (by @OEOTYAN) +- refactor: remove built-in packet filter (by @ShrBox) +- refactor: update MinecraftPacketIds (by @dreamguxiang) ## Fixed -* fix: Fix AddEfect #1100 (by @Tsubasa6848 @RimuruChan) -* fix: #1088 (by @Tsubasa6848 @OEOTYAN) -* fix: #959 (by @Tsubasa6848) -* feat: #1011 (by @Tsubasa6848 @Jasonzyt) +- fix: fix queryEntities (#1123) (by @OEOTYAN) +- fix: fix #1150 (by @dreamguxiang) -**Full Changelog**: https://github.com/LiteLDev/LiteLoaderBDS/compare/2.11.0...2.11.1 \ No newline at end of file +**Full Changelog**: https://github.com/LiteLDev/LiteLoaderBDS/compare/2.11.1...2.12.0-beta.1 diff --git a/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt index 6c4abd7d67..c669a92873 100644 --- a/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt +++ b/ScriptEngine/CMake/ScriptEngine-Lua/CMakeLists.txt @@ -20,3 +20,14 @@ add_custom_command( COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" VERBATIM ) + +if(NOT "${BDS_LOCAL_DEV_ENVIRONMENT_DIR}" STREQUAL "") + # copy target DLL and PDB to local bds dev directory + add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/LiteLoader.Lua.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/pdb/LiteLoader.Lua.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to local bds dev directory" + VERBATIM + ) +endif() \ No newline at end of file diff --git a/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt index 3d64299906..11862f9d41 100644 --- a/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt +++ b/ScriptEngine/CMake/ScriptEngine-NodeJs/CMakeLists.txt @@ -24,3 +24,14 @@ add_custom_command( COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" VERBATIM ) + +if(NOT "${BDS_LOCAL_DEV_ENVIRONMENT_DIR}" STREQUAL "") + # copy target DLL and PDB to local bds dev directory + add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/LiteLoader.NodeJs.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/pdb/LiteLoader.NodeJs.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to local bds dev directory" + VERBATIM + ) +endif() \ No newline at end of file diff --git a/ScriptEngine/CMake/ScriptEngine-Python/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-Python/CMakeLists.txt new file mode 100644 index 0000000000..331e20712c --- /dev/null +++ b/ScriptEngine/CMake/ScriptEngine-Python/CMakeLists.txt @@ -0,0 +1,33 @@ +cmake_minimum_required(VERSION 3.21) +project(ScriptEngine-Python) + +set(CMAKE_CXX_STANDARD 20) +set(CMAKE_BUILD_TYPE Release) + +set(LLSE_BACKEND PYTHON) +set(SCRIPTX_BACKEND Python) +set(LLSE_BACKEND_LIBRARY Python) + +include(../../CMakeLists.txt) + +target_include_directories(${PROJECT_NAME} PRIVATE ${SCRIPTENGINE_SOURCE_DIR}/third-party/backend/include/Python/) + +# copy target DLL and PDB to output directory +add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/output/plugins/LiteLoader/LiteLoader.Python.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${CMAKE_BINARY_DIR}/pdb/LiteLoader.Python.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" + VERBATIM +) + +if(NOT "${BDS_LOCAL_DEV_ENVIRONMENT_DIR}" STREQUAL "") + # copy target DLL and PDB to local bds dev directory + add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/LiteLoader.Python.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/pdb/LiteLoader.Python.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to local bds dev directory" + VERBATIM + ) +endif() \ No newline at end of file diff --git a/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt b/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt index 1036adc3ba..718520317e 100644 --- a/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt +++ b/ScriptEngine/CMake/ScriptEngine-QuickJs/CMakeLists.txt @@ -20,3 +20,14 @@ add_custom_command( COMMENT "Copying ${PROJECT_NAME} DLL and PDB to output directory" VERBATIM ) + +if(NOT "${BDS_LOCAL_DEV_ENVIRONMENT_DIR}" STREQUAL "") + # copy target DLL and PDB to local bds dev directory + add_custom_command( + TARGET ${PROJECT_NAME} POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/LiteLoader.Js.dll + COMMAND ${CMAKE_COMMAND} -E copy $ ${BDS_LOCAL_DEV_ENVIRONMENT_DIR}/plugins/LiteLoader/pdb/LiteLoader.Js.pdb + COMMENT "Copying ${PROJECT_NAME} DLL and PDB to local bds dev directory" + VERBATIM + ) +endif() \ No newline at end of file diff --git a/ScriptEngine/CMakeLists.txt b/ScriptEngine/CMakeLists.txt index fde15c31f0..dd97c0ae72 100644 --- a/ScriptEngine/CMakeLists.txt +++ b/ScriptEngine/CMakeLists.txt @@ -44,6 +44,8 @@ add_link_options( /DEBUG:FULL /DLL /MACHINE:X64 /OPT:REF /INCREMENTAL:NO /SUBSYSTEM:WINDOWS /MANIFESTUAC:NO /OPT:ICF /ERRORREPORT:PROMPT /NOLOGO /TLBID:1 + /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libcd.lib + /NODEFAULTLIB:libcmtd.lib /NODEFAULTLIB:msvcrtd.lib /DELAYLOAD:bedrock_server.dll # use delayload to import BDS APIs manually(bedrock_server.dll does not need to exist) ) diff --git a/ScriptEngine/assets/BaseLib.js b/ScriptEngine/assets/BaseLib.js index 73adf2e89c..adbb7e52fe 100644 --- a/ScriptEngine/assets/BaseLib.js +++ b/ScriptEngine/assets/BaseLib.js @@ -411,3 +411,5 @@ globalThis.LXL_CustomForm = LLSE_CustomForm; globalThis.LXL_Item = LLSE_Item; globalThis.LXL_Player = LLSE_Player; globalThis.LXL_Objective = LLSE_Objective; +ll.export = ll.exports; +ll.import = ll.imports; \ No newline at end of file diff --git a/ScriptEngine/assets/BaseLib.lua b/ScriptEngine/assets/BaseLib.lua index 5c9596b96a..a0469e3f86 100644 --- a/ScriptEngine/assets/BaseLib.lua +++ b/ScriptEngine/assets/BaseLib.lua @@ -20,3 +20,5 @@ LXL_CustomForm = LLSE_CustomForm LXL_Item = LLSE_Item LXL_Player = LLSE_Player LXL_Objective = LLSE_Objective +ll.export = ll.exports +ll.import = ll.imports \ No newline at end of file diff --git a/ScriptEngine/assets/BaseLib.py b/ScriptEngine/assets/BaseLib.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ScriptEngine/src/api/APIHelp.h b/ScriptEngine/src/api/APIHelp.h index a01fd2de74..60b928b5b0 100644 --- a/ScriptEngine/src/api/APIHelp.h +++ b/ScriptEngine/src/api/APIHelp.h @@ -18,7 +18,7 @@ // 输出异常信息 inline void PrintException(const script::Exception& e) { ostringstream sout; - sout << "script::Exception "; + sout << "script::Exception: "; sout << e; logger.error(sout.str()); } diff --git a/ScriptEngine/src/api/EntityAPI.cpp b/ScriptEngine/src/api/EntityAPI.cpp index 94bc553139..5ce6fa2a07 100644 --- a/ScriptEngine/src/api/EntityAPI.cpp +++ b/ScriptEngine/src/api/EntityAPI.cpp @@ -21,6 +21,8 @@ #include #include #include +#include +#include #include using magic_enum::enum_integer; @@ -71,8 +73,6 @@ ClassDefine EntityClassBuilder = .instanceProperty("isAngry", &EntityClass::isAngry) .instanceProperty("isBaby", &EntityClass::isBaby) .instanceProperty("isMoving", &EntityClass::isMoving) - .instanceProperty("getBiomeName", &EntityClass::getBiomeName) - .instanceProperty("getBiomeId", &EntityClass::getBiomeId) .instanceFunction("teleport", &EntityClass::teleport) .instanceFunction("kill", &EntityClass::kill) @@ -114,6 +114,8 @@ ClassDefine EntityClassBuilder = .instanceFunction("getAllTags", &EntityClass::getAllTags) .instanceFunction("getEntityFromViewVector", &EntityClass::getEntityFromViewVector) .instanceFunction("getBlockFromViewVector", &EntityClass::getBlockFromViewVector) + .instanceFunction("getBiomeName", &EntityClass::getBiomeName) + .instanceFunction("getBiomeId", &EntityClass::getBiomeId) .instanceFunction("quickEvalMolangScript", &EntityClass::quickEvalMolangScript) // For Compatibility @@ -188,9 +190,7 @@ std::optional EntityClass::tryExtractActor(Local v) { void EntityClass::set(Actor* actor) { __try { id = actor->getUniqueID(); - } __except (EXCEPTION_EXECUTE_HANDLER) { - isValid = false; - } + } __except (EXCEPTION_EXECUTE_HANDLER) { isValid = false; } } Actor* EntityClass::get() { @@ -982,8 +982,7 @@ Local EntityClass::getBlockStandingOn(const Arguments& args) { if (!entity) return Local(); - return BlockClass::newBlock(entity->getBlockPosCurrentlyStandingOn(nullptr), - (int)entity->getDimensionId()); + return BlockClass::newBlock(entity->getBlockPosCurrentlyStandingOn(nullptr), (int)entity->getDimensionId()); } CATCH("Fail in getBlockStandingOn!"); } @@ -1516,6 +1515,89 @@ Local McClass::getAllEntities(const Arguments& args) { CATCH("Fail in GetAllEntities"); } +Local McClass::getEntities(const Arguments& args) { + try { + int dim; + float dis = 2.0f; + AABB aabb; + if (args.size() > 0) { + + if (IsInstanceOf(args[0])) { + // IntPos + IntPos* posObj = IntPos::extractPos(args[0]); + + aabb.min = posObj->getBlockPos().toVec3(); + dim = posObj->dim; + + } else if (IsInstanceOf(args[0])) { + // FloatPos + FloatPos* posObj = FloatPos::extractPos(args[0]); + aabb.min = posObj->getVec3(); + dim = posObj->dim; + } else { + LOG_WRONG_ARG_TYPE(); + return Local(); + } + if (args.size() > 1) { + if (IsInstanceOf(args[1])) { + // IntPos + IntPos* posObj = IntPos::extractPos(args[1]); + if (dim != posObj->dim) { + LOG_ERROR_WITH_SCRIPT_INFO("Wrong Dimension!"); + return Local(); + } + aabb.max = posObj->getBlockPos().toVec3()+1; + dim = posObj->dim; + + } else if (IsInstanceOf(args[1])) { + // FloatPos + FloatPos* posObj = FloatPos::extractPos(args[1]); + if(dim != posObj->dim){ + LOG_ERROR_WITH_SCRIPT_INFO("Wrong Dimension!"); + return Local(); + } + aabb.max = posObj->getVec3(); + dim = posObj->dim; + } else if (args[1].getKind() == ValueKind::kNumber) { + aabb.max = aabb.min + 1; + dis = args[1].asNumber().toFloat(); + } else { + LOG_WRONG_ARG_TYPE(); + return Local(); + } + if (args.size() > 2) { + if (args[2].getKind() == ValueKind::kNumber) { + dis = args[1].asNumber().toFloat(); + } else { + LOG_WRONG_ARG_TYPE(); + return Local(); + } + } else { + aabb.max = aabb.min + 1; + } + } else { + aabb.max = aabb.min + 1; + } + } else { + LOG_TOO_FEW_ARGS(); + return Local(); + } + + auto arr = Array::newArray(); + auto* bs = Level::getBlockSource(dim); + if(bs == nullptr) { + LOG_ERROR_WITH_SCRIPT_INFO("Wrong Dimension!"); + return Local(); + } + auto entityList = bs->getEntities(aabb, dis); + for (auto i : entityList) { + arr.add(EntityClass::newEntity(i)); + } + return arr; + } + CATCH("Fail in GetAllEntities"); +} + Local McClass::cloneMob(const Arguments& args) { CHECK_ARGS_COUNT(args, 2); @@ -1668,7 +1750,8 @@ Local McClass::explode(const Arguments& args) { CHECK_ARG_TYPE(args[1], ValueKind::kNumber); CHECK_ARG_TYPE(args[2], ValueKind::kNumber); CHECK_ARG_TYPE(args[3], ValueKind::kNumber); - pos = {args[0].asNumber().toFloat(), args[1].asNumber().toFloat(), args[2].asNumber().toFloat(), args[3].toInt()}; + pos = {args[0].asNumber().toFloat(), args[1].asNumber().toFloat(), args[2].asNumber().toFloat(), + args[3].toInt()}; } else { LOG_WRONG_ARGS_COUNT(); return Local(); @@ -1687,4 +1770,4 @@ Local McClass::explode(const Arguments& args) { return Boolean::newBoolean(Level::createExplosion(pos.getVec3(), pos.dim, source, power, isFire, isDestroy)); } CATCH("Fail in Explode!"); -} \ No newline at end of file +} diff --git a/ScriptEngine/src/api/EventAPI.cpp b/ScriptEngine/src/api/EventAPI.cpp index 613043ce1f..62898018de 100644 --- a/ScriptEngine/src/api/EventAPI.cpp +++ b/ScriptEngine/src/api/EventAPI.cpp @@ -16,6 +16,7 @@ #include "main/BuiltinCommands.h" #include "api/APIHelp.h" #include "main/NodeJsHelper.h" +#include "main/PythonHelper.h" #include "api/BaseAPI.h" #include "api/BlockAPI.h" #include "api/GuiAPI.h" @@ -1199,8 +1200,10 @@ void InitBasicEventListeners() { #ifdef LLSE_BACKEND_NODEJS if (!NodeJsHelper::processConsoleNpmCmd(ev.mCommand)) return false; +#elif defined(LLSE_BACKEND_PYTHON) + if (!PythonHelper::processConsolePipCmd(ev.mCommand)) + return false; #endif - // CallEvents vector paras; bool isFromOtherEngine = false; @@ -1238,8 +1241,10 @@ void InitBasicEventListeners() { case ScriptPluginManagerEvent::Operation::Load: // ev.pluginType is not used // since in loadPlugin there will be check - if (PluginManager::loadPlugin(ev.target, true, true)) - ev.success = true; + try { + if (PluginManager::loadPlugin(ev.target, true, true)) + ev.success = true; + } catch(...) {} break; case ScriptPluginManagerEvent::Operation::Unload: @@ -1278,38 +1283,34 @@ void InitBasicEventListeners() { IF_LISTENED_END(EVENT_TYPES::onServerStarted); return true; }); -} - -inline bool CallTickEvent() { - IF_LISTENED(EVENT_TYPES::onTick) { - CallEvent(EVENT_TYPES::onTick); - } - IF_LISTENED_END(EVENT_TYPES::onTick); -} -// 植入tick -TClasslessInstanceHook(void, "?tick@ServerLevel@@UEAAXXZ") { + // 植入tick + Schedule::repeat([](){ #ifndef LLSE_BACKEND_NODEJS - try { - std::list tmpList; - { - SRWLockSharedHolder lock(globalShareData->engineListLock); - // low efficiency - tmpList = globalShareData->globalEngineList; - } - for (auto engine : tmpList) { - if (EngineManager::isValid(engine) && EngineManager::getEngineType(engine) == LLSE_BACKEND_TYPE) { - EngineScope enter(engine); - engine->messageQueue()->loopQueue(script::utils::MessageQueue::LoopType::kLoopOnce); + try { + std::list tmpList; + { + SRWLockSharedHolder lock(globalShareData->engineListLock); + // low efficiency + tmpList = globalShareData->globalEngineList; + } + for (auto engine : tmpList) { + if (EngineManager::isValid(engine) && EngineManager::getEngineType(engine) == LLSE_BACKEND_TYPE) { + EngineScope enter(engine); + engine->messageQueue()->loopQueue(script::utils::MessageQueue::LoopType::kLoopOnce); + } } + } catch (...) { + logger.error("Error occurred in Engine Message Loop!"); + logger.error("Uncaught Exception Detected!"); } - } catch (...) { - logger.error("Error occurred in Engine Message Loop!"); - logger.error("Uncaught Exception Detected!"); - } #endif - CallTickEvent(); - return original(this); + // Call tick event + IF_LISTENED(EVENT_TYPES::onTick) { + CallEvent(EVENT_TYPES::onTick); + } + IF_LISTENED_END(EVENT_TYPES::onTick); + }, 1); } /* onTurnLectern // 由于还是不能拦截掉书，暂时注释 diff --git a/ScriptEngine/src/api/FileSystemAPI.cpp b/ScriptEngine/src/api/FileSystemAPI.cpp index 9e857f905a..8428709ea1 100644 --- a/ScriptEngine/src/api/FileSystemAPI.cpp +++ b/ScriptEngine/src/api/FileSystemAPI.cpp @@ -256,6 +256,7 @@ Local FileClass::read(const Arguments& args) { pool.enqueue([cnt, fp{&file}, isBinary{isBinary}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { + SetCurrentThreadDescription(L"LLSE_FileRead_" _CRT_WIDE(LLSE_MODULE_TYPE)); if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) @@ -275,6 +276,7 @@ Local FileClass::read(const Arguments& args) { NewTimeout(callback.get(), {res}, 1); } CATCH_IN_CALLBACK("ReadFile") + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } @@ -290,6 +292,7 @@ Local FileClass::readLine(const Arguments& args) { pool.enqueue([fp{&file}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { + SetCurrentThreadDescription(L"LLSE_FileReadLine_" _CRT_WIDE(LLSE_MODULE_TYPE)); if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) @@ -305,6 +308,7 @@ Local FileClass::readLine(const Arguments& args) { NewTimeout(callback.get(), {String::newString(buf)}, 1); } CATCH_IN_CALLBACK("FileReadLine") + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } @@ -320,6 +324,7 @@ Local FileClass::readAll(const Arguments& args) { pool.enqueue([fp{&file}, isBinary{isBinary}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { + SetCurrentThreadDescription(L"LLSE_FileReadAll_" _CRT_WIDE(LLSE_MODULE_TYPE)); if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) @@ -335,6 +340,7 @@ Local FileClass::readAll(const Arguments& args) { NewTimeout(callback.get(), {readed}, 1); } CATCH_IN_CALLBACK("FileReadAll") + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } @@ -365,6 +371,7 @@ Local FileClass::write(const Arguments& args) { pool.enqueue([fp{&file}, lock{&lock}, data{std::move(data)}, isString, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { + SetCurrentThreadDescription(L"LLSE_FileWrite_" _CRT_WIDE(LLSE_MODULE_TYPE)); if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) @@ -385,6 +392,7 @@ Local FileClass::write(const Arguments& args) { } CATCH_IN_CALLBACK("WriteFile") } + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } @@ -406,6 +414,7 @@ Local FileClass::writeLine(const Arguments& args) { pool.enqueue([fp{&file}, lock{&lock}, data{std::move(data)}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}]() { + SetCurrentThreadDescription(L"LLSE_FileWriteLine_" _CRT_WIDE(LLSE_MODULE_TYPE)); if (ll::isServerStopping()) return; if (!EngineManager::isValid(engine)) @@ -423,6 +432,7 @@ Local FileClass::writeLine(const Arguments& args) { } CATCH_IN_CALLBACK("FileWriteLine") } + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } @@ -486,9 +496,11 @@ Local FileClass::isEOF(const Arguments& args) { Local FileClass::flush(const Arguments& args) { try { pool.enqueue([fp{&file}, lock{&lock}]() { + SetCurrentThreadDescription(L"LLSE_FileFlush_" _CRT_WIDE(LLSE_MODULE_TYPE)); lock->lock(); fp->flush(); lock->unlock(); + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } diff --git a/ScriptEngine/src/api/LlAPI.cpp b/ScriptEngine/src/api/LlAPI.cpp index 5009d5327f..d048465164 100644 --- a/ScriptEngine/src/api/LlAPI.cpp +++ b/ScriptEngine/src/api/LlAPI.cpp @@ -34,8 +34,8 @@ ClassDefine LlClassBuilder = .function("requireVersion", &LlClass::requireVersion) .function("listPlugins", &LlClass::listPlugins) .function("getAllPluginInfo", &LlClass::getAllPluginInfo) - .function("import", &LlClass::importFunc) - .function("export", &LlClass::exportFunc) + .function("imports", &LlClass::importFunc) + .function("exports", &LlClass::exportFunc) .function("hasExported", &LlClass::hasFuncExported) .function("require", &LlClass::require) .function("eval", &LlClass::eval) diff --git a/ScriptEngine/src/api/McAPI.cpp b/ScriptEngine/src/api/McAPI.cpp index e2808478e3..d31a89b0ec 100644 --- a/ScriptEngine/src/api/McAPI.cpp +++ b/ScriptEngine/src/api/McAPI.cpp @@ -13,6 +13,7 @@ ClassDefine McClassBuilder = .function("getPlayer", &McClass::getPlayer) .function("getOnlinePlayers", &McClass::getOnlinePlayers) .function("getAllEntities", McClass::getAllEntities) + .function("getEntities", McClass::getEntities) .function("newItem", &McClass::newItem) .function("spawnMob", &McClass::spawnMob) .function("cloneMob", &McClass::cloneMob) diff --git a/ScriptEngine/src/api/McAPI.h b/ScriptEngine/src/api/McAPI.h index e5ecb6a381..02f06c858c 100644 --- a/ScriptEngine/src/api/McAPI.h +++ b/ScriptEngine/src/api/McAPI.h @@ -19,6 +19,7 @@ class McClass { static Local getPlayer(const Arguments& args); static Local getOnlinePlayers(const Arguments& args); static Local getAllEntities(const Arguments& args); + static Local getEntities(const Arguments& args); static Local newItem(const Arguments& args); static Local spawnMob(const Arguments& args); diff --git a/ScriptEngine/src/api/NetworkAPI.cpp b/ScriptEngine/src/api/NetworkAPI.cpp index 23bc699395..9bffcab15a 100644 --- a/ScriptEngine/src/api/NetworkAPI.cpp +++ b/ScriptEngine/src/api/NetworkAPI.cpp @@ -273,11 +273,10 @@ Local WSClientClass::connectAsync(const Arguments& args) { RecordOperation(ENGINE_OWN_DATA()->pluginName, "ConnectToWebsocketServer", target); script::Global callbackFunc{args[1].asFunction()}; - thread( + std::thread( [ws{this->ws}, target, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}, pluginName{ENGINE_OWN_DATA()->pluginName}]() mutable { -#ifdef DEBUG - SetThreadDescription(GetCurrentThread(), L"LLSE Connect WebSocket"); -#endif // DEBUG + + SetCurrentThreadDescription(L"LLSE_WebSocket_Connect_Thread"); if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); try { @@ -682,7 +681,8 @@ Local HttpServerClass::listen(const Arguments& args) { RecordOperation(ENGINE_OWN_DATA()->pluginName, "StartHttpServer", fmt::format("on {}:{}", addr, port)); - thread th([this](string addr, int port) { + std::thread th([this](string addr, int port) { + SetCurrentThreadDescription(L"LLSE_HttpServer_Listen_Thread"); svr->listen(addr.c_str(), port); }, addr, port); diff --git a/ScriptEngine/src/api/PlayerAPI.cpp b/ScriptEngine/src/api/PlayerAPI.cpp index 1cfe71ecb2..08946592ad 100644 --- a/ScriptEngine/src/api/PlayerAPI.cpp +++ b/ScriptEngine/src/api/PlayerAPI.cpp @@ -2549,13 +2549,15 @@ Local PlayerClass::giveItem(const Arguments& args) { Local PlayerClass::clearItem(const Arguments& args) { CHECK_ARGS_COUNT(args, 1); CHECK_ARG_TYPE(args[0], ValueKind::kString); + CHECK_ARG_TYPE(args[1], ValueKind::kNumber); try { Player* player = get(); - if (!player) + if (!player) { return Local(); - - return Number::newNumber(player->clearItem(args[0].toStr())); + } + return Number::newNumber( + (int32_t)player->clearItem(args[0].toStr(), args.size() == 1 ? 1 : args[1].asNumber().toInt32())); } CATCH("Fail in clearItem!"); } diff --git a/ScriptEngine/src/api/ScriptAPI.cpp b/ScriptEngine/src/api/ScriptAPI.cpp index fe8d112d9e..d4010215c4 100644 --- a/ScriptEngine/src/api/ScriptAPI.cpp +++ b/ScriptEngine/src/api/ScriptAPI.cpp @@ -106,8 +106,10 @@ Local FastLog(const Arguments& args) { PrintValue(sout, args[i]); pool.enqueue([str{sout.str()}, pluginName{ENGINE_OWN_DATA()->pluginName}]() { + SetCurrentThreadDescription(L"LLSE_FastLog_" _CRT_WIDE(LLSE_MODULE_TYPE)); Logger fastLogger(pluginName); fastLogger.info(str); + SetCurrentThreadDescription(L"LLSE_ThreadPool_Idle_" _CRT_WIDE(LLSE_MODULE_TYPE)); }); return Boolean::newBoolean(true); } diff --git a/ScriptEngine/src/engine/MessageSystem.cpp b/ScriptEngine/src/engine/MessageSystem.cpp index 74bc23480d..5afad0b0b1 100644 --- a/ScriptEngine/src/engine/MessageSystem.cpp +++ b/ScriptEngine/src/engine/MessageSystem.cpp @@ -312,9 +312,8 @@ void InitMessageSystem() { // dangerous? std::thread([]() { -#ifdef DEBUG - SetThreadDescription(GetCurrentThread(), L"LLSE MessageSystem " _CRT_WIDE(LLSE_MODULE_TYPE)); -#endif // DEBUG + SetCurrentThreadDescription(L"LLSE_MessageSystemLoop_" _CRT_WIDE(LLSE_MODULE_TYPE)); + // Set global SEH-Exception handler if (!ll::isDebugMode()) _set_se_translator(seh_exception::TranslateSEHtoCE); diff --git a/ScriptEngine/src/main/BuiltinCommands.cpp b/ScriptEngine/src/main/BuiltinCommands.cpp index b26e7929d9..8b24b89f27 100644 --- a/ScriptEngine/src/main/BuiltinCommands.cpp +++ b/ScriptEngine/src/main/BuiltinCommands.cpp @@ -3,33 +3,42 @@ #include #include #include +#ifdef LLSE_BACKEND_PYTHON +#include "PythonHelper.h" +#endif using namespace std; + extern Logger logger; +extern bool isInConsoleDebugMode; +extern ScriptEngine* debugEngine; + +#define OUTPUT_DEBUG_SIGN() std::cout << "> " << std::flush bool ProcessDebugEngine(const std::string& cmd) { -#define OUTPUT_DEBUG_SIGN() std::cout << "> " << std::flush - extern bool globalDebug; - extern ScriptEngine* debugEngine; +#ifdef LLSE_BACKEND_PYTHON + // process python debug seperately + return PythonHelper::processPythonDebugEngine(cmd); +#endif if (cmd == LLSE_DEBUG_CMD) { - if (globalDebug) + if (isInConsoleDebugMode) { //EndDebug logger.info("Debug mode ended"); - globalDebug = false; + isInConsoleDebugMode = false; } else { //StartDebug logger.info("Debug mode begins"); - globalDebug = true; + isInConsoleDebugMode = true; OUTPUT_DEBUG_SIGN(); } return false; } - if (globalDebug) + if (isInConsoleDebugMode) { EngineScope enter(debugEngine); try diff --git a/ScriptEngine/src/main/Configs.h b/ScriptEngine/src/main/Configs.h index a526a8a367..9daf31825a 100644 --- a/ScriptEngine/src/main/Configs.h +++ b/ScriptEngine/src/main/Configs.h @@ -20,39 +20,49 @@ #define LLSE_BACKEND_NODEJS_NAME "NodeJs" #define LLSE_BACKEND_JS_NAME "Js" #define LLSE_BACKEND_LUA_NAME "Lua" +#define LLSE_BACKEND_PYTHON_NAME "Python" #if defined(LLSE_BACKEND_QUICKJS) // QuickJs #define LLSE_BACKEND_TYPE LLSE_BACKEND_JS_NAME - #define LLSE_PLUGINS_EXTENSION ".js" + #define LLSE_SOURCE_FILE_EXTENSION ".js" #define LLSE_PLUGINS_ROOT_DIR "plugins" #define LLSE_IS_PLUGIN_PACKAGE 0 #elif defined(LLSE_BACKEND_LUA) // Lua #define LLSE_BACKEND_TYPE LLSE_BACKEND_LUA_NAME - #define LLSE_PLUGINS_EXTENSION ".lua" + #define LLSE_SOURCE_FILE_EXTENSION ".lua" #define LLSE_PLUGINS_ROOT_DIR "plugins" #define LLSE_IS_PLUGIN_PACKAGE 0 #elif defined(LLSE_BACKEND_NODEJS) // NodeJs #define LLSE_BACKEND_TYPE LLSE_BACKEND_NODEJS_NAME - #define LLSE_PLUGINS_EXTENSION LLSE_PLUGIN_PACKAGE_EXTENSION + #define LLSE_SOURCE_FILE_EXTENSION ".js" #define LLSE_PLUGINS_ROOT_DIR "plugins/nodejs" #define LLSE_IS_PLUGIN_PACKAGE 1 + +#elif defined(LLSE_BACKEND_PYTHON) +// Python + #define LLSE_BACKEND_TYPE LLSE_BACKEND_PYTHON_NAME + #define LLSE_SOURCE_FILE_EXTENSION ".py" + #define LLSE_PLUGINS_ROOT_DIR "plugins/python" + #define LLSE_IS_PLUGIN_PACKAGE 1 #endif // Language specific information #define LLSE_NODEJS_ROOT_DIR "plugins/nodejs" +#define LLSE_PYTHON_ROOT_DIR "plugins/python" // All backends information #define LLSE_MODULE_TYPE LLSE_BACKEND_TYPE -#define LLSE_VALID_BACKENDS std::vector({"Js", "Lua", "NodeJs"}) -#define LLSE_VALID_PLUGIN_EXTENSIONS std::vector({".js", ".lua", ""}) -#define LLSE_VALID_PLUGIN_PACKAGE_IDENTIFIER std::vector({"", "", "package.json"}) +#define LLSE_VALID_BACKENDS std::vector({"Js", "Lua", "NodeJs", "Python"}) +#define LLSE_VALID_PLUGIN_EXTENSIONS std::vector({".js", ".lua", "", ".py"}) +#define LLSE_VALID_PLUGIN_PACKAGE_IDENTIFIER \ + std::vector({"", "", "package.json", "pyproject.toml"}) #define LLSE_VALID_BACKENDS_COUNT LLSE_VALID_BACKENDS.size() @@ -66,6 +76,9 @@ #elif defined(LLSE_BACKEND_LUA) #define LLSE_LOADER_NAME "ScriptEngine-Lua" #define LLSE_LOADER_DESCRIPTION "Lua ScriptEngine for LiteLoaderBDS" +#elif defined(LLSE_BACKEND_PYTHON) + #define LLSE_LOADER_NAME "ScriptEngine-Python" + #define LLSE_LOADER_DESCRIPTION "Python ScriptEngine for LiteLoaderBDS" #endif @@ -76,6 +89,8 @@ #define LLSE_DEBUG_CMD "jsdebug" #elif defined(LLSE_BACKEND_LUA) #define LLSE_DEBUG_CMD "luadebug" +#elif defined(LLSE_BACKEND_PYTHON) + #define LLSE_DEBUG_CMD "pydebug" #endif #define LLSE_DEBUG_ENGINE_NAME "__LLSE_DEBUG_ENGINE__" diff --git a/ScriptEngine/src/main/Loader.cpp b/ScriptEngine/src/main/Loader.cpp index 3306c4d8d3..9d21fa3d9e 100644 --- a/ScriptEngine/src/main/Loader.cpp +++ b/ScriptEngine/src/main/Loader.cpp @@ -22,7 +22,7 @@ std::unordered_map depends; // Debug engine ScriptEngine* debugEngine; -bool globalDebug = false; +bool isInConsoleDebugMode = false; // Pre-declared extern void BindAPIs(ScriptEngine* engine); @@ -35,7 +35,7 @@ void LoadDepends() { std::filesystem::directory_iterator deps(LLSE_DEPENDS_DIR); for (auto& i : deps) { - if (i.is_regular_file() && i.path().filename() == string("BaseLib") + LLSE_PLUGINS_EXTENSION) { + if (i.is_regular_file() && i.path().filename() == string("BaseLib") + LLSE_SOURCE_FILE_EXTENSION) { try { auto path = UTF82String(i.path().generic_u8string()); auto content = ReadAllFile(path); @@ -74,7 +74,8 @@ void LoadDebugEngine() { // Load baselibs try { for (auto& [path, content] : depends) { - debugEngine->eval(content, path); + if(!content.empty()) + debugEngine->eval(content, path); } } catch (const Exception& e) { logger.error("Fail in Loading Dependence Lib!\n"); @@ -98,9 +99,11 @@ void LoadMain() { int count = 0; std::filesystem::directory_iterator files(LLSE_PLUGINS_LOAD_DIR); for (auto& i : files) { - if (i.is_regular_file() && i.path().extension() == LLSE_PLUGINS_EXTENSION) { - if (PluginManager::loadPlugin(UTF82String(i.path().generic_u8string()), false, true)) - ++count; + if (i.is_regular_file() && i.path().extension() == LLSE_SOURCE_FILE_EXTENSION) { + try{ + if (PluginManager::loadPlugin(UTF82String(i.path().generic_u8string()), false, true)) + ++count; + }catch(...){} } } logger.info(tr("llse.loader.loadMain.done", @@ -110,7 +113,6 @@ void LoadMain() { } - #ifdef LLSE_BACKEND_NODEJS // NodeJs后端 - 主加载 void LoadMain_NodeJs() { @@ -122,14 +124,18 @@ void LoadMain_NodeJs() { std::filesystem::directory_iterator files(LLSE_PLUGINS_ROOT_DIR); for (auto& i : files) { std::filesystem::path pth = i.path(); + std::string targetDirStr = UTF82String(pth.make_preferred().u8string()); if (i.is_directory() && pth.filename() != "node_modules") { if (std::filesystem::exists(pth / "package.json")) { - if (PluginManager::loadPlugin(UTF82String(pth.u8string()), false, true)) { - ++count; - } + try{ + if (PluginManager::loadPlugin(targetDirStr, false, true)) { + ++count; + } + }catch(...){} } else { - logger.warn(tr("llse.loader.loadMain.nodejs.ignored", UTF82String(pth.filename().u8string()))); + logger.warn(tr("llse.loader.loadMain.nodejs.ignored", + fmt::arg("path", targetDirStr))); } } } @@ -139,13 +145,21 @@ void LoadMain_NodeJs() { files = std::filesystem::directory_iterator(LLSE_PLUGINS_LOAD_DIR); for (auto& i : files) { std::filesystem::path pth = i.path(); - if (i.is_regular_file() && EndsWith(UTF82String(pth.u8string()), LLSE_PLUGIN_PACKAGE_EXTENSION)) { + std::string packFilePathStr = UTF82String(pth.make_preferred().u8string()); + if (i.is_regular_file() && EndsWith(packFilePathStr, LLSE_PLUGIN_PACKAGE_EXTENSION)) { logger.info(tr("llse.loader.loadMain.nodejs.installPack.start", - fmt::arg("path", UTF82String(pth.u8string())))); - if (!PluginManager::loadPlugin(UTF82String(pth.u8string()), false, true)) { - logger.error(tr("llse.loader.loadMain.nodejs.installPack.fail")); + fmt::arg("path", packFilePathStr))); + try{ + if (!PluginManager::loadPlugin(packFilePathStr, false, true)) { + logger.error(tr("llse.loader.loadMain.nodejs.installPack.fail", packFilePathStr)); + } + ++count; + ++installCount; + }catch(...) { + // not matched backend type + logger.warn(tr("llse.loader.loadMain.nodejs.ignored", + fmt::arg("path", packFilePathStr))); } - ++installCount; } } @@ -155,11 +169,83 @@ void LoadMain_NodeJs() { } #endif + +#ifdef LLSE_BACKEND_PYTHON +// Python后端 - 主加载 +void LoadMain_Python() { + logger.info(tr("llse.loader.loadMain.start", fmt::arg("type", "Python"))); + int installCount = 0; + int count = 0; + + // Load plugins in PYTHON_ROOT_DIR + std::filesystem::directory_iterator files(LLSE_PLUGINS_ROOT_DIR); + for (auto& i : files) { + std::filesystem::path pth = i.path(); + std::string targetDirStr = UTF82String(pth.make_preferred().u8string()); + if (i.is_directory() && pth.filename() != "site-packages") { + if (std::filesystem::exists(pth / "pyproject.toml")) { + try{ + if (PluginManager::loadPlugin(targetDirStr, false, true)) { + ++count; + } + }catch(...) {} + } + else { + logger.warn(tr("llse.loader.loadMain.python.ignored", + fmt::arg("path", targetDirStr))); + } + } + } + + // Unpack .llplugin & install + // Tips: Must after plugins loaded in PYTHON_ROOT_DIR + files = std::filesystem::directory_iterator(LLSE_PLUGINS_LOAD_DIR); + for (auto& i : files) { + std::filesystem::path pth = i.path(); + std::string packFilePathStr = UTF82String(pth.make_preferred().u8string()); + if (i.is_regular_file() && EndsWith(packFilePathStr, LLSE_PLUGIN_PACKAGE_EXTENSION)) { + logger.info(tr("llse.loader.loadMain.python.installPack.start", + fmt::arg("path", packFilePathStr))); + try{ + if (!PluginManager::loadPlugin(packFilePathStr, false, true)) { + logger.error(tr("llse.loader.loadMain.python.installPack.fail", packFilePathStr)); + } + ++count; + ++installCount; + }catch(...) { + // not matched backend type + logger.warn(tr("llse.loader.loadMain.python.ignored", packFilePathStr)); + } + } + } + + // Load single-file plugin + files = std::filesystem::directory_iterator(LLSE_PLUGINS_LOAD_DIR); + for (auto& i : files) { + if (i.is_regular_file() && i.path().extension() == LLSE_SOURCE_FILE_EXTENSION) { + try { + if (PluginManager::loadPlugin(UTF82String(i.path().generic_u8string()), false, true)) + ++count; + }catch(...){} + } + } + + logger.info(tr("llse.loader.loadMain.done", + fmt::arg("count", count), + fmt::arg("type", "Python"))); +} +#endif + + void LoadMain_Package() { #ifdef LLSE_BACKEND_NODEJS // Process NodeJs backend's plugin load separately LoadMain_NodeJs(); return; +#elif defined(LLSE_BACKEND_PYTHON) + // Process Python backend's plugin load separately + LoadMain_Python(); + return; #endif } \ No newline at end of file diff --git a/ScriptEngine/src/main/NodeJsHelper.cpp b/ScriptEngine/src/main/NodeJsHelper.cpp index a427e99ce4..52e7cf5ff8 100644 --- a/ScriptEngine/src/main/NodeJsHelper.cpp +++ b/ScriptEngine/src/main/NodeJsHelper.cpp @@ -128,6 +128,7 @@ bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, s string executeJs = "const __LLSE_PublicRequire = require('module').createRequire(process.cwd() + '/" + pluginDirPath + "');" + "const __LLSE_PublicModule = require('module'); __LLSE_PublicModule.exports = {};" + + "ll.export = ll.exports; ll.import = ll.imports; " + "(function (exports, require, module, __filename, __dirname) { " + *mainScripts + "\n})({}, __LLSE_PublicRequire, __LLSE_PublicModule, '" diff --git a/ScriptEngine/src/main/PluginManager.cpp b/ScriptEngine/src/main/PluginManager.cpp index 4014e72e68..de3d584c34 100644 --- a/ScriptEngine/src/main/PluginManager.cpp +++ b/ScriptEngine/src/main/PluginManager.cpp @@ -15,10 +15,14 @@ #include "api/CommandAPI.h" #include "api/EventAPI.h" #include + #ifdef LLSE_BACKEND_NODEJS #pragma warning(disable : 4251) #include "main/NodeJsHelper.h" +#elif defined(LLSE_BACKEND_PYTHON) +#include "main/PythonHelper.h" #endif + #define H(x) do_hash(x) using namespace std; @@ -37,6 +41,7 @@ string RemoveRealAllExtension(string fileName) { // - This function must be called in correct backend // - "filePath" can be a single-file plugin path, or a .llplugin compressed package path // or a dir path which contains uncompressed plugin package +// * if mustBeCurrectModule == true and not-current-module plugin is found, will throw exception bool PluginManager::loadPlugin(const std::string& fileOrDirPath, bool isHotLoad, bool mustBeCurrentModule) { if (fileOrDirPath == LLSE_DEBUG_ENGINE_NAME) return true; @@ -90,14 +95,16 @@ bool PluginManager::loadPlugin(const std::string& fileOrDirPath, bool isHotLoad, else if (backendType != LLSE_BACKEND_TYPE) { // Unmatched backend - // logger.error(pluginFileName + " is not a plugin of " + LLSE_BACKEND_TYPE + " engine!"); + if(mustBeCurrentModule) + throw Exception("Plugin of not matched backend given!"); return false; } // Plugin package if (isPluginPackage) { - return loadPluginPackage(realPath, fileOrDirPath, isHotLoad); + bool isUncompressedFirstTime = (realPath != fileOrDirPath); + return loadPluginPackage(realPath, fileOrDirPath, isHotLoad, isUncompressedFirstTime); } // Single file plugin @@ -128,7 +135,8 @@ bool PluginManager::loadPlugin(const std::string& fileOrDirPath, bool isHotLoad, // Load depend libs try { for (auto& [path, content] : depends) { - engine->eval(content, path); + if(!content.empty()) + engine->eval(content, path); } } catch (const Exception& e) { logger.error("Fail in Loading Dependence Lib!\n"); @@ -202,18 +210,21 @@ bool PluginManager::loadPlugin(const std::string& fileOrDirPath, bool isHotLoad, // Load plugin package // This function must be called in correct backend -bool PluginManager::loadPluginPackage(const std::string& dirPath, const std::string& packagePath, bool isHotLoad) +bool PluginManager::loadPluginPackage(const std::string& dirPath, const std::string& packagePath, bool isHotLoad, bool isUncompressedFirstTime) { - // "dirPath" is always public temp dir (LLSE_PLUGIN_PACKAGE_TEMP_DIR) + // "dirPath" is public temp dir (LLSE_PLUGIN_PACKAGE_TEMP_DIR) or normal plugin dir + // "packagePath" will point to plugin package path if isUncompressedFirstTime == true if (!filesystem::is_directory(dirPath)) return false; bool result = false; #ifdef LLSE_BACKEND_NODEJS result = NodeJsHelper::loadNodeJsPlugin(dirPath, packagePath, isHotLoad); +#elif defined(LLSE_BACKEND_PYTHON) + result = PythonHelper::loadPythonPlugin(dirPath, packagePath, isHotLoad); #endif - if (result) + if (result && isUncompressedFirstTime) { // OK now. Delete installed plugin package std::error_code ec; @@ -271,7 +282,11 @@ bool PluginManager::reloadPlugin(const std::string& name) { string filePath = plugin->filePath; if (!PluginManager::unloadPlugin(name)) return false; - return PluginManager::loadPlugin(filePath, true, true); + try{ + return PluginManager::loadPlugin(filePath, true, true); + }catch(...){ + return false; + } } // Reload all plugins diff --git a/ScriptEngine/src/main/PluginManager.h b/ScriptEngine/src/main/PluginManager.h index d24c9e6319..2943a64d29 100644 --- a/ScriptEngine/src/main/PluginManager.h +++ b/ScriptEngine/src/main/PluginManager.h @@ -8,9 +8,10 @@ class PluginManager { private: static bool unRegisterPlugin(std::string name); - static bool loadPluginPackage(const std::string& dirPath, const std::string& packagePath, bool isHotLoad = false); + static bool loadPluginPackage(const std::string& dirPath, const std::string& packagePath, bool isHotLoad, bool isUncompressedFirstTime); public: + // if mustBeCurrectModule == true and not-current-module plugin is found, will throw exception static bool loadPlugin(const std::string& fileOrDirPath, bool isHotLoad = false, bool mustBeCurrectModule = false); static bool unloadPlugin(const std::string& name); static bool reloadPlugin(const std::string& name); diff --git a/ScriptEngine/src/main/PythonHelper.cpp b/ScriptEngine/src/main/PythonHelper.cpp new file mode 100644 index 0000000000..af52b72015 --- /dev/null +++ b/ScriptEngine/src/main/PythonHelper.cpp @@ -0,0 +1,498 @@ +#pragma warning(disable : 4251) +#include "Configs.h" +#if defined(LLSE_BACKEND_PYTHON) +#include "Global.hpp" +#include +#include "Loader.h" +#include "api/EventAPI.h" +#include "api/CommandCompatibleAPI.h" +#include "api/CommandAPI.h" +#include "engine/RemoteCall.h" +#include +#include +#include +#include +#include "utils/Utils.h" +#include "PythonHelper.h" +#include "engine/EngineManager.h" +#include "engine/EngineOwnData.h" +#include +#include + +#define PIP_EXECUTE_TIMEOUT 1800 * 1000 + +// pre-declare +extern void BindAPIs(ScriptEngine* engine); +extern Logger logger; +extern bool isInConsoleDebugMode; +extern ScriptEngine* debugEngine; + + +namespace PythonHelper { + +bool pythonInited = false; + +bool initPythonRuntime() { + if(!pythonInited) + { + script::py_interop::setPythonHomePath(L".\\plugins\\lib\\python-env"); + script::py_interop::setModuleSearchPaths({ + L".\\plugins\\lib\\python-env\\python310.zip", + L".\\plugins\\lib\\python-env\\DLLs", + L".\\plugins\\lib\\python-env\\Lib", + L".\\plugins\\lib\\python-env\\Lib\\site-packages", + }); + pythonInited = true; + } + return true; +} + +bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, std::string pluginDirPath) +{ + // TODO: add import path to sys.path + try { + engine->loadFile(entryScriptPath); + } + catch (const Exception& e1) { + // Fail + logger.error("Fail in Loading Script Plugin!\n"); + throw e1; + } + return true; +} + +// Load Python plugin +// This function must be called in correct backend +bool loadPythonPlugin(std::string dirPath, const std::string& packagePath, bool isHotLoad) { + // "dirPath" is public temp dir (LLSE_PLUGIN_PACKAGE_TEMP_DIR) or normal plugin dir + // "packagePath" will point to plugin package path if isUncompressedFirstTime == true + if (dirPath == LLSE_PLUGIN_PACKAGE_TEMP_DIR) + { + // Need to copy from temp dir to installed dir + if (std::filesystem::exists(LLSE_PLUGIN_PACKAGE_TEMP_DIR "/pyproject.toml")) { + auto pluginName = PythonHelper::getPluginPackageName(LLSE_PLUGIN_PACKAGE_TEMP_DIR); + if (pluginName.empty()) + { + pluginName = UTF82String(filesystem::path(packagePath).filename().replace_extension("").u8string()); + } + auto dest = std::filesystem::path(LLSE_PLUGINS_ROOT_DIR).append(pluginName); + + // copy files + std::error_code ec; + //if (filesystem::exists(dest)) + // filesystem::remove_all(dest, ec); + std::filesystem::copy(LLSE_PLUGIN_PACKAGE_TEMP_DIR "/", dest, + filesystem::copy_options::overwrite_existing | filesystem::copy_options::recursive, ec); + + // reset dirPath + dirPath = UTF82String(dest.u8string()); + } + // remove temp dir + std::error_code ec; + std::filesystem::remove_all(LLSE_PLUGIN_PACKAGE_TEMP_DIR, ec); + } + + std::string entryPath = PythonHelper::findEntryScript(dirPath); + if (entryPath.empty()) + return false; + std::string pluginName = PythonHelper::getPluginPackageName(dirPath); + + // Run "pip install" if needed + auto realPackageInstallDir = (filesystem::path(dirPath) / "site-packages").make_preferred(); + if(!filesystem::exists(realPackageInstallDir)) + { + std::string dependTmpFilePath = PythonHelper::getPluginPackDependencyFilePath(dirPath); + if (!dependTmpFilePath.empty()) + { + int exitCode = 0; + logger.info(tr("llse.loader.python.executePipInstall.start", + fmt::arg("name", UTF82String(filesystem::path(dirPath).filename().u8string())))); + + if ((exitCode = PythonHelper::executePipCommand("pip install -r \"" + dependTmpFilePath + + "\" -t \"" + UTF82String(realPackageInstallDir.u8string()) + "\" --disable-pip-version-check")) == 0) + { + logger.info(tr("llse.loader.python.executePipInstall.success")); + } + else + logger.error(tr("llse.loader.python.executePipInstall.fail", fmt::arg("code", exitCode))); + + // remove temp dependency file after installation + std::error_code ec; + std::filesystem::remove(std::filesystem::path(dependTmpFilePath), ec); + } + } + + // Create engine & Load plugin + ScriptEngine* engine = nullptr; + try { + engine = EngineManager::newEngine(); + EngineScope enter(engine); + + // setData + ENGINE_OWN_DATA()->pluginName = pluginName; + ENGINE_OWN_DATA()->pluginFileOrDirPath = dirPath; + ENGINE_OWN_DATA()->logger.title = pluginName; + + try { + engine->eval("import sys as _llse_py_sys_module"); + std::error_code ec; + + // add plugin-own site-packages to sys.path + string pluginSitePackageFormatted = UTF82String( + std::filesystem::canonical(realPackageInstallDir.make_preferred(), ec).u8string()); + if(!ec) + { + engine->eval("_llse_py_sys_module.path.insert(0, r'" + pluginSitePackageFormatted + "')"); + } + // add plugin source dir to sys.path + string sourceDirFormatted = UTF82String( + std::filesystem::canonical(filesystem::path(dirPath).make_preferred()).u8string()); + engine->eval("_llse_py_sys_module.path.insert(0, r'" + sourceDirFormatted + "')"); + + // set __file__ and __name__ + string entryPathFormatted = UTF82String( + std::filesystem::canonical(filesystem::path(entryPath).make_preferred()).u8string()); + engine->set("__file__", entryPathFormatted); + // engine->set("__name__", String::newString("__main__")); + } + catch (const Exception& e) { + logger.error("Fail in setting sys.path!\n"); + throw; + } + + // bindAPIs + try { + BindAPIs(engine); + } catch (const Exception& e) { + logger.error("Fail in Binding APIs!\n"); + throw; + } + + // Load depend libs + try { + for (auto& [path, content] : depends) { + if(!content.empty()) + engine->eval(content, path); + } + } catch (const Exception& e) { + logger.error("Fail in Loading Dependence Lib!\n"); + throw; + } + + // Load script + if (!PythonHelper::loadPluginCode(engine, entryPath, dirPath)) + throw "Uncaught exception thrown in code"; + + if (!PluginManager::getPlugin(pluginName)) { + // Plugin did't register itself. Help to register it + string description = pluginName; + ll::Version ver(1, 0, 0); + std::map others = {}; + + // Read information from pyproject.toml + try { + std::filesystem::path packageFilePath = std::filesystem::path(dirPath) / "pyproject.toml"; + string packageFilePathStr = UTF82String(packageFilePath.make_preferred().u8string()); + + toml::table configData = toml::parse_file(packageFilePathStr); + auto projectNode = configData["project"]; + + // description + if(projectNode["description"]) + { + description = *(projectNode["description"].value()); + } + + // version + if(projectNode["version"]) + { + ver = ll::Version::parse(*(projectNode["version"].value())); + } + + // TODO: more information to read + } + catch (...) + { } + + // register + PluginManager::registerPlugin(dirPath, pluginName, description, ver, others); + } + + // Call necessary events when at hot load + if (isHotLoad) + LLSECallEventsOnHotLoad(engine); + + // Success + logger.info(tr("llse.loader.loadMain.loadedPlugin", + fmt::arg("type", "Python"), + fmt::arg("name", pluginName))); + return true; + } + catch (const Exception& e) { + logger.error("Fail to load " + dirPath + "!"); + if (engine) { + EngineScope enter(engine); + logger.error("In Plugin: " + ENGINE_OWN_DATA()->pluginName); + PrintException(e); + ExitEngineScope exit; + + LLSERemoveTimeTaskData(engine); + LLSERemoveAllEventListeners(engine); + LLSERemoveCmdRegister(engine); + LLSERemoveCmdCallback(engine); + LLSERemoveAllExportedFuncs(engine); + + engine->getData().reset(); + EngineManager::unRegisterEngine(engine); + } + if (engine) { + engine->destroy(); + } + } + catch (const std::exception& e) { + logger.error("Fail to load " + dirPath + "!"); + logger.error(TextEncoding::toUTF8(e.what())); + } + catch (...) { + logger.error("Fail to load " + dirPath + "!"); + } + return false; +} + +std::string findEntryScript(const std::string& dirPath) +{ + auto dirPath_obj = std::filesystem::path(dirPath); + + std::filesystem::path entryFilePath = dirPath_obj / "__init__.py"; + if (!std::filesystem::exists(entryFilePath)) + return ""; + else + return UTF82String(entryFilePath.u8string()); +} + +std::string getPluginPackageName(const std::string& dirPath) +{ + auto dirPath_obj = std::filesystem::path(dirPath); + std::string defaultReturnName = UTF82String(filesystem::path(dirPath).filename().u8string()); + + std::filesystem::path packageFilePath = dirPath_obj / std::filesystem::path("pyproject.toml"); + if (!std::filesystem::exists(packageFilePath)) + return defaultReturnName; + + try { + string packageFilePathStr = UTF82String(packageFilePath.make_preferred().u8string()); + toml::table configData = toml::parse_file(packageFilePathStr); + auto projectNode = configData["project"]; + if(!projectNode["name"]) + return defaultReturnName; + std::optional packageName = projectNode["name"].value(); + if (packageName && !packageName->empty()) + return *packageName; + else + return defaultReturnName; + } + catch (...) + { + return defaultReturnName; + } +} + +std::string getPluginPackDependencyFilePath(const std::string& dirPath) +{ + auto dirPath_obj = std::filesystem::path(dirPath); + std::filesystem::path packageFilePath = dirPath_obj / std::filesystem::path("pyproject.toml"); + std::filesystem::path requirementsFilePath = dirPath_obj / std::filesystem::path("requirements.txt"); + std::filesystem::path requirementsTmpFilePath + = dirPath_obj / std::filesystem::path("_requirements_llse_temp.txt"); + + // if requirements.txt exists, copy a temp version + if(std::filesystem::exists(requirementsFilePath)) + { + std::error_code ec; + std::filesystem::copy_file(requirementsFilePath, requirementsTmpFilePath, ec); + } + + if (std::filesystem::exists(packageFilePath)) + { + // copy dependencies from pyproject.toml to _requirements_llse_temp.txt + std::string dependsAdded = ""; + try { + string packageFilePathStr = UTF82String(packageFilePath.make_preferred().u8string()); + toml::table configData = toml::parse_file(packageFilePathStr); + auto projectNode = configData["project"]; + if(projectNode["dependencies"]) + { + toml::array* arr = projectNode["dependencies"].as_array(); + arr->for_each([&dependsAdded](toml::value& elem) + { + std::optional depend = *elem; + dependsAdded += "\n" + *depend; + }); + } + } + catch (...) + { } + + if(!dependsAdded.empty()) + { + std::ofstream fout(UTF82String(requirementsTmpFilePath.make_preferred().u8string()), std::ios::app); + fout << dependsAdded; + fout.close(); + } + } + + if(std::filesystem::exists(requirementsTmpFilePath)) + return UTF82String(requirementsTmpFilePath.make_preferred().u8string()); + else + return ""; +} + +#define OUTPUT_DEBUG_SIGN() std::cout << ">>> " << std::flush +#define OUTPUT_DEBUG_NEED_MORE_CODE_SIGN() std::cout << "... " << std::flush +std::string codeBuffer = ""; +bool isInsideCodeBlock = false; + +static PyObject* getPyGlobalDict() { + PyObject* m = PyImport_AddModule("__main__"); + if (m == nullptr) { + throw Exception("can't find __main__ module"); + } + return PyModule_GetDict(m); +} + +bool processPythonDebugEngine(const std::string &cmd) +{ + if (cmd == LLSE_DEBUG_CMD) + { + if (isInConsoleDebugMode) + { + //EndDebug + logger.info("Debug mode ended"); + isInConsoleDebugMode = false; + } + else + { + //StartDebug + logger.info("Debug mode begins"); + codeBuffer.clear(); + isInsideCodeBlock = false; + isInConsoleDebugMode = true; + OUTPUT_DEBUG_SIGN(); + } + return false; + } + if (isInConsoleDebugMode) + { + EngineScope enter(debugEngine); + if (cmd == "stop") + { + return true; + } + else + { + try { + if(isInsideCodeBlock) + { + // is in code block mode + if(cmd.empty()) + { + // exit code block + isInsideCodeBlock = false; + } + else + { + // add a new line to buffer + codeBuffer += cmd + "\n"; + OUTPUT_DEBUG_NEED_MORE_CODE_SIGN(); + return false; + } + } + else + { + // not in code block mode + if(EndsWith(cmd, ":")) + { + // begin code block mode + isInsideCodeBlock = true; + codeBuffer = cmd + "\n"; + OUTPUT_DEBUG_NEED_MORE_CODE_SIGN(); + return false; + } + else + { + codeBuffer = cmd; + } + } + + PyRun_StringFlags(codeBuffer.c_str(), Py_single_input, getPyGlobalDict(), nullptr, nullptr); + codeBuffer.clear(); + if(script::py_interop::hasException()) + { + auto exp = script::py_interop::getAndClearLastException(); + throw exp; + } + } catch(const Exception &e) { + isInsideCodeBlock = false; + codeBuffer.clear(); + logger.error("Exception:\n" + e.stacktrace() + "\n" + e.message()); + } + } + OUTPUT_DEBUG_SIGN(); + return false; + } + return true; +} + +bool processConsolePipCmd(const std::string& cmd) +{ +#ifdef LLSE_BACKEND_PYTHON + if (StartsWith(cmd, "pip ")) + { + PythonHelper::executePipCommand(cmd); + return false; + } + else + return true; +#else + return true; +#endif +} + +// if no -t in cmd, packages will install to default global embedding site-package dir +// (./plugins/lib/python-env/Lib/site-packages) +int executePipCommand(std::string cmd) +{ + if(cmd.find("--disable-pip-version-check") == std::string::npos) + cmd += " --disable-pip-version-check"; + cmd = ".\\plugins\\lib\\python-env\\python.exe -m " + cmd; + + SECURITY_ATTRIBUTES sa; + sa.nLength = sizeof(SECURITY_ATTRIBUTES); + sa.lpSecurityDescriptor = nullptr; + sa.bInheritHandle = TRUE; + + STARTUPINFOW si = {0}; + PROCESS_INFORMATION pi; + si.cb = sizeof(STARTUPINFO); + GetStartupInfoW(&si); + + auto wCmd = str2cwstr(cmd); + if (!CreateProcessW(nullptr, wCmd, nullptr, nullptr, TRUE, 0, nullptr, nullptr, &si, &pi)) { + delete [] wCmd; + return -1; + } + CloseHandle(pi.hThread); + + if(WaitForSingleObject(pi.hProcess, PIP_EXECUTE_TIMEOUT) == WAIT_TIMEOUT) + TerminateProcess(pi.hProcess, -1); + + DWORD exitCode = 0; + GetExitCodeProcess(pi.hProcess, &exitCode); + CloseHandle(pi.hProcess); + delete [] wCmd; + return exitCode; +} + +} // namespace PythonHelper + +#endif \ No newline at end of file diff --git a/ScriptEngine/src/main/PythonHelper.h b/ScriptEngine/src/main/PythonHelper.h new file mode 100644 index 0000000000..40403529e8 --- /dev/null +++ b/ScriptEngine/src/main/PythonHelper.h @@ -0,0 +1,28 @@ +#pragma once +#if defined(LLSE_BACKEND_PYTHON) +#include +#include +#include "Configs.h" +#include +#include + +namespace PythonHelper { + +bool initPythonRuntime(); + +// raw, will throw exception if fail +bool loadPluginCode(script::ScriptEngine* engine, std::string entryScriptPath, std::string pluginDirPath); +bool loadPythonPlugin(std::string dirPath, const std::string& packagePath, bool isHotLoad = false); + +std::string findEntryScript(const std::string& dirPath); +std::string getPluginPackageName(const std::string& dirPath); +std::string getPluginPackDependencyFilePath(const std::string& dirPath); + +bool processPythonDebugEngine(const std::string &cmd); + +bool processConsolePipCmd(const std::string& cmd); +int executePipCommand(std::string cmd); + +} + +#endif \ No newline at end of file diff --git a/ScriptEngine/src/main/ScriptEngine.cpp b/ScriptEngine/src/main/ScriptEngine.cpp index 6d59968583..f1c609a7c3 100644 --- a/ScriptEngine/src/main/ScriptEngine.cpp +++ b/ScriptEngine/src/main/ScriptEngine.cpp @@ -21,6 +21,10 @@ #include #include "utils/JsonHelper.h" #include "main/EconomicSystem.h" + +#ifdef LLSE_BACKEND_PYTHON +#include "PythonHelper.h" +#endif using namespace std; // Global vars @@ -60,6 +64,10 @@ void entry() { EconomySystem::init(); } +#ifdef LLSE_BACKEND_PYTHON + PythonHelper::initPythonRuntime(); +#endif + // Pre-load depending libs LoadDepends(); diff --git a/ScriptEngine/src/res/ScriptEngine.rc b/ScriptEngine/src/res/ScriptEngine.rc index 0ce446b4af..779ead19b2 100644 --- a/ScriptEngine/src/res/ScriptEngine.rc +++ b/ScriptEngine/src/res/ScriptEngine.rc @@ -55,7 +55,10 @@ END #define LLSE_FILE_DESCRIPTION "A Lua Script Plugin Engine for LiteLoader" #elif defined LLSE_BACKEND_NODEJS #define LLSE_OUTPUT_FILE_NAME "LiteLoader.NodeJs.dll" -#define LLSE_FILE_DESCRIPTION "A NodeJs Script Plugin Engine for LiteLoader" +#define LLSE_FILE_DESCRIPTION "A Node.Js Script Plugin Engine for LiteLoader" +#elif defined LLSE_BACKEND_PYTHON +#define LLSE_OUTPUT_FILE_NAME "LiteLoader.Python.dll" +#define LLSE_FILE_DESCRIPTION "A Python Script Plugin Engine for LiteLoader" #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/ScriptEngine/third-party/backend/include/Python/Python.h b/ScriptEngine/third-party/backend/include/Python/Python.h new file mode 100644 index 0000000000..d3186c32e3 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/Python.h @@ -0,0 +1,148 @@ +#ifndef Py_PYTHON_H +#define Py_PYTHON_H +/* Since this is a "meta-include" file, no #ifdef __cplusplus / extern "C" { */ + +/* Include nearly all Python header files */ + +#include "patchlevel.h" +#include "pyconfig.h" +#include "pymacconfig.h" + +#include + +#ifndef UCHAR_MAX +#error "Something's broken. UCHAR_MAX should be defined in limits.h." +#endif + +#if UCHAR_MAX != 255 +#error "Python's source code assumes C's unsigned char is an 8-bit type." +#endif + +#if defined(__sgi) && !defined(_SGI_MP_SOURCE) +#define _SGI_MP_SOURCE +#endif + +#include +#ifndef NULL +# error "Python.h requires that stdio.h define NULL." +#endif + +#include +#ifdef HAVE_ERRNO_H +#include +#endif +#include +#ifndef MS_WINDOWS +#include +#endif + +/* For size_t? */ +#ifdef HAVE_STDDEF_H +#include +#endif + +/* CAUTION: Build setups should ensure that NDEBUG is defined on the + * compiler command line when building Python in release mode; else + * assert() calls won't be removed. + */ +#include + +#include "pyport.h" +#include "pymacro.h" + +/* A convenient way for code to know if sanitizers are enabled. */ +#if defined(__has_feature) +# if __has_feature(memory_sanitizer) +# if !defined(_Py_MEMORY_SANITIZER) +# define _Py_MEMORY_SANITIZER +# endif +# endif +# if __has_feature(address_sanitizer) +# if !defined(_Py_ADDRESS_SANITIZER) +# define _Py_ADDRESS_SANITIZER +# endif +# endif +#elif defined(__GNUC__) +# if defined(__SANITIZE_ADDRESS__) +# define _Py_ADDRESS_SANITIZER +# endif +#endif + +#include "pymath.h" +#include "pymem.h" + +#include "object.h" +#include "objimpl.h" +#include "typeslots.h" +#include "pyhash.h" + +#include "cpython/pydebug.h" + +#include "bytearrayobject.h" +#include "bytesobject.h" +#include "unicodeobject.h" +#include "longobject.h" +#include "longintrepr.h" +#include "boolobject.h" +#include "floatobject.h" +#include "complexobject.h" +#include "rangeobject.h" +#include "memoryobject.h" +#include "tupleobject.h" +#include "listobject.h" +#include "dictobject.h" +#include "cpython/odictobject.h" +#include "enumobject.h" +#include "setobject.h" +#include "methodobject.h" +#include "moduleobject.h" +#include "funcobject.h" +#include "classobject.h" +#include "fileobject.h" +#include "pycapsule.h" +#include "code.h" +#include "pyframe.h" +#include "traceback.h" +#include "sliceobject.h" +#include "cellobject.h" +#include "iterobject.h" +#include "cpython/initconfig.h" +#include "genobject.h" +#include "descrobject.h" +#include "genericaliasobject.h" +#include "warnings.h" +#include "weakrefobject.h" +#include "structseq.h" +#include "namespaceobject.h" +#include "cpython/picklebufobject.h" +#include "cpython/pytime.h" + +#include "codecs.h" +#include "pyerrors.h" +#include "pythread.h" +#include "pystate.h" +#include "context.h" + +#include "modsupport.h" +#include "compile.h" +#include "pythonrun.h" +#include "pylifecycle.h" +#include "ceval.h" +#include "sysmodule.h" +#include "osmodule.h" +#include "intrcheck.h" +#include "import.h" + +#include "abstract.h" +#include "bltinmodule.h" + +#include "eval.h" + +#include "cpython/pyctype.h" +#include "pystrtod.h" +#include "pystrcmp.h" +#include "fileutils.h" +#include "cpython/pyfpe.h" +#include "tracemalloc.h" + +#endif /* !Py_PYTHON_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/abstract.h b/ScriptEngine/third-party/backend/include/Python/abstract.h new file mode 100644 index 0000000000..9eaab6b2e0 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/abstract.h @@ -0,0 +1,873 @@ +/* Abstract Object Interface (many thanks to Jim Fulton) */ + +#ifndef Py_ABSTRACTOBJECT_H +#define Py_ABSTRACTOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* === Object Protocol ================================================== */ + +/* Implemented elsewhere: + + int PyObject_Print(PyObject *o, FILE *fp, int flags); + + Print an object 'o' on file 'fp'. Returns -1 on error. The flags argument + is used to enable certain printing options. The only option currently + supported is Py_Print_RAW. + + (What should be said about Py_Print_RAW?). */ + + +/* Implemented elsewhere: + + int PyObject_HasAttrString(PyObject *o, const char *attr_name); + + Returns 1 if object 'o' has the attribute attr_name, and 0 otherwise. + + This is equivalent to the Python expression: hasattr(o,attr_name). + + This function always succeeds. */ + + +/* Implemented elsewhere: + + PyObject* PyObject_GetAttrString(PyObject *o, const char *attr_name); + + Retrieve an attributed named attr_name form object o. + Returns the attribute value on success, or NULL on failure. + + This is the equivalent of the Python expression: o.attr_name. */ + + +/* Implemented elsewhere: + + int PyObject_HasAttr(PyObject *o, PyObject *attr_name); + + Returns 1 if o has the attribute attr_name, and 0 otherwise. + + This is equivalent to the Python expression: hasattr(o,attr_name). + + This function always succeeds. */ + +/* Implemented elsewhere: + + PyObject* PyObject_GetAttr(PyObject *o, PyObject *attr_name); + + Retrieve an attributed named 'attr_name' form object 'o'. + Returns the attribute value on success, or NULL on failure. + + This is the equivalent of the Python expression: o.attr_name. */ + + +/* Implemented elsewhere: + + int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v); + + Set the value of the attribute named attr_name, for object 'o', + to the value 'v'. Raise an exception and return -1 on failure; return 0 on + success. + + This is the equivalent of the Python statement o.attr_name=v. */ + + +/* Implemented elsewhere: + + int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v); + + Set the value of the attribute named attr_name, for object 'o', to the value + 'v'. an exception and return -1 on failure; return 0 on success. + + This is the equivalent of the Python statement o.attr_name=v. */ + +/* Implemented as a macro: + + int PyObject_DelAttrString(PyObject *o, const char *attr_name); + + Delete attribute named attr_name, for object o. Returns + -1 on failure. + + This is the equivalent of the Python statement: del o.attr_name. */ +#define PyObject_DelAttrString(O,A) PyObject_SetAttrString((O),(A), NULL) + + +/* Implemented as a macro: + + int PyObject_DelAttr(PyObject *o, PyObject *attr_name); + + Delete attribute named attr_name, for object o. Returns -1 + on failure. This is the equivalent of the Python + statement: del o.attr_name. */ +#define PyObject_DelAttr(O,A) PyObject_SetAttr((O),(A), NULL) + + +/* Implemented elsewhere: + + PyObject *PyObject_Repr(PyObject *o); + + Compute the string representation of object 'o'. Returns the + string representation on success, NULL on failure. + + This is the equivalent of the Python expression: repr(o). + + Called by the repr() built-in function. */ + + +/* Implemented elsewhere: + + PyObject *PyObject_Str(PyObject *o); + + Compute the string representation of object, o. Returns the + string representation on success, NULL on failure. + + This is the equivalent of the Python expression: str(o). + + Called by the str() and print() built-in functions. */ + + +/* Declared elsewhere + + PyAPI_FUNC(int) PyCallable_Check(PyObject *o); + + Determine if the object, o, is callable. Return 1 if the object is callable + and 0 otherwise. + + This function always succeeds. */ + + +#ifdef PY_SSIZE_T_CLEAN +# define PyObject_CallFunction _PyObject_CallFunction_SizeT +# define PyObject_CallMethod _PyObject_CallMethod_SizeT +#endif + + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +/* Call a callable Python object without any arguments */ +PyAPI_FUNC(PyObject *) PyObject_CallNoArgs(PyObject *func); +#endif + + +/* Call a callable Python object 'callable' with arguments given by the + tuple 'args' and keywords arguments given by the dictionary 'kwargs'. + + 'args' must not be NULL, use an empty tuple if no arguments are + needed. If no named arguments are needed, 'kwargs' can be NULL. + + This is the equivalent of the Python expression: + callable(*args, **kwargs). */ +PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable, + PyObject *args, PyObject *kwargs); + + +/* Call a callable Python object 'callable', with arguments given by the + tuple 'args'. If no arguments are needed, then 'args' can be NULL. + + Returns the result of the call on success, or NULL on failure. + + This is the equivalent of the Python expression: + callable(*args). */ +PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable, + PyObject *args); + +/* Call a callable Python object, callable, with a variable number of C + arguments. The C arguments are described using a mkvalue-style format + string. + + The format may be NULL, indicating that no arguments are provided. + + Returns the result of the call on success, or NULL on failure. + + This is the equivalent of the Python expression: + callable(arg1, arg2, ...). */ +PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable, + const char *format, ...); + +/* Call the method named 'name' of object 'obj' with a variable number of + C arguments. The C arguments are described by a mkvalue format string. + + The format can be NULL, indicating that no arguments are provided. + + Returns the result of the call on success, or NULL on failure. + + This is the equivalent of the Python expression: + obj.name(arg1, arg2, ...). */ +PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *obj, + const char *name, + const char *format, ...); + +PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, + const char *format, + ...); + +PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj, + const char *name, + const char *format, + ...); + +/* Call a callable Python object 'callable' with a variable number of C + arguments. The C arguments are provided as PyObject* values, terminated + by a NULL. + + Returns the result of the call on success, or NULL on failure. + + This is the equivalent of the Python expression: + callable(arg1, arg2, ...). */ +PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, + ...); + +/* Call the method named 'name' of object 'obj' with a variable number of + C arguments. The C arguments are provided as PyObject* values, terminated + by NULL. + + Returns the result of the call on success, or NULL on failure. + + This is the equivalent of the Python expression: obj.name(*args). */ + +PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs( + PyObject *obj, + PyObject *name, + ...); + + +/* Implemented elsewhere: + + Py_hash_t PyObject_Hash(PyObject *o); + + Compute and return the hash, hash_value, of an object, o. On + failure, return -1. + + This is the equivalent of the Python expression: hash(o). */ + + +/* Implemented elsewhere: + + int PyObject_IsTrue(PyObject *o); + + Returns 1 if the object, o, is considered to be true, 0 if o is + considered to be false and -1 on failure. + + This is equivalent to the Python expression: not not o. */ + + +/* Implemented elsewhere: + + int PyObject_Not(PyObject *o); + + Returns 0 if the object, o, is considered to be true, 1 if o is + considered to be false and -1 on failure. + + This is equivalent to the Python expression: not o. */ + + +/* Get the type of an object. + + On success, returns a type object corresponding to the object type of object + 'o'. On failure, returns NULL. + + This is equivalent to the Python expression: type(o) */ +PyAPI_FUNC(PyObject *) PyObject_Type(PyObject *o); + + +/* Return the size of object 'o'. If the object 'o' provides both sequence and + mapping protocols, the sequence size is returned. + + On error, -1 is returned. + + This is the equivalent to the Python expression: len(o) */ +PyAPI_FUNC(Py_ssize_t) PyObject_Size(PyObject *o); + + +/* For DLL compatibility */ +#undef PyObject_Length +PyAPI_FUNC(Py_ssize_t) PyObject_Length(PyObject *o); +#define PyObject_Length PyObject_Size + +/* Return element of 'o' corresponding to the object 'key'. Return NULL + on failure. + + This is the equivalent of the Python expression: o[key] */ +PyAPI_FUNC(PyObject *) PyObject_GetItem(PyObject *o, PyObject *key); + + +/* Map the object 'key' to the value 'v' into 'o'. + + Raise an exception and return -1 on failure; return 0 on success. + + This is the equivalent of the Python statement: o[key]=v. */ +PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v); + +/* Remove the mapping for the string 'key' from the object 'o'. + Returns -1 on failure. + + This is equivalent to the Python statement: del o[key]. */ +PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, const char *key); + +/* Delete the mapping for the object 'key' from the object 'o'. + Returns -1 on failure. + + This is the equivalent of the Python statement: del o[key]. */ +PyAPI_FUNC(int) PyObject_DelItem(PyObject *o, PyObject *key); + + +/* === Old Buffer API ============================================ */ + +/* FIXME: usage of these should all be replaced in Python itself + but for backwards compatibility we will implement them. + Their usage without a corresponding "unlock" mechanism + may create issues (but they would already be there). */ + +/* Takes an arbitrary object which must support the (character, single segment) + buffer interface and returns a pointer to a read-only memory location + usable as character based input for subsequent processing. + + Return 0 on success. buffer and buffer_len are only set in case no error + occurs. Otherwise, -1 is returned and an exception set. */ +Py_DEPRECATED(3.0) +PyAPI_FUNC(int) PyObject_AsCharBuffer(PyObject *obj, + const char **buffer, + Py_ssize_t *buffer_len); + +/* Checks whether an arbitrary object supports the (character, single segment) + buffer interface. + + Returns 1 on success, 0 on failure. */ +Py_DEPRECATED(3.0) PyAPI_FUNC(int) PyObject_CheckReadBuffer(PyObject *obj); + +/* Same as PyObject_AsCharBuffer() except that this API expects (readable, + single segment) buffer interface and returns a pointer to a read-only memory + location which can contain arbitrary data. + + 0 is returned on success. buffer and buffer_len are only set in case no + error occurs. Otherwise, -1 is returned and an exception set. */ +Py_DEPRECATED(3.0) +PyAPI_FUNC(int) PyObject_AsReadBuffer(PyObject *obj, + const void **buffer, + Py_ssize_t *buffer_len); + +/* Takes an arbitrary object which must support the (writable, single segment) + buffer interface and returns a pointer to a writable memory location in + buffer of size 'buffer_len'. + + Return 0 on success. buffer and buffer_len are only set in case no error + occurs. Otherwise, -1 is returned and an exception set. */ +Py_DEPRECATED(3.0) +PyAPI_FUNC(int) PyObject_AsWriteBuffer(PyObject *obj, + void **buffer, + Py_ssize_t *buffer_len); + + +/* === New Buffer API ============================================ */ + +/* Takes an arbitrary object and returns the result of calling + obj.__format__(format_spec). */ +PyAPI_FUNC(PyObject *) PyObject_Format(PyObject *obj, + PyObject *format_spec); + + +/* ==== Iterators ================================================ */ + +/* Takes an object and returns an iterator for it. + This is typically a new iterator but if the argument is an iterator, this + returns itself. */ +PyAPI_FUNC(PyObject *) PyObject_GetIter(PyObject *); + +/* Takes an AsyncIterable object and returns an AsyncIterator for it. + This is typically a new iterator but if the argument is an AsyncIterator, + this returns itself. */ +PyAPI_FUNC(PyObject *) PyObject_GetAIter(PyObject *); + +/* Returns non-zero if the object 'obj' provides iterator protocols, and 0 otherwise. + + This function always succeeds. */ +PyAPI_FUNC(int) PyIter_Check(PyObject *); + +/* Returns non-zero if the object 'obj' provides AsyncIterator protocols, and 0 otherwise. + + This function always succeeds. */ +PyAPI_FUNC(int) PyAIter_Check(PyObject *); + +/* Takes an iterator object and calls its tp_iternext slot, + returning the next value. + + If the iterator is exhausted, this returns NULL without setting an + exception. + + NULL with an exception means an error occurred. */ +PyAPI_FUNC(PyObject *) PyIter_Next(PyObject *); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 + +/* Takes generator, coroutine or iterator object and sends the value into it. + Returns: + - PYGEN_RETURN (0) if generator has returned. + 'result' parameter is filled with return value + - PYGEN_ERROR (-1) if exception was raised. + 'result' parameter is NULL + - PYGEN_NEXT (1) if generator has yielded. + 'result' parameter is filled with yielded value. */ +PyAPI_FUNC(PySendResult) PyIter_Send(PyObject *, PyObject *, PyObject **); +#endif + + +/* === Number Protocol ================================================== */ + +/* Returns 1 if the object 'o' provides numeric protocols, and 0 otherwise. + + This function always succeeds. */ +PyAPI_FUNC(int) PyNumber_Check(PyObject *o); + +/* Returns the result of adding o1 and o2, or NULL on failure. + + This is the equivalent of the Python expression: o1 + o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Add(PyObject *o1, PyObject *o2); + +/* Returns the result of subtracting o2 from o1, or NULL on failure. + + This is the equivalent of the Python expression: o1 - o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Subtract(PyObject *o1, PyObject *o2); + +/* Returns the result of multiplying o1 and o2, or NULL on failure. + + This is the equivalent of the Python expression: o1 * o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Multiply(PyObject *o1, PyObject *o2); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* This is the equivalent of the Python expression: o1 @ o2. */ +PyAPI_FUNC(PyObject *) PyNumber_MatrixMultiply(PyObject *o1, PyObject *o2); +#endif + +/* Returns the result of dividing o1 by o2 giving an integral result, + or NULL on failure. + + This is the equivalent of the Python expression: o1 // o2. */ +PyAPI_FUNC(PyObject *) PyNumber_FloorDivide(PyObject *o1, PyObject *o2); + +/* Returns the result of dividing o1 by o2 giving a float result, or NULL on + failure. + + This is the equivalent of the Python expression: o1 / o2. */ +PyAPI_FUNC(PyObject *) PyNumber_TrueDivide(PyObject *o1, PyObject *o2); + +/* Returns the remainder of dividing o1 by o2, or NULL on failure. + + This is the equivalent of the Python expression: o1 % o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Remainder(PyObject *o1, PyObject *o2); + +/* See the built-in function divmod. + + Returns NULL on failure. + + This is the equivalent of the Python expression: divmod(o1, o2). */ +PyAPI_FUNC(PyObject *) PyNumber_Divmod(PyObject *o1, PyObject *o2); + +/* See the built-in function pow. Returns NULL on failure. + + This is the equivalent of the Python expression: pow(o1, o2, o3), + where o3 is optional. */ +PyAPI_FUNC(PyObject *) PyNumber_Power(PyObject *o1, PyObject *o2, + PyObject *o3); + +/* Returns the negation of o on success, or NULL on failure. + + This is the equivalent of the Python expression: -o. */ +PyAPI_FUNC(PyObject *) PyNumber_Negative(PyObject *o); + +/* Returns the positive of o on success, or NULL on failure. + + This is the equivalent of the Python expression: +o. */ +PyAPI_FUNC(PyObject *) PyNumber_Positive(PyObject *o); + +/* Returns the absolute value of 'o', or NULL on failure. + + This is the equivalent of the Python expression: abs(o). */ +PyAPI_FUNC(PyObject *) PyNumber_Absolute(PyObject *o); + +/* Returns the bitwise negation of 'o' on success, or NULL on failure. + + This is the equivalent of the Python expression: ~o. */ +PyAPI_FUNC(PyObject *) PyNumber_Invert(PyObject *o); + +/* Returns the result of left shifting o1 by o2 on success, or NULL on failure. + + This is the equivalent of the Python expression: o1 << o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Lshift(PyObject *o1, PyObject *o2); + +/* Returns the result of right shifting o1 by o2 on success, or NULL on + failure. + + This is the equivalent of the Python expression: o1 >> o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Rshift(PyObject *o1, PyObject *o2); + +/* Returns the result of bitwise and of o1 and o2 on success, or NULL on + failure. + + This is the equivalent of the Python expression: o1 & o2. */ +PyAPI_FUNC(PyObject *) PyNumber_And(PyObject *o1, PyObject *o2); + +/* Returns the bitwise exclusive or of o1 by o2 on success, or NULL on failure. + + This is the equivalent of the Python expression: o1 ^ o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Xor(PyObject *o1, PyObject *o2); + +/* Returns the result of bitwise or on o1 and o2 on success, or NULL on + failure. + + This is the equivalent of the Python expression: o1 | o2. */ +PyAPI_FUNC(PyObject *) PyNumber_Or(PyObject *o1, PyObject *o2); + +/* Returns 1 if obj is an index integer (has the nb_index slot of the + tp_as_number structure filled in), and 0 otherwise. */ +PyAPI_FUNC(int) PyIndex_Check(PyObject *); + +/* Returns the object 'o' converted to a Python int, or NULL with an exception + raised on failure. */ +PyAPI_FUNC(PyObject *) PyNumber_Index(PyObject *o); + +/* Returns the object 'o' converted to Py_ssize_t by going through + PyNumber_Index() first. + + If an overflow error occurs while converting the int to Py_ssize_t, then the + second argument 'exc' is the error-type to return. If it is NULL, then the + overflow error is cleared and the value is clipped. */ +PyAPI_FUNC(Py_ssize_t) PyNumber_AsSsize_t(PyObject *o, PyObject *exc); + +/* Returns the object 'o' converted to an integer object on success, or NULL + on failure. + + This is the equivalent of the Python expression: int(o). */ +PyAPI_FUNC(PyObject *) PyNumber_Long(PyObject *o); + +/* Returns the object 'o' converted to a float object on success, or NULL + on failure. + + This is the equivalent of the Python expression: float(o). */ +PyAPI_FUNC(PyObject *) PyNumber_Float(PyObject *o); + + +/* --- In-place variants of (some of) the above number protocol functions -- */ + +/* Returns the result of adding o2 to o1, possibly in-place, or NULL + on failure. + + This is the equivalent of the Python expression: o1 += o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceAdd(PyObject *o1, PyObject *o2); + +/* Returns the result of subtracting o2 from o1, possibly in-place or + NULL on failure. + + This is the equivalent of the Python expression: o1 -= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceSubtract(PyObject *o1, PyObject *o2); + +/* Returns the result of multiplying o1 by o2, possibly in-place, or NULL on + failure. + + This is the equivalent of the Python expression: o1 *= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceMultiply(PyObject *o1, PyObject *o2); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* This is the equivalent of the Python expression: o1 @= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceMatrixMultiply(PyObject *o1, PyObject *o2); +#endif + +/* Returns the result of dividing o1 by o2 giving an integral result, possibly + in-place, or NULL on failure. + + This is the equivalent of the Python expression: o1 /= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceFloorDivide(PyObject *o1, + PyObject *o2); + +/* Returns the result of dividing o1 by o2 giving a float result, possibly + in-place, or null on failure. + + This is the equivalent of the Python expression: o1 /= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceTrueDivide(PyObject *o1, + PyObject *o2); + +/* Returns the remainder of dividing o1 by o2, possibly in-place, or NULL on + failure. + + This is the equivalent of the Python expression: o1 %= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceRemainder(PyObject *o1, PyObject *o2); + +/* Returns the result of raising o1 to the power of o2, possibly in-place, + or NULL on failure. + + This is the equivalent of the Python expression: o1 **= o2, + or o1 = pow(o1, o2, o3) if o3 is present. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlacePower(PyObject *o1, PyObject *o2, + PyObject *o3); + +/* Returns the result of left shifting o1 by o2, possibly in-place, or NULL + on failure. + + This is the equivalent of the Python expression: o1 <<= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceLshift(PyObject *o1, PyObject *o2); + +/* Returns the result of right shifting o1 by o2, possibly in-place or NULL + on failure. + + This is the equivalent of the Python expression: o1 >>= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceRshift(PyObject *o1, PyObject *o2); + +/* Returns the result of bitwise and of o1 and o2, possibly in-place, or NULL + on failure. + + This is the equivalent of the Python expression: o1 &= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceAnd(PyObject *o1, PyObject *o2); + +/* Returns the bitwise exclusive or of o1 by o2, possibly in-place, or NULL + on failure. + + This is the equivalent of the Python expression: o1 ^= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceXor(PyObject *o1, PyObject *o2); + +/* Returns the result of bitwise or of o1 and o2, possibly in-place, + or NULL on failure. + + This is the equivalent of the Python expression: o1 |= o2. */ +PyAPI_FUNC(PyObject *) PyNumber_InPlaceOr(PyObject *o1, PyObject *o2); + +/* Returns the integer n converted to a string with a base, with a base + marker of 0b, 0o or 0x prefixed if applicable. + + If n is not an int object, it is converted with PyNumber_Index first. */ +PyAPI_FUNC(PyObject *) PyNumber_ToBase(PyObject *n, int base); + + +/* === Sequence protocol ================================================ */ + +/* Return 1 if the object provides sequence protocol, and zero + otherwise. + + This function always succeeds. */ +PyAPI_FUNC(int) PySequence_Check(PyObject *o); + +/* Return the size of sequence object o, or -1 on failure. */ +PyAPI_FUNC(Py_ssize_t) PySequence_Size(PyObject *o); + +/* For DLL compatibility */ +#undef PySequence_Length +PyAPI_FUNC(Py_ssize_t) PySequence_Length(PyObject *o); +#define PySequence_Length PySequence_Size + + +/* Return the concatenation of o1 and o2 on success, and NULL on failure. + + This is the equivalent of the Python expression: o1 + o2. */ +PyAPI_FUNC(PyObject *) PySequence_Concat(PyObject *o1, PyObject *o2); + +/* Return the result of repeating sequence object 'o' 'count' times, + or NULL on failure. + + This is the equivalent of the Python expression: o * count. */ +PyAPI_FUNC(PyObject *) PySequence_Repeat(PyObject *o, Py_ssize_t count); + +/* Return the ith element of o, or NULL on failure. + + This is the equivalent of the Python expression: o[i]. */ +PyAPI_FUNC(PyObject *) PySequence_GetItem(PyObject *o, Py_ssize_t i); + +/* Return the slice of sequence object o between i1 and i2, or NULL on failure. + + This is the equivalent of the Python expression: o[i1:i2]. */ +PyAPI_FUNC(PyObject *) PySequence_GetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); + +/* Assign object 'v' to the ith element of the sequence 'o'. Raise an exception + and return -1 on failure; return 0 on success. + + This is the equivalent of the Python statement o[i] = v. */ +PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v); + +/* Delete the 'i'-th element of the sequence 'v'. Returns -1 on failure. + + This is the equivalent of the Python statement: del o[i]. */ +PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i); + +/* Assign the sequence object 'v' to the slice in sequence object 'o', + from 'i1' to 'i2'. Returns -1 on failure. + + This is the equivalent of the Python statement: o[i1:i2] = v. */ +PyAPI_FUNC(int) PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, + PyObject *v); + +/* Delete the slice in sequence object 'o' from 'i1' to 'i2'. + Returns -1 on failure. + + This is the equivalent of the Python statement: del o[i1:i2]. */ +PyAPI_FUNC(int) PySequence_DelSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2); + +/* Returns the sequence 'o' as a tuple on success, and NULL on failure. + + This is equivalent to the Python expression: tuple(o). */ +PyAPI_FUNC(PyObject *) PySequence_Tuple(PyObject *o); + +/* Returns the sequence 'o' as a list on success, and NULL on failure. + This is equivalent to the Python expression: list(o) */ +PyAPI_FUNC(PyObject *) PySequence_List(PyObject *o); + +/* Return the sequence 'o' as a list, unless it's already a tuple or list. + + Use PySequence_Fast_GET_ITEM to access the members of this list, and + PySequence_Fast_GET_SIZE to get its length. + + Returns NULL on failure. If the object does not support iteration, raises a + TypeError exception with 'm' as the message text. */ +PyAPI_FUNC(PyObject *) PySequence_Fast(PyObject *o, const char* m); + +/* Return the size of the sequence 'o', assuming that 'o' was returned by + PySequence_Fast and is not NULL. */ +#define PySequence_Fast_GET_SIZE(o) \ + (PyList_Check(o) ? PyList_GET_SIZE(o) : PyTuple_GET_SIZE(o)) + +/* Return the 'i'-th element of the sequence 'o', assuming that o was returned + by PySequence_Fast, and that i is within bounds. */ +#define PySequence_Fast_GET_ITEM(o, i)\ + (PyList_Check(o) ? PyList_GET_ITEM(o, i) : PyTuple_GET_ITEM(o, i)) + +/* Return a pointer to the underlying item array for + an object returned by PySequence_Fast */ +#define PySequence_Fast_ITEMS(sf) \ + (PyList_Check(sf) ? ((PyListObject *)(sf))->ob_item \ + : ((PyTupleObject *)(sf))->ob_item) + +/* Return the number of occurrences on value on 'o', that is, return + the number of keys for which o[key] == value. + + On failure, return -1. This is equivalent to the Python expression: + o.count(value). */ +PyAPI_FUNC(Py_ssize_t) PySequence_Count(PyObject *o, PyObject *value); + +/* Return 1 if 'ob' is in the sequence 'seq'; 0 if 'ob' is not in the sequence + 'seq'; -1 on error. + + Use __contains__ if possible, else _PySequence_IterSearch(). */ +PyAPI_FUNC(int) PySequence_Contains(PyObject *seq, PyObject *ob); + +/* For DLL-level backwards compatibility */ +#undef PySequence_In +/* Determine if the sequence 'o' contains 'value'. If an item in 'o' is equal + to 'value', return 1, otherwise return 0. On error, return -1. + + This is equivalent to the Python expression: value in o. */ +PyAPI_FUNC(int) PySequence_In(PyObject *o, PyObject *value); + +/* For source-level backwards compatibility */ +#define PySequence_In PySequence_Contains + + +/* Return the first index for which o[i] == value. + On error, return -1. + + This is equivalent to the Python expression: o.index(value). */ +PyAPI_FUNC(Py_ssize_t) PySequence_Index(PyObject *o, PyObject *value); + + +/* --- In-place versions of some of the above Sequence functions --- */ + +/* Append sequence 'o2' to sequence 'o1', in-place when possible. Return the + resulting object, which could be 'o1', or NULL on failure. + + This is the equivalent of the Python expression: o1 += o2. */ +PyAPI_FUNC(PyObject *) PySequence_InPlaceConcat(PyObject *o1, PyObject *o2); + +/* Repeat sequence 'o' by 'count', in-place when possible. Return the resulting + object, which could be 'o', or NULL on failure. + + This is the equivalent of the Python expression: o1 *= count. */ +PyAPI_FUNC(PyObject *) PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count); + + +/* === Mapping protocol ================================================= */ + +/* Return 1 if the object provides mapping protocol, and 0 otherwise. + + This function always succeeds. */ +PyAPI_FUNC(int) PyMapping_Check(PyObject *o); + +/* Returns the number of keys in mapping object 'o' on success, and -1 on + failure. This is equivalent to the Python expression: len(o). */ +PyAPI_FUNC(Py_ssize_t) PyMapping_Size(PyObject *o); + +/* For DLL compatibility */ +#undef PyMapping_Length +PyAPI_FUNC(Py_ssize_t) PyMapping_Length(PyObject *o); +#define PyMapping_Length PyMapping_Size + + +/* Implemented as a macro: + + int PyMapping_DelItemString(PyObject *o, const char *key); + + Remove the mapping for the string 'key' from the mapping 'o'. Returns -1 on + failure. + + This is equivalent to the Python statement: del o[key]. */ +#define PyMapping_DelItemString(O,K) PyObject_DelItemString((O),(K)) + +/* Implemented as a macro: + + int PyMapping_DelItem(PyObject *o, PyObject *key); + + Remove the mapping for the object 'key' from the mapping object 'o'. + Returns -1 on failure. + + This is equivalent to the Python statement: del o[key]. */ +#define PyMapping_DelItem(O,K) PyObject_DelItem((O),(K)) + +/* On success, return 1 if the mapping object 'o' has the key 'key', + and 0 otherwise. + + This is equivalent to the Python expression: key in o. + + This function always succeeds. */ +PyAPI_FUNC(int) PyMapping_HasKeyString(PyObject *o, const char *key); + +/* Return 1 if the mapping object has the key 'key', and 0 otherwise. + + This is equivalent to the Python expression: key in o. + + This function always succeeds. */ +PyAPI_FUNC(int) PyMapping_HasKey(PyObject *o, PyObject *key); + +/* On success, return a list or tuple of the keys in mapping object 'o'. + On failure, return NULL. */ +PyAPI_FUNC(PyObject *) PyMapping_Keys(PyObject *o); + +/* On success, return a list or tuple of the values in mapping object 'o'. + On failure, return NULL. */ +PyAPI_FUNC(PyObject *) PyMapping_Values(PyObject *o); + +/* On success, return a list or tuple of the items in mapping object 'o', + where each item is a tuple containing a key-value pair. On failure, return + NULL. */ +PyAPI_FUNC(PyObject *) PyMapping_Items(PyObject *o); + +/* Return element of 'o' corresponding to the string 'key' or NULL on failure. + + This is the equivalent of the Python expression: o[key]. */ +PyAPI_FUNC(PyObject *) PyMapping_GetItemString(PyObject *o, + const char *key); + +/* Map the string 'key' to the value 'v' in the mapping 'o'. + Returns -1 on failure. + + This is the equivalent of the Python statement: o[key]=v. */ +PyAPI_FUNC(int) PyMapping_SetItemString(PyObject *o, const char *key, + PyObject *value); + +/* isinstance(object, typeorclass) */ +PyAPI_FUNC(int) PyObject_IsInstance(PyObject *object, PyObject *typeorclass); + +/* issubclass(object, typeorclass) */ +PyAPI_FUNC(int) PyObject_IsSubclass(PyObject *object, PyObject *typeorclass); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_ABSTRACTOBJECT_H +# include "cpython/abstract.h" +# undef Py_CPYTHON_ABSTRACTOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* Py_ABSTRACTOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/bltinmodule.h b/ScriptEngine/third-party/backend/include/Python/bltinmodule.h new file mode 100644 index 0000000000..868c9e6443 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/bltinmodule.h @@ -0,0 +1,14 @@ +#ifndef Py_BLTINMODULE_H +#define Py_BLTINMODULE_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(PyTypeObject) PyFilter_Type; +PyAPI_DATA(PyTypeObject) PyMap_Type; +PyAPI_DATA(PyTypeObject) PyZip_Type; + +#ifdef __cplusplus +} +#endif +#endif /* !Py_BLTINMODULE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/boolobject.h b/ScriptEngine/third-party/backend/include/Python/boolobject.h new file mode 100644 index 0000000000..cda6f89a99 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/boolobject.h @@ -0,0 +1,43 @@ +/* Boolean object interface */ + +#ifndef Py_BOOLOBJECT_H +#define Py_BOOLOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + + +PyAPI_DATA(PyTypeObject) PyBool_Type; + +#define PyBool_Check(x) Py_IS_TYPE(x, &PyBool_Type) + +/* Py_False and Py_True are the only two bools in existence. +Don't forget to apply Py_INCREF() when returning either!!! */ + +/* Don't use these directly */ +PyAPI_DATA(struct _longobject) _Py_FalseStruct; +PyAPI_DATA(struct _longobject) _Py_TrueStruct; + +/* Use these macros */ +#define Py_False ((PyObject *) &_Py_FalseStruct) +#define Py_True ((PyObject *) &_Py_TrueStruct) + +// Test if an object is the True singleton, the same as "x is True" in Python. +PyAPI_FUNC(int) Py_IsTrue(PyObject *x); +#define Py_IsTrue(x) Py_Is((x), Py_True) + +// Test if an object is the False singleton, the same as "x is False" in Python. +PyAPI_FUNC(int) Py_IsFalse(PyObject *x); +#define Py_IsFalse(x) Py_Is((x), Py_False) + +/* Macros for returning Py_True or Py_False, respectively */ +#define Py_RETURN_TRUE return Py_NewRef(Py_True) +#define Py_RETURN_FALSE return Py_NewRef(Py_False) + +/* Function to return a bool from a C long */ +PyAPI_FUNC(PyObject *) PyBool_FromLong(long); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_BOOLOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/bytearrayobject.h b/ScriptEngine/third-party/backend/include/Python/bytearrayobject.h new file mode 100644 index 0000000000..9e95433f0f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/bytearrayobject.h @@ -0,0 +1,46 @@ +/* ByteArray object interface */ + +#ifndef Py_BYTEARRAYOBJECT_H +#define Py_BYTEARRAYOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/* Type PyByteArrayObject represents a mutable array of bytes. + * The Python API is that of a sequence; + * the bytes are mapped to ints in [0, 256). + * Bytes are not characters; they may be used to encode characters. + * The only way to go between bytes and str/unicode is via encoding + * and decoding. + * For the convenience of C programmers, the bytes type is considered + * to contain a char pointer, not an unsigned char pointer. + */ + +/* Type object */ +PyAPI_DATA(PyTypeObject) PyByteArray_Type; +PyAPI_DATA(PyTypeObject) PyByteArrayIter_Type; + +/* Type check macros */ +#define PyByteArray_Check(self) PyObject_TypeCheck(self, &PyByteArray_Type) +#define PyByteArray_CheckExact(self) Py_IS_TYPE(self, &PyByteArray_Type) + +/* Direct API functions */ +PyAPI_FUNC(PyObject *) PyByteArray_FromObject(PyObject *); +PyAPI_FUNC(PyObject *) PyByteArray_Concat(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyByteArray_FromStringAndSize(const char *, Py_ssize_t); +PyAPI_FUNC(Py_ssize_t) PyByteArray_Size(PyObject *); +PyAPI_FUNC(char *) PyByteArray_AsString(PyObject *); +PyAPI_FUNC(int) PyByteArray_Resize(PyObject *, Py_ssize_t); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_BYTEARRAYOBJECT_H +# include "cpython/bytearrayobject.h" +# undef Py_CPYTHON_BYTEARRAYOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_BYTEARRAYOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/bytesobject.h b/ScriptEngine/third-party/backend/include/Python/bytesobject.h new file mode 100644 index 0000000000..39c241a2dc --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/bytesobject.h @@ -0,0 +1,69 @@ + +/* Bytes object interface */ + +#ifndef Py_BYTESOBJECT_H +#define Py_BYTESOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/* +Type PyBytesObject represents a byte string. An extra zero byte is +reserved at the end to ensure it is zero-terminated, but a size is +present so strings with null bytes in them can be represented. This +is an immutable object type. + +There are functions to create new bytes objects, to test +an object for bytes-ness, and to get the +byte string value. The latter function returns a null pointer +if the object is not of the proper type. +There is a variant that takes an explicit size as well as a +variant that assumes a zero-terminated string. Note that none of the +functions should be applied to NULL pointer. +*/ + +PyAPI_DATA(PyTypeObject) PyBytes_Type; +PyAPI_DATA(PyTypeObject) PyBytesIter_Type; + +#define PyBytes_Check(op) \ + PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_BYTES_SUBCLASS) +#define PyBytes_CheckExact(op) Py_IS_TYPE(op, &PyBytes_Type) + +PyAPI_FUNC(PyObject *) PyBytes_FromStringAndSize(const char *, Py_ssize_t); +PyAPI_FUNC(PyObject *) PyBytes_FromString(const char *); +PyAPI_FUNC(PyObject *) PyBytes_FromObject(PyObject *); +PyAPI_FUNC(PyObject *) PyBytes_FromFormatV(const char*, va_list) + Py_GCC_ATTRIBUTE((format(printf, 1, 0))); +PyAPI_FUNC(PyObject *) PyBytes_FromFormat(const char*, ...) + Py_GCC_ATTRIBUTE((format(printf, 1, 2))); +PyAPI_FUNC(Py_ssize_t) PyBytes_Size(PyObject *); +PyAPI_FUNC(char *) PyBytes_AsString(PyObject *); +PyAPI_FUNC(PyObject *) PyBytes_Repr(PyObject *, int); +PyAPI_FUNC(void) PyBytes_Concat(PyObject **, PyObject *); +PyAPI_FUNC(void) PyBytes_ConcatAndDel(PyObject **, PyObject *); +PyAPI_FUNC(PyObject *) PyBytes_DecodeEscape(const char *, Py_ssize_t, + const char *, Py_ssize_t, + const char *); + +/* Provides access to the internal data buffer and size of a bytes object. + Passing NULL as len parameter will force the string buffer to be + 0-terminated (passing a string with embedded NUL characters will + cause an exception). */ +PyAPI_FUNC(int) PyBytes_AsStringAndSize( + PyObject *obj, /* bytes object */ + char **s, /* pointer to buffer variable */ + Py_ssize_t *len /* pointer to length variable or NULL */ + ); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_BYTESOBJECT_H +# include "cpython/bytesobject.h" +# undef Py_CPYTHON_BYTESOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_BYTESOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/cellobject.h b/ScriptEngine/third-party/backend/include/Python/cellobject.h new file mode 100644 index 0000000000..81bc784d36 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cellobject.h @@ -0,0 +1,29 @@ +/* Cell object interface */ +#ifndef Py_LIMITED_API +#ifndef Py_CELLOBJECT_H +#define Py_CELLOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + PyObject_HEAD + PyObject *ob_ref; /* Content of the cell or NULL when empty */ +} PyCellObject; + +PyAPI_DATA(PyTypeObject) PyCell_Type; + +#define PyCell_Check(op) Py_IS_TYPE(op, &PyCell_Type) + +PyAPI_FUNC(PyObject *) PyCell_New(PyObject *); +PyAPI_FUNC(PyObject *) PyCell_Get(PyObject *); +PyAPI_FUNC(int) PyCell_Set(PyObject *, PyObject *); + +#define PyCell_GET(op) (((PyCellObject *)(op))->ob_ref) +#define PyCell_SET(op, v) ((void)(((PyCellObject *)(op))->ob_ref = v)) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_TUPLEOBJECT_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/ceval.h b/ScriptEngine/third-party/backend/include/Python/ceval.h new file mode 100644 index 0000000000..0f687666e2 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/ceval.h @@ -0,0 +1,158 @@ +#ifndef Py_CEVAL_H +#define Py_CEVAL_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* Interface to random parts in ceval.c */ + +/* PyEval_CallObjectWithKeywords(), PyEval_CallObject(), PyEval_CallFunction + * and PyEval_CallMethod are deprecated. Since they are officially part of the + * stable ABI (PEP 384), they must be kept for backward compatibility. + * PyObject_Call(), PyObject_CallFunction() and PyObject_CallMethod() are + * recommended to call a callable object. + */ + +Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallObjectWithKeywords( + PyObject *callable, + PyObject *args, + PyObject *kwargs); + +/* Deprecated since PyEval_CallObjectWithKeywords is deprecated */ +#define PyEval_CallObject(callable, arg) \ + PyEval_CallObjectWithKeywords(callable, arg, (PyObject *)NULL) + +Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallFunction( + PyObject *callable, const char *format, ...); +Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyEval_CallMethod( + PyObject *obj, const char *name, const char *format, ...); + +PyAPI_FUNC(PyObject *) PyEval_GetBuiltins(void); +PyAPI_FUNC(PyObject *) PyEval_GetGlobals(void); +PyAPI_FUNC(PyObject *) PyEval_GetLocals(void); +PyAPI_FUNC(PyFrameObject *) PyEval_GetFrame(void); + +PyAPI_FUNC(int) Py_AddPendingCall(int (*func)(void *), void *arg); +PyAPI_FUNC(int) Py_MakePendingCalls(void); + +/* Protection against deeply nested recursive calls + + In Python 3.0, this protection has two levels: + * normal anti-recursion protection is triggered when the recursion level + exceeds the current recursion limit. It raises a RecursionError, and sets + the "overflowed" flag in the thread state structure. This flag + temporarily *disables* the normal protection; this allows cleanup code + to potentially outgrow the recursion limit while processing the + RecursionError. + * "last chance" anti-recursion protection is triggered when the recursion + level exceeds "current recursion limit + 50". By construction, this + protection can only be triggered when the "overflowed" flag is set. It + means the cleanup code has itself gone into an infinite loop, or the + RecursionError has been mistakingly ignored. When this protection is + triggered, the interpreter aborts with a Fatal Error. + + In addition, the "overflowed" flag is automatically reset when the + recursion level drops below "current recursion limit - 50". This heuristic + is meant to ensure that the normal anti-recursion protection doesn't get + disabled too long. + + Please note: this scheme has its own limitations. See: + http://mail.python.org/pipermail/python-dev/2008-August/082106.html + for some observations. +*/ +PyAPI_FUNC(void) Py_SetRecursionLimit(int); +PyAPI_FUNC(int) Py_GetRecursionLimit(void); + +PyAPI_FUNC(int) Py_EnterRecursiveCall(const char *where); +PyAPI_FUNC(void) Py_LeaveRecursiveCall(void); + +PyAPI_FUNC(const char *) PyEval_GetFuncName(PyObject *); +PyAPI_FUNC(const char *) PyEval_GetFuncDesc(PyObject *); + +PyAPI_FUNC(PyObject *) PyEval_EvalFrame(PyFrameObject *); +PyAPI_FUNC(PyObject *) PyEval_EvalFrameEx(PyFrameObject *f, int exc); + +/* Interface for threads. + + A module that plans to do a blocking system call (or something else + that lasts a long time and doesn't touch Python data) can allow other + threads to run as follows: + + ...preparations here... + Py_BEGIN_ALLOW_THREADS + ...blocking system call here... + Py_END_ALLOW_THREADS + ...interpret result here... + + The Py_BEGIN_ALLOW_THREADS/Py_END_ALLOW_THREADS pair expands to a + {}-surrounded block. + To leave the block in the middle (e.g., with return), you must insert + a line containing Py_BLOCK_THREADS before the return, e.g. + + if (...premature_exit...) { + Py_BLOCK_THREADS + PyErr_SetFromErrno(PyExc_OSError); + return NULL; + } + + An alternative is: + + Py_BLOCK_THREADS + if (...premature_exit...) { + PyErr_SetFromErrno(PyExc_OSError); + return NULL; + } + Py_UNBLOCK_THREADS + + For convenience, that the value of 'errno' is restored across + Py_END_ALLOW_THREADS and Py_BLOCK_THREADS. + + WARNING: NEVER NEST CALLS TO Py_BEGIN_ALLOW_THREADS AND + Py_END_ALLOW_THREADS!!! + + Note that not yet all candidates have been converted to use this + mechanism! +*/ + +PyAPI_FUNC(PyThreadState *) PyEval_SaveThread(void); +PyAPI_FUNC(void) PyEval_RestoreThread(PyThreadState *); + +Py_DEPRECATED(3.9) PyAPI_FUNC(int) PyEval_ThreadsInitialized(void); +Py_DEPRECATED(3.9) PyAPI_FUNC(void) PyEval_InitThreads(void); +/* PyEval_AcquireLock() and PyEval_ReleaseLock() are part of stable ABI. + * They will be removed from this header file in the future version. + * But they will be remained in ABI until Python 4.0. + */ +Py_DEPRECATED(3.2) PyAPI_FUNC(void) PyEval_AcquireLock(void); +Py_DEPRECATED(3.2) PyAPI_FUNC(void) PyEval_ReleaseLock(void); +PyAPI_FUNC(void) PyEval_AcquireThread(PyThreadState *tstate); +PyAPI_FUNC(void) PyEval_ReleaseThread(PyThreadState *tstate); + +#define Py_BEGIN_ALLOW_THREADS { \ + PyThreadState *_save; \ + _save = PyEval_SaveThread(); +#define Py_BLOCK_THREADS PyEval_RestoreThread(_save); +#define Py_UNBLOCK_THREADS _save = PyEval_SaveThread(); +#define Py_END_ALLOW_THREADS PyEval_RestoreThread(_save); \ + } + +/* Masks and values used by FORMAT_VALUE opcode. */ +#define FVC_MASK 0x3 +#define FVC_NONE 0x0 +#define FVC_STR 0x1 +#define FVC_REPR 0x2 +#define FVC_ASCII 0x3 +#define FVS_MASK 0x4 +#define FVS_HAVE_SPEC 0x4 + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_CEVAL_H +# include "cpython/ceval.h" +# undef Py_CPYTHON_CEVAL_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_CEVAL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/classobject.h b/ScriptEngine/third-party/backend/include/Python/classobject.h new file mode 100644 index 0000000000..1952f673b7 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/classobject.h @@ -0,0 +1,57 @@ +/* Former class object interface -- now only bound methods are here */ + +/* Revealing some structures (not for general use) */ + +#ifndef Py_LIMITED_API +#ifndef Py_CLASSOBJECT_H +#define Py_CLASSOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + PyObject_HEAD + PyObject *im_func; /* The callable object implementing the method */ + PyObject *im_self; /* The instance it is bound to */ + PyObject *im_weakreflist; /* List of weak references */ + vectorcallfunc vectorcall; +} PyMethodObject; + +PyAPI_DATA(PyTypeObject) PyMethod_Type; + +#define PyMethod_Check(op) Py_IS_TYPE(op, &PyMethod_Type) + +PyAPI_FUNC(PyObject *) PyMethod_New(PyObject *, PyObject *); + +PyAPI_FUNC(PyObject *) PyMethod_Function(PyObject *); +PyAPI_FUNC(PyObject *) PyMethod_Self(PyObject *); + +/* Macros for direct access to these values. Type checks are *not* + done, so use with care. */ +#define PyMethod_GET_FUNCTION(meth) \ + (((PyMethodObject *)meth) -> im_func) +#define PyMethod_GET_SELF(meth) \ + (((PyMethodObject *)meth) -> im_self) + +typedef struct { + PyObject_HEAD + PyObject *func; +} PyInstanceMethodObject; + +PyAPI_DATA(PyTypeObject) PyInstanceMethod_Type; + +#define PyInstanceMethod_Check(op) Py_IS_TYPE(op, &PyInstanceMethod_Type) + +PyAPI_FUNC(PyObject *) PyInstanceMethod_New(PyObject *); +PyAPI_FUNC(PyObject *) PyInstanceMethod_Function(PyObject *); + +/* Macros for direct access to these values. Type checks are *not* + done, so use with care. */ +#define PyInstanceMethod_GET_FUNCTION(meth) \ + (((PyInstanceMethodObject *)meth) -> func) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_CLASSOBJECT_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/code.h b/ScriptEngine/third-party/backend/include/Python/code.h new file mode 100644 index 0000000000..b9e23eb816 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/code.h @@ -0,0 +1,20 @@ +/* Definitions for bytecode */ + +#ifndef Py_CODE_H +#define Py_CODE_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct PyCodeObject PyCodeObject; + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_CODE_H +# include "cpython/code.h" +# undef Py_CPYTHON_CODE_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_CODE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/codecs.h b/ScriptEngine/third-party/backend/include/Python/codecs.h new file mode 100644 index 0000000000..37ecfb4ab7 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/codecs.h @@ -0,0 +1,248 @@ +#ifndef Py_CODECREGISTRY_H +#define Py_CODECREGISTRY_H +#ifdef __cplusplus +extern "C" { +#endif + +/* ------------------------------------------------------------------------ + + Python Codec Registry and support functions + + +Written by Marc-Andre Lemburg (mal@lemburg.com). + +Copyright (c) Corporation for National Research Initiatives. + + ------------------------------------------------------------------------ */ + +/* Register a new codec search function. + + As side effect, this tries to load the encodings package, if not + yet done, to make sure that it is always first in the list of + search functions. + + The search_function's refcount is incremented by this function. */ + +PyAPI_FUNC(int) PyCodec_Register( + PyObject *search_function + ); + +/* Unregister a codec search function and clear the registry's cache. + If the search function is not registered, do nothing. + Return 0 on success. Raise an exception and return -1 on error. */ + +PyAPI_FUNC(int) PyCodec_Unregister( + PyObject *search_function + ); + +/* Codec registry lookup API. + + Looks up the given encoding and returns a CodecInfo object with + function attributes which implement the different aspects of + processing the encoding. + + The encoding string is looked up converted to all lower-case + characters. This makes encodings looked up through this mechanism + effectively case-insensitive. + + If no codec is found, a KeyError is set and NULL returned. + + As side effect, this tries to load the encodings package, if not + yet done. This is part of the lazy load strategy for the encodings + package. + + */ + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyCodec_Lookup( + const char *encoding + ); + +PyAPI_FUNC(int) _PyCodec_Forget( + const char *encoding + ); +#endif + +/* Codec registry encoding check API. + + Returns 1/0 depending on whether there is a registered codec for + the given encoding. + +*/ + +PyAPI_FUNC(int) PyCodec_KnownEncoding( + const char *encoding + ); + +/* Generic codec based encoding API. + + object is passed through the encoder function found for the given + encoding using the error handling method defined by errors. errors + may be NULL to use the default method defined for the codec. + + Raises a LookupError in case no encoder can be found. + + */ + +PyAPI_FUNC(PyObject *) PyCodec_Encode( + PyObject *object, + const char *encoding, + const char *errors + ); + +/* Generic codec based decoding API. + + object is passed through the decoder function found for the given + encoding using the error handling method defined by errors. errors + may be NULL to use the default method defined for the codec. + + Raises a LookupError in case no encoder can be found. + + */ + +PyAPI_FUNC(PyObject *) PyCodec_Decode( + PyObject *object, + const char *encoding, + const char *errors + ); + +#ifndef Py_LIMITED_API +/* Text codec specific encoding and decoding API. + + Checks the encoding against a list of codecs which do not + implement a str<->bytes encoding before attempting the + operation. + + Please note that these APIs are internal and should not + be used in Python C extensions. + + XXX (ncoghlan): should we make these, or something like them, public + in Python 3.5+? + + */ +PyAPI_FUNC(PyObject *) _PyCodec_LookupTextEncoding( + const char *encoding, + const char *alternate_command + ); + +PyAPI_FUNC(PyObject *) _PyCodec_EncodeText( + PyObject *object, + const char *encoding, + const char *errors + ); + +PyAPI_FUNC(PyObject *) _PyCodec_DecodeText( + PyObject *object, + const char *encoding, + const char *errors + ); + +/* These two aren't actually text encoding specific, but _io.TextIOWrapper + * is the only current API consumer. + */ +PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalDecoder( + PyObject *codec_info, + const char *errors + ); + +PyAPI_FUNC(PyObject *) _PyCodecInfo_GetIncrementalEncoder( + PyObject *codec_info, + const char *errors + ); +#endif + + + +/* --- Codec Lookup APIs -------------------------------------------------- + + All APIs return a codec object with incremented refcount and are + based on _PyCodec_Lookup(). The same comments w/r to the encoding + name also apply to these APIs. + +*/ + +/* Get an encoder function for the given encoding. */ + +PyAPI_FUNC(PyObject *) PyCodec_Encoder( + const char *encoding + ); + +/* Get a decoder function for the given encoding. */ + +PyAPI_FUNC(PyObject *) PyCodec_Decoder( + const char *encoding + ); + +/* Get an IncrementalEncoder object for the given encoding. */ + +PyAPI_FUNC(PyObject *) PyCodec_IncrementalEncoder( + const char *encoding, + const char *errors + ); + +/* Get an IncrementalDecoder object function for the given encoding. */ + +PyAPI_FUNC(PyObject *) PyCodec_IncrementalDecoder( + const char *encoding, + const char *errors + ); + +/* Get a StreamReader factory function for the given encoding. */ + +PyAPI_FUNC(PyObject *) PyCodec_StreamReader( + const char *encoding, + PyObject *stream, + const char *errors + ); + +/* Get a StreamWriter factory function for the given encoding. */ + +PyAPI_FUNC(PyObject *) PyCodec_StreamWriter( + const char *encoding, + PyObject *stream, + const char *errors + ); + +/* Unicode encoding error handling callback registry API */ + +/* Register the error handling callback function error under the given + name. This function will be called by the codec when it encounters + unencodable characters/undecodable bytes and doesn't know the + callback name, when name is specified as the error parameter + in the call to the encode/decode function. + Return 0 on success, -1 on error */ +PyAPI_FUNC(int) PyCodec_RegisterError(const char *name, PyObject *error); + +/* Lookup the error handling callback function registered under the given + name. As a special case NULL can be passed, in which case + the error handling callback for "strict" will be returned. */ +PyAPI_FUNC(PyObject *) PyCodec_LookupError(const char *name); + +/* raise exc as an exception */ +PyAPI_FUNC(PyObject *) PyCodec_StrictErrors(PyObject *exc); + +/* ignore the unicode error, skipping the faulty input */ +PyAPI_FUNC(PyObject *) PyCodec_IgnoreErrors(PyObject *exc); + +/* replace the unicode encode error with ? or U+FFFD */ +PyAPI_FUNC(PyObject *) PyCodec_ReplaceErrors(PyObject *exc); + +/* replace the unicode encode error with XML character references */ +PyAPI_FUNC(PyObject *) PyCodec_XMLCharRefReplaceErrors(PyObject *exc); + +/* replace the unicode encode error with backslash escapes (\x, \u and \U) */ +PyAPI_FUNC(PyObject *) PyCodec_BackslashReplaceErrors(PyObject *exc); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* replace the unicode encode error with backslash escapes (\N, \x, \u and \U) */ +PyAPI_FUNC(PyObject *) PyCodec_NameReplaceErrors(PyObject *exc); +#endif + +#ifndef Py_LIMITED_API +PyAPI_DATA(const char *) Py_hexdigits; +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_CODECREGISTRY_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/compile.h b/ScriptEngine/third-party/backend/include/Python/compile.h new file mode 100644 index 0000000000..3c5acd7209 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/compile.h @@ -0,0 +1,25 @@ +#ifndef Py_COMPILE_H +#define Py_COMPILE_H +#ifdef __cplusplus +extern "C" { +#endif + +/* These definitions must match corresponding definitions in graminit.h. */ +#define Py_single_input 256 +#define Py_file_input 257 +#define Py_eval_input 258 +#define Py_func_type_input 345 + +/* This doesn't need to match anything */ +#define Py_fstring_input 800 + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_COMPILE_H +# include "cpython/compile.h" +# undef Py_CPYTHON_COMPILE_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_COMPILE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/complexobject.h b/ScriptEngine/third-party/backend/include/Python/complexobject.h new file mode 100644 index 0000000000..9221f9c51d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/complexobject.h @@ -0,0 +1,69 @@ +/* Complex number structure */ + +#ifndef Py_COMPLEXOBJECT_H +#define Py_COMPLEXOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +typedef struct { + double real; + double imag; +} Py_complex; + +/* Operations on complex numbers from complexmodule.c */ + +PyAPI_FUNC(Py_complex) _Py_c_sum(Py_complex, Py_complex); +PyAPI_FUNC(Py_complex) _Py_c_diff(Py_complex, Py_complex); +PyAPI_FUNC(Py_complex) _Py_c_neg(Py_complex); +PyAPI_FUNC(Py_complex) _Py_c_prod(Py_complex, Py_complex); +PyAPI_FUNC(Py_complex) _Py_c_quot(Py_complex, Py_complex); +PyAPI_FUNC(Py_complex) _Py_c_pow(Py_complex, Py_complex); +PyAPI_FUNC(double) _Py_c_abs(Py_complex); +#endif + +/* Complex object interface */ + +/* +PyComplexObject represents a complex number with double-precision +real and imaginary parts. +*/ +#ifndef Py_LIMITED_API +typedef struct { + PyObject_HEAD + Py_complex cval; +} PyComplexObject; +#endif + +PyAPI_DATA(PyTypeObject) PyComplex_Type; + +#define PyComplex_Check(op) PyObject_TypeCheck(op, &PyComplex_Type) +#define PyComplex_CheckExact(op) Py_IS_TYPE(op, &PyComplex_Type) + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) PyComplex_FromCComplex(Py_complex); +#endif +PyAPI_FUNC(PyObject *) PyComplex_FromDoubles(double real, double imag); + +PyAPI_FUNC(double) PyComplex_RealAsDouble(PyObject *op); +PyAPI_FUNC(double) PyComplex_ImagAsDouble(PyObject *op); +#ifndef Py_LIMITED_API +PyAPI_FUNC(Py_complex) PyComplex_AsCComplex(PyObject *op); +#endif + +/* Format the object based on the format_spec, as defined in PEP 3101 + (Advanced String Formatting). */ +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyComplex_FormatAdvancedWriter( + _PyUnicodeWriter *writer, + PyObject *obj, + PyObject *format_spec, + Py_ssize_t start, + Py_ssize_t end); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_COMPLEXOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/context.h b/ScriptEngine/third-party/backend/include/Python/context.h new file mode 100644 index 0000000000..4e5007089d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/context.h @@ -0,0 +1,81 @@ +#ifndef Py_CONTEXT_H +#define Py_CONTEXT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API + + +PyAPI_DATA(PyTypeObject) PyContext_Type; +typedef struct _pycontextobject PyContext; + +PyAPI_DATA(PyTypeObject) PyContextVar_Type; +typedef struct _pycontextvarobject PyContextVar; + +PyAPI_DATA(PyTypeObject) PyContextToken_Type; +typedef struct _pycontexttokenobject PyContextToken; + + +#define PyContext_CheckExact(o) Py_IS_TYPE(o, &PyContext_Type) +#define PyContextVar_CheckExact(o) Py_IS_TYPE(o, &PyContextVar_Type) +#define PyContextToken_CheckExact(o) Py_IS_TYPE(o, &PyContextToken_Type) + + +PyAPI_FUNC(PyObject *) PyContext_New(void); +PyAPI_FUNC(PyObject *) PyContext_Copy(PyObject *); +PyAPI_FUNC(PyObject *) PyContext_CopyCurrent(void); + +PyAPI_FUNC(int) PyContext_Enter(PyObject *); +PyAPI_FUNC(int) PyContext_Exit(PyObject *); + + +/* Create a new context variable. + + default_value can be NULL. +*/ +PyAPI_FUNC(PyObject *) PyContextVar_New( + const char *name, PyObject *default_value); + + +/* Get a value for the variable. + + Returns -1 if an error occurred during lookup. + + Returns 0 if value either was or was not found. + + If value was found, *value will point to it. + If not, it will point to: + + - default_value, if not NULL; + - the default value of "var", if not NULL; + - NULL. + + '*value' will be a new ref, if not NULL. +*/ +PyAPI_FUNC(int) PyContextVar_Get( + PyObject *var, PyObject *default_value, PyObject **value); + + +/* Set a new value for the variable. + Returns NULL if an error occurs. +*/ +PyAPI_FUNC(PyObject *) PyContextVar_Set(PyObject *var, PyObject *value); + + +/* Reset a variable to its previous value. + Returns 0 on success, -1 on error. +*/ +PyAPI_FUNC(int) PyContextVar_Reset(PyObject *var, PyObject *token); + + +/* This method is exposed only for CPython tests. Don not use it. */ +PyAPI_FUNC(PyObject *) _PyContext_NewHamtForTests(void); + + +#endif /* !Py_LIMITED_API */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_CONTEXT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/abstract.h b/ScriptEngine/third-party/backend/include/Python/cpython/abstract.h new file mode 100644 index 0000000000..db85021964 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/abstract.h @@ -0,0 +1,373 @@ +#ifndef Py_CPYTHON_ABSTRACTOBJECT_H +# error "this header file must not be included directly" +#endif + +/* === Object Protocol ================================================== */ + +#ifdef PY_SSIZE_T_CLEAN +# define _PyObject_CallMethodId _PyObject_CallMethodId_SizeT +#endif + +/* Convert keyword arguments from the FASTCALL (stack: C array, kwnames: tuple) + format to a Python dictionary ("kwargs" dict). + + The type of kwnames keys is not checked. The final function getting + arguments is responsible to check if all keys are strings, for example using + PyArg_ParseTupleAndKeywords() or PyArg_ValidateKeywordArguments(). + + Duplicate keys are merged using the last value. If duplicate keys must raise + an exception, the caller is responsible to implement an explicit keys on + kwnames. */ +PyAPI_FUNC(PyObject *) _PyStack_AsDict( + PyObject *const *values, + PyObject *kwnames); + +/* Suggested size (number of positional arguments) for arrays of PyObject* + allocated on a C stack to avoid allocating memory on the heap memory. Such + array is used to pass positional arguments to call functions of the + PyObject_Vectorcall() family. + + The size is chosen to not abuse the C stack and so limit the risk of stack + overflow. The size is also chosen to allow using the small stack for most + function calls of the Python standard library. On 64-bit CPU, it allocates + 40 bytes on the stack. */ +#define _PY_FASTCALL_SMALL_STACK 5 + +PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult( + PyThreadState *tstate, + PyObject *callable, + PyObject *result, + const char *where); + +/* === Vectorcall protocol (PEP 590) ============================= */ + +/* Call callable using tp_call. Arguments are like PyObject_Vectorcall() + or PyObject_FastCallDict() (both forms are supported), + except that nargs is plainly the number of arguments without flags. */ +PyAPI_FUNC(PyObject *) _PyObject_MakeTpCall( + PyThreadState *tstate, + PyObject *callable, + PyObject *const *args, Py_ssize_t nargs, + PyObject *keywords); + +#define PY_VECTORCALL_ARGUMENTS_OFFSET ((size_t)1 << (8 * sizeof(size_t) - 1)) + +static inline Py_ssize_t +PyVectorcall_NARGS(size_t n) +{ + return n & ~PY_VECTORCALL_ARGUMENTS_OFFSET; +} + +static inline vectorcallfunc +PyVectorcall_Function(PyObject *callable) +{ + PyTypeObject *tp; + Py_ssize_t offset; + vectorcallfunc ptr; + + assert(callable != NULL); + tp = Py_TYPE(callable); + if (!PyType_HasFeature(tp, Py_TPFLAGS_HAVE_VECTORCALL)) { + return NULL; + } + assert(PyCallable_Check(callable)); + offset = tp->tp_vectorcall_offset; + assert(offset > 0); + memcpy(&ptr, (char *) callable + offset, sizeof(ptr)); + return ptr; +} + +/* Call the callable object 'callable' with the "vectorcall" calling + convention. + + args is a C array for positional arguments. + + nargsf is the number of positional arguments plus optionally the flag + PY_VECTORCALL_ARGUMENTS_OFFSET which means that the caller is allowed to + modify args[-1]. + + kwnames is a tuple of keyword names. The values of the keyword arguments + are stored in "args" after the positional arguments (note that the number + of keyword arguments does not change nargsf). kwnames can also be NULL if + there are no keyword arguments. + + keywords must only contain strings and all keys must be unique. + + Return the result on success. Raise an exception and return NULL on + error. */ +static inline PyObject * +_PyObject_VectorcallTstate(PyThreadState *tstate, PyObject *callable, + PyObject *const *args, size_t nargsf, + PyObject *kwnames) +{ + vectorcallfunc func; + PyObject *res; + + assert(kwnames == NULL || PyTuple_Check(kwnames)); + assert(args != NULL || PyVectorcall_NARGS(nargsf) == 0); + + func = PyVectorcall_Function(callable); + if (func == NULL) { + Py_ssize_t nargs = PyVectorcall_NARGS(nargsf); + return _PyObject_MakeTpCall(tstate, callable, args, nargs, kwnames); + } + res = func(callable, args, nargsf, kwnames); + return _Py_CheckFunctionResult(tstate, callable, res, NULL); +} + +static inline PyObject * +PyObject_Vectorcall(PyObject *callable, PyObject *const *args, + size_t nargsf, PyObject *kwnames) +{ + PyThreadState *tstate = PyThreadState_Get(); + return _PyObject_VectorcallTstate(tstate, callable, + args, nargsf, kwnames); +} + +// Backwards compatibility aliases for API that was provisional in Python 3.8 +#define _PyObject_Vectorcall PyObject_Vectorcall +#define _PyObject_VectorcallMethod PyObject_VectorcallMethod +#define _PyObject_FastCallDict PyObject_VectorcallDict +#define _PyVectorcall_Function PyVectorcall_Function +#define _PyObject_CallOneArg PyObject_CallOneArg +#define _PyObject_CallMethodNoArgs PyObject_CallMethodNoArgs +#define _PyObject_CallMethodOneArg PyObject_CallMethodOneArg + +/* Same as PyObject_Vectorcall except that keyword arguments are passed as + dict, which may be NULL if there are no keyword arguments. */ +PyAPI_FUNC(PyObject *) PyObject_VectorcallDict( + PyObject *callable, + PyObject *const *args, + size_t nargsf, + PyObject *kwargs); + +/* Call "callable" (which must support vectorcall) with positional arguments + "tuple" and keyword arguments "dict". "dict" may also be NULL */ +PyAPI_FUNC(PyObject *) PyVectorcall_Call(PyObject *callable, PyObject *tuple, PyObject *dict); + +static inline PyObject * +_PyObject_FastCallTstate(PyThreadState *tstate, PyObject *func, PyObject *const *args, Py_ssize_t nargs) +{ + return _PyObject_VectorcallTstate(tstate, func, args, (size_t)nargs, NULL); +} + +/* Same as PyObject_Vectorcall except without keyword arguments */ +static inline PyObject * +_PyObject_FastCall(PyObject *func, PyObject *const *args, Py_ssize_t nargs) +{ + PyThreadState *tstate = PyThreadState_Get(); + return _PyObject_FastCallTstate(tstate, func, args, nargs); +} + +/* Call a callable without any arguments + Private static inline function variant of public function + PyObject_CallNoArgs(). */ +static inline PyObject * +_PyObject_CallNoArg(PyObject *func) { + PyThreadState *tstate = PyThreadState_Get(); + return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL); +} + +static inline PyObject * +PyObject_CallOneArg(PyObject *func, PyObject *arg) +{ + PyObject *_args[2]; + PyObject **args; + PyThreadState *tstate; + size_t nargsf; + + assert(arg != NULL); + args = _args + 1; // For PY_VECTORCALL_ARGUMENTS_OFFSET + args[0] = arg; + tstate = PyThreadState_Get(); + nargsf = 1 | PY_VECTORCALL_ARGUMENTS_OFFSET; + return _PyObject_VectorcallTstate(tstate, func, args, nargsf, NULL); +} + +PyAPI_FUNC(PyObject *) PyObject_VectorcallMethod( + PyObject *name, PyObject *const *args, + size_t nargsf, PyObject *kwnames); + +static inline PyObject * +PyObject_CallMethodNoArgs(PyObject *self, PyObject *name) +{ + return PyObject_VectorcallMethod(name, &self, + 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); +} + +static inline PyObject * +PyObject_CallMethodOneArg(PyObject *self, PyObject *name, PyObject *arg) +{ + PyObject *args[2] = {self, arg}; + + assert(arg != NULL); + return PyObject_VectorcallMethod(name, args, + 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); +} + +/* Like PyObject_CallMethod(), but expect a _Py_Identifier* + as the method name. */ +PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj, + _Py_Identifier *name, + const char *format, ...); + +PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *obj, + _Py_Identifier *name, + const char *format, + ...); + +PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs( + PyObject *obj, + struct _Py_Identifier *name, + ...); + +static inline PyObject * +_PyObject_VectorcallMethodId( + _Py_Identifier *name, PyObject *const *args, + size_t nargsf, PyObject *kwnames) +{ + PyObject *oname = _PyUnicode_FromId(name); /* borrowed */ + if (!oname) { + return NULL; + } + return PyObject_VectorcallMethod(oname, args, nargsf, kwnames); +} + +static inline PyObject * +_PyObject_CallMethodIdNoArgs(PyObject *self, _Py_Identifier *name) +{ + return _PyObject_VectorcallMethodId(name, &self, + 1 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); +} + +static inline PyObject * +_PyObject_CallMethodIdOneArg(PyObject *self, _Py_Identifier *name, PyObject *arg) +{ + PyObject *args[2] = {self, arg}; + + assert(arg != NULL); + return _PyObject_VectorcallMethodId(name, args, + 2 | PY_VECTORCALL_ARGUMENTS_OFFSET, NULL); +} + +PyAPI_FUNC(int) _PyObject_HasLen(PyObject *o); + +/* Guess the size of object 'o' using len(o) or o.__length_hint__(). + If neither of those return a non-negative value, then return the default + value. If one of the calls fails, this function returns -1. */ +PyAPI_FUNC(Py_ssize_t) PyObject_LengthHint(PyObject *o, Py_ssize_t); + +/* === New Buffer API ============================================ */ + +/* Return 1 if the getbuffer function is available, otherwise return 0. */ +PyAPI_FUNC(int) PyObject_CheckBuffer(PyObject *obj); + +/* This is a C-API version of the getbuffer function call. It checks + to make sure object has the required function pointer and issues the + call. + + Returns -1 and raises an error on failure and returns 0 on success. */ +PyAPI_FUNC(int) PyObject_GetBuffer(PyObject *obj, Py_buffer *view, + int flags); + +/* Get the memory area pointed to by the indices for the buffer given. + Note that view->ndim is the assumed size of indices. */ +PyAPI_FUNC(void *) PyBuffer_GetPointer(Py_buffer *view, Py_ssize_t *indices); + +/* Return the implied itemsize of the data-format area from a + struct-style description. */ +PyAPI_FUNC(Py_ssize_t) PyBuffer_SizeFromFormat(const char *format); + +/* Implementation in memoryobject.c */ +PyAPI_FUNC(int) PyBuffer_ToContiguous(void *buf, Py_buffer *view, + Py_ssize_t len, char order); + +PyAPI_FUNC(int) PyBuffer_FromContiguous(Py_buffer *view, void *buf, + Py_ssize_t len, char order); + +/* Copy len bytes of data from the contiguous chunk of memory + pointed to by buf into the buffer exported by obj. Return + 0 on success and return -1 and raise a PyBuffer_Error on + error (i.e. the object does not have a buffer interface or + it is not working). + + If fort is 'F', then if the object is multi-dimensional, + then the data will be copied into the array in + Fortran-style (first dimension varies the fastest). If + fort is 'C', then the data will be copied into the array + in C-style (last dimension varies the fastest). If fort + is 'A', then it does not matter and the copy will be made + in whatever way is more efficient. */ +PyAPI_FUNC(int) PyObject_CopyData(PyObject *dest, PyObject *src); + +/* Copy the data from the src buffer to the buffer of destination. */ +PyAPI_FUNC(int) PyBuffer_IsContiguous(const Py_buffer *view, char fort); + +/*Fill the strides array with byte-strides of a contiguous + (Fortran-style if fort is 'F' or C-style otherwise) + array of the given shape with the given number of bytes + per element. */ +PyAPI_FUNC(void) PyBuffer_FillContiguousStrides(int ndims, + Py_ssize_t *shape, + Py_ssize_t *strides, + int itemsize, + char fort); + +/* Fills in a buffer-info structure correctly for an exporter + that can only share a contiguous chunk of memory of + "unsigned bytes" of the given length. + + Returns 0 on success and -1 (with raising an error) on error. */ +PyAPI_FUNC(int) PyBuffer_FillInfo(Py_buffer *view, PyObject *o, void *buf, + Py_ssize_t len, int readonly, + int flags); + +/* Releases a Py_buffer obtained from getbuffer ParseTuple's "s*". */ +PyAPI_FUNC(void) PyBuffer_Release(Py_buffer *view); + +/* === Sequence protocol ================================================ */ + +/* Assume tp_as_sequence and sq_item exist and that 'i' does not + need to be corrected for a negative index. */ +#define PySequence_ITEM(o, i)\ + ( Py_TYPE(o)->tp_as_sequence->sq_item(o, i) ) + +#define PY_ITERSEARCH_COUNT 1 +#define PY_ITERSEARCH_INDEX 2 +#define PY_ITERSEARCH_CONTAINS 3 + +/* Iterate over seq. + + Result depends on the operation: + + PY_ITERSEARCH_COUNT: return # of times obj appears in seq; -1 if + error. + PY_ITERSEARCH_INDEX: return 0-based index of first occurrence of + obj in seq; set ValueError and return -1 if none found; + also return -1 on error. + PY_ITERSEARCH_CONTAINS: return 1 if obj in seq, else 0; -1 on + error. */ +PyAPI_FUNC(Py_ssize_t) _PySequence_IterSearch(PyObject *seq, + PyObject *obj, int operation); + +/* === Mapping protocol ================================================= */ + +PyAPI_FUNC(int) _PyObject_RealIsInstance(PyObject *inst, PyObject *cls); + +PyAPI_FUNC(int) _PyObject_RealIsSubclass(PyObject *derived, PyObject *cls); + +PyAPI_FUNC(char *const *) _PySequence_BytesToCharpArray(PyObject* self); + +PyAPI_FUNC(void) _Py_FreeCharPArray(char *const array[]); + +/* For internal use by buffer API functions */ +PyAPI_FUNC(void) _Py_add_one_to_index_F(int nd, Py_ssize_t *index, + const Py_ssize_t *shape); +PyAPI_FUNC(void) _Py_add_one_to_index_C(int nd, Py_ssize_t *index, + const Py_ssize_t *shape); + +/* Convert Python int to Py_ssize_t. Do nothing if the argument is None. */ +PyAPI_FUNC(int) _Py_convert_optional_to_ssize_t(PyObject *, void *); + +/* Same as PyNumber_Index but can return an instance of a subclass of int. */ +PyAPI_FUNC(PyObject *) _PyNumber_Index(PyObject *o); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/bytearrayobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/bytearrayobject.h new file mode 100644 index 0000000000..569b0cd036 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/bytearrayobject.h @@ -0,0 +1,20 @@ +#ifndef Py_CPYTHON_BYTEARRAYOBJECT_H +# error "this header file must not be included directly" +#endif + +/* Object layout */ +typedef struct { + PyObject_VAR_HEAD + Py_ssize_t ob_alloc; /* How many bytes allocated in ob_bytes */ + char *ob_bytes; /* Physical backing buffer */ + char *ob_start; /* Logical start inside ob_bytes */ + Py_ssize_t ob_exports; /* How many buffer exports */ +} PyByteArrayObject; + +/* Macros, trading safety for speed */ +#define PyByteArray_AS_STRING(self) \ + (assert(PyByteArray_Check(self)), \ + Py_SIZE(self) ? ((PyByteArrayObject *)(self))->ob_start : _PyByteArray_empty_string) +#define PyByteArray_GET_SIZE(self) (assert(PyByteArray_Check(self)), Py_SIZE(self)) + +PyAPI_DATA(char) _PyByteArray_empty_string[]; diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/bytesobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/bytesobject.h new file mode 100644 index 0000000000..6b3f55224f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/bytesobject.h @@ -0,0 +1,118 @@ +#ifndef Py_CPYTHON_BYTESOBJECT_H +# error "this header file must not be included directly" +#endif + +typedef struct { + PyObject_VAR_HEAD + Py_hash_t ob_shash; + char ob_sval[1]; + + /* Invariants: + * ob_sval contains space for 'ob_size+1' elements. + * ob_sval[ob_size] == 0. + * ob_shash is the hash of the byte string or -1 if not computed yet. + */ +} PyBytesObject; + +PyAPI_FUNC(int) _PyBytes_Resize(PyObject **, Py_ssize_t); +PyAPI_FUNC(PyObject*) _PyBytes_FormatEx( + const char *format, + Py_ssize_t format_len, + PyObject *args, + int use_bytearray); +PyAPI_FUNC(PyObject*) _PyBytes_FromHex( + PyObject *string, + int use_bytearray); + +/* Helper for PyBytes_DecodeEscape that detects invalid escape chars. */ +PyAPI_FUNC(PyObject *) _PyBytes_DecodeEscape(const char *, Py_ssize_t, + const char *, const char **); + +/* Macro, trading safety for speed */ +#define PyBytes_AS_STRING(op) (assert(PyBytes_Check(op)), \ + (((PyBytesObject *)(op))->ob_sval)) +#define PyBytes_GET_SIZE(op) (assert(PyBytes_Check(op)),Py_SIZE(op)) + +/* _PyBytes_Join(sep, x) is like sep.join(x). sep must be PyBytesObject*, + x must be an iterable object. */ +PyAPI_FUNC(PyObject *) _PyBytes_Join(PyObject *sep, PyObject *x); + + +/* The _PyBytesWriter structure is big: it contains an embedded "stack buffer". + A _PyBytesWriter variable must be declared at the end of variables in a + function to optimize the memory allocation on the stack. */ +typedef struct { + /* bytes, bytearray or NULL (when the small buffer is used) */ + PyObject *buffer; + + /* Number of allocated size. */ + Py_ssize_t allocated; + + /* Minimum number of allocated bytes, + incremented by _PyBytesWriter_Prepare() */ + Py_ssize_t min_size; + + /* If non-zero, use a bytearray instead of a bytes object for buffer. */ + int use_bytearray; + + /* If non-zero, overallocate the buffer (default: 0). + This flag must be zero if use_bytearray is non-zero. */ + int overallocate; + + /* Stack buffer */ + int use_small_buffer; + char small_buffer[512]; +} _PyBytesWriter; + +/* Initialize a bytes writer + + By default, the overallocation is disabled. Set the overallocate attribute + to control the allocation of the buffer. */ +PyAPI_FUNC(void) _PyBytesWriter_Init(_PyBytesWriter *writer); + +/* Get the buffer content and reset the writer. + Return a bytes object, or a bytearray object if use_bytearray is non-zero. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(PyObject *) _PyBytesWriter_Finish(_PyBytesWriter *writer, + void *str); + +/* Deallocate memory of a writer (clear its internal buffer). */ +PyAPI_FUNC(void) _PyBytesWriter_Dealloc(_PyBytesWriter *writer); + +/* Allocate the buffer to write size bytes. + Return the pointer to the beginning of buffer data. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(void*) _PyBytesWriter_Alloc(_PyBytesWriter *writer, + Py_ssize_t size); + +/* Ensure that the buffer is large enough to write *size* bytes. + Add size to the writer minimum size (min_size attribute). + + str is the current pointer inside the buffer. + Return the updated current pointer inside the buffer. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(void*) _PyBytesWriter_Prepare(_PyBytesWriter *writer, + void *str, + Py_ssize_t size); + +/* Resize the buffer to make it larger. + The new buffer may be larger than size bytes because of overallocation. + Return the updated current pointer inside the buffer. + Raise an exception and return NULL on error. + + Note: size must be greater than the number of allocated bytes in the writer. + + This function doesn't use the writer minimum size (min_size attribute). + + See also _PyBytesWriter_Prepare(). + */ +PyAPI_FUNC(void*) _PyBytesWriter_Resize(_PyBytesWriter *writer, + void *str, + Py_ssize_t size); + +/* Write bytes. + Raise an exception and return NULL on error. */ +PyAPI_FUNC(void*) _PyBytesWriter_WriteBytes(_PyBytesWriter *writer, + void *str, + const void *bytes, + Py_ssize_t size); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/ceval.h b/ScriptEngine/third-party/backend/include/Python/cpython/ceval.h new file mode 100644 index 0000000000..06338928f6 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/ceval.h @@ -0,0 +1,30 @@ +#ifndef Py_CPYTHON_CEVAL_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(void) PyEval_SetProfile(Py_tracefunc, PyObject *); +PyAPI_DATA(int) _PyEval_SetProfile(PyThreadState *tstate, Py_tracefunc func, PyObject *arg); +PyAPI_FUNC(void) PyEval_SetTrace(Py_tracefunc, PyObject *); +PyAPI_FUNC(int) _PyEval_SetTrace(PyThreadState *tstate, Py_tracefunc func, PyObject *arg); +PyAPI_FUNC(int) _PyEval_GetCoroutineOriginTrackingDepth(void); +PyAPI_FUNC(int) _PyEval_SetAsyncGenFirstiter(PyObject *); +PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFirstiter(void); +PyAPI_FUNC(int) _PyEval_SetAsyncGenFinalizer(PyObject *); +PyAPI_FUNC(PyObject *) _PyEval_GetAsyncGenFinalizer(void); + +/* Helper to look up a builtin object */ +PyAPI_FUNC(PyObject *) _PyEval_GetBuiltinId(_Py_Identifier *); +/* Look at the current frame's (if any) code's co_flags, and turn on + the corresponding compiler flags in cf->cf_flags. Return 1 if any + flag was set, else return 0. */ +PyAPI_FUNC(int) PyEval_MergeCompilerFlags(PyCompilerFlags *cf); + +PyAPI_FUNC(PyObject *) _PyEval_EvalFrameDefault(PyThreadState *tstate, PyFrameObject *f, int exc); + +PyAPI_FUNC(void) _PyEval_SetSwitchInterval(unsigned long microseconds); +PyAPI_FUNC(unsigned long) _PyEval_GetSwitchInterval(void); + +PyAPI_FUNC(Py_ssize_t) _PyEval_RequestCodeExtraIndex(freefunc); + +PyAPI_FUNC(int) _PyEval_SliceIndex(PyObject *, Py_ssize_t *); +PyAPI_FUNC(int) _PyEval_SliceIndexNotNone(PyObject *, Py_ssize_t *); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/code.h b/ScriptEngine/third-party/backend/include/Python/cpython/code.h new file mode 100644 index 0000000000..fa6408521c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/code.h @@ -0,0 +1,184 @@ +#ifndef Py_CPYTHON_CODE_H +# error "this header file must not be included directly" +#endif + +typedef uint16_t _Py_CODEUNIT; + +#ifdef WORDS_BIGENDIAN +# define _Py_OPCODE(word) ((word) >> 8) +# define _Py_OPARG(word) ((word) & 255) +#else +# define _Py_OPCODE(word) ((word) & 255) +# define _Py_OPARG(word) ((word) >> 8) +#endif + +typedef struct _PyOpcache _PyOpcache; + +/* Bytecode object */ +struct PyCodeObject { + PyObject_HEAD + int co_argcount; /* #arguments, except *args */ + int co_posonlyargcount; /* #positional only arguments */ + int co_kwonlyargcount; /* #keyword only arguments */ + int co_nlocals; /* #local variables */ + int co_stacksize; /* #entries needed for evaluation stack */ + int co_flags; /* CO_..., see below */ + int co_firstlineno; /* first source line number */ + PyObject *co_code; /* instruction opcodes */ + PyObject *co_consts; /* list (constants used) */ + PyObject *co_names; /* list of strings (names used) */ + PyObject *co_varnames; /* tuple of strings (local variable names) */ + PyObject *co_freevars; /* tuple of strings (free variable names) */ + PyObject *co_cellvars; /* tuple of strings (cell variable names) */ + /* The rest aren't used in either hash or comparisons, except for co_name, + used in both. This is done to preserve the name and line number + for tracebacks and debuggers; otherwise, constant de-duplication + would collapse identical functions/lambdas defined on different lines. + */ + Py_ssize_t *co_cell2arg; /* Maps cell vars which are arguments. */ + PyObject *co_filename; /* unicode (where it was loaded from) */ + PyObject *co_name; /* unicode (name, for reference) */ + PyObject *co_linetable; /* string (encoding addr<->lineno mapping) See + Objects/lnotab_notes.txt for details. */ + void *co_zombieframe; /* for optimization only (see frameobject.c) */ + PyObject *co_weakreflist; /* to support weakrefs to code objects */ + /* Scratch space for extra data relating to the code object. + Type is a void* to keep the format private in codeobject.c to force + people to go through the proper APIs. */ + void *co_extra; + + /* Per opcodes just-in-time cache + * + * To reduce cache size, we use indirect mapping from opcode index to + * cache object: + * cache = co_opcache[co_opcache_map[next_instr - first_instr] - 1] + */ + + // co_opcache_map is indexed by (next_instr - first_instr). + // * 0 means there is no cache for this opcode. + // * n > 0 means there is cache in co_opcache[n-1]. + unsigned char *co_opcache_map; + _PyOpcache *co_opcache; + int co_opcache_flag; // used to determine when create a cache. + unsigned char co_opcache_size; // length of co_opcache. +}; + +/* Masks for co_flags above */ +#define CO_OPTIMIZED 0x0001 +#define CO_NEWLOCALS 0x0002 +#define CO_VARARGS 0x0004 +#define CO_VARKEYWORDS 0x0008 +#define CO_NESTED 0x0010 +#define CO_GENERATOR 0x0020 +/* The CO_NOFREE flag is set if there are no free or cell variables. + This information is redundant, but it allows a single flag test + to determine whether there is any extra work to be done when the + call frame it setup. +*/ +#define CO_NOFREE 0x0040 + +/* The CO_COROUTINE flag is set for coroutine functions (defined with + ``async def`` keywords) */ +#define CO_COROUTINE 0x0080 +#define CO_ITERABLE_COROUTINE 0x0100 +#define CO_ASYNC_GENERATOR 0x0200 + +/* bpo-39562: These constant values are changed in Python 3.9 + to prevent collision with compiler flags. CO_FUTURE_ and PyCF_ + constants must be kept unique. PyCF_ constants can use bits from + 0x0100 to 0x10000. CO_FUTURE_ constants use bits starting at 0x20000. */ +#define CO_FUTURE_DIVISION 0x20000 +#define CO_FUTURE_ABSOLUTE_IMPORT 0x40000 /* do absolute imports by default */ +#define CO_FUTURE_WITH_STATEMENT 0x80000 +#define CO_FUTURE_PRINT_FUNCTION 0x100000 +#define CO_FUTURE_UNICODE_LITERALS 0x200000 + +#define CO_FUTURE_BARRY_AS_BDFL 0x400000 +#define CO_FUTURE_GENERATOR_STOP 0x800000 +#define CO_FUTURE_ANNOTATIONS 0x1000000 + +/* This value is found in the co_cell2arg array when the associated cell + variable does not correspond to an argument. */ +#define CO_CELL_NOT_AN_ARG (-1) + +/* This should be defined if a future statement modifies the syntax. + For example, when a keyword is added. +*/ +#define PY_PARSER_REQUIRES_FUTURE_KEYWORD + +#define CO_MAXBLOCKS 20 /* Max static block nesting within a function */ + +PyAPI_DATA(PyTypeObject) PyCode_Type; + +#define PyCode_Check(op) Py_IS_TYPE(op, &PyCode_Type) +#define PyCode_GetNumFree(op) (PyTuple_GET_SIZE((op)->co_freevars)) + +/* Public interface */ +PyAPI_FUNC(PyCodeObject *) PyCode_New( + int, int, int, int, int, PyObject *, PyObject *, + PyObject *, PyObject *, PyObject *, PyObject *, + PyObject *, PyObject *, int, PyObject *); + +PyAPI_FUNC(PyCodeObject *) PyCode_NewWithPosOnlyArgs( + int, int, int, int, int, int, PyObject *, PyObject *, + PyObject *, PyObject *, PyObject *, PyObject *, + PyObject *, PyObject *, int, PyObject *); + /* same as struct above */ + +/* Creates a new empty code object with the specified source location. */ +PyAPI_FUNC(PyCodeObject *) +PyCode_NewEmpty(const char *filename, const char *funcname, int firstlineno); + +/* Return the line number associated with the specified bytecode index + in this code object. If you just need the line number of a frame, + use PyFrame_GetLineNumber() instead. */ +PyAPI_FUNC(int) PyCode_Addr2Line(PyCodeObject *, int); + +/* for internal use only */ +struct _opaque { + int computed_line; + const char *lo_next; + const char *limit; +}; + +typedef struct _line_offsets { + int ar_start; + int ar_end; + int ar_line; + struct _opaque opaque; +} PyCodeAddressRange; + +/* Update *bounds to describe the first and one-past-the-last instructions in the + same line as lasti. Return the number of that line. +*/ +PyAPI_FUNC(int) _PyCode_CheckLineNumber(int lasti, PyCodeAddressRange *bounds); + +/* Create a comparable key used to compare constants taking in account the + * object type. It is used to make sure types are not coerced (e.g., float and + * complex) _and_ to distinguish 0.0 from -0.0 e.g. on IEEE platforms + * + * Return (type(obj), obj, ...): a tuple with variable size (at least 2 items) + * depending on the type and the value. The type is the first item to not + * compare bytes and str which can raise a BytesWarning exception. */ +PyAPI_FUNC(PyObject*) _PyCode_ConstantKey(PyObject *obj); + +PyAPI_FUNC(PyObject*) PyCode_Optimize(PyObject *code, PyObject* consts, + PyObject *names, PyObject *lnotab); + + +PyAPI_FUNC(int) _PyCode_GetExtra(PyObject *code, Py_ssize_t index, + void **extra); +PyAPI_FUNC(int) _PyCode_SetExtra(PyObject *code, Py_ssize_t index, + void *extra); + +/** API for initializing the line number table. */ +int _PyCode_InitAddressRange(PyCodeObject* co, PyCodeAddressRange *bounds); + +/** Out of process API for initializing the line number table. */ +void PyLineTable_InitAddressRange(const char *linetable, Py_ssize_t length, int firstlineno, PyCodeAddressRange *range); + +/** API for traversing the line number table. */ +int PyLineTable_NextAddressRange(PyCodeAddressRange *range); +int PyLineTable_PreviousAddressRange(PyCodeAddressRange *range); + + diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/compile.h b/ScriptEngine/third-party/backend/include/Python/cpython/compile.h new file mode 100644 index 0000000000..518a376499 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/compile.h @@ -0,0 +1,54 @@ +#ifndef Py_CPYTHON_COMPILE_H +# error "this header file must not be included directly" +#endif + +/* Public interface */ +#define PyCF_MASK (CO_FUTURE_DIVISION | CO_FUTURE_ABSOLUTE_IMPORT | \ + CO_FUTURE_WITH_STATEMENT | CO_FUTURE_PRINT_FUNCTION | \ + CO_FUTURE_UNICODE_LITERALS | CO_FUTURE_BARRY_AS_BDFL | \ + CO_FUTURE_GENERATOR_STOP | CO_FUTURE_ANNOTATIONS) +#define PyCF_MASK_OBSOLETE (CO_NESTED) + +/* bpo-39562: CO_FUTURE_ and PyCF_ constants must be kept unique. + PyCF_ constants can use bits from 0x0100 to 0x10000. + CO_FUTURE_ constants use bits starting at 0x20000. */ +#define PyCF_SOURCE_IS_UTF8 0x0100 +#define PyCF_DONT_IMPLY_DEDENT 0x0200 +#define PyCF_ONLY_AST 0x0400 +#define PyCF_IGNORE_COOKIE 0x0800 +#define PyCF_TYPE_COMMENTS 0x1000 +#define PyCF_ALLOW_TOP_LEVEL_AWAIT 0x2000 +#define PyCF_ALLOW_INCOMPLETE_INPUT 0x4000 +#define PyCF_COMPILE_MASK (PyCF_ONLY_AST | PyCF_ALLOW_TOP_LEVEL_AWAIT | \ + PyCF_TYPE_COMMENTS | PyCF_DONT_IMPLY_DEDENT | \ + PyCF_ALLOW_INCOMPLETE_INPUT) + +typedef struct { + int cf_flags; /* bitmask of CO_xxx flags relevant to future */ + int cf_feature_version; /* minor Python version (PyCF_ONLY_AST) */ +} PyCompilerFlags; + +#define _PyCompilerFlags_INIT \ + (PyCompilerFlags){.cf_flags = 0, .cf_feature_version = PY_MINOR_VERSION} + +/* Future feature support */ + +typedef struct { + int ff_features; /* flags set by future statements */ + int ff_lineno; /* line number of last future statement */ +} PyFutureFeatures; + +#define FUTURE_NESTED_SCOPES "nested_scopes" +#define FUTURE_GENERATORS "generators" +#define FUTURE_DIVISION "division" +#define FUTURE_ABSOLUTE_IMPORT "absolute_import" +#define FUTURE_WITH_STATEMENT "with_statement" +#define FUTURE_PRINT_FUNCTION "print_function" +#define FUTURE_UNICODE_LITERALS "unicode_literals" +#define FUTURE_BARRY_AS_BDFL "barry_as_FLUFL" +#define FUTURE_GENERATOR_STOP "generator_stop" +#define FUTURE_ANNOTATIONS "annotations" + +#define PY_INVALID_STACK_EFFECT INT_MAX +PyAPI_FUNC(int) PyCompile_OpcodeStackEffect(int opcode, int oparg); +PyAPI_FUNC(int) PyCompile_OpcodeStackEffectWithJump(int opcode, int oparg, int jump); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/dictobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/dictobject.h new file mode 100644 index 0000000000..641d7bdc48 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/dictobject.h @@ -0,0 +1,84 @@ +#ifndef Py_CPYTHON_DICTOBJECT_H +# error "this header file must not be included directly" +#endif + +typedef struct _dictkeysobject PyDictKeysObject; + +/* The ma_values pointer is NULL for a combined table + * or points to an array of PyObject* for a split table + */ +typedef struct { + PyObject_HEAD + + /* Number of items in the dictionary */ + Py_ssize_t ma_used; + + /* Dictionary version: globally unique, value change each time + the dictionary is modified */ + uint64_t ma_version_tag; + + PyDictKeysObject *ma_keys; + + /* If ma_values is NULL, the table is "combined": keys and values + are stored in ma_keys. + + If ma_values is not NULL, the table is split: + keys are stored in ma_keys and values are stored in ma_values */ + PyObject **ma_values; +} PyDictObject; + +PyAPI_FUNC(PyObject *) _PyDict_GetItem_KnownHash(PyObject *mp, PyObject *key, + Py_hash_t hash); +PyAPI_FUNC(PyObject *) _PyDict_GetItemIdWithError(PyObject *dp, + struct _Py_Identifier *key); +PyAPI_FUNC(PyObject *) _PyDict_GetItemStringWithError(PyObject *, const char *); +PyAPI_FUNC(PyObject *) PyDict_SetDefault( + PyObject *mp, PyObject *key, PyObject *defaultobj); +PyAPI_FUNC(int) _PyDict_SetItem_KnownHash(PyObject *mp, PyObject *key, + PyObject *item, Py_hash_t hash); +PyAPI_FUNC(int) _PyDict_DelItem_KnownHash(PyObject *mp, PyObject *key, + Py_hash_t hash); +PyAPI_FUNC(int) _PyDict_DelItemIf(PyObject *mp, PyObject *key, + int (*predicate)(PyObject *value)); +PyDictKeysObject *_PyDict_NewKeysForClass(void); +PyAPI_FUNC(int) _PyDict_Next( + PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value, Py_hash_t *hash); + +/* Get the number of items of a dictionary. */ +#define PyDict_GET_SIZE(mp) (assert(PyDict_Check(mp)),((PyDictObject *)mp)->ma_used) +PyAPI_FUNC(int) _PyDict_Contains_KnownHash(PyObject *, PyObject *, Py_hash_t); +PyAPI_FUNC(int) _PyDict_ContainsId(PyObject *, struct _Py_Identifier *); +PyAPI_FUNC(PyObject *) _PyDict_NewPresized(Py_ssize_t minused); +PyAPI_FUNC(void) _PyDict_MaybeUntrack(PyObject *mp); +PyAPI_FUNC(int) _PyDict_HasOnlyStringKeys(PyObject *mp); +Py_ssize_t _PyDict_KeysSize(PyDictKeysObject *keys); +PyAPI_FUNC(Py_ssize_t) _PyDict_SizeOf(PyDictObject *); +PyAPI_FUNC(PyObject *) _PyDict_Pop(PyObject *, PyObject *, PyObject *); +PyObject *_PyDict_Pop_KnownHash(PyObject *, PyObject *, Py_hash_t, PyObject *); +PyObject *_PyDict_FromKeys(PyObject *, PyObject *, PyObject *); +#define _PyDict_HasSplitTable(d) ((d)->ma_values != NULL) + +/* Like PyDict_Merge, but override can be 0, 1 or 2. If override is 0, + the first occurrence of a key wins, if override is 1, the last occurrence + of a key wins, if override is 2, a KeyError with conflicting key as + argument is raised. +*/ +PyAPI_FUNC(int) _PyDict_MergeEx(PyObject *mp, PyObject *other, int override); +PyAPI_FUNC(int) _PyDict_SetItemId(PyObject *dp, struct _Py_Identifier *key, PyObject *item); + +PyAPI_FUNC(int) _PyDict_DelItemId(PyObject *mp, struct _Py_Identifier *key); +PyAPI_FUNC(void) _PyDict_DebugMallocStats(FILE *out); + +int _PyObjectDict_SetItem(PyTypeObject *tp, PyObject **dictptr, PyObject *name, PyObject *value); +PyObject *_PyDict_LoadGlobal(PyDictObject *, PyDictObject *, PyObject *); +Py_ssize_t _PyDict_GetItemHint(PyDictObject *, PyObject *, Py_ssize_t, PyObject **); + +/* _PyDictView */ + +typedef struct { + PyObject_HEAD + PyDictObject *dv_dict; +} _PyDictViewObject; + +PyAPI_FUNC(PyObject *) _PyDictView_New(PyObject *, PyTypeObject *); +PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/fileobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/fileobject.h new file mode 100644 index 0000000000..cff2243d62 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/fileobject.h @@ -0,0 +1,18 @@ +#ifndef Py_CPYTHON_FILEOBJECT_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(char *) Py_UniversalNewlineFgets(char *, int, FILE*, PyObject *); + +/* The std printer acts as a preliminary sys.stderr until the new io + infrastructure is in place. */ +PyAPI_FUNC(PyObject *) PyFile_NewStdPrinter(int); +PyAPI_DATA(PyTypeObject) PyStdPrinter_Type; + +typedef PyObject * (*Py_OpenCodeHookFunction)(PyObject *, void *); + +PyAPI_FUNC(PyObject *) PyFile_OpenCode(const char *utf8path); +PyAPI_FUNC(PyObject *) PyFile_OpenCodeObject(PyObject *path); +PyAPI_FUNC(int) PyFile_SetOpenCodeHook(Py_OpenCodeHookFunction hook, void *userData); + +PyAPI_FUNC(int) _PyLong_FileDescriptor_Converter(PyObject *, void *); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/fileutils.h b/ScriptEngine/third-party/backend/include/Python/cpython/fileutils.h new file mode 100644 index 0000000000..ccf37e9468 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/fileutils.h @@ -0,0 +1,172 @@ +#ifndef Py_CPYTHON_FILEUTILS_H +# error "this header file must not be included directly" +#endif + +typedef enum { + _Py_ERROR_UNKNOWN=0, + _Py_ERROR_STRICT, + _Py_ERROR_SURROGATEESCAPE, + _Py_ERROR_REPLACE, + _Py_ERROR_IGNORE, + _Py_ERROR_BACKSLASHREPLACE, + _Py_ERROR_SURROGATEPASS, + _Py_ERROR_XMLCHARREFREPLACE, + _Py_ERROR_OTHER +} _Py_error_handler; + +PyAPI_FUNC(_Py_error_handler) _Py_GetErrorHandler(const char *errors); + +PyAPI_FUNC(int) _Py_DecodeLocaleEx( + const char *arg, + wchar_t **wstr, + size_t *wlen, + const char **reason, + int current_locale, + _Py_error_handler errors); + +PyAPI_FUNC(int) _Py_EncodeLocaleEx( + const wchar_t *text, + char **str, + size_t *error_pos, + const char **reason, + int current_locale, + _Py_error_handler errors); + +PyAPI_FUNC(char*) _Py_EncodeLocaleRaw( + const wchar_t *text, + size_t *error_pos); + +PyAPI_FUNC(PyObject *) _Py_device_encoding(int); + +#if defined(MS_WINDOWS) || defined(__APPLE__) + /* On Windows, the count parameter of read() is an int (bpo-9015, bpo-9611). + On macOS 10.13, read() and write() with more than INT_MAX bytes + fail with EINVAL (bpo-24658). */ +# define _PY_READ_MAX INT_MAX +# define _PY_WRITE_MAX INT_MAX +#else + /* write() should truncate the input to PY_SSIZE_T_MAX bytes, + but it's safer to do it ourself to have a portable behaviour */ +# define _PY_READ_MAX PY_SSIZE_T_MAX +# define _PY_WRITE_MAX PY_SSIZE_T_MAX +#endif + +#ifdef MS_WINDOWS +struct _Py_stat_struct { + unsigned long st_dev; + uint64_t st_ino; + unsigned short st_mode; + int st_nlink; + int st_uid; + int st_gid; + unsigned long st_rdev; + __int64 st_size; + time_t st_atime; + int st_atime_nsec; + time_t st_mtime; + int st_mtime_nsec; + time_t st_ctime; + int st_ctime_nsec; + unsigned long st_file_attributes; + unsigned long st_reparse_tag; +}; +#else +# define _Py_stat_struct stat +#endif + +PyAPI_FUNC(int) _Py_fstat( + int fd, + struct _Py_stat_struct *status); + +PyAPI_FUNC(int) _Py_fstat_noraise( + int fd, + struct _Py_stat_struct *status); + +PyAPI_FUNC(int) _Py_stat( + PyObject *path, + struct stat *status); + +PyAPI_FUNC(int) _Py_open( + const char *pathname, + int flags); + +PyAPI_FUNC(int) _Py_open_noraise( + const char *pathname, + int flags); + +PyAPI_FUNC(FILE *) _Py_wfopen( + const wchar_t *path, + const wchar_t *mode); + +PyAPI_FUNC(FILE*) _Py_fopen_obj( + PyObject *path, + const char *mode); + +PyAPI_FUNC(Py_ssize_t) _Py_read( + int fd, + void *buf, + size_t count); + +PyAPI_FUNC(Py_ssize_t) _Py_write( + int fd, + const void *buf, + size_t count); + +PyAPI_FUNC(Py_ssize_t) _Py_write_noraise( + int fd, + const void *buf, + size_t count); + +#ifdef HAVE_READLINK +PyAPI_FUNC(int) _Py_wreadlink( + const wchar_t *path, + wchar_t *buf, + /* Number of characters of 'buf' buffer + including the trailing NUL character */ + size_t buflen); +#endif + +#ifdef HAVE_REALPATH +PyAPI_FUNC(wchar_t*) _Py_wrealpath( + const wchar_t *path, + wchar_t *resolved_path, + /* Number of characters of 'resolved_path' buffer + including the trailing NUL character */ + size_t resolved_path_len); +#endif + +#ifndef MS_WINDOWS +PyAPI_FUNC(int) _Py_isabs(const wchar_t *path); +#endif + +PyAPI_FUNC(int) _Py_abspath(const wchar_t *path, wchar_t **abspath_p); + +PyAPI_FUNC(wchar_t*) _Py_wgetcwd( + wchar_t *buf, + /* Number of characters of 'buf' buffer + including the trailing NUL character */ + size_t buflen); + +PyAPI_FUNC(int) _Py_get_inheritable(int fd); + +PyAPI_FUNC(int) _Py_set_inheritable(int fd, int inheritable, + int *atomic_flag_works); + +PyAPI_FUNC(int) _Py_set_inheritable_async_safe(int fd, int inheritable, + int *atomic_flag_works); + +PyAPI_FUNC(int) _Py_dup(int fd); + +#ifndef MS_WINDOWS +PyAPI_FUNC(int) _Py_get_blocking(int fd); + +PyAPI_FUNC(int) _Py_set_blocking(int fd, int blocking); +#else /* MS_WINDOWS */ +PyAPI_FUNC(void*) _Py_get_osfhandle_noraise(int fd); + +PyAPI_FUNC(void*) _Py_get_osfhandle(int fd); + +PyAPI_FUNC(int) _Py_open_osfhandle_noraise(void *handle, int flags); + +PyAPI_FUNC(int) _Py_open_osfhandle(void *handle, int flags); +#endif /* MS_WINDOWS */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/frameobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/frameobject.h new file mode 100644 index 0000000000..5122ec41a3 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/frameobject.h @@ -0,0 +1,94 @@ +/* Frame object interface */ + +#ifndef Py_CPYTHON_FRAMEOBJECT_H +# error "this header file must not be included directly" +#endif + +/* These values are chosen so that the inline functions below all + * compare f_state to zero. + */ +enum _framestate { + FRAME_CREATED = -2, + FRAME_SUSPENDED = -1, + FRAME_EXECUTING = 0, + FRAME_RETURNED = 1, + FRAME_UNWINDING = 2, + FRAME_RAISED = 3, + FRAME_CLEARED = 4 +}; + +typedef signed char PyFrameState; + +typedef struct { + int b_type; /* what kind of block this is */ + int b_handler; /* where to jump to find handler */ + int b_level; /* value stack level to pop to */ +} PyTryBlock; + +struct _frame { + PyObject_VAR_HEAD + struct _frame *f_back; /* previous frame, or NULL */ + PyCodeObject *f_code; /* code segment */ + PyObject *f_builtins; /* builtin symbol table (PyDictObject) */ + PyObject *f_globals; /* global symbol table (PyDictObject) */ + PyObject *f_locals; /* local symbol table (any mapping) */ + PyObject **f_valuestack; /* points after the last local */ + PyObject *f_trace; /* Trace function */ + int f_stackdepth; /* Depth of value stack */ + char f_trace_lines; /* Emit per-line trace events? */ + char f_trace_opcodes; /* Emit per-opcode trace events? */ + + /* Borrowed reference to a generator, or NULL */ + PyObject *f_gen; + + int f_lasti; /* Last instruction if called */ + int f_lineno; /* Current line number. Only valid if non-zero */ + int f_iblock; /* index in f_blockstack */ + PyFrameState f_state; /* What state the frame is in */ + PyTryBlock f_blockstack[CO_MAXBLOCKS]; /* for try and loop blocks */ + PyObject *f_localsplus[1]; /* locals+stack, dynamically sized */ +}; + +static inline int _PyFrame_IsRunnable(struct _frame *f) { + return f->f_state < FRAME_EXECUTING; +} + +static inline int _PyFrame_IsExecuting(struct _frame *f) { + return f->f_state == FRAME_EXECUTING; +} + +static inline int _PyFrameHasCompleted(struct _frame *f) { + return f->f_state > FRAME_EXECUTING; +} + +/* Standard object interface */ + +PyAPI_DATA(PyTypeObject) PyFrame_Type; + +#define PyFrame_Check(op) Py_IS_TYPE(op, &PyFrame_Type) + +PyAPI_FUNC(PyFrameObject *) PyFrame_New(PyThreadState *, PyCodeObject *, + PyObject *, PyObject *); + +/* only internal use */ +PyFrameObject* +_PyFrame_New_NoTrack(PyThreadState *, PyFrameConstructor *, PyObject *); + + +/* The rest of the interface is specific for frame objects */ + +/* Block management functions */ + +PyAPI_FUNC(void) PyFrame_BlockSetup(PyFrameObject *, int, int, int); +PyAPI_FUNC(PyTryBlock *) PyFrame_BlockPop(PyFrameObject *); + +/* Conversions between "fast locals" and locals in dictionary */ + +PyAPI_FUNC(void) PyFrame_LocalsToFast(PyFrameObject *, int); + +PyAPI_FUNC(int) PyFrame_FastToLocalsWithError(PyFrameObject *f); +PyAPI_FUNC(void) PyFrame_FastToLocals(PyFrameObject *); + +PyAPI_FUNC(void) _PyFrame_DebugMallocStats(FILE *out); + +PyAPI_FUNC(PyFrameObject *) PyFrame_GetBack(PyFrameObject *frame); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/import.h b/ScriptEngine/third-party/backend/include/Python/cpython/import.h new file mode 100644 index 0000000000..419945f710 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/import.h @@ -0,0 +1,46 @@ +#ifndef Py_CPYTHON_IMPORT_H +# error "this header file must not be included directly" +#endif + +PyMODINIT_FUNC PyInit__imp(void); + +PyAPI_FUNC(int) _PyImport_IsInitialized(PyInterpreterState *); + +PyAPI_FUNC(PyObject *) _PyImport_GetModuleId(struct _Py_Identifier *name); +PyAPI_FUNC(int) _PyImport_SetModule(PyObject *name, PyObject *module); +PyAPI_FUNC(int) _PyImport_SetModuleString(const char *name, PyObject* module); + +PyAPI_FUNC(void) _PyImport_AcquireLock(void); +PyAPI_FUNC(int) _PyImport_ReleaseLock(void); + +/* Obsolete since 3.5, will be removed in 3.11. */ +Py_DEPRECATED(3.10) PyAPI_FUNC(PyObject *) _PyImport_FindExtensionObject(PyObject *, PyObject *); + +PyAPI_FUNC(int) _PyImport_FixupBuiltin( + PyObject *mod, + const char *name, /* UTF-8 encoded string */ + PyObject *modules + ); +PyAPI_FUNC(int) _PyImport_FixupExtensionObject(PyObject*, PyObject *, + PyObject *, PyObject *); + +struct _inittab { + const char *name; /* ASCII encoded string */ + PyObject* (*initfunc)(void); +}; +PyAPI_DATA(struct _inittab *) PyImport_Inittab; +PyAPI_FUNC(int) PyImport_ExtendInittab(struct _inittab *newtab); + +struct _frozen { + const char *name; /* ASCII encoded string */ + const unsigned char *code; + int size; +}; + +/* Embedding apps may change this pointer to point to their favorite + collection of frozen modules: */ + +PyAPI_DATA(const struct _frozen *) PyImport_FrozenModules; + +PyAPI_DATA(PyObject *) _PyImport_GetModuleAttr(PyObject *, PyObject *); +PyAPI_DATA(PyObject *) _PyImport_GetModuleAttrString(const char *, const char *); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/initconfig.h b/ScriptEngine/third-party/backend/include/Python/cpython/initconfig.h new file mode 100644 index 0000000000..583165bee4 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/initconfig.h @@ -0,0 +1,249 @@ +#ifndef Py_PYCORECONFIG_H +#define Py_PYCORECONFIG_H +#ifndef Py_LIMITED_API +#ifdef __cplusplus +extern "C" { +#endif + +/* --- PyStatus ----------------------------------------------- */ + +typedef struct { + enum { + _PyStatus_TYPE_OK=0, + _PyStatus_TYPE_ERROR=1, + _PyStatus_TYPE_EXIT=2 + } _type; + const char *func; + const char *err_msg; + int exitcode; +} PyStatus; + +PyAPI_FUNC(PyStatus) PyStatus_Ok(void); +PyAPI_FUNC(PyStatus) PyStatus_Error(const char *err_msg); +PyAPI_FUNC(PyStatus) PyStatus_NoMemory(void); +PyAPI_FUNC(PyStatus) PyStatus_Exit(int exitcode); +PyAPI_FUNC(int) PyStatus_IsError(PyStatus err); +PyAPI_FUNC(int) PyStatus_IsExit(PyStatus err); +PyAPI_FUNC(int) PyStatus_Exception(PyStatus err); + +/* --- PyWideStringList ------------------------------------------------ */ + +typedef struct { + /* If length is greater than zero, items must be non-NULL + and all items strings must be non-NULL */ + Py_ssize_t length; + wchar_t **items; +} PyWideStringList; + +PyAPI_FUNC(PyStatus) PyWideStringList_Append(PyWideStringList *list, + const wchar_t *item); +PyAPI_FUNC(PyStatus) PyWideStringList_Insert(PyWideStringList *list, + Py_ssize_t index, + const wchar_t *item); + + +/* --- PyPreConfig ----------------------------------------------- */ + +typedef struct PyPreConfig { + int _config_init; /* _PyConfigInitEnum value */ + + /* Parse Py_PreInitializeFromBytesArgs() arguments? + See PyConfig.parse_argv */ + int parse_argv; + + /* If greater than 0, enable isolated mode: sys.path contains + neither the script's directory nor the user's site-packages directory. + + Set to 1 by the -I command line option. If set to -1 (default), inherit + Py_IsolatedFlag value. */ + int isolated; + + /* If greater than 0: use environment variables. + Set to 0 by -E command line option. If set to -1 (default), it is + set to !Py_IgnoreEnvironmentFlag. */ + int use_environment; + + /* Set the LC_CTYPE locale to the user preferred locale? If equals to 0, + set coerce_c_locale and coerce_c_locale_warn to 0. */ + int configure_locale; + + /* Coerce the LC_CTYPE locale if it's equal to "C"? (PEP 538) + + Set to 0 by PYTHONCOERCECLOCALE=0. Set to 1 by PYTHONCOERCECLOCALE=1. + Set to 2 if the user preferred LC_CTYPE locale is "C". + + If it is equal to 1, LC_CTYPE locale is read to decide if it should be + coerced or not (ex: PYTHONCOERCECLOCALE=1). Internally, it is set to 2 + if the LC_CTYPE locale must be coerced. + + Disable by default (set to 0). Set it to -1 to let Python decide if it + should be enabled or not. */ + int coerce_c_locale; + + /* Emit a warning if the LC_CTYPE locale is coerced? + + Set to 1 by PYTHONCOERCECLOCALE=warn. + + Disable by default (set to 0). Set it to -1 to let Python decide if it + should be enabled or not. */ + int coerce_c_locale_warn; + +#ifdef MS_WINDOWS + /* If greater than 1, use the "mbcs" encoding instead of the UTF-8 + encoding for the filesystem encoding. + + Set to 1 if the PYTHONLEGACYWINDOWSFSENCODING environment variable is + set to a non-empty string. If set to -1 (default), inherit + Py_LegacyWindowsFSEncodingFlag value. + + See PEP 529 for more details. */ + int legacy_windows_fs_encoding; +#endif + + /* Enable UTF-8 mode? (PEP 540) + + Disabled by default (equals to 0). + + Set to 1 by "-X utf8" and "-X utf8=1" command line options. + Set to 1 by PYTHONUTF8=1 environment variable. + + Set to 0 by "-X utf8=0" and PYTHONUTF8=0. + + If equals to -1, it is set to 1 if the LC_CTYPE locale is "C" or + "POSIX", otherwise it is set to 0. Inherit Py_UTF8Mode value value. */ + int utf8_mode; + + /* If non-zero, enable the Python Development Mode. + + Set to 1 by the -X dev command line option. Set by the PYTHONDEVMODE + environment variable. */ + int dev_mode; + + /* Memory allocator: PYTHONMALLOC env var. + See PyMemAllocatorName for valid values. */ + int allocator; +} PyPreConfig; + +PyAPI_FUNC(void) PyPreConfig_InitPythonConfig(PyPreConfig *config); +PyAPI_FUNC(void) PyPreConfig_InitIsolatedConfig(PyPreConfig *config); + + +/* --- PyConfig ---------------------------------------------- */ + +/* This structure is best documented in the Doc/c-api/init_config.rst file. */ +typedef struct PyConfig { + int _config_init; /* _PyConfigInitEnum value */ + + int isolated; + int use_environment; + int dev_mode; + int install_signal_handlers; + int use_hash_seed; + unsigned long hash_seed; + int faulthandler; + int tracemalloc; + int import_time; + int show_ref_count; + int dump_refs; + int malloc_stats; + wchar_t *filesystem_encoding; + wchar_t *filesystem_errors; + wchar_t *pycache_prefix; + int parse_argv; + PyWideStringList orig_argv; + PyWideStringList argv; + PyWideStringList xoptions; + PyWideStringList warnoptions; + int site_import; + int bytes_warning; + int warn_default_encoding; + int inspect; + int interactive; + int optimization_level; + int parser_debug; + int write_bytecode; + int verbose; + int quiet; + int user_site_directory; + int configure_c_stdio; + int buffered_stdio; + wchar_t *stdio_encoding; + wchar_t *stdio_errors; +#ifdef MS_WINDOWS + int legacy_windows_stdio; +#endif + wchar_t *check_hash_pycs_mode; + + /* --- Path configuration inputs ------------ */ + int pathconfig_warnings; + wchar_t *program_name; + wchar_t *pythonpath_env; + wchar_t *home; + wchar_t *platlibdir; + + /* --- Path configuration outputs ----------- */ + int module_search_paths_set; + PyWideStringList module_search_paths; + wchar_t *executable; + wchar_t *base_executable; + wchar_t *prefix; + wchar_t *base_prefix; + wchar_t *exec_prefix; + wchar_t *base_exec_prefix; + + /* --- Parameter only used by Py_Main() ---------- */ + int skip_source_first_line; + wchar_t *run_command; + wchar_t *run_module; + wchar_t *run_filename; + + /* --- Private fields ---------------------------- */ + + // Install importlib? If equals to 0, importlib is not initialized at all. + // Needed by freeze_importlib. + int _install_importlib; + + // If equal to 0, stop Python initialization before the "main" phase. + int _init_main; + + // If non-zero, disallow threads, subprocesses, and fork. + // Default: 0. + int _isolated_interpreter; +} PyConfig; + +PyAPI_FUNC(void) PyConfig_InitPythonConfig(PyConfig *config); +PyAPI_FUNC(void) PyConfig_InitIsolatedConfig(PyConfig *config); +PyAPI_FUNC(void) PyConfig_Clear(PyConfig *); +PyAPI_FUNC(PyStatus) PyConfig_SetString( + PyConfig *config, + wchar_t **config_str, + const wchar_t *str); +PyAPI_FUNC(PyStatus) PyConfig_SetBytesString( + PyConfig *config, + wchar_t **config_str, + const char *str); +PyAPI_FUNC(PyStatus) PyConfig_Read(PyConfig *config); +PyAPI_FUNC(PyStatus) PyConfig_SetBytesArgv( + PyConfig *config, + Py_ssize_t argc, + char * const *argv); +PyAPI_FUNC(PyStatus) PyConfig_SetArgv(PyConfig *config, + Py_ssize_t argc, + wchar_t * const *argv); +PyAPI_FUNC(PyStatus) PyConfig_SetWideStringList(PyConfig *config, + PyWideStringList *list, + Py_ssize_t length, wchar_t **items); + + +/* --- Helper functions --------------------------------------- */ + +/* Get the original command line arguments, before Python modified them. + + See also PyConfig.orig_argv. */ +PyAPI_FUNC(void) Py_GetArgcArgv(int *argc, wchar_t ***argv); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_LIMITED_API */ +#endif /* !Py_PYCORECONFIG_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/interpreteridobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/interpreteridobject.h new file mode 100644 index 0000000000..5076584209 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/interpreteridobject.h @@ -0,0 +1,11 @@ +#ifndef Py_CPYTHON_INTERPRETERIDOBJECT_H +# error "this header file must not be included directly" +#endif + +/* Interpreter ID Object */ + +PyAPI_DATA(PyTypeObject) _PyInterpreterID_Type; + +PyAPI_FUNC(PyObject *) _PyInterpreterID_New(int64_t); +PyAPI_FUNC(PyObject *) _PyInterpreterState_GetIDObject(PyInterpreterState *); +PyAPI_FUNC(PyInterpreterState *) _PyInterpreterID_LookUp(PyObject *); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/listobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/listobject.h new file mode 100644 index 0000000000..e3239152c4 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/listobject.h @@ -0,0 +1,34 @@ +#ifndef Py_CPYTHON_LISTOBJECT_H +# error "this header file must not be included directly" +#endif + +typedef struct { + PyObject_VAR_HEAD + /* Vector of pointers to list elements. list[0] is ob_item[0], etc. */ + PyObject **ob_item; + + /* ob_item contains space for 'allocated' elements. The number + * currently in use is ob_size. + * Invariants: + * 0 <= ob_size <= allocated + * len(list) == ob_size + * ob_item == NULL implies ob_size == allocated == 0 + * list.sort() temporarily sets allocated to -1 to detect mutations. + * + * Items must normally not be NULL, except during construction when + * the list is not yet visible outside the function that builds it. + */ + Py_ssize_t allocated; +} PyListObject; + +PyAPI_FUNC(PyObject *) _PyList_Extend(PyListObject *, PyObject *); +PyAPI_FUNC(void) _PyList_DebugMallocStats(FILE *out); + +/* Macro, trading safety for speed */ + +/* Cast argument to PyListObject* type. */ +#define _PyList_CAST(op) (assert(PyList_Check(op)), (PyListObject *)(op)) + +#define PyList_GET_ITEM(op, i) (_PyList_CAST(op)->ob_item[i]) +#define PyList_SET_ITEM(op, i, v) ((void)(_PyList_CAST(op)->ob_item[i] = (v))) +#define PyList_GET_SIZE(op) Py_SIZE(_PyList_CAST(op)) diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/methodobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/methodobject.h new file mode 100644 index 0000000000..7ecbfe3b5e --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/methodobject.h @@ -0,0 +1,35 @@ +#ifndef Py_CPYTHON_METHODOBJECT_H +# error "this header file must not be included directly" +#endif + +PyAPI_DATA(PyTypeObject) PyCMethod_Type; + +#define PyCMethod_CheckExact(op) Py_IS_TYPE(op, &PyCMethod_Type) +#define PyCMethod_Check(op) PyObject_TypeCheck(op, &PyCMethod_Type) + +/* Macros for direct access to these values. Type checks are *not* + done, so use with care. */ +#define PyCFunction_GET_FUNCTION(func) \ + (((PyCFunctionObject *)func) -> m_ml -> ml_meth) +#define PyCFunction_GET_SELF(func) \ + (((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_STATIC ? \ + NULL : ((PyCFunctionObject *)func) -> m_self) +#define PyCFunction_GET_FLAGS(func) \ + (((PyCFunctionObject *)func) -> m_ml -> ml_flags) +#define PyCFunction_GET_CLASS(func) \ + (((PyCFunctionObject *)func) -> m_ml -> ml_flags & METH_METHOD ? \ + ((PyCMethodObject *)func) -> mm_class : NULL) + +typedef struct { + PyObject_HEAD + PyMethodDef *m_ml; /* Description of the C function to call */ + PyObject *m_self; /* Passed as 'self' arg to the C func, can be NULL */ + PyObject *m_module; /* The __module__ attribute, can be anything */ + PyObject *m_weakreflist; /* List of weak references */ + vectorcallfunc vectorcall; +} PyCFunctionObject; + +typedef struct { + PyCFunctionObject func; + PyTypeObject *mm_class; /* Class that defines this method */ +} PyCMethodObject; diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/object.h b/ScriptEngine/third-party/backend/include/Python/cpython/object.h new file mode 100644 index 0000000000..84c60e55d5 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/object.h @@ -0,0 +1,552 @@ +#ifndef Py_CPYTHON_OBJECT_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(void) _Py_NewReference(PyObject *op); + +#ifdef Py_TRACE_REFS +/* Py_TRACE_REFS is such major surgery that we call external routines. */ +PyAPI_FUNC(void) _Py_ForgetReference(PyObject *); +#endif + +#ifdef Py_REF_DEBUG +PyAPI_FUNC(Py_ssize_t) _Py_GetRefTotal(void); +#endif + + +/********************* String Literals ****************************************/ +/* This structure helps managing static strings. The basic usage goes like this: + Instead of doing + + r = PyObject_CallMethod(o, "foo", "args", ...); + + do + + _Py_IDENTIFIER(foo); + ... + r = _PyObject_CallMethodId(o, &PyId_foo, "args", ...); + + PyId_foo is a static variable, either on block level or file level. On first + usage, the string "foo" is interned, and the structures are linked. On interpreter + shutdown, all strings are released. + + Alternatively, _Py_static_string allows choosing the variable name. + _PyUnicode_FromId returns a borrowed reference to the interned string. + _PyObject_{Get,Set,Has}AttrId are __getattr__ versions using _Py_Identifier*. +*/ +typedef struct _Py_Identifier { + const char* string; + // Index in PyInterpreterState.unicode.ids.array. It is process-wide + // unique and must be initialized to -1. + Py_ssize_t index; +} _Py_Identifier; + +#define _Py_static_string_init(value) { .string = value, .index = -1 } +#define _Py_static_string(varname, value) static _Py_Identifier varname = _Py_static_string_init(value) +#define _Py_IDENTIFIER(varname) _Py_static_string(PyId_##varname, #varname) + +/* buffer interface */ +typedef struct bufferinfo { + void *buf; + PyObject *obj; /* owned reference */ + Py_ssize_t len; + Py_ssize_t itemsize; /* This is Py_ssize_t so it can be + pointed to by strides in simple case.*/ + int readonly; + int ndim; + char *format; + Py_ssize_t *shape; + Py_ssize_t *strides; + Py_ssize_t *suboffsets; + void *internal; +} Py_buffer; + +typedef int (*getbufferproc)(PyObject *, Py_buffer *, int); +typedef void (*releasebufferproc)(PyObject *, Py_buffer *); + +typedef PyObject *(*vectorcallfunc)(PyObject *callable, PyObject *const *args, + size_t nargsf, PyObject *kwnames); + +/* Maximum number of dimensions */ +#define PyBUF_MAX_NDIM 64 + +/* Flags for getting buffers */ +#define PyBUF_SIMPLE 0 +#define PyBUF_WRITABLE 0x0001 +/* we used to include an E, backwards compatible alias */ +#define PyBUF_WRITEABLE PyBUF_WRITABLE +#define PyBUF_FORMAT 0x0004 +#define PyBUF_ND 0x0008 +#define PyBUF_STRIDES (0x0010 | PyBUF_ND) +#define PyBUF_C_CONTIGUOUS (0x0020 | PyBUF_STRIDES) +#define PyBUF_F_CONTIGUOUS (0x0040 | PyBUF_STRIDES) +#define PyBUF_ANY_CONTIGUOUS (0x0080 | PyBUF_STRIDES) +#define PyBUF_INDIRECT (0x0100 | PyBUF_STRIDES) + +#define PyBUF_CONTIG (PyBUF_ND | PyBUF_WRITABLE) +#define PyBUF_CONTIG_RO (PyBUF_ND) + +#define PyBUF_STRIDED (PyBUF_STRIDES | PyBUF_WRITABLE) +#define PyBUF_STRIDED_RO (PyBUF_STRIDES) + +#define PyBUF_RECORDS (PyBUF_STRIDES | PyBUF_WRITABLE | PyBUF_FORMAT) +#define PyBUF_RECORDS_RO (PyBUF_STRIDES | PyBUF_FORMAT) + +#define PyBUF_FULL (PyBUF_INDIRECT | PyBUF_WRITABLE | PyBUF_FORMAT) +#define PyBUF_FULL_RO (PyBUF_INDIRECT | PyBUF_FORMAT) + + +#define PyBUF_READ 0x100 +#define PyBUF_WRITE 0x200 +/* End buffer interface */ + + +typedef struct { + /* Number implementations must check *both* + arguments for proper type and implement the necessary conversions + in the slot functions themselves. */ + + binaryfunc nb_add; + binaryfunc nb_subtract; + binaryfunc nb_multiply; + binaryfunc nb_remainder; + binaryfunc nb_divmod; + ternaryfunc nb_power; + unaryfunc nb_negative; + unaryfunc nb_positive; + unaryfunc nb_absolute; + inquiry nb_bool; + unaryfunc nb_invert; + binaryfunc nb_lshift; + binaryfunc nb_rshift; + binaryfunc nb_and; + binaryfunc nb_xor; + binaryfunc nb_or; + unaryfunc nb_int; + void *nb_reserved; /* the slot formerly known as nb_long */ + unaryfunc nb_float; + + binaryfunc nb_inplace_add; + binaryfunc nb_inplace_subtract; + binaryfunc nb_inplace_multiply; + binaryfunc nb_inplace_remainder; + ternaryfunc nb_inplace_power; + binaryfunc nb_inplace_lshift; + binaryfunc nb_inplace_rshift; + binaryfunc nb_inplace_and; + binaryfunc nb_inplace_xor; + binaryfunc nb_inplace_or; + + binaryfunc nb_floor_divide; + binaryfunc nb_true_divide; + binaryfunc nb_inplace_floor_divide; + binaryfunc nb_inplace_true_divide; + + unaryfunc nb_index; + + binaryfunc nb_matrix_multiply; + binaryfunc nb_inplace_matrix_multiply; +} PyNumberMethods; + +typedef struct { + lenfunc sq_length; + binaryfunc sq_concat; + ssizeargfunc sq_repeat; + ssizeargfunc sq_item; + void *was_sq_slice; + ssizeobjargproc sq_ass_item; + void *was_sq_ass_slice; + objobjproc sq_contains; + + binaryfunc sq_inplace_concat; + ssizeargfunc sq_inplace_repeat; +} PySequenceMethods; + +typedef struct { + lenfunc mp_length; + binaryfunc mp_subscript; + objobjargproc mp_ass_subscript; +} PyMappingMethods; + +typedef PySendResult (*sendfunc)(PyObject *iter, PyObject *value, PyObject **result); + +typedef struct { + unaryfunc am_await; + unaryfunc am_aiter; + unaryfunc am_anext; + sendfunc am_send; +} PyAsyncMethods; + +typedef struct { + getbufferproc bf_getbuffer; + releasebufferproc bf_releasebuffer; +} PyBufferProcs; + +/* Allow printfunc in the tp_vectorcall_offset slot for + * backwards-compatibility */ +typedef Py_ssize_t printfunc; + +// If this structure is modified, Doc/includes/typestruct.h should be updated +// as well. +struct _typeobject { + PyObject_VAR_HEAD + const char *tp_name; /* For printing, in format "." */ + Py_ssize_t tp_basicsize, tp_itemsize; /* For allocation */ + + /* Methods to implement standard operations */ + + destructor tp_dealloc; + Py_ssize_t tp_vectorcall_offset; + getattrfunc tp_getattr; + setattrfunc tp_setattr; + PyAsyncMethods *tp_as_async; /* formerly known as tp_compare (Python 2) + or tp_reserved (Python 3) */ + reprfunc tp_repr; + + /* Method suites for standard classes */ + + PyNumberMethods *tp_as_number; + PySequenceMethods *tp_as_sequence; + PyMappingMethods *tp_as_mapping; + + /* More standard operations (here for binary compatibility) */ + + hashfunc tp_hash; + ternaryfunc tp_call; + reprfunc tp_str; + getattrofunc tp_getattro; + setattrofunc tp_setattro; + + /* Functions to access object as input/output buffer */ + PyBufferProcs *tp_as_buffer; + + /* Flags to define presence of optional/expanded features */ + unsigned long tp_flags; + + const char *tp_doc; /* Documentation string */ + + /* Assigned meaning in release 2.0 */ + /* call function for all accessible objects */ + traverseproc tp_traverse; + + /* delete references to contained objects */ + inquiry tp_clear; + + /* Assigned meaning in release 2.1 */ + /* rich comparisons */ + richcmpfunc tp_richcompare; + + /* weak reference enabler */ + Py_ssize_t tp_weaklistoffset; + + /* Iterators */ + getiterfunc tp_iter; + iternextfunc tp_iternext; + + /* Attribute descriptor and subclassing stuff */ + struct PyMethodDef *tp_methods; + struct PyMemberDef *tp_members; + struct PyGetSetDef *tp_getset; + // Strong reference on a heap type, borrowed reference on a static type + struct _typeobject *tp_base; + PyObject *tp_dict; + descrgetfunc tp_descr_get; + descrsetfunc tp_descr_set; + Py_ssize_t tp_dictoffset; + initproc tp_init; + allocfunc tp_alloc; + newfunc tp_new; + freefunc tp_free; /* Low-level free-memory routine */ + inquiry tp_is_gc; /* For PyObject_IS_GC */ + PyObject *tp_bases; + PyObject *tp_mro; /* method resolution order */ + PyObject *tp_cache; + PyObject *tp_subclasses; + PyObject *tp_weaklist; + destructor tp_del; + + /* Type attribute cache version tag. Added in version 2.6 */ + unsigned int tp_version_tag; + + destructor tp_finalize; + vectorcallfunc tp_vectorcall; +}; + +/* The *real* layout of a type object when allocated on the heap */ +typedef struct _heaptypeobject { + /* Note: there's a dependency on the order of these members + in slotptr() in typeobject.c . */ + PyTypeObject ht_type; + PyAsyncMethods as_async; + PyNumberMethods as_number; + PyMappingMethods as_mapping; + PySequenceMethods as_sequence; /* as_sequence comes after as_mapping, + so that the mapping wins when both + the mapping and the sequence define + a given operator (e.g. __getitem__). + see add_operators() in typeobject.c . */ + PyBufferProcs as_buffer; + PyObject *ht_name, *ht_slots, *ht_qualname; + struct _dictkeysobject *ht_cached_keys; + PyObject *ht_module; + /* here are optional user slots, followed by the members. */ +} PyHeapTypeObject; + +/* access macro to the members which are floating "behind" the object */ +#define PyHeapType_GET_MEMBERS(etype) \ + ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize)) + +PyAPI_FUNC(const char *) _PyType_Name(PyTypeObject *); +PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); +PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *); +PyAPI_FUNC(PyObject *) _PyObject_LookupSpecial(PyObject *, _Py_Identifier *); +PyAPI_FUNC(PyTypeObject *) _PyType_CalculateMetaclass(PyTypeObject *, PyObject *); +PyAPI_FUNC(PyObject *) _PyType_GetDocFromInternalDoc(const char *, const char *); +PyAPI_FUNC(PyObject *) _PyType_GetTextSignatureFromInternalDoc(const char *, const char *); +struct PyModuleDef; +PyAPI_FUNC(PyObject *) _PyType_GetModuleByDef(PyTypeObject *, struct PyModuleDef *); + +struct _Py_Identifier; +PyAPI_FUNC(int) PyObject_Print(PyObject *, FILE *, int); +PyAPI_FUNC(void) _Py_BreakPoint(void); +PyAPI_FUNC(void) _PyObject_Dump(PyObject *); +PyAPI_FUNC(int) _PyObject_IsFreed(PyObject *); + +PyAPI_FUNC(int) _PyObject_IsAbstract(PyObject *); +PyAPI_FUNC(PyObject *) _PyObject_GetAttrId(PyObject *, struct _Py_Identifier *); +PyAPI_FUNC(int) _PyObject_SetAttrId(PyObject *, struct _Py_Identifier *, PyObject *); +/* Replacements of PyObject_GetAttr() and _PyObject_GetAttrId() which + don't raise AttributeError. + + Return 1 and set *result != NULL if an attribute is found. + Return 0 and set *result == NULL if an attribute is not found; + an AttributeError is silenced. + Return -1 and set *result == NULL if an error other than AttributeError + is raised. +*/ +PyAPI_FUNC(int) _PyObject_LookupAttr(PyObject *, PyObject *, PyObject **); +PyAPI_FUNC(int) _PyObject_LookupAttrId(PyObject *, struct _Py_Identifier *, PyObject **); + +PyAPI_FUNC(int) _PyObject_GetMethod(PyObject *obj, PyObject *name, PyObject **method); + +PyAPI_FUNC(PyObject **) _PyObject_GetDictPtr(PyObject *); +PyAPI_FUNC(PyObject *) _PyObject_NextNotImplemented(PyObject *); +PyAPI_FUNC(void) PyObject_CallFinalizer(PyObject *); +PyAPI_FUNC(int) PyObject_CallFinalizerFromDealloc(PyObject *); + +/* Same as PyObject_Generic{Get,Set}Attr, but passing the attributes + dict as the last parameter. */ +PyAPI_FUNC(PyObject *) +_PyObject_GenericGetAttrWithDict(PyObject *, PyObject *, PyObject *, int); +PyAPI_FUNC(int) +_PyObject_GenericSetAttrWithDict(PyObject *, PyObject *, + PyObject *, PyObject *); + +PyAPI_FUNC(PyObject *) _PyObject_FunctionStr(PyObject *); + +/* Safely decref `op` and set `op` to `op2`. + * + * As in case of Py_CLEAR "the obvious" code can be deadly: + * + * Py_DECREF(op); + * op = op2; + * + * The safe way is: + * + * Py_SETREF(op, op2); + * + * That arranges to set `op` to `op2` _before_ decref'ing, so that any code + * triggered as a side-effect of `op` getting torn down no longer believes + * `op` points to a valid object. + * + * Py_XSETREF is a variant of Py_SETREF that uses Py_XDECREF instead of + * Py_DECREF. + */ + +#define Py_SETREF(op, op2) \ + do { \ + PyObject *_py_tmp = _PyObject_CAST(op); \ + (op) = (op2); \ + Py_DECREF(_py_tmp); \ + } while (0) + +#define Py_XSETREF(op, op2) \ + do { \ + PyObject *_py_tmp = _PyObject_CAST(op); \ + (op) = (op2); \ + Py_XDECREF(_py_tmp); \ + } while (0) + + +PyAPI_DATA(PyTypeObject) _PyNone_Type; +PyAPI_DATA(PyTypeObject) _PyNotImplemented_Type; + +/* Maps Py_LT to Py_GT, ..., Py_GE to Py_LE. + * Defined in object.c. + */ +PyAPI_DATA(int) _Py_SwappedOp[]; + +PyAPI_FUNC(void) +_PyDebugAllocatorStats(FILE *out, const char *block_name, int num_blocks, + size_t sizeof_block); +PyAPI_FUNC(void) +_PyObject_DebugTypeStats(FILE *out); + +/* Define a pair of assertion macros: + _PyObject_ASSERT_FROM(), _PyObject_ASSERT_WITH_MSG() and _PyObject_ASSERT(). + + These work like the regular C assert(), in that they will abort the + process with a message on stderr if the given condition fails to hold, + but compile away to nothing if NDEBUG is defined. + + However, before aborting, Python will also try to call _PyObject_Dump() on + the given object. This may be of use when investigating bugs in which a + particular object is corrupt (e.g. buggy a tp_visit method in an extension + module breaking the garbage collector), to help locate the broken objects. + + The WITH_MSG variant allows you to supply an additional message that Python + will attempt to print to stderr, after the object dump. */ +#ifdef NDEBUG + /* No debugging: compile away the assertions: */ +# define _PyObject_ASSERT_FROM(obj, expr, msg, filename, lineno, func) \ + ((void)0) +#else + /* With debugging: generate checks: */ +# define _PyObject_ASSERT_FROM(obj, expr, msg, filename, lineno, func) \ + ((expr) \ + ? (void)(0) \ + : _PyObject_AssertFailed((obj), Py_STRINGIFY(expr), \ + (msg), (filename), (lineno), (func))) +#endif + +#define _PyObject_ASSERT_WITH_MSG(obj, expr, msg) \ + _PyObject_ASSERT_FROM(obj, expr, msg, __FILE__, __LINE__, __func__) +#define _PyObject_ASSERT(obj, expr) \ + _PyObject_ASSERT_WITH_MSG(obj, expr, NULL) + +#define _PyObject_ASSERT_FAILED_MSG(obj, msg) \ + _PyObject_AssertFailed((obj), NULL, (msg), __FILE__, __LINE__, __func__) + +/* Declare and define _PyObject_AssertFailed() even when NDEBUG is defined, + to avoid causing compiler/linker errors when building extensions without + NDEBUG against a Python built with NDEBUG defined. + + msg, expr and function can be NULL. */ +PyAPI_FUNC(void) _Py_NO_RETURN _PyObject_AssertFailed( + PyObject *obj, + const char *expr, + const char *msg, + const char *file, + int line, + const char *function); + +/* Check if an object is consistent. For example, ensure that the reference + counter is greater than or equal to 1, and ensure that ob_type is not NULL. + + Call _PyObject_AssertFailed() if the object is inconsistent. + + If check_content is zero, only check header fields: reduce the overhead. + + The function always return 1. The return value is just here to be able to + write: + + assert(_PyObject_CheckConsistency(obj, 1)); */ +PyAPI_FUNC(int) _PyObject_CheckConsistency( + PyObject *op, + int check_content); + + +/* Trashcan mechanism, thanks to Christian Tismer. + +When deallocating a container object, it's possible to trigger an unbounded +chain of deallocations, as each Py_DECREF in turn drops the refcount on "the +next" object in the chain to 0. This can easily lead to stack overflows, +especially in threads (which typically have less stack space to work with). + +A container object can avoid this by bracketing the body of its tp_dealloc +function with a pair of macros: + +static void +mytype_dealloc(mytype *p) +{ + ... declarations go here ... + + PyObject_GC_UnTrack(p); // must untrack first + Py_TRASHCAN_BEGIN(p, mytype_dealloc) + ... The body of the deallocator goes here, including all calls ... + ... to Py_DECREF on contained objects. ... + Py_TRASHCAN_END // there should be no code after this +} + +CAUTION: Never return from the middle of the body! If the body needs to +"get out early", put a label immediately before the Py_TRASHCAN_END +call, and goto it. Else the call-depth counter (see below) will stay +above 0 forever, and the trashcan will never get emptied. + +How it works: The BEGIN macro increments a call-depth counter. So long +as this counter is small, the body of the deallocator is run directly without +further ado. But if the counter gets large, it instead adds p to a list of +objects to be deallocated later, skips the body of the deallocator, and +resumes execution after the END macro. The tp_dealloc routine then returns +without deallocating anything (and so unbounded call-stack depth is avoided). + +When the call stack finishes unwinding again, code generated by the END macro +notices this, and calls another routine to deallocate all the objects that +may have been added to the list of deferred deallocations. In effect, a +chain of N deallocations is broken into (N-1)/(PyTrash_UNWIND_LEVEL-1) pieces, +with the call stack never exceeding a depth of PyTrash_UNWIND_LEVEL. + +Since the tp_dealloc of a subclass typically calls the tp_dealloc of the base +class, we need to ensure that the trashcan is only triggered on the tp_dealloc +of the actual class being deallocated. Otherwise we might end up with a +partially-deallocated object. To check this, the tp_dealloc function must be +passed as second argument to Py_TRASHCAN_BEGIN(). +*/ + +/* This is the old private API, invoked by the macros before 3.2.4. + Kept for binary compatibility of extensions using the stable ABI. */ +PyAPI_FUNC(void) _PyTrash_deposit_object(PyObject*); +PyAPI_FUNC(void) _PyTrash_destroy_chain(void); + +/* This is the old private API, invoked by the macros before 3.9. + Kept for binary compatibility of extensions using the stable ABI. */ +PyAPI_FUNC(void) _PyTrash_thread_deposit_object(PyObject*); +PyAPI_FUNC(void) _PyTrash_thread_destroy_chain(void); + +/* Forward declarations for PyThreadState */ +struct _ts; + +/* Python 3.9 private API, invoked by the macros below. */ +PyAPI_FUNC(int) _PyTrash_begin(struct _ts *tstate, PyObject *op); +PyAPI_FUNC(void) _PyTrash_end(struct _ts *tstate); +/* Python 3.10 private API, invoked by the Py_TRASHCAN_BEGIN(). */ +PyAPI_FUNC(int) _PyTrash_cond(PyObject *op, destructor dealloc); + +#define PyTrash_UNWIND_LEVEL 50 + +#define Py_TRASHCAN_BEGIN_CONDITION(op, cond) \ + do { \ + PyThreadState *_tstate = NULL; \ + /* If "cond" is false, then _tstate remains NULL and the deallocator \ + * is run normally without involving the trashcan */ \ + if (cond) { \ + _tstate = PyThreadState_Get(); \ + if (_PyTrash_begin(_tstate, _PyObject_CAST(op))) { \ + break; \ + } \ + } + /* The body of the deallocator is here. */ +#define Py_TRASHCAN_END \ + if (_tstate) { \ + _PyTrash_end(_tstate); \ + } \ + } while (0); + +#define Py_TRASHCAN_BEGIN(op, dealloc) \ + Py_TRASHCAN_BEGIN_CONDITION(op, \ + _PyTrash_cond(_PyObject_CAST(op), (destructor)dealloc)) + +/* For backwards compatibility, these macros enable the trashcan + * unconditionally */ +#define Py_TRASHCAN_SAFE_BEGIN(op) Py_TRASHCAN_BEGIN_CONDITION(op, 1) +#define Py_TRASHCAN_SAFE_END(op) Py_TRASHCAN_END diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/objimpl.h b/ScriptEngine/third-party/backend/include/Python/cpython/objimpl.h new file mode 100644 index 0000000000..d83700e2a4 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/objimpl.h @@ -0,0 +1,100 @@ +#ifndef Py_CPYTHON_OBJIMPL_H +# error "this header file must not be included directly" +#endif + +#define _PyObject_SIZE(typeobj) ( (typeobj)->tp_basicsize ) + +/* _PyObject_VAR_SIZE returns the number of bytes (as size_t) allocated for a + vrbl-size object with nitems items, exclusive of gc overhead (if any). The + value is rounded up to the closest multiple of sizeof(void *), in order to + ensure that pointer fields at the end of the object are correctly aligned + for the platform (this is of special importance for subclasses of, e.g., + str or int, so that pointers can be stored after the embedded data). + + Note that there's no memory wastage in doing this, as malloc has to + return (at worst) pointer-aligned memory anyway. +*/ +#if ((SIZEOF_VOID_P - 1) & SIZEOF_VOID_P) != 0 +# error "_PyObject_VAR_SIZE requires SIZEOF_VOID_P be a power of 2" +#endif + +#define _PyObject_VAR_SIZE(typeobj, nitems) \ + _Py_SIZE_ROUND_UP((typeobj)->tp_basicsize + \ + (nitems)*(typeobj)->tp_itemsize, \ + SIZEOF_VOID_P) + + +/* This example code implements an object constructor with a custom + allocator, where PyObject_New is inlined, and shows the important + distinction between two steps (at least): + 1) the actual allocation of the object storage; + 2) the initialization of the Python specific fields + in this storage with PyObject_{Init, InitVar}. + + PyObject * + YourObject_New(...) + { + PyObject *op; + + op = (PyObject *) Your_Allocator(_PyObject_SIZE(YourTypeStruct)); + if (op == NULL) { + return PyErr_NoMemory(); + } + + PyObject_Init(op, &YourTypeStruct); + + op->ob_field = value; + ... + return op; + } + + Note that in C++, the use of the new operator usually implies that + the 1st step is performed automatically for you, so in a C++ class + constructor you would start directly with PyObject_Init/InitVar. */ + +/* This function returns the number of allocated memory blocks, regardless of size */ +PyAPI_FUNC(Py_ssize_t) _Py_GetAllocatedBlocks(void); + +/* Macros */ +#ifdef WITH_PYMALLOC +PyAPI_FUNC(int) _PyObject_DebugMallocStats(FILE *out); +#endif + + +typedef struct { + /* user context passed as the first argument to the 2 functions */ + void *ctx; + + /* allocate an arena of size bytes */ + void* (*alloc) (void *ctx, size_t size); + + /* free an arena */ + void (*free) (void *ctx, void *ptr, size_t size); +} PyObjectArenaAllocator; + +/* Get the arena allocator. */ +PyAPI_FUNC(void) PyObject_GetArenaAllocator(PyObjectArenaAllocator *allocator); + +/* Set the arena allocator. */ +PyAPI_FUNC(void) PyObject_SetArenaAllocator(PyObjectArenaAllocator *allocator); + + +/* Test if an object implements the garbage collector protocol */ +PyAPI_FUNC(int) PyObject_IS_GC(PyObject *obj); + + +/* Code built with Py_BUILD_CORE must include pycore_gc.h instead which + defines a different _PyGC_FINALIZED() macro. */ +#ifndef Py_BUILD_CORE + // Kept for backward compatibility with Python 3.8 +# define _PyGC_FINALIZED(o) PyObject_GC_IsFinalized(o) +#endif + +PyAPI_FUNC(PyObject *) _PyObject_GC_Malloc(size_t size); +PyAPI_FUNC(PyObject *) _PyObject_GC_Calloc(size_t size); + + +/* Test if a type supports weak references */ +#define PyType_SUPPORTS_WEAKREFS(t) ((t)->tp_weaklistoffset > 0) + +PyAPI_FUNC(PyObject **) PyObject_GET_WEAKREFS_LISTPTR(PyObject *op); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/odictobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/odictobject.h new file mode 100644 index 0000000000..e070413017 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/odictobject.h @@ -0,0 +1,43 @@ +#ifndef Py_ODICTOBJECT_H +#define Py_ODICTOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* OrderedDict */ +/* This API is optional and mostly redundant. */ + +#ifndef Py_LIMITED_API + +typedef struct _odictobject PyODictObject; + +PyAPI_DATA(PyTypeObject) PyODict_Type; +PyAPI_DATA(PyTypeObject) PyODictIter_Type; +PyAPI_DATA(PyTypeObject) PyODictKeys_Type; +PyAPI_DATA(PyTypeObject) PyODictItems_Type; +PyAPI_DATA(PyTypeObject) PyODictValues_Type; + +#define PyODict_Check(op) PyObject_TypeCheck(op, &PyODict_Type) +#define PyODict_CheckExact(op) Py_IS_TYPE(op, &PyODict_Type) +#define PyODict_SIZE(op) PyDict_GET_SIZE((op)) + +PyAPI_FUNC(PyObject *) PyODict_New(void); +PyAPI_FUNC(int) PyODict_SetItem(PyObject *od, PyObject *key, PyObject *item); +PyAPI_FUNC(int) PyODict_DelItem(PyObject *od, PyObject *key); + +/* wrappers around PyDict* functions */ +#define PyODict_GetItem(od, key) PyDict_GetItem(_PyObject_CAST(od), key) +#define PyODict_GetItemWithError(od, key) \ + PyDict_GetItemWithError(_PyObject_CAST(od), key) +#define PyODict_Contains(od, key) PyDict_Contains(_PyObject_CAST(od), key) +#define PyODict_Size(od) PyDict_Size(_PyObject_CAST(od)) +#define PyODict_GetItemString(od, key) \ + PyDict_GetItemString(_PyObject_CAST(od), key) + +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_ODICTOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/picklebufobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/picklebufobject.h new file mode 100644 index 0000000000..0df2561dce --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/picklebufobject.h @@ -0,0 +1,31 @@ +/* PickleBuffer object. This is built-in for ease of use from third-party + * C extensions. + */ + +#ifndef Py_PICKLEBUFOBJECT_H +#define Py_PICKLEBUFOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API + +PyAPI_DATA(PyTypeObject) PyPickleBuffer_Type; + +#define PyPickleBuffer_Check(op) Py_IS_TYPE(op, &PyPickleBuffer_Type) + +/* Create a PickleBuffer redirecting to the given buffer-enabled object */ +PyAPI_FUNC(PyObject *) PyPickleBuffer_FromObject(PyObject *); +/* Get the PickleBuffer's underlying view to the original object + * (NULL if released) + */ +PyAPI_FUNC(const Py_buffer *) PyPickleBuffer_GetBuffer(PyObject *); +/* Release the PickleBuffer. Returns 0 on success, -1 on error. */ +PyAPI_FUNC(int) PyPickleBuffer_Release(PyObject *); + +#endif /* !Py_LIMITED_API */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_PICKLEBUFOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pyctype.h b/ScriptEngine/third-party/backend/include/Python/cpython/pyctype.h new file mode 100644 index 0000000000..729d93275e --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pyctype.h @@ -0,0 +1,39 @@ +#ifndef Py_LIMITED_API +#ifndef PYCTYPE_H +#define PYCTYPE_H +#ifdef __cplusplus +extern "C" { +#endif + +#define PY_CTF_LOWER 0x01 +#define PY_CTF_UPPER 0x02 +#define PY_CTF_ALPHA (PY_CTF_LOWER|PY_CTF_UPPER) +#define PY_CTF_DIGIT 0x04 +#define PY_CTF_ALNUM (PY_CTF_ALPHA|PY_CTF_DIGIT) +#define PY_CTF_SPACE 0x08 +#define PY_CTF_XDIGIT 0x10 + +PyAPI_DATA(const unsigned int) _Py_ctype_table[256]; + +/* Unlike their C counterparts, the following macros are not meant to + * handle an int with any of the values [EOF, 0-UCHAR_MAX]. The argument + * must be a signed/unsigned char. */ +#define Py_ISLOWER(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_LOWER) +#define Py_ISUPPER(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_UPPER) +#define Py_ISALPHA(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALPHA) +#define Py_ISDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_DIGIT) +#define Py_ISXDIGIT(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_XDIGIT) +#define Py_ISALNUM(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_ALNUM) +#define Py_ISSPACE(c) (_Py_ctype_table[Py_CHARMASK(c)] & PY_CTF_SPACE) + +PyAPI_DATA(const unsigned char) _Py_ctype_tolower[256]; +PyAPI_DATA(const unsigned char) _Py_ctype_toupper[256]; + +#define Py_TOLOWER(c) (_Py_ctype_tolower[Py_CHARMASK(c)]) +#define Py_TOUPPER(c) (_Py_ctype_toupper[Py_CHARMASK(c)]) + +#ifdef __cplusplus +} +#endif +#endif /* !PYCTYPE_H */ +#endif /* !Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pydebug.h b/ScriptEngine/third-party/backend/include/Python/cpython/pydebug.h new file mode 100644 index 0000000000..78bcb118be --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pydebug.h @@ -0,0 +1,38 @@ +#ifndef Py_LIMITED_API +#ifndef Py_PYDEBUG_H +#define Py_PYDEBUG_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(int) Py_DebugFlag; +PyAPI_DATA(int) Py_VerboseFlag; +PyAPI_DATA(int) Py_QuietFlag; +PyAPI_DATA(int) Py_InteractiveFlag; +PyAPI_DATA(int) Py_InspectFlag; +PyAPI_DATA(int) Py_OptimizeFlag; +PyAPI_DATA(int) Py_NoSiteFlag; +PyAPI_DATA(int) Py_BytesWarningFlag; +PyAPI_DATA(int) Py_FrozenFlag; +PyAPI_DATA(int) Py_IgnoreEnvironmentFlag; +PyAPI_DATA(int) Py_DontWriteBytecodeFlag; +PyAPI_DATA(int) Py_NoUserSiteDirectory; +PyAPI_DATA(int) Py_UnbufferedStdioFlag; +PyAPI_DATA(int) Py_HashRandomizationFlag; +PyAPI_DATA(int) Py_IsolatedFlag; + +#ifdef MS_WINDOWS +PyAPI_DATA(int) Py_LegacyWindowsFSEncodingFlag; +PyAPI_DATA(int) Py_LegacyWindowsStdioFlag; +#endif + +/* this is a wrapper around getenv() that pays attention to + Py_IgnoreEnvironmentFlag. It should be used for getting variables like + PYTHONPATH and PYTHONHOME from the environment */ +#define Py_GETENV(s) (Py_IgnoreEnvironmentFlag ? NULL : getenv(s)) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_PYDEBUG_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pyerrors.h b/ScriptEngine/third-party/backend/include/Python/cpython/pyerrors.h new file mode 100644 index 0000000000..3f95245667 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pyerrors.h @@ -0,0 +1,214 @@ +#ifndef Py_CPYTHON_ERRORS_H +# error "this header file must not be included directly" +#endif + +/* Error objects */ + +/* PyException_HEAD defines the initial segment of every exception class. */ +#define PyException_HEAD PyObject_HEAD PyObject *dict;\ + PyObject *args; PyObject *traceback;\ + PyObject *context; PyObject *cause;\ + char suppress_context; + +typedef struct { + PyException_HEAD +} PyBaseExceptionObject; + +typedef struct { + PyException_HEAD + PyObject *msg; + PyObject *filename; + PyObject *lineno; + PyObject *offset; + PyObject *end_lineno; + PyObject *end_offset; + PyObject *text; + PyObject *print_file_and_line; +} PySyntaxErrorObject; + +typedef struct { + PyException_HEAD + PyObject *msg; + PyObject *name; + PyObject *path; +} PyImportErrorObject; + +typedef struct { + PyException_HEAD + PyObject *encoding; + PyObject *object; + Py_ssize_t start; + Py_ssize_t end; + PyObject *reason; +} PyUnicodeErrorObject; + +typedef struct { + PyException_HEAD + PyObject *code; +} PySystemExitObject; + +typedef struct { + PyException_HEAD + PyObject *myerrno; + PyObject *strerror; + PyObject *filename; + PyObject *filename2; +#ifdef MS_WINDOWS + PyObject *winerror; +#endif + Py_ssize_t written; /* only for BlockingIOError, -1 otherwise */ +} PyOSErrorObject; + +typedef struct { + PyException_HEAD + PyObject *value; +} PyStopIterationObject; + +typedef struct { + PyException_HEAD + PyObject *name; +} PyNameErrorObject; + +typedef struct { + PyException_HEAD + PyObject *obj; + PyObject *name; +} PyAttributeErrorObject; + +/* Compatibility typedefs */ +typedef PyOSErrorObject PyEnvironmentErrorObject; +#ifdef MS_WINDOWS +typedef PyOSErrorObject PyWindowsErrorObject; +#endif + +/* Error handling definitions */ + +PyAPI_FUNC(void) _PyErr_SetKeyError(PyObject *); +PyAPI_FUNC(_PyErr_StackItem*) _PyErr_GetTopmostException(PyThreadState *tstate); +PyAPI_FUNC(void) _PyErr_GetExcInfo(PyThreadState *, PyObject **, PyObject **, PyObject **); + +/* Context manipulation (PEP 3134) */ + +PyAPI_FUNC(void) _PyErr_ChainExceptions(PyObject *, PyObject *, PyObject *); + +/* Convenience functions */ + +#ifdef MS_WINDOWS +Py_DEPRECATED(3.3) +PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithUnicodeFilename( + PyObject *, const Py_UNICODE *); +#endif /* MS_WINDOWS */ + +/* Like PyErr_Format(), but saves current exception as __context__ and + __cause__. + */ +PyAPI_FUNC(PyObject *) _PyErr_FormatFromCause( + PyObject *exception, + const char *format, /* ASCII-encoded string */ + ... + ); + +#ifdef MS_WINDOWS +/* XXX redeclare to use WSTRING */ +Py_DEPRECATED(3.3) +PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithUnicodeFilename( + int, const Py_UNICODE *); +Py_DEPRECATED(3.3) +PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithUnicodeFilename( + PyObject *,int, const Py_UNICODE *); +#endif + +/* In exceptions.c */ + +/* Helper that attempts to replace the current exception with one of the + * same type but with a prefix added to the exception text. The resulting + * exception description looks like: + * + * prefix (exc_type: original_exc_str) + * + * Only some exceptions can be safely replaced. If the function determines + * it isn't safe to perform the replacement, it will leave the original + * unmodified exception in place. + * + * Returns a borrowed reference to the new exception (if any), NULL if the + * existing exception was left in place. + */ +PyAPI_FUNC(PyObject *) _PyErr_TrySetFromCause( + const char *prefix_format, /* ASCII-encoded string */ + ... + ); + +/* In signalmodule.c */ + +int PySignal_SetWakeupFd(int fd); +PyAPI_FUNC(int) _PyErr_CheckSignals(void); + +/* Support for adding program text to SyntaxErrors */ + +PyAPI_FUNC(void) PyErr_SyntaxLocationObject( + PyObject *filename, + int lineno, + int col_offset); + +PyAPI_FUNC(void) PyErr_RangedSyntaxLocationObject( + PyObject *filename, + int lineno, + int col_offset, + int end_lineno, + int end_col_offset); + +PyAPI_FUNC(PyObject *) PyErr_ProgramTextObject( + PyObject *filename, + int lineno); + +/* Create a UnicodeEncodeError object. + * + * TODO: This API will be removed in Python 3.11. + */ +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_Create( + const char *encoding, /* UTF-8 encoded string */ + const Py_UNICODE *object, + Py_ssize_t length, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); + +/* Create a UnicodeTranslateError object. + * + * TODO: This API will be removed in Python 3.11. + */ +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_Create( + const Py_UNICODE *object, + Py_ssize_t length, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); + +PyAPI_FUNC(PyObject *) _PyErr_ProgramDecodedTextObject( + PyObject *filename, + int lineno, + const char* encoding); + +PyAPI_FUNC(PyObject *) _PyUnicodeTranslateError_Create( + PyObject *object, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); + +PyAPI_FUNC(void) _PyErr_WriteUnraisableMsg( + const char *err_msg, + PyObject *obj); + +PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalErrorFunc( + const char *func, + const char *message); + +PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalErrorFormat( + const char *func, + const char *format, + ...); + +#define Py_FatalError(message) _Py_FatalErrorFunc(__func__, message) diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pyfpe.h b/ScriptEngine/third-party/backend/include/Python/cpython/pyfpe.h new file mode 100644 index 0000000000..cc2def63aa --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pyfpe.h @@ -0,0 +1,15 @@ +#ifndef Py_PYFPE_H +#define Py_PYFPE_H +/* Header excluded from the stable API */ +#ifndef Py_LIMITED_API + +/* These macros used to do something when Python was built with --with-fpectl, + * but support for that was dropped in 3.7. We continue to define them though, + * to avoid breaking API users. + */ + +#define PyFPE_START_PROTECT(err_string, leave_stmt) +#define PyFPE_END_PROTECT(v) + +#endif /* !defined(Py_LIMITED_API) */ +#endif /* !Py_PYFPE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pylifecycle.h b/ScriptEngine/third-party/backend/include/Python/cpython/pylifecycle.h new file mode 100644 index 0000000000..5faeb3533b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pylifecycle.h @@ -0,0 +1,64 @@ +#ifndef Py_CPYTHON_PYLIFECYCLE_H +# error "this header file must not be included directly" +#endif + +/* Py_FrozenMain is kept out of the Limited API until documented and present + in all builds of Python */ +PyAPI_FUNC(int) Py_FrozenMain(int argc, char **argv); + +/* Only used by applications that embed the interpreter and need to + * override the standard encoding determination mechanism + */ +PyAPI_FUNC(int) Py_SetStandardStreamEncoding(const char *encoding, + const char *errors); + +/* PEP 432 Multi-phase initialization API (Private while provisional!) */ + +PyAPI_FUNC(PyStatus) Py_PreInitialize( + const PyPreConfig *src_config); +PyAPI_FUNC(PyStatus) Py_PreInitializeFromBytesArgs( + const PyPreConfig *src_config, + Py_ssize_t argc, + char **argv); +PyAPI_FUNC(PyStatus) Py_PreInitializeFromArgs( + const PyPreConfig *src_config, + Py_ssize_t argc, + wchar_t **argv); + +PyAPI_FUNC(int) _Py_IsCoreInitialized(void); + + +/* Initialization and finalization */ + +PyAPI_FUNC(PyStatus) Py_InitializeFromConfig( + const PyConfig *config); +PyAPI_FUNC(PyStatus) _Py_InitializeMain(void); + +PyAPI_FUNC(int) Py_RunMain(void); + + +PyAPI_FUNC(void) _Py_NO_RETURN Py_ExitStatusException(PyStatus err); + +/* Restore signals that the interpreter has called SIG_IGN on to SIG_DFL. */ +PyAPI_FUNC(void) _Py_RestoreSignals(void); + +PyAPI_FUNC(int) Py_FdIsInteractive(FILE *, const char *); +PyAPI_FUNC(int) _Py_FdIsInteractive(FILE *fp, PyObject *filename); + +PyAPI_FUNC(void) _Py_SetProgramFullPath(const wchar_t *); + +PyAPI_FUNC(const char *) _Py_gitidentifier(void); +PyAPI_FUNC(const char *) _Py_gitversion(void); + +PyAPI_FUNC(int) _Py_IsFinalizing(void); + +/* Random */ +PyAPI_FUNC(int) _PyOS_URandom(void *buffer, Py_ssize_t size); +PyAPI_FUNC(int) _PyOS_URandomNonblock(void *buffer, Py_ssize_t size); + +/* Legacy locale support */ +PyAPI_FUNC(int) _Py_CoerceLegacyLocale(int warn); +PyAPI_FUNC(int) _Py_LegacyLocaleDetected(int warn); +PyAPI_FUNC(char *) _Py_SetLocaleFromEnv(int category); + +PyAPI_FUNC(PyThreadState *) _Py_NewInterpreter(int isolated_subinterpreter); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pymem.h b/ScriptEngine/third-party/backend/include/Python/cpython/pymem.h new file mode 100644 index 0000000000..d1054d7652 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pymem.h @@ -0,0 +1,98 @@ +#ifndef Py_CPYTHON_PYMEM_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(void *) PyMem_RawMalloc(size_t size); +PyAPI_FUNC(void *) PyMem_RawCalloc(size_t nelem, size_t elsize); +PyAPI_FUNC(void *) PyMem_RawRealloc(void *ptr, size_t new_size); +PyAPI_FUNC(void) PyMem_RawFree(void *ptr); + +/* Try to get the allocators name set by _PyMem_SetupAllocators(). */ +PyAPI_FUNC(const char*) _PyMem_GetCurrentAllocatorName(void); + +/* strdup() using PyMem_RawMalloc() */ +PyAPI_FUNC(char *) _PyMem_RawStrdup(const char *str); + +/* strdup() using PyMem_Malloc() */ +PyAPI_FUNC(char *) _PyMem_Strdup(const char *str); + +/* wcsdup() using PyMem_RawMalloc() */ +PyAPI_FUNC(wchar_t*) _PyMem_RawWcsdup(const wchar_t *str); + + +typedef enum { + /* PyMem_RawMalloc(), PyMem_RawRealloc() and PyMem_RawFree() */ + PYMEM_DOMAIN_RAW, + + /* PyMem_Malloc(), PyMem_Realloc() and PyMem_Free() */ + PYMEM_DOMAIN_MEM, + + /* PyObject_Malloc(), PyObject_Realloc() and PyObject_Free() */ + PYMEM_DOMAIN_OBJ +} PyMemAllocatorDomain; + +typedef enum { + PYMEM_ALLOCATOR_NOT_SET = 0, + PYMEM_ALLOCATOR_DEFAULT = 1, + PYMEM_ALLOCATOR_DEBUG = 2, + PYMEM_ALLOCATOR_MALLOC = 3, + PYMEM_ALLOCATOR_MALLOC_DEBUG = 4, +#ifdef WITH_PYMALLOC + PYMEM_ALLOCATOR_PYMALLOC = 5, + PYMEM_ALLOCATOR_PYMALLOC_DEBUG = 6, +#endif +} PyMemAllocatorName; + + +typedef struct { + /* user context passed as the first argument to the 4 functions */ + void *ctx; + + /* allocate a memory block */ + void* (*malloc) (void *ctx, size_t size); + + /* allocate a memory block initialized by zeros */ + void* (*calloc) (void *ctx, size_t nelem, size_t elsize); + + /* allocate or resize a memory block */ + void* (*realloc) (void *ctx, void *ptr, size_t new_size); + + /* release a memory block */ + void (*free) (void *ctx, void *ptr); +} PyMemAllocatorEx; + +/* Get the memory block allocator of the specified domain. */ +PyAPI_FUNC(void) PyMem_GetAllocator(PyMemAllocatorDomain domain, + PyMemAllocatorEx *allocator); + +/* Set the memory block allocator of the specified domain. + + The new allocator must return a distinct non-NULL pointer when requesting + zero bytes. + + For the PYMEM_DOMAIN_RAW domain, the allocator must be thread-safe: the GIL + is not held when the allocator is called. + + If the new allocator is not a hook (don't call the previous allocator), the + PyMem_SetupDebugHooks() function must be called to reinstall the debug hooks + on top on the new allocator. */ +PyAPI_FUNC(void) PyMem_SetAllocator(PyMemAllocatorDomain domain, + PyMemAllocatorEx *allocator); + +/* Setup hooks to detect bugs in the following Python memory allocator + functions: + + - PyMem_RawMalloc(), PyMem_RawRealloc(), PyMem_RawFree() + - PyMem_Malloc(), PyMem_Realloc(), PyMem_Free() + - PyObject_Malloc(), PyObject_Realloc() and PyObject_Free() + + Newly allocated memory is filled with the byte 0xCB, freed memory is filled + with the byte 0xDB. Additional checks: + + - detect API violations, ex: PyObject_Free() called on a buffer allocated + by PyMem_Malloc() + - detect write before the start of the buffer (buffer underflow) + - detect write after the end of the buffer (buffer overflow) + + The function does nothing if Python is not compiled is debug mode. */ +PyAPI_FUNC(void) PyMem_SetupDebugHooks(void); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pystate.h b/ScriptEngine/third-party/backend/include/Python/cpython/pystate.h new file mode 100644 index 0000000000..7c995b9307 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pystate.h @@ -0,0 +1,305 @@ +#ifndef Py_CPYTHON_PYSTATE_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(int) _PyInterpreterState_RequiresIDRef(PyInterpreterState *); +PyAPI_FUNC(void) _PyInterpreterState_RequireIDRef(PyInterpreterState *, int); + +PyAPI_FUNC(PyObject *) _PyInterpreterState_GetMainModule(PyInterpreterState *); + +/* State unique per thread */ + +/* Py_tracefunc return -1 when raising an exception, or 0 for success. */ +typedef int (*Py_tracefunc)(PyObject *, PyFrameObject *, int, PyObject *); + +/* The following values are used for 'what' for tracefunc functions + * + * To add a new kind of trace event, also update "trace_init" in + * Python/sysmodule.c to define the Python level event name + */ +#define PyTrace_CALL 0 +#define PyTrace_EXCEPTION 1 +#define PyTrace_LINE 2 +#define PyTrace_RETURN 3 +#define PyTrace_C_CALL 4 +#define PyTrace_C_EXCEPTION 5 +#define PyTrace_C_RETURN 6 +#define PyTrace_OPCODE 7 + + +typedef struct _cframe { + /* This struct will be threaded through the C stack + * allowing fast access to per-thread state that needs + * to be accessed quickly by the interpreter, but can + * be modified outside of the interpreter. + * + * WARNING: This makes data on the C stack accessible from + * heap objects. Care must be taken to maintain stack + * discipline and make sure that instances of this struct cannot + * accessed outside of their lifetime. + */ + int use_tracing; + struct _cframe *previous; +} CFrame; + +typedef struct _err_stackitem { + /* This struct represents an entry on the exception stack, which is a + * per-coroutine state. (Coroutine in the computer science sense, + * including the thread and generators). + * This ensures that the exception state is not impacted by "yields" + * from an except handler. + */ + PyObject *exc_type, *exc_value, *exc_traceback; + + struct _err_stackitem *previous_item; + +} _PyErr_StackItem; + + +// The PyThreadState typedef is in Include/pystate.h. +struct _ts { + /* See Python/ceval.c for comments explaining most fields */ + + struct _ts *prev; + struct _ts *next; + PyInterpreterState *interp; + + /* Borrowed reference to the current frame (it can be NULL) */ + PyFrameObject *frame; + int recursion_depth; + int recursion_headroom; /* Allow 50 more calls to handle any errors. */ + int stackcheck_counter; + + /* 'tracing' keeps track of the execution depth when tracing/profiling. + This is to prevent the actual trace/profile code from being recorded in + the trace/profile. */ + int tracing; + + /* Pointer to current CFrame in the C stack frame of the currently, + * or most recently, executing _PyEval_EvalFrameDefault. */ + CFrame *cframe; + + Py_tracefunc c_profilefunc; + Py_tracefunc c_tracefunc; + PyObject *c_profileobj; + PyObject *c_traceobj; + + /* The exception currently being raised */ + PyObject *curexc_type; + PyObject *curexc_value; + PyObject *curexc_traceback; + + /* The exception currently being handled, if no coroutines/generators + * are present. Always last element on the stack referred to be exc_info. + */ + _PyErr_StackItem exc_state; + + /* Pointer to the top of the stack of the exceptions currently + * being handled */ + _PyErr_StackItem *exc_info; + + PyObject *dict; /* Stores per-thread state */ + + int gilstate_counter; + + PyObject *async_exc; /* Asynchronous exception to raise */ + unsigned long thread_id; /* Thread id where this tstate was created */ + + int trash_delete_nesting; + PyObject *trash_delete_later; + + /* Called when a thread state is deleted normally, but not when it + * is destroyed after fork(). + * Pain: to prevent rare but fatal shutdown errors (issue 18808), + * Thread.join() must wait for the join'ed thread's tstate to be unlinked + * from the tstate chain. That happens at the end of a thread's life, + * in pystate.c. + * The obvious way doesn't quite work: create a lock which the tstate + * unlinking code releases, and have Thread.join() wait to acquire that + * lock. The problem is that we _are_ at the end of the thread's life: + * if the thread holds the last reference to the lock, decref'ing the + * lock will delete the lock, and that may trigger arbitrary Python code + * if there's a weakref, with a callback, to the lock. But by this time + * _PyRuntime.gilstate.tstate_current is already NULL, so only the simplest + * of C code can be allowed to run (in particular it must not be possible to + * release the GIL). + * So instead of holding the lock directly, the tstate holds a weakref to + * the lock: that's the value of on_delete_data below. Decref'ing a + * weakref is harmless. + * on_delete points to _threadmodule.c's static release_sentinel() function. + * After the tstate is unlinked, release_sentinel is called with the + * weakref-to-lock (on_delete_data) argument, and release_sentinel releases + * the indirectly held lock. + */ + void (*on_delete)(void *); + void *on_delete_data; + + int coroutine_origin_tracking_depth; + + PyObject *async_gen_firstiter; + PyObject *async_gen_finalizer; + + PyObject *context; + uint64_t context_ver; + + /* Unique thread state id. */ + uint64_t id; + + CFrame root_cframe; + + /* XXX signal handlers should also be here */ + +}; + +// Alias for backward compatibility with Python 3.8 +#define _PyInterpreterState_Get PyInterpreterState_Get + +PyAPI_FUNC(PyThreadState *) _PyThreadState_Prealloc(PyInterpreterState *); + +/* Similar to PyThreadState_Get(), but don't issue a fatal error + * if it is NULL. */ +PyAPI_FUNC(PyThreadState *) _PyThreadState_UncheckedGet(void); + +PyAPI_FUNC(PyObject *) _PyThreadState_GetDict(PyThreadState *tstate); + +/* PyGILState */ + +/* Helper/diagnostic function - return 1 if the current thread + currently holds the GIL, 0 otherwise. + + The function returns 1 if _PyGILState_check_enabled is non-zero. */ +PyAPI_FUNC(int) PyGILState_Check(void); + +/* Get the single PyInterpreterState used by this process' GILState + implementation. + + This function doesn't check for error. Return NULL before _PyGILState_Init() + is called and after _PyGILState_Fini() is called. + + See also _PyInterpreterState_Get() and _PyInterpreterState_GET(). */ +PyAPI_FUNC(PyInterpreterState *) _PyGILState_GetInterpreterStateUnsafe(void); + +/* The implementation of sys._current_frames() Returns a dict mapping + thread id to that thread's current frame. +*/ +PyAPI_FUNC(PyObject *) _PyThread_CurrentFrames(void); + +/* The implementation of sys._current_exceptions() Returns a dict mapping + thread id to that thread's current exception. +*/ +PyAPI_FUNC(PyObject *) _PyThread_CurrentExceptions(void); + +/* Routines for advanced debuggers, requested by David Beazley. + Don't use unless you know what you are doing! */ +PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Main(void); +PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Head(void); +PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Next(PyInterpreterState *); +PyAPI_FUNC(PyThreadState *) PyInterpreterState_ThreadHead(PyInterpreterState *); +PyAPI_FUNC(PyThreadState *) PyThreadState_Next(PyThreadState *); +PyAPI_FUNC(void) PyThreadState_DeleteCurrent(void); + +/* Frame evaluation API */ + +typedef PyObject* (*_PyFrameEvalFunction)(PyThreadState *tstate, PyFrameObject *, int); + +PyAPI_FUNC(_PyFrameEvalFunction) _PyInterpreterState_GetEvalFrameFunc( + PyInterpreterState *interp); +PyAPI_FUNC(void) _PyInterpreterState_SetEvalFrameFunc( + PyInterpreterState *interp, + _PyFrameEvalFunction eval_frame); + +PyAPI_FUNC(const PyConfig*) _PyInterpreterState_GetConfig(PyInterpreterState *interp); + +/* Get a copy of the current interpreter configuration. + + Return 0 on success. Raise an exception and return -1 on error. + + The caller must initialize 'config', using PyConfig_InitPythonConfig() + for example. + + Python must be preinitialized to call this method. + The caller must hold the GIL. */ +PyAPI_FUNC(int) _PyInterpreterState_GetConfigCopy( + struct PyConfig *config); + +/* Set the configuration of the current interpreter. + + This function should be called during or just after the Python + initialization. + + Update the sys module with the new configuration. If the sys module was + modified directly after the Python initialization, these changes are lost. + + Some configuration like faulthandler or warnoptions can be updated in the + configuration, but don't reconfigure Python (don't enable/disable + faulthandler and don't reconfigure warnings filters). + + Return 0 on success. Raise an exception and return -1 on error. + + The configuration should come from _PyInterpreterState_GetConfigCopy(). */ +PyAPI_FUNC(int) _PyInterpreterState_SetConfig( + const struct PyConfig *config); + +// Get the configuration of the current interpreter. +// The caller must hold the GIL. +PyAPI_FUNC(const PyConfig*) _Py_GetConfig(void); + + +/* cross-interpreter data */ + +struct _xid; + +// _PyCrossInterpreterData is similar to Py_buffer as an effectively +// opaque struct that holds data outside the object machinery. This +// is necessary to pass safely between interpreters in the same process. +typedef struct _xid { + // data is the cross-interpreter-safe derivation of a Python object + // (see _PyObject_GetCrossInterpreterData). It will be NULL if the + // new_object func (below) encodes the data. + void *data; + // obj is the Python object from which the data was derived. This + // is non-NULL only if the data remains bound to the object in some + // way, such that the object must be "released" (via a decref) when + // the data is released. In that case the code that sets the field, + // likely a registered "crossinterpdatafunc", is responsible for + // ensuring it owns the reference (i.e. incref). + PyObject *obj; + // interp is the ID of the owning interpreter of the original + // object. It corresponds to the active interpreter when + // _PyObject_GetCrossInterpreterData() was called. This should only + // be set by the cross-interpreter machinery. + // + // We use the ID rather than the PyInterpreterState to avoid issues + // with deleted interpreters. Note that IDs are never re-used, so + // each one will always correspond to a specific interpreter + // (whether still alive or not). + int64_t interp; + // new_object is a function that returns a new object in the current + // interpreter given the data. The resulting object (a new + // reference) will be equivalent to the original object. This field + // is required. + PyObject *(*new_object)(struct _xid *); + // free is called when the data is released. If it is NULL then + // nothing will be done to free the data. For some types this is + // okay (e.g. bytes) and for those types this field should be set + // to NULL. However, for most the data was allocated just for + // cross-interpreter use, so it must be freed when + // _PyCrossInterpreterData_Release is called or the memory will + // leak. In that case, at the very least this field should be set + // to PyMem_RawFree (the default if not explicitly set to NULL). + // The call will happen with the original interpreter activated. + void (*free)(void *); +} _PyCrossInterpreterData; + +PyAPI_FUNC(int) _PyObject_GetCrossInterpreterData(PyObject *, _PyCrossInterpreterData *); +PyAPI_FUNC(PyObject *) _PyCrossInterpreterData_NewObject(_PyCrossInterpreterData *); +PyAPI_FUNC(void) _PyCrossInterpreterData_Release(_PyCrossInterpreterData *); + +PyAPI_FUNC(int) _PyObject_CheckCrossInterpreterData(PyObject *); + +/* cross-interpreter data registry */ + +typedef int (*crossinterpdatafunc)(PyObject *, struct _xid *); + +PyAPI_FUNC(int) _PyCrossInterpreterData_RegisterClass(PyTypeObject *, crossinterpdatafunc); +PyAPI_FUNC(crossinterpdatafunc) _PyCrossInterpreterData_Lookup(PyObject *); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pythonrun.h b/ScriptEngine/third-party/backend/include/Python/cpython/pythonrun.h new file mode 100644 index 0000000000..2e72d0820d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pythonrun.h @@ -0,0 +1,121 @@ +#ifndef Py_CPYTHON_PYTHONRUN_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(int) PyRun_SimpleStringFlags(const char *, PyCompilerFlags *); +PyAPI_FUNC(int) _PyRun_SimpleFileObject( + FILE *fp, + PyObject *filename, + int closeit, + PyCompilerFlags *flags); +PyAPI_FUNC(int) PyRun_AnyFileExFlags( + FILE *fp, + const char *filename, /* decoded from the filesystem encoding */ + int closeit, + PyCompilerFlags *flags); +PyAPI_FUNC(int) _PyRun_AnyFileObject( + FILE *fp, + PyObject *filename, + int closeit, + PyCompilerFlags *flags); +PyAPI_FUNC(int) PyRun_SimpleFileExFlags( + FILE *fp, + const char *filename, /* decoded from the filesystem encoding */ + int closeit, + PyCompilerFlags *flags); +PyAPI_FUNC(int) PyRun_InteractiveOneFlags( + FILE *fp, + const char *filename, /* decoded from the filesystem encoding */ + PyCompilerFlags *flags); +PyAPI_FUNC(int) PyRun_InteractiveOneObject( + FILE *fp, + PyObject *filename, + PyCompilerFlags *flags); +PyAPI_FUNC(int) PyRun_InteractiveLoopFlags( + FILE *fp, + const char *filename, /* decoded from the filesystem encoding */ + PyCompilerFlags *flags); +PyAPI_FUNC(int) _PyRun_InteractiveLoopObject( + FILE *fp, + PyObject *filename, + PyCompilerFlags *flags); + + +PyAPI_FUNC(PyObject *) PyRun_StringFlags(const char *, int, PyObject *, + PyObject *, PyCompilerFlags *); + +PyAPI_FUNC(PyObject *) PyRun_FileExFlags( + FILE *fp, + const char *filename, /* decoded from the filesystem encoding */ + int start, + PyObject *globals, + PyObject *locals, + int closeit, + PyCompilerFlags *flags); + + +PyAPI_FUNC(PyObject *) Py_CompileStringExFlags( + const char *str, + const char *filename, /* decoded from the filesystem encoding */ + int start, + PyCompilerFlags *flags, + int optimize); +PyAPI_FUNC(PyObject *) Py_CompileStringObject( + const char *str, + PyObject *filename, int start, + PyCompilerFlags *flags, + int optimize); + +#define Py_CompileString(str, p, s) Py_CompileStringExFlags(str, p, s, NULL, -1) +#define Py_CompileStringFlags(str, p, s, f) Py_CompileStringExFlags(str, p, s, f, -1) + + +PyAPI_FUNC(const char *) _Py_SourceAsString( + PyObject *cmd, + const char *funcname, + const char *what, + PyCompilerFlags *cf, + PyObject **cmd_copy); + + +/* A function flavor is also exported by libpython. It is required when + libpython is accessed directly rather than using header files which defines + macros below. On Windows, for example, PyAPI_FUNC() uses dllexport to + export functions in pythonXX.dll. */ +PyAPI_FUNC(PyObject *) PyRun_String(const char *str, int s, PyObject *g, PyObject *l); +PyAPI_FUNC(int) PyRun_AnyFile(FILE *fp, const char *name); +PyAPI_FUNC(int) PyRun_AnyFileEx(FILE *fp, const char *name, int closeit); +PyAPI_FUNC(int) PyRun_AnyFileFlags(FILE *, const char *, PyCompilerFlags *); +PyAPI_FUNC(int) PyRun_SimpleString(const char *s); +PyAPI_FUNC(int) PyRun_SimpleFile(FILE *f, const char *p); +PyAPI_FUNC(int) PyRun_SimpleFileEx(FILE *f, const char *p, int c); +PyAPI_FUNC(int) PyRun_InteractiveOne(FILE *f, const char *p); +PyAPI_FUNC(int) PyRun_InteractiveLoop(FILE *f, const char *p); +PyAPI_FUNC(PyObject *) PyRun_File(FILE *fp, const char *p, int s, PyObject *g, PyObject *l); +PyAPI_FUNC(PyObject *) PyRun_FileEx(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, int c); +PyAPI_FUNC(PyObject *) PyRun_FileFlags(FILE *fp, const char *p, int s, PyObject *g, PyObject *l, PyCompilerFlags *flags); + +/* Use macros for a bunch of old variants */ +#define PyRun_String(str, s, g, l) PyRun_StringFlags(str, s, g, l, NULL) +#define PyRun_AnyFile(fp, name) PyRun_AnyFileExFlags(fp, name, 0, NULL) +#define PyRun_AnyFileEx(fp, name, closeit) \ + PyRun_AnyFileExFlags(fp, name, closeit, NULL) +#define PyRun_AnyFileFlags(fp, name, flags) \ + PyRun_AnyFileExFlags(fp, name, 0, flags) +#define PyRun_SimpleString(s) PyRun_SimpleStringFlags(s, NULL) +#define PyRun_SimpleFile(f, p) PyRun_SimpleFileExFlags(f, p, 0, NULL) +#define PyRun_SimpleFileEx(f, p, c) PyRun_SimpleFileExFlags(f, p, c, NULL) +#define PyRun_InteractiveOne(f, p) PyRun_InteractiveOneFlags(f, p, NULL) +#define PyRun_InteractiveLoop(f, p) PyRun_InteractiveLoopFlags(f, p, NULL) +#define PyRun_File(fp, p, s, g, l) \ + PyRun_FileExFlags(fp, p, s, g, l, 0, NULL) +#define PyRun_FileEx(fp, p, s, g, l, c) \ + PyRun_FileExFlags(fp, p, s, g, l, c, NULL) +#define PyRun_FileFlags(fp, p, s, g, l, flags) \ + PyRun_FileExFlags(fp, p, s, g, l, 0, flags) + + +/* Stuff with no proper home (yet) */ +PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, const char *); +PyAPI_DATA(PyThreadState*) _PyOS_ReadlineTState; +PyAPI_DATA(char) *(*PyOS_ReadlineFunctionPointer)(FILE *, FILE *, const char *); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/pytime.h b/ScriptEngine/third-party/backend/include/Python/cpython/pytime.h new file mode 100644 index 0000000000..754c7f4777 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/pytime.h @@ -0,0 +1,247 @@ +#ifndef Py_LIMITED_API +#ifndef Py_PYTIME_H +#define Py_PYTIME_H + +/************************************************************************** +Symbols and macros to supply platform-independent interfaces to time related +functions and constants +**************************************************************************/ +#ifdef __cplusplus +extern "C" { +#endif + +/* _PyTime_t: Python timestamp with subsecond precision. It can be used to + store a duration, and so indirectly a date (related to another date, like + UNIX epoch). */ +typedef int64_t _PyTime_t; +#define _PyTime_MIN INT64_MIN +#define _PyTime_MAX INT64_MAX + +typedef enum { + /* Round towards minus infinity (-inf). + For example, used to read a clock. */ + _PyTime_ROUND_FLOOR=0, + /* Round towards infinity (+inf). + For example, used for timeout to wait "at least" N seconds. */ + _PyTime_ROUND_CEILING=1, + /* Round to nearest with ties going to nearest even integer. + For example, used to round from a Python float. */ + _PyTime_ROUND_HALF_EVEN=2, + /* Round away from zero + For example, used for timeout. _PyTime_ROUND_CEILING rounds + -1e-9 to 0 milliseconds which causes bpo-31786 issue. + _PyTime_ROUND_UP rounds -1e-9 to -1 millisecond which keeps + the timeout sign as expected. select.poll(timeout) must block + for negative values." */ + _PyTime_ROUND_UP=3, + /* _PyTime_ROUND_TIMEOUT (an alias for _PyTime_ROUND_UP) should be + used for timeouts. */ + _PyTime_ROUND_TIMEOUT = _PyTime_ROUND_UP +} _PyTime_round_t; + + +/* Convert a time_t to a PyLong. */ +PyAPI_FUNC(PyObject *) _PyLong_FromTime_t( + time_t sec); + +/* Convert a PyLong to a time_t. */ +PyAPI_FUNC(time_t) _PyLong_AsTime_t( + PyObject *obj); + +/* Convert a number of seconds, int or float, to time_t. */ +PyAPI_FUNC(int) _PyTime_ObjectToTime_t( + PyObject *obj, + time_t *sec, + _PyTime_round_t); + +/* Convert a number of seconds, int or float, to a timeval structure. + usec is in the range [0; 999999] and rounded towards zero. + For example, -1.2 is converted to (-2, 800000). */ +PyAPI_FUNC(int) _PyTime_ObjectToTimeval( + PyObject *obj, + time_t *sec, + long *usec, + _PyTime_round_t); + +/* Convert a number of seconds, int or float, to a timespec structure. + nsec is in the range [0; 999999999] and rounded towards zero. + For example, -1.2 is converted to (-2, 800000000). */ +PyAPI_FUNC(int) _PyTime_ObjectToTimespec( + PyObject *obj, + time_t *sec, + long *nsec, + _PyTime_round_t); + + +/* Create a timestamp from a number of seconds. */ +PyAPI_FUNC(_PyTime_t) _PyTime_FromSeconds(int seconds); + +/* Macro to create a timestamp from a number of seconds, no integer overflow. + Only use the macro for small values, prefer _PyTime_FromSeconds(). */ +#define _PYTIME_FROMSECONDS(seconds) \ + ((_PyTime_t)(seconds) * (1000 * 1000 * 1000)) + +/* Create a timestamp from a number of nanoseconds. */ +PyAPI_FUNC(_PyTime_t) _PyTime_FromNanoseconds(_PyTime_t ns); + +/* Create a timestamp from nanoseconds (Python int). */ +PyAPI_FUNC(int) _PyTime_FromNanosecondsObject(_PyTime_t *t, + PyObject *obj); + +/* Convert a number of seconds (Python float or int) to a timestamp. + Raise an exception and return -1 on error, return 0 on success. */ +PyAPI_FUNC(int) _PyTime_FromSecondsObject(_PyTime_t *t, + PyObject *obj, + _PyTime_round_t round); + +/* Convert a number of milliseconds (Python float or int, 10^-3) to a timestamp. + Raise an exception and return -1 on error, return 0 on success. */ +PyAPI_FUNC(int) _PyTime_FromMillisecondsObject(_PyTime_t *t, + PyObject *obj, + _PyTime_round_t round); + +/* Convert a timestamp to a number of seconds as a C double. */ +PyAPI_FUNC(double) _PyTime_AsSecondsDouble(_PyTime_t t); + +/* Convert timestamp to a number of milliseconds (10^-3 seconds). */ +PyAPI_FUNC(_PyTime_t) _PyTime_AsMilliseconds(_PyTime_t t, + _PyTime_round_t round); + +/* Convert timestamp to a number of microseconds (10^-6 seconds). */ +PyAPI_FUNC(_PyTime_t) _PyTime_AsMicroseconds(_PyTime_t t, + _PyTime_round_t round); + +/* Convert timestamp to a number of nanoseconds (10^-9 seconds) as a Python int + object. */ +PyAPI_FUNC(PyObject *) _PyTime_AsNanosecondsObject(_PyTime_t t); + +/* Create a timestamp from a timeval structure. + Raise an exception and return -1 on overflow, return 0 on success. */ +PyAPI_FUNC(int) _PyTime_FromTimeval(_PyTime_t *tp, struct timeval *tv); + +/* Convert a timestamp to a timeval structure (microsecond resolution). + tv_usec is always positive. + Raise an exception and return -1 if the conversion overflowed, + return 0 on success. */ +PyAPI_FUNC(int) _PyTime_AsTimeval(_PyTime_t t, + struct timeval *tv, + _PyTime_round_t round); + +/* Similar to _PyTime_AsTimeval(), but don't raise an exception on error. */ +PyAPI_FUNC(int) _PyTime_AsTimeval_noraise(_PyTime_t t, + struct timeval *tv, + _PyTime_round_t round); + +/* Convert a timestamp to a number of seconds (secs) and microseconds (us). + us is always positive. This function is similar to _PyTime_AsTimeval() + except that secs is always a time_t type, whereas the timeval structure + uses a C long for tv_sec on Windows. + Raise an exception and return -1 if the conversion overflowed, + return 0 on success. */ +PyAPI_FUNC(int) _PyTime_AsTimevalTime_t( + _PyTime_t t, + time_t *secs, + int *us, + _PyTime_round_t round); + +#if defined(HAVE_CLOCK_GETTIME) || defined(HAVE_KQUEUE) +/* Create a timestamp from a timespec structure. + Raise an exception and return -1 on overflow, return 0 on success. */ +PyAPI_FUNC(int) _PyTime_FromTimespec(_PyTime_t *tp, struct timespec *ts); + +/* Convert a timestamp to a timespec structure (nanosecond resolution). + tv_nsec is always positive. + Raise an exception and return -1 on error, return 0 on success. */ +PyAPI_FUNC(int) _PyTime_AsTimespec(_PyTime_t t, struct timespec *ts); +#endif + +/* Compute ticks * mul / div. + The caller must ensure that ((div - 1) * mul) cannot overflow. */ +PyAPI_FUNC(_PyTime_t) _PyTime_MulDiv(_PyTime_t ticks, + _PyTime_t mul, + _PyTime_t div); + +/* Structure used by time.get_clock_info() */ +typedef struct { + const char *implementation; + int monotonic; + int adjustable; + double resolution; +} _Py_clock_info_t; + +/* Get the current time from the system clock. + + If the internal clock fails, silently ignore the error and return 0. + On integer overflow, silently ignore the overflow and truncated the clock to + _PyTime_MIN or _PyTime_MAX. + + Use _PyTime_GetSystemClockWithInfo() to check for failure. */ +PyAPI_FUNC(_PyTime_t) _PyTime_GetSystemClock(void); + +/* Get the current time from the system clock. + * On success, set *t and *info (if not NULL), and return 0. + * On error, raise an exception and return -1. + */ +PyAPI_FUNC(int) _PyTime_GetSystemClockWithInfo( + _PyTime_t *t, + _Py_clock_info_t *info); + +/* Get the time of a monotonic clock, i.e. a clock that cannot go backwards. + The clock is not affected by system clock updates. The reference point of + the returned value is undefined, so that only the difference between the + results of consecutive calls is valid. + + If the internal clock fails, silently ignore the error and return 0. + On integer overflow, silently ignore the overflow and truncated the clock to + _PyTime_MIN or _PyTime_MAX. + + Use _PyTime_GetMonotonicClockWithInfo() to check for failure. */ +PyAPI_FUNC(_PyTime_t) _PyTime_GetMonotonicClock(void); + +/* Get the time of a monotonic clock, i.e. a clock that cannot go backwards. + The clock is not affected by system clock updates. The reference point of + the returned value is undefined, so that only the difference between the + results of consecutive calls is valid. + + Fill info (if set) with information of the function used to get the time. + + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) _PyTime_GetMonotonicClockWithInfo( + _PyTime_t *t, + _Py_clock_info_t *info); + + +/* Converts a timestamp to the Gregorian time, using the local time zone. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) _PyTime_localtime(time_t t, struct tm *tm); + +/* Converts a timestamp to the Gregorian time, assuming UTC. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) _PyTime_gmtime(time_t t, struct tm *tm); + +/* Get the performance counter: clock with the highest available resolution to + measure a short duration. + + If the internal clock fails, silently ignore the error and return 0. + On integer overflow, silently ignore the overflow and truncated the clock to + _PyTime_MIN or _PyTime_MAX. + + Use _PyTime_GetPerfCounterWithInfo() to check for failure. */ +PyAPI_FUNC(_PyTime_t) _PyTime_GetPerfCounter(void); + +/* Get the performance counter: clock with the highest available resolution to + measure a short duration. + + Fill info (if set) with information of the function used to get the time. + + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) _PyTime_GetPerfCounterWithInfo( + _PyTime_t *t, + _Py_clock_info_t *info); + +#ifdef __cplusplus +} +#endif + +#endif /* Py_PYTIME_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/sysmodule.h b/ScriptEngine/third-party/backend/include/Python/cpython/sysmodule.h new file mode 100644 index 0000000000..fc4c899b3f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/sysmodule.h @@ -0,0 +1,16 @@ +#ifndef Py_CPYTHON_SYSMODULE_H +# error "this header file must not be included directly" +#endif + +PyAPI_FUNC(PyObject *) _PySys_GetObjectId(_Py_Identifier *key); +PyAPI_FUNC(int) _PySys_SetObjectId(_Py_Identifier *key, PyObject *); + +PyAPI_FUNC(size_t) _PySys_GetSizeOf(PyObject *); + +typedef int(*Py_AuditHookFunction)(const char *, PyObject *, void *); + +PyAPI_FUNC(int) PySys_Audit( + const char *event, + const char *argFormat, + ...); +PyAPI_FUNC(int) PySys_AddAuditHook(Py_AuditHookFunction, void*); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/traceback.h b/ScriptEngine/third-party/backend/include/Python/cpython/traceback.h new file mode 100644 index 0000000000..aac5b42c34 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/traceback.h @@ -0,0 +1,14 @@ +#ifndef Py_CPYTHON_TRACEBACK_H +# error "this header file must not be included directly" +#endif + +typedef struct _traceback { + PyObject_HEAD + struct _traceback *tb_next; + PyFrameObject *tb_frame; + int tb_lasti; + int tb_lineno; +} PyTracebackObject; + +PyAPI_FUNC(int) _Py_DisplaySourceLine(PyObject *, PyObject *, int, int); +PyAPI_FUNC(void) _PyTraceback_Add(const char *, const char *, int); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/tupleobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/tupleobject.h new file mode 100644 index 0000000000..7cada8848c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/tupleobject.h @@ -0,0 +1,28 @@ +#ifndef Py_CPYTHON_TUPLEOBJECT_H +# error "this header file must not be included directly" +#endif + +typedef struct { + PyObject_VAR_HEAD + /* ob_item contains space for 'ob_size' elements. + Items must normally not be NULL, except during construction when + the tuple is not yet visible outside the function that builds it. */ + PyObject *ob_item[1]; +} PyTupleObject; + +PyAPI_FUNC(int) _PyTuple_Resize(PyObject **, Py_ssize_t); +PyAPI_FUNC(void) _PyTuple_MaybeUntrack(PyObject *); + +/* Macros trading safety for speed */ + +/* Cast argument to PyTupleObject* type. */ +#define _PyTuple_CAST(op) (assert(PyTuple_Check(op)), (PyTupleObject *)(op)) + +#define PyTuple_GET_SIZE(op) Py_SIZE(_PyTuple_CAST(op)) + +#define PyTuple_GET_ITEM(op, i) (_PyTuple_CAST(op)->ob_item[i]) + +/* Macro, *only* to be used to fill in brand new tuples */ +#define PyTuple_SET_ITEM(op, i, v) ((void)(_PyTuple_CAST(op)->ob_item[i] = v)) + +PyAPI_FUNC(void) _PyTuple_DebugMallocStats(FILE *out); diff --git a/ScriptEngine/third-party/backend/include/Python/cpython/unicodeobject.h b/ScriptEngine/third-party/backend/include/Python/cpython/unicodeobject.h new file mode 100644 index 0000000000..0761f01efb --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/cpython/unicodeobject.h @@ -0,0 +1,1169 @@ +#ifndef Py_CPYTHON_UNICODEOBJECT_H +# error "this header file must not be included directly" +#endif + +/* Py_UNICODE was the native Unicode storage format (code unit) used by + Python and represents a single Unicode element in the Unicode type. + With PEP 393, Py_UNICODE is deprecated and replaced with a + typedef to wchar_t. */ +#define PY_UNICODE_TYPE wchar_t +/* Py_DEPRECATED(3.3) */ typedef wchar_t Py_UNICODE; + +/* --- Internal Unicode Operations ---------------------------------------- */ + +#ifndef USE_UNICODE_WCHAR_CACHE +# define USE_UNICODE_WCHAR_CACHE 1 +#endif /* USE_UNICODE_WCHAR_CACHE */ + +/* Since splitting on whitespace is an important use case, and + whitespace in most situations is solely ASCII whitespace, we + optimize for the common case by using a quick look-up table + _Py_ascii_whitespace (see below) with an inlined check. + + */ +#define Py_UNICODE_ISSPACE(ch) \ + ((Py_UCS4)(ch) < 128U ? _Py_ascii_whitespace[(ch)] : _PyUnicode_IsWhitespace(ch)) + +#define Py_UNICODE_ISLOWER(ch) _PyUnicode_IsLowercase(ch) +#define Py_UNICODE_ISUPPER(ch) _PyUnicode_IsUppercase(ch) +#define Py_UNICODE_ISTITLE(ch) _PyUnicode_IsTitlecase(ch) +#define Py_UNICODE_ISLINEBREAK(ch) _PyUnicode_IsLinebreak(ch) + +#define Py_UNICODE_TOLOWER(ch) _PyUnicode_ToLowercase(ch) +#define Py_UNICODE_TOUPPER(ch) _PyUnicode_ToUppercase(ch) +#define Py_UNICODE_TOTITLE(ch) _PyUnicode_ToTitlecase(ch) + +#define Py_UNICODE_ISDECIMAL(ch) _PyUnicode_IsDecimalDigit(ch) +#define Py_UNICODE_ISDIGIT(ch) _PyUnicode_IsDigit(ch) +#define Py_UNICODE_ISNUMERIC(ch) _PyUnicode_IsNumeric(ch) +#define Py_UNICODE_ISPRINTABLE(ch) _PyUnicode_IsPrintable(ch) + +#define Py_UNICODE_TODECIMAL(ch) _PyUnicode_ToDecimalDigit(ch) +#define Py_UNICODE_TODIGIT(ch) _PyUnicode_ToDigit(ch) +#define Py_UNICODE_TONUMERIC(ch) _PyUnicode_ToNumeric(ch) + +#define Py_UNICODE_ISALPHA(ch) _PyUnicode_IsAlpha(ch) + +#define Py_UNICODE_ISALNUM(ch) \ + (Py_UNICODE_ISALPHA(ch) || \ + Py_UNICODE_ISDECIMAL(ch) || \ + Py_UNICODE_ISDIGIT(ch) || \ + Py_UNICODE_ISNUMERIC(ch)) + +Py_DEPRECATED(3.3) static inline void +Py_UNICODE_COPY(Py_UNICODE *target, const Py_UNICODE *source, Py_ssize_t length) { + memcpy(target, source, (size_t)(length) * sizeof(Py_UNICODE)); +} + +Py_DEPRECATED(3.3) static inline void +Py_UNICODE_FILL(Py_UNICODE *target, Py_UNICODE value, Py_ssize_t length) { + Py_ssize_t i; + for (i = 0; i < length; i++) { + target[i] = value; + } +} + +/* macros to work with surrogates */ +#define Py_UNICODE_IS_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDFFF) +#define Py_UNICODE_IS_HIGH_SURROGATE(ch) (0xD800 <= (ch) && (ch) <= 0xDBFF) +#define Py_UNICODE_IS_LOW_SURROGATE(ch) (0xDC00 <= (ch) && (ch) <= 0xDFFF) +/* Join two surrogate characters and return a single Py_UCS4 value. */ +#define Py_UNICODE_JOIN_SURROGATES(high, low) \ + (((((Py_UCS4)(high) & 0x03FF) << 10) | \ + ((Py_UCS4)(low) & 0x03FF)) + 0x10000) +/* high surrogate = top 10 bits added to D800 */ +#define Py_UNICODE_HIGH_SURROGATE(ch) (0xD800 - (0x10000 >> 10) + ((ch) >> 10)) +/* low surrogate = bottom 10 bits added to DC00 */ +#define Py_UNICODE_LOW_SURROGATE(ch) (0xDC00 + ((ch) & 0x3FF)) + +/* --- Unicode Type ------------------------------------------------------- */ + +/* ASCII-only strings created through PyUnicode_New use the PyASCIIObject + structure. state.ascii and state.compact are set, and the data + immediately follow the structure. utf8_length and wstr_length can be found + in the length field; the utf8 pointer is equal to the data pointer. */ +typedef struct { + /* There are 4 forms of Unicode strings: + + - compact ascii: + + * structure = PyASCIIObject + * test: PyUnicode_IS_COMPACT_ASCII(op) + * kind = PyUnicode_1BYTE_KIND + * compact = 1 + * ascii = 1 + * ready = 1 + * (length is the length of the utf8 and wstr strings) + * (data starts just after the structure) + * (since ASCII is decoded from UTF-8, the utf8 string are the data) + + - compact: + + * structure = PyCompactUnicodeObject + * test: PyUnicode_IS_COMPACT(op) && !PyUnicode_IS_ASCII(op) + * kind = PyUnicode_1BYTE_KIND, PyUnicode_2BYTE_KIND or + PyUnicode_4BYTE_KIND + * compact = 1 + * ready = 1 + * ascii = 0 + * utf8 is not shared with data + * utf8_length = 0 if utf8 is NULL + * wstr is shared with data and wstr_length=length + if kind=PyUnicode_2BYTE_KIND and sizeof(wchar_t)=2 + or if kind=PyUnicode_4BYTE_KIND and sizeof(wchar_t)=4 + * wstr_length = 0 if wstr is NULL + * (data starts just after the structure) + + - legacy string, not ready: + + * structure = PyUnicodeObject + * test: kind == PyUnicode_WCHAR_KIND + * length = 0 (use wstr_length) + * hash = -1 + * kind = PyUnicode_WCHAR_KIND + * compact = 0 + * ascii = 0 + * ready = 0 + * interned = SSTATE_NOT_INTERNED + * wstr is not NULL + * data.any is NULL + * utf8 is NULL + * utf8_length = 0 + + - legacy string, ready: + + * structure = PyUnicodeObject structure + * test: !PyUnicode_IS_COMPACT(op) && kind != PyUnicode_WCHAR_KIND + * kind = PyUnicode_1BYTE_KIND, PyUnicode_2BYTE_KIND or + PyUnicode_4BYTE_KIND + * compact = 0 + * ready = 1 + * data.any is not NULL + * utf8 is shared and utf8_length = length with data.any if ascii = 1 + * utf8_length = 0 if utf8 is NULL + * wstr is shared with data.any and wstr_length = length + if kind=PyUnicode_2BYTE_KIND and sizeof(wchar_t)=2 + or if kind=PyUnicode_4BYTE_KIND and sizeof(wchar_4)=4 + * wstr_length = 0 if wstr is NULL + + Compact strings use only one memory block (structure + characters), + whereas legacy strings use one block for the structure and one block + for characters. + + Legacy strings are created by PyUnicode_FromUnicode() and + PyUnicode_FromStringAndSize(NULL, size) functions. They become ready + when PyUnicode_READY() is called. + + See also _PyUnicode_CheckConsistency(). + */ + PyObject_HEAD + Py_ssize_t length; /* Number of code points in the string */ + Py_hash_t hash; /* Hash value; -1 if not set */ + struct { + /* + SSTATE_NOT_INTERNED (0) + SSTATE_INTERNED_MORTAL (1) + SSTATE_INTERNED_IMMORTAL (2) + + If interned != SSTATE_NOT_INTERNED, the two references from the + dictionary to this object are *not* counted in ob_refcnt. + */ + unsigned int interned:2; + /* Character size: + + - PyUnicode_WCHAR_KIND (0): + + * character type = wchar_t (16 or 32 bits, depending on the + platform) + + - PyUnicode_1BYTE_KIND (1): + + * character type = Py_UCS1 (8 bits, unsigned) + * all characters are in the range U+0000-U+00FF (latin1) + * if ascii is set, all characters are in the range U+0000-U+007F + (ASCII), otherwise at least one character is in the range + U+0080-U+00FF + + - PyUnicode_2BYTE_KIND (2): + + * character type = Py_UCS2 (16 bits, unsigned) + * all characters are in the range U+0000-U+FFFF (BMP) + * at least one character is in the range U+0100-U+FFFF + + - PyUnicode_4BYTE_KIND (4): + + * character type = Py_UCS4 (32 bits, unsigned) + * all characters are in the range U+0000-U+10FFFF + * at least one character is in the range U+10000-U+10FFFF + */ + unsigned int kind:3; + /* Compact is with respect to the allocation scheme. Compact unicode + objects only require one memory block while non-compact objects use + one block for the PyUnicodeObject struct and another for its data + buffer. */ + unsigned int compact:1; + /* The string only contains characters in the range U+0000-U+007F (ASCII) + and the kind is PyUnicode_1BYTE_KIND. If ascii is set and compact is + set, use the PyASCIIObject structure. */ + unsigned int ascii:1; + /* The ready flag indicates whether the object layout is initialized + completely. This means that this is either a compact object, or + the data pointer is filled out. The bit is redundant, and helps + to minimize the test in PyUnicode_IS_READY(). */ + unsigned int ready:1; + /* Padding to ensure that PyUnicode_DATA() is always aligned to + 4 bytes (see issue #19537 on m68k). */ + unsigned int :24; + } state; + wchar_t *wstr; /* wchar_t representation (null-terminated) */ +} PyASCIIObject; + +/* Non-ASCII strings allocated through PyUnicode_New use the + PyCompactUnicodeObject structure. state.compact is set, and the data + immediately follow the structure. */ +typedef struct { + PyASCIIObject _base; + Py_ssize_t utf8_length; /* Number of bytes in utf8, excluding the + * terminating \0. */ + char *utf8; /* UTF-8 representation (null-terminated) */ + Py_ssize_t wstr_length; /* Number of code points in wstr, possible + * surrogates count as two code points. */ +} PyCompactUnicodeObject; + +/* Strings allocated through PyUnicode_FromUnicode(NULL, len) use the + PyUnicodeObject structure. The actual string data is initially in the wstr + block, and copied into the data block using _PyUnicode_Ready. */ +typedef struct { + PyCompactUnicodeObject _base; + union { + void *any; + Py_UCS1 *latin1; + Py_UCS2 *ucs2; + Py_UCS4 *ucs4; + } data; /* Canonical, smallest-form Unicode buffer */ +} PyUnicodeObject; + +PyAPI_FUNC(int) _PyUnicode_CheckConsistency( + PyObject *op, + int check_content); + +/* Fast access macros */ + +/* Returns the deprecated Py_UNICODE representation's size in code units + (this includes surrogate pairs as 2 units). + If the Py_UNICODE representation is not available, it will be computed + on request. Use PyUnicode_GET_LENGTH() for the length in code points. */ + +/* Py_DEPRECATED(3.3) */ +#define PyUnicode_GET_SIZE(op) \ + (assert(PyUnicode_Check(op)), \ + (((PyASCIIObject *)(op))->wstr) ? \ + PyUnicode_WSTR_LENGTH(op) : \ + ((void)PyUnicode_AsUnicode(_PyObject_CAST(op)),\ + assert(((PyASCIIObject *)(op))->wstr), \ + PyUnicode_WSTR_LENGTH(op))) + +/* Py_DEPRECATED(3.3) */ +#define PyUnicode_GET_DATA_SIZE(op) \ + (PyUnicode_GET_SIZE(op) * Py_UNICODE_SIZE) + +/* Alias for PyUnicode_AsUnicode(). This will create a wchar_t/Py_UNICODE + representation on demand. Using this macro is very inefficient now, + try to port your code to use the new PyUnicode_*BYTE_DATA() macros or + use PyUnicode_WRITE() and PyUnicode_READ(). */ + +/* Py_DEPRECATED(3.3) */ +#define PyUnicode_AS_UNICODE(op) \ + (assert(PyUnicode_Check(op)), \ + (((PyASCIIObject *)(op))->wstr) ? (((PyASCIIObject *)(op))->wstr) : \ + PyUnicode_AsUnicode(_PyObject_CAST(op))) + +/* Py_DEPRECATED(3.3) */ +#define PyUnicode_AS_DATA(op) \ + ((const char *)(PyUnicode_AS_UNICODE(op))) + + +/* --- Flexible String Representation Helper Macros (PEP 393) -------------- */ + +/* Values for PyASCIIObject.state: */ + +/* Interning state. */ +#define SSTATE_NOT_INTERNED 0 +#define SSTATE_INTERNED_MORTAL 1 +#define SSTATE_INTERNED_IMMORTAL 2 + +/* Return true if the string contains only ASCII characters, or 0 if not. The + string may be compact (PyUnicode_IS_COMPACT_ASCII) or not, but must be + ready. */ +#define PyUnicode_IS_ASCII(op) \ + (assert(PyUnicode_Check(op)), \ + assert(PyUnicode_IS_READY(op)), \ + ((PyASCIIObject*)op)->state.ascii) + +/* Return true if the string is compact or 0 if not. + No type checks or Ready calls are performed. */ +#define PyUnicode_IS_COMPACT(op) \ + (((PyASCIIObject*)(op))->state.compact) + +/* Return true if the string is a compact ASCII string (use PyASCIIObject + structure), or 0 if not. No type checks or Ready calls are performed. */ +#define PyUnicode_IS_COMPACT_ASCII(op) \ + (((PyASCIIObject*)op)->state.ascii && PyUnicode_IS_COMPACT(op)) + +enum PyUnicode_Kind { +/* String contains only wstr byte characters. This is only possible + when the string was created with a legacy API and _PyUnicode_Ready() + has not been called yet. */ + PyUnicode_WCHAR_KIND = 0, +/* Return values of the PyUnicode_KIND() macro: */ + PyUnicode_1BYTE_KIND = 1, + PyUnicode_2BYTE_KIND = 2, + PyUnicode_4BYTE_KIND = 4 +}; + +/* Return pointers to the canonical representation cast to unsigned char, + Py_UCS2, or Py_UCS4 for direct character access. + No checks are performed, use PyUnicode_KIND() before to ensure + these will work correctly. */ + +#define PyUnicode_1BYTE_DATA(op) ((Py_UCS1*)PyUnicode_DATA(op)) +#define PyUnicode_2BYTE_DATA(op) ((Py_UCS2*)PyUnicode_DATA(op)) +#define PyUnicode_4BYTE_DATA(op) ((Py_UCS4*)PyUnicode_DATA(op)) + +/* Return one of the PyUnicode_*_KIND values defined above. */ +#define PyUnicode_KIND(op) \ + (assert(PyUnicode_Check(op)), \ + assert(PyUnicode_IS_READY(op)), \ + ((PyASCIIObject *)(op))->state.kind) + +/* Return a void pointer to the raw unicode buffer. */ +#define _PyUnicode_COMPACT_DATA(op) \ + (PyUnicode_IS_ASCII(op) ? \ + ((void*)((PyASCIIObject*)(op) + 1)) : \ + ((void*)((PyCompactUnicodeObject*)(op) + 1))) + +#define _PyUnicode_NONCOMPACT_DATA(op) \ + (assert(((PyUnicodeObject*)(op))->data.any), \ + ((((PyUnicodeObject *)(op))->data.any))) + +#define PyUnicode_DATA(op) \ + (assert(PyUnicode_Check(op)), \ + PyUnicode_IS_COMPACT(op) ? _PyUnicode_COMPACT_DATA(op) : \ + _PyUnicode_NONCOMPACT_DATA(op)) + +/* In the access macros below, "kind" may be evaluated more than once. + All other macro parameters are evaluated exactly once, so it is safe + to put side effects into them (such as increasing the index). */ + +/* Write into the canonical representation, this macro does not do any sanity + checks and is intended for usage in loops. The caller should cache the + kind and data pointers obtained from other macro calls. + index is the index in the string (starts at 0) and value is the new + code point value which should be written to that location. */ +#define PyUnicode_WRITE(kind, data, index, value) \ + do { \ + switch ((kind)) { \ + case PyUnicode_1BYTE_KIND: { \ + ((Py_UCS1 *)(data))[(index)] = (Py_UCS1)(value); \ + break; \ + } \ + case PyUnicode_2BYTE_KIND: { \ + ((Py_UCS2 *)(data))[(index)] = (Py_UCS2)(value); \ + break; \ + } \ + default: { \ + assert((kind) == PyUnicode_4BYTE_KIND); \ + ((Py_UCS4 *)(data))[(index)] = (Py_UCS4)(value); \ + } \ + } \ + } while (0) + +/* Read a code point from the string's canonical representation. No checks + or ready calls are performed. */ +#define PyUnicode_READ(kind, data, index) \ + ((Py_UCS4) \ + ((kind) == PyUnicode_1BYTE_KIND ? \ + ((const Py_UCS1 *)(data))[(index)] : \ + ((kind) == PyUnicode_2BYTE_KIND ? \ + ((const Py_UCS2 *)(data))[(index)] : \ + ((const Py_UCS4 *)(data))[(index)] \ + ) \ + )) + +/* PyUnicode_READ_CHAR() is less efficient than PyUnicode_READ() because it + calls PyUnicode_KIND() and might call it twice. For single reads, use + PyUnicode_READ_CHAR, for multiple consecutive reads callers should + cache kind and use PyUnicode_READ instead. */ +#define PyUnicode_READ_CHAR(unicode, index) \ + (assert(PyUnicode_Check(unicode)), \ + assert(PyUnicode_IS_READY(unicode)), \ + (Py_UCS4) \ + (PyUnicode_KIND((unicode)) == PyUnicode_1BYTE_KIND ? \ + ((const Py_UCS1 *)(PyUnicode_DATA((unicode))))[(index)] : \ + (PyUnicode_KIND((unicode)) == PyUnicode_2BYTE_KIND ? \ + ((const Py_UCS2 *)(PyUnicode_DATA((unicode))))[(index)] : \ + ((const Py_UCS4 *)(PyUnicode_DATA((unicode))))[(index)] \ + ) \ + )) + +/* Returns the length of the unicode string. The caller has to make sure that + the string has it's canonical representation set before calling + this macro. Call PyUnicode_(FAST_)Ready to ensure that. */ +#define PyUnicode_GET_LENGTH(op) \ + (assert(PyUnicode_Check(op)), \ + assert(PyUnicode_IS_READY(op)), \ + ((PyASCIIObject *)(op))->length) + + +/* Fast check to determine whether an object is ready. Equivalent to + PyUnicode_IS_COMPACT(op) || ((PyUnicodeObject*)(op))->data.any */ + +#define PyUnicode_IS_READY(op) (((PyASCIIObject*)op)->state.ready) + +/* PyUnicode_READY() does less work than _PyUnicode_Ready() in the best + case. If the canonical representation is not yet set, it will still call + _PyUnicode_Ready(). + Returns 0 on success and -1 on errors. */ +#define PyUnicode_READY(op) \ + (assert(PyUnicode_Check(op)), \ + (PyUnicode_IS_READY(op) ? \ + 0 : _PyUnicode_Ready(_PyObject_CAST(op)))) + +/* Return a maximum character value which is suitable for creating another + string based on op. This is always an approximation but more efficient + than iterating over the string. */ +#define PyUnicode_MAX_CHAR_VALUE(op) \ + (assert(PyUnicode_IS_READY(op)), \ + (PyUnicode_IS_ASCII(op) ? \ + (0x7f) : \ + (PyUnicode_KIND(op) == PyUnicode_1BYTE_KIND ? \ + (0xffU) : \ + (PyUnicode_KIND(op) == PyUnicode_2BYTE_KIND ? \ + (0xffffU) : \ + (0x10ffffU))))) + +Py_DEPRECATED(3.3) +static inline Py_ssize_t _PyUnicode_get_wstr_length(PyObject *op) { + return PyUnicode_IS_COMPACT_ASCII(op) ? + ((PyASCIIObject*)op)->length : + ((PyCompactUnicodeObject*)op)->wstr_length; +} +#define PyUnicode_WSTR_LENGTH(op) _PyUnicode_get_wstr_length((PyObject*)op) + +/* === Public API ========================================================= */ + +/* --- Plain Py_UNICODE --------------------------------------------------- */ + +/* With PEP 393, this is the recommended way to allocate a new unicode object. + This function will allocate the object and its buffer in a single memory + block. Objects created using this function are not resizable. */ +PyAPI_FUNC(PyObject*) PyUnicode_New( + Py_ssize_t size, /* Number of code points in the new string */ + Py_UCS4 maxchar /* maximum code point value in the string */ + ); + +/* Initializes the canonical string representation from the deprecated + wstr/Py_UNICODE representation. This function is used to convert Unicode + objects which were created using the old API to the new flexible format + introduced with PEP 393. + + Don't call this function directly, use the public PyUnicode_READY() macro + instead. */ +PyAPI_FUNC(int) _PyUnicode_Ready( + PyObject *unicode /* Unicode object */ + ); + +/* Get a copy of a Unicode string. */ +PyAPI_FUNC(PyObject*) _PyUnicode_Copy( + PyObject *unicode + ); + +/* Copy character from one unicode object into another, this function performs + character conversion when necessary and falls back to memcpy() if possible. + + Fail if to is too small (smaller than *how_many* or smaller than + len(from)-from_start), or if kind(from[from_start:from_start+how_many]) > + kind(to), or if *to* has more than 1 reference. + + Return the number of written character, or return -1 and raise an exception + on error. + + Pseudo-code: + + how_many = min(how_many, len(from) - from_start) + to[to_start:to_start+how_many] = from[from_start:from_start+how_many] + return how_many + + Note: The function doesn't write a terminating null character. + */ +PyAPI_FUNC(Py_ssize_t) PyUnicode_CopyCharacters( + PyObject *to, + Py_ssize_t to_start, + PyObject *from, + Py_ssize_t from_start, + Py_ssize_t how_many + ); + +/* Unsafe version of PyUnicode_CopyCharacters(): don't check arguments and so + may crash if parameters are invalid (e.g. if the output string + is too short). */ +PyAPI_FUNC(void) _PyUnicode_FastCopyCharacters( + PyObject *to, + Py_ssize_t to_start, + PyObject *from, + Py_ssize_t from_start, + Py_ssize_t how_many + ); + +/* Fill a string with a character: write fill_char into + unicode[start:start+length]. + + Fail if fill_char is bigger than the string maximum character, or if the + string has more than 1 reference. + + Return the number of written character, or return -1 and raise an exception + on error. */ +PyAPI_FUNC(Py_ssize_t) PyUnicode_Fill( + PyObject *unicode, + Py_ssize_t start, + Py_ssize_t length, + Py_UCS4 fill_char + ); + +/* Unsafe version of PyUnicode_Fill(): don't check arguments and so may crash + if parameters are invalid (e.g. if length is longer than the string). */ +PyAPI_FUNC(void) _PyUnicode_FastFill( + PyObject *unicode, + Py_ssize_t start, + Py_ssize_t length, + Py_UCS4 fill_char + ); + +/* Create a Unicode Object from the Py_UNICODE buffer u of the given + size. + + u may be NULL which causes the contents to be undefined. It is the + user's responsibility to fill in the needed data afterwards. Note + that modifying the Unicode object contents after construction is + only allowed if u was set to NULL. + + The buffer is copied into the new object. */ +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_FromUnicode( + const Py_UNICODE *u, /* Unicode buffer */ + Py_ssize_t size /* size of buffer */ + ); + +/* Create a new string from a buffer of Py_UCS1, Py_UCS2 or Py_UCS4 characters. + Scan the string to find the maximum character. */ +PyAPI_FUNC(PyObject*) PyUnicode_FromKindAndData( + int kind, + const void *buffer, + Py_ssize_t size); + +/* Create a new string from a buffer of ASCII characters. + WARNING: Don't check if the string contains any non-ASCII character. */ +PyAPI_FUNC(PyObject*) _PyUnicode_FromASCII( + const char *buffer, + Py_ssize_t size); + +/* Compute the maximum character of the substring unicode[start:end]. + Return 127 for an empty string. */ +PyAPI_FUNC(Py_UCS4) _PyUnicode_FindMaxChar ( + PyObject *unicode, + Py_ssize_t start, + Py_ssize_t end); + +/* Return a read-only pointer to the Unicode object's internal + Py_UNICODE buffer. + If the wchar_t/Py_UNICODE representation is not yet available, this + function will calculate it. */ +Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicode( + PyObject *unicode /* Unicode object */ + ); + +/* Similar to PyUnicode_AsUnicode(), but raises a ValueError if the string + contains null characters. */ +PyAPI_FUNC(const Py_UNICODE *) _PyUnicode_AsUnicode( + PyObject *unicode /* Unicode object */ + ); + +/* Return a read-only pointer to the Unicode object's internal + Py_UNICODE buffer and save the length at size. + If the wchar_t/Py_UNICODE representation is not yet available, this + function will calculate it. */ + +Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UNICODE *) PyUnicode_AsUnicodeAndSize( + PyObject *unicode, /* Unicode object */ + Py_ssize_t *size /* location where to save the length */ + ); + + +/* --- _PyUnicodeWriter API ----------------------------------------------- */ + +typedef struct { + PyObject *buffer; + void *data; + enum PyUnicode_Kind kind; + Py_UCS4 maxchar; + Py_ssize_t size; + Py_ssize_t pos; + + /* minimum number of allocated characters (default: 0) */ + Py_ssize_t min_length; + + /* minimum character (default: 127, ASCII) */ + Py_UCS4 min_char; + + /* If non-zero, overallocate the buffer (default: 0). */ + unsigned char overallocate; + + /* If readonly is 1, buffer is a shared string (cannot be modified) + and size is set to 0. */ + unsigned char readonly; +} _PyUnicodeWriter ; + +/* Initialize a Unicode writer. + * + * By default, the minimum buffer size is 0 character and overallocation is + * disabled. Set min_length, min_char and overallocate attributes to control + * the allocation of the buffer. */ +PyAPI_FUNC(void) +_PyUnicodeWriter_Init(_PyUnicodeWriter *writer); + +/* Prepare the buffer to write 'length' characters + with the specified maximum character. + + Return 0 on success, raise an exception and return -1 on error. */ +#define _PyUnicodeWriter_Prepare(WRITER, LENGTH, MAXCHAR) \ + (((MAXCHAR) <= (WRITER)->maxchar \ + && (LENGTH) <= (WRITER)->size - (WRITER)->pos) \ + ? 0 \ + : (((LENGTH) == 0) \ + ? 0 \ + : _PyUnicodeWriter_PrepareInternal((WRITER), (LENGTH), (MAXCHAR)))) + +/* Don't call this function directly, use the _PyUnicodeWriter_Prepare() macro + instead. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_PrepareInternal(_PyUnicodeWriter *writer, + Py_ssize_t length, Py_UCS4 maxchar); + +/* Prepare the buffer to have at least the kind KIND. + For example, kind=PyUnicode_2BYTE_KIND ensures that the writer will + support characters in range U+000-U+FFFF. + + Return 0 on success, raise an exception and return -1 on error. */ +#define _PyUnicodeWriter_PrepareKind(WRITER, KIND) \ + (assert((KIND) != PyUnicode_WCHAR_KIND), \ + (KIND) <= (WRITER)->kind \ + ? 0 \ + : _PyUnicodeWriter_PrepareKindInternal((WRITER), (KIND))) + +/* Don't call this function directly, use the _PyUnicodeWriter_PrepareKind() + macro instead. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_PrepareKindInternal(_PyUnicodeWriter *writer, + enum PyUnicode_Kind kind); + +/* Append a Unicode character. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_WriteChar(_PyUnicodeWriter *writer, + Py_UCS4 ch + ); + +/* Append a Unicode string. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_WriteStr(_PyUnicodeWriter *writer, + PyObject *str /* Unicode string */ + ); + +/* Append a substring of a Unicode string. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_WriteSubstring(_PyUnicodeWriter *writer, + PyObject *str, /* Unicode string */ + Py_ssize_t start, + Py_ssize_t end + ); + +/* Append an ASCII-encoded byte string. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_WriteASCIIString(_PyUnicodeWriter *writer, + const char *str, /* ASCII-encoded byte string */ + Py_ssize_t len /* number of bytes, or -1 if unknown */ + ); + +/* Append a latin1-encoded byte string. + Return 0 on success, raise an exception and return -1 on error. */ +PyAPI_FUNC(int) +_PyUnicodeWriter_WriteLatin1String(_PyUnicodeWriter *writer, + const char *str, /* latin1-encoded byte string */ + Py_ssize_t len /* length in bytes */ + ); + +/* Get the value of the writer as a Unicode string. Clear the + buffer of the writer. Raise an exception and return NULL + on error. */ +PyAPI_FUNC(PyObject *) +_PyUnicodeWriter_Finish(_PyUnicodeWriter *writer); + +/* Deallocate memory of a writer (clear its internal buffer). */ +PyAPI_FUNC(void) +_PyUnicodeWriter_Dealloc(_PyUnicodeWriter *writer); + + +/* Format the object based on the format_spec, as defined in PEP 3101 + (Advanced String Formatting). */ +PyAPI_FUNC(int) _PyUnicode_FormatAdvancedWriter( + _PyUnicodeWriter *writer, + PyObject *obj, + PyObject *format_spec, + Py_ssize_t start, + Py_ssize_t end); + +/* --- Manage the default encoding ---------------------------------------- */ + +/* Returns a pointer to the default encoding (UTF-8) of the + Unicode object unicode. + + Like PyUnicode_AsUTF8AndSize(), this also caches the UTF-8 representation + in the unicodeobject. + + _PyUnicode_AsString is a #define for PyUnicode_AsUTF8 to + support the previous internal function with the same behaviour. + + Use of this API is DEPRECATED since no size information can be + extracted from the returned data. +*/ + +PyAPI_FUNC(const char *) PyUnicode_AsUTF8(PyObject *unicode); + +#define _PyUnicode_AsString PyUnicode_AsUTF8 + +/* --- Generic Codecs ----------------------------------------------------- */ + +/* Encodes a Py_UNICODE buffer of the given size and returns a + Python string object. */ +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_Encode( + const Py_UNICODE *s, /* Unicode char buffer */ + Py_ssize_t size, /* number of Py_UNICODE chars to encode */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* --- UTF-7 Codecs ------------------------------------------------------- */ + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF7( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* number of Py_UNICODE chars to encode */ + int base64SetO, /* Encode RFC2152 Set O characters in base64 */ + int base64WhiteSpace, /* Encode whitespace (sp, ht, nl, cr) in base64 */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF7( + PyObject *unicode, /* Unicode object */ + int base64SetO, /* Encode RFC2152 Set O characters in base64 */ + int base64WhiteSpace, /* Encode whitespace (sp, ht, nl, cr) in base64 */ + const char *errors /* error handling */ + ); + +/* --- UTF-8 Codecs ------------------------------------------------------- */ + +PyAPI_FUNC(PyObject*) _PyUnicode_AsUTF8String( + PyObject *unicode, + const char *errors); + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF8( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* number of Py_UNICODE chars to encode */ + const char *errors /* error handling */ + ); + +/* --- UTF-32 Codecs ------------------------------------------------------ */ + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF32( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* number of Py_UNICODE chars to encode */ + const char *errors, /* error handling */ + int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ + ); + +PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF32( + PyObject *object, /* Unicode object */ + const char *errors, /* error handling */ + int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ + ); + +/* --- UTF-16 Codecs ------------------------------------------------------ */ + +/* Returns a Python string object holding the UTF-16 encoded value of + the Unicode data. + + If byteorder is not 0, output is written according to the following + byte order: + + byteorder == -1: little endian + byteorder == 0: native byte order (writes a BOM mark) + byteorder == 1: big endian + + If byteorder is 0, the output string will always start with the + Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is + prepended. + + Note that Py_UNICODE data is being interpreted as UTF-16 reduced to + UCS-2. This trick makes it possible to add full UTF-16 capabilities + at a later point without compromising the APIs. + +*/ +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUTF16( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* number of Py_UNICODE chars to encode */ + const char *errors, /* error handling */ + int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ + ); + +PyAPI_FUNC(PyObject*) _PyUnicode_EncodeUTF16( + PyObject* unicode, /* Unicode object */ + const char *errors, /* error handling */ + int byteorder /* byteorder to use 0=BOM+native;-1=LE,1=BE */ + ); + +/* --- Unicode-Escape Codecs ---------------------------------------------- */ + +/* Variant of PyUnicode_DecodeUnicodeEscape that supports partial decoding. */ +PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscapeStateful( + const char *string, /* Unicode-Escape encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed /* bytes consumed */ +); + +/* Helper for PyUnicode_DecodeUnicodeEscape that detects invalid escape + chars. */ +PyAPI_FUNC(PyObject*) _PyUnicode_DecodeUnicodeEscapeInternal( + const char *string, /* Unicode-Escape encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed, /* bytes consumed */ + const char **first_invalid_escape /* on return, points to first + invalid escaped char in + string. */ +); + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeUnicodeEscape( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length /* Number of Py_UNICODE chars to encode */ + ); + +/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */ + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeRawUnicodeEscape( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length /* Number of Py_UNICODE chars to encode */ + ); + +/* Variant of PyUnicode_DecodeRawUnicodeEscape that supports partial decoding. */ +PyAPI_FUNC(PyObject*) _PyUnicode_DecodeRawUnicodeEscapeStateful( + const char *string, /* Unicode-Escape encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed /* bytes consumed */ +); + +/* --- Latin-1 Codecs ----------------------------------------------------- */ + +PyAPI_FUNC(PyObject*) _PyUnicode_AsLatin1String( + PyObject* unicode, + const char* errors); + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeLatin1( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ + const char *errors /* error handling */ + ); + +/* --- ASCII Codecs ------------------------------------------------------- */ + +PyAPI_FUNC(PyObject*) _PyUnicode_AsASCIIString( + PyObject* unicode, + const char* errors); + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeASCII( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ + const char *errors /* error handling */ + ); + +/* --- Character Map Codecs ----------------------------------------------- */ + +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeCharmap( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ + PyObject *mapping, /* encoding mapping */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) _PyUnicode_EncodeCharmap( + PyObject *unicode, /* Unicode object */ + PyObject *mapping, /* encoding mapping */ + const char *errors /* error handling */ + ); + +/* Translate a Py_UNICODE buffer of the given length by applying a + character mapping table to it and return the resulting Unicode + object. + + The mapping table must map Unicode ordinal integers to Unicode strings, + Unicode ordinal integers or None (causing deletion of the character). + + Mapping tables may be dictionaries or sequences. Unmapped character + ordinals (ones which cause a LookupError) are left untouched and + are copied as-is. + +*/ +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject *) PyUnicode_TranslateCharmap( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ + PyObject *table, /* Translate table */ + const char *errors /* error handling */ + ); + +/* --- MBCS codecs for Windows -------------------------------------------- */ + +#ifdef MS_WINDOWS +Py_DEPRECATED(3.3) PyAPI_FUNC(PyObject*) PyUnicode_EncodeMBCS( + const Py_UNICODE *data, /* Unicode char buffer */ + Py_ssize_t length, /* number of Py_UNICODE chars to encode */ + const char *errors /* error handling */ + ); +#endif + +/* --- Decimal Encoder ---------------------------------------------------- */ + +/* Takes a Unicode string holding a decimal value and writes it into + an output buffer using standard ASCII digit codes. + + The output buffer has to provide at least length+1 bytes of storage + area. The output string is 0-terminated. + + The encoder converts whitespace to ' ', decimal characters to their + corresponding ASCII digit and all other Latin-1 characters except + \0 as-is. Characters outside this range (Unicode ordinals 1-256) + are treated as errors. This includes embedded NULL bytes. + + Error handling is defined by the errors argument: + + NULL or "strict": raise a ValueError + "ignore": ignore the wrong characters (these are not copied to the + output buffer) + "replace": replaces illegal characters with '?' + + Returns 0 on success, -1 on failure. + +*/ + +Py_DEPRECATED(3.3) PyAPI_FUNC(int) PyUnicode_EncodeDecimal( + Py_UNICODE *s, /* Unicode buffer */ + Py_ssize_t length, /* Number of Py_UNICODE chars to encode */ + char *output, /* Output buffer; must have size >= length */ + const char *errors /* error handling */ + ); + +/* Transforms code points that have decimal digit property to the + corresponding ASCII digit code points. + + Returns a new Unicode string on success, NULL on failure. +*/ + +Py_DEPRECATED(3.3) +PyAPI_FUNC(PyObject*) PyUnicode_TransformDecimalToASCII( + Py_UNICODE *s, /* Unicode buffer */ + Py_ssize_t length /* Number of Py_UNICODE chars to transform */ + ); + +/* Coverts a Unicode object holding a decimal value to an ASCII string + for using in int, float and complex parsers. + Transforms code points that have decimal digit property to the + corresponding ASCII digit code points. Transforms spaces to ASCII. + Transforms code points starting from the first non-ASCII code point that + is neither a decimal digit nor a space to the end into '?'. */ + +PyAPI_FUNC(PyObject*) _PyUnicode_TransformDecimalAndSpaceToASCII( + PyObject *unicode /* Unicode object */ + ); + +/* --- Methods & Slots ---------------------------------------------------- */ + +PyAPI_FUNC(PyObject *) _PyUnicode_JoinArray( + PyObject *separator, + PyObject *const *items, + Py_ssize_t seqlen + ); + +/* Test whether a unicode is equal to ASCII identifier. Return 1 if true, + 0 otherwise. The right argument must be ASCII identifier. + Any error occurs inside will be cleared before return. */ +PyAPI_FUNC(int) _PyUnicode_EqualToASCIIId( + PyObject *left, /* Left string */ + _Py_Identifier *right /* Right identifier */ + ); + +/* Test whether a unicode is equal to ASCII string. Return 1 if true, + 0 otherwise. The right argument must be ASCII-encoded string. + Any error occurs inside will be cleared before return. */ +PyAPI_FUNC(int) _PyUnicode_EqualToASCIIString( + PyObject *left, + const char *right /* ASCII-encoded string */ + ); + +/* Externally visible for str.strip(unicode) */ +PyAPI_FUNC(PyObject *) _PyUnicode_XStrip( + PyObject *self, + int striptype, + PyObject *sepobj + ); + +/* Using explicit passed-in values, insert the thousands grouping + into the string pointed to by buffer. For the argument descriptions, + see Objects/stringlib/localeutil.h */ +PyAPI_FUNC(Py_ssize_t) _PyUnicode_InsertThousandsGrouping( + _PyUnicodeWriter *writer, + Py_ssize_t n_buffer, + PyObject *digits, + Py_ssize_t d_pos, + Py_ssize_t n_digits, + Py_ssize_t min_width, + const char *grouping, + PyObject *thousands_sep, + Py_UCS4 *maxchar); + +/* === Characters Type APIs =============================================== */ + +/* Helper array used by Py_UNICODE_ISSPACE(). */ + +PyAPI_DATA(const unsigned char) _Py_ascii_whitespace[]; + +/* These should not be used directly. Use the Py_UNICODE_IS* and + Py_UNICODE_TO* macros instead. + + These APIs are implemented in Objects/unicodectype.c. + +*/ + +PyAPI_FUNC(int) _PyUnicode_IsLowercase( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsUppercase( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsTitlecase( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsXidStart( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsXidContinue( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsWhitespace( + const Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsLinebreak( + const Py_UCS4 ch /* Unicode character */ + ); + +/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UCS4) _PyUnicode_ToLowercase( + Py_UCS4 ch /* Unicode character */ + ); + +/* Py_DEPRECATED(3.3) */ PyAPI_FUNC(Py_UCS4) _PyUnicode_ToUppercase( + Py_UCS4 ch /* Unicode character */ + ); + +Py_DEPRECATED(3.3) PyAPI_FUNC(Py_UCS4) _PyUnicode_ToTitlecase( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_ToLowerFull( + Py_UCS4 ch, /* Unicode character */ + Py_UCS4 *res + ); + +PyAPI_FUNC(int) _PyUnicode_ToTitleFull( + Py_UCS4 ch, /* Unicode character */ + Py_UCS4 *res + ); + +PyAPI_FUNC(int) _PyUnicode_ToUpperFull( + Py_UCS4 ch, /* Unicode character */ + Py_UCS4 *res + ); + +PyAPI_FUNC(int) _PyUnicode_ToFoldedFull( + Py_UCS4 ch, /* Unicode character */ + Py_UCS4 *res + ); + +PyAPI_FUNC(int) _PyUnicode_IsCaseIgnorable( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsCased( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_ToDecimalDigit( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_ToDigit( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(double) _PyUnicode_ToNumeric( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsDecimalDigit( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsDigit( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsNumeric( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsPrintable( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(int) _PyUnicode_IsAlpha( + Py_UCS4 ch /* Unicode character */ + ); + +PyAPI_FUNC(PyObject*) _PyUnicode_FormatLong(PyObject *, int, int, int); + +/* Return an interned Unicode object for an Identifier; may fail if there is no memory.*/ +PyAPI_FUNC(PyObject*) _PyUnicode_FromId(_Py_Identifier*); + +/* Fast equality check when the inputs are known to be exact unicode types + and where the hash values are equal (i.e. a very probable match) */ +PyAPI_FUNC(int) _PyUnicode_EQ(PyObject *, PyObject *); + +PyAPI_FUNC(int) _PyUnicode_WideCharString_Converter(PyObject *, void *); +PyAPI_FUNC(int) _PyUnicode_WideCharString_Opt_Converter(PyObject *, void *); + +PyAPI_FUNC(Py_ssize_t) _PyUnicode_ScanIdentifier(PyObject *); diff --git a/ScriptEngine/third-party/backend/include/Python/datetime.h b/ScriptEngine/third-party/backend/include/Python/datetime.h new file mode 100644 index 0000000000..bb565201a1 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/datetime.h @@ -0,0 +1,267 @@ +/* datetime.h + */ +#ifndef Py_LIMITED_API +#ifndef DATETIME_H +#define DATETIME_H +#ifdef __cplusplus +extern "C" { +#endif + +/* Fields are packed into successive bytes, each viewed as unsigned and + * big-endian, unless otherwise noted: + * + * byte offset + * 0 year 2 bytes, 1-9999 + * 2 month 1 byte, 1-12 + * 3 day 1 byte, 1-31 + * 4 hour 1 byte, 0-23 + * 5 minute 1 byte, 0-59 + * 6 second 1 byte, 0-59 + * 7 usecond 3 bytes, 0-999999 + * 10 + */ + +/* # of bytes for year, month, and day. */ +#define _PyDateTime_DATE_DATASIZE 4 + +/* # of bytes for hour, minute, second, and usecond. */ +#define _PyDateTime_TIME_DATASIZE 6 + +/* # of bytes for year, month, day, hour, minute, second, and usecond. */ +#define _PyDateTime_DATETIME_DATASIZE 10 + + +typedef struct +{ + PyObject_HEAD + Py_hash_t hashcode; /* -1 when unknown */ + int days; /* -MAX_DELTA_DAYS <= days <= MAX_DELTA_DAYS */ + int seconds; /* 0 <= seconds < 24*3600 is invariant */ + int microseconds; /* 0 <= microseconds < 1000000 is invariant */ +} PyDateTime_Delta; + +typedef struct +{ + PyObject_HEAD /* a pure abstract base class */ +} PyDateTime_TZInfo; + + +/* The datetime and time types have hashcodes, and an optional tzinfo member, + * present if and only if hastzinfo is true. + */ +#define _PyTZINFO_HEAD \ + PyObject_HEAD \ + Py_hash_t hashcode; \ + char hastzinfo; /* boolean flag */ + +/* No _PyDateTime_BaseTZInfo is allocated; it's just to have something + * convenient to cast to, when getting at the hastzinfo member of objects + * starting with _PyTZINFO_HEAD. + */ +typedef struct +{ + _PyTZINFO_HEAD +} _PyDateTime_BaseTZInfo; + +/* All time objects are of PyDateTime_TimeType, but that can be allocated + * in two ways, with or without a tzinfo member. Without is the same as + * tzinfo == None, but consumes less memory. _PyDateTime_BaseTime is an + * internal struct used to allocate the right amount of space for the + * "without" case. + */ +#define _PyDateTime_TIMEHEAD \ + _PyTZINFO_HEAD \ + unsigned char data[_PyDateTime_TIME_DATASIZE]; + +typedef struct +{ + _PyDateTime_TIMEHEAD +} _PyDateTime_BaseTime; /* hastzinfo false */ + +typedef struct +{ + _PyDateTime_TIMEHEAD + unsigned char fold; + PyObject *tzinfo; +} PyDateTime_Time; /* hastzinfo true */ + + +/* All datetime objects are of PyDateTime_DateTimeType, but that can be + * allocated in two ways too, just like for time objects above. In addition, + * the plain date type is a base class for datetime, so it must also have + * a hastzinfo member (although it's unused there). + */ +typedef struct +{ + _PyTZINFO_HEAD + unsigned char data[_PyDateTime_DATE_DATASIZE]; +} PyDateTime_Date; + +#define _PyDateTime_DATETIMEHEAD \ + _PyTZINFO_HEAD \ + unsigned char data[_PyDateTime_DATETIME_DATASIZE]; + +typedef struct +{ + _PyDateTime_DATETIMEHEAD +} _PyDateTime_BaseDateTime; /* hastzinfo false */ + +typedef struct +{ + _PyDateTime_DATETIMEHEAD + unsigned char fold; + PyObject *tzinfo; +} PyDateTime_DateTime; /* hastzinfo true */ + + +/* Apply for date and datetime instances. */ + +// o is a pointer to a time or a datetime object. +#define _PyDateTime_HAS_TZINFO(o) (((_PyDateTime_BaseTZInfo *)(o))->hastzinfo) + +#define PyDateTime_GET_YEAR(o) ((((PyDateTime_Date*)o)->data[0] << 8) | \ + ((PyDateTime_Date*)o)->data[1]) +#define PyDateTime_GET_MONTH(o) (((PyDateTime_Date*)o)->data[2]) +#define PyDateTime_GET_DAY(o) (((PyDateTime_Date*)o)->data[3]) + +#define PyDateTime_DATE_GET_HOUR(o) (((PyDateTime_DateTime*)o)->data[4]) +#define PyDateTime_DATE_GET_MINUTE(o) (((PyDateTime_DateTime*)o)->data[5]) +#define PyDateTime_DATE_GET_SECOND(o) (((PyDateTime_DateTime*)o)->data[6]) +#define PyDateTime_DATE_GET_MICROSECOND(o) \ + ((((PyDateTime_DateTime*)o)->data[7] << 16) | \ + (((PyDateTime_DateTime*)o)->data[8] << 8) | \ + ((PyDateTime_DateTime*)o)->data[9]) +#define PyDateTime_DATE_GET_FOLD(o) (((PyDateTime_DateTime*)o)->fold) +#define PyDateTime_DATE_GET_TZINFO(o) (_PyDateTime_HAS_TZINFO(o) ? \ + ((PyDateTime_DateTime *)(o))->tzinfo : Py_None) + +/* Apply for time instances. */ +#define PyDateTime_TIME_GET_HOUR(o) (((PyDateTime_Time*)o)->data[0]) +#define PyDateTime_TIME_GET_MINUTE(o) (((PyDateTime_Time*)o)->data[1]) +#define PyDateTime_TIME_GET_SECOND(o) (((PyDateTime_Time*)o)->data[2]) +#define PyDateTime_TIME_GET_MICROSECOND(o) \ + ((((PyDateTime_Time*)o)->data[3] << 16) | \ + (((PyDateTime_Time*)o)->data[4] << 8) | \ + ((PyDateTime_Time*)o)->data[5]) +#define PyDateTime_TIME_GET_FOLD(o) (((PyDateTime_Time*)o)->fold) +#define PyDateTime_TIME_GET_TZINFO(o) (_PyDateTime_HAS_TZINFO(o) ? \ + ((PyDateTime_Time *)(o))->tzinfo : Py_None) + +/* Apply for time delta instances */ +#define PyDateTime_DELTA_GET_DAYS(o) (((PyDateTime_Delta*)o)->days) +#define PyDateTime_DELTA_GET_SECONDS(o) (((PyDateTime_Delta*)o)->seconds) +#define PyDateTime_DELTA_GET_MICROSECONDS(o) \ + (((PyDateTime_Delta*)o)->microseconds) + + +/* Define structure for C API. */ +typedef struct { + /* type objects */ + PyTypeObject *DateType; + PyTypeObject *DateTimeType; + PyTypeObject *TimeType; + PyTypeObject *DeltaType; + PyTypeObject *TZInfoType; + + /* singletons */ + PyObject *TimeZone_UTC; + + /* constructors */ + PyObject *(*Date_FromDate)(int, int, int, PyTypeObject*); + PyObject *(*DateTime_FromDateAndTime)(int, int, int, int, int, int, int, + PyObject*, PyTypeObject*); + PyObject *(*Time_FromTime)(int, int, int, int, PyObject*, PyTypeObject*); + PyObject *(*Delta_FromDelta)(int, int, int, int, PyTypeObject*); + PyObject *(*TimeZone_FromTimeZone)(PyObject *offset, PyObject *name); + + /* constructors for the DB API */ + PyObject *(*DateTime_FromTimestamp)(PyObject*, PyObject*, PyObject*); + PyObject *(*Date_FromTimestamp)(PyObject*, PyObject*); + + /* PEP 495 constructors */ + PyObject *(*DateTime_FromDateAndTimeAndFold)(int, int, int, int, int, int, int, + PyObject*, int, PyTypeObject*); + PyObject *(*Time_FromTimeAndFold)(int, int, int, int, PyObject*, int, PyTypeObject*); + +} PyDateTime_CAPI; + +#define PyDateTime_CAPSULE_NAME "datetime.datetime_CAPI" + + +/* This block is only used as part of the public API and should not be + * included in _datetimemodule.c, which does not use the C API capsule. + * See bpo-35081 for more details. + * */ +#ifndef _PY_DATETIME_IMPL +/* Define global variable for the C API and a macro for setting it. */ +static PyDateTime_CAPI *PyDateTimeAPI = NULL; + +#define PyDateTime_IMPORT \ + PyDateTimeAPI = (PyDateTime_CAPI *)PyCapsule_Import(PyDateTime_CAPSULE_NAME, 0) + +/* Macro for access to the UTC singleton */ +#define PyDateTime_TimeZone_UTC PyDateTimeAPI->TimeZone_UTC + +/* Macros for type checking when not building the Python core. */ +#define PyDate_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateType) +#define PyDate_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->DateType) + +#define PyDateTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DateTimeType) +#define PyDateTime_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->DateTimeType) + +#define PyTime_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TimeType) +#define PyTime_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->TimeType) + +#define PyDelta_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->DeltaType) +#define PyDelta_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->DeltaType) + +#define PyTZInfo_Check(op) PyObject_TypeCheck(op, PyDateTimeAPI->TZInfoType) +#define PyTZInfo_CheckExact(op) Py_IS_TYPE(op, PyDateTimeAPI->TZInfoType) + + +/* Macros for accessing constructors in a simplified fashion. */ +#define PyDate_FromDate(year, month, day) \ + PyDateTimeAPI->Date_FromDate(year, month, day, PyDateTimeAPI->DateType) + +#define PyDateTime_FromDateAndTime(year, month, day, hour, min, sec, usec) \ + PyDateTimeAPI->DateTime_FromDateAndTime(year, month, day, hour, \ + min, sec, usec, Py_None, PyDateTimeAPI->DateTimeType) + +#define PyDateTime_FromDateAndTimeAndFold(year, month, day, hour, min, sec, usec, fold) \ + PyDateTimeAPI->DateTime_FromDateAndTimeAndFold(year, month, day, hour, \ + min, sec, usec, Py_None, fold, PyDateTimeAPI->DateTimeType) + +#define PyTime_FromTime(hour, minute, second, usecond) \ + PyDateTimeAPI->Time_FromTime(hour, minute, second, usecond, \ + Py_None, PyDateTimeAPI->TimeType) + +#define PyTime_FromTimeAndFold(hour, minute, second, usecond, fold) \ + PyDateTimeAPI->Time_FromTimeAndFold(hour, minute, second, usecond, \ + Py_None, fold, PyDateTimeAPI->TimeType) + +#define PyDelta_FromDSU(days, seconds, useconds) \ + PyDateTimeAPI->Delta_FromDelta(days, seconds, useconds, 1, \ + PyDateTimeAPI->DeltaType) + +#define PyTimeZone_FromOffset(offset) \ + PyDateTimeAPI->TimeZone_FromTimeZone(offset, NULL) + +#define PyTimeZone_FromOffsetAndName(offset, name) \ + PyDateTimeAPI->TimeZone_FromTimeZone(offset, name) + +/* Macros supporting the DB API. */ +#define PyDateTime_FromTimestamp(args) \ + PyDateTimeAPI->DateTime_FromTimestamp( \ + (PyObject*) (PyDateTimeAPI->DateTimeType), args, NULL) + +#define PyDate_FromTimestamp(args) \ + PyDateTimeAPI->Date_FromTimestamp( \ + (PyObject*) (PyDateTimeAPI->DateType), args) + +#endif /* !defined(_PY_DATETIME_IMPL) */ + +#ifdef __cplusplus +} +#endif +#endif +#endif /* !Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/descrobject.h b/ScriptEngine/third-party/backend/include/Python/descrobject.h new file mode 100644 index 0000000000..703bc8fd6d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/descrobject.h @@ -0,0 +1,108 @@ +/* Descriptors */ +#ifndef Py_DESCROBJECT_H +#define Py_DESCROBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef PyObject *(*getter)(PyObject *, void *); +typedef int (*setter)(PyObject *, PyObject *, void *); + +typedef struct PyGetSetDef { + const char *name; + getter get; + setter set; + const char *doc; + void *closure; +} PyGetSetDef; + +#ifndef Py_LIMITED_API +typedef PyObject *(*wrapperfunc)(PyObject *self, PyObject *args, + void *wrapped); + +typedef PyObject *(*wrapperfunc_kwds)(PyObject *self, PyObject *args, + void *wrapped, PyObject *kwds); + +struct wrapperbase { + const char *name; + int offset; + void *function; + wrapperfunc wrapper; + const char *doc; + int flags; + PyObject *name_strobj; +}; + +/* Flags for above struct */ +#define PyWrapperFlag_KEYWORDS 1 /* wrapper function takes keyword args */ + +/* Various kinds of descriptor objects */ + +typedef struct { + PyObject_HEAD + PyTypeObject *d_type; + PyObject *d_name; + PyObject *d_qualname; +} PyDescrObject; + +#define PyDescr_COMMON PyDescrObject d_common + +#define PyDescr_TYPE(x) (((PyDescrObject *)(x))->d_type) +#define PyDescr_NAME(x) (((PyDescrObject *)(x))->d_name) + +typedef struct { + PyDescr_COMMON; + PyMethodDef *d_method; + vectorcallfunc vectorcall; +} PyMethodDescrObject; + +typedef struct { + PyDescr_COMMON; + struct PyMemberDef *d_member; +} PyMemberDescrObject; + +typedef struct { + PyDescr_COMMON; + PyGetSetDef *d_getset; +} PyGetSetDescrObject; + +typedef struct { + PyDescr_COMMON; + struct wrapperbase *d_base; + void *d_wrapped; /* This can be any function pointer */ +} PyWrapperDescrObject; +#endif /* Py_LIMITED_API */ + +PyAPI_DATA(PyTypeObject) PyClassMethodDescr_Type; +PyAPI_DATA(PyTypeObject) PyGetSetDescr_Type; +PyAPI_DATA(PyTypeObject) PyMemberDescr_Type; +PyAPI_DATA(PyTypeObject) PyMethodDescr_Type; +PyAPI_DATA(PyTypeObject) PyWrapperDescr_Type; +PyAPI_DATA(PyTypeObject) PyDictProxy_Type; +#ifndef Py_LIMITED_API +PyAPI_DATA(PyTypeObject) _PyMethodWrapper_Type; +#endif /* Py_LIMITED_API */ + +PyAPI_FUNC(PyObject *) PyDescr_NewMethod(PyTypeObject *, PyMethodDef *); +PyAPI_FUNC(PyObject *) PyDescr_NewClassMethod(PyTypeObject *, PyMethodDef *); +struct PyMemberDef; /* forward declaration for following prototype */ +PyAPI_FUNC(PyObject *) PyDescr_NewMember(PyTypeObject *, + struct PyMemberDef *); +PyAPI_FUNC(PyObject *) PyDescr_NewGetSet(PyTypeObject *, + struct PyGetSetDef *); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) PyDescr_NewWrapper(PyTypeObject *, + struct wrapperbase *, void *); +PyAPI_FUNC(int) PyDescr_IsData(PyObject *); +#endif + +PyAPI_FUNC(PyObject *) PyDictProxy_New(PyObject *); +PyAPI_FUNC(PyObject *) PyWrapper_New(PyObject *, PyObject *); + + +PyAPI_DATA(PyTypeObject) PyProperty_Type; +#ifdef __cplusplus +} +#endif +#endif /* !Py_DESCROBJECT_H */ + diff --git a/ScriptEngine/third-party/backend/include/Python/dictobject.h b/ScriptEngine/third-party/backend/include/Python/dictobject.h new file mode 100644 index 0000000000..da5a36ba07 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/dictobject.h @@ -0,0 +1,97 @@ +#ifndef Py_DICTOBJECT_H +#define Py_DICTOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* Dictionary object type -- mapping from hashable object to object */ + +/* The distribution includes a separate file, Objects/dictnotes.txt, + describing explorations into dictionary design and optimization. + It covers typical dictionary use patterns, the parameters for + tuning dictionaries, and several ideas for possible optimizations. +*/ + +PyAPI_DATA(PyTypeObject) PyDict_Type; + +#define PyDict_Check(op) \ + PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_DICT_SUBCLASS) +#define PyDict_CheckExact(op) Py_IS_TYPE(op, &PyDict_Type) + +PyAPI_FUNC(PyObject *) PyDict_New(void); +PyAPI_FUNC(PyObject *) PyDict_GetItem(PyObject *mp, PyObject *key); +PyAPI_FUNC(PyObject *) PyDict_GetItemWithError(PyObject *mp, PyObject *key); +PyAPI_FUNC(int) PyDict_SetItem(PyObject *mp, PyObject *key, PyObject *item); +PyAPI_FUNC(int) PyDict_DelItem(PyObject *mp, PyObject *key); +PyAPI_FUNC(void) PyDict_Clear(PyObject *mp); +PyAPI_FUNC(int) PyDict_Next( + PyObject *mp, Py_ssize_t *pos, PyObject **key, PyObject **value); +PyAPI_FUNC(PyObject *) PyDict_Keys(PyObject *mp); +PyAPI_FUNC(PyObject *) PyDict_Values(PyObject *mp); +PyAPI_FUNC(PyObject *) PyDict_Items(PyObject *mp); +PyAPI_FUNC(Py_ssize_t) PyDict_Size(PyObject *mp); +PyAPI_FUNC(PyObject *) PyDict_Copy(PyObject *mp); +PyAPI_FUNC(int) PyDict_Contains(PyObject *mp, PyObject *key); + +/* PyDict_Update(mp, other) is equivalent to PyDict_Merge(mp, other, 1). */ +PyAPI_FUNC(int) PyDict_Update(PyObject *mp, PyObject *other); + +/* PyDict_Merge updates/merges from a mapping object (an object that + supports PyMapping_Keys() and PyObject_GetItem()). If override is true, + the last occurrence of a key wins, else the first. The Python + dict.update(other) is equivalent to PyDict_Merge(dict, other, 1). +*/ +PyAPI_FUNC(int) PyDict_Merge(PyObject *mp, + PyObject *other, + int override); + +/* PyDict_MergeFromSeq2 updates/merges from an iterable object producing + iterable objects of length 2. If override is true, the last occurrence + of a key wins, else the first. The Python dict constructor dict(seq2) + is equivalent to dict={}; PyDict_MergeFromSeq(dict, seq2, 1). +*/ +PyAPI_FUNC(int) PyDict_MergeFromSeq2(PyObject *d, + PyObject *seq2, + int override); + +PyAPI_FUNC(PyObject *) PyDict_GetItemString(PyObject *dp, const char *key); +PyAPI_FUNC(int) PyDict_SetItemString(PyObject *dp, const char *key, PyObject *item); +PyAPI_FUNC(int) PyDict_DelItemString(PyObject *dp, const char *key); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 +PyAPI_FUNC(PyObject *) PyObject_GenericGetDict(PyObject *, void *); +#endif + +/* Dictionary (keys, values, items) views */ + +PyAPI_DATA(PyTypeObject) PyDictKeys_Type; +PyAPI_DATA(PyTypeObject) PyDictValues_Type; +PyAPI_DATA(PyTypeObject) PyDictItems_Type; + +#define PyDictKeys_Check(op) PyObject_TypeCheck(op, &PyDictKeys_Type) +#define PyDictValues_Check(op) PyObject_TypeCheck(op, &PyDictValues_Type) +#define PyDictItems_Check(op) PyObject_TypeCheck(op, &PyDictItems_Type) +/* This excludes Values, since they are not sets. */ +# define PyDictViewSet_Check(op) \ + (PyDictKeys_Check(op) || PyDictItems_Check(op)) + +/* Dictionary (key, value, items) iterators */ + +PyAPI_DATA(PyTypeObject) PyDictIterKey_Type; +PyAPI_DATA(PyTypeObject) PyDictIterValue_Type; +PyAPI_DATA(PyTypeObject) PyDictIterItem_Type; + +PyAPI_DATA(PyTypeObject) PyDictRevIterKey_Type; +PyAPI_DATA(PyTypeObject) PyDictRevIterItem_Type; +PyAPI_DATA(PyTypeObject) PyDictRevIterValue_Type; + + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_DICTOBJECT_H +# include "cpython/dictobject.h" +# undef Py_CPYTHON_DICTOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_DICTOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/dynamic_annotations.h b/ScriptEngine/third-party/backend/include/Python/dynamic_annotations.h new file mode 100644 index 0000000000..4d4def9bf8 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/dynamic_annotations.h @@ -0,0 +1,499 @@ +/* Copyright (c) 2008-2009, Google Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Neither the name of Google Inc. nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * --- + * Author: Kostya Serebryany + * Copied to CPython by Jeffrey Yasskin, with all macros renamed to + * start with _Py_ to avoid colliding with users embedding Python, and + * with deprecated macros removed. + */ + +/* This file defines dynamic annotations for use with dynamic analysis + tool such as valgrind, PIN, etc. + + Dynamic annotation is a source code annotation that affects + the generated code (that is, the annotation is not a comment). + Each such annotation is attached to a particular + instruction and/or to a particular object (address) in the program. + + The annotations that should be used by users are macros in all upper-case + (e.g., _Py_ANNOTATE_NEW_MEMORY). + + Actual implementation of these macros may differ depending on the + dynamic analysis tool being used. + + See https://code.google.com/p/data-race-test/ for more information. + + This file supports the following dynamic analysis tools: + - None (DYNAMIC_ANNOTATIONS_ENABLED is not defined or zero). + Macros are defined empty. + - ThreadSanitizer, Helgrind, DRD (DYNAMIC_ANNOTATIONS_ENABLED is 1). + Macros are defined as calls to non-inlinable empty functions + that are intercepted by Valgrind. */ + +#ifndef __DYNAMIC_ANNOTATIONS_H__ +#define __DYNAMIC_ANNOTATIONS_H__ + +#ifndef DYNAMIC_ANNOTATIONS_ENABLED +# define DYNAMIC_ANNOTATIONS_ENABLED 0 +#endif + +#if DYNAMIC_ANNOTATIONS_ENABLED != 0 + + /* ------------------------------------------------------------- + Annotations useful when implementing condition variables such as CondVar, + using conditional critical sections (Await/LockWhen) and when constructing + user-defined synchronization mechanisms. + + The annotations _Py_ANNOTATE_HAPPENS_BEFORE() and + _Py_ANNOTATE_HAPPENS_AFTER() can be used to define happens-before arcs in + user-defined synchronization mechanisms: the race detector will infer an + arc from the former to the latter when they share the same argument + pointer. + + Example 1 (reference counting): + + void Unref() { + _Py_ANNOTATE_HAPPENS_BEFORE(&refcount_); + if (AtomicDecrementByOne(&refcount_) == 0) { + _Py_ANNOTATE_HAPPENS_AFTER(&refcount_); + delete this; + } + } + + Example 2 (message queue): + + void MyQueue::Put(Type *e) { + MutexLock lock(&mu_); + _Py_ANNOTATE_HAPPENS_BEFORE(e); + PutElementIntoMyQueue(e); + } + + Type *MyQueue::Get() { + MutexLock lock(&mu_); + Type *e = GetElementFromMyQueue(); + _Py_ANNOTATE_HAPPENS_AFTER(e); + return e; + } + + Note: when possible, please use the existing reference counting and message + queue implementations instead of inventing new ones. */ + + /* Report that wait on the condition variable at address "cv" has succeeded + and the lock at address "lock" is held. */ +#define _Py_ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) \ + AnnotateCondVarWait(__FILE__, __LINE__, cv, lock) + + /* Report that wait on the condition variable at "cv" has succeeded. Variant + w/o lock. */ +#define _Py_ANNOTATE_CONDVAR_WAIT(cv) \ + AnnotateCondVarWait(__FILE__, __LINE__, cv, NULL) + + /* Report that we are about to signal on the condition variable at address + "cv". */ +#define _Py_ANNOTATE_CONDVAR_SIGNAL(cv) \ + AnnotateCondVarSignal(__FILE__, __LINE__, cv) + + /* Report that we are about to signal_all on the condition variable at "cv". */ +#define _Py_ANNOTATE_CONDVAR_SIGNAL_ALL(cv) \ + AnnotateCondVarSignalAll(__FILE__, __LINE__, cv) + + /* Annotations for user-defined synchronization mechanisms. */ +#define _Py_ANNOTATE_HAPPENS_BEFORE(obj) _Py_ANNOTATE_CONDVAR_SIGNAL(obj) +#define _Py_ANNOTATE_HAPPENS_AFTER(obj) _Py_ANNOTATE_CONDVAR_WAIT(obj) + + /* Report that the bytes in the range [pointer, pointer+size) are about + to be published safely. The race checker will create a happens-before + arc from the call _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) to + subsequent accesses to this memory. + Note: this annotation may not work properly if the race detector uses + sampling, i.e. does not observe all memory accesses. + */ +#define _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(pointer, size) \ + AnnotatePublishMemoryRange(__FILE__, __LINE__, pointer, size) + + /* Instruct the tool to create a happens-before arc between mu->Unlock() and + mu->Lock(). This annotation may slow down the race detector and hide real + races. Normally it is used only when it would be difficult to annotate each + of the mutex's critical sections individually using the annotations above. + This annotation makes sense only for hybrid race detectors. For pure + happens-before detectors this is a no-op. For more details see + https://code.google.com/p/data-race-test/wiki/PureHappensBeforeVsHybrid . */ +#define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) \ + AnnotateMutexIsUsedAsCondVar(__FILE__, __LINE__, mu) + + /* ------------------------------------------------------------- + Annotations useful when defining memory allocators, or when memory that + was protected in one way starts to be protected in another. */ + + /* Report that a new memory at "address" of size "size" has been allocated. + This might be used when the memory has been retrieved from a free list and + is about to be reused, or when the locking discipline for a variable + changes. */ +#define _Py_ANNOTATE_NEW_MEMORY(address, size) \ + AnnotateNewMemory(__FILE__, __LINE__, address, size) + + /* ------------------------------------------------------------- + Annotations useful when defining FIFO queues that transfer data between + threads. */ + + /* Report that the producer-consumer queue (such as ProducerConsumerQueue) at + address "pcq" has been created. The _Py_ANNOTATE_PCQ_* annotations should + be used only for FIFO queues. For non-FIFO queues use + _Py_ANNOTATE_HAPPENS_BEFORE (for put) and _Py_ANNOTATE_HAPPENS_AFTER (for + get). */ +#define _Py_ANNOTATE_PCQ_CREATE(pcq) \ + AnnotatePCQCreate(__FILE__, __LINE__, pcq) + + /* Report that the queue at address "pcq" is about to be destroyed. */ +#define _Py_ANNOTATE_PCQ_DESTROY(pcq) \ + AnnotatePCQDestroy(__FILE__, __LINE__, pcq) + + /* Report that we are about to put an element into a FIFO queue at address + "pcq". */ +#define _Py_ANNOTATE_PCQ_PUT(pcq) \ + AnnotatePCQPut(__FILE__, __LINE__, pcq) + + /* Report that we've just got an element from a FIFO queue at address "pcq". */ +#define _Py_ANNOTATE_PCQ_GET(pcq) \ + AnnotatePCQGet(__FILE__, __LINE__, pcq) + + /* ------------------------------------------------------------- + Annotations that suppress errors. It is usually better to express the + program's synchronization using the other annotations, but these can + be used when all else fails. */ + + /* Report that we may have a benign race at "pointer", with size + "sizeof(*(pointer))". "pointer" must be a non-void* pointer. Insert at the + point where "pointer" has been allocated, preferably close to the point + where the race happens. See also _Py_ANNOTATE_BENIGN_RACE_STATIC. */ +#define _Py_ANNOTATE_BENIGN_RACE(pointer, description) \ + AnnotateBenignRaceSized(__FILE__, __LINE__, pointer, \ + sizeof(*(pointer)), description) + + /* Same as _Py_ANNOTATE_BENIGN_RACE(address, description), but applies to + the memory range [address, address+size). */ +#define _Py_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) \ + AnnotateBenignRaceSized(__FILE__, __LINE__, address, size, description) + + /* Request the analysis tool to ignore all reads in the current thread + until _Py_ANNOTATE_IGNORE_READS_END is called. + Useful to ignore intentional racey reads, while still checking + other reads and all writes. + See also _Py_ANNOTATE_UNPROTECTED_READ. */ +#define _Py_ANNOTATE_IGNORE_READS_BEGIN() \ + AnnotateIgnoreReadsBegin(__FILE__, __LINE__) + + /* Stop ignoring reads. */ +#define _Py_ANNOTATE_IGNORE_READS_END() \ + AnnotateIgnoreReadsEnd(__FILE__, __LINE__) + + /* Similar to _Py_ANNOTATE_IGNORE_READS_BEGIN, but ignore writes. */ +#define _Py_ANNOTATE_IGNORE_WRITES_BEGIN() \ + AnnotateIgnoreWritesBegin(__FILE__, __LINE__) + + /* Stop ignoring writes. */ +#define _Py_ANNOTATE_IGNORE_WRITES_END() \ + AnnotateIgnoreWritesEnd(__FILE__, __LINE__) + + /* Start ignoring all memory accesses (reads and writes). */ +#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() \ + do {\ + _Py_ANNOTATE_IGNORE_READS_BEGIN();\ + _Py_ANNOTATE_IGNORE_WRITES_BEGIN();\ + }while(0)\ + + /* Stop ignoring all memory accesses. */ +#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_END() \ + do {\ + _Py_ANNOTATE_IGNORE_WRITES_END();\ + _Py_ANNOTATE_IGNORE_READS_END();\ + }while(0)\ + + /* Similar to _Py_ANNOTATE_IGNORE_READS_BEGIN, but ignore synchronization events: + RWLOCK* and CONDVAR*. */ +#define _Py_ANNOTATE_IGNORE_SYNC_BEGIN() \ + AnnotateIgnoreSyncBegin(__FILE__, __LINE__) + + /* Stop ignoring sync events. */ +#define _Py_ANNOTATE_IGNORE_SYNC_END() \ + AnnotateIgnoreSyncEnd(__FILE__, __LINE__) + + + /* Enable (enable!=0) or disable (enable==0) race detection for all threads. + This annotation could be useful if you want to skip expensive race analysis + during some period of program execution, e.g. during initialization. */ +#define _Py_ANNOTATE_ENABLE_RACE_DETECTION(enable) \ + AnnotateEnableRaceDetection(__FILE__, __LINE__, enable) + + /* ------------------------------------------------------------- + Annotations useful for debugging. */ + + /* Request to trace every access to "address". */ +#define _Py_ANNOTATE_TRACE_MEMORY(address) \ + AnnotateTraceMemory(__FILE__, __LINE__, address) + + /* Report the current thread name to a race detector. */ +#define _Py_ANNOTATE_THREAD_NAME(name) \ + AnnotateThreadName(__FILE__, __LINE__, name) + + /* ------------------------------------------------------------- + Annotations useful when implementing locks. They are not + normally needed by modules that merely use locks. + The "lock" argument is a pointer to the lock object. */ + + /* Report that a lock has been created at address "lock". */ +#define _Py_ANNOTATE_RWLOCK_CREATE(lock) \ + AnnotateRWLockCreate(__FILE__, __LINE__, lock) + + /* Report that the lock at address "lock" is about to be destroyed. */ +#define _Py_ANNOTATE_RWLOCK_DESTROY(lock) \ + AnnotateRWLockDestroy(__FILE__, __LINE__, lock) + + /* Report that the lock at address "lock" has been acquired. + is_w=1 for writer lock, is_w=0 for reader lock. */ +#define _Py_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) \ + AnnotateRWLockAcquired(__FILE__, __LINE__, lock, is_w) + + /* Report that the lock at address "lock" is about to be released. */ +#define _Py_ANNOTATE_RWLOCK_RELEASED(lock, is_w) \ + AnnotateRWLockReleased(__FILE__, __LINE__, lock, is_w) + + /* ------------------------------------------------------------- + Annotations useful when implementing barriers. They are not + normally needed by modules that merely use barriers. + The "barrier" argument is a pointer to the barrier object. */ + + /* Report that the "barrier" has been initialized with initial "count". + If 'reinitialization_allowed' is true, initialization is allowed to happen + multiple times w/o calling barrier_destroy() */ +#define _Py_ANNOTATE_BARRIER_INIT(barrier, count, reinitialization_allowed) \ + AnnotateBarrierInit(__FILE__, __LINE__, barrier, count, \ + reinitialization_allowed) + + /* Report that we are about to enter barrier_wait("barrier"). */ +#define _Py_ANNOTATE_BARRIER_WAIT_BEFORE(barrier) \ + AnnotateBarrierWaitBefore(__FILE__, __LINE__, barrier) + + /* Report that we just exited barrier_wait("barrier"). */ +#define _Py_ANNOTATE_BARRIER_WAIT_AFTER(barrier) \ + AnnotateBarrierWaitAfter(__FILE__, __LINE__, barrier) + + /* Report that the "barrier" has been destroyed. */ +#define _Py_ANNOTATE_BARRIER_DESTROY(barrier) \ + AnnotateBarrierDestroy(__FILE__, __LINE__, barrier) + + /* ------------------------------------------------------------- + Annotations useful for testing race detectors. */ + + /* Report that we expect a race on the variable at "address". + Use only in unit tests for a race detector. */ +#define _Py_ANNOTATE_EXPECT_RACE(address, description) \ + AnnotateExpectRace(__FILE__, __LINE__, address, description) + + /* A no-op. Insert where you like to test the interceptors. */ +#define _Py_ANNOTATE_NO_OP(arg) \ + AnnotateNoOp(__FILE__, __LINE__, arg) + + /* Force the race detector to flush its state. The actual effect depends on + * the implementation of the detector. */ +#define _Py_ANNOTATE_FLUSH_STATE() \ + AnnotateFlushState(__FILE__, __LINE__) + + +#else /* DYNAMIC_ANNOTATIONS_ENABLED == 0 */ + +#define _Py_ANNOTATE_RWLOCK_CREATE(lock) /* empty */ +#define _Py_ANNOTATE_RWLOCK_DESTROY(lock) /* empty */ +#define _Py_ANNOTATE_RWLOCK_ACQUIRED(lock, is_w) /* empty */ +#define _Py_ANNOTATE_RWLOCK_RELEASED(lock, is_w) /* empty */ +#define _Py_ANNOTATE_BARRIER_INIT(barrier, count, reinitialization_allowed) /* */ +#define _Py_ANNOTATE_BARRIER_WAIT_BEFORE(barrier) /* empty */ +#define _Py_ANNOTATE_BARRIER_WAIT_AFTER(barrier) /* empty */ +#define _Py_ANNOTATE_BARRIER_DESTROY(barrier) /* empty */ +#define _Py_ANNOTATE_CONDVAR_LOCK_WAIT(cv, lock) /* empty */ +#define _Py_ANNOTATE_CONDVAR_WAIT(cv) /* empty */ +#define _Py_ANNOTATE_CONDVAR_SIGNAL(cv) /* empty */ +#define _Py_ANNOTATE_CONDVAR_SIGNAL_ALL(cv) /* empty */ +#define _Py_ANNOTATE_HAPPENS_BEFORE(obj) /* empty */ +#define _Py_ANNOTATE_HAPPENS_AFTER(obj) /* empty */ +#define _Py_ANNOTATE_PUBLISH_MEMORY_RANGE(address, size) /* empty */ +#define _Py_ANNOTATE_UNPUBLISH_MEMORY_RANGE(address, size) /* empty */ +#define _Py_ANNOTATE_SWAP_MEMORY_RANGE(address, size) /* empty */ +#define _Py_ANNOTATE_PCQ_CREATE(pcq) /* empty */ +#define _Py_ANNOTATE_PCQ_DESTROY(pcq) /* empty */ +#define _Py_ANNOTATE_PCQ_PUT(pcq) /* empty */ +#define _Py_ANNOTATE_PCQ_GET(pcq) /* empty */ +#define _Py_ANNOTATE_NEW_MEMORY(address, size) /* empty */ +#define _Py_ANNOTATE_EXPECT_RACE(address, description) /* empty */ +#define _Py_ANNOTATE_BENIGN_RACE(address, description) /* empty */ +#define _Py_ANNOTATE_BENIGN_RACE_SIZED(address, size, description) /* empty */ +#define _Py_ANNOTATE_PURE_HAPPENS_BEFORE_MUTEX(mu) /* empty */ +#define _Py_ANNOTATE_MUTEX_IS_USED_AS_CONDVAR(mu) /* empty */ +#define _Py_ANNOTATE_TRACE_MEMORY(arg) /* empty */ +#define _Py_ANNOTATE_THREAD_NAME(name) /* empty */ +#define _Py_ANNOTATE_IGNORE_READS_BEGIN() /* empty */ +#define _Py_ANNOTATE_IGNORE_READS_END() /* empty */ +#define _Py_ANNOTATE_IGNORE_WRITES_BEGIN() /* empty */ +#define _Py_ANNOTATE_IGNORE_WRITES_END() /* empty */ +#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_BEGIN() /* empty */ +#define _Py_ANNOTATE_IGNORE_READS_AND_WRITES_END() /* empty */ +#define _Py_ANNOTATE_IGNORE_SYNC_BEGIN() /* empty */ +#define _Py_ANNOTATE_IGNORE_SYNC_END() /* empty */ +#define _Py_ANNOTATE_ENABLE_RACE_DETECTION(enable) /* empty */ +#define _Py_ANNOTATE_NO_OP(arg) /* empty */ +#define _Py_ANNOTATE_FLUSH_STATE() /* empty */ + +#endif /* DYNAMIC_ANNOTATIONS_ENABLED */ + +/* Use the macros above rather than using these functions directly. */ +#ifdef __cplusplus +extern "C" { +#endif +void AnnotateRWLockCreate(const char *file, int line, + const volatile void *lock); +void AnnotateRWLockDestroy(const char *file, int line, + const volatile void *lock); +void AnnotateRWLockAcquired(const char *file, int line, + const volatile void *lock, long is_w); +void AnnotateRWLockReleased(const char *file, int line, + const volatile void *lock, long is_w); +void AnnotateBarrierInit(const char *file, int line, + const volatile void *barrier, long count, + long reinitialization_allowed); +void AnnotateBarrierWaitBefore(const char *file, int line, + const volatile void *barrier); +void AnnotateBarrierWaitAfter(const char *file, int line, + const volatile void *barrier); +void AnnotateBarrierDestroy(const char *file, int line, + const volatile void *barrier); +void AnnotateCondVarWait(const char *file, int line, + const volatile void *cv, + const volatile void *lock); +void AnnotateCondVarSignal(const char *file, int line, + const volatile void *cv); +void AnnotateCondVarSignalAll(const char *file, int line, + const volatile void *cv); +void AnnotatePublishMemoryRange(const char *file, int line, + const volatile void *address, + long size); +void AnnotateUnpublishMemoryRange(const char *file, int line, + const volatile void *address, + long size); +void AnnotatePCQCreate(const char *file, int line, + const volatile void *pcq); +void AnnotatePCQDestroy(const char *file, int line, + const volatile void *pcq); +void AnnotatePCQPut(const char *file, int line, + const volatile void *pcq); +void AnnotatePCQGet(const char *file, int line, + const volatile void *pcq); +void AnnotateNewMemory(const char *file, int line, + const volatile void *address, + long size); +void AnnotateExpectRace(const char *file, int line, + const volatile void *address, + const char *description); +void AnnotateBenignRace(const char *file, int line, + const volatile void *address, + const char *description); +void AnnotateBenignRaceSized(const char *file, int line, + const volatile void *address, + long size, + const char *description); +void AnnotateMutexIsUsedAsCondVar(const char *file, int line, + const volatile void *mu); +void AnnotateTraceMemory(const char *file, int line, + const volatile void *arg); +void AnnotateThreadName(const char *file, int line, + const char *name); +void AnnotateIgnoreReadsBegin(const char *file, int line); +void AnnotateIgnoreReadsEnd(const char *file, int line); +void AnnotateIgnoreWritesBegin(const char *file, int line); +void AnnotateIgnoreWritesEnd(const char *file, int line); +void AnnotateEnableRaceDetection(const char *file, int line, int enable); +void AnnotateNoOp(const char *file, int line, + const volatile void *arg); +void AnnotateFlushState(const char *file, int line); + +/* Return non-zero value if running under valgrind. + + If "valgrind.h" is included into dynamic_annotations.c, + the regular valgrind mechanism will be used. + See http://valgrind.org/docs/manual/manual-core-adv.html about + RUNNING_ON_VALGRIND and other valgrind "client requests". + The file "valgrind.h" may be obtained by doing + svn co svn://svn.valgrind.org/valgrind/trunk/include + + If for some reason you can't use "valgrind.h" or want to fake valgrind, + there are two ways to make this function return non-zero: + - Use environment variable: export RUNNING_ON_VALGRIND=1 + - Make your tool intercept the function RunningOnValgrind() and + change its return value. + */ +int RunningOnValgrind(void); + +#ifdef __cplusplus +} +#endif + +#if DYNAMIC_ANNOTATIONS_ENABLED != 0 && defined(__cplusplus) + + /* _Py_ANNOTATE_UNPROTECTED_READ is the preferred way to annotate racey reads. + + Instead of doing + _Py_ANNOTATE_IGNORE_READS_BEGIN(); + ... = x; + _Py_ANNOTATE_IGNORE_READS_END(); + one can use + ... = _Py_ANNOTATE_UNPROTECTED_READ(x); */ + template + inline T _Py_ANNOTATE_UNPROTECTED_READ(const volatile T &x) { + _Py_ANNOTATE_IGNORE_READS_BEGIN(); + T res = x; + _Py_ANNOTATE_IGNORE_READS_END(); + return res; + } + /* Apply _Py_ANNOTATE_BENIGN_RACE_SIZED to a static variable. */ +#define _Py_ANNOTATE_BENIGN_RACE_STATIC(static_var, description) \ + namespace { \ + class static_var ## _annotator { \ + public: \ + static_var ## _annotator() { \ + _Py_ANNOTATE_BENIGN_RACE_SIZED(&static_var, \ + sizeof(static_var), \ + # static_var ": " description); \ + } \ + }; \ + static static_var ## _annotator the ## static_var ## _annotator;\ + } +#else /* DYNAMIC_ANNOTATIONS_ENABLED == 0 */ + +#define _Py_ANNOTATE_UNPROTECTED_READ(x) (x) +#define _Py_ANNOTATE_BENIGN_RACE_STATIC(static_var, description) /* empty */ + +#endif /* DYNAMIC_ANNOTATIONS_ENABLED */ + +#endif /* __DYNAMIC_ANNOTATIONS_H__ */ diff --git a/ScriptEngine/third-party/backend/include/Python/enumobject.h b/ScriptEngine/third-party/backend/include/Python/enumobject.h new file mode 100644 index 0000000000..c14dbfc8c3 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/enumobject.h @@ -0,0 +1,17 @@ +#ifndef Py_ENUMOBJECT_H +#define Py_ENUMOBJECT_H + +/* Enumerate Object */ + +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(PyTypeObject) PyEnum_Type; +PyAPI_DATA(PyTypeObject) PyReversed_Type; + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_ENUMOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/errcode.h b/ScriptEngine/third-party/backend/include/Python/errcode.h new file mode 100644 index 0000000000..54ae929bf2 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/errcode.h @@ -0,0 +1,38 @@ +#ifndef Py_ERRCODE_H +#define Py_ERRCODE_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* Error codes passed around between file input, tokenizer, parser and + interpreter. This is necessary so we can turn them into Python + exceptions at a higher level. Note that some errors have a + slightly different meaning when passed from the tokenizer to the + parser than when passed from the parser to the interpreter; e.g. + the parser only returns E_EOF when it hits EOF immediately, and it + never returns E_OK. */ + +#define E_OK 10 /* No error */ +#define E_EOF 11 /* End Of File */ +#define E_INTR 12 /* Interrupted */ +#define E_TOKEN 13 /* Bad token */ +#define E_SYNTAX 14 /* Syntax error */ +#define E_NOMEM 15 /* Ran out of memory */ +#define E_DONE 16 /* Parsing complete */ +#define E_ERROR 17 /* Execution error */ +#define E_TABSPACE 18 /* Inconsistent mixing of tabs and spaces */ +#define E_OVERFLOW 19 /* Node had too many children */ +#define E_TOODEEP 20 /* Too many indentation levels */ +#define E_DEDENT 21 /* No matching outer block for dedent */ +#define E_DECODE 22 /* Error in decoding into Unicode */ +#define E_EOFS 23 /* EOF in triple-quoted string */ +#define E_EOLS 24 /* EOL in single-quoted string */ +#define E_LINECONT 25 /* Unexpected characters after a line continuation */ +#define E_BADSINGLE 27 /* Ill-formed single statement input */ +#define E_INTERACT_STOP 28 /* Interactive mode stopped tokenization */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_ERRCODE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/eval.h b/ScriptEngine/third-party/backend/include/Python/eval.h new file mode 100644 index 0000000000..eda28df8f6 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/eval.h @@ -0,0 +1,27 @@ + +/* Interface to execute compiled code */ + +#ifndef Py_EVAL_H +#define Py_EVAL_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(PyObject *) PyEval_EvalCode(PyObject *, PyObject *, PyObject *); + +PyAPI_FUNC(PyObject *) PyEval_EvalCodeEx(PyObject *co, + PyObject *globals, + PyObject *locals, + PyObject *const *args, int argc, + PyObject *const *kwds, int kwdc, + PyObject *const *defs, int defc, + PyObject *kwdefs, PyObject *closure); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyEval_CallTracing(PyObject *func, PyObject *args); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_EVAL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/exports.h b/ScriptEngine/third-party/backend/include/Python/exports.h new file mode 100644 index 0000000000..fc1a5c5ead --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/exports.h @@ -0,0 +1,30 @@ +#ifndef Py_EXPORTS_H +#define Py_EXPORTS_H + +#if defined(_WIN32) || defined(__CYGWIN__) + #define Py_IMPORTED_SYMBOL __declspec(dllimport) + #define Py_EXPORTED_SYMBOL __declspec(dllexport) + #define Py_LOCAL_SYMBOL +#else +/* + * If we only ever used gcc >= 5, we could use __has_attribute(visibility) + * as a cross-platform way to determine if visibility is supported. However, + * we may still need to support gcc >= 4, as some Ubuntu LTS and Centos versions + * have 4 < gcc < 5. + */ + #ifndef __has_attribute + #define __has_attribute(x) 0 // Compatibility with non-clang compilers. + #endif + #if (defined(__GNUC__) && (__GNUC__ >= 4)) ||\ + (defined(__clang__) && __has_attribute(visibility)) + #define Py_IMPORTED_SYMBOL __attribute__ ((visibility ("default"))) + #define Py_EXPORTED_SYMBOL __attribute__ ((visibility ("default"))) + #define Py_LOCAL_SYMBOL __attribute__ ((visibility ("hidden"))) + #else + #define Py_IMPORTED_SYMBOL + #define Py_EXPORTED_SYMBOL + #define Py_LOCAL_SYMBOL + #endif +#endif + +#endif /* Py_EXPORTS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/fileobject.h b/ScriptEngine/third-party/backend/include/Python/fileobject.h new file mode 100644 index 0000000000..6ec2994aa8 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/fileobject.h @@ -0,0 +1,49 @@ +/* File object interface (what's left of it -- see io.py) */ + +#ifndef Py_FILEOBJECT_H +#define Py_FILEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#define PY_STDIOTEXTMODE "b" + +PyAPI_FUNC(PyObject *) PyFile_FromFd(int, const char *, const char *, int, + const char *, const char *, + const char *, int); +PyAPI_FUNC(PyObject *) PyFile_GetLine(PyObject *, int); +PyAPI_FUNC(int) PyFile_WriteObject(PyObject *, PyObject *, int); +PyAPI_FUNC(int) PyFile_WriteString(const char *, PyObject *); +PyAPI_FUNC(int) PyObject_AsFileDescriptor(PyObject *); + +/* The default encoding used by the platform file system APIs + If non-NULL, this is different than the default encoding for strings +*/ +PyAPI_DATA(const char *) Py_FileSystemDefaultEncoding; +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 +PyAPI_DATA(const char *) Py_FileSystemDefaultEncodeErrors; +#endif +PyAPI_DATA(int) Py_HasFileSystemDefaultEncoding; + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000 +PyAPI_DATA(int) Py_UTF8Mode; +#endif + +/* A routine to check if a file descriptor can be select()-ed. */ +#ifdef _MSC_VER + /* On Windows, any socket fd can be select()-ed, no matter how high */ + #define _PyIsSelectable_fd(FD) (1) +#else + #define _PyIsSelectable_fd(FD) ((unsigned int)(FD) < (unsigned int)FD_SETSIZE) +#endif + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_FILEOBJECT_H +# include "cpython/fileobject.h" +# undef Py_CPYTHON_FILEOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_FILEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/fileutils.h b/ScriptEngine/third-party/backend/include/Python/fileutils.h new file mode 100644 index 0000000000..16f3b635de --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/fileutils.h @@ -0,0 +1,26 @@ +#ifndef Py_FILEUTILS_H +#define Py_FILEUTILS_H +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +PyAPI_FUNC(wchar_t *) Py_DecodeLocale( + const char *arg, + size_t *size); + +PyAPI_FUNC(char*) Py_EncodeLocale( + const wchar_t *text, + size_t *error_pos); +#endif + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_FILEUTILS_H +# include "cpython/fileutils.h" +# undef Py_CPYTHON_FILEUTILS_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_FILEUTILS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/floatobject.h b/ScriptEngine/third-party/backend/include/Python/floatobject.h new file mode 100644 index 0000000000..e994aa8f29 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/floatobject.h @@ -0,0 +1,118 @@ + +/* Float object interface */ + +/* +PyFloatObject represents a (double precision) floating point number. +*/ + +#ifndef Py_FLOATOBJECT_H +#define Py_FLOATOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +typedef struct { + PyObject_HEAD + double ob_fval; +} PyFloatObject; +#endif + +PyAPI_DATA(PyTypeObject) PyFloat_Type; + +#define PyFloat_Check(op) PyObject_TypeCheck(op, &PyFloat_Type) +#define PyFloat_CheckExact(op) Py_IS_TYPE(op, &PyFloat_Type) + +#ifdef Py_NAN +#define Py_RETURN_NAN return PyFloat_FromDouble(Py_NAN) +#endif + +#define Py_RETURN_INF(sign) do \ + if (copysign(1., sign) == 1.) { \ + return PyFloat_FromDouble(Py_HUGE_VAL); \ + } else { \ + return PyFloat_FromDouble(-Py_HUGE_VAL); \ + } while(0) + +PyAPI_FUNC(double) PyFloat_GetMax(void); +PyAPI_FUNC(double) PyFloat_GetMin(void); +PyAPI_FUNC(PyObject *) PyFloat_GetInfo(void); + +/* Return Python float from string PyObject. */ +PyAPI_FUNC(PyObject *) PyFloat_FromString(PyObject*); + +/* Return Python float from C double. */ +PyAPI_FUNC(PyObject *) PyFloat_FromDouble(double); + +/* Extract C double from Python float. The macro version trades safety for + speed. */ +PyAPI_FUNC(double) PyFloat_AsDouble(PyObject *); +#ifndef Py_LIMITED_API +#define PyFloat_AS_DOUBLE(op) (((PyFloatObject *)(op))->ob_fval) +#endif + +#ifndef Py_LIMITED_API +/* _PyFloat_{Pack,Unpack}{4,8} + * + * The struct and pickle (at least) modules need an efficient platform- + * independent way to store floating-point values as byte strings. + * The Pack routines produce a string from a C double, and the Unpack + * routines produce a C double from such a string. The suffix (4 or 8) + * specifies the number of bytes in the string. + * + * On platforms that appear to use (see _PyFloat_Init()) IEEE-754 formats + * these functions work by copying bits. On other platforms, the formats the + * 4- byte format is identical to the IEEE-754 single precision format, and + * the 8-byte format to the IEEE-754 double precision format, although the + * packing of INFs and NaNs (if such things exist on the platform) isn't + * handled correctly, and attempting to unpack a string containing an IEEE + * INF or NaN will raise an exception. + * + * On non-IEEE platforms with more precision, or larger dynamic range, than + * 754 supports, not all values can be packed; on non-IEEE platforms with less + * precision, or smaller dynamic range, not all values can be unpacked. What + * happens in such cases is partly accidental (alas). + */ + +/* The pack routines write 2, 4 or 8 bytes, starting at p. le is a bool + * argument, true if you want the string in little-endian format (exponent + * last, at p+1, p+3 or p+7), false if you want big-endian format (exponent + * first, at p). + * Return value: 0 if all is OK, -1 if error (and an exception is + * set, most likely OverflowError). + * There are two problems on non-IEEE platforms: + * 1): What this does is undefined if x is a NaN or infinity. + * 2): -0.0 and +0.0 produce the same string. + */ +PyAPI_FUNC(int) _PyFloat_Pack2(double x, unsigned char *p, int le); +PyAPI_FUNC(int) _PyFloat_Pack4(double x, unsigned char *p, int le); +PyAPI_FUNC(int) _PyFloat_Pack8(double x, unsigned char *p, int le); + +/* The unpack routines read 2, 4 or 8 bytes, starting at p. le is a bool + * argument, true if the string is in little-endian format (exponent + * last, at p+1, p+3 or p+7), false if big-endian (exponent first, at p). + * Return value: The unpacked double. On error, this is -1.0 and + * PyErr_Occurred() is true (and an exception is set, most likely + * OverflowError). Note that on a non-IEEE platform this will refuse + * to unpack a string that represents a NaN or infinity. + */ +PyAPI_FUNC(double) _PyFloat_Unpack2(const unsigned char *p, int le); +PyAPI_FUNC(double) _PyFloat_Unpack4(const unsigned char *p, int le); +PyAPI_FUNC(double) _PyFloat_Unpack8(const unsigned char *p, int le); + +PyAPI_FUNC(void) _PyFloat_DebugMallocStats(FILE* out); + +/* Format the object based on the format_spec, as defined in PEP 3101 + (Advanced String Formatting). */ +PyAPI_FUNC(int) _PyFloat_FormatAdvancedWriter( + _PyUnicodeWriter *writer, + PyObject *obj, + PyObject *format_spec, + Py_ssize_t start, + Py_ssize_t end); +#endif /* Py_LIMITED_API */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_FLOATOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/frameobject.h b/ScriptEngine/third-party/backend/include/Python/frameobject.h new file mode 100644 index 0000000000..c118af1201 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/frameobject.h @@ -0,0 +1,20 @@ +/* Frame object interface */ + +#ifndef Py_FRAMEOBJECT_H +#define Py_FRAMEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#include "pyframe.h" + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_FRAMEOBJECT_H +# include "cpython/frameobject.h" +# undef Py_CPYTHON_FRAMEOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_FRAMEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/funcobject.h b/ScriptEngine/third-party/backend/include/Python/funcobject.h new file mode 100644 index 0000000000..d7acd18c65 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/funcobject.h @@ -0,0 +1,110 @@ + +/* Function object interface */ +#ifndef Py_LIMITED_API +#ifndef Py_FUNCOBJECT_H +#define Py_FUNCOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + + +#define COMMON_FIELDS(PREFIX) \ + PyObject *PREFIX ## globals; \ + PyObject *PREFIX ## builtins; \ + PyObject *PREFIX ## name; \ + PyObject *PREFIX ## qualname; \ + PyObject *PREFIX ## code; /* A code object, the __code__ attribute */ \ + PyObject *PREFIX ## defaults; /* NULL or a tuple */ \ + PyObject *PREFIX ## kwdefaults; /* NULL or a dict */ \ + PyObject *PREFIX ## closure; /* NULL or a tuple of cell objects */ + +typedef struct { + COMMON_FIELDS(fc_) +} PyFrameConstructor; + +/* Function objects and code objects should not be confused with each other: + * + * Function objects are created by the execution of the 'def' statement. + * They reference a code object in their __code__ attribute, which is a + * purely syntactic object, i.e. nothing more than a compiled version of some + * source code lines. There is one code object per source code "fragment", + * but each code object can be referenced by zero or many function objects + * depending only on how many times the 'def' statement in the source was + * executed so far. + */ + +typedef struct { + PyObject_HEAD + COMMON_FIELDS(func_) + PyObject *func_doc; /* The __doc__ attribute, can be anything */ + PyObject *func_dict; /* The __dict__ attribute, a dict or NULL */ + PyObject *func_weakreflist; /* List of weak references */ + PyObject *func_module; /* The __module__ attribute, can be anything */ + PyObject *func_annotations; /* Annotations, a dict or NULL */ + vectorcallfunc vectorcall; + + /* Invariant: + * func_closure contains the bindings for func_code->co_freevars, so + * PyTuple_Size(func_closure) == PyCode_GetNumFree(func_code) + * (func_closure may be NULL if PyCode_GetNumFree(func_code) == 0). + */ +} PyFunctionObject; + +PyAPI_DATA(PyTypeObject) PyFunction_Type; + +#define PyFunction_Check(op) Py_IS_TYPE(op, &PyFunction_Type) + +PyAPI_FUNC(PyObject *) PyFunction_New(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_NewWithQualName(PyObject *, PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetCode(PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetGlobals(PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetModule(PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetDefaults(PyObject *); +PyAPI_FUNC(int) PyFunction_SetDefaults(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetKwDefaults(PyObject *); +PyAPI_FUNC(int) PyFunction_SetKwDefaults(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetClosure(PyObject *); +PyAPI_FUNC(int) PyFunction_SetClosure(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyFunction_GetAnnotations(PyObject *); +PyAPI_FUNC(int) PyFunction_SetAnnotations(PyObject *, PyObject *); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyFunction_Vectorcall( + PyObject *func, + PyObject *const *stack, + size_t nargsf, + PyObject *kwnames); +#endif + +/* Macros for direct access to these values. Type checks are *not* + done, so use with care. */ +#define PyFunction_GET_CODE(func) \ + (((PyFunctionObject *)func) -> func_code) +#define PyFunction_GET_GLOBALS(func) \ + (((PyFunctionObject *)func) -> func_globals) +#define PyFunction_GET_MODULE(func) \ + (((PyFunctionObject *)func) -> func_module) +#define PyFunction_GET_DEFAULTS(func) \ + (((PyFunctionObject *)func) -> func_defaults) +#define PyFunction_GET_KW_DEFAULTS(func) \ + (((PyFunctionObject *)func) -> func_kwdefaults) +#define PyFunction_GET_CLOSURE(func) \ + (((PyFunctionObject *)func) -> func_closure) +#define PyFunction_GET_ANNOTATIONS(func) \ + (((PyFunctionObject *)func) -> func_annotations) + +#define PyFunction_AS_FRAME_CONSTRUCTOR(func) \ + ((PyFrameConstructor *)&((PyFunctionObject *)(func))->func_globals) + +/* The classmethod and staticmethod types lives here, too */ +PyAPI_DATA(PyTypeObject) PyClassMethod_Type; +PyAPI_DATA(PyTypeObject) PyStaticMethod_Type; + +PyAPI_FUNC(PyObject *) PyClassMethod_New(PyObject *); +PyAPI_FUNC(PyObject *) PyStaticMethod_New(PyObject *); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_FUNCOBJECT_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/genericaliasobject.h b/ScriptEngine/third-party/backend/include/Python/genericaliasobject.h new file mode 100644 index 0000000000..cf002976b2 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/genericaliasobject.h @@ -0,0 +1,14 @@ +// Implementation of PEP 585: support list[int] etc. +#ifndef Py_GENERICALIASOBJECT_H +#define Py_GENERICALIASOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(PyObject *) Py_GenericAlias(PyObject *, PyObject *); +PyAPI_DATA(PyTypeObject) Py_GenericAliasType; + +#ifdef __cplusplus +} +#endif +#endif /* !Py_GENERICALIASOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/genobject.h b/ScriptEngine/third-party/backend/include/Python/genobject.h new file mode 100644 index 0000000000..e965334a01 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/genobject.h @@ -0,0 +1,100 @@ + +/* Generator object interface */ + +#ifndef Py_LIMITED_API +#ifndef Py_GENOBJECT_H +#define Py_GENOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#include "pystate.h" /* _PyErr_StackItem */ +#include "abstract.h" /* PySendResult */ + +/* _PyGenObject_HEAD defines the initial segment of generator + and coroutine objects. */ +#define _PyGenObject_HEAD(prefix) \ + PyObject_HEAD \ + /* Note: gi_frame can be NULL if the generator is "finished" */ \ + PyFrameObject *prefix##_frame; \ + /* The code object backing the generator */ \ + PyObject *prefix##_code; \ + /* List of weak reference. */ \ + PyObject *prefix##_weakreflist; \ + /* Name of the generator. */ \ + PyObject *prefix##_name; \ + /* Qualified name of the generator. */ \ + PyObject *prefix##_qualname; \ + _PyErr_StackItem prefix##_exc_state; + +typedef struct { + /* The gi_ prefix is intended to remind of generator-iterator. */ + _PyGenObject_HEAD(gi) +} PyGenObject; + +PyAPI_DATA(PyTypeObject) PyGen_Type; + +#define PyGen_Check(op) PyObject_TypeCheck(op, &PyGen_Type) +#define PyGen_CheckExact(op) Py_IS_TYPE(op, &PyGen_Type) + +PyAPI_FUNC(PyObject *) PyGen_New(PyFrameObject *); +PyAPI_FUNC(PyObject *) PyGen_NewWithQualName(PyFrameObject *, + PyObject *name, PyObject *qualname); +PyAPI_FUNC(int) _PyGen_SetStopIterationValue(PyObject *); +PyAPI_FUNC(int) _PyGen_FetchStopIterationValue(PyObject **); +PyObject *_PyGen_yf(PyGenObject *); +PyAPI_FUNC(void) _PyGen_Finalize(PyObject *self); + +#ifndef Py_LIMITED_API +typedef struct { + _PyGenObject_HEAD(cr) + PyObject *cr_origin; +} PyCoroObject; + +PyAPI_DATA(PyTypeObject) PyCoro_Type; +PyAPI_DATA(PyTypeObject) _PyCoroWrapper_Type; + +#define PyCoro_CheckExact(op) Py_IS_TYPE(op, &PyCoro_Type) +PyObject *_PyCoro_GetAwaitableIter(PyObject *o); +PyAPI_FUNC(PyObject *) PyCoro_New(PyFrameObject *, + PyObject *name, PyObject *qualname); + +/* Asynchronous Generators */ + +typedef struct { + _PyGenObject_HEAD(ag) + PyObject *ag_finalizer; + + /* Flag is set to 1 when hooks set up by sys.set_asyncgen_hooks + were called on the generator, to avoid calling them more + than once. */ + int ag_hooks_inited; + + /* Flag is set to 1 when aclose() is called for the first time, or + when a StopAsyncIteration exception is raised. */ + int ag_closed; + + int ag_running_async; +} PyAsyncGenObject; + +PyAPI_DATA(PyTypeObject) PyAsyncGen_Type; +PyAPI_DATA(PyTypeObject) _PyAsyncGenASend_Type; +PyAPI_DATA(PyTypeObject) _PyAsyncGenWrappedValue_Type; +PyAPI_DATA(PyTypeObject) _PyAsyncGenAThrow_Type; + +PyAPI_FUNC(PyObject *) PyAsyncGen_New(PyFrameObject *, + PyObject *name, PyObject *qualname); + +#define PyAsyncGen_CheckExact(op) Py_IS_TYPE(op, &PyAsyncGen_Type) + +PyObject *_PyAsyncGenValueWrapperNew(PyObject *); + +#endif + +#undef _PyGenObject_HEAD + +#ifdef __cplusplus +} +#endif +#endif /* !Py_GENOBJECT_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/import.h b/ScriptEngine/third-party/backend/include/Python/import.h new file mode 100644 index 0000000000..aeef3efd0b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/import.h @@ -0,0 +1,98 @@ +/* Module definition and import interface */ + +#ifndef Py_IMPORT_H +#define Py_IMPORT_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(long) PyImport_GetMagicNumber(void); +PyAPI_FUNC(const char *) PyImport_GetMagicTag(void); +PyAPI_FUNC(PyObject *) PyImport_ExecCodeModule( + const char *name, /* UTF-8 encoded string */ + PyObject *co + ); +PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleEx( + const char *name, /* UTF-8 encoded string */ + PyObject *co, + const char *pathname /* decoded from the filesystem encoding */ + ); +PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleWithPathnames( + const char *name, /* UTF-8 encoded string */ + PyObject *co, + const char *pathname, /* decoded from the filesystem encoding */ + const char *cpathname /* decoded from the filesystem encoding */ + ); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject *) PyImport_ExecCodeModuleObject( + PyObject *name, + PyObject *co, + PyObject *pathname, + PyObject *cpathname + ); +#endif +PyAPI_FUNC(PyObject *) PyImport_GetModuleDict(void); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000 +PyAPI_FUNC(PyObject *) PyImport_GetModule(PyObject *name); +#endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject *) PyImport_AddModuleObject( + PyObject *name + ); +#endif +PyAPI_FUNC(PyObject *) PyImport_AddModule( + const char *name /* UTF-8 encoded string */ + ); +PyAPI_FUNC(PyObject *) PyImport_ImportModule( + const char *name /* UTF-8 encoded string */ + ); +PyAPI_FUNC(PyObject *) PyImport_ImportModuleNoBlock( + const char *name /* UTF-8 encoded string */ + ); +PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevel( + const char *name, /* UTF-8 encoded string */ + PyObject *globals, + PyObject *locals, + PyObject *fromlist, + int level + ); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +PyAPI_FUNC(PyObject *) PyImport_ImportModuleLevelObject( + PyObject *name, + PyObject *globals, + PyObject *locals, + PyObject *fromlist, + int level + ); +#endif + +#define PyImport_ImportModuleEx(n, g, l, f) \ + PyImport_ImportModuleLevel(n, g, l, f, 0) + +PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path); +PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name); +PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(int) PyImport_ImportFrozenModuleObject( + PyObject *name + ); +#endif +PyAPI_FUNC(int) PyImport_ImportFrozenModule( + const char *name /* UTF-8 encoded string */ + ); + +PyAPI_FUNC(int) PyImport_AppendInittab( + const char *name, /* ASCII encoded string */ + PyObject* (*initfunc)(void) + ); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_IMPORT_H +# include "cpython/import.h" +# undef Py_CPYTHON_IMPORT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_IMPORT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_abstract.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_abstract.h new file mode 100644 index 0000000000..b791bf2432 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_abstract.h @@ -0,0 +1,22 @@ +#ifndef Py_INTERNAL_ABSTRACT_H +#define Py_INTERNAL_ABSTRACT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +// Fast inlined version of PyIndex_Check() +static inline int +_PyIndex_Check(PyObject *obj) +{ + PyNumberMethods *tp_as_number = Py_TYPE(obj)->tp_as_number; + return (tp_as_number != NULL && tp_as_number->nb_index != NULL); +} + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_ABSTRACT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_accu.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_accu.h new file mode 100644 index 0000000000..d346222e4d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_accu.h @@ -0,0 +1,39 @@ +#ifndef Py_LIMITED_API +#ifndef Py_INTERNAL_ACCU_H +#define Py_INTERNAL_ACCU_H +#ifdef __cplusplus +extern "C" { +#endif + +/*** This is a private API for use by the interpreter and the stdlib. + *** Its definition may be changed or removed at any moment. + ***/ + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* + * A two-level accumulator of unicode objects that avoids both the overhead + * of keeping a huge number of small separate objects, and the quadratic + * behaviour of using a naive repeated concatenation scheme. + */ + +#undef small /* defined by some Windows headers */ + +typedef struct { + PyObject *large; /* A list of previously accumulated large strings */ + PyObject *small; /* Pending small strings */ +} _PyAccu; + +PyAPI_FUNC(int) _PyAccu_Init(_PyAccu *acc); +PyAPI_FUNC(int) _PyAccu_Accumulate(_PyAccu *acc, PyObject *unicode); +PyAPI_FUNC(PyObject *) _PyAccu_FinishAsList(_PyAccu *acc); +PyAPI_FUNC(PyObject *) _PyAccu_Finish(_PyAccu *acc); +PyAPI_FUNC(void) _PyAccu_Destroy(_PyAccu *acc); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_ACCU_H */ +#endif /* !Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_asdl.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_asdl.h new file mode 100644 index 0000000000..c0b07c3181 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_asdl.h @@ -0,0 +1,112 @@ +#ifndef Py_INTERNAL_ASDL_H +#define Py_INTERNAL_ASDL_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_pyarena.h" // _PyArena_Malloc() + +typedef PyObject * identifier; +typedef PyObject * string; +typedef PyObject * object; +typedef PyObject * constant; + +/* It would be nice if the code generated by asdl_c.py was completely + independent of Python, but it is a goal the requires too much work + at this stage. So, for example, I'll represent identifiers as + interned Python strings. +*/ + +#define _ASDL_SEQ_HEAD \ + Py_ssize_t size; \ + void **elements; + +typedef struct { + _ASDL_SEQ_HEAD +} asdl_seq; + +typedef struct { + _ASDL_SEQ_HEAD + void *typed_elements[1]; +} asdl_generic_seq; + +typedef struct { + _ASDL_SEQ_HEAD + PyObject *typed_elements[1]; +} asdl_identifier_seq; + +typedef struct { + _ASDL_SEQ_HEAD + int typed_elements[1]; +} asdl_int_seq; + +asdl_generic_seq *_Py_asdl_generic_seq_new(Py_ssize_t size, PyArena *arena); +asdl_identifier_seq *_Py_asdl_identifier_seq_new(Py_ssize_t size, PyArena *arena); +asdl_int_seq *_Py_asdl_int_seq_new(Py_ssize_t size, PyArena *arena); + + +#define GENERATE_ASDL_SEQ_CONSTRUCTOR(NAME, TYPE) \ +asdl_ ## NAME ## _seq *_Py_asdl_ ## NAME ## _seq_new(Py_ssize_t size, PyArena *arena) \ +{ \ + asdl_ ## NAME ## _seq *seq = NULL; \ + size_t n; \ + /* check size is sane */ \ + if (size < 0 || \ + (size && (((size_t)size - 1) > (SIZE_MAX / sizeof(void *))))) { \ + PyErr_NoMemory(); \ + return NULL; \ + } \ + n = (size ? (sizeof(TYPE *) * (size - 1)) : 0); \ + /* check if size can be added safely */ \ + if (n > SIZE_MAX - sizeof(asdl_ ## NAME ## _seq)) { \ + PyErr_NoMemory(); \ + return NULL; \ + } \ + n += sizeof(asdl_ ## NAME ## _seq); \ + seq = (asdl_ ## NAME ## _seq *)_PyArena_Malloc(arena, n); \ + if (!seq) { \ + PyErr_NoMemory(); \ + return NULL; \ + } \ + memset(seq, 0, n); \ + seq->size = size; \ + seq->elements = (void**)seq->typed_elements; \ + return seq; \ +} + +#define asdl_seq_GET_UNTYPED(S, I) (S)->elements[(I)] +#define asdl_seq_GET(S, I) (S)->typed_elements[(I)] +#define asdl_seq_LEN(S) ((S) == NULL ? 0 : (S)->size) + +#ifdef Py_DEBUG +# define asdl_seq_SET(S, I, V) \ + do { \ + Py_ssize_t _asdl_i = (I); \ + assert((S) != NULL); \ + assert(0 <= _asdl_i && _asdl_i < (S)->size); \ + (S)->typed_elements[_asdl_i] = (V); \ + } while (0) +#else +# define asdl_seq_SET(S, I, V) (S)->typed_elements[I] = (V) +#endif + +#ifdef Py_DEBUG +# define asdl_seq_SET_UNTYPED(S, I, V) \ + do { \ + Py_ssize_t _asdl_i = (I); \ + assert((S) != NULL); \ + assert(0 <= _asdl_i && _asdl_i < (S)->size); \ + (S)->elements[_asdl_i] = (V); \ + } while (0) +#else +# define asdl_seq_SET_UNTYPED(S, I, V) (S)->elements[I] = (V) +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_ASDL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_ast.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ast.h new file mode 100644 index 0000000000..ebb6a90087 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ast.h @@ -0,0 +1,855 @@ +// File automatically generated by Parser/asdl_c.py. + +#ifndef Py_INTERNAL_AST_H +#define Py_INTERNAL_AST_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_asdl.h" + +typedef struct _mod *mod_ty; + +typedef struct _stmt *stmt_ty; + +typedef struct _expr *expr_ty; + +typedef enum _expr_context { Load=1, Store=2, Del=3 } expr_context_ty; + +typedef enum _boolop { And=1, Or=2 } boolop_ty; + +typedef enum _operator { Add=1, Sub=2, Mult=3, MatMult=4, Div=5, Mod=6, Pow=7, + LShift=8, RShift=9, BitOr=10, BitXor=11, BitAnd=12, + FloorDiv=13 } operator_ty; + +typedef enum _unaryop { Invert=1, Not=2, UAdd=3, USub=4 } unaryop_ty; + +typedef enum _cmpop { Eq=1, NotEq=2, Lt=3, LtE=4, Gt=5, GtE=6, Is=7, IsNot=8, + In=9, NotIn=10 } cmpop_ty; + +typedef struct _comprehension *comprehension_ty; + +typedef struct _excepthandler *excepthandler_ty; + +typedef struct _arguments *arguments_ty; + +typedef struct _arg *arg_ty; + +typedef struct _keyword *keyword_ty; + +typedef struct _alias *alias_ty; + +typedef struct _withitem *withitem_ty; + +typedef struct _match_case *match_case_ty; + +typedef struct _pattern *pattern_ty; + +typedef struct _type_ignore *type_ignore_ty; + + +typedef struct { + _ASDL_SEQ_HEAD + mod_ty typed_elements[1]; +} asdl_mod_seq; + +asdl_mod_seq *_Py_asdl_mod_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + stmt_ty typed_elements[1]; +} asdl_stmt_seq; + +asdl_stmt_seq *_Py_asdl_stmt_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + expr_ty typed_elements[1]; +} asdl_expr_seq; + +asdl_expr_seq *_Py_asdl_expr_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + comprehension_ty typed_elements[1]; +} asdl_comprehension_seq; + +asdl_comprehension_seq *_Py_asdl_comprehension_seq_new(Py_ssize_t size, PyArena + *arena); + +typedef struct { + _ASDL_SEQ_HEAD + excepthandler_ty typed_elements[1]; +} asdl_excepthandler_seq; + +asdl_excepthandler_seq *_Py_asdl_excepthandler_seq_new(Py_ssize_t size, PyArena + *arena); + +typedef struct { + _ASDL_SEQ_HEAD + arguments_ty typed_elements[1]; +} asdl_arguments_seq; + +asdl_arguments_seq *_Py_asdl_arguments_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + arg_ty typed_elements[1]; +} asdl_arg_seq; + +asdl_arg_seq *_Py_asdl_arg_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + keyword_ty typed_elements[1]; +} asdl_keyword_seq; + +asdl_keyword_seq *_Py_asdl_keyword_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + alias_ty typed_elements[1]; +} asdl_alias_seq; + +asdl_alias_seq *_Py_asdl_alias_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + withitem_ty typed_elements[1]; +} asdl_withitem_seq; + +asdl_withitem_seq *_Py_asdl_withitem_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + match_case_ty typed_elements[1]; +} asdl_match_case_seq; + +asdl_match_case_seq *_Py_asdl_match_case_seq_new(Py_ssize_t size, PyArena + *arena); + +typedef struct { + _ASDL_SEQ_HEAD + pattern_ty typed_elements[1]; +} asdl_pattern_seq; + +asdl_pattern_seq *_Py_asdl_pattern_seq_new(Py_ssize_t size, PyArena *arena); + +typedef struct { + _ASDL_SEQ_HEAD + type_ignore_ty typed_elements[1]; +} asdl_type_ignore_seq; + +asdl_type_ignore_seq *_Py_asdl_type_ignore_seq_new(Py_ssize_t size, PyArena + *arena); + + +enum _mod_kind {Module_kind=1, Interactive_kind=2, Expression_kind=3, + FunctionType_kind=4}; +struct _mod { + enum _mod_kind kind; + union { + struct { + asdl_stmt_seq *body; + asdl_type_ignore_seq *type_ignores; + } Module; + + struct { + asdl_stmt_seq *body; + } Interactive; + + struct { + expr_ty body; + } Expression; + + struct { + asdl_expr_seq *argtypes; + expr_ty returns; + } FunctionType; + + } v; +}; + +enum _stmt_kind {FunctionDef_kind=1, AsyncFunctionDef_kind=2, ClassDef_kind=3, + Return_kind=4, Delete_kind=5, Assign_kind=6, + AugAssign_kind=7, AnnAssign_kind=8, For_kind=9, + AsyncFor_kind=10, While_kind=11, If_kind=12, With_kind=13, + AsyncWith_kind=14, Match_kind=15, Raise_kind=16, Try_kind=17, + Assert_kind=18, Import_kind=19, ImportFrom_kind=20, + Global_kind=21, Nonlocal_kind=22, Expr_kind=23, Pass_kind=24, + Break_kind=25, Continue_kind=26}; +struct _stmt { + enum _stmt_kind kind; + union { + struct { + identifier name; + arguments_ty args; + asdl_stmt_seq *body; + asdl_expr_seq *decorator_list; + expr_ty returns; + string type_comment; + } FunctionDef; + + struct { + identifier name; + arguments_ty args; + asdl_stmt_seq *body; + asdl_expr_seq *decorator_list; + expr_ty returns; + string type_comment; + } AsyncFunctionDef; + + struct { + identifier name; + asdl_expr_seq *bases; + asdl_keyword_seq *keywords; + asdl_stmt_seq *body; + asdl_expr_seq *decorator_list; + } ClassDef; + + struct { + expr_ty value; + } Return; + + struct { + asdl_expr_seq *targets; + } Delete; + + struct { + asdl_expr_seq *targets; + expr_ty value; + string type_comment; + } Assign; + + struct { + expr_ty target; + operator_ty op; + expr_ty value; + } AugAssign; + + struct { + expr_ty target; + expr_ty annotation; + expr_ty value; + int simple; + } AnnAssign; + + struct { + expr_ty target; + expr_ty iter; + asdl_stmt_seq *body; + asdl_stmt_seq *orelse; + string type_comment; + } For; + + struct { + expr_ty target; + expr_ty iter; + asdl_stmt_seq *body; + asdl_stmt_seq *orelse; + string type_comment; + } AsyncFor; + + struct { + expr_ty test; + asdl_stmt_seq *body; + asdl_stmt_seq *orelse; + } While; + + struct { + expr_ty test; + asdl_stmt_seq *body; + asdl_stmt_seq *orelse; + } If; + + struct { + asdl_withitem_seq *items; + asdl_stmt_seq *body; + string type_comment; + } With; + + struct { + asdl_withitem_seq *items; + asdl_stmt_seq *body; + string type_comment; + } AsyncWith; + + struct { + expr_ty subject; + asdl_match_case_seq *cases; + } Match; + + struct { + expr_ty exc; + expr_ty cause; + } Raise; + + struct { + asdl_stmt_seq *body; + asdl_excepthandler_seq *handlers; + asdl_stmt_seq *orelse; + asdl_stmt_seq *finalbody; + } Try; + + struct { + expr_ty test; + expr_ty msg; + } Assert; + + struct { + asdl_alias_seq *names; + } Import; + + struct { + identifier module; + asdl_alias_seq *names; + int level; + } ImportFrom; + + struct { + asdl_identifier_seq *names; + } Global; + + struct { + asdl_identifier_seq *names; + } Nonlocal; + + struct { + expr_ty value; + } Expr; + + } v; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +enum _expr_kind {BoolOp_kind=1, NamedExpr_kind=2, BinOp_kind=3, UnaryOp_kind=4, + Lambda_kind=5, IfExp_kind=6, Dict_kind=7, Set_kind=8, + ListComp_kind=9, SetComp_kind=10, DictComp_kind=11, + GeneratorExp_kind=12, Await_kind=13, Yield_kind=14, + YieldFrom_kind=15, Compare_kind=16, Call_kind=17, + FormattedValue_kind=18, JoinedStr_kind=19, Constant_kind=20, + Attribute_kind=21, Subscript_kind=22, Starred_kind=23, + Name_kind=24, List_kind=25, Tuple_kind=26, Slice_kind=27}; +struct _expr { + enum _expr_kind kind; + union { + struct { + boolop_ty op; + asdl_expr_seq *values; + } BoolOp; + + struct { + expr_ty target; + expr_ty value; + } NamedExpr; + + struct { + expr_ty left; + operator_ty op; + expr_ty right; + } BinOp; + + struct { + unaryop_ty op; + expr_ty operand; + } UnaryOp; + + struct { + arguments_ty args; + expr_ty body; + } Lambda; + + struct { + expr_ty test; + expr_ty body; + expr_ty orelse; + } IfExp; + + struct { + asdl_expr_seq *keys; + asdl_expr_seq *values; + } Dict; + + struct { + asdl_expr_seq *elts; + } Set; + + struct { + expr_ty elt; + asdl_comprehension_seq *generators; + } ListComp; + + struct { + expr_ty elt; + asdl_comprehension_seq *generators; + } SetComp; + + struct { + expr_ty key; + expr_ty value; + asdl_comprehension_seq *generators; + } DictComp; + + struct { + expr_ty elt; + asdl_comprehension_seq *generators; + } GeneratorExp; + + struct { + expr_ty value; + } Await; + + struct { + expr_ty value; + } Yield; + + struct { + expr_ty value; + } YieldFrom; + + struct { + expr_ty left; + asdl_int_seq *ops; + asdl_expr_seq *comparators; + } Compare; + + struct { + expr_ty func; + asdl_expr_seq *args; + asdl_keyword_seq *keywords; + } Call; + + struct { + expr_ty value; + int conversion; + expr_ty format_spec; + } FormattedValue; + + struct { + asdl_expr_seq *values; + } JoinedStr; + + struct { + constant value; + string kind; + } Constant; + + struct { + expr_ty value; + identifier attr; + expr_context_ty ctx; + } Attribute; + + struct { + expr_ty value; + expr_ty slice; + expr_context_ty ctx; + } Subscript; + + struct { + expr_ty value; + expr_context_ty ctx; + } Starred; + + struct { + identifier id; + expr_context_ty ctx; + } Name; + + struct { + asdl_expr_seq *elts; + expr_context_ty ctx; + } List; + + struct { + asdl_expr_seq *elts; + expr_context_ty ctx; + } Tuple; + + struct { + expr_ty lower; + expr_ty upper; + expr_ty step; + } Slice; + + } v; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +struct _comprehension { + expr_ty target; + expr_ty iter; + asdl_expr_seq *ifs; + int is_async; +}; + +enum _excepthandler_kind {ExceptHandler_kind=1}; +struct _excepthandler { + enum _excepthandler_kind kind; + union { + struct { + expr_ty type; + identifier name; + asdl_stmt_seq *body; + } ExceptHandler; + + } v; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +struct _arguments { + asdl_arg_seq *posonlyargs; + asdl_arg_seq *args; + arg_ty vararg; + asdl_arg_seq *kwonlyargs; + asdl_expr_seq *kw_defaults; + arg_ty kwarg; + asdl_expr_seq *defaults; +}; + +struct _arg { + identifier arg; + expr_ty annotation; + string type_comment; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +struct _keyword { + identifier arg; + expr_ty value; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +struct _alias { + identifier name; + identifier asname; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +struct _withitem { + expr_ty context_expr; + expr_ty optional_vars; +}; + +struct _match_case { + pattern_ty pattern; + expr_ty guard; + asdl_stmt_seq *body; +}; + +enum _pattern_kind {MatchValue_kind=1, MatchSingleton_kind=2, + MatchSequence_kind=3, MatchMapping_kind=4, + MatchClass_kind=5, MatchStar_kind=6, MatchAs_kind=7, + MatchOr_kind=8}; +struct _pattern { + enum _pattern_kind kind; + union { + struct { + expr_ty value; + } MatchValue; + + struct { + constant value; + } MatchSingleton; + + struct { + asdl_pattern_seq *patterns; + } MatchSequence; + + struct { + asdl_expr_seq *keys; + asdl_pattern_seq *patterns; + identifier rest; + } MatchMapping; + + struct { + expr_ty cls; + asdl_pattern_seq *patterns; + asdl_identifier_seq *kwd_attrs; + asdl_pattern_seq *kwd_patterns; + } MatchClass; + + struct { + identifier name; + } MatchStar; + + struct { + pattern_ty pattern; + identifier name; + } MatchAs; + + struct { + asdl_pattern_seq *patterns; + } MatchOr; + + } v; + int lineno; + int col_offset; + int end_lineno; + int end_col_offset; +}; + +enum _type_ignore_kind {TypeIgnore_kind=1}; +struct _type_ignore { + enum _type_ignore_kind kind; + union { + struct { + int lineno; + string tag; + } TypeIgnore; + + } v; +}; + + +// Note: these macros affect function definitions, not only call sites. +mod_ty _PyAST_Module(asdl_stmt_seq * body, asdl_type_ignore_seq * type_ignores, + PyArena *arena); +mod_ty _PyAST_Interactive(asdl_stmt_seq * body, PyArena *arena); +mod_ty _PyAST_Expression(expr_ty body, PyArena *arena); +mod_ty _PyAST_FunctionType(asdl_expr_seq * argtypes, expr_ty returns, PyArena + *arena); +stmt_ty _PyAST_FunctionDef(identifier name, arguments_ty args, asdl_stmt_seq * + body, asdl_expr_seq * decorator_list, expr_ty + returns, string type_comment, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +stmt_ty _PyAST_AsyncFunctionDef(identifier name, arguments_ty args, + asdl_stmt_seq * body, asdl_expr_seq * + decorator_list, expr_ty returns, string + type_comment, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_ClassDef(identifier name, asdl_expr_seq * bases, + asdl_keyword_seq * keywords, asdl_stmt_seq * body, + asdl_expr_seq * decorator_list, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +stmt_ty _PyAST_Return(expr_ty value, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Delete(asdl_expr_seq * targets, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Assign(asdl_expr_seq * targets, expr_ty value, string + type_comment, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +stmt_ty _PyAST_AugAssign(expr_ty target, operator_ty op, expr_ty value, int + lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int + simple, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +stmt_ty _PyAST_For(expr_ty target, expr_ty iter, asdl_stmt_seq * body, + asdl_stmt_seq * orelse, string type_comment, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +stmt_ty _PyAST_AsyncFor(expr_ty target, expr_ty iter, asdl_stmt_seq * body, + asdl_stmt_seq * orelse, string type_comment, int + lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_While(expr_ty test, asdl_stmt_seq * body, asdl_stmt_seq * + orelse, int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_If(expr_ty test, asdl_stmt_seq * body, asdl_stmt_seq * orelse, + int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_With(asdl_withitem_seq * items, asdl_stmt_seq * body, string + type_comment, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +stmt_ty _PyAST_AsyncWith(asdl_withitem_seq * items, asdl_stmt_seq * body, + string type_comment, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Match(expr_ty subject, asdl_match_case_seq * cases, int lineno, + int col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +stmt_ty _PyAST_Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset, + int end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Try(asdl_stmt_seq * body, asdl_excepthandler_seq * handlers, + asdl_stmt_seq * orelse, asdl_stmt_seq * finalbody, int + lineno, int col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +stmt_ty _PyAST_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, + int end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Import(asdl_alias_seq * names, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_ImportFrom(identifier module, asdl_alias_seq * names, int level, + int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_Global(asdl_identifier_seq * names, int lineno, int col_offset, + int end_lineno, int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Nonlocal(asdl_identifier_seq * names, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +stmt_ty _PyAST_Expr(expr_ty value, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +stmt_ty _PyAST_Pass(int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_Break(int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +stmt_ty _PyAST_Continue(int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_BoolOp(boolop_ty op, asdl_expr_seq * values, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_NamedExpr(expr_ty target, expr_ty value, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +expr_ty _PyAST_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, + int col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +expr_ty _PyAST_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_Lambda(arguments_ty args, expr_ty body, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, + int col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +expr_ty _PyAST_Dict(asdl_expr_seq * keys, asdl_expr_seq * values, int lineno, + int col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_Set(asdl_expr_seq * elts, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +expr_ty _PyAST_ListComp(expr_ty elt, asdl_comprehension_seq * generators, int + lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_SetComp(expr_ty elt, asdl_comprehension_seq * generators, int + lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_DictComp(expr_ty key, expr_ty value, asdl_comprehension_seq * + generators, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +expr_ty _PyAST_GeneratorExp(expr_ty elt, asdl_comprehension_seq * generators, + int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_Await(expr_ty value, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +expr_ty _PyAST_Yield(expr_ty value, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +expr_ty _PyAST_YieldFrom(expr_ty value, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +expr_ty _PyAST_Compare(expr_ty left, asdl_int_seq * ops, asdl_expr_seq * + comparators, int lineno, int col_offset, int end_lineno, + int end_col_offset, PyArena *arena); +expr_ty _PyAST_Call(expr_ty func, asdl_expr_seq * args, asdl_keyword_seq * + keywords, int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_FormattedValue(expr_ty value, int conversion, expr_ty + format_spec, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +expr_ty _PyAST_JoinedStr(asdl_expr_seq * values, int lineno, int col_offset, + int end_lineno, int end_col_offset, PyArena *arena); +expr_ty _PyAST_Constant(constant value, string kind, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, + int lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_Subscript(expr_ty value, expr_ty slice, expr_context_ty ctx, int + lineno, int col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +expr_ty _PyAST_Starred(expr_ty value, expr_context_ty ctx, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_Name(identifier id, expr_context_ty ctx, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_List(asdl_expr_seq * elts, expr_context_ty ctx, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_Tuple(asdl_expr_seq * elts, expr_context_ty ctx, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +expr_ty _PyAST_Slice(expr_ty lower, expr_ty upper, expr_ty step, int lineno, + int col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +comprehension_ty _PyAST_comprehension(expr_ty target, expr_ty iter, + asdl_expr_seq * ifs, int is_async, + PyArena *arena); +excepthandler_ty _PyAST_ExceptHandler(expr_ty type, identifier name, + asdl_stmt_seq * body, int lineno, int + col_offset, int end_lineno, int + end_col_offset, PyArena *arena); +arguments_ty _PyAST_arguments(asdl_arg_seq * posonlyargs, asdl_arg_seq * args, + arg_ty vararg, asdl_arg_seq * kwonlyargs, + asdl_expr_seq * kw_defaults, arg_ty kwarg, + asdl_expr_seq * defaults, PyArena *arena); +arg_ty _PyAST_arg(identifier arg, expr_ty annotation, string type_comment, int + lineno, int col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +keyword_ty _PyAST_keyword(identifier arg, expr_ty value, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +alias_ty _PyAST_alias(identifier name, identifier asname, int lineno, int + col_offset, int end_lineno, int end_col_offset, PyArena + *arena); +withitem_ty _PyAST_withitem(expr_ty context_expr, expr_ty optional_vars, + PyArena *arena); +match_case_ty _PyAST_match_case(pattern_ty pattern, expr_ty guard, + asdl_stmt_seq * body, PyArena *arena); +pattern_ty _PyAST_MatchValue(expr_ty value, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +pattern_ty _PyAST_MatchSingleton(constant value, int lineno, int col_offset, + int end_lineno, int end_col_offset, PyArena + *arena); +pattern_ty _PyAST_MatchSequence(asdl_pattern_seq * patterns, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +pattern_ty _PyAST_MatchMapping(asdl_expr_seq * keys, asdl_pattern_seq * + patterns, identifier rest, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +pattern_ty _PyAST_MatchClass(expr_ty cls, asdl_pattern_seq * patterns, + asdl_identifier_seq * kwd_attrs, asdl_pattern_seq + * kwd_patterns, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +pattern_ty _PyAST_MatchStar(identifier name, int lineno, int col_offset, int + end_lineno, int end_col_offset, PyArena *arena); +pattern_ty _PyAST_MatchAs(pattern_ty pattern, identifier name, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +pattern_ty _PyAST_MatchOr(asdl_pattern_seq * patterns, int lineno, int + col_offset, int end_lineno, int end_col_offset, + PyArena *arena); +type_ignore_ty _PyAST_TypeIgnore(int lineno, string tag, PyArena *arena); + + +PyObject* PyAST_mod2obj(mod_ty t); +mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode); +int PyAST_Check(PyObject* obj); + +extern int _PyAST_Validate(mod_ty); + +/* _PyAST_ExprAsUnicode is defined in ast_unparse.c */ +extern PyObject* _PyAST_ExprAsUnicode(expr_ty); + +/* Return the borrowed reference to the first literal string in the + sequence of statements or NULL if it doesn't start from a literal string. + Doesn't set exception. */ +extern PyObject* _PyAST_GetDocString(asdl_stmt_seq *); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_AST_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_ast_state.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ast_state.h new file mode 100644 index 0000000000..882cd09c00 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ast_state.h @@ -0,0 +1,255 @@ +// File automatically generated by Parser/asdl_c.py. + +#ifndef Py_INTERNAL_AST_STATE_H +#define Py_INTERNAL_AST_STATE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +struct ast_state { + int initialized; + PyObject *AST_type; + PyObject *Add_singleton; + PyObject *Add_type; + PyObject *And_singleton; + PyObject *And_type; + PyObject *AnnAssign_type; + PyObject *Assert_type; + PyObject *Assign_type; + PyObject *AsyncFor_type; + PyObject *AsyncFunctionDef_type; + PyObject *AsyncWith_type; + PyObject *Attribute_type; + PyObject *AugAssign_type; + PyObject *Await_type; + PyObject *BinOp_type; + PyObject *BitAnd_singleton; + PyObject *BitAnd_type; + PyObject *BitOr_singleton; + PyObject *BitOr_type; + PyObject *BitXor_singleton; + PyObject *BitXor_type; + PyObject *BoolOp_type; + PyObject *Break_type; + PyObject *Call_type; + PyObject *ClassDef_type; + PyObject *Compare_type; + PyObject *Constant_type; + PyObject *Continue_type; + PyObject *Del_singleton; + PyObject *Del_type; + PyObject *Delete_type; + PyObject *DictComp_type; + PyObject *Dict_type; + PyObject *Div_singleton; + PyObject *Div_type; + PyObject *Eq_singleton; + PyObject *Eq_type; + PyObject *ExceptHandler_type; + PyObject *Expr_type; + PyObject *Expression_type; + PyObject *FloorDiv_singleton; + PyObject *FloorDiv_type; + PyObject *For_type; + PyObject *FormattedValue_type; + PyObject *FunctionDef_type; + PyObject *FunctionType_type; + PyObject *GeneratorExp_type; + PyObject *Global_type; + PyObject *GtE_singleton; + PyObject *GtE_type; + PyObject *Gt_singleton; + PyObject *Gt_type; + PyObject *IfExp_type; + PyObject *If_type; + PyObject *ImportFrom_type; + PyObject *Import_type; + PyObject *In_singleton; + PyObject *In_type; + PyObject *Interactive_type; + PyObject *Invert_singleton; + PyObject *Invert_type; + PyObject *IsNot_singleton; + PyObject *IsNot_type; + PyObject *Is_singleton; + PyObject *Is_type; + PyObject *JoinedStr_type; + PyObject *LShift_singleton; + PyObject *LShift_type; + PyObject *Lambda_type; + PyObject *ListComp_type; + PyObject *List_type; + PyObject *Load_singleton; + PyObject *Load_type; + PyObject *LtE_singleton; + PyObject *LtE_type; + PyObject *Lt_singleton; + PyObject *Lt_type; + PyObject *MatMult_singleton; + PyObject *MatMult_type; + PyObject *MatchAs_type; + PyObject *MatchClass_type; + PyObject *MatchMapping_type; + PyObject *MatchOr_type; + PyObject *MatchSequence_type; + PyObject *MatchSingleton_type; + PyObject *MatchStar_type; + PyObject *MatchValue_type; + PyObject *Match_type; + PyObject *Mod_singleton; + PyObject *Mod_type; + PyObject *Module_type; + PyObject *Mult_singleton; + PyObject *Mult_type; + PyObject *Name_type; + PyObject *NamedExpr_type; + PyObject *Nonlocal_type; + PyObject *NotEq_singleton; + PyObject *NotEq_type; + PyObject *NotIn_singleton; + PyObject *NotIn_type; + PyObject *Not_singleton; + PyObject *Not_type; + PyObject *Or_singleton; + PyObject *Or_type; + PyObject *Pass_type; + PyObject *Pow_singleton; + PyObject *Pow_type; + PyObject *RShift_singleton; + PyObject *RShift_type; + PyObject *Raise_type; + PyObject *Return_type; + PyObject *SetComp_type; + PyObject *Set_type; + PyObject *Slice_type; + PyObject *Starred_type; + PyObject *Store_singleton; + PyObject *Store_type; + PyObject *Sub_singleton; + PyObject *Sub_type; + PyObject *Subscript_type; + PyObject *Try_type; + PyObject *Tuple_type; + PyObject *TypeIgnore_type; + PyObject *UAdd_singleton; + PyObject *UAdd_type; + PyObject *USub_singleton; + PyObject *USub_type; + PyObject *UnaryOp_type; + PyObject *While_type; + PyObject *With_type; + PyObject *YieldFrom_type; + PyObject *Yield_type; + PyObject *__dict__; + PyObject *__doc__; + PyObject *__match_args__; + PyObject *__module__; + PyObject *_attributes; + PyObject *_fields; + PyObject *alias_type; + PyObject *annotation; + PyObject *arg; + PyObject *arg_type; + PyObject *args; + PyObject *argtypes; + PyObject *arguments_type; + PyObject *asname; + PyObject *ast; + PyObject *attr; + PyObject *bases; + PyObject *body; + PyObject *boolop_type; + PyObject *cases; + PyObject *cause; + PyObject *cls; + PyObject *cmpop_type; + PyObject *col_offset; + PyObject *comparators; + PyObject *comprehension_type; + PyObject *context_expr; + PyObject *conversion; + PyObject *ctx; + PyObject *decorator_list; + PyObject *defaults; + PyObject *elt; + PyObject *elts; + PyObject *end_col_offset; + PyObject *end_lineno; + PyObject *exc; + PyObject *excepthandler_type; + PyObject *expr_context_type; + PyObject *expr_type; + PyObject *finalbody; + PyObject *format_spec; + PyObject *func; + PyObject *generators; + PyObject *guard; + PyObject *handlers; + PyObject *id; + PyObject *ifs; + PyObject *is_async; + PyObject *items; + PyObject *iter; + PyObject *key; + PyObject *keys; + PyObject *keyword_type; + PyObject *keywords; + PyObject *kind; + PyObject *kw_defaults; + PyObject *kwarg; + PyObject *kwd_attrs; + PyObject *kwd_patterns; + PyObject *kwonlyargs; + PyObject *left; + PyObject *level; + PyObject *lineno; + PyObject *lower; + PyObject *match_case_type; + PyObject *mod_type; + PyObject *module; + PyObject *msg; + PyObject *name; + PyObject *names; + PyObject *op; + PyObject *operand; + PyObject *operator_type; + PyObject *ops; + PyObject *optional_vars; + PyObject *orelse; + PyObject *pattern; + PyObject *pattern_type; + PyObject *patterns; + PyObject *posonlyargs; + PyObject *rest; + PyObject *returns; + PyObject *right; + PyObject *simple; + PyObject *slice; + PyObject *step; + PyObject *stmt_type; + PyObject *subject; + PyObject *tag; + PyObject *target; + PyObject *targets; + PyObject *test; + PyObject *type; + PyObject *type_comment; + PyObject *type_ignore_type; + PyObject *type_ignores; + PyObject *unaryop_type; + PyObject *upper; + PyObject *value; + PyObject *values; + PyObject *vararg; + PyObject *withitem_type; +}; + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_AST_STATE_H */ + diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_atomic.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_atomic.h new file mode 100644 index 0000000000..425d69f868 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_atomic.h @@ -0,0 +1,557 @@ +#ifndef Py_ATOMIC_H +#define Py_ATOMIC_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "dynamic_annotations.h" /* _Py_ANNOTATE_MEMORY_ORDER */ +#include "pyconfig.h" + +#ifdef HAVE_STD_ATOMIC +# include +#endif + + +#if defined(_MSC_VER) +#include +#if defined(_M_IX86) || defined(_M_X64) +# include +#endif +#endif + +/* This is modeled after the atomics interface from C1x, according to + * the draft at + * http://www.open-std.org/JTC1/SC22/wg14/www/docs/n1425.pdf. + * Operations and types are named the same except with a _Py_ prefix + * and have the same semantics. + * + * Beware, the implementations here are deep magic. + */ + +#if defined(HAVE_STD_ATOMIC) + +typedef enum _Py_memory_order { + _Py_memory_order_relaxed = memory_order_relaxed, + _Py_memory_order_acquire = memory_order_acquire, + _Py_memory_order_release = memory_order_release, + _Py_memory_order_acq_rel = memory_order_acq_rel, + _Py_memory_order_seq_cst = memory_order_seq_cst +} _Py_memory_order; + +typedef struct _Py_atomic_address { + atomic_uintptr_t _value; +} _Py_atomic_address; + +typedef struct _Py_atomic_int { + atomic_int _value; +} _Py_atomic_int; + +#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \ + atomic_signal_fence(ORDER) + +#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \ + atomic_thread_fence(ORDER) + +#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ + atomic_store_explicit(&((ATOMIC_VAL)->_value), NEW_VAL, ORDER) + +#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ + atomic_load_explicit(&((ATOMIC_VAL)->_value), ORDER) + +// Use builtin atomic operations in GCC >= 4.7 and clang +#elif defined(HAVE_BUILTIN_ATOMIC) + +typedef enum _Py_memory_order { + _Py_memory_order_relaxed = __ATOMIC_RELAXED, + _Py_memory_order_acquire = __ATOMIC_ACQUIRE, + _Py_memory_order_release = __ATOMIC_RELEASE, + _Py_memory_order_acq_rel = __ATOMIC_ACQ_REL, + _Py_memory_order_seq_cst = __ATOMIC_SEQ_CST +} _Py_memory_order; + +typedef struct _Py_atomic_address { + uintptr_t _value; +} _Py_atomic_address; + +typedef struct _Py_atomic_int { + int _value; +} _Py_atomic_int; + +#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) \ + __atomic_signal_fence(ORDER) + +#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) \ + __atomic_thread_fence(ORDER) + +#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ + (assert((ORDER) == __ATOMIC_RELAXED \ + || (ORDER) == __ATOMIC_SEQ_CST \ + || (ORDER) == __ATOMIC_RELEASE), \ + __atomic_store_n(&((ATOMIC_VAL)->_value), NEW_VAL, ORDER)) + +#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ + (assert((ORDER) == __ATOMIC_RELAXED \ + || (ORDER) == __ATOMIC_SEQ_CST \ + || (ORDER) == __ATOMIC_ACQUIRE \ + || (ORDER) == __ATOMIC_CONSUME), \ + __atomic_load_n(&((ATOMIC_VAL)->_value), ORDER)) + +/* Only support GCC (for expression statements) and x86 (for simple + * atomic semantics) and MSVC x86/x64/ARM */ +#elif defined(__GNUC__) && (defined(__i386__) || defined(__amd64)) +typedef enum _Py_memory_order { + _Py_memory_order_relaxed, + _Py_memory_order_acquire, + _Py_memory_order_release, + _Py_memory_order_acq_rel, + _Py_memory_order_seq_cst +} _Py_memory_order; + +typedef struct _Py_atomic_address { + uintptr_t _value; +} _Py_atomic_address; + +typedef struct _Py_atomic_int { + int _value; +} _Py_atomic_int; + + +static __inline__ void +_Py_atomic_signal_fence(_Py_memory_order order) +{ + if (order != _Py_memory_order_relaxed) + __asm__ volatile("":::"memory"); +} + +static __inline__ void +_Py_atomic_thread_fence(_Py_memory_order order) +{ + if (order != _Py_memory_order_relaxed) + __asm__ volatile("mfence":::"memory"); +} + +/* Tell the race checker about this operation's effects. */ +static __inline__ void +_Py_ANNOTATE_MEMORY_ORDER(const volatile void *address, _Py_memory_order order) +{ + (void)address; /* shut up -Wunused-parameter */ + switch(order) { + case _Py_memory_order_release: + case _Py_memory_order_acq_rel: + case _Py_memory_order_seq_cst: + _Py_ANNOTATE_HAPPENS_BEFORE(address); + break; + case _Py_memory_order_relaxed: + case _Py_memory_order_acquire: + break; + } + switch(order) { + case _Py_memory_order_acquire: + case _Py_memory_order_acq_rel: + case _Py_memory_order_seq_cst: + _Py_ANNOTATE_HAPPENS_AFTER(address); + break; + case _Py_memory_order_relaxed: + case _Py_memory_order_release: + break; + } +} + +#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ + __extension__ ({ \ + __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \ + __typeof__(atomic_val->_value) new_val = NEW_VAL;\ + volatile __typeof__(new_val) *volatile_data = &atomic_val->_value; \ + _Py_memory_order order = ORDER; \ + _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \ + \ + /* Perform the operation. */ \ + _Py_ANNOTATE_IGNORE_WRITES_BEGIN(); \ + switch(order) { \ + case _Py_memory_order_release: \ + _Py_atomic_signal_fence(_Py_memory_order_release); \ + /* fallthrough */ \ + case _Py_memory_order_relaxed: \ + *volatile_data = new_val; \ + break; \ + \ + case _Py_memory_order_acquire: \ + case _Py_memory_order_acq_rel: \ + case _Py_memory_order_seq_cst: \ + __asm__ volatile("xchg %0, %1" \ + : "+r"(new_val) \ + : "m"(atomic_val->_value) \ + : "memory"); \ + break; \ + } \ + _Py_ANNOTATE_IGNORE_WRITES_END(); \ + }) + +#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ + __extension__ ({ \ + __typeof__(ATOMIC_VAL) atomic_val = ATOMIC_VAL; \ + __typeof__(atomic_val->_value) result; \ + volatile __typeof__(result) *volatile_data = &atomic_val->_value; \ + _Py_memory_order order = ORDER; \ + _Py_ANNOTATE_MEMORY_ORDER(atomic_val, order); \ + \ + /* Perform the operation. */ \ + _Py_ANNOTATE_IGNORE_READS_BEGIN(); \ + switch(order) { \ + case _Py_memory_order_release: \ + case _Py_memory_order_acq_rel: \ + case _Py_memory_order_seq_cst: \ + /* Loads on x86 are not releases by default, so need a */ \ + /* thread fence. */ \ + _Py_atomic_thread_fence(_Py_memory_order_release); \ + break; \ + default: \ + /* No fence */ \ + break; \ + } \ + result = *volatile_data; \ + switch(order) { \ + case _Py_memory_order_acquire: \ + case _Py_memory_order_acq_rel: \ + case _Py_memory_order_seq_cst: \ + /* Loads on x86 are automatically acquire operations so */ \ + /* can get by with just a compiler fence. */ \ + _Py_atomic_signal_fence(_Py_memory_order_acquire); \ + break; \ + default: \ + /* No fence */ \ + break; \ + } \ + _Py_ANNOTATE_IGNORE_READS_END(); \ + result; \ + }) + +#elif defined(_MSC_VER) +/* _Interlocked* functions provide a full memory barrier and are therefore + enough for acq_rel and seq_cst. If the HLE variants aren't available + in hardware they will fall back to a full memory barrier as well. + + This might affect performance but likely only in some very specific and + hard to measure scenario. +*/ +#if defined(_M_IX86) || defined(_M_X64) +typedef enum _Py_memory_order { + _Py_memory_order_relaxed, + _Py_memory_order_acquire, + _Py_memory_order_release, + _Py_memory_order_acq_rel, + _Py_memory_order_seq_cst +} _Py_memory_order; + +typedef struct _Py_atomic_address { + volatile uintptr_t _value; +} _Py_atomic_address; + +typedef struct _Py_atomic_int { + volatile int _value; +} _Py_atomic_int; + + +#if defined(_M_X64) +#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \ + switch (ORDER) { \ + case _Py_memory_order_acquire: \ + _InterlockedExchange64_HLEAcquire((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \ + break; \ + case _Py_memory_order_release: \ + _InterlockedExchange64_HLERelease((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \ + break; \ + default: \ + _InterlockedExchange64((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)(NEW_VAL)); \ + break; \ + } +#else +#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0); +#endif + +#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \ + switch (ORDER) { \ + case _Py_memory_order_acquire: \ + _InterlockedExchange_HLEAcquire((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \ + break; \ + case _Py_memory_order_release: \ + _InterlockedExchange_HLERelease((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \ + break; \ + default: \ + _InterlockedExchange((volatile long*)&((ATOMIC_VAL)->_value), (int)(NEW_VAL)); \ + break; \ + } + +#if defined(_M_X64) +/* This has to be an intptr_t for now. + gil_created() uses -1 as a sentinel value, if this returns + a uintptr_t it will do an unsigned compare and crash +*/ +inline intptr_t _Py_atomic_load_64bit_impl(volatile uintptr_t* value, int order) { + __int64 old; + switch (order) { + case _Py_memory_order_acquire: + { + do { + old = *value; + } while(_InterlockedCompareExchange64_HLEAcquire((volatile __int64*)value, old, old) != old); + break; + } + case _Py_memory_order_release: + { + do { + old = *value; + } while(_InterlockedCompareExchange64_HLERelease((volatile __int64*)value, old, old) != old); + break; + } + case _Py_memory_order_relaxed: + old = *value; + break; + default: + { + do { + old = *value; + } while(_InterlockedCompareExchange64((volatile __int64*)value, old, old) != old); + break; + } + } + return old; +} + +#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) \ + _Py_atomic_load_64bit_impl((volatile uintptr_t*)&((ATOMIC_VAL)->_value), (ORDER)) + +#else +#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) ((ATOMIC_VAL)->_value) +#endif + +inline int _Py_atomic_load_32bit_impl(volatile int* value, int order) { + long old; + switch (order) { + case _Py_memory_order_acquire: + { + do { + old = *value; + } while(_InterlockedCompareExchange_HLEAcquire((volatile long*)value, old, old) != old); + break; + } + case _Py_memory_order_release: + { + do { + old = *value; + } while(_InterlockedCompareExchange_HLERelease((volatile long*)value, old, old) != old); + break; + } + case _Py_memory_order_relaxed: + old = *value; + break; + default: + { + do { + old = *value; + } while(_InterlockedCompareExchange((volatile long*)value, old, old) != old); + break; + } + } + return old; +} + +#define _Py_atomic_load_32bit(ATOMIC_VAL, ORDER) \ + _Py_atomic_load_32bit_impl((volatile int*)&((ATOMIC_VAL)->_value), (ORDER)) + +#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ + if (sizeof((ATOMIC_VAL)->_value) == 8) { \ + _Py_atomic_store_64bit((ATOMIC_VAL), NEW_VAL, ORDER) } else { \ + _Py_atomic_store_32bit((ATOMIC_VAL), NEW_VAL, ORDER) } + +#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ + ( \ + sizeof((ATOMIC_VAL)->_value) == 8 ? \ + _Py_atomic_load_64bit((ATOMIC_VAL), ORDER) : \ + _Py_atomic_load_32bit((ATOMIC_VAL), ORDER) \ + ) +#elif defined(_M_ARM) || defined(_M_ARM64) +typedef enum _Py_memory_order { + _Py_memory_order_relaxed, + _Py_memory_order_acquire, + _Py_memory_order_release, + _Py_memory_order_acq_rel, + _Py_memory_order_seq_cst +} _Py_memory_order; + +typedef struct _Py_atomic_address { + volatile uintptr_t _value; +} _Py_atomic_address; + +typedef struct _Py_atomic_int { + volatile int _value; +} _Py_atomic_int; + + +#if defined(_M_ARM64) +#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) \ + switch (ORDER) { \ + case _Py_memory_order_acquire: \ + _InterlockedExchange64_acq((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \ + break; \ + case _Py_memory_order_release: \ + _InterlockedExchange64_rel((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \ + break; \ + default: \ + _InterlockedExchange64((__int64 volatile*)&((ATOMIC_VAL)->_value), (__int64)NEW_VAL); \ + break; \ + } +#else +#define _Py_atomic_store_64bit(ATOMIC_VAL, NEW_VAL, ORDER) ((void)0); +#endif + +#define _Py_atomic_store_32bit(ATOMIC_VAL, NEW_VAL, ORDER) \ + switch (ORDER) { \ + case _Py_memory_order_acquire: \ + _InterlockedExchange_acq((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \ + break; \ + case _Py_memory_order_release: \ + _InterlockedExchange_rel((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \ + break; \ + default: \ + _InterlockedExchange((volatile long*)&((ATOMIC_VAL)->_value), (int)NEW_VAL); \ + break; \ + } + +#if defined(_M_ARM64) +/* This has to be an intptr_t for now. + gil_created() uses -1 as a sentinel value, if this returns + a uintptr_t it will do an unsigned compare and crash +*/ +inline intptr_t _Py_atomic_load_64bit_impl(volatile uintptr_t* value, int order) { + uintptr_t old; + switch (order) { + case _Py_memory_order_acquire: + { + do { + old = *value; + } while(_InterlockedCompareExchange64_acq(value, old, old) != old); + break; + } + case _Py_memory_order_release: + { + do { + old = *value; + } while(_InterlockedCompareExchange64_rel(value, old, old) != old); + break; + } + case _Py_memory_order_relaxed: + old = *value; + break; + default: + { + do { + old = *value; + } while(_InterlockedCompareExchange64(value, old, old) != old); + break; + } + } + return old; +} + +#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) \ + _Py_atomic_load_64bit_impl((volatile uintptr_t*)&((ATOMIC_VAL)->_value), (ORDER)) + +#else +#define _Py_atomic_load_64bit(ATOMIC_VAL, ORDER) ((ATOMIC_VAL)->_value) +#endif + +inline int _Py_atomic_load_32bit_impl(volatile int* value, int order) { + int old; + switch (order) { + case _Py_memory_order_acquire: + { + do { + old = *value; + } while(_InterlockedCompareExchange_acq(value, old, old) != old); + break; + } + case _Py_memory_order_release: + { + do { + old = *value; + } while(_InterlockedCompareExchange_rel(value, old, old) != old); + break; + } + case _Py_memory_order_relaxed: + old = *value; + break; + default: + { + do { + old = *value; + } while(_InterlockedCompareExchange(value, old, old) != old); + break; + } + } + return old; +} + +#define _Py_atomic_load_32bit(ATOMIC_VAL, ORDER) \ + _Py_atomic_load_32bit_impl((volatile int*)&((ATOMIC_VAL)->_value), (ORDER)) + +#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ + if (sizeof((ATOMIC_VAL)->_value) == 8) { \ + _Py_atomic_store_64bit((ATOMIC_VAL), (NEW_VAL), (ORDER)) } else { \ + _Py_atomic_store_32bit((ATOMIC_VAL), (NEW_VAL), (ORDER)) } + +#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ + ( \ + sizeof((ATOMIC_VAL)->_value) == 8 ? \ + _Py_atomic_load_64bit((ATOMIC_VAL), (ORDER)) : \ + _Py_atomic_load_32bit((ATOMIC_VAL), (ORDER)) \ + ) +#endif +#else /* !gcc x86 !_msc_ver */ +typedef enum _Py_memory_order { + _Py_memory_order_relaxed, + _Py_memory_order_acquire, + _Py_memory_order_release, + _Py_memory_order_acq_rel, + _Py_memory_order_seq_cst +} _Py_memory_order; + +typedef struct _Py_atomic_address { + uintptr_t _value; +} _Py_atomic_address; + +typedef struct _Py_atomic_int { + int _value; +} _Py_atomic_int; +/* Fall back to other compilers and processors by assuming that simple + volatile accesses are atomic. This is false, so people should port + this. */ +#define _Py_atomic_signal_fence(/*memory_order*/ ORDER) ((void)0) +#define _Py_atomic_thread_fence(/*memory_order*/ ORDER) ((void)0) +#define _Py_atomic_store_explicit(ATOMIC_VAL, NEW_VAL, ORDER) \ + ((ATOMIC_VAL)->_value = NEW_VAL) +#define _Py_atomic_load_explicit(ATOMIC_VAL, ORDER) \ + ((ATOMIC_VAL)->_value) +#endif + +/* Standardized shortcuts. */ +#define _Py_atomic_store(ATOMIC_VAL, NEW_VAL) \ + _Py_atomic_store_explicit((ATOMIC_VAL), (NEW_VAL), _Py_memory_order_seq_cst) +#define _Py_atomic_load(ATOMIC_VAL) \ + _Py_atomic_load_explicit((ATOMIC_VAL), _Py_memory_order_seq_cst) + +/* Python-local extensions */ + +#define _Py_atomic_store_relaxed(ATOMIC_VAL, NEW_VAL) \ + _Py_atomic_store_explicit((ATOMIC_VAL), (NEW_VAL), _Py_memory_order_relaxed) +#define _Py_atomic_load_relaxed(ATOMIC_VAL) \ + _Py_atomic_load_explicit((ATOMIC_VAL), _Py_memory_order_relaxed) + +#ifdef __cplusplus +} +#endif +#endif /* Py_ATOMIC_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_atomic_funcs.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_atomic_funcs.h new file mode 100644 index 0000000000..a708789cea --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_atomic_funcs.h @@ -0,0 +1,94 @@ +/* Atomic functions: similar to pycore_atomic.h, but don't need + to declare variables as atomic. + + Py_ssize_t type: + + * value = _Py_atomic_size_get(&var) + * _Py_atomic_size_set(&var, value) + + Use sequentially-consistent ordering (__ATOMIC_SEQ_CST memory order): + enforce total ordering with all other atomic functions. +*/ +#ifndef Py_ATOMIC_FUNC_H +#define Py_ATOMIC_FUNC_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#if defined(_MSC_VER) +# include // _InterlockedExchange() +#endif + + +// Use builtin atomic operations in GCC >= 4.7 and clang +#ifdef HAVE_BUILTIN_ATOMIC + +static inline Py_ssize_t _Py_atomic_size_get(Py_ssize_t *var) +{ + return __atomic_load_n(var, __ATOMIC_SEQ_CST); +} + +static inline void _Py_atomic_size_set(Py_ssize_t *var, Py_ssize_t value) +{ + __atomic_store_n(var, value, __ATOMIC_SEQ_CST); +} + +#elif defined(_MSC_VER) + +static inline Py_ssize_t _Py_atomic_size_get(Py_ssize_t *var) +{ +#if SIZEOF_VOID_P == 8 + Py_BUILD_ASSERT(sizeof(__int64) == sizeof(*var)); + volatile __int64 *volatile_var = (volatile __int64 *)var; + __int64 old; + do { + old = *volatile_var; + } while(_InterlockedCompareExchange64(volatile_var, old, old) != old); +#else + Py_BUILD_ASSERT(sizeof(long) == sizeof(*var)); + volatile long *volatile_var = (volatile long *)var; + long old; + do { + old = *volatile_var; + } while(_InterlockedCompareExchange(volatile_var, old, old) != old); +#endif + return old; +} + +static inline void _Py_atomic_size_set(Py_ssize_t *var, Py_ssize_t value) +{ +#if SIZEOF_VOID_P == 8 + Py_BUILD_ASSERT(sizeof(__int64) == sizeof(*var)); + volatile __int64 *volatile_var = (volatile __int64 *)var; + _InterlockedExchange64(volatile_var, value); +#else + Py_BUILD_ASSERT(sizeof(long) == sizeof(*var)); + volatile long *volatile_var = (volatile long *)var; + _InterlockedExchange(volatile_var, value); +#endif +} + +#else +// Fallback implementation using volatile + +static inline Py_ssize_t _Py_atomic_size_get(Py_ssize_t *var) +{ + volatile Py_ssize_t *volatile_var = (volatile Py_ssize_t *)var; + return *volatile_var; +} + +static inline void _Py_atomic_size_set(Py_ssize_t *var, Py_ssize_t value) +{ + volatile Py_ssize_t *volatile_var = (volatile Py_ssize_t *)var; + *volatile_var = value; +} +#endif + +#ifdef __cplusplus +} +#endif +#endif /* Py_ATOMIC_FUNC_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_bitutils.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_bitutils.h new file mode 100644 index 0000000000..e4aa7a3d0d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_bitutils.h @@ -0,0 +1,176 @@ +/* Bit and bytes utilities. + + Bytes swap functions, reverse order of bytes: + + - _Py_bswap16(uint16_t) + - _Py_bswap32(uint32_t) + - _Py_bswap64(uint64_t) +*/ + +#ifndef Py_INTERNAL_BITUTILS_H +#define Py_INTERNAL_BITUTILS_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#if defined(__GNUC__) \ + && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 8)) + /* __builtin_bswap16() is available since GCC 4.8, + __builtin_bswap32() is available since GCC 4.3, + __builtin_bswap64() is available since GCC 4.3. */ +# define _PY_HAVE_BUILTIN_BSWAP +#endif + +#ifdef _MSC_VER + /* Get _byteswap_ushort(), _byteswap_ulong(), _byteswap_uint64() */ +# include +#endif + +static inline uint16_t +_Py_bswap16(uint16_t word) +{ +#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Py__has_builtin(__builtin_bswap16) + return __builtin_bswap16(word); +#elif defined(_MSC_VER) + Py_BUILD_ASSERT(sizeof(word) == sizeof(unsigned short)); + return _byteswap_ushort(word); +#else + // Portable implementation which doesn't rely on circular bit shift + return ( ((word & UINT16_C(0x00FF)) << 8) + | ((word & UINT16_C(0xFF00)) >> 8)); +#endif +} + +static inline uint32_t +_Py_bswap32(uint32_t word) +{ +#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Py__has_builtin(__builtin_bswap32) + return __builtin_bswap32(word); +#elif defined(_MSC_VER) + Py_BUILD_ASSERT(sizeof(word) == sizeof(unsigned long)); + return _byteswap_ulong(word); +#else + // Portable implementation which doesn't rely on circular bit shift + return ( ((word & UINT32_C(0x000000FF)) << 24) + | ((word & UINT32_C(0x0000FF00)) << 8) + | ((word & UINT32_C(0x00FF0000)) >> 8) + | ((word & UINT32_C(0xFF000000)) >> 24)); +#endif +} + +static inline uint64_t +_Py_bswap64(uint64_t word) +{ +#if defined(_PY_HAVE_BUILTIN_BSWAP) || _Py__has_builtin(__builtin_bswap64) + return __builtin_bswap64(word); +#elif defined(_MSC_VER) + return _byteswap_uint64(word); +#else + // Portable implementation which doesn't rely on circular bit shift + return ( ((word & UINT64_C(0x00000000000000FF)) << 56) + | ((word & UINT64_C(0x000000000000FF00)) << 40) + | ((word & UINT64_C(0x0000000000FF0000)) << 24) + | ((word & UINT64_C(0x00000000FF000000)) << 8) + | ((word & UINT64_C(0x000000FF00000000)) >> 8) + | ((word & UINT64_C(0x0000FF0000000000)) >> 24) + | ((word & UINT64_C(0x00FF000000000000)) >> 40) + | ((word & UINT64_C(0xFF00000000000000)) >> 56)); +#endif +} + + +// Population count: count the number of 1's in 'x' +// (number of bits set to 1), also known as the hamming weight. +// +// Implementation note. CPUID is not used, to test if x86 POPCNT instruction +// can be used, to keep the implementation simple. For example, Visual Studio +// __popcnt() is not used this reason. The clang and GCC builtin function can +// use the x86 POPCNT instruction if the target architecture has SSE4a or +// newer. +static inline int +_Py_popcount32(uint32_t x) +{ +#if (defined(__clang__) || defined(__GNUC__)) + +#if SIZEOF_INT >= 4 + Py_BUILD_ASSERT(sizeof(x) <= sizeof(unsigned int)); + return __builtin_popcount(x); +#else + // The C standard guarantees that unsigned long will always be big enough + // to hold a uint32_t value without losing information. + Py_BUILD_ASSERT(sizeof(x) <= sizeof(unsigned long)); + return __builtin_popcountl(x); +#endif + +#else + // 32-bit SWAR (SIMD Within A Register) popcount + + // Binary: 0 1 0 1 ... + const uint32_t M1 = 0x55555555; + // Binary: 00 11 00 11. .. + const uint32_t M2 = 0x33333333; + // Binary: 0000 1111 0000 1111 ... + const uint32_t M4 = 0x0F0F0F0F; + // 256**4 + 256**3 + 256**2 + 256**1 + const uint32_t SUM = 0x01010101; + + // Put count of each 2 bits into those 2 bits + x = x - ((x >> 1) & M1); + // Put count of each 4 bits into those 4 bits + x = (x & M2) + ((x >> 2) & M2); + // Put count of each 8 bits into those 8 bits + x = (x + (x >> 4)) & M4; + // Sum of the 4 byte counts + return (uint32_t)((uint64_t)x * (uint64_t)SUM) >> 24; +#endif +} + + +// Return the index of the most significant 1 bit in 'x'. This is the smallest +// integer k such that x < 2**k. Equivalent to floor(log2(x)) + 1 for x != 0. +static inline int +_Py_bit_length(unsigned long x) +{ +#if (defined(__clang__) || defined(__GNUC__)) + if (x != 0) { + // __builtin_clzl() is available since GCC 3.4. + // Undefined behavior for x == 0. + return (int)sizeof(unsigned long) * 8 - __builtin_clzl(x); + } + else { + return 0; + } +#elif defined(_MSC_VER) + // _BitScanReverse() is documented to search 32 bits. + Py_BUILD_ASSERT(sizeof(unsigned long) <= 4); + unsigned long msb; + if (_BitScanReverse(&msb, x)) { + return (int)msb + 1; + } + else { + return 0; + } +#else + const int BIT_LENGTH_TABLE[32] = { + 0, 1, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, + 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5 + }; + int msb = 0; + while (x >= 32) { + msb += 6; + x >>= 6; + } + msb += BIT_LENGTH_TABLE[x]; + return msb; +#endif +} + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_BITUTILS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_blocks_output_buffer.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_blocks_output_buffer.h new file mode 100644 index 0000000000..28cf6fba4e --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_blocks_output_buffer.h @@ -0,0 +1,317 @@ +/* + _BlocksOutputBuffer is used to maintain an output buffer + that has unpredictable size. Suitable for compression/decompression + API (bz2/lzma/zlib) that has stream->next_out and stream->avail_out: + + stream->next_out: point to the next output position. + stream->avail_out: the number of available bytes left in the buffer. + + It maintains a list of bytes object, so there is no overhead of resizing + the buffer. + + Usage: + + 1, Initialize the struct instance like this: + _BlocksOutputBuffer buffer = {.list = NULL}; + Set .list to NULL for _BlocksOutputBuffer_OnError() + + 2, Initialize the buffer use one of these functions: + _BlocksOutputBuffer_InitAndGrow() + _BlocksOutputBuffer_InitWithSize() + + 3, If (avail_out == 0), grow the buffer: + _BlocksOutputBuffer_Grow() + + 4, Get the current outputted data size: + _BlocksOutputBuffer_GetDataSize() + + 5, Finish the buffer, and return a bytes object: + _BlocksOutputBuffer_Finish() + + 6, Clean up the buffer when an error occurred: + _BlocksOutputBuffer_OnError() +*/ + +#ifndef Py_INTERNAL_BLOCKS_OUTPUT_BUFFER_H +#define Py_INTERNAL_BLOCKS_OUTPUT_BUFFER_H +#ifdef __cplusplus +extern "C" { +#endif + +#include "Python.h" + +typedef struct { + // List of bytes objects + PyObject *list; + // Number of whole allocated size + Py_ssize_t allocated; + // Max length of the buffer, negative number means unlimited length. + Py_ssize_t max_length; +} _BlocksOutputBuffer; + +static const char unable_allocate_msg[] = "Unable to allocate output buffer."; + +/* In 32-bit build, the max block size should <= INT32_MAX. */ +#define OUTPUT_BUFFER_MAX_BLOCK_SIZE (256*1024*1024) + +/* Block size sequence */ +#define KB (1024) +#define MB (1024*1024) +static const Py_ssize_t BUFFER_BLOCK_SIZE[] = + { 32*KB, 64*KB, 256*KB, 1*MB, 4*MB, 8*MB, 16*MB, 16*MB, + 32*MB, 32*MB, 32*MB, 32*MB, 64*MB, 64*MB, 128*MB, 128*MB, + OUTPUT_BUFFER_MAX_BLOCK_SIZE }; +#undef KB +#undef MB + +/* According to the block sizes defined by BUFFER_BLOCK_SIZE, the whole + allocated size growth step is: + 1 32 KB +32 KB + 2 96 KB +64 KB + 3 352 KB +256 KB + 4 1.34 MB +1 MB + 5 5.34 MB +4 MB + 6 13.34 MB +8 MB + 7 29.34 MB +16 MB + 8 45.34 MB +16 MB + 9 77.34 MB +32 MB + 10 109.34 MB +32 MB + 11 141.34 MB +32 MB + 12 173.34 MB +32 MB + 13 237.34 MB +64 MB + 14 301.34 MB +64 MB + 15 429.34 MB +128 MB + 16 557.34 MB +128 MB + 17 813.34 MB +256 MB + 18 1069.34 MB +256 MB + 19 1325.34 MB +256 MB + 20 1581.34 MB +256 MB + 21 1837.34 MB +256 MB + 22 2093.34 MB +256 MB + ... +*/ + +/* Initialize the buffer, and grow the buffer. + + max_length: Max length of the buffer, -1 for unlimited length. + + On success, return allocated size (>=0) + On failure, return -1 +*/ +static inline Py_ssize_t +_BlocksOutputBuffer_InitAndGrow(_BlocksOutputBuffer *buffer, + const Py_ssize_t max_length, + void **next_out) +{ + PyObject *b; + Py_ssize_t block_size; + + // ensure .list was set to NULL + assert(buffer->list == NULL); + + // get block size + if (0 <= max_length && max_length < BUFFER_BLOCK_SIZE[0]) { + block_size = max_length; + } else { + block_size = BUFFER_BLOCK_SIZE[0]; + } + + // the first block + b = PyBytes_FromStringAndSize(NULL, block_size); + if (b == NULL) { + return -1; + } + + // create the list + buffer->list = PyList_New(1); + if (buffer->list == NULL) { + Py_DECREF(b); + return -1; + } + PyList_SET_ITEM(buffer->list, 0, b); + + // set variables + buffer->allocated = block_size; + buffer->max_length = max_length; + + *next_out = PyBytes_AS_STRING(b); + return block_size; +} + +/* Initialize the buffer, with an initial size. + + Check block size limit in the outer wrapper function. For example, some libs + accept UINT32_MAX as the maximum block size, then init_size should <= it. + + On success, return allocated size (>=0) + On failure, return -1 +*/ +static inline Py_ssize_t +_BlocksOutputBuffer_InitWithSize(_BlocksOutputBuffer *buffer, + const Py_ssize_t init_size, + void **next_out) +{ + PyObject *b; + + // ensure .list was set to NULL + assert(buffer->list == NULL); + + // the first block + b = PyBytes_FromStringAndSize(NULL, init_size); + if (b == NULL) { + PyErr_SetString(PyExc_MemoryError, unable_allocate_msg); + return -1; + } + + // create the list + buffer->list = PyList_New(1); + if (buffer->list == NULL) { + Py_DECREF(b); + return -1; + } + PyList_SET_ITEM(buffer->list, 0, b); + + // set variables + buffer->allocated = init_size; + buffer->max_length = -1; + + *next_out = PyBytes_AS_STRING(b); + return init_size; +} + +/* Grow the buffer. The avail_out must be 0, please check it before calling. + + On success, return allocated size (>=0) + On failure, return -1 +*/ +static inline Py_ssize_t +_BlocksOutputBuffer_Grow(_BlocksOutputBuffer *buffer, + void **next_out, + const Py_ssize_t avail_out) +{ + PyObject *b; + const Py_ssize_t list_len = Py_SIZE(buffer->list); + Py_ssize_t block_size; + + // ensure no gaps in the data + if (avail_out != 0) { + PyErr_SetString(PyExc_SystemError, + "avail_out is non-zero in _BlocksOutputBuffer_Grow()."); + return -1; + } + + // get block size + if (list_len < (Py_ssize_t) Py_ARRAY_LENGTH(BUFFER_BLOCK_SIZE)) { + block_size = BUFFER_BLOCK_SIZE[list_len]; + } else { + block_size = BUFFER_BLOCK_SIZE[Py_ARRAY_LENGTH(BUFFER_BLOCK_SIZE) - 1]; + } + + // check max_length + if (buffer->max_length >= 0) { + // if (rest == 0), should not grow the buffer. + Py_ssize_t rest = buffer->max_length - buffer->allocated; + assert(rest > 0); + + // block_size of the last block + if (block_size > rest) { + block_size = rest; + } + } + + // check buffer->allocated overflow + if (block_size > PY_SSIZE_T_MAX - buffer->allocated) { + PyErr_SetString(PyExc_MemoryError, unable_allocate_msg); + return -1; + } + + // create the block + b = PyBytes_FromStringAndSize(NULL, block_size); + if (b == NULL) { + PyErr_SetString(PyExc_MemoryError, unable_allocate_msg); + return -1; + } + if (PyList_Append(buffer->list, b) < 0) { + Py_DECREF(b); + return -1; + } + Py_DECREF(b); + + // set variables + buffer->allocated += block_size; + + *next_out = PyBytes_AS_STRING(b); + return block_size; +} + +/* Return the current outputted data size. */ +static inline Py_ssize_t +_BlocksOutputBuffer_GetDataSize(_BlocksOutputBuffer *buffer, + const Py_ssize_t avail_out) +{ + return buffer->allocated - avail_out; +} + +/* Finish the buffer. + + Return a bytes object on success + Return NULL on failure +*/ +static inline PyObject * +_BlocksOutputBuffer_Finish(_BlocksOutputBuffer *buffer, + const Py_ssize_t avail_out) +{ + PyObject *result, *block; + const Py_ssize_t list_len = Py_SIZE(buffer->list); + + // fast path for single block + if ((list_len == 1 && avail_out == 0) || + (list_len == 2 && Py_SIZE(PyList_GET_ITEM(buffer->list, 1)) == avail_out)) + { + block = PyList_GET_ITEM(buffer->list, 0); + Py_INCREF(block); + + Py_CLEAR(buffer->list); + return block; + } + + // final bytes object + result = PyBytes_FromStringAndSize(NULL, buffer->allocated - avail_out); + if (result == NULL) { + PyErr_SetString(PyExc_MemoryError, unable_allocate_msg); + return NULL; + } + + // memory copy + if (list_len > 0) { + char *posi = PyBytes_AS_STRING(result); + + // blocks except the last one + Py_ssize_t i = 0; + for (; i < list_len-1; i++) { + block = PyList_GET_ITEM(buffer->list, i); + memcpy(posi, PyBytes_AS_STRING(block), Py_SIZE(block)); + posi += Py_SIZE(block); + } + // the last block + block = PyList_GET_ITEM(buffer->list, i); + memcpy(posi, PyBytes_AS_STRING(block), Py_SIZE(block) - avail_out); + } else { + assert(Py_SIZE(result) == 0); + } + + Py_CLEAR(buffer->list); + return result; +} + +/* Clean up the buffer when an error occurred. */ +static inline void +_BlocksOutputBuffer_OnError(_BlocksOutputBuffer *buffer) +{ + Py_CLEAR(buffer->list); +} + +#ifdef __cplusplus +} +#endif +#endif /* Py_INTERNAL_BLOCKS_OUTPUT_BUFFER_H */ \ No newline at end of file diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_bytes_methods.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_bytes_methods.h new file mode 100644 index 0000000000..11e8ab20e9 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_bytes_methods.h @@ -0,0 +1,73 @@ +#ifndef Py_LIMITED_API +#ifndef Py_BYTES_CTYPE_H +#define Py_BYTES_CTYPE_H + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* + * The internal implementation behind PyBytes (bytes) and PyByteArray (bytearray) + * methods of the given names, they operate on ASCII byte strings. + */ +extern PyObject* _Py_bytes_isspace(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_isalpha(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_isalnum(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_isascii(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_isdigit(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_islower(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_isupper(const char *cptr, Py_ssize_t len); +extern PyObject* _Py_bytes_istitle(const char *cptr, Py_ssize_t len); + +/* These store their len sized answer in the given preallocated *result arg. */ +extern void _Py_bytes_lower(char *result, const char *cptr, Py_ssize_t len); +extern void _Py_bytes_upper(char *result, const char *cptr, Py_ssize_t len); +extern void _Py_bytes_title(char *result, const char *s, Py_ssize_t len); +extern void _Py_bytes_capitalize(char *result, const char *s, Py_ssize_t len); +extern void _Py_bytes_swapcase(char *result, const char *s, Py_ssize_t len); + +extern PyObject *_Py_bytes_find(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_index(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_rfind(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_rindex(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_count(const char *str, Py_ssize_t len, PyObject *args); +extern int _Py_bytes_contains(const char *str, Py_ssize_t len, PyObject *arg); +extern PyObject *_Py_bytes_startswith(const char *str, Py_ssize_t len, PyObject *args); +extern PyObject *_Py_bytes_endswith(const char *str, Py_ssize_t len, PyObject *args); + +/* The maketrans() static method. */ +extern PyObject* _Py_bytes_maketrans(Py_buffer *frm, Py_buffer *to); + +/* Shared __doc__ strings. */ +extern const char _Py_isspace__doc__[]; +extern const char _Py_isalpha__doc__[]; +extern const char _Py_isalnum__doc__[]; +extern const char _Py_isascii__doc__[]; +extern const char _Py_isdigit__doc__[]; +extern const char _Py_islower__doc__[]; +extern const char _Py_isupper__doc__[]; +extern const char _Py_istitle__doc__[]; +extern const char _Py_lower__doc__[]; +extern const char _Py_upper__doc__[]; +extern const char _Py_title__doc__[]; +extern const char _Py_capitalize__doc__[]; +extern const char _Py_swapcase__doc__[]; +extern const char _Py_count__doc__[]; +extern const char _Py_find__doc__[]; +extern const char _Py_index__doc__[]; +extern const char _Py_rfind__doc__[]; +extern const char _Py_rindex__doc__[]; +extern const char _Py_startswith__doc__[]; +extern const char _Py_endswith__doc__[]; +extern const char _Py_maketrans__doc__[]; +extern const char _Py_expandtabs__doc__[]; +extern const char _Py_ljust__doc__[]; +extern const char _Py_rjust__doc__[]; +extern const char _Py_center__doc__[]; +extern const char _Py_zfill__doc__[]; + +/* this is needed because some docs are shared from the .o, not static */ +#define PyDoc_STRVAR_shared(name,str) const char name[] = PyDoc_STR(str) + +#endif /* !Py_BYTES_CTYPE_H */ +#endif /* !Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_call.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_call.h new file mode 100644 index 0000000000..f7d856a54b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_call.h @@ -0,0 +1,39 @@ +#ifndef Py_INTERNAL_CALL_H +#define Py_INTERNAL_CALL_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend( + PyThreadState *tstate, + PyObject *callable, + PyObject *obj, + PyObject *args, + PyObject *kwargs); + +PyAPI_FUNC(PyObject *) _PyObject_FastCallDictTstate( + PyThreadState *tstate, + PyObject *callable, + PyObject *const *args, + size_t nargsf, + PyObject *kwargs); + +PyAPI_FUNC(PyObject *) _PyObject_Call( + PyThreadState *tstate, + PyObject *callable, + PyObject *args, + PyObject *kwargs); + +static inline PyObject * +_PyObject_CallNoArgTstate(PyThreadState *tstate, PyObject *func) { + return _PyObject_VectorcallTstate(tstate, func, NULL, 0, NULL); +} + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_CALL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_ceval.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ceval.h new file mode 100644 index 0000000000..f573c3e508 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ceval.h @@ -0,0 +1,114 @@ +#ifndef Py_INTERNAL_CEVAL_H +#define Py_INTERNAL_CEVAL_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* Forward declarations */ +struct pyruntimestate; +struct _ceval_runtime_state; + +#include "pycore_interp.h" /* PyInterpreterState.eval_frame */ + +extern void _Py_FinishPendingCalls(PyThreadState *tstate); +extern void _PyEval_InitRuntimeState(struct _ceval_runtime_state *); +extern int _PyEval_InitState(struct _ceval_state *ceval); +extern void _PyEval_FiniState(struct _ceval_state *ceval); +PyAPI_FUNC(void) _PyEval_SignalReceived(PyInterpreterState *interp); +PyAPI_FUNC(int) _PyEval_AddPendingCall( + PyInterpreterState *interp, + int (*func)(void *), + void *arg); +PyAPI_FUNC(void) _PyEval_SignalAsyncExc(PyInterpreterState *interp); +#ifdef HAVE_FORK +extern PyStatus _PyEval_ReInitThreads(PyThreadState *tstate); +#endif +PyAPI_FUNC(void) _PyEval_SetCoroutineOriginTrackingDepth( + PyThreadState *tstate, + int new_depth); + +void _PyEval_Fini(void); + + +extern PyObject* _PyEval_GetBuiltins(PyThreadState *tstate); +extern PyObject *_PyEval_BuiltinsFromGlobals( + PyThreadState *tstate, + PyObject *globals); + + +static inline PyObject* +_PyEval_EvalFrame(PyThreadState *tstate, PyFrameObject *f, int throwflag) +{ + return tstate->interp->eval_frame(tstate, f, throwflag); +} + +extern PyObject * +_PyEval_Vector(PyThreadState *tstate, + PyFrameConstructor *desc, PyObject *locals, + PyObject* const* args, size_t argcount, + PyObject *kwnames); + +#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS +extern int _PyEval_ThreadsInitialized(PyInterpreterState *interp); +#else +extern int _PyEval_ThreadsInitialized(struct pyruntimestate *runtime); +#endif +extern PyStatus _PyEval_InitGIL(PyThreadState *tstate); +extern void _PyEval_FiniGIL(PyInterpreterState *interp); + +extern void _PyEval_ReleaseLock(PyThreadState *tstate); + +extern void _PyEval_DeactivateOpCache(void); + + +/* --- _Py_EnterRecursiveCall() ----------------------------------------- */ + +#ifdef USE_STACKCHECK +/* With USE_STACKCHECK macro defined, trigger stack checks in + _Py_CheckRecursiveCall() on every 64th call to Py_EnterRecursiveCall. */ +static inline int _Py_MakeRecCheck(PyThreadState *tstate) { + return (++tstate->recursion_depth > tstate->interp->ceval.recursion_limit + || ++tstate->stackcheck_counter > 64); +} +#else +static inline int _Py_MakeRecCheck(PyThreadState *tstate) { + return (++tstate->recursion_depth > tstate->interp->ceval.recursion_limit); +} +#endif + +PyAPI_FUNC(int) _Py_CheckRecursiveCall( + PyThreadState *tstate, + const char *where); + +static inline int _Py_EnterRecursiveCall(PyThreadState *tstate, + const char *where) { + return (_Py_MakeRecCheck(tstate) && _Py_CheckRecursiveCall(tstate, where)); +} + +static inline int _Py_EnterRecursiveCall_inline(const char *where) { + PyThreadState *tstate = PyThreadState_GET(); + return _Py_EnterRecursiveCall(tstate, where); +} + +#define Py_EnterRecursiveCall(where) _Py_EnterRecursiveCall_inline(where) + +static inline void _Py_LeaveRecursiveCall(PyThreadState *tstate) { + tstate->recursion_depth--; +} + +static inline void _Py_LeaveRecursiveCall_inline(void) { + PyThreadState *tstate = PyThreadState_GET(); + _Py_LeaveRecursiveCall(tstate); +} + +#define Py_LeaveRecursiveCall() _Py_LeaveRecursiveCall_inline() + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_CEVAL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_code.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_code.h new file mode 100644 index 0000000000..8ff1863dc0 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_code.h @@ -0,0 +1,34 @@ +#ifndef Py_INTERNAL_CODE_H +#define Py_INTERNAL_CODE_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct { + PyObject *ptr; /* Cached pointer (borrowed reference) */ + uint64_t globals_ver; /* ma_version of global dict */ + uint64_t builtins_ver; /* ma_version of builtin dict */ +} _PyOpcache_LoadGlobal; + +typedef struct { + PyTypeObject *type; + Py_ssize_t hint; + unsigned int tp_version_tag; +} _PyOpCodeOpt_LoadAttr; + +struct _PyOpcache { + union { + _PyOpcache_LoadGlobal lg; + _PyOpCodeOpt_LoadAttr la; + } u; + char optimized; +}; + +/* Private API */ +int _PyCode_InitOpcache(PyCodeObject *co); + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_CODE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_compile.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_compile.h new file mode 100644 index 0000000000..06a6082cdd --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_compile.h @@ -0,0 +1,44 @@ +#ifndef Py_INTERNAL_COMPILE_H +#define Py_INTERNAL_COMPILE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +struct _arena; // Type defined in pycore_pyarena.h +struct _mod; // Type defined in pycore_ast.h + +// Export the symbol for test_peg_generator (built as a library) +PyAPI_FUNC(PyCodeObject*) _PyAST_Compile( + struct _mod *mod, + PyObject *filename, + PyCompilerFlags *flags, + int optimize, + struct _arena *arena); +extern PyFutureFeatures* _PyFuture_FromAST( + struct _mod * mod, + PyObject *filename + ); + +extern PyObject* _Py_Mangle(PyObject *p, PyObject *name); + +typedef struct { + int optimize; + int ff_features; + + int recursion_depth; /* current recursion depth */ + int recursion_limit; /* recursion limit */ +} _PyASTOptimizeState; + +extern int _PyAST_Optimize( + struct _mod *, + struct _arena *arena, + _PyASTOptimizeState *state); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_COMPILE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_condvar.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_condvar.h new file mode 100644 index 0000000000..8b89d70951 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_condvar.h @@ -0,0 +1,95 @@ +#ifndef Py_INTERNAL_CONDVAR_H +#define Py_INTERNAL_CONDVAR_H + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#ifndef _POSIX_THREADS +/* This means pthreads are not implemented in libc headers, hence the macro + not present in unistd.h. But they still can be implemented as an external + library (e.g. gnu pth in pthread emulation) */ +# ifdef HAVE_PTHREAD_H +# include /* _POSIX_THREADS */ +# endif +#endif + +#ifdef _POSIX_THREADS +/* + * POSIX support + */ +#define Py_HAVE_CONDVAR + +#include + +#define PyMUTEX_T pthread_mutex_t +#define PyCOND_T pthread_cond_t + +#elif defined(NT_THREADS) +/* + * Windows (XP, 2003 server and later, as well as (hopefully) CE) support + * + * Emulated condition variables ones that work with XP and later, plus + * example native support on VISTA and onwards. + */ +#define Py_HAVE_CONDVAR + +/* include windows if it hasn't been done before */ +#define WIN32_LEAN_AND_MEAN +#include + +/* options */ +/* non-emulated condition variables are provided for those that want + * to target Windows Vista. Modify this macro to enable them. + */ +#ifndef _PY_EMULATED_WIN_CV +#define _PY_EMULATED_WIN_CV 1 /* use emulated condition variables */ +#endif + +/* fall back to emulation if not targeting Vista */ +#if !defined NTDDI_VISTA || NTDDI_VERSION < NTDDI_VISTA +#undef _PY_EMULATED_WIN_CV +#define _PY_EMULATED_WIN_CV 1 +#endif + +#if _PY_EMULATED_WIN_CV + +typedef CRITICAL_SECTION PyMUTEX_T; + +/* The ConditionVariable object. From XP onwards it is easily emulated + with a Semaphore. + Semaphores are available on Windows XP (2003 server) and later. + We use a Semaphore rather than an auto-reset event, because although + an auto-resent event might appear to solve the lost-wakeup bug (race + condition between releasing the outer lock and waiting) because it + maintains state even though a wait hasn't happened, there is still + a lost wakeup problem if more than one thread are interrupted in the + critical place. A semaphore solves that, because its state is + counted, not Boolean. + Because it is ok to signal a condition variable with no one + waiting, we need to keep track of the number of + waiting threads. Otherwise, the semaphore's state could rise + without bound. This also helps reduce the number of "spurious wakeups" + that would otherwise happen. + */ + +typedef struct _PyCOND_T +{ + HANDLE sem; + int waiting; /* to allow PyCOND_SIGNAL to be a no-op */ +} PyCOND_T; + +#else /* !_PY_EMULATED_WIN_CV */ + +/* Use native Win7 primitives if build target is Win7 or higher */ + +/* SRWLOCK is faster and better than CriticalSection */ +typedef SRWLOCK PyMUTEX_T; + +typedef CONDITION_VARIABLE PyCOND_T; + +#endif /* _PY_EMULATED_WIN_CV */ + +#endif /* _POSIX_THREADS, NT_THREADS */ + +#endif /* Py_INTERNAL_CONDVAR_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_context.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_context.h new file mode 100644 index 0000000000..a482dd4212 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_context.h @@ -0,0 +1,42 @@ +#ifndef Py_INTERNAL_CONTEXT_H +#define Py_INTERNAL_CONTEXT_H + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_hamt.h" /* PyHamtObject */ + +struct _pycontextobject { + PyObject_HEAD + PyContext *ctx_prev; + PyHamtObject *ctx_vars; + PyObject *ctx_weakreflist; + int ctx_entered; +}; + + +struct _pycontextvarobject { + PyObject_HEAD + PyObject *var_name; + PyObject *var_default; + PyObject *var_cached; + uint64_t var_cached_tsid; + uint64_t var_cached_tsver; + Py_hash_t var_hash; +}; + + +struct _pycontexttokenobject { + PyObject_HEAD + PyContext *tok_ctx; + PyContextVar *tok_var; + PyObject *tok_oldval; + int tok_used; +}; + + +int _PyContext_Init(void); +void _PyContext_Fini(PyInterpreterState *interp); + +#endif /* !Py_INTERNAL_CONTEXT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_dtoa.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_dtoa.h new file mode 100644 index 0000000000..3faf8cf6b2 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_dtoa.h @@ -0,0 +1,23 @@ +#ifndef PY_NO_SHORT_FLOAT_REPR +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* These functions are used by modules compiled as C extension like math: + they must be exported. */ + +PyAPI_FUNC(double) _Py_dg_strtod(const char *str, char **ptr); +PyAPI_FUNC(char *) _Py_dg_dtoa(double d, int mode, int ndigits, + int *decpt, int *sign, char **rve); +PyAPI_FUNC(void) _Py_dg_freedtoa(char *s); +PyAPI_FUNC(double) _Py_dg_stdnan(int sign); +PyAPI_FUNC(double) _Py_dg_infinity(int sign); + +#ifdef __cplusplus +} +#endif +#endif /* !PY_NO_SHORT_FLOAT_REPR */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_fileutils.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_fileutils.h new file mode 100644 index 0000000000..c1c9244a1b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_fileutils.h @@ -0,0 +1,71 @@ +#ifndef Py_INTERNAL_FILEUTILS_H +#define Py_INTERNAL_FILEUTILS_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "Py_BUILD_CORE must be defined to include this header" +#endif + +#include /* struct lconv */ + +PyAPI_DATA(int) _Py_HasFileSystemDefaultEncodeErrors; + +PyAPI_FUNC(int) _Py_DecodeUTF8Ex( + const char *arg, + Py_ssize_t arglen, + wchar_t **wstr, + size_t *wlen, + const char **reason, + _Py_error_handler errors); + +PyAPI_FUNC(int) _Py_EncodeUTF8Ex( + const wchar_t *text, + char **str, + size_t *error_pos, + const char **reason, + int raw_malloc, + _Py_error_handler errors); + +PyAPI_FUNC(wchar_t*) _Py_DecodeUTF8_surrogateescape( + const char *arg, + Py_ssize_t arglen, + size_t *wlen); + +PyAPI_FUNC(int) _Py_GetForceASCII(void); + +/* Reset "force ASCII" mode (if it was initialized). + + This function should be called when Python changes the LC_CTYPE locale, + so the "force ASCII" mode can be detected again on the new locale + encoding. */ +PyAPI_FUNC(void) _Py_ResetForceASCII(void); + + +PyAPI_FUNC(int) _Py_GetLocaleconvNumeric( + struct lconv *lc, + PyObject **decimal_point, + PyObject **thousands_sep); + +PyAPI_FUNC(void) _Py_closerange(int first, int last); + +PyAPI_FUNC(wchar_t*) _Py_GetLocaleEncoding(void); +PyAPI_FUNC(PyObject*) _Py_GetLocaleEncodingObject(void); + +#ifdef HAVE_NON_UNICODE_WCHAR_T_REPRESENTATION +extern int _Py_LocaleUsesNonUnicodeWchar(void); + +extern wchar_t* _Py_DecodeNonUnicodeWchar( + const wchar_t* native, + Py_ssize_t size); + +extern int _Py_EncodeNonUnicodeWchar_InPlace( + wchar_t* unicode, + Py_ssize_t size); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_FILEUTILS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_format.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_format.h new file mode 100644 index 0000000000..1b8d57539c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_format.h @@ -0,0 +1,27 @@ +#ifndef Py_INTERNAL_FORMAT_H +#define Py_INTERNAL_FORMAT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* Format codes + * F_LJUST '-' + * F_SIGN '+' + * F_BLANK ' ' + * F_ALT '#' + * F_ZERO '0' + */ +#define F_LJUST (1<<0) +#define F_SIGN (1<<1) +#define F_BLANK (1<<2) +#define F_ALT (1<<3) +#define F_ZERO (1<<4) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_FORMAT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_gc.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_gc.h new file mode 100644 index 0000000000..9db4a4716f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_gc.h @@ -0,0 +1,181 @@ +#ifndef Py_INTERNAL_GC_H +#define Py_INTERNAL_GC_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* GC information is stored BEFORE the object structure. */ +typedef struct { + // Pointer to next object in the list. + // 0 means the object is not tracked + uintptr_t _gc_next; + + // Pointer to previous object in the list. + // Lowest two bits are used for flags documented later. + uintptr_t _gc_prev; +} PyGC_Head; + +#define _Py_AS_GC(o) ((PyGC_Head *)(o)-1) + +/* True if the object is currently tracked by the GC. */ +#define _PyObject_GC_IS_TRACKED(o) (_Py_AS_GC(o)->_gc_next != 0) + +/* True if the object may be tracked by the GC in the future, or already is. + This can be useful to implement some optimizations. */ +#define _PyObject_GC_MAY_BE_TRACKED(obj) \ + (PyObject_IS_GC(obj) && \ + (!PyTuple_CheckExact(obj) || _PyObject_GC_IS_TRACKED(obj))) + + +/* Bit flags for _gc_prev */ +/* Bit 0 is set when tp_finalize is called */ +#define _PyGC_PREV_MASK_FINALIZED (1) +/* Bit 1 is set when the object is in generation which is GCed currently. */ +#define _PyGC_PREV_MASK_COLLECTING (2) +/* The (N-2) most significant bits contain the real address. */ +#define _PyGC_PREV_SHIFT (2) +#define _PyGC_PREV_MASK (((uintptr_t) -1) << _PyGC_PREV_SHIFT) + +// Lowest bit of _gc_next is used for flags only in GC. +// But it is always 0 for normal code. +#define _PyGCHead_NEXT(g) ((PyGC_Head*)(g)->_gc_next) +#define _PyGCHead_SET_NEXT(g, p) ((g)->_gc_next = (uintptr_t)(p)) + +// Lowest two bits of _gc_prev is used for _PyGC_PREV_MASK_* flags. +#define _PyGCHead_PREV(g) ((PyGC_Head*)((g)->_gc_prev & _PyGC_PREV_MASK)) +#define _PyGCHead_SET_PREV(g, p) do { \ + assert(((uintptr_t)p & ~_PyGC_PREV_MASK) == 0); \ + (g)->_gc_prev = ((g)->_gc_prev & ~_PyGC_PREV_MASK) \ + | ((uintptr_t)(p)); \ + } while (0) + +#define _PyGCHead_FINALIZED(g) \ + (((g)->_gc_prev & _PyGC_PREV_MASK_FINALIZED) != 0) +#define _PyGCHead_SET_FINALIZED(g) \ + ((g)->_gc_prev |= _PyGC_PREV_MASK_FINALIZED) + +#define _PyGC_FINALIZED(o) \ + _PyGCHead_FINALIZED(_Py_AS_GC(o)) +#define _PyGC_SET_FINALIZED(o) \ + _PyGCHead_SET_FINALIZED(_Py_AS_GC(o)) + + +/* GC runtime state */ + +/* If we change this, we need to change the default value in the + signature of gc.collect. */ +#define NUM_GENERATIONS 3 +/* + NOTE: about untracking of mutable objects. + + Certain types of container cannot participate in a reference cycle, and + so do not need to be tracked by the garbage collector. Untracking these + objects reduces the cost of garbage collections. However, determining + which objects may be untracked is not free, and the costs must be + weighed against the benefits for garbage collection. + + There are two possible strategies for when to untrack a container: + + i) When the container is created. + ii) When the container is examined by the garbage collector. + + Tuples containing only immutable objects (integers, strings etc, and + recursively, tuples of immutable objects) do not need to be tracked. + The interpreter creates a large number of tuples, many of which will + not survive until garbage collection. It is therefore not worthwhile + to untrack eligible tuples at creation time. + + Instead, all tuples except the empty tuple are tracked when created. + During garbage collection it is determined whether any surviving tuples + can be untracked. A tuple can be untracked if all of its contents are + already not tracked. Tuples are examined for untracking in all garbage + collection cycles. It may take more than one cycle to untrack a tuple. + + Dictionaries containing only immutable objects also do not need to be + tracked. Dictionaries are untracked when created. If a tracked item is + inserted into a dictionary (either as a key or value), the dictionary + becomes tracked. During a full garbage collection (all generations), + the collector will untrack any dictionaries whose contents are not + tracked. + + The module provides the python function is_tracked(obj), which returns + the CURRENT tracking status of the object. Subsequent garbage + collections may change the tracking status of the object. + + Untracking of certain containers was introduced in issue #4688, and + the algorithm was refined in response to issue #14775. +*/ + +struct gc_generation { + PyGC_Head head; + int threshold; /* collection threshold */ + int count; /* count of allocations or collections of younger + generations */ +}; + +/* Running stats per generation */ +struct gc_generation_stats { + /* total number of collections */ + Py_ssize_t collections; + /* total number of collected objects */ + Py_ssize_t collected; + /* total number of uncollectable objects (put into gc.garbage) */ + Py_ssize_t uncollectable; +}; + +struct _gc_runtime_state { + /* List of objects that still need to be cleaned up, singly linked + * via their gc headers' gc_prev pointers. */ + PyObject *trash_delete_later; + /* Current call-stack depth of tp_dealloc calls. */ + int trash_delete_nesting; + + int enabled; + int debug; + /* linked lists of container objects */ + struct gc_generation generations[NUM_GENERATIONS]; + PyGC_Head *generation0; + /* a permanent generation which won't be collected */ + struct gc_generation permanent_generation; + struct gc_generation_stats generation_stats[NUM_GENERATIONS]; + /* true if we are currently running the collector */ + int collecting; + /* list of uncollectable objects */ + PyObject *garbage; + /* a list of callbacks to be invoked when collection is performed */ + PyObject *callbacks; + /* This is the number of objects that survived the last full + collection. It approximates the number of long lived objects + tracked by the GC. + + (by "full collection", we mean a collection of the oldest + generation). */ + Py_ssize_t long_lived_total; + /* This is the number of objects that survived all "non-full" + collections, and are awaiting to undergo a full collection for + the first time. */ + Py_ssize_t long_lived_pending; +}; + +extern void _PyGC_InitState(struct _gc_runtime_state *); + +extern Py_ssize_t _PyGC_CollectNoFail(PyThreadState *tstate); + + +// Functions to clear types free lists +extern void _PyFrame_ClearFreeList(PyInterpreterState *interp); +extern void _PyTuple_ClearFreeList(PyInterpreterState *interp); +extern void _PyFloat_ClearFreeList(PyInterpreterState *interp); +extern void _PyList_ClearFreeList(PyInterpreterState *interp); +extern void _PyDict_ClearFreeList(PyInterpreterState *interp); +extern void _PyAsyncGen_ClearFreeLists(PyInterpreterState *interp); +extern void _PyContext_ClearFreeList(PyInterpreterState *interp); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_GC_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_getopt.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_getopt.h new file mode 100644 index 0000000000..7f0dd13ae5 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_getopt.h @@ -0,0 +1,22 @@ +#ifndef Py_INTERNAL_PYGETOPT_H +#define Py_INTERNAL_PYGETOPT_H + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +extern int _PyOS_opterr; +extern Py_ssize_t _PyOS_optind; +extern const wchar_t *_PyOS_optarg; + +extern void _PyOS_ResetGetOpt(void); + +typedef struct { + const wchar_t *name; + int has_arg; + int val; +} _PyOS_LongOption; + +extern int _PyOS_GetOpt(Py_ssize_t argc, wchar_t * const *argv, int *longindex); + +#endif /* !Py_INTERNAL_PYGETOPT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_gil.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_gil.h new file mode 100644 index 0000000000..8ebad37b68 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_gil.h @@ -0,0 +1,50 @@ +#ifndef Py_INTERNAL_GIL_H +#define Py_INTERNAL_GIL_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_atomic.h" /* _Py_atomic_address */ +#include "pycore_condvar.h" /* PyCOND_T */ + +#ifndef Py_HAVE_CONDVAR +# error You need either a POSIX-compatible or a Windows system! +#endif + +/* Enable if you want to force the switching of threads at least + every `interval`. */ +#undef FORCE_SWITCHING +#define FORCE_SWITCHING + +struct _gil_runtime_state { + /* microseconds (the Python API uses seconds, though) */ + unsigned long interval; + /* Last PyThreadState holding / having held the GIL. This helps us + know whether anyone else was scheduled after we dropped the GIL. */ + _Py_atomic_address last_holder; + /* Whether the GIL is already taken (-1 if uninitialized). This is + atomic because it can be read without any lock taken in ceval.c. */ + _Py_atomic_int locked; + /* Number of GIL switches since the beginning. */ + unsigned long switch_number; + /* This condition variable allows one or several threads to wait + until the GIL is released. In addition, the mutex also protects + the above variables. */ + PyCOND_T cond; + PyMUTEX_T mutex; +#ifdef FORCE_SWITCHING + /* This condition variable helps the GIL-releasing thread wait for + a GIL-awaiting thread to be scheduled and take the GIL. */ + PyCOND_T switch_cond; + PyMUTEX_T switch_mutex; +#endif +}; + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_GIL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_hamt.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_hamt.h new file mode 100644 index 0000000000..357d966162 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_hamt.h @@ -0,0 +1,128 @@ +#ifndef Py_INTERNAL_HAMT_H +#define Py_INTERNAL_HAMT_H + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + + +/* +HAMT tree is shaped by hashes of keys. Every group of 5 bits of a hash denotes +the exact position of the key in one level of the tree. Since we're using +32 bit hashes, we can have at most 7 such levels. Although if there are +two distinct keys with equal hashes, they will have to occupy the same +cell in the 7th level of the tree -- so we'd put them in a "collision" node. +Which brings the total possible tree depth to 8. Read more about the actual +layout of the HAMT tree in `hamt.c`. + +This constant is used to define a datastucture for storing iteration state. +*/ +#define _Py_HAMT_MAX_TREE_DEPTH 8 + + +#define PyHamt_Check(o) Py_IS_TYPE(o, &_PyHamt_Type) + + +/* Abstract tree node. */ +typedef struct { + PyObject_HEAD +} PyHamtNode; + + +/* An HAMT immutable mapping collection. */ +typedef struct { + PyObject_HEAD + PyHamtNode *h_root; + PyObject *h_weakreflist; + Py_ssize_t h_count; +} PyHamtObject; + + +/* A struct to hold the state of depth-first traverse of the tree. + + HAMT is an immutable collection. Iterators will hold a strong reference + to it, and every node in the HAMT has strong references to its children. + + So for iterators, we can implement zero allocations and zero reference + inc/dec depth-first iteration. + + - i_nodes: an array of seven pointers to tree nodes + - i_level: the current node in i_nodes + - i_pos: an array of positions within nodes in i_nodes. +*/ +typedef struct { + PyHamtNode *i_nodes[_Py_HAMT_MAX_TREE_DEPTH]; + Py_ssize_t i_pos[_Py_HAMT_MAX_TREE_DEPTH]; + int8_t i_level; +} PyHamtIteratorState; + + +/* Base iterator object. + + Contains the iteration state, a pointer to the HAMT tree, + and a pointer to the 'yield function'. The latter is a simple + function that returns a key/value tuple for the 'Items' iterator, + just a key for the 'Keys' iterator, and a value for the 'Values' + iterator. +*/ +typedef struct { + PyObject_HEAD + PyHamtObject *hi_obj; + PyHamtIteratorState hi_iter; + binaryfunc hi_yield; +} PyHamtIterator; + + +PyAPI_DATA(PyTypeObject) _PyHamt_Type; +PyAPI_DATA(PyTypeObject) _PyHamt_ArrayNode_Type; +PyAPI_DATA(PyTypeObject) _PyHamt_BitmapNode_Type; +PyAPI_DATA(PyTypeObject) _PyHamt_CollisionNode_Type; +PyAPI_DATA(PyTypeObject) _PyHamtKeys_Type; +PyAPI_DATA(PyTypeObject) _PyHamtValues_Type; +PyAPI_DATA(PyTypeObject) _PyHamtItems_Type; + + +/* Create a new HAMT immutable mapping. */ +PyHamtObject * _PyHamt_New(void); + +/* Return a new collection based on "o", but with an additional + key/val pair. */ +PyHamtObject * _PyHamt_Assoc(PyHamtObject *o, PyObject *key, PyObject *val); + +/* Return a new collection based on "o", but without "key". */ +PyHamtObject * _PyHamt_Without(PyHamtObject *o, PyObject *key); + +/* Find "key" in the "o" collection. + + Return: + - -1: An error occurred. + - 0: "key" wasn't found in "o". + - 1: "key" is in "o"; "*val" is set to its value (a borrowed ref). +*/ +int _PyHamt_Find(PyHamtObject *o, PyObject *key, PyObject **val); + +/* Check if "v" is equal to "w". + + Return: + - 0: v != w + - 1: v == w + - -1: An error occurred. +*/ +int _PyHamt_Eq(PyHamtObject *v, PyHamtObject *w); + +/* Return the size of "o"; equivalent of "len(o)". */ +Py_ssize_t _PyHamt_Len(PyHamtObject *o); + +/* Return a Keys iterator over "o". */ +PyObject * _PyHamt_NewIterKeys(PyHamtObject *o); + +/* Return a Values iterator over "o". */ +PyObject * _PyHamt_NewIterValues(PyHamtObject *o); + +/* Return a Items iterator over "o". */ +PyObject * _PyHamt_NewIterItems(PyHamtObject *o); + +int _PyHamt_Init(void); +void _PyHamt_Fini(void); + +#endif /* !Py_INTERNAL_HAMT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_hashtable.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_hashtable.h new file mode 100644 index 0000000000..18757abc28 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_hashtable.h @@ -0,0 +1,148 @@ +#ifndef Py_INTERNAL_HASHTABLE_H +#define Py_INTERNAL_HASHTABLE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* Single linked list */ + +typedef struct _Py_slist_item_s { + struct _Py_slist_item_s *next; +} _Py_slist_item_t; + +typedef struct { + _Py_slist_item_t *head; +} _Py_slist_t; + +#define _Py_SLIST_ITEM_NEXT(ITEM) (((_Py_slist_item_t *)ITEM)->next) + +#define _Py_SLIST_HEAD(SLIST) (((_Py_slist_t *)SLIST)->head) + + +/* _Py_hashtable: table entry */ + +typedef struct { + /* used by _Py_hashtable_t.buckets to link entries */ + _Py_slist_item_t _Py_slist_item; + + Py_uhash_t key_hash; + void *key; + void *value; +} _Py_hashtable_entry_t; + + +/* _Py_hashtable: prototypes */ + +/* Forward declaration */ +struct _Py_hashtable_t; +typedef struct _Py_hashtable_t _Py_hashtable_t; + +typedef Py_uhash_t (*_Py_hashtable_hash_func) (const void *key); +typedef int (*_Py_hashtable_compare_func) (const void *key1, const void *key2); +typedef void (*_Py_hashtable_destroy_func) (void *key); +typedef _Py_hashtable_entry_t* (*_Py_hashtable_get_entry_func)(_Py_hashtable_t *ht, + const void *key); + +typedef struct { + // Allocate a memory block + void* (*malloc) (size_t size); + + // Release a memory block + void (*free) (void *ptr); +} _Py_hashtable_allocator_t; + + +/* _Py_hashtable: table */ +struct _Py_hashtable_t { + size_t nentries; // Total number of entries in the table + size_t nbuckets; + _Py_slist_t *buckets; + + _Py_hashtable_get_entry_func get_entry_func; + _Py_hashtable_hash_func hash_func; + _Py_hashtable_compare_func compare_func; + _Py_hashtable_destroy_func key_destroy_func; + _Py_hashtable_destroy_func value_destroy_func; + _Py_hashtable_allocator_t alloc; +}; + +/* Hash a pointer (void*) */ +PyAPI_FUNC(Py_uhash_t) _Py_hashtable_hash_ptr(const void *key); + +/* Comparison using memcmp() */ +PyAPI_FUNC(int) _Py_hashtable_compare_direct( + const void *key1, + const void *key2); + +PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_new( + _Py_hashtable_hash_func hash_func, + _Py_hashtable_compare_func compare_func); + +PyAPI_FUNC(_Py_hashtable_t *) _Py_hashtable_new_full( + _Py_hashtable_hash_func hash_func, + _Py_hashtable_compare_func compare_func, + _Py_hashtable_destroy_func key_destroy_func, + _Py_hashtable_destroy_func value_destroy_func, + _Py_hashtable_allocator_t *allocator); + +PyAPI_FUNC(void) _Py_hashtable_destroy(_Py_hashtable_t *ht); + +PyAPI_FUNC(void) _Py_hashtable_clear(_Py_hashtable_t *ht); + +typedef int (*_Py_hashtable_foreach_func) (_Py_hashtable_t *ht, + const void *key, const void *value, + void *user_data); + +/* Call func() on each entry of the hashtable. + Iteration stops if func() result is non-zero, in this case it's the result + of the call. Otherwise, the function returns 0. */ +PyAPI_FUNC(int) _Py_hashtable_foreach( + _Py_hashtable_t *ht, + _Py_hashtable_foreach_func func, + void *user_data); + +PyAPI_FUNC(size_t) _Py_hashtable_size(const _Py_hashtable_t *ht); + +/* Add a new entry to the hash. The key must not be present in the hash table. + Return 0 on success, -1 on memory error. */ +PyAPI_FUNC(int) _Py_hashtable_set( + _Py_hashtable_t *ht, + const void *key, + void *value); + + +/* Get an entry. + Return NULL if the key does not exist. */ +static inline _Py_hashtable_entry_t * +_Py_hashtable_get_entry(_Py_hashtable_t *ht, const void *key) +{ + return ht->get_entry_func(ht, key); +} + + +/* Get value from an entry. + Return NULL if the entry is not found. + + Use _Py_hashtable_get_entry() to distinguish entry value equal to NULL + and entry not found. */ +PyAPI_FUNC(void*) _Py_hashtable_get(_Py_hashtable_t *ht, const void *key); + + +/* Remove a key and its associated value without calling key and value destroy + functions. + + Return the removed value if the key was found. + Return NULL if the key was not found. */ +PyAPI_FUNC(void*) _Py_hashtable_steal( + _Py_hashtable_t *ht, + const void *key); + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_HASHTABLE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_import.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_import.h new file mode 100644 index 0000000000..e21ed0a7a0 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_import.h @@ -0,0 +1,17 @@ +#ifndef Py_LIMITED_API +#ifndef Py_INTERNAL_IMPORT_H +#define Py_INTERNAL_IMPORT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef HAVE_FORK +extern PyStatus _PyImport_ReInitLock(void); +#endif +extern PyObject* _PyImport_BootstrapImp(PyThreadState *tstate); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_IMPORT_H */ +#endif /* !Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_initconfig.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_initconfig.h new file mode 100644 index 0000000000..21c71bfa9d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_initconfig.h @@ -0,0 +1,178 @@ +#ifndef Py_INTERNAL_CORECONFIG_H +#define Py_INTERNAL_CORECONFIG_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* Forward declaration */ +struct pyruntimestate; + +/* --- PyStatus ----------------------------------------------- */ + +/* Almost all errors causing Python initialization to fail */ +#ifdef _MSC_VER + /* Visual Studio 2015 doesn't implement C99 __func__ in C */ +# define _PyStatus_GET_FUNC() __FUNCTION__ +#else +# define _PyStatus_GET_FUNC() __func__ +#endif + +#define _PyStatus_OK() \ + (PyStatus){._type = _PyStatus_TYPE_OK,} + /* other fields are set to 0 */ +#define _PyStatus_ERR(ERR_MSG) \ + (PyStatus){ \ + ._type = _PyStatus_TYPE_ERROR, \ + .func = _PyStatus_GET_FUNC(), \ + .err_msg = (ERR_MSG)} + /* other fields are set to 0 */ +#define _PyStatus_NO_MEMORY() _PyStatus_ERR("memory allocation failed") +#define _PyStatus_EXIT(EXITCODE) \ + (PyStatus){ \ + ._type = _PyStatus_TYPE_EXIT, \ + .exitcode = (EXITCODE)} +#define _PyStatus_IS_ERROR(err) \ + (err._type == _PyStatus_TYPE_ERROR) +#define _PyStatus_IS_EXIT(err) \ + (err._type == _PyStatus_TYPE_EXIT) +#define _PyStatus_EXCEPTION(err) \ + (err._type != _PyStatus_TYPE_OK) +#define _PyStatus_UPDATE_FUNC(err) \ + do { err.func = _PyStatus_GET_FUNC(); } while (0) + +PyObject* _PyErr_SetFromPyStatus(PyStatus status); + +/* --- PyWideStringList ------------------------------------------------ */ + +#define _PyWideStringList_INIT (PyWideStringList){.length = 0, .items = NULL} + +#ifndef NDEBUG +PyAPI_FUNC(int) _PyWideStringList_CheckConsistency(const PyWideStringList *list); +#endif +PyAPI_FUNC(void) _PyWideStringList_Clear(PyWideStringList *list); +PyAPI_FUNC(int) _PyWideStringList_Copy(PyWideStringList *list, + const PyWideStringList *list2); +PyAPI_FUNC(PyStatus) _PyWideStringList_Extend(PyWideStringList *list, + const PyWideStringList *list2); +PyAPI_FUNC(PyObject*) _PyWideStringList_AsList(const PyWideStringList *list); + + +/* --- _PyArgv ---------------------------------------------------- */ + +typedef struct _PyArgv { + Py_ssize_t argc; + int use_bytes_argv; + char * const *bytes_argv; + wchar_t * const *wchar_argv; +} _PyArgv; + +PyAPI_FUNC(PyStatus) _PyArgv_AsWstrList(const _PyArgv *args, + PyWideStringList *list); + + +/* --- Helper functions ------------------------------------------- */ + +PyAPI_FUNC(int) _Py_str_to_int( + const char *str, + int *result); +PyAPI_FUNC(const wchar_t*) _Py_get_xoption( + const PyWideStringList *xoptions, + const wchar_t *name); +PyAPI_FUNC(const char*) _Py_GetEnv( + int use_environment, + const char *name); +PyAPI_FUNC(void) _Py_get_env_flag( + int use_environment, + int *flag, + const char *name); + +/* Py_GetArgcArgv() helper */ +PyAPI_FUNC(void) _Py_ClearArgcArgv(void); + + +/* --- _PyPreCmdline ------------------------------------------------- */ + +typedef struct { + PyWideStringList argv; + PyWideStringList xoptions; /* "-X value" option */ + int isolated; /* -I option */ + int use_environment; /* -E option */ + int dev_mode; /* -X dev and PYTHONDEVMODE */ + int warn_default_encoding; /* -X warn_default_encoding and PYTHONWARNDEFAULTENCODING */ +} _PyPreCmdline; + +#define _PyPreCmdline_INIT \ + (_PyPreCmdline){ \ + .use_environment = -1, \ + .isolated = -1, \ + .dev_mode = -1} +/* Note: _PyPreCmdline_INIT sets other fields to 0/NULL */ + +extern void _PyPreCmdline_Clear(_PyPreCmdline *cmdline); +extern PyStatus _PyPreCmdline_SetArgv(_PyPreCmdline *cmdline, + const _PyArgv *args); +extern PyStatus _PyPreCmdline_SetConfig( + const _PyPreCmdline *cmdline, + PyConfig *config); +extern PyStatus _PyPreCmdline_Read(_PyPreCmdline *cmdline, + const PyPreConfig *preconfig); + + +/* --- PyPreConfig ----------------------------------------------- */ + +PyAPI_FUNC(void) _PyPreConfig_InitCompatConfig(PyPreConfig *preconfig); +extern void _PyPreConfig_InitFromConfig( + PyPreConfig *preconfig, + const PyConfig *config); +extern PyStatus _PyPreConfig_InitFromPreConfig( + PyPreConfig *preconfig, + const PyPreConfig *config2); +extern PyObject* _PyPreConfig_AsDict(const PyPreConfig *preconfig); +extern void _PyPreConfig_GetConfig(PyPreConfig *preconfig, + const PyConfig *config); +extern PyStatus _PyPreConfig_Read(PyPreConfig *preconfig, + const _PyArgv *args); +extern PyStatus _PyPreConfig_Write(const PyPreConfig *preconfig); + + +/* --- PyConfig ---------------------------------------------- */ + +typedef enum { + /* Py_Initialize() API: backward compatibility with Python 3.6 and 3.7 */ + _PyConfig_INIT_COMPAT = 1, + _PyConfig_INIT_PYTHON = 2, + _PyConfig_INIT_ISOLATED = 3 +} _PyConfigInitEnum; + +PyAPI_FUNC(void) _PyConfig_InitCompatConfig(PyConfig *config); +extern PyStatus _PyConfig_Copy( + PyConfig *config, + const PyConfig *config2); +extern PyStatus _PyConfig_InitPathConfig( + PyConfig *config, + int compute_path_config); +extern PyStatus _PyConfig_Read(PyConfig *config, int compute_path_config); +extern PyStatus _PyConfig_Write(const PyConfig *config, + struct pyruntimestate *runtime); +extern PyStatus _PyConfig_SetPyArgv( + PyConfig *config, + const _PyArgv *args); + +PyAPI_FUNC(PyObject*) _PyConfig_AsDict(const PyConfig *config); +PyAPI_FUNC(int) _PyConfig_FromDict(PyConfig *config, PyObject *dict); + +extern int _Py_global_config_int_max_str_digits; + + +/* --- Function used for testing ---------------------------------- */ + +PyAPI_FUNC(PyObject*) _Py_GetConfigsAsDict(void); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_CORECONFIG_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_interp.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_interp.h new file mode 100644 index 0000000000..a564b1256c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_interp.h @@ -0,0 +1,339 @@ +#ifndef Py_INTERNAL_INTERP_H +#define Py_INTERNAL_INTERP_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_atomic.h" // _Py_atomic_address +#include "pycore_ast_state.h" // struct ast_state +#include "pycore_gil.h" // struct _gil_runtime_state +#include "pycore_gc.h" // struct _gc_runtime_state +#include "pycore_warnings.h" // struct _warnings_runtime_state + +struct _pending_calls { + PyThread_type_lock lock; + /* Request for running pending calls. */ + _Py_atomic_int calls_to_do; + /* Request for looking at the `async_exc` field of the current + thread state. + Guarded by the GIL. */ + int async_exc; +#define NPENDINGCALLS 32 + struct { + int (*func)(void *); + void *arg; + } calls[NPENDINGCALLS]; + int first; + int last; +}; + +struct _ceval_state { + int recursion_limit; + /* This single variable consolidates all requests to break out of + the fast path in the eval loop. */ + _Py_atomic_int eval_breaker; + /* Request for dropping the GIL */ + _Py_atomic_int gil_drop_request; + struct _pending_calls pending; +#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS + struct _gil_runtime_state gil; +#endif +}; + +/* fs_codec.encoding is initialized to NULL. + Later, it is set to a non-NULL string by _PyUnicode_InitEncodings(). */ +struct _Py_unicode_fs_codec { + char *encoding; // Filesystem encoding (encoded to UTF-8) + int utf8; // encoding=="utf-8"? + char *errors; // Filesystem errors (encoded to UTF-8) + _Py_error_handler error_handler; +}; + +struct _Py_bytes_state { + PyObject *empty_string; + PyBytesObject *characters[256]; +}; + +struct _Py_unicode_ids { + Py_ssize_t size; + PyObject **array; +}; + +struct _Py_unicode_state { + // The empty Unicode object is a singleton to improve performance. + PyObject *empty_string; + /* Single character Unicode strings in the Latin-1 range are being + shared as well. */ + PyObject *latin1[256]; + struct _Py_unicode_fs_codec fs_codec; + + // Unused member kept for ABI backward compatibility with Python 3.10.0: + // see bpo-46006. + PyObject *unused_interned; + + // Unicode identifiers (_Py_Identifier): see _PyUnicode_FromId() + struct _Py_unicode_ids ids; +}; + +struct _Py_float_state { + /* Special free list + free_list is a singly-linked list of available PyFloatObjects, + linked via abuse of their ob_type members. */ + int numfree; + PyFloatObject *free_list; +}; + +/* Speed optimization to avoid frequent malloc/free of small tuples */ +#ifndef PyTuple_MAXSAVESIZE + // Largest tuple to save on free list +# define PyTuple_MAXSAVESIZE 20 +#endif +#ifndef PyTuple_MAXFREELIST + // Maximum number of tuples of each size to save +# define PyTuple_MAXFREELIST 2000 +#endif + +struct _Py_tuple_state { +#if PyTuple_MAXSAVESIZE > 0 + /* Entries 1 up to PyTuple_MAXSAVESIZE are free lists, + entry 0 is the empty tuple () of which at most one instance + will be allocated. */ + PyTupleObject *free_list[PyTuple_MAXSAVESIZE]; + int numfree[PyTuple_MAXSAVESIZE]; +#endif +}; + +/* Empty list reuse scheme to save calls to malloc and free */ +#ifndef PyList_MAXFREELIST +# define PyList_MAXFREELIST 80 +#endif + +struct _Py_list_state { + PyListObject *free_list[PyList_MAXFREELIST]; + int numfree; +}; + +#ifndef PyDict_MAXFREELIST +# define PyDict_MAXFREELIST 80 +#endif + +struct _Py_dict_state { + /* Dictionary reuse scheme to save calls to malloc and free */ + PyDictObject *free_list[PyDict_MAXFREELIST]; + int numfree; + PyDictKeysObject *keys_free_list[PyDict_MAXFREELIST]; + int keys_numfree; +}; + +struct _Py_frame_state { + PyFrameObject *free_list; + /* number of frames currently in free_list */ + int numfree; +}; + +#ifndef _PyAsyncGen_MAXFREELIST +# define _PyAsyncGen_MAXFREELIST 80 +#endif + +struct _Py_async_gen_state { + /* Freelists boost performance 6-10%; they also reduce memory + fragmentation, as _PyAsyncGenWrappedValue and PyAsyncGenASend + are short-living objects that are instantiated for every + __anext__() call. */ + struct _PyAsyncGenWrappedValue* value_freelist[_PyAsyncGen_MAXFREELIST]; + int value_numfree; + + struct PyAsyncGenASend* asend_freelist[_PyAsyncGen_MAXFREELIST]; + int asend_numfree; +}; + +struct _Py_context_state { + // List of free PyContext objects + PyContext *freelist; + int numfree; +}; + +struct _Py_exc_state { + // The dict mapping from errno codes to OSError subclasses + PyObject *errnomap; + PyBaseExceptionObject *memerrors_freelist; + int memerrors_numfree; +}; + + +// atexit state +typedef struct { + PyObject *func; + PyObject *args; + PyObject *kwargs; +} atexit_callback; + +struct atexit_state { + atexit_callback **callbacks; + int ncallbacks; + int callback_len; +}; + + +// Type attribute lookup cache: speed up attribute and method lookups, +// see _PyType_Lookup(). +struct type_cache_entry { + unsigned int version; // initialized from type->tp_version_tag + PyObject *name; // reference to exactly a str or None + PyObject *value; // borrowed reference or NULL +}; + +#define MCACHE_SIZE_EXP 12 +#define MCACHE_STATS 0 + +struct type_cache { + struct type_cache_entry hashtable[1 << MCACHE_SIZE_EXP]; +#if MCACHE_STATS + size_t hits; + size_t misses; + size_t collisions; +#endif +}; + + +/* interpreter state */ + +#define _PY_NSMALLPOSINTS 257 +#define _PY_NSMALLNEGINTS 5 + +// _PyLong_GetZero() and _PyLong_GetOne() must always be available +#if _PY_NSMALLPOSINTS < 2 +# error "_PY_NSMALLPOSINTS must be greater than 1" +#endif + +// The PyInterpreterState typedef is in Include/pystate.h. +struct _is { + + struct _is *next; + struct _ts *tstate_head; + + /* Reference to the _PyRuntime global variable. This field exists + to not have to pass runtime in addition to tstate to a function. + Get runtime from tstate: tstate->interp->runtime. */ + struct pyruntimestate *runtime; + + int64_t id; + int64_t id_refcount; + int requires_idref; + PyThread_type_lock id_mutex; + + int finalizing; + + struct _ceval_state ceval; + struct _gc_runtime_state gc; + + // sys.modules dictionary + PyObject *modules; + PyObject *modules_by_index; + // Dictionary of the sys module + PyObject *sysdict; + // Dictionary of the builtins module + PyObject *builtins; + // importlib module + PyObject *importlib; + + /* Used in Modules/_threadmodule.c. */ + long num_threads; + /* Support for runtime thread stack size tuning. + A value of 0 means using the platform's default stack size + or the size specified by the THREAD_STACK_SIZE macro. */ + /* Used in Python/thread.c. */ + size_t pythread_stacksize; + + PyObject *codec_search_path; + PyObject *codec_search_cache; + PyObject *codec_error_registry; + int codecs_initialized; + + PyConfig config; +#ifdef HAVE_DLOPEN + int dlopenflags; +#endif + + PyObject *dict; /* Stores per-interpreter state */ + + PyObject *builtins_copy; + PyObject *import_func; + // Initialized to _PyEval_EvalFrameDefault(). + _PyFrameEvalFunction eval_frame; + + Py_ssize_t co_extra_user_count; + freefunc co_extra_freefuncs[MAX_CO_EXTRA_USERS]; + +#ifdef HAVE_FORK + PyObject *before_forkers; + PyObject *after_forkers_parent; + PyObject *after_forkers_child; +#endif + + uint64_t tstate_next_unique_id; + + struct _warnings_runtime_state warnings; + struct atexit_state atexit; + + PyObject *audit_hooks; + + /* Small integers are preallocated in this array so that they + can be shared. + The integers that are preallocated are those in the range + -_PY_NSMALLNEGINTS (inclusive) to _PY_NSMALLPOSINTS (not inclusive). + */ + PyLongObject* small_ints[_PY_NSMALLNEGINTS + _PY_NSMALLPOSINTS]; + struct _Py_bytes_state bytes; + struct _Py_unicode_state unicode; + struct _Py_float_state float_state; + /* Using a cache is very effective since typically only a single slice is + created and then deleted again. */ + PySliceObject *slice_cache; + + struct _Py_tuple_state tuple; + struct _Py_list_state list; + struct _Py_dict_state dict_state; + struct _Py_frame_state frame; + struct _Py_async_gen_state async_gen; + struct _Py_context_state context; + struct _Py_exc_state exc_state; + + struct ast_state ast; + struct type_cache type_cache; + + int int_max_str_digits; +}; + +extern void _PyInterpreterState_ClearModules(PyInterpreterState *interp); +extern void _PyInterpreterState_Clear(PyThreadState *tstate); + + +/* cross-interpreter data registry */ + +/* For now we use a global registry of shareable classes. An + alternative would be to add a tp_* slot for a class's + crossinterpdatafunc. It would be simpler and more efficient. */ + +struct _xidregitem; + +struct _xidregitem { + PyTypeObject *cls; + crossinterpdatafunc getdata; + struct _xidregitem *next; +}; + +PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(int64_t); + +PyAPI_FUNC(int) _PyInterpreterState_IDInitref(struct _is *); +PyAPI_FUNC(int) _PyInterpreterState_IDIncref(struct _is *); +PyAPI_FUNC(void) _PyInterpreterState_IDDecref(struct _is *); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_INTERP_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_list.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_list.h new file mode 100644 index 0000000000..f18fb052c4 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_list.h @@ -0,0 +1,20 @@ +#ifndef Py_INTERNAL_LIST_H +#define Py_INTERNAL_LIST_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "listobject.h" // _PyList_CAST() + + +#define _PyList_ITEMS(op) (_PyList_CAST(op)->ob_item) + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_LIST_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_long.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_long.h new file mode 100644 index 0000000000..90069f8ed7 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_long.h @@ -0,0 +1,75 @@ +#ifndef Py_INTERNAL_LONG_H +#define Py_INTERNAL_LONG_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_interp.h" // PyInterpreterState.small_ints +#include "pycore_pystate.h" // _PyThreadState_GET() + +/* + * Default int base conversion size limitation: Denial of Service prevention. + * + * Chosen such that this isn't wildly slow on modern hardware and so that + * everyone's existing deployed numpy test suite passes before + * https://github.com/numpy/numpy/issues/22098 is widely available. + * + * $ python -m timeit -s 's = "1"*4300' 'int(s)' + * 2000 loops, best of 5: 125 usec per loop + * $ python -m timeit -s 's = "1"*4300; v = int(s)' 'str(v)' + * 1000 loops, best of 5: 311 usec per loop + * (zen2 cloud VM) + * + * 4300 decimal digits fits a ~14284 bit number. + */ +#define _PY_LONG_DEFAULT_MAX_STR_DIGITS 4300 +/* + * Threshold for max digits check. For performance reasons int() and + * int.__str__() don't checks values that are smaller than this + * threshold. Acts as a guaranteed minimum size limit for bignums that + * applications can expect from CPython. + * + * % python -m timeit -s 's = "1"*640; v = int(s)' 'str(int(s))' + * 20000 loops, best of 5: 12 usec per loop + * + * "640 digits should be enough for anyone." - gps + * fits a ~2126 bit decimal number. + */ +#define _PY_LONG_MAX_STR_DIGITS_THRESHOLD 640 + +#if ((_PY_LONG_DEFAULT_MAX_STR_DIGITS != 0) && \ + (_PY_LONG_DEFAULT_MAX_STR_DIGITS < _PY_LONG_MAX_STR_DIGITS_THRESHOLD)) +# error "_PY_LONG_DEFAULT_MAX_STR_DIGITS smaller than threshold." +#endif + +// Don't call this function but _PyLong_GetZero() and _PyLong_GetOne() +static inline PyObject* __PyLong_GetSmallInt_internal(int value) +{ + PyInterpreterState *interp = _PyInterpreterState_GET(); + assert(-_PY_NSMALLNEGINTS <= value && value < _PY_NSMALLPOSINTS); + size_t index = _PY_NSMALLNEGINTS + value; + PyObject *obj = (PyObject*)interp->small_ints[index]; + // _PyLong_GetZero(), _PyLong_GetOne() and get_small_int() must not be + // called before _PyLong_Init() nor after _PyLong_Fini(). + assert(obj != NULL); + return obj; +} + +// Return a borrowed reference to the zero singleton. +// The function cannot return NULL. +static inline PyObject* _PyLong_GetZero(void) +{ return __PyLong_GetSmallInt_internal(0); } + +// Return a borrowed reference to the one singleton. +// The function cannot return NULL. +static inline PyObject* _PyLong_GetOne(void) +{ return __PyLong_GetSmallInt_internal(1); } + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_LONG_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_moduleobject.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_moduleobject.h new file mode 100644 index 0000000000..e9978abd25 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_moduleobject.h @@ -0,0 +1,42 @@ +#ifndef Py_INTERNAL_MODULEOBJECT_H +#define Py_INTERNAL_MODULEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +typedef struct { + PyObject_HEAD + PyObject *md_dict; + struct PyModuleDef *md_def; + void *md_state; + PyObject *md_weaklist; + // for logging purposes after md_dict is cleared + PyObject *md_name; +} PyModuleObject; + +static inline PyModuleDef* _PyModule_GetDef(PyObject *mod) { + assert(PyModule_Check(mod)); + return ((PyModuleObject *)mod)->md_def; +} + +static inline void* _PyModule_GetState(PyObject* mod) { + assert(PyModule_Check(mod)); + return ((PyModuleObject *)mod)->md_state; +} + +static inline PyObject* _PyModule_GetDict(PyObject *mod) { + assert(PyModule_Check(mod)); + PyObject *dict = ((PyModuleObject *)mod) -> md_dict; + // _PyModule_GetDict(mod) must not be used after calling module_clear(mod) + assert(dict != NULL); + return dict; +} + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_MODULEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_object.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_object.h new file mode 100644 index 0000000000..90d98134b8 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_object.h @@ -0,0 +1,186 @@ +#ifndef Py_INTERNAL_OBJECT_H +#define Py_INTERNAL_OBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_gc.h" // _PyObject_GC_IS_TRACKED() +#include "pycore_interp.h" // PyInterpreterState.gc +#include "pycore_pystate.h" // _PyInterpreterState_GET() + +PyAPI_FUNC(int) _PyType_CheckConsistency(PyTypeObject *type); +PyAPI_FUNC(int) _PyDict_CheckConsistency(PyObject *mp, int check_content); + +/* Update the Python traceback of an object. This function must be called + when a memory block is reused from a free list. + + Internal function called by _Py_NewReference(). */ +extern int _PyTraceMalloc_NewReference(PyObject *op); + +// Fast inlined version of PyType_HasFeature() +static inline int +_PyType_HasFeature(PyTypeObject *type, unsigned long feature) { + return ((type->tp_flags & feature) != 0); +} + +extern void _PyType_InitCache(PyInterpreterState *interp); + +/* Only private in Python 3.10 and 3.9.8+; public in 3.11 */ +extern PyObject *_PyType_GetQualName(PyTypeObject *type); + +/* Inline functions trading binary compatibility for speed: + _PyObject_Init() is the fast version of PyObject_Init(), and + _PyObject_InitVar() is the fast version of PyObject_InitVar(). + + These inline functions must not be called with op=NULL. */ +static inline void +_PyObject_Init(PyObject *op, PyTypeObject *typeobj) +{ + assert(op != NULL); + Py_SET_TYPE(op, typeobj); + if (_PyType_HasFeature(typeobj, Py_TPFLAGS_HEAPTYPE)) { + Py_INCREF(typeobj); + } + _Py_NewReference(op); +} + +static inline void +_PyObject_InitVar(PyVarObject *op, PyTypeObject *typeobj, Py_ssize_t size) +{ + assert(op != NULL); + Py_SET_SIZE(op, size); + _PyObject_Init((PyObject *)op, typeobj); +} + + +/* Tell the GC to track this object. + * + * The object must not be tracked by the GC. + * + * NB: While the object is tracked by the collector, it must be safe to call the + * ob_traverse method. + * + * Internal note: interp->gc.generation0->_gc_prev doesn't have any bit flags + * because it's not object header. So we don't use _PyGCHead_PREV() and + * _PyGCHead_SET_PREV() for it to avoid unnecessary bitwise operations. + * + * See also the public PyObject_GC_Track() function. + */ +static inline void _PyObject_GC_TRACK( +// The preprocessor removes _PyObject_ASSERT_FROM() calls if NDEBUG is defined +#ifndef NDEBUG + const char *filename, int lineno, +#endif + PyObject *op) +{ + _PyObject_ASSERT_FROM(op, !_PyObject_GC_IS_TRACKED(op), + "object already tracked by the garbage collector", + filename, lineno, __func__); + + PyGC_Head *gc = _Py_AS_GC(op); + _PyObject_ASSERT_FROM(op, + (gc->_gc_prev & _PyGC_PREV_MASK_COLLECTING) == 0, + "object is in generation which is garbage collected", + filename, lineno, __func__); + + PyInterpreterState *interp = _PyInterpreterState_GET(); + PyGC_Head *generation0 = interp->gc.generation0; + PyGC_Head *last = (PyGC_Head*)(generation0->_gc_prev); + _PyGCHead_SET_NEXT(last, gc); + _PyGCHead_SET_PREV(gc, last); + _PyGCHead_SET_NEXT(gc, generation0); + generation0->_gc_prev = (uintptr_t)gc; +} + +/* Tell the GC to stop tracking this object. + * + * Internal note: This may be called while GC. So _PyGC_PREV_MASK_COLLECTING + * must be cleared. But _PyGC_PREV_MASK_FINALIZED bit is kept. + * + * The object must be tracked by the GC. + * + * See also the public PyObject_GC_UnTrack() which accept an object which is + * not tracked. + */ +static inline void _PyObject_GC_UNTRACK( +// The preprocessor removes _PyObject_ASSERT_FROM() calls if NDEBUG is defined +#ifndef NDEBUG + const char *filename, int lineno, +#endif + PyObject *op) +{ + _PyObject_ASSERT_FROM(op, _PyObject_GC_IS_TRACKED(op), + "object not tracked by the garbage collector", + filename, lineno, __func__); + + PyGC_Head *gc = _Py_AS_GC(op); + PyGC_Head *prev = _PyGCHead_PREV(gc); + PyGC_Head *next = _PyGCHead_NEXT(gc); + _PyGCHead_SET_NEXT(prev, next); + _PyGCHead_SET_PREV(next, prev); + gc->_gc_next = 0; + gc->_gc_prev &= _PyGC_PREV_MASK_FINALIZED; +} + +// Macros to accept any type for the parameter, and to automatically pass +// the filename and the filename (if NDEBUG is not defined) where the macro +// is called. +#ifdef NDEBUG +# define _PyObject_GC_TRACK(op) \ + _PyObject_GC_TRACK(_PyObject_CAST(op)) +# define _PyObject_GC_UNTRACK(op) \ + _PyObject_GC_UNTRACK(_PyObject_CAST(op)) +#else +# define _PyObject_GC_TRACK(op) \ + _PyObject_GC_TRACK(__FILE__, __LINE__, _PyObject_CAST(op)) +# define _PyObject_GC_UNTRACK(op) \ + _PyObject_GC_UNTRACK(__FILE__, __LINE__, _PyObject_CAST(op)) +#endif + +#ifdef Py_REF_DEBUG +extern void _PyDebug_PrintTotalRefs(void); +#endif + +#ifdef Py_TRACE_REFS +extern void _Py_AddToAllObjects(PyObject *op, int force); +extern void _Py_PrintReferences(FILE *); +extern void _Py_PrintReferenceAddresses(FILE *); +#endif + +static inline PyObject ** +_PyObject_GET_WEAKREFS_LISTPTR(PyObject *op) +{ + Py_ssize_t offset = Py_TYPE(op)->tp_weaklistoffset; + return (PyObject **)((char *)op + offset); +} + +// Fast inlined version of PyObject_IS_GC() +static inline int +_PyObject_IS_GC(PyObject *obj) +{ + return (PyType_IS_GC(Py_TYPE(obj)) + && (Py_TYPE(obj)->tp_is_gc == NULL + || Py_TYPE(obj)->tp_is_gc(obj))); +} + +// Fast inlined version of PyType_IS_GC() +#define _PyType_IS_GC(t) _PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC) + +// Usage: assert(_Py_CheckSlotResult(obj, "__getitem__", result != NULL)); +extern int _Py_CheckSlotResult( + PyObject *obj, + const char *slot_name, + int success); + +// PyType_Ready() must be called if _PyType_IsReady() is false. +// See also the Py_TPFLAGS_READY flag. +#define _PyType_IsReady(type) ((type)->tp_dict != NULL) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_OBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_parser.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_parser.h new file mode 100644 index 0000000000..e2de24e2ca --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_parser.h @@ -0,0 +1,31 @@ +#ifndef Py_INTERNAL_PARSER_H +#define Py_INTERNAL_PARSER_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +extern struct _mod* _PyParser_ASTFromString( + const char *str, + PyObject* filename, + int mode, + PyCompilerFlags *flags, + PyArena *arena); +extern struct _mod* _PyParser_ASTFromFile( + FILE *fp, + PyObject *filename_ob, + const char *enc, + int mode, + const char *ps1, + const char *ps2, + PyCompilerFlags *flags, + int *errcode, + PyArena *arena); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_PARSER_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pathconfig.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pathconfig.h new file mode 100644 index 0000000000..15447f5449 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pathconfig.h @@ -0,0 +1,73 @@ +#ifndef Py_INTERNAL_PATHCONFIG_H +#define Py_INTERNAL_PATHCONFIG_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +typedef struct _PyPathConfig { + /* Full path to the Python program */ + wchar_t *program_full_path; + wchar_t *prefix; + wchar_t *exec_prefix; + /* Set by Py_SetPath(), or computed by _PyConfig_InitPathConfig() */ + wchar_t *module_search_path; + /* Python program name */ + wchar_t *program_name; + /* Set by Py_SetPythonHome() or PYTHONHOME environment variable */ + wchar_t *home; +#ifdef MS_WINDOWS + /* isolated and site_import are used to set Py_IsolatedFlag and + Py_NoSiteFlag flags on Windows in read_pth_file(). These fields + are ignored when their value are equal to -1 (unset). */ + int isolated; + int site_import; + /* Set when a venv is detected */ + wchar_t *base_executable; +#endif +} _PyPathConfig; + +#ifdef MS_WINDOWS +# define _PyPathConfig_INIT \ + {.module_search_path = NULL, \ + .isolated = -1, \ + .site_import = -1} +#else +# define _PyPathConfig_INIT \ + {.module_search_path = NULL} +#endif +/* Note: _PyPathConfig_INIT sets other fields to 0/NULL */ + +PyAPI_DATA(_PyPathConfig) _Py_path_config; +#ifdef MS_WINDOWS +PyAPI_DATA(wchar_t*) _Py_dll_path; +#endif + +extern void _PyPathConfig_ClearGlobal(void); + +extern PyStatus _PyPathConfig_Calculate( + _PyPathConfig *pathconfig, + const PyConfig *config); +extern int _PyPathConfig_ComputeSysPath0( + const PyWideStringList *argv, + PyObject **path0); +extern PyStatus _Py_FindEnvConfigValue( + FILE *env_file, + const wchar_t *key, + wchar_t **value_p); + +#ifdef MS_WINDOWS +extern wchar_t* _Py_GetDLLPath(void); +#endif + +extern PyStatus _PyConfig_WritePathConfig(const PyConfig *config); +extern void _Py_DumpPathConfig(PyThreadState *tstate); +extern PyObject* _PyPathConfig_AsDict(void); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_PATHCONFIG_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyarena.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyarena.h new file mode 100644 index 0000000000..d78972a88c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyarena.h @@ -0,0 +1,64 @@ +/* An arena-like memory interface for the compiler. + */ + +#ifndef Py_INTERNAL_PYARENA_H +#define Py_INTERNAL_PYARENA_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +typedef struct _arena PyArena; + +/* _PyArena_New() and _PyArena_Free() create a new arena and free it, + respectively. Once an arena has been created, it can be used + to allocate memory via _PyArena_Malloc(). Pointers to PyObject can + also be registered with the arena via _PyArena_AddPyObject(), and the + arena will ensure that the PyObjects stay alive at least until + _PyArena_Free() is called. When an arena is freed, all the memory it + allocated is freed, the arena releases internal references to registered + PyObject*, and none of its pointers are valid. + XXX (tim) What does "none of its pointers are valid" mean? Does it + XXX mean that pointers previously obtained via _PyArena_Malloc() are + XXX no longer valid? (That's clearly true, but not sure that's what + XXX the text is trying to say.) + + _PyArena_New() returns an arena pointer. On error, it + returns a negative number and sets an exception. + XXX (tim): Not true. On error, _PyArena_New() actually returns NULL, + XXX and looks like it may or may not set an exception (e.g., if the + XXX internal PyList_New(0) returns NULL, _PyArena_New() passes that on + XXX and an exception is set; OTOH, if the internal + XXX block_new(DEFAULT_BLOCK_SIZE) returns NULL, that's passed on but + XXX an exception is not set in that case). +*/ +PyAPI_FUNC(PyArena*) _PyArena_New(void); +PyAPI_FUNC(void) _PyArena_Free(PyArena *); + +/* Mostly like malloc(), return the address of a block of memory spanning + * `size` bytes, or return NULL (without setting an exception) if enough + * new memory can't be obtained. Unlike malloc(0), _PyArena_Malloc() with + * size=0 does not guarantee to return a unique pointer (the pointer + * returned may equal one or more other pointers obtained from + * _PyArena_Malloc()). + * Note that pointers obtained via _PyArena_Malloc() must never be passed to + * the system free() or realloc(), or to any of Python's similar memory- + * management functions. _PyArena_Malloc()-obtained pointers remain valid + * until _PyArena_Free(ar) is called, at which point all pointers obtained + * from the arena `ar` become invalid simultaneously. + */ +PyAPI_FUNC(void*) _PyArena_Malloc(PyArena *, size_t size); + +/* This routine isn't a proper arena allocation routine. It takes + * a PyObject* and records it so that it can be DECREFed when the + * arena is freed. + */ +PyAPI_FUNC(int) _PyArena_AddPyObject(PyArena *, PyObject *); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_PYARENA_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyerrors.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyerrors.h new file mode 100644 index 0000000000..a5e97fe23f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyerrors.h @@ -0,0 +1,96 @@ +#ifndef Py_INTERNAL_PYERRORS_H +#define Py_INTERNAL_PYERRORS_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +static inline PyObject* _PyErr_Occurred(PyThreadState *tstate) +{ + assert(tstate != NULL); + return tstate->curexc_type; +} + +static inline void _PyErr_ClearExcState(_PyErr_StackItem *exc_state) +{ + PyObject *t, *v, *tb; + t = exc_state->exc_type; + v = exc_state->exc_value; + tb = exc_state->exc_traceback; + exc_state->exc_type = NULL; + exc_state->exc_value = NULL; + exc_state->exc_traceback = NULL; + Py_XDECREF(t); + Py_XDECREF(v); + Py_XDECREF(tb); +} + + +PyAPI_FUNC(void) _PyErr_Fetch( + PyThreadState *tstate, + PyObject **type, + PyObject **value, + PyObject **traceback); + +PyAPI_FUNC(int) _PyErr_ExceptionMatches( + PyThreadState *tstate, + PyObject *exc); + +PyAPI_FUNC(void) _PyErr_Restore( + PyThreadState *tstate, + PyObject *type, + PyObject *value, + PyObject *traceback); + +PyAPI_FUNC(void) _PyErr_SetObject( + PyThreadState *tstate, + PyObject *type, + PyObject *value); + +PyAPI_FUNC(void) _PyErr_ChainStackItem( + _PyErr_StackItem *exc_info); + +PyAPI_FUNC(void) _PyErr_Clear(PyThreadState *tstate); + +PyAPI_FUNC(void) _PyErr_SetNone(PyThreadState *tstate, PyObject *exception); + +PyAPI_FUNC(PyObject *) _PyErr_NoMemory(PyThreadState *tstate); + +PyAPI_FUNC(void) _PyErr_SetString( + PyThreadState *tstate, + PyObject *exception, + const char *string); + +PyAPI_FUNC(PyObject *) _PyErr_Format( + PyThreadState *tstate, + PyObject *exception, + const char *format, + ...); + +PyAPI_FUNC(void) _PyErr_NormalizeException( + PyThreadState *tstate, + PyObject **exc, + PyObject **val, + PyObject **tb); + +PyAPI_FUNC(PyObject *) _PyErr_FormatFromCauseTstate( + PyThreadState *tstate, + PyObject *exception, + const char *format, + ...); + +PyAPI_FUNC(int) _PyErr_CheckSignalsTstate(PyThreadState *tstate); + +PyAPI_FUNC(void) _Py_DumpExtensionModules(int fd, PyInterpreterState *interp); + +extern PyObject* _Py_Offer_Suggestions(PyObject* exception); +PyAPI_FUNC(Py_ssize_t) _Py_UTF8_Edit_Cost(PyObject *str_a, PyObject *str_b, + Py_ssize_t max_cost); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_PYERRORS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyhash.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyhash.h new file mode 100644 index 0000000000..a229f8d8b7 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pyhash.h @@ -0,0 +1,10 @@ +#ifndef Py_INTERNAL_HASH_H +#define Py_INTERNAL_HASH_H + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +uint64_t _Py_KeyedHash(uint64_t, const char *, Py_ssize_t); + +#endif diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pylifecycle.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pylifecycle.h new file mode 100644 index 0000000000..524be9d4cb --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pylifecycle.h @@ -0,0 +1,141 @@ +#ifndef Py_INTERNAL_LIFECYCLE_H +#define Py_INTERNAL_LIFECYCLE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#ifdef HAVE_SIGNAL_H +#include +#endif + +#include "pycore_runtime.h" // _PyRuntimeState + +#ifndef NSIG +# if defined(_NSIG) +# define NSIG _NSIG /* For BSD/SysV */ +# elif defined(_SIGMAX) +# define NSIG (_SIGMAX + 1) /* For QNX */ +# elif defined(SIGMAX) +# define NSIG (SIGMAX + 1) /* For djgpp */ +# else +# define NSIG 64 /* Use a reasonable default value */ +# endif +#endif + +/* Forward declarations */ +struct _PyArgv; +struct pyruntimestate; + +/* True if the main interpreter thread exited due to an unhandled + * KeyboardInterrupt exception, suggesting the user pressed ^C. */ +PyAPI_DATA(int) _Py_UnhandledKeyboardInterrupt; + +extern int _Py_SetFileSystemEncoding( + const char *encoding, + const char *errors); +extern void _Py_ClearFileSystemEncoding(void); +extern PyStatus _PyUnicode_InitEncodings(PyThreadState *tstate); +#ifdef MS_WINDOWS +extern int _PyUnicode_EnableLegacyWindowsFSEncoding(void); +#endif + +PyAPI_FUNC(void) _Py_ClearStandardStreamEncoding(void); + +PyAPI_FUNC(int) _Py_IsLocaleCoercionTarget(const char *ctype_loc); + +/* Various one-time initializers */ + +extern PyStatus _PyUnicode_Init(PyInterpreterState *interp); +extern PyStatus _PyUnicode_InitTypes(void); +extern PyStatus _PyBytes_Init(PyInterpreterState *interp); +extern int _PyStructSequence_Init(void); +extern int _PyLong_Init(PyInterpreterState *interp); +extern int _PyLong_InitTypes(void); +extern PyStatus _PyTuple_Init(PyInterpreterState *interp); +extern PyStatus _PyFaulthandler_Init(int enable); +extern int _PyTraceMalloc_Init(int enable); +extern PyObject * _PyBuiltin_Init(PyInterpreterState *interp); +extern PyStatus _PySys_Create( + PyThreadState *tstate, + PyObject **sysmod_p); +extern PyStatus _PySys_ReadPreinitWarnOptions(PyWideStringList *options); +extern PyStatus _PySys_ReadPreinitXOptions(PyConfig *config); +extern int _PySys_UpdateConfig(PyThreadState *tstate); +extern PyStatus _PyExc_Init(PyInterpreterState *interp); +extern PyStatus _PyErr_InitTypes(void); +extern PyStatus _PyBuiltins_AddExceptions(PyObject * bltinmod); +extern void _PyFloat_Init(void); +extern int _PyFloat_InitTypes(void); +extern PyStatus _Py_HashRandomization_Init(const PyConfig *); + +extern PyStatus _PyTypes_Init(void); +extern PyStatus _PyTypes_InitSlotDefs(void); +extern PyStatus _PyImportZip_Init(PyThreadState *tstate); +extern PyStatus _PyGC_Init(PyInterpreterState *interp); +extern PyStatus _PyAtExit_Init(PyInterpreterState *interp); + + +/* Various internal finalizers */ + +extern void _PyFrame_Fini(PyInterpreterState *interp); +extern void _PyDict_Fini(PyInterpreterState *interp); +extern void _PyTuple_Fini(PyInterpreterState *interp); +extern void _PyList_Fini(PyInterpreterState *interp); +extern void _PyBytes_Fini(PyInterpreterState *interp); +extern void _PyFloat_Fini(PyInterpreterState *interp); +extern void _PySlice_Fini(PyInterpreterState *interp); +extern void _PyAsyncGen_Fini(PyInterpreterState *interp); + +extern int _PySignal_Init(int install_signal_handlers); +extern void _PySignal_Fini(void); + +extern void _PyExc_Fini(PyInterpreterState *interp); +extern void _PyImport_Fini(void); +extern void _PyImport_Fini2(void); +extern void _PyGC_Fini(PyInterpreterState *interp); +extern void _PyType_Fini(PyInterpreterState *interp); +extern void _Py_HashRandomization_Fini(void); +extern void _PyUnicode_Fini(PyInterpreterState *interp); +extern void _PyUnicode_ClearInterned(PyInterpreterState *interp); +extern void _PyLong_Fini(PyInterpreterState *interp); +extern void _PyFaulthandler_Fini(void); +extern void _PyHash_Fini(void); +extern void _PyTraceMalloc_Fini(void); +extern void _PyWarnings_Fini(PyInterpreterState *interp); +extern void _PyAST_Fini(PyInterpreterState *interp); +extern void _PyAtExit_Fini(PyInterpreterState *interp); + +extern PyStatus _PyGILState_Init(_PyRuntimeState *runtime); +extern PyStatus _PyGILState_SetTstate(PyThreadState *tstate); +extern void _PyGILState_Fini(PyInterpreterState *interp); + +PyAPI_FUNC(void) _PyGC_DumpShutdownStats(PyInterpreterState *interp); + +PyAPI_FUNC(PyStatus) _Py_PreInitializeFromPyArgv( + const PyPreConfig *src_config, + const struct _PyArgv *args); +PyAPI_FUNC(PyStatus) _Py_PreInitializeFromConfig( + const PyConfig *config, + const struct _PyArgv *args); + + +PyAPI_FUNC(int) _Py_HandleSystemExit(int *exitcode_p); + +PyAPI_FUNC(PyObject*) _PyErr_WriteUnraisableDefaultHook(PyObject *unraisable); + +PyAPI_FUNC(void) _PyErr_Print(PyThreadState *tstate); +PyAPI_FUNC(void) _PyErr_Display(PyObject *file, PyObject *exception, + PyObject *value, PyObject *tb); + +PyAPI_FUNC(void) _PyThreadState_DeleteCurrent(PyThreadState *tstate); + +extern void _PyAtExit_Call(PyInterpreterState *interp); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_LIFECYCLE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pymem.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pymem.h new file mode 100644 index 0000000000..49af17146f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pymem.h @@ -0,0 +1,101 @@ +#ifndef Py_INTERNAL_PYMEM_H +#define Py_INTERNAL_PYMEM_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pymem.h" // PyMemAllocatorName + + +/* Set the memory allocator of the specified domain to the default. + Save the old allocator into *old_alloc if it's non-NULL. + Return on success, or return -1 if the domain is unknown. */ +PyAPI_FUNC(int) _PyMem_SetDefaultAllocator( + PyMemAllocatorDomain domain, + PyMemAllocatorEx *old_alloc); + +/* Special bytes broadcast into debug memory blocks at appropriate times. + Strings of these are unlikely to be valid addresses, floats, ints or + 7-bit ASCII. + + - PYMEM_CLEANBYTE: clean (newly allocated) memory + - PYMEM_DEADBYTE dead (newly freed) memory + - PYMEM_FORBIDDENBYTE: untouchable bytes at each end of a block + + Byte patterns 0xCB, 0xDB and 0xFB have been replaced with 0xCD, 0xDD and + 0xFD to use the same values than Windows CRT debug malloc() and free(). + If modified, _PyMem_IsPtrFreed() should be updated as well. */ +#define PYMEM_CLEANBYTE 0xCD +#define PYMEM_DEADBYTE 0xDD +#define PYMEM_FORBIDDENBYTE 0xFD + +/* Heuristic checking if a pointer value is newly allocated + (uninitialized), newly freed or NULL (is equal to zero). + + The pointer is not dereferenced, only the pointer value is checked. + + The heuristic relies on the debug hooks on Python memory allocators which + fills newly allocated memory with CLEANBYTE (0xCD) and newly freed memory + with DEADBYTE (0xDD). Detect also "untouchable bytes" marked + with FORBIDDENBYTE (0xFD). */ +static inline int _PyMem_IsPtrFreed(const void *ptr) +{ + uintptr_t value = (uintptr_t)ptr; +#if SIZEOF_VOID_P == 8 + return (value == 0 + || value == (uintptr_t)0xCDCDCDCDCDCDCDCD + || value == (uintptr_t)0xDDDDDDDDDDDDDDDD + || value == (uintptr_t)0xFDFDFDFDFDFDFDFD); +#elif SIZEOF_VOID_P == 4 + return (value == 0 + || value == (uintptr_t)0xCDCDCDCD + || value == (uintptr_t)0xDDDDDDDD + || value == (uintptr_t)0xFDFDFDFD); +#else +# error "unknown pointer size" +#endif +} + +PyAPI_FUNC(int) _PyMem_GetAllocatorName( + const char *name, + PyMemAllocatorName *allocator); + +/* Configure the Python memory allocators. + Pass PYMEM_ALLOCATOR_DEFAULT to use default allocators. + PYMEM_ALLOCATOR_NOT_SET does nothing. */ +PyAPI_FUNC(int) _PyMem_SetupAllocators(PyMemAllocatorName allocator); + +struct _PyTraceMalloc_Config { + /* Module initialized? + Variable protected by the GIL */ + enum { + TRACEMALLOC_NOT_INITIALIZED, + TRACEMALLOC_INITIALIZED, + TRACEMALLOC_FINALIZED + } initialized; + + /* Is tracemalloc tracing memory allocations? + Variable protected by the GIL */ + int tracing; + + /* limit of the number of frames in a traceback, 1 by default. + Variable protected by the GIL. */ + int max_nframe; +}; + +#define _PyTraceMalloc_Config_INIT \ + {.initialized = TRACEMALLOC_NOT_INITIALIZED, \ + .tracing = 0, \ + .max_nframe = 1} + +PyAPI_DATA(struct _PyTraceMalloc_Config) _Py_tracemalloc_config; + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_PYMEM_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_pystate.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pystate.h new file mode 100644 index 0000000000..4b894f3eff --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_pystate.h @@ -0,0 +1,153 @@ +#ifndef Py_INTERNAL_PYSTATE_H +#define Py_INTERNAL_PYSTATE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_runtime.h" /* PyRuntimeState */ + + +/* Check if the current thread is the main thread. + Use _Py_IsMainInterpreter() to check if it's the main interpreter. */ +static inline int +_Py_IsMainThread(void) +{ + unsigned long thread = PyThread_get_thread_ident(); + return (thread == _PyRuntime.main_thread); +} + + +static inline int +_Py_IsMainInterpreter(PyInterpreterState *interp) +{ + /* Use directly _PyRuntime rather than tstate->interp->runtime, since + this function is used in performance critical code path (ceval) */ + return (interp == _PyRuntime.interpreters.main); +} + + +/* Only handle signals on the main thread of the main interpreter. */ +static inline int +_Py_ThreadCanHandleSignals(PyInterpreterState *interp) +{ + return (_Py_IsMainThread() && interp == _PyRuntime.interpreters.main); +} + + +/* Only execute pending calls on the main thread. */ +static inline int +_Py_ThreadCanHandlePendingCalls(void) +{ + return _Py_IsMainThread(); +} + + +/* Variable and macro for in-line access to current thread + and interpreter state */ + +#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS +PyAPI_FUNC(PyThreadState*) _PyThreadState_GetTSS(void); +#endif + +static inline PyThreadState* +_PyRuntimeState_GetThreadState(_PyRuntimeState *runtime) +{ +#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS + return _PyThreadState_GetTSS(); +#else + return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->gilstate.tstate_current); +#endif +} + +/* Get the current Python thread state. + + Efficient macro reading directly the 'gilstate.tstate_current' atomic + variable. The macro is unsafe: it does not check for error and it can + return NULL. + + The caller must hold the GIL. + + See also PyThreadState_Get() and PyThreadState_GET(). */ +static inline PyThreadState* +_PyThreadState_GET(void) +{ +#ifdef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS + return _PyThreadState_GetTSS(); +#else + return _PyRuntimeState_GetThreadState(&_PyRuntime); +#endif +} + +/* Redefine PyThreadState_GET() as an alias to _PyThreadState_GET() */ +#undef PyThreadState_GET +#define PyThreadState_GET() _PyThreadState_GET() + +PyAPI_FUNC(void) _Py_NO_RETURN _Py_FatalError_TstateNULL(const char *func); + +static inline void +_Py_EnsureFuncTstateNotNULL(const char *func, PyThreadState *tstate) +{ + if (tstate == NULL) { + _Py_FatalError_TstateNULL(func); + } +} + +// Call Py_FatalError() if tstate is NULL +#define _Py_EnsureTstateNotNULL(tstate) \ + _Py_EnsureFuncTstateNotNULL(__func__, tstate) + + +/* Get the current interpreter state. + + The macro is unsafe: it does not check for error and it can return NULL. + + The caller must hold the GIL. + + See also _PyInterpreterState_Get() + and _PyGILState_GetInterpreterStateUnsafe(). */ +static inline PyInterpreterState* _PyInterpreterState_GET(void) { + PyThreadState *tstate = _PyThreadState_GET(); +#ifdef Py_DEBUG + _Py_EnsureTstateNotNULL(tstate); +#endif + return tstate->interp; +} + + +/* Other */ + +PyAPI_FUNC(void) _PyThreadState_Init( + PyThreadState *tstate); +PyAPI_FUNC(void) _PyThreadState_DeleteExcept( + _PyRuntimeState *runtime, + PyThreadState *tstate); + +PyAPI_FUNC(PyThreadState *) _PyThreadState_Swap( + struct _gilstate_runtime_state *gilstate, + PyThreadState *newts); + +PyAPI_FUNC(PyStatus) _PyInterpreterState_Enable(_PyRuntimeState *runtime); + +#ifdef HAVE_FORK +extern PyStatus _PyInterpreterState_DeleteExceptMain(_PyRuntimeState *runtime); +extern PyStatus _PyGILState_Reinit(_PyRuntimeState *runtime); +extern void _PySignal_AfterFork(void); +#endif + + +PyAPI_FUNC(int) _PyState_AddModule( + PyThreadState *tstate, + PyObject* module, + struct PyModuleDef* def); + + +PyAPI_FUNC(int) _PyOS_InterruptOccurred(PyThreadState *tstate); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_PYSTATE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_runtime.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_runtime.h new file mode 100644 index 0000000000..bcd710c449 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_runtime.h @@ -0,0 +1,157 @@ +#ifndef Py_INTERNAL_RUNTIME_H +#define Py_INTERNAL_RUNTIME_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "pycore_atomic.h" /* _Py_atomic_address */ +#include "pycore_gil.h" // struct _gil_runtime_state + +/* ceval state */ + +struct _ceval_runtime_state { + /* Request for checking signals. It is shared by all interpreters (see + bpo-40513). Any thread of any interpreter can receive a signal, but only + the main thread of the main interpreter can handle signals: see + _Py_ThreadCanHandleSignals(). */ + _Py_atomic_int signals_pending; +#ifndef EXPERIMENTAL_ISOLATED_SUBINTERPRETERS + struct _gil_runtime_state gil; +#endif +}; + +/* GIL state */ + +struct _gilstate_runtime_state { + /* bpo-26558: Flag to disable PyGILState_Check(). + If set to non-zero, PyGILState_Check() always return 1. */ + int check_enabled; + /* Assuming the current thread holds the GIL, this is the + PyThreadState for the current thread. */ + _Py_atomic_address tstate_current; + /* The single PyInterpreterState used by this process' + GILState implementation + */ + /* TODO: Given interp_main, it may be possible to kill this ref */ + PyInterpreterState *autoInterpreterState; + Py_tss_t autoTSSkey; +}; + +/* Runtime audit hook state */ + +typedef struct _Py_AuditHookEntry { + struct _Py_AuditHookEntry *next; + Py_AuditHookFunction hookCFunction; + void *userData; +} _Py_AuditHookEntry; + +struct _Py_unicode_runtime_ids { + PyThread_type_lock lock; + // next_index value must be preserved when Py_Initialize()/Py_Finalize() + // is called multiple times: see _PyUnicode_FromId() implementation. + Py_ssize_t next_index; +}; + +/* Full Python runtime state */ + +typedef struct pyruntimestate { + /* Is running Py_PreInitialize()? */ + int preinitializing; + + /* Is Python preinitialized? Set to 1 by Py_PreInitialize() */ + int preinitialized; + + /* Is Python core initialized? Set to 1 by _Py_InitializeCore() */ + int core_initialized; + + /* Is Python fully initialized? Set to 1 by Py_Initialize() */ + int initialized; + + /* Set by Py_FinalizeEx(). Only reset to NULL if Py_Initialize() + is called again. + + Use _PyRuntimeState_GetFinalizing() and _PyRuntimeState_SetFinalizing() + to access it, don't access it directly. */ + _Py_atomic_address _finalizing; + + struct pyinterpreters { + PyThread_type_lock mutex; + PyInterpreterState *head; + PyInterpreterState *main; + /* _next_interp_id is an auto-numbered sequence of small + integers. It gets initialized in _PyInterpreterState_Init(), + which is called in Py_Initialize(), and used in + PyInterpreterState_New(). A negative interpreter ID + indicates an error occurred. The main interpreter will + always have an ID of 0. Overflow results in a RuntimeError. + If that becomes a problem later then we can adjust, e.g. by + using a Python int. */ + int64_t next_id; + } interpreters; + // XXX Remove this field once we have a tp_* slot. + struct _xidregistry { + PyThread_type_lock mutex; + struct _xidregitem *head; + } xidregistry; + + unsigned long main_thread; + +#define NEXITFUNCS 32 + void (*exitfuncs[NEXITFUNCS])(void); + int nexitfuncs; + + struct _ceval_runtime_state ceval; + struct _gilstate_runtime_state gilstate; + + PyPreConfig preconfig; + + // Audit values must be preserved when Py_Initialize()/Py_Finalize() + // is called multiple times. + Py_OpenCodeHookFunction open_code_hook; + void *open_code_userdata; + _Py_AuditHookEntry *audit_hook_head; + + struct _Py_unicode_runtime_ids unicode_ids; + + // XXX Consolidate globals found via the check-c-globals script. +} _PyRuntimeState; + +#define _PyRuntimeState_INIT \ + {.preinitialized = 0, .core_initialized = 0, .initialized = 0} +/* Note: _PyRuntimeState_INIT sets other fields to 0/NULL */ + + +PyAPI_DATA(_PyRuntimeState) _PyRuntime; + +PyAPI_FUNC(PyStatus) _PyRuntimeState_Init(_PyRuntimeState *runtime); +PyAPI_FUNC(void) _PyRuntimeState_Fini(_PyRuntimeState *runtime); + +#ifdef HAVE_FORK +extern PyStatus _PyRuntimeState_ReInitThreads(_PyRuntimeState *runtime); +#endif + +/* Initialize _PyRuntimeState. + Return NULL on success, or return an error message on failure. */ +PyAPI_FUNC(PyStatus) _PyRuntime_Initialize(void); + +PyAPI_FUNC(void) _PyRuntime_Finalize(void); + + +static inline PyThreadState* +_PyRuntimeState_GetFinalizing(_PyRuntimeState *runtime) { + return (PyThreadState*)_Py_atomic_load_relaxed(&runtime->_finalizing); +} + +static inline void +_PyRuntimeState_SetFinalizing(_PyRuntimeState *runtime, PyThreadState *tstate) { + _Py_atomic_store_relaxed(&runtime->_finalizing, (uintptr_t)tstate); +} + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_RUNTIME_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_structseq.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_structseq.h new file mode 100644 index 0000000000..84c8d477e0 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_structseq.h @@ -0,0 +1,21 @@ +#ifndef Py_INTERNAL_STRUCTSEQ_H +#define Py_INTERNAL_STRUCTSEQ_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + + +PyAPI_FUNC(int) _PyStructSequence_InitType( + PyTypeObject *type, + PyStructSequence_Desc *desc, + unsigned long tp_flags); + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_STRUCTSEQ_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_symtable.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_symtable.h new file mode 100644 index 0000000000..a2e520b8e2 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_symtable.h @@ -0,0 +1,133 @@ +#ifndef Py_INTERNAL_SYMTABLE_H +#define Py_INTERNAL_SYMTABLE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +struct _mod; // Type defined in pycore_ast.h + +typedef enum _block_type { FunctionBlock, ClassBlock, ModuleBlock, AnnotationBlock } + _Py_block_ty; + +typedef enum _comprehension_type { + NoComprehension = 0, + ListComprehension = 1, + DictComprehension = 2, + SetComprehension = 3, + GeneratorExpression = 4 } _Py_comprehension_ty; + +struct _symtable_entry; + +struct symtable { + PyObject *st_filename; /* name of file being compiled, + decoded from the filesystem encoding */ + struct _symtable_entry *st_cur; /* current symbol table entry */ + struct _symtable_entry *st_top; /* symbol table entry for module */ + PyObject *st_blocks; /* dict: map AST node addresses + * to symbol table entries */ + PyObject *st_stack; /* list: stack of namespace info */ + PyObject *st_global; /* borrowed ref to st_top->ste_symbols */ + int st_nblocks; /* number of blocks used. kept for + consistency with the corresponding + compiler structure */ + PyObject *st_private; /* name of current class or NULL */ + PyFutureFeatures *st_future; /* module's future features that affect + the symbol table */ + int recursion_depth; /* current recursion depth */ + int recursion_limit; /* recursion limit */ +}; + +typedef struct _symtable_entry { + PyObject_HEAD + PyObject *ste_id; /* int: key in ste_table->st_blocks */ + PyObject *ste_symbols; /* dict: variable names to flags */ + PyObject *ste_name; /* string: name of current block */ + PyObject *ste_varnames; /* list of function parameters */ + PyObject *ste_children; /* list of child blocks */ + PyObject *ste_directives;/* locations of global and nonlocal statements */ + _Py_block_ty ste_type; /* module, class or function */ + int ste_nested; /* true if block is nested */ + unsigned ste_free : 1; /* true if block has free variables */ + unsigned ste_child_free : 1; /* true if a child block has free vars, + including free refs to globals */ + unsigned ste_generator : 1; /* true if namespace is a generator */ + unsigned ste_coroutine : 1; /* true if namespace is a coroutine */ + _Py_comprehension_ty ste_comprehension; /* Kind of comprehension (if any) */ + unsigned ste_varargs : 1; /* true if block has varargs */ + unsigned ste_varkeywords : 1; /* true if block has varkeywords */ + unsigned ste_returns_value : 1; /* true if namespace uses return with + an argument */ + unsigned ste_needs_class_closure : 1; /* for class scopes, true if a + closure over __class__ + should be created */ + unsigned ste_comp_iter_target : 1; /* true if visiting comprehension target */ + int ste_comp_iter_expr; /* non-zero if visiting a comprehension range expression */ + int ste_lineno; /* first line of block */ + int ste_col_offset; /* offset of first line of block */ + int ste_end_lineno; /* end line of block */ + int ste_end_col_offset; /* end offset of first line of block */ + int ste_opt_lineno; /* lineno of last exec or import * */ + int ste_opt_col_offset; /* offset of last exec or import * */ + struct symtable *ste_table; +} PySTEntryObject; + +extern PyTypeObject PySTEntry_Type; + +#define PySTEntry_Check(op) Py_IS_TYPE(op, &PySTEntry_Type) + +extern int _PyST_GetScope(PySTEntryObject *, PyObject *); + +extern struct symtable* _PySymtable_Build( + struct _mod *mod, + PyObject *filename, + PyFutureFeatures *future); +PyAPI_FUNC(PySTEntryObject *) PySymtable_Lookup(struct symtable *, void *); + +extern void _PySymtable_Free(struct symtable *); + +/* Flags for def-use information */ + +#define DEF_GLOBAL 1 /* global stmt */ +#define DEF_LOCAL 2 /* assignment in code block */ +#define DEF_PARAM 2<<1 /* formal parameter */ +#define DEF_NONLOCAL 2<<2 /* nonlocal stmt */ +#define USE 2<<3 /* name is used */ +#define DEF_FREE 2<<4 /* name used but not defined in nested block */ +#define DEF_FREE_CLASS 2<<5 /* free variable from class's method */ +#define DEF_IMPORT 2<<6 /* assignment occurred via import */ +#define DEF_ANNOT 2<<7 /* this name is annotated */ +#define DEF_COMP_ITER 2<<8 /* this name is a comprehension iteration variable */ + +#define DEF_BOUND (DEF_LOCAL | DEF_PARAM | DEF_IMPORT) + +/* GLOBAL_EXPLICIT and GLOBAL_IMPLICIT are used internally by the symbol + table. GLOBAL is returned from PyST_GetScope() for either of them. + It is stored in ste_symbols at bits 12-15. +*/ +#define SCOPE_OFFSET 11 +#define SCOPE_MASK (DEF_GLOBAL | DEF_LOCAL | DEF_PARAM | DEF_NONLOCAL) + +#define LOCAL 1 +#define GLOBAL_EXPLICIT 2 +#define GLOBAL_IMPLICIT 3 +#define FREE 4 +#define CELL 5 + +#define GENERATOR 1 +#define GENERATOR_EXPRESSION 2 + +// Used by symtablemodule.c +extern struct symtable* _Py_SymtableStringObjectFlags( + const char *str, + PyObject *filename, + int start, + PyCompilerFlags *flags); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_SYMTABLE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_sysmodule.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_sysmodule.h new file mode 100644 index 0000000000..738a7746a0 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_sysmodule.h @@ -0,0 +1,24 @@ +#ifndef Py_INTERNAL_SYSMODULE_H +#define Py_INTERNAL_SYSMODULE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +PyAPI_FUNC(int) _PySys_Audit( + PyThreadState *tstate, + const char *event, + const char *argFormat, + ...); + +/* We want minimal exposure of this function, so use extern rather than + PyAPI_FUNC() to not export the symbol. */ +extern void _PySys_ClearAuditHooks(PyThreadState *tstate); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_SYSMODULE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_traceback.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_traceback.h new file mode 100644 index 0000000000..c01a47639d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_traceback.h @@ -0,0 +1,93 @@ +#ifndef Py_INTERNAL_TRACEBACK_H +#define Py_INTERNAL_TRACEBACK_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* Forward declaration */ +struct _is; + +/* Write the Python traceback into the file 'fd'. For example: + + Traceback (most recent call first): + File "xxx", line xxx in + File "xxx", line xxx in + ... + File "xxx", line xxx in + + This function is written for debug purpose only, to dump the traceback in + the worst case: after a segmentation fault, at fatal error, etc. That's why, + it is very limited. Strings are truncated to 100 characters and encoded to + ASCII with backslashreplace. It doesn't write the source code, only the + function name, filename and line number of each frame. Write only the first + 100 frames: if the traceback is truncated, write the line " ...". + + This function is signal safe. */ + +PyAPI_FUNC(void) _Py_DumpTraceback( + int fd, + PyThreadState *tstate); + +/* Write the traceback of all threads into the file 'fd'. current_thread can be + NULL. + + Return NULL on success, or an error message on error. + + This function is written for debug purpose only. It calls + _Py_DumpTraceback() for each thread, and so has the same limitations. It + only write the traceback of the first 100 threads: write "..." if there are + more threads. + + If current_tstate is NULL, the function tries to get the Python thread state + of the current thread. It is not an error if the function is unable to get + the current Python thread state. + + If interp is NULL, the function tries to get the interpreter state from + the current Python thread state, or from + _PyGILState_GetInterpreterStateUnsafe() in last resort. + + It is better to pass NULL to interp and current_tstate, the function tries + different options to retrieve this information. + + This function is signal safe. */ + +PyAPI_FUNC(const char*) _Py_DumpTracebackThreads( + int fd, + struct _is *interp, + PyThreadState *current_tstate); + +/* Write a Unicode object into the file descriptor fd. Encode the string to + ASCII using the backslashreplace error handler. + + Do nothing if text is not a Unicode object. The function accepts Unicode + string which is not ready (PyUnicode_WCHAR_KIND). + + This function is signal safe. */ +PyAPI_FUNC(void) _Py_DumpASCII(int fd, PyObject *text); + +/* Format an integer as decimal into the file descriptor fd. + + This function is signal safe. */ +PyAPI_FUNC(void) _Py_DumpDecimal( + int fd, + size_t value); + +/* Format an integer as hexadecimal with width digits into fd file descriptor. + The function is signal safe. */ +PyAPI_FUNC(void) _Py_DumpHexadecimal( + int fd, + uintptr_t value, + Py_ssize_t width); + +PyAPI_FUNC(PyObject*) _PyTraceBack_FromFrame( + PyObject *tb_next, + PyFrameObject *frame); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_TRACEBACK_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_tuple.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_tuple.h new file mode 100644 index 0000000000..5353e18d08 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_tuple.h @@ -0,0 +1,20 @@ +#ifndef Py_INTERNAL_TUPLE_H +#define Py_INTERNAL_TUPLE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +#include "tupleobject.h" /* _PyTuple_CAST() */ + +#define _PyTuple_ITEMS(op) (_PyTuple_CAST(op)->ob_item) + +PyAPI_FUNC(PyObject *) _PyTuple_FromArray(PyObject *const *, Py_ssize_t); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_TUPLE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_ucnhash.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ucnhash.h new file mode 100644 index 0000000000..187dd68e73 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_ucnhash.h @@ -0,0 +1,34 @@ +/* Unicode name database interface */ +#ifndef Py_INTERNAL_UCNHASH_H +#define Py_INTERNAL_UCNHASH_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +/* revised ucnhash CAPI interface (exported through a "wrapper") */ + +#define PyUnicodeData_CAPSULE_NAME "unicodedata._ucnhash_CAPI" + +typedef struct { + + /* Get name for a given character code. + Returns non-zero if success, zero if not. + Does not set Python exceptions. */ + int (*getname)(Py_UCS4 code, char* buffer, int buflen, + int with_alias_and_seq); + + /* Get character code for a given name. + Same error handling as for getname(). */ + int (*getcode)(const char* name, int namelen, Py_UCS4* code, + int with_named_seq); + +} _PyUnicode_Name_CAPI; + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_UCNHASH_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_unionobject.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_unionobject.h new file mode 100644 index 0000000000..9962f57610 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_unionobject.h @@ -0,0 +1,22 @@ +#ifndef Py_INTERNAL_UNIONOBJECT_H +#define Py_INTERNAL_UNIONOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +extern PyTypeObject _PyUnion_Type; +#define _PyUnion_Check(op) Py_IS_TYPE(op, &_PyUnion_Type) +extern PyObject *_Py_union_type_or(PyObject *, PyObject *); + +#define _PyGenericAlias_Check(op) PyObject_TypeCheck(op, &Py_GenericAliasType) +extern PyObject *_Py_subs_parameters(PyObject *, PyObject *, PyObject *, PyObject *); +extern PyObject *_Py_make_parameters(PyObject *); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_UNIONOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/internal/pycore_warnings.h b/ScriptEngine/third-party/backend/include/Python/internal/pycore_warnings.h new file mode 100644 index 0000000000..f728ec3077 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/internal/pycore_warnings.h @@ -0,0 +1,25 @@ +#ifndef Py_INTERNAL_WARNINGS_H +#define Py_INTERNAL_WARNINGS_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_BUILD_CORE +# error "this header requires Py_BUILD_CORE define" +#endif + +struct _warnings_runtime_state { + /* Both 'filters' and 'onceregistry' can be set in warnings.py; + get_warnings_attr() will reset these variables accordingly. */ + PyObject *filters; /* List */ + PyObject *once_registry; /* Dict */ + PyObject *default_action; /* String */ + long filters_version; +}; + +extern int _PyWarnings_InitState(PyInterpreterState *interp); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERNAL_WARNINGS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/interpreteridobject.h b/ScriptEngine/third-party/backend/include/Python/interpreteridobject.h new file mode 100644 index 0000000000..e744fcdc9f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/interpreteridobject.h @@ -0,0 +1,17 @@ +#ifndef Py_INTERPRETERIDOBJECT_H +#define Py_INTERPRETERIDOBJECT_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_INTERPRETERIDOBJECT_H +# include "cpython/interpreteridobject.h" +# undef Py_CPYTHON_INTERPRETERIDOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTERPRETERIDOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/intrcheck.h b/ScriptEngine/third-party/backend/include/Python/intrcheck.h new file mode 100644 index 0000000000..b8cc656016 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/intrcheck.h @@ -0,0 +1,30 @@ +#ifndef Py_INTRCHECK_H +#define Py_INTRCHECK_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(int) PyOS_InterruptOccurred(void); +#ifdef HAVE_FORK +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000 +PyAPI_FUNC(void) PyOS_BeforeFork(void); +PyAPI_FUNC(void) PyOS_AfterFork_Parent(void); +PyAPI_FUNC(void) PyOS_AfterFork_Child(void); +#endif +#endif +/* Deprecated, please use PyOS_AfterFork_Child() instead */ +Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyOS_AfterFork(void); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyOS_IsMainThread(void); + +#ifdef MS_WINDOWS +/* windows.h is not included by Python.h so use void* instead of HANDLE */ +PyAPI_FUNC(void*) _PyOS_SigintEvent(void); +#endif +#endif /* !Py_LIMITED_API */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_INTRCHECK_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/iterobject.h b/ScriptEngine/third-party/backend/include/Python/iterobject.h new file mode 100644 index 0000000000..6454611aeb --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/iterobject.h @@ -0,0 +1,27 @@ +#ifndef Py_ITEROBJECT_H +#define Py_ITEROBJECT_H +/* Iterators (the basic kind, over a sequence) */ +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(PyTypeObject) PySeqIter_Type; +PyAPI_DATA(PyTypeObject) PyCallIter_Type; +#ifdef Py_BUILD_CORE +extern PyTypeObject _PyAnextAwaitable_Type; +#endif + +#define PySeqIter_Check(op) Py_IS_TYPE(op, &PySeqIter_Type) + +PyAPI_FUNC(PyObject *) PySeqIter_New(PyObject *); + + +#define PyCallIter_Check(op) Py_IS_TYPE(op, &PyCallIter_Type) + +PyAPI_FUNC(PyObject *) PyCallIter_New(PyObject *, PyObject *); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_ITEROBJECT_H */ + diff --git a/ScriptEngine/third-party/backend/include/Python/listobject.h b/ScriptEngine/third-party/backend/include/Python/listobject.h new file mode 100644 index 0000000000..2a8a25525d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/listobject.h @@ -0,0 +1,52 @@ +/* List object interface + + Another generally useful object type is a list of object pointers. + This is a mutable type: the list items can be changed, and items can be + added or removed. Out-of-range indices or non-list objects are ignored. + + WARNING: PyList_SetItem does not increment the new item's reference count, + but does decrement the reference count of the item it replaces, if not nil. + It does *decrement* the reference count if it is *not* inserted in the list. + Similarly, PyList_GetItem does not increment the returned item's reference + count. +*/ + +#ifndef Py_LISTOBJECT_H +#define Py_LISTOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(PyTypeObject) PyList_Type; +PyAPI_DATA(PyTypeObject) PyListIter_Type; +PyAPI_DATA(PyTypeObject) PyListRevIter_Type; + +#define PyList_Check(op) \ + PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LIST_SUBCLASS) +#define PyList_CheckExact(op) Py_IS_TYPE(op, &PyList_Type) + +PyAPI_FUNC(PyObject *) PyList_New(Py_ssize_t size); +PyAPI_FUNC(Py_ssize_t) PyList_Size(PyObject *); + +PyAPI_FUNC(PyObject *) PyList_GetItem(PyObject *, Py_ssize_t); +PyAPI_FUNC(int) PyList_SetItem(PyObject *, Py_ssize_t, PyObject *); +PyAPI_FUNC(int) PyList_Insert(PyObject *, Py_ssize_t, PyObject *); +PyAPI_FUNC(int) PyList_Append(PyObject *, PyObject *); + +PyAPI_FUNC(PyObject *) PyList_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); +PyAPI_FUNC(int) PyList_SetSlice(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); + +PyAPI_FUNC(int) PyList_Sort(PyObject *); +PyAPI_FUNC(int) PyList_Reverse(PyObject *); +PyAPI_FUNC(PyObject *) PyList_AsTuple(PyObject *); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_LISTOBJECT_H +# include "cpython/listobject.h" +# undef Py_CPYTHON_LISTOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_LISTOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/longintrepr.h b/ScriptEngine/third-party/backend/include/Python/longintrepr.h new file mode 100644 index 0000000000..ff4155f965 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/longintrepr.h @@ -0,0 +1,99 @@ +#ifndef Py_LIMITED_API +#ifndef Py_LONGINTREPR_H +#define Py_LONGINTREPR_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* This is published for the benefit of "friends" marshal.c and _decimal.c. */ + +/* Parameters of the integer representation. There are two different + sets of parameters: one set for 30-bit digits, stored in an unsigned 32-bit + integer type, and one set for 15-bit digits with each digit stored in an + unsigned short. The value of PYLONG_BITS_IN_DIGIT, defined either at + configure time or in pyport.h, is used to decide which digit size to use. + + Type 'digit' should be able to hold 2*PyLong_BASE-1, and type 'twodigits' + should be an unsigned integer type able to hold all integers up to + PyLong_BASE*PyLong_BASE-1. x_sub assumes that 'digit' is an unsigned type, + and that overflow is handled by taking the result modulo 2**N for some N > + PyLong_SHIFT. The majority of the code doesn't care about the precise + value of PyLong_SHIFT, but there are some notable exceptions: + + - long_pow() requires that PyLong_SHIFT be divisible by 5 + + - PyLong_{As,From}ByteArray require that PyLong_SHIFT be at least 8 + + - long_hash() requires that PyLong_SHIFT is *strictly* less than the number + of bits in an unsigned long, as do the PyLong <-> long (or unsigned long) + conversion functions + + - the Python int <-> size_t/Py_ssize_t conversion functions expect that + PyLong_SHIFT is strictly less than the number of bits in a size_t + + - the marshal code currently expects that PyLong_SHIFT is a multiple of 15 + + - NSMALLNEGINTS and NSMALLPOSINTS should be small enough to fit in a single + digit; with the current values this forces PyLong_SHIFT >= 9 + + The values 15 and 30 should fit all of the above requirements, on any + platform. +*/ + +#if PYLONG_BITS_IN_DIGIT == 30 +typedef uint32_t digit; +typedef int32_t sdigit; /* signed variant of digit */ +typedef uint64_t twodigits; +typedef int64_t stwodigits; /* signed variant of twodigits */ +#define PyLong_SHIFT 30 +#define _PyLong_DECIMAL_SHIFT 9 /* max(e such that 10**e fits in a digit) */ +#define _PyLong_DECIMAL_BASE ((digit)1000000000) /* 10 ** DECIMAL_SHIFT */ +#elif PYLONG_BITS_IN_DIGIT == 15 +typedef unsigned short digit; +typedef short sdigit; /* signed variant of digit */ +typedef unsigned long twodigits; +typedef long stwodigits; /* signed variant of twodigits */ +#define PyLong_SHIFT 15 +#define _PyLong_DECIMAL_SHIFT 4 /* max(e such that 10**e fits in a digit) */ +#define _PyLong_DECIMAL_BASE ((digit)10000) /* 10 ** DECIMAL_SHIFT */ +#else +#error "PYLONG_BITS_IN_DIGIT should be 15 or 30" +#endif +#define PyLong_BASE ((digit)1 << PyLong_SHIFT) +#define PyLong_MASK ((digit)(PyLong_BASE - 1)) + +#if PyLong_SHIFT % 5 != 0 +#error "longobject.c requires that PyLong_SHIFT be divisible by 5" +#endif + +/* Long integer representation. + The absolute value of a number is equal to + SUM(for i=0 through abs(ob_size)-1) ob_digit[i] * 2**(SHIFT*i) + Negative numbers are represented with ob_size < 0; + zero is represented by ob_size == 0. + In a normalized number, ob_digit[abs(ob_size)-1] (the most significant + digit) is never zero. Also, in all cases, for all valid i, + 0 <= ob_digit[i] <= MASK. + The allocation function takes care of allocating extra memory + so that ob_digit[0] ... ob_digit[abs(ob_size)-1] are actually available. + + CAUTION: Generic code manipulating subtypes of PyVarObject has to + aware that ints abuse ob_size's sign bit. +*/ + +struct _longobject { + PyObject_VAR_HEAD + digit ob_digit[1]; +}; + +PyAPI_FUNC(PyLongObject *) _PyLong_New(Py_ssize_t); + +/* Return a copy of src. */ +PyAPI_FUNC(PyObject *) _PyLong_Copy(PyLongObject *src); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_LONGINTREPR_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/longobject.h b/ScriptEngine/third-party/backend/include/Python/longobject.h new file mode 100644 index 0000000000..e2301d7abf --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/longobject.h @@ -0,0 +1,220 @@ +#ifndef Py_LONGOBJECT_H +#define Py_LONGOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* Long (arbitrary precision) integer object interface */ + +typedef struct _longobject PyLongObject; /* Revealed in longintrepr.h */ + +PyAPI_DATA(PyTypeObject) PyLong_Type; + +#define PyLong_Check(op) \ + PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_LONG_SUBCLASS) +#define PyLong_CheckExact(op) Py_IS_TYPE(op, &PyLong_Type) + +PyAPI_FUNC(PyObject *) PyLong_FromLong(long); +PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLong(unsigned long); +PyAPI_FUNC(PyObject *) PyLong_FromSize_t(size_t); +PyAPI_FUNC(PyObject *) PyLong_FromSsize_t(Py_ssize_t); +PyAPI_FUNC(PyObject *) PyLong_FromDouble(double); +PyAPI_FUNC(long) PyLong_AsLong(PyObject *); +PyAPI_FUNC(long) PyLong_AsLongAndOverflow(PyObject *, int *); +PyAPI_FUNC(Py_ssize_t) PyLong_AsSsize_t(PyObject *); +PyAPI_FUNC(size_t) PyLong_AsSize_t(PyObject *); +PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLong(PyObject *); +PyAPI_FUNC(unsigned long) PyLong_AsUnsignedLongMask(PyObject *); +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyLong_AsInt(PyObject *); +#endif +PyAPI_FUNC(PyObject *) PyLong_GetInfo(void); + +/* It may be useful in the future. I've added it in the PyInt -> PyLong + cleanup to keep the extra information. [CH] */ +#define PyLong_AS_LONG(op) PyLong_AsLong(op) + +/* Issue #1983: pid_t can be longer than a C long on some systems */ +#if !defined(SIZEOF_PID_T) || SIZEOF_PID_T == SIZEOF_INT +#define _Py_PARSE_PID "i" +#define PyLong_FromPid PyLong_FromLong +#define PyLong_AsPid PyLong_AsLong +#elif SIZEOF_PID_T == SIZEOF_LONG +#define _Py_PARSE_PID "l" +#define PyLong_FromPid PyLong_FromLong +#define PyLong_AsPid PyLong_AsLong +#elif defined(SIZEOF_LONG_LONG) && SIZEOF_PID_T == SIZEOF_LONG_LONG +#define _Py_PARSE_PID "L" +#define PyLong_FromPid PyLong_FromLongLong +#define PyLong_AsPid PyLong_AsLongLong +#else +#error "sizeof(pid_t) is neither sizeof(int), sizeof(long) or sizeof(long long)" +#endif /* SIZEOF_PID_T */ + +#if SIZEOF_VOID_P == SIZEOF_INT +# define _Py_PARSE_INTPTR "i" +# define _Py_PARSE_UINTPTR "I" +#elif SIZEOF_VOID_P == SIZEOF_LONG +# define _Py_PARSE_INTPTR "l" +# define _Py_PARSE_UINTPTR "k" +#elif defined(SIZEOF_LONG_LONG) && SIZEOF_VOID_P == SIZEOF_LONG_LONG +# define _Py_PARSE_INTPTR "L" +# define _Py_PARSE_UINTPTR "K" +#else +# error "void* different in size from int, long and long long" +#endif /* SIZEOF_VOID_P */ + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyLong_UnsignedShort_Converter(PyObject *, void *); +PyAPI_FUNC(int) _PyLong_UnsignedInt_Converter(PyObject *, void *); +PyAPI_FUNC(int) _PyLong_UnsignedLong_Converter(PyObject *, void *); +PyAPI_FUNC(int) _PyLong_UnsignedLongLong_Converter(PyObject *, void *); +PyAPI_FUNC(int) _PyLong_Size_t_Converter(PyObject *, void *); +#endif + +/* Used by Python/mystrtoul.c, _PyBytes_FromHex(), + _PyBytes_DecodeEscape(), etc. */ +#ifndef Py_LIMITED_API +PyAPI_DATA(unsigned char) _PyLong_DigitValue[256]; +#endif + +/* _PyLong_Frexp returns a double x and an exponent e such that the + true value is approximately equal to x * 2**e. e is >= 0. x is + 0.0 if and only if the input is 0 (in which case, e and x are both + zeroes); otherwise, 0.5 <= abs(x) < 1.0. On overflow, which is + possible if the number of bits doesn't fit into a Py_ssize_t, sets + OverflowError and returns -1.0 for x, 0 for e. */ +#ifndef Py_LIMITED_API +PyAPI_FUNC(double) _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e); +#endif + +PyAPI_FUNC(double) PyLong_AsDouble(PyObject *); +PyAPI_FUNC(PyObject *) PyLong_FromVoidPtr(void *); +PyAPI_FUNC(void *) PyLong_AsVoidPtr(PyObject *); + +PyAPI_FUNC(PyObject *) PyLong_FromLongLong(long long); +PyAPI_FUNC(PyObject *) PyLong_FromUnsignedLongLong(unsigned long long); +PyAPI_FUNC(long long) PyLong_AsLongLong(PyObject *); +PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLong(PyObject *); +PyAPI_FUNC(unsigned long long) PyLong_AsUnsignedLongLongMask(PyObject *); +PyAPI_FUNC(long long) PyLong_AsLongLongAndOverflow(PyObject *, int *); + +PyAPI_FUNC(PyObject *) PyLong_FromString(const char *, char **, int); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) PyLong_FromUnicodeObject(PyObject *u, int base); +PyAPI_FUNC(PyObject *) _PyLong_FromBytes(const char *, Py_ssize_t, int); +#endif + +#ifndef Py_LIMITED_API +/* _PyLong_Sign. Return 0 if v is 0, -1 if v < 0, +1 if v > 0. + v must not be NULL, and must be a normalized long. + There are no error cases. +*/ +PyAPI_FUNC(int) _PyLong_Sign(PyObject *v); + + +/* _PyLong_NumBits. Return the number of bits needed to represent the + absolute value of a long. For example, this returns 1 for 1 and -1, 2 + for 2 and -2, and 2 for 3 and -3. It returns 0 for 0. + v must not be NULL, and must be a normalized long. + (size_t)-1 is returned and OverflowError set if the true result doesn't + fit in a size_t. +*/ +PyAPI_FUNC(size_t) _PyLong_NumBits(PyObject *v); + +/* _PyLong_DivmodNear. Given integers a and b, compute the nearest + integer q to the exact quotient a / b, rounding to the nearest even integer + in the case of a tie. Return (q, r), where r = a - q*b. The remainder r + will satisfy abs(r) <= abs(b)/2, with equality possible only if q is + even. +*/ +PyAPI_FUNC(PyObject *) _PyLong_DivmodNear(PyObject *, PyObject *); + +/* _PyLong_FromByteArray: View the n unsigned bytes as a binary integer in + base 256, and return a Python int with the same numeric value. + If n is 0, the integer is 0. Else: + If little_endian is 1/true, bytes[n-1] is the MSB and bytes[0] the LSB; + else (little_endian is 0/false) bytes[0] is the MSB and bytes[n-1] the + LSB. + If is_signed is 0/false, view the bytes as a non-negative integer. + If is_signed is 1/true, view the bytes as a 2's-complement integer, + non-negative if bit 0x80 of the MSB is clear, negative if set. + Error returns: + + Return NULL with the appropriate exception set if there's not + enough memory to create the Python int. +*/ +PyAPI_FUNC(PyObject *) _PyLong_FromByteArray( + const unsigned char* bytes, size_t n, + int little_endian, int is_signed); + +/* _PyLong_AsByteArray: Convert the least-significant 8*n bits of long + v to a base-256 integer, stored in array bytes. Normally return 0, + return -1 on error. + If little_endian is 1/true, store the MSB at bytes[n-1] and the LSB at + bytes[0]; else (little_endian is 0/false) store the MSB at bytes[0] and + the LSB at bytes[n-1]. + If is_signed is 0/false, it's an error if v < 0; else (v >= 0) n bytes + are filled and there's nothing special about bit 0x80 of the MSB. + If is_signed is 1/true, bytes is filled with the 2's-complement + representation of v's value. Bit 0x80 of the MSB is the sign bit. + Error returns (-1): + + is_signed is 0 and v < 0. TypeError is set in this case, and bytes + isn't altered. + + n isn't big enough to hold the full mathematical value of v. For + example, if is_signed is 0 and there are more digits in the v than + fit in n; or if is_signed is 1, v < 0, and n is just 1 bit shy of + being large enough to hold a sign bit. OverflowError is set in this + case, but bytes holds the least-significant n bytes of the true value. +*/ +PyAPI_FUNC(int) _PyLong_AsByteArray(PyLongObject* v, + unsigned char* bytes, size_t n, + int little_endian, int is_signed); + +/* _PyLong_Format: Convert the long to a string object with given base, + appending a base prefix of 0[box] if base is 2, 8 or 16. */ +PyAPI_FUNC(PyObject *) _PyLong_Format(PyObject *obj, int base); + +PyAPI_FUNC(int) _PyLong_FormatWriter( + _PyUnicodeWriter *writer, + PyObject *obj, + int base, + int alternate); + +PyAPI_FUNC(char*) _PyLong_FormatBytesWriter( + _PyBytesWriter *writer, + char *str, + PyObject *obj, + int base, + int alternate); + +/* Format the object based on the format_spec, as defined in PEP 3101 + (Advanced String Formatting). */ +PyAPI_FUNC(int) _PyLong_FormatAdvancedWriter( + _PyUnicodeWriter *writer, + PyObject *obj, + PyObject *format_spec, + Py_ssize_t start, + Py_ssize_t end); +#endif /* Py_LIMITED_API */ + +/* These aren't really part of the int object, but they're handy. The + functions are in Python/mystrtoul.c. + */ +PyAPI_FUNC(unsigned long) PyOS_strtoul(const char *, char **, int); +PyAPI_FUNC(long) PyOS_strtol(const char *, char **, int); + +#ifndef Py_LIMITED_API +/* For use by the gcd function in mathmodule.c */ +PyAPI_FUNC(PyObject *) _PyLong_GCD(PyObject *, PyObject *); +#endif /* !Py_LIMITED_API */ + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyLong_Rshift(PyObject *, size_t); +PyAPI_FUNC(PyObject *) _PyLong_Lshift(PyObject *, size_t); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_LONGOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/marshal.h b/ScriptEngine/third-party/backend/include/Python/marshal.h new file mode 100644 index 0000000000..09d9337e57 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/marshal.h @@ -0,0 +1,28 @@ + +/* Interface for marshal.c */ + +#ifndef Py_MARSHAL_H +#define Py_MARSHAL_H +#ifdef __cplusplus +extern "C" { +#endif + +#define Py_MARSHAL_VERSION 4 + +PyAPI_FUNC(void) PyMarshal_WriteLongToFile(long, FILE *, int); +PyAPI_FUNC(void) PyMarshal_WriteObjectToFile(PyObject *, FILE *, int); +PyAPI_FUNC(PyObject *) PyMarshal_WriteObjectToString(PyObject *, int); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(long) PyMarshal_ReadLongFromFile(FILE *); +PyAPI_FUNC(int) PyMarshal_ReadShortFromFile(FILE *); +PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromFile(FILE *); +PyAPI_FUNC(PyObject *) PyMarshal_ReadLastObjectFromFile(FILE *); +#endif +PyAPI_FUNC(PyObject *) PyMarshal_ReadObjectFromString(const char *, + Py_ssize_t); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_MARSHAL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/memoryobject.h b/ScriptEngine/third-party/backend/include/Python/memoryobject.h new file mode 100644 index 0000000000..306028f4b2 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/memoryobject.h @@ -0,0 +1,72 @@ +/* Memory view object. In Python this is available as "memoryview". */ + +#ifndef Py_MEMORYOBJECT_H +#define Py_MEMORYOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +PyAPI_DATA(PyTypeObject) _PyManagedBuffer_Type; +#endif +PyAPI_DATA(PyTypeObject) PyMemoryView_Type; + +#define PyMemoryView_Check(op) Py_IS_TYPE(op, &PyMemoryView_Type) + +#ifndef Py_LIMITED_API +/* Get a pointer to the memoryview's private copy of the exporter's buffer. */ +#define PyMemoryView_GET_BUFFER(op) (&((PyMemoryViewObject *)(op))->view) +/* Get a pointer to the exporting object (this may be NULL!). */ +#define PyMemoryView_GET_BASE(op) (((PyMemoryViewObject *)(op))->view.obj) +#endif + +PyAPI_FUNC(PyObject *) PyMemoryView_FromObject(PyObject *base); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject *) PyMemoryView_FromMemory(char *mem, Py_ssize_t size, + int flags); +#endif +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) PyMemoryView_FromBuffer(Py_buffer *info); +#endif +PyAPI_FUNC(PyObject *) PyMemoryView_GetContiguous(PyObject *base, + int buffertype, + char order); + + +/* The structs are declared here so that macros can work, but they shouldn't + be considered public. Don't access their fields directly, use the macros + and functions instead! */ +#ifndef Py_LIMITED_API +#define _Py_MANAGED_BUFFER_RELEASED 0x001 /* access to exporter blocked */ +#define _Py_MANAGED_BUFFER_FREE_FORMAT 0x002 /* free format */ +typedef struct { + PyObject_HEAD + int flags; /* state flags */ + Py_ssize_t exports; /* number of direct memoryview exports */ + Py_buffer master; /* snapshot buffer obtained from the original exporter */ +} _PyManagedBufferObject; + + +/* memoryview state flags */ +#define _Py_MEMORYVIEW_RELEASED 0x001 /* access to master buffer blocked */ +#define _Py_MEMORYVIEW_C 0x002 /* C-contiguous layout */ +#define _Py_MEMORYVIEW_FORTRAN 0x004 /* Fortran contiguous layout */ +#define _Py_MEMORYVIEW_SCALAR 0x008 /* scalar: ndim = 0 */ +#define _Py_MEMORYVIEW_PIL 0x010 /* PIL-style layout */ + +typedef struct { + PyObject_VAR_HEAD + _PyManagedBufferObject *mbuf; /* managed buffer */ + Py_hash_t hash; /* hash value for read-only views */ + int flags; /* state flags */ + Py_ssize_t exports; /* number of buffer re-exports */ + Py_buffer view; /* private copy of the exporter's view */ + PyObject *weakreflist; + Py_ssize_t ob_array[1]; /* shape, strides, suboffsets */ +} PyMemoryViewObject; +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_MEMORYOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/methodobject.h b/ScriptEngine/third-party/backend/include/Python/methodobject.h new file mode 100644 index 0000000000..9ffe8e1a3d --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/methodobject.h @@ -0,0 +1,116 @@ + +/* Method object interface */ + +#ifndef Py_METHODOBJECT_H +#define Py_METHODOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* This is about the type 'builtin_function_or_method', + not Python methods in user-defined classes. See classobject.h + for the latter. */ + +PyAPI_DATA(PyTypeObject) PyCFunction_Type; + +#define PyCFunction_CheckExact(op) Py_IS_TYPE(op, &PyCFunction_Type) +#define PyCFunction_Check(op) PyObject_TypeCheck(op, &PyCFunction_Type) + +typedef PyObject *(*PyCFunction)(PyObject *, PyObject *); +typedef PyObject *(*_PyCFunctionFast) (PyObject *, PyObject *const *, Py_ssize_t); +typedef PyObject *(*PyCFunctionWithKeywords)(PyObject *, PyObject *, + PyObject *); +typedef PyObject *(*_PyCFunctionFastWithKeywords) (PyObject *, + PyObject *const *, Py_ssize_t, + PyObject *); +typedef PyObject *(*PyCMethod)(PyObject *, PyTypeObject *, PyObject *const *, + size_t, PyObject *); + +PyAPI_FUNC(PyCFunction) PyCFunction_GetFunction(PyObject *); +PyAPI_FUNC(PyObject *) PyCFunction_GetSelf(PyObject *); +PyAPI_FUNC(int) PyCFunction_GetFlags(PyObject *); + +Py_DEPRECATED(3.9) PyAPI_FUNC(PyObject *) PyCFunction_Call(PyObject *, PyObject *, PyObject *); + +struct PyMethodDef { + const char *ml_name; /* The name of the built-in function/method */ + PyCFunction ml_meth; /* The C function that implements it */ + int ml_flags; /* Combination of METH_xxx flags, which mostly + describe the args expected by the C func */ + const char *ml_doc; /* The __doc__ attribute, or NULL */ +}; +typedef struct PyMethodDef PyMethodDef; + +/* PyCFunction_New is declared as a function for stable ABI (declaration is + * needed for e.g. GCC with -fvisibility=hidden), but redefined as a macro + * that calls PyCFunction_NewEx. */ +PyAPI_FUNC(PyObject *) PyCFunction_New(PyMethodDef *, PyObject *); +#define PyCFunction_New(ML, SELF) PyCFunction_NewEx((ML), (SELF), NULL) + +/* PyCFunction_NewEx is similar: on 3.9+, this calls PyCMethod_New. */ +PyAPI_FUNC(PyObject *) PyCFunction_NewEx(PyMethodDef *, PyObject *, + PyObject *); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +#define PyCFunction_NewEx(ML, SELF, MOD) PyCMethod_New((ML), (SELF), (MOD), NULL) +PyAPI_FUNC(PyObject *) PyCMethod_New(PyMethodDef *, PyObject *, + PyObject *, PyTypeObject *); +#endif + + +/* Flag passed to newmethodobject */ +/* #define METH_OLDARGS 0x0000 -- unsupported now */ +#define METH_VARARGS 0x0001 +#define METH_KEYWORDS 0x0002 +/* METH_NOARGS and METH_O must not be combined with the flags above. */ +#define METH_NOARGS 0x0004 +#define METH_O 0x0008 + +/* METH_CLASS and METH_STATIC are a little different; these control + the construction of methods for a class. These cannot be used for + functions in modules. */ +#define METH_CLASS 0x0010 +#define METH_STATIC 0x0020 + +/* METH_COEXIST allows a method to be entered even though a slot has + already filled the entry. When defined, the flag allows a separate + method, "__contains__" for example, to coexist with a defined + slot like sq_contains. */ + +#define METH_COEXIST 0x0040 + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030a0000 +# define METH_FASTCALL 0x0080 +#endif + +/* This bit is preserved for Stackless Python */ +#ifdef STACKLESS +# define METH_STACKLESS 0x0100 +#else +# define METH_STACKLESS 0x0000 +#endif + +/* METH_METHOD means the function stores an + * additional reference to the class that defines it; + * both self and class are passed to it. + * It uses PyCMethodObject instead of PyCFunctionObject. + * May not be combined with METH_NOARGS, METH_O, METH_CLASS or METH_STATIC. + */ + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +#define METH_METHOD 0x0200 +#endif + + +#ifndef Py_LIMITED_API + +#define Py_CPYTHON_METHODOBJECT_H +#include "cpython/methodobject.h" +#undef Py_CPYTHON_METHODOBJECT_H + +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_METHODOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/modsupport.h b/ScriptEngine/third-party/backend/include/Python/modsupport.h new file mode 100644 index 0000000000..f009d586bf --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/modsupport.h @@ -0,0 +1,263 @@ + +#ifndef Py_MODSUPPORT_H +#define Py_MODSUPPORT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* Module support interface */ + +#include + +/* If PY_SSIZE_T_CLEAN is defined, each functions treats #-specifier + to mean Py_ssize_t */ +#ifdef PY_SSIZE_T_CLEAN +#define PyArg_Parse _PyArg_Parse_SizeT +#define PyArg_ParseTuple _PyArg_ParseTuple_SizeT +#define PyArg_ParseTupleAndKeywords _PyArg_ParseTupleAndKeywords_SizeT +#define PyArg_VaParse _PyArg_VaParse_SizeT +#define PyArg_VaParseTupleAndKeywords _PyArg_VaParseTupleAndKeywords_SizeT +#define Py_BuildValue _Py_BuildValue_SizeT +#define Py_VaBuildValue _Py_VaBuildValue_SizeT +#ifndef Py_LIMITED_API +#define _Py_VaBuildStack _Py_VaBuildStack_SizeT +#endif +#else +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list); +PyAPI_FUNC(PyObject **) _Py_VaBuildStack_SizeT( + PyObject **small_stack, + Py_ssize_t small_stack_len, + const char *format, + va_list va, + Py_ssize_t *p_nargs); +#endif /* !Py_LIMITED_API */ +#endif + +/* Due to a glitch in 3.2, the _SizeT versions weren't exported from the DLL. */ +#if !defined(PY_SSIZE_T_CLEAN) || !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...); +PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...); +PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *, + const char *, char **, ...); +PyAPI_FUNC(int) PyArg_VaParse(PyObject *, const char *, va_list); +PyAPI_FUNC(int) PyArg_VaParseTupleAndKeywords(PyObject *, PyObject *, + const char *, char **, va_list); +#endif +PyAPI_FUNC(int) PyArg_ValidateKeywordArguments(PyObject *); +PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...); +PyAPI_FUNC(PyObject *) Py_BuildValue(const char *, ...); +PyAPI_FUNC(PyObject *) _Py_BuildValue_SizeT(const char *, ...); + + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) _PyArg_UnpackStack( + PyObject *const *args, + Py_ssize_t nargs, + const char *name, + Py_ssize_t min, + Py_ssize_t max, + ...); + +PyAPI_FUNC(int) _PyArg_NoKeywords(const char *funcname, PyObject *kwargs); +PyAPI_FUNC(int) _PyArg_NoKwnames(const char *funcname, PyObject *kwnames); +PyAPI_FUNC(int) _PyArg_NoPositional(const char *funcname, PyObject *args); +#define _PyArg_NoKeywords(funcname, kwargs) \ + ((kwargs) == NULL || _PyArg_NoKeywords((funcname), (kwargs))) +#define _PyArg_NoKwnames(funcname, kwnames) \ + ((kwnames) == NULL || _PyArg_NoKwnames((funcname), (kwnames))) +#define _PyArg_NoPositional(funcname, args) \ + ((args) == NULL || _PyArg_NoPositional((funcname), (args))) + +PyAPI_FUNC(void) _PyArg_BadArgument(const char *, const char *, const char *, PyObject *); +PyAPI_FUNC(int) _PyArg_CheckPositional(const char *, Py_ssize_t, + Py_ssize_t, Py_ssize_t); +#define _PyArg_CheckPositional(funcname, nargs, min, max) \ + (((min) <= (nargs) && (nargs) <= (max)) \ + || _PyArg_CheckPositional((funcname), (nargs), (min), (max))) + +#endif + +PyAPI_FUNC(PyObject *) Py_VaBuildValue(const char *, va_list); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject **) _Py_VaBuildStack( + PyObject **small_stack, + Py_ssize_t small_stack_len, + const char *format, + va_list va, + Py_ssize_t *p_nargs); +#endif + +#ifndef Py_LIMITED_API +typedef struct _PyArg_Parser { + const char *format; + const char * const *keywords; + const char *fname; + const char *custom_msg; + int pos; /* number of positional-only arguments */ + int min; /* minimal number of arguments */ + int max; /* maximal number of positional arguments */ + PyObject *kwtuple; /* tuple of keyword parameter names */ + struct _PyArg_Parser *next; +} _PyArg_Parser; +#ifdef PY_SSIZE_T_CLEAN +#define _PyArg_ParseTupleAndKeywordsFast _PyArg_ParseTupleAndKeywordsFast_SizeT +#define _PyArg_ParseStack _PyArg_ParseStack_SizeT +#define _PyArg_ParseStackAndKeywords _PyArg_ParseStackAndKeywords_SizeT +#define _PyArg_VaParseTupleAndKeywordsFast _PyArg_VaParseTupleAndKeywordsFast_SizeT +#endif +PyAPI_FUNC(int) _PyArg_ParseTupleAndKeywordsFast(PyObject *, PyObject *, + struct _PyArg_Parser *, ...); +PyAPI_FUNC(int) _PyArg_ParseStack( + PyObject *const *args, + Py_ssize_t nargs, + const char *format, + ...); +PyAPI_FUNC(int) _PyArg_ParseStackAndKeywords( + PyObject *const *args, + Py_ssize_t nargs, + PyObject *kwnames, + struct _PyArg_Parser *, + ...); +PyAPI_FUNC(int) _PyArg_VaParseTupleAndKeywordsFast(PyObject *, PyObject *, + struct _PyArg_Parser *, va_list); +PyAPI_FUNC(PyObject * const *) _PyArg_UnpackKeywords( + PyObject *const *args, Py_ssize_t nargs, + PyObject *kwargs, PyObject *kwnames, + struct _PyArg_Parser *parser, + int minpos, int maxpos, int minkw, + PyObject **buf); +#define _PyArg_UnpackKeywords(args, nargs, kwargs, kwnames, parser, minpos, maxpos, minkw, buf) \ + (((minkw) == 0 && (kwargs) == NULL && (kwnames) == NULL && \ + (minpos) <= (nargs) && (nargs) <= (maxpos) && args != NULL) ? (args) : \ + _PyArg_UnpackKeywords((args), (nargs), (kwargs), (kwnames), (parser), \ + (minpos), (maxpos), (minkw), (buf))) + +void _PyArg_Fini(void); +#endif /* Py_LIMITED_API */ + +// Add an attribute with name 'name' and value 'obj' to the module 'mod. +// On success, return 0 on success. +// On error, raise an exception and return -1. +PyAPI_FUNC(int) PyModule_AddObjectRef(PyObject *mod, const char *name, PyObject *value); + +// Similar to PyModule_AddObjectRef() but steal a reference to 'obj' +// (Py_DECREF(obj)) on success (if it returns 0). +PyAPI_FUNC(int) PyModule_AddObject(PyObject *mod, const char *, PyObject *value); + +PyAPI_FUNC(int) PyModule_AddIntConstant(PyObject *, const char *, long); +PyAPI_FUNC(int) PyModule_AddStringConstant(PyObject *, const char *, const char *); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +/* New in 3.9 */ +PyAPI_FUNC(int) PyModule_AddType(PyObject *module, PyTypeObject *type); +#endif /* Py_LIMITED_API */ +#define PyModule_AddIntMacro(m, c) PyModule_AddIntConstant(m, #c, c) +#define PyModule_AddStringMacro(m, c) PyModule_AddStringConstant(m, #c, c) + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ +PyAPI_FUNC(int) PyModule_SetDocString(PyObject *, const char *); +PyAPI_FUNC(int) PyModule_AddFunctions(PyObject *, PyMethodDef *); +PyAPI_FUNC(int) PyModule_ExecDef(PyObject *module, PyModuleDef *def); +#endif + +#define Py_CLEANUP_SUPPORTED 0x20000 + +#define PYTHON_API_VERSION 1013 +#define PYTHON_API_STRING "1013" +/* The API version is maintained (independently from the Python version) + so we can detect mismatches between the interpreter and dynamically + loaded modules. These are diagnosed by an error message but + the module is still loaded (because the mismatch can only be tested + after loading the module). The error message is intended to + explain the core dump a few seconds later. + + The symbol PYTHON_API_STRING defines the same value as a string + literal. *** PLEASE MAKE SURE THE DEFINITIONS MATCH. *** + + Please add a line or two to the top of this log for each API + version change: + + 22-Feb-2006 MvL 1013 PEP 353 - long indices for sequence lengths + + 19-Aug-2002 GvR 1012 Changes to string object struct for + interning changes, saving 3 bytes. + + 17-Jul-2001 GvR 1011 Descr-branch, just to be on the safe side + + 25-Jan-2001 FLD 1010 Parameters added to PyCode_New() and + PyFrame_New(); Python 2.1a2 + + 14-Mar-2000 GvR 1009 Unicode API added + + 3-Jan-1999 GvR 1007 Decided to change back! (Don't reuse 1008!) + + 3-Dec-1998 GvR 1008 Python 1.5.2b1 + + 18-Jan-1997 GvR 1007 string interning and other speedups + + 11-Oct-1996 GvR renamed Py_Ellipses to Py_Ellipsis :-( + + 30-Jul-1996 GvR Slice and ellipses syntax added + + 23-Jul-1996 GvR For 1.4 -- better safe than sorry this time :-) + + 7-Nov-1995 GvR Keyword arguments (should've been done at 1.3 :-( ) + + 10-Jan-1995 GvR Renamed globals to new naming scheme + + 9-Jan-1995 GvR Initial version (incompatible with older API) +*/ + +/* The PYTHON_ABI_VERSION is introduced in PEP 384. For the lifetime of + Python 3, it will stay at the value of 3; changes to the limited API + must be performed in a strictly backwards-compatible manner. */ +#define PYTHON_ABI_VERSION 3 +#define PYTHON_ABI_STRING "3" + +#ifdef Py_TRACE_REFS + /* When we are tracing reference counts, rename module creation functions so + modules compiled with incompatible settings will generate a + link-time error. */ + #define PyModule_Create2 PyModule_Create2TraceRefs + #define PyModule_FromDefAndSpec2 PyModule_FromDefAndSpec2TraceRefs +#endif + +PyAPI_FUNC(PyObject *) PyModule_Create2(struct PyModuleDef*, + int apiver); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PyModule_CreateInitialized(struct PyModuleDef*, + int apiver); +#endif + +#ifdef Py_LIMITED_API +#define PyModule_Create(module) \ + PyModule_Create2(module, PYTHON_ABI_VERSION) +#else +#define PyModule_Create(module) \ + PyModule_Create2(module, PYTHON_API_VERSION) +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ +PyAPI_FUNC(PyObject *) PyModule_FromDefAndSpec2(PyModuleDef *def, + PyObject *spec, + int module_api_version); + +#ifdef Py_LIMITED_API +#define PyModule_FromDefAndSpec(module, spec) \ + PyModule_FromDefAndSpec2(module, spec, PYTHON_ABI_VERSION) +#else +#define PyModule_FromDefAndSpec(module, spec) \ + PyModule_FromDefAndSpec2(module, spec, PYTHON_API_VERSION) +#endif /* Py_LIMITED_API */ +#endif /* New in 3.5 */ + +#ifndef Py_LIMITED_API +PyAPI_DATA(const char *) _Py_PackageContext; +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_MODSUPPORT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/moduleobject.h b/ScriptEngine/third-party/backend/include/Python/moduleobject.h new file mode 100644 index 0000000000..49b116ca1c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/moduleobject.h @@ -0,0 +1,96 @@ + +/* Module object interface */ + +#ifndef Py_MODULEOBJECT_H +#define Py_MODULEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(PyTypeObject) PyModule_Type; + +#define PyModule_Check(op) PyObject_TypeCheck(op, &PyModule_Type) +#define PyModule_CheckExact(op) Py_IS_TYPE(op, &PyModule_Type) + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject *) PyModule_NewObject( + PyObject *name + ); +#endif +PyAPI_FUNC(PyObject *) PyModule_New( + const char *name /* UTF-8 encoded string */ + ); +PyAPI_FUNC(PyObject *) PyModule_GetDict(PyObject *); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject *) PyModule_GetNameObject(PyObject *); +#endif +PyAPI_FUNC(const char *) PyModule_GetName(PyObject *); +Py_DEPRECATED(3.2) PyAPI_FUNC(const char *) PyModule_GetFilename(PyObject *); +PyAPI_FUNC(PyObject *) PyModule_GetFilenameObject(PyObject *); +#ifndef Py_LIMITED_API +PyAPI_FUNC(void) _PyModule_Clear(PyObject *); +PyAPI_FUNC(void) _PyModule_ClearDict(PyObject *); +PyAPI_FUNC(int) _PyModuleSpec_IsInitializing(PyObject *); +#endif +PyAPI_FUNC(struct PyModuleDef*) PyModule_GetDef(PyObject*); +PyAPI_FUNC(void*) PyModule_GetState(PyObject*); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ +PyAPI_FUNC(PyObject *) PyModuleDef_Init(struct PyModuleDef*); +PyAPI_DATA(PyTypeObject) PyModuleDef_Type; +#endif + +typedef struct PyModuleDef_Base { + PyObject_HEAD + PyObject* (*m_init)(void); + Py_ssize_t m_index; + PyObject* m_copy; +} PyModuleDef_Base; + +#define PyModuleDef_HEAD_INIT { \ + PyObject_HEAD_INIT(NULL) \ + NULL, /* m_init */ \ + 0, /* m_index */ \ + NULL, /* m_copy */ \ + } + +struct PyModuleDef_Slot; +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ +typedef struct PyModuleDef_Slot{ + int slot; + void *value; +} PyModuleDef_Slot; + +#define Py_mod_create 1 +#define Py_mod_exec 2 + +#ifndef Py_LIMITED_API +#define _Py_mod_LAST_SLOT 2 +#endif + +#endif /* New in 3.5 */ + +typedef struct PyModuleDef{ + PyModuleDef_Base m_base; + const char* m_name; + const char* m_doc; + Py_ssize_t m_size; + PyMethodDef *m_methods; + struct PyModuleDef_Slot* m_slots; + traverseproc m_traverse; + inquiry m_clear; + freefunc m_free; +} PyModuleDef; + + +// Internal C API +#ifdef Py_BUILD_CORE +extern int _PyModule_IsExtension(PyObject *obj); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_MODULEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/namespaceobject.h b/ScriptEngine/third-party/backend/include/Python/namespaceobject.h new file mode 100644 index 0000000000..0c8d95c0f1 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/namespaceobject.h @@ -0,0 +1,19 @@ + +/* simple namespace object interface */ + +#ifndef NAMESPACEOBJECT_H +#define NAMESPACEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +PyAPI_DATA(PyTypeObject) _PyNamespace_Type; + +PyAPI_FUNC(PyObject *) _PyNamespace_New(PyObject *kwds); +#endif /* !Py_LIMITED_API */ + +#ifdef __cplusplus +} +#endif +#endif /* !NAMESPACEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/object.h b/ScriptEngine/third-party/backend/include/Python/object.h new file mode 100644 index 0000000000..61e638c349 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/object.h @@ -0,0 +1,749 @@ +#ifndef Py_OBJECT_H +#define Py_OBJECT_H + +#ifdef __cplusplus +extern "C" { +#endif + + +/* Object and type object interface */ + +/* +Objects are structures allocated on the heap. Special rules apply to +the use of objects to ensure they are properly garbage-collected. +Objects are never allocated statically or on the stack; they must be +accessed through special macros and functions only. (Type objects are +exceptions to the first rule; the standard types are represented by +statically initialized type objects, although work on type/class unification +for Python 2.2 made it possible to have heap-allocated type objects too). + +An object has a 'reference count' that is increased or decreased when a +pointer to the object is copied or deleted; when the reference count +reaches zero there are no references to the object left and it can be +removed from the heap. + +An object has a 'type' that determines what it represents and what kind +of data it contains. An object's type is fixed when it is created. +Types themselves are represented as objects; an object contains a +pointer to the corresponding type object. The type itself has a type +pointer pointing to the object representing the type 'type', which +contains a pointer to itself!. + +Objects do not float around in memory; once allocated an object keeps +the same size and address. Objects that must hold variable-size data +can contain pointers to variable-size parts of the object. Not all +objects of the same type have the same size; but the size cannot change +after allocation. (These restrictions are made so a reference to an +object can be simply a pointer -- moving an object would require +updating all the pointers, and changing an object's size would require +moving it if there was another object right next to it.) + +Objects are always accessed through pointers of the type 'PyObject *'. +The type 'PyObject' is a structure that only contains the reference count +and the type pointer. The actual memory allocated for an object +contains other data that can only be accessed after casting the pointer +to a pointer to a longer structure type. This longer type must start +with the reference count and type fields; the macro PyObject_HEAD should be +used for this (to accommodate for future changes). The implementation +of a particular object type can cast the object pointer to the proper +type and back. + +A standard interface exists for objects that contain an array of items +whose size is determined when the object is allocated. +*/ + +/* Py_DEBUG implies Py_REF_DEBUG. */ +#if defined(Py_DEBUG) && !defined(Py_REF_DEBUG) +# define Py_REF_DEBUG +#endif + +#if defined(Py_LIMITED_API) && defined(Py_TRACE_REFS) +# error Py_LIMITED_API is incompatible with Py_TRACE_REFS +#endif + +/* PyTypeObject structure is defined in cpython/object.h. + In Py_LIMITED_API, PyTypeObject is an opaque structure. */ +typedef struct _typeobject PyTypeObject; + +#ifdef Py_TRACE_REFS +/* Define pointers to support a doubly-linked list of all live heap objects. */ +#define _PyObject_HEAD_EXTRA \ + struct _object *_ob_next; \ + struct _object *_ob_prev; + +#define _PyObject_EXTRA_INIT 0, 0, + +#else +# define _PyObject_HEAD_EXTRA +# define _PyObject_EXTRA_INIT +#endif + +/* PyObject_HEAD defines the initial segment of every PyObject. */ +#define PyObject_HEAD PyObject ob_base; + +#define PyObject_HEAD_INIT(type) \ + { _PyObject_EXTRA_INIT \ + 1, type }, + +#define PyVarObject_HEAD_INIT(type, size) \ + { PyObject_HEAD_INIT(type) size }, + +/* PyObject_VAR_HEAD defines the initial segment of all variable-size + * container objects. These end with a declaration of an array with 1 + * element, but enough space is malloc'ed so that the array actually + * has room for ob_size elements. Note that ob_size is an element count, + * not necessarily a byte count. + */ +#define PyObject_VAR_HEAD PyVarObject ob_base; +#define Py_INVALID_SIZE (Py_ssize_t)-1 + +/* Nothing is actually declared to be a PyObject, but every pointer to + * a Python object can be cast to a PyObject*. This is inheritance built + * by hand. Similarly every pointer to a variable-size Python object can, + * in addition, be cast to PyVarObject*. + */ +typedef struct _object { + _PyObject_HEAD_EXTRA + Py_ssize_t ob_refcnt; + PyTypeObject *ob_type; +} PyObject; + +/* Cast argument to PyObject* type. */ +#define _PyObject_CAST(op) ((PyObject*)(op)) +#define _PyObject_CAST_CONST(op) ((const PyObject*)(op)) + +typedef struct { + PyObject ob_base; + Py_ssize_t ob_size; /* Number of items in variable part */ +} PyVarObject; + +/* Cast argument to PyVarObject* type. */ +#define _PyVarObject_CAST(op) ((PyVarObject*)(op)) +#define _PyVarObject_CAST_CONST(op) ((const PyVarObject*)(op)) + + +// Test if the 'x' object is the 'y' object, the same as "x is y" in Python. +PyAPI_FUNC(int) Py_Is(PyObject *x, PyObject *y); +#define Py_Is(x, y) ((x) == (y)) + + +static inline Py_ssize_t _Py_REFCNT(const PyObject *ob) { + return ob->ob_refcnt; +} +#define Py_REFCNT(ob) _Py_REFCNT(_PyObject_CAST_CONST(ob)) + + +// bpo-39573: The Py_SET_TYPE() function must be used to set an object type. +#define Py_TYPE(ob) (_PyObject_CAST(ob)->ob_type) + +// bpo-39573: The Py_SET_SIZE() function must be used to set an object size. +#define Py_SIZE(ob) (_PyVarObject_CAST(ob)->ob_size) + + +static inline int _Py_IS_TYPE(const PyObject *ob, const PyTypeObject *type) { + // bpo-44378: Don't use Py_TYPE() since Py_TYPE() requires a non-const + // object. + return ob->ob_type == type; +} +#define Py_IS_TYPE(ob, type) _Py_IS_TYPE(_PyObject_CAST_CONST(ob), type) + + +static inline void _Py_SET_REFCNT(PyObject *ob, Py_ssize_t refcnt) { + ob->ob_refcnt = refcnt; +} +#define Py_SET_REFCNT(ob, refcnt) _Py_SET_REFCNT(_PyObject_CAST(ob), refcnt) + + +static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type) { + ob->ob_type = type; +} +#define Py_SET_TYPE(ob, type) _Py_SET_TYPE(_PyObject_CAST(ob), type) + + +static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size) { + ob->ob_size = size; +} +#define Py_SET_SIZE(ob, size) _Py_SET_SIZE(_PyVarObject_CAST(ob), size) + + +/* +Type objects contain a string containing the type name (to help somewhat +in debugging), the allocation parameters (see PyObject_New() and +PyObject_NewVar()), +and methods for accessing objects of the type. Methods are optional, a +nil pointer meaning that particular kind of access is not available for +this type. The Py_DECREF() macro uses the tp_dealloc method without +checking for a nil pointer; it should always be implemented except if +the implementation can guarantee that the reference count will never +reach zero (e.g., for statically allocated type objects). + +NB: the methods for certain type groups are now contained in separate +method blocks. +*/ + +typedef PyObject * (*unaryfunc)(PyObject *); +typedef PyObject * (*binaryfunc)(PyObject *, PyObject *); +typedef PyObject * (*ternaryfunc)(PyObject *, PyObject *, PyObject *); +typedef int (*inquiry)(PyObject *); +typedef Py_ssize_t (*lenfunc)(PyObject *); +typedef PyObject *(*ssizeargfunc)(PyObject *, Py_ssize_t); +typedef PyObject *(*ssizessizeargfunc)(PyObject *, Py_ssize_t, Py_ssize_t); +typedef int(*ssizeobjargproc)(PyObject *, Py_ssize_t, PyObject *); +typedef int(*ssizessizeobjargproc)(PyObject *, Py_ssize_t, Py_ssize_t, PyObject *); +typedef int(*objobjargproc)(PyObject *, PyObject *, PyObject *); + +typedef int (*objobjproc)(PyObject *, PyObject *); +typedef int (*visitproc)(PyObject *, void *); +typedef int (*traverseproc)(PyObject *, visitproc, void *); + + +typedef void (*freefunc)(void *); +typedef void (*destructor)(PyObject *); +typedef PyObject *(*getattrfunc)(PyObject *, char *); +typedef PyObject *(*getattrofunc)(PyObject *, PyObject *); +typedef int (*setattrfunc)(PyObject *, char *, PyObject *); +typedef int (*setattrofunc)(PyObject *, PyObject *, PyObject *); +typedef PyObject *(*reprfunc)(PyObject *); +typedef Py_hash_t (*hashfunc)(PyObject *); +typedef PyObject *(*richcmpfunc) (PyObject *, PyObject *, int); +typedef PyObject *(*getiterfunc) (PyObject *); +typedef PyObject *(*iternextfunc) (PyObject *); +typedef PyObject *(*descrgetfunc) (PyObject *, PyObject *, PyObject *); +typedef int (*descrsetfunc) (PyObject *, PyObject *, PyObject *); +typedef int (*initproc)(PyObject *, PyObject *, PyObject *); +typedef PyObject *(*newfunc)(PyTypeObject *, PyObject *, PyObject *); +typedef PyObject *(*allocfunc)(PyTypeObject *, Py_ssize_t); + +typedef struct{ + int slot; /* slot id, see below */ + void *pfunc; /* function pointer */ +} PyType_Slot; + +typedef struct{ + const char* name; + int basicsize; + int itemsize; + unsigned int flags; + PyType_Slot *slots; /* terminated by slot==0. */ +} PyType_Spec; + +PyAPI_FUNC(PyObject*) PyType_FromSpec(PyType_Spec*); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject*) PyType_FromSpecWithBases(PyType_Spec*, PyObject*); +#endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000 +PyAPI_FUNC(void*) PyType_GetSlot(PyTypeObject*, int); +#endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +PyAPI_FUNC(PyObject*) PyType_FromModuleAndSpec(PyObject *, PyType_Spec *, PyObject *); +PyAPI_FUNC(PyObject *) PyType_GetModule(struct _typeobject *); +PyAPI_FUNC(void *) PyType_GetModuleState(struct _typeobject *); +#endif + +/* Generic type check */ +PyAPI_FUNC(int) PyType_IsSubtype(PyTypeObject *, PyTypeObject *); + +static inline int _PyObject_TypeCheck(PyObject *ob, PyTypeObject *type) { + return Py_IS_TYPE(ob, type) || PyType_IsSubtype(Py_TYPE(ob), type); +} +#define PyObject_TypeCheck(ob, type) _PyObject_TypeCheck(_PyObject_CAST(ob), type) + +PyAPI_DATA(PyTypeObject) PyType_Type; /* built-in 'type' */ +PyAPI_DATA(PyTypeObject) PyBaseObject_Type; /* built-in 'object' */ +PyAPI_DATA(PyTypeObject) PySuper_Type; /* built-in 'super' */ + +PyAPI_FUNC(unsigned long) PyType_GetFlags(PyTypeObject*); + +PyAPI_FUNC(int) PyType_Ready(PyTypeObject *); +PyAPI_FUNC(PyObject *) PyType_GenericAlloc(PyTypeObject *, Py_ssize_t); +PyAPI_FUNC(PyObject *) PyType_GenericNew(PyTypeObject *, + PyObject *, PyObject *); +PyAPI_FUNC(unsigned int) PyType_ClearCache(void); +PyAPI_FUNC(void) PyType_Modified(PyTypeObject *); + +/* Generic operations on objects */ +PyAPI_FUNC(PyObject *) PyObject_Repr(PyObject *); +PyAPI_FUNC(PyObject *) PyObject_Str(PyObject *); +PyAPI_FUNC(PyObject *) PyObject_ASCII(PyObject *); +PyAPI_FUNC(PyObject *) PyObject_Bytes(PyObject *); +PyAPI_FUNC(PyObject *) PyObject_RichCompare(PyObject *, PyObject *, int); +PyAPI_FUNC(int) PyObject_RichCompareBool(PyObject *, PyObject *, int); +PyAPI_FUNC(PyObject *) PyObject_GetAttrString(PyObject *, const char *); +PyAPI_FUNC(int) PyObject_SetAttrString(PyObject *, const char *, PyObject *); +PyAPI_FUNC(int) PyObject_HasAttrString(PyObject *, const char *); +PyAPI_FUNC(PyObject *) PyObject_GetAttr(PyObject *, PyObject *); +PyAPI_FUNC(int) PyObject_SetAttr(PyObject *, PyObject *, PyObject *); +PyAPI_FUNC(int) PyObject_HasAttr(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyObject_SelfIter(PyObject *); +PyAPI_FUNC(PyObject *) PyObject_GenericGetAttr(PyObject *, PyObject *); +PyAPI_FUNC(int) PyObject_GenericSetAttr(PyObject *, PyObject *, PyObject *); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(int) PyObject_GenericSetDict(PyObject *, PyObject *, void *); +#endif +PyAPI_FUNC(Py_hash_t) PyObject_Hash(PyObject *); +PyAPI_FUNC(Py_hash_t) PyObject_HashNotImplemented(PyObject *); +PyAPI_FUNC(int) PyObject_IsTrue(PyObject *); +PyAPI_FUNC(int) PyObject_Not(PyObject *); +PyAPI_FUNC(int) PyCallable_Check(PyObject *); +PyAPI_FUNC(void) PyObject_ClearWeakRefs(PyObject *); + +/* PyObject_Dir(obj) acts like Python builtins.dir(obj), returning a + list of strings. PyObject_Dir(NULL) is like builtins.dir(), + returning the names of the current locals. In this case, if there are + no current locals, NULL is returned, and PyErr_Occurred() is false. +*/ +PyAPI_FUNC(PyObject *) PyObject_Dir(PyObject *); + + +/* Helpers for printing recursive container types */ +PyAPI_FUNC(int) Py_ReprEnter(PyObject *); +PyAPI_FUNC(void) Py_ReprLeave(PyObject *); + +/* Flag bits for printing: */ +#define Py_PRINT_RAW 1 /* No string quotes etc. */ + +/* +Type flags (tp_flags) + +These flags are used to change expected features and behavior for a +particular type. + +Arbitration of the flag bit positions will need to be coordinated among +all extension writers who publicly release their extensions (this will +be fewer than you might expect!). + +Most flags were removed as of Python 3.0 to make room for new flags. (Some +flags are not for backwards compatibility but to indicate the presence of an +optional feature; these flags remain of course.) + +Type definitions should use Py_TPFLAGS_DEFAULT for their tp_flags value. + +Code can use PyType_HasFeature(type_ob, flag_value) to test whether the +given type object has a specified feature. +*/ + +#ifndef Py_LIMITED_API +/* Set if instances of the type object are treated as sequences for pattern matching */ +#define Py_TPFLAGS_SEQUENCE (1 << 5) +/* Set if instances of the type object are treated as mappings for pattern matching */ +#define Py_TPFLAGS_MAPPING (1 << 6) +#endif + +/* Disallow creating instances of the type: set tp_new to NULL and don't create + * the "__new__" key in the type dictionary. */ +#define Py_TPFLAGS_DISALLOW_INSTANTIATION (1UL << 7) + +/* Set if the type object is immutable: type attributes cannot be set nor deleted */ +#define Py_TPFLAGS_IMMUTABLETYPE (1UL << 8) + +/* Set if the type object is dynamically allocated */ +#define Py_TPFLAGS_HEAPTYPE (1UL << 9) + +/* Set if the type allows subclassing */ +#define Py_TPFLAGS_BASETYPE (1UL << 10) + +/* Set if the type implements the vectorcall protocol (PEP 590) */ +#ifndef Py_LIMITED_API +#define Py_TPFLAGS_HAVE_VECTORCALL (1UL << 11) +// Backwards compatibility alias for API that was provisional in Python 3.8 +#define _Py_TPFLAGS_HAVE_VECTORCALL Py_TPFLAGS_HAVE_VECTORCALL +#endif + +/* Set if the type is 'ready' -- fully initialized */ +#define Py_TPFLAGS_READY (1UL << 12) + +/* Set while the type is being 'readied', to prevent recursive ready calls */ +#define Py_TPFLAGS_READYING (1UL << 13) + +/* Objects support garbage collection (see objimpl.h) */ +#define Py_TPFLAGS_HAVE_GC (1UL << 14) + +/* These two bits are preserved for Stackless Python, next after this is 17 */ +#ifdef STACKLESS +#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION (3UL << 15) +#else +#define Py_TPFLAGS_HAVE_STACKLESS_EXTENSION 0 +#endif + +/* Objects behave like an unbound method */ +#define Py_TPFLAGS_METHOD_DESCRIPTOR (1UL << 17) + +/* Object has up-to-date type attribute cache */ +#define Py_TPFLAGS_VALID_VERSION_TAG (1UL << 19) + +/* Type is abstract and cannot be instantiated */ +#define Py_TPFLAGS_IS_ABSTRACT (1UL << 20) + +// This undocumented flag gives certain built-ins their unique pattern-matching +// behavior, which allows a single positional subpattern to match against the +// subject itself (rather than a mapped attribute on it): +#define _Py_TPFLAGS_MATCH_SELF (1UL << 22) + +/* These flags are used to determine if a type is a subclass. */ +#define Py_TPFLAGS_LONG_SUBCLASS (1UL << 24) +#define Py_TPFLAGS_LIST_SUBCLASS (1UL << 25) +#define Py_TPFLAGS_TUPLE_SUBCLASS (1UL << 26) +#define Py_TPFLAGS_BYTES_SUBCLASS (1UL << 27) +#define Py_TPFLAGS_UNICODE_SUBCLASS (1UL << 28) +#define Py_TPFLAGS_DICT_SUBCLASS (1UL << 29) +#define Py_TPFLAGS_BASE_EXC_SUBCLASS (1UL << 30) +#define Py_TPFLAGS_TYPE_SUBCLASS (1UL << 31) + +#define Py_TPFLAGS_DEFAULT ( \ + Py_TPFLAGS_HAVE_STACKLESS_EXTENSION | \ + 0) + +/* NOTE: Some of the following flags reuse lower bits (removed as part of the + * Python 3.0 transition). */ + +/* The following flags are kept for compatibility; in previous + * versions they indicated presence of newer tp_* fields on the + * type struct. + * Starting with 3.8, binary compatibility of C extensions across + * feature releases of Python is not supported anymore (except when + * using the stable ABI, in which all classes are created dynamically, + * using the interpreter's memory layout.) + * Note that older extensions using the stable ABI set these flags, + * so the bits must not be repurposed. + */ +#define Py_TPFLAGS_HAVE_FINALIZE (1UL << 0) +#define Py_TPFLAGS_HAVE_VERSION_TAG (1UL << 18) + + +/* +The macros Py_INCREF(op) and Py_DECREF(op) are used to increment or decrement +reference counts. Py_DECREF calls the object's deallocator function when +the refcount falls to 0; for +objects that don't contain references to other objects or heap memory +this can be the standard function free(). Both macros can be used +wherever a void expression is allowed. The argument must not be a +NULL pointer. If it may be NULL, use Py_XINCREF/Py_XDECREF instead. +The macro _Py_NewReference(op) initialize reference counts to 1, and +in special builds (Py_REF_DEBUG, Py_TRACE_REFS) performs additional +bookkeeping appropriate to the special build. + +We assume that the reference count field can never overflow; this can +be proven when the size of the field is the same as the pointer size, so +we ignore the possibility. Provided a C int is at least 32 bits (which +is implicitly assumed in many parts of this code), that's enough for +about 2**31 references to an object. + +XXX The following became out of date in Python 2.2, but I'm not sure +XXX what the full truth is now. Certainly, heap-allocated type objects +XXX can and should be deallocated. +Type objects should never be deallocated; the type pointer in an object +is not considered to be a reference to the type object, to save +complications in the deallocation function. (This is actually a +decision that's up to the implementer of each new type so if you want, +you can count such references to the type object.) +*/ + +#ifdef Py_REF_DEBUG +PyAPI_DATA(Py_ssize_t) _Py_RefTotal; +PyAPI_FUNC(void) _Py_NegativeRefcount(const char *filename, int lineno, + PyObject *op); +#endif /* Py_REF_DEBUG */ + +PyAPI_FUNC(void) _Py_Dealloc(PyObject *); + +/* +These are provided as conveniences to Python runtime embedders, so that +they can have object code that is not dependent on Python compilation flags. +*/ +PyAPI_FUNC(void) Py_IncRef(PyObject *); +PyAPI_FUNC(void) Py_DecRef(PyObject *); + +// Similar to Py_IncRef() and Py_DecRef() but the argument must be non-NULL. +// Private functions used by Py_INCREF() and Py_DECREF(). +PyAPI_FUNC(void) _Py_IncRef(PyObject *); +PyAPI_FUNC(void) _Py_DecRef(PyObject *); + +static inline void _Py_INCREF(PyObject *op) +{ +#if defined(Py_REF_DEBUG) && defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030A0000 + // Stable ABI for Python 3.10 built in debug mode. + _Py_IncRef(op); +#else + // Non-limited C API and limited C API for Python 3.9 and older access + // directly PyObject.ob_refcnt. +#ifdef Py_REF_DEBUG + _Py_RefTotal++; +#endif + op->ob_refcnt++; +#endif +} +#define Py_INCREF(op) _Py_INCREF(_PyObject_CAST(op)) + +static inline void _Py_DECREF( +#if defined(Py_REF_DEBUG) && !(defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030A0000) + const char *filename, int lineno, +#endif + PyObject *op) +{ +#if defined(Py_REF_DEBUG) && defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030A0000 + // Stable ABI for Python 3.10 built in debug mode. + _Py_DecRef(op); +#else + // Non-limited C API and limited C API for Python 3.9 and older access + // directly PyObject.ob_refcnt. +#ifdef Py_REF_DEBUG + _Py_RefTotal--; +#endif + if (--op->ob_refcnt != 0) { +#ifdef Py_REF_DEBUG + if (op->ob_refcnt < 0) { + _Py_NegativeRefcount(filename, lineno, op); + } +#endif + } + else { + _Py_Dealloc(op); + } +#endif +} +#if defined(Py_REF_DEBUG) && !(defined(Py_LIMITED_API) && Py_LIMITED_API+0 >= 0x030A0000) +# define Py_DECREF(op) _Py_DECREF(__FILE__, __LINE__, _PyObject_CAST(op)) +#else +# define Py_DECREF(op) _Py_DECREF(_PyObject_CAST(op)) +#endif + + +/* Safely decref `op` and set `op` to NULL, especially useful in tp_clear + * and tp_dealloc implementations. + * + * Note that "the obvious" code can be deadly: + * + * Py_XDECREF(op); + * op = NULL; + * + * Typically, `op` is something like self->containee, and `self` is done + * using its `containee` member. In the code sequence above, suppose + * `containee` is non-NULL with a refcount of 1. Its refcount falls to + * 0 on the first line, which can trigger an arbitrary amount of code, + * possibly including finalizers (like __del__ methods or weakref callbacks) + * coded in Python, which in turn can release the GIL and allow other threads + * to run, etc. Such code may even invoke methods of `self` again, or cause + * cyclic gc to trigger, but-- oops! --self->containee still points to the + * object being torn down, and it may be in an insane state while being torn + * down. This has in fact been a rich historic source of miserable (rare & + * hard-to-diagnose) segfaulting (and other) bugs. + * + * The safe way is: + * + * Py_CLEAR(op); + * + * That arranges to set `op` to NULL _before_ decref'ing, so that any code + * triggered as a side-effect of `op` getting torn down no longer believes + * `op` points to a valid object. + * + * There are cases where it's safe to use the naive code, but they're brittle. + * For example, if `op` points to a Python integer, you know that destroying + * one of those can't cause problems -- but in part that relies on that + * Python integers aren't currently weakly referencable. Best practice is + * to use Py_CLEAR() even if you can't think of a reason for why you need to. + */ +#define Py_CLEAR(op) \ + do { \ + PyObject *_py_tmp = _PyObject_CAST(op); \ + if (_py_tmp != NULL) { \ + (op) = NULL; \ + Py_DECREF(_py_tmp); \ + } \ + } while (0) + +/* Function to use in case the object pointer can be NULL: */ +static inline void _Py_XINCREF(PyObject *op) +{ + if (op != NULL) { + Py_INCREF(op); + } +} + +#define Py_XINCREF(op) _Py_XINCREF(_PyObject_CAST(op)) + +static inline void _Py_XDECREF(PyObject *op) +{ + if (op != NULL) { + Py_DECREF(op); + } +} + +#define Py_XDECREF(op) _Py_XDECREF(_PyObject_CAST(op)) + +// Create a new strong reference to an object: +// increment the reference count of the object and return the object. +PyAPI_FUNC(PyObject*) Py_NewRef(PyObject *obj); + +// Similar to Py_NewRef(), but the object can be NULL. +PyAPI_FUNC(PyObject*) Py_XNewRef(PyObject *obj); + +static inline PyObject* _Py_NewRef(PyObject *obj) +{ + Py_INCREF(obj); + return obj; +} + +static inline PyObject* _Py_XNewRef(PyObject *obj) +{ + Py_XINCREF(obj); + return obj; +} + +// Py_NewRef() and Py_XNewRef() are exported as functions for the stable ABI. +// Names overridden with macros by static inline functions for best +// performances. +#define Py_NewRef(obj) _Py_NewRef(_PyObject_CAST(obj)) +#define Py_XNewRef(obj) _Py_XNewRef(_PyObject_CAST(obj)) + + +/* +_Py_NoneStruct is an object of undefined type which can be used in contexts +where NULL (nil) is not suitable (since NULL often means 'error'). + +Don't forget to apply Py_INCREF() when returning this value!!! +*/ +PyAPI_DATA(PyObject) _Py_NoneStruct; /* Don't use this directly */ +#define Py_None (&_Py_NoneStruct) + +// Test if an object is the None singleton, the same as "x is None" in Python. +PyAPI_FUNC(int) Py_IsNone(PyObject *x); +#define Py_IsNone(x) Py_Is((x), Py_None) + +/* Macro for returning Py_None from a function */ +#define Py_RETURN_NONE return Py_NewRef(Py_None) + +/* +Py_NotImplemented is a singleton used to signal that an operation is +not implemented for a given type combination. +*/ +PyAPI_DATA(PyObject) _Py_NotImplementedStruct; /* Don't use this directly */ +#define Py_NotImplemented (&_Py_NotImplementedStruct) + +/* Macro for returning Py_NotImplemented from a function */ +#define Py_RETURN_NOTIMPLEMENTED return Py_NewRef(Py_NotImplemented) + +/* Rich comparison opcodes */ +#define Py_LT 0 +#define Py_LE 1 +#define Py_EQ 2 +#define Py_NE 3 +#define Py_GT 4 +#define Py_GE 5 + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 +/* Result of calling PyIter_Send */ +typedef enum { + PYGEN_RETURN = 0, + PYGEN_ERROR = -1, + PYGEN_NEXT = 1, +} PySendResult; +#endif + +/* + * Macro for implementing rich comparisons + * + * Needs to be a macro because any C-comparable type can be used. + */ +#define Py_RETURN_RICHCOMPARE(val1, val2, op) \ + do { \ + switch (op) { \ + case Py_EQ: if ((val1) == (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_NE: if ((val1) != (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_LT: if ((val1) < (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_GT: if ((val1) > (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_LE: if ((val1) <= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + case Py_GE: if ((val1) >= (val2)) Py_RETURN_TRUE; Py_RETURN_FALSE; \ + default: \ + Py_UNREACHABLE(); \ + } \ + } while (0) + + +/* +More conventions +================ + +Argument Checking +----------------- + +Functions that take objects as arguments normally don't check for nil +arguments, but they do check the type of the argument, and return an +error if the function doesn't apply to the type. + +Failure Modes +------------- + +Functions may fail for a variety of reasons, including running out of +memory. This is communicated to the caller in two ways: an error string +is set (see errors.h), and the function result differs: functions that +normally return a pointer return NULL for failure, functions returning +an integer return -1 (which could be a legal return value too!), and +other functions return 0 for success and -1 for failure. +Callers should always check for errors before using the result. If +an error was set, the caller must either explicitly clear it, or pass +the error on to its caller. + +Reference Counts +---------------- + +It takes a while to get used to the proper usage of reference counts. + +Functions that create an object set the reference count to 1; such new +objects must be stored somewhere or destroyed again with Py_DECREF(). +Some functions that 'store' objects, such as PyTuple_SetItem() and +PyList_SetItem(), +don't increment the reference count of the object, since the most +frequent use is to store a fresh object. Functions that 'retrieve' +objects, such as PyTuple_GetItem() and PyDict_GetItemString(), also +don't increment +the reference count, since most frequently the object is only looked at +quickly. Thus, to retrieve an object and store it again, the caller +must call Py_INCREF() explicitly. + +NOTE: functions that 'consume' a reference count, like +PyList_SetItem(), consume the reference even if the object wasn't +successfully stored, to simplify error handling. + +It seems attractive to make other functions that take an object as +argument consume a reference count; however, this may quickly get +confusing (even the current practice is already confusing). Consider +it carefully, it may save lots of calls to Py_INCREF() and Py_DECREF() at +times. +*/ + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_OBJECT_H +# include "cpython/object.h" +# undef Py_CPYTHON_OBJECT_H +#endif + + +static inline int +PyType_HasFeature(PyTypeObject *type, unsigned long feature) +{ + unsigned long flags; +#ifdef Py_LIMITED_API + // PyTypeObject is opaque in the limited C API + flags = PyType_GetFlags(type); +#else + flags = type->tp_flags; +#endif + return ((flags & feature) != 0); +} + +#define PyType_FastSubclass(type, flag) PyType_HasFeature(type, flag) + +static inline int _PyType_Check(PyObject *op) { + return PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TYPE_SUBCLASS); +} +#define PyType_Check(op) _PyType_Check(_PyObject_CAST(op)) + +static inline int _PyType_CheckExact(PyObject *op) { + return Py_IS_TYPE(op, &PyType_Type); +} +#define PyType_CheckExact(op) _PyType_CheckExact(_PyObject_CAST(op)) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_OBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/objimpl.h b/ScriptEngine/third-party/backend/include/Python/objimpl.h new file mode 100644 index 0000000000..450befad67 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/objimpl.h @@ -0,0 +1,215 @@ +/* The PyObject_ memory family: high-level object memory interfaces. + See pymem.h for the low-level PyMem_ family. +*/ + +#ifndef Py_OBJIMPL_H +#define Py_OBJIMPL_H + +#include "pymem.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* BEWARE: + + Each interface exports both functions and macros. Extension modules should + use the functions, to ensure binary compatibility across Python versions. + Because the Python implementation is free to change internal details, and + the macros may (or may not) expose details for speed, if you do use the + macros you must recompile your extensions with each Python release. + + Never mix calls to PyObject_ memory functions with calls to the platform + malloc/realloc/ calloc/free, or with calls to PyMem_. +*/ + +/* +Functions and macros for modules that implement new object types. + + - PyObject_New(type, typeobj) allocates memory for a new object of the given + type, and initializes part of it. 'type' must be the C structure type used + to represent the object, and 'typeobj' the address of the corresponding + type object. Reference count and type pointer are filled in; the rest of + the bytes of the object are *undefined*! The resulting expression type is + 'type *'. The size of the object is determined by the tp_basicsize field + of the type object. + + - PyObject_NewVar(type, typeobj, n) is similar but allocates a variable-size + object with room for n items. In addition to the refcount and type pointer + fields, this also fills in the ob_size field. + + - PyObject_Free(op) releases the memory allocated for an object. It does not + run a destructor -- it only frees the memory. PyObject_Free is identical. + + - PyObject_Init(op, typeobj) and PyObject_InitVar(op, typeobj, n) don't + allocate memory. Instead of a 'type' parameter, they take a pointer to a + new object (allocated by an arbitrary allocator), and initialize its object + header fields. + +Note that objects created with PyObject_{New, NewVar} are allocated using the +specialized Python allocator (implemented in obmalloc.c), if WITH_PYMALLOC is +enabled. In addition, a special debugging allocator is used if Py_DEBUG +macro is also defined. + +In case a specific form of memory management is needed (for example, if you +must use the platform malloc heap(s), or shared memory, or C++ local storage or +operator new), you must first allocate the object with your custom allocator, +then pass its pointer to PyObject_{Init, InitVar} for filling in its Python- +specific fields: reference count, type pointer, possibly others. You should +be aware that Python has no control over these objects because they don't +cooperate with the Python memory manager. Such objects may not be eligible +for automatic garbage collection and you have to make sure that they are +released accordingly whenever their destructor gets called (cf. the specific +form of memory management you're using). + +Unless you have specific memory management requirements, use +PyObject_{New, NewVar, Del}. +*/ + +/* + * Raw object memory interface + * =========================== + */ + +/* Functions to call the same malloc/realloc/free as used by Python's + object allocator. If WITH_PYMALLOC is enabled, these may differ from + the platform malloc/realloc/free. The Python object allocator is + designed for fast, cache-conscious allocation of many "small" objects, + and with low hidden memory overhead. + + PyObject_Malloc(0) returns a unique non-NULL pointer if possible. + + PyObject_Realloc(NULL, n) acts like PyObject_Malloc(n). + PyObject_Realloc(p != NULL, 0) does not return NULL, or free the memory + at p. + + Returned pointers must be checked for NULL explicitly; no action is + performed on failure other than to return NULL (no warning it printed, no + exception is set, etc). + + For allocating objects, use PyObject_{New, NewVar} instead whenever + possible. The PyObject_{Malloc, Realloc, Free} family is exposed + so that you can exploit Python's small-block allocator for non-object + uses. If you must use these routines to allocate object memory, make sure + the object gets initialized via PyObject_{Init, InitVar} after obtaining + the raw memory. +*/ +PyAPI_FUNC(void *) PyObject_Malloc(size_t size); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +PyAPI_FUNC(void *) PyObject_Calloc(size_t nelem, size_t elsize); +#endif +PyAPI_FUNC(void *) PyObject_Realloc(void *ptr, size_t new_size); +PyAPI_FUNC(void) PyObject_Free(void *ptr); + + +// Deprecated aliases only kept for backward compatibility. +// PyObject_Del and PyObject_DEL are defined with no parameter to be able to +// use them as function pointers (ex: tp_free = PyObject_Del). +#define PyObject_MALLOC PyObject_Malloc +#define PyObject_REALLOC PyObject_Realloc +#define PyObject_FREE PyObject_Free +#define PyObject_Del PyObject_Free +#define PyObject_DEL PyObject_Free + + +/* + * Generic object allocator interface + * ================================== + */ + +/* Functions */ +PyAPI_FUNC(PyObject *) PyObject_Init(PyObject *, PyTypeObject *); +PyAPI_FUNC(PyVarObject *) PyObject_InitVar(PyVarObject *, + PyTypeObject *, Py_ssize_t); + +#define PyObject_INIT(op, typeobj) \ + PyObject_Init(_PyObject_CAST(op), (typeobj)) +#define PyObject_INIT_VAR(op, typeobj, size) \ + PyObject_InitVar(_PyVarObject_CAST(op), (typeobj), (size)) + + +PyAPI_FUNC(PyObject *) _PyObject_New(PyTypeObject *); +PyAPI_FUNC(PyVarObject *) _PyObject_NewVar(PyTypeObject *, Py_ssize_t); + +#define PyObject_New(type, typeobj) ((type *)_PyObject_New(typeobj)) + +// Alias to PyObject_New(). In Python 3.8, PyObject_NEW() called directly +// PyObject_MALLOC() with _PyObject_SIZE(). +#define PyObject_NEW(type, typeobj) PyObject_New(type, typeobj) + +#define PyObject_NewVar(type, typeobj, n) \ + ( (type *) _PyObject_NewVar((typeobj), (n)) ) + +// Alias to PyObject_NewVar(). In Python 3.8, PyObject_NEW_VAR() called +// directly PyObject_MALLOC() with _PyObject_VAR_SIZE(). +#define PyObject_NEW_VAR(type, typeobj, n) PyObject_NewVar(type, typeobj, n) + + +/* + * Garbage Collection Support + * ========================== + */ + +/* C equivalent of gc.collect(). */ +PyAPI_FUNC(Py_ssize_t) PyGC_Collect(void); +/* C API for controlling the state of the garbage collector */ +PyAPI_FUNC(int) PyGC_Enable(void); +PyAPI_FUNC(int) PyGC_Disable(void); +PyAPI_FUNC(int) PyGC_IsEnabled(void); + +/* Test if a type has a GC head */ +#define PyType_IS_GC(t) PyType_HasFeature((t), Py_TPFLAGS_HAVE_GC) + +PyAPI_FUNC(PyVarObject *) _PyObject_GC_Resize(PyVarObject *, Py_ssize_t); +#define PyObject_GC_Resize(type, op, n) \ + ( (type *) _PyObject_GC_Resize(_PyVarObject_CAST(op), (n)) ) + + + +PyAPI_FUNC(PyObject *) _PyObject_GC_New(PyTypeObject *); +PyAPI_FUNC(PyVarObject *) _PyObject_GC_NewVar(PyTypeObject *, Py_ssize_t); + +/* Tell the GC to track this object. + * + * See also private _PyObject_GC_TRACK() macro. */ +PyAPI_FUNC(void) PyObject_GC_Track(void *); + +/* Tell the GC to stop tracking this object. + * + * See also private _PyObject_GC_UNTRACK() macro. */ +PyAPI_FUNC(void) PyObject_GC_UnTrack(void *); + +PyAPI_FUNC(void) PyObject_GC_Del(void *); + +#define PyObject_GC_New(type, typeobj) \ + ( (type *) _PyObject_GC_New(typeobj) ) +#define PyObject_GC_NewVar(type, typeobj, n) \ + ( (type *) _PyObject_GC_NewVar((typeobj), (n)) ) + +PyAPI_FUNC(int) PyObject_GC_IsTracked(PyObject *); +PyAPI_FUNC(int) PyObject_GC_IsFinalized(PyObject *); + +/* Utility macro to help write tp_traverse functions. + * To use this macro, the tp_traverse function must name its arguments + * "visit" and "arg". This is intended to keep tp_traverse functions + * looking as much alike as possible. + */ +#define Py_VISIT(op) \ + do { \ + if (op) { \ + int vret = visit(_PyObject_CAST(op), arg); \ + if (vret) \ + return vret; \ + } \ + } while (0) + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_OBJIMPL_H +# include "cpython/objimpl.h" +# undef Py_CPYTHON_OBJIMPL_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_OBJIMPL_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/opcode.h b/ScriptEngine/third-party/backend/include/Python/opcode.h new file mode 100644 index 0000000000..52039754bd --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/opcode.h @@ -0,0 +1,172 @@ +/* Auto-generated by Tools/scripts/generate_opcode_h.py from Lib/opcode.py */ +#ifndef Py_OPCODE_H +#define Py_OPCODE_H +#ifdef __cplusplus +extern "C" { +#endif + + + /* Instruction opcodes for compiled code */ +#define POP_TOP 1 +#define ROT_TWO 2 +#define ROT_THREE 3 +#define DUP_TOP 4 +#define DUP_TOP_TWO 5 +#define ROT_FOUR 6 +#define NOP 9 +#define UNARY_POSITIVE 10 +#define UNARY_NEGATIVE 11 +#define UNARY_NOT 12 +#define UNARY_INVERT 15 +#define BINARY_MATRIX_MULTIPLY 16 +#define INPLACE_MATRIX_MULTIPLY 17 +#define BINARY_POWER 19 +#define BINARY_MULTIPLY 20 +#define BINARY_MODULO 22 +#define BINARY_ADD 23 +#define BINARY_SUBTRACT 24 +#define BINARY_SUBSCR 25 +#define BINARY_FLOOR_DIVIDE 26 +#define BINARY_TRUE_DIVIDE 27 +#define INPLACE_FLOOR_DIVIDE 28 +#define INPLACE_TRUE_DIVIDE 29 +#define GET_LEN 30 +#define MATCH_MAPPING 31 +#define MATCH_SEQUENCE 32 +#define MATCH_KEYS 33 +#define COPY_DICT_WITHOUT_KEYS 34 +#define WITH_EXCEPT_START 49 +#define GET_AITER 50 +#define GET_ANEXT 51 +#define BEFORE_ASYNC_WITH 52 +#define END_ASYNC_FOR 54 +#define INPLACE_ADD 55 +#define INPLACE_SUBTRACT 56 +#define INPLACE_MULTIPLY 57 +#define INPLACE_MODULO 59 +#define STORE_SUBSCR 60 +#define DELETE_SUBSCR 61 +#define BINARY_LSHIFT 62 +#define BINARY_RSHIFT 63 +#define BINARY_AND 64 +#define BINARY_XOR 65 +#define BINARY_OR 66 +#define INPLACE_POWER 67 +#define GET_ITER 68 +#define GET_YIELD_FROM_ITER 69 +#define PRINT_EXPR 70 +#define LOAD_BUILD_CLASS 71 +#define YIELD_FROM 72 +#define GET_AWAITABLE 73 +#define LOAD_ASSERTION_ERROR 74 +#define INPLACE_LSHIFT 75 +#define INPLACE_RSHIFT 76 +#define INPLACE_AND 77 +#define INPLACE_XOR 78 +#define INPLACE_OR 79 +#define LIST_TO_TUPLE 82 +#define RETURN_VALUE 83 +#define IMPORT_STAR 84 +#define SETUP_ANNOTATIONS 85 +#define YIELD_VALUE 86 +#define POP_BLOCK 87 +#define POP_EXCEPT 89 +#define HAVE_ARGUMENT 90 +#define STORE_NAME 90 +#define DELETE_NAME 91 +#define UNPACK_SEQUENCE 92 +#define FOR_ITER 93 +#define UNPACK_EX 94 +#define STORE_ATTR 95 +#define DELETE_ATTR 96 +#define STORE_GLOBAL 97 +#define DELETE_GLOBAL 98 +#define ROT_N 99 +#define LOAD_CONST 100 +#define LOAD_NAME 101 +#define BUILD_TUPLE 102 +#define BUILD_LIST 103 +#define BUILD_SET 104 +#define BUILD_MAP 105 +#define LOAD_ATTR 106 +#define COMPARE_OP 107 +#define IMPORT_NAME 108 +#define IMPORT_FROM 109 +#define JUMP_FORWARD 110 +#define JUMP_IF_FALSE_OR_POP 111 +#define JUMP_IF_TRUE_OR_POP 112 +#define JUMP_ABSOLUTE 113 +#define POP_JUMP_IF_FALSE 114 +#define POP_JUMP_IF_TRUE 115 +#define LOAD_GLOBAL 116 +#define IS_OP 117 +#define CONTAINS_OP 118 +#define RERAISE 119 +#define JUMP_IF_NOT_EXC_MATCH 121 +#define SETUP_FINALLY 122 +#define LOAD_FAST 124 +#define STORE_FAST 125 +#define DELETE_FAST 126 +#define GEN_START 129 +#define RAISE_VARARGS 130 +#define CALL_FUNCTION 131 +#define MAKE_FUNCTION 132 +#define BUILD_SLICE 133 +#define LOAD_CLOSURE 135 +#define LOAD_DEREF 136 +#define STORE_DEREF 137 +#define DELETE_DEREF 138 +#define CALL_FUNCTION_KW 141 +#define CALL_FUNCTION_EX 142 +#define SETUP_WITH 143 +#define EXTENDED_ARG 144 +#define LIST_APPEND 145 +#define SET_ADD 146 +#define MAP_ADD 147 +#define LOAD_CLASSDEREF 148 +#define MATCH_CLASS 152 +#define SETUP_ASYNC_WITH 154 +#define FORMAT_VALUE 155 +#define BUILD_CONST_KEY_MAP 156 +#define BUILD_STRING 157 +#define LOAD_METHOD 160 +#define CALL_METHOD 161 +#define LIST_EXTEND 162 +#define SET_UPDATE 163 +#define DICT_MERGE 164 +#define DICT_UPDATE 165 +#ifdef NEED_OPCODE_JUMP_TABLES +static uint32_t _PyOpcode_RelativeJump[8] = { + 0U, + 0U, + 536870912U, + 67125248U, + 67141632U, + 0U, + 0U, + 0U, +}; +static uint32_t _PyOpcode_Jump[8] = { + 0U, + 0U, + 536870912U, + 101695488U, + 67141632U, + 0U, + 0U, + 0U, +}; +#endif /* OPCODE_TABLES */ + +/* EXCEPT_HANDLER is a special, implicit block type which is created when + entering an except handler. It is not an opcode but we define it here + as we want it to be available to both frameobject.c and ceval.c, while + remaining private.*/ +#define EXCEPT_HANDLER 257 + +#define HAS_ARG(op) ((op) >= HAVE_ARGUMENT) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_OPCODE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/osdefs.h b/ScriptEngine/third-party/backend/include/Python/osdefs.h new file mode 100644 index 0000000000..3243944a14 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/osdefs.h @@ -0,0 +1,51 @@ +#ifndef Py_OSDEFS_H +#define Py_OSDEFS_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* Operating system dependencies */ + +#ifdef MS_WINDOWS +#define SEP L'\\' +#define ALTSEP L'/' +#define MAXPATHLEN 256 +#define DELIM L';' +#endif + +#ifdef __VXWORKS__ +#define DELIM L';' +#endif + +/* Filename separator */ +#ifndef SEP +#define SEP L'/' +#endif + +/* Max pathname length */ +#ifdef __hpux +#include +#include +#ifndef PATH_MAX +#define PATH_MAX MAXPATHLEN +#endif +#endif + +#ifndef MAXPATHLEN +#if defined(PATH_MAX) && PATH_MAX > 1024 +#define MAXPATHLEN PATH_MAX +#else +#define MAXPATHLEN 1024 +#endif +#endif + +/* Search path entry delimiter */ +#ifndef DELIM +#define DELIM L':' +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_OSDEFS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/osmodule.h b/ScriptEngine/third-party/backend/include/Python/osmodule.h new file mode 100644 index 0000000000..9095c2fdd3 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/osmodule.h @@ -0,0 +1,17 @@ + +/* os module interface */ + +#ifndef Py_OSMODULE_H +#define Py_OSMODULE_H +#ifdef __cplusplus +extern "C" { +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 +PyAPI_FUNC(PyObject *) PyOS_FSPath(PyObject *path); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_OSMODULE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/patchlevel.h b/ScriptEngine/third-party/backend/include/Python/patchlevel.h new file mode 100644 index 0000000000..48a34d0ef5 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/patchlevel.h @@ -0,0 +1,35 @@ + +/* Python version identification scheme. + + When the major or minor version changes, the VERSION variable in + configure.ac must also be changed. + + There is also (independent) API version information in modsupport.h. +*/ + +/* Values for PY_RELEASE_LEVEL */ +#define PY_RELEASE_LEVEL_ALPHA 0xA +#define PY_RELEASE_LEVEL_BETA 0xB +#define PY_RELEASE_LEVEL_GAMMA 0xC /* For release candidates */ +#define PY_RELEASE_LEVEL_FINAL 0xF /* Serial should be 0 here */ + /* Higher for patch releases */ + +/* Version parsed out into numeric values */ +/*--start constants--*/ +#define PY_MAJOR_VERSION 3 +#define PY_MINOR_VERSION 10 +#define PY_MICRO_VERSION 9 +#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL +#define PY_RELEASE_SERIAL 0 + +/* Version as a string */ +#define PY_VERSION "3.10.9" +/*--end constants--*/ + +/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2. + Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */ +#define PY_VERSION_HEX ((PY_MAJOR_VERSION << 24) | \ + (PY_MINOR_VERSION << 16) | \ + (PY_MICRO_VERSION << 8) | \ + (PY_RELEASE_LEVEL << 4) | \ + (PY_RELEASE_SERIAL << 0)) diff --git a/ScriptEngine/third-party/backend/include/Python/py_curses.h b/ScriptEngine/third-party/backend/include/Python/py_curses.h new file mode 100644 index 0000000000..b70252d9d7 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/py_curses.h @@ -0,0 +1,99 @@ + +#ifndef Py_CURSES_H +#define Py_CURSES_H + +#ifdef __APPLE__ +/* +** On Mac OS X 10.2 [n]curses.h and stdlib.h use different guards +** against multiple definition of wchar_t. +*/ +#ifdef _BSD_WCHAR_T_DEFINED_ +#define _WCHAR_T +#endif +#endif /* __APPLE__ */ + +/* On FreeBSD, [n]curses.h and stdlib.h/wchar.h use different guards + against multiple definition of wchar_t and wint_t. */ +#if defined(__FreeBSD__) && defined(_XOPEN_SOURCE_EXTENDED) +# ifndef __wchar_t +# define __wchar_t +# endif +# ifndef __wint_t +# define __wint_t +# endif +#endif + +#if !defined(HAVE_CURSES_IS_PAD) && defined(WINDOW_HAS_FLAGS) +/* The following definition is necessary for ncurses 5.7; without it, + some of [n]curses.h set NCURSES_OPAQUE to 1, and then Python + can't get at the WINDOW flags field. */ +#define NCURSES_OPAQUE 0 +#endif + +#ifdef HAVE_NCURSES_H +#include +#else +#include +#endif + +#ifdef HAVE_NCURSES_H +/* configure was checking , but we will + use , which has some or all these features. */ +#if !defined(WINDOW_HAS_FLAGS) && !(NCURSES_OPAQUE+0) +#define WINDOW_HAS_FLAGS 1 +#endif +#if !defined(HAVE_CURSES_IS_PAD) && NCURSES_VERSION_PATCH+0 >= 20090906 +#define HAVE_CURSES_IS_PAD 1 +#endif +#ifndef MVWDELCH_IS_EXPRESSION +#define MVWDELCH_IS_EXPRESSION 1 +#endif +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +#define PyCurses_API_pointers 4 + +/* Type declarations */ + +typedef struct { + PyObject_HEAD + WINDOW *win; + char *encoding; +} PyCursesWindowObject; + +#define PyCursesWindow_Check(v) Py_IS_TYPE(v, &PyCursesWindow_Type) + +#define PyCurses_CAPSULE_NAME "_curses._C_API" + + +#ifdef CURSES_MODULE +/* This section is used when compiling _cursesmodule.c */ + +#else +/* This section is used in modules that use the _cursesmodule API */ + +static void **PyCurses_API; + +#define PyCursesWindow_Type (*(PyTypeObject *) PyCurses_API[0]) +#define PyCursesSetupTermCalled {if (! ((int (*)(void))PyCurses_API[1]) () ) return NULL;} +#define PyCursesInitialised {if (! ((int (*)(void))PyCurses_API[2]) () ) return NULL;} +#define PyCursesInitialisedColor {if (! ((int (*)(void))PyCurses_API[3]) () ) return NULL;} + +#define import_curses() \ + PyCurses_API = (void **)PyCapsule_Import(PyCurses_CAPSULE_NAME, 1); + +#endif + +/* general error messages */ +static const char catchall_ERR[] = "curses function returned ERR"; +static const char catchall_NULL[] = "curses function returned NULL"; + +#ifdef __cplusplus +} +#endif + +#endif /* !defined(Py_CURSES_H) */ + diff --git a/ScriptEngine/third-party/backend/include/Python/pycapsule.h b/ScriptEngine/third-party/backend/include/Python/pycapsule.h new file mode 100644 index 0000000000..fb5d503fea --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pycapsule.h @@ -0,0 +1,59 @@ + +/* Capsule objects let you wrap a C "void *" pointer in a Python + object. They're a way of passing data through the Python interpreter + without creating your own custom type. + + Capsules are used for communication between extension modules. + They provide a way for an extension module to export a C interface + to other extension modules, so that extension modules can use the + Python import mechanism to link to one another. + + For more information, please see "c-api/capsule.html" in the + documentation. +*/ + +#ifndef Py_CAPSULE_H +#define Py_CAPSULE_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_DATA(PyTypeObject) PyCapsule_Type; + +typedef void (*PyCapsule_Destructor)(PyObject *); + +#define PyCapsule_CheckExact(op) Py_IS_TYPE(op, &PyCapsule_Type) + + +PyAPI_FUNC(PyObject *) PyCapsule_New( + void *pointer, + const char *name, + PyCapsule_Destructor destructor); + +PyAPI_FUNC(void *) PyCapsule_GetPointer(PyObject *capsule, const char *name); + +PyAPI_FUNC(PyCapsule_Destructor) PyCapsule_GetDestructor(PyObject *capsule); + +PyAPI_FUNC(const char *) PyCapsule_GetName(PyObject *capsule); + +PyAPI_FUNC(void *) PyCapsule_GetContext(PyObject *capsule); + +PyAPI_FUNC(int) PyCapsule_IsValid(PyObject *capsule, const char *name); + +PyAPI_FUNC(int) PyCapsule_SetPointer(PyObject *capsule, void *pointer); + +PyAPI_FUNC(int) PyCapsule_SetDestructor(PyObject *capsule, PyCapsule_Destructor destructor); + +PyAPI_FUNC(int) PyCapsule_SetName(PyObject *capsule, const char *name); + +PyAPI_FUNC(int) PyCapsule_SetContext(PyObject *capsule, void *context); + +PyAPI_FUNC(void *) PyCapsule_Import( + const char *name, /* UTF-8 encoded string */ + int no_block); + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_CAPSULE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pyconfig.h b/ScriptEngine/third-party/backend/include/Python/pyconfig.h new file mode 100644 index 0000000000..103e647ac8 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pyconfig.h @@ -0,0 +1,690 @@ +#ifndef Py_CONFIG_H +#define Py_CONFIG_H + +/* pyconfig.h. NOT Generated automatically by configure. + +This is a manually maintained version used for the Watcom, +Borland and Microsoft Visual C++ compilers. It is a +standard part of the Python distribution. + +WINDOWS DEFINES: +The code specific to Windows should be wrapped around one of +the following #defines + +MS_WIN64 - Code specific to the MS Win64 API +MS_WIN32 - Code specific to the MS Win32 (and Win64) API (obsolete, this covers all supported APIs) +MS_WINDOWS - Code specific to Windows, but all versions. +Py_ENABLE_SHARED - Code if the Python core is built as a DLL. + +Also note that neither "_M_IX86" or "_MSC_VER" should be used for +any purpose other than "Windows Intel x86 specific" and "Microsoft +compiler specific". Therefore, these should be very rare. + + +NOTE: The following symbols are deprecated: +NT, USE_DL_EXPORT, USE_DL_IMPORT, DL_EXPORT, DL_IMPORT +MS_CORE_DLL. + +WIN32 is still required for the locale module. + +*/ + +/* Deprecated USE_DL_EXPORT macro - please use Py_BUILD_CORE */ +#ifdef USE_DL_EXPORT +# define Py_BUILD_CORE +#endif /* USE_DL_EXPORT */ + +/* Visual Studio 2005 introduces deprecation warnings for + "insecure" and POSIX functions. The insecure functions should + be replaced by *_s versions (according to Microsoft); the + POSIX functions by _* versions (which, according to Microsoft, + would be ISO C conforming). Neither renaming is feasible, so + we just silence the warnings. */ + +#ifndef _CRT_SECURE_NO_DEPRECATE +#define _CRT_SECURE_NO_DEPRECATE 1 +#endif +#ifndef _CRT_NONSTDC_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE 1 +#endif + +#define HAVE_IO_H +#define HAVE_SYS_UTIME_H +#define HAVE_TEMPNAM +#define HAVE_TMPFILE +#define HAVE_TMPNAM +#define HAVE_CLOCK +#define HAVE_STRERROR + +#include + +#define HAVE_HYPOT +#define HAVE_STRFTIME +#define DONT_HAVE_SIG_ALARM +#define DONT_HAVE_SIG_PAUSE +#define LONG_BIT 32 +#define WORD_BIT 32 + +#define MS_WIN32 /* only support win32 and greater. */ +#define MS_WINDOWS +#ifndef PYTHONPATH +# define PYTHONPATH L".\\DLLs;.\\lib" +#endif +#define NT_THREADS +#define WITH_THREAD +#ifndef NETSCAPE_PI +#define USE_SOCKET +#endif + + +/* Compiler specific defines */ + +/* ------------------------------------------------------------------------*/ +/* Microsoft C defines _MSC_VER */ +#ifdef _MSC_VER + +/* We want COMPILER to expand to a string containing _MSC_VER's *value*. + * This is horridly tricky, because the stringization operator only works + * on macro arguments, and doesn't evaluate macros passed *as* arguments. + * Attempts simpler than the following appear doomed to produce "_MSC_VER" + * literally in the string. + */ +#define _Py_PASTE_VERSION(SUFFIX) \ + ("[MSC v." _Py_STRINGIZE(_MSC_VER) " " SUFFIX "]") +/* e.g., this produces, after compile-time string catenation, + * ("[MSC v.1200 32 bit (Intel)]") + * + * _Py_STRINGIZE(_MSC_VER) expands to + * _Py_STRINGIZE1((_MSC_VER)) expands to + * _Py_STRINGIZE2(_MSC_VER) but as this call is the result of token-pasting + * it's scanned again for macros and so further expands to (under MSVC 6) + * _Py_STRINGIZE2(1200) which then expands to + * "1200" + */ +#define _Py_STRINGIZE(X) _Py_STRINGIZE1((X)) +#define _Py_STRINGIZE1(X) _Py_STRINGIZE2 ## X +#define _Py_STRINGIZE2(X) #X + +/* MSVC defines _WINxx to differentiate the windows platform types + + Note that for compatibility reasons _WIN32 is defined on Win32 + *and* on Win64. For the same reasons, in Python, MS_WIN32 is + defined on Win32 *and* Win64. Win32 only code must therefore be + guarded as follows: + #if defined(MS_WIN32) && !defined(MS_WIN64) +*/ +#ifdef _WIN64 +#define MS_WIN64 +#endif + +/* set the COMPILER */ +#ifdef MS_WIN64 +#if defined(_M_X64) || defined(_M_AMD64) +#if defined(__INTEL_COMPILER) +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 64 bit (amd64) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else +#define COMPILER _Py_PASTE_VERSION("64 bit (AMD64)") +#endif /* __INTEL_COMPILER */ +#define PYD_PLATFORM_TAG "win_amd64" +#elif defined(_M_ARM64) +#define COMPILER _Py_PASTE_VERSION("64 bit (ARM64)") +#define PYD_PLATFORM_TAG "win_arm64" +#else +#define COMPILER _Py_PASTE_VERSION("64 bit (Unknown)") +#endif +#endif /* MS_WIN64 */ + +/* set the version macros for the windows headers */ +/* Python 3.9+ requires Windows 8 or greater */ +#define Py_WINVER 0x0602 /* _WIN32_WINNT_WIN8 */ +#define Py_NTDDI NTDDI_WIN8 + +/* We only set these values when building Python - we don't want to force + these values on extensions, as that will affect the prototypes and + structures exposed in the Windows headers. Even when building Python, we + allow a single source file to override this - they may need access to + structures etc so it can optionally use new Windows features if it + determines at runtime they are available. +*/ +#if defined(Py_BUILD_CORE) || defined(Py_BUILD_CORE_BUILTIN) || defined(Py_BUILD_CORE_MODULE) +#ifndef NTDDI_VERSION +#define NTDDI_VERSION Py_NTDDI +#endif +#ifndef WINVER +#define WINVER Py_WINVER +#endif +#ifndef _WIN32_WINNT +#define _WIN32_WINNT Py_WINVER +#endif +#endif + +/* _W64 is not defined for VC6 or eVC4 */ +#ifndef _W64 +#define _W64 +#endif + +/* Define like size_t, omitting the "unsigned" */ +#ifdef MS_WIN64 +typedef __int64 Py_ssize_t; +#else +typedef _W64 int Py_ssize_t; +#endif +#define HAVE_PY_SSIZE_T 1 + +#if defined(MS_WIN32) && !defined(MS_WIN64) +#if defined(_M_IX86) +#if defined(__INTEL_COMPILER) +#define COMPILER ("[ICC v." _Py_STRINGIZE(__INTEL_COMPILER) " 32 bit (Intel) with MSC v." _Py_STRINGIZE(_MSC_VER) " CRT]") +#else +#define COMPILER _Py_PASTE_VERSION("32 bit (Intel)") +#endif /* __INTEL_COMPILER */ +#define PYD_PLATFORM_TAG "win32" +#elif defined(_M_ARM) +#define COMPILER _Py_PASTE_VERSION("32 bit (ARM)") +#define PYD_PLATFORM_TAG "win_arm32" +#else +#define COMPILER _Py_PASTE_VERSION("32 bit (Unknown)") +#endif +#endif /* MS_WIN32 && !MS_WIN64 */ + +typedef int pid_t; + +#include +#define Py_IS_NAN _isnan +#define Py_IS_INFINITY(X) (!_finite(X) && !_isnan(X)) +#define Py_IS_FINITE(X) _finite(X) + +/* define some ANSI types that are not defined in earlier Win headers */ +#if _MSC_VER >= 1200 +/* This file only exists in VC 6.0 or higher */ +#include +#endif + +#endif /* _MSC_VER */ + +/* ------------------------------------------------------------------------*/ +/* egcs/gnu-win32 defines __GNUC__ and _WIN32 */ +#if defined(__GNUC__) && defined(_WIN32) +/* XXX These defines are likely incomplete, but should be easy to fix. + They should be complete enough to build extension modules. */ +/* Suggested by Rene Liebscher to avoid a GCC 2.91.* + bug that requires structure imports. More recent versions of the + compiler don't exhibit this bug. +*/ +#if (__GNUC__==2) && (__GNUC_MINOR__<=91) +#warning "Please use an up-to-date version of gcc! (>2.91 recommended)" +#endif + +#define COMPILER "[gcc]" +#define PY_LONG_LONG long long +#define PY_LLONG_MIN LLONG_MIN +#define PY_LLONG_MAX LLONG_MAX +#define PY_ULLONG_MAX ULLONG_MAX +#endif /* GNUC */ + +/* ------------------------------------------------------------------------*/ +/* lcc-win32 defines __LCC__ */ +#if defined(__LCC__) +/* XXX These defines are likely incomplete, but should be easy to fix. + They should be complete enough to build extension modules. */ + +#define COMPILER "[lcc-win32]" +typedef int pid_t; +/* __declspec() is supported here too - do nothing to get the defaults */ + +#endif /* LCC */ + +/* ------------------------------------------------------------------------*/ +/* End of compilers - finish up */ + +#ifndef NO_STDIO_H +# include +#endif + +/* 64 bit ints are usually spelt __int64 unless compiler has overridden */ +#ifndef PY_LONG_LONG +# define PY_LONG_LONG __int64 +# define PY_LLONG_MAX _I64_MAX +# define PY_LLONG_MIN _I64_MIN +# define PY_ULLONG_MAX _UI64_MAX +#endif + +/* For Windows the Python core is in a DLL by default. Test +Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ +#if !defined(MS_NO_COREDLL) && !defined(Py_NO_ENABLE_SHARED) +# define Py_ENABLE_SHARED 1 /* standard symbol for shared library */ +# define MS_COREDLL /* deprecated old symbol */ +#endif /* !MS_NO_COREDLL && ... */ + +/* All windows compilers that use this header support __declspec */ +#define HAVE_DECLSPEC_DLL + +/* For an MSVC DLL, we can nominate the .lib files used by extensions */ +#ifdef MS_COREDLL +# if !defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_BUILTIN) + /* not building the core - must be an ext */ +# if defined(_MSC_VER) + /* So MSVC users need not specify the .lib + file in their Makefile (other compilers are + generally taken care of by distutils.) */ +# if defined(_DEBUG) +# pragma comment(lib,"python310_d.lib") +# elif defined(Py_LIMITED_API) +# pragma comment(lib,"python3.lib") +# else +# pragma comment(lib,"python310.lib") +# endif /* _DEBUG */ +# endif /* _MSC_VER */ +# endif /* Py_BUILD_CORE */ +#endif /* MS_COREDLL */ + +#if defined(MS_WIN64) +/* maintain "win32" sys.platform for backward compatibility of Python code, + the Win64 API should be close enough to the Win32 API to make this + preferable */ +# define PLATFORM "win32" +# define SIZEOF_VOID_P 8 +# define SIZEOF_TIME_T 8 +# define SIZEOF_OFF_T 4 +# define SIZEOF_FPOS_T 8 +# define SIZEOF_HKEY 8 +# define SIZEOF_SIZE_T 8 +# define ALIGNOF_SIZE_T 8 +/* configure.ac defines HAVE_LARGEFILE_SUPPORT iff + sizeof(off_t) > sizeof(long), and sizeof(long long) >= sizeof(off_t). + On Win64 the second condition is not true, but if fpos_t replaces off_t + then this is true. The uses of HAVE_LARGEFILE_SUPPORT imply that Win64 + should define this. */ +# define HAVE_LARGEFILE_SUPPORT +#elif defined(MS_WIN32) +# define PLATFORM "win32" +# define HAVE_LARGEFILE_SUPPORT +# define SIZEOF_VOID_P 4 +# define SIZEOF_OFF_T 4 +# define SIZEOF_FPOS_T 8 +# define SIZEOF_HKEY 4 +# define SIZEOF_SIZE_T 4 +# define ALIGNOF_SIZE_T 4 + /* MS VS2005 changes time_t to a 64-bit type on all platforms */ +# if defined(_MSC_VER) && _MSC_VER >= 1400 +# define SIZEOF_TIME_T 8 +# else +# define SIZEOF_TIME_T 4 +# endif +#endif + +#ifdef _DEBUG +# define Py_DEBUG +#endif + + +#ifdef MS_WIN32 + +#define SIZEOF_SHORT 2 +#define SIZEOF_INT 4 +#define SIZEOF_LONG 4 +#define ALIGNOF_LONG 4 +#define SIZEOF_LONG_LONG 8 +#define SIZEOF_DOUBLE 8 +#define SIZEOF_FLOAT 4 + +/* VC 7.1 has them and VC 6.0 does not. VC 6.0 has a version number of 1200. + Microsoft eMbedded Visual C++ 4.0 has a version number of 1201 and doesn't + define these. + If some compiler does not provide them, modify the #if appropriately. */ +#if defined(_MSC_VER) +#if _MSC_VER > 1300 +#define HAVE_UINTPTR_T 1 +#define HAVE_INTPTR_T 1 +#else +/* VC6, VS 2002 and eVC4 don't support the C99 LL suffix for 64-bit integer literals */ +#define Py_LL(x) x##I64 +#endif /* _MSC_VER > 1300 */ +#endif /* _MSC_VER */ + +#endif + +/* define signed and unsigned exact-width 32-bit and 64-bit types, used in the + implementation of Python integers. */ +#define PY_UINT32_T uint32_t +#define PY_UINT64_T uint64_t +#define PY_INT32_T int32_t +#define PY_INT64_T int64_t + +/* Fairly standard from here! */ + +/* Define to 1 if you have the `copysign' function. */ +#define HAVE_COPYSIGN 1 + +/* Define to 1 if you have the `round' function. */ +#if _MSC_VER >= 1800 +#define HAVE_ROUND 1 +#endif + +/* Define to 1 if you have the `isinf' macro. */ +#define HAVE_DECL_ISINF 1 + +/* Define to 1 if you have the `isnan' function. */ +#define HAVE_DECL_ISNAN 1 + +/* Define if on AIX 3. + System headers sometimes define this. + We just want to avoid a redefinition error message. */ +#ifndef _ALL_SOURCE +/* #undef _ALL_SOURCE */ +#endif + +/* Define to empty if the keyword does not work. */ +/* #define const */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CONIO_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DIRECT_H 1 + +/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. + */ +#define HAVE_DECL_TZNAME 1 + +/* Define if you have dirent.h. */ +/* #define DIRENT 1 */ + +/* Define to the type of elements in the array set by `getgroups'. + Usually this is either `int' or `gid_t'. */ +/* #undef GETGROUPS_T */ + +/* Define to `int' if doesn't define. */ +/* #undef gid_t */ + +/* Define if your struct tm has tm_zone. */ +/* #undef HAVE_TM_ZONE */ + +/* Define if you don't have tm_zone but do have the external array + tzname. */ +#define HAVE_TZNAME + +/* Define to `int' if doesn't define. */ +/* #undef mode_t */ + +/* Define if you don't have dirent.h, but have ndir.h. */ +/* #undef NDIR */ + +/* Define to `long' if doesn't define. */ +/* #undef off_t */ + +/* Define to `int' if doesn't define. */ +/* #undef pid_t */ + +/* Define if the system does not provide POSIX.1 features except + with this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define if you need to in order for stat and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define as the return type of signal handlers (int or void). */ +#define RETSIGTYPE void + +/* Define to `unsigned' if doesn't define. */ +/* #undef size_t */ + +/* Define if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Define if you don't have dirent.h, but have sys/dir.h. */ +/* #undef SYSDIR */ + +/* Define if you don't have dirent.h, but have sys/ndir.h. */ +/* #undef SYSNDIR */ + +/* Define if you can safely include both and . */ +/* #undef TIME_WITH_SYS_TIME */ + +/* Define if your declares struct tm. */ +/* #define TM_IN_SYS_TIME 1 */ + +/* Define to `int' if doesn't define. */ +/* #undef uid_t */ + +/* Define if the closedir function returns void instead of int. */ +/* #undef VOID_CLOSEDIR */ + +/* Define if getpgrp() must be called as getpgrp(0) + and (consequently) setpgrp() as setpgrp(0, 0). */ +/* #undef GETPGRP_HAVE_ARGS */ + +/* Define this if your time.h defines altzone */ +/* #define HAVE_ALTZONE */ + +/* Define if you have the putenv function. */ +#define HAVE_PUTENV + +/* Define if your compiler supports function prototypes */ +#define HAVE_PROTOTYPES + +/* Define if you can safely include both and + (which you can't on SCO ODT 3.0). */ +/* #undef SYS_SELECT_WITH_SYS_TIME */ + +/* Define if you want build the _decimal module using a coroutine-local rather + than a thread-local context */ +#define WITH_DECIMAL_CONTEXTVAR 1 + +/* Define if you want documentation strings in extension modules */ +#define WITH_DOC_STRINGS 1 + +/* Define if you want to compile in rudimentary thread support */ +/* #undef WITH_THREAD */ + +/* Define if you want to use the GNU readline library */ +/* #define WITH_READLINE 1 */ + +/* Use Python's own small-block memory-allocator. */ +#define WITH_PYMALLOC 1 + +/* Define if you have clock. */ +/* #define HAVE_CLOCK */ + +/* Define when any dynamic module loading is enabled */ +#define HAVE_DYNAMIC_LOADING + +/* Define if you have ftime. */ +#define HAVE_FTIME + +/* Define if you have getpeername. */ +#define HAVE_GETPEERNAME + +/* Define if you have getpgrp. */ +/* #undef HAVE_GETPGRP */ + +/* Define if you have getpid. */ +#define HAVE_GETPID + +/* Define if you have gettimeofday. */ +/* #undef HAVE_GETTIMEOFDAY */ + +/* Define if you have getwd. */ +/* #undef HAVE_GETWD */ + +/* Define if you have lstat. */ +/* #undef HAVE_LSTAT */ + +/* Define if you have the mktime function. */ +#define HAVE_MKTIME + +/* Define if you have nice. */ +/* #undef HAVE_NICE */ + +/* Define if you have readlink. */ +/* #undef HAVE_READLINK */ + +/* Define if you have setpgid. */ +/* #undef HAVE_SETPGID */ + +/* Define if you have setpgrp. */ +/* #undef HAVE_SETPGRP */ + +/* Define if you have setsid. */ +/* #undef HAVE_SETSID */ + +/* Define if you have setvbuf. */ +#define HAVE_SETVBUF + +/* Define if you have siginterrupt. */ +/* #undef HAVE_SIGINTERRUPT */ + +/* Define if you have symlink. */ +/* #undef HAVE_SYMLINK */ + +/* Define if you have tcgetpgrp. */ +/* #undef HAVE_TCGETPGRP */ + +/* Define if you have tcsetpgrp. */ +/* #undef HAVE_TCSETPGRP */ + +/* Define if you have times. */ +/* #undef HAVE_TIMES */ + +/* Define if you have uname. */ +/* #undef HAVE_UNAME */ + +/* Define if you have waitpid. */ +/* #undef HAVE_WAITPID */ + +/* Define to 1 if you have the `wcsftime' function. */ +#if defined(_MSC_VER) && _MSC_VER >= 1310 +#define HAVE_WCSFTIME 1 +#endif + +/* Define to 1 if you have the `wcscoll' function. */ +#define HAVE_WCSCOLL 1 + +/* Define to 1 if you have the `wcsxfrm' function. */ +#define HAVE_WCSXFRM 1 + +/* Define if the zlib library has inflateCopy */ +#define HAVE_ZLIB_COPY 1 + +/* Define if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_ERRNO_H 1 + +/* Define if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_PROCESS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SIGNAL_H 1 + +/* Define if you have the prototypes. */ +#define HAVE_STDARG_PROTOTYPES + +/* Define if you have the header file. */ +#define HAVE_STDDEF_H 1 + +/* Define if you have the header file. */ +/* #undef HAVE_SYS_AUDIOIO_H */ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_PARAM_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_SELECT_H 1 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_SYS_TIME_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_TIMES_H 1 */ + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define if you have the header file. */ +/* #define HAVE_SYS_UN_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_UTIME_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_SYS_UTSNAME_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_UNISTD_H 1 */ + +/* Define if you have the header file. */ +/* #define HAVE_UTIME_H 1 */ + +/* Define if the compiler provides a wchar.h header file. */ +#define HAVE_WCHAR_H 1 + +/* The size of `wchar_t', as computed by sizeof. */ +#define SIZEOF_WCHAR_T 2 + +/* The size of `_Bool', as computed by sizeof. */ +#define SIZEOF__BOOL 1 + +/* The size of `pid_t', as computed by sizeof. */ +#define SIZEOF_PID_T SIZEOF_INT + +/* Define if you have the dl library (-ldl). */ +/* #undef HAVE_LIBDL */ + +/* Define if you have the mpc library (-lmpc). */ +/* #undef HAVE_LIBMPC */ + +/* Define if you have the nsl library (-lnsl). */ +#define HAVE_LIBNSL 1 + +/* Define if you have the seq library (-lseq). */ +/* #undef HAVE_LIBSEQ */ + +/* Define if you have the socket library (-lsocket). */ +#define HAVE_LIBSOCKET 1 + +/* Define if you have the sun library (-lsun). */ +/* #undef HAVE_LIBSUN */ + +/* Define if you have the termcap library (-ltermcap). */ +/* #undef HAVE_LIBTERMCAP */ + +/* Define if you have the termlib library (-ltermlib). */ +/* #undef HAVE_LIBTERMLIB */ + +/* Define if you have the thread library (-lthread). */ +/* #undef HAVE_LIBTHREAD */ + +/* WinSock does not use a bitmask in select, and uses + socket handles greater than FD_SETSIZE */ +#define Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE + +/* Define if C doubles are 64-bit IEEE 754 binary format, stored with the + least significant byte first */ +#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1 + +/* Define to 1 if you have the `erf' function. */ +#define HAVE_ERF 1 + +/* Define to 1 if you have the `erfc' function. */ +#define HAVE_ERFC 1 + +/* Define if you have the 'inet_pton' function. */ +#define HAVE_INET_PTON 1 + +/* framework name */ +#define _PYTHONFRAMEWORK "" + +/* Define if libssl has X509_VERIFY_PARAM_set1_host and related function */ +#define HAVE_X509_VERIFY_PARAM_SET1_HOST 1 + +#define PLATLIBDIR "lib" + +#endif /* !Py_CONFIG_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pydtrace.h b/ScriptEngine/third-party/backend/include/Python/pydtrace.h new file mode 100644 index 0000000000..75f8e7f709 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pydtrace.h @@ -0,0 +1,59 @@ +/* Static DTrace probes interface */ + +#ifndef Py_DTRACE_H +#define Py_DTRACE_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifdef WITH_DTRACE + +#include "pydtrace_probes.h" + +/* pydtrace_probes.h, on systems with DTrace, is auto-generated to include + `PyDTrace_{PROBE}` and `PyDTrace_{PROBE}_ENABLED()` macros for every probe + defined in pydtrace_provider.d. + + Calling these functions must be guarded by a `PyDTrace_{PROBE}_ENABLED()` + check to minimize performance impact when probing is off. For example: + + if (PyDTrace_FUNCTION_ENTRY_ENABLED()) + PyDTrace_FUNCTION_ENTRY(f); +*/ + +#else + +/* Without DTrace, compile to nothing. */ + +static inline void PyDTrace_LINE(const char *arg0, const char *arg1, int arg2) {} +static inline void PyDTrace_FUNCTION_ENTRY(const char *arg0, const char *arg1, int arg2) {} +static inline void PyDTrace_FUNCTION_RETURN(const char *arg0, const char *arg1, int arg2) {} +static inline void PyDTrace_GC_START(int arg0) {} +static inline void PyDTrace_GC_DONE(Py_ssize_t arg0) {} +static inline void PyDTrace_INSTANCE_NEW_START(int arg0) {} +static inline void PyDTrace_INSTANCE_NEW_DONE(int arg0) {} +static inline void PyDTrace_INSTANCE_DELETE_START(int arg0) {} +static inline void PyDTrace_INSTANCE_DELETE_DONE(int arg0) {} +static inline void PyDTrace_IMPORT_FIND_LOAD_START(const char *arg0) {} +static inline void PyDTrace_IMPORT_FIND_LOAD_DONE(const char *arg0, int arg1) {} +static inline void PyDTrace_AUDIT(const char *arg0, void *arg1) {} + +static inline int PyDTrace_LINE_ENABLED(void) { return 0; } +static inline int PyDTrace_FUNCTION_ENTRY_ENABLED(void) { return 0; } +static inline int PyDTrace_FUNCTION_RETURN_ENABLED(void) { return 0; } +static inline int PyDTrace_GC_START_ENABLED(void) { return 0; } +static inline int PyDTrace_GC_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_NEW_START_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_NEW_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_DELETE_START_ENABLED(void) { return 0; } +static inline int PyDTrace_INSTANCE_DELETE_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_IMPORT_FIND_LOAD_START_ENABLED(void) { return 0; } +static inline int PyDTrace_IMPORT_FIND_LOAD_DONE_ENABLED(void) { return 0; } +static inline int PyDTrace_AUDIT_ENABLED(void) { return 0; } + +#endif /* !WITH_DTRACE */ + +#ifdef __cplusplus +} +#endif +#endif /* !Py_DTRACE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pyerrors.h b/ScriptEngine/third-party/backend/include/Python/pyerrors.h new file mode 100644 index 0000000000..f5d1c71157 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pyerrors.h @@ -0,0 +1,324 @@ +#ifndef Py_ERRORS_H +#define Py_ERRORS_H +#ifdef __cplusplus +extern "C" { +#endif + +#include // va_list + +/* Error handling definitions */ + +PyAPI_FUNC(void) PyErr_SetNone(PyObject *); +PyAPI_FUNC(void) PyErr_SetObject(PyObject *, PyObject *); +PyAPI_FUNC(void) PyErr_SetString( + PyObject *exception, + const char *string /* decoded from utf-8 */ + ); +PyAPI_FUNC(PyObject *) PyErr_Occurred(void); +PyAPI_FUNC(void) PyErr_Clear(void); +PyAPI_FUNC(void) PyErr_Fetch(PyObject **, PyObject **, PyObject **); +PyAPI_FUNC(void) PyErr_Restore(PyObject *, PyObject *, PyObject *); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(void) PyErr_GetExcInfo(PyObject **, PyObject **, PyObject **); +PyAPI_FUNC(void) PyErr_SetExcInfo(PyObject *, PyObject *, PyObject *); +#endif + +/* Defined in Python/pylifecycle.c + + The Py_FatalError() function is replaced with a macro which logs + automatically the name of the current function, unless the Py_LIMITED_API + macro is defined. */ +PyAPI_FUNC(void) _Py_NO_RETURN Py_FatalError(const char *message); + +/* Error testing and normalization */ +PyAPI_FUNC(int) PyErr_GivenExceptionMatches(PyObject *, PyObject *); +PyAPI_FUNC(int) PyErr_ExceptionMatches(PyObject *); +PyAPI_FUNC(void) PyErr_NormalizeException(PyObject**, PyObject**, PyObject**); + +/* Traceback manipulation (PEP 3134) */ +PyAPI_FUNC(int) PyException_SetTraceback(PyObject *, PyObject *); +PyAPI_FUNC(PyObject *) PyException_GetTraceback(PyObject *); + +/* Cause manipulation (PEP 3134) */ +PyAPI_FUNC(PyObject *) PyException_GetCause(PyObject *); +PyAPI_FUNC(void) PyException_SetCause(PyObject *, PyObject *); + +/* Context manipulation (PEP 3134) */ +PyAPI_FUNC(PyObject *) PyException_GetContext(PyObject *); +PyAPI_FUNC(void) PyException_SetContext(PyObject *, PyObject *); + +/* */ + +#define PyExceptionClass_Check(x) \ + (PyType_Check((x)) && \ + PyType_FastSubclass((PyTypeObject*)(x), Py_TPFLAGS_BASE_EXC_SUBCLASS)) + +#define PyExceptionInstance_Check(x) \ + PyType_FastSubclass(Py_TYPE(x), Py_TPFLAGS_BASE_EXC_SUBCLASS) + +PyAPI_FUNC(const char *) PyExceptionClass_Name(PyObject *); + +#define PyExceptionInstance_Class(x) ((PyObject*)Py_TYPE(x)) + + +/* Predefined exceptions */ + +PyAPI_DATA(PyObject *) PyExc_BaseException; +PyAPI_DATA(PyObject *) PyExc_Exception; +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +PyAPI_DATA(PyObject *) PyExc_StopAsyncIteration; +#endif +PyAPI_DATA(PyObject *) PyExc_StopIteration; +PyAPI_DATA(PyObject *) PyExc_GeneratorExit; +PyAPI_DATA(PyObject *) PyExc_ArithmeticError; +PyAPI_DATA(PyObject *) PyExc_LookupError; + +PyAPI_DATA(PyObject *) PyExc_AssertionError; +PyAPI_DATA(PyObject *) PyExc_AttributeError; +PyAPI_DATA(PyObject *) PyExc_BufferError; +PyAPI_DATA(PyObject *) PyExc_EOFError; +PyAPI_DATA(PyObject *) PyExc_FloatingPointError; +PyAPI_DATA(PyObject *) PyExc_OSError; +PyAPI_DATA(PyObject *) PyExc_ImportError; +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 +PyAPI_DATA(PyObject *) PyExc_ModuleNotFoundError; +#endif +PyAPI_DATA(PyObject *) PyExc_IndexError; +PyAPI_DATA(PyObject *) PyExc_KeyError; +PyAPI_DATA(PyObject *) PyExc_KeyboardInterrupt; +PyAPI_DATA(PyObject *) PyExc_MemoryError; +PyAPI_DATA(PyObject *) PyExc_NameError; +PyAPI_DATA(PyObject *) PyExc_OverflowError; +PyAPI_DATA(PyObject *) PyExc_RuntimeError; +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +PyAPI_DATA(PyObject *) PyExc_RecursionError; +#endif +PyAPI_DATA(PyObject *) PyExc_NotImplementedError; +PyAPI_DATA(PyObject *) PyExc_SyntaxError; +PyAPI_DATA(PyObject *) PyExc_IndentationError; +PyAPI_DATA(PyObject *) PyExc_TabError; +PyAPI_DATA(PyObject *) PyExc_ReferenceError; +PyAPI_DATA(PyObject *) PyExc_SystemError; +PyAPI_DATA(PyObject *) PyExc_SystemExit; +PyAPI_DATA(PyObject *) PyExc_TypeError; +PyAPI_DATA(PyObject *) PyExc_UnboundLocalError; +PyAPI_DATA(PyObject *) PyExc_UnicodeError; +PyAPI_DATA(PyObject *) PyExc_UnicodeEncodeError; +PyAPI_DATA(PyObject *) PyExc_UnicodeDecodeError; +PyAPI_DATA(PyObject *) PyExc_UnicodeTranslateError; +PyAPI_DATA(PyObject *) PyExc_ValueError; +PyAPI_DATA(PyObject *) PyExc_ZeroDivisionError; + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_DATA(PyObject *) PyExc_BlockingIOError; +PyAPI_DATA(PyObject *) PyExc_BrokenPipeError; +PyAPI_DATA(PyObject *) PyExc_ChildProcessError; +PyAPI_DATA(PyObject *) PyExc_ConnectionError; +PyAPI_DATA(PyObject *) PyExc_ConnectionAbortedError; +PyAPI_DATA(PyObject *) PyExc_ConnectionRefusedError; +PyAPI_DATA(PyObject *) PyExc_ConnectionResetError; +PyAPI_DATA(PyObject *) PyExc_FileExistsError; +PyAPI_DATA(PyObject *) PyExc_FileNotFoundError; +PyAPI_DATA(PyObject *) PyExc_InterruptedError; +PyAPI_DATA(PyObject *) PyExc_IsADirectoryError; +PyAPI_DATA(PyObject *) PyExc_NotADirectoryError; +PyAPI_DATA(PyObject *) PyExc_PermissionError; +PyAPI_DATA(PyObject *) PyExc_ProcessLookupError; +PyAPI_DATA(PyObject *) PyExc_TimeoutError; +#endif + + +/* Compatibility aliases */ +PyAPI_DATA(PyObject *) PyExc_EnvironmentError; +PyAPI_DATA(PyObject *) PyExc_IOError; +#ifdef MS_WINDOWS +PyAPI_DATA(PyObject *) PyExc_WindowsError; +#endif + +/* Predefined warning categories */ +PyAPI_DATA(PyObject *) PyExc_Warning; +PyAPI_DATA(PyObject *) PyExc_UserWarning; +PyAPI_DATA(PyObject *) PyExc_DeprecationWarning; +PyAPI_DATA(PyObject *) PyExc_PendingDeprecationWarning; +PyAPI_DATA(PyObject *) PyExc_SyntaxWarning; +PyAPI_DATA(PyObject *) PyExc_RuntimeWarning; +PyAPI_DATA(PyObject *) PyExc_FutureWarning; +PyAPI_DATA(PyObject *) PyExc_ImportWarning; +PyAPI_DATA(PyObject *) PyExc_UnicodeWarning; +PyAPI_DATA(PyObject *) PyExc_BytesWarning; +PyAPI_DATA(PyObject *) PyExc_EncodingWarning; +PyAPI_DATA(PyObject *) PyExc_ResourceWarning; + + +/* Convenience functions */ + +PyAPI_FUNC(int) PyErr_BadArgument(void); +PyAPI_FUNC(PyObject *) PyErr_NoMemory(void); +PyAPI_FUNC(PyObject *) PyErr_SetFromErrno(PyObject *); +PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObject( + PyObject *, PyObject *); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000 +PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilenameObjects( + PyObject *, PyObject *, PyObject *); +#endif +PyAPI_FUNC(PyObject *) PyErr_SetFromErrnoWithFilename( + PyObject *exc, + const char *filename /* decoded from the filesystem encoding */ + ); + +PyAPI_FUNC(PyObject *) PyErr_Format( + PyObject *exception, + const char *format, /* ASCII-encoded string */ + ... + ); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +PyAPI_FUNC(PyObject *) PyErr_FormatV( + PyObject *exception, + const char *format, + va_list vargs); +#endif + +#ifdef MS_WINDOWS +PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErrWithFilename( + int ierr, + const char *filename /* decoded from the filesystem encoding */ + ); +PyAPI_FUNC(PyObject *) PyErr_SetFromWindowsErr(int); +PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObject( + PyObject *,int, PyObject *); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03040000 +PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilenameObjects( + PyObject *,int, PyObject *, PyObject *); +#endif +PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErrWithFilename( + PyObject *exc, + int ierr, + const char *filename /* decoded from the filesystem encoding */ + ); +PyAPI_FUNC(PyObject *) PyErr_SetExcFromWindowsErr(PyObject *, int); +#endif /* MS_WINDOWS */ + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 +PyAPI_FUNC(PyObject *) PyErr_SetImportErrorSubclass(PyObject *, PyObject *, + PyObject *, PyObject *); +#endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject *) PyErr_SetImportError(PyObject *, PyObject *, + PyObject *); +#endif + +/* Export the old function so that the existing API remains available: */ +PyAPI_FUNC(void) PyErr_BadInternalCall(void); +PyAPI_FUNC(void) _PyErr_BadInternalCall(const char *filename, int lineno); +/* Mask the old API with a call to the new API for code compiled under + Python 2.0: */ +#define PyErr_BadInternalCall() _PyErr_BadInternalCall(__FILE__, __LINE__) + +/* Function to create a new exception */ +PyAPI_FUNC(PyObject *) PyErr_NewException( + const char *name, PyObject *base, PyObject *dict); +PyAPI_FUNC(PyObject *) PyErr_NewExceptionWithDoc( + const char *name, const char *doc, PyObject *base, PyObject *dict); +PyAPI_FUNC(void) PyErr_WriteUnraisable(PyObject *); + + +/* In signalmodule.c */ +PyAPI_FUNC(int) PyErr_CheckSignals(void); +PyAPI_FUNC(void) PyErr_SetInterrupt(void); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 +PyAPI_FUNC(int) PyErr_SetInterruptEx(int signum); +#endif + +/* Support for adding program text to SyntaxErrors */ +PyAPI_FUNC(void) PyErr_SyntaxLocation( + const char *filename, /* decoded from the filesystem encoding */ + int lineno); +PyAPI_FUNC(void) PyErr_SyntaxLocationEx( + const char *filename, /* decoded from the filesystem encoding */ + int lineno, + int col_offset); +PyAPI_FUNC(PyObject *) PyErr_ProgramText( + const char *filename, /* decoded from the filesystem encoding */ + int lineno); + +/* The following functions are used to create and modify unicode + exceptions from C */ + +/* create a UnicodeDecodeError object */ +PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_Create( + const char *encoding, /* UTF-8 encoded string */ + const char *object, + Py_ssize_t length, + Py_ssize_t start, + Py_ssize_t end, + const char *reason /* UTF-8 encoded string */ + ); + +/* get the encoding attribute */ +PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetEncoding(PyObject *); +PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetEncoding(PyObject *); + +/* get the object attribute */ +PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetObject(PyObject *); +PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetObject(PyObject *); +PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetObject(PyObject *); + +/* get the value of the start attribute (the int * may not be NULL) + return 0 on success, -1 on failure */ +PyAPI_FUNC(int) PyUnicodeEncodeError_GetStart(PyObject *, Py_ssize_t *); +PyAPI_FUNC(int) PyUnicodeDecodeError_GetStart(PyObject *, Py_ssize_t *); +PyAPI_FUNC(int) PyUnicodeTranslateError_GetStart(PyObject *, Py_ssize_t *); + +/* assign a new value to the start attribute + return 0 on success, -1 on failure */ +PyAPI_FUNC(int) PyUnicodeEncodeError_SetStart(PyObject *, Py_ssize_t); +PyAPI_FUNC(int) PyUnicodeDecodeError_SetStart(PyObject *, Py_ssize_t); +PyAPI_FUNC(int) PyUnicodeTranslateError_SetStart(PyObject *, Py_ssize_t); + +/* get the value of the end attribute (the int *may not be NULL) + return 0 on success, -1 on failure */ +PyAPI_FUNC(int) PyUnicodeEncodeError_GetEnd(PyObject *, Py_ssize_t *); +PyAPI_FUNC(int) PyUnicodeDecodeError_GetEnd(PyObject *, Py_ssize_t *); +PyAPI_FUNC(int) PyUnicodeTranslateError_GetEnd(PyObject *, Py_ssize_t *); + +/* assign a new value to the end attribute + return 0 on success, -1 on failure */ +PyAPI_FUNC(int) PyUnicodeEncodeError_SetEnd(PyObject *, Py_ssize_t); +PyAPI_FUNC(int) PyUnicodeDecodeError_SetEnd(PyObject *, Py_ssize_t); +PyAPI_FUNC(int) PyUnicodeTranslateError_SetEnd(PyObject *, Py_ssize_t); + +/* get the value of the reason attribute */ +PyAPI_FUNC(PyObject *) PyUnicodeEncodeError_GetReason(PyObject *); +PyAPI_FUNC(PyObject *) PyUnicodeDecodeError_GetReason(PyObject *); +PyAPI_FUNC(PyObject *) PyUnicodeTranslateError_GetReason(PyObject *); + +/* assign a new value to the reason attribute + return 0 on success, -1 on failure */ +PyAPI_FUNC(int) PyUnicodeEncodeError_SetReason( + PyObject *exc, + const char *reason /* UTF-8 encoded string */ + ); +PyAPI_FUNC(int) PyUnicodeDecodeError_SetReason( + PyObject *exc, + const char *reason /* UTF-8 encoded string */ + ); +PyAPI_FUNC(int) PyUnicodeTranslateError_SetReason( + PyObject *exc, + const char *reason /* UTF-8 encoded string */ + ); + +PyAPI_FUNC(int) PyOS_snprintf(char *str, size_t size, const char *format, ...) + Py_GCC_ATTRIBUTE((format(printf, 3, 4))); +PyAPI_FUNC(int) PyOS_vsnprintf(char *str, size_t size, const char *format, va_list va) + Py_GCC_ATTRIBUTE((format(printf, 3, 0))); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_ERRORS_H +# include "cpython/pyerrors.h" +# undef Py_CPYTHON_ERRORS_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_ERRORS_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pyexpat.h b/ScriptEngine/third-party/backend/include/Python/pyexpat.h new file mode 100644 index 0000000000..07020b5dc9 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pyexpat.h @@ -0,0 +1,55 @@ +/* Stuff to export relevant 'expat' entry points from pyexpat to other + * parser modules, such as cElementTree. */ + +/* note: you must import expat.h before importing this module! */ + +#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.1" +#define PyExpat_CAPSULE_NAME "pyexpat.expat_CAPI" + +struct PyExpat_CAPI +{ + char* magic; /* set to PyExpat_CAPI_MAGIC */ + int size; /* set to sizeof(struct PyExpat_CAPI) */ + int MAJOR_VERSION; + int MINOR_VERSION; + int MICRO_VERSION; + /* pointers to selected expat functions. add new functions at + the end, if needed */ + const XML_LChar * (*ErrorString)(enum XML_Error code); + enum XML_Error (*GetErrorCode)(XML_Parser parser); + XML_Size (*GetErrorColumnNumber)(XML_Parser parser); + XML_Size (*GetErrorLineNumber)(XML_Parser parser); + enum XML_Status (*Parse)( + XML_Parser parser, const char *s, int len, int isFinal); + XML_Parser (*ParserCreate_MM)( + const XML_Char *encoding, const XML_Memory_Handling_Suite *memsuite, + const XML_Char *namespaceSeparator); + void (*ParserFree)(XML_Parser parser); + void (*SetCharacterDataHandler)( + XML_Parser parser, XML_CharacterDataHandler handler); + void (*SetCommentHandler)( + XML_Parser parser, XML_CommentHandler handler); + void (*SetDefaultHandlerExpand)( + XML_Parser parser, XML_DefaultHandler handler); + void (*SetElementHandler)( + XML_Parser parser, XML_StartElementHandler start, + XML_EndElementHandler end); + void (*SetNamespaceDeclHandler)( + XML_Parser parser, XML_StartNamespaceDeclHandler start, + XML_EndNamespaceDeclHandler end); + void (*SetProcessingInstructionHandler)( + XML_Parser parser, XML_ProcessingInstructionHandler handler); + void (*SetUnknownEncodingHandler)( + XML_Parser parser, XML_UnknownEncodingHandler handler, + void *encodingHandlerData); + void (*SetUserData)(XML_Parser parser, void *userData); + void (*SetStartDoctypeDeclHandler)(XML_Parser parser, + XML_StartDoctypeDeclHandler start); + enum XML_Status (*SetEncoding)(XML_Parser parser, const XML_Char *encoding); + int (*DefaultUnknownEncodingHandler)( + void *encodingHandlerData, const XML_Char *name, XML_Encoding *info); + /* might be none for expat < 2.1.0 */ + int (*SetHashSalt)(XML_Parser parser, unsigned long hash_salt); + /* always add new stuff to the end! */ +}; + diff --git a/ScriptEngine/third-party/backend/include/Python/pyframe.h b/ScriptEngine/third-party/backend/include/Python/pyframe.h new file mode 100644 index 0000000000..3816224201 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pyframe.h @@ -0,0 +1,22 @@ +/* Limited C API of PyFrame API + * + * Include "frameobject.h" to get the PyFrameObject structure. + */ + +#ifndef Py_PYFRAME_H +#define Py_PYFRAME_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _frame PyFrameObject; + +/* Return the line of code the frame is currently executing. */ +PyAPI_FUNC(int) PyFrame_GetLineNumber(PyFrameObject *); + +PyAPI_FUNC(PyCodeObject *) PyFrame_GetCode(PyFrameObject *frame); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_PYFRAME_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pyhash.h b/ScriptEngine/third-party/backend/include/Python/pyhash.h new file mode 100644 index 0000000000..a314ea907b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pyhash.h @@ -0,0 +1,144 @@ +#ifndef Py_HASH_H + +#define Py_HASH_H +#ifdef __cplusplus +extern "C" { +#endif + +/* Helpers for hash functions */ +#ifndef Py_LIMITED_API +PyAPI_FUNC(Py_hash_t) _Py_HashDouble(PyObject *, double); +PyAPI_FUNC(Py_hash_t) _Py_HashPointer(const void*); +// Similar to _Py_HashPointer(), but don't replace -1 with -2 +PyAPI_FUNC(Py_hash_t) _Py_HashPointerRaw(const void*); +PyAPI_FUNC(Py_hash_t) _Py_HashBytes(const void*, Py_ssize_t); +#endif + +/* Prime multiplier used in string and various other hashes. */ +#define _PyHASH_MULTIPLIER 1000003UL /* 0xf4243 */ + +/* Parameters used for the numeric hash implementation. See notes for + _Py_HashDouble in Python/pyhash.c. Numeric hashes are based on + reduction modulo the prime 2**_PyHASH_BITS - 1. */ + +#if SIZEOF_VOID_P >= 8 +# define _PyHASH_BITS 61 +#else +# define _PyHASH_BITS 31 +#endif + +#define _PyHASH_MODULUS (((size_t)1 << _PyHASH_BITS) - 1) +#define _PyHASH_INF 314159 +#define _PyHASH_IMAG _PyHASH_MULTIPLIER + + +/* hash secret + * + * memory layout on 64 bit systems + * cccccccc cccccccc cccccccc uc -- unsigned char[24] + * pppppppp ssssssss ........ fnv -- two Py_hash_t + * k0k0k0k0 k1k1k1k1 ........ siphash -- two uint64_t + * ........ ........ ssssssss djbx33a -- 16 bytes padding + one Py_hash_t + * ........ ........ eeeeeeee pyexpat XML hash salt + * + * memory layout on 32 bit systems + * cccccccc cccccccc cccccccc uc + * ppppssss ........ ........ fnv -- two Py_hash_t + * k0k0k0k0 k1k1k1k1 ........ siphash -- two uint64_t (*) + * ........ ........ ssss.... djbx33a -- 16 bytes padding + one Py_hash_t + * ........ ........ eeee.... pyexpat XML hash salt + * + * (*) The siphash member may not be available on 32 bit platforms without + * an unsigned int64 data type. + */ +#ifndef Py_LIMITED_API +typedef union { + /* ensure 24 bytes */ + unsigned char uc[24]; + /* two Py_hash_t for FNV */ + struct { + Py_hash_t prefix; + Py_hash_t suffix; + } fnv; + /* two uint64 for SipHash24 */ + struct { + uint64_t k0; + uint64_t k1; + } siphash; + /* a different (!) Py_hash_t for small string optimization */ + struct { + unsigned char padding[16]; + Py_hash_t suffix; + } djbx33a; + struct { + unsigned char padding[16]; + Py_hash_t hashsalt; + } expat; +} _Py_HashSecret_t; +PyAPI_DATA(_Py_HashSecret_t) _Py_HashSecret; + +#ifdef Py_DEBUG +PyAPI_DATA(int) _Py_HashSecret_Initialized; +#endif + + +/* hash function definition */ +typedef struct { + Py_hash_t (*const hash)(const void *, Py_ssize_t); + const char *name; + const int hash_bits; + const int seed_bits; +} PyHash_FuncDef; + +PyAPI_FUNC(PyHash_FuncDef*) PyHash_GetFuncDef(void); +#endif + + +/* cutoff for small string DJBX33A optimization in range [1, cutoff). + * + * About 50% of the strings in a typical Python application are smaller than + * 6 to 7 chars. However DJBX33A is vulnerable to hash collision attacks. + * NEVER use DJBX33A for long strings! + * + * A Py_HASH_CUTOFF of 0 disables small string optimization. 32 bit platforms + * should use a smaller cutoff because it is easier to create colliding + * strings. A cutoff of 7 on 64bit platforms and 5 on 32bit platforms should + * provide a decent safety margin. + */ +#ifndef Py_HASH_CUTOFF +# define Py_HASH_CUTOFF 0 +#elif (Py_HASH_CUTOFF > 7 || Py_HASH_CUTOFF < 0) +# error Py_HASH_CUTOFF must in range 0...7. +#endif /* Py_HASH_CUTOFF */ + + +/* hash algorithm selection + * + * The values for Py_HASH_SIPHASH24 and Py_HASH_FNV are hard-coded in the + * configure script. + * + * - FNV is available on all platforms and architectures. + * - SIPHASH24 only works on platforms that don't require aligned memory for integers. + * - With EXTERNAL embedders can provide an alternative implementation with:: + * + * PyHash_FuncDef PyHash_Func = {...}; + * + * XXX: Figure out __declspec() for extern PyHash_FuncDef. + */ +#define Py_HASH_EXTERNAL 0 +#define Py_HASH_SIPHASH24 1 +#define Py_HASH_FNV 2 + +#ifndef Py_HASH_ALGORITHM +# ifndef HAVE_ALIGNED_REQUIRED +# define Py_HASH_ALGORITHM Py_HASH_SIPHASH24 +# else +# define Py_HASH_ALGORITHM Py_HASH_FNV +# endif /* uint64_t && uint32_t && aligned */ +#endif /* Py_HASH_ALGORITHM */ + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_HASH_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pylifecycle.h b/ScriptEngine/third-party/backend/include/Python/pylifecycle.h new file mode 100644 index 0000000000..2df7fe6e3c --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pylifecycle.h @@ -0,0 +1,74 @@ + +/* Interfaces to configure, query, create & destroy the Python runtime */ + +#ifndef Py_PYLIFECYCLE_H +#define Py_PYLIFECYCLE_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* Initialization and finalization */ +PyAPI_FUNC(void) Py_Initialize(void); +PyAPI_FUNC(void) Py_InitializeEx(int); +PyAPI_FUNC(void) Py_Finalize(void); +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 +PyAPI_FUNC(int) Py_FinalizeEx(void); +#endif +PyAPI_FUNC(int) Py_IsInitialized(void); + +/* Subinterpreter support */ +PyAPI_FUNC(PyThreadState *) Py_NewInterpreter(void); +PyAPI_FUNC(void) Py_EndInterpreter(PyThreadState *); + + +/* Py_PyAtExit is for the atexit module, Py_AtExit is for low-level + * exit functions. + */ +PyAPI_FUNC(int) Py_AtExit(void (*func)(void)); + +PyAPI_FUNC(void) _Py_NO_RETURN Py_Exit(int); + +/* Bootstrap __main__ (defined in Modules/main.c) */ +PyAPI_FUNC(int) Py_Main(int argc, wchar_t **argv); +PyAPI_FUNC(int) Py_BytesMain(int argc, char **argv); + +/* In pathconfig.c */ +PyAPI_FUNC(void) Py_SetProgramName(const wchar_t *); +PyAPI_FUNC(wchar_t *) Py_GetProgramName(void); + +PyAPI_FUNC(void) Py_SetPythonHome(const wchar_t *); +PyAPI_FUNC(wchar_t *) Py_GetPythonHome(void); + +PyAPI_FUNC(wchar_t *) Py_GetProgramFullPath(void); + +PyAPI_FUNC(wchar_t *) Py_GetPrefix(void); +PyAPI_FUNC(wchar_t *) Py_GetExecPrefix(void); +PyAPI_FUNC(wchar_t *) Py_GetPath(void); +PyAPI_FUNC(void) Py_SetPath(const wchar_t *); +#ifdef MS_WINDOWS +int _Py_CheckPython3(void); +#endif + +/* In their own files */ +PyAPI_FUNC(const char *) Py_GetVersion(void); +PyAPI_FUNC(const char *) Py_GetPlatform(void); +PyAPI_FUNC(const char *) Py_GetCopyright(void); +PyAPI_FUNC(const char *) Py_GetCompiler(void); +PyAPI_FUNC(const char *) Py_GetBuildInfo(void); + +/* Signals */ +typedef void (*PyOS_sighandler_t)(int); +PyAPI_FUNC(PyOS_sighandler_t) PyOS_getsig(int); +PyAPI_FUNC(PyOS_sighandler_t) PyOS_setsig(int, PyOS_sighandler_t); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_PYLIFECYCLE_H +# include "cpython/pylifecycle.h" +# undef Py_CPYTHON_PYLIFECYCLE_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_PYLIFECYCLE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pymacconfig.h b/ScriptEngine/third-party/backend/include/Python/pymacconfig.h new file mode 100644 index 0000000000..9dde11bd58 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pymacconfig.h @@ -0,0 +1,102 @@ +#ifndef PYMACCONFIG_H +#define PYMACCONFIG_H + /* + * This file moves some of the autoconf magic to compile-time + * when building on MacOSX. This is needed for building 4-way + * universal binaries and for 64-bit universal binaries because + * the values redefined below aren't configure-time constant but + * only compile-time constant in these scenarios. + */ + +#if defined(__APPLE__) + +# undef SIZEOF_LONG +# undef SIZEOF_PTHREAD_T +# undef SIZEOF_SIZE_T +# undef SIZEOF_TIME_T +# undef SIZEOF_VOID_P +# undef SIZEOF__BOOL +# undef SIZEOF_UINTPTR_T +# undef SIZEOF_PTHREAD_T +# undef WORDS_BIGENDIAN +# undef DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754 +# undef DOUBLE_IS_BIG_ENDIAN_IEEE754 +# undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 +# undef HAVE_GCC_ASM_FOR_X87 + +# undef VA_LIST_IS_ARRAY +# if defined(__LP64__) && defined(__x86_64__) +# define VA_LIST_IS_ARRAY 1 +# endif + +# undef HAVE_LARGEFILE_SUPPORT +# ifndef __LP64__ +# define HAVE_LARGEFILE_SUPPORT 1 +# endif + +# undef SIZEOF_LONG +# ifdef __LP64__ +# define SIZEOF__BOOL 1 +# define SIZEOF__BOOL 1 +# define SIZEOF_LONG 8 +# define SIZEOF_PTHREAD_T 8 +# define SIZEOF_SIZE_T 8 +# define SIZEOF_TIME_T 8 +# define SIZEOF_VOID_P 8 +# define SIZEOF_UINTPTR_T 8 +# define SIZEOF_PTHREAD_T 8 +# else +# ifdef __ppc__ +# define SIZEOF__BOOL 4 +# else +# define SIZEOF__BOOL 1 +# endif +# define SIZEOF_LONG 4 +# define SIZEOF_PTHREAD_T 4 +# define SIZEOF_SIZE_T 4 +# define SIZEOF_TIME_T 4 +# define SIZEOF_VOID_P 4 +# define SIZEOF_UINTPTR_T 4 +# define SIZEOF_PTHREAD_T 4 +# endif + +# if defined(__LP64__) + /* MacOSX 10.4 (the first release to support 64-bit code + * at all) only supports 64-bit in the UNIX layer. + * Therefore suppress the toolbox-glue in 64-bit mode. + */ + + /* In 64-bit mode setpgrp always has no arguments, in 32-bit + * mode that depends on the compilation environment + */ +# undef SETPGRP_HAVE_ARG + +# endif + +#ifdef __BIG_ENDIAN__ +#define WORDS_BIGENDIAN 1 +#define DOUBLE_IS_BIG_ENDIAN_IEEE754 +#else +#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 +#endif /* __BIG_ENDIAN */ + +#ifdef __i386__ +# define HAVE_GCC_ASM_FOR_X87 +#endif + + /* + * The definition in pyconfig.h is only valid on the OS release + * where configure ran on and not necessarily for all systems where + * the executable can be used on. + * + * Specifically: OSX 10.4 has limited supported for '%zd', while + * 10.5 has full support for '%zd'. A binary built on 10.5 won't + * work properly on 10.4 unless we suppress the definition + * of PY_FORMAT_SIZE_T + */ +#undef PY_FORMAT_SIZE_T + + +#endif /* defined(_APPLE__) */ + +#endif /* PYMACCONFIG_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pymacro.h b/ScriptEngine/third-party/backend/include/Python/pymacro.h new file mode 100644 index 0000000000..202b936d96 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pymacro.h @@ -0,0 +1,132 @@ +#ifndef Py_PYMACRO_H +#define Py_PYMACRO_H + +/* Minimum value between x and y */ +#define Py_MIN(x, y) (((x) > (y)) ? (y) : (x)) + +/* Maximum value between x and y */ +#define Py_MAX(x, y) (((x) > (y)) ? (x) : (y)) + +/* Absolute value of the number x */ +#define Py_ABS(x) ((x) < 0 ? -(x) : (x)) + +#define _Py_XSTRINGIFY(x) #x + +/* Convert the argument to a string. For example, Py_STRINGIFY(123) is replaced + with "123" by the preprocessor. Defines are also replaced by their value. + For example Py_STRINGIFY(__LINE__) is replaced by the line number, not + by "__LINE__". */ +#define Py_STRINGIFY(x) _Py_XSTRINGIFY(x) + +/* Get the size of a structure member in bytes */ +#define Py_MEMBER_SIZE(type, member) sizeof(((type *)0)->member) + +/* Argument must be a char or an int in [-128, 127] or [0, 255]. */ +#define Py_CHARMASK(c) ((unsigned char)((c) & 0xff)) + +/* Assert a build-time dependency, as an expression. + + Your compile will fail if the condition isn't true, or can't be evaluated + by the compiler. This can be used in an expression: its value is 0. + + Example: + + #define foo_to_char(foo) \ + ((char *)(foo) \ + + Py_BUILD_ASSERT_EXPR(offsetof(struct foo, string) == 0)) + + Written by Rusty Russell, public domain, http://ccodearchive.net/ */ +#define Py_BUILD_ASSERT_EXPR(cond) \ + (sizeof(char [1 - 2*!(cond)]) - 1) + +#define Py_BUILD_ASSERT(cond) do { \ + (void)Py_BUILD_ASSERT_EXPR(cond); \ + } while(0) + +/* Get the number of elements in a visible array + + This does not work on pointers, or arrays declared as [], or function + parameters. With correct compiler support, such usage will cause a build + error (see Py_BUILD_ASSERT_EXPR). + + Written by Rusty Russell, public domain, http://ccodearchive.net/ + + Requires at GCC 3.1+ */ +#if (defined(__GNUC__) && !defined(__STRICT_ANSI__) && \ + (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) || (__GNUC__ >= 4))) +/* Two gcc extensions. + &a[0] degrades to a pointer: a different type from an array */ +#define Py_ARRAY_LENGTH(array) \ + (sizeof(array) / sizeof((array)[0]) \ + + Py_BUILD_ASSERT_EXPR(!__builtin_types_compatible_p(typeof(array), \ + typeof(&(array)[0])))) +#else +#define Py_ARRAY_LENGTH(array) \ + (sizeof(array) / sizeof((array)[0])) +#endif + + +/* Define macros for inline documentation. */ +#define PyDoc_VAR(name) static const char name[] +#define PyDoc_STRVAR(name,str) PyDoc_VAR(name) = PyDoc_STR(str) +#ifdef WITH_DOC_STRINGS +#define PyDoc_STR(str) str +#else +#define PyDoc_STR(str) "" +#endif + +/* Below "a" is a power of 2. */ +/* Round down size "n" to be a multiple of "a". */ +#define _Py_SIZE_ROUND_DOWN(n, a) ((size_t)(n) & ~(size_t)((a) - 1)) +/* Round up size "n" to be a multiple of "a". */ +#define _Py_SIZE_ROUND_UP(n, a) (((size_t)(n) + \ + (size_t)((a) - 1)) & ~(size_t)((a) - 1)) +/* Round pointer "p" down to the closest "a"-aligned address <= "p". */ +#define _Py_ALIGN_DOWN(p, a) ((void *)((uintptr_t)(p) & ~(uintptr_t)((a) - 1))) +/* Round pointer "p" up to the closest "a"-aligned address >= "p". */ +#define _Py_ALIGN_UP(p, a) ((void *)(((uintptr_t)(p) + \ + (uintptr_t)((a) - 1)) & ~(uintptr_t)((a) - 1))) +/* Check if pointer "p" is aligned to "a"-bytes boundary. */ +#define _Py_IS_ALIGNED(p, a) (!((uintptr_t)(p) & (uintptr_t)((a) - 1))) + +/* Use this for unused arguments in a function definition to silence compiler + * warnings. Example: + * + * int func(int a, int Py_UNUSED(b)) { return a; } + */ +#if defined(__GNUC__) || defined(__clang__) +# define Py_UNUSED(name) _unused_ ## name __attribute__((unused)) +#else +# define Py_UNUSED(name) _unused_ ## name +#endif + +#if defined(RANDALL_WAS_HERE) +# define Py_UNREACHABLE() \ + Py_FatalError( \ + "If you're seeing this, the code is in what I thought was\n" \ + "an unreachable state.\n\n" \ + "I could give you advice for what to do, but honestly, why\n" \ + "should you trust me? I clearly screwed this up. I'm writing\n" \ + "a message that should never appear, yet I know it will\n" \ + "probably appear someday.\n\n" \ + "On a deep level, I know I'm not up to this task.\n" \ + "I'm so sorry.\n" \ + "https://xkcd.com/2200") +#elif defined(Py_DEBUG) +# define Py_UNREACHABLE() \ + Py_FatalError( \ + "We've reached an unreachable state. Anything is possible.\n" \ + "The limits were in our heads all along. Follow your dreams.\n" \ + "https://xkcd.com/2200") +#elif defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)) +# define Py_UNREACHABLE() __builtin_unreachable() +#elif defined(__clang__) || defined(__INTEL_COMPILER) +# define Py_UNREACHABLE() __builtin_unreachable() +#elif defined(_MSC_VER) +# define Py_UNREACHABLE() __assume(0) +#else +# define Py_UNREACHABLE() \ + Py_FatalError("Unreachable C code path reached") +#endif + +#endif /* Py_PYMACRO_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pymath.h b/ScriptEngine/third-party/backend/include/Python/pymath.h new file mode 100644 index 0000000000..f869724334 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pymath.h @@ -0,0 +1,230 @@ +#ifndef Py_PYMATH_H +#define Py_PYMATH_H + +#include "pyconfig.h" /* include for defines */ + +/************************************************************************** +Symbols and macros to supply platform-independent interfaces to mathematical +functions and constants +**************************************************************************/ + +/* Python provides implementations for copysign, round and hypot in + * Python/pymath.c just in case your math library doesn't provide the + * functions. + * + *Note: PC/pyconfig.h defines copysign as _copysign + */ +#ifndef HAVE_COPYSIGN +extern double copysign(double, double); +#endif + +#ifndef HAVE_ROUND +extern double round(double); +#endif + +#ifndef HAVE_HYPOT +extern double hypot(double, double); +#endif + +/* extra declarations */ +#ifndef _MSC_VER +#ifndef __STDC__ +extern double fmod (double, double); +extern double frexp (double, int *); +extern double ldexp (double, int); +extern double modf (double, double *); +extern double pow(double, double); +#endif /* __STDC__ */ +#endif /* _MSC_VER */ + +/* High precision definition of pi and e (Euler) + * The values are taken from libc6's math.h. + */ +#ifndef Py_MATH_PIl +#define Py_MATH_PIl 3.1415926535897932384626433832795029L +#endif +#ifndef Py_MATH_PI +#define Py_MATH_PI 3.14159265358979323846 +#endif + +#ifndef Py_MATH_El +#define Py_MATH_El 2.7182818284590452353602874713526625L +#endif + +#ifndef Py_MATH_E +#define Py_MATH_E 2.7182818284590452354 +#endif + +/* Tau (2pi) to 40 digits, taken from tauday.com/tau-digits. */ +#ifndef Py_MATH_TAU +#define Py_MATH_TAU 6.2831853071795864769252867665590057683943L +#endif + + +/* On x86, Py_FORCE_DOUBLE forces a floating-point number out of an x87 FPU + register and into a 64-bit memory location, rounding from extended + precision to double precision in the process. On other platforms it does + nothing. */ + +/* we take double rounding as evidence of x87 usage */ +#ifndef Py_LIMITED_API +#ifndef Py_FORCE_DOUBLE +# ifdef X87_DOUBLE_ROUNDING +PyAPI_FUNC(double) _Py_force_double(double); +# define Py_FORCE_DOUBLE(X) (_Py_force_double(X)) +# else +# define Py_FORCE_DOUBLE(X) (X) +# endif +#endif +#endif + +#ifndef Py_LIMITED_API +#ifdef HAVE_GCC_ASM_FOR_X87 +PyAPI_FUNC(unsigned short) _Py_get_387controlword(void); +PyAPI_FUNC(void) _Py_set_387controlword(unsigned short); +#endif +#endif + +/* Py_IS_NAN(X) + * Return 1 if float or double arg is a NaN, else 0. + * Caution: + * X is evaluated more than once. + * This may not work on all platforms. Each platform has *some* + * way to spell this, though -- override in pyconfig.h if you have + * a platform where it doesn't work. + * Note: PC/pyconfig.h defines Py_IS_NAN as _isnan + */ +#ifndef Py_IS_NAN +#if defined HAVE_DECL_ISNAN && HAVE_DECL_ISNAN == 1 +#define Py_IS_NAN(X) isnan(X) +#else +#define Py_IS_NAN(X) ((X) != (X)) +#endif +#endif + +/* Py_IS_INFINITY(X) + * Return 1 if float or double arg is an infinity, else 0. + * Caution: + * X is evaluated more than once. + * This implementation may set the underflow flag if |X| is very small; + * it really can't be implemented correctly (& easily) before C99. + * Override in pyconfig.h if you have a better spelling on your platform. + * Py_FORCE_DOUBLE is used to avoid getting false negatives from a + * non-infinite value v sitting in an 80-bit x87 register such that + * v becomes infinite when spilled from the register to 64-bit memory. + * Note: PC/pyconfig.h defines Py_IS_INFINITY as _isinf + */ +#ifndef Py_IS_INFINITY +# if defined HAVE_DECL_ISINF && HAVE_DECL_ISINF == 1 +# define Py_IS_INFINITY(X) isinf(X) +# else +# define Py_IS_INFINITY(X) ((X) && \ + (Py_FORCE_DOUBLE(X)*0.5 == Py_FORCE_DOUBLE(X))) +# endif +#endif + +/* Py_IS_FINITE(X) + * Return 1 if float or double arg is neither infinite nor NAN, else 0. + * Some compilers (e.g. VisualStudio) have intrinsics for this, so a special + * macro for this particular test is useful + * Note: PC/pyconfig.h defines Py_IS_FINITE as _finite + */ +#ifndef Py_IS_FINITE +#if defined HAVE_DECL_ISFINITE && HAVE_DECL_ISFINITE == 1 +#define Py_IS_FINITE(X) isfinite(X) +#elif defined HAVE_FINITE +#define Py_IS_FINITE(X) finite(X) +#else +#define Py_IS_FINITE(X) (!Py_IS_INFINITY(X) && !Py_IS_NAN(X)) +#endif +#endif + +/* HUGE_VAL is supposed to expand to a positive double infinity. Python + * uses Py_HUGE_VAL instead because some platforms are broken in this + * respect. We used to embed code in pyport.h to try to worm around that, + * but different platforms are broken in conflicting ways. If you're on + * a platform where HUGE_VAL is defined incorrectly, fiddle your Python + * config to #define Py_HUGE_VAL to something that works on your platform. + */ +#ifndef Py_HUGE_VAL +#define Py_HUGE_VAL HUGE_VAL +#endif + +/* Py_NAN + * A value that evaluates to a NaN. On IEEE 754 platforms INF*0 or + * INF/INF works. Define Py_NO_NAN in pyconfig.h if your platform + * doesn't support NaNs. + */ +#if !defined(Py_NAN) && !defined(Py_NO_NAN) +#if !defined(__INTEL_COMPILER) + #define Py_NAN (Py_HUGE_VAL * 0.) +#else /* __INTEL_COMPILER */ + #if defined(ICC_NAN_STRICT) + #pragma float_control(push) + #pragma float_control(precise, on) + #pragma float_control(except, on) + #if defined(_MSC_VER) + __declspec(noinline) + #else /* Linux */ + __attribute__((noinline)) + #endif /* _MSC_VER */ + static double __icc_nan() + { + return sqrt(-1.0); + } + #pragma float_control (pop) + #define Py_NAN __icc_nan() + #else /* ICC_NAN_RELAXED as default for Intel Compiler */ + static const union { unsigned char buf[8]; double __icc_nan; } __nan_store = {0,0,0,0,0,0,0xf8,0x7f}; + #define Py_NAN (__nan_store.__icc_nan) + #endif /* ICC_NAN_STRICT */ +#endif /* __INTEL_COMPILER */ +#endif + +/* Py_OVERFLOWED(X) + * Return 1 iff a libm function overflowed. Set errno to 0 before calling + * a libm function, and invoke this macro after, passing the function + * result. + * Caution: + * This isn't reliable. C99 no longer requires libm to set errno under + * any exceptional condition, but does require +- HUGE_VAL return + * values on overflow. A 754 box *probably* maps HUGE_VAL to a + * double infinity, and we're cool if that's so, unless the input + * was an infinity and an infinity is the expected result. A C89 + * system sets errno to ERANGE, so we check for that too. We're + * out of luck if a C99 754 box doesn't map HUGE_VAL to +Inf, or + * if the returned result is a NaN, or if a C89 box returns HUGE_VAL + * in non-overflow cases. + * X is evaluated more than once. + * Some platforms have better way to spell this, so expect some #ifdef'ery. + * + * OpenBSD uses 'isinf()' because a compiler bug on that platform causes + * the longer macro version to be mis-compiled. This isn't optimal, and + * should be removed once a newer compiler is available on that platform. + * The system that had the failure was running OpenBSD 3.2 on Intel, with + * gcc 2.95.3. + * + * According to Tim's checkin, the FreeBSD systems use isinf() to work + * around a FPE bug on that platform. + */ +#if defined(__FreeBSD__) || defined(__OpenBSD__) +#define Py_OVERFLOWED(X) isinf(X) +#else +#define Py_OVERFLOWED(X) ((X) != 0.0 && (errno == ERANGE || \ + (X) == Py_HUGE_VAL || \ + (X) == -Py_HUGE_VAL)) +#endif + +/* Return whether integral type *type* is signed or not. */ +#define _Py_IntegralTypeSigned(type) ((type)(-1) < 0) +/* Return the maximum value of integral type *type*. */ +#define _Py_IntegralTypeMax(type) ((_Py_IntegralTypeSigned(type)) ? (((((type)1 << (sizeof(type)*CHAR_BIT - 2)) - 1) << 1) + 1) : ~(type)0) +/* Return the minimum value of integral type *type*. */ +#define _Py_IntegralTypeMin(type) ((_Py_IntegralTypeSigned(type)) ? -_Py_IntegralTypeMax(type) - 1 : 0) +/* Check whether *v* is in the range of integral type *type*. This is most + * useful if *v* is floating-point, since demoting a floating-point *v* to an + * integral type that cannot represent *v*'s integral part is undefined + * behavior. */ +#define _Py_InIntegralTypeRange(type, v) (_Py_IntegralTypeMin(type) <= v && v <= _Py_IntegralTypeMax(type)) + +#endif /* Py_PYMATH_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pymem.h b/ScriptEngine/third-party/backend/include/Python/pymem.h new file mode 100644 index 0000000000..66cdb0d297 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pymem.h @@ -0,0 +1,104 @@ +/* The PyMem_ family: low-level memory allocation interfaces. + See objimpl.h for the PyObject_ memory family. +*/ + +#ifndef Py_PYMEM_H +#define Py_PYMEM_H + +#include "pyport.h" + +#ifdef __cplusplus +extern "C" { +#endif + +/* BEWARE: + + Each interface exports both functions and macros. Extension modules should + use the functions, to ensure binary compatibility across Python versions. + Because the Python implementation is free to change internal details, and + the macros may (or may not) expose details for speed, if you do use the + macros you must recompile your extensions with each Python release. + + Never mix calls to PyMem_ with calls to the platform malloc/realloc/ + calloc/free. For example, on Windows different DLLs may end up using + different heaps, and if you use PyMem_Malloc you'll get the memory from the + heap used by the Python DLL; it could be a disaster if you free()'ed that + directly in your own extension. Using PyMem_Free instead ensures Python + can return the memory to the proper heap. As another example, in + a debug build (Py_DEBUG macro), Python wraps all calls to all PyMem_ and + PyObject_ memory functions in special debugging wrappers that add additional + debugging info to dynamic memory blocks. The system routines have no idea + what to do with that stuff, and the Python wrappers have no idea what to do + with raw blocks obtained directly by the system routines then. + + The GIL must be held when using these APIs. +*/ + +/* + * Raw memory interface + * ==================== + */ + +/* Functions + + Functions supplying platform-independent semantics for malloc/realloc/ + free. These functions make sure that allocating 0 bytes returns a distinct + non-NULL pointer (whenever possible -- if we're flat out of memory, NULL + may be returned), even if the platform malloc and realloc don't. + Returned pointers must be checked for NULL explicitly. No action is + performed on failure (no exception is set, no warning is printed, etc). +*/ + +PyAPI_FUNC(void *) PyMem_Malloc(size_t size); +PyAPI_FUNC(void *) PyMem_Calloc(size_t nelem, size_t elsize); +PyAPI_FUNC(void *) PyMem_Realloc(void *ptr, size_t new_size); +PyAPI_FUNC(void) PyMem_Free(void *ptr); + +/* + * Type-oriented memory interface + * ============================== + * + * Allocate memory for n objects of the given type. Returns a new pointer + * or NULL if the request was too large or memory allocation failed. Use + * these macros rather than doing the multiplication yourself so that proper + * overflow checking is always done. + */ + +#define PyMem_New(type, n) \ + ( ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ + ( (type *) PyMem_Malloc((n) * sizeof(type)) ) ) + +/* + * The value of (p) is always clobbered by this macro regardless of success. + * The caller MUST check if (p) is NULL afterwards and deal with the memory + * error if so. This means the original value of (p) MUST be saved for the + * caller's memory error handler to not lose track of it. + */ +#define PyMem_Resize(p, type, n) \ + ( (p) = ((size_t)(n) > PY_SSIZE_T_MAX / sizeof(type)) ? NULL : \ + (type *) PyMem_Realloc((p), (n) * sizeof(type)) ) + + +// Deprecated aliases only kept for backward compatibility. +// PyMem_Del and PyMem_DEL are defined with no parameter to be able to use +// them as function pointers (ex: dealloc = PyMem_Del). +#define PyMem_MALLOC(n) PyMem_Malloc(n) +#define PyMem_NEW(type, n) PyMem_New(type, n) +#define PyMem_REALLOC(p, n) PyMem_Realloc(p, n) +#define PyMem_RESIZE(p, type, n) PyMem_Resize(p, type, n) +#define PyMem_FREE(p) PyMem_Free(p) +#define PyMem_Del PyMem_Free +#define PyMem_DEL PyMem_Free + + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_PYMEM_H +# include "cpython/pymem.h" +# undef Py_CPYTHON_PYMEM_H +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_PYMEM_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pyport.h b/ScriptEngine/third-party/backend/include/Python/pyport.h new file mode 100644 index 0000000000..6ab0ae4007 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pyport.h @@ -0,0 +1,889 @@ +#ifndef Py_PYPORT_H +#define Py_PYPORT_H + +#include "pyconfig.h" /* include for defines */ + +#include + + +/* Defines to build Python and its standard library: + * + * - Py_BUILD_CORE: Build Python core. Give access to Python internals, but + * should not be used by third-party modules. + * - Py_BUILD_CORE_BUILTIN: Build a Python stdlib module as a built-in module. + * - Py_BUILD_CORE_MODULE: Build a Python stdlib module as a dynamic library. + * + * Py_BUILD_CORE_BUILTIN and Py_BUILD_CORE_MODULE imply Py_BUILD_CORE. + * + * On Windows, Py_BUILD_CORE_MODULE exports "PyInit_xxx" symbol, whereas + * Py_BUILD_CORE_BUILTIN does not. + */ +#if defined(Py_BUILD_CORE_BUILTIN) && !defined(Py_BUILD_CORE) +# define Py_BUILD_CORE +#endif +#if defined(Py_BUILD_CORE_MODULE) && !defined(Py_BUILD_CORE) +# define Py_BUILD_CORE +#endif + + +/************************************************************************** +Symbols and macros to supply platform-independent interfaces to basic +C language & library operations whose spellings vary across platforms. + +Please try to make documentation here as clear as possible: by definition, +the stuff here is trying to illuminate C's darkest corners. + +Config #defines referenced here: + +SIGNED_RIGHT_SHIFT_ZERO_FILLS +Meaning: To be defined iff i>>j does not extend the sign bit when i is a + signed integral type and i < 0. +Used in: Py_ARITHMETIC_RIGHT_SHIFT + +Py_DEBUG +Meaning: Extra checks compiled in for debug mode. +Used in: Py_SAFE_DOWNCAST + +**************************************************************************/ + +/* typedefs for some C9X-defined synonyms for integral types. + * + * The names in Python are exactly the same as the C9X names, except with a + * Py_ prefix. Until C9X is universally implemented, this is the only way + * to ensure that Python gets reliable names that don't conflict with names + * in non-Python code that are playing their own tricks to define the C9X + * names. + * + * NOTE: don't go nuts here! Python has no use for *most* of the C9X + * integral synonyms. Only define the ones we actually need. + */ + +/* long long is required. Ensure HAVE_LONG_LONG is defined for compatibility. */ +#ifndef HAVE_LONG_LONG +#define HAVE_LONG_LONG 1 +#endif +#ifndef PY_LONG_LONG +#define PY_LONG_LONG long long +/* If LLONG_MAX is defined in limits.h, use that. */ +#define PY_LLONG_MIN LLONG_MIN +#define PY_LLONG_MAX LLONG_MAX +#define PY_ULLONG_MAX ULLONG_MAX +#endif + +#define PY_UINT32_T uint32_t +#define PY_UINT64_T uint64_t + +/* Signed variants of the above */ +#define PY_INT32_T int32_t +#define PY_INT64_T int64_t + +/* If PYLONG_BITS_IN_DIGIT is not defined then we'll use 30-bit digits if all + the necessary integer types are available, and we're on a 64-bit platform + (as determined by SIZEOF_VOID_P); otherwise we use 15-bit digits. */ + +#ifndef PYLONG_BITS_IN_DIGIT +#if SIZEOF_VOID_P >= 8 +#define PYLONG_BITS_IN_DIGIT 30 +#else +#define PYLONG_BITS_IN_DIGIT 15 +#endif +#endif + +/* uintptr_t is the C9X name for an unsigned integral type such that a + * legitimate void* can be cast to uintptr_t and then back to void* again + * without loss of information. Similarly for intptr_t, wrt a signed + * integral type. + */ +typedef uintptr_t Py_uintptr_t; +typedef intptr_t Py_intptr_t; + +/* Py_ssize_t is a signed integral type such that sizeof(Py_ssize_t) == + * sizeof(size_t). C99 doesn't define such a thing directly (size_t is an + * unsigned integral type). See PEP 353 for details. + */ +#ifdef HAVE_PY_SSIZE_T + +#elif HAVE_SSIZE_T +typedef ssize_t Py_ssize_t; +#elif SIZEOF_VOID_P == SIZEOF_SIZE_T +typedef Py_intptr_t Py_ssize_t; +#else +# error "Python needs a typedef for Py_ssize_t in pyport.h." +#endif + +/* Py_hash_t is the same size as a pointer. */ +#define SIZEOF_PY_HASH_T SIZEOF_SIZE_T +typedef Py_ssize_t Py_hash_t; +/* Py_uhash_t is the unsigned equivalent needed to calculate numeric hash. */ +#define SIZEOF_PY_UHASH_T SIZEOF_SIZE_T +typedef size_t Py_uhash_t; + +/* Only used for compatibility with code that may not be PY_SSIZE_T_CLEAN. */ +#ifdef PY_SSIZE_T_CLEAN +typedef Py_ssize_t Py_ssize_clean_t; +#else +typedef int Py_ssize_clean_t; +#endif + +/* Largest possible value of size_t. */ +#define PY_SIZE_MAX SIZE_MAX + +/* Largest positive value of type Py_ssize_t. */ +#define PY_SSIZE_T_MAX ((Py_ssize_t)(((size_t)-1)>>1)) +/* Smallest negative value of type Py_ssize_t. */ +#define PY_SSIZE_T_MIN (-PY_SSIZE_T_MAX-1) + +/* Macro kept for backward compatibility: use "z" in new code. + * + * PY_FORMAT_SIZE_T is a platform-specific modifier for use in a printf + * format to convert an argument with the width of a size_t or Py_ssize_t. + * C99 introduced "z" for this purpose, but old MSVCs had not supported it. + * Since MSVC supports "z" since (at least) 2015, we can just use "z" + * for new code. + * + * These "high level" Python format functions interpret "z" correctly on + * all platforms (Python interprets the format string itself, and does whatever + * the platform C requires to convert a size_t/Py_ssize_t argument): + * + * PyBytes_FromFormat + * PyErr_Format + * PyBytes_FromFormatV + * PyUnicode_FromFormatV + * + * Lower-level uses require that you interpolate the correct format modifier + * yourself (e.g., calling printf, fprintf, sprintf, PyOS_snprintf); for + * example, + * + * Py_ssize_t index; + * fprintf(stderr, "index %" PY_FORMAT_SIZE_T "d sucks\n", index); + * + * That will expand to %zd or to something else correct for a Py_ssize_t on + * the platform. + */ +#ifndef PY_FORMAT_SIZE_T +# define PY_FORMAT_SIZE_T "z" +#endif + +/* Py_LOCAL can be used instead of static to get the fastest possible calling + * convention for functions that are local to a given module. + * + * Py_LOCAL_INLINE does the same thing, and also explicitly requests inlining, + * for platforms that support that. + * + * If PY_LOCAL_AGGRESSIVE is defined before python.h is included, more + * "aggressive" inlining/optimization is enabled for the entire module. This + * may lead to code bloat, and may slow things down for those reasons. It may + * also lead to errors, if the code relies on pointer aliasing. Use with + * care. + * + * NOTE: You can only use this for functions that are entirely local to a + * module; functions that are exported via method tables, callbacks, etc, + * should keep using static. + */ + +#if defined(_MSC_VER) +# if defined(PY_LOCAL_AGGRESSIVE) + /* enable more aggressive optimization for MSVC */ + /* active in both release and debug builds - see bpo-43271 */ +# pragma optimize("gt", on) +#endif + /* ignore warnings if the compiler decides not to inline a function */ +# pragma warning(disable: 4710) + /* fastest possible local call under MSVC */ +# define Py_LOCAL(type) static type __fastcall +# define Py_LOCAL_INLINE(type) static __inline type __fastcall +#else +# define Py_LOCAL(type) static type +# define Py_LOCAL_INLINE(type) static inline type +#endif + +/* Py_MEMCPY is kept for backwards compatibility, + * see https://bugs.python.org/issue28126 */ +#define Py_MEMCPY memcpy + +#include + +#ifdef HAVE_IEEEFP_H +#include /* needed for 'finite' declaration on some platforms */ +#endif + +#include /* Moved here from the math section, before extern "C" */ + +/******************************************** + * WRAPPER FOR and/or * + ********************************************/ + +#ifdef TIME_WITH_SYS_TIME +#include +#include +#else /* !TIME_WITH_SYS_TIME */ +#ifdef HAVE_SYS_TIME_H +#include +#else /* !HAVE_SYS_TIME_H */ +#include +#endif /* !HAVE_SYS_TIME_H */ +#endif /* !TIME_WITH_SYS_TIME */ + + +/****************************** + * WRAPPER FOR * + ******************************/ + +/* NB caller must include */ + +#ifdef HAVE_SYS_SELECT_H +#include +#endif /* !HAVE_SYS_SELECT_H */ + +/******************************* + * stat() and fstat() fiddling * + *******************************/ + +#ifdef HAVE_SYS_STAT_H +#include +#elif defined(HAVE_STAT_H) +#include +#endif + +#ifndef S_IFMT +/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */ +#define S_IFMT 0170000 +#endif + +#ifndef S_IFLNK +/* Windows doesn't define S_IFLNK but posixmodule.c maps + * IO_REPARSE_TAG_SYMLINK to S_IFLNK */ +# define S_IFLNK 0120000 +#endif + +#ifndef S_ISREG +#define S_ISREG(x) (((x) & S_IFMT) == S_IFREG) +#endif + +#ifndef S_ISDIR +#define S_ISDIR(x) (((x) & S_IFMT) == S_IFDIR) +#endif + +#ifndef S_ISCHR +#define S_ISCHR(x) (((x) & S_IFMT) == S_IFCHR) +#endif + +#ifdef __cplusplus +/* Move this down here since some C++ #include's don't like to be included + inside an extern "C" */ +extern "C" { +#endif + + +/* Py_ARITHMETIC_RIGHT_SHIFT + * C doesn't define whether a right-shift of a signed integer sign-extends + * or zero-fills. Here a macro to force sign extension: + * Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) + * Return I >> J, forcing sign extension. Arithmetically, return the + * floor of I/2**J. + * Requirements: + * I should have signed integer type. In the terminology of C99, this can + * be either one of the five standard signed integer types (signed char, + * short, int, long, long long) or an extended signed integer type. + * J is an integer >= 0 and strictly less than the number of bits in the + * type of I (because C doesn't define what happens for J outside that + * range either). + * TYPE used to specify the type of I, but is now ignored. It's been left + * in for backwards compatibility with versions <= 2.6 or 3.0. + * Caution: + * I may be evaluated more than once. + */ +#ifdef SIGNED_RIGHT_SHIFT_ZERO_FILLS +#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) \ + ((I) < 0 ? -1-((-1-(I)) >> (J)) : (I) >> (J)) +#else +#define Py_ARITHMETIC_RIGHT_SHIFT(TYPE, I, J) ((I) >> (J)) +#endif + +/* Py_FORCE_EXPANSION(X) + * "Simply" returns its argument. However, macro expansions within the + * argument are evaluated. This unfortunate trickery is needed to get + * token-pasting to work as desired in some cases. + */ +#define Py_FORCE_EXPANSION(X) X + +/* Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) + * Cast VALUE to type NARROW from type WIDE. In Py_DEBUG mode, this + * assert-fails if any information is lost. + * Caution: + * VALUE may be evaluated more than once. + */ +#ifdef Py_DEBUG +#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) \ + (assert((WIDE)(NARROW)(VALUE) == (VALUE)), (NARROW)(VALUE)) +#else +#define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE) +#endif + +/* Py_SET_ERRNO_ON_MATH_ERROR(x) + * If a libm function did not set errno, but it looks like the result + * overflowed or not-a-number, set errno to ERANGE or EDOM. Set errno + * to 0 before calling a libm function, and invoke this macro after, + * passing the function result. + * Caution: + * This isn't reliable. See Py_OVERFLOWED comments. + * X is evaluated more than once. + */ +#if defined(__FreeBSD__) || defined(__OpenBSD__) || (defined(__hpux) && defined(__ia64)) +#define _Py_SET_EDOM_FOR_NAN(X) if (isnan(X)) errno = EDOM; +#else +#define _Py_SET_EDOM_FOR_NAN(X) ; +#endif +#define Py_SET_ERRNO_ON_MATH_ERROR(X) \ + do { \ + if (errno == 0) { \ + if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ + errno = ERANGE; \ + else _Py_SET_EDOM_FOR_NAN(X) \ + } \ + } while(0) + +/* Py_SET_ERANGE_IF_OVERFLOW(x) + * An alias of Py_SET_ERRNO_ON_MATH_ERROR for backward-compatibility. + */ +#define Py_SET_ERANGE_IF_OVERFLOW(X) Py_SET_ERRNO_ON_MATH_ERROR(X) + +/* Py_ADJUST_ERANGE1(x) + * Py_ADJUST_ERANGE2(x, y) + * Set errno to 0 before calling a libm function, and invoke one of these + * macros after, passing the function result(s) (Py_ADJUST_ERANGE2 is useful + * for functions returning complex results). This makes two kinds of + * adjustments to errno: (A) If it looks like the platform libm set + * errno=ERANGE due to underflow, clear errno. (B) If it looks like the + * platform libm overflowed but didn't set errno, force errno to ERANGE. In + * effect, we're trying to force a useful implementation of C89 errno + * behavior. + * Caution: + * This isn't reliable. See Py_OVERFLOWED comments. + * X and Y may be evaluated more than once. + */ +#define Py_ADJUST_ERANGE1(X) \ + do { \ + if (errno == 0) { \ + if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL) \ + errno = ERANGE; \ + } \ + else if (errno == ERANGE && (X) == 0.0) \ + errno = 0; \ + } while(0) + +#define Py_ADJUST_ERANGE2(X, Y) \ + do { \ + if ((X) == Py_HUGE_VAL || (X) == -Py_HUGE_VAL || \ + (Y) == Py_HUGE_VAL || (Y) == -Py_HUGE_VAL) { \ + if (errno == 0) \ + errno = ERANGE; \ + } \ + else if (errno == ERANGE) \ + errno = 0; \ + } while(0) + +/* The functions _Py_dg_strtod and _Py_dg_dtoa in Python/dtoa.c (which are + * required to support the short float repr introduced in Python 3.1) require + * that the floating-point unit that's being used for arithmetic operations + * on C doubles is set to use 53-bit precision. It also requires that the + * FPU rounding mode is round-half-to-even, but that's less often an issue. + * + * If your FPU isn't already set to 53-bit precision/round-half-to-even, and + * you want to make use of _Py_dg_strtod and _Py_dg_dtoa, then you should + * + * #define HAVE_PY_SET_53BIT_PRECISION 1 + * + * and also give appropriate definitions for the following three macros: + * + * _PY_SET_53BIT_PRECISION_START : store original FPU settings, and + * set FPU to 53-bit precision/round-half-to-even + * _PY_SET_53BIT_PRECISION_END : restore original FPU settings + * _PY_SET_53BIT_PRECISION_HEADER : any variable declarations needed to + * use the two macros above. + * + * The macros are designed to be used within a single C function: see + * Python/pystrtod.c for an example of their use. + */ + +/* get and set x87 control word for gcc/x86 */ +#ifdef HAVE_GCC_ASM_FOR_X87 +#define HAVE_PY_SET_53BIT_PRECISION 1 +/* _Py_get/set_387controlword functions are defined in Python/pymath.c */ +#define _Py_SET_53BIT_PRECISION_HEADER \ + unsigned short old_387controlword, new_387controlword +#define _Py_SET_53BIT_PRECISION_START \ + do { \ + old_387controlword = _Py_get_387controlword(); \ + new_387controlword = (old_387controlword & ~0x0f00) | 0x0200; \ + if (new_387controlword != old_387controlword) \ + _Py_set_387controlword(new_387controlword); \ + } while (0) +#define _Py_SET_53BIT_PRECISION_END \ + if (new_387controlword != old_387controlword) \ + _Py_set_387controlword(old_387controlword) +#endif + +/* get and set x87 control word for VisualStudio/x86 */ +#if defined(_MSC_VER) && !defined(_WIN64) && !defined(_M_ARM) /* x87 not supported in 64-bit or ARM */ +#define HAVE_PY_SET_53BIT_PRECISION 1 +#define _Py_SET_53BIT_PRECISION_HEADER \ + unsigned int old_387controlword, new_387controlword, out_387controlword +/* We use the __control87_2 function to set only the x87 control word. + The SSE control word is unaffected. */ +#define _Py_SET_53BIT_PRECISION_START \ + do { \ + __control87_2(0, 0, &old_387controlword, NULL); \ + new_387controlword = \ + (old_387controlword & ~(_MCW_PC | _MCW_RC)) | (_PC_53 | _RC_NEAR); \ + if (new_387controlword != old_387controlword) \ + __control87_2(new_387controlword, _MCW_PC | _MCW_RC, \ + &out_387controlword, NULL); \ + } while (0) +#define _Py_SET_53BIT_PRECISION_END \ + do { \ + if (new_387controlword != old_387controlword) \ + __control87_2(old_387controlword, _MCW_PC | _MCW_RC, \ + &out_387controlword, NULL); \ + } while (0) +#endif + +#ifdef HAVE_GCC_ASM_FOR_MC68881 +#define HAVE_PY_SET_53BIT_PRECISION 1 +#define _Py_SET_53BIT_PRECISION_HEADER \ + unsigned int old_fpcr, new_fpcr +#define _Py_SET_53BIT_PRECISION_START \ + do { \ + __asm__ ("fmove.l %%fpcr,%0" : "=g" (old_fpcr)); \ + /* Set double precision / round to nearest. */ \ + new_fpcr = (old_fpcr & ~0xf0) | 0x80; \ + if (new_fpcr != old_fpcr) \ + __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (new_fpcr)); \ + } while (0) +#define _Py_SET_53BIT_PRECISION_END \ + do { \ + if (new_fpcr != old_fpcr) \ + __asm__ volatile ("fmove.l %0,%%fpcr" : : "g" (old_fpcr)); \ + } while (0) +#endif + +/* default definitions are empty */ +#ifndef HAVE_PY_SET_53BIT_PRECISION +#define _Py_SET_53BIT_PRECISION_HEADER +#define _Py_SET_53BIT_PRECISION_START +#define _Py_SET_53BIT_PRECISION_END +#endif + +/* If we can't guarantee 53-bit precision, don't use the code + in Python/dtoa.c, but fall back to standard code. This + means that repr of a float will be long (17 sig digits). + + Realistically, there are two things that could go wrong: + + (1) doubles aren't IEEE 754 doubles, or + (2) we're on x86 with the rounding precision set to 64-bits + (extended precision), and we don't know how to change + the rounding precision. + */ + +#if !defined(DOUBLE_IS_LITTLE_ENDIAN_IEEE754) && \ + !defined(DOUBLE_IS_BIG_ENDIAN_IEEE754) && \ + !defined(DOUBLE_IS_ARM_MIXED_ENDIAN_IEEE754) +#define PY_NO_SHORT_FLOAT_REPR +#endif + +/* double rounding is symptomatic of use of extended precision on x86. If + we're seeing double rounding, and we don't have any mechanism available for + changing the FPU rounding precision, then don't use Python/dtoa.c. */ +#if defined(X87_DOUBLE_ROUNDING) && !defined(HAVE_PY_SET_53BIT_PRECISION) +#define PY_NO_SHORT_FLOAT_REPR +#endif + + +/* Py_DEPRECATED(version) + * Declare a variable, type, or function deprecated. + * The macro must be placed before the declaration. + * Usage: + * Py_DEPRECATED(3.3) extern int old_var; + * Py_DEPRECATED(3.4) typedef int T1; + * Py_DEPRECATED(3.8) PyAPI_FUNC(int) Py_OldFunction(void); + */ +#if defined(__GNUC__) \ + && ((__GNUC__ >= 4) || (__GNUC__ == 3) && (__GNUC_MINOR__ >= 1)) +#define Py_DEPRECATED(VERSION_UNUSED) __attribute__((__deprecated__)) +#elif defined(_MSC_VER) +#define Py_DEPRECATED(VERSION) __declspec(deprecated( \ + "deprecated in " #VERSION)) +#else +#define Py_DEPRECATED(VERSION_UNUSED) +#endif + +#if defined(__clang__) +#define _Py_COMP_DIAG_PUSH _Pragma("clang diagnostic push") +#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \ + _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"") +#define _Py_COMP_DIAG_POP _Pragma("clang diagnostic pop") +#elif defined(__GNUC__) \ + && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 6)) +#define _Py_COMP_DIAG_PUSH _Pragma("GCC diagnostic push") +#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS \ + _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") +#define _Py_COMP_DIAG_POP _Pragma("GCC diagnostic pop") +#elif defined(_MSC_VER) +#define _Py_COMP_DIAG_PUSH __pragma(warning(push)) +#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS __pragma(warning(disable: 4996)) +#define _Py_COMP_DIAG_POP __pragma(warning(pop)) +#else +#define _Py_COMP_DIAG_PUSH +#define _Py_COMP_DIAG_IGNORE_DEPR_DECLS +#define _Py_COMP_DIAG_POP +#endif + +/* _Py_HOT_FUNCTION + * The hot attribute on a function is used to inform the compiler that the + * function is a hot spot of the compiled program. The function is optimized + * more aggressively and on many target it is placed into special subsection of + * the text section so all hot functions appears close together improving + * locality. + * + * Usage: + * int _Py_HOT_FUNCTION x(void) { return 3; } + * + * Issue #28618: This attribute must not be abused, otherwise it can have a + * negative effect on performance. Only the functions were Python spend most of + * its time must use it. Use a profiler when running performance benchmark + * suite to find these functions. + */ +#if defined(__GNUC__) \ + && ((__GNUC__ >= 5) || (__GNUC__ == 4) && (__GNUC_MINOR__ >= 3)) +#define _Py_HOT_FUNCTION __attribute__((hot)) +#else +#define _Py_HOT_FUNCTION +#endif + +/* _Py_NO_INLINE + * Disable inlining on a function. For example, it helps to reduce the C stack + * consumption. + * + * Usage: + * int _Py_NO_INLINE x(void) { return 3; } + */ +#if defined(_MSC_VER) +# define _Py_NO_INLINE __declspec(noinline) +#elif defined(__GNUC__) || defined(__clang__) +# define _Py_NO_INLINE __attribute__ ((noinline)) +#else +# define _Py_NO_INLINE +#endif + +/************************************************************************** +Prototypes that are missing from the standard include files on some systems +(and possibly only some versions of such systems.) + +Please be conservative with adding new ones, document them and enclose them +in platform-specific #ifdefs. +**************************************************************************/ + +#ifdef SOLARIS +/* Unchecked */ +extern int gethostname(char *, int); +#endif + +#ifdef HAVE__GETPTY +#include /* we need to import mode_t */ +extern char * _getpty(int *, int, mode_t, int); +#endif + +/* On QNX 6, struct termio must be declared by including sys/termio.h + if TCGETA, TCSETA, TCSETAW, or TCSETAF are used. sys/termio.h must + be included before termios.h or it will generate an error. */ +#if defined(HAVE_SYS_TERMIO_H) && !defined(__hpux) +#include +#endif + + +/* On 4.4BSD-descendants, ctype functions serves the whole range of + * wchar_t character set rather than single byte code points only. + * This characteristic can break some operations of string object + * including str.upper() and str.split() on UTF-8 locales. This + * workaround was provided by Tim Robbins of FreeBSD project. + */ + +#if defined(__APPLE__) +# define _PY_PORT_CTYPE_UTF8_ISSUE +#endif + +#ifdef _PY_PORT_CTYPE_UTF8_ISSUE +#ifndef __cplusplus + /* The workaround below is unsafe in C++ because + * the defines these symbols as real functions, + * with a slightly different signature. + * See issue #10910 + */ +#include +#include +#undef isalnum +#define isalnum(c) iswalnum(btowc(c)) +#undef isalpha +#define isalpha(c) iswalpha(btowc(c)) +#undef islower +#define islower(c) iswlower(btowc(c)) +#undef isspace +#define isspace(c) iswspace(btowc(c)) +#undef isupper +#define isupper(c) iswupper(btowc(c)) +#undef tolower +#define tolower(c) towlower(btowc(c)) +#undef toupper +#define toupper(c) towupper(btowc(c)) +#endif +#endif + + +/* Declarations for symbol visibility. + + PyAPI_FUNC(type): Declares a public Python API function and return type + PyAPI_DATA(type): Declares public Python data and its type + PyMODINIT_FUNC: A Python module init function. If these functions are + inside the Python core, they are private to the core. + If in an extension module, it may be declared with + external linkage depending on the platform. + + As a number of platforms support/require "__declspec(dllimport/dllexport)", + we support a HAVE_DECLSPEC_DLL macro to save duplication. +*/ + +/* + All windows ports, except cygwin, are handled in PC/pyconfig.h. + + Cygwin is the only other autoconf platform requiring special + linkage handling and it uses __declspec(). +*/ +#if defined(__CYGWIN__) +# define HAVE_DECLSPEC_DLL +#endif + +#include "exports.h" + +/* only get special linkage if built as shared or platform is Cygwin */ +#if defined(Py_ENABLE_SHARED) || defined(__CYGWIN__) +# if defined(HAVE_DECLSPEC_DLL) +# if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) +# define PyAPI_FUNC(RTYPE) Py_EXPORTED_SYMBOL RTYPE +# define PyAPI_DATA(RTYPE) extern Py_EXPORTED_SYMBOL RTYPE + /* module init functions inside the core need no external linkage */ + /* except for Cygwin to handle embedding */ +# if defined(__CYGWIN__) +# define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject* +# else /* __CYGWIN__ */ +# define PyMODINIT_FUNC PyObject* +# endif /* __CYGWIN__ */ +# else /* Py_BUILD_CORE */ + /* Building an extension module, or an embedded situation */ + /* public Python functions and data are imported */ + /* Under Cygwin, auto-import functions to prevent compilation */ + /* failures similar to those described at the bottom of 4.1: */ + /* http://docs.python.org/extending/windows.html#a-cookbook-approach */ +# if !defined(__CYGWIN__) +# define PyAPI_FUNC(RTYPE) Py_IMPORTED_SYMBOL RTYPE +# endif /* !__CYGWIN__ */ +# define PyAPI_DATA(RTYPE) extern Py_IMPORTED_SYMBOL RTYPE + /* module init functions outside the core must be exported */ +# if defined(__cplusplus) +# define PyMODINIT_FUNC extern "C" Py_EXPORTED_SYMBOL PyObject* +# else /* __cplusplus */ +# define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject* +# endif /* __cplusplus */ +# endif /* Py_BUILD_CORE */ +# endif /* HAVE_DECLSPEC_DLL */ +#endif /* Py_ENABLE_SHARED */ + +/* If no external linkage macros defined by now, create defaults */ +#ifndef PyAPI_FUNC +# define PyAPI_FUNC(RTYPE) Py_EXPORTED_SYMBOL RTYPE +#endif +#ifndef PyAPI_DATA +# define PyAPI_DATA(RTYPE) extern Py_EXPORTED_SYMBOL RTYPE +#endif +#ifndef PyMODINIT_FUNC +# if defined(__cplusplus) +# define PyMODINIT_FUNC extern "C" Py_EXPORTED_SYMBOL PyObject* +# else /* __cplusplus */ +# define PyMODINIT_FUNC Py_EXPORTED_SYMBOL PyObject* +# endif /* __cplusplus */ +#endif + +/* limits.h constants that may be missing */ + +#ifndef INT_MAX +#define INT_MAX 2147483647 +#endif + +#ifndef LONG_MAX +#if SIZEOF_LONG == 4 +#define LONG_MAX 0X7FFFFFFFL +#elif SIZEOF_LONG == 8 +#define LONG_MAX 0X7FFFFFFFFFFFFFFFL +#else +#error "could not set LONG_MAX in pyport.h" +#endif +#endif + +#ifndef LONG_MIN +#define LONG_MIN (-LONG_MAX-1) +#endif + +#ifndef LONG_BIT +#define LONG_BIT (8 * SIZEOF_LONG) +#endif + +#if LONG_BIT != 8 * SIZEOF_LONG +/* 04-Oct-2000 LONG_BIT is apparently (mis)defined as 64 on some recent + * 32-bit platforms using gcc. We try to catch that here at compile-time + * rather than waiting for integer multiplication to trigger bogus + * overflows. + */ +#error "LONG_BIT definition appears wrong for platform (bad gcc/glibc config?)." +#endif + +#ifdef __cplusplus +} +#endif + +/* + * Hide GCC attributes from compilers that don't support them. + */ +#if (!defined(__GNUC__) || __GNUC__ < 2 || \ + (__GNUC__ == 2 && __GNUC_MINOR__ < 7) ) +#define Py_GCC_ATTRIBUTE(x) +#else +#define Py_GCC_ATTRIBUTE(x) __attribute__(x) +#endif + +/* + * Specify alignment on compilers that support it. + */ +#if defined(__GNUC__) && __GNUC__ >= 3 +#define Py_ALIGNED(x) __attribute__((aligned(x))) +#else +#define Py_ALIGNED(x) +#endif + +/* Eliminate end-of-loop code not reached warnings from SunPro C + * when using do{...}while(0) macros + */ +#ifdef __SUNPRO_C +#pragma error_messages (off,E_END_OF_LOOP_CODE_NOT_REACHED) +#endif + +#ifndef Py_LL +#define Py_LL(x) x##LL +#endif + +#ifndef Py_ULL +#define Py_ULL(x) Py_LL(x##U) +#endif + +#define Py_VA_COPY va_copy + +/* + * Convenient macros to deal with endianness of the platform. WORDS_BIGENDIAN is + * detected by configure and defined in pyconfig.h. The code in pyconfig.h + * also takes care of Apple's universal builds. + */ + +#ifdef WORDS_BIGENDIAN +# define PY_BIG_ENDIAN 1 +# define PY_LITTLE_ENDIAN 0 +#else +# define PY_BIG_ENDIAN 0 +# define PY_LITTLE_ENDIAN 1 +#endif + +#ifdef Py_BUILD_CORE +/* + * Macros to protect CRT calls against instant termination when passed an + * invalid parameter (issue23524). + */ +#if defined _MSC_VER && _MSC_VER >= 1900 + +extern _invalid_parameter_handler _Py_silent_invalid_parameter_handler; +#define _Py_BEGIN_SUPPRESS_IPH { _invalid_parameter_handler _Py_old_handler = \ + _set_thread_local_invalid_parameter_handler(_Py_silent_invalid_parameter_handler); +#define _Py_END_SUPPRESS_IPH _set_thread_local_invalid_parameter_handler(_Py_old_handler); } + +#else + +#define _Py_BEGIN_SUPPRESS_IPH +#define _Py_END_SUPPRESS_IPH + +#endif /* _MSC_VER >= 1900 */ +#endif /* Py_BUILD_CORE */ + +#ifdef __ANDROID__ + /* The Android langinfo.h header is not used. */ +# undef HAVE_LANGINFO_H +# undef CODESET +#endif + +/* Maximum value of the Windows DWORD type */ +#define PY_DWORD_MAX 4294967295U + +/* This macro used to tell whether Python was built with multithreading + * enabled. Now multithreading is always enabled, but keep the macro + * for compatibility. + */ +#ifndef WITH_THREAD +# define WITH_THREAD +#endif + +/* Check that ALT_SOABI is consistent with Py_TRACE_REFS: + ./configure --with-trace-refs should must be used to define Py_TRACE_REFS */ +#if defined(ALT_SOABI) && defined(Py_TRACE_REFS) +# error "Py_TRACE_REFS ABI is not compatible with release and debug ABI" +#endif + +#if defined(__ANDROID__) || defined(__VXWORKS__) + // Use UTF-8 as the locale encoding, ignore the LC_CTYPE locale. + // See _Py_GetLocaleEncoding(), PyUnicode_DecodeLocale() + // and PyUnicode_EncodeLocale(). +# define _Py_FORCE_UTF8_LOCALE +#endif + +#if defined(_Py_FORCE_UTF8_LOCALE) || defined(__APPLE__) + // Use UTF-8 as the filesystem encoding. + // See PyUnicode_DecodeFSDefaultAndSize(), PyUnicode_EncodeFSDefault(), + // Py_DecodeLocale() and Py_EncodeLocale(). +# define _Py_FORCE_UTF8_FS_ENCODING +#endif + +/* Mark a function which cannot return. Example: + PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void); + + XLC support is intentionally omitted due to bpo-40244 */ +#ifndef _Py_NO_RETURN +#if defined(__clang__) || \ + (defined(__GNUC__) && \ + ((__GNUC__ >= 3) || \ + (__GNUC__ == 2) && (__GNUC_MINOR__ >= 5))) +# define _Py_NO_RETURN __attribute__((__noreturn__)) +#elif defined(_MSC_VER) +# define _Py_NO_RETURN __declspec(noreturn) +#else +# define _Py_NO_RETURN +#endif +#endif + + +// Preprocessor check for a builtin preprocessor function. Always return 0 +// if __has_builtin() macro is not defined. +// +// __has_builtin() is available on clang and GCC 10. +#ifdef __has_builtin +# define _Py__has_builtin(x) __has_builtin(x) +#else +# define _Py__has_builtin(x) 0 +#endif + + +#endif /* Py_PYPORT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pystate.h b/ScriptEngine/third-party/backend/include/Python/pystate.h new file mode 100644 index 0000000000..bae440778b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pystate.h @@ -0,0 +1,150 @@ +/* Thread and interpreter state structures and their interfaces */ + + +#ifndef Py_PYSTATE_H +#define Py_PYSTATE_H +#ifdef __cplusplus +extern "C" { +#endif + +/* This limitation is for performance and simplicity. If needed it can be +removed (with effort). */ +#define MAX_CO_EXTRA_USERS 255 + +/* Forward declarations for PyFrameObject, PyThreadState + and PyInterpreterState */ +struct _ts; +struct _is; + +/* struct _ts is defined in cpython/pystate.h */ +typedef struct _ts PyThreadState; +/* struct _is is defined in internal/pycore_interp.h */ +typedef struct _is PyInterpreterState; + +PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_New(void); +PyAPI_FUNC(void) PyInterpreterState_Clear(PyInterpreterState *); +PyAPI_FUNC(void) PyInterpreterState_Delete(PyInterpreterState *); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +/* New in 3.9 */ +/* Get the current interpreter state. + + Issue a fatal error if there no current Python thread state or no current + interpreter. It cannot return NULL. + + The caller must hold the GIL. */ +PyAPI_FUNC(PyInterpreterState *) PyInterpreterState_Get(void); +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03080000 +/* New in 3.8 */ +PyAPI_FUNC(PyObject *) PyInterpreterState_GetDict(PyInterpreterState *); +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000 +/* New in 3.7 */ +PyAPI_FUNC(int64_t) PyInterpreterState_GetID(PyInterpreterState *); +#endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 + +/* State unique per thread */ + +/* New in 3.3 */ +PyAPI_FUNC(int) PyState_AddModule(PyObject*, struct PyModuleDef*); +PyAPI_FUNC(int) PyState_RemoveModule(struct PyModuleDef*); +#endif +PyAPI_FUNC(PyObject*) PyState_FindModule(struct PyModuleDef*); + +PyAPI_FUNC(PyThreadState *) PyThreadState_New(PyInterpreterState *); +PyAPI_FUNC(void) PyThreadState_Clear(PyThreadState *); +PyAPI_FUNC(void) PyThreadState_Delete(PyThreadState *); + +/* Get the current thread state. + + When the current thread state is NULL, this issues a fatal error (so that + the caller needn't check for NULL). + + The caller must hold the GIL. + + See also PyThreadState_GET() and _PyThreadState_GET(). */ +PyAPI_FUNC(PyThreadState *) PyThreadState_Get(void); + +/* Get the current Python thread state. + + Macro using PyThreadState_Get() or _PyThreadState_GET() depending if + pycore_pystate.h is included or not (this header redefines the macro). + + If PyThreadState_Get() is used, issue a fatal error if the current thread + state is NULL. + + See also PyThreadState_Get() and _PyThreadState_GET(). */ +#define PyThreadState_GET() PyThreadState_Get() + +PyAPI_FUNC(PyThreadState *) PyThreadState_Swap(PyThreadState *); +PyAPI_FUNC(PyObject *) PyThreadState_GetDict(void); +PyAPI_FUNC(int) PyThreadState_SetAsyncExc(unsigned long, PyObject *); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03090000 +/* New in 3.9 */ +PyAPI_FUNC(PyInterpreterState*) PyThreadState_GetInterpreter(PyThreadState *tstate); +PyAPI_FUNC(PyFrameObject*) PyThreadState_GetFrame(PyThreadState *tstate); +PyAPI_FUNC(uint64_t) PyThreadState_GetID(PyThreadState *tstate); +#endif + +typedef + enum {PyGILState_LOCKED, PyGILState_UNLOCKED} + PyGILState_STATE; + + +/* Ensure that the current thread is ready to call the Python + C API, regardless of the current state of Python, or of its + thread lock. This may be called as many times as desired + by a thread so long as each call is matched with a call to + PyGILState_Release(). In general, other thread-state APIs may + be used between _Ensure() and _Release() calls, so long as the + thread-state is restored to its previous state before the Release(). + For example, normal use of the Py_BEGIN_ALLOW_THREADS/ + Py_END_ALLOW_THREADS macros are acceptable. + + The return value is an opaque "handle" to the thread state when + PyGILState_Ensure() was called, and must be passed to + PyGILState_Release() to ensure Python is left in the same state. Even + though recursive calls are allowed, these handles can *not* be shared - + each unique call to PyGILState_Ensure must save the handle for its + call to PyGILState_Release. + + When the function returns, the current thread will hold the GIL. + + Failure is a fatal error. +*/ +PyAPI_FUNC(PyGILState_STATE) PyGILState_Ensure(void); + +/* Release any resources previously acquired. After this call, Python's + state will be the same as it was prior to the corresponding + PyGILState_Ensure() call (but generally this state will be unknown to + the caller, hence the use of the GILState API.) + + Every call to PyGILState_Ensure must be matched by a call to + PyGILState_Release on the same thread. +*/ +PyAPI_FUNC(void) PyGILState_Release(PyGILState_STATE); + +/* Helper/diagnostic function - get the current thread state for + this thread. May return NULL if no GILState API has been used + on the current thread. Note that the main thread always has such a + thread-state, even if no auto-thread-state call has been made + on the main thread. +*/ +PyAPI_FUNC(PyThreadState *) PyGILState_GetThisThreadState(void); + + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_PYSTATE_H +# include "cpython/pystate.h" +# undef Py_CPYTHON_PYSTATE_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_PYSTATE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pystrcmp.h b/ScriptEngine/third-party/backend/include/Python/pystrcmp.h new file mode 100644 index 0000000000..edb12397e3 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pystrcmp.h @@ -0,0 +1,23 @@ +#ifndef Py_STRCMP_H +#define Py_STRCMP_H + +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(int) PyOS_mystrnicmp(const char *, const char *, Py_ssize_t); +PyAPI_FUNC(int) PyOS_mystricmp(const char *, const char *); + +#ifdef MS_WINDOWS +#define PyOS_strnicmp strnicmp +#define PyOS_stricmp stricmp +#else +#define PyOS_strnicmp PyOS_mystrnicmp +#define PyOS_stricmp PyOS_mystricmp +#endif + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_STRCMP_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pystrhex.h b/ScriptEngine/third-party/backend/include/Python/pystrhex.h new file mode 100644 index 0000000000..a4f36305ba --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pystrhex.h @@ -0,0 +1,22 @@ +#ifndef Py_STRHEX_H +#define Py_STRHEX_H + +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +/* Returns a str() containing the hex representation of argbuf. */ +PyAPI_FUNC(PyObject*) _Py_strhex(const char* argbuf, const Py_ssize_t arglen); +/* Returns a bytes() containing the ASCII hex representation of argbuf. */ +PyAPI_FUNC(PyObject*) _Py_strhex_bytes(const char* argbuf, const Py_ssize_t arglen); +/* These variants include support for a separator between every N bytes: */ +PyAPI_FUNC(PyObject*) _Py_strhex_with_sep(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, const int bytes_per_group); +PyAPI_FUNC(PyObject*) _Py_strhex_bytes_with_sep(const char* argbuf, const Py_ssize_t arglen, const PyObject* sep, const int bytes_per_group); +#endif /* !Py_LIMITED_API */ + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_STRHEX_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pystrtod.h b/ScriptEngine/third-party/backend/include/Python/pystrtod.h new file mode 100644 index 0000000000..c1e84de6fe --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pystrtod.h @@ -0,0 +1,45 @@ +#ifndef Py_STRTOD_H +#define Py_STRTOD_H + +#ifdef __cplusplus +extern "C" { +#endif + + +PyAPI_FUNC(double) PyOS_string_to_double(const char *str, + char **endptr, + PyObject *overflow_exception); + +/* The caller is responsible for calling PyMem_Free to free the buffer + that's is returned. */ +PyAPI_FUNC(char *) PyOS_double_to_string(double val, + char format_code, + int precision, + int flags, + int *type); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _Py_string_to_number_with_underscores( + const char *str, Py_ssize_t len, const char *what, PyObject *obj, void *arg, + PyObject *(*innerfunc)(const char *, Py_ssize_t, void *)); + +PyAPI_FUNC(double) _Py_parse_inf_or_nan(const char *p, char **endptr); +#endif + + +/* PyOS_double_to_string's "flags" parameter can be set to 0 or more of: */ +#define Py_DTSF_SIGN 0x01 /* always add the sign */ +#define Py_DTSF_ADD_DOT_0 0x02 /* if the result is an integer add ".0" */ +#define Py_DTSF_ALT 0x04 /* "alternate" formatting. it's format_code + specific */ + +/* PyOS_double_to_string's "type", if non-NULL, will be set to one of: */ +#define Py_DTST_FINITE 0 +#define Py_DTST_INFINITE 1 +#define Py_DTST_NAN 2 + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_STRTOD_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pythonrun.h b/ScriptEngine/third-party/backend/include/Python/pythonrun.h new file mode 100644 index 0000000000..b0a2fc3002 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pythonrun.h @@ -0,0 +1,44 @@ + +/* Interfaces to parse and execute pieces of python code */ + +#ifndef Py_PYTHONRUN_H +#define Py_PYTHONRUN_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(PyObject *) Py_CompileString(const char *, const char *, int); + +PyAPI_FUNC(void) PyErr_Print(void); +PyAPI_FUNC(void) PyErr_PrintEx(int); +PyAPI_FUNC(void) PyErr_Display(PyObject *, PyObject *, PyObject *); + + +/* Stuff with no proper home (yet) */ +PyAPI_DATA(int) (*PyOS_InputHook)(void); + +/* Stack size, in "pointers" (so we get extra safety margins + on 64-bit platforms). On a 32-bit platform, this translates + to an 8k margin. */ +#define PYOS_STACK_MARGIN 2048 + +#if defined(WIN32) && !defined(MS_WIN64) && !defined(_M_ARM) && defined(_MSC_VER) && _MSC_VER >= 1300 +/* Enable stack checking under Microsoft C */ +#define USE_STACKCHECK +#endif + +#ifdef USE_STACKCHECK +/* Check that we aren't overflowing our stack */ +PyAPI_FUNC(int) PyOS_CheckStack(void); +#endif + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_PYTHONRUN_H +# include "cpython/pythonrun.h" +# undef Py_CPYTHON_PYTHONRUN_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_PYTHONRUN_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/pythread.h b/ScriptEngine/third-party/backend/include/Python/pythread.h new file mode 100644 index 0000000000..bb9d864122 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/pythread.h @@ -0,0 +1,169 @@ + +#ifndef Py_PYTHREAD_H +#define Py_PYTHREAD_H + +typedef void *PyThread_type_lock; + +#ifdef __cplusplus +extern "C" { +#endif + +/* Return status codes for Python lock acquisition. Chosen for maximum + * backwards compatibility, ie failure -> 0, success -> 1. */ +typedef enum PyLockStatus { + PY_LOCK_FAILURE = 0, + PY_LOCK_ACQUIRED = 1, + PY_LOCK_INTR +} PyLockStatus; + +#ifndef Py_LIMITED_API +#define PYTHREAD_INVALID_THREAD_ID ((unsigned long)-1) +#endif + +PyAPI_FUNC(void) PyThread_init_thread(void); +PyAPI_FUNC(unsigned long) PyThread_start_new_thread(void (*)(void *), void *); +PyAPI_FUNC(void) _Py_NO_RETURN PyThread_exit_thread(void); +PyAPI_FUNC(unsigned long) PyThread_get_thread_ident(void); + +#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(_WIN32) || defined(_AIX) +#define PY_HAVE_THREAD_NATIVE_ID +PyAPI_FUNC(unsigned long) PyThread_get_thread_native_id(void); +#endif + +PyAPI_FUNC(PyThread_type_lock) PyThread_allocate_lock(void); +PyAPI_FUNC(void) PyThread_free_lock(PyThread_type_lock); +PyAPI_FUNC(int) PyThread_acquire_lock(PyThread_type_lock, int); +#define WAIT_LOCK 1 +#define NOWAIT_LOCK 0 + +#ifndef Py_LIMITED_API +#ifdef HAVE_FORK +/* Private function to reinitialize a lock at fork in the child process. + Reset the lock to the unlocked state. + Return 0 on success, return -1 on error. */ +PyAPI_FUNC(int) _PyThread_at_fork_reinit(PyThread_type_lock *lock); +#endif /* HAVE_FORK */ +#endif /* !Py_LIMITED_API */ + +/* PY_TIMEOUT_T is the integral type used to specify timeouts when waiting + on a lock (see PyThread_acquire_lock_timed() below). + PY_TIMEOUT_MAX is the highest usable value (in microseconds) of that + type, and depends on the system threading API. + + NOTE: this isn't the same value as `_thread.TIMEOUT_MAX`. The _thread + module exposes a higher-level API, with timeouts expressed in seconds + and floating-point numbers allowed. +*/ +#define PY_TIMEOUT_T long long + +#if defined(_POSIX_THREADS) + /* PyThread_acquire_lock_timed() uses _PyTime_FromNanoseconds(us * 1000), + convert microseconds to nanoseconds. */ +# define PY_TIMEOUT_MAX (LLONG_MAX / 1000) +#elif defined (NT_THREADS) + /* In the NT API, the timeout is a DWORD and is expressed in milliseconds */ +# if 0xFFFFFFFFLL * 1000 < LLONG_MAX +# define PY_TIMEOUT_MAX (0xFFFFFFFFLL * 1000) +# else +# define PY_TIMEOUT_MAX LLONG_MAX +# endif +#else +# define PY_TIMEOUT_MAX LLONG_MAX +#endif + + +/* If microseconds == 0, the call is non-blocking: it returns immediately + even when the lock can't be acquired. + If microseconds > 0, the call waits up to the specified duration. + If microseconds < 0, the call waits until success (or abnormal failure) + + microseconds must be less than PY_TIMEOUT_MAX. Behaviour otherwise is + undefined. + + If intr_flag is true and the acquire is interrupted by a signal, then the + call will return PY_LOCK_INTR. The caller may reattempt to acquire the + lock. +*/ +PyAPI_FUNC(PyLockStatus) PyThread_acquire_lock_timed(PyThread_type_lock, + PY_TIMEOUT_T microseconds, + int intr_flag); + +PyAPI_FUNC(void) PyThread_release_lock(PyThread_type_lock); + +PyAPI_FUNC(size_t) PyThread_get_stacksize(void); +PyAPI_FUNC(int) PyThread_set_stacksize(size_t); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject*) PyThread_GetInfo(void); +#endif + + +/* Thread Local Storage (TLS) API + TLS API is DEPRECATED. Use Thread Specific Storage (TSS) API. + + The existing TLS API has used int to represent TLS keys across all + platforms, but it is not POSIX-compliant. Therefore, the new TSS API uses + opaque data type to represent TSS keys to be compatible (see PEP 539). +*/ +Py_DEPRECATED(3.7) PyAPI_FUNC(int) PyThread_create_key(void); +Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_delete_key(int key); +Py_DEPRECATED(3.7) PyAPI_FUNC(int) PyThread_set_key_value(int key, + void *value); +Py_DEPRECATED(3.7) PyAPI_FUNC(void *) PyThread_get_key_value(int key); +Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_delete_key_value(int key); + +/* Cleanup after a fork */ +Py_DEPRECATED(3.7) PyAPI_FUNC(void) PyThread_ReInitTLS(void); + + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03070000 +/* New in 3.7 */ +/* Thread Specific Storage (TSS) API */ + +typedef struct _Py_tss_t Py_tss_t; /* opaque */ + +#ifndef Py_LIMITED_API +#if defined(_POSIX_THREADS) + /* Darwin needs pthread.h to know type name the pthread_key_t. */ +# include +# define NATIVE_TSS_KEY_T pthread_key_t +#elif defined(NT_THREADS) + /* In Windows, native TSS key type is DWORD, + but hardcode the unsigned long to avoid errors for include directive. + */ +# define NATIVE_TSS_KEY_T unsigned long +#else +# error "Require native threads. See https://bugs.python.org/issue31370" +#endif + +/* When Py_LIMITED_API is not defined, the type layout of Py_tss_t is + exposed to allow static allocation in the API clients. Even in this case, + you must handle TSS keys through API functions due to compatibility. +*/ +struct _Py_tss_t { + int _is_initialized; + NATIVE_TSS_KEY_T _key; +}; + +#undef NATIVE_TSS_KEY_T + +/* When static allocation, you must initialize with Py_tss_NEEDS_INIT. */ +#define Py_tss_NEEDS_INIT {0} +#endif /* !Py_LIMITED_API */ + +PyAPI_FUNC(Py_tss_t *) PyThread_tss_alloc(void); +PyAPI_FUNC(void) PyThread_tss_free(Py_tss_t *key); + +/* The parameter key must not be NULL. */ +PyAPI_FUNC(int) PyThread_tss_is_created(Py_tss_t *key); +PyAPI_FUNC(int) PyThread_tss_create(Py_tss_t *key); +PyAPI_FUNC(void) PyThread_tss_delete(Py_tss_t *key); +PyAPI_FUNC(int) PyThread_tss_set(Py_tss_t *key, void *value); +PyAPI_FUNC(void *) PyThread_tss_get(Py_tss_t *key); +#endif /* New in 3.7 */ + +#ifdef __cplusplus +} +#endif + +#endif /* !Py_PYTHREAD_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/rangeobject.h b/ScriptEngine/third-party/backend/include/Python/rangeobject.h new file mode 100644 index 0000000000..d6af8473f9 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/rangeobject.h @@ -0,0 +1,27 @@ + +/* Range object interface */ + +#ifndef Py_RANGEOBJECT_H +#define Py_RANGEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* +A range object represents an integer range. This is an immutable object; +a range cannot change its value after creation. + +Range objects behave like the corresponding tuple objects except that +they are represented by a start, stop, and step datamembers. +*/ + +PyAPI_DATA(PyTypeObject) PyRange_Type; +PyAPI_DATA(PyTypeObject) PyRangeIter_Type; +PyAPI_DATA(PyTypeObject) PyLongRangeIter_Type; + +#define PyRange_Check(op) Py_IS_TYPE(op, &PyRange_Type) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_RANGEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/setobject.h b/ScriptEngine/third-party/backend/include/Python/setobject.h new file mode 100644 index 0000000000..62516be5ab --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/setobject.h @@ -0,0 +1,110 @@ +/* Set object interface */ + +#ifndef Py_SETOBJECT_H +#define Py_SETOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API + +/* There are three kinds of entries in the table: + +1. Unused: key == NULL and hash == 0 +2. Dummy: key == dummy and hash == -1 +3. Active: key != NULL and key != dummy and hash != -1 + +The hash field of Unused slots is always zero. + +The hash field of Dummy slots are set to -1 +meaning that dummy entries can be detected by +either entry->key==dummy or by entry->hash==-1. +*/ + +#define PySet_MINSIZE 8 + +typedef struct { + PyObject *key; + Py_hash_t hash; /* Cached hash code of the key */ +} setentry; + +/* The SetObject data structure is shared by set and frozenset objects. + +Invariant for sets: + - hash is -1 + +Invariants for frozensets: + - data is immutable. + - hash is the hash of the frozenset or -1 if not computed yet. + +*/ + +typedef struct { + PyObject_HEAD + + Py_ssize_t fill; /* Number active and dummy entries*/ + Py_ssize_t used; /* Number active entries */ + + /* The table contains mask + 1 slots, and that's a power of 2. + * We store the mask instead of the size because the mask is more + * frequently needed. + */ + Py_ssize_t mask; + + /* The table points to a fixed-size smalltable for small tables + * or to additional malloc'ed memory for bigger tables. + * The table pointer is never NULL which saves us from repeated + * runtime null-tests. + */ + setentry *table; + Py_hash_t hash; /* Only used by frozenset objects */ + Py_ssize_t finger; /* Search finger for pop() */ + + setentry smalltable[PySet_MINSIZE]; + PyObject *weakreflist; /* List of weak references */ +} PySetObject; + +#define PySet_GET_SIZE(so) (assert(PyAnySet_Check(so)),(((PySetObject *)(so))->used)) + +PyAPI_DATA(PyObject *) _PySet_Dummy; + +PyAPI_FUNC(int) _PySet_NextEntry(PyObject *set, Py_ssize_t *pos, PyObject **key, Py_hash_t *hash); +PyAPI_FUNC(int) _PySet_Update(PyObject *set, PyObject *iterable); + +#endif /* Section excluded by Py_LIMITED_API */ + +PyAPI_DATA(PyTypeObject) PySet_Type; +PyAPI_DATA(PyTypeObject) PyFrozenSet_Type; +PyAPI_DATA(PyTypeObject) PySetIter_Type; + +PyAPI_FUNC(PyObject *) PySet_New(PyObject *); +PyAPI_FUNC(PyObject *) PyFrozenSet_New(PyObject *); + +PyAPI_FUNC(int) PySet_Add(PyObject *set, PyObject *key); +PyAPI_FUNC(int) PySet_Clear(PyObject *set); +PyAPI_FUNC(int) PySet_Contains(PyObject *anyset, PyObject *key); +PyAPI_FUNC(int) PySet_Discard(PyObject *set, PyObject *key); +PyAPI_FUNC(PyObject *) PySet_Pop(PyObject *set); +PyAPI_FUNC(Py_ssize_t) PySet_Size(PyObject *anyset); + +#define PyFrozenSet_CheckExact(ob) Py_IS_TYPE(ob, &PyFrozenSet_Type) +#define PyFrozenSet_Check(ob) \ + (Py_IS_TYPE(ob, &PyFrozenSet_Type) || \ + PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) + +#define PyAnySet_CheckExact(ob) \ + (Py_IS_TYPE(ob, &PySet_Type) || Py_IS_TYPE(ob, &PyFrozenSet_Type)) +#define PyAnySet_Check(ob) \ + (Py_IS_TYPE(ob, &PySet_Type) || Py_IS_TYPE(ob, &PyFrozenSet_Type) || \ + PyType_IsSubtype(Py_TYPE(ob), &PySet_Type) || \ + PyType_IsSubtype(Py_TYPE(ob), &PyFrozenSet_Type)) + +#define PySet_CheckExact(op) Py_IS_TYPE(op, &PySet_Type) +#define PySet_Check(ob) \ + (Py_IS_TYPE(ob, &PySet_Type) || \ + PyType_IsSubtype(Py_TYPE(ob), &PySet_Type)) + +#ifdef __cplusplus +} +#endif +#endif /* !Py_SETOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/sliceobject.h b/ScriptEngine/third-party/backend/include/Python/sliceobject.h new file mode 100644 index 0000000000..2c889508b4 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/sliceobject.h @@ -0,0 +1,65 @@ +#ifndef Py_SLICEOBJECT_H +#define Py_SLICEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* The unique ellipsis object "..." */ + +PyAPI_DATA(PyObject) _Py_EllipsisObject; /* Don't use this directly */ + +#define Py_Ellipsis (&_Py_EllipsisObject) + +/* Slice object interface */ + +/* + +A slice object containing start, stop, and step data members (the +names are from range). After much talk with Guido, it was decided to +let these be any arbitrary python type. Py_None stands for omitted values. +*/ +#ifndef Py_LIMITED_API +typedef struct { + PyObject_HEAD + PyObject *start, *stop, *step; /* not NULL */ +} PySliceObject; +#endif + +PyAPI_DATA(PyTypeObject) PySlice_Type; +PyAPI_DATA(PyTypeObject) PyEllipsis_Type; + +#define PySlice_Check(op) Py_IS_TYPE(op, &PySlice_Type) + +PyAPI_FUNC(PyObject *) PySlice_New(PyObject* start, PyObject* stop, + PyObject* step); +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject *) _PySlice_FromIndices(Py_ssize_t start, Py_ssize_t stop); +PyAPI_FUNC(int) _PySlice_GetLongIndices(PySliceObject *self, PyObject *length, + PyObject **start_ptr, PyObject **stop_ptr, + PyObject **step_ptr); +#endif +PyAPI_FUNC(int) PySlice_GetIndices(PyObject *r, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); +Py_DEPRECATED(3.7) +PyAPI_FUNC(int) PySlice_GetIndicesEx(PyObject *r, Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t *step, + Py_ssize_t *slicelength); + +#if !defined(Py_LIMITED_API) || (Py_LIMITED_API+0 >= 0x03050400 && Py_LIMITED_API+0 < 0x03060000) || Py_LIMITED_API+0 >= 0x03060100 +#define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( \ + PySlice_Unpack((slice), (start), (stop), (step)) < 0 ? \ + ((*(slicelen) = 0), -1) : \ + ((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), \ + 0)) +PyAPI_FUNC(int) PySlice_Unpack(PyObject *slice, + Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step); +PyAPI_FUNC(Py_ssize_t) PySlice_AdjustIndices(Py_ssize_t length, + Py_ssize_t *start, Py_ssize_t *stop, + Py_ssize_t step); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_SLICEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/structmember.h b/ScriptEngine/third-party/backend/include/Python/structmember.h new file mode 100644 index 0000000000..93b7aff809 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/structmember.h @@ -0,0 +1,75 @@ +#ifndef Py_STRUCTMEMBER_H +#define Py_STRUCTMEMBER_H +#ifdef __cplusplus +extern "C" { +#endif + + +/* Interface to map C struct members to Python object attributes */ + +#include /* For offsetof */ + +/* An array of PyMemberDef structures defines the name, type and offset + of selected members of a C structure. These can be read by + PyMember_GetOne() and set by PyMember_SetOne() (except if their READONLY + flag is set). The array must be terminated with an entry whose name + pointer is NULL. */ + +typedef struct PyMemberDef { + const char *name; + int type; + Py_ssize_t offset; + int flags; + const char *doc; +} PyMemberDef; + +/* Types */ +#define T_SHORT 0 +#define T_INT 1 +#define T_LONG 2 +#define T_FLOAT 3 +#define T_DOUBLE 4 +#define T_STRING 5 +#define T_OBJECT 6 +/* XXX the ordering here is weird for binary compatibility */ +#define T_CHAR 7 /* 1-character string */ +#define T_BYTE 8 /* 8-bit signed int */ +/* unsigned variants: */ +#define T_UBYTE 9 +#define T_USHORT 10 +#define T_UINT 11 +#define T_ULONG 12 + +/* Added by Jack: strings contained in the structure */ +#define T_STRING_INPLACE 13 + +/* Added by Lillo: bools contained in the structure (assumed char) */ +#define T_BOOL 14 + +#define T_OBJECT_EX 16 /* Like T_OBJECT, but raises AttributeError + when the value is NULL, instead of + converting to None. */ +#define T_LONGLONG 17 +#define T_ULONGLONG 18 + +#define T_PYSSIZET 19 /* Py_ssize_t */ +#define T_NONE 20 /* Value is always None */ + + +/* Flags */ +#define READONLY 1 +#define READ_RESTRICTED 2 +#define PY_WRITE_RESTRICTED 4 +#define RESTRICTED (READ_RESTRICTED | PY_WRITE_RESTRICTED) + +#define PY_AUDIT_READ READ_RESTRICTED + +/* Current API, use this */ +PyAPI_FUNC(PyObject *) PyMember_GetOne(const char *, struct PyMemberDef *); +PyAPI_FUNC(int) PyMember_SetOne(char *, struct PyMemberDef *, PyObject *); + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_STRUCTMEMBER_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/structseq.h b/ScriptEngine/third-party/backend/include/Python/structseq.h new file mode 100644 index 0000000000..8f51c89163 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/structseq.h @@ -0,0 +1,49 @@ + +/* Named tuple object interface */ + +#ifndef Py_STRUCTSEQ_H +#define Py_STRUCTSEQ_H +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct PyStructSequence_Field { + const char *name; + const char *doc; +} PyStructSequence_Field; + +typedef struct PyStructSequence_Desc { + const char *name; + const char *doc; + struct PyStructSequence_Field *fields; + int n_in_sequence; +} PyStructSequence_Desc; + +extern const char * const PyStructSequence_UnnamedField; + +#ifndef Py_LIMITED_API +PyAPI_FUNC(void) PyStructSequence_InitType(PyTypeObject *type, + PyStructSequence_Desc *desc); +PyAPI_FUNC(int) PyStructSequence_InitType2(PyTypeObject *type, + PyStructSequence_Desc *desc); +#endif +PyAPI_FUNC(PyTypeObject*) PyStructSequence_NewType(PyStructSequence_Desc *desc); + +PyAPI_FUNC(PyObject *) PyStructSequence_New(PyTypeObject* type); + +#ifndef Py_LIMITED_API +typedef PyTupleObject PyStructSequence; + +/* Macro, *only* to be used to fill in brand new objects */ +#define PyStructSequence_SET_ITEM(op, i, v) PyTuple_SET_ITEM(op, i, v) + +#define PyStructSequence_GET_ITEM(op, i) PyTuple_GET_ITEM(op, i) +#endif + +PyAPI_FUNC(void) PyStructSequence_SetItem(PyObject*, Py_ssize_t, PyObject*); +PyAPI_FUNC(PyObject*) PyStructSequence_GetItem(PyObject*, Py_ssize_t); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_STRUCTSEQ_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/sysmodule.h b/ScriptEngine/third-party/backend/include/Python/sysmodule.h new file mode 100644 index 0000000000..670e5d283f --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/sysmodule.h @@ -0,0 +1,41 @@ + +/* System module interface */ + +#ifndef Py_SYSMODULE_H +#define Py_SYSMODULE_H +#ifdef __cplusplus +extern "C" { +#endif + +PyAPI_FUNC(PyObject *) PySys_GetObject(const char *); +PyAPI_FUNC(int) PySys_SetObject(const char *, PyObject *); + +PyAPI_FUNC(void) PySys_SetArgv(int, wchar_t **); +PyAPI_FUNC(void) PySys_SetArgvEx(int, wchar_t **, int); +PyAPI_FUNC(void) PySys_SetPath(const wchar_t *); + +PyAPI_FUNC(void) PySys_WriteStdout(const char *format, ...) + Py_GCC_ATTRIBUTE((format(printf, 1, 2))); +PyAPI_FUNC(void) PySys_WriteStderr(const char *format, ...) + Py_GCC_ATTRIBUTE((format(printf, 1, 2))); +PyAPI_FUNC(void) PySys_FormatStdout(const char *format, ...); +PyAPI_FUNC(void) PySys_FormatStderr(const char *format, ...); + +PyAPI_FUNC(void) PySys_ResetWarnOptions(void); +PyAPI_FUNC(void) PySys_AddWarnOption(const wchar_t *); +PyAPI_FUNC(void) PySys_AddWarnOptionUnicode(PyObject *); +PyAPI_FUNC(int) PySys_HasWarnOptions(void); + +PyAPI_FUNC(void) PySys_AddXOption(const wchar_t *); +PyAPI_FUNC(PyObject *) PySys_GetXOptions(void); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_SYSMODULE_H +# include "cpython/sysmodule.h" +# undef Py_CPYTHON_SYSMODULE_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_SYSMODULE_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/token.h b/ScriptEngine/third-party/backend/include/Python/token.h new file mode 100644 index 0000000000..eb1b9ea47b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/token.h @@ -0,0 +1,97 @@ +/* Auto-generated by Tools/scripts/generate_token.py */ + +/* Token types */ +#ifndef Py_LIMITED_API +#ifndef Py_TOKEN_H +#define Py_TOKEN_H +#ifdef __cplusplus +extern "C" { +#endif + +#undef TILDE /* Prevent clash of our definition with system macro. Ex AIX, ioctl.h */ + +#define ENDMARKER 0 +#define NAME 1 +#define NUMBER 2 +#define STRING 3 +#define NEWLINE 4 +#define INDENT 5 +#define DEDENT 6 +#define LPAR 7 +#define RPAR 8 +#define LSQB 9 +#define RSQB 10 +#define COLON 11 +#define COMMA 12 +#define SEMI 13 +#define PLUS 14 +#define MINUS 15 +#define STAR 16 +#define SLASH 17 +#define VBAR 18 +#define AMPER 19 +#define LESS 20 +#define GREATER 21 +#define EQUAL 22 +#define DOT 23 +#define PERCENT 24 +#define LBRACE 25 +#define RBRACE 26 +#define EQEQUAL 27 +#define NOTEQUAL 28 +#define LESSEQUAL 29 +#define GREATEREQUAL 30 +#define TILDE 31 +#define CIRCUMFLEX 32 +#define LEFTSHIFT 33 +#define RIGHTSHIFT 34 +#define DOUBLESTAR 35 +#define PLUSEQUAL 36 +#define MINEQUAL 37 +#define STAREQUAL 38 +#define SLASHEQUAL 39 +#define PERCENTEQUAL 40 +#define AMPEREQUAL 41 +#define VBAREQUAL 42 +#define CIRCUMFLEXEQUAL 43 +#define LEFTSHIFTEQUAL 44 +#define RIGHTSHIFTEQUAL 45 +#define DOUBLESTAREQUAL 46 +#define DOUBLESLASH 47 +#define DOUBLESLASHEQUAL 48 +#define AT 49 +#define ATEQUAL 50 +#define RARROW 51 +#define ELLIPSIS 52 +#define COLONEQUAL 53 +#define OP 54 +#define AWAIT 55 +#define ASYNC 56 +#define TYPE_IGNORE 57 +#define TYPE_COMMENT 58 +#define SOFT_KEYWORD 59 +#define ERRORTOKEN 60 +#define N_TOKENS 64 +#define NT_OFFSET 256 + +/* Special definitions for cooperation with parser */ + +#define ISTERMINAL(x) ((x) < NT_OFFSET) +#define ISNONTERMINAL(x) ((x) >= NT_OFFSET) +#define ISEOF(x) ((x) == ENDMARKER) +#define ISWHITESPACE(x) ((x) == ENDMARKER || \ + (x) == NEWLINE || \ + (x) == INDENT || \ + (x) == DEDENT) + + +PyAPI_DATA(const char * const) _PyParser_TokenNames[]; /* Token names */ +PyAPI_FUNC(int) PyToken_OneChar(int); +PyAPI_FUNC(int) PyToken_TwoChars(int, int); +PyAPI_FUNC(int) PyToken_ThreeChars(int, int, int); + +#ifdef __cplusplus +} +#endif +#endif /* !Py_TOKEN_H */ +#endif /* Py_LIMITED_API */ diff --git a/ScriptEngine/third-party/backend/include/Python/traceback.h b/ScriptEngine/third-party/backend/include/Python/traceback.h new file mode 100644 index 0000000000..781e5a6eec --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/traceback.h @@ -0,0 +1,26 @@ +#ifndef Py_TRACEBACK_H +#define Py_TRACEBACK_H +#ifdef __cplusplus +extern "C" { +#endif + +/* Traceback interface */ + +PyAPI_FUNC(int) PyTraceBack_Here(PyFrameObject *); +PyAPI_FUNC(int) PyTraceBack_Print(PyObject *, PyObject *); + +/* Reveal traceback type so we can typecheck traceback objects */ +PyAPI_DATA(PyTypeObject) PyTraceBack_Type; +#define PyTraceBack_Check(v) Py_IS_TYPE(v, &PyTraceBack_Type) + + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_TRACEBACK_H +# include "cpython/traceback.h" +# undef Py_CPYTHON_TRACEBACK_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_TRACEBACK_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/tracemalloc.h b/ScriptEngine/third-party/backend/include/Python/tracemalloc.h new file mode 100644 index 0000000000..bd14217c19 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/tracemalloc.h @@ -0,0 +1,38 @@ +#ifndef Py_TRACEMALLOC_H +#define Py_TRACEMALLOC_H + +#ifndef Py_LIMITED_API +/* Track an allocated memory block in the tracemalloc module. + Return 0 on success, return -1 on error (failed to allocate memory to store + the trace). + + Return -2 if tracemalloc is disabled. + + If memory block is already tracked, update the existing trace. */ +PyAPI_FUNC(int) PyTraceMalloc_Track( + unsigned int domain, + uintptr_t ptr, + size_t size); + +/* Untrack an allocated memory block in the tracemalloc module. + Do nothing if the block was not tracked. + + Return -2 if tracemalloc is disabled, otherwise return 0. */ +PyAPI_FUNC(int) PyTraceMalloc_Untrack( + unsigned int domain, + uintptr_t ptr); + +/* Get the traceback where a memory block was allocated. + + Return a tuple of (filename: str, lineno: int) tuples. + + Return None if the tracemalloc module is disabled or if the memory block + is not tracked by tracemalloc. + + Raise an exception and return NULL on error. */ +PyAPI_FUNC(PyObject*) _PyTraceMalloc_GetTraceback( + unsigned int domain, + uintptr_t ptr); +#endif + +#endif /* !Py_TRACEMALLOC_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/tupleobject.h b/ScriptEngine/third-party/backend/include/Python/tupleobject.h new file mode 100644 index 0000000000..e796a32019 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/tupleobject.h @@ -0,0 +1,46 @@ +/* Tuple object interface */ + +#ifndef Py_TUPLEOBJECT_H +#define Py_TUPLEOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + +/* +Another generally useful object type is a tuple of object pointers. +For Python, this is an immutable type. C code can change the tuple items +(but not their number), and even use tuples as general-purpose arrays of +object references, but in general only brand new tuples should be mutated, +not ones that might already have been exposed to Python code. + +*** WARNING *** PyTuple_SetItem does not increment the new item's reference +count, but does decrement the reference count of the item it replaces, +if not nil. It does *decrement* the reference count if it is *not* +inserted in the tuple. Similarly, PyTuple_GetItem does not increment the +returned item's reference count. +*/ + +PyAPI_DATA(PyTypeObject) PyTuple_Type; +PyAPI_DATA(PyTypeObject) PyTupleIter_Type; + +#define PyTuple_Check(op) \ + PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_TUPLE_SUBCLASS) +#define PyTuple_CheckExact(op) Py_IS_TYPE(op, &PyTuple_Type) + +PyAPI_FUNC(PyObject *) PyTuple_New(Py_ssize_t size); +PyAPI_FUNC(Py_ssize_t) PyTuple_Size(PyObject *); +PyAPI_FUNC(PyObject *) PyTuple_GetItem(PyObject *, Py_ssize_t); +PyAPI_FUNC(int) PyTuple_SetItem(PyObject *, Py_ssize_t, PyObject *); +PyAPI_FUNC(PyObject *) PyTuple_GetSlice(PyObject *, Py_ssize_t, Py_ssize_t); +PyAPI_FUNC(PyObject *) PyTuple_Pack(Py_ssize_t, ...); + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_TUPLEOBJECT_H +# include "cpython/tupleobject.h" +# undef Py_CPYTHON_TUPLEOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_TUPLEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/typeslots.h b/ScriptEngine/third-party/backend/include/Python/typeslots.h new file mode 100644 index 0000000000..5800d0158b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/typeslots.h @@ -0,0 +1,94 @@ +/* Do not renumber the file; these numbers are part of the stable ABI. */ +#if defined(Py_LIMITED_API) +/* Disabled, see #10181 */ +#undef Py_bf_getbuffer +#undef Py_bf_releasebuffer +#else +#define Py_bf_getbuffer 1 +#define Py_bf_releasebuffer 2 +#endif +#define Py_mp_ass_subscript 3 +#define Py_mp_length 4 +#define Py_mp_subscript 5 +#define Py_nb_absolute 6 +#define Py_nb_add 7 +#define Py_nb_and 8 +#define Py_nb_bool 9 +#define Py_nb_divmod 10 +#define Py_nb_float 11 +#define Py_nb_floor_divide 12 +#define Py_nb_index 13 +#define Py_nb_inplace_add 14 +#define Py_nb_inplace_and 15 +#define Py_nb_inplace_floor_divide 16 +#define Py_nb_inplace_lshift 17 +#define Py_nb_inplace_multiply 18 +#define Py_nb_inplace_or 19 +#define Py_nb_inplace_power 20 +#define Py_nb_inplace_remainder 21 +#define Py_nb_inplace_rshift 22 +#define Py_nb_inplace_subtract 23 +#define Py_nb_inplace_true_divide 24 +#define Py_nb_inplace_xor 25 +#define Py_nb_int 26 +#define Py_nb_invert 27 +#define Py_nb_lshift 28 +#define Py_nb_multiply 29 +#define Py_nb_negative 30 +#define Py_nb_or 31 +#define Py_nb_positive 32 +#define Py_nb_power 33 +#define Py_nb_remainder 34 +#define Py_nb_rshift 35 +#define Py_nb_subtract 36 +#define Py_nb_true_divide 37 +#define Py_nb_xor 38 +#define Py_sq_ass_item 39 +#define Py_sq_concat 40 +#define Py_sq_contains 41 +#define Py_sq_inplace_concat 42 +#define Py_sq_inplace_repeat 43 +#define Py_sq_item 44 +#define Py_sq_length 45 +#define Py_sq_repeat 46 +#define Py_tp_alloc 47 +#define Py_tp_base 48 +#define Py_tp_bases 49 +#define Py_tp_call 50 +#define Py_tp_clear 51 +#define Py_tp_dealloc 52 +#define Py_tp_del 53 +#define Py_tp_descr_get 54 +#define Py_tp_descr_set 55 +#define Py_tp_doc 56 +#define Py_tp_getattr 57 +#define Py_tp_getattro 58 +#define Py_tp_hash 59 +#define Py_tp_init 60 +#define Py_tp_is_gc 61 +#define Py_tp_iter 62 +#define Py_tp_iternext 63 +#define Py_tp_methods 64 +#define Py_tp_new 65 +#define Py_tp_repr 66 +#define Py_tp_richcompare 67 +#define Py_tp_setattr 68 +#define Py_tp_setattro 69 +#define Py_tp_str 70 +#define Py_tp_traverse 71 +#define Py_tp_members 72 +#define Py_tp_getset 73 +#define Py_tp_free 74 +#define Py_nb_matrix_multiply 75 +#define Py_nb_inplace_matrix_multiply 76 +#define Py_am_await 77 +#define Py_am_aiter 78 +#define Py_am_anext 79 +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000 +/* New in 3.5 */ +#define Py_tp_finalize 80 +#endif +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 +/* New in 3.10 */ +#define Py_am_send 81 +#endif diff --git a/ScriptEngine/third-party/backend/include/Python/unicodeobject.h b/ScriptEngine/third-party/backend/include/Python/unicodeobject.h new file mode 100644 index 0000000000..b0ac086a6b --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/unicodeobject.h @@ -0,0 +1,1053 @@ +#ifndef Py_UNICODEOBJECT_H +#define Py_UNICODEOBJECT_H + +#include + +/* + +Unicode implementation based on original code by Fredrik Lundh, +modified by Marc-Andre Lemburg (mal@lemburg.com) according to the +Unicode Integration Proposal. (See +http://www.egenix.com/files/python/unicode-proposal.txt). + +Copyright (c) Corporation for National Research Initiatives. + + + Original header: + -------------------------------------------------------------------- + + * Yet another Unicode string type for Python. This type supports the + * 16-bit Basic Multilingual Plane (BMP) only. + * + * Written by Fredrik Lundh, January 1999. + * + * Copyright (c) 1999 by Secret Labs AB. + * Copyright (c) 1999 by Fredrik Lundh. + * + * fredrik@pythonware.com + * http://www.pythonware.com + * + * -------------------------------------------------------------------- + * This Unicode String Type is + * + * Copyright (c) 1999 by Secret Labs AB + * Copyright (c) 1999 by Fredrik Lundh + * + * By obtaining, using, and/or copying this software and/or its + * associated documentation, you agree that you have read, understood, + * and will comply with the following terms and conditions: + * + * Permission to use, copy, modify, and distribute this software and its + * associated documentation for any purpose and without fee is hereby + * granted, provided that the above copyright notice appears in all + * copies, and that both that copyright notice and this permission notice + * appear in supporting documentation, and that the name of Secret Labs + * AB or the author not be used in advertising or publicity pertaining to + * distribution of the software without specific, written prior + * permission. + * + * SECRET LABS AB AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO + * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND + * FITNESS. IN NO EVENT SHALL SECRET LABS AB OR THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * -------------------------------------------------------------------- */ + +#include + +/* === Internal API ======================================================= */ + +/* --- Internal Unicode Format -------------------------------------------- */ + +/* Python 3.x requires unicode */ +#define Py_USING_UNICODE + +#ifndef SIZEOF_WCHAR_T +#error Must define SIZEOF_WCHAR_T +#endif + +#define Py_UNICODE_SIZE SIZEOF_WCHAR_T + +/* If wchar_t can be used for UCS-4 storage, set Py_UNICODE_WIDE. + Otherwise, Unicode strings are stored as UCS-2 (with limited support + for UTF-16) */ + +#if Py_UNICODE_SIZE >= 4 +#define Py_UNICODE_WIDE +#endif + +/* Set these flags if the platform has "wchar.h" and the + wchar_t type is a 16-bit unsigned type */ +/* #define HAVE_WCHAR_H */ +/* #define HAVE_USABLE_WCHAR_T */ + +/* If the compiler provides a wchar_t type we try to support it + through the interface functions PyUnicode_FromWideChar(), + PyUnicode_AsWideChar() and PyUnicode_AsWideCharString(). */ + +#ifdef HAVE_USABLE_WCHAR_T +# ifndef HAVE_WCHAR_H +# define HAVE_WCHAR_H +# endif +#endif + +#ifdef HAVE_WCHAR_H +# include +#endif + +/* Py_UCS4 and Py_UCS2 are typedefs for the respective + unicode representations. */ +typedef uint32_t Py_UCS4; +typedef uint16_t Py_UCS2; +typedef uint8_t Py_UCS1; + +#ifdef __cplusplus +extern "C" { +#endif + + +PyAPI_DATA(PyTypeObject) PyUnicode_Type; +PyAPI_DATA(PyTypeObject) PyUnicodeIter_Type; + +#define PyUnicode_Check(op) \ + PyType_FastSubclass(Py_TYPE(op), Py_TPFLAGS_UNICODE_SUBCLASS) +#define PyUnicode_CheckExact(op) Py_IS_TYPE(op, &PyUnicode_Type) + +/* --- Constants ---------------------------------------------------------- */ + +/* This Unicode character will be used as replacement character during + decoding if the errors argument is set to "replace". Note: the + Unicode character U+FFFD is the official REPLACEMENT CHARACTER in + Unicode 3.0. */ + +#define Py_UNICODE_REPLACEMENT_CHARACTER ((Py_UCS4) 0xFFFD) + +/* === Public API ========================================================= */ + +/* Similar to PyUnicode_FromUnicode(), but u points to UTF-8 encoded bytes */ +PyAPI_FUNC(PyObject*) PyUnicode_FromStringAndSize( + const char *u, /* UTF-8 encoded string */ + Py_ssize_t size /* size of buffer */ + ); + +/* Similar to PyUnicode_FromUnicode(), but u points to null-terminated + UTF-8 encoded bytes. The size is determined with strlen(). */ +PyAPI_FUNC(PyObject*) PyUnicode_FromString( + const char *u /* UTF-8 encoded string */ + ); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject*) PyUnicode_Substring( + PyObject *str, + Py_ssize_t start, + Py_ssize_t end); +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +/* Copy the string into a UCS4 buffer including the null character if copy_null + is set. Return NULL and raise an exception on error. Raise a SystemError if + the buffer is smaller than the string. Return buffer on success. + + buflen is the length of the buffer in (Py_UCS4) characters. */ +PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4( + PyObject *unicode, + Py_UCS4* buffer, + Py_ssize_t buflen, + int copy_null); + +/* Copy the string into a UCS4 buffer. A new buffer is allocated using + * PyMem_Malloc; if this fails, NULL is returned with a memory error + exception set. */ +PyAPI_FUNC(Py_UCS4*) PyUnicode_AsUCS4Copy(PyObject *unicode); +#endif + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +/* Get the length of the Unicode object. */ + +PyAPI_FUNC(Py_ssize_t) PyUnicode_GetLength( + PyObject *unicode +); +#endif + +/* Get the number of Py_UNICODE units in the + string representation. */ + +Py_DEPRECATED(3.3) PyAPI_FUNC(Py_ssize_t) PyUnicode_GetSize( + PyObject *unicode /* Unicode object */ + ); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +/* Read a character from the string. */ + +PyAPI_FUNC(Py_UCS4) PyUnicode_ReadChar( + PyObject *unicode, + Py_ssize_t index + ); + +/* Write a character to the string. The string must have been created through + PyUnicode_New, must not be shared, and must not have been hashed yet. + + Return 0 on success, -1 on error. */ + +PyAPI_FUNC(int) PyUnicode_WriteChar( + PyObject *unicode, + Py_ssize_t index, + Py_UCS4 character + ); +#endif + +/* Resize a Unicode object. The length is the number of characters, except + if the kind of the string is PyUnicode_WCHAR_KIND: in this case, the length + is the number of Py_UNICODE characters. + + *unicode is modified to point to the new (resized) object and 0 + returned on success. + + Try to resize the string in place (which is usually faster than allocating + a new string and copy characters), or create a new string. + + Error handling is implemented as follows: an exception is set, -1 + is returned and *unicode left untouched. + + WARNING: The function doesn't check string content, the result may not be a + string in canonical representation. */ + +PyAPI_FUNC(int) PyUnicode_Resize( + PyObject **unicode, /* Pointer to the Unicode object */ + Py_ssize_t length /* New length */ + ); + +/* Decode obj to a Unicode object. + + bytes, bytearray and other bytes-like objects are decoded according to the + given encoding and error handler. The encoding and error handler can be + NULL to have the interface use UTF-8 and "strict". + + All other objects (including Unicode objects) raise an exception. + + The API returns NULL in case of an error. The caller is responsible + for decref'ing the returned objects. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_FromEncodedObject( + PyObject *obj, /* Object */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Copy an instance of a Unicode subtype to a new true Unicode object if + necessary. If obj is already a true Unicode object (not a subtype), return + the reference with *incremented* refcount. + + The API returns NULL in case of an error. The caller is responsible + for decref'ing the returned objects. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_FromObject( + PyObject *obj /* Object */ + ); + +PyAPI_FUNC(PyObject *) PyUnicode_FromFormatV( + const char *format, /* ASCII-encoded string */ + va_list vargs + ); +PyAPI_FUNC(PyObject *) PyUnicode_FromFormat( + const char *format, /* ASCII-encoded string */ + ... + ); + +PyAPI_FUNC(void) PyUnicode_InternInPlace(PyObject **); +PyAPI_FUNC(PyObject *) PyUnicode_InternFromString( + const char *u /* UTF-8 encoded string */ + ); + +// PyUnicode_InternImmortal() is deprecated since Python 3.10 +// and will be removed in Python 3.12. Use PyUnicode_InternInPlace() instead. +Py_DEPRECATED(3.10) PyAPI_FUNC(void) PyUnicode_InternImmortal(PyObject **); + +/* Use only if you know it's a string */ +#define PyUnicode_CHECK_INTERNED(op) \ + (((PyASCIIObject *)(op))->state.interned) + +/* --- wchar_t support for platforms which support it --------------------- */ + +#ifdef HAVE_WCHAR_H + +/* Create a Unicode Object from the wchar_t buffer w of the given + size. + + The buffer is copied into the new object. */ + +PyAPI_FUNC(PyObject*) PyUnicode_FromWideChar( + const wchar_t *w, /* wchar_t buffer */ + Py_ssize_t size /* size of buffer */ + ); + +/* Copies the Unicode Object contents into the wchar_t buffer w. At + most size wchar_t characters are copied. + + Note that the resulting wchar_t string may or may not be + 0-terminated. It is the responsibility of the caller to make sure + that the wchar_t string is 0-terminated in case this is required by + the application. + + Returns the number of wchar_t characters copied (excluding a + possibly trailing 0-termination character) or -1 in case of an + error. */ + +PyAPI_FUNC(Py_ssize_t) PyUnicode_AsWideChar( + PyObject *unicode, /* Unicode object */ + wchar_t *w, /* wchar_t buffer */ + Py_ssize_t size /* size of buffer */ + ); + +/* Convert the Unicode object to a wide character string. The output string + always ends with a nul character. If size is not NULL, write the number of + wide characters (excluding the null character) into *size. + + Returns a buffer allocated by PyMem_Malloc() (use PyMem_Free() to free it) + on success. On error, returns NULL, *size is undefined and raises a + MemoryError. */ + +PyAPI_FUNC(wchar_t*) PyUnicode_AsWideCharString( + PyObject *unicode, /* Unicode object */ + Py_ssize_t *size /* number of characters of the result */ + ); + +#endif + +/* --- Unicode ordinals --------------------------------------------------- */ + +/* Create a Unicode Object from the given Unicode code point ordinal. + + The ordinal must be in range(0x110000). A ValueError is + raised in case it is not. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_FromOrdinal(int ordinal); + +/* === Builtin Codecs ===================================================== + + Many of these APIs take two arguments encoding and errors. These + parameters encoding and errors have the same semantics as the ones + of the builtin str() API. + + Setting encoding to NULL causes the default encoding (UTF-8) to be used. + + Error handling is set by errors which may also be set to NULL + meaning to use the default handling defined for the codec. Default + error handling for all builtin codecs is "strict" (ValueErrors are + raised). + + The codecs all use a similar interface. Only deviation from the + generic ones are documented. + +*/ + +/* --- Manage the default encoding ---------------------------------------- */ + +/* Returns "utf-8". */ +PyAPI_FUNC(const char*) PyUnicode_GetDefaultEncoding(void); + +/* --- Generic Codecs ----------------------------------------------------- */ + +/* Create a Unicode object by decoding the encoded string s of the + given size. */ + +PyAPI_FUNC(PyObject*) PyUnicode_Decode( + const char *s, /* encoded string */ + Py_ssize_t size, /* size of buffer */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Decode a Unicode object unicode and return the result as Python + object. + + This API is DEPRECATED. The only supported standard encoding is rot13. + Use PyCodec_Decode() to decode with rot13 and non-standard codecs + that decode from str. */ + +Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedObject( + PyObject *unicode, /* Unicode object */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Decode a Unicode object unicode and return the result as Unicode + object. + + This API is DEPRECATED. The only supported standard encoding is rot13. + Use PyCodec_Decode() to decode with rot13 and non-standard codecs + that decode from str to str. */ + +Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsDecodedUnicode( + PyObject *unicode, /* Unicode object */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Encodes a Unicode object and returns the result as Python + object. + + This API is DEPRECATED. It is superseded by PyUnicode_AsEncodedString() + since all standard encodings (except rot13) encode str to bytes. + Use PyCodec_Encode() for encoding with rot13 and non-standard codecs + that encode form str to non-bytes. */ + +Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedObject( + PyObject *unicode, /* Unicode object */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Encodes a Unicode object and returns the result as Python string + object. */ + +PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedString( + PyObject *unicode, /* Unicode object */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Encodes a Unicode object and returns the result as Unicode + object. + + This API is DEPRECATED. The only supported standard encodings is rot13. + Use PyCodec_Encode() to encode with rot13 and non-standard codecs + that encode from str to str. */ + +Py_DEPRECATED(3.6) PyAPI_FUNC(PyObject*) PyUnicode_AsEncodedUnicode( + PyObject *unicode, /* Unicode object */ + const char *encoding, /* encoding */ + const char *errors /* error handling */ + ); + +/* Build an encoding map. */ + +PyAPI_FUNC(PyObject*) PyUnicode_BuildEncodingMap( + PyObject* string /* 256 character map */ + ); + +/* --- UTF-7 Codecs ------------------------------------------------------- */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7( + const char *string, /* UTF-7 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF7Stateful( + const char *string, /* UTF-7 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed /* bytes consumed */ + ); + +/* --- UTF-8 Codecs ------------------------------------------------------- */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8( + const char *string, /* UTF-8 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF8Stateful( + const char *string, /* UTF-8 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed /* bytes consumed */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_AsUTF8String( + PyObject *unicode /* Unicode object */ + ); + +/* Returns a pointer to the default encoding (UTF-8) of the + Unicode object unicode and the size of the encoded representation + in bytes stored in *size. + + In case of an error, no *size is set. + + This function caches the UTF-8 encoded string in the unicodeobject + and subsequent calls will return the same string. The memory is released + when the unicodeobject is deallocated. +*/ + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x030A0000 +PyAPI_FUNC(const char *) PyUnicode_AsUTF8AndSize( + PyObject *unicode, + Py_ssize_t *size); +#endif + +/* --- UTF-32 Codecs ------------------------------------------------------ */ + +/* Decodes length bytes from a UTF-32 encoded buffer string and returns + the corresponding Unicode object. + + errors (if non-NULL) defines the error handling. It defaults + to "strict". + + If byteorder is non-NULL, the decoder starts decoding using the + given byte order: + + *byteorder == -1: little endian + *byteorder == 0: native order + *byteorder == 1: big endian + + In native mode, the first four bytes of the stream are checked for a + BOM mark. If found, the BOM mark is analysed, the byte order + adjusted and the BOM skipped. In the other modes, no BOM mark + interpretation is done. After completion, *byteorder is set to the + current byte order at the end of input data. + + If byteorder is NULL, the codec starts in native order mode. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32( + const char *string, /* UTF-32 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + int *byteorder /* pointer to byteorder to use + 0=native;-1=LE,1=BE; updated on + exit */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF32Stateful( + const char *string, /* UTF-32 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + int *byteorder, /* pointer to byteorder to use + 0=native;-1=LE,1=BE; updated on + exit */ + Py_ssize_t *consumed /* bytes consumed */ + ); + +/* Returns a Python string using the UTF-32 encoding in native byte + order. The string always starts with a BOM mark. */ + +PyAPI_FUNC(PyObject*) PyUnicode_AsUTF32String( + PyObject *unicode /* Unicode object */ + ); + +/* Returns a Python string object holding the UTF-32 encoded value of + the Unicode data. + + If byteorder is not 0, output is written according to the following + byte order: + + byteorder == -1: little endian + byteorder == 0: native byte order (writes a BOM mark) + byteorder == 1: big endian + + If byteorder is 0, the output string will always start with the + Unicode BOM mark (U+FEFF). In the other two modes, no BOM mark is + prepended. + +*/ + +/* --- UTF-16 Codecs ------------------------------------------------------ */ + +/* Decodes length bytes from a UTF-16 encoded buffer string and returns + the corresponding Unicode object. + + errors (if non-NULL) defines the error handling. It defaults + to "strict". + + If byteorder is non-NULL, the decoder starts decoding using the + given byte order: + + *byteorder == -1: little endian + *byteorder == 0: native order + *byteorder == 1: big endian + + In native mode, the first two bytes of the stream are checked for a + BOM mark. If found, the BOM mark is analysed, the byte order + adjusted and the BOM skipped. In the other modes, no BOM mark + interpretation is done. After completion, *byteorder is set to the + current byte order at the end of input data. + + If byteorder is NULL, the codec starts in native order mode. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16( + const char *string, /* UTF-16 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + int *byteorder /* pointer to byteorder to use + 0=native;-1=LE,1=BE; updated on + exit */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUTF16Stateful( + const char *string, /* UTF-16 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + int *byteorder, /* pointer to byteorder to use + 0=native;-1=LE,1=BE; updated on + exit */ + Py_ssize_t *consumed /* bytes consumed */ + ); + +/* Returns a Python string using the UTF-16 encoding in native byte + order. The string always starts with a BOM mark. */ + +PyAPI_FUNC(PyObject*) PyUnicode_AsUTF16String( + PyObject *unicode /* Unicode object */ + ); + +/* --- Unicode-Escape Codecs ---------------------------------------------- */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeUnicodeEscape( + const char *string, /* Unicode-Escape encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_AsUnicodeEscapeString( + PyObject *unicode /* Unicode object */ + ); + +/* --- Raw-Unicode-Escape Codecs ------------------------------------------ */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeRawUnicodeEscape( + const char *string, /* Raw-Unicode-Escape encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_AsRawUnicodeEscapeString( + PyObject *unicode /* Unicode object */ + ); + +/* --- Latin-1 Codecs ----------------------------------------------------- + + Note: Latin-1 corresponds to the first 256 Unicode ordinals. */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeLatin1( + const char *string, /* Latin-1 encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_AsLatin1String( + PyObject *unicode /* Unicode object */ + ); + +/* --- ASCII Codecs ------------------------------------------------------- + + Only 7-bit ASCII data is excepted. All other codes generate errors. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeASCII( + const char *string, /* ASCII encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_AsASCIIString( + PyObject *unicode /* Unicode object */ + ); + +/* --- Character Map Codecs ----------------------------------------------- + + This codec uses mappings to encode and decode characters. + + Decoding mappings must map byte ordinals (integers in the range from 0 to + 255) to Unicode strings, integers (which are then interpreted as Unicode + ordinals) or None. Unmapped data bytes (ones which cause a LookupError) + as well as mapped to None, 0xFFFE or '\ufffe' are treated as "undefined + mapping" and cause an error. + + Encoding mappings must map Unicode ordinal integers to bytes objects, + integers in the range from 0 to 255 or None. Unmapped character + ordinals (ones which cause a LookupError) as well as mapped to + None are treated as "undefined mapping" and cause an error. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeCharmap( + const char *string, /* Encoded string */ + Py_ssize_t length, /* size of string */ + PyObject *mapping, /* decoding mapping */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_AsCharmapString( + PyObject *unicode, /* Unicode object */ + PyObject *mapping /* encoding mapping */ + ); + +/* --- MBCS codecs for Windows -------------------------------------------- */ + +#ifdef MS_WINDOWS +PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCS( + const char *string, /* MBCS encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors /* error handling */ + ); + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeMBCSStateful( + const char *string, /* MBCS encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed /* bytes consumed */ + ); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject*) PyUnicode_DecodeCodePageStateful( + int code_page, /* code page number */ + const char *string, /* encoded string */ + Py_ssize_t length, /* size of string */ + const char *errors, /* error handling */ + Py_ssize_t *consumed /* bytes consumed */ + ); +#endif + +PyAPI_FUNC(PyObject*) PyUnicode_AsMBCSString( + PyObject *unicode /* Unicode object */ + ); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +PyAPI_FUNC(PyObject*) PyUnicode_EncodeCodePage( + int code_page, /* code page number */ + PyObject *unicode, /* Unicode object */ + const char *errors /* error handling */ + ); +#endif + +#endif /* MS_WINDOWS */ + +/* --- Locale encoding --------------------------------------------------- */ + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +/* Decode a string from the current locale encoding. The decoder is strict if + *surrogateescape* is equal to zero, otherwise it uses the 'surrogateescape' + error handler (PEP 383) to escape undecodable bytes. If a byte sequence can + be decoded as a surrogate character and *surrogateescape* is not equal to + zero, the byte sequence is escaped using the 'surrogateescape' error handler + instead of being decoded. *str* must end with a null character but cannot + contain embedded null characters. */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocaleAndSize( + const char *str, + Py_ssize_t len, + const char *errors); + +/* Similar to PyUnicode_DecodeLocaleAndSize(), but compute the string + length using strlen(). */ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeLocale( + const char *str, + const char *errors); + +/* Encode a Unicode object to the current locale encoding. The encoder is + strict is *surrogateescape* is equal to zero, otherwise the + "surrogateescape" error handler is used. Return a bytes object. The string + cannot contain embedded null characters. */ + +PyAPI_FUNC(PyObject*) PyUnicode_EncodeLocale( + PyObject *unicode, + const char *errors + ); +#endif + +/* --- File system encoding ---------------------------------------------- */ + +/* ParseTuple converter: encode str objects to bytes using + PyUnicode_EncodeFSDefault(); bytes objects are output as-is. */ + +PyAPI_FUNC(int) PyUnicode_FSConverter(PyObject*, void*); + +/* ParseTuple converter: decode bytes objects to unicode using + PyUnicode_DecodeFSDefaultAndSize(); str objects are output as-is. */ + +PyAPI_FUNC(int) PyUnicode_FSDecoder(PyObject*, void*); + +/* Decode a null-terminated string using Py_FileSystemDefaultEncoding + and the "surrogateescape" error handler. + + If Py_FileSystemDefaultEncoding is not set, fall back to the locale + encoding. + + Use PyUnicode_DecodeFSDefaultAndSize() if the string length is known. +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefault( + const char *s /* encoded string */ + ); + +/* Decode a string using Py_FileSystemDefaultEncoding + and the "surrogateescape" error handler. + + If Py_FileSystemDefaultEncoding is not set, fall back to the locale + encoding. +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_DecodeFSDefaultAndSize( + const char *s, /* encoded string */ + Py_ssize_t size /* size */ + ); + +/* Encode a Unicode object to Py_FileSystemDefaultEncoding with the + "surrogateescape" error handler, and return bytes. + + If Py_FileSystemDefaultEncoding is not set, fall back to the locale + encoding. +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_EncodeFSDefault( + PyObject *unicode + ); + +/* --- Methods & Slots ---------------------------------------------------- + + These are capable of handling Unicode objects and strings on input + (we refer to them as strings in the descriptions) and return + Unicode objects or integers as appropriate. */ + +/* Concat two strings giving a new Unicode string. */ + +PyAPI_FUNC(PyObject*) PyUnicode_Concat( + PyObject *left, /* Left string */ + PyObject *right /* Right string */ + ); + +/* Concat two strings and put the result in *pleft + (sets *pleft to NULL on error) */ + +PyAPI_FUNC(void) PyUnicode_Append( + PyObject **pleft, /* Pointer to left string */ + PyObject *right /* Right string */ + ); + +/* Concat two strings, put the result in *pleft and drop the right object + (sets *pleft to NULL on error) */ + +PyAPI_FUNC(void) PyUnicode_AppendAndDel( + PyObject **pleft, /* Pointer to left string */ + PyObject *right /* Right string */ + ); + +/* Split a string giving a list of Unicode strings. + + If sep is NULL, splitting will be done at all whitespace + substrings. Otherwise, splits occur at the given separator. + + At most maxsplit splits will be done. If negative, no limit is set. + + Separators are not included in the resulting list. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_Split( + PyObject *s, /* String to split */ + PyObject *sep, /* String separator */ + Py_ssize_t maxsplit /* Maxsplit count */ + ); + +/* Dito, but split at line breaks. + + CRLF is considered to be one line break. Line breaks are not + included in the resulting list. */ + +PyAPI_FUNC(PyObject*) PyUnicode_Splitlines( + PyObject *s, /* String to split */ + int keepends /* If true, line end markers are included */ + ); + +/* Partition a string using a given separator. */ + +PyAPI_FUNC(PyObject*) PyUnicode_Partition( + PyObject *s, /* String to partition */ + PyObject *sep /* String separator */ + ); + +/* Partition a string using a given separator, searching from the end of the + string. */ + +PyAPI_FUNC(PyObject*) PyUnicode_RPartition( + PyObject *s, /* String to partition */ + PyObject *sep /* String separator */ + ); + +/* Split a string giving a list of Unicode strings. + + If sep is NULL, splitting will be done at all whitespace + substrings. Otherwise, splits occur at the given separator. + + At most maxsplit splits will be done. But unlike PyUnicode_Split + PyUnicode_RSplit splits from the end of the string. If negative, + no limit is set. + + Separators are not included in the resulting list. + +*/ + +PyAPI_FUNC(PyObject*) PyUnicode_RSplit( + PyObject *s, /* String to split */ + PyObject *sep, /* String separator */ + Py_ssize_t maxsplit /* Maxsplit count */ + ); + +/* Translate a string by applying a character mapping table to it and + return the resulting Unicode object. + + The mapping table must map Unicode ordinal integers to Unicode strings, + Unicode ordinal integers or None (causing deletion of the character). + + Mapping tables may be dictionaries or sequences. Unmapped character + ordinals (ones which cause a LookupError) are left untouched and + are copied as-is. + +*/ + +PyAPI_FUNC(PyObject *) PyUnicode_Translate( + PyObject *str, /* String */ + PyObject *table, /* Translate table */ + const char *errors /* error handling */ + ); + +/* Join a sequence of strings using the given separator and return + the resulting Unicode string. */ + +PyAPI_FUNC(PyObject*) PyUnicode_Join( + PyObject *separator, /* Separator string */ + PyObject *seq /* Sequence object */ + ); + +/* Return 1 if substr matches str[start:end] at the given tail end, 0 + otherwise. */ + +PyAPI_FUNC(Py_ssize_t) PyUnicode_Tailmatch( + PyObject *str, /* String */ + PyObject *substr, /* Prefix or Suffix string */ + Py_ssize_t start, /* Start index */ + Py_ssize_t end, /* Stop index */ + int direction /* Tail end: -1 prefix, +1 suffix */ + ); + +/* Return the first position of substr in str[start:end] using the + given search direction or -1 if not found. -2 is returned in case + an error occurred and an exception is set. */ + +PyAPI_FUNC(Py_ssize_t) PyUnicode_Find( + PyObject *str, /* String */ + PyObject *substr, /* Substring to find */ + Py_ssize_t start, /* Start index */ + Py_ssize_t end, /* Stop index */ + int direction /* Find direction: +1 forward, -1 backward */ + ); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03030000 +/* Like PyUnicode_Find, but search for single character only. */ +PyAPI_FUNC(Py_ssize_t) PyUnicode_FindChar( + PyObject *str, + Py_UCS4 ch, + Py_ssize_t start, + Py_ssize_t end, + int direction + ); +#endif + +/* Count the number of occurrences of substr in str[start:end]. */ + +PyAPI_FUNC(Py_ssize_t) PyUnicode_Count( + PyObject *str, /* String */ + PyObject *substr, /* Substring to count */ + Py_ssize_t start, /* Start index */ + Py_ssize_t end /* Stop index */ + ); + +/* Replace at most maxcount occurrences of substr in str with replstr + and return the resulting Unicode object. */ + +PyAPI_FUNC(PyObject *) PyUnicode_Replace( + PyObject *str, /* String */ + PyObject *substr, /* Substring to find */ + PyObject *replstr, /* Substring to replace */ + Py_ssize_t maxcount /* Max. number of replacements to apply; + -1 = all */ + ); + +/* Compare two strings and return -1, 0, 1 for less than, equal, + greater than resp. + Raise an exception and return -1 on error. */ + +PyAPI_FUNC(int) PyUnicode_Compare( + PyObject *left, /* Left string */ + PyObject *right /* Right string */ + ); + +/* Compare a Unicode object with C string and return -1, 0, 1 for less than, + equal, and greater than, respectively. It is best to pass only + ASCII-encoded strings, but the function interprets the input string as + ISO-8859-1 if it contains non-ASCII characters. + This function does not raise exceptions. */ + +PyAPI_FUNC(int) PyUnicode_CompareWithASCIIString( + PyObject *left, + const char *right /* ASCII-encoded string */ + ); + +/* Rich compare two strings and return one of the following: + + - NULL in case an exception was raised + - Py_True or Py_False for successful comparisons + - Py_NotImplemented in case the type combination is unknown + + Possible values for op: + + Py_GT, Py_GE, Py_EQ, Py_NE, Py_LT, Py_LE + +*/ + +PyAPI_FUNC(PyObject *) PyUnicode_RichCompare( + PyObject *left, /* Left string */ + PyObject *right, /* Right string */ + int op /* Operation: Py_EQ, Py_NE, Py_GT, etc. */ + ); + +/* Apply an argument tuple or dictionary to a format string and return + the resulting Unicode string. */ + +PyAPI_FUNC(PyObject *) PyUnicode_Format( + PyObject *format, /* Format string */ + PyObject *args /* Argument tuple or dictionary */ + ); + +/* Checks whether element is contained in container and return 1/0 + accordingly. + + element has to coerce to a one element Unicode string. -1 is + returned in case of an error. */ + +PyAPI_FUNC(int) PyUnicode_Contains( + PyObject *container, /* Container string */ + PyObject *element /* Element string */ + ); + +/* Checks whether argument is a valid identifier. */ + +PyAPI_FUNC(int) PyUnicode_IsIdentifier(PyObject *s); + +/* === Characters Type APIs =============================================== */ + +#ifndef Py_LIMITED_API +# define Py_CPYTHON_UNICODEOBJECT_H +# include "cpython/unicodeobject.h" +# undef Py_CPYTHON_UNICODEOBJECT_H +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_UNICODEOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/include/Python/warnings.h b/ScriptEngine/third-party/backend/include/Python/warnings.h new file mode 100644 index 0000000000..a675bb5dfc --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/warnings.h @@ -0,0 +1,67 @@ +#ifndef Py_WARNINGS_H +#define Py_WARNINGS_H +#ifdef __cplusplus +extern "C" { +#endif + +#ifndef Py_LIMITED_API +PyAPI_FUNC(PyObject*) _PyWarnings_Init(void); +#endif + +PyAPI_FUNC(int) PyErr_WarnEx( + PyObject *category, + const char *message, /* UTF-8 encoded string */ + Py_ssize_t stack_level); +PyAPI_FUNC(int) PyErr_WarnFormat( + PyObject *category, + Py_ssize_t stack_level, + const char *format, /* ASCII-encoded string */ + ...); + +#if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03060000 +/* Emit a ResourceWarning warning */ +PyAPI_FUNC(int) PyErr_ResourceWarning( + PyObject *source, + Py_ssize_t stack_level, + const char *format, /* ASCII-encoded string */ + ...); +#endif +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) PyErr_WarnExplicitObject( + PyObject *category, + PyObject *message, + PyObject *filename, + int lineno, + PyObject *module, + PyObject *registry); +#endif +PyAPI_FUNC(int) PyErr_WarnExplicit( + PyObject *category, + const char *message, /* UTF-8 encoded string */ + const char *filename, /* decoded from the filesystem encoding */ + int lineno, + const char *module, /* UTF-8 encoded string */ + PyObject *registry); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(int) +PyErr_WarnExplicitFormat(PyObject *category, + const char *filename, int lineno, + const char *module, PyObject *registry, + const char *format, ...); +#endif + +/* DEPRECATED: Use PyErr_WarnEx() instead. */ +#ifndef Py_LIMITED_API +#define PyErr_Warn(category, msg) PyErr_WarnEx(category, msg, 1) +#endif + +#ifndef Py_LIMITED_API +void _PyErr_WarnUnawaitedCoroutine(PyObject *coro); +#endif + +#ifdef __cplusplus +} +#endif +#endif /* !Py_WARNINGS_H */ + diff --git a/ScriptEngine/third-party/backend/include/Python/weakrefobject.h b/ScriptEngine/third-party/backend/include/Python/weakrefobject.h new file mode 100644 index 0000000000..ac4b4821c8 --- /dev/null +++ b/ScriptEngine/third-party/backend/include/Python/weakrefobject.h @@ -0,0 +1,86 @@ +/* Weak references objects for Python. */ + +#ifndef Py_WEAKREFOBJECT_H +#define Py_WEAKREFOBJECT_H +#ifdef __cplusplus +extern "C" { +#endif + + +typedef struct _PyWeakReference PyWeakReference; + +/* PyWeakReference is the base struct for the Python ReferenceType, ProxyType, + * and CallableProxyType. + */ +#ifndef Py_LIMITED_API +struct _PyWeakReference { + PyObject_HEAD + + /* The object to which this is a weak reference, or Py_None if none. + * Note that this is a stealth reference: wr_object's refcount is + * not incremented to reflect this pointer. + */ + PyObject *wr_object; + + /* A callable to invoke when wr_object dies, or NULL if none. */ + PyObject *wr_callback; + + /* A cache for wr_object's hash code. As usual for hashes, this is -1 + * if the hash code isn't known yet. + */ + Py_hash_t hash; + + /* If wr_object is weakly referenced, wr_object has a doubly-linked NULL- + * terminated list of weak references to it. These are the list pointers. + * If wr_object goes away, wr_object is set to Py_None, and these pointers + * have no meaning then. + */ + PyWeakReference *wr_prev; + PyWeakReference *wr_next; +}; +#endif + +PyAPI_DATA(PyTypeObject) _PyWeakref_RefType; +PyAPI_DATA(PyTypeObject) _PyWeakref_ProxyType; +PyAPI_DATA(PyTypeObject) _PyWeakref_CallableProxyType; + +#define PyWeakref_CheckRef(op) PyObject_TypeCheck(op, &_PyWeakref_RefType) +#define PyWeakref_CheckRefExact(op) \ + Py_IS_TYPE(op, &_PyWeakref_RefType) +#define PyWeakref_CheckProxy(op) \ + (Py_IS_TYPE(op, &_PyWeakref_ProxyType) || \ + Py_IS_TYPE(op, &_PyWeakref_CallableProxyType)) + +#define PyWeakref_Check(op) \ + (PyWeakref_CheckRef(op) || PyWeakref_CheckProxy(op)) + + +PyAPI_FUNC(PyObject *) PyWeakref_NewRef(PyObject *ob, + PyObject *callback); +PyAPI_FUNC(PyObject *) PyWeakref_NewProxy(PyObject *ob, + PyObject *callback); +PyAPI_FUNC(PyObject *) PyWeakref_GetObject(PyObject *ref); + +#ifndef Py_LIMITED_API +PyAPI_FUNC(Py_ssize_t) _PyWeakref_GetWeakrefCount(PyWeakReference *head); + +PyAPI_FUNC(void) _PyWeakref_ClearRef(PyWeakReference *self); +#endif + +/* Explanation for the Py_REFCNT() check: when a weakref's target is part + of a long chain of deallocations which triggers the trashcan mechanism, + clearing the weakrefs can be delayed long after the target's refcount + has dropped to zero. In the meantime, code accessing the weakref will + be able to "see" the target object even though it is supposed to be + unreachable. See issue #16602. */ + +#define PyWeakref_GET_OBJECT(ref) \ + (Py_REFCNT(((PyWeakReference *)(ref))->wr_object) > 0 \ + ? ((PyWeakReference *)(ref))->wr_object \ + : Py_None) + + +#ifdef __cplusplus +} +#endif +#endif /* !Py_WEAKREFOBJECT_H */ diff --git a/ScriptEngine/third-party/backend/lib/Python/python310.lib b/ScriptEngine/third-party/backend/lib/Python/python310.lib new file mode 100644 index 0000000000..a892a09598 Binary files /dev/null and b/ScriptEngine/third-party/backend/lib/Python/python310.lib differ diff --git a/ScriptEngine/third-party/include/tomlplusplus/toml.hpp b/ScriptEngine/third-party/include/tomlplusplus/toml.hpp new file mode 100644 index 0000000000..e5a6715e82 --- /dev/null +++ b/ScriptEngine/third-party/include/tomlplusplus/toml.hpp @@ -0,0 +1,17401 @@ +//---------------------------------------------------------------------------------------------------------------------- +// +// toml++ v3.3.0 +// https://github.com/marzer/tomlplusplus +// SPDX-License-Identifier: MIT +// +//---------------------------------------------------------------------------------------------------------------------- +// +// - THIS FILE WAS ASSEMBLED FROM MULTIPLE HEADER FILES BY A SCRIPT - PLEASE DON'T EDIT IT DIRECTLY - +// +// If you wish to submit a contribution to toml++, hooray and thanks! Before you crack on, please be aware that this +// file was assembled from a number of smaller files by a python script, and code contributions should not be made +// against it directly. You should instead make your changes in the relevant source file(s). The file names of the files +// that contributed to this header can be found at the beginnings and ends of the corresponding sections of this file. +// +//---------------------------------------------------------------------------------------------------------------------- +// +// TOML Language Specifications: +// latest: https://github.com/toml-lang/toml/blob/master/README.md +// v1.0.0: https://toml.io/en/v1.0.0 +// v0.5.0: https://toml.io/en/v0.5.0 +// changelog: https://github.com/toml-lang/toml/blob/master/CHANGELOG.md +// +//---------------------------------------------------------------------------------------------------------------------- +// +// MIT License +// +// Copyright (c) Mark Gillard +// +// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated +// documentation files (the "Software"), to deal in the Software without restriction, including without limitation the +// rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to +// permit persons to whom the Software is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the +// Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE +// WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR +// COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//---------------------------------------------------------------------------------------------------------------------- +#ifndef TOMLPLUSPLUS_H +#define TOMLPLUSPLUS_H + +#define INCLUDE_TOMLPLUSPLUS_H // old guard name used pre-v3 + +//******** impl/preprocessor.h *************************************************************************************** + +#ifndef __cplusplus +#error toml++ is a C++ library. +#endif +#ifdef _MSVC_LANG +#define TOML_CPP _MSVC_LANG +#else +#define TOML_CPP __cplusplus +#endif +#if TOML_CPP >= 202002L +#undef TOML_CPP +#define TOML_CPP 20 +#elif TOML_CPP >= 201703L +#undef TOML_CPP +#define TOML_CPP 17 +#else +#if TOML_CPP < 201103L +#error toml++ requires C++17 or higher. For a pre-C++11 TOML library see https://github.com/ToruNiina/Boost.toml +#elif TOML_CPP < 201703L +#error toml++ requires C++17 or higher. For a C++11 TOML library see https://github.com/ToruNiina/toml11 +#endif +#endif + +#define TOML_MAKE_VERSION(major, minor, patch) (((major)*10000) + ((minor)*100) + ((patch))) + +#ifdef __clang__ +#define TOML_CLANG __clang_major__ +#define TOML_CLANG_VERSION TOML_MAKE_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__) +#else +#define TOML_CLANG 0 +#endif +#ifdef __INTEL_COMPILER +#define TOML_ICC __INTEL_COMPILER +#ifdef __ICL +#define TOML_ICC_CL TOML_ICC +#else +#define TOML_ICC_CL 0 +#endif +#else +#define TOML_ICC 0 +#define TOML_ICC_CL 0 +#endif +#if defined(_MSC_VER) && !TOML_CLANG && !TOML_ICC +#define TOML_MSVC _MSC_VER +#else +#define TOML_MSVC 0 +#endif +#if defined(__GNUC__) && !TOML_CLANG && !TOML_ICC +#define TOML_GCC __GNUC__ +#else +#define TOML_GCC 0 +#endif +#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) || defined(__CYGWIN__) +#define TOML_WINDOWS 1 +#else +#define TOML_WINDOWS 0 +#endif +#if defined(DOXYGEN) || defined(__DOXYGEN__) || defined(__POXY__) || defined(__poxy__) +#define TOML_DOXYGEN 1 +#else +#define TOML_DOXYGEN 0 +#endif +#ifdef __INTELLISENSE__ +#define TOML_INTELLISENSE 1 +#else +#define TOML_INTELLISENSE 0 +#endif + +// special handling for apple clang; see: +// - https://github.com/marzer/tomlplusplus/issues/189 +// - https://en.wikipedia.org/wiki/Xcode +// - https://stackoverflow.com/questions/19387043/how-can-i-reliably-detect-the-version-of-clang-at-preprocessing-time +#if TOML_CLANG && defined(__apple_build_version__) +#undef TOML_CLANG +#if TOML_CLANG_VERSION >= TOML_MAKE_VERSION(14, 0, 0) +#define TOML_CLANG 14 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(13, 1, 6) +#define TOML_CLANG 13 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(13, 0, 0) +#define TOML_CLANG 12 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(12, 0, 5) +#define TOML_CLANG 11 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(12, 0, 0) +#define TOML_CLANG 10 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(11, 0, 3) +#define TOML_CLANG 9 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(11, 0, 0) +#define TOML_CLANG 8 +#elif TOML_CLANG_VERSION >= TOML_MAKE_VERSION(10, 0, 1) +#define TOML_CLANG 7 +#else +#define TOML_CLANG 6 // not strictly correct but doesn't matter below this +#endif +#endif + +// IA64 +#if defined(__ia64__) || defined(__ia64) || defined(_IA64) || defined(__IA64__) || defined(_M_IA64) +#define TOML_ARCH_ITANIUM 1 +#else +#define TOML_ARCH_ITANIUM 0 +#endif + +// AMD64 +#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_AMD64) +#define TOML_ARCH_AMD64 1 +#else +#define TOML_ARCH_AMD64 0 +#endif + +// 32-bit x86 +#if defined(__i386__) || defined(_M_IX86) +#define TOML_ARCH_X86 1 +#else +#define TOML_ARCH_X86 0 +#endif + +// ARM +#if defined(__aarch64__) || defined(__ARM_ARCH_ISA_A64) || defined(_M_ARM64) || defined(__ARM_64BIT_STATE) \ + || defined(_M_ARM64EC) +#define TOML_ARCH_ARM32 0 +#define TOML_ARCH_ARM64 1 +#define TOML_ARCH_ARM 1 +#elif defined(__arm__) || defined(_M_ARM) || defined(__ARM_32BIT_STATE) +#define TOML_ARCH_ARM32 1 +#define TOML_ARCH_ARM64 0 +#define TOML_ARCH_ARM 1 +#else +#define TOML_ARCH_ARM32 0 +#define TOML_ARCH_ARM64 0 +#define TOML_ARCH_ARM 0 +#endif + +// TOML_HAS_INCLUDE +#ifdef __has_include +#define TOML_HAS_INCLUDE(header) __has_include(header) +#else +#define TOML_HAS_INCLUDE(header) 0 +#endif + +#ifdef __has_builtin +#define TOML_HAS_BUILTIN(name) __has_builtin(name) +#else +#define TOML_HAS_BUILTIN(name) 0 +#endif + +// TOML_HAS_FEATURE +#ifdef __has_feature +#define TOML_HAS_FEATURE(name) __has_feature(name) +#else +#define TOML_HAS_FEATURE(name) 0 +#endif + +// TOML_HAS_ATTR +#ifdef __has_attribute +#define TOML_HAS_ATTR(attr) __has_attribute(attr) +#else +#define TOML_HAS_ATTR(attr) 0 +#endif + +// TOML_HAS_CPP_ATTR +#ifdef __has_cpp_attribute +#define TOML_HAS_CPP_ATTR(attr) __has_cpp_attribute(attr) +#else +#define TOML_HAS_CPP_ATTR(attr) 0 +#endif + +// TOML_COMPILER_HAS_EXCEPTIONS +#if defined(__EXCEPTIONS) || defined(_CPPUNWIND) || defined(__cpp_exceptions) +#define TOML_COMPILER_HAS_EXCEPTIONS 1 +#else +#define TOML_COMPILER_HAS_EXCEPTIONS 0 +#endif + +// TOML_COMPILER_HAS_RTTI +#if defined(_CPPRTTI) || defined(__GXX_RTTI) || TOML_HAS_FEATURE(cxx_rtti) +#define TOML_COMPILER_HAS_RTTI 1 +#else +#define TOML_COMPILER_HAS_RTTI 0 +#endif + +// TOML_ATTR (gnu attributes) +#if TOML_CLANG || TOML_GCC || defined(__GNUC__) +#define TOML_ATTR(...) __attribute__((__VA_ARGS__)) +#else +#define TOML_ATTR(...) +#endif + +// TOML_DECLSPEC (msvc attributes) +#ifdef _MSC_VER +#define TOML_DECLSPEC(...) __declspec(__VA_ARGS__) +#else +#define TOML_DECLSPEC(...) +#endif + +// TOML_CONCAT +#define TOML_CONCAT_1(x, y) x##y +#define TOML_CONCAT(x, y) TOML_CONCAT_1(x, y) + +// TOML_MAKE_STRING +#define TOML_MAKE_STRING_1(s) #s +#define TOML_MAKE_STRING(s) TOML_MAKE_STRING_1(s) + +// TOML_PRAGMA_XXXX (compiler-specific pragmas) +#if TOML_CLANG +#define TOML_PRAGMA_CLANG(decl) _Pragma(TOML_MAKE_STRING(clang decl)) +#else +#define TOML_PRAGMA_CLANG(decl) +#endif +#if TOML_CLANG >= 9 +#define TOML_PRAGMA_CLANG_GE_9(decl) TOML_PRAGMA_CLANG(decl) +#else +#define TOML_PRAGMA_CLANG_GE_9(decl) +#endif +#if TOML_CLANG >= 10 +#define TOML_PRAGMA_CLANG_GE_10(decl) TOML_PRAGMA_CLANG(decl) +#else +#define TOML_PRAGMA_CLANG_GE_10(decl) +#endif +#if TOML_CLANG >= 11 +#define TOML_PRAGMA_CLANG_GE_11(decl) TOML_PRAGMA_CLANG(decl) +#else +#define TOML_PRAGMA_CLANG_GE_11(decl) +#endif +#if TOML_GCC +#define TOML_PRAGMA_GCC(decl) _Pragma(TOML_MAKE_STRING(GCC decl)) +#else +#define TOML_PRAGMA_GCC(decl) +#endif +#if TOML_MSVC +#define TOML_PRAGMA_MSVC(...) __pragma(__VA_ARGS__) +#else +#define TOML_PRAGMA_MSVC(...) +#endif +#if TOML_ICC +#define TOML_PRAGMA_ICC(...) __pragma(__VA_ARGS__) +#else +#define TOML_PRAGMA_ICC(...) +#endif + +// TOML_ALWAYS_INLINE +#ifdef _MSC_VER +#define TOML_ALWAYS_INLINE __forceinline +#elif TOML_GCC || TOML_CLANG || TOML_HAS_ATTR(__always_inline__) +#define TOML_ALWAYS_INLINE \ + TOML_ATTR(__always_inline__) \ + inline +#else +#define TOML_ALWAYS_INLINE inline +#endif + +// TOML_NEVER_INLINE +#ifdef _MSC_VER +#define TOML_NEVER_INLINE TOML_DECLSPEC(noinline) +#elif TOML_GCC || TOML_CLANG || TOML_HAS_ATTR(__noinline__) +#define TOML_NEVER_INLINE TOML_ATTR(__noinline__) +#else +#define TOML_NEVER_INLINE +#endif + +// MSVC attributes +#define TOML_ABSTRACT_INTERFACE TOML_DECLSPEC(novtable) +#define TOML_EMPTY_BASES TOML_DECLSPEC(empty_bases) + +// TOML_TRIVIAL_ABI +#if TOML_CLANG || TOML_HAS_ATTR(__trivial_abi__) +#define TOML_TRIVIAL_ABI TOML_ATTR(__trivial_abi__) +#else +#define TOML_TRIVIAL_ABI +#endif + +// TOML_NODISCARD +#if TOML_CPP >= 17 && TOML_HAS_CPP_ATTR(nodiscard) >= 201603 +#define TOML_NODISCARD [[nodiscard]] +#elif TOML_CLANG || TOML_GCC || TOML_HAS_ATTR(__warn_unused_result__) +#define TOML_NODISCARD TOML_ATTR(__warn_unused_result__) +#else +#define TOML_NODISCARD +#endif + +// TOML_NODISCARD_CTOR +#if TOML_CPP >= 17 && TOML_HAS_CPP_ATTR(nodiscard) >= 201907 +#define TOML_NODISCARD_CTOR [[nodiscard]] +#else +#define TOML_NODISCARD_CTOR +#endif + +// pure + const +// clang-format off +#ifdef NDEBUG + #define TOML_PURE TOML_DECLSPEC(noalias) TOML_ATTR(__pure__) + #define TOML_CONST TOML_DECLSPEC(noalias) TOML_ATTR(__const__) + #define TOML_PURE_GETTER TOML_NODISCARD TOML_PURE + #define TOML_CONST_GETTER TOML_NODISCARD TOML_CONST + #define TOML_PURE_INLINE_GETTER TOML_NODISCARD TOML_ALWAYS_INLINE TOML_PURE + #define TOML_CONST_INLINE_GETTER TOML_NODISCARD TOML_ALWAYS_INLINE TOML_CONST +#else + #define TOML_PURE + #define TOML_CONST + #define TOML_PURE_GETTER TOML_NODISCARD + #define TOML_CONST_GETTER TOML_NODISCARD + #define TOML_PURE_INLINE_GETTER TOML_NODISCARD TOML_ALWAYS_INLINE + #define TOML_CONST_INLINE_GETTER TOML_NODISCARD TOML_ALWAYS_INLINE +#endif +// clang-format on + +// TOML_ASSUME +#ifdef _MSC_VER +#define TOML_ASSUME(...) __assume(__VA_ARGS__) +#elif TOML_ICC || TOML_CLANG || TOML_HAS_BUILTIN(__builtin_assume) +#define TOML_ASSUME(...) __builtin_assume(__VA_ARGS__) +#else +#define TOML_ASSUME(...) static_assert(true) +#endif + +// TOML_UNREACHABLE +#ifdef _MSC_VER +#define TOML_UNREACHABLE __assume(0) +#elif TOML_ICC || TOML_CLANG || TOML_GCC || TOML_HAS_BUILTIN(__builtin_unreachable) +#define TOML_UNREACHABLE __builtin_unreachable() +#else +#define TOML_UNREACHABLE static_assert(true) +#endif + +// TOML_LIKELY +#if TOML_CPP >= 20 && TOML_HAS_CPP_ATTR(likely) >= 201803 +#define TOML_LIKELY(...) (__VA_ARGS__) [[likely]] +#define TOML_LIKELY_CASE [[likely]] +#elif TOML_GCC || TOML_CLANG || TOML_HAS_BUILTIN(__builtin_expect) +#define TOML_LIKELY(...) (__builtin_expect(!!(__VA_ARGS__), 1)) +#else +#define TOML_LIKELY(...) (__VA_ARGS__) +#endif +#ifndef TOML_LIKELY_CASE +#define TOML_LIKELY_CASE +#endif + +// TOML_UNLIKELY +#if TOML_CPP >= 20 && TOML_HAS_CPP_ATTR(unlikely) >= 201803 +#define TOML_UNLIKELY(...) (__VA_ARGS__) [[unlikely]] +#define TOML_UNLIKELY_CASE [[unlikely]] +#elif TOML_GCC || TOML_CLANG || TOML_HAS_BUILTIN(__builtin_expect) +#define TOML_UNLIKELY(...) (__builtin_expect(!!(__VA_ARGS__), 0)) +#else +#define TOML_UNLIKELY(...) (__VA_ARGS__) +#endif +#ifndef TOML_UNLIKELY_CASE +#define TOML_UNLIKELY_CASE +#endif + +// TOML_FLAGS_ENUM +#if TOML_CLANG || TOML_HAS_ATTR(flag_enum) +#define TOML_FLAGS_ENUM __attribute__((flag_enum)) +#else +#define TOML_FLAGS_ENUM +#endif + +// TOML_OPEN_ENUM + TOML_CLOSED_ENUM +#if TOML_CLANG || TOML_HAS_ATTR(enum_extensibility) +#define TOML_OPEN_ENUM __attribute__((enum_extensibility(open))) +#define TOML_CLOSED_ENUM __attribute__((enum_extensibility(closed))) +#else +#define TOML_OPEN_ENUM +#define TOML_CLOSED_ENUM +#endif + +// TOML_OPEN_FLAGS_ENUM + TOML_CLOSED_FLAGS_ENUM +#define TOML_OPEN_FLAGS_ENUM TOML_OPEN_ENUM TOML_FLAGS_ENUM +#define TOML_CLOSED_FLAGS_ENUM TOML_CLOSED_ENUM TOML_FLAGS_ENUM + +// TOML_MAKE_FLAGS +#define TOML_MAKE_FLAGS_2(T, op, linkage) \ + TOML_CONST_INLINE_GETTER \ + linkage constexpr T operator op(T lhs, T rhs) noexcept \ + { \ + using under = std::underlying_type_t; \ + return static_cast(static_cast(lhs) op static_cast(rhs)); \ + } \ + \ + linkage constexpr T& operator TOML_CONCAT(op, =)(T & lhs, T rhs) noexcept \ + { \ + return lhs = (lhs op rhs); \ + } \ + \ + static_assert(true) +#define TOML_MAKE_FLAGS_1(T, linkage) \ + static_assert(std::is_enum_v); \ + \ + TOML_MAKE_FLAGS_2(T, &, linkage); \ + TOML_MAKE_FLAGS_2(T, |, linkage); \ + TOML_MAKE_FLAGS_2(T, ^, linkage); \ + \ + TOML_CONST_INLINE_GETTER \ + linkage constexpr T operator~(T val) noexcept \ + { \ + using under = std::underlying_type_t; \ + return static_cast(~static_cast(val)); \ + } \ + \ + TOML_CONST_INLINE_GETTER \ + linkage constexpr bool operator!(T val) noexcept \ + { \ + using under = std::underlying_type_t; \ + return !static_cast(val); \ + } \ + \ + static_assert(true) +#define TOML_MAKE_FLAGS(T) TOML_MAKE_FLAGS_1(T, ) + +#define TOML_UNUSED(...) static_cast(__VA_ARGS__) + +#define TOML_DELETE_DEFAULTS(T) \ + T(const T&) = delete; \ + T(T&&) = delete; \ + T& operator=(const T&) = delete; \ + T& operator=(T&&) = delete + +#define TOML_ASYMMETRICAL_EQUALITY_OPS(LHS, RHS, ...) \ + __VA_ARGS__ TOML_NODISCARD \ + friend bool operator==(RHS rhs, LHS lhs) noexcept \ + { \ + return lhs == rhs; \ + } \ + __VA_ARGS__ TOML_NODISCARD \ + friend bool operator!=(LHS lhs, RHS rhs) noexcept \ + { \ + return !(lhs == rhs); \ + } \ + __VA_ARGS__ TOML_NODISCARD \ + friend bool operator!=(RHS rhs, LHS lhs) noexcept \ + { \ + return !(lhs == rhs); \ + } \ + static_assert(true) + +#define TOML_EVAL_BOOL_1(T, F) T +#define TOML_EVAL_BOOL_0(T, F) F + +#if !defined(__POXY__) && !defined(POXY_IMPLEMENTATION_DETAIL) +#define POXY_IMPLEMENTATION_DETAIL(...) __VA_ARGS__ +#endif + +// COMPILER-SPECIFIC WARNING MANAGEMENT + +#if TOML_CLANG + +#define TOML_PUSH_WARNINGS \ + TOML_PRAGMA_CLANG(diagnostic push) \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wunknown-warning-option") \ + static_assert(true) + +#define TOML_DISABLE_SWITCH_WARNINGS \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wswitch") \ + static_assert(true) + +#define TOML_DISABLE_ARITHMETIC_WARNINGS \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wfloat-equal") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wdouble-promotion") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wchar-subscripts") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wshift-sign-overflow") \ + static_assert(true) + +#define TOML_DISABLE_SPAM_WARNINGS \ + TOML_PRAGMA_CLANG_GE_9(diagnostic ignored "-Wctad-maybe-unsupported") \ + TOML_PRAGMA_CLANG_GE_10(diagnostic ignored "-Wzero-as-null-pointer-constant") \ + TOML_PRAGMA_CLANG_GE_11(diagnostic ignored "-Wsuggest-destructor-override") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wweak-vtables") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wweak-template-vtables") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wdouble-promotion") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wchar-subscripts") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wmissing-field-initializers") \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Wpadded") \ + static_assert(true) + +#define TOML_POP_WARNINGS \ + TOML_PRAGMA_CLANG(diagnostic pop) \ + static_assert(true) + +#define TOML_DISABLE_WARNINGS \ + TOML_PRAGMA_CLANG(diagnostic push) \ + TOML_PRAGMA_CLANG(diagnostic ignored "-Weverything") \ + static_assert(true, "") + +#define TOML_ENABLE_WARNINGS \ + TOML_PRAGMA_CLANG(diagnostic pop) \ + static_assert(true) + +#define TOML_SIMPLE_STATIC_ASSERT_MESSAGES 1 + +#elif TOML_MSVC + +#define TOML_PUSH_WARNINGS \ + __pragma(warning(push)) \ + static_assert(true) + +#if TOML_HAS_INCLUDE() +#pragma warning(push, 0) +#include +#pragma warning(pop) +#define TOML_DISABLE_CODE_ANALYSIS_WARNINGS \ + __pragma(warning(disable : ALL_CODE_ANALYSIS_WARNINGS)) \ + static_assert(true) +#else +#define TOML_DISABLE_CODE_ANALYSIS_WARNINGS static_assert(true) +#endif + +#define TOML_DISABLE_SWITCH_WARNINGS \ + __pragma(warning(disable : 4061)) \ + __pragma(warning(disable : 4062)) \ + __pragma(warning(disable : 4063)) \ + __pragma(warning(disable : 5262)) /* switch-case implicit fallthrough (false-positive) */ \ + __pragma(warning(disable : 26819)) /* cg: unannotated fallthrough */ \ + static_assert(true) + +#define TOML_DISABLE_SPAM_WARNINGS \ + __pragma(warning(disable : 4127)) /* conditional expr is constant */ \ + __pragma(warning(disable : 4324)) /* structure was padded due to alignment specifier */ \ + __pragma(warning(disable : 4348)) \ + __pragma(warning(disable : 4464)) /* relative include path contains '..' */ \ + __pragma(warning(disable : 4505)) /* unreferenced local function removed */ \ + __pragma(warning(disable : 4514)) /* unreferenced inline function has been removed */ \ + __pragma(warning(disable : 4582)) /* constructor is not implicitly called */ \ + __pragma(warning(disable : 4619)) /* there is no warning number 'XXXX' */ \ + __pragma(warning(disable : 4623)) /* default constructor was implicitly defined as deleted */ \ + __pragma(warning(disable : 4625)) /* copy constructor was implicitly defined as deleted */ \ + __pragma(warning(disable : 4626)) /* assignment operator was implicitly defined as deleted */ \ + __pragma(warning(disable : 4710)) /* function not inlined */ \ + __pragma(warning(disable : 4711)) /* function selected for automatic expansion */ \ + __pragma(warning(disable : 4820)) /* N bytes padding added */ \ + __pragma(warning(disable : 4946)) /* reinterpret_cast used between related classes */ \ + __pragma(warning(disable : 5026)) /* move constructor was implicitly defined as deleted */ \ + __pragma(warning(disable : 5027)) /* move assignment operator was implicitly defined as deleted */ \ + __pragma(warning(disable : 5039)) /* potentially throwing function passed to 'extern "C"' function */ \ + __pragma(warning(disable : 5045)) /* Compiler will insert Spectre mitigation */ \ + __pragma(warning(disable : 5264)) /* const variable is not used (false-positive) */ \ + __pragma(warning(disable : 26451)) \ + __pragma(warning(disable : 26490)) \ + __pragma(warning(disable : 26495)) \ + __pragma(warning(disable : 26812)) \ + __pragma(warning(disable : 26819)) \ + static_assert(true) + +#define TOML_DISABLE_ARITHMETIC_WARNINGS \ + __pragma(warning(disable : 4365)) /* argument signed/unsigned mismatch */ \ + __pragma(warning(disable : 4738)) /* storing 32-bit float result in memory */ \ + __pragma(warning(disable : 5219)) /* implicit conversion from integral to float */ \ + static_assert(true) + +#define TOML_POP_WARNINGS \ + __pragma(warning(pop)) \ + static_assert(true) + +#define TOML_DISABLE_WARNINGS \ + __pragma(warning(push, 0)) \ + __pragma(warning(disable : 4348)) \ + __pragma(warning(disable : 4668)) \ + __pragma(warning(disable : 5105)) \ + __pragma(warning(disable : 5264)) \ + TOML_DISABLE_CODE_ANALYSIS_WARNINGS; \ + TOML_DISABLE_SWITCH_WARNINGS; \ + TOML_DISABLE_SPAM_WARNINGS; \ + TOML_DISABLE_ARITHMETIC_WARNINGS; \ + static_assert(true) + +#define TOML_ENABLE_WARNINGS TOML_POP_WARNINGS + +#elif TOML_ICC + +#define TOML_PUSH_WARNINGS \ + __pragma(warning(push)) \ + static_assert(true) + +#define TOML_DISABLE_SPAM_WARNINGS \ + __pragma(warning(disable : 82)) /* storage class is not first */ \ + __pragma(warning(disable : 111)) /* statement unreachable (false-positive) */ \ + __pragma(warning(disable : 869)) /* unreferenced parameter */ \ + __pragma(warning(disable : 1011)) /* missing return (false-positive) */ \ + __pragma(warning(disable : 2261)) /* assume expr side-effects discarded */ \ + static_assert(true) + +#define TOML_POP_WARNINGS \ + __pragma(warning(pop)) \ + static_assert(true) + +#define TOML_DISABLE_WARNINGS \ + __pragma(warning(push, 0)) \ + TOML_DISABLE_SPAM_WARNINGS + +#define TOML_ENABLE_WARNINGS \ + __pragma(warning(pop)) \ + static_assert(true) + +#elif TOML_GCC + +#define TOML_PUSH_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic push) \ + static_assert(true) + +#define TOML_DISABLE_SWITCH_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wswitch") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wswitch-enum") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wswitch-default") \ + static_assert(true) + +#define TOML_DISABLE_ARITHMETIC_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wfloat-equal") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wsign-conversion") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wchar-subscripts") \ + static_assert(true) + +#define TOML_DISABLE_SUGGEST_ATTR_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wsuggest-attribute=const") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wsuggest-attribute=pure") \ + static_assert(true) + +#define TOML_DISABLE_SPAM_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wpadded") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wcast-align") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wcomment") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wtype-limits") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wuseless-cast") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wchar-subscripts") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wsubobject-linkage") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wmissing-field-initializers") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wmaybe-uninitialized") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wnoexcept") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wnull-dereference") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wduplicated-branches") \ + static_assert(true) + +#define TOML_POP_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic pop) \ + static_assert(true) + +#define TOML_DISABLE_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic push) \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wall") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wextra") \ + TOML_PRAGMA_GCC(diagnostic ignored "-Wpedantic") \ + TOML_DISABLE_SWITCH_WARNINGS; \ + TOML_DISABLE_ARITHMETIC_WARNINGS; \ + TOML_DISABLE_SUGGEST_ATTR_WARNINGS; \ + TOML_DISABLE_SPAM_WARNINGS; \ + static_assert(true) + +#define TOML_ENABLE_WARNINGS \ + TOML_PRAGMA_GCC(diagnostic pop) \ + static_assert(true) + +#endif + +#ifndef TOML_PUSH_WARNINGS +#define TOML_PUSH_WARNINGS static_assert(true) +#endif +#ifndef TOML_DISABLE_CODE_ANALYSIS_WARNINGS +#define TOML_DISABLE_CODE_ANALYSIS_WARNINGS static_assert(true) +#endif +#ifndef TOML_DISABLE_SWITCH_WARNINGS +#define TOML_DISABLE_SWITCH_WARNINGS static_assert(true) +#endif +#ifndef TOML_DISABLE_SUGGEST_ATTR_WARNINGS +#define TOML_DISABLE_SUGGEST_ATTR_WARNINGS static_assert(true) +#endif +#ifndef TOML_DISABLE_SPAM_WARNINGS +#define TOML_DISABLE_SPAM_WARNINGS static_assert(true) +#endif +#ifndef TOML_DISABLE_ARITHMETIC_WARNINGS +#define TOML_DISABLE_ARITHMETIC_WARNINGS static_assert(true) +#endif +#ifndef TOML_POP_WARNINGS +#define TOML_POP_WARNINGS static_assert(true) +#endif +#ifndef TOML_DISABLE_WARNINGS +#define TOML_DISABLE_WARNINGS static_assert(true) +#endif +#ifndef TOML_ENABLE_WARNINGS +#define TOML_ENABLE_WARNINGS static_assert(true) +#endif +#ifndef TOML_SIMPLE_STATIC_ASSERT_MESSAGES +#define TOML_SIMPLE_STATIC_ASSERT_MESSAGES 0 +#endif + +#ifdef TOML_CONFIG_HEADER +#include TOML_CONFIG_HEADER +#endif + +// is the library being built as a shared lib/dll using meson and friends? +#ifndef TOML_SHARED_LIB +#define TOML_SHARED_LIB 0 +#endif + +// header-only mode +#if !defined(TOML_HEADER_ONLY) && defined(TOML_ALL_INLINE) // was TOML_ALL_INLINE pre-2.0 +#define TOML_HEADER_ONLY TOML_ALL_INLINE +#endif +#if !defined(TOML_HEADER_ONLY) || (defined(TOML_HEADER_ONLY) && TOML_HEADER_ONLY) || TOML_INTELLISENSE +#undef TOML_HEADER_ONLY +#define TOML_HEADER_ONLY 1 +#endif +#if TOML_DOXYGEN || TOML_SHARED_LIB +#undef TOML_HEADER_ONLY +#define TOML_HEADER_ONLY 0 +#endif + +// internal implementation switch +#if defined(TOML_IMPLEMENTATION) || TOML_HEADER_ONLY +#undef TOML_IMPLEMENTATION +#define TOML_IMPLEMENTATION 1 +#else +#define TOML_IMPLEMENTATION 0 +#endif + +// dll/shared lib function exports (legacy - TOML_API was the old name for this setting) +#if !defined(TOML_EXPORTED_MEMBER_FUNCTION) && !defined(TOML_EXPORTED_STATIC_FUNCTION) \ + && !defined(TOML_EXPORTED_FREE_FUNCTION) && !defined(TOML_EXPORTED_CLASS) && defined(TOML_API) +#define TOML_EXPORTED_MEMBER_FUNCTION TOML_API +#define TOML_EXPORTED_STATIC_FUNCTION TOML_API +#define TOML_EXPORTED_FREE_FUNCTION TOML_API +#endif + +// dll/shared lib exports +#if TOML_SHARED_LIB +#undef TOML_API +#undef TOML_EXPORTED_CLASS +#undef TOML_EXPORTED_MEMBER_FUNCTION +#undef TOML_EXPORTED_STATIC_FUNCTION +#undef TOML_EXPORTED_FREE_FUNCTION +#if TOML_WINDOWS +#if TOML_IMPLEMENTATION +#define TOML_EXPORTED_CLASS __declspec(dllexport) +#define TOML_EXPORTED_FREE_FUNCTION __declspec(dllexport) +#else +#define TOML_EXPORTED_CLASS __declspec(dllimport) +#define TOML_EXPORTED_FREE_FUNCTION __declspec(dllimport) +#endif +#ifndef TOML_CALLCONV +#define TOML_CALLCONV __cdecl +#endif +#elif defined(__GNUC__) && __GNUC__ >= 4 +#define TOML_EXPORTED_CLASS __attribute__((visibility("default"))) +#define TOML_EXPORTED_MEMBER_FUNCTION __attribute__((visibility("default"))) +#define TOML_EXPORTED_STATIC_FUNCTION __attribute__((visibility("default"))) +#define TOML_EXPORTED_FREE_FUNCTION __attribute__((visibility("default"))) +#endif +#endif +#ifndef TOML_EXPORTED_CLASS +#define TOML_EXPORTED_CLASS +#endif +#ifndef TOML_EXPORTED_MEMBER_FUNCTION +#define TOML_EXPORTED_MEMBER_FUNCTION +#endif +#ifndef TOML_EXPORTED_STATIC_FUNCTION +#define TOML_EXPORTED_STATIC_FUNCTION +#endif +#ifndef TOML_EXPORTED_FREE_FUNCTION +#define TOML_EXPORTED_FREE_FUNCTION +#endif + +// experimental language features +#if !defined(TOML_ENABLE_UNRELEASED_FEATURES) && defined(TOML_UNRELEASED_FEATURES) // was TOML_UNRELEASED_FEATURES + // pre-3.0 +#define TOML_ENABLE_UNRELEASED_FEATURES TOML_UNRELEASED_FEATURES +#endif +#if (defined(TOML_ENABLE_UNRELEASED_FEATURES) && TOML_ENABLE_UNRELEASED_FEATURES) || TOML_INTELLISENSE +#undef TOML_ENABLE_UNRELEASED_FEATURES +#define TOML_ENABLE_UNRELEASED_FEATURES 1 +#endif +#ifndef TOML_ENABLE_UNRELEASED_FEATURES +#define TOML_ENABLE_UNRELEASED_FEATURES 0 +#endif + +// parser +#if !defined(TOML_ENABLE_PARSER) && defined(TOML_PARSER) // was TOML_PARSER pre-3.0 +#define TOML_ENABLE_PARSER TOML_PARSER +#endif +#if !defined(TOML_ENABLE_PARSER) || (defined(TOML_ENABLE_PARSER) && TOML_ENABLE_PARSER) || TOML_INTELLISENSE +#undef TOML_ENABLE_PARSER +#define TOML_ENABLE_PARSER 1 +#endif + +// formatters +#if !defined(TOML_ENABLE_FORMATTERS) || (defined(TOML_ENABLE_FORMATTERS) && TOML_ENABLE_FORMATTERS) || TOML_INTELLISENSE +#undef TOML_ENABLE_FORMATTERS +#define TOML_ENABLE_FORMATTERS 1 +#endif + +// SIMD +#if !defined(TOML_ENABLE_SIMD) || (defined(TOML_ENABLE_SIMD) && TOML_ENABLE_SIMD) || TOML_INTELLISENSE +#undef TOML_ENABLE_SIMD +#define TOML_ENABLE_SIMD 1 +#endif + +// windows compat +#if !defined(TOML_ENABLE_WINDOWS_COMPAT) && defined(TOML_WINDOWS_COMPAT) // was TOML_WINDOWS_COMPAT pre-3.0 +#define TOML_ENABLE_WINDOWS_COMPAT TOML_WINDOWS_COMPAT +#endif +#if !defined(TOML_ENABLE_WINDOWS_COMPAT) || (defined(TOML_ENABLE_WINDOWS_COMPAT) && TOML_ENABLE_WINDOWS_COMPAT) \ + || TOML_INTELLISENSE +#undef TOML_ENABLE_WINDOWS_COMPAT +#define TOML_ENABLE_WINDOWS_COMPAT 1 +#endif + +#if !TOML_WINDOWS +#undef TOML_ENABLE_WINDOWS_COMPAT +#define TOML_ENABLE_WINDOWS_COMPAT 0 +#endif + +#ifndef TOML_INCLUDE_WINDOWS_H +#define TOML_INCLUDE_WINDOWS_H 0 +#endif + +// custom optional +#ifdef TOML_OPTIONAL_TYPE +#define TOML_HAS_CUSTOM_OPTIONAL_TYPE 1 +#else +#define TOML_HAS_CUSTOM_OPTIONAL_TYPE 0 +#endif + +// exceptions (library use) +#if TOML_COMPILER_HAS_EXCEPTIONS +#if !defined(TOML_EXCEPTIONS) || (defined(TOML_EXCEPTIONS) && TOML_EXCEPTIONS) +#undef TOML_EXCEPTIONS +#define TOML_EXCEPTIONS 1 +#endif +#else +#if defined(TOML_EXCEPTIONS) && TOML_EXCEPTIONS +#error TOML_EXCEPTIONS was explicitly enabled but exceptions are disabled/unsupported by the compiler. +#endif +#undef TOML_EXCEPTIONS +#define TOML_EXCEPTIONS 0 +#endif + +// calling convention for static/free/friend functions +#ifndef TOML_CALLCONV +#define TOML_CALLCONV +#endif + +#ifndef TOML_UNDEF_MACROS +#define TOML_UNDEF_MACROS 1 +#endif + +#ifndef TOML_MAX_NESTED_VALUES +#define TOML_MAX_NESTED_VALUES 256 +// this refers to the depth of nested values, e.g. inline tables and arrays. +// 256 is crazy high! if you're hitting this limit with real input, TOML is probably the wrong tool for the job... +#endif + +#ifdef TOML_CHAR_8_STRINGS +#if TOML_CHAR_8_STRINGS +#error TOML_CHAR_8_STRINGS was removed in toml++ 2.0.0; all value setters and getters now work with char8_t strings implicitly. +#endif +#endif + +#ifdef TOML_LARGE_FILES +#if !TOML_LARGE_FILES +#error Support for !TOML_LARGE_FILES (i.e. 'small files') was removed in toml++ 3.0.0. +#endif +#endif + +#ifndef TOML_LIFETIME_HOOKS +#define TOML_LIFETIME_HOOKS 0 +#endif + +#ifdef NDEBUG +#undef TOML_ASSERT +#define TOML_ASSERT(expr) static_assert(true) +#endif +#ifndef TOML_ASSERT +#ifndef assert +TOML_DISABLE_WARNINGS; +#include +TOML_ENABLE_WARNINGS; +#endif +#define TOML_ASSERT(expr) assert(expr) +#endif +#ifdef NDEBUG +#define TOML_ASSERT_ASSUME(expr) TOML_ASSUME(expr) +#else +#define TOML_ASSERT_ASSUME(expr) TOML_ASSERT(expr) +#endif + +#ifndef TOML_ENABLE_FLOAT16 +#define TOML_ENABLE_FLOAT16 0 +#endif + +#if !defined(TOML_FLOAT_CHARCONV) && (TOML_GCC || TOML_CLANG || (TOML_ICC && !TOML_ICC_CL)) +// not supported by any version of GCC or Clang as of 26/11/2020 +// not supported by any version of ICC on Linux as of 11/01/2021 +#define TOML_FLOAT_CHARCONV 0 +#endif +#if !defined(TOML_INT_CHARCONV) && (defined(__EMSCRIPTEN__) || defined(__APPLE__)) +// causes link errors on emscripten +// causes Mac OS SDK version errors on some versions of Apple Clang +#define TOML_INT_CHARCONV 0 +#endif +#ifndef TOML_INT_CHARCONV +#define TOML_INT_CHARCONV 1 +#endif +#ifndef TOML_FLOAT_CHARCONV +#define TOML_FLOAT_CHARCONV 1 +#endif +#if (TOML_INT_CHARCONV || TOML_FLOAT_CHARCONV) && !TOML_HAS_INCLUDE() +#undef TOML_INT_CHARCONV +#undef TOML_FLOAT_CHARCONV +#define TOML_INT_CHARCONV 0 +#define TOML_FLOAT_CHARCONV 0 +#endif + +#if defined(__cpp_concepts) && __cpp_concepts >= 201907 +#define TOML_REQUIRES(...) requires(__VA_ARGS__) +#else +#define TOML_REQUIRES(...) +#endif +#define TOML_ENABLE_IF(...) , typename std::enable_if<(__VA_ARGS__), int>::type = 0 +#define TOML_CONSTRAINED_TEMPLATE(condition, ...) \ + template <__VA_ARGS__ TOML_ENABLE_IF(condition)> \ + TOML_REQUIRES(condition) +#define TOML_HIDDEN_CONSTRAINT(condition, ...) TOML_CONSTRAINED_TEMPLATE(condition, __VA_ARGS__) + +#if defined(__SIZEOF_FLOAT128__) && defined(__FLT128_MANT_DIG__) && defined(__LDBL_MANT_DIG__) \ + && __FLT128_MANT_DIG__ > __LDBL_MANT_DIG__ +#define TOML_FLOAT128 __float128 +#endif + +#ifdef __SIZEOF_INT128__ +#define TOML_INT128 __int128_t +#define TOML_UINT128 __uint128_t +#endif + +// clang-format off + +//******** impl/version.h ******************************************************************************************** + +#define TOML_LIB_MAJOR 3 +#define TOML_LIB_MINOR 3 +#define TOML_LIB_PATCH 0 + +#define TOML_LANG_MAJOR 1 +#define TOML_LANG_MINOR 0 +#define TOML_LANG_PATCH 0 + +//******** impl/preprocessor.h *************************************************************************************** + +#define TOML_LIB_SINGLE_HEADER 1 + +#if TOML_ENABLE_UNRELEASED_FEATURES + #define TOML_LANG_EFFECTIVE_VERSION \ + TOML_MAKE_VERSION(TOML_LANG_MAJOR, TOML_LANG_MINOR, TOML_LANG_PATCH+1) +#else + #define TOML_LANG_EFFECTIVE_VERSION \ + TOML_MAKE_VERSION(TOML_LANG_MAJOR, TOML_LANG_MINOR, TOML_LANG_PATCH) +#endif + +#define TOML_LANG_HIGHER_THAN(major, minor, patch) \ + (TOML_LANG_EFFECTIVE_VERSION > TOML_MAKE_VERSION(major, minor, patch)) + +#define TOML_LANG_AT_LEAST(major, minor, patch) \ + (TOML_LANG_EFFECTIVE_VERSION >= TOML_MAKE_VERSION(major, minor, patch)) + +#define TOML_LANG_UNRELEASED \ + TOML_LANG_HIGHER_THAN(TOML_LANG_MAJOR, TOML_LANG_MINOR, TOML_LANG_PATCH) + +#ifndef TOML_ABI_NAMESPACES + #if TOML_DOXYGEN + #define TOML_ABI_NAMESPACES 0 + #else + #define TOML_ABI_NAMESPACES 1 + #endif +#endif +#if TOML_ABI_NAMESPACES + #define TOML_NAMESPACE_START namespace toml { inline namespace TOML_CONCAT(v, TOML_LIB_MAJOR) + #define TOML_NAMESPACE_END } static_assert(true) + #define TOML_NAMESPACE ::toml::TOML_CONCAT(v, TOML_LIB_MAJOR) + #define TOML_ABI_NAMESPACE_START(name) inline namespace name { static_assert(true) + #define TOML_ABI_NAMESPACE_BOOL(cond, T, F) TOML_ABI_NAMESPACE_START(TOML_CONCAT(TOML_EVAL_BOOL_, cond)(T, F)) + #define TOML_ABI_NAMESPACE_END } static_assert(true) +#else + #define TOML_NAMESPACE_START namespace toml + #define TOML_NAMESPACE_END static_assert(true) + #define TOML_NAMESPACE toml + #define TOML_ABI_NAMESPACE_START(...) static_assert(true) + #define TOML_ABI_NAMESPACE_BOOL(...) static_assert(true) + #define TOML_ABI_NAMESPACE_END static_assert(true) +#endif +#define TOML_IMPL_NAMESPACE_START TOML_NAMESPACE_START { namespace impl +#define TOML_IMPL_NAMESPACE_END } TOML_NAMESPACE_END +#if TOML_HEADER_ONLY + #define TOML_ANON_NAMESPACE_START static_assert(TOML_IMPLEMENTATION); TOML_IMPL_NAMESPACE_START + #define TOML_ANON_NAMESPACE_END TOML_IMPL_NAMESPACE_END + #define TOML_ANON_NAMESPACE TOML_NAMESPACE::impl + #define TOML_EXTERNAL_LINKAGE inline + #define TOML_INTERNAL_LINKAGE inline +#else + #define TOML_ANON_NAMESPACE_START static_assert(TOML_IMPLEMENTATION); \ + using namespace toml; \ + namespace + #define TOML_ANON_NAMESPACE_END static_assert(true) + #define TOML_ANON_NAMESPACE + #define TOML_EXTERNAL_LINKAGE + #define TOML_INTERNAL_LINKAGE static +#endif + +// clang-format on + +// clang-format off + +#if TOML_SIMPLE_STATIC_ASSERT_MESSAGES + + #define TOML_SA_NEWLINE " " + #define TOML_SA_LIST_SEP ", " + #define TOML_SA_LIST_BEG " (" + #define TOML_SA_LIST_END ")" + #define TOML_SA_LIST_NEW " " + #define TOML_SA_LIST_NXT ", " + +#else + + #define TOML_SA_NEWLINE "\n| " + #define TOML_SA_LIST_SEP TOML_SA_NEWLINE " - " + #define TOML_SA_LIST_BEG TOML_SA_LIST_SEP + #define TOML_SA_LIST_END + #define TOML_SA_LIST_NEW TOML_SA_NEWLINE TOML_SA_NEWLINE + #define TOML_SA_LIST_NXT TOML_SA_LIST_NEW + +#endif + +#define TOML_SA_NATIVE_VALUE_TYPE_LIST \ + TOML_SA_LIST_BEG "std::string" \ + TOML_SA_LIST_SEP "int64_t" \ + TOML_SA_LIST_SEP "double" \ + TOML_SA_LIST_SEP "bool" \ + TOML_SA_LIST_SEP "toml::date" \ + TOML_SA_LIST_SEP "toml::time" \ + TOML_SA_LIST_SEP "toml::date_time" \ + TOML_SA_LIST_END + +#define TOML_SA_NODE_TYPE_LIST \ + TOML_SA_LIST_BEG "toml::table" \ + TOML_SA_LIST_SEP "toml::array" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_SEP "toml::value" \ + TOML_SA_LIST_END + +#define TOML_SA_UNWRAPPED_NODE_TYPE_LIST \ + TOML_SA_LIST_NEW "A native TOML value type" \ + TOML_SA_NATIVE_VALUE_TYPE_LIST \ + \ + TOML_SA_LIST_NXT "A TOML node type" \ + TOML_SA_NODE_TYPE_LIST + +// clang-format on + +TOML_PUSH_WARNINGS; +TOML_DISABLE_SPAM_WARNINGS; +TOML_DISABLE_SWITCH_WARNINGS; +TOML_DISABLE_SUGGEST_ATTR_WARNINGS; + +// misc warning false-positives +#if TOML_MSVC +#pragma warning(disable : 5031) // #pragma warning(pop): likely mismatch +#if TOML_SHARED_LIB +#pragma warning(disable : 4251) // dll exports for std lib types +#endif +#elif TOML_CLANG +TOML_PRAGMA_CLANG(diagnostic ignored "-Wheader-hygiene") +#if TOML_CLANG >= 12 +TOML_PRAGMA_CLANG(diagnostic ignored "-Wc++20-extensions") +#endif +#if TOML_CLANG == 13 +TOML_PRAGMA_CLANG(diagnostic ignored "-Wreserved-identifier") +#endif +#endif + +//******** impl/std_new.h ******************************************************************************************** + +TOML_DISABLE_WARNINGS; +#include +TOML_ENABLE_WARNINGS; + +#if (!defined(__apple_build_version__) && TOML_CLANG >= 8) || TOML_GCC >= 7 || TOML_ICC >= 1910 || TOML_MSVC >= 1914 +#define TOML_LAUNDER(x) __builtin_launder(x) +#elif defined(__cpp_lib_launder) && __cpp_lib_launder >= 201606 +#define TOML_LAUNDER(x) std::launder(x) +#else +#define TOML_LAUNDER(x) x +#endif + +//******** impl/std_string.h ***************************************************************************************** + +TOML_DISABLE_WARNINGS; +#include +#include +TOML_ENABLE_WARNINGS; + +#if TOML_DOXYGEN \ + || (defined(__cpp_char8_t) && __cpp_char8_t >= 201811 && defined(__cpp_lib_char8_t) \ + && __cpp_lib_char8_t >= 201907) +#define TOML_HAS_CHAR8 1 +#else +#define TOML_HAS_CHAR8 0 +#endif + +namespace toml // non-abi namespace; this is not an error +{ + using namespace std::string_literals; + using namespace std::string_view_literals; +} + +#if TOML_ENABLE_WINDOWS_COMPAT + +TOML_IMPL_NAMESPACE_START +{ + TOML_NODISCARD + TOML_EXPORTED_FREE_FUNCTION + std::string narrow(std::wstring_view); + + TOML_NODISCARD + TOML_EXPORTED_FREE_FUNCTION + std::wstring widen(std::string_view); + +#if TOML_HAS_CHAR8 + + TOML_NODISCARD + TOML_EXPORTED_FREE_FUNCTION + std::wstring widen(std::u8string_view); + +#endif +} +TOML_IMPL_NAMESPACE_END; + +#endif // TOML_ENABLE_WINDOWS_COMPAT + +//******** impl/std_optional.h *************************************************************************************** + +TOML_DISABLE_WARNINGS; +#if !TOML_HAS_CUSTOM_OPTIONAL_TYPE +#include +#endif +TOML_ENABLE_WARNINGS; + +TOML_NAMESPACE_START +{ +#if TOML_HAS_CUSTOM_OPTIONAL_TYPE + + template + using optional = TOML_OPTIONAL_TYPE; + +#else + + template + using optional = std::optional; + +#endif +} +TOML_NAMESPACE_END; + +//******** impl/forward_declarations.h ******************************************************************************* + +TOML_DISABLE_WARNINGS; +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +TOML_ENABLE_WARNINGS; +TOML_PUSH_WARNINGS; +#ifdef _MSC_VER +#ifndef __clang__ +#pragma inline_recursion(on) +#endif +#pragma push_macro("min") +#pragma push_macro("max") +#undef min +#undef max +#endif + +#ifndef TOML_DISABLE_ENVIRONMENT_CHECKS +#define TOML_ENV_MESSAGE \ + "If you're seeing this error it's because you're building toml++ for an environment that doesn't conform to " \ + "one of the 'ground truths' assumed by the library. Essentially this just means that I don't have the " \ + "resources to test on more platforms, but I wish I did! You can try disabling the checks by defining " \ + "TOML_DISABLE_ENVIRONMENT_CHECKS, but your mileage may vary. Please consider filing an issue at " \ + "https://github.com/marzer/tomlplusplus/issues to help me improve support for your target environment. " \ + "Thanks!" + +static_assert(CHAR_BIT == 8, TOML_ENV_MESSAGE); +static_assert(FLT_RADIX == 2, TOML_ENV_MESSAGE); +static_assert('A' == 65, TOML_ENV_MESSAGE); +static_assert(sizeof(double) == 8, TOML_ENV_MESSAGE); +static_assert(std::numeric_limits::is_iec559, TOML_ENV_MESSAGE); +static_assert(std::numeric_limits::digits == 53, TOML_ENV_MESSAGE); +static_assert(std::numeric_limits::digits10 == 15, TOML_ENV_MESSAGE); + +#undef TOML_ENV_MESSAGE +#endif // !TOML_DISABLE_ENVIRONMENT_CHECKS + +// undocumented forward declarations are hidden from doxygen because they fuck it up =/ + +namespace toml // non-abi namespace; this is not an error +{ + using ::std::size_t; + using ::std::intptr_t; + using ::std::uintptr_t; + using ::std::ptrdiff_t; + using ::std::nullptr_t; + using ::std::int8_t; + using ::std::int16_t; + using ::std::int32_t; + using ::std::int64_t; + using ::std::uint8_t; + using ::std::uint16_t; + using ::std::uint32_t; + using ::std::uint64_t; + using ::std::uint_least32_t; + using ::std::uint_least64_t; +} + +TOML_NAMESPACE_START +{ + struct date; + struct time; + struct time_offset; + + TOML_ABI_NAMESPACE_BOOL(TOML_HAS_CUSTOM_OPTIONAL_TYPE, custopt, stdopt); + struct date_time; + TOML_ABI_NAMESPACE_END; + + struct source_position; + struct source_region; + + class node; + template + class node_view; + + class key; + class array; + class table; + template + class value; + + class path; + + class toml_formatter; + class json_formatter; + class yaml_formatter; + + TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, ex, noex); +#if TOML_EXCEPTIONS + using parse_result = table; +#else + class parse_result; +#endif + TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS +} +TOML_NAMESPACE_END; + +TOML_IMPL_NAMESPACE_START +{ + using node_ptr = std::unique_ptr; + + TOML_ABI_NAMESPACE_BOOL(TOML_EXCEPTIONS, impl_ex, impl_noex); + class parser; + TOML_ABI_NAMESPACE_END; // TOML_EXCEPTIONS + + // clang-format off + + inline constexpr std::string_view control_char_escapes[] = + { + "\\u0000"sv, + "\\u0001"sv, + "\\u0002"sv, + "\\u0003"sv, + "\\u0004"sv, + "\\u0005"sv, + "\\u0006"sv, + "\\u0007"sv, + "\\b"sv, + "\\t"sv, + "\\n"sv, + "\\u000B"sv, + "\\f"sv, + "\\r"sv, + "\\u000E"sv, + "\\u000F"sv, + "\\u0010"sv, + "\\u0011"sv, + "\\u0012"sv, + "\\u0013"sv, + "\\u0014"sv, + "\\u0015"sv, + "\\u0016"sv, + "\\u0017"sv, + "\\u0018"sv, + "\\u0019"sv, + "\\u001A"sv, + "\\u001B"sv, + "\\u001C"sv, + "\\u001D"sv, + "\\u001E"sv, + "\\u001F"sv, + }; + + inline constexpr std::string_view node_type_friendly_names[] = + { + "none"sv, + "table"sv, + "array"sv, + "string"sv, + "integer"sv, + "floating-point"sv, + "boolean"sv, + "date"sv, + "time"sv, + "date-time"sv + }; + + // clang-format on +} +TOML_IMPL_NAMESPACE_END; + +#if TOML_ABI_NAMESPACES +#if TOML_EXCEPTIONS +#define TOML_PARSER_TYPENAME TOML_NAMESPACE::impl::impl_ex::parser +#else +#define TOML_PARSER_TYPENAME TOML_NAMESPACE::impl::impl_noex::parser +#endif +#else +#define TOML_PARSER_TYPENAME TOML_NAMESPACE::impl::parser +#endif + +namespace toml +{ +} + +TOML_NAMESPACE_START // abi namespace +{ + inline namespace literals + { + } + + enum class TOML_CLOSED_ENUM node_type : uint8_t + { + none, + table, + array, + string, + integer, + floating_point, + boolean, + date, + time, + date_time + }; + + template + inline std::basic_ostream& operator<<(std::basic_ostream& lhs, node_type rhs) + { + const auto str = impl::node_type_friendly_names[static_cast>(rhs)]; + using str_char_t = decltype(str)::value_type; + if constexpr (std::is_same_v) + return lhs << str; + else + { + if constexpr (sizeof(Char) == sizeof(str_char_t)) + return lhs << std::basic_string_view{ reinterpret_cast(str.data()), str.length() }; + else + return lhs << str.data(); + } + } + + enum class TOML_OPEN_FLAGS_ENUM value_flags : uint16_t // being an "OPEN" flags enum is not an error + { + none, + format_as_binary = 1, + format_as_octal = 2, + format_as_hexadecimal = 3, + }; + TOML_MAKE_FLAGS(value_flags); + + inline constexpr value_flags preserve_source_value_flags = + POXY_IMPLEMENTATION_DETAIL(value_flags{ static_cast>(-1) }); + + enum class TOML_CLOSED_FLAGS_ENUM format_flags : uint64_t + { + none, + quote_dates_and_times = (1ull << 0), + quote_infinities_and_nans = (1ull << 1), + allow_literal_strings = (1ull << 2), + allow_multi_line_strings = (1ull << 3), + allow_real_tabs_in_strings = (1ull << 4), + allow_unicode_strings = (1ull << 5), + allow_binary_integers = (1ull << 6), + allow_octal_integers = (1ull << 7), + allow_hexadecimal_integers = (1ull << 8), + indent_sub_tables = (1ull << 9), + indent_array_elements = (1ull << 10), + indentation = indent_sub_tables | indent_array_elements, + relaxed_float_precision = (1ull << 11), + terse_key_value_pairs = (1ull << 12), + }; + TOML_MAKE_FLAGS(format_flags); + + template + struct TOML_TRIVIAL_ABI inserter + { + static_assert(std::is_reference_v); + + T value; + }; + template + inserter(T &&) -> inserter; + template + inserter(T&) -> inserter; + + using default_formatter = toml_formatter; +} +TOML_NAMESPACE_END; + +TOML_IMPL_NAMESPACE_START +{ + template + using remove_cvref = std::remove_cv_t>; + + template + using common_signed_type = std::common_type_t...>; + + template + inline constexpr bool is_one_of = (false || ... || std::is_same_v); + + template + inline constexpr bool all_integral = (std::is_integral_v && ...); + + template + inline constexpr bool is_cvref = std::is_reference_v || std::is_const_v || std::is_volatile_v; + + template + inline constexpr bool is_wide_string = + is_one_of, const wchar_t*, wchar_t*, std::wstring_view, std::wstring>; + + template + inline constexpr bool value_retrieval_is_nothrow = !std::is_same_v, std::string> +#if TOML_HAS_CHAR8 + && !std::is_same_v, std::u8string> +#endif + + && !is_wide_string; + + template + struct copy_ref_; + template + using copy_ref = typename copy_ref_::type; + + template + struct copy_ref_ + { + using type = Dest; + }; + + template + struct copy_ref_ + { + using type = std::add_lvalue_reference_t; + }; + + template + struct copy_ref_ + { + using type = std::add_rvalue_reference_t; + }; + + template + struct copy_cv_; + template + using copy_cv = typename copy_cv_::type; + + template + struct copy_cv_ + { + using type = Dest; + }; + + template + struct copy_cv_ + { + using type = std::add_const_t; + }; + + template + struct copy_cv_ + { + using type = std::add_volatile_t; + }; + + template + struct copy_cv_ + { + using type = std::add_cv_t; + }; + + template + using copy_cvref = + copy_ref, std::remove_reference_t>, Dest>, Src>; + + template + inline constexpr bool dependent_false = false; + + template + inline constexpr bool first_is_same = false; + template + inline constexpr bool first_is_same = true; + + // general value traits + // (as they relate to their equivalent native TOML type) + template + struct value_traits + { + using native_type = void; + static constexpr bool is_native = false; + static constexpr bool is_losslessly_convertible_to_native = false; + static constexpr bool can_represent_native = false; + static constexpr bool can_partially_represent_native = false; + static constexpr auto type = node_type::none; + }; + + template + struct value_traits : value_traits + {}; + template + struct value_traits : value_traits + {}; + template + struct value_traits : value_traits + {}; + template + struct value_traits : value_traits + {}; + template + struct value_traits : value_traits + {}; + + // integer value_traits specializations - standard types + template + struct integer_limits + { + static constexpr auto min = (std::numeric_limits::min)(); + static constexpr auto max = (std::numeric_limits::max)(); + }; + template + struct integer_traits_base : integer_limits + { + using native_type = int64_t; + static constexpr bool is_native = std::is_same_v; + static constexpr bool is_signed = static_cast(-1) < T{}; // for impls not specializing std::is_signed + static constexpr auto type = node_type::integer; + static constexpr bool can_partially_represent_native = true; + }; + template + struct unsigned_integer_traits : integer_traits_base + { + static constexpr bool is_losslessly_convertible_to_native = integer_limits::max <= 9223372036854775807ULL; + static constexpr bool can_represent_native = false; + }; + template + struct signed_integer_traits : integer_traits_base + { + using native_type = int64_t; + static constexpr bool is_losslessly_convertible_to_native = + integer_limits::min >= (-9223372036854775807LL - 1LL) && integer_limits::max <= 9223372036854775807LL; + static constexpr bool can_represent_native = + integer_limits::min <= (-9223372036854775807LL - 1LL) && integer_limits::max >= 9223372036854775807LL; + }; + template ::is_signed> + struct integer_traits : signed_integer_traits + {}; + template + struct integer_traits : unsigned_integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; + static_assert(value_traits::is_native); + static_assert(value_traits::is_signed); + static_assert(value_traits::is_losslessly_convertible_to_native); + static_assert(value_traits::can_represent_native); + static_assert(value_traits::can_partially_represent_native); + + // integer value_traits specializations - non-standard types +#ifdef TOML_INT128 + template <> + struct integer_limits + { + static constexpr TOML_INT128 max = + static_cast((TOML_UINT128{ 1u } << ((__SIZEOF_INT128__ * CHAR_BIT) - 1)) - 1); + static constexpr TOML_INT128 min = -max - TOML_INT128{ 1 }; + }; + template <> + struct integer_limits + { + static constexpr TOML_UINT128 min = TOML_UINT128{}; + static constexpr TOML_UINT128 max = (2u * static_cast(integer_limits::max)) + 1u; + }; + template <> + struct value_traits : integer_traits + {}; + template <> + struct value_traits : integer_traits + {}; +#endif +#ifdef TOML_SMALL_INT_TYPE + template <> + struct value_traits : signed_integer_traits + {}; +#endif + + // floating-point traits base + template + struct float_traits_base + { + static constexpr auto type = node_type::floating_point; + using native_type = double; + static constexpr bool is_native = std::is_same_v; + static constexpr bool is_signed = true; + + static constexpr int bits = static_cast(sizeof(T) * CHAR_BIT); + static constexpr int digits = MantissaDigits; + static constexpr int digits10 = DecimalDigits; + + static constexpr bool is_losslessly_convertible_to_native = bits <= 64 // + && digits <= 53 // DBL_MANT_DIG + && digits10 <= 15; // DBL_DIG + + static constexpr bool can_represent_native = digits >= 53 // DBL_MANT_DIG + && digits10 >= 15; // DBL_DIG + + static constexpr bool can_partially_represent_native = digits > 0 && digits10 > 0; + }; + template + struct float_traits : float_traits_base::digits, std::numeric_limits::digits10> + {}; +#if TOML_ENABLE_FLOAT16 + template <> + struct float_traits<_Float16> : float_traits_base<_Float16, __FLT16_MANT_DIG__, __FLT16_DIG__> + {}; +#endif +#ifdef TOML_FLOAT128 + template <> + struct float_traits : float_traits_base + {}; +#endif + + // floating-point traits + template <> + struct value_traits : float_traits + {}; + template <> + struct value_traits : float_traits + {}; + template <> + struct value_traits : float_traits + {}; +#if TOML_ENABLE_FLOAT16 + template <> + struct value_traits<_Float16> : float_traits<_Float16> + {}; +#endif +#ifdef TOML_FLOAT128 + template <> + struct value_traits : float_traits + {}; +#endif +#ifdef TOML_SMALL_FLOAT_TYPE + template <> + struct value_traits : float_traits + {}; +#endif + static_assert(value_traits::is_native); + static_assert(value_traits::is_losslessly_convertible_to_native); + static_assert(value_traits::can_represent_native); + static_assert(value_traits::can_partially_represent_native); + + // string value_traits specializations - char-based strings + template + struct string_traits + { + using native_type = std::string; + static constexpr bool is_native = std::is_same_v; + static constexpr bool is_losslessly_convertible_to_native = true; + static constexpr bool can_represent_native = + !std::is_array_v && (!std::is_pointer_v || std::is_const_v>); + static constexpr bool can_partially_represent_native = can_represent_native; + static constexpr auto type = node_type::string; + }; + template <> + struct value_traits : string_traits + {}; + template <> + struct value_traits : string_traits + {}; + template <> + struct value_traits : string_traits + {}; + template + struct value_traits : string_traits + {}; + template <> + struct value_traits : string_traits + {}; + template + struct value_traits : string_traits + {}; + + // string value_traits specializations - char8_t-based strings +#if TOML_HAS_CHAR8 + template <> + struct value_traits : string_traits + {}; + template <> + struct value_traits : string_traits + {}; + template <> + struct value_traits : string_traits + {}; + template + struct value_traits : string_traits + {}; + template <> + struct value_traits : string_traits + {}; + template + struct value_traits : string_traits + {}; +#endif + + // string value_traits specializations - wchar_t-based strings on Windows +#if TOML_ENABLE_WINDOWS_COMPAT + template + struct wstring_traits + { + using native_type = std::string; + static constexpr bool is_native = false; + static constexpr bool is_losslessly_convertible_to_native = true; // narrow + static constexpr bool can_represent_native = std::is_same_v; // widen + static constexpr bool can_partially_represent_native = can_represent_native; + static constexpr auto type = node_type::string; + }; + template <> + struct value_traits : wstring_traits + {}; + template <> + struct value_traits : wstring_traits + {}; + template <> + struct value_traits : wstring_traits + {}; + template + struct value_traits : wstring_traits + {}; + template <> + struct value_traits : wstring_traits + {}; + template + struct value_traits : wstring_traits + {}; +#endif + + // other 'native' value_traits specializations + template + struct native_value_traits + { + using native_type = T; + static constexpr bool is_native = true; + static constexpr bool is_losslessly_convertible_to_native = true; + static constexpr bool can_represent_native = true; + static constexpr bool can_partially_represent_native = true; + static constexpr auto type = NodeType; + }; + template <> + struct value_traits : native_value_traits + {}; + template <> + struct value_traits : native_value_traits + {}; + template <> + struct value_traits